diff --git a/.travis.yml b/.travis.yml
index c54d7a2b8..c1ef5b549 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,17 @@ dist: trusty
 
 language: php
 
+install:
+  - cd ..
+  - ls
+  - mv wp-matomo matomo
+  - cd matomo
+
 notifications:
   email:
     on_success: never
     on_failure: change
 
-branches:
-  only:
-    - master
-
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a695df25..23bc38a00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+0.2.0
+- Update to Matomo 3.12.0
+- Improve session start success check
+
 0.1.9
 - Better session error logging
 
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
index fb5e4d3b2..b3ebf56cb 100644
--- a/app/CHANGELOG.md
+++ b/app/CHANGELOG.md
@@ -4,6 +4,13 @@ This is the Developer Changelog for Matomo platform developers. All changes in o
 
 The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)** lets you see more details about any Matomo release, such as the list of new guides and FAQs, security fixes, and links to all closed issues. 
 
+## Matomo 3.12.0
+
+### New API
+* Added new event `Visualization.beforeRender`, triggered after immediately before rendering a visualization.
+* Added new event `Http.sendHttpRequest` and `Http.sendHttpRequest.end` so plugins can listen to external HTTP requests, monitor them, or resolve the request themselves.
+* Added new event `CliMulti.supportsAsync` so plugins can force or disable the usage of archiving through the CLI
+
 ## Matomo 3.10.0
 
 ### Breaking Changes
diff --git a/app/LEGALNOTICE b/app/LEGALNOTICE
index 295ff6bca..15ddc77bd 100644
--- a/app/LEGALNOTICE
+++ b/app/LEGALNOTICE
@@ -14,7 +14,7 @@ SOFTWARE LICENSE
 
 	The free software license of Matomo is GNU General Public License v3
 	or later.  A copy of GNU GPL v3 should have been included in this
-	software package in misc/gpl-3.0.txt.
+	software package in LICENSE.
 
 
 TRADEMARK
@@ -36,7 +36,7 @@ TRADEMARK
 CREDITS
 
 	The software consists of contributions made by many individuals.
-	Major contributors are listed in https://matomo.org/the-piwik-team/.
+	Major contributors are listed in https://matomo.org/team/.
 
 	For detailed contribution history, refer to the source, tickets,
 	patches, and Git revision history, available at
@@ -217,6 +217,10 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link: http://raphaeljs.com/
 	License: MIT (Expat)
 
+	Name: iFrame Resizer 
+	Link: https://github.com/davidjbradshaw/iframe-resizer
+	License: MIT
+
 	Name: lessphp
 	Link: http://leafo.net/lessphp
 	License: GPL3, MIT (Expat)
@@ -275,7 +279,7 @@ THIRD-PARTY CONTENT
 	License: GPL
 	By: Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey
 
-	Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind", "icon-bug", "icon-upload", "icon-segmented-visits-log") in plugins/Morpheus/fonts
+	Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind", "icon-bug", "icon-upload", "icon-segmented-visits-log") in plugins/Morpheus/fonts, and plugins/Morpheus/images/compare.svg
 	Link: https://design.google.com/icons/
 	License: Apache License Version 2.0
 
diff --git a/app/README.md b/app/README.md
index 600710685..a73e3f95c 100644
--- a/app/README.md
+++ b/app/README.md
@@ -1,8 +1,8 @@
 # Matomo (formerly Piwik) - matomo.org
 
-[![Latest Stable Version](https://poser.pugx.org/matomo-org/matomo/v/stable)](https://matomo.org/download/)
-[![Latest Unstable Version](https://poser.pugx.org/matomo-org/matomo/v/unstable)](https://packagist.org/packages/piwik/piwik)
-[![License](https://poser.pugx.org/matomo-org/matomo/license)](https://matomo.org/free-software/)
+[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://matomo.org/download/)
+[![Latest Unstable Version](https://poser.pugx.org/piwik/piwik/v/unstable)](https://packagist.org/packages/piwik/piwik)
+[![License](https://poser.pugx.org/piwik/piwik/license)](https://matomo.org/free-software/)
 
 ## Code Status
 
@@ -28,7 +28,7 @@ Or in short:
 
 ## License
 
-Matomo is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
+Matomo is released under the GPL v3 (or later) license, see [LICENSE](LICENSE)
 
 ## Requirements
 
@@ -107,7 +107,7 @@ What makes Matomo unique from the competition:
   * Modern, easy to use User Interface: you can fully customize your dashboard, drag and drop widgets and more.
 
   * Matomo features are built inside plugins: you can add new features and remove the ones you don’t need.
-    You can build your own web analytics plugins or hire a consultant to have your custom feature built-in Matomo
+    You can build your own web analytics plugins or hire a consultant to have your custom feature built-in Matomo.
 
   * A vibrant international Open community of more than 200,000 active users (tracking even more websites!)
 
@@ -117,7 +117,3 @@ What makes Matomo unique from the competition:
 Documentation and more info on https://matomo.org
 
 We are together creating the best open analytics platform in the world!
-
-## Known issues
-
-* Untested is DB connection when configuring MYSQL SOCKETS OR PIPES as DB host, eg `define( 'DB_HOST', '127.0.0.1:/var/run/mysqld/mysqld.sock' );`
\ No newline at end of file
diff --git a/matomo_bootstrap.php b/app/bootstrap.php
similarity index 97%
rename from matomo_bootstrap.php
rename to app/bootstrap.php
index 5e88482b6..900c90fda 100644
--- a/matomo_bootstrap.php
+++ b/app/bootstrap.php
@@ -14,7 +14,7 @@
 
 if ( ! defined( 'ABSPATH' ) ) {
 	// prevent from loading twice
-	require_once( dirname( __FILE__ ) . '/../../../wp-load.php' );
+	require_once( dirname( __FILE__ ) . '/../../../../wp-load.php' );
 }
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/app/config/global.ini.php b/app/config/global.ini.php
old mode 100644
new mode 100755
index 01671b5c1..439b1ab03
--- a/app/config/global.ini.php
+++ b/app/config/global.ini.php
@@ -48,7 +48,6 @@
 ; If configured, the following queries will be executed on the reader instead of the writer.
 ; * archiving queries that hit a log table
 ; * live queries that hit a log table
-; * fetching of archives when viewing a report
 ; You only want to enable a reader if you can ensure there is minimal replication lag / delay on the reader.
 ; Otherwise you might get corrupt data in the reports.
 [database_reader]
@@ -209,6 +208,12 @@
 enabled_periods_UI = "day,week,month,year,range"
 enabled_periods_API = "day,week,month,year,range"
 
+; whether to enable segment archiving cache
+; Note: if you use any plugins, this need to be compliant with Matomo and
+; * depending on the segment you create you may need a newer MySQL version (eg 5.7 or newer)
+; * use a reader database for archiving in case you have configured a database reader
+enable_segments_cache = 1
+
 ; whether to enable subquery cache for Custom Segment archiving queries
 enable_segments_subquery_cache = 0
 ; Any segment subquery that matches more than segments_subquery_cache_limit IDs will not be cached,
@@ -357,6 +362,11 @@
 ; or make sure the date ranges users' want to see will be processed somehow.
 archiving_range_force_on_browser_request = 1
 
+; By default Matomo will automatically archive all date ranges any user has chosen in his account settings.
+; This is limited to the available options last7, previous7, last30 and previous30.
+; If you need any other period, or want to ensure one of those is always archived, you can define them here
+archiving_custom_ranges[] =
+
 ; By default Matomo runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data.
 ; If your Matomo tracks millions of pages, the OPTIMIZE TABLE queries might run for hours (seen in "SHOW FULL PROCESSLIST \g")
 ; so you can disable these special queries here:
@@ -538,6 +548,12 @@
 ; this limit can be adjusted by changing this value
 live_visitor_profile_max_visits_to_aggregate = 100
 
+; If configured, will abort a MySQL query after the configured amount of seconds and show an error in the UI to for
+; example lower the date range or tweak the segment (if one is applied). Set it to -1 if the query time should not be
+; limited. Note: This feature requires a recent MySQL version (5.7 or newer). Some MySQL forks like MariaDB might not
+; support this feature which uses the MAX_EXECUTION_TIME hint.
+live_query_max_execution_time = -1
+
 ; In "All Websites" dashboard, when looking at today's reports (or a date range including today),
 ; the page will automatically refresh every 5 minutes. Set to 0 to disable automatic refresh
 multisites_refresh_after_seconds = 300
@@ -637,6 +653,9 @@
 ; With this option, you can disable the framed mode of the Overlay plugin. Use it if your website contains a framebuster.
 overlay_disable_framed_mode = 0
 
+; Controls whether the user is able to upload a custom logo for their Matomo install
+enable_custom_logo = 1
+
 ; By default we check whether the Custom logo is writable or not, before we display the Custom logo file uploader
 enable_custom_logo_check = 1
 
@@ -658,6 +677,12 @@
 ; - links to Uninstall themes will be disabled (but user can still enable/disable themes)
 enable_plugins_admin = 1
 
+; By setting this option to 0 the users management will be disabled
+enable_users_admin = 1
+
+; By setting this option to 0 the websites management will be disabled
+enable_sites_admin = 1
+
 ; By setting this option to 1, it will be possible for Super Users to upload Matomo plugin ZIP archives directly in Matomo Administration.
 ; Enabling this opens a remote code execution vulnerability where
 ; an attacker who gained Super User access could execute custom PHP code in a Matomo plugin.
@@ -711,6 +736,12 @@
 ; The number of days to wait before sending the JavaScript tracking code email reminder.
 num_days_before_tracking_code_reminder = 5
 
+; The maximum number of segments that can be compared simultaneously.
+data_comparison_segment_limit = 5
+
+; The maximum number of periods that can be compared simultaneously.
+data_comparison_period_limit = 5
+
 ; The path to a custom cacert.pem file Matomo should use.
 ; By default Matomo uses a file extracted from the Firefox browser and provided here: https://curl.haxx.se/docs/caextract.html.
 ; The file contains root CAs and is used to determine if the chain of a SSL certificate is valid and it is safe to connect.
@@ -722,7 +753,6 @@
 ; Default is 1.
 enable_tracking_failures_notification = 1
 
-
 [Tracker]
 
 ; Matomo uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Matomo,
@@ -951,6 +981,7 @@
 Plugins[] = RssWidget
 Plugins[] = Feedback
 Plugins[] = Monolog
+
 Plugins[] = Login
 Plugins[] = TwoFactorAuth
 Plugins[] = UsersManager
diff --git a/app/config/global.php b/app/config/global.php
index fdcbd5577..17d7b9e01 100644
--- a/app/config/global.php
+++ b/app/config/global.php
@@ -9,6 +9,7 @@
 return array(
 
     'path.root' => PIWIK_DOCUMENT_ROOT,
+
     'path.misc.user' => 'misc/user/',
 
     'path.tmp' => function (ContainerInterface $c) {
@@ -117,6 +118,8 @@
         'misc/package/WebAppGallery/*.xml',
         'misc/package/WebAppGallery/install.sql',
         'plugins/ImageGraph/fonts/unifont.ttf',
+        'plugins/*/config/tracker.php',
+        'plugins/*/config/config.php',
         'vendor/autoload.php',
         'vendor/composer/autoload_real.php',
         'vendor/szymach/c-pchart/app/*',
diff --git a/app/console b/app/console
old mode 100644
new mode 100755
index 122c46e6e..44768da38
--- a/app/console
+++ b/app/console
@@ -4,13 +4,9 @@ if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
 
-if (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-	require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
-}
-
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
-}
+} 
 
 if (!defined('PIWIK_INCLUDE_PATH')) {
     define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
diff --git a/app/core/API/ApiRenderer.php b/app/core/API/ApiRenderer.php
index 6072bcd19..e14acf7a7 100644
--- a/app/core/API/ApiRenderer.php
+++ b/app/core/API/ApiRenderer.php
@@ -14,6 +14,7 @@
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugin;
+use Piwik\SettingsServer;
 
 /**
  * API renderer
@@ -22,6 +23,8 @@ abstract class ApiRenderer
 {
     protected $request;
 
+    protected $hideIdSubDataTable;
+
     final public function __construct($request)
     {
         $this->request = $request;
@@ -30,6 +33,12 @@ final public function __construct($request)
 
     protected function init()
     {
+        $this->hideIdSubDataTable = Common::getRequestVar('hideIdSubDatable', false, 'int', $this->request);
+    }
+
+    protected function shouldSendBacktrace()
+    {
+        return Common::isPhpCliMode() && SettingsServer::isArchivePhpTriggered();
     }
 
     abstract public function sendHeader();
@@ -101,7 +110,7 @@ protected function buildDataTableRenderer($dataTable)
         $renderer->setTable($dataTable);
         $renderer->setIdSite($idSite);
         $renderer->setRenderSubTables(Common::getRequestVar('expanded', false, 'int', $this->request));
-        $renderer->setHideIdSubDatableFromResponse(Common::getRequestVar('hideIdSubDatable', false, 'int', $this->request));
+        $renderer->setHideIdSubDatableFromResponse($this->hideIdSubDataTable);
 
         return $renderer;
     }
diff --git a/app/core/API/DataTableManipulator.php b/app/core/API/DataTableManipulator.php
index ee24ec78a..4faf3ad77 100644
--- a/app/core/API/DataTableManipulator.php
+++ b/app/core/API/DataTableManipulator.php
@@ -192,6 +192,7 @@ protected function callApiAndReturnDataTable($apiModule, $method, $request)
         $request['expanded'] = 0;
         $request['format'] = 'original';
         $request['format_metrics'] = 0;
+        $request['compare'] = 0;
 
         // don't want to run recursive filters on the subtables as they are loaded,
         // otherwise the result will be empty in places (or everywhere). instead we
diff --git a/app/core/API/DataTableManipulator/Flattener.php b/app/core/API/DataTableManipulator/Flattener.php
index 5e8b68a56..2db6017ec 100644
--- a/app/core/API/DataTableManipulator/Flattener.php
+++ b/app/core/API/DataTableManipulator/Flattener.php
@@ -102,8 +102,7 @@ protected function flattenDataTableInto($dataTable, $newDataTable, $level, $dime
      * @param string $dimensionName
      * @param bool $parentLogo
      */
-    private function flattenRow
-    (Row $row, $rowId, DataTable $dataTable, $level, $dimensionName,
+    private function flattenRow(Row $row, $rowId, DataTable $dataTable, $level, $dimensionName,
                                 $labelPrefix = '', $parentLogo = false)
     {
         $dimensions = $dataTable->getMetadata('dimensions');
@@ -202,6 +201,12 @@ private function flattenRow
             if ($origLabel !== false) {
                 foreach ($subTable->getRows() as $subRow) {
                     foreach ($row->getMetadata() as $name => $value) {
+                        // do not set 'segment' parameter if there is a segmentValue on the row, since that will prevent the segmentValue
+                        // from being used in DataTablePostProcessor
+                        if ($name == 'segment' && $subRow->getMetadata('segmentValue') !== false) {
+                            continue;
+                        }
+
                         if ($subRow->getMetadata($name) === false) {
                             $subRow->setMetadata($name, $value);
                         }
diff --git a/app/core/API/DataTableManipulator/LabelFilter.php b/app/core/API/DataTableManipulator/LabelFilter.php
index 6a7d23b52..369d006f5 100644
--- a/app/core/API/DataTableManipulator/LabelFilter.php
+++ b/app/core/API/DataTableManipulator/LabelFilter.php
@@ -28,6 +28,8 @@ class LabelFilter extends DataTableManipulator
 
     private $labels;
     private $addLabelIndex;
+    private $isComparing;
+    private $labelSeries;
     const FLAG_IS_ROW_EVOLUTION = 'label_index';
 
     /**
@@ -50,9 +52,18 @@ public function filter($labels, $dataTable, $addLabelIndex = false)
             $labels = array($labels);
         }
 
-        $this->labels = $labels;
+        $this->labels = array_values($labels);
         $this->addLabelIndex = (bool)$addLabelIndex;
-        return $this->manipulate($dataTable);
+        $this->isComparing = $this->isComparing();
+
+        $labelSeries = Common::getRequestVar('labelSeries', '', 'string', $this->request);
+        $labelSeries = explode(',', $labelSeries);
+        $labelSeries = array_filter($labelSeries, 'strlen');
+        $this->labelSeries = $labelSeries;
+
+        $result = $this->manipulate($dataTable);
+
+        return $result;
     }
 
     /**
@@ -175,9 +186,27 @@ protected function manipulateDataTable($dataTable)
 
                 $row = $this->doFilterRecursiveDescend($labelVariation, $dataTable);
                 if ($row) {
+                    if ($this->isComparing
+                        && isset($this->labelSeries[$labelIndex])
+                    ) {
+                        $comparisons = $row->getComparisons();
+                        if (!empty($comparisons)) {
+                            $labelSeriesIndex = $this->labelSeries[$labelIndex];
+
+                            $originalLabel = $row->getColumn('label');
+
+                            $row = $comparisons->getRowFromId($labelSeriesIndex);
+
+                            // add label and make sure it is the first column
+                            $columns = array_merge(['label' => $originalLabel . ' ' . $row->getMetadata('compareSeriesPretty')], $row->getColumns());
+                            $row->setColumns($columns);
+                        }
+                    }
+
                     if ($this->addLabelIndex) {
                         $row->setMetadata(self::FLAG_IS_ROW_EVOLUTION, $labelIndex);
                     }
+
                     $result->addRow($row);
                     break;
                 }
@@ -185,4 +214,9 @@ protected function manipulateDataTable($dataTable)
         }
         return $result;
     }
+
+    private function isComparing()
+    {
+        return Common::getRequestVar('compare', 0, 'int', $this->request) == 1;
+    }
 }
diff --git a/app/core/API/DataTableManipulator/ReportTotalsCalculator.php b/app/core/API/DataTableManipulator/ReportTotalsCalculator.php
index 45ffec9ee..a6d4fcc53 100644
--- a/app/core/API/DataTableManipulator/ReportTotalsCalculator.php
+++ b/app/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -148,8 +148,10 @@ protected function manipulateDataTable($dataTable)
             $dataTable->setMetadata('totals', $totals);
 
             if (1 === Common::getRequestVar('keep_totals_row', 0, 'integer', $this->request)) {
+                $totalLabel = Common::getRequestVar('keep_totals_row_label', Piwik::translate('General_Totals'), 'string', $this->request);
+
                 $row->deleteMetadata(false);
-                $row->setColumn('label', Piwik::translate('General_Totals'));
+                $row->setColumn('label', $totalLabel);
                 $dataTable->setTotalsRow($row);
             }
         }
diff --git a/app/core/API/DataTablePostProcessor.php b/app/core/API/DataTablePostProcessor.php
index cd49c8bd9..66e87828e 100644
--- a/app/core/API/DataTablePostProcessor.php
+++ b/app/core/API/DataTablePostProcessor.php
@@ -21,6 +21,7 @@
 use Piwik\Plugin\ProcessedMetric;
 use Piwik\Plugin\Report;
 use Piwik\Plugin\ReportsProvider;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 
 /**
  * Processes DataTables that should be served through Piwik's APIs. This processing handles
@@ -119,6 +120,7 @@ public function process(DataTableInterface $dataTable)
 
         $dataTable = $this->applyGenericFilters($dataTable);
         $this->applyComputeProcessedMetrics($dataTable);
+        $dataTable = $this->applyComparison($dataTable);
 
         if ($this->callbackAfterGenericFilters) {
             call_user_func($this->callbackAfterGenericFilters, $dataTable);
@@ -126,6 +128,7 @@ public function process(DataTableInterface $dataTable)
 
         // we automatically safe decode all datatable labels (against xss)
         $dataTable->queueFilter('SafeDecodeLabel');
+
         $dataTable = $this->convertSegmentValueToSegment($dataTable);
         $dataTable = $this->applyQueuedFilters($dataTable);
         $dataTable = $this->applyRequestedColumnDeletion($dataTable);
@@ -473,5 +476,27 @@ public function applyComputeProcessedMetrics(DataTableInterface $dataTable)
     {
         $dataTable->filter(array($this, 'computeProcessedMetrics'));
     }
+
+    public function applyComparison(DataTableInterface $dataTable)
+    {
+        $compare = Common::getRequestVar('compare', '0', 'int', $this->request);
+        if ($compare != 1) {
+            return $dataTable;
+        }
+
+        $filter = new DataComparisonFilter($this->request, $this->report);
+        $filter->compare($dataTable);
+
+        $dataTable->filter(function (DataTable $table) {
+            foreach ($table->getRows() as $row) {
+                $comparisons = $row->getComparisons();
+                if (!empty($comparisons)) {
+                    $this->computeProcessedMetrics($comparisons);
+                }
+            }
+        });
+
+        return $dataTable;
+    }
 }
 
diff --git a/app/core/API/DocumentationGenerator.php b/app/core/API/DocumentationGenerator.php
index f398eb62f..be18398b3 100644
--- a/app/core/API/DocumentationGenerator.php
+++ b/app/core/API/DocumentationGenerator.php
@@ -262,6 +262,7 @@ public function getExampleUrl($class, $methodName, $parametersToSet = array())
         $aParameters['language'] = false;
         $aParameters['translateColumnNames'] = false;
         $aParameters['label'] = false;
+        $aParameters['labelSeries'] = false;
         $aParameters['flat'] = false;
         $aParameters['include_aggregate_rows'] = false;
         $aParameters['filter_offset'] = false; 
@@ -285,6 +286,11 @@ public function getExampleUrl($class, $methodName, $parametersToSet = array())
         $aParameters['expanded'] = false;
         $aParameters['idDimenson'] = false;
         $aParameters['format_metrics'] = false;
+        $aParameters['compare'] = false;
+        $aParameters['compareDates'] = false;
+        $aParameters['comparePeriods'] = false;
+        $aParameters['compareSegments'] = false;
+        $aParameters['comparisonIdSubtables'] = false;
 
         $entityNames = StaticContainer::get('entities.idNames');
         foreach ($entityNames as $entityName) {
diff --git a/app/core/API/Request.php b/app/core/API/Request.php
index 7b81cbaed..cf323f448 100644
--- a/app/core/API/Request.php
+++ b/app/core/API/Request.php
@@ -500,6 +500,7 @@ public static function processRequest($method, $paramOverride = array(), $defaul
         $params['serialize'] = '0';
         $params['module'] = 'API';
         $params['method'] = $method;
+        $params['compare'] = '0';
         $params = $paramOverride + $params;
 
         // process request
@@ -556,6 +557,10 @@ public static function getCurrentUrlWithoutGenericFilters($params)
             }
         }
 
+        $params['compareDates'] = null;
+        $params['comparePeriods'] = null;
+        $params['compareSegments'] = null;
+
         return Url::getCurrentQueryStringWithParametersModified($params);
     }
 
diff --git a/app/core/Access.php b/app/core/Access.php
index 1c410d66d..7a253831c 100644
--- a/app/core/Access.php
+++ b/app/core/Access.php
@@ -12,6 +12,7 @@
 use Piwik\Access\CapabilitiesProvider;
 use Piwik\Access\RolesProvider;
 use Piwik\Container\StaticContainer;
+use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Plugins\SitesManager\API as SitesManagerApi;
 
 /**
@@ -412,7 +413,7 @@ public function getSitesIdWithWriteAccess()
     public function checkUserHasSuperUserAccess()
     {
         if (!$this->hasSuperUserAccess()) {
-            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilege', array("'superuser'")));
+            $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilege', array("'superuser'")));
         }
     }
 
@@ -456,7 +457,7 @@ public function isUserHasSomeAdminAccess()
     public function checkUserHasSomeWriteAccess()
     {
         if (!$this->isUserHasSomeWriteAccess()) {
-            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('write')));
+            $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('write')));
         }
     }
 
@@ -468,7 +469,7 @@ public function checkUserHasSomeWriteAccess()
     public function checkUserHasSomeAdminAccess()
     {
         if (!$this->isUserHasSomeAdminAccess()) {
-            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('admin')));
+            $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('admin')));
         }
     }
 
@@ -486,7 +487,7 @@ public function checkUserHasSomeViewAccess()
         $idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess();
 
         if (count($idSitesAccessible) == 0) {
-            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('view')));
+            $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAtLeastOneWebsite', array('view')));
         }
     }
 
@@ -508,7 +509,7 @@ public function checkUserHasAdminAccess($idSites)
 
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $idSitesAccessible)) {
-                throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'admin'", $idsite)));
+                $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'admin'", $idsite)));
             }
         }
     }
@@ -531,7 +532,7 @@ public function checkUserHasViewAccess($idSites)
 
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $idSitesAccessible)) {
-                throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idsite)));
+                $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idsite)));
             }
         }
     }
@@ -554,11 +555,21 @@ public function checkUserHasWriteAccess($idSites)
 
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $idSitesAccessible)) {
-                throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'write'", $idsite)));
+                $this->throwNoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'write'", $idsite)));
             }
         }
     }
 
+    public function checkUserIsNotAnonymous()
+    {
+        if ($this->hasSuperUserAccess()) {
+            return;
+        }
+        if (Piwik::isUserIsAnonymous()) {
+            $this->throwNoAccessException(Piwik::translate('General_YouMustBeLoggedIn'));
+        }
+    }
+
     private function getSitesIdWithCapability($capability)
     {
         if (!empty($this->idsitesByAccess[$capability])) {
@@ -578,7 +589,7 @@ public function checkUserHasCapability($idSites, $capability)
 
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $idSitesAccessible)) {
-                throw new NoAccessException(Piwik::translate('ExceptionCapabilityAccessWebsite', array("'" . $capability ."'", $idsite)));
+                $this->throwNoAccessException(Piwik::translate('ExceptionCapabilityAccessWebsite', array("'" . $capability ."'", $idsite)));
             }
         }
 
@@ -600,7 +611,7 @@ protected function getIdSites($idSites)
         $idSites = Site::getIdSitesFromIdSitesString($idSites);
 
         if (empty($idSites)) {
-            throw new NoAccessException("The parameter 'idSite=' is missing from the request.");
+            $this->throwNoAccessException("The parameter 'idSite=' is missing from the request.");
         }
 
         return $idSites;
@@ -688,6 +699,28 @@ public function getCapabilitiesForSite($idSite)
         }
         return $result;
     }
+
+    /**
+     * Throw a NoAccessException with the given message, or a more generic 'You need to log in' message if the
+     * user is not currently logged in (e.g. if session has expired).
+     * @param $message
+     * @throws NoAccessException
+     */
+    private function throwNoAccessException($message)
+    {
+        if (Piwik::isUserIsAnonymous()) {
+            $message = Piwik::translate('General_YouMustBeLoggedIn');
+        }
+        // Try to detect whether user was previously logged in so that we can display a different message
+        $referrer = Url::getReferrer();
+        if ($referrer && Url::isValidHost(Url::getHostFromUrl($referrer)) &&
+            strpos($_SERVER['HTTP_REFERER'], SettingsPiwik::getPiwikUrl()) === 0
+        ) {
+            $message = Piwik::translate('General_YourSessionHasExpired');
+        }
+
+        throw new NoAccessException($message);
+    }
 }
 
 /**
@@ -695,6 +728,6 @@ public function getCapabilitiesForSite($idSite)
  *
  * @api
  */
-class NoAccessException extends \Exception
+class NoAccessException extends InvalidRequestParameterException
 {
 }
diff --git a/app/core/Application/Kernel/EnvironmentValidator.php b/app/core/Application/Kernel/EnvironmentValidator.php
index 6f324e2d0..3a526a8c5 100644
--- a/app/core/Application/Kernel/EnvironmentValidator.php
+++ b/app/core/Application/Kernel/EnvironmentValidator.php
@@ -10,6 +10,7 @@
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Exception\NotYetInstalledException;
 use Piwik\Filechecks;
 use Piwik\Piwik;
diff --git a/app/core/Application/Kernel/PluginList.php b/app/core/Application/Kernel/PluginList.php
index dbab86e3b..e3275c2c8 100644
--- a/app/core/Application/Kernel/PluginList.php
+++ b/app/core/Application/Kernel/PluginList.php
@@ -33,6 +33,7 @@ class PluginList
      */
     private $corePluginsDisabledByDefault = array(
         'DBStats',
+        'ExamplePlugin',
         'ExampleCommand',
         'ExampleSettingsPlugin',
         'ExampleUI',
@@ -41,6 +42,7 @@ class PluginList
         'ExampleTracker',
         'ExampleLogTables',
         'ExampleReport',
+        'ExampleAPI',
         'MobileAppMeasurable',
         'Provider',
         'TagManager'
diff --git a/app/core/Archive.php b/app/core/Archive.php
index 8d4b46e96..3bf6d5b18 100644
--- a/app/core/Archive.php
+++ b/app/core/Archive.php
@@ -453,31 +453,6 @@ public static function createDataTableFromArchive($recordName, $idSite, $period,
         return $dataTable;
     }
 
-    private function canUseDbReader()
-    {
-        if (Common::isPhpCliMode() ) {
-            // we are likely archiving or we are in CronArchive class etc. where it is important to detect if a
-            // specific archive already exist or not to possibly prevent triggering an unneeded archive request...
-            // also we only want to read archives from the reader for requests from the web
-            return false;
-        }
-
-        if (SettingsServer::isArchivePhpTriggered()) {
-            // when archiving is triggered, we want to make sure to read archives from master to ensure most recent
-            // archives are read etc
-            return false;
-        }
-
-        if (Rules::isArchivingDisabledFor($this->params->getIdSites(), $this->params->getSegment(), $this->getPeriodLabel())) {
-            // in this case we know we won't be creating any archives and we will only want to read archives in order
-            // to present the data in Matomo. We want to use the reader in this case
-            return true;
-        }
-
-        // archiving could be triggered during this request, better not use the reader
-        return false;
-    }
-
     private function getSiteIdsThatAreRequestedInThisArchiveButWereNotInvalidatedYet()
     {
         if (is_null(self::$cache)) {
@@ -569,7 +544,7 @@ protected function get($archiveNames, $archiveDataType, $idSubtable = null)
         }
 
         $result = new Archive\DataCollection(
-            $dataNames, $archiveDataType, $this->params->getIdSites(), $this->params->getPeriods(), $defaultRow = null);
+            $dataNames, $archiveDataType, $this->params->getIdSites(), $this->params->getPeriods(), $this->params->getSegment(), $defaultRow = null);
 
         $archiveIds = $this->getArchiveIds($archiveNames);
         if (empty($archiveIds)) {
@@ -581,7 +556,7 @@ protected function get($archiveNames, $archiveDataType, $idSubtable = null)
             return $result;
         }
 
-        $archiveData = ArchiveSelector::getArchiveData($archiveIds, $archiveNames, $archiveDataType, $idSubtable, $this->canUseDbReader());
+        $archiveData = ArchiveSelector::getArchiveData($archiveIds, $archiveNames, $archiveDataType, $idSubtable);
 
         $isNumeric = $archiveDataType == 'numeric';
 
@@ -674,6 +649,15 @@ private function cacheArchiveIdsAfterLaunching($archiveGroups, $plugins)
             foreach ($this->params->getIdSites() as $idSite) {
                 $site = new Site($idSite);
 
+                 if ($period->getLabel() === 'day'
+                    && !$this->params->getSegment()->isEmpty()
+                    && Common::getRequestVar('skipArchiveSegmentToday', 0, 'int')
+                    && $period->getDateStart()->toString() == Date::factory('now', $site->getTimezone())->toString()) {
+
+                    Log::debug("Skipping archive %s for %s as segment today is disabled", $period->getLabel(), $period->getPrettyString());
+                    continue;
+                }
+
                 // if the END of the period is BEFORE the website creation date
                 // we already know there are no stats for this period
                 // we add one day to make sure we don't miss the day of the website creation
@@ -705,7 +689,7 @@ private function cacheArchiveIdsAfterLaunching($archiveGroups, $plugins)
     private function cacheArchiveIdsWithoutLaunching($plugins)
     {
         $idarchivesByReport = ArchiveSelector::getArchiveIds(
-            $this->params->getIdSites(), $this->params->getPeriods(), $this->params->getSegment(), $plugins, $this->canUseDbReader());
+            $this->params->getIdSites(), $this->params->getPeriods(), $this->params->getSegment(), $plugins);
 
         // initialize archive ID cache for each report
         foreach ($plugins as $plugin) {
diff --git a/app/core/Archive/ArchiveInvalidator.php b/app/core/Archive/ArchiveInvalidator.php
index 0dab3baa2..4f8bf5e97 100644
--- a/app/core/Archive/ArchiveInvalidator.php
+++ b/app/core/Archive/ArchiveInvalidator.php
@@ -205,6 +205,50 @@ public function markArchivesAsInvalidated(array $idSites, array $dates, $period,
         return $invalidationInfo;
     }
 
+    /**
+     * @param $idSites int[]
+     * @param $dates Date[]
+     * @param $period string
+     * @param $segment Segment
+     * @param bool $cascadeDown
+     * @return InvalidationResult
+     * @throws \Exception
+     */
+    public function markArchivesOverlappingRangeAsInvalidated(array $idSites, array $dates, Segment $segment = null)
+    {
+        $invalidationInfo = new InvalidationResult();
+
+        $ranges = array();
+        foreach ($dates as $dateRange) {
+            $ranges[] = $dateRange[0] . ',' . $dateRange[1];
+        }
+        $periodsByType = array(Period\Range::PERIOD_ID => $ranges);
+
+        $invalidatedMonths = array();
+        $archiveNumericTables = ArchiveTableCreator::getTablesArchivesInstalled($type = ArchiveTableCreator::NUMERIC_TABLE);
+        foreach ($archiveNumericTables as $table) {
+            $tableDate = ArchiveTableCreator::getDateFromTableName($table);
+
+            $result = $this->model->updateArchiveAsInvalidated($table, $idSites, $periodsByType, $segment);
+            $rowsAffected = $result->rowCount();
+            if ($rowsAffected > 0) {
+                $invalidatedMonths[] = $tableDate;
+            }
+        }
+
+        foreach ($idSites as $idSite) {
+            foreach ($dates as $dateRange) {
+                $this->forgetRememberedArchivedReportsToInvalidate($idSite, $dateRange[0]);
+                $invalidationInfo->processedDates[] = $dateRange[0];
+            }
+        }
+
+        $archivesToPurge = new ArchivesToPurgeDistributedList();
+        $archivesToPurge->add($invalidatedMonths);
+
+        return $invalidationInfo;
+    }
+
     /**
      * @param string[][][] $periodDates
      * @return string[][][]
@@ -230,11 +274,13 @@ private function getPeriodsToInvalidate($dates, $periodType, $cascadeDown)
     {
         $periodsToInvalidate = array();
 
-        foreach ($dates as $date) {
-            if ($periodType == 'range') {
-                $date = $date . ',' . $date;
-            }
+        if ($periodType == 'range') {
+            $rangeString = $dates[0] . ',' . $dates[1];
+            $periodsToInvalidate[] = Period\Factory::build('range', $rangeString);
+            return $periodsToInvalidate;
+        }
 
+        foreach ($dates as $date) {
             $period = Period\Factory::build($periodType, $date);
             $periodsToInvalidate[] = $period;
 
@@ -242,9 +288,7 @@ private function getPeriodsToInvalidate($dates, $periodType, $cascadeDown)
                 $periodsToInvalidate = array_merge($periodsToInvalidate, $period->getAllOverlappingChildPeriods());
             }
 
-            if ($periodType != 'year'
-                && $periodType != 'range'
-            ) {
+            if ($periodType != 'year') {
                 $periodsToInvalidate[] = Period\Factory::build('year', $date);
             }
         }
@@ -264,7 +308,11 @@ private function getPeriodDatesByYearMonthAndPeriodType($periods)
             $periodType = $period->getId();
 
             $yearMonth = ArchiveTableCreator::getTableMonthFromDate($date);
-            $result[$yearMonth][$periodType][] = $date->toString();
+            $dateString = $date->toString();
+            if ($periodType == Period\Range::PERIOD_ID) {
+                $dateString = $period->getRangeString();
+            }
+            $result[$yearMonth][$periodType][] = $dateString;
         }
         return $result;
     }
diff --git a/app/core/Archive/ArchivePurger.php b/app/core/Archive/ArchivePurger.php
index cfb04d223..cd330ea37 100644
--- a/app/core/Archive/ArchivePurger.php
+++ b/app/core/Archive/ArchivePurger.php
@@ -158,21 +158,23 @@ public function purgeOutdatedArchives(Date $dateStart)
 
     public function purgeDeletedSiteArchives(Date $dateStart)
     {
-        $idArchivesToDelete = $this->getDeletedSiteArchiveIds($dateStart);
+        $archiveTable = ArchiveTableCreator::getNumericTable($dateStart);
+        $idArchivesToDelete = $this->model->getArchiveIdsForDeletedSites($archiveTable);
 
         return $this->purge($idArchivesToDelete, $dateStart, 'deleted sites');
     }
 
     /**
      * @param Date $dateStart
-     * @param array $segmentHashesByIdSite  List of valid segment hashes, indexed by site ID
+     * @param array $deletedSegments List of segments whose archives should be purged
      * @return int
      */
-    public function purgeDeletedSegmentArchives(Date $dateStart, array $segmentHashesByIdSite)
+    public function purgeDeletedSegmentArchives(Date $dateStart, array $deletedSegments)
     {
-        $idArchivesToDelete = $this->getDeletedSegmentArchiveIds($dateStart, $segmentHashesByIdSite);
-
-        return $this->purge($idArchivesToDelete, $dateStart, 'deleted segments');
+        if (count($deletedSegments)) {
+            $idArchivesToDelete = $this->getDeletedSegmentArchiveIds($dateStart, $deletedSegments);
+            return $this->purge($idArchivesToDelete, $dateStart, 'deleted segments');
+        }
     }
 
     /**
@@ -210,20 +212,11 @@ protected function purge(array $idArchivesToDelete, Date $dateStart, $reason)
         return $deletedRowCount;
     }
 
-    protected function getDeletedSiteArchiveIds(Date $date)
-    {
-        $archiveTable = ArchiveTableCreator::getNumericTable($date);
-        return $this->model->getArchiveIdsForDeletedSites(
-            $archiveTable, 
-            $this->getOldestTemporaryArchiveToKeepThreshold()
-        );
-    }
-
-    protected function getDeletedSegmentArchiveIds(Date $date, array $segmentHashesByIdSite)
+    protected function getDeletedSegmentArchiveIds(Date $date, array $deletedSegments)
     {
         $archiveTable = ArchiveTableCreator::getNumericTable($date);
-        return $this->model->getArchiveIdsForDeletedSegments(
-            $archiveTable, $segmentHashesByIdSite, $this->getOldestTemporaryArchiveToKeepThreshold()
+        return $this->model->getArchiveIdsForSegments(
+            $archiveTable, $deletedSegments, $this->getOldestTemporaryArchiveToKeepThreshold()
         );
     }
 
diff --git a/app/core/Archive/DataCollection.php b/app/core/Archive/DataCollection.php
index c172464af..8f7f61b01 100644
--- a/app/core/Archive/DataCollection.php
+++ b/app/core/Archive/DataCollection.php
@@ -105,7 +105,7 @@ class DataCollection
      * @param \Piwik\Period[] $periods @see $this->periods
      * @param array $defaultRow @see $this->defaultRow
      */
-    public function __construct($dataNames, $dataType, $sitesId, $periods, $defaultRow = null)
+    public function __construct($dataNames, $dataType, $sitesId, $periods, $segment, $defaultRow = null)
     {
         $this->dataNames = $dataNames;
         $this->dataType = $dataType;
@@ -119,6 +119,8 @@ public function __construct($dataNames, $dataType, $sitesId, $periods, $defaultR
         foreach ($periods as $period) {
             $this->periods[$period->getRangeString()] = $period;
         }
+
+        $this->segment = $segment;
         $this->defaultRow = $defaultRow;
     }
 
@@ -221,7 +223,7 @@ public function getIndexedArray($resultIndices)
     public function getDataTable($resultIndices)
     {
         $dataTableFactory = new DataTableFactory(
-            $this->dataNames, $this->dataType, $this->sitesId, $this->periods, $this->defaultRow);
+            $this->dataNames, $this->dataType, $this->sitesId, $this->periods, $this->segment, $this->defaultRow);
 
         $index = $this->getIndexedArray($resultIndices);
 
@@ -238,7 +240,7 @@ public function getDataTable($resultIndices)
     public function getMergedDataTable($resultIndices)
     {
         $dataTableFactory = new DataTableFactory(
-            $this->dataNames, $this->dataType, $this->sitesId, $this->periods, $this->defaultRow);
+            $this->dataNames, $this->dataType, $this->sitesId, $this->periods, $this->segment, $this->defaultRow);
 
         $index = $this->getIndexedArray($resultIndices);
 
@@ -278,7 +280,7 @@ public function getExpandedDataTable($resultIndices, $idSubTable = null, $depth
         }
 
         $dataTableFactory = new DataTableFactory(
-            $this->dataNames, 'blob', $this->sitesId, $this->periods, $this->defaultRow);
+            $this->dataNames, 'blob', $this->sitesId, $this->periods, $this->segment, $this->defaultRow);
         $dataTableFactory->expandDataTable($depth, $addMetadataSubTableId);
         $dataTableFactory->useSubtable($idSubTable);
 
diff --git a/app/core/Archive/DataTableFactory.php b/app/core/Archive/DataTableFactory.php
index 58bbfba56..fdc69a5f5 100644
--- a/app/core/Archive/DataTableFactory.php
+++ b/app/core/Archive/DataTableFactory.php
@@ -9,9 +9,15 @@
 
 namespace Piwik\Archive;
 
+use Piwik\API\Request;
+use Piwik\Cache;
+use Piwik\Cache\Transient;
+use Piwik\CacheId;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Period\Week;
+use Piwik\Piwik;
+use Piwik\Segment;
 use Piwik\Site;
 
 /**
@@ -22,6 +28,9 @@
  */
 class DataTableFactory
 {
+    const TABLE_METADATA_SEGMENT_INDEX = 'segment';
+    const TABLE_METADATA_SEGMENT_PRETTY_INDEX = 'segmentPretty';
+
     /**
      * @see DataCollection::$dataNames.
      */
@@ -67,6 +76,11 @@ class DataTableFactory
      */
     private $periods;
 
+    /**
+     * @var Segment
+     */
+    private $segment;
+
     /**
      * The ID of the subtable to create a DataTable for. Only relevant for blob data.
      *
@@ -85,7 +99,7 @@ class DataTableFactory
     /**
      * Constructor.
      */
-    public function __construct($dataNames, $dataType, $sitesId, $periods, $defaultRow)
+    public function __construct($dataNames, $dataType, $sitesId, $periods, Segment $segment, $defaultRow)
     {
         $this->dataNames = $dataNames;
         $this->dataType = $dataType;
@@ -93,6 +107,7 @@ public function __construct($dataNames, $dataType, $sitesId, $periods, $defaultR
 
         //here index period by string only
         $this->periods = $periods;
+        $this->segment = $segment;
         $this->defaultRow = $defaultRow;
     }
 
@@ -239,7 +254,10 @@ public function makeMerged($index, $resultIndices)
     private function makeFromBlobRow($blobRow, $keyMetadata)
     {
         if ($blobRow === false) {
-            return new DataTable();
+            $table = new DataTable();
+            $table->setAllTableMetadata($keyMetadata);
+            $this->setPrettySegmentMetadata($table);
+            return $table;
         }
 
         if (count($this->dataNames) === 1) {
@@ -271,7 +289,8 @@ private function makeDataTableFromSingleBlob($blobRow, $keyMetadata)
         }
 
         // set table metadata
-        $table->setAllTableMetadata(array_merge(DataCollection::getDataRowMetadata($blobRow), $keyMetadata));
+        $table->setAllTableMetadata(array_merge($table->getAllTableMetadata(), DataCollection::getDataRowMetadata($blobRow), $keyMetadata));
+        $this->setPrettySegmentMetadata($table);
 
         if ($this->expandDataTable) {
             $table->enableRecursiveFilters();
@@ -297,7 +316,8 @@ private function makeIndexedByRecordNameDataTable($blobRow, $keyMetadata)
 
         foreach ($blobRow as $name => $blob) {
             $newTable = DataTable::fromSerializedArray($blob);
-            $newTable->setAllTableMetadata($tableMetadata);
+            $newTable->setAllTableMetadata(array_merge($newTable->getAllTableMetadata(), $tableMetadata));
+            $this->setPrettySegmentMetadata($newTable);
 
             $table->addTable($newTable, $name);
         }
@@ -397,8 +417,13 @@ private function setSubtables($dataTable, $blobRow, $treeLevel = 0)
             }
 
             $blobName = $dataName . "_" . $sid;
-            if (isset($blobRow[$blobName])) {
+            if (!empty($blobRow[$blobName])) {
                 $subtable = DataTable::fromSerializedArray($blobRow[$blobName]);
+                $subtable->setMetadata(self::TABLE_METADATA_PERIOD_INDEX, $dataTable->getMetadata(self::TABLE_METADATA_PERIOD_INDEX));
+                $subtable->setMetadata(self::TABLE_METADATA_SITE_INDEX, $dataTable->getMetadata(self::TABLE_METADATA_SITE_INDEX));
+                $subtable->setMetadata(self::TABLE_METADATA_SEGMENT_INDEX, $dataTable->getMetadata(self::TABLE_METADATA_SEGMENT_INDEX));
+                $subtable->setMetadata(self::TABLE_METADATA_SEGMENT_PRETTY_INDEX, $dataTable->getMetadata(self::TABLE_METADATA_SEGMENT_PRETTY_INDEX));
+
                 $this->setSubtables($subtable, $blobRow, $treeLevel + 1);
 
                 // we edit the subtable ID so that it matches the newly table created in memory
@@ -419,6 +444,8 @@ private function getDefaultMetadata()
         return array(
             DataTableFactory::TABLE_METADATA_SITE_INDEX => new Site(reset($this->sitesId)),
             DataTableFactory::TABLE_METADATA_PERIOD_INDEX => reset($this->periods),
+            DataTableFactory::TABLE_METADATA_SEGMENT_INDEX => $this->segment->getString(),
+            DataTableFactory::TABLE_METADATA_SEGMENT_PRETTY_INDEX => $this->segment->getString(),
         );
     }
 
@@ -452,7 +479,8 @@ private function makeFromMetricsArray($data, $keyMetadata)
         $table = new DataTable\Simple();
 
         if (!empty($data)) {
-            $table->setAllTableMetadata(array_merge(DataCollection::getDataRowMetadata($data), $keyMetadata));
+            $table->setAllTableMetadata(array_merge($table->getAllTableMetadata(), DataCollection::getDataRowMetadata($data), $keyMetadata));
+            $this->setPrettySegmentMetadata($table);
 
             DataCollection::removeMetadataFromDataRow($data);
 
@@ -470,7 +498,8 @@ private function makeFromMetricsArray($data, $keyMetadata)
                 $table->addRow(new Row(array(Row::COLUMNS => array($name => 0))));
             }
 
-            $table->setAllTableMetadata($keyMetadata);
+            $table->setAllTableMetadata(array_merge($table->getAllTableMetadata(), $keyMetadata));
+            $this->setPrettySegmentMetadata($table);
         }
 
         $result = $table;
@@ -496,7 +525,8 @@ private function makeMergedTableWithPeriodAndSiteIndex($index, $resultIndices, $
                 $table = new DataTable();
             }
 
-            $table->setAllTableMetadata($metadata);
+            $table->setAllTableMetadata(array_merge($table->getAllTableMetadata(), $metadata));
+            $this->setPrettySegmentMetadata($table);
             $map->addTable($table, $this->prettifyIndexLabel(self::TABLE_METADATA_PERIOD_INDEX, $range));
 
             $tables[$range] = $table;
@@ -532,6 +562,7 @@ private function makeMergedWithSiteIndex($index, $useSimpleDataTable, $isNumeric
         }
 
         $table->setAllTableMetadata(array(DataTableFactory::TABLE_METADATA_PERIOD_INDEX => reset($this->periods)));
+        $this->setPrettySegmentMetadata($table);
 
         foreach ($index as $idsite => $row) {
             if (!empty($row)) {
@@ -549,4 +580,15 @@ private function makeMergedWithSiteIndex($index, $useSimpleDataTable, $isNumeric
 
         return $table;
     }
+
+    private function setPrettySegmentMetadata(DataTable $table)
+    {
+        $site = $table->getMetadata(self::TABLE_METADATA_SITE_INDEX);
+        $idSite = $site ? $site->getId() : false;
+
+        $segmentPretty = $this->segment->getStoredSegmentName($idSite);
+
+        $table->setMetadata('segment', $this->segment->getString());
+        $table->setMetadata('segmentPretty', $segmentPretty);
+    }
 }
diff --git a/app/core/ArchiveProcessor/Loader.php b/app/core/ArchiveProcessor/Loader.php
index cf153c8a5..f08e63003 100644
--- a/app/core/ArchiveProcessor/Loader.php
+++ b/app/core/ArchiveProcessor/Loader.php
@@ -24,13 +24,6 @@
  */
 class Loader
 {
-    /**
-     * Is the current archive temporary. ie.
-     * - today
-     * - current week / month / year
-     */
-    protected $temporaryArchive;
-
     /**
      * Idarchive in the DB for the requested archive
      *
@@ -105,7 +98,7 @@ protected function prepareCoreMetricsArchive($visits, $visitsConverted)
 
             $this->params->setRequestedPlugin('VisitsSummary');
 
-            $pluginsArchiver = new PluginsArchiver($this->params, $this->isArchiveTemporary());
+            $pluginsArchiver = new PluginsArchiver($this->params);
             $metrics = $pluginsArchiver->callAggregateCoreMetrics();
             $pluginsArchiver->finalizeArchive();
 
@@ -120,7 +113,7 @@ protected function prepareCoreMetricsArchive($visits, $visitsConverted)
 
     protected function prepareAllPluginsArchive($visits, $visitsConverted)
     {
-        $pluginsArchiver = new PluginsArchiver($this->params, $this->isArchiveTemporary());
+        $pluginsArchiver = new PluginsArchiver($this->params);
 
         if ($this->mustProcessVisitCount($visits)
             || $this->doesRequestedPluginIncludeVisitsSummary()
@@ -171,14 +164,11 @@ protected function loadExistingArchiveIdFromDb()
     {
         $noArchiveFound = array(false, false, false);
 
-        // see isArchiveTemporary()
-        $minDatetimeArchiveProcessedUTC = $this->getMinTimeArchiveProcessed();
-
         if ($this->isArchivingForcedToTrigger()) {
             return $noArchiveFound;
         }
 
-        $idAndVisits = ArchiveSelector::getArchiveIdAndVisits($this->params, $minDatetimeArchiveProcessedUTC);
+        $idAndVisits = ArchiveSelector::getArchiveIdAndVisits($this->params);
 
         if (!$idAndVisits) {
             return $noArchiveFound;
@@ -187,31 +177,6 @@ protected function loadExistingArchiveIdFromDb()
         return $idAndVisits;
     }
 
-    /**
-     * Returns the minimum archive processed datetime to look at. Only public for tests.
-     *
-     * @return int|bool  Datetime timestamp, or false if must look at any archive available
-     */
-    protected function getMinTimeArchiveProcessed()
-    {
-        $endDateTimestamp = self::determineIfArchivePermanent($this->params->getDateEnd());
-        $isArchiveTemporary = ($endDateTimestamp === false);
-        $this->temporaryArchive = $isArchiveTemporary;
-
-        if ($endDateTimestamp) {
-            // Permanent archive
-            return $endDateTimestamp;
-        }
-
-        $dateStart = $this->params->getDateStart();
-        $period    = $this->params->getPeriod();
-        $segment   = $this->params->getSegment();
-        $site      = $this->params->getSite();
-
-        // Temporary archive
-        return Rules::getMinTimeProcessedForTemporaryArchive($dateStart, $period, $segment, $site);
-    }
-
     protected static function determineIfArchivePermanent(Date $dateEnd)
     {
         $now = time();
@@ -226,15 +191,6 @@ protected static function determineIfArchivePermanent(Date $dateEnd)
         return false;
     }
 
-    protected function isArchiveTemporary()
-    {
-        if (is_null($this->temporaryArchive)) {
-            throw new \Exception("getMinTimeArchiveProcessed() should be called prior to isArchiveTemporary()");
-        }
-
-        return $this->temporaryArchive;
-    }
-
     private function shouldArchiveForSiteEvenWhenNoVisits()
     {
         $idSitesToArchive = $this->getIdSitesToArchiveWhenNoVisits();
diff --git a/app/core/ArchiveProcessor/Parameters.php b/app/core/ArchiveProcessor/Parameters.php
index a099b8b0f..e76578792 100644
--- a/app/core/ArchiveProcessor/Parameters.php
+++ b/app/core/ArchiveProcessor/Parameters.php
@@ -221,12 +221,9 @@ public function isSingleSite()
         return count($this->getIdSites()) == 1;
     }
 
-    public function logStatusDebug($isTemporary)
+    public function logStatusDebug()
     {
         $temporary = 'definitive archive';
-        if ($isTemporary) {
-            $temporary = 'temporary archive';
-        }
         Log::debug(
             "%s archive, idSite = %d (%s), segment '%s', report = '%s', UTC datetime [%s -> %s]",
             $this->getPeriod()->getLabel(),
diff --git a/app/core/ArchiveProcessor/PluginsArchiver.php b/app/core/ArchiveProcessor/PluginsArchiver.php
index 001c29567..a5f828ee6 100644
--- a/app/core/ArchiveProcessor/PluginsArchiver.php
+++ b/app/core/ArchiveProcessor/PluginsArchiver.php
@@ -61,14 +61,14 @@ class PluginsArchiver
      */
     private $shouldAggregateFromRawData;
 
-    public function __construct(Parameters $params, $isTemporaryArchive, ArchiveWriter $archiveWriter = null)
+    public function __construct(Parameters $params, ArchiveWriter $archiveWriter = null)
     {
         $this->params = $params;
-        $this->isTemporaryArchive = $isTemporaryArchive;
-        $this->archiveWriter = $archiveWriter ?: new ArchiveWriter($this->params, $this->isTemporaryArchive);
+        $this->archiveWriter = $archiveWriter ?: new ArchiveWriter($this->params);
         $this->archiveWriter->initNewArchive();
 
         $this->logAggregator = new LogAggregator($params);
+        $this->logAggregator->allowUsageSegmentCache();
 
         $this->archiveProcessor = new ArchiveProcessor($this->params, $this->archiveWriter, $this->logAggregator);
 
@@ -99,6 +99,7 @@ public function __construct(Parameters $params, $isTemporaryArchive, ArchiveWrit
      */
     public function callAggregateCoreMetrics()
     {
+        $this->logAggregator->cleanup();
         $this->logAggregator->setQueryOriginHint('Core');
 
         if ($this->shouldAggregateFromRawData) {
@@ -193,13 +194,17 @@ public function callAggregateAllPlugins($visits, $visitsConverted, $forceArchivi
             Manager::getInstance()->deleteAll($latestUsedTableId);
             unset($archiver);
         }
+
+        $this->logAggregator->cleanup();
     }
 
     public function finalizeArchive()
     {
-        $this->params->logStatusDebug($this->archiveWriter->isArchiveTemporary);
+        $this->params->logStatusDebug();
         $this->archiveWriter->finalizeArchive();
-        return $this->archiveWriter->getIdArchive();
+        $idArchive = $this->archiveWriter->getIdArchive();
+
+        return $idArchive;
     }
 
     /**
@@ -318,9 +323,9 @@ private function makeNewArchiverObject($archiverClass, $pluginName)
          * @param \Piwik\Plugin\Archiver &$archiver The newly created plugin archiver instance.
          * @param string $pluginName The name of plugin of which archiver instance was created.
          * @param array $this->params Array containing archive parameters (Site, Period, Date and Segment)
-         * @param bool $this->isTemporaryArchive Flag indicating whether the archive being processed is temporary (ie. the period isn't finished yet) or final (the period is already finished and in the past).
+         * @param bool false This parameter is deprecated and will be removed.
          */
-        Piwik::postEvent('Archiving.makeNewArchiverObject', array($archiver, $pluginName, $this->params, $this->isTemporaryArchive));
+        Piwik::postEvent('Archiving.makeNewArchiverObject', array($archiver, $pluginName, $this->params, false));
 
         return $archiver;
     }
diff --git a/app/core/ArchiveProcessor/Rules.php b/app/core/ArchiveProcessor/Rules.php
index ebd054fe6..90d8d46a2 100644
--- a/app/core/ArchiveProcessor/Rules.php
+++ b/app/core/ArchiveProcessor/Rules.php
@@ -57,7 +57,7 @@ public static function getDoneStringFlagFor(array $idSites, $segment, $periodLab
 
     public static function shouldProcessReportsAllPlugins(array $idSites, Segment $segment, $periodLabel)
     {
-        if ($segment->isEmpty() && $periodLabel != 'range') {
+        if ($segment->isEmpty() && ($periodLabel != 'range' || SettingsServer::isArchivePhpTriggered())) {
             return true;
         }
 
diff --git a/app/core/AssetManager.php b/app/core/AssetManager.php
index bf9fc6fd2..3581822a4 100644
--- a/app/core/AssetManager.php
+++ b/app/core/AssetManager.php
@@ -75,6 +75,29 @@ public function __construct()
         }
     }
 
+    /**
+     * @inheritDoc
+     * @return AssetManager
+     */
+    public static function getInstance()
+    {
+        $assetManager = parent::getInstance();
+
+        /**
+         * Triggered when creating an instance of the asset manager. Lets you overwite the
+         * asset manager behavior.
+         *
+         * @param AssetManager &$assetManager
+         *
+         * @ignore
+         * This event is not a public event since we don't want to make the asset manager itself public
+         * API
+         */
+        Piwik::postEvent('AssetManager.makeNewAssetManagerObject', array(&$assetManager));
+
+        return $assetManager;
+    }
+
     /**
      * @param UIAssetCacheBuster $cacheBuster
      */
@@ -188,19 +211,6 @@ public function getMergedNonCoreJavaScript()
         return $this->getMergedJavascript($this->getNonCoreJScriptFetcher(), $this->getMergedNonCoreJSAsset());
     }
 
-	/**
-	 * @inheritDoc
-	 * @return AssetManager
-	 */
-    public static function getInstance()
-    {
-    	$assetManager = parent::getInstance();
-
-    	Piwik::postEvent('AssetManager.makeNewAssetManagerObject', array(&$assetManager));
-
-    	return $assetManager;
-    }
-
     /**
      * @param boolean $core
      * @return string[]
@@ -302,7 +312,7 @@ private function getMergedJavascript($assetFetcher, $mergedAsset)
      *
      * @return string
      */
-    private function getIndividualCoreAndNonCoreJsIncludes()
+    protected function getIndividualCoreAndNonCoreJsIncludes()
     {
         return
             $this->getIndividualJsIncludesFromAssetFetcher($this->getCoreJScriptFetcher()) .
diff --git a/app/core/AssetManager/UIAsset/OnDiskUIAsset.php b/app/core/AssetManager/UIAsset/OnDiskUIAsset.php
index 6c3d21460..e6ff9135c 100644
--- a/app/core/AssetManager/UIAsset/OnDiskUIAsset.php
+++ b/app/core/AssetManager/UIAsset/OnDiskUIAsset.php
@@ -55,7 +55,7 @@ public function getAbsoluteLocation()
 
     public function getRelativeLocation()
     {
-        if (!empty($this->relativeRootDir)) {
+        if (isset($this->relativeRootDir)) {
             return $this->relativeRootDir . $this->relativeLocation;
         }
         return $this->relativeLocation;
diff --git a/app/core/CliMulti.php b/app/core/CliMulti.php
index 3a9c5ea1f..863bea1b3 100644
--- a/app/core/CliMulti.php
+++ b/app/core/CliMulti.php
@@ -239,21 +239,23 @@ private function generateCommandId($command)
      */
     public function supportsAsync()
     {
-	    $supportsAsync = Process::isSupported() && !Common::isPhpCgiType() && $this->findPhpBinary();
-	    /**
-	     * Triggered to allow plugins to force the usage of async cli multi execution or to disable it.
-	     *
-	     * **Example**
-	     *
-	     *     public function supportsAsync(&$supportsAsync)
-	     *     {
-	     *         $supportsAsync = false; // do not allow async climulti execution
-	     *     }
-	     *
-	     * @param bool &$supportsAsync Whether async is supported or not.
-	     */
-	    Piwik::postEvent('CliMulti.supportsAsync', array(&$supportsAsync));
-	    return $supportsAsync;
+        $supportsAsync = Process::isSupported() && !Common::isPhpCgiType() && $this->findPhpBinary();
+
+        /**
+         * Triggered to allow plugins to force the usage of async cli multi execution or to disable it.
+         *
+         * **Example**
+         *
+         *     public function supportsAsync(&$supportsAsync)
+         *     {
+         *         $supportsAsync = false; // do not allow async climulti execution
+         *     }
+         *
+         * @param bool &$supportsAsync Whether async is supported or not.
+         */
+        Piwik::postEvent('CliMulti.supportsAsync', array(&$supportsAsync));
+
+        return $supportsAsync;
     }
 
     private function findPhpBinary()
diff --git a/app/core/Common.php b/app/core/Common.php
index 6a6fad5df..15f709ce7 100644
--- a/app/core/Common.php
+++ b/app/core/Common.php
@@ -1259,34 +1259,20 @@ public static function destroy(&$var)
     }
 
     /**
-     * @todo This method is weird, it's debugging statements but seem to only work for the tracker, maybe it
-     * should be moved elsewhere
+     * @deprecated Use the logger directly instead.
      */
     public static function printDebug($info = '')
     {
-        if (isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG']) {
-            if (!headers_sent()) {
-                // prevent XSS in tracker debug output
-                Common::sendHeader('Content-type: text/plain');
-            }
-
-            if (is_object($info)) {
-                $info = var_export($info, true);
-            }
-
-            $logger = StaticContainer::get('Psr\Log\LoggerInterface');
+        if (is_object($info)) {
+            $info = var_export($info, true);
+        }
 
-            if (is_array($info) || is_object($info)) {
-                $info = Common::sanitizeInputValues($info);
-                $out = var_export($info, true);
-                foreach (explode("\n", $out) as $line) {
-                    $logger->debug($line);
-                }
-            } else {
-                foreach (explode("\n", $info) as $line) {
-                    $logger->debug($line);
-                }
-            }
+        $logger = StaticContainer::get('Psr\Log\LoggerInterface');
+        if (is_array($info) || is_object($info)) {
+            $out = var_export($info, true);
+            $logger->debug($out);
+        } else {
+            $logger->debug($info);
         }
     }
 
diff --git a/app/core/Concurrency/Lock.php b/app/core/Concurrency/Lock.php
new file mode 100644
index 000000000..38818fd15
--- /dev/null
+++ b/app/core/Concurrency/Lock.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Concurrency;
+
+use Piwik\Common;
+
+class Lock
+{
+    /**
+     * @var LockBackend
+     */
+    private $backend;
+
+    private $lockKeyStart;
+
+    private $lockKey   = null;
+    private $lockValue = null;
+
+    public function __construct(LockBackend $backend, $lockKeyStart)
+    {
+        $this->backend = $backend;
+        $this->lockKeyStart = $lockKeyStart;
+        $this->lockKey = $this->lockKeyStart;
+    }
+
+    public function getNumberOfAcquiredLocks()
+    {
+        return count($this->getAllAcquiredLockKeys());
+    }
+
+    public function getAllAcquiredLockKeys()
+    {
+        return $this->backend->getKeysMatchingPattern($this->lockKeyStart . '*');
+    }
+
+    public function acquireLock($id, $ttlInSeconds = 60)
+    {
+        $this->lockKey = $this->lockKeyStart . $id;
+
+        $lockValue = substr(Common::generateUniqId(), 0, 12);
+        $locked    = $this->backend->setIfNotExists($this->lockKey, $lockValue, $ttlInSeconds);
+
+        if ($locked) {
+            $this->lockValue = $lockValue;
+        }
+
+        return $locked;
+    }
+
+    public function isLocked()
+    {
+        if (!$this->lockValue) {
+            return false;
+        }
+
+        return $this->lockValue === $this->backend->get($this->lockKey);
+    }
+
+    public function unlock()
+    {
+        if ($this->lockValue) {
+            $this->backend->deleteIfKeyHasValue($this->lockKey, $this->lockValue);
+            $this->lockValue = null;
+        }
+    }
+
+    public function expireLock($ttlInSeconds)
+    {
+        if ($ttlInSeconds > 0 && $this->lockValue) {
+            $success = $this->backend->expireIfKeyHasValue($this->lockKey, $this->lockValue, $ttlInSeconds);
+            if (!$success) {
+                $value = $this->backend->get($this->lockKey);
+                $message = sprintf('Failed to expire key %s (%s / %s).', $this->lockKey, $this->lockValue, (string) $value);
+
+                if ($value === false) {
+                    Common::printDebug($message . ' It seems like the key already expired as it no longer exists.');
+                } elseif (!empty($value) && $value == $this->lockValue) {
+                    Common::printDebug($message . ' We still have the lock but for some reason it did not expire.');
+                } elseif (!empty($value)) {
+                    Common::printDebug($message . ' This lock has been acquired by another process/server.');
+                } else {
+                    Common::printDebug($message . ' Failed to expire key.');
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/core/Concurrency/LockBackend.php b/app/core/Concurrency/LockBackend.php
new file mode 100644
index 000000000..7f67cbafa
--- /dev/null
+++ b/app/core/Concurrency/LockBackend.php
@@ -0,0 +1,58 @@
+<?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\Concurrency;
+
+interface LockBackend
+{
+    /**
+     * TODO
+     *
+     * @param $pattern
+     * @return mixed
+     */
+    public function getKeysMatchingPattern($pattern);
+
+    /**
+     * TODO
+     *
+     * @param $lockKey
+     * @param $lockValue
+     * @param $ttlInSeconds
+     * @return mixed
+     */
+    public function setIfNotExists($lockKey, $lockValue, $ttlInSeconds);
+
+    /**
+     * TODO
+     *
+     * @param $lockKey
+     * @return mixed
+     */
+    public function get($lockKey);
+
+    /**
+     * TODO
+     *
+     * @param $lockKey
+     * @param $lockValue
+     * @return mixed
+     */
+    public function deleteIfKeyHasValue($lockKey, $lockValue);
+
+    /**
+     * TODO
+     *
+     * @param $lockKey
+     * @param $lockValue
+     * @param $ttlInSeconds
+     * @return mixed
+     */
+    public function expireIfKeyHasValue($lockKey, $lockValue, $ttlInSeconds);
+}
\ No newline at end of file
diff --git a/app/core/Concurrency/LockBackend/MySqlLockBackend.php b/app/core/Concurrency/LockBackend/MySqlLockBackend.php
new file mode 100644
index 000000000..561c681ff
--- /dev/null
+++ b/app/core/Concurrency/LockBackend/MySqlLockBackend.php
@@ -0,0 +1,146 @@
+<?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\Concurrency\LockBackend;
+
+
+use Piwik\Common;
+use Piwik\Concurrency\LockBackend;
+use Piwik\Db;
+use Piwik\DbHelper;
+
+class MySqlLockBackend implements LockBackend
+{
+    const TABLE_NAME = 'locks';
+
+    /**
+     * fyi: does not support list keys at the moment just because not really needed so much just yet
+     */
+    public function getKeysMatchingPattern($pattern)
+    {
+        $sql = sprintf('SELECT SQL_NO_CACHE distinct `key` FROM %s WHERE `key` like ? and %s', self::getTableName(), $this->getQueryPartExpiryTime());
+        $pattern = str_replace('*', '%', $pattern);
+        $keys = Db::fetchAll($sql, array($pattern));
+        $raw = array_column($keys, 'key');
+        return $raw;
+    }
+
+    public function setIfNotExists($key, $value, $ttlInSeconds)
+    {
+        if (empty($ttlInSeconds)) {
+            $ttlInSeconds = 999999999;
+        }
+
+        // FYI: We used to have an INSERT INTO ... ON DUPLICATE UPDATE ... However, this can be problematic in concurrency issues
+        // because the ON DUPLICATE UPDATE may work successfully for 2 jobs at the same time but only one of them got the lock then.
+        // This would be perfectly fine if we did something like `return $this->get($key) === $value` to 100% detect which process
+        // got the lock as we do now. However, maybe the expireTime gets overwritten with a wrong value or so. That's why we
+        // rather try to get the lock with the insert only because only one job can succeed with this. If below flow with the
+        // delete becomes to slow, we may be able to use the INSERT INTO ... ON DUPLICATE UPDATE again.
+
+        if ($this->get($key)) {
+            return false; // a value is set, won't be possible to insert
+        }
+        
+        $tablePrefixed = self::getTableName();
+
+        // remove any existing but expired lock
+        // todo: we could combine get() and keyExists() in one query!
+        if ($this->keyExists($key)) {
+            // most of the time an expired key should not exist... we don't want to lock the row unncessarily therefore we check first
+            // if value exists... 
+            $sql = sprintf('DELETE FROM %s WHERE `key` = ? and not (%s)', $tablePrefixed, $this->getQueryPartExpiryTime());
+            Db::query($sql, array($key));
+        }
+
+        $query = sprintf('INSERT INTO %s (`key`, `value`, `expiry_time`) 
+                                 VALUES (?,?,(UNIX_TIMESTAMP() + ?))',
+            $tablePrefixed);
+        // we make sure to update the row if the key is expired and consider it as "deleted"
+
+        try {
+            Db::query($query, array($key, $value, (int) $ttlInSeconds));
+        } catch (\Exception $e) {
+            if ($e->getCode() == 23000
+                || strpos($e->getMessage(), 'Duplicate entry') !== false
+                || strpos($e->getMessage(), ' 1062 ') !== false) {
+                return false;
+            }
+            throw $e;
+        }
+
+        // we make sure we got the lock
+        return $this->get($key) === $value;
+    }
+
+    public function get($key)
+    {
+        $sql = sprintf('SELECT SQL_NO_CACHE `value` FROM %s WHERE `key` = ? AND %s LIMIT 1', self::getTableName(), $this->getQueryPartExpiryTime());
+        return Db::fetchOne($sql, array($key));
+    }
+
+    public function deleteIfKeyHasValue($key, $value)
+    {
+        if (empty($value)) {
+            return false;
+        }
+
+        $sql = sprintf('DELETE FROM %s WHERE `key` = ? and `value` = ?', self::getTableName());
+        return $this->queryDidMakeChange($sql, array($key, $value));
+    }
+
+    public function expireIfKeyHasValue($key, $value, $ttlInSeconds)
+    {
+        if (empty($value)) {
+            return false;
+        }
+
+        // we need to use unix_timestamp in mysql and not time() in php since the local time might be different on each server
+        // better to rely on one central DB server time only
+        $sql = sprintf('UPDATE %s SET expiry_time = (UNIX_TIMESTAMP() + ?) WHERE `key` = ? and `value` = ?', self::getTableName());
+        $success = $this->queryDidMakeChange($sql, array((int) $ttlInSeconds, $key, $value));
+
+        if (!$success) {
+            // the above update did not work because the same time was already set and we just tried to set the same ttl
+            // again too fast within one second
+            return $value === $this->get($key);
+        }
+
+        return true;
+    }
+
+    public function keyExists($key)
+    {
+        $sql = sprintf('SELECT SQL_NO_CACHE 1 FROM %s WHERE `key` = ? LIMIT 1', self::getTableName());
+        $value = Db::fetchOne($sql, array($key));
+        return !empty($value);
+    }
+
+    private function queryDidMakeChange($sql, $bind = array())
+    {
+        $query = Db::query($sql, $bind);
+        if (is_object($query) && method_exists($query, 'rowCount')) {
+            // anything else but mysqli in tracker mode
+            return (bool) $query->rowCount();
+        } else {
+            // mysqli in tracker mode
+            return (bool) Db::get()->rowCount($query);
+        }
+    }
+
+    private static function getTableName()
+    {
+        return Common::prefixTable(self::TABLE_NAME);
+    }
+
+    private function getQueryPartExpiryTime()
+    {
+        return 'UNIX_TIMESTAMP() <= expiry_time';
+    }
+}
\ No newline at end of file
diff --git a/app/core/Config.php b/app/core/Config.php
index c55250035..f434a51fd 100644
--- a/app/core/Config.php
+++ b/app/core/Config.php
@@ -11,6 +11,8 @@
 
 use Exception;
 use Piwik\Application\Kernel\GlobalSettingsProvider;
+use Piwik\Config\Cache;
+use Piwik\Config\IniFileChain;
 use Piwik\Container\StaticContainer;
 use Piwik\Exception\MissingFilePermissionException;
 use Piwik\ProfessionalServices\Advertising;
@@ -139,7 +141,7 @@ public static function getLocalConfigPath()
         if (!empty($GLOBALS['CONFIG_INI_PATH_RESOLVER']) && is_callable($GLOBALS['CONFIG_INI_PATH_RESOLVER'])) {
             return call_user_func($GLOBALS['CONFIG_INI_PATH_RESOLVER']);
         }
-
+        
         $path = self::getByDomainConfigPath();
         if ($path) {
             return $path;
@@ -332,7 +334,7 @@ public function existsLocalConfig()
     public function deleteLocalConfig()
     {
         $configLocal = $this->getLocalPath();
-
+        
         if(file_exists($configLocal)){
             @unlink($configLocal);
         }
@@ -368,7 +370,7 @@ public function getFromCommonConfig($name)
     {
         return $this->settings->getIniFileChain()->getFrom($this->getCommonPath(), $name);
     }
-
+    
     /**
      * @api
      */
@@ -407,16 +409,9 @@ public function dumpConfig()
     /**
      * Write user configuration file
      *
-     * @param array $configLocal
-     * @param array $configGlobal
-     * @param array $configCommon
-     * @param array $configCache
-     * @param string $pathLocal
-     * @param bool $clear
-     *
      * @throws \Exception if config file not writable
      */
-    protected function writeConfig($clear = true)
+    protected function writeConfig()
     {
         $output = $this->dumpConfig();
         if ($output !== null
@@ -435,6 +430,8 @@ protected function writeConfig($clear = true)
                 throw $this->getConfigNotWritableException();
             }
 
+            $this->settings->getIniFileChain()->deleteConfigCache();
+
             /**
              * Triggered when a INI config file is changed on disk.
              *
@@ -442,10 +439,6 @@ protected function writeConfig($clear = true)
              */
             Piwik::postEvent('Core.configFileChanged', [$localPath]);
         }
-
-        if ($clear) {
-            //$this->reload();
-        }
     }
 
     /**
diff --git a/app/core/Config/Cache.php b/app/core/Config/Cache.php
new file mode 100644
index 000000000..aa0bf80e9
--- /dev/null
+++ b/app/core/Config/Cache.php
@@ -0,0 +1,89 @@
+<?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\Config;
+
+use Piwik\Cache\Backend\File;
+use Piwik\Common;
+use Piwik\Filesystem;
+use Piwik\Piwik;
+use Piwik\Url;
+
+/**
+ * Exception thrown when the config file doesn't exist.
+ */
+class Cache extends File
+{
+    private $host = '';
+
+    public function __construct()
+    {
+        $this->host = $this->getHost();
+
+        // because the config is not yet loaded we cannot identify the instanceId...
+        // need to use the hostname
+        $dir = $this->makeCacheDir($this->host);
+
+        parent::__construct($dir);
+    }
+
+    private function makeCacheDir($host)
+    {
+        return PIWIK_INCLUDE_PATH . '/tmp/' . $host . '/cache/tracker';
+    }
+
+    public function isValidHost($mergedConfigSettings)
+    {
+        if (!isset($mergedConfigSettings['General']['trusted_hosts']) || !is_array($mergedConfigSettings['General']['trusted_hosts'])) {
+            return false;
+        }
+        // note: we do not support "enable_trusted_host_check" to keep things secure
+        return in_array($this->host, $mergedConfigSettings['General']['trusted_hosts'], true);
+    }
+
+    private function getHost()
+    {
+        $host = Url::getHost($checkIfTrusted = false);
+        $host = Url::getHostSanitized($host); // Remove any port number to get actual hostname
+        $host = Common::sanitizeInputValue($host);
+
+        if (empty($host)
+            || strpos($host, '..') !== false
+            || strpos($host, '\\') !== false
+            || strpos($host, '/') !== false) {
+            throw new \Exception('Unsupported host');
+        }
+
+        $this->host = $host;
+
+        return $host;
+    }
+
+    public function doDelete($id)
+    {
+        // when the config changes, we need to invalidate the config caches for all configured hosts as well, not only
+        // the currently trusted host
+        $hosts = Url::getTrustedHosts();
+        $initialDir = $this->directory;
+
+        foreach ($hosts as $host)
+        {
+            $dir = $this->makeCacheDir($host);
+            if (@is_dir($dir)) {
+                $this->directory = $dir;
+                $success = parent::doDelete($id);
+                if ($success) {
+                    Piwik::postEvent('Core.configFileDeleted', array($this->getFilename($id)));
+                }
+            }
+        }
+
+        $this->directory = $initialDir;
+    }
+
+}
diff --git a/app/core/Config/IniFileChain.php b/app/core/Config/IniFileChain.php
index eb773b582..a3ac25d74 100644
--- a/app/core/Config/IniFileChain.php
+++ b/app/core/Config/IniFileChain.php
@@ -35,6 +35,7 @@
  */
 class IniFileChain
 {
+    const CONFIG_CACHE_KEY = 'config.ini';
     /**
      * Maps INI file names with their parsed contents. The order of the files signifies the order
      * in the chain. Files with lower index are overwritten/merged with files w/ a higher index.
@@ -209,6 +210,19 @@ public function reload($defaultSettingsFiles = array(), $userSettingsFile = null
             $this->resetSettingsChain($defaultSettingsFiles, $userSettingsFile);
         }
 
+        if (!empty($userSettingsFile) && !empty($GLOBALS['ENABLE_CONFIG_PHP_CACHE'])) {
+            $cache = new Cache();
+            $values = $cache->doFetch(self::CONFIG_CACHE_KEY);
+            
+            if (!empty($values)
+                && isset($values['mergedSettings'])
+                && isset($values['settingsChain'])) {
+                $this->mergedSettings = $values['mergedSettings'];
+                $this->settingsChain = $values['settingsChain'];
+                return;
+            }
+        }
+
         $reader = new IniReader();
         foreach ($this->settingsChain as $file => $ignore) {
             if (is_readable($file)) {
@@ -228,9 +242,31 @@ public function reload($defaultSettingsFiles = array(), $userSettingsFile = null
         // on PHP 7+ as they would be always equal
         $this->mergedSettings = $this->copy($merged);
 
-	    if (!empty($GLOBALS['MATOMO_MODIFY_CONFIG_SETTINGS']) && !empty($this->mergedSettings)) {
-		    $this->mergedSettings = call_user_func($GLOBALS['MATOMO_MODIFY_CONFIG_SETTINGS'], $this->mergedSettings);
-	    }
+        if (!empty($GLOBALS['MATOMO_MODIFY_CONFIG_SETTINGS']) && !empty($this->mergedSettings)) {
+            $this->mergedSettings = call_user_func($GLOBALS['MATOMO_MODIFY_CONFIG_SETTINGS'], $this->mergedSettings);
+        }
+        
+        if (!empty($GLOBALS['ENABLE_CONFIG_PHP_CACHE'])
+            && !empty($userSettingsFile)
+            && !empty($this->mergedSettings)
+            && !empty($this->settingsChain)) {
+
+            $ttlOneHour = 3600;
+            $cache = new Cache();
+            if ($cache->isValidHost($this->mergedSettings)) {
+                // we make sure to save the config only if the host is valid...
+                $data = array('mergedSettings' => $this->mergedSettings, 'settingsChain' => $this->settingsChain);
+                $cache->doSave(self::CONFIG_CACHE_KEY, $data, $ttlOneHour);
+            }
+        }
+    }
+
+    public function deleteConfigCache()
+    {
+        if (!empty($GLOBALS['ENABLE_CONFIG_PHP_CACHE'])) {
+            $cache = new Cache();
+            $cache->doDelete(IniFileChain::CONFIG_CACHE_KEY);
+        }
     }
 
     private function copy($merged)
diff --git a/app/core/Console.php b/app/core/Console.php
index a25d65b8d..9a2c45d6a 100644
--- a/app/core/Console.php
+++ b/app/core/Console.php
@@ -8,12 +8,15 @@
  */
 namespace Piwik;
 
+use Exception;
 use Piwik\Application\Environment;
 use Piwik\Config\ConfigNotFoundException;
 use Piwik\Container\StaticContainer;
+use Piwik\Exception\AuthenticationFailedException;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugins\Monolog\Handler\FailureLogMessageDetector;
 use Piwik\Version;
+use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Monolog\Handler\ConsoleHandler;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -79,6 +82,8 @@ public function doRun(InputInterface $input, OutputInterface $output)
             Log::warning($e->getMessage());
         }
 
+        $this->initAuth();
+
         $commands = $this->getAvailableCommands();
 
         foreach ($commands as $command) {
@@ -260,4 +265,18 @@ private function getCommandsFromPluginsMarkedInConfig()
         }
         return $commands;
     }
+
+    private function initAuth()
+    {
+        Piwik::postEvent('Request.initAuthenticationObject');
+        try {
+            StaticContainer::get('Piwik\Auth');
+        } catch (Exception $e) {
+            $message = "Authentication object cannot be found in the container. Maybe the Login plugin is not activated?
+                        You can activate the plugin by adding:
+                        Plugins[] = Login
+                        under the [Plugins] section in your config/config.ini.php";
+            StaticContainer::get(LoggerInterface::class)->warning($message);
+        }
+    }
 }
diff --git a/app/core/Container/ContainerFactory.php b/app/core/Container/ContainerFactory.php
index 3c08c930b..1ae6f6a2d 100644
--- a/app/core/Container/ContainerFactory.php
+++ b/app/core/Container/ContainerFactory.php
@@ -87,12 +87,10 @@ public function create()
             $this->addEnvironmentConfig($builder, $environment);
         }
 
-        $configPhpPath = PIWIK_USER_PATH . '/config/config.php';
-
         // User config
-        if (file_exists($configPhpPath)
+        if (file_exists(PIWIK_USER_PATH . '/config/config.php')
             && !in_array('test', $this->environments, true)) {
-            $builder->addDefinitions($configPhpPath);
+            $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
         }
 
         if (!empty($this->definitions)) {
@@ -114,7 +112,7 @@ private function addEnvironmentConfig(ContainerBuilder $builder, $environment)
             return;
         }
 
-        $file = sprintf('%s/config/environment/%s.php', PIWIK_DOCUMENT_ROOT, $environment);
+        $file = sprintf('%s/config/environment/%s.php', PIWIK_USER_PATH, $environment);
 
         if (file_exists($file)) {
             $builder->addDefinitions($file);
diff --git a/app/core/Cookie.php b/app/core/Cookie.php
index ab6c81745..25c17c4e8 100644
--- a/app/core/Cookie.php
+++ b/app/core/Cookie.php
@@ -204,7 +204,7 @@ private function extractSignedContent($content)
         $signature = substr($content, -40);
 
         if (substr($content, -43, 3) == self::VALUE_SEPARATOR . '_=' &&
-            $signature == sha1(substr($content, 0, -40) . SettingsPiwik::getSalt())
+            $signature === sha1(substr($content, 0, -40) . SettingsPiwik::getSalt())
         ) {
             // strip trailing: VALUE_SEPARATOR '_=' signature"
             return substr($content, 0, -43);
diff --git a/app/core/CronArchive.php b/app/core/CronArchive.php
index 3f3d645d9..2e3d6fdca 100644
--- a/app/core/CronArchive.php
+++ b/app/core/CronArchive.php
@@ -222,6 +222,13 @@ class CronArchive
      */
     public $disableSegmentsArchiving = false;
 
+    /**
+     * If enabled, segments will be only archived for yesterday, but not today. If the segment was created recently,
+     * then it will still be archived for today and the setting will be ignored for this segment.
+     * @var bool
+     */
+    public $skipSegmentsToday = false;
+
     private $websitesWithVisitsSinceLastRun = 0;
     private $skippedPeriodsArchivesWebsite = 0;
     private $skippedPeriodsNoDataInPeriod = 0;
@@ -288,6 +295,7 @@ public function __construct($processNewSegmentsFrom = null, LoggerInterface $log
         $this->formatter = new Formatter();
 
         $processNewSegmentsFrom = $processNewSegmentsFrom ?: StaticContainer::get('ini.General.process_new_segments_from');
+
         $this->segmentArchivingRequestUrlProvider = new SegmentArchivingRequestUrlProvider($processNewSegmentsFrom);
 
         $this->invalidator = StaticContainer::get('Piwik\Archive\ArchiveInvalidator');
@@ -359,6 +367,10 @@ public function init()
             $this->logger->info('Will ignore websites and help finish a previous started queue instead. IDs: ' . implode(', ', $this->websites->getInitialSiteIds()));
         }
 
+        if ($this->skipSegmentsToday) {
+            $this->logger->info('Will skip segments archiving for today unless they were created recently');
+        }
+
         $this->logForcedSegmentInfo();
 
         /**
@@ -1685,9 +1697,17 @@ private function getCustomDateRangeToPreProcess($idSite)
         if (is_null($cache)) {
             $cache = $this->loadCustomDateRangeToPreProcess();
         }
+
         if (empty($cache[$idSite])) {
-            return array();
+            $cache[$idSite] = array();
         }
+
+        $customRanges = array_filter(Config::getInstance()->General['archiving_custom_ranges']);
+
+        if (!empty($customRanges)) {
+            $cache[$idSite] = array_merge($cache[$idSite], $customRanges);
+        }
+
         $dates = array_unique($cache[$idSite]);
         return $dates;
     }
@@ -1760,6 +1780,22 @@ private function makeRequestUrl($url)
         return $url;
     }
 
+    protected function wasSegmentChangedRecently($definition, $allSegments)
+    {
+        foreach ($allSegments as $segment) {
+            if ($segment['definition'] === $definition) {
+                $twentyFourHoursAgo = Date::now()->subHour(24);
+                $segmentDate = $segment['ts_created'];
+                if (!empty($segment['ts_last_edit'])) {
+                    $segmentDate = $segment['ts_last_edit'];
+                }
+                return Date::factory($segmentDate)->isLater($twentyFourHoursAgo);
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param $idSite
      * @param $period
@@ -1785,12 +1821,29 @@ private function getUrlsWithSegment($idSite, $period, $date)
         $segmentCount = count($segments);
         $processedSegmentCount = 0;
 
+        $allSegmentsFullInfo = array();
+        if ($this->skipSegmentsToday) {
+            // small performance tweak... only needed when skip segments today
+            $segmentEditorModel = StaticContainer::get('Piwik\Plugins\SegmentEditor\Model');
+            $allSegmentsFullInfo = $segmentEditorModel->getSegmentsToAutoArchive($idSite);
+        }
+
         foreach ($segments as $segment) {
+            $shouldSkipToday = $this->skipSegmentsToday && !$this->wasSegmentChangedRecently($segment, $allSegmentsFullInfo);
+
+            if ($this->skipSegmentsToday && !$shouldSkipToday) {
+                $this->logger->info(sprintf('Segment "%s" was created or changed recently and will therefore archive today', $segment));
+            }
+
             $dateParamForSegment = $this->segmentArchivingRequestUrlProvider->getUrlParameterDateString($idSite, $period, $date, $segment);
 
             $urlWithSegment = $this->getVisitsRequestUrl($idSite, $period, $dateParamForSegment, $segment);
             $urlWithSegment = $this->makeRequestUrl($urlWithSegment);
 
+            if ($shouldSkipToday) {
+                $urlWithSegment .= '&skipArchiveSegmentToday=1';
+            }
+
             if ($this->isAlreadyArchivingSegment($urlWithSegment, $idSite, $period, $segment)) {
                 continue;
             }
diff --git a/app/core/DataAccess/ArchiveSelector.php b/app/core/DataAccess/ArchiveSelector.php
index 1c306f7a0..5e73f1cb8 100644
--- a/app/core/DataAccess/ArchiveSelector.php
+++ b/app/core/DataAccess/ArchiveSelector.php
@@ -45,7 +45,13 @@ private static function getModel()
         return new Model();
     }
 
-    public static function getArchiveIdAndVisits(ArchiveProcessor\Parameters $params, $minDatetimeArchiveProcessedUTC)
+    /**
+     * @param ArchiveProcessor\Parameters $params
+     * @param bool $minDatetimeArchiveProcessedUTC deprecated. will be removed in Matomo 4.
+     * @return array|bool
+     * @throws Exception
+     */
+    public static function getArchiveIdAndVisits(ArchiveProcessor\Parameters $params, $minDatetimeArchiveProcessedUTC = false)
     {
         $idSite       = $params->getSite()->getId();
         $period       = $params->getPeriod()->getId();
@@ -55,11 +61,6 @@ public static function getArchiveIdAndVisits(ArchiveProcessor\Parameters $params
 
         $numericTable = ArchiveTableCreator::getNumericTable($dateStart);
 
-        $minDatetimeIsoArchiveProcessedUTC = null;
-        if ($minDatetimeArchiveProcessedUTC) {
-            $minDatetimeIsoArchiveProcessedUTC = Date::factory($minDatetimeArchiveProcessedUTC)->getDatetime();
-        }
-
         $requestedPlugin = $params->getRequestedPlugin();
         $segment         = $params->getSegment();
         $plugins = array("VisitsSummary", $requestedPlugin);
@@ -67,7 +68,7 @@ public static function getArchiveIdAndVisits(ArchiveProcessor\Parameters $params
         $doneFlags      = Rules::getDoneFlags($plugins, $segment);
         $doneFlagValues = Rules::getSelectableDoneFlagValues();
 
-        $results = self::getModel()->getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStartIso, $dateEndIso, $minDatetimeIsoArchiveProcessedUTC, $doneFlags, $doneFlagValues);
+        $results = self::getModel()->getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStartIso, $dateEndIso, $doneFlags, $doneFlagValues);
 
         if (empty($results)) {
             return false;
@@ -138,7 +139,6 @@ protected static function getMostRecentIdArchiveFromResults(Segment $segment, $r
      * @param array $periods
      * @param Segment $segment
      * @param array $plugins List of plugin names for which data is being requested.
-     * @param bool $canUseReaderDb if enabled, will try to read archive from reader
      * @return array Archive IDs are grouped by archive name and period range, ie,
      *               array(
      *                   'VisitsSummary.done' => array(
@@ -147,7 +147,7 @@ protected static function getMostRecentIdArchiveFromResults(Segment $segment, $r
      *               )
      * @throws
      */
-    public static function getArchiveIds($siteIds, $periods, $segment, $plugins, $canUseReaderDb)
+    public static function getArchiveIds($siteIds, $periods, $segment, $plugins)
     {
         if (empty($siteIds)) {
             throw new \Exception("Website IDs could not be read from the request, ie. idSite=");
@@ -174,11 +174,7 @@ public static function getArchiveIds($siteIds, $periods, $segment, $plugins, $ca
             $monthToPeriods[$table][] = $period;
         }
 
-        if ($canUseReaderDb) {
-            $db = Db::getReader();
-        } else {
-            $db = Db::get();
-        }
+        $db = Db::get();
 
         // for every month within the archive query, select from numeric table
         $result = array();
@@ -235,19 +231,14 @@ public static function getArchiveIds($siteIds, $periods, $segment, $plugins, $ca
      * @param string $archiveDataType The archive data type (either, 'blob' or 'numeric').
      * @param int|null|string $idSubtable  null if the root blob should be loaded, an integer if a subtable should be
      *                                     loaded and 'all' if all subtables should be loaded.
-     * @param bool $canUseReaderDb if enabled, will try to read archive from reader DB
      * @return array
      *@throws Exception
      */
-    public static function getArchiveData($archiveIds, $recordNames, $archiveDataType, $idSubtable, $canUseReaderDb)
+    public static function getArchiveData($archiveIds, $recordNames, $archiveDataType, $idSubtable)
     {
         $chunk = new Chunk();
 
-        if ($canUseReaderDb) {
-            $db = Db::getReader();
-        } else {
-            $db = Db::get();
-        }
+        $db = Db::get();
 
         // create the SQL to select archive data
         $loadAllSubtables = $idSubtable == Archive::ID_SUBTABLE_LOAD_ALL_SUBTABLES;
diff --git a/app/core/DataAccess/ArchiveWriter.php b/app/core/DataAccess/ArchiveWriter.php
index 5aa7cee1b..7a5bc464f 100644
--- a/app/core/DataAccess/ArchiveWriter.php
+++ b/app/core/DataAccess/ArchiveWriter.php
@@ -9,13 +9,11 @@
 namespace Piwik\DataAccess;
 
 use Exception;
-use Piwik\Archive;
 use Piwik\Archive\Chunk;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\ArchiveProcessor;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
-use Piwik\Period;
 
 /**
  * This class is used to create a new Archive.
@@ -37,11 +35,15 @@ class ArchiveWriter
      * @var int
      */
     const DONE_ERROR = 2;
+
     /**
      * Flag indicates the archive is over a period that is not finished, eg. the current day, current week, etc.
      * Archives flagged will be regularly purged from the DB.
      *
+     * This flag is deprecated, new archives should not be written as temporary.
+     *
      * @var int
+     * @deprecated
      */
     const DONE_OK_TEMPORARY = 3;
 
@@ -61,7 +63,20 @@ class ArchiveWriter
         'name',
         'value');
 
-    public function __construct(ArchiveProcessor\Parameters $params, $isArchiveTemporary)
+    private $recordsToWriteSpool = array(
+        'numeric' => array(),
+        'blob' => array()
+    );
+
+    const MAX_SPOOL_SIZE = 50;
+
+    /**
+     * ArchiveWriter constructor.
+     * @param ArchiveProcessor\Parameters $params
+     * @param bool $isArchiveTemporary Deprecated. Has no effect.
+     * @throws Exception
+     */
+    public function __construct(ArchiveProcessor\Parameters $params, $isArchiveTemporary = false)
     {
         $this->idArchive = false;
         $this->idSite    = $params->getSite()->getId();
@@ -70,7 +85,6 @@ public function __construct(ArchiveProcessor\Parameters $params, $isArchiveTempo
 
         $idSites = array($this->idSite);
         $this->doneFlag = Rules::getDoneStringFlagFor($idSites, $this->segment, $this->period->getLabel(), $params->getRequestedPlugin());
-        $this->isArchiveTemporary = $isArchiveTemporary;
 
         $this->dateStart = $this->period->getDateStart();
     }
@@ -86,11 +100,10 @@ public function __construct(ArchiveProcessor\Parameters $params, $isArchiveTempo
     public function insertBlobRecord($name, $values)
     {
         if (is_array($values)) {
-            $clean = array();
 
             if (isset($values[0])) {
                 // we always store the root table in a single blob for fast access
-                $clean[] = array($name, $this->compress($values[0]));
+                $this->insertRecord($name, $this->compress($values[0]));
                 unset($values[0]);
             }
 
@@ -99,16 +112,13 @@ public function insertBlobRecord($name, $values)
                 $chunk  = new Chunk();
                 $chunks = $chunk->moveArchiveBlobsIntoChunks($name, $values);
                 foreach ($chunks as $index => $subtables) {
-                    $clean[] = array($index, $this->compress(serialize($subtables)));
+                    $this->insertRecord($index, $this->compress(serialize($subtables)));
                 }
             }
-
-            $this->insertBulkRecords($clean);
-            return;
+        } else {
+            $values = $this->compress($values);
+            $this->insertRecord($name, $values);
         }
-
-        $values = $this->compress($values);
-        $this->insertRecord($name, $values);
     }
 
     public function getIdArchive()
@@ -128,12 +138,12 @@ public function initNewArchive()
 
     public function finalizeArchive()
     {
+        $this->flushSpools();
+
         $numericTable = $this->getTableNumeric();
         $idArchive    = $this->getIdArchive();
 
-        $this->getModel()->deletePreviousArchiveStatus($numericTable, $idArchive, $this->doneFlag);
-
-        $this->logArchiveStatusAsFinal();
+        $this->getModel()->updateArchiveStatus($numericTable, $idArchive, $this->doneFlag, self::DONE_OK);
     }
 
     protected function compress($data)
@@ -163,29 +173,9 @@ protected function logArchiveStatusAsIncomplete()
         $this->insertRecord($this->doneFlag, self::DONE_ERROR);
     }
 
-    protected function logArchiveStatusAsFinal()
+    private function batchInsertSpool($valueType)
     {
-        $status = self::DONE_OK;
-
-        if ($this->isArchiveTemporary) {
-            $status = self::DONE_OK_TEMPORARY;
-        }
-
-        $this->insertRecord($this->doneFlag, $status);
-    }
-
-    protected function insertBulkRecords($records)
-    {
-        // Using standard plain INSERT if there is only one record to insert
-        if ($DEBUG_DO_NOT_USE_BULK_INSERT = false
-            || count($records) == 1
-        ) {
-            foreach ($records as $record) {
-                $this->insertRecord($record[0], $record[1]);
-            }
-
-            return true;
-        }
+        $records = $this->recordsToWriteSpool[$valueType];
 
         $bindSql = $this->getInsertRecordBind();
         $values  = array();
@@ -212,7 +202,12 @@ protected function insertBulkRecords($records)
         $tableName = $this->getTableNameToInsert($valueSeen);
         $fields    = $this->getInsertFields();
 
-        BatchInsert::tableInsertBatch($tableName, $fields, $values, $throwException = false, $charset = 'latin1');
+        // For numeric records it's faster to do the insert directly; for blobs the data infile is better
+        if ($valueType == 'numeric') {
+            BatchInsert::tableInsertBatchSql($tableName, $fields, $values);
+        } else {
+            BatchInsert::tableInsertBatch($tableName, $fields, $values, $throwException = false, $charset = 'latin1');
+        }
 
         return true;
     }
@@ -231,15 +226,42 @@ public function insertRecord($name, $value)
             return false;
         }
 
-        $tableName = $this->getTableNameToInsert($value);
-        $fields    = $this->getInsertFields();
-        $record    = $this->getInsertRecordBind();
+        $valueType = $this->isRecordNumeric($value) ? 'numeric' : 'blob';
+        $this->recordsToWriteSpool[$valueType][] = array(
+            0 => $name,
+            1 => $value
+        );
 
-        $this->getModel()->insertRecord($tableName, $fields, $record, $name, $value);
+        if (count($this->recordsToWriteSpool[$valueType]) >= self::MAX_SPOOL_SIZE) {
+            $this->flushSpool($valueType);
+        }
 
         return true;
     }
 
+    public function flushSpools()
+    {
+        $this->flushSpool('numeric');
+        $this->flushSpool('blob');
+    }
+
+    private function flushSpool($valueType)
+    {
+        $numRecords = count($this->recordsToWriteSpool[$valueType]);
+
+        if ($numRecords > 1) {
+            $this->batchInsertSpool($valueType);
+        } elseif ($numRecords == 1) {
+            list($name, $value) = $this->recordsToWriteSpool[$valueType][0];
+            $tableName = $this->getTableNameToInsert($value);
+            $fields    = $this->getInsertFields();
+            $record    = $this->getInsertRecordBind();
+
+            $this->getModel()->insertRecord($tableName, $fields, $record, $name, $value);
+        }
+        $this->recordsToWriteSpool[$valueType] = array();
+    }
+
     protected function getInsertRecordBind()
     {
         return array($this->getIdArchive(),
@@ -252,7 +274,7 @@ protected function getInsertRecordBind()
 
     protected function getTableNameToInsert($value)
     {
-        if (is_numeric($value)) {
+        if ($this->isRecordNumeric($value)) {
             return $this->getTableNumeric();
         }
 
@@ -273,4 +295,9 @@ protected function isRecordZero($value)
     {
         return ($value === '0' || $value === false || $value === 0 || $value === 0.0);
     }
+
+    private function isRecordNumeric($value)
+    {
+        return is_numeric($value);
+    }
 }
diff --git a/app/core/DataAccess/LogAggregator.php b/app/core/DataAccess/LogAggregator.php
index ada5e405a..397d5a659 100644
--- a/app/core/DataAccess/LogAggregator.php
+++ b/app/core/DataAccess/LogAggregator.php
@@ -10,12 +10,18 @@
 
 use Piwik\ArchiveProcessor\Parameters;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\DataArray;
 use Piwik\Date;
 use Piwik\Db;
+use Piwik\DbHelper;
 use Piwik\Metrics;
 use Piwik\Period;
+use Piwik\Piwik;
+use Piwik\Plugin\LogTablesProvider;
+use Piwik\Segment;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Tracker\GoalManager;
 use Psr\Log\LoggerInterface;
 
@@ -127,6 +133,8 @@ class LogAggregator
 
     const FIELDS_SEPARATOR = ", \n\t\t\t";
 
+    const LOG_TABLE_SEGMENT_TEMPORARY_PREFIX = 'logtmpsegment';
+
     /** @var \Piwik\Date */
     protected $dateStart;
 
@@ -149,6 +157,15 @@ class LogAggregator
      */
     private $logger;
 
+    /**
+     * @var bool
+     */
+    private $isRootArchiveRequest;
+
+    /**
+     * @var bool
+     */
+    private $allowUsageSegmentCache = false;
 
     /**
      * Constructor.
@@ -161,6 +178,7 @@ public function __construct(Parameters $params, LoggerInterface $logger = null)
         $this->dateEnd = $params->getDateTimeEnd();
         $this->segment = $params->getSegment();
         $this->sites = $params->getIdSites();
+        $this->isRootArchiveRequest = $params->isRootArchiveRequest();
         $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
     }
 
@@ -174,10 +192,173 @@ public function setQueryOriginHint($nameOfOrigiin)
         $this->queryOriginHint = $nameOfOrigiin;
     }
 
+    private function getSegmentTmpTableName()
+    {
+        $bind = $this->getGeneralQueryBindParams();
+        return self::LOG_TABLE_SEGMENT_TEMPORARY_PREFIX . md5(json_encode($bind) . $this->segment->getString());
+    }
+
+    public function cleanup()
+    {
+        if (!$this->segment->isEmpty() && $this->isSegmentCacheEnabled()) {
+            $segmentTable = $this->getSegmentTmpTableName();
+            $segmentTable = Common::prefixTable($segmentTable);
+
+            if ($this->doesSegmentTableExist($segmentTable)) {
+                // safety in case an older MySQL version is used that does not drop table at the end of the connection
+                // automatically. also helps us release disk space/memory earlier when multiple segments are archived
+                $this->getDb()->query('DROP TEMPORARY TABLE IF EXISTS ' . $segmentTable);
+            }
+
+            $logTablesProvider = $this->getLogTableProvider();
+            if ($logTablesProvider->getLogTable($segmentTable)) {
+                $logTablesProvider->setTempTable(null); // no longer available
+            }
+        }
+    }
+
+    private function doesSegmentTableExist($segmentTablePrefixed)
+    {
+        try {
+            // using DROP TABLE IF EXISTS would not work on a DB reader if the table doesn't exist...
+            $this->getDb()->fetchOne('SELECT 1 FROM ' . $segmentTablePrefixed . ' LIMIT 1');
+            $tableExists = true;
+        } catch (\Exception $e) {
+            $tableExists = false;
+        }
+
+        return $tableExists;
+    }
+
+    private function isSegmentCacheEnabled()
+    {
+        if (!$this->allowUsageSegmentCache) {
+            return false;
+        }
+
+        $config = Config::getInstance();
+        $general = $config->General;
+        return !empty($general['enable_segments_cache']);
+    }
+
+    public function allowUsageSegmentCache()
+    {
+        $this->allowUsageSegmentCache = true;
+    }
+
+    private function getLogTableProvider()
+    {
+        return StaticContainer::get(LogTablesProvider::class);
+    }
+
+    private function createTemporaryTable($unprefixedSegmentTableName, $segmentSelectSql, $segmentSelectBind)
+    {
+        $table = Common::prefixTable($unprefixedSegmentTableName);
+
+        if ($this->doesSegmentTableExist($table)) {
+            return; // no need to create the table, it was already created... better to have a select vs unneeded create table
+        }
+	    
+        $engine = '';
+        if (defined('PIWIK_TEST_MODE') && PIWIK_TEST_MODE) {
+            $engine = 'ENGINE=MEMORY';
+        }
+        $createTableSql = 'CREATE TEMPORARY TABLE ' . $table . ' (idvisit  BIGINT(10) UNSIGNED NOT NULL) ' . $engine;
+        // we do not insert the data right away using create temporary table ... select ...
+        // to avoid metadata lock see eg https://www.percona.com/blog/2018/01/10/why-avoid-create-table-as-select-statement/
+
+        $readerDb = Db::getReader();
+        try {
+            $readerDb->query($createTableSql);
+        } catch (\Exception $e) {
+            if ($readerDb->isErrNo($e, \Piwik\Updater\Migration\Db::ERROR_CODE_TABLE_EXISTS)) {
+                return;
+            }
+            throw $e;
+        }
+
+        $transactionLevel = new Db\TransactionLevel($readerDb);
+        $canSetTransactionLevel = $transactionLevel->canLikelySetTransactionLevel();
+
+	    if ($canSetTransactionLevel) {
+	        // i know this could be shortened to one if or one line but I want to make sure this line where we
+            // set uncomitted is easily noticable in the code as it could be missed quite easily otherwise
+            // we set uncommitted so we don't make the INSERT INTO... SELECT... locking ... we do not want to lock
+            // eg the visits table
+	        if (!$transactionLevel->setUncommitted()) {
+	        	$canSetTransactionLevel = false;
+	        }
+	    }
+
+        if (!$canSetTransactionLevel) {
+            // transaction level doesn't work... we're instead executing the select individually and then insert the data
+            // this uses more memory but at least is not locking
+            $all = $readerDb->fetchAll($segmentSelectSql, $segmentSelectBind);
+            if (!empty($all)) {
+                // we're not using batchinsert since this would not support the reader DB.
+                $readerDb->query('INSERT INTO ' . $table . ' VALUES ('.implode('),(', array_column($all, 'idvisit')).')');
+            }
+            return;
+        }
+
+        $insertIntoStatement = 'INSERT INTO ' . $table . ' (idvisit) ' . $segmentSelectSql;
+        $readerDb->query($insertIntoStatement, $segmentSelectBind);
+
+        $transactionLevel->restorePreviousStatus();
+    }
+
     public function generateQuery($select, $from, $where, $groupBy, $orderBy, $limit = 0, $offset = 0)
     {
+        $segment = $this->segment;
         $bind = $this->getGeneralQueryBindParams();
-        $query = $this->segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy, $limit, $offset);
+
+        if (!$this->segment->isEmpty() && $this->isSegmentCacheEnabled()) {
+            // here we create the TMP table and apply the segment including the datetime and the requested idsite
+            // at the end we generated query will no longer need to apply the datetime/idsite and segment
+            $segment = new Segment('', $this->sites);
+
+            $segmentTable = $this->getSegmentTmpTableName();
+
+            $segmentWhere = $this->getWhereStatement('log_visit', 'visit_last_action_time');
+            $segmentBind = $this->getGeneralQueryBindParams();
+
+            $logQueryBuilder = StaticContainer::get('Piwik\DataAccess\LogQueryBuilder');
+            $forceGroupByBackup = $logQueryBuilder->getForcedInnerGroupBySubselect();
+            $logQueryBuilder->forceInnerGroupBySubselect(LogQueryBuilder::FORCE_INNER_GROUP_BY_NO_SUBSELECT);
+            $segmentSql = $this->segment->getSelectQuery('distinct log_visit.idvisit as idvisit', 'log_visit', $segmentWhere, $segmentBind, 'log_visit.idvisit ASC');
+            $logQueryBuilder->forceInnerGroupBySubselect($forceGroupByBackup);
+
+            $this->createTemporaryTable($segmentTable, $segmentSql['sql'], $segmentSql['bind']);
+
+            if (!is_array($from)) {
+                $from = array($segmentTable, $from);
+            } else {
+                array_unshift($from, $segmentTable);
+            }
+
+            $logTablesProvider = $this->getLogTableProvider();
+            $logTablesProvider->setTempTable(new LogTableTemporary($segmentTable));
+
+            foreach ($logTablesProvider->getAllLogTables() as $logTable) {
+                if ($logTable->getDateTimeColumn()) {
+                    $whereTest = $this->getWhereStatement($logTable->getName(), $logTable->getDateTimeColumn());
+                    if (strpos($where, $whereTest) === 0) {
+                        // we don't need to apply the where statement again as it would have been applied already
+                        // in the temporary table... instead it should join the tables through the idvisit index
+                        $where = ltrim(str_replace($whereTest, '', $where));
+                        if (stripos($where, 'and ') === 0) {
+                            $where = substr($where, strlen('and '));
+                        }
+                        $bind = array();
+                        break;
+                    }
+                }
+
+            }
+
+        }
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind, $orderBy, $groupBy, $limit, $offset);
 
         $select = 'SELECT';
         if ($this->queryOriginHint && is_array($query) && 0 === strpos(trim($query['sql']), $select)) {
@@ -185,7 +366,7 @@ public function generateQuery($select, $from, $where, $groupBy, $orderBy, $limit
             $query['sql'] = 'SELECT /* ' . $this->queryOriginHint . ' */' . substr($query['sql'], strlen($select));
         }
 
-	// Log on DEBUG level all SQL archiving queries
+    	// Log on DEBUG level all SQL archiving queries
         $this->logger->debug($query['sql']);
 
         return $query;
@@ -687,13 +868,21 @@ public function queryEcommerceItems($dimension)
      *
      *                                           If a string is used for this parameter, the table alias is not
      *                                           suffixed (since there is only one column).
+     * @param string $secondaryOrderBy      A secondary order by clause for the ranking query
      * @return mixed A Zend_Db_Statement if `$rankingQuery` isn't supplied, otherwise the result of
      *               {@link Piwik\RankingQuery::execute()}. Read [this](#queryEcommerceItems-result-set)
      *               to see what aggregate data is calculated by the query.
      * @api
      */
-    public function queryActionsByDimension($dimensions, $where = '', $additionalSelects = array(), $metrics = false, $rankingQuery = null, $joinLogActionOnColumn = false)
-    {
+    public function queryActionsByDimension(
+        $dimensions,
+        $where = '',
+        $additionalSelects = array(),
+        $metrics = false,
+        $rankingQuery = null,
+        $joinLogActionOnColumn = false,
+        $secondaryOrderBy = null
+    ) {
         $tableName = self::LOG_ACTIONS_TABLE;
         $availableMetrics = $this->getActionsMetricFields();
 
@@ -701,7 +890,6 @@ public function queryActionsByDimension($dimensions, $where = '', $additionalSel
         $from    = array($tableName);
         $where   = $this->getWhereStatement($tableName, self::ACTION_DATETIME_FIELD, $where);
         $groupBy = $this->getGroupByStatement($dimensions, $tableName);
-        $orderBy = false;
 
         if ($joinLogActionOnColumn !== false) {
             $multiJoin = is_array($joinLogActionOnColumn);
@@ -727,8 +915,12 @@ public function queryActionsByDimension($dimensions, $where = '', $additionalSel
             }
         }
 
+        $orderBy = false;
         if ($rankingQuery) {
             $orderBy = '`' . Metrics::INDEX_NB_ACTIONS . '` DESC';
+            if ($secondaryOrderBy) {
+                $orderBy .= ', ' . $secondaryOrderBy;
+            }
         }
 
         $query = $this->generateQuery($select, $from, $where, $groupBy, $orderBy);
diff --git a/app/core/DataAccess/LogQueryBuilder.php b/app/core/DataAccess/LogQueryBuilder.php
index e2b130de4..9e6e57653 100644
--- a/app/core/DataAccess/LogQueryBuilder.php
+++ b/app/core/DataAccess/LogQueryBuilder.php
@@ -17,6 +17,8 @@
 
 class LogQueryBuilder
 {
+    const FORCE_INNER_GROUP_BY_NO_SUBSELECT = '__##nosubquery##__';
+
     /**
      * @var LogTablesProvider
      */
@@ -42,6 +44,11 @@ public function forceInnerGroupBySubselect($innerGroupBy)
         $this->forcedInnerGroupBy = $innerGroupBy;
     }
 
+    public function getForcedInnerGroupBySubselect()
+    {
+        return $this->forcedInnerGroupBy;
+    }
+
     public function getSelectQueryString(SegmentExpression $segmentExpression, $select, $from, $where, $bind, $groupBy,
                                          $orderBy, $limitAndOffset)
     {
@@ -71,7 +78,11 @@ public function getSelectQueryString(SegmentExpression $segmentExpression, $sele
             && strpos($from, 'log_link_visit_action') !== false);
 
         if (!empty($this->forcedInnerGroupBy)) {
-            $sql = $this->buildWrappedSelectQuery($select, $from, $where, $groupBy, $orderBy, $limitAndOffset, $tables, $this->forcedInnerGroupBy);
+            if ($this->forcedInnerGroupBy === self::FORCE_INNER_GROUP_BY_NO_SUBSELECT) {
+                $sql = $this->buildSelectQuery($select, $from, $where, $groupBy, $orderBy, $limitAndOffset);
+            } else {
+                $sql = $this->buildWrappedSelectQuery($select, $from, $where, $groupBy, $orderBy, $limitAndOffset, $tables, $this->forcedInnerGroupBy);
+            }
         } elseif ($useSpecialConversionGroupBy) {
             $innerGroupBy = "CONCAT(log_conversion.idvisit, '_' , log_conversion.idgoal, '_', log_conversion.buster)";
             $sql = $this->buildWrappedSelectQuery($select, $from, $where, $groupBy, $orderBy, $limitAndOffset, $tables, $innerGroupBy);
@@ -89,7 +100,7 @@ public function getSelectQueryString(SegmentExpression $segmentExpression, $sele
     private function getKnownTables()
     {
         $names = array();
-        foreach ($this->logTableProvider->getAllLogTables() as $logTable) {
+        foreach ($this->logTableProvider->getAllLogTablesWithTemporary() as $logTable) {
             $names[] = $logTable->getName();
         }
         return $names;
diff --git a/app/core/DataAccess/LogQueryBuilder/JoinGenerator.php b/app/core/DataAccess/LogQueryBuilder/JoinGenerator.php
index 5cc5d48f6..08f6ebdc2 100644
--- a/app/core/DataAccess/LogQueryBuilder/JoinGenerator.php
+++ b/app/core/DataAccess/LogQueryBuilder/JoinGenerator.php
@@ -11,6 +11,7 @@
 
 use Exception;
 use Piwik\Common;
+use Piwik\DataAccess\LogAggregator;
 use Piwik\Tracker\LogTable;
 
 class JoinGenerator
@@ -190,8 +191,20 @@ public function generate()
                     continue;
                 }
 
+                $joinName = 'LEFT JOIN';
+                if ($i > 0
+                    && $this->tables[$i - 1]
+                    && is_string($this->tables[$i - 1])
+                    && strpos($this->tables[$i - 1], LogAggregator::LOG_TABLE_SEGMENT_TEMPORARY_PREFIX) === 0) {
+                    $joinName = 'INNER JOIN';
+                    // when we archive a segment there will be eg `logtmpsegment$HASH` as first table.
+                    // then we join log_conversion for example... if we didn't use INNER JOIN we would as a result
+                    // get rows for visits even when they didn't have a conversion. Instead we only want to find rows
+                    // that have an entry in both tables when doing eg
+                    // logtmpsegment57cd546b7203d68a41027547c4abe1a2.idvisit = log_conversion.idvisit
+                }
                 // the join sql the default way
-                $this->joinString .= " LEFT JOIN $tableSql ON " . $join;
+                $this->joinString .= " $joinName $tableSql ON " . $join;
             }
 
             $availableLogTables[$table] = $logTable;
diff --git a/app/core/DataAccess/LogQueryBuilder/JoinTables.php b/app/core/DataAccess/LogQueryBuilder/JoinTables.php
index a5b1f34d8..efce94d3e 100644
--- a/app/core/DataAccess/LogQueryBuilder/JoinTables.php
+++ b/app/core/DataAccess/LogQueryBuilder/JoinTables.php
@@ -10,6 +10,7 @@
 namespace Piwik\DataAccess\LogQueryBuilder;
 
 use Exception;
+use Piwik\DataAccess\LogAggregator;
 use Piwik\Plugin\LogTablesProvider;
 
 class JoinTables extends \ArrayObject
@@ -148,10 +149,15 @@ public function sort()
 
         // the first entry is always the FROM table
         $firstTable = array_shift($tables);
+        $sorted = [$firstTable];
+
+        if (strpos($firstTable, LogAggregator::LOG_TABLE_SEGMENT_TEMPORARY_PREFIX) === 0) {
+            // the first table might be a temporary segment table in which case we need to keep the next one as well
+            $sorted[] = array_shift($tables);
+        }
 
         $dependencies = $this->parseDependencies($tables);
 
-        $sorted = [$firstTable];
         $this->visitTableListDfs($tables, $dependencies, function ($tableInfo) use (&$sorted) {
             $sorted[] = $tableInfo;
         });
diff --git a/app/core/DataAccess/LogTableTemporary.php b/app/core/DataAccess/LogTableTemporary.php
new file mode 100644
index 000000000..8be027c11
--- /dev/null
+++ b/app/core/DataAccess/LogTableTemporary.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\DataAccess;
+
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\Db;
+use Piwik\Tracker\LogTable;
+
+class LogTableTemporary extends LogTable
+{
+    private $tableName;
+    public function __construct($name)
+    {
+        $this->tableName = $name;
+    }
+
+    public function setName($name)
+    {
+        $this->tableName = $name;
+    }
+
+    public function getName()
+    {
+        return $this->tableName;
+    }
+
+    public function getIdColumn()
+    {
+        return 'idvist';
+    }
+
+    public function getColumnToJoinOnIdVisit()
+    {
+        return 'idvisit';
+    }
+    public function getPrimaryKey()
+    {
+        return array('idvisit');
+    }
+}
\ No newline at end of file
diff --git a/app/core/DataAccess/Model.php b/app/core/DataAccess/Model.php
index 8ab8f5cff..6b0d5e264 100644
--- a/app/core/DataAccess/Model.php
+++ b/app/core/DataAccess/Model.php
@@ -115,10 +115,21 @@ public function updateArchiveAsInvalidated($archiveTable, $idSites, $datesByPeri
         foreach ($datesByPeriodType as $periodType => $dates) {
             $dateConditions = array();
 
-            foreach ($dates as $date) {
-                $dateConditions[] = "(date1 <= ? AND ? <= date2)";
-                $bind[] = $date;
-                $bind[] = $date;
+            if ($periodType == Period\Range::PERIOD_ID) {
+                foreach ($dates as $date) {
+                    // Ranges in the DB match if their date2 is after the start of the search range and date1 is before the end
+                    // e.g. search range is 2019-01-01 to 2019-01-31
+                    // date2 >= startdate -> Ranges with date2 < 2019-01-01 (ended before 1 January) and are excluded
+                    // date1 <= endate -> Ranges with date1 > 2019-01-31 (started after 31 January) and are excluded
+                    $dateConditions[] = "(date2 >= ? AND date1 <= ?)";
+                    $bind = array_merge($bind, explode(',', $date));
+                }
+            } else {
+                foreach ($dates as $date) {
+                    $dateConditions[] = "(date1 <= ? AND ? <= date2)";
+                    $bind[] = $date;
+                    $bind[] = $date;
+                }
             }
 
             $dateConditionsSql = implode(" OR ", $dateConditions);
@@ -149,7 +160,6 @@ public function updateArchiveAsInvalidated($archiveTable, $idSites, $datesByPeri
         return Db::query($sql, $bind);
     }
 
-
     public function getTemporaryArchivesOlderThan($archiveTable, $purgeArchivesOlderThan)
     {
         $query = "SELECT idarchive FROM " . $archiveTable . "
@@ -186,13 +196,15 @@ public function deleteArchivesWithPeriod($numericTable, $blobTable, $period, $da
     public function deleteArchiveIds($numericTable, $blobTable, $idsToDelete)
     {
         $idsToDelete = array_values($idsToDelete);
-        $query = "DELETE FROM %s WHERE idarchive IN (" . Common::getSqlStringFieldsArray($idsToDelete) . ")";
 
-        $queryObj = Db::query(sprintf($query, $numericTable), $idsToDelete);
+        $idsToDelete = array_map('intval', $idsToDelete);
+        $query = "DELETE FROM %s WHERE idarchive IN (" . implode(',', $idsToDelete) . ")";
+
+        $queryObj = Db::query(sprintf($query, $numericTable), array());
         $deletedRows = $queryObj->rowCount();
 
         try {
-            $queryObj = Db::query(sprintf($query, $blobTable), $idsToDelete);
+            $queryObj = Db::query(sprintf($query, $blobTable), array());
             $deletedRows += $queryObj->rowCount();
         } catch (Exception $e) {
             // Individual blob tables could be missing
@@ -205,7 +217,7 @@ public function deleteArchiveIds($numericTable, $blobTable, $idsToDelete)
         return $deletedRows;
     }
 
-    public function getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStartIso, $dateEndIso, $minDatetimeIsoArchiveProcessedUTC, $doneFlags, $doneFlagValues)
+    public function getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStartIso, $dateEndIso, $doneFlags, $doneFlagValues)
     {
         $bindSQL = array($idSite,
             $dateStartIso,
@@ -213,12 +225,6 @@ public function getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStar
             $period,
         );
 
-        $timeStampWhere = '';
-        if ($minDatetimeIsoArchiveProcessedUTC) {
-            $timeStampWhere = " AND ts_archived >= ? ";
-            $bindSQL[]      = $minDatetimeIsoArchiveProcessedUTC;
-        }
-
         $sqlWhereArchiveName = self::getNameCondition($doneFlags, $doneFlagValues);
 
         $sqlQuery = "SELECT idarchive, value, name, date1 as startDate FROM $numericTable
@@ -229,7 +235,6 @@ public function getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStar
                          AND ( ($sqlWhereArchiveName)
                                OR name = '" . ArchiveSelector::NB_VISITS_RECORD_LOOKED_UP . "'
                                OR name = '" . ArchiveSelector::NB_VISITS_CONVERTED_RECORD_LOOKED_UP . "')
-                         $timeStampWhere
                      ORDER BY idarchive DESC";
         $results = Db::fetchAll($sqlQuery, $bindSQL);
 
@@ -279,25 +284,11 @@ public function allocateNewArchiveId($numericTable)
         return $idarchive;
     }
 
-    public function deletePreviousArchiveStatus($numericTable, $archiveId, $doneFlag)
+    public function updateArchiveStatus($numericTable, $archiveId, $doneFlag, $value)
     {
-        $tableWithoutLeadingPrefix = $numericTable;
-        $lenNumericTableWithoutPrefix = strlen('archive_numeric_MM_YYYY');
-
-        if (strlen($numericTable) >= $lenNumericTableWithoutPrefix) {
-            $tableWithoutLeadingPrefix = substr($numericTable, strlen($numericTable) - $lenNumericTableWithoutPrefix);
-            // we need to make sure lock name is less than 64 characters see https://github.com/piwik/piwik/issues/9131
-        }
-        $dbLockName = "rmPrevArchiveStatus.$tableWithoutLeadingPrefix.$archiveId";
-
-        // without advisory lock here, the DELETE would acquire Exclusive Lock
-        $this->acquireArchiveTableLock($dbLockName);
-
-        Db::query("DELETE FROM $numericTable WHERE idarchive = ? AND (name = '" . $doneFlag . "')",
-            array($archiveId)
+        Db::query("UPDATE $numericTable SET `value` = ? WHERE idarchive = ? and `name` = ?",
+            array($value, $archiveId, $doneFlag)
         );
-
-        $this->releaseArchiveTableLock($dbLockName);
     }
 
     public function insertRecord($tableName, $fields, $record, $name, $value)
@@ -340,14 +331,31 @@ public function getSitesWithInvalidatedArchive($numericTable)
      * @param string $oldestToKeep Datetime string
      * @return array of IDs
      */
-    public function getArchiveIdsForDeletedSites($archiveTableName, $oldestToKeep)
+    public function getArchiveIdsForDeletedSites($archiveTableName)
     {
-        $sql = "SELECT DISTINCT idarchive FROM " . $archiveTableName . " a "
-            . " LEFT JOIN " . Common::prefixTable('site') . " s USING (idsite)"
-            . " WHERE s.idsite IS NULL"
-            . " AND ts_archived < ?";
+        $sql = "SELECT DISTINCT idsite FROM " . $archiveTableName;
+        $rows = Db::getReader()->fetchAll($sql, array());
 
-        $rows = Db::fetchAll($sql, array($oldestToKeep));
+        if (empty($rows)) {
+            return array(); // nothing to delete
+        }
+
+        $idSitesUsed = array_column($rows, 'idsite');
+
+        $model = new \Piwik\Plugins\SitesManager\Model();
+        $idSitesExisting = $model->getSitesId();
+
+        $deletedSites = array_diff($idSitesUsed, $idSitesExisting);
+
+        if (empty($deletedSites)) {
+            return array();
+        }
+        $deletedSites = array_values($deletedSites);
+        $deletedSites = array_map('intval', $deletedSites);
+
+        $sql = "SELECT DISTINCT idarchive FROM " . $archiveTableName . " WHERE idsite IN (".implode(',',$deletedSites).")";
+
+        $rows = Db::getReader()->fetchAll($sql, array());
 
         return array_column($rows, 'idarchive');
     }
@@ -356,53 +364,54 @@ public function getArchiveIdsForDeletedSites($archiveTableName, $oldestToKeep)
      * Get a list of IDs of archives with segments that no longer exist in the DB. Excludes temporary archives that 
      * may still be in use, as specified by the $oldestToKeep passed in.
      * @param string $archiveTableName
-     * @param array $segmentHashesById  Whitelist of existing segments, indexed by site ID
+     * @param array $segments  List of segments to match against
      * @param string $oldestToKeep Datetime string
      * @return array With keys idarchive, name, idsite
      */
-    public function getArchiveIdsForDeletedSegments($archiveTableName, array $segmentHashesById, $oldestToKeep)
+    public function getArchiveIdsForSegments($archiveTableName, array $segments, $oldestToKeep)
     {
-    	if (empty($segmentHashesById)) {
-    		return array();
-	    }
-        $validSegmentClauses = [];
-
-        foreach ($segmentHashesById as $idSite => $segments) {
-            // segments are md5 hashes and such not a problem re sql injection. for performance etc we don't want to use
-            // bound parameters for the query
-            foreach ($segments as $segment) {
-                if (!preg_match('/^[a-z0-9A-Z]+$/', $segment)) {
-                    throw new Exception($segment . ' expected to be an md5 hash');
-                }
+        $segmentClauses = [];
+        foreach ($segments as $segment) {
+            if (!empty($segment['definition'])) {
+                $segmentClauses[] = $this->getDeletedSegmentWhereClause($segment);
             }
+        }
 
-            // Special case as idsite=0 means the segments are not site-specific
-            if ($idSite === 0) {
-                foreach ($segments as $segmentHash) {
-                    $validSegmentClauses[] = '(name LIKE "done' . $segmentHash . '%")';
-                }
-                continue;
-            }
-
-            $idSite = (int)$idSite;
-
-            // Vanilla case - segments that are valid for a single site only
-            $sql = '(idsite = ' . $idSite . ' AND (';
-            $sql .= 'name LIKE "done' . implode('%" OR name LIKE "done', $segments) . '%"';
-            $sql .= '))';
-            $validSegmentClauses[] = $sql;
+        if (empty($segmentClauses)) {
+            return array();
         }
 
-        $isValidSegmentSql = implode(' OR ', $validSegmentClauses);
+        $segmentClauses = implode(' OR ', $segmentClauses);
 
         $sql = 'SELECT idarchive FROM ' . $archiveTableName
-            . ' WHERE name LIKE "done%" AND name != "done"'
-            . ' AND ts_archived < ?'
-            . ' AND NOT (' . $isValidSegmentSql . ')';
+            . ' WHERE ts_archived < ?'
+            . ' AND (' . $segmentClauses . ')';
 
         $rows = Db::fetchAll($sql, array($oldestToKeep));
 
-        return array_map(function($row) { return $row['idarchive']; }, $rows);
+        return array_column($rows, 'idarchive');
+    }
+
+    private function getDeletedSegmentWhereClause(array $segment)
+    {
+        $idSite = (int)$segment['enable_only_idsite'];
+        $segmentHash = Segment::getSegmentHash($segment['definition']);
+        // Valid segment hashes are md5 strings - just confirm that it is so it's safe for SQL injection
+        if (!ctype_xdigit($segmentHash)) {
+            throw new Exception($segment . ' expected to be an md5 hash');
+        }
+
+        $nameClause = 'name LIKE "done' . $segmentHash . '%"';
+        $idSiteClause = '';
+        if ($idSite > 0) {
+            $idSiteClause = ' AND idsite = ' . $idSite;
+        } elseif (! empty($segment['idsites_to_preserve'])) {
+            // A segment for all sites was deleted, but there are segments for a single site with the same definition
+            $idSitesToPreserve = array_map('intval', $segment['idsites_to_preserve']);
+            $idSiteClause = ' AND idsite NOT IN (' . implode(',', $idSitesToPreserve) . ')';
+        }
+
+        return "($nameClause $idSiteClause)";
     }
 
     /**
@@ -417,15 +426,4 @@ private static function getNameCondition($doneFlags, $possibleValues)
         return "((name IN ($allDoneFlags)) AND (value IN (" . implode(',', $possibleValues) . ")))";
     }
 
-    protected function acquireArchiveTableLock($dbLockName)
-    {
-        if (Db::getDbLock($dbLockName, $maxRetries = 30) === false) {
-            throw new Exception("Cannot get named lock $dbLockName.");
-        }
-    }
-
-    protected function releaseArchiveTableLock($dbLockName)
-    {
-        Db::releaseDbLock($dbLockName);
-    }
 }
diff --git a/app/core/DataAccess/RawLogDao.php b/app/core/DataAccess/RawLogDao.php
index 5fd94f122..a3d7f0ab5 100644
--- a/app/core/DataAccess/RawLogDao.php
+++ b/app/core/DataAccess/RawLogDao.php
@@ -103,18 +103,41 @@ public function countVisitsWithDatesLimit($from, $to)
      *                            ```
      * @param int $iterationStep The number of rows to query at a time.
      * @param callable $callback The callback that processes each chunk of rows.
+     * @param string $willDelete Set to true if you will make sure to delete all rows that were fetched. If you are in
+     *                           doubt and not sure if to set true or false, use "false". Setting it to true will
+     *                           enable an internal performance improvement but it can result in an endless loop if not
+     *                           used properly.
      */
-    public function forAllLogs($logTable, $fields, $conditions, $iterationStep, $callback)
+    public function forAllLogs($logTable, $fields, $conditions, $iterationStep, $callback, $willDelete)
     {
-        $idField = $this->getIdFieldForLogTable($logTable);
+        $lastId = 0;
+
+        if ($willDelete) {
+            // we don't want to look at eg idvisit so the query will be mostly index covered as the
+            // "where idvisit > 0 ... ORDER BY idvisit ASC" will be gone... meaning we don't need to look at a huge range
+            // of visits...
+            $idField = null;
+            $bindFunction = function ($bind, $lastId) {
+                return $bind;
+            };
+        } else {
+            // when we are not deleting, we need to ensure to iterate over each visitor step by step... meaning we
+            // need to remember which visit we have already looked at and which one not. Therefore we need to apply
+            // "where idvisit > $lastId" in the query and "order by idvisit ASC"
+            $idField = $this->getIdFieldForLogTable($logTable);
+            $bindFunction = function ($bind, $lastId) {
+                return array_merge(array($lastId), $bind);
+            };
+        }
+
         list($query, $bind) = $this->createLogIterationQuery($logTable, $idField, $fields, $conditions, $iterationStep);
 
-        $lastId = 0;
         do {
-            $rows = Db::fetchAll($query, array_merge(array($lastId), $bind));
+            $rows = Db::fetchAll($query, call_user_func($bindFunction, $bind, $lastId));
             if (!empty($rows)) {
-                $lastId = $rows[count($rows) - 1][$idField];
-
+                if ($idField) {
+                    $lastId = $rows[count($rows) - 1][$idField];
+                }
                 $callback($rows);
             }
         } while (count($rows) == $iterationStep);
@@ -250,23 +273,34 @@ private function createLogIterationQuery($logTable, $idField, $fields, $conditio
     {
         $bind = array();
 
-        $sql = "SELECT " . implode(', ', $fields) . " FROM `" . Common::prefixTable($logTable) . "` WHERE $idField > ?";
+        $sql = "SELECT " . implode(', ', $fields) . " FROM `" . Common::prefixTable($logTable) . "` WHERE ";
+
+        $parts = array();
+
+        if ($idField) {
+            $parts[] = "$idField > ?";
+        }
 
         foreach ($conditions as $condition) {
             list($column, $operator, $value) = $condition;
 
             if (is_array($value)) {
-                $sql .= " AND $column IN (" . Common::getSqlStringFieldsArray($value) . ")";
+                $parts[] = "$column IN (" . Common::getSqlStringFieldsArray($value) . ")";
 
                 $bind = array_merge($bind, $value);
             } else {
-                $sql .= " AND $column $operator ?";
+                $parts[]= "$column $operator ?";
 
                 $bind[] = $value;
             }
         }
+        $sql .= implode(' AND ', $parts);
+
+        if ($idField) {
+            $sql .= " ORDER BY $idField ASC";
+        }
 
-        $sql .= " ORDER BY $idField ASC LIMIT " . (int)$iterationStep;
+        $sql .= " LIMIT " . (int)$iterationStep;
 
         return array($sql, $bind);
     }
diff --git a/app/core/DataTable.php b/app/core/DataTable.php
index 727cc5dd0..9065afcef 100644
--- a/app/core/DataTable.php
+++ b/app/core/DataTable.php
@@ -200,9 +200,17 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess
     /** The ID of the Summary Row. */
     const ID_SUMMARY_ROW = -1;
 
+    /**
+     * The ID of the special metadata row. This row only exists in the serialized row data and stores the datatable metadata.
+     *
+     * This allows us to save datatable metadata in archive data.
+     */
+    const ID_ARCHIVED_METADATA_ROW = -3;
+
     /** The original label of the Summary Row. */
     const LABEL_SUMMARY_ROW = -1;
     const LABEL_TOTALS_ROW = -2;
+    const LABEL_ARCHIVED_METADATA_ROW = '__datatable_metadata__';
 
     /**
      * Name for metadata that contains extra {@link Piwik\Plugin\ProcessedMetric}s for a DataTable.
@@ -664,6 +672,12 @@ public function getRowFromLabel($label)
         ) {
             return $this->summaryRow;
         }
+        if (empty($rowId)
+            && !empty($this->totalsRow)
+            && $label == $this->totalsRow->getColumn('label')
+        ) {
+            return $this->totalsRow;
+        }
         if ($rowId instanceof Row) {
             return $rowId;
         }
@@ -1291,6 +1305,15 @@ public function getSerialized($maximumRowsInDataTable = null,
             $subtableId = 0;
             throw new Exception("Maximum recursion level of " . self::$maximumDepthLevelAllowed . " reached. Maybe you have set a DataTable\Row with an associated DataTable belonging already to one of its parent tables?");
         }
+
+        // gather metadata before filters are called, so their metadata is not stored in serialized form
+        $metadata = $this->getAllTableMetadata();
+        foreach ($metadata as $key => $value) {
+            if (!is_scalar($value) && !is_string($value)) {
+                unset($metadata[$key]);
+            }
+        }
+
         if (!is_null($maximumRowsInDataTable)) {
             $this->filter('Truncate',
                 array($maximumRowsInDataTable - 1,
@@ -1341,6 +1364,16 @@ public function getSerialized($maximumRowsInDataTable = null,
             $rows[self::ID_SUMMARY_ROW] = $this->summaryRow->export();
         }
 
+        if (!empty($metadata)) {
+            $metadataRow = new Row();
+            $metadataRow->setColumns($metadata);
+
+            // set the label so the row will be indexed correctly internally
+            $metadataRow->setColumn('label', self::LABEL_ARCHIVED_METADATA_ROW);
+
+            $rows[self::ID_ARCHIVED_METADATA_ROW] = $metadataRow->export();
+        }
+
         $aSerializedDataTable[$forcedId] = serialize($rows);
         unset($rows);
 
@@ -1402,6 +1435,13 @@ public function addRowsFromSerializedArray($serialized)
             unset($rows[self::ID_SUMMARY_ROW]);
         }
 
+        if (array_key_exists(self::ID_ARCHIVED_METADATA_ROW, $rows)) {
+            $metadata = $rows[self::ID_ARCHIVED_METADATA_ROW][Row::COLUMNS];
+            unset($metadata['label']);
+            $this->setAllTableMetadata($metadata);
+            unset($rows[self::ID_ARCHIVED_METADATA_ROW]);
+        }
+
         foreach ($rows as $id => $row) {
             if (isset($row->c)) {
                 $this->addRow(new Row($row->c)); // Pre Piwik 2.13
@@ -1573,7 +1613,12 @@ public static function makeFromIndexedArray($array, $subtablePerLabel = null)
             if (isset($subtablePerLabel[$label])) {
                 $cleanRow[Row::DATATABLE_ASSOCIATED] = $subtablePerLabel[$label];
             }
-            $table->addRow(new Row($cleanRow));
+
+            if ($label === RankingQuery::LABEL_SUMMARY_ROW) {
+                $table->addSummaryRow(new Row($cleanRow));
+            } else {
+                $table->addRow(new Row($cleanRow));
+            }
         }
         return $table;
     }
diff --git a/app/core/DataTable/Filter/ReplaceColumnNames.php b/app/core/DataTable/Filter/ReplaceColumnNames.php
index 334057304..f996f48e2 100644
--- a/app/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/app/core/DataTable/Filter/ReplaceColumnNames.php
@@ -56,7 +56,7 @@ class ReplaceColumnNames extends BaseFilter
     public function __construct($table, $mappingToApply = null)
     {
         parent::__construct($table);
-        $this->mappingToApply = Metrics::$mappingFromIdToName;
+        $this->mappingToApply = Metrics::getMappingFromIdToName();
         if (!is_null($mappingToApply)) {
             $this->mappingToApply = $mappingToApply;
         }
@@ -81,7 +81,14 @@ public function filter($table)
      */
     protected function filterTable($table)
     {
-        foreach ($table->getRows() as $row) {
+        $rows = $table->getRows();
+
+        $totalRow = $table->getTotalsRow();
+        if ($totalRow) {
+            $rows[] = $totalRow;
+        }
+
+        foreach ($rows as $row) {
             $newColumns = $this->getRenamedColumns($row->getColumns());
             $row->setColumns($newColumns);
             $this->filterSubTable($row);
diff --git a/app/core/DataTable/Filter/SafeDecodeLabel.php b/app/core/DataTable/Filter/SafeDecodeLabel.php
index af851ab4b..1a2f26bac 100644
--- a/app/core/DataTable/Filter/SafeDecodeLabel.php
+++ b/app/core/DataTable/Filter/SafeDecodeLabel.php
@@ -17,6 +17,8 @@
  */
 class SafeDecodeLabel extends BaseFilter
 {
+    const APPLIED_METADATA_NAME = 'SafeDecodeLabelApplied';
+
     private $columnToDecode;
 
     /**
@@ -59,6 +61,10 @@ public static function decodeLabelSafe($value)
      */
     public function filter($table)
     {
+        if ($table->getMetadata(self::APPLIED_METADATA_NAME)) {
+            return;
+        }
+
         foreach ($table->getRows() as $row) {
             $value = $row->getColumn($this->columnToDecode);
             if ($value !== false) {
diff --git a/app/core/DataTable/Renderer/Console.php b/app/core/DataTable/Renderer/Console.php
index c16bcfd6d..57b21f534 100644
--- a/app/core/DataTable/Renderer/Console.php
+++ b/app/core/DataTable/Renderer/Console.php
@@ -148,6 +148,8 @@ protected function renderTable($table, $prefix = "")
                     foreach ($metadataIn as $name => $value) {
                         if (is_object($value) && !method_exists( $value, '__toString' )) {
                             $value = 'Object [' . get_class($value) . ']';
+                        } elseif (is_array($value)) {
+                        	$value = 'Array ' . json_encode($value);
                         }
                         $output .= $prefix . $prefix . "$name => $value";
                     }
diff --git a/app/core/DataTable/Renderer/Csv.php b/app/core/DataTable/Renderer/Csv.php
index dc0723a53..ada62e67c 100644
--- a/app/core/DataTable/Renderer/Csv.php
+++ b/app/core/DataTable/Renderer/Csv.php
@@ -423,7 +423,9 @@ private function makeArrayFromDataTable($table, &$allColumns)
                         $name = 'metadata_' . $name;
                     }
 
-                    if (is_array($value)) {
+                    if (is_array($value)
+                        || is_object($value)
+                    ) {
                         if (!in_array($name, $this->unsupportedColumns)) {
                             $this->unsupportedColumns[] = $name;
                         }
diff --git a/app/core/DataTable/Renderer/Html.php b/app/core/DataTable/Renderer/Html.php
index b42076cad..424c5ba6a 100644
--- a/app/core/DataTable/Renderer/Html.php
+++ b/app/core/DataTable/Renderer/Html.php
@@ -10,6 +10,7 @@
 
 use Exception;
 use Piwik\DataTable;
+use Piwik\DataTable\DataTableInterface;
 use Piwik\DataTable\Renderer;
 
 /**
@@ -51,7 +52,7 @@ public function render()
     /**
      * Computes the output for the given data table
      *
-     * @param DataTable $table
+     * @param DataTableInterface $table
      * @return string
      */
     protected function renderTable($table)
@@ -119,6 +120,8 @@ protected function buildTableStructure($table, $columnToAdd = null, $valueToAdd
                     $value = "'$value'";
                 } else if (is_array($value)) {
                     $value = var_export($value, true);
+                } else if ($value instanceof DataTable\DataTableInterface) {
+                    $value = $this->renderTable($value);
                 }
                 $metadata[] = "'$name' => $value";
             }
diff --git a/app/core/DataTable/Renderer/Json.php b/app/core/DataTable/Renderer/Json.php
index 81a03f3e4..28d57eb6f 100644
--- a/app/core/DataTable/Renderer/Json.php
+++ b/app/core/DataTable/Renderer/Json.php
@@ -62,6 +62,9 @@ protected function renderTable($table)
             $array = array('value' => $array);
         }
 
+        // convert datatable column/metadata values
+        $this->convertDataTableColumnMetadataValues($array);
+
         // decode all entities
         $callback = function (&$value, $key) {
             if (is_string($value)) {
@@ -117,4 +120,18 @@ private function convertDataTableToArray($table)
 
         return $array;
     }
+
+    private function convertDataTableColumnMetadataValues(&$table)
+    {
+        if (empty($table)) {
+            return;
+        }
+
+        array_walk_recursive($table, function (&$value, $key) {
+            if ($value instanceof DataTable) {
+                $value = $this->convertDataTableToArray($value);
+                $this->convertDataTableColumnMetadataValues($value);
+            }
+        });
+    }
 }
diff --git a/app/core/DataTable/Renderer/Php.php b/app/core/DataTable/Renderer/Php.php
index 65229d676..5bcb86195 100644
--- a/app/core/DataTable/Renderer/Php.php
+++ b/app/core/DataTable/Renderer/Php.php
@@ -122,9 +122,14 @@ public function flatRender($dataTable = null)
         } elseif ($dataTable instanceof Simple) {
             $flatArray = $this->renderSimpleTable($dataTable);
 
+            reset($flatArray);
+            $firstKey = key($flatArray);
+
             // if we return only one numeric value then we print out the result in a simple <result> tag
             // keep it simple!
-            if (count($flatArray) == 1) {
+            if (count($flatArray) == 1
+                && $firstKey !== DataTable\Row::COMPARISONS_METADATA_NAME
+            ) {
                 $flatArray = current($flatArray);
             }
         } // A normal DataTable needs to be handled specifically
@@ -206,6 +211,10 @@ protected function renderTable($table)
                 $newRow['issummaryrow'] = true;
             }
 
+            if (isset($newRow['metadata'][DataTable\Row::COMPARISONS_METADATA_NAME])) {
+                $newRow['metadata'][DataTable\Row::COMPARISONS_METADATA_NAME] = $row->getComparisons();
+            }
+
             $subTable = $row->getSubtable();
             if ($this->isRenderSubtables()
                 && $subTable
@@ -245,6 +254,12 @@ protected function renderSimpleTable($table)
         foreach ($row->getColumns() as $columnName => $columnValue) {
             $array[$columnName] = $columnValue;
         }
+
+        $comparisons = $row->getComparisons();
+        if (!empty($comparisons)) {
+            $array[DataTable\Row::COMPARISONS_METADATA_NAME] = $comparisons;
+        }
+
         return $array;
     }
 }
diff --git a/app/core/DataTable/Renderer/Rss.php b/app/core/DataTable/Renderer/Rss.php
index 2b001725d..f90dbc255 100644
--- a/app/core/DataTable/Renderer/Rss.php
+++ b/app/core/DataTable/Renderer/Rss.php
@@ -147,7 +147,9 @@ protected function renderDataTable($table)
             foreach ($row->getColumns() as $column => $value) {
                 // for example, goals data is array: not supported in export RSS
                 // in the future we shall reuse ViewDataTable for html exports in RSS anyway
-                if (is_array($value)) {
+                if (is_array($value)
+                    || is_object($value)
+                ) {
                     continue;
                 }
                 $allColumns[$column] = true;
diff --git a/app/core/DataTable/Renderer/Xml.php b/app/core/DataTable/Renderer/Xml.php
index b13eae78c..939b3a897 100644
--- a/app/core/DataTable/Renderer/Xml.php
+++ b/app/core/DataTable/Renderer/Xml.php
@@ -233,9 +233,16 @@ protected function renderDataTableMap($table, $array, $prefixLines = "")
             foreach ($array as $valueAttribute => $value) {
                 if (empty($value)) {
                     $xml .= $prefixLines . "\t<result $nameDescriptionAttribute=\"$valueAttribute\" />\n";
-                } elseif ($value instanceof Map) {
-                    $out = $this->renderTable($value, true);
+                } elseif ($value instanceof DataTable\DataTableInterface) {
                     //TODO somehow this code is not tested, cover this case
+                    $out = $this->renderTable($value, true);
+                    $xml .= "\t<result $nameDescriptionAttribute=\"$valueAttribute\">\n$out</result>\n";
+                } else if (is_array($value)) {
+                    if (!is_array(reset($value))) {
+                        $out = $this->renderDataTableSimple($value);
+                    } else {
+                        $out = $this->renderDataTable($value);
+                    }
                     $xml .= "\t<result $nameDescriptionAttribute=\"$valueAttribute\">\n$out</result>\n";
                 } else {
                     $xml .= $prefixLines . "\t<result $nameDescriptionAttribute=\"$valueAttribute\">" . self::formatValueXml($value) . "</result>\n";
@@ -265,7 +272,11 @@ protected function renderDataTableMap($table, $array, $prefixLines = "")
                     $xml .= $prefixLines . "\t<result $nameDescriptionAttribute=\"$valueAttribute\" />\n";
                 } else {
                     if (is_array($dataTableSimple)) {
-                        $dataTableSimple = "\n" . $this->renderDataTableSimple($dataTableSimple, $prefixLines . "\t") . $prefixLines . "\t";
+                        if (!is_array(reset($dataTableSimple))) {
+                            $dataTableSimple = "\n" . $this->renderDataTableSimple($dataTableSimple, $prefixLines . "\t") . $prefixLines . "\t";
+                        } else {
+                            $dataTableSimple = "\n" . $this->renderDataTable($dataTableSimple, $prefixLines . "\t") . $prefixLines . "\t";
+                        }
                     }
                     $xml .= $prefixLines . "\t<result $nameDescriptionAttribute=\"$valueAttribute\">" . $dataTableSimple . "</result>\n";
                 }
@@ -369,7 +380,15 @@ protected function renderDataTable($array, $prefixLine = "")
                 $out .= "\n";
                 foreach ($row as $name => $value) {
                     // handle the recursive dataTable case by XML outputting the recursive table
-                    if (is_array($value)) {
+                    if ($value instanceof DataTable) {
+                        $value = $this->getArrayFromDataTable($value);
+                        if ($value instanceof Simple) {
+                            $value = "\n" . $this->renderDataTableSimple($value, $prefixLine . "\t\t");
+                        } else {
+                            $value = "\n" . $this->renderDataTable($value, $prefixLine . "\t\t");
+                        }
+                        $value .= $prefixLine . "\t\t";
+                    } else if (is_array($value)) {
                         if (is_array(reset($value))) {
                             $value = "\n" . $this->renderDataTable($value, $prefixLine . "\t\t");
                         } else {
@@ -414,8 +433,16 @@ protected function renderDataTableSimple($array, $prefixLine = "")
         foreach ($array as $keyName => $value) {
             $xmlValue = self::formatValueXml($value);
             list($tagStart, $tagEnd) = $this->getTagStartAndEndFor($keyName, $columnsHaveInvalidChars);
-            if (strlen($xmlValue) == 0) {
+            if (is_string($xmlValue) && strlen($xmlValue) == 0) {
                 $out .= $prefixLine . "\t<$tagStart />\n";
+            } else if ($value instanceof DataTable || is_array($value)) {
+                $arrayValue = $this->getArrayFromDataTable($value);
+                if (!is_array(reset($arrayValue))) {
+                    $xmlTable = $this->renderDataTableSimple($arrayValue, $prefixLine . "\t");
+                } else {
+                    $xmlTable = $this->renderDataTable($arrayValue, $prefixLine . "\t");
+                }
+                $out .= $prefixLine . "\t<$tagStart>\n" . $xmlTable . $prefixLine . "\t</$tagEnd>\n";
             } else {
                 $out .= $prefixLine . "\t<$tagStart>" . $xmlValue . "</$tagEnd>\n";
             }
diff --git a/app/core/DataTable/Row.php b/app/core/DataTable/Row.php
index 4c3ecc623..f881f1cbf 100644
--- a/app/core/DataTable/Row.php
+++ b/app/core/DataTable/Row.php
@@ -23,6 +23,8 @@
  */
 class Row extends \ArrayObject
 {
+    const COMPARISONS_METADATA_NAME = 'comparisons';
+
     /**
      * List of columns that cannot be summed. An associative array for speed.
      *
@@ -87,9 +89,11 @@ public function __construct($row = array())
      */
     public function export()
     {
+        $metadataToPersist = $this->metadata;
+        unset($metadataToPersist[self::COMPARISONS_METADATA_NAME]);
         return array(
             self::COLUMNS => $this->getArrayCopy(),
-            self::METADATA => $this->metadata,
+            self::METADATA => $metadataToPersist,
             self::DATATABLE_ASSOCIATED => $this->subtableId,
         );
     }
@@ -590,6 +594,30 @@ public function isSummaryRow()
         return $this->getColumn('label') === DataTable::LABEL_SUMMARY_ROW;
     }
 
+    /**
+     * Returns the associated comparisons DataTable, if any.
+     *
+     * @return DataTable|null
+     */
+    public function getComparisons()
+    {
+        $dataTableId = $this->getMetadata(self::COMPARISONS_METADATA_NAME);
+        if (empty($dataTableId)) {
+            return null;
+        }
+        return Manager::getInstance()->getTable($dataTableId);
+    }
+
+    /**
+     * Associates the supplied table with this row as the comparisons table.
+     *
+     * @param DataTable $table
+     */
+    public function setComparisons(DataTable $table)
+    {
+        $this->setMetadata(self::COMPARISONS_METADATA_NAME, $table->getId());
+    }
+
     /**
      * Helper function: sums 2 values
      *
diff --git a/app/core/Db.php b/app/core/Db.php
index 9af8ec2c6..af2563869 100644
--- a/app/core/Db.php
+++ b/app/core/Db.php
@@ -180,6 +180,7 @@ public static function createReaderDatabaseObject($dbConfig = null)
         $dbConfig['schema'] = $masterDbConfig['schema'];
         $dbConfig['type'] = $masterDbConfig['type'];
         $dbConfig['tables_prefix'] = $masterDbConfig['tables_prefix'];
+        $dbConfig['charset'] = $masterDbConfig['charset'];
 
         $db = @Adapter::factory($dbConfig['adapter'], $dbConfig);
 
diff --git a/app/core/Db/BatchInsert.php b/app/core/Db/BatchInsert.php
index b2693d7e9..f2b146e4e 100644
--- a/app/core/Db/BatchInsert.php
+++ b/app/core/Db/BatchInsert.php
@@ -15,6 +15,7 @@
 use Piwik\Db;
 use Piwik\Log;
 use Piwik\SettingsServer;
+use Piwik\SettingsPiwik;
 
 class BatchInsert
 {
@@ -41,6 +42,30 @@ public static function tableInsertBatchIterate($tableName, $fields, $values, $ig
         }
     }
 
+    /**
+     * Performs a batch insert into a specific table by sending all data in one SQL statement.
+     *
+     * @param string $tableName PREFIXED table name! you must call Common::prefixTable() before passing the table name
+     * @param array $fields array of unquoted field names
+     * @param array $values array of data to be inserted
+     * @param bool $ignoreWhenDuplicate Ignore new rows that contain unique key values that duplicate old rows
+     */
+    public static function tableInsertBatchSql($tableName, $fields, $values, $ignoreWhenDuplicate = true)
+    {
+        $insertLines = array();
+        $bind = array();
+        foreach ($values as $row) {
+            $insertLines[] = "(" . Common::getSqlStringFieldsArray($row) . ")";
+            $bind = array_merge($bind, $row);
+        }
+
+        $fieldList = '(' . implode(',', $fields) . ')';
+        $insertLines = implode(',', $insertLines);
+        $ignore    = $ignoreWhenDuplicate ? 'IGNORE' : '';
+        $query = "INSERT $ignore INTO $tableName $fieldList VALUES $insertLines";
+        Db::query($query, $bind);
+    }
+
     /**
      * Performs a batch insert into a specific table using either LOAD DATA INFILE or plain INSERTs,
      * as a fallback. On MySQL, LOAD DATA INFILE is 20x faster than a series of plain INSERTs.
@@ -62,7 +87,12 @@ public static function tableInsertBatch($tableName, $fields, $values, $throwExce
             && Db::get()->hasBulkLoader()) {
 
             $path = self::getBestPathForLoadData();
-            $filePath = $path . $tableName . '-' . Common::generateUniqId() . '.csv';
+            $instanceId = SettingsPiwik::getPiwikInstanceId();
+            if (empty($instanceId)) {
+                $instanceId = '';
+            }
+            $filePath = $path . $tableName . '-' . $instanceId . Common::generateUniqId() . '.csv';
+
 
             try {
                 $fileSpec = array(
diff --git a/app/core/Db/Schema/Mysql.php b/app/core/Db/Schema/Mysql.php
index afa5c9778..10c049e14 100644
--- a/app/core/Db/Schema/Mysql.php
+++ b/app/core/Db/Schema/Mysql.php
@@ -154,7 +154,7 @@ public function getTablesCreateSql()
 
             'log_action'          => "CREATE TABLE {$prefixTables}log_action (
                                       idaction INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-                                      name TEXT,
+                                      name VARCHAR(4096),
                                       hash INTEGER(10) UNSIGNED NOT NULL,
                                       type TINYINT UNSIGNED NULL,
                                       url_prefix TINYINT(2) NULL,
@@ -209,7 +209,7 @@ public function getTablesCreateSql()
                                       buster int unsigned NOT NULL,
                                       idorder varchar(100) default NULL,
                                       items SMALLINT UNSIGNED DEFAULT NULL,
-                                      url text NOT NULL,
+                                      url VARCHAR(4096) NOT NULL,
                                         PRIMARY KEY (idvisit, idgoal, buster),
                                         UNIQUE KEY unique_idsite_idorder (idsite, idorder),
                                         INDEX index_idsite_datetime ( idsite, server_time )
@@ -310,6 +310,13 @@ public function getTablesCreateSql()
                                       PRIMARY KEY(`idsite`, `idfailure`)
                                   ) ENGINE=$engine DEFAULT CHARSET=utf8
             ",
+            'locks'                   => "CREATE TABLE `{$prefixTables}locks` (
+                                      `key` VARCHAR(70) NOT NULL,
+                                      `value` VARCHAR(255) NULL DEFAULT NULL,
+                                      `expiry_time` BIGINT UNSIGNED DEFAULT 9999999999,
+                                      PRIMARY KEY (`key`)
+                                  ) ENGINE=$engine DEFAULT CHARSET=utf8
+            ",
         );
 
         return $tables;
diff --git a/app/core/Db/TransactionLevel.php b/app/core/Db/TransactionLevel.php
new file mode 100644
index 000000000..c19699084
--- /dev/null
+++ b/app/core/Db/TransactionLevel.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Db;
+
+use Piwik\Db;
+use Piwik\Option;
+
+class TransactionLevel
+{
+    const TEST_OPTION_NAME = 'TransactionLevel.testOption';
+
+    private $statusBackup;
+
+    /**
+     * @var \Piwik\Tracker\Db|\Piwik\Db\AdapterInterface|\Piwik\Db $db
+     */
+    private $db;
+
+    /**
+     * @param \Piwik\Tracker\Db|\Piwik\Db\AdapterInterface|\Piwik\Db $db
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    public function canLikelySetTransactionLevel()
+    {
+        $dbSettings = new Db\Settings();
+
+        return strtolower($dbSettings->getEngine()) === 'innodb';
+    }
+
+    public function setUncommitted()
+    {
+        try {
+            $backup = $this->db->fetchOne('SELECT @@TX_ISOLATION');
+        } catch (\Exception $e) {
+            try {
+                $backup = $this->db->fetchOne('SELECT @@transaction_isolation');
+            } catch (\Exception $e) {
+                return false;
+            }
+        }
+
+        try {
+            $this->db->query('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+            $this->statusBackup = $backup;
+
+            Option::set(self::TEST_OPTION_NAME, '1'); // try setting something w/ the new transaction isolation level
+        } catch (\Exception $e) {
+            // catch eg 1665 Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED
+            $this->restorePreviousStatus();
+            return false;
+        }
+
+        return true;
+    }
+
+    public function restorePreviousStatus()
+    {
+        if ($this->statusBackup) {
+            $value = strtoupper($this->statusBackup);
+            $this->statusBackup = null;
+
+            $value = str_replace('-', ' ', $value);
+            if (in_array($value, array('REPEATABLE READ', 'READ COMMITTED', 'SERIALIZABLE'))) {
+                $this->db->query('SET SESSION TRANSACTION ISOLATION LEVEL '.$value);
+            } elseif ($value !== 'READ UNCOMMITTED') {
+                $this->db->query('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+            }
+        }
+
+    }
+
+}
diff --git a/app/core/DeviceDetectorCache.php b/app/core/DeviceDetector/DeviceDetectorCache.php
similarity index 96%
rename from app/core/DeviceDetectorCache.php
rename to app/core/DeviceDetector/DeviceDetectorCache.php
index fe4815136..ad2d8573e 100644
--- a/app/core/DeviceDetectorCache.php
+++ b/app/core/DeviceDetector/DeviceDetectorCache.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
-namespace Piwik;
+namespace Piwik\DeviceDetector;
 
 use Piwik\Cache as PiwikCache;
 
@@ -27,7 +27,7 @@ class DeviceDetectorCache implements \DeviceDetector\Cache\Cache
     public function __construct($ttl = 300)
     {
         $this->ttl   = (int) $ttl;
-        $this->cache = PiwikCache::getEagerCache();
+        $this->cache = PiwikCache::getLazyCache();
     }
 
     /**
diff --git a/app/core/DeviceDetector/DeviceDetectorFactory.php b/app/core/DeviceDetector/DeviceDetectorFactory.php
new file mode 100644
index 000000000..ce8b98bbd
--- /dev/null
+++ b/app/core/DeviceDetector/DeviceDetectorFactory.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\DeviceDetector;
+
+use DeviceDetector\DeviceDetector;
+use Piwik\Common;
+use Piwik\Container\StaticContainer;
+
+class DeviceDetectorFactory
+{
+    protected static $deviceDetectorInstances = array();
+
+    /**
+     * Returns an instance of DeviceDetector for the given user agent. Uses template method pattern
+     * and calls getDeviceDetectionInfo() when it doesn't find a matching instance in the cache.
+     * @param string $userAgent
+     * @return DeviceDetector|mixed
+     */
+    public function makeInstance($userAgent)
+    {
+        $userAgent = self::getNormalizedUserAgent($userAgent);
+
+        if (array_key_exists($userAgent, self::$deviceDetectorInstances)) {
+            return self::$deviceDetectorInstances[$userAgent];
+        }
+
+        $deviceDetector = $this->getDeviceDetectionInfo($userAgent);
+
+        self::$deviceDetectorInstances[$userAgent] = $deviceDetector;
+
+        return $deviceDetector;
+    }
+
+    public static function getNormalizedUserAgent($userAgent)
+    {
+        return Common::mb_substr(trim($userAgent), 0, 500);
+    }
+
+    /**
+     * Creates a new DeviceDetector for the user agent. Called by makeInstance() when no matching instance
+     * was found in the cache.
+     * @param $userAgent
+     * @return DeviceDetector
+     */
+    protected function getDeviceDetectionInfo($userAgent)
+    {
+        $deviceDetector = new DeviceDetector($userAgent);
+        $deviceDetector->discardBotInformation();
+        $deviceDetector->setCache(new DeviceDetectorCache(86400));
+        $deviceDetector->parse();
+        return $deviceDetector;
+    }
+
+    public static function clearInstancesCache()
+    {
+        self::$deviceDetectorInstances = array();
+    }
+}
\ No newline at end of file
diff --git a/app/core/DeviceDetectorFactory.php b/app/core/DeviceDetectorFactory.php
index 2217dbe7c..1d392cf95 100644
--- a/app/core/DeviceDetectorFactory.php
+++ b/app/core/DeviceDetectorFactory.php
@@ -9,32 +9,19 @@
 namespace Piwik;
 
 use DeviceDetector\DeviceDetector;
-use Piwik\Common;
+use Piwik\Container\StaticContainer;
 
 class DeviceDetectorFactory
 {
-    protected static $deviceDetectorInstances = array();
-
     /**
-     * Returns a Singleton instance of DeviceDetector for the given user agent
+     * Returns a Singleton instance of DeviceDetector for the given user agent.
      * @param string $userAgent
      * @return DeviceDetector
+     * @deprecated Should get a factory via StaticContainer and call makeInstance() on it instead
      */
     public static function getInstance($userAgent)
     {
-        $userAgent = Common::mb_substr($userAgent, 0, 500);
-
-        if (array_key_exists($userAgent, self::$deviceDetectorInstances)) {
-            return self::$deviceDetectorInstances[$userAgent];
-        }
-
-        $deviceDetector = new DeviceDetector($userAgent);
-        $deviceDetector->discardBotInformation();
-        $deviceDetector->setCache(new DeviceDetectorCache(86400));
-        $deviceDetector->parse();
-
-        self::$deviceDetectorInstances[$userAgent] = $deviceDetector;
-
-        return $deviceDetector;
+        $factory = StaticContainer::get(\Piwik\DeviceDetector\DeviceDetectorFactory::class);
+        return $factory->makeInstance($userAgent);
     }
-}
+}
\ No newline at end of file
diff --git a/app/core/ErrorHandler.php b/app/core/ErrorHandler.php
index 272187d82..92a47c4f2 100644
--- a/app/core/ErrorHandler.php
+++ b/app/core/ErrorHandler.php
@@ -161,8 +161,12 @@ public static function errorHandler($errno, $errstr, $errfile, $errline)
             case E_DEPRECATED:
             case E_USER_DEPRECATED:
             default:
+                $context = array('trace' => debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 15));
                 try {
-                    StaticContainer::get(LoggerInterface::class)->warning(self::createLogMessage($errno, $errstr, $errfile, $errline));
+                    StaticContainer::get(LoggerInterface::class)->warning(
+                        self::createLogMessage($errno, $errstr, $errfile, $errline),
+                        $context
+                    );
                 } catch (\Exception $ex) {
                     // ignore (it's possible for this to happen if the StaticContainer hasn't been created yet)
                 }
diff --git a/app/core/Exception/NoWebsiteFoundException.php b/app/core/Exception/NoWebsiteFoundException.php
index 6d4c77e8f..3d38be164 100644
--- a/app/core/Exception/NoWebsiteFoundException.php
+++ b/app/core/Exception/NoWebsiteFoundException.php
@@ -8,6 +8,6 @@
  */
 namespace Piwik\Exception;
 
-class NoWebsiteFoundException extends Exception
+class NoWebsiteFoundException extends InvalidRequestParameterException
 {
 }
diff --git a/app/core/Exception/NotYetInstalledException.php b/app/core/Exception/NotYetInstalledException.php
index 388f001c2..95e31d63b 100644
--- a/app/core/Exception/NotYetInstalledException.php
+++ b/app/core/Exception/NotYetInstalledException.php
@@ -8,6 +8,6 @@
  */
 namespace Piwik\Exception;
 
-class NotYetInstalledException extends Exception
+class NotYetInstalledException extends InvalidRequestParameterException
 {
 }
diff --git a/app/core/Http.php b/app/core/Http.php
index bb4a44d3d..f7dc89f9d 100644
--- a/app/core/Http.php
+++ b/app/core/Http.php
@@ -136,7 +136,7 @@ public static function ensureDestinationDirectoryExists($destinationPath)
      * @param array $additionalHeaders List of additional headers to set for the request
      *
      * @return string|array  true (or string/array) on success; false on HTTP response error code (1xx or 4xx)
-     * @throws Exception
+     *@throws Exception
      */
     public static function sendHttpRequestBy(
         $method = 'socket',
@@ -244,19 +244,19 @@ public static function sendHttpRequestBy(
 		     * described below
 		     * @ignore
 		     */
-		    Piwik::postEvent('Http.sendHttpRequest.end', array($aUrl, $httpEventParams, &$response, &$status, &$headers));
-
-		    if ($destinationPath && file_exists($destinationPath)) {
-		    	return true;
-		    }
-		    if ($getExtendedInfo) {
-			    return array(
-				    'status'  => $status,
-				    'headers' => $headers,
-				    'data'    => $response
-			    );
+                    Piwik::postEvent('Http.sendHttpRequest.end', array($aUrl, $httpEventParams, &$response, &$status, &$headers));
+ 
+                    if ($destinationPath && file_exists($destinationPath)) {
+                        return true;
+                    }
+                    if ($getExtendedInfo) {
+                        return array(
+                            'status'  => $status,
+                            'headers' => $headers,
+                            'data'    => $response
+                        );
 		    } else {
-			    return trim($response);
+                        return trim($response);
 		    }
 	    }
 
diff --git a/app/core/LogDeleter.php b/app/core/LogDeleter.php
index 5a4fa15b0..e97416e44 100644
--- a/app/core/LogDeleter.php
+++ b/app/core/LogDeleter.php
@@ -10,6 +10,7 @@
 
 use Piwik\DataAccess\RawLogDao;
 use Piwik\Plugin\LogTablesProvider;
+use Piwik\Plugins\SitesManager\Model;
 
 /**
  * Service that deletes log entries. Methods in this class cascade, so deleting visits will delete visit actions,
@@ -69,7 +70,7 @@ public function deleteVisits($visitIds)
      * @param callable $afterChunkDeleted Callback executed after every chunk of visits are deleted.
      * @return int The number of visits deleted.
      */
-    public function deleteVisitsFor($startDatetime, $endDatetime, $idSite = null, $iterationStep = 1000, $afterChunkDeleted = null)
+    public function deleteVisitsFor($startDatetime, $endDatetime, $idSite = null, $iterationStep = 2000, $afterChunkDeleted = null)
     {
         $fields = array('idvisit');
         $conditions = array();
@@ -84,6 +85,12 @@ public function deleteVisitsFor($startDatetime, $endDatetime, $idSite = null, $i
 
         if (!empty($idSite)) {
             $conditions[] = array('idsite', '=', $idSite);
+        } elseif (!empty($startDatetime) || !empty($endDatetime)) {
+            // make sure to use index!
+            $sitesModel = new Model();
+            $allIdSites = $sitesModel->getSitesId();
+            $allIdSites = array_map('intval', $allIdSites);
+            $conditions[] = array('idsite', '', $allIdSites);
         }
 
         $logsDeleted = 0;
@@ -95,8 +102,8 @@ public function deleteVisitsFor($startDatetime, $endDatetime, $idSite = null, $i
             if (!empty($afterChunkDeleted)) {
                 $afterChunkDeleted($logsDeleted);
             }
-        });
+        }, $willDelete = true);
 
         return $logsDeleted;
     }
-}
\ No newline at end of file
+}
diff --git a/app/core/Mail.php b/app/core/Mail.php
index 64295c526..ddc229944 100644
--- a/app/core/Mail.php
+++ b/app/core/Mail.php
@@ -147,11 +147,7 @@ public function setSubject($subject)
         return parent::setSubject($subject);
     }
 
-    /**
-     * @param string $email
-     * @return string
-     */
-    protected function parseDomainPlaceholderAsPiwikHostName($email)
+    public function getMailHost()
     {
         $hostname  = Config::getInstance()->mail['defaultHostnameIfEmpty'];
         $piwikHost = Url::getCurrentHost($hostname);
@@ -162,7 +158,16 @@ protected function parseDomainPlaceholderAsPiwikHostName($email)
         if ($this->isHostDefinedAndNotLocal($url)) {
             $piwikHost = $url['host'];
         }
+        return $piwikHost;
+    }
 
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function parseDomainPlaceholderAsPiwikHostName($email)
+    {
+        $piwikHost = $this->getMailHost();
         return str_replace('{DOMAIN}', $piwikHost, $email);
     }
 
diff --git a/app/core/Metrics.php b/app/core/Metrics.php
index 9ee9a16ce..144e0ec29 100644
--- a/app/core/Metrics.php
+++ b/app/core/Metrics.php
@@ -9,6 +9,8 @@
 namespace Piwik;
 
 use Piwik\Cache as PiwikCache;
+use Piwik\Columns\MetricsList;
+use Piwik\Container\StaticContainer;
 
 require_once PIWIK_INCLUDE_PATH . "/core/Piwik.php";
 
@@ -175,6 +177,36 @@ class Metrics
         Metrics::INDEX_NB_VISITS_CONVERTED,
     );
 
+    public static function getMappingFromIdToName()
+    {
+        $cache = StaticContainer::get(PiwikCache\Transient::class);
+        $cacheKey = CacheId::siteAware(CacheId::pluginAware('Metrics.mappingFromIdToName'));
+
+        $value = $cache->fetch($cacheKey);
+        if (empty($value)) {
+            $value = self::$mappingFromIdToName;
+
+            /**
+             * Use this event if your plugin uses custom metric integer IDs to associate those IDs with the
+             * actual metric names (eg, 2 => nb_visits). This allows matomo to automate the replacing
+             * of IDs => metric names for your new metrics.
+             *
+             * **Example**
+             *
+             *     public function addMetricIdToNameMapping(&$mapping)
+             *     {
+             *         $mapping[Archiver::INDEX_MY_NEW_METRIC] = $mapping['MyPlugin_myNewMetric'];
+             *     }
+             *
+             * @ignore
+             */
+            Piwik::postEvent('Metrics.addMetricIdToNameMapping', [&$value]);
+
+            $cache->save($cacheKey, $value);
+        }
+        return $value;
+    }
+
     public static function getVisitsMetricNames()
     {
         $names = array();
diff --git a/app/core/Metrics/Formatter.php b/app/core/Metrics/Formatter.php
index 8852e2610..25e80ef81 100644
--- a/app/core/Metrics/Formatter.php
+++ b/app/core/Metrics/Formatter.php
@@ -207,7 +207,11 @@ public function formatMetrics(DataTable $dataTable, Report $report = null, $metr
         foreach ($dataTable->getRows() as $row) {
             $subtable = $row->getSubtable();
             if (!empty($subtable)) {
-                $this->formatMetrics($subtable, $report, $metricsToFormat);
+                $this->formatMetrics($subtable, $report, $metricsToFormat, $formatAll);
+            }
+            $comparisons = $row->getComparisons();
+            if (!empty($comparisons)) {
+                $this->formatMetrics($comparisons, $report, $metricsToFormat, $formatAll);
             }
         }
 
diff --git a/app/core/Piwik.php b/app/core/Piwik.php
index e252b09de..1768b8219 100644
--- a/app/core/Piwik.php
+++ b/app/core/Piwik.php
@@ -332,12 +332,7 @@ public static function isUserIsAnonymous()
      */
     public static function checkUserIsNotAnonymous()
     {
-        if (Access::getInstance()->hasSuperUserAccess()) {
-            return;
-        }
-        if (self::isUserIsAnonymous()) {
-            throw new NoAccessException(Piwik::translate('General_YouMustBeLoggedIn'));
-        }
+        Access::getInstance()->checkUserIsNotAnonymous();
     }
 
     /**
@@ -606,7 +601,7 @@ public static function getAction()
      * @param array|string $columns
      * @return array
      */
-    public static function getArrayFromApiParameter($columns)
+    public static function getArrayFromApiParameter($columns, $unique = true)
     {
         if (empty($columns)) {
             return array();
@@ -615,7 +610,9 @@ public static function getArrayFromApiParameter($columns)
             return $columns;
         }
         $array = explode(',', $columns);
-        $array = array_unique($array);
+        if ($unique) {
+            $array = array_unique($array);
+        }
         return $array;
     }
 
diff --git a/app/core/Plugin.php b/app/core/Plugin.php
index ebd80595d..a3187bf70 100644
--- a/app/core/Plugin.php
+++ b/app/core/Plugin.php
@@ -12,8 +12,9 @@
 use Piwik\Plugin\Dependency;
 use Piwik\Plugin\Manager;
 use Piwik\Plugin\MetadataLoader;
-if (!class_exists('\Piwik\Plugin')) {
 
+if (!class_exists('Piwik\Plugin')) {
+  
 /**
  * Base class of all Plugin Descriptor classes.
  *
@@ -595,3 +596,4 @@ private function makeDependency($piwikVersion)
     }
 }
 }
+    
diff --git a/app/core/Plugin/Controller.php b/app/core/Plugin/Controller.php
index 2fa31f341..176a040dc 100644
--- a/app/core/Plugin/Controller.php
+++ b/app/core/Plugin/Controller.php
@@ -314,6 +314,10 @@ protected function renderTemplateAs($template, array $variables = array(), $view
             $view->$key = $value;
         }
 
+        if (isset($view->siteName)) {
+            $view->siteNameDecoded = Common::unsanitizeInputValue($view->siteName);
+        }
+
         return $view->render();
     }
 
@@ -616,7 +620,6 @@ protected function setGeneralVariablesViewAs($view, $viewType)
         $this->setPeriodVariablesView($view);
 
         $view->siteName = $this->site->getName();
-        $view->siteNameDecoded = Common::unsanitizeInputValue($view->siteName);
         $view->siteMainUrl = $this->site->getMainUrl();
 
         $siteTimezone = $this->site->getTimezone();
@@ -1026,8 +1029,8 @@ public static function getPrettyDate($date, $period)
 
     protected function checkSitePermission()
     {
-        if (!empty($this->idSite) && empty($this->site)) {
-            throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'view'", $this->idSite)));
+        if (!empty($this->idSite)) {
+            Access::getInstance()->checkUserHasViewAccess($this->idSite);
         } elseif (empty($this->site) || empty($this->idSite)) {
             throw new Exception("The requested website idSite is not found in the request, or is invalid.
 				Please check that you are logged in Matomo and have permission to access the specified website.");
@@ -1065,3 +1068,4 @@ private function checkViewType($viewType)
         }
     }
 }
+
diff --git a/app/core/Plugin/ControllerAdmin.php b/app/core/Plugin/ControllerAdmin.php
index 90189d555..82b5e2e4c 100644
--- a/app/core/Plugin/ControllerAdmin.php
+++ b/app/core/Plugin/ControllerAdmin.php
@@ -128,7 +128,6 @@ private static function notifyAnyInvalidPlugin()
     protected function setBasicVariablesViewAs($view, $viewType = 'admin')
     {
         $this->setBasicVariablesNoneAdminView($view);
-
         if ($viewType == 'admin') {
             self::setBasicVariablesAdminView($view);
         }
diff --git a/app/core/Plugin/LogTablesProvider.php b/app/core/Plugin/LogTablesProvider.php
index 97381bb77..8cd5884f2 100644
--- a/app/core/Plugin/LogTablesProvider.php
+++ b/app/core/Plugin/LogTablesProvider.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugin;
 
 use Piwik\Container\StaticContainer;
+use Piwik\DataAccess\LogTableTemporary;
 use Piwik\Piwik;
 use Piwik\Tracker\LogTable;
 
@@ -24,6 +25,11 @@ class LogTablesProvider {
      */
     private $tablesCache;
 
+    /**
+     * @var LogTableTemporary
+     */
+    private $tempTable;
+
     public function __construct(Manager $pluginManager)
     {
         $this->pluginManager = $pluginManager;
@@ -37,6 +43,9 @@ public function __construct(Manager $pluginManager)
      */
     public function getLogTable($tableNameWithoutPrefix)
     {
+        if ($this->tempTable && $this->tempTable->getName() === $tableNameWithoutPrefix) {
+            return $this->tempTable;
+        }
         foreach ($this->getAllLogTables() as $table) {
             if ($table->getName() === $tableNameWithoutPrefix) {
                 return $table;
@@ -44,6 +53,32 @@ public function getLogTable($tableNameWithoutPrefix)
         }
     }
 
+    /**
+     * @param LogTableTemporary|null $table
+     */
+    public function setTempTable($table)
+    {
+        $this->tempTable = $table;
+    }
+
+    public function clearCache()
+    {
+        $this->tablesCache = null;
+    }
+
+    /**
+     * Needed for log query builder
+     * @return LogTable[]
+     */
+    public function getAllLogTablesWithTemporary()
+    {
+        $tables = $this->getAllLogTables();
+        if ($this->tempTable) {
+            $tables[] = $this->tempTable;
+        }
+        return $tables;
+    }
+
     /**
      * Get all log table instances defined by any activated and loaded plugin. The returned tables are not sorted in
      * any order.
diff --git a/app/core/Plugin/Manager.php b/app/core/Plugin/Manager.php
index 5cddf2fc7..fd5b9d56b 100644
--- a/app/core/Plugin/Manager.php
+++ b/app/core/Plugin/Manager.php
@@ -35,8 +35,6 @@
 use Piwik\Translation\Translator;
 use Piwik\Updater;
 
-require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
-
 /**
  * The singleton that manages plugin loading/unloading and installation/uninstallation.
  */
@@ -369,17 +367,7 @@ public static function initPluginDirectories()
 
             $pluginDirs = self::getPluginsDirectories();
             if (count($pluginDirs) > 1) {
-                spl_autoload_register(function ($className) use ($pluginDirs) {
-                    if (strpos($className, 'Piwik\Plugins\\') === 0) {
-                        $withoutPrefix = str_replace('Piwik\Plugins\\', '', $className);
-                        $path = str_replace('\\', DIRECTORY_SEPARATOR, $withoutPrefix) . '.php';
-                        foreach ($pluginDirs as $pluginsDirectory) {
-                            if (file_exists($pluginsDirectory . $path)) {
-                                require_once $pluginsDirectory . $path;
-                            }
-                        }
-                    }
-                });
+                self::registerPluginDirAutoload($pluginDirs);
             }
         }
 
@@ -395,6 +383,26 @@ public static function initPluginDirectories()
         }
     }
 
+    /**
+     * Registers a new autoloader to support the loading of Matomo plugin classes when the plugins are installed
+     * outside the Matomo plugins folder.
+     * @param array $pluginDirs
+     */
+    public static function registerPluginDirAutoload($pluginDirs)
+    {
+        spl_autoload_register(function ($className) use ($pluginDirs) {
+            if (strpos($className, 'Piwik\Plugins\\') === 0) {
+                $withoutPrefix = str_replace('Piwik\Plugins\\', '', $className);
+                $path = str_replace('\\', DIRECTORY_SEPARATOR, $withoutPrefix) . '.php';
+                foreach ($pluginDirs as $pluginsDirectory) {
+                    if (file_exists($pluginsDirectory . $path)) {
+                        require_once $pluginsDirectory . $path;
+                    }
+                }
+            }
+        });
+    }
+
     public static function getAlternativeWebRootDirectories()
     {
         $dirs = array();
@@ -1647,3 +1655,4 @@ public function loadPluginTranslations()
         }
     }
 }
+
diff --git a/app/core/Plugin/ViewDataTable.php b/app/core/Plugin/ViewDataTable.php
index 64248a327..2cb2837b6 100644
--- a/app/core/Plugin/ViewDataTable.php
+++ b/app/core/Plugin/ViewDataTable.php
@@ -9,10 +9,14 @@
 namespace Piwik\Plugin;
 
 use Piwik\API\Request;
+use Piwik\API\Request as ApiRequest;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Sparkline;
+use Piwik\View;
 use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Config as VizConfig;
 use Piwik\ViewDataTable\Manager as ViewDataTableManager;
@@ -169,6 +173,8 @@ abstract class ViewDataTable implements ViewInterface
      */
     protected $request;
 
+    private $isComparing = null;
+
     /**
      * Constructor. Initializes display and request properties to their default values.
      * Posts the {@hook ViewDataTable.configure} event which plugins can use to configure the
@@ -356,7 +362,12 @@ protected function loadDataTableFromAPI()
             return $this->dataTable;
         }
 
-        $this->dataTable = $this->request->loadDataTableFromAPI();
+        $extraParams = [];
+        if ($this->isComparing()) {
+            $extraParams['compare'] = '1';
+        }
+
+        $this->dataTable = $this->request->loadDataTableFromAPI($extraParams);
 
         return $this->dataTable;
     }
@@ -590,4 +601,41 @@ public function getNonOverridableParams($overrideParams)
         return $paramsCannotBeOverridden;
     }
 
+    /**
+     * Returns true if both this current visualization supports comparison, and if comparison query parameters
+     * are present in the URL.
+     *
+     * @return bool
+     */
+    public function isComparing()
+    {
+        if (!$this->supportsComparison()
+            || $this->config->disable_comparison
+        ) {
+            return false;
+        }
+
+        $request = $this->request->getRequestArray();
+        $request = ApiRequest::getRequestArrayFromString($request);
+
+        $result = DataComparisonFilter::isCompareParamsPresent($request);
+        return $result;
+    }
+
+    /**
+     * Implementations should override this method if they support a special comparison view. By
+     * default, it is assumed visualizations do not support comparison.
+     *
+     * @return bool
+     */
+    public function supportsComparison()
+    {
+        return false;
+    }
+
+    public function getRequestArray()
+    {
+        $requestArray = $this->request->getRequestArray();
+        return ApiRequest::getRequestArrayFromString($requestArray);
+    }
 }
diff --git a/app/core/Plugin/Visualization.php b/app/core/Plugin/Visualization.php
index b130f3c28..1695bd04c 100644
--- a/app/core/Plugin/Visualization.php
+++ b/app/core/Plugin/Visualization.php
@@ -12,6 +12,7 @@
 use Piwik\API\DataTablePostProcessor;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
+use Piwik\API\Request as ApiRequest;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
@@ -25,11 +26,12 @@
 use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\API\API as ApiApi;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
+use Piwik\SettingsPiwik;
 use Piwik\View;
 use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\Plugin\Manager as PluginManager;
-use Piwik\API\Request as ApiRequest;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -190,7 +192,9 @@ public function render()
             $this->applyFilters();
             $this->addVisualizationInfoFromMetricMetadata();
             $this->afterAllFiltersAreApplied();
+
             $this->beforeRender();
+            $this->fireBeforeRenderHook();
 
             $this->logMessageIfRequestPropertiesHaveChanged($requestPropertiesAfterLoadDataTable);
         } catch (NoAccessException $e) {
@@ -245,6 +249,17 @@ public function render()
         $view->footerIcons = $this->config->footer_icons;
         $view->isWidget    = Common::getRequestVar('widget', 0, 'int');
         $view->notifications = [];
+        $view->isComparing = $this->isComparing();
+
+        if (!$this->supportsComparison()
+            && DataComparisonFilter::isCompareParamsPresent()
+            && empty($view->dataTableHasNoData)
+        ) {
+            if (empty($view->properties['show_footer_message'])) {
+                $view->properties['show_footer_message'] = '';
+            }
+            $view->properties['show_footer_message'] .= '<br/>' . Piwik::translate('General_VisualizationDoesNotSupportComparison');
+        }
 
         if (empty($this->dataTable) || !$this->hasAnyData($this->dataTable)) {
             /**
@@ -403,6 +418,19 @@ private function postDataTableLoadedFromAPI()
         $hasNbVisits       = in_array('nb_visits', $columns);
         $hasNbUniqVisitors = in_array('nb_uniq_visitors', $columns);
 
+        // if any comparison period doesn't support unique visitors, we can't display it for the main table
+        if ($this->isComparing()) {
+            $request = $this->getRequestArray();
+            if (!empty($request['comparePeriods'])) {
+                foreach ($request['comparePeriods'] as $comparePeriod) {
+                    if (!SettingsPiwik::isUniqueVisitorsEnabled($comparePeriod)) {
+                        $hasNbUniqVisitors = false;
+                        break;
+                    }
+                }
+            }
+        }
+
         // default columns_to_display to label, nb_uniq_visitors/nb_visits if those columns exist in the
         // dataset. otherwise, default to all columns in dataset.
         if (empty($this->config->columns_to_display)) {
@@ -490,7 +518,6 @@ private function applyFilters()
             foreach ($self->config->getPresentationFilters() as $filter) {
                 $dataTable->queueFilter($filter[0], $filter[1]);
             }
-
         });
 
         $this->dataTable = $postProcessor->process($this->dataTable);
@@ -666,6 +693,10 @@ protected function getClientSideParametersToSet()
             $javascriptVariablesToSet['segment'] = $rawSegment;
         }
 
+        if (isset($javascriptVariablesToSet['compareSegments'])) {
+            $javascriptVariablesToSet['compareSegments'] = Common::unsanitizeInputValues($javascriptVariablesToSet['compareSegments']);
+        }
+
         return $javascriptVariablesToSet;
     }
 
@@ -723,6 +754,17 @@ public function beforeRender()
         // eg $this->config->showFooterColumns = true;
     }
 
+    private function fireBeforeRenderHook()
+    {
+        /**
+         * Posted immediately before rendering the view. Plugins can use this event to perform last minute
+         * configuration of the view based on it's data or the report being viewed.
+         *
+         * @param Visualization $view The instance to configure.
+         */
+        Piwik::postEvent('Visualization.beforeRender', [$this]);
+    }
+
     private function makeDataTablePostProcessor()
     {
         $request = $this->buildApiRequestArray();
@@ -788,8 +830,7 @@ private function makeSureArrayContainsOnlyStrings($array)
      */
     public function buildApiRequestArray()
     {
-        $requestArray = $this->request->getRequestArray();
-        $request = ApiRequest::getRequestArrayFromString($requestArray);
+        $request = $this->getRequestArray();
 
         if (false === $this->config->enable_sort) {
             $request['filter_sort_column'] = '';
@@ -804,6 +845,10 @@ public function buildApiRequestArray()
             unset($request['disable_queued_filters']);
         }
 
+        if ($this->isComparing()) {
+            $request['compare'] = '1';
+        }
+
         return $request;
     }
 }
diff --git a/app/core/ProfessionalServices/Advertising.php b/app/core/ProfessionalServices/Advertising.php
index 56ea72c5c..b59d8b868 100644
--- a/app/core/ProfessionalServices/Advertising.php
+++ b/app/core/ProfessionalServices/Advertising.php
@@ -55,7 +55,7 @@ public function areAdsForProfessionalServicesEnabled()
      */
     public function getPromoUrlForProfessionalServices($campaignMedium, $campaignContent = '')
     {
-        $url = 'https://matomo.org/support/?';
+        $url = 'https://matomo.org/support-plans/?';
 
         $campaign = $this->getCampaignParametersForPromoUrl(
             $name = self::CAMPAIGN_NAME_PROFESSIONAL_SERVICES,
@@ -102,7 +102,7 @@ public function addPromoCampaignParametersToUrl($url, $campaignName, $campaignMe
      */
     private function getCampaignParametersForPromoUrl($campaignName, $campaignMedium, $campaignContent = '')
     {
-        $campaignName = sprintf('pk_campaign=%s&pk_medium=%s&pk_source=Piwik_App', $campaignName, $campaignMedium);
+        $campaignName = sprintf('pk_campaign=%s&pk_medium=%s&pk_source=Matomo_App', $campaignName, $campaignMedium);
 
         if (!empty($campaignContent)) {
             $campaignName .= '&pk_content=' . $campaignContent;
diff --git a/app/core/Profiler.php b/app/core/Profiler.php
index 49bba4188..1e019733b 100644
--- a/app/core/Profiler.php
+++ b/app/core/Profiler.php
@@ -210,7 +210,7 @@ public static function setupProfilerXHProf($mainRun = false, $setupDuringTrackin
         }
 
         $hasXhprof = function_exists('xhprof_enable');
-        $hasTidewaysXhprof = function_exists('tideways_xhprof_enable');
+        $hasTidewaysXhprof = function_exists('tideways_xhprof_enable') || function_exists('tideways_enable');
 
         if (!$hasXhprof && !$hasTidewaysXhprof) {
             $xhProfPath = PIWIK_INCLUDE_PATH . '/vendor/facebook/xhprof/extension/modules/xhprof.so';
@@ -248,6 +248,8 @@ function xhprof_error($out)
 
         if (function_exists('xhprof_enable')) {
             xhprof_enable(XHPROF_FLAGS_CPU + XHPROF_FLAGS_MEMORY);
+        } elseif (function_exists('tideways_enable')) {
+            tideways_enable(TIDEWAYS_FLAGS_MEMORY | TIDEWAYS_FLAGS_CPU);
         } elseif (function_exists('tideways_xhprof_enable')) {
             tideways_xhprof_enable(TIDEWAYS_XHPROF_FLAGS_MEMORY | TIDEWAYS_XHPROF_FLAGS_CPU);
         }
@@ -257,8 +259,12 @@ function xhprof_error($out)
                 $xhprofData = xhprof_disable();
                 $xhprofRuns = new XHProfRuns_Default();
                 $runId = $xhprofRuns->save_run($xhprofData, $profilerNamespace);
-            } elseif (function_exists('tideways_xhprof_disable')) {
-                $xhprofData = tideways_xhprof_disable();
+            } elseif (function_exists('tideways_xhprof_disable') || function_exists('tideways_disable')) {
+                if (function_exists('tideways_xhprof_disable')) {
+                    $xhprofData = tideways_xhprof_disable();
+                } else {
+                    $xhprofData = tideways_disable();
+                }
                 $runId = uniqid();
                 file_put_contents(
                     $outputDir . DIRECTORY_SEPARATOR . $runId . '.' . $profilerNamespace . '.xhprof',
diff --git a/app/core/RankingQuery.php b/app/core/RankingQuery.php
index fd4f69b16..c78400039 100644
--- a/app/core/RankingQuery.php
+++ b/app/core/RankingQuery.php
@@ -41,6 +41,9 @@
  */
 class RankingQuery
 {
+    // a special label used to mark the 'Others' row in a ranking query result set. this is mapped to the
+    // datatable summary row during archiving.
+    const LABEL_SUMMARY_ROW = '__mtm_ranking_query_others__';
 
     /**
      * Contains the labels of the inner query.
@@ -84,7 +87,7 @@ class RankingQuery
      * The value to use in the label of the 'Others' row.
      * @var string
      */
-    private $othersLabelValue = 'Others';
+    private $othersLabelValue = self::LABEL_SUMMARY_ROW;
 
     /**
      * Constructor.
@@ -223,7 +226,7 @@ public function partitionResultIntoMultipleGroups($partitionColumn, $possibleVal
     public function execute($innerQuery, $bind = array())
     {
         $query = $this->generateRankingQuery($innerQuery);
-        $data  = Db::fetchAll($query, $bind);
+        $data  = Db::getReader()->fetchAll($query, $bind);
 
         if ($this->columnToMarkExcludedRows !== false) {
             // split the result into the regular result and the rows with special treatment
diff --git a/app/core/Segment.php b/app/core/Segment.php
index 765eeb344..c10eee2cf 100644
--- a/app/core/Segment.php
+++ b/app/core/Segment.php
@@ -13,7 +13,7 @@
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\LogQueryBuilder;
-use Piwik\Plugins\API\API;
+use Piwik\Plugins\SegmentEditor\SegmentEditor;
 use Piwik\Segment\SegmentExpression;
 
 /**
@@ -75,6 +75,11 @@ class Segment
      */
     private $segmentQueryBuilder;
 
+    /**
+     * @var bool
+     */
+    private $isSegmentEncoded;
+
     /**
      * Truncate the Segments to 8k
      */
@@ -99,12 +104,31 @@ public function __construct($segmentCondition, $idSites)
             throw new Exception("The Super User has disabled the Segmentation feature.");
         }
 
-        // First try with url decoded value. If that fails, try with raw value.
-        // If that also fails, it will throw the exception
+        // The segment expression can be urlencoded. Unfortunately, both the encoded and decoded versions
+        // can usually be parsed successfully. To pick the right one, we try both and pick the one w/ more
+        // successfully parsed subexpressions.
+        $subexpressionsDecoded = 0;
         try {
             $this->initializeSegment(urldecode($segmentCondition), $idSites);
+            $subexpressionsDecoded = $this->segmentExpression->getSubExpressionCount();
         } catch (Exception $e) {
+            // ignore
+        }
+
+        $subexpressionsRaw = 0;
+        try {
             $this->initializeSegment($segmentCondition, $idSites);
+            $subexpressionsRaw = $this->segmentExpression->getSubExpressionCount();
+        } catch (Exception $e) {
+            // ignore
+        }
+
+        if ($subexpressionsRaw > $subexpressionsDecoded) {
+            $this->initializeSegment($segmentCondition, $idSites);
+            $this->isSegmentEncoded = false;
+        } else {
+            $this->initializeSegment(urldecode($segmentCondition), $idSites);
+            $this->isSegmentEncoded = true;
         }
     }
 
@@ -331,11 +355,13 @@ public static function getSegmentHash($definition)
      * @param false|string $groupBy (optional) Group by clause, eg, `"t2.col2"`.
      * @param int $limit Limit number of result to $limit
      * @param int $offset Specified the offset of the first row to return
+     * @param bool $forceGroupBy Force the group by and not using a subquery. Note: This may make the query slower see https://github.com/matomo-org/matomo/issues/9200#issuecomment-183641293
+     *                           A $groupBy value needs to be set for this to work. 
      * @param int If set to value >= 1 then the Select query (and All inner queries) will be LIMIT'ed by this value.
      *              Use only when you're not aggregating or it will sample the data.
      * @return string The entire select query.
      */
-    public function getSelectQuery($select, $from, $where = false, $bind = array(), $orderBy = false, $groupBy = false, $limit = 0, $offset = 0)
+    public function getSelectQuery($select, $from, $where = false, $bind = array(), $orderBy = false, $groupBy = false, $limit = 0, $offset = 0, $forceGroupBy = false)
     {
         $segmentExpression = $this->segmentExpression;
 
@@ -344,8 +370,23 @@ public function getSelectQuery($select, $from, $where = false, $bind = array(),
             $limitAndOffset = (int) $offset . ', ' . (int) $limit;
         }
 
-        return $this->segmentQueryBuilder->getSelectQueryString($segmentExpression, $select, $from, $where, $bind,
-            $groupBy, $orderBy, $limitAndOffset);
+        try {
+            if ($forceGroupBy && $groupBy) {
+                $this->segmentQueryBuilder->forceInnerGroupBySubselect(LogQueryBuilder::FORCE_INNER_GROUP_BY_NO_SUBSELECT);
+            }
+            $result = $this->segmentQueryBuilder->getSelectQueryString($segmentExpression, $select, $from, $where, $bind,
+                $groupBy, $orderBy, $limitAndOffset);
+        } catch (Exception $e) {
+            if ($forceGroupBy && $groupBy) {
+                $this->segmentQueryBuilder->forceInnerGroupBySubselect('');
+            }
+            throw $e;
+        }
+
+        if ($forceGroupBy && $groupBy) {
+            $this->segmentQueryBuilder->forceInnerGroupBySubselect('');
+        }
+        return $result;
     }
 
     /**
@@ -408,4 +449,30 @@ private static function containsCondition($segment, $operator, $segmentCondition
             || $segment === urlencode($segmentCondition)
             || $segment === urldecode($segmentCondition);
     }
+
+    public function getStoredSegmentName($idSite)
+    {
+        $segment = $this->getString();
+        if (empty($segment)) {
+            return Piwik::translate('SegmentEditor_DefaultAllVisits');
+        }
+
+        $availableSegments = SegmentEditor::getAllSegmentsForSite($idSite);
+
+        $foundStoredSegment = null;
+        foreach ($availableSegments as $storedSegment) {
+            if ($storedSegment['definition'] == $segment
+                || $storedSegment['definition'] == urldecode($segment)
+                || $storedSegment['definition'] == urlencode($segment)
+            ) {
+                $foundStoredSegment = $storedSegment;
+            }
+        }
+
+        if (isset($foundStoredSegment)) {
+            return $foundStoredSegment['name'];
+        }
+
+        return $this->isSegmentEncoded ? urldecode($segment) : $segment;
+    }
 }
diff --git a/app/core/Segment/SegmentExpression.php b/app/core/Segment/SegmentExpression.php
index f9386fa44..4a85fc0ab 100644
--- a/app/core/Segment/SegmentExpression.php
+++ b/app/core/Segment/SegmentExpression.php
@@ -74,6 +74,15 @@ public function isEmpty()
     protected $tree = array();
     protected $parsedSubExpressions = array();
 
+    public function getSubExpressionCount()
+    {
+        $cleaned = array_filter($this->parsedSubExpressions, function ($part) {
+            $isExpressionColumnPresent = !empty($part[1][0]);
+            return $isExpressionColumnPresent;
+        });
+        return count($cleaned);
+    }
+
     /**
      * Given the array of parsed filters containing, for each filter,
      * the boolean operator (AND/OR) and the operand,
diff --git a/app/core/Session.php b/app/core/Session.php
index 1dbca1580..024c5246d 100644
--- a/app/core/Session.php
+++ b/app/core/Session.php
@@ -54,9 +54,8 @@ public static function start($options = false)
         ) {
             return;
         }
-
         self::$sessionStarted = true;
-
+    
         if (defined('PIWIK_SESSION_NAME')) {
             self::$sessionName = PIWIK_SESSION_NAME;
         }
@@ -149,7 +148,7 @@ public static function start($options = false)
             } else {
                 $pathToSessions = Filechecks::getErrorMessageMissingPermissions(self::getSessionsDirectory());
             }
-
+            
             $message = sprintf("Error: %s %s\n<pre>Debug: the original error was \n%s</pre>",
                 Piwik::translate('General_ExceptionUnableToStartSession'),
                 $pathToSessions,
@@ -175,10 +174,11 @@ public static function getSessionsDirectory()
 
     public static function close()
     {
-    	if (self::isSessionStarted()) {
-    		// only write/close session if the session was actually started by us
-		    parent::writeClose();
-	    }
+        if (self::isSessionStarted()) {
+            // only write/close session if the session was actually started by us
+            // otherwise we will set the session values to base64 encoded and whoever the session started might not expect the values in that way
+            parent::writeClose();
+        }
     }
 
     public static function isSessionStarted()
diff --git a/app/core/Session/SessionFingerprint.php b/app/core/Session/SessionFingerprint.php
index 4955247d0..df8a519e5 100644
--- a/app/core/Session/SessionFingerprint.php
+++ b/app/core/Session/SessionFingerprint.php
@@ -36,6 +36,9 @@
  */
 class SessionFingerprint
 {
+    // used in case the global.ini.php becomes corrupt or doesn't update properly
+    const DEFAULT_IDLE_TIMEOUT = 3600;
+
     const USER_NAME_SESSION_VAR_NAME = 'user.name';
     const SESSION_INFO_SESSION_VAR_NAME = 'session.info';
     const SESSION_INFO_TWO_FACTOR_AUTH_VERIFIED = 'twofactorauth.verified';
@@ -138,8 +141,17 @@ private function getExpirationTimeFromNow($time = null)
     {
         $time = $time ?: Date::now()->getTimestampUTC();
 
-        $nonRememberedSessionExpireTime = Config::getInstance()->General['login_session_not_remembered_idle_timeout'];
-        $sessionCookieLifetime = Config::getInstance()->General['login_cookie_expire'];
+        $general = Config::getInstance()->General;
+
+        if (!isset($general['login_session_not_remembered_idle_timeout'])
+            || (int) $general['login_session_not_remembered_idle_timeout'] <= 0
+        ) {
+            $nonRememberedSessionExpireTime = self::DEFAULT_IDLE_TIMEOUT;
+        } else {
+            $nonRememberedSessionExpireTime = (int) $general['login_session_not_remembered_idle_timeout'];
+        }
+
+        $sessionCookieLifetime = $general['login_cookie_expire'];
 
         if ($this->isRemembered()) {
             $expireDuration = $sessionCookieLifetime;
diff --git a/app/core/Tracker.php b/app/core/Tracker.php
index cca32fae6..3e0cefc4c 100644
--- a/app/core/Tracker.php
+++ b/app/core/Tracker.php
@@ -9,6 +9,7 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Container\StaticContainer;
 use Piwik\Plugins\BulkTracking\Tracker\Requests;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 use Piwik\Tracker\Db as TrackerDb;
@@ -19,6 +20,7 @@
 use Piwik\Tracker\TrackerConfig;
 use Piwik\Tracker\Visit;
 use Piwik\Plugin\Manager as PluginManager;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class used by the logging script piwik.php called by the javascript tag.
@@ -43,6 +45,16 @@ class Tracker
     private $countOfLoggedRequests = 0;
     protected $isInstalled = null;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct()
+    {
+        $this->logger = StaticContainer::get(LoggerInterface::class);
+    }
+
     public function isDebugModeEnabled()
     {
         return array_key_exists('PIWIK_TRACKER_DEBUG', $GLOBALS) && $GLOBALS['PIWIK_TRACKER_DEBUG'] === true;
@@ -53,7 +65,7 @@ public function shouldRecordStatistics()
         $record = TrackerConfig::getConfigValue('record_statistics') != 0;
 
         if (!$record) {
-            Common::printDebug('Tracking is disabled in the config.ini.php via record_statistics=0');
+            $this->logger->debug('Tracking is disabled in the config.ini.php via record_statistics=0');
         }
 
         return $record && $this->isInstalled();
@@ -74,8 +86,9 @@ private function init()
             ErrorHandler::registerErrorHandler();
             ExceptionHandler::setUp();
 
-            Common::printDebug("Debug enabled - Input parameters: ");
-            Common::printDebug(var_export($_GET + $_POST, true));
+            $this->logger->debug("Debug enabled - Input parameters: {params}", [
+                'params' => var_export($_GET + $_POST, true),
+            ]);
         }
     }
 
@@ -129,9 +142,11 @@ public function track(Handler $handler, RequestSet $requestSet)
     public function trackRequest(Request $request)
     {
         if ($request->isEmptyRequest()) {
-            Common::printDebug("The request is empty");
+            $this->logger->debug('The request is empty');
         } else {
-            Common::printDebug("Current datetime: " . date("Y-m-d H:i:s", $request->getCurrentTimestamp()));
+            $this->logger->debug('Current datetime: {date}', [
+                'date' => date("Y-m-d H:i:s", $request->getCurrentTimestamp()),
+            ]);
 
             $visit = Visit\Factory::make();
             $visit->setRequest($request);
@@ -306,15 +321,20 @@ protected function loadTrackerPlugins()
         try {
             $pluginManager  = PluginManager::getInstance();
             $pluginsTracker = $pluginManager->loadTrackerPlugins();
-            Common::printDebug("Loading plugins: { " . implode(", ", $pluginsTracker) . " }");
+
+            $this->logger->debug("Loading plugins: { {plugins} }", [
+                'plugins' => implode(", ", $pluginsTracker),
+            ]);
         } catch (Exception $e) {
-            Common::printDebug("ERROR: " . $e->getMessage());
+            $this->logger->error('Error loading tracker plugins: {exception}', [
+                'exception' => $e,
+            ]);
         }
     }
 
     private function handleFatalErrors()
     {
-        register_shutdown_function(function () {
+        register_shutdown_function(function () { // TODO: add a log here
             $lastError = error_get_last();
             if (!empty($lastError) && $lastError['type'] == E_ERROR) {
                 Common::sendResponseCode(500);
diff --git a/app/core/Tracker/Action.php b/app/core/Tracker/Action.php
index 5a7a3d9b0..d0caddcdc 100644
--- a/app/core/Tracker/Action.php
+++ b/app/core/Tracker/Action.php
@@ -11,10 +11,12 @@
 
 use Exception;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\ActionDimension;
 use Piwik\Plugin\Manager;
 use Piwik\Tracker;
+use Psr\Log\LoggerInterface;
 
 /**
  * An action
@@ -76,6 +78,11 @@ abstract class Action
      */
     private $rawActionUrl;
 
+    /**
+     * @var mixed|LoggerInterface
+     */
+    private $logger;
+
     /**
      * Makes the correct Action object based on the request.
      *
@@ -148,6 +155,7 @@ public function __construct($type, Request $request)
     {
         $this->actionType = $type;
         $this->request    = $request;
+        $this->logger = StaticContainer::get(LoggerInterface::class);
     }
 
     /**
@@ -202,8 +210,12 @@ protected function setActionUrl($url)
         $this->actionUrl = PageUrl::getUrlIfLookValid($url2);
 
         if ($url != $this->rawActionUrl) {
-            Common::printDebug(' Before was "' . $this->rawActionUrl . '"');
-            Common::printDebug(' After is "' . $url2 . '"');
+            $this->logger->debug(' Before was "{rawActionUrl}"', [
+                'rawActionUrl' => $this->rawActionUrl,
+            ]);
+            $this->logger->debug(' After is "{url2}"', [
+                'url2' => $url2,
+            ]);
         }
     }
 
@@ -332,7 +344,7 @@ public function loadIdsFromLogActionTable()
 
                 $actionId        = $dimension->getActionId();
                 $actions[$field] = array($value, $actionId);
-                Common::printDebug("$field = $value");
+                $this->logger->debug("$field = $value");
             }
         }
 
@@ -403,10 +415,11 @@ public function record(Visitor $visitor, $idReferrerActionUrl, $idReferrerAction
 
         $visitAction['idlink_va'] = $this->idLinkVisitAction;
 
-        Common::printDebug("Inserted new action:");
         $visitActionDebug = $visitAction;
         $visitActionDebug['idvisitor'] = bin2hex($visitActionDebug['idvisitor']);
-        Common::printDebug($visitActionDebug);
+        $this->logger->debug("Inserted new action: {action}", [
+            'action' => var_export($visitActionDebug, true),
+        ]);
     }
 
     public function writeDebugInfo()
@@ -415,9 +428,11 @@ public function writeDebugInfo()
         $name = $this->getActionName();
         $url  = $this->getActionUrl();
 
-        Common::printDebug("Action is a $type,
-                Action name =  " . $name . ",
-                Action URL = " . $url);
+        $this->logger->debug('Action is a {type}, Action name = {name}, Action URL = {url}', [
+            'type' => $type,
+            'name' => $name,
+            'url' => $url,
+        ]);
 
         return true;
     }
diff --git a/app/core/Tracker/Cache.php b/app/core/Tracker/Cache.php
index cd6061446..f20223d23 100644
--- a/app/core/Tracker/Cache.php
+++ b/app/core/Tracker/Cache.php
@@ -13,9 +13,11 @@
 use Piwik\Cache as PiwikCache;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Tracker;
+use Psr\Log\LoggerInterface;
 
 /**
  * Simple cache mechanism used in Tracker to avoid requesting settings from mysql on every request
@@ -116,7 +118,9 @@ public static function updateCacheWebsiteAttributes($idSite)
              * @param int $idSite The site ID to get attributes for.
              */
             Piwik::postEvent('Tracker.Cache.getSiteAttributes', array(&$content, $idSite));
-            Common::printDebug("Website $idSite tracker cache was re-created.");
+
+            $logger = StaticContainer::get(LoggerInterface::class);
+            $logger->debug("Website $idSite tracker cache was re-created.");
         });
 
         // if nothing is returned from the plugins, we don't save the content
@@ -191,7 +195,9 @@ public static function updateGeneralCache()
          */
         Piwik::postEvent('Tracker.setTrackerCacheGeneral', array(&$cacheContent));
         self::setCacheGeneral($cacheContent);
-        Common::printDebug("General tracker cache was re-created.");
+
+        $logger = StaticContainer::get(LoggerInterface::class);
+        $logger->debug("General tracker cache was re-created.");
 
         Tracker::restoreTrackerPlugins();
 
diff --git a/app/core/Tracker/Db.php b/app/core/Tracker/Db.php
index c07b26ebb..c3d1eeb98 100644
--- a/app/core/Tracker/Db.php
+++ b/app/core/Tracker/Db.php
@@ -261,13 +261,13 @@ public static function factory($configDb)
          */
         Piwik::postEvent('Tracker.getDatabaseConfig', array(&$configDb));
 
-	    $className = 'Piwik\Tracker\Db\\' . str_replace(' ', '\\', ucwords(str_replace(array('_', '\\'), ' ', strtolower($configDb['adapter']))));
+        $className = 'Piwik\Tracker\Db\\' . str_replace(' ', '\\', ucwords(str_replace(array('_', '\\'), ' ', strtolower($configDb['adapter']))));
 
-	    if (!class_exists($className)) {
-		    throw new Exception('Unsupported database adapter ' . $configDb['adapter']);
-	    }
+        if (!class_exists($className)) {
+           throw new Exception('Unsupported database adapter ' . $configDb['adapter']);
+        }
 
-	    return new $className($configDb);
+        return new $className($configDb);
     }
 
     public static function connectPiwikTrackerDb()
diff --git a/app/core/Tracker/Handler.php b/app/core/Tracker/Handler.php
index cb4707a01..f4c9fa933 100644
--- a/app/core/Tracker/Handler.php
+++ b/app/core/Tracker/Handler.php
@@ -10,11 +10,13 @@
 namespace Piwik\Tracker;
 
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Tracker;
 use Exception;
 use Piwik\Url;
+use Psr\Log\LoggerInterface;
 
 class Handler
 {
@@ -28,9 +30,15 @@ class Handler
      */
     private $tasksRunner;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     public function __construct()
     {
         $this->setResponse(new Response());
+        $this->logger = StaticContainer::get(LoggerInterface::class);
     }
 
     public function setResponse($response)
@@ -81,8 +89,6 @@ public function setScheduledTasksRunner(ScheduledTasksRunner $runner)
 
     public function onException(Tracker $tracker, RequestSet $requestSet, Exception $e)
     {
-        Common::printDebug("Exception: " . $e->getMessage());
-
         $statusCode = 500;
         if ($e instanceof UnexpectedWebsiteFoundException) {
             $statusCode = 400;
@@ -90,6 +96,17 @@ public function onException(Tracker $tracker, RequestSet $requestSet, Exception
             $statusCode = 400;
         }
 
+        // if an internal server error, log as a real error, otherwise it's just malformed input
+        if ($statusCode == 500) {
+            $this->logger->error('Exception: {exception}', [
+                'exception' => $e,
+            ]);
+        } else {
+            $this->logger->debug('Exception: {exception}', [
+                'exception' => $e,
+            ]);
+        }
+
         $this->response->outputException($tracker, $e, $statusCode);
         $this->redirectIfNeeded($requestSet);
     }
diff --git a/app/core/Tracker/LogTable.php b/app/core/Tracker/LogTable.php
index b077069f9..164abb33b 100644
--- a/app/core/Tracker/LogTable.php
+++ b/app/core/Tracker/LogTable.php
@@ -79,6 +79,17 @@ public function shouldJoinWithSubSelect()
     {
         return false;
     }
+
+    /**
+     * Defines a column that stores the date/time at which time an entry was written or updated. Setting this
+     * can help improve the performance of some archive queries. For example the log_link_visit_action table would define
+     * server_time while log_visit would define visit_last_action_time
+     * @return string
+     */
+    public function getDateTimeColumn()
+    {
+        return '';
+    }
     
     /**
      * Returns the name of a log table that allows to join on a visit. Eg if there is a table "action", and it is not
diff --git a/app/core/Tracker/Model.php b/app/core/Tracker/Model.php
index 7564ab6e0..f7a8406a1 100644
--- a/app/core/Tracker/Model.php
+++ b/app/core/Tracker/Model.php
@@ -10,7 +10,9 @@
 
 use Exception;
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Tracker;
+use Psr\Log\LoggerInterface;
 
 class Model
 {
@@ -76,7 +78,9 @@ public function updateConversion($idVisit, $idGoal, $newConversion)
         try {
             $this->getDb()->query($sql, $sqlBind);
         } catch (Exception $e) {
-            Common::printDebug("There was an error while updating the Conversion: " . $e->getMessage());
+            StaticContainer::get(LoggerInterface::class)->error("There was an error while updating the Conversion: {exception}", [
+                'exception' => $e,
+            ]);
 
             return false;
         }
@@ -313,7 +317,7 @@ public function updateVisit($idSite, $idVisit, $valuesToUpdate)
     {
         list($updateParts, $sqlBind) = $this->fieldsToQuery($valuesToUpdate);
 
-        $parts = implode($updateParts, ', ');
+        $parts = implode(', ',$updateParts);
         $table = Common::prefixTable('log_visit');
 
         $sqlQuery = "UPDATE $table SET $parts WHERE idsite = ? AND idvisit = ?";
diff --git a/app/core/Tracker/Request.php b/app/core/Tracker/Request.php
index e1c59f5e0..fce9b8f0c 100644
--- a/app/core/Tracker/Request.php
+++ b/app/core/Tracker/Request.php
@@ -502,6 +502,18 @@ protected function getCustomTimestamp()
             }
         }
 
+        $cache = Tracker\Cache::getCacheGeneral();
+        if (!empty($cache['delete_logs_enable']) && !empty($cache['delete_logs_older_than'])) {
+            $scheduleInterval = $cache['delete_logs_schedule_lowest_interval'];
+            $maxLogAge = $cache['delete_logs_older_than'];
+            $logEntryCutoff = time() - (($maxLogAge + $scheduleInterval) * 60*60*24);
+            if ($cdt < $logEntryCutoff) {
+                $message = "Custom timestamp is older than the configured 'deleted old raw data' value of $maxLogAge days";
+                Common::printDebug($message);
+                throw new InvalidRequestParameterException($message);
+            }
+        }
+
         return $cdt;
     }
 
diff --git a/app/core/Tracker/Settings.php b/app/core/Tracker/Settings.php
index 06657d097..6db7b998d 100644
--- a/app/core/Tracker/Settings.php
+++ b/app/core/Tracker/Settings.php
@@ -9,8 +9,9 @@
 namespace Piwik\Tracker;
 
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Tracker;
-use Piwik\DeviceDetectorFactory;
+use Piwik\DeviceDetector\DeviceDetectorFactory;
 use Piwik\SettingsPiwik;
 
 class Settings // TODO: merge w/ visitor recognizer or make it it's own service. the class name is required for BC.
@@ -37,7 +38,7 @@ public function getConfigId(Request $request, $ipAddress)
 
         $userAgent = $request->getUserAgent();
 
-        $deviceDetector = DeviceDetectorFactory::getInstance($userAgent);
+        $deviceDetector = StaticContainer::get(DeviceDetectorFactory::class)->makeInstance($userAgent);
         $aBrowserInfo   = $deviceDetector->getClient();
 
         if ($aBrowserInfo['type'] != 'browser') {
diff --git a/app/core/Tracker/TrackerCodeGenerator.php b/app/core/Tracker/TrackerCodeGenerator.php
index c1081cc06..ba5ce0a7d 100644
--- a/app/core/Tracker/TrackerCodeGenerator.php
+++ b/app/core/Tracker/TrackerCodeGenerator.php
@@ -247,7 +247,7 @@ private function getJavascriptTagOptions($idSite, $mergeSubdomains, $mergeAliasU
         foreach ($websiteUrls as $site_url) {
             $referrerParsed = parse_url($site_url);
 
-            if (!isset($firstHost)) {
+            if (!isset($firstHost) && isset($referrerParsed['host'])) {
                 $firstHost = $referrerParsed['host'];
             }
 
@@ -267,4 +267,17 @@ private function getJavascriptTagOptions($idSite, $mergeSubdomains, $mergeAliasU
         }
         return $options;
     }
+
+    /**
+     * When including the JS tracking code in a mailto link, we need to strip the surrounding HTML tags off. This
+     * ensures consistent behaviour between mail clients that render the mailto body as plain text (as in the
+     * spec), and those which try to render it as HTML and therefore hide the tags.
+     * @param string $jsTrackingCode JS tracking code as returned from the generate() function.
+     * @return string
+     */
+    public static function stripTags($jsTrackingCode)
+    {
+        // Strip off open and close <script> tag and comments so that JS will be displayed in ALL mail clients
+        return trim(strip_tags(html_entity_decode($jsTrackingCode)));
+    }
 }
diff --git a/app/core/Tracker/Visit.php b/app/core/Tracker/Visit.php
index 1e0050e29..9449a4a0f 100644
--- a/app/core/Tracker/Visit.php
+++ b/app/core/Tracker/Visit.php
@@ -17,6 +17,7 @@
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Network\IPUtils;
 use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Plugins\UserCountry\Columns\Base;
 use Piwik\Tracker;
 use Piwik\Tracker\Visit\VisitProperties;
 
@@ -68,6 +69,14 @@ class Visit implements VisitInterface
      */
     private $invalidator;
 
+    protected $fieldsThatRequireAuth = array(
+        'city',
+        'region',
+        'country',
+        'lat',
+        'long'
+    );
+
     public function __construct()
     {
         $requestProcessors = StaticContainer::get('Piwik\Plugin\RequestProcessors');
@@ -88,7 +97,7 @@ public function setRequest(Request $request)
     private function checkSiteExists(Request $request)
     {
         try {
-            $this->request->getIdSite();
+            $request->getIdSite();
         } catch (UnexpectedWebsiteFoundException $e) {
             // we allow 0... the request will fail anyway as the site won't exist... allowing 0 will help us
             // reporting this tracking problem as it is a common issue. Otherwise we would not be able to report
@@ -98,6 +107,17 @@ private function checkSiteExists(Request $request)
         }
     }
 
+    private function validateRequest(Request $request)
+    {
+        // Check for params that aren't allowed to be included unless the request is authenticated
+        foreach ($this->fieldsThatRequireAuth as $field) {
+            Base::getValueFromUrlParamsIfAllowed($field, $request);
+        }
+
+        // Special logic for timestamp as some overrides are OK without auth and others aren't
+        $request->getCurrentTimestamp();
+    }
+
     /**
      *    Main algorithm to handle the visit.
      *
@@ -128,6 +148,8 @@ public function handle()
             $processor->manipulateRequest($this->request);
         }
 
+        $this->validateRequest($this->request);
+
         $this->visitProperties = new VisitProperties();
 
         foreach ($this->requestProcessors as $processor) {
@@ -558,12 +580,13 @@ private function markArchivedReportsAsInvalidIfArchiveAlreadyFinished()
         $date = Date::factory((int)$time, $timezone);
 
         // $date->isToday() is buggy when server and website timezones don't match - so we'll do our own checking
-        $startOfToday = Date::factoryInTimezone('today', $timezone);
-        $isToday = $date->toString('Y-m-d') === $startOfToday->toString('Y-m-d');
-
-        if (!$isToday) { // we don't have to handle in case date is in future as it is not allowed by tracker
-            $this->invalidator->rememberToInvalidateArchivedReportsLater($idSite, $date);
+        $startOfTomorrow = Date::factoryInTimezone('today', $timezone)->addDay(1);
+        $isLaterThanToday = $date->getTimestamp() >= $startOfTomorrow->getTimestamp();
+        if ($isLaterThanToday) {
+            return;
         }
+
+        $this->invalidator->rememberToInvalidateArchivedReportsLater($idSite, $date);
     }
 
     private function getTimezoneForSite($idSite)
diff --git a/app/core/Tracker/VisitExcluded.php b/app/core/Tracker/VisitExcluded.php
index bd0e390ea..838f0cf2a 100644
--- a/app/core/Tracker/VisitExcluded.php
+++ b/app/core/Tracker/VisitExcluded.php
@@ -10,7 +10,8 @@
 
 use Piwik\Cache as PiwikCache;
 use Piwik\Common;
-use Piwik\DeviceDetectorFactory;
+use Piwik\Container\StaticContainer;
+use Piwik\DeviceDetector\DeviceDetectorFactory;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Network\IP;
 use Piwik\Piwik;
@@ -175,7 +176,7 @@ protected function isNonHumanBot()
     {
         $allowBots = $this->request->getParam('bots');
 
-        $deviceDetector = DeviceDetectorFactory::getInstance($this->userAgent);
+        $deviceDetector = StaticContainer::get(DeviceDetectorFactory::class)->makeInstance($this->userAgent );
 
         return !$allowBots
             && ($deviceDetector->isBot() || $this->isIpInRange());
diff --git a/app/core/Updater/Migration/Db.php b/app/core/Updater/Migration/Db.php
index 2cda50acc..011dfd566 100644
--- a/app/core/Updater/Migration/Db.php
+++ b/app/core/Updater/Migration/Db.php
@@ -67,4 +67,14 @@ abstract class Db extends Migration
      */
     const ERROR_CODE_TABLE_NOT_EXISTS = 1146;
 
+    /**
+     * Query execution was interrupted, maximum statement execution time exceeded
+     */
+    const ERROR_CODE_MAX_EXECUTION_TIME_EXCEEDED_QUERY_INTERRUPTED = 3024;
+
+    /**
+     * Sort aborted: Query execution was interrupted, maximum statement execution time exceeded
+     */
+    const ERROR_CODE_MAX_EXECUTION_TIME_EXCEEDED_SORT_ABORTED = 1028;
+
 }
diff --git a/app/core/Updates/3.12.0-b1.php b/app/core/Updates/3.12.0-b1.php
new file mode 100644
index 000000000..347a58894
--- /dev/null
+++ b/app/core/Updates/3.12.0-b1.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updater;
+use Piwik\Updates as PiwikUpdates;
+use Piwik\Updater\Migration;
+use Piwik\Updater\Migration\Factory as MigrationFactory;
+
+/**
+ * Update for version 3.12.0-b1.
+ */
+class Updates_3_12_0_b1 extends PiwikUpdates
+{
+    /**
+     * @var MigrationFactory
+     */
+    private $migration;
+
+    public function __construct(MigrationFactory $factory)
+    {
+        $this->migration = $factory;
+    }
+
+    public function getMigrations(Updater $updater)
+    {
+        $migration1 = $this->migration->db->createTable('locks', [
+            'key' => 'VARCHAR(70) NOT NULL',
+            'value' => 'VARCHAR(255) NULL DEFAULT NULL',
+            'expiry_time' => 'BIGINT UNSIGNED DEFAULT 9999999999',
+        ], 'key');
+
+        return array(
+            $migration1,
+        );
+    }
+
+    public function doUpdate(Updater $updater)
+    {
+        $updater->executeMigrations(__FILE__, $this->getMigrations($updater));
+    }
+}
diff --git a/app/core/Updates/3.12.0-b7.php b/app/core/Updates/3.12.0-b7.php
new file mode 100644
index 000000000..f5b4bf8fb
--- /dev/null
+++ b/app/core/Updates/3.12.0-b7.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updater;
+use Piwik\Updates as PiwikUpdates;
+use Piwik\Updater\Migration\Factory as MigrationFactory;
+
+/**
+ * Update for version 3.12.0-b7.
+ */
+class Updates_3_12_0_b7 extends PiwikUpdates
+{
+    /**
+     * @var MigrationFactory
+     */
+    private $migration;
+
+    public function __construct(MigrationFactory $factory)
+    {
+        $this->migration = $factory;
+    }
+
+    public function getMigrations(Updater $updater)
+    {
+        $migration1 = $this->migration->plugin->deactivate('ExamplePlugin');
+        $migration2 = $this->migration->plugin->deactivate('ExampleAPI');
+
+        return array(
+            $migration1,
+            $migration2,
+        );
+    }
+
+    public function doUpdate(Updater $updater)
+    {
+        $updater->executeMigrations(__FILE__, $this->getMigrations($updater));
+    }
+}
diff --git a/app/core/Updates/4.0.0-b1.php b/app/core/Updates/4.0.0-b1.php
new file mode 100644
index 000000000..8fa33ba36
--- /dev/null
+++ b/app/core/Updates/4.0.0-b1.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updater;
+use Piwik\Updates as PiwikUpdates;
+use Piwik\Updater\Migration;
+use Piwik\Updater\Migration\Factory as MigrationFactory;
+
+/**
+ * Update for version 4.0.0-b1.
+ */
+class Updates_4_0_0_b1 extends PiwikUpdates
+{
+    /**
+     * @var MigrationFactory
+     */
+    private $migration;
+
+    public function __construct(MigrationFactory $factory)
+    {
+        $this->migration = $factory;
+    }
+
+    public function getMigrations(Updater $updater)
+    {
+        $migration1 = $this->migration->db->changeColumnType('log_action', 'name', 'VARCHAR(4096)');
+        $migration2 = $this->migration->db->changeColumnType('log_conversion', 'url', 'VARCHAR(4096)');
+
+        return array(
+            $migration1,
+            $migration2
+        );
+    }
+
+    public function doUpdate(Updater $updater)
+    {
+        $updater->executeMigrations(__FILE__, $this->getMigrations($updater));
+    }
+}
diff --git a/app/core/Url.php b/app/core/Url.php
index bf2065f30..8d87f5e92 100644
--- a/app/core/Url.php
+++ b/app/core/Url.php
@@ -244,7 +244,7 @@ public static function isValidHost($host = false)
         $untrustedHost = Common::mb_strtolower($host);
         $untrustedHost = rtrim($untrustedHost, '.');
 
-        $hostRegex = Common::mb_strtolower('/(^|.)' . implode('|', $trustedHosts) . '$/');
+        $hostRegex = Common::mb_strtolower('/(^|.)' . implode('$|', $trustedHosts) . '$/');
 
         $result = preg_match($hostRegex, $untrustedHost);
         return 0 !== $result;
diff --git a/app/core/Version.php b/app/core/Version.php
index 85fc91444..8d25d333c 100644
--- a/app/core/Version.php
+++ b/app/core/Version.php
@@ -20,7 +20,7 @@ final class Version
      * The current Matomo version.
      * @var string
      */
-    const VERSION = '3.11.0';
+    const VERSION = '3.12.0';
 
     public function isStableVersion($version)
     {
diff --git a/app/core/View.php b/app/core/View.php
index 2e8357658..1424736fc 100644
--- a/app/core/View.php
+++ b/app/core/View.php
@@ -121,6 +121,8 @@ class View implements ViewInterface
     private $xFrameOptions = null;
     private $enableCacheBuster = true;
 
+    private $useStrictReferrerPolicy = true;
+
     /**
      * Constructor.
      *
@@ -281,8 +283,11 @@ public function render()
         if(!empty($this->xFrameOptions)) {
             Common::sendHeader('X-Frame-Options: ' . (string)$this->xFrameOptions);
         }
+
         // don't send Referer-Header for outgoing links
-        Common::sendHeader('Referrer-Policy: same-origin');
+        if (!empty($this->useStrictReferrerPolicy)) {
+            Common::sendHeader('Referrer-Policy: same-origin');
+        }
 
         return $this->renderTwigTemplate();
     }
@@ -460,4 +465,24 @@ private function shouldPropagateTokenAuthInAjaxRequests()
         $generalConfig = Config::getInstance()->General;
         return Common::getRequestVar('module', false) == 'Widgetize' || $generalConfig['enable_framed_pages'] == '1';
     }
+
+    /**
+     * Returns whether a strict Referrer-Policy header will be sent. Generally this should be set to 'true'.
+     *
+     * @return bool
+     */
+    public function getUseStrictReferrerPolicy()
+    {
+        return $this->useStrictReferrerPolicy;
+    }
+
+    /**
+     * Sets whether a strict Referrer-Policy header will be sent (if not, nothing is sent).
+     *
+     * @param bool $useStrictReferrerPolicy
+     */
+    public function setUseStrictReferrerPolicy($useStrictReferrerPolicy)
+    {
+        $this->useStrictReferrerPolicy = $useStrictReferrerPolicy;
+    }
 }
diff --git a/app/core/ViewDataTable/Config.php b/app/core/ViewDataTable/Config.php
index aafedfe17..4576dd339 100644
--- a/app/core/ViewDataTable/Config.php
+++ b/app/core/ViewDataTable/Config.php
@@ -494,6 +494,12 @@ class   Config
      */
     public $disable_all_rows_filter_limit = false;
 
+    /**
+     * Sets a limit for the maximum number of rows that can be exported.
+     * @var int
+     */
+    public $max_export_filter_limit = -1;
+
     /**
      * Message to show if not data is available for the report
      * Defaults to `CoreHome_ThereIsNoDataForThisReport` if not set
@@ -526,6 +532,13 @@ class   Config
      */
     public $segmented_visitor_log_segment_suffix = '';
 
+    /**
+     * Disable comparison support for this specific usage of a ViewDataTable.
+     *
+     * @var bool
+     */
+    public $disable_comparison = false;
+
     /**
      * @ignore
      */
diff --git a/app/core/ViewDataTable/Factory.php b/app/core/ViewDataTable/Factory.php
index e3a1d9048..360425e51 100644
--- a/app/core/ViewDataTable/Factory.php
+++ b/app/core/ViewDataTable/Factory.php
@@ -145,7 +145,7 @@ public static function build($defaultType = null, $apiAction = false, $controlle
                 $type = $defaultType ?: self::DEFAULT_VIEW;
             }
         } else {
-            $type = $defaultViewType;
+            $type = $defaultType ?: $defaultViewType;
         }
 
         $params['viewDataTable'] = $type;
diff --git a/app/core/ViewDataTable/Manager.php b/app/core/ViewDataTable/Manager.php
index d28a01428..5a43cf33b 100644
--- a/app/core/ViewDataTable/Manager.php
+++ b/app/core/ViewDataTable/Manager.php
@@ -257,6 +257,7 @@ public static function getViewDataTableParameters($login, $controllerAction, $co
 
         // when setting an invalid parameter, we silently ignore the invalid parameter and proceed
         $params = self::removeNonOverridableParameters($controllerAction, $params);
+        self::unsetComparisonParams($params);
 
         return $params;
     }
@@ -280,6 +281,8 @@ public static function saveViewDataTableParameters($login, $controllerAction, $p
     {
         $params = self::getViewDataTableParameters($login, $controllerAction);
 
+        self::unsetComparisonParams($params);
+
         foreach ($parametersToOverride as $key => $value) {
             if ($key === 'viewDataTable'
                 && !empty($params[$key])
@@ -425,4 +428,11 @@ private static function getGraphViewIcons(ViewDataTable $view)
         return $graphViewIcons;
     }
 
+    private static function unsetComparisonParams(&$params)
+    {
+        unset($params['compareDates']);
+        unset($params['comparePeriods']);
+        unset($params['compareSegments']);
+        unset($params['compare']);
+    }
 }
diff --git a/app/core/ViewDataTable/Request.php b/app/core/ViewDataTable/Request.php
index 98735375b..265d057de 100644
--- a/app/core/ViewDataTable/Request.php
+++ b/app/core/ViewDataTable/Request.php
@@ -32,10 +32,11 @@ public function __construct($requestConfig)
      * It builds the API request string and uses Request to call the API.
      * The requested DataTable object is stored in $this->dataTable.
      */
-    public function loadDataTableFromAPI()
+    public function loadDataTableFromAPI($extraParams = [])
     {
         // we build the request (URL) to call the API
         $requestArray = $this->getRequestArray();
+        $requestArray = array_merge($extraParams, $requestArray);
 
         // we make the request to the API
         $request = new ApiRequest($requestArray);
@@ -75,7 +76,7 @@ public function getRequestArray()
             'expanded',
             'pivotBy',
             'pivotByColumn',
-            'pivotByColumnLimit'
+            'pivotByColumnLimit',
         ), $this->requestConfig->getExtraParametersToSet());
 
         foreach ($toSetEventually as $varToSet) {
@@ -110,6 +111,10 @@ public function getRequestArray()
             $requestArray['disable_queued_filters'] = 1;
         }
 
+        if (!empty($requestArray['compareSegments'])) {
+            $requestArray['compareSegments'] = Common::unsanitizeInputValues($requestArray['compareSegments']);
+        }
+
         return $requestArray;
     }
 
diff --git a/app/core/ViewDataTable/RequestConfig.php b/app/core/ViewDataTable/RequestConfig.php
index c86ded97d..c951f936d 100644
--- a/app/core/ViewDataTable/RequestConfig.php
+++ b/app/core/ViewDataTable/RequestConfig.php
@@ -95,7 +95,10 @@ class RequestConfig
         'expanded',
         'pivotBy',
         'pivotByColumn',
-        'pivotByColumnLimit'
+        'pivotByColumnLimit',
+        'compareSegments',
+        'comparePeriods',
+        'compareDates',
     );
 
     /**
@@ -117,7 +120,10 @@ class RequestConfig
         'expanded',
         'pivotBy',
         'pivotByColumn',
-        'pivotByColumnLimit'
+        'pivotByColumnLimit',
+        'compareSegments',
+        'comparePeriods',
+        'compareDates',
     );
 
     /**
@@ -272,6 +278,27 @@ class RequestConfig
      */
     public $pivotByColumnLimit = false;
 
+    /**
+     * List of segments to compare with. Defaults to segments used in `compareSegments[]` query parameter.
+     *
+     * @var array
+     */
+    public $compareSegments = [];
+
+    /**
+     * List of period labels to compare with. Defaults to values used in `comparePeriods[]` query parameter.
+     *
+     * @var array
+     */
+    public $comparePeriods = [];
+
+    /**
+     * List of period dates to compare with. Defaults to values used in `compareDates[]` query parameter.
+     *
+     * @var array
+     */
+    public $compareDates = [];
+
     public function getProperties()
     {
         return get_object_vars($this);
diff --git a/app/core/Visualization/Sparkline.php b/app/core/Visualization/Sparkline.php
index 3ec7c811d..f564fbf46 100644
--- a/app/core/Visualization/Sparkline.php
+++ b/app/core/Visualization/Sparkline.php
@@ -35,7 +35,7 @@ class Sparkline implements ViewInterface
      * @var int
      */
     protected $_height = self::DEFAULT_HEIGHT;
-    private $values = array();
+    private $serieses = array();
     /**
      * @var \Davaxi\Sparkline
      */
@@ -43,58 +43,65 @@ class Sparkline implements ViewInterface
 
     /**
      * Array with format: array( x, y, z, ... )
-     * @param array $data
+     * @param array $data,...
      */
-    public function setValues($data) {
-        $this->values = $data;
+    public function setValues()
+    {
+        $this->serieses = func_get_args();
     }
 
-    public function main() {
+    public function addSeries(array $values)
+    {
+        $this->serieses[] = $values;
+    }
 
+    public function main()
+    {
         $sparkline = new \Davaxi\Sparkline();
 
-        $seconds = Piwik::translate('Intl_NSecondsShort');
-        $percent = Piwik::translate('Intl_NumberSymbolPercent');
         $thousandSeparator = Piwik::translate('Intl_NumberSymbolGroup');
-        $decimalSeparator = Piwik::translate('Intl_NumberSymbolGroup');
-        $toRemove = array('%', $percent, str_replace('%s', '', $seconds));
-        $values = [];
-        foreach ($this->values as $value) {
-            // 50% and 50s should be plotted as 50
-            $value = str_replace($toRemove, '', $value);
-            // replace localized decimal separator
-            $value = str_replace($thousandSeparator, '', $value);
-            $value = str_replace($decimalSeparator, '.', $value);
-            if ($value == '') {
-                $value = 0;
+        $decimalSeparator = Piwik::translate('Intl_NumberSymbolDecimal');
+
+        $sparkline->setData(); // remove default series
+        foreach ($this->serieses as $seriesIndex => $series) {
+            $values = [];
+            $hasFloat = false;
+
+            foreach ($series as $value) {
+                // replace localized decimal separator
+                $value = str_replace($thousandSeparator, '', $value);
+                $value = str_replace($decimalSeparator, '.', $value);
+
+                // sanitize value
+                $value = filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION | FILTER_FLAG_ALLOW_SCIENTIFIC);
+
+                if (empty($value) || !is_numeric($value)) {
+                    $value = 0;
+                }
+
+                $values[] = $value;
+
+                if (is_float($value + 0)) { // coerce to int/float type before checking
+                    $hasFloat = true;
+                }
             }
-            $values[] = $value;
-        }
 
-        $hasFloat = false;
-        foreach ($values as $value) {
-            if (is_numeric($value)
-                && is_float($value + 0) // coerce to int/float type before checking
-            ) {
-                $hasFloat = true;
-                break;
+            // the sparkline lib used converts everything to integers (see the FormatTrait.php file) which means float
+            // numbers that are close to 1.0 or 0.0 will get floored. this can happen in the average page generation time
+            // report, and cause some values which are, eg, around ~.9 to appear as 0 in the sparkline. to workaround this, we
+            // scale the values.
+            if ($hasFloat) {
+                $values = array_map(function ($x) {
+                    return $x * 1000.0;
+                }, $values);
             }
-        }
 
-        // the sparkline lib used converts everything to integers (see the FormatTrait.php file) which means float
-        // numbers that are close to 1.0 or 0.0 will get floored. this can happen in the average page generation time
-        // report, and cause some values which are, eg, around ~.9 to appear as 0 in the sparkline. to workaround this, we
-        // scale the values.
-        if ($hasFloat) {
-            $values = array_map(function ($x) {
-                return $x * 1000.0;
-            }, $values);
+            $sparkline->addSeries($values);
+            $this->setSparklineColors($sparkline, $seriesIndex);
         }
 
-        $sparkline->setData($values);
         $sparkline->setWidth($this->getWidth());
         $sparkline->setHeight($this->getHeight());
-        $this->setSparklineColors($sparkline);
         $sparkline->setLineThickness(1);
         $sparkline->setPadding('5');
 
@@ -152,7 +159,7 @@ public function setHeight($height) {
      *
      * @param \Davaxi\Sparkline $sparkline
      */
-    private function setSparklineColors($sparkline) {
+    private function setSparklineColors($sparkline, $seriesIndex) {
         $colors = Common::getRequestVar('colors', false, 'json');
 
         if (empty($colors)) { // quick fix so row evolution sparklines will have color in widgetize's iframes
@@ -171,20 +178,29 @@ private function setSparklineColors($sparkline) {
         } else {
             $sparkline->deactivateBackgroundColor();
         }
-        $sparkline->setLineColorHex($colors['lineColor']);
+
+        if (is_array($colors['lineColor'])) {
+            $sparkline->setLineColorHex($colors['lineColor'][$seriesIndex], $seriesIndex);
+
+            // set point colors to same as line colors so they can be better differentiated
+            $colors['minPointColor'] = $colors['maxPointColor'] = $colors['lastPointColor'] = $colors['lineColor'][$seriesIndex];
+        } else {
+            $sparkline->setLineColorHex($colors['lineColor']);
+        }
+
         if (strtolower($colors['fillColor'] !== "#ffffff")) {
             $sparkline->setFillColorHex($colors['fillColor']);
         } else {
             $sparkline->deactivateFillColor();
         }
         if (strtolower($colors['minPointColor'] !== "#ffffff")) {
-            $sparkline->addPoint("minimum", 5, $colors['minPointColor']);
+            $sparkline->addPoint("minimum", 5, $colors['minPointColor'], $seriesIndex);
         }
         if (strtolower($colors['maxPointColor'] !== "#ffffff")) {
-            $sparkline->addPoint("maximum", 5, $colors['maxPointColor']);
+            $sparkline->addPoint("maximum", 5, $colors['maxPointColor'], $seriesIndex);
         }
         if (strtolower($colors['lastPointColor'] !== "#ffffff")) {
-            $sparkline->addPoint("last", 5, $colors['lastPointColor']);
+            $sparkline->addPoint("last", 5, $colors['lastPointColor'], $seriesIndex);
         }
     }
 
diff --git a/app/core/Widget/WidgetConfig.php b/app/core/Widget/WidgetConfig.php
index aab159214..d1e85304d 100644
--- a/app/core/Widget/WidgetConfig.php
+++ b/app/core/Widget/WidgetConfig.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Widget;
 
+use Piwik\Access;
 use Piwik\Piwik;
 use Exception;
 
@@ -258,6 +259,10 @@ public function disable()
     public function checkIsEnabled()
     {
         if (!$this->isEnabled()) {
+            // Some widgets are disabled when the user is not superuser. If the user is not logged in, we should
+            // prompt them to do this first rather than showing them the "widget not enabled" error
+            Access::getInstance()->checkUserIsNotAnonymous();
+
             throw new Exception(Piwik::translate('General_ExceptionWidgetNotEnabled'));
         }
     }
diff --git a/app/core/bootstrap.php b/app/core/bootstrap.php
index ef595466a..2e4606964 100644
--- a/app/core/bootstrap.php
+++ b/app/core/bootstrap.php
@@ -29,8 +29,8 @@
 // NOTE: the code above must be PHP 4 compatible
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 
-if ( session_status() !== PHP_SESSION_ACTIVE && !headers_sent() ) {
-	session_cache_limiter( 'nocache' );
+if (session_status() !== PHP_SESSION_ACTIVE && !headers_sent()) {
+    session_cache_limiter('nocache');
 }
 
 define('PIWIK_DEFAULT_TIMEZONE', @date_default_timezone_get());
diff --git a/app/core/testMinimumPhpVersion.php b/app/core/testMinimumPhpVersion.php
index 513b442f1..f79290c1f 100644
--- a/app/core/testMinimumPhpVersion.php
+++ b/app/core/testMinimumPhpVersion.php
@@ -116,6 +116,7 @@ function Piwik_GetErrorMessagePage($message, $optionalTrace = false, $optionalLi
 
         if (!headers_sent()) {
             header('Content-Type: text/html; charset=utf-8');
+            header('Cache-Control: private, no-cache, no-store');
 
             $isInternalServerError = preg_match('/(sql|database|mysql)/i', $message);
             if ($isInternalServerError) {
@@ -149,10 +150,10 @@ function Piwik_GetErrorMessagePage($message, $optionalTrace = false, $optionalLi
         if ($optionalLinks) {
             $optionalLinks = '<ul>
                             <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org">Matomo.org homepage</a></li>
-                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/faq/">Matomo Frequently Asked Questions</a></li>
-                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/docs/">Matomo Documentation</a></li>
+                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/faq/">Frequently Asked Questions</a></li>
+                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/docs/">User Guides</a></li>
                             <li><a rel="noreferrer noopener" target="_blank" href="https://forum.matomo.org/">Matomo Forums</a></li>
-                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/support/?pk_campaign=App_AnErrorOccured&pk_source=Piwik_App&pk_medium=ProfessionalServicesLink">Professional help for Matomo</a></li>
+                            <li><a rel="noreferrer noopener" target="_blank" href="https://matomo.org/support/?pk_campaign=App_AnErrorOccured&pk_source=Matomo_App&pk_medium=ProfessionalServicesLink">Professional Support for Matomo</a></li>
                             </ul>';
         }
         if ($optionalLinkBack) {
diff --git a/app/index.php b/app/index.php
index a74725e7a..8e3b2cb64 100644
--- a/app/index.php
+++ b/app/index.php
@@ -11,10 +11,6 @@
 if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
-
-if (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-    require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
-}
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
diff --git a/app/js/piwik.js b/app/js/piwik.js
index c06fc4b20..0749b32d9 100644
--- a/app/js/piwik.js
+++ b/app/js/piwik.js
@@ -3880,14 +3880,10 @@ if (typeof window.Piwik !== 'object') {
                     return '0';
                 }
 
-                if (!isDefined(navigatorAlias.cookieEnabled)) {
-                    var testCookieName = getCookieName('testcookie');
-                    setCookie(testCookieName, '1');
+				var testCookieName = getCookieName('testcookie');
+				setCookie(testCookieName, '1');
 
-                    return getCookie(testCookieName) === '1' ? '1' : '0';
-                }
-
-                return navigatorAlias.cookieEnabled ? '1' : '0';
+                return getCookie(testCookieName) === '1' ? '1' : '0';
             }
 
             /*
@@ -5916,10 +5912,6 @@ if (typeof window.Piwik !== 'object') {
              * @return Tracker
              */
             this.addTracker = function (piwikUrl, siteId) {
-                if (!siteId) {
-                    throw new Error('A siteId must be given to add a new tracker');
-                }
-
                 if (!isDefined(piwikUrl) || null === piwikUrl) {
                     piwikUrl = this.getTrackerUrl();
                 }
@@ -6853,8 +6845,8 @@ if (typeof window.Piwik !== 'object') {
 
                 if (configHeartBeatDelay || heartBeatSetUp) {
                     if (windowAlias.removeEventListener) {
-                        windowAlias.removeEventListener('focus', heartBeatOnFocus, true);
-                        windowAlias.removeEventListener('blur', heartBeatOnBlur, true);
+                        windowAlias.removeEventListener('focus', heartBeatOnFocus);
+                        windowAlias.removeEventListener('blur', heartBeatOnBlur);
                     } else if  (windowAlias.detachEvent) {
                         windowAlias.detachEvent('onfocus', heartBeatOnFocus);
                         windowAlias.detachEvent('onblur', heartBeatOnBlur);
@@ -7523,8 +7515,10 @@ if (typeof window.Piwik !== 'object') {
                     return;
                 }
 
+                var thirtyYears = 30 * 365 * 24 * 60 * 60 * 1000;
+
                 deleteCookie(CONSENT_COOKIE_NAME, configCookiePath, configCookieDomain);
-                setCookie(CONSENT_REMOVED_COOKIE_NAME, new Date().getTime(), 0, configCookiePath, configCookieDomain, configCookieIsSecure);
+                setCookie(CONSENT_REMOVED_COOKIE_NAME, new Date().getTime(), thirtyYears, configCookiePath, configCookieDomain, configCookieIsSecure);
                 this.requireConsent();
             };
 
@@ -7600,7 +7594,7 @@ if (typeof window.Piwik !== 'object') {
          * Constructor
          ************************************************************/
 
-        var applyFirst = ['addTracker', 'disableCookies', 'setTrackerUrl', 'setAPIUrl', 'enableCrossDomainLinking', 'setCrossDomainLinkingTimeout', 'setSecureCookie', 'setCookiePath', 'setCookieDomain', 'setDomains', 'setUserId', 'setSiteId', 'alwaysUseSendBeacon', 'enableLinkTracking', 'requireConsent', 'setConsentGiven'];
+        var applyFirst = ['addTracker', 'disableCookies', 'setTrackerUrl', 'setAPIUrl', 'enableCrossDomainLinking', 'setCrossDomainLinkingTimeout', 'setSessionCookieTimeout', 'setVisitorCookieTimeout', 'setSecureCookie', 'setCookiePath', 'setCookieDomain', 'setDomains', 'setUserId', 'setSiteId', 'alwaysUseSendBeacon', 'enableLinkTracking', 'requireConsent', 'setConsentGiven'];
 
         function createFirstTracker(piwikUrl, siteId)
         {
diff --git a/app/js/piwik.min.js b/app/js/piwik.min.js
index 7ad4f35d0..d3d035ca2 100644
--- a/app/js/piwik.min.js
+++ b/app/js/piwik.min.js
@@ -43,11 +43,11 @@ try{be=G.title}catch(ct){be=""}function c6(dh,df,de,dg,dd,dc){if(bg){return}var
 if(db.indexOf("//")!==0&&db.indexOf("http")!==0){if(db.indexOf("*")===0){db=db.substr(1)}if(db.indexOf(".")===0){db=db.substr(1)}db="http://"+db}dc.href=v.toAbsoluteUrl(db);if(dc.pathname){return dc.pathname}return""}function aZ(dc,db){if(!ag(db,"/")){db="/"+db}if(!ag(dc,"/")){dc="/"+dc}var dd=(db==="/"||db==="/*");if(dd){return true}if(dc===db){return true}db=String(db).toLowerCase();dc=String(dc).toLowerCase();if(R(db,"*")){db=db.slice(0,-1);dd=(!db||db==="/");if(dd){return true}if(dc===db){return true}return dc.indexOf(db)===0}if(!R(dc,"/")){dc+="/"}if(!R(db,"/")){db+="/"}return dc.indexOf(db)===0}function ao(df,dh){var dc,db,dd,de,dg;for(dc=0;dc<au.length;dc++){de=L(au[dc]);dg=cg(au[dc]);if(cB(df,de)&&aZ(dh,dg)){return true}}return false}function aR(de){var dc,db,dd;for(dc=0;dc<au.length;dc++){db=L(au[dc].toLowerCase());if(de===db){return true}if(db.slice(0,1)==="."){if(de===db.slice(1)){return true}dd=de.length-db.length;if((dd>0)&&(de.slice(dd)===db)){return true}}}return false}function cl(db,dd){db=db.replace("send_image=0","send_image=1");
 var dc=new Image(1,1);dc.onload=function(){E=0;if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:true})}};dc.onerror=function(){if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:false})}};dc.src=aA+(aA.indexOf("?")<0?"?":"&")+db}function aG(){return"object"===typeof h&&"function"===typeof h.sendBeacon&&"function"===typeof Blob}function a2(de,di){var dd=aG();if(!dd){return false}var dh={type:"application/x-www-form-urlencoded; charset=UTF-8"};var dg=false;var dc=aA;try{var db=new Blob([de],dh);if(de.length<=2000){db=new Blob([],dh);dc=dc+(dc.indexOf("?")<0?"?":"&")+de}dg=h.sendBeacon(dc,db)}catch(df){return false}if(dg&&typeof di==="function"){di({request:de,trackerUrl:aA,success:true,isSendBeacon:true})}return dg}function cY(dc,dd,db){if(!J(db)||null===db){db=true}if(m&&a2(dc,dd)){return}setTimeout(function(){if(m&&a2(dc,dd)){return}var dg;try{var df=T.XMLHttpRequest?new T.XMLHttpRequest():T.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;df.open("POST",aA,true);
 df.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){var dh=m&&a2(dc,dd);if(!dh&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false,xhr:this})}}}else{if(this.readyState===4&&(typeof dd==="function")){dd({request:dc,trackerUrl:aA,success:true,xhr:this})}}};df.setRequestHeader("Content-Type",cs);df.withCredentials=true;df.send(dc)}catch(de){dg=m&&a2(dc,dd);if(!dg&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false})}}}},50)}function cb(dc){var db=new Date();var dd=db.getTime()+dc;if(!r||dd>r){r=dd}}function cj(db){if(b7||!a1||!bw){return}b7=setTimeout(function dc(){b7=null;if(!a8){a8=(!G.hasFocus||G.hasFocus())}if(!a8){cj(a1);return}if(bM()){return}var dd=new Date(),de=a1-(dd.getTime()-cS);de=Math.min(a1,de);cj(de)},db||a1)}function bF(){if(!b7){return}clearTimeout(b7);b7=null}function a6(){a8=true;if(bM()){return}cj()}function av(){bF()}function c8(){if(aK||!a1){return}aK=true;
-ak(T,"focus",a6);ak(T,"blur",av);cj()}function cx(df){var dc=new Date();var db=dc.getTime();cS=db;if(cw&&db<cw){var dd=cw-db;setTimeout(df,dd);cb(dd+50);cw+=50;return}if(cw===false){var de=800;cw=db+de}df()}function bA(dc,db,dd){if(!bw){cE.push(dc);return}if(!cK&&dc){if(cv&&bw){dc+="&consent=1"}cx(function(){if(cQ&&a2(dc,dd)){cb(100);return}if(c3==="POST"||String(dc).length>2000){cY(dc,dd)}else{cl(dc,dd)}cb(db)})}if(!aK){c8()}else{cj()}}function cf(db){if(cK){return false}return(db&&db.length)}function cX(db,df){if(!df||df>=db.length){return[db]}var dc=0;var dd=db.length;var de=[];for(dc;dc<dd;dc+=df){de.push(db.slice(dc,dc+df))}return de}function c7(dc,db){if(!cf(dc)){return}if(!bw){cE.push(dc);return}cx(function(){var df=cX(dc,50);var dd=0,de;for(dd;dd<df.length;dd++){de='{"requests":["?'+df[dd].join('","?')+'"]}';cY(de,null,false)}cb(db)})}function aP(db){return bf+db+"."+b1+"."+bj}function b0(){if(bg){return"0"}if(!J(h.cookieEnabled)){var db=aP("testcookie");c6(db,"1");return az(db)==="1"?"1":"0"
-}return h.cookieEnabled?"1":"0"}function bd(){bj=b2((cR||cO)+(bk||"/")).slice(0,4)}function bS(){var dc=aP("cvar"),db=az(dc);if(db.length){db=JSON_PIWIK.parse(db);if(W(db)){return db}}return{}}function cy(){if(aM===false){aM=bS()}}function cL(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)+(new Date()).getTime()+Math.random()).slice(0,16)}function aw(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)).slice(0,6)}function bb(){return Math.floor((new Date()).getTime()/1000)}function aF(){var dc=bb();var dd=aw();var db=String(dc)+dd;return db}function cW(dd){dd=String(dd);var dg=aw();var de=dg.length;var df=dd.substr(-1*de,de);var dc=parseInt(dd.substr(0,dd.length-de),10);if(dc&&df&&df===dg){var db=bb();if(aV<=0){return true}if(db>=dc&&db<=(dc+aV)){return true}}return false}function c9(db){if(!cH){return""}var df=f(db,ar);if(!df){return""}df=String(df);var dd=new RegExp("^[a-zA-Z0-9]+$");if(df.length===32&&dd.test(df)){var dc=df.substr(16,32);if(cW(dc)){var de=df.substr(0,16);
-return de}}return""}function cI(){if(!bJ){bJ=c9(bI)}var dd=new Date(),db=Math.round(dd.getTime()/1000),dc=aP("id"),dg=az(dc),df,de;if(dg){df=dg.split(".");df.unshift("0");if(bJ.length){df[1]=bJ}return df}if(bJ.length){de=bJ}else{if("0"===b0()){de=""}else{de=cL()}}df=["1",de,db,0,db,"",""];return df}function aU(){var di=cI(),de=di[0],df=di[1],dc=di[2],db=di[3],dg=di[4],dd=di[5];if(!J(di[6])){di[6]=""}var dh=di[6];return{newVisitor:de,uuid:df,createTs:dc,visitCount:db,currentVisitTs:dg,lastVisitTs:dd,lastEcommerceOrderTs:dh}}function aD(){var de=new Date(),dc=de.getTime(),df=aU().createTs;var db=parseInt(df,10);var dd=(db*1000)+cD-dc;return dd}function aI(db){if(!b1){return}var dd=new Date(),dc=Math.round(dd.getTime()/1000);if(!J(db)){db=aU()}var de=db.uuid+"."+db.createTs+"."+db.visitCount+"."+dc+"."+db.lastVisitTs+"."+db.lastEcommerceOrderTs;c6(aP("id"),de,aD(),bk,cR,bN)}function bH(){var db=az(aP("ref"));if(db.length){try{db=JSON_PIWIK.parse(db);if(W(db)){return db}}catch(dc){}}return["","",0,""]
-}function bT(dd,dc,db){c6(dd,"",-86400,dc,db)}function br(dc){var db="testvalue";c6("test",db,10000,null,dc);if(az("test")===db){bT("test",null,dc);return true}return false}function aB(){var dc=bg;bg=false;var db,dd;for(db=0;db<bp.length;db++){dd=aP(bp[db]);if(dd!==cG&&dd!==a9&&0!==az(dd)){bT(dd,bk,cR)}}bg=dc}function bY(db){b1=db;aI()}function da(df){if(!df||!W(df)){return}var de=[];var dd;for(dd in df){if(Object.prototype.hasOwnProperty.call(df,dd)){de.push(dd)}}var dg={};de.sort();var db=de.length;var dc;for(dc=0;dc<db;dc++){dg[de[dc]]=df[de[dc]]}return dg}function b8(){c6(aP("ses"),"1",ck,bk,cR,bN)}function bc(){var de="";var dc="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dd=dc.length;var db;for(db=0;db<6;db++){de+=dc.charAt(Math.floor(Math.random()*dd))}return de}function co(dd,dz,dA,de){var dy,dc=new Date(),dl=Math.round(dc.getTime()/1000),di,dx,df=1024,dF,dm,dv=aM,dg=aP("ses"),dt=aP("ref"),dq=aP("cvar"),dr=az(dg),dw=bH(),dC=a0||bI,dj,db;if(bg){aB()}if(cK){return""
-}var ds=aU();if(!J(de)){de=""}var dp=G.characterSet||G.charset;if(!dp||dp.toLowerCase()==="utf-8"){dp=null}dj=dw[0];db=dw[1];di=dw[2];dx=dw[3];if(!dr){var dB=ck/1000;if(!ds.lastVisitTs||(dl-ds.lastVisitTs)>dB){ds.visitCount++;ds.lastVisitTs=ds.currentVisitTs}if(!bq||!dj.length){for(dy in cm){if(Object.prototype.hasOwnProperty.call(cm,dy)){dj=f(dC,cm[dy]);if(dj.length){break}}}for(dy in bB){if(Object.prototype.hasOwnProperty.call(bB,dy)){db=f(dC,bB[dy]);if(db.length){break}}}}dF=d(bi);dm=dx.length?d(dx):"";if(dF.length&&!aR(dF)&&(!bq||!dm.length||aR(dm))){dx=bi}if(dx.length||dj.length){di=dl;dw=[dj,db,di,bX(dx.slice(0,df))];c6(dt,JSON_PIWIK.stringify(dw),cZ,bk,cR)}}dd+="&idsite="+b1+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dc.getHours()+"&m="+dc.getMinutes()+"&s="+dc.getSeconds()+"&url="+t(bX(dC))+(bi.length?"&urlref="+t(bX(bi)):"")+((bt&&bt.length)?"&uid="+t(bt):"")+"&_id="+ds.uuid+"&_idts="+ds.createTs+"&_idvc="+ds.visitCount+"&_idn="+ds.newVisitor+(dj.length?"&_rcn="+t(dj):"")+(db.length?"&_rck="+t(db):"")+"&_refts="+di+"&_viewts="+ds.lastVisitTs+(String(ds.lastEcommerceOrderTs).length?"&_ects="+ds.lastEcommerceOrderTs:"")+(String(dx).length?"&_ref="+t(bX(dx.slice(0,df))):"")+(dp?"&cs="+t(dp):"")+"&send_image=0";
+ak(T,"focus",a6);ak(T,"blur",av);cj()}function cx(df){var dc=new Date();var db=dc.getTime();cS=db;if(cw&&db<cw){var dd=cw-db;setTimeout(df,dd);cb(dd+50);cw+=50;return}if(cw===false){var de=800;cw=db+de}df()}function bA(dc,db,dd){if(!bw){cE.push(dc);return}if(!cK&&dc){if(cv&&bw){dc+="&consent=1"}cx(function(){if(cQ&&a2(dc,dd)){cb(100);return}if(c3==="POST"||String(dc).length>2000){cY(dc,dd)}else{cl(dc,dd)}cb(db)})}if(!aK){c8()}else{cj()}}function cf(db){if(cK){return false}return(db&&db.length)}function cX(db,df){if(!df||df>=db.length){return[db]}var dc=0;var dd=db.length;var de=[];for(dc;dc<dd;dc+=df){de.push(db.slice(dc,dc+df))}return de}function c7(dc,db){if(!cf(dc)){return}if(!bw){cE.push(dc);return}cx(function(){var df=cX(dc,50);var dd=0,de;for(dd;dd<df.length;dd++){de='{"requests":["?'+df[dd].join('","?')+'"]}';cY(de,null,false)}cb(db)})}function aP(db){return bf+db+"."+b1+"."+bj}function b0(){if(bg){return"0"}var db=aP("testcookie");c6(db,"1");return az(db)==="1"?"1":"0"}function bd(){bj=b2((cR||cO)+(bk||"/")).slice(0,4)
+}function bS(){var dc=aP("cvar"),db=az(dc);if(db.length){db=JSON_PIWIK.parse(db);if(W(db)){return db}}return{}}function cy(){if(aM===false){aM=bS()}}function cL(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)+(new Date()).getTime()+Math.random()).slice(0,16)}function aw(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)).slice(0,6)}function bb(){return Math.floor((new Date()).getTime()/1000)}function aF(){var dc=bb();var dd=aw();var db=String(dc)+dd;return db}function cW(dd){dd=String(dd);var dg=aw();var de=dg.length;var df=dd.substr(-1*de,de);var dc=parseInt(dd.substr(0,dd.length-de),10);if(dc&&df&&df===dg){var db=bb();if(aV<=0){return true}if(db>=dc&&db<=(dc+aV)){return true}}return false}function c9(db){if(!cH){return""}var df=f(db,ar);if(!df){return""}df=String(df);var dd=new RegExp("^[a-zA-Z0-9]+$");if(df.length===32&&dd.test(df)){var dc=df.substr(16,32);if(cW(dc)){var de=df.substr(0,16);return de}}return""}function cI(){if(!bJ){bJ=c9(bI)
+}var dd=new Date(),db=Math.round(dd.getTime()/1000),dc=aP("id"),dg=az(dc),df,de;if(dg){df=dg.split(".");df.unshift("0");if(bJ.length){df[1]=bJ}return df}if(bJ.length){de=bJ}else{if("0"===b0()){de=""}else{de=cL()}}df=["1",de,db,0,db,"",""];return df}function aU(){var di=cI(),de=di[0],df=di[1],dc=di[2],db=di[3],dg=di[4],dd=di[5];if(!J(di[6])){di[6]=""}var dh=di[6];return{newVisitor:de,uuid:df,createTs:dc,visitCount:db,currentVisitTs:dg,lastVisitTs:dd,lastEcommerceOrderTs:dh}}function aD(){var de=new Date(),dc=de.getTime(),df=aU().createTs;var db=parseInt(df,10);var dd=(db*1000)+cD-dc;return dd}function aI(db){if(!b1){return}var dd=new Date(),dc=Math.round(dd.getTime()/1000);if(!J(db)){db=aU()}var de=db.uuid+"."+db.createTs+"."+db.visitCount+"."+dc+"."+db.lastVisitTs+"."+db.lastEcommerceOrderTs;c6(aP("id"),de,aD(),bk,cR,bN)}function bH(){var db=az(aP("ref"));if(db.length){try{db=JSON_PIWIK.parse(db);if(W(db)){return db}}catch(dc){}}return["","",0,""]}function bT(dd,dc,db){c6(dd,"",-86400,dc,db)
+}function br(dc){var db="testvalue";c6("test",db,10000,null,dc);if(az("test")===db){bT("test",null,dc);return true}return false}function aB(){var dc=bg;bg=false;var db,dd;for(db=0;db<bp.length;db++){dd=aP(bp[db]);if(dd!==cG&&dd!==a9&&0!==az(dd)){bT(dd,bk,cR)}}bg=dc}function bY(db){b1=db;aI()}function da(df){if(!df||!W(df)){return}var de=[];var dd;for(dd in df){if(Object.prototype.hasOwnProperty.call(df,dd)){de.push(dd)}}var dg={};de.sort();var db=de.length;var dc;for(dc=0;dc<db;dc++){dg[de[dc]]=df[de[dc]]}return dg}function b8(){c6(aP("ses"),"1",ck,bk,cR,bN)}function bc(){var de="";var dc="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dd=dc.length;var db;for(db=0;db<6;db++){de+=dc.charAt(Math.floor(Math.random()*dd))}return de}function co(dd,dz,dA,de){var dy,dc=new Date(),dl=Math.round(dc.getTime()/1000),di,dx,df=1024,dF,dm,dv=aM,dg=aP("ses"),dt=aP("ref"),dq=aP("cvar"),dr=az(dg),dw=bH(),dC=a0||bI,dj,db;if(bg){aB()}if(cK){return""}var ds=aU();if(!J(de)){de=""}var dp=G.characterSet||G.charset;
+if(!dp||dp.toLowerCase()==="utf-8"){dp=null}dj=dw[0];db=dw[1];di=dw[2];dx=dw[3];if(!dr){var dB=ck/1000;if(!ds.lastVisitTs||(dl-ds.lastVisitTs)>dB){ds.visitCount++;ds.lastVisitTs=ds.currentVisitTs}if(!bq||!dj.length){for(dy in cm){if(Object.prototype.hasOwnProperty.call(cm,dy)){dj=f(dC,cm[dy]);if(dj.length){break}}}for(dy in bB){if(Object.prototype.hasOwnProperty.call(bB,dy)){db=f(dC,bB[dy]);if(db.length){break}}}}dF=d(bi);dm=dx.length?d(dx):"";if(dF.length&&!aR(dF)&&(!bq||!dm.length||aR(dm))){dx=bi}if(dx.length||dj.length){di=dl;dw=[dj,db,di,bX(dx.slice(0,df))];c6(dt,JSON_PIWIK.stringify(dw),cZ,bk,cR)}}dd+="&idsite="+b1+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dc.getHours()+"&m="+dc.getMinutes()+"&s="+dc.getSeconds()+"&url="+t(bX(dC))+(bi.length?"&urlref="+t(bX(bi)):"")+((bt&&bt.length)?"&uid="+t(bt):"")+"&_id="+ds.uuid+"&_idts="+ds.createTs+"&_idvc="+ds.visitCount+"&_idn="+ds.newVisitor+(dj.length?"&_rcn="+t(dj):"")+(db.length?"&_rck="+t(db):"")+"&_refts="+di+"&_viewts="+ds.lastVisitTs+(String(ds.lastEcommerceOrderTs).length?"&_ects="+ds.lastEcommerceOrderTs:"")+(String(dx).length?"&_ref="+t(bX(dx.slice(0,df))):"")+(dp?"&cs="+t(dp):"")+"&send_image=0";
 for(dy in c1){if(Object.prototype.hasOwnProperty.call(c1,dy)){dd+="&"+dy+"="+c1[dy]}}var dE=[];if(dz){for(dy in dz){if(Object.prototype.hasOwnProperty.call(dz,dy)&&/^dimension\d+$/.test(dy)){var dh=dy.replace("dimension","");dE.push(parseInt(dh,10));dE.push(String(dh));dd+="&"+dy+"="+t(dz[dy]);delete dz[dy]}}}if(dz&&B(dz)){dz=null}for(dy in bh){if(Object.prototype.hasOwnProperty.call(bh,dy)){var dn=(-1===M(dE,dy));if(dn){dd+="&dimension"+dy+"="+t(bh[dy])}}}if(dz){dd+="&data="+t(JSON_PIWIK.stringify(dz))}else{if(al){dd+="&data="+t(JSON_PIWIK.stringify(al))}}function dk(dG,dH){var dI=JSON_PIWIK.stringify(dG);if(dI.length>2){return"&"+dH+"="+t(dI)}return""}var dD=da(bR);var du=da(ch);dd+=dk(dD,"cvar");dd+=dk(du,"e_cvar");if(aM){dd+=dk(aM,"_cvar");for(dy in dv){if(Object.prototype.hasOwnProperty.call(dv,dy)){if(aM[dy][0]===""||aM[dy][1]===""){delete aM[dy]}}}if(bL){c6(dq,JSON_PIWIK.stringify(aM),ck,bk,cR)}}if(aY){if(ci){dd+="&gt_ms="+ci}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dd+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
 }}}if(aH){dd+="&pv_id="+aH}ds.lastEcommerceOrderTs=J(de)&&String(de).length?de:ds.lastEcommerceOrderTs;aI(ds);b8();dd+=aa(dA,{tracker:bD,request:dd});if(cT.length){dd+="&"+cT}if(A(b6)){dd=b6(dd)}return dd}bM=function a3(){var db=new Date();if(cS+a1<=db.getTime()){bD.ping();return true}return false};function bl(de,dd,dj,df,db,dm){var dh="idgoal=0",di,dc=new Date(),dk=[],dl,dg=String(de).length;if(dg){dh+="&ec_id="+t(de);di=Math.round(dc.getTime()/1000)}dh+="&revenue="+dd;if(String(dj).length){dh+="&ec_st="+dj}if(String(df).length){dh+="&ec_tx="+df}if(String(db).length){dh+="&ec_sh="+db}if(String(dm).length){dh+="&ec_dt="+dm}if(cU){for(dl in cU){if(Object.prototype.hasOwnProperty.call(cU,dl)){if(!J(cU[dl][1])){cU[dl][1]=""}if(!J(cU[dl][2])){cU[dl][2]=""}if(!J(cU[dl][3])||String(cU[dl][3]).length===0){cU[dl][3]=0}if(!J(cU[dl][4])||String(cU[dl][4]).length===0){cU[dl][4]=1}dk.push(cU[dl])}}dh+="&ec_items="+t(JSON_PIWIK.stringify(dk))}dh=co(dh,al,"ecommerce",di);bA(dh,bE);if(dg){cU={}}}function bU(db,df,de,dd,dc,dg){if(String(db).length&&J(df)){bl(db,df,de,dd,dc,dg)
 }}function bn(db){if(J(db)){bl("",db,"","","","")}}function bV(dc,de,dd){aH=bc();var db=co("action_name="+t(ai(dc||be)),de,"log");bA(db,bE,dd)}function aW(dd,dc){var de,db="(^| )(piwik[_-]"+dc;if(dd){for(de=0;de<dd.length;de++){db+="|"+dd[de]}}db+=")( |$)";return new RegExp(db)}function aQ(db){return(aA&&db&&0===String(db).indexOf(aA))}function cq(df,db,dg,dc){if(aQ(db)){return 0}var de=aW(bG,"download"),dd=aW(a4,"link"),dh=new RegExp("\\.("+c0.join("|")+")([?&#]|$)","i");if(dd.test(df)){return"link"}if(dc||de.test(df)||dh.test(db)){return"download"}if(dg){return 0}return"link"}function aq(dc){var db;db=dc.parentNode;while(db!==null&&J(db)){if(ac.isLinkElement(dc)){break}dc=db;db=dc.parentNode}return dc}function c5(dg){dg=aq(dg);if(!ac.hasNodeAttribute(dg,"href")){return}if(!J(dg.href)){return}var df=ac.getAttributeValueFromNode(dg,"href");if(aQ(df)){return}var dc=dg.pathname||cg(dg.href);var dh=dg.hostname||d(dg.href);var di=dh.toLowerCase();var dd=dg.href.replace(dh,di);var de=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");
@@ -60,20 +60,20 @@ if(!dc||aQ(dc)){return}dc=k(dc,ar);var dd=bm();dc=F(dc,ar,dd);ac.setAnyAttribute
 }}function aX(db){return db.target||db.srcElement}function ay(db){return function(de){de=de||T.event;var dd=bO(de);var df=aX(de);if(de.type==="click"){var dc=false;if(db&&dd==="middle"){dc=true}if(df&&!dc){cA(df)}}else{if(de.type==="mousedown"){if(dd==="middle"&&df){aN=dd;bv=df}else{aN=bv=null}}else{if(de.type==="mouseup"){if(dd===aN&&df===bv){cA(df)}aN=bv=null}else{if(de.type==="contextmenu"){cA(df)}}}}}}function an(dd,dc){var db=typeof dc;if(db==="undefined"){dc=true}ak(dd,"click",ay(dc),false);if(dc){ak(dd,"mouseup",ay(dc),false);ak(dd,"mousedown",ay(dc),false);ak(dd,"contextmenu",ay(dc),false)}}function by(dd,df){am=true;var de,dc=aW(bu,"ignore"),dg=G.links,db=null,dh=null;if(dg){for(de=0;de<dg.length;de++){db=dg[de];if(!dc.test(db.className)){dh=typeof db.piwikTrackers;if("undefined"===dh){db.piwikTrackers=[]}if(-1===M(db.piwikTrackers,df)){db.piwikTrackers.push(df);an(db,dd)}}}}}function aO(dc,df,dg){if(ca){return true}ca=true;var dh=false;var de,dd;function db(){dh=true}n(function(){function di(dk){setTimeout(function(){if(!ca){return
 }dh=false;dg.trackVisibleContentImpressions();di(dk)},dk)}function dj(dk){setTimeout(function(){if(!ca){return}if(dh){dh=false;dg.trackVisibleContentImpressions()}dj(dk)},dk)}if(dc){de=["scroll","resize"];for(dd=0;dd<de.length;dd++){if(G.addEventListener){G.addEventListener(de[dd],db,false)}else{T.attachEvent("on"+de[dd],db)}}dj(100)}if(df&&df>0){df=parseInt(df,10);di(df)}})}function cz(){var dc,de,df={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(h.userAgent))){if(h.mimeTypes&&h.mimeTypes.length){for(dc in df){if(Object.prototype.hasOwnProperty.call(df,dc)){de=h.mimeTypes[df[dc]];c1[dc]=(de&&de.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(h.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&J(h.javaEnabled)&&h.javaEnabled()){c1.java="1"
 }if(A(T.GearsFactory)){c1.gears="1"}c1.cookie=b0()}var dd=parseInt(X.width,10);var db=parseInt(X.height,10);c1.res=parseInt(dd,10)+"x"+parseInt(db,10)}var bx={enabled:true,requests:[],timeout:null,sendRequests:function(){var db=this.requests;this.requests=[];if(db.length===1){bA(db[0],bE)}else{c7(db,bE)}},push:function(db){if(!db){return}if(m||!this.enabled){bA(db,bE);return}bx.requests.push(db);if(this.timeout){clearTimeout(this.timeout);this.timeout=null}this.timeout=setTimeout(function(){bx.timeout=null;bx.sendRequests()},1750);var dc="RequestQueue"+at;if(!Object.prototype.hasOwnProperty.call(b,dc)){b[dc]={unload:function(){if(bx.timeout){clearTimeout(bx.timeout)}bx.sendRequests()}}}}};cz();bd();aI();this.getVisitorId=function(){return aU().uuid};this.getVisitorInfo=function(){return cI()};this.getAttributionInfo=function(){return bH()};this.getAttributionCampaignName=function(){return bH()[0]};this.getAttributionCampaignKeyword=function(){return bH()[1]};this.getAttributionReferrerTimestamp=function(){return bH()[2]
-};this.getAttributionReferrerUrl=function(){return bH()[3]};this.setTrackerUrl=function(db){aA=db};this.getTrackerUrl=function(){return aA};this.getPiwikUrl=function(){return O(this.getTrackerUrl(),bC)};this.addTracker=function(db,dd){if(!dd){throw new Error("A siteId must be given to add a new tracker")}if(!J(db)||null===db){db=this.getTrackerUrl()}var dc=new Q(db,dd);I.push(dc);e.trigger("TrackerAdded",[this]);return dc};this.getSiteId=function(){return b1};this.setSiteId=function(db){bY(db)};this.resetUserId=function(){bt=""};this.setUserId=function(db){if(!J(db)||!db.length){return}bt=db};this.getUserId=function(){return bt};this.setCustomData=function(db,dc){if(W(db)){al=db}else{if(!al){al={}}al[db]=dc}};this.getCustomData=function(){return al};this.setCustomRequestProcessing=function(db){b6=db};this.appendToTrackingUrl=function(db){cT=db};this.getRequest=function(db){return co(db)};this.addPlugin=function(db,dc){b[db]=dc};this.setCustomDimension=function(db,dc){db=parseInt(db,10);
-if(db>0){if(!J(dc)){dc=""}if(!w(dc)){dc=String(dc)}bh[db]=dc}};this.getCustomDimension=function(db){db=parseInt(db,10);if(db>0&&Object.prototype.hasOwnProperty.call(bh,db)){return bh[db]}};this.deleteCustomDimension=function(db){db=parseInt(db,10);if(db>0){delete bh[db]}};this.setCustomVariable=function(dc,db,df,dd){var de;if(!J(dd)){dd="visit"}if(!J(db)){return}if(!J(df)){df=""}if(dc>0){db=!w(db)?String(db):db;df=!w(df)?String(df):df;de=[db.slice(0,bo),df.slice(0,bo)];if(dd==="visit"||dd===2){cy();aM[dc]=de}else{if(dd==="page"||dd===3){bR[dc]=de}else{if(dd==="event"){ch[dc]=de}}}}};this.getCustomVariable=function(dc,dd){var db;if(!J(dd)){dd="visit"}if(dd==="page"||dd===3){db=bR[dc]}else{if(dd==="event"){db=ch[dc]}else{if(dd==="visit"||dd===2){cy();db=aM[dc]}}}if(!J(db)||(db&&db[0]==="")){return false}return db};this.deleteCustomVariable=function(db,dc){if(this.getCustomVariable(db,dc)){this.setCustomVariable(db,"","",dc)}};this.deleteCustomVariables=function(db){if(db==="page"||db===3){bR={}
-}else{if(db==="event"){ch={}}else{if(db==="visit"||db===2){aM={}}}}};this.storeCustomVariablesInCookie=function(){bL=true};this.setLinkTrackingTimer=function(db){bE=db};this.getLinkTrackingTimer=function(){return bE};this.setDownloadExtensions=function(db){if(w(db)){db=db.split("|")}c0=db};this.addDownloadExtensions=function(dc){var db;if(w(dc)){dc=dc.split("|")}for(db=0;db<dc.length;db++){c0.push(dc[db])}};this.removeDownloadExtensions=function(dd){var dc,db=[];if(w(dd)){dd=dd.split("|")}for(dc=0;dc<c0.length;dc++){if(M(dd,c0[dc])===-1){db.push(c0[dc])}}c0=db};this.setDomains=function(db){au=w(db)?[db]:db;var df=false,dd=0,dc;for(dd;dd<au.length;dd++){dc=String(au[dd]);if(cB(cO,L(dc))){df=true;break}var de=cg(dc);if(de&&de!=="/"&&de!=="/*"){df=true;break}}if(!df){au.push(cO)}};this.enableCrossDomainLinking=function(){cH=true};this.disableCrossDomainLinking=function(){cH=false};this.isCrossDomainLinkingEnabled=function(){return cH};this.setCrossDomainLinkingTimeout=function(db){aV=db};this.getCrossDomainLinkingUrlParameter=function(){return t(ar)+"="+t(bm())
-};this.setIgnoreClasses=function(db){bu=w(db)?[db]:db};this.setRequestMethod=function(db){c3=db||cd};this.setRequestContentType=function(db){cs=db||aE};this.setReferrerUrl=function(db){bi=db};this.setCustomUrl=function(db){a0=bQ(bI,db)};this.getCurrentUrl=function(){return a0||bI};this.setDocumentTitle=function(db){be=db};this.setAPIUrl=function(db){bC=db};this.setDownloadClasses=function(db){bG=w(db)?[db]:db};this.setLinkClasses=function(db){a4=w(db)?[db]:db};this.setCampaignNameKey=function(db){cm=w(db)?[db]:db};this.setCampaignKeywordKey=function(db){bB=w(db)?[db]:db};this.discardHashTag=function(db){bK=db};this.setCookieNamePrefix=function(db){bf=db;aM=bS()};this.setCookieDomain=function(db){var dc=L(db);if(br(dc)){cR=dc;bd()}};this.getCookieDomain=function(){return cR};this.hasCookies=function(){return"1"===b0()};this.setSessionCookie=function(dd,dc,db){if(!dd){throw new Error("Missing cookie name")}if(!J(db)){db=ck}bp.push(dd);c6(aP(dd),dc,db,bk,cR)};this.getCookie=function(dc){var db=az(aP(dc));
-if(db===0){return null}return db};this.setCookiePath=function(db){bk=db;bd()};this.getCookiePath=function(db){return bk};this.setVisitorCookieTimeout=function(db){cD=db*1000};this.setSessionCookieTimeout=function(db){ck=db*1000};this.getSessionCookieTimeout=function(){return ck};this.setReferralCookieTimeout=function(db){cZ=db*1000};this.setConversionAttributionFirstReferrer=function(db){bq=db};this.setSecureCookie=function(db){bN=db};this.disableCookies=function(){bg=true;c1.cookie="0";if(b1){aB()}};this.deleteCookies=function(){aB()};this.setDoNotTrack=function(dc){var db=h.doNotTrack||h.msDoNotTrack;cK=dc&&(db==="yes"||db==="1");if(cK){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cQ=true};this.addListener=function(dc,db){an(dc,db)};this.enableLinkTracking=function(dc){c2=true;var db=this;cc(function(){q(function(){by(dc,db)})})};this.enableJSErrorTracking=function(){if(cM){return}cM=true;var db=T.onerror;T.onerror=function(dg,de,dd,df,dc){cc(function(){var dh="JavaScript Errors";
-var di=de+":"+dd;if(df){di+=":"+df}ap(dh,di,dg)});if(db){return db(dg,de,dd,df,dc)}return false}};this.disablePerformanceTracking=function(){aY=false};this.setGenerationTimeMs=function(db){ci=parseInt(db,10)};this.enableHeartBeatTimer=function(db){db=Math.max(db,1);a1=(db||15)*1000;if(cS!==null){c8()}};this.disableHeartBeatTimer=function(){bF();if(a1||aK){if(T.removeEventListener){T.removeEventListener("focus",a6,true);T.removeEventListener("blur",av,true)}else{if(T.detachEvent){T.detachEvent("onfocus",a6);T.detachEvent("onblur",av)}}}a1=null;aK=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};this.redirectFile=function(db){if(T.location.protocol==="file:"){T.location=db}};this.setCountPreRendered=function(db){ba=db};this.trackGoal=function(db,de,dd,dc){cc(function(){cN(db,de,dd,dc)})};this.trackLink=function(dc,db,de,dd){cc(function(){cV(dc,db,de,dd)})};this.getNumTrackedPageViews=function(){return cn};this.trackPageView=function(db,dd,dc){b5=[];
-cE=[];if(N(b1)){cc(function(){Y(aA,bC,b1)})}else{cc(function(){cn++;bV(db,dd,dc)})}};this.trackAllContentImpressions=function(){if(N(b1)){return}cc(function(){q(function(){var db=v.findContentNodes();var dc=cu(db);c7(dc,bE)})})};this.trackVisibleContentImpressions=function(db,dc){if(N(b1)){return}if(!J(db)){db=true}if(!J(dc)){dc=750}aO(db,dc,this);cc(function(){n(function(){var dd=v.findContentNodes();var de=a5(dd);c7(de,bE)})})};this.trackContentImpression=function(dd,db,dc){if(N(b1)){return}dd=a(dd);db=a(db);dc=a(dc);if(!dd){return}db=db||"Unknown";cc(function(){var de=aC(dd,db,dc);bA(de,bE)})};this.trackContentImpressionsWithinNode=function(db){if(N(b1)||!db){return}cc(function(){if(ca){n(function(){var dc=v.findContentNodesWithinNode(db);var dd=a5(dc);c7(dd,bE)})}else{q(function(){var dc=v.findContentNodesWithinNode(db);var dd=cu(dc);c7(dd,bE)})}})};this.trackContentInteraction=function(dd,de,db,dc){if(N(b1)){return}dd=a(dd);de=a(de);db=a(db);dc=a(dc);if(!dd||!de){return}db=db||"Unknown";
-cc(function(){var df=aL(dd,de,db,dc);if(df){bA(df,bE)}})};this.trackContentInteractionNode=function(dc,db){if(N(b1)||!dc){return}cc(function(){var dd=c4(dc,db);if(dd){bA(dd,bE)}})};this.logAllContentBlocksOnPage=function(){var dd=v.findContentNodes();var db=v.collectContent(dd);var dc=typeof console;if(dc!=="undefined"&&console&&console.log){console.log(db)}};this.trackEvent=function(dc,de,db,dd,dg,df){cc(function(){ap(dc,de,db,dd,dg,df)})};this.trackSiteSearch=function(db,dd,dc,de){b5=[];cc(function(){b3(db,dd,dc,de)})};this.setEcommerceView=function(de,db,dd,dc){if(!J(dd)||!dd.length){dd=""}else{if(dd instanceof Array){dd=JSON_PIWIK.stringify(dd)}}bR[5]=["_pkc",dd];if(J(dc)&&String(dc).length){bR[2]=["_pkp",dc]}if((!J(de)||!de.length)&&(!J(db)||!db.length)){return}if(J(de)&&de.length){bR[3]=["_pks",de]}if(!J(db)||!db.length){db=""}bR[4]=["_pkn",db]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cU))};this.addEcommerceItem=function(df,db,dd,dc,de){if(df.length){cU[df]=[df,db,dd,dc,de]
-}};this.removeEcommerceItem=function(db){if(db.length){delete cU[db]}};this.clearEcommerceCart=function(){cU={}};this.trackEcommerceOrder=function(db,df,de,dd,dc,dg){bU(db,df,de,dd,dc,dg)};this.trackEcommerceCartUpdate=function(db){bn(db)};this.trackRequest=function(dc,de,dd,db){cc(function(){var df=co(dc,de,db);bA(df,bE,dd)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bx.enabled=false};this.queueRequest=function(db){cc(function(){var dc=co(db);bx.push(dc)})};this.getRememberedConsent=function(){var db=az(a9);if(az(cG)){if(db){bT(a9,bk,cR)}return null}if(!db||db===0){return null}return db};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cv=true;bw=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bw){aB()}}}};this.setConsentGiven=function(){bw=true;bT(cG,bk,cR);var dc,db;for(dc=0;dc<cE.length;dc++){db=typeof cE[dc];if(db==="string"){bA(cE[dc],bE)
-}else{if(db==="object"){c7(cE[dc],bE)}}}cE=[]};this.rememberConsentGiven=function(dc){if(bg){ah("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");return}if(dc){dc=dc*60*60*1000}this.setConsentGiven();var db=new Date().getTime();c6(a9,db,dc,bk,cR,bN)};this.forgetConsentGiven=function(){if(bg){ah("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}bT(a9,bk,cR);c6(cG,new Date().getTime(),0,bk,cR,bN);this.requireConsent()};this.isUserOptedOut=function(){return !bw};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ad}}function c(aq,ap){var ar={};var an,ao;for(an=0;an<ap.length;an++){var al=ap[an];ar[al]=1;for(ao=0;ao<aq.length;ao++){if(aq[ao]&&aq[ao][0]){var am=aq[ao][0];if(al===am){ad(aq[ao]);delete aq[ao];if(ar[am]>1&&am!=="addTracker"){ah("The method "+am+' 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: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
-}ar[am]++}}}}return aq}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ab(al,an){var am=new Q(al,an);I.push(am);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){ad(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[am]);return am}ak(T,"beforeunload",af,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ao,an,am,al){var ap=typeof al;if(ap==="undefined"){al=false}ak(ao,an,am,al)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(am,al){if(!y[am]){y[am]=[]}y[am].push(al)},off:function(an,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){if(y[an][al]===am){y[an].splice(al,1)}}},trigger:function(an,ao,am){if(!y[an]){return}var al=0;
-for(al;al<y[an].length;al++){y[an][al].apply(am||T,ao)}},addPlugin:function(al,am){b[al]=am},getTracker:function(al,am){if(!J(am)){am=this.getAsyncTracker().getSiteId()}if(!J(al)){al=this.getAsyncTracker().getTrackerUrl()}return new Q(al,am)},getAsyncTrackers:function(){return I},addTracker:function(al,an){var am;if(!I.length){am=ab(al,an)}else{am=I[0].addTracker(al,an)}return am},getAsyncTracker:function(am,ap){var ao;if(I&&I.length&&I[0]){ao=I[0]}else{return ab(am,ap)}if(!ap&&!am){return ao}if((!J(ap)||null===ap)&&ao){ap=ao.getSiteId()}if((!J(am)||null===am)&&ao){am=ao.getTrackerUrl()}var an,al=0;for(al;al<I.length;al++){an=I[al];if(an&&String(an.getSiteId())===String(ap)&&an.getTrackerUrl()===am){return an}}},retryMissedPluginCalls:function(){var am=ae;ae=[];var al=0;for(al;al<am.length;al++){ad(am[al])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})}return e}())}
+};this.getAttributionReferrerUrl=function(){return bH()[3]};this.setTrackerUrl=function(db){aA=db};this.getTrackerUrl=function(){return aA};this.getPiwikUrl=function(){return O(this.getTrackerUrl(),bC)};this.addTracker=function(db,dd){if(!J(db)||null===db){db=this.getTrackerUrl()}var dc=new Q(db,dd);I.push(dc);e.trigger("TrackerAdded",[this]);return dc};this.getSiteId=function(){return b1};this.setSiteId=function(db){bY(db)};this.resetUserId=function(){bt=""};this.setUserId=function(db){if(!J(db)||!db.length){return}bt=db};this.getUserId=function(){return bt};this.setCustomData=function(db,dc){if(W(db)){al=db}else{if(!al){al={}}al[db]=dc}};this.getCustomData=function(){return al};this.setCustomRequestProcessing=function(db){b6=db};this.appendToTrackingUrl=function(db){cT=db};this.getRequest=function(db){return co(db)};this.addPlugin=function(db,dc){b[db]=dc};this.setCustomDimension=function(db,dc){db=parseInt(db,10);if(db>0){if(!J(dc)){dc=""}if(!w(dc)){dc=String(dc)}bh[db]=dc}};this.getCustomDimension=function(db){db=parseInt(db,10);
+if(db>0&&Object.prototype.hasOwnProperty.call(bh,db)){return bh[db]}};this.deleteCustomDimension=function(db){db=parseInt(db,10);if(db>0){delete bh[db]}};this.setCustomVariable=function(dc,db,df,dd){var de;if(!J(dd)){dd="visit"}if(!J(db)){return}if(!J(df)){df=""}if(dc>0){db=!w(db)?String(db):db;df=!w(df)?String(df):df;de=[db.slice(0,bo),df.slice(0,bo)];if(dd==="visit"||dd===2){cy();aM[dc]=de}else{if(dd==="page"||dd===3){bR[dc]=de}else{if(dd==="event"){ch[dc]=de}}}}};this.getCustomVariable=function(dc,dd){var db;if(!J(dd)){dd="visit"}if(dd==="page"||dd===3){db=bR[dc]}else{if(dd==="event"){db=ch[dc]}else{if(dd==="visit"||dd===2){cy();db=aM[dc]}}}if(!J(db)||(db&&db[0]==="")){return false}return db};this.deleteCustomVariable=function(db,dc){if(this.getCustomVariable(db,dc)){this.setCustomVariable(db,"","",dc)}};this.deleteCustomVariables=function(db){if(db==="page"||db===3){bR={}}else{if(db==="event"){ch={}}else{if(db==="visit"||db===2){aM={}}}}};this.storeCustomVariablesInCookie=function(){bL=true
+};this.setLinkTrackingTimer=function(db){bE=db};this.getLinkTrackingTimer=function(){return bE};this.setDownloadExtensions=function(db){if(w(db)){db=db.split("|")}c0=db};this.addDownloadExtensions=function(dc){var db;if(w(dc)){dc=dc.split("|")}for(db=0;db<dc.length;db++){c0.push(dc[db])}};this.removeDownloadExtensions=function(dd){var dc,db=[];if(w(dd)){dd=dd.split("|")}for(dc=0;dc<c0.length;dc++){if(M(dd,c0[dc])===-1){db.push(c0[dc])}}c0=db};this.setDomains=function(db){au=w(db)?[db]:db;var df=false,dd=0,dc;for(dd;dd<au.length;dd++){dc=String(au[dd]);if(cB(cO,L(dc))){df=true;break}var de=cg(dc);if(de&&de!=="/"&&de!=="/*"){df=true;break}}if(!df){au.push(cO)}};this.enableCrossDomainLinking=function(){cH=true};this.disableCrossDomainLinking=function(){cH=false};this.isCrossDomainLinkingEnabled=function(){return cH};this.setCrossDomainLinkingTimeout=function(db){aV=db};this.getCrossDomainLinkingUrlParameter=function(){return t(ar)+"="+t(bm())};this.setIgnoreClasses=function(db){bu=w(db)?[db]:db
+};this.setRequestMethod=function(db){c3=db||cd};this.setRequestContentType=function(db){cs=db||aE};this.setReferrerUrl=function(db){bi=db};this.setCustomUrl=function(db){a0=bQ(bI,db)};this.getCurrentUrl=function(){return a0||bI};this.setDocumentTitle=function(db){be=db};this.setAPIUrl=function(db){bC=db};this.setDownloadClasses=function(db){bG=w(db)?[db]:db};this.setLinkClasses=function(db){a4=w(db)?[db]:db};this.setCampaignNameKey=function(db){cm=w(db)?[db]:db};this.setCampaignKeywordKey=function(db){bB=w(db)?[db]:db};this.discardHashTag=function(db){bK=db};this.setCookieNamePrefix=function(db){bf=db;aM=bS()};this.setCookieDomain=function(db){var dc=L(db);if(br(dc)){cR=dc;bd()}};this.getCookieDomain=function(){return cR};this.hasCookies=function(){return"1"===b0()};this.setSessionCookie=function(dd,dc,db){if(!dd){throw new Error("Missing cookie name")}if(!J(db)){db=ck}bp.push(dd);c6(aP(dd),dc,db,bk,cR)};this.getCookie=function(dc){var db=az(aP(dc));if(db===0){return null}return db};this.setCookiePath=function(db){bk=db;
+bd()};this.getCookiePath=function(db){return bk};this.setVisitorCookieTimeout=function(db){cD=db*1000};this.setSessionCookieTimeout=function(db){ck=db*1000};this.getSessionCookieTimeout=function(){return ck};this.setReferralCookieTimeout=function(db){cZ=db*1000};this.setConversionAttributionFirstReferrer=function(db){bq=db};this.setSecureCookie=function(db){bN=db};this.disableCookies=function(){bg=true;c1.cookie="0";if(b1){aB()}};this.deleteCookies=function(){aB()};this.setDoNotTrack=function(dc){var db=h.doNotTrack||h.msDoNotTrack;cK=dc&&(db==="yes"||db==="1");if(cK){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cQ=true};this.addListener=function(dc,db){an(dc,db)};this.enableLinkTracking=function(dc){c2=true;var db=this;cc(function(){q(function(){by(dc,db)})})};this.enableJSErrorTracking=function(){if(cM){return}cM=true;var db=T.onerror;T.onerror=function(dg,de,dd,df,dc){cc(function(){var dh="JavaScript Errors";var di=de+":"+dd;if(df){di+=":"+df}ap(dh,di,dg)});if(db){return db(dg,de,dd,df,dc)
+}return false}};this.disablePerformanceTracking=function(){aY=false};this.setGenerationTimeMs=function(db){ci=parseInt(db,10)};this.enableHeartBeatTimer=function(db){db=Math.max(db,1);a1=(db||15)*1000;if(cS!==null){c8()}};this.disableHeartBeatTimer=function(){bF();if(a1||aK){if(T.removeEventListener){T.removeEventListener("focus",a6);T.removeEventListener("blur",av)}else{if(T.detachEvent){T.detachEvent("onfocus",a6);T.detachEvent("onblur",av)}}}a1=null;aK=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};this.redirectFile=function(db){if(T.location.protocol==="file:"){T.location=db}};this.setCountPreRendered=function(db){ba=db};this.trackGoal=function(db,de,dd,dc){cc(function(){cN(db,de,dd,dc)})};this.trackLink=function(dc,db,de,dd){cc(function(){cV(dc,db,de,dd)})};this.getNumTrackedPageViews=function(){return cn};this.trackPageView=function(db,dd,dc){b5=[];cE=[];if(N(b1)){cc(function(){Y(aA,bC,b1)})}else{cc(function(){cn++;bV(db,dd,dc)})}};this.trackAllContentImpressions=function(){if(N(b1)){return
+}cc(function(){q(function(){var db=v.findContentNodes();var dc=cu(db);c7(dc,bE)})})};this.trackVisibleContentImpressions=function(db,dc){if(N(b1)){return}if(!J(db)){db=true}if(!J(dc)){dc=750}aO(db,dc,this);cc(function(){n(function(){var dd=v.findContentNodes();var de=a5(dd);c7(de,bE)})})};this.trackContentImpression=function(dd,db,dc){if(N(b1)){return}dd=a(dd);db=a(db);dc=a(dc);if(!dd){return}db=db||"Unknown";cc(function(){var de=aC(dd,db,dc);bA(de,bE)})};this.trackContentImpressionsWithinNode=function(db){if(N(b1)||!db){return}cc(function(){if(ca){n(function(){var dc=v.findContentNodesWithinNode(db);var dd=a5(dc);c7(dd,bE)})}else{q(function(){var dc=v.findContentNodesWithinNode(db);var dd=cu(dc);c7(dd,bE)})}})};this.trackContentInteraction=function(dd,de,db,dc){if(N(b1)){return}dd=a(dd);de=a(de);db=a(db);dc=a(dc);if(!dd||!de){return}db=db||"Unknown";cc(function(){var df=aL(dd,de,db,dc);if(df){bA(df,bE)}})};this.trackContentInteractionNode=function(dc,db){if(N(b1)||!dc){return}cc(function(){var dd=c4(dc,db);
+if(dd){bA(dd,bE)}})};this.logAllContentBlocksOnPage=function(){var dd=v.findContentNodes();var db=v.collectContent(dd);var dc=typeof console;if(dc!=="undefined"&&console&&console.log){console.log(db)}};this.trackEvent=function(dc,de,db,dd,dg,df){cc(function(){ap(dc,de,db,dd,dg,df)})};this.trackSiteSearch=function(db,dd,dc,de){b5=[];cc(function(){b3(db,dd,dc,de)})};this.setEcommerceView=function(de,db,dd,dc){if(!J(dd)||!dd.length){dd=""}else{if(dd instanceof Array){dd=JSON_PIWIK.stringify(dd)}}bR[5]=["_pkc",dd];if(J(dc)&&String(dc).length){bR[2]=["_pkp",dc]}if((!J(de)||!de.length)&&(!J(db)||!db.length)){return}if(J(de)&&de.length){bR[3]=["_pks",de]}if(!J(db)||!db.length){db=""}bR[4]=["_pkn",db]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cU))};this.addEcommerceItem=function(df,db,dd,dc,de){if(df.length){cU[df]=[df,db,dd,dc,de]}};this.removeEcommerceItem=function(db){if(db.length){delete cU[db]}};this.clearEcommerceCart=function(){cU={}};this.trackEcommerceOrder=function(db,df,de,dd,dc,dg){bU(db,df,de,dd,dc,dg)
+};this.trackEcommerceCartUpdate=function(db){bn(db)};this.trackRequest=function(dc,de,dd,db){cc(function(){var df=co(dc,de,db);bA(df,bE,dd)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bx.enabled=false};this.queueRequest=function(db){cc(function(){var dc=co(db);bx.push(dc)})};this.getRememberedConsent=function(){var db=az(a9);if(az(cG)){if(db){bT(a9,bk,cR)}return null}if(!db||db===0){return null}return db};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cv=true;bw=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bw){aB()}}}};this.setConsentGiven=function(){bw=true;bT(cG,bk,cR);var dc,db;for(dc=0;dc<cE.length;dc++){db=typeof cE[dc];if(db==="string"){bA(cE[dc],bE)}else{if(db==="object"){c7(cE[dc],bE)}}}cE=[]};this.rememberConsentGiven=function(dc){if(bg){ah("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");
+return}if(dc){dc=dc*60*60*1000}this.setConsentGiven();var db=new Date().getTime();c6(a9,db,dc,bk,cR,bN)};this.forgetConsentGiven=function(){if(bg){ah("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}var db=30*365*24*60*60*1000;bT(a9,bk,cR);c6(cG,new Date().getTime(),db,bk,cR,bN);this.requireConsent()};this.isUserOptedOut=function(){return !bw};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ad}}function c(aq,ap){var ar={};var an,ao;for(an=0;an<ap.length;an++){var al=ap[an];ar[al]=1;for(ao=0;ao<aq.length;ao++){if(aq[ao]&&aq[ao][0]){var am=aq[ao][0];if(al===am){ad(aq[ao]);delete aq[ao];if(ar[am]>1&&am!=="addTracker"){ah("The method "+am+' 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: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
+}ar[am]++}}}}return aq}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ab(al,an){var am=new Q(al,an);I.push(am);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){ad(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[am]);return am}ak(T,"beforeunload",af,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ao,an,am,al){var ap=typeof al;if(ap==="undefined"){al=false}ak(ao,an,am,al)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(am,al){if(!y[am]){y[am]=[]}y[am].push(al)},off:function(an,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){if(y[an][al]===am){y[an].splice(al,1)
+}}},trigger:function(an,ao,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){y[an][al].apply(am||T,ao)}},addPlugin:function(al,am){b[al]=am},getTracker:function(al,am){if(!J(am)){am=this.getAsyncTracker().getSiteId()}if(!J(al)){al=this.getAsyncTracker().getTrackerUrl()}return new Q(al,am)},getAsyncTrackers:function(){return I},addTracker:function(al,an){var am;if(!I.length){am=ab(al,an)}else{am=I[0].addTracker(al,an)}return am},getAsyncTracker:function(am,ap){var ao;if(I&&I.length&&I[0]){ao=I[0]}else{return ab(am,ap)}if(!ap&&!am){return ao}if((!J(ap)||null===ap)&&ao){ap=ao.getSiteId()}if((!J(am)||null===am)&&ao){am=ao.getTrackerUrl()}var an,al=0;for(al;al<I.length;al++){an=I[al];if(an&&String(an.getSiteId())===String(ap)&&an.getTrackerUrl()===am){return an}}},retryMissedPluginCalls:function(){var am=ae;ae=[];var al=0;for(al;al<am.length;al++){ad(am[al])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})
+}return e}())}
 /*!!! pluginTrackerHook */
-(function(){function b(){if("object"!==typeof _paq){return false
-}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true
-}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
+(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)
+}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
 /*!! @license-end */;
\ No newline at end of file
diff --git a/app/js/tracker.php b/app/js/tracker.php
index 87d21314f..ce9793b9c 100644
--- a/app/js/tracker.php
+++ b/app/js/tracker.php
@@ -22,15 +22,18 @@
  *
  * @see core/Piwik.php
  */
-define('PIWIK_INCLUDE_PATH', '..');
 define('PIWIK_DOCUMENT_ROOT', '..');
 
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
-	require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
+    require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
+}
+
+if (!defined('PIWIK_INCLUDE_PATH')) {
+    define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
 if (!defined('PIWIK_USER_PATH')) {
-	define('PIWIK_USER_PATH', '..');
+    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
diff --git a/app/lang/bg.json b/app/lang/bg.json
index 5c75aedfa..ae747c878 100644
--- a/app/lang/bg.json
+++ b/app/lang/bg.json
@@ -286,7 +286,6 @@
         "Remove": "Премахни",
         "Report": "Доклад",
         "ReportGeneratedFrom": "Този доклад е генериран с данни от %s.",
-        "ReportRatioTooltip": "'%1$s' представя %2$s за %3$s %4$s с %5$s.",
         "Reports": "Доклади",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Архивирай отчетите на всеки X секунди",
         "ReportsWillBeProcessedAtMostEveryHour": "Докладите ще бъдат най-добре обработени на всеки час.",
@@ -327,7 +326,6 @@
         "TimeAgo": "%s преди",
         "TimeOnPage": "Време на страница",
         "Total": "Общо",
-        "TotalRatioTooltip": "Това е %1$s от всички %2$s %3$s.",
         "TotalRevenue": "Общо приход",
         "TrackingScopeAction": "Действие",
         "TrackingScopeVisit": "Посещение",
diff --git a/app/lang/cs.json b/app/lang/cs.json
index 7753c2311..7ec25e5f7 100644
--- a/app/lang/cs.json
+++ b/app/lang/cs.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Více informací o zobrazování grafů v Matomo",
         "HelloUser": "Ahoj, %s!",
         "Help": "Pomoc",
+        "HelpResources": "Zdroje nápovědy",
         "HelpTranslatePiwik": "Možná byste nám chtěli %1$s pomoci s překladem Matomo%2$s.",
         "Hide": "skrýt",
         "HoursMinutes": "%1$s hodin %2$s min.",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Obdržená data jsou neplatná.",
         "IP": "IP",
         "JsTrackingTag": "Javascriptový tracking kód",
+        "KpiMetric": "KPI Metrika",
         "Language": "Jazyk",
         "Languages": "Jazyky",
         "LastDays": "Posledních %s dní (včetně dneška)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 návštěva",
         "OnlyEnterIfRequired": "Uživatelské jméno zadejte pouze v případě, že jej váš SMTP server vyžaduje",
         "OnlyEnterIfRequiredPassword": "Heslo zadejte pouze v případě, že jej váš SMTP server vyžaduje",
+        "SmtpFromEmailHelp": "Výchozí hodnota je noreply@{DOMAIN}, kde {DOMAIN} bude nahrazena vaší Matomo doménou \"%1$s\".<br>Pokud vám nefunguje odesílání mailů možná je potřeba nastavit tuto adresu aby odpovídala vašemu uživatelskému jménu pro SMTP.",
+        "NameShownInTheSenderColumn": "Název zobrazený ve sloupci odesílatele",
         "OnlyUsedIfUserPwdIsSet": "Použito pouze v případě, že je nastaveno uživatelské jméno\/heslo. V případě že si nejste jisti jakou metodu použít, zeptejte se svého poskytovatele",
         "OpenSourceWebAnalytics": "Open Source Web Analytics",
         "OperationAtLeast": "Aspoň",
@@ -366,7 +370,7 @@
         "Remove": "Odstranit",
         "Report": "Hlášení",
         "ReportGeneratedFrom": "Toto hlášení bylo vytvořeno s použitím dat z %s.",
-        "ReportRatioTooltip": "'%1$s' reprezentuje %2$s z %3$s %4$s s %5$s.",
+        "ReportRatioTooltip": "'%1$s' představuje %2$s z %3$s %4$s v segmentu %5$s s %6$s.",
         "Reports": "Hlášení",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archivovat hlášení nejvýše každých X sekund",
         "RearchiveTimeIntervalOnlyForTodayReports": "Toto ovlivní pouze hlášení zahrnující dnešek nebo období, která dnešek obsahují.",
@@ -400,6 +404,8 @@
         "SmtpPort": "Post SMTP",
         "SmtpServerAddress": "Adresa SMTP serveru",
         "SmtpUsername": "Uživatelské jméno SMTP",
+        "SmtpFromName": "SMTP jméno odesílatele",
+        "SmtpFromAddress": "SMTP adresa odesílatele",
         "Source": "Zdroj",
         "StatisticsAreNotRecorded": "Zaznamenávání statistik návštěvníků Matomo je aktuálně zakázáno. Povolte ho nastavením record_statistics = 1 ve vašem souboru config\/config.ini.php.",
         "Subtotal": "Mezisoučet",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Pokud chcete všechny tyto soubory smazat, spusťte následující příkaz:",
         "Total": "Celkem",
         "Totals": "Celkem",
-        "TotalRatioTooltip": "Toto je %1$s ze všech %2$s %3$s.",
+        "TotalRatioTooltip": "Toto je %1$s ze všech %2$s %3$s v %4$s.",
         "TotalRevenue": "Celková hodnota",
         "TotalVisitsPageviewsActionsRevenue": "(Celkem: %1$s návštěv, %2$s zobrazení, %3$s akcí, %4$s příjem)",
         "TrackingScopeAction": "Akce",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "Prohlížíte si demo %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Abyste mohli využívat tyto funkce musíte být přihlášeni",
         "YourChangesHaveBeenSaved": "Vaše změny byly uloženy",
+        "YourSessionHasExpired": "Vaše relace vypršela kvůli nečinnosti. Pro pokračování se prosím přihlašte.",
         "ThankYouForUsingMatomo": "Děkujeme že používáte Matomo",
-        "TheMatomoTeam": "Tým Matomo"
+        "TheMatomoTeam": "Tým Matomo",
+        "PleaseTryAgain": "Prosím zkuste to znovu",
+        "ComparisonRatioTooltip": "Toto je %1$s změna ve srovnání s '%2$s' segmentem na %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' na %2$s obsahuje %3$s ze všech návštěv (%4$s z celkových%5$s).",
+        "ComparisonCardTooltip2": "Počet návštěv je odlišný o %1$s ve srovnání s %2$s nad %3$s.",
+        "VisualizationDoesNotSupportComparison": "Tato vizualizace nepodporuje srovnání segmentů\/období.",
+        "ChangeInX": "Změna v %1$s",
+        "Comparisons": "Porovnání",
+        "ClickToRemoveComp": "Klepnutím toto porovnání odeberete.",
+        "MaximumNumberOfSegmentsComparedIs": "Maximální počet segmentů, které lze porovnat současně, je %s.",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s délka parametru dotazu se musí shodovat s %2$s délkou parametru dotazu.",
+        "MaximumNumberOfPeriodsComparedIs": "Maximální počet period, které lze porovnat současně, je %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "O Matomo Mobile",
@@ -568,7 +586,11 @@
         "VerifyLoginData": "Ujistěte se, že kombinace vašeho uživatelského jména a hesla je správná.",
         "YouAreOffline": "Omlouváme se, momentálně jste offline",
         "ExceptionNoViewAccess": "Zkontrolujte vaše uživatelské jméno a heslo a ujistěte se, že máte přístup %s alespoň pro jedny stránky.",
-        "Mobile_HowtoExitAndroid": "Klikněte na zpět pro ukončení"
+        "Mobile_HowtoExitAndroid": "Klikněte na zpět pro ukončení",
+        "MatomoMarketplace": "Matomo obchod",
+        "EnterAuthCode": "Vložit autentikační kód",
+        "EnterCorrectAuthCode": "Vložte správný autentikační kód",
+        "EnterAuthCodeExplanation": "Vypadá to, že možná používáte dvoufaktorové ověřování. Zadejte prosím šestimístný kód pro přihlášení k účtu."
     },
     "RowEvolution": {
         "AvailableMetrics": "Dostupná měření",
diff --git a/app/lang/da.json b/app/lang/da.json
index dc88d3d0e..29af8a874 100644
--- a/app/lang/da.json
+++ b/app/lang/da.json
@@ -40,6 +40,7 @@
         "ColumnActionsPerVisit": "Handlinger pr. besøg",
         "ColumnActionsPerVisitDocumentation": "Det gennemsnitlige antal handlinger (sidevisninger, filhentninger eller udgående links), der blev udført under besøgene.",
         "ColumnAverageGenerationTime": "Gennemsnitlig genereringstid",
+        "ColumnViewsWithGenerationTime": "Sidevisninger med produktionstid",
         "ColumnAverageGenerationTimeDocumentation": "Den gennemsnitlige tid, det tog at generere siden. Målingen omfatter den tid det tog serveren at generere web-siden, plus den tid det tog for den besøgende at hente svar fra serveren. En lavere gennemsnitlig genereringstid betyder en hurtigere hjemmeside for de besøgende!",
         "ColumnAverageTimeOnPage": "Gns. tid på siden",
         "ColumnAverageTimeOnPageDocumentation": "Den gennemsnitlige tid, besøgende har brugt på siden (kun denne side, ikke hele hjemmesiden).",
@@ -64,6 +65,7 @@
         "ColumnPageGenerationTime": "Sidegenereringstid",
         "ColumnKeyword": "Søgeord",
         "ColumnLabel": "Etiket",
+        "ColumnHits": "Hits",
         "ColumnMaxActions": "Maks. handlinger i et enkelt besøg",
         "ColumnNbActions": "Handlinger",
         "ColumnNbActionsDocumentation": "Antal handlinger, der udføres af besøgende. Handlinger kan være sidevisninger, filhentninger eller udgående links.",
@@ -104,6 +106,8 @@
         "ComputedMetricMinDocumentation": "Den mindste værdi af %s",
         "ComputedMetricUniqueCount": "Unikke %s",
         "ComputedMetricUniqueCountDocumentation": "Antal unikke %s",
+        "ComputedMetricCountWithValue": "Emner med %s",
+        "ComputedMetricCountWithValueDocumentation": "Antallet af emner med en værdi angivet som%s",
         "ConfigFileIsNotWritable": "Matomos konfigurationsfil %1$s er skrivebeskyttet, så nogle af ændringerne vil ikke blive gemt. %2$s Skift rettigheder til konfigurationsfilen for at gøre den skrivebar.",
         "Continue": "Fortsæt",
         "ContinueToPiwik": "Fortsæt til Matomo",
@@ -183,12 +187,17 @@
         "ExceptionLanguageFileNotFound": "Sprogfil '%s' blev ikke fundet.",
         "ExceptionMethodNotFound": "Metoden '%1$s' eksisterer ikke eller er ikke tilgængelig i modulet '%2$s'.",
         "ExceptionMissingFile": "Mangler fil: %s",
+        "ExceptionUnexpectedFile": "Filer blev fundet i din Matomo, men vi forventede dem ikke.",
         "ExceptionUnexpectedFilePleaseDelete": "Slet venligst disse filer for at undgå fejl.",
+        "ExceptionUnexpectedDirectory": "Mapper blev fundet i din Matomo, men vi forventede dem ikke.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "Slet venligst disse mapper for at undgå fejl.",
         "ExceptionFileToDelete": "Slet fil: %s",
         "ExceptionDirectoryToDelete": "Slet mappe: %s",
         "ExceptionNonceMismatch": "Kan ikke kontrollere sikkerheden på formularen.",
         "ExceptionPrivilege": "Du kan ikke få adgang til denne ressource, det kræver en %s adgang.",
+        "ExceptionPrivilegeAccessWebsite": "Du har ikke adgang til denne ressource, da den kræver %s adgang for websitet med id=%d.",
+        "ExceptionCapabilityAccessWebsite": "Du har ikke adgang til denne ressource, da den kræver %s egnethed for websitet med id=%d.",
+        "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 (%1$s) kunne ikke læses. Udbyderen kan have deaktiveret %2$s.",
@@ -224,10 +233,12 @@
         "GraphHelp": "Flere oplysninger om visning af diagrammer i Matomo.",
         "HelloUser": "Hej %s!",
         "Help": "Hjælp",
+        "HelpResources": "Hjælpe resourcer",
         "HelpTranslatePiwik": "Måske vil du gerne %1$shjæle til at forbedre Matomo oversættelser%2$s?",
         "Hide": "skjul",
         "HoursMinutes": "%1$s timer %2$s minutter",
         "Id": "Id",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Forudsat arkivering er hurtig på din installation, kan crontab sættes til at køre oftere.",
         "InfoFor": "Info om %s",
         "Installed": "Installeret",
         "InvalidDateRange": "Ugyldigt datointerval, prøv igen",
@@ -292,6 +303,7 @@
         "OneVisit": "1 besøg",
         "OnlyEnterIfRequired": "Indtast kun et brugernavn, hvis SMTP-serveren kræver det",
         "OnlyEnterIfRequiredPassword": "Indtast kun en adgangskode, hvis SMTP-serveren kræver det",
+        "NameShownInTheSenderColumn": "Navnet der er vist i afsender kolonnen",
         "OnlyUsedIfUserPwdIsSet": "Anvendes kun, hvis brugernavn\/adgangskode er sat, spørg din udbyder hvis du ikke ved hvilken metode der skal bruges.",
         "OpenSourceWebAnalytics": "Open Source webanalyse",
         "OperationAtLeast": "Mindst",
@@ -342,6 +354,7 @@
         "ProductRevenue": "Produkt Omsætning",
         "Measurable": "Målbar",
         "Measurables": "Målbare",
+        "MeasurableId": "Målbar ID",
         "PurchasedProducts": "Købte produkter",
         "Quantity": "Mængde",
         "RangeReports": "Brugerdefinerede datointervaller",
@@ -355,7 +368,6 @@
         "Remove": "Fjern",
         "Report": "Rapport",
         "ReportGeneratedFrom": "Denne rapport blev genereret med data fra %s.",
-        "ReportRatioTooltip": "'%1$s' repræsenterer %2$s af %3$s %4$s med %5$s.",
         "Reports": "Rapporter",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arkiver rapporter med højst X sekunders mellemrum",
         "RearchiveTimeIntervalOnlyForTodayReports": "Dette berører kun rapporter for i dag (eller et andet datointerval inklusive i dag)",
@@ -389,6 +401,8 @@
         "SmtpPort": "SMTP-port",
         "SmtpServerAddress": "SMTP-serveradresse",
         "SmtpUsername": "SMTP-brugernavn",
+        "SmtpFromName": "SMTP afsender navn",
+        "SmtpFromAddress": "SMTP afsender adresse",
         "Source": "Kilde",
         "StatisticsAreNotRecorded": "Matomo besøgssporing er i øjeblikket deaktiveret! Genaktiver sporing ved at sætte record_statistics = 1 i config\/config.ini.php filen.",
         "Subtotal": "Subtotal",
@@ -403,7 +417,6 @@
         "ToDeleteAllFilesRunThisCommand": "For at slette alle disse filer i en omgang, kan du køre denne kommando:",
         "Total": "Total",
         "Totals": "Total",
-        "TotalRatioTooltip": "Dette er %1$s af alle %2$s %3$s.",
         "TotalRevenue": "Indtægter i alt",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s besøg, %2$s sidevisninger, %3$s handlinger, %4$s indtjening)",
         "TrackingScopeAction": "Handling",
@@ -436,6 +449,7 @@
         "VisitorIPs": "Besøgendes IP",
         "Visitors": "Besøgende",
         "VisitsWith": "Besøg med %s",
+        "VisitorFingerprint": "Fingeraftryk",
         "VisitorSettings": "Besøgendes indstillinger",
         "VisitType": "Besøgstype",
         "VisitTypes": "Besøgstyper",
@@ -449,6 +463,8 @@
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Opgrader venligst din PHP-version til seneste PHP %s, så dine Matomo statistikdata forbliver sikre.",
         "ValidatorErrorEmptyValue": "Der skal gives en værdi",
         "ValidatorErrorNotANumber": "Værdien er ikke et nummer",
+        "ValidatorErrorNumberTooLow": "Værdien \"%1$s\" er for lav. Værdien skal mindst være %2$s.",
+        "ValidatorErrorNumberTooHigh": "Værdien \"%1$s\" er for høj. Værdien skal maksimalt være %2$s",
         "ValidatorErrorCharacterTooShort": "Værdien indeholder \"%1$s\" tegn men skal indeholde mindst %2$s tegn.",
         "ValidatorErrorCharacterTooLong": "Værdien indeholder \"%1$s\" tegn men skal indeholde højst %2$s tegn.",
         "ValidatorErrorNotUrlLike": "Værdien \"%s\" ligner ikke en URL.",
@@ -475,10 +491,13 @@
         "YearsDays": "%1$s år %2$s dage",
         "Yes": "Ja",
         "YouAreCurrentlyUsing": "Du bruger i øjeblikket Matomo %s.",
+        "YouAreViewingDemoMessage": "Du kigger på en demo version af %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Du skal være logget på for at få adgang til denne funktion.",
         "YourChangesHaveBeenSaved": "Ændringer er gemt.",
+        "YourSessionHasExpired": "Din session er udløbet på grund af inaktivitet. Log venligst ind igen for at fortsætte.",
         "ThankYouForUsingMatomo": "Tak fordi du bruger Matomo",
-        "TheMatomoTeam": "Holdet bag Matomo"
+        "TheMatomoTeam": "Holdet bag Matomo",
+        "PleaseTryAgain": "Prøv venligst igen"
     },
     "Mobile": {
         "AboutPiwikMobile": "Om Matomo Mobil",
@@ -553,7 +572,11 @@
         "VerifyLoginData": "Kontroller at kombinationen af brugernavn og adgangskode er korrekt.",
         "YouAreOffline": "Beklager, du er i øjeblikket offline",
         "ExceptionNoViewAccess": "Kontroller dit brugernavn og adgangskode og sørg for at have %s adgang til mindst én hjemmeside.",
-        "Mobile_HowtoExitAndroid": "Klik TILBAGE igen for at afslutte"
+        "Mobile_HowtoExitAndroid": "Klik TILBAGE igen for at afslutte",
+        "MatomoMarketplace": "Matomo Markedsplads",
+        "EnterAuthCode": "Indtast godkendelseskode",
+        "EnterCorrectAuthCode": "Indtast korrekt godkendelseskode",
+        "EnterAuthCodeExplanation": "Noget tyder på at du bruger to-faktor godkendelse. Indtast venligst den seks-cifrede kode for at logge ind på din konto."
     },
     "RowEvolution": {
         "AvailableMetrics": "Tilgængelige målinger",
diff --git a/app/lang/de.json b/app/lang/de.json
index 714ecad41..331eec062 100644
--- a/app/lang/de.json
+++ b/app/lang/de.json
@@ -7,7 +7,7 @@
         "Action": "Aktion",
         "Actions": "Aktionen",
         "Add": "Hinzufügen",
-        "AfterEntry": "nach Eingang hier",
+        "AfterEntry": "nach Eintritt",
         "All": "Alle",
         "AllowPiwikArchivingToTriggerBrowser": "Berichte archivieren, wenn diese im Browser angezeigt werden",
         "AllWebsitesDashboard": "Dashboard aller Websites",
@@ -32,7 +32,7 @@
         "ChooseLanguage": "Sprache wählen",
         "ChoosePeriod": "Zeitraum wählen",
         "ClickHere": "Klicken Sie hier für weitere Informationen.",
-        "DoubleClickToChangePeriod": "Doppelklick, um diesen Zeitbereich zu wählen.",
+        "DoubleClickToChangePeriod": "Doppelklick, um diesen Zeitraum zu wählen.",
         "Close": "Schließen",
         "ClickToSearch": "Zum Suchen klicken",
         "Copy": "Kopieren",
@@ -45,7 +45,7 @@
         "ColumnAverageTimeOnPage": "Durchschnittszeit pro Seite",
         "ColumnAverageTimeOnPageDocumentation": "Die durchschnittliche Besuchdauer einer Seite (nur die einzelne Seite, nicht die gesamte Website)",
         "ColumnAvgTimeOnSite": "Durchschnittszeit auf der Website",
-        "ColumnSumTimeOnSite": "Gesamte Zeit auf der Webseite",
+        "ColumnSumTimeOnSite": "Gesamte Zeit auf der Website",
         "ColumnAvgTimeOnSiteDocumentation": "Durchschnittslänge eines Besuches.",
         "ColumnBounceRate": "Absprungsrate",
         "ColumnBounceRateDocumentation": "Der Anteil der Besuche, bei denen nur eine Seite aufgerufen wurde. Dies bedeutet, dass der Besucher die Website auf der Eingangsseite sofort wieder verlassen hat.",
@@ -77,7 +77,7 @@
         "ColumnNbVisitsDocumentation": "Wenn ein Besucher zum ersten Mal die Webseite besucht oder seit dem letzten Seitenaufruf mehr als 30 Minuten vergangen sind, wird dies als neuer Besuch gewertet.",
         "ColumnPageBounceRateDocumentation": "Prozentsatz der Besuche, die auf dieser Seite starteten und die Website sofort wieder verlassen haben.",
         "ColumnPageviews": "Seitenansichten",
-        "ColumnPageviewsDocumentation": "Die Anzahl, wie häufig diese Seite besucht wurde.",
+        "ColumnPageviewsDocumentation": "Die Anzahl der Seitenaufrufe.",
         "ColumnPercentageVisits": "%% Besuche",
         "ColumnRevenue": "Umsatz",
         "ColumnSumVisitLength": "Von Besuchern verbrachte Gesamtzeit (in Sekunden)",
@@ -188,16 +188,16 @@
         "ExceptionMethodNotFound": "Die Methode '%1$s' existiert nicht oder ist im Modul '%2$s' nicht verfügbar.",
         "ExceptionMissingFile": "Fehlende Datei: %s",
         "ExceptionUnexpectedFile": "Es wurden unerwartete Dateien in Ihrer Matomo-Installation gefunden.",
-        "ExceptionUnexpectedFilePleaseDelete": "Bitte lösche diese Dateien, um Fehler zu vermeiden.",
+        "ExceptionUnexpectedFilePleaseDelete": "Bitte löschen Sie diese Dateien, um Fehler zu vermeiden.",
         "ExceptionUnexpectedDirectory": "Es wurden unerwartete Verzeichnisse in Ihrer Matomo-Installation gefunden.",
-        "ExceptionUnexpectedDirectoryPleaseDelete": "Bitte lösche diese Verzeichnisse, um Fehler zu vermeiden.",
+        "ExceptionUnexpectedDirectoryPleaseDelete": "Bitte löschen Sie diese Verzeichnisse, um Fehler zu vermeiden.",
         "ExceptionFileToDelete": "Zu löschende Datei: %s",
         "ExceptionDirectoryToDelete": "Zu löschendes Verzeichnis: %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.",
-        "ExceptionPrivilegeAccessWebsite": "Sie haben keinen Zugriff auf diese Ressource, weil sie %s Zugriff für die Webseite id = %d benötigt.",
-        "ExceptionCapabilityAccessWebsite": "Sie haben keinen Zugang zu dieser Ressource weil diese Berechtigung %s für die Webseite id = %d benötigt .",
-        "ExceptionPrivilegeAtLeastOneWebsite": "Sie haben keinen Zugang zu dieser Ressource, weil sie %s Zugriff für mindestens eine Webseite benötigt.",
+        "ExceptionPrivilegeAccessWebsite": "Sie haben keinen Zugriff auf diese Ressource, weil sie %s Zugriff für die Website id = %d benötigt.",
+        "ExceptionCapabilityAccessWebsite": "Sie haben keinen Zugang zu dieser Ressource weil diese Berechtigung %s für die Website id = %d benötigt .",
+        "ExceptionPrivilegeAtLeastOneWebsite": "Sie haben keinen Zugang zu dieser Ressource, weil sie %s Zugriff für mindestens eine Website benötigt.",
         "ExceptionUnableToStartSession": "Starten einer Session nicht möglich.",
         "ExceptionUndeletableFile": "Löschen von %s nicht möglich",
         "ExceptionUnreadableFileDisabledMethod": "Die Konfigurationsdatei {%1$s} konnte nicht gelesen werden. Ihr Host hat möglicherweise %2$s deaktiviert.",
@@ -233,6 +233,7 @@
         "GraphHelp": "Mehr Informationen über die Darstellung von Graphen in Matomo.",
         "HelloUser": "Hallo, %s!",
         "Help": "Hilfe",
+        "HelpResources": "Hilfequellen",
         "HelpTranslatePiwik": "Möchten Sie uns %1$shelfen, die Übersetzungen von Matomo zu verbessern%2$s?",
         "Hide": "verbergen",
         "HoursMinutes": "%1$s Stunden %2$s Minuten",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Die empfangenen Daten sind nicht gültig.",
         "IP": "IP",
         "JsTrackingTag": "JavaScript-Tracking-Code",
+        "KpiMetric": "KPI Metrik",
         "Language": "Sprache",
         "Languages": "Sprachen",
         "LastDays": "Letzte %s Tage (inkl. heute)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 Besuch",
         "OnlyEnterIfRequired": "Geben Sie nur dann einen Benutzernamen an, wenn der SMTP-Server dies benötigt.",
         "OnlyEnterIfRequiredPassword": "Geben Sie nur dann ein Passwort an, wenn der SMTP-Server dies benötigt.",
+        "SmtpFromEmailHelp": "Der Standardwert ist noreply @ {DOMAIN}, wobei {DOMAIN} durch Ihre Matomo-Domain \"%1$s\" ersetzt wird.<br>Wenn das Versenden von E-Mails bei Ihnen nicht funktioniert, müssen Sie diese Adresse möglicherweise auf Ihren SMTP-Benutzernamen einstellen.",
+        "NameShownInTheSenderColumn": "Der Name der in der Absender-Spalte angezeigt wird",
         "OnlyUsedIfUserPwdIsSet": "Wird nur verwendet, wenn Benutzername\/Passwort gesetzt sind. Fragen Sie Ihren Provider, wenn Sie nicht sicher sind, welche Methode verwendet werden muss.",
         "OpenSourceWebAnalytics": "Quelloffene Webanalytik",
         "OperationAtLeast": "Mindestens",
@@ -366,7 +370,7 @@
         "Remove": "Entfernen",
         "Report": "Bericht",
         "ReportGeneratedFrom": "Dieser Bericht nutzt Daten von %s.",
-        "ReportRatioTooltip": "'%1$s' repräsentiert %2$s von %3$s %4$s mit %5$s.",
+        "ReportRatioTooltip": "'%1$s' repräsentiert %2$s von %3$s %4$s im Segment %5$s mit %6$s.",
         "Reports": "Berichte",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archiviere Berichte mindestens alle X Sekunden",
         "RearchiveTimeIntervalOnlyForTodayReports": "Dies betrifft nur Berichte für heute (sowie jeden anderen Zeitraum, der den heutigen Tag beinhalten)",
@@ -400,6 +404,8 @@
         "SmtpPort": "SMTP-Port",
         "SmtpServerAddress": "SMTP-Server-Adresse",
         "SmtpUsername": "SMTP-Benutzername",
+        "SmtpFromName": "SMTP Von-Name",
+        "SmtpFromAddress": "SMTP Von-Adresse",
         "Source": "Quelle",
         "StatisticsAreNotRecorded": "Das Besuchertracking von Matomo ist derzeit deaktiviert! Reaktivieren Sie das Tracking, indem Sie in der Datei config\/config.ini.php record_statistics = 1 setzen.",
         "Subtotal": "Zwischensumme",
@@ -413,8 +419,8 @@
         "ToDeleteAllDirectoriesRunThisCommand": "Um alle diese Verzeichnisse auf einmal zu löschen, kannst du folgenden Befehl ausführen:",
         "ToDeleteAllFilesRunThisCommand": "Um alle diese Dateien auf einmal zu löschen, kannst du folgenden Befehl ausführen:",
         "Total": "Gesamt",
-        "Totals": "Gesamttotal",
-        "TotalRatioTooltip": "Das entspricht %1$s von %2$s %3$s.",
+        "Totals": "Gesamtsummen",
+        "TotalRatioTooltip": "Dies ist %1$s von allen %2$s %3$s in %4$s.",
         "TotalRevenue": "Gesamteinnahmen",
         "TotalVisitsPageviewsActionsRevenue": "(Gesamt: %1$s Besuche, %2$s Seitenansichten, %3$s Aktionen, %4$s Einnahmen)",
         "TrackingScopeAction": "Aktion",
@@ -448,7 +454,7 @@
         "Visitors": "Besucher",
         "VisitsWith": "Besuche mit %s",
         "VisitorFingerprint": "Fingerabdruck",
-        "VisitorSettings": "Besuchereinstellungen",
+        "VisitorSettings": "Einstellungen des Besuchers",
         "VisitType": "Art des Besuchs",
         "VisitTypes": "Besuchstypen",
         "VisitTypeExample": "Um beispielsweise alle wiederkehrenden Besucher abzufragen, die Bestellungen getätigt haben, muss der API Aufruf folgendes enthalten: %s",
@@ -462,9 +468,9 @@
         "ValidatorErrorEmptyValue": "Es muss ein Wert angegeben werden.",
         "ValidatorErrorNotANumber": "Der Wert ist keine Zahl.",
         "ValidatorErrorNumberTooLow": "Der Wert \"%1$s\" ist zu niedrig. Er muss mindestens %2$s betragen.",
-        "ValidatorErrorNumberTooHigh": "Der Wert \"%1$s\" ist zu hoch. Er sollte höchstens %2$s betragen",
+        "ValidatorErrorNumberTooHigh": "Der Wert \"%1$s\" ist zu hoch. Er darf höchstens %2$s betragen",
         "ValidatorErrorCharacterTooShort": "Der Wert enthält \"%1$s\" Zeichen, muss jedoch mindestens %2$s Zeichen enthalten.",
-        "ValidatorErrorCharacterTooLong": "Der Wert enthält \"%1$s\" Zeichen, sollte aber maximal %2$s Zeichen haben.",
+        "ValidatorErrorCharacterTooLong": "Der Wert enthält \"%1$s\" Zeichen, darf aber maximal %2$s Zeichen haben.",
         "ValidatorErrorNotUrlLike": "Der Wert \"%s\" sieht nicht wie eine URL aus.",
         "ValidatorErrorNotEmailLike": "Der Wert \"%s\" ist keine gültige E-Mail-Adresse.",
         "ValidatorErrorNoValidRegex": "Der Wert \"%s\" ist kein gültiger regulärer Ausdruck.",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "Sie sehen gerade die Demo von %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Sie müssen angemeldet sein, um diese Funktion nutzen zu können.",
         "YourChangesHaveBeenSaved": "Ihre Änderungen wurden gespeichert.",
+        "YourSessionHasExpired": "Ihre Sitzung ist aufgrund Inaktivität abgelaufen. Bitte melden Sie sich an um fortzufahren.",
         "ThankYouForUsingMatomo": "Danke, dass Sie Matomo benutzen",
-        "TheMatomoTeam": "Das Matomo Team"
+        "TheMatomoTeam": "Das Matomo Team",
+        "PleaseTryAgain": "Bitte versuchen Sie es erneut",
+        "ComparisonRatioTooltip": "Dies ist eine %1$s Änderung verglichen mit dem '%2$s' Segment auf %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' auf %2$s beinhaltet %3$s aller Besuche (%4$s von %5$s insgesamt).",
+        "ComparisonCardTooltip2": "Die Besucheranzahl ist um %1$s verschieden verglichen mit %2$s über %3$s.",
+        "VisualizationDoesNotSupportComparison": "Diese Ansicht unterstützt nicht den Vergleich von Segmenten\/Zeiträumen.",
+        "ChangeInX": "Änderungen in %1$s",
+        "Comparisons": "Vergleiche",
+        "ClickToRemoveComp": "Klicken Sie um diesen Vergleich zu entfernen",
+        "MaximumNumberOfSegmentsComparedIs": "Die maximale Anzahl von Segmenten die gleichzeitig verglichen werden können ist %s.",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s Abfrageparameterlänge muss mit der %2$s Abfrageparameterlänge übereinstimmen.",
+        "MaximumNumberOfPeriodsComparedIs": "Die maximale Anzahl von Zeiträumen die gleichzeitig verglichen werden können ist %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Über Matomo Mobile",
diff --git a/app/lang/el.json b/app/lang/el.json
index 02d48ceb1..b04f3d55e 100644
--- a/app/lang/el.json
+++ b/app/lang/el.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Περισσότερες πληροφορίες για την προβολή γραφικών στο Matomo.",
         "HelloUser": "Γεια σου, %s!",
         "Help": "Βοήθεια",
+        "HelpResources": "Πόροι βοήθειας",
         "HelpTranslatePiwik": "Ίσως μπορείτε να βοηθήσετε %1$sβελτιώνοντας τις μεταφράσεις του Matomo%2$s;",
         "Hide": "απόκρυψη",
         "HoursMinutes": "%1$s ώρες %2$s λεπτά",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Τα ληφθέντα δεδομένα δεν είναι έγκυρα.",
         "IP": "Διεύθυνση IP",
         "JsTrackingTag": "Κώδικας Παρακολούθησης JavaScript",
+        "KpiMetric": "Μετρική KPI",
         "Language": "Γλώσσα",
         "Languages": "Γλώσσες",
         "LastDays": "Τελευταίες %s ημέρες (με τη σημερινή)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 επίσκεψη",
         "OnlyEnterIfRequired": "Εισάγετε όνομα χρήστη μόνο αν το απαιτεί ο διακομιστής SMTP σας",
         "OnlyEnterIfRequiredPassword": "Εισάγετε κωδικό πρόσβασης μόνο αν το απαιτεί ο διακομιστής SMTP σας",
+        "SmtpFromEmailHelp": "Η προκαθορισμένη τιμή είναι noreply@{DOMAIN}, όπου το {DOMAIN} θα αντικατασταθεί από το όνομα χώρου του Matomo \"%1$s\".<br>Αν η αποστολή των e-mail δεν δουλεύει, θα πρέπει να ορίσετε τη διεύθυνση αυτή να είναι ίδια με το όνομα χρήστη για το SMTP.",
+        "NameShownInTheSenderColumn": "Το όνομα που εμφανίζεται στην στήλη αποστολέα",
         "OnlyUsedIfUserPwdIsSet": "Χρησιμοποιήστε το μόνο αν έχει οριστεί όνομα χρήστη\/κωδικός πρόσβασης. Ρωτήστε τον πάροχό σας αν δεν είστε σίγουρος\/η ποια μέθοδο να χρησιμοποιήσετε",
         "OpenSourceWebAnalytics": "Λογισμικό Ανάλυσης Ιστοσελίδων",
         "OperationAtLeast": "Τουλάχιστον",
@@ -366,7 +370,7 @@
         "Remove": "Αφαίρεση",
         "Report": "Αναφορά",
         "ReportGeneratedFrom": "Αυτή η αναφορά δημιουργήθηκε με χρήση δεδομένων από %s.",
-        "ReportRatioTooltip": "Το '%1$s' αντιπροσωπεύει το %2$s από %3$s %4$s με %5$s.",
+        "ReportRatioTooltip": "Το '%1$s' αντιπροσωπεύει το %2$s από %3$s %4$s στο τμήμα %5$s με %6$s.",
         "Reports": "Αναφορές",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Αρχειοθέτηση αναφορών το πολύ κάθε X δευτερόλεπτα",
         "RearchiveTimeIntervalOnlyForTodayReports": "Αυτό επηρεάζει μόνο τις αναφορές για σήμερα (ή οποιοδήποτε άλλο χρονικό εύρος συμπεριλαμβανομένου και σήμερα)",
@@ -400,6 +404,8 @@
         "SmtpPort": "Θύρα SMTP",
         "SmtpServerAddress": "Διεύθυνση διακομιστή SMTP",
         "SmtpUsername": "Όνομα χρήστη SMTP",
+        "SmtpFromName": "Όνομα από στο SMTP",
+        "SmtpFromAddress": "Διεύθυνση από στο SMTP",
         "Source": "Προέλευση",
         "StatisticsAreNotRecorded": "Η Παρακολούθηση Επισκεπτών στο Matomo είναι απενεργοποιημένη! Η εκ νέου ενεργοποίηση εντοπισμού γίνεται θέτοντας record_statistics = 1 στο αρχείο config.ini.php.",
         "Subtotal": "Υποσύνολο",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Για να διαγράψετε αυτά τα αρχεία με τη μία, εκτελέστε την εξής εντολή:",
         "Total": "Σύνολο",
         "Totals": "Σύνολα",
-        "TotalRatioTooltip": "Αυτό είναι το %1$s από όλες τις %2$s %3$s.",
+        "TotalRatioTooltip": "Αυτό είναι το %1$s από όλα τα %2$s %3$s στο %4$s.",
         "TotalRevenue": "Συνολική Πρόσοδος",
         "TotalVisitsPageviewsActionsRevenue": "(Συνολικά: %1$s επισκέψεις, %2$s αναγνώσεις σελίδων, %3$s ενέργειες, %4$s κέρδος)",
         "TrackingScopeAction": "Ενέργεια",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "Βλέπετε μια έκδοση επίδειξης του %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Πρέπει να συνδεθείτε για να έχετε πρόσβαση στη λειτουργία",
         "YourChangesHaveBeenSaved": "Οι αλλαγές σας αποθηκεύτηκαν.",
+        "YourSessionHasExpired": "Η σύνοδός σας έληξε λόγω μη δραστηριότητας. Παρακαλούμε κάνετε είσοδο εκ νέου για να συνεχίσετε.",
         "ThankYouForUsingMatomo": "Ευχαριστούμε που χρησιμοποιείτε το Matomo",
-        "TheMatomoTeam": "Η ομάδα του Matomo"
+        "TheMatomoTeam": "Η ομάδα του Matomo",
+        "PleaseTryAgain": "Παρακαλούμε δοκιμάστε αργότερα",
+        "ComparisonRatioTooltip": "Αυτό είναι μια αλλαγή %1$s σε σύγκριση με το τμήμα '%2$s' στο %3$s.",
+        "ComparisonCardTooltip1": "Το '%1$s' στο %2$s περιέχει %3$s όλων των επισκέψεων (%4$s από σύνολο %5$s).",
+        "ComparisonCardTooltip2": "Ο αριθμός επισκέψεων είναι διαφορετικός κατά %1$s σε σύγκριση με το %2$s από %3$s.",
+        "VisualizationDoesNotSupportComparison": "Η οπτικοποίηση δεν υποστηρίζει συγκρίσεις τμημάτων\/περιόδων.",
+        "ChangeInX": "Αλλαγή στο %1$s",
+        "Comparisons": "Συγκρίσεις",
+        "ClickToRemoveComp": "Πατήστε για να αφαιρέσετε τη σύγκριση.",
+        "MaximumNumberOfSegmentsComparedIs": "Ο μέγιστος αριθμός τμημάτων που μπορεί να συγκριθούν ταυτόχρονα είναι %s.",
+        "CompareDatesParamMustMatchComparePeriods": "Το %1$s μήκος παραμέτρου στο ερώτημα πρέπει να ταιριάζει με το %2$s μέγεθος παραμέτρου ερωτήματος.",
+        "MaximumNumberOfPeriodsComparedIs": "Ο μέγιστος αριθμός περιόδων που μπορεί να συγκριθούν ταυτόχρονα είναι %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Σχετικά με το Matomo για κινητά",
diff --git a/app/lang/en.json b/app/lang/en.json
index cbbf7f0b0..17f920373 100644
--- a/app/lang/en.json
+++ b/app/lang/en.json
@@ -233,6 +233,7 @@
         "GraphHelp": "More information about displaying graphs in Matomo.",
         "HelloUser": "Hello, %s!",
         "Help": "Help",
+        "HelpResources": "Help resources",
         "HelpTranslatePiwik": "Maybe you would like to %1$shelp us improve the Matomo translations%2$s?",
         "Hide": "hide",
         "HoursMinutes": "%1$s hours %2$s min",
@@ -244,6 +245,7 @@
         "InvalidResponse": "The received data is invalid.",
         "IP": "IP",
         "JsTrackingTag": "JavaScript Tracking Code",
+        "KpiMetric": "KPI Metric",
         "Language": "Language",
         "Languages": "Languages",
         "LastDays": "Last %s days (including today)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 visit",
         "OnlyEnterIfRequired": "Only enter a username if your SMTP server requires it.",
         "OnlyEnterIfRequiredPassword": "Only enter a password if your SMTP server requires it.",
+        "SmtpFromEmailHelp": "The default value is noreply@{DOMAIN}, where {DOMAIN} will be replaced with your Matomo domain \"%1$s\".<br>If sending mails doesn't work for you, you might need to set this address to match your SMTP username.",
+        "NameShownInTheSenderColumn": "The name shown in the sender column",
         "OnlyUsedIfUserPwdIsSet": "Only used if a username\/password is set, ask your provider if you are unsure which method to use.",
         "OpenSourceWebAnalytics": "free\/libre analytics platform",
         "OperationAtLeast": "At least",
@@ -366,7 +370,7 @@
         "Remove": "Remove",
         "Report": "Report",
         "ReportGeneratedFrom": "This report was generated using data from %s.",
-        "ReportRatioTooltip": "'%1$s' represents %2$s of %3$s %4$s with %5$s.",
+        "ReportRatioTooltip": "'%1$s' represents %2$s of %3$s %4$s in segment %5$s with %6$s.",
         "Reports": "Reports",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archive reports at most every X seconds",
         "RearchiveTimeIntervalOnlyForTodayReports": "This affects only reports for today (or any other Date Range including today)",
@@ -400,6 +404,8 @@
         "SmtpPort": "SMTP Port",
         "SmtpServerAddress": "SMTP server address",
         "SmtpUsername": "SMTP username",
+        "SmtpFromName": "SMTP from name",
+        "SmtpFromAddress": "SMTP from address",
         "Source": "Source",
         "StatisticsAreNotRecorded": "Matomo Visitor Tracking is currently disabled! Re-enable tracking by setting record_statistics = 1 in your config\/config.ini.php file.",
         "Subtotal": "Subtotal",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "To delete all these files at once, you can run this command:",
         "Total": "Total",
         "Totals": "Totals",
-        "TotalRatioTooltip": "This is %1$s of all %2$s %3$s.",
+        "TotalRatioTooltip": "This is %1$s of all %2$s %3$s in %4$s.",
         "TotalRevenue": "Total Revenue",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visits, %2$s pageviews, %3$s actions, %4$s revenue)",
         "TrackingScopeAction": "Action",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "You are viewing the demo of %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "You must be logged in to access this functionality.",
         "YourChangesHaveBeenSaved": "Your changes have been saved.",
+        "YourSessionHasExpired": "Your session has expired due to inactivity. Please log in to continue.",
         "ThankYouForUsingMatomo": "Thank you for using Matomo",
-        "TheMatomoTeam": "The Matomo Team"
+        "TheMatomoTeam": "The Matomo Team",
+        "PleaseTryAgain": "Please try again",
+        "ComparisonRatioTooltip": "This is a %1$s change compared to the '%2$s' segment on %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' on %2$s contains %3$s of all visits (%4$s out of %5$s total).",
+        "ComparisonCardTooltip2": "The visit count is different by %1$s compared to %2$s over %3$s.",
+        "VisualizationDoesNotSupportComparison": "This visualization does not support segment/period comparison.",
+        "ChangeInX": "Change in %1$s",
+        "Comparisons": "Comparisons",
+        "ClickToRemoveComp": "Click to remove this comparison.",
+        "MaximumNumberOfSegmentsComparedIs": "The maximum number of segments that can be compared simultaneously is %s.",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s query parameter length must match %2$s query parameter length.",
+        "MaximumNumberOfPeriodsComparedIs": "The maximum number of periods that can be compared simultaneously is %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "About Matomo Mobile",
diff --git a/app/lang/eo.json b/app/lang/eo.json
index f4d58a60a..870c95f22 100644
--- a/app/lang/eo.json
+++ b/app/lang/eo.json
@@ -308,7 +308,6 @@
         "TimeOnPage": "Tempo en la retpaĝo",
         "Total": "Totalo",
         "Totals": "Totaloj",
-        "TotalRatioTooltip": "Ĉi tio estas %1$sde ĉiuj %2$s%3$s.",
         "TotalRevenue": "Totalaj enspezoj",
         "TrackingScopeAction": "Ago",
         "TrackingScopePage": "Paĝo",
diff --git a/app/lang/es-ar.json b/app/lang/es-ar.json
index 9292d3152..ab095e2ce 100644
--- a/app/lang/es-ar.json
+++ b/app/lang/es-ar.json
@@ -14,6 +14,8 @@
         "And": "y",
         "API": "API",
         "Apply": "Aplicar",
+        "ArchivingInlineHelp": "Para sitios web de tráfico medio a alto, se recomienda deshabilitar el archivado de Matomo al ingresar con el navegador. En su lugar, te recomendamos que configurés una tarea de cron para procesar los informes de Matomo cada hora.",
+        "ArchivingTriggerDescription": "Recomendado para grandes instalaciones de Matomo. Necesitás %1$sconfigurar una tarea de cron%2$s para procesar los informes automáticamente.",
         "AuthenticationMethodSmtp": "Método de autenticación SMTP",
         "AverageOrderValue": "Valor promedio por pedido",
         "AveragePrice": "Precio promedio",
@@ -33,6 +35,8 @@
         "DoubleClickToChangePeriod": "Hacé doble clic para aplicar este período.",
         "Close": "Cerrar",
         "ClickToSearch": "Hacé clic para buscar",
+        "Copy": "Copiar",
+        "Confirm": "Confirmar",
         "ColumnActionsPerVisit": "Acciones por visita",
         "ColumnActionsPerVisitDocumentation": "El número promedio de acciones (visitas, búsquedas en el sitio, descargas y enlaces externos) que han sido llevadas a cabo durante las visitas.",
         "ColumnAverageGenerationTime": "Promedio de tiempo de generación",
@@ -41,10 +45,12 @@
         "ColumnAverageTimeOnPage": "Tiempo promedio en la página",
         "ColumnAverageTimeOnPageDocumentation": "El tiempo promedio que los visitantes estuvieron en esta página (solamente esta página, no todo el sitio web).",
         "ColumnAvgTimeOnSite": "Tiempo promedio en el sitio web",
+        "ColumnSumTimeOnSite": "Tiempo total en el sitio web",
         "ColumnAvgTimeOnSiteDocumentation": "La duración promedia de una visita.",
         "ColumnBounceRate": "Porcentaje de rebote",
         "ColumnBounceRateDocumentation": "El porcentaje de visitas que únicamente han mirado una página. Esto significa que el visitante salió del sitio web directamente desde la página principal.",
         "ColumnBounces": "Rebotes",
+        "RealTime": "Tiempo real",
         "ColumnBouncesDocumentation": "Número de visitas que empezaron y acabaron en esta página. Esto quiere decir que el visitante salió de la web después de ver solamente esta página.",
         "ColumnConversionRate": "Tasa de conversión",
         "ColumnConversionRateDocumentation": "El porcentaje de visitas que han activado un meta.",
@@ -102,8 +108,10 @@
         "ComputedMetricUniqueCountDocumentation": "El número único de %s",
         "ComputedMetricCountWithValue": "Entradas con %s",
         "ComputedMetricCountWithValueDocumentation": "El número de entradas que tiene un ajuste de valor para %s",
+        "ConfigFileIsNotWritable": "El archivo de configuración %1$s de Matomo no tiene permisos de escritura, por lo que algunos de tus cambios podrían no ser guardados. %2$s Por favor, cambiá los permisos del archivo de configuración para que se puedan guardar los cambios.",
         "Continue": "Continuar",
         "ContinueToPiwik": "Ir a Matomo",
+        "CurrentlyUsingUnsecureHttp": "Actualmente estás usando Matomo sobre una conexión HTTP insegura, lo cual es riesgoso. Te recomendamos configurar Matomo para que use SSL (HTTPS) y mejorar la seguridad.",
         "CreatedByUser": "Creado por %s",
         "CurrentMonth": "Mes actual",
         "CurrentWeek": "Semana actual",
@@ -152,17 +160,24 @@
         "EncryptedSmtpTransport": "Ingresá el tipo de cifrado de tu servidor SMTP.",
         "Error": "Error",
         "Errors": "Errores",
+        "ErrorRequest": "Epa, hubo un problema durante la solicitud. Quizá el servidor tuvo un error temporal, o quizá solicitaste un informe con demasiados datos. Por favor, probá de nuevo. Si el error persiste, por favor %1$scontactá a tu administrador de Matomo%2$s para solicitarle ayuda.",
         "EvolutionOverPeriod": "Evolución sobre el período",
         "EvolutionSummaryGeneric": "%1$s en %2$s comparado con %3$s en %4$s. Evolución: %5$s",
+        "ExceptionContactSupportGeneric": "Si todavía seguís con este problema, por favor %1$scontactá a tu administrador de Matomo%2$s para solicitarle ayuda.",
         "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "El usuario tiene que ser, o bien un súperusuario o el usuario \"%s\" mismo.",
         "ExceptionConfigurationFileNotFound": "El archivo de configuración {%s} no fue encontrado o no pudo ser leído.",
+        "ExceptionConfigurationFileExistsButNotReadable": "El archivo de configuración %s parece que existe, pero Matomo no pudo leerlo.",
         "ExceptionConfigurationFilePleaseCheckReadableByUser": "Por favor, revisá que %1$s sea legible por el usuario \"%2$s\".",
+        "ExceptionDatabaseVersion": "Tu versión de %1$s es %2$s, pero Matomo necesita al menos la %3$s.",
+        "ExceptionDatabaseVersionNewerThanCodebase": "Tu código base de Matomo está ejecutando la antigua versión %1$s y detectamos que tu base de datos de Matomo ya fue actualizada a la versión más reciente %2$s.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Puede que tu administrador de Matomo esté finalizando el proceso de actualización en este preciso momento. Por favor, volvé a intentar 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 tu cliente %1$s %2$s es incompatible con la versión del servidor %3$s.",
         "ExceptionInvalidAggregateReportsFormat": "El formato de informes de agregado \";%1$s\"; no es válido. Probá alguno de los siguientes en su lugar: %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: %1$s o cualquier palabra clave soportada por la función %2$s (mirá %3$s para más información)",
+        "ExceptionInvalidDateBeforeFirstWebsite": "La fecha \"%1$s\" es anterior al primer sitio web en línea. Intentá con una fecha que sea posterior a %2$s (estampa de tiempo %3$s).",
         "ExceptionInvalidDateRange": "La fecha \";%1$s\"; no es un rango de fecha correcto. Debería tener el siguiente formato: %2$s.",
         "ExceptionInvalidPeriod": "El período \"%1$s\" no es válido. Probá alguno de los siguientes en su lugar: %2$s.",
         "ExceptionInvalidRendererFormat": "Formato de renderizado \";%1$s\"; no válido. Probá alguno de los siguientes en su lugar: %2$s.",
@@ -172,13 +187,16 @@
         "ExceptionLanguageFileNotFound": "Archivo de idioma \"%s\" no encontrado.",
         "ExceptionMethodNotFound": "El método \";%1$s\"; no existe o no está disponible en el módulo \";%2$s\";.",
         "ExceptionMissingFile": "Archivo faltante: %s",
+        "ExceptionUnexpectedFile": "Se encontraron archivos en tu cuenta de Matomo, pero no los esperábamos.",
         "ExceptionUnexpectedFilePleaseDelete": "Por favor, eliminá estos archivos para prevenir errores.",
+        "ExceptionUnexpectedDirectory": "Se encontraron carpetas en tu cuenta de Matomo, pero no las esperábamos.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "Por favor, eliminá estas carpetas para prevenir errores.",
         "ExceptionFileToDelete": "Archivo a eliminar: %s",
         "ExceptionDirectoryToDelete": "Carpeta a eliminar: %s",
         "ExceptionNonceMismatch": "No se puede verificar el código de seguridad en este formulario.",
         "ExceptionPrivilege": "No podés acceder a este recurso ya que requiere un acceso %s.",
         "ExceptionPrivilegeAccessWebsite": "No podés acceder a este recurso ya que requiere acceso de %spara el identificador de sitio web = %d.",
+        "ExceptionCapabilityAccessWebsite": "No podés acceder a este recurso ya que requiere acceso de %spara el identificador de sitio web = %d.",
         "ExceptionPrivilegeAtLeastOneWebsite": "No podés acceder a este recurso ya que requiere acceso de %s para al menos un sitio web.",
         "ExceptionUnableToStartSession": "No se pudo iniciar sesión.",
         "ExceptionUndeletableFile": "No se pudo eliminar %s",
@@ -193,28 +211,41 @@
         "ExportThisReport": "Exportar este conjunto de datos en otros formatos",
         "Faq": "Preguntas frecuentes",
         "FileIntegrityWarning": "Falló la suma de integridad del archivo e informó de algunos errores. Deberías corregir esta falla y luego refrescar la página hasta que no hayan errores.",
+        "FileIntegrityWarningReupload": "Los errores de abajo pueden deberse a una subida fallida o parcial de archivos de Matomo.",
+        "FileIntegrityWarningReuploadBis": "Intentá resubir todos los archivos de Matomo en modo BINARIO.",
         "First": "Primero",
         "Flatten": "Aplanar",
+        "ForcedSSL": "Conexión SSL forzada",
+        "ForceSSLRecommended": "Recomendamos usar Matomo sólo sobre conexiones SSL seguras. Para prevenir accesos inseguros sobre HTTP, agregá %1$s a la sección %2$s en tu archivo config\/config.ini.php de Matomo.",
+        "NotPossibleWithoutHttps": "Atención: hacer esto sin configurar un vertificado SSL para usar HTTPS hará que Matomo deje de funcionar.",
+        "UseSSLInstall": "Recomendamos usar Matomo sólo sobre conexiones SSL seguras. Por favor, %1$shacé clic acá para continuar con el proceso de instalación sobre SSL%2$s.",
         "ForExampleShort": "ej.",
         "Forums": "Foros",
         "FromReferrer": "desde",
+        "Generic": "General",
         "GeneralInformation": "Información general",
         "GeneralSettings": "Configuracion general",
         "GetStarted": "Comenzá",
         "GiveUsYourFeedback": "¡Envianos tus comentarios!",
         "Goal": "Meta",
         "GoTo": "Ir a %s",
+        "GoTo2": "Ir a",
+        "GraphHelp": "Más información sobre la visualización de gráficos en Matomo.",
         "HelloUser": "¡Hola, %s!",
         "Help": "Ayuda",
+        "HelpResources": "Recursos de ayuda",
+        "HelpTranslatePiwik": "¿Te gustaría %1$sayudarnos a mejorar las localizaciones%2$s de Matomo?",
         "Hide": "ocultar",
         "HoursMinutes": "%1$s horas %2$s min",
         "Id": "Id",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Asumiendo que el archivado es más rápido para tu configuración, podés configurar el crontab para ejecutarse más frecuentemente.",
         "InfoFor": "Info para %s",
         "Installed": "Instalado",
         "InvalidDateRange": "Rango de fecha no válido. Por favor, intentá de nuevo",
         "InvalidResponse": "Los datos recibidos no son válidos.",
         "IP": "IP",
         "JsTrackingTag": "Código de rastreo JavaScript",
+        "KpiMetric": "Métrica KPI",
         "Language": "Idioma",
         "Languages": "Idiomas",
         "LastDays": "Últimos %s días (incluyendo hoy)",
@@ -251,6 +282,8 @@
         "NeedMoreHelp": "Necesita mas ayuda?",
         "Never": "Nunca",
         "New": "Nuevo",
+        "NewReportsWillBeProcessedByCron": "Cuando el archivado de Matomo no es activado por el navegador, los nuevos informes serán procesados por el crontab.",
+        "NewUpdatePiwikX": "Nueva actualización: Matomo %s",
         "NewVisitor": "Nuevo visitante",
         "NewVisits": "Nuevas visitas",
         "Next": "Siguiente",
@@ -265,12 +298,14 @@
         "NumberOfVisits": "Número de visitas",
         "NUsers": "%s usuarios",
         "NVisits": "%s visitas",
-        "NUniqueVisitors": "%s visitas únicas",
+        "NUniqueVisitors": "%s visitantes únicos",
         "Ok": "Aceptar",
         "OneAction": "1 acción",
         "OneVisit": "1 visita",
         "OnlyEnterIfRequired": "Sólo ingresá un nombre de usuario si tu servidor SMTP lo requiere.",
         "OnlyEnterIfRequiredPassword": "Sólo ingresá una contraseña si tu servidor SMTP lo requiere.",
+        "SmtpFromEmailHelp": "El valor predeterminado es \"noreply@{DOMAIN}\", en donde \"{DOMAIN}\" será reemplazado por tu dominio de Matomo \"%1$s\".<br>Si el envío de correo electrónico no funciona para vos, podrías necesitar establecer esta dirección para coincidir con tu nombre de usuario SMTP.",
+        "NameShownInTheSenderColumn": "El nombre mostrado en la columna de remitente",
         "OnlyUsedIfUserPwdIsSet": "Sólo usado si se establece un nombre de usuario \/ contraseña. Consultá con tu proveedor si no estás seguro de qué método usar.",
         "OpenSourceWebAnalytics": "Plataforma libre de análisis web",
         "OperationAtLeast": "Como mínimo",
@@ -296,10 +331,18 @@
         "OverlayRowActionTooltipTitle": "Superposición de página abierta",
         "Overview": "Global",
         "Pages": "Páginas",
+        "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": "Período",
         "Piechart": "Gráfico de torta",
+        "Print": "Imprimir",
+        "Profiles": "Perfiles",
+        "MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s, anteriormente conocido como Piwik, es un proyecto colaborativo ofrecido por los miembros del %7$sequipo Matomo%8$s así como muchos otros contribuyentes alrededor del mundo.<br\/> Si sos un fan de Matomo, podés ayudar: encontrá %3$scómo participar en Matomo%4$s, o %5$sdoná ahora%6$s ¡para ayudar a fundar el próximo gran lanzamiento de Matomo!",
+        "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s está disponible. Por favor, contactá al %2$sadministrador de Matomo%3$s.",
+        "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s está disponible. %2$s ¡Por favor, actualizá ahora!%3$s (ver los %4$scambios%5$s).",
+        "PleaseContactYourPiwikAdministrator": "Por favor, contactá a tu administrador de Matomo.",
         "PleaseSpecifyValue": "Por favor, especificá un valor para \"%s\".",
         "PleaseUpdatePiwik": "Por favor, actualizá tu Matomo",
         "Plugin": "Plugin",
@@ -313,6 +356,7 @@
         "ProductRevenue": "Ingresos del producto",
         "Measurable": "Medible",
         "Measurables": "Medibles",
+        "MeasurableId": "ID medible",
         "PurchasedProducts": "Productos comprados",
         "Quantity": "Cantidad",
         "RangeReports": "Rangos de fecha personalizados",
@@ -326,13 +370,14 @@
         "Remove": "Quitar",
         "Report": "Informe",
         "ReportGeneratedFrom": "Este informe fue generado usando datos de %s.",
-        "ReportRatioTooltip": "\"%1$s\" representa %2$s de %3$s %4$s con %5$s.",
+        "ReportRatioTooltip": "\"%1$s\" representa %2$s de %3$s %4$s en segmento %5$s con %6$s.",
         "Reports": "Informes",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "El archivo informa casi cada X segundos",
         "RearchiveTimeIntervalOnlyForTodayReports": "Esto sólo afecta informes de hoy (o cualquier otro rango de fechas, incluyendo hoy)",
         "ReportsWillBeProcessedAtMostEveryHour": "Por lo tanto, los informes serán procesados, como mucho, cada hora.",
         "RequestTimedOut": "Se agotó el tiempo de espera para %s. Por favor, intentá de nuevo.",
         "Required": "%s necesario",
+        "Required2": "Necesario",
         "ReturningVisitor": "Visitante recurrente",
         "ReturningVisitorAllVisits": "Ver todas las visitas",
         "RowEvolutionRowActionTooltip": "Mirá cómo las mediciones de esta fila se modificaron con el tiempo.",
@@ -359,6 +404,8 @@
         "SmtpPort": "Puerto SMTP",
         "SmtpServerAddress": "Dirección del servidor SMTP",
         "SmtpUsername": "Nombre de usuario SMTP",
+        "SmtpFromName": "Nombre SMTP",
+        "SmtpFromAddress": "Dirección SMTP",
         "Source": "Fuente",
         "StatisticsAreNotRecorded": "¡El Rastreo de visitas de Matomo está actualmente deshabilitado! Rehabilitá el rastreo mediante la configuración record_statistics = 1 en tu archivo config\/config.ini.php.",
         "Subtotal": "Subtotal",
@@ -372,7 +419,8 @@
         "ToDeleteAllDirectoriesRunThisCommand": "Para eliminar todas estas carpetas de una, podés ejecutar este comando:",
         "ToDeleteAllFilesRunThisCommand": "Para eliminar todos estos archivos de una, podés ejecutar este comando:",
         "Total": "Total",
-        "TotalRatioTooltip": "Esto es %1$s de todo %2$s %3$s.",
+        "Totals": "Totales",
+        "TotalRatioTooltip": "Esto es %1$s de todo %2$s %3$s en %4$s.",
         "TotalRevenue": "Ingresos totales",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visitas, %2$s vistas de páginas, %3$s acciones, %4$s ingresos)",
         "TrackingScopeAction": "Acción",
@@ -405,6 +453,7 @@
         "VisitorIPs": "IPs del visitante",
         "Visitors": "Visitantes",
         "VisitsWith": "Visitas con %s",
+        "VisitorFingerprint": "Huella digital",
         "VisitorSettings": "Configuración de visitantes",
         "VisitType": "Tipo de visita",
         "VisitTypes": "Tipos de visita",
@@ -412,7 +461,23 @@
         "Warning": "Advertencia",
         "Warnings": "Alertas",
         "WarningPhpVersionXIsTooOld": "La versión PHP de la versión %s que estás usando alcanzó su fin de ciclo (EOL). Te recomendamos encarecidamente que te actualicés a la versión actual, ya que al continuar usando esta versión obsoleta te exponés a vulnerabilidades de seguridad y errores que ya pueden haber sido corregidos en versiones más recientes de PHP.",
+        "WarningPiwikWillStopSupportingPHPVersion": "Matomo dejará de soportar PHP %1$s en la siguiente actualización mayor. ¡Actualizá tu PHP, por lo menos a la versión %2$s, antes que sea demasiado tarde!",
+        "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Tenés que actualizar tu versión de PHP para recibir la última actualización de Matomo.",
+        "PiwikCannotBeUpgradedBecausePhpIsTooOld": "Matomo no puede actualizarse a la última versión mayor porque tu versión de PHP es obsoleta.",
+        "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Por favor, actualizá tu versión de PHP, al menos a PHP %s, así tus datos de análisis de Matomo permanecen seguros.",
+        "ValidatorErrorEmptyValue": "Se necesita de un valor.",
+        "ValidatorErrorNotANumber": "El valor no es un número.",
+        "ValidatorErrorNumberTooLow": "El valor \"%1$s\" es demasiado bajo. El valor necesita ser, al menos, %2$s.",
+        "ValidatorErrorNumberTooHigh": "El valor \"%1$s\" es demasiado alto. El valor debería ser, como mucho, %2$s.",
+        "ValidatorErrorCharacterTooShort": "El valor contiene %1$s caracteres, pero necesita contener, al menos, %2$s caracteres.",
+        "ValidatorErrorCharacterTooLong": "El valor contiene %1$s caracteres, pero debería contener, como mucho, %2$s caracteres.",
+        "ValidatorErrorNotUrlLike": "El valor \"%s\" no parece ser una dirección web.",
+        "ValidatorErrorNotEmailLike": "El valor \"%s\" no parece ser una dirección válida de correo electrónico.",
+        "ValidatorErrorNoValidRegex": "El valor \"%s\" no es una expresión regular válida.",
+        "ValidatorErrorXNotWhitelisted": "El valor \"%1$s\" no está permitido; usá uno de: %2$s.",
+        "ValidatorErrorInvalidDateTimeFormat": "La fecha \"%1$s\" no tiene el formato correcto; por favor, usá %2$s.",
         "WarningFileIntegrityNoManifest": "La verificación de integridad de archivos no se pudo realizar debido a que falta manifest.inc.php.",
+        "WarningFileIntegrityNoManifestDeployingFromGit": "Si estás desplegando Matomo desde 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": "%1$sAdvertencia:%2$s esta contraseña se guardará en el archivo de configuración visible para todo aquel que pueda accederlo.",
         "WarningDebugOnDemandEnabled": "El modo de seguimiento de %1$s está habilitado. Por razones de seguridad, esto debería estar habilitado sólo por un corto período de tiempo. Para deshabilitarlo, establecé %2$s a %3$s en %4$s.",
@@ -432,7 +497,21 @@
         "YouAreCurrentlyUsing": "Actualmente estás usando Matomo %s.",
         "YouAreViewingDemoMessage": "Estás viendo la demo de %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Tenés que iniciar sesión para acceder a esta función.",
-        "YourChangesHaveBeenSaved": "Cambios guardados."
+        "YourChangesHaveBeenSaved": "Cambios guardados.",
+        "YourSessionHasExpired": "Debido a inactividad, venció tu sesión. Por favor, volvé a iniciar sesión para continuar.",
+        "ThankYouForUsingMatomo": "Gracias por usar Matomo",
+        "TheMatomoTeam": "El equipo de Matomo",
+        "PleaseTryAgain": "Por favor, intentá de nuevo",
+        "ComparisonRatioTooltip": "Esto es un cambio %1$s comparado al segmento \"%2$s\" en %3$s.",
+        "ComparisonCardTooltip1": "\"%1$s\" en %2$s contiene %3$s de todas las visitas (%4$s de %5$s en total).",
+        "ComparisonCardTooltip2": "Esta cuenta de visita es diferente en %1$s comparada a %2$s sobre %3$s.",
+        "VisualizationDoesNotSupportComparison": "Esta visualización no soporta comparación de segmento\/período.",
+        "ChangeInX": "Cambio en %1$s",
+        "Comparisons": "Comparaciones",
+        "ClickToRemoveComp": "Hacé clic para quitar esta comparación.",
+        "MaximumNumberOfSegmentsComparedIs": "El número máximo de segmentos que pueden ser comparados simultáneamente es %s.",
+        "CompareDatesParamMustMatchComparePeriods": "La longitud del parámetro de consulta de %1$s debe coincidir la longitud de parámetro de consulta de %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "El número máximo de períodos que pueden ser comparados simultáneamente es %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Acerca de Matomo Mobile",
@@ -440,11 +519,11 @@
         "Account": "Cuenta",
         "Accounts": "Cuentas",
         "AddAccount": "Agregar cuenta",
-        "AddPiwikDemo": "Agregar una Demo de Matomo",
+        "AddPiwikDemo": "Agregar una demo de Matomo",
         "Advanced": "Avanzado",
         "AnonymousAccess": "Acceso anónimo",
         "AnonymousTracking": "Rastreo anónimo",
-        "AskForAnonymousTrackingPermission": "Cuando está activado, Piwik Mobile enviará los datos de uso anónimos a matomo.org. La intención es utilizar esta información para ayudar a los desarrolladores de Piwik Mobile a entender mejor cómo se utiliza la aplicación. La información enviada es: menús y configuraciones en las que se ha hecho clic, nombre y versión del sistema operativo, cualquier error mostrado en Piwik Mobile. No vamos a rastrear NINGUNO de los datos analíticos. Estos datos anónimos nunca se harán públicos. Podés habilitar\/deshabilitar el rastreo anónimo en la configuración en cualquier momento.",
+        "AskForAnonymousTrackingPermission": "Cuando está activado, Matomo Mobile enviará los datos de uso anónimos a matomo.org. La intención es utilizar esta información para ayudar a los desarrolladores de Matomo Mobile a entender mejor cómo se utiliza la aplicación. La información enviada es: menús y configuraciones en las que se ha hecho clic, nombre y versión del sistema operativo, cualquier error mostrado en Matomo Mobile. No vamos a rastrear NINGUNO de los datos analíticos. Estos datos anónimos nunca se harán públicos. Podés habilitar\/deshabilitar el rastreo anónimo en la configuración en cualquier momento.",
         "ChooseHttpTimeout": "Elegí el valor de tiempo de espera HTTP",
         "ChooseMetric": "Elegir medición",
         "ChooseReport": "Elegí un informe",
@@ -454,15 +533,19 @@
         "EmailUs": "Contactanos",
         "EnableGraphsLabel": "Mostrar gráficos",
         "EvolutionGraph": "Gráfico histórico",
+        "HelpUsToImprovePiwikMobile": "¿Te gustaría habilitar el rastreo de uso anónimo en Matomo Mobile?",
         "HowtoDeleteAnAccount": "Mantené presionado para quitar una cuenta.",
         "HowtoDeleteAnAccountOniOS": "Deslizar de derecha a izquierda para eliminar una cuenta",
         "HowtoLoginAnonymous": "Dejá el nombre de usuario y la contraseña vacíos para iniciar sesión como anónimo",
-        "HttpIsNotSecureWarning": "Tu código de autorización (token_auth) de Matomo se envía como texto no cifrado si usas 'HTTP'. Por este motivo, se recomienda HTTPS para el transporte seguro de datos a través de Internet. ¿Deseas continuar?",
+        "HttpIsNotSecureWarning": "Tu código de autorización (token_auth) de Matomo se envía como texto no cifrado si usás \"HTTP\". Por este motivo, se recomienda HTTPS para el transporte seguro de datos a través de Internet. ¿Querés continuar?",
         "HttpTimeout": "Tiempo de espera HTTP",
+        "IncompatiblePiwikVersion": "La versión de Matomo que estás usando no es compatible con Matomo Mobile 2. Actualizá tu instalación e intentá de nuevo, o instalá Matomo Mobile 1.",
         "LastUpdated": "Última actualización: %s",
         "LoadingReport": "Cargando %s",
         "LoginCredentials": "Credenciales",
+        "LoginToPiwikToChangeSettings": "Iniciá sesión en tu servidor Matomo para crear y actualizar sitios web, usuarios o para cambiar la Configuración general como \"Informe para cargar predeterminadamente\".",
         "LoginUseHttps": "Usar HTTPS",
+        "MatomoMobile": "Aplicación móvil de Matomo",
         "MultiChartLabel": "Mostrar pequeños gráficos",
         "NavigationBack": "Volver",
         "NetworkError": "Error de red",
@@ -471,6 +554,7 @@
         "NetworkNotReachable": "Red inaccesible",
         "NoAccountIsSelected": "Tenés que seleccionar una cuenta. Agregá una nueva cuenta si todavía no configuraste ninguna.",
         "NoDataShort": "No hay datos",
+        "NoPiwikAccount": "¿No tenés cuenta en Matomo?",
         "NoReportsShort": "No hay informes",
         "NoVisitorFound": "No se encontraron visitantes",
         "NoVisitorsShort": "No hay visitantes",
@@ -483,10 +567,13 @@
         "RatingDontRemindMe": "No volver a informar de esto",
         "RatingNotNow": "Ahora no",
         "RatingNow": "Está bien, lo voy a puntuar ahora",
+        "RatingPleaseRateUs": "Matomo Mobile App es software libre. Realmente apreciaríamos si te tomás 1 minuto para calificar la aplicación en la %1$s. Si tenés sugerencias de nuevas funciones o informes de errores, por favor ponete en contacto con %2$s.",
         "ReleaseToRefresh": "Soltá para refrescar",
         "Reloading": "Recargando...",
         "RequestTimedOutShort": "Error de tiempo de espera de red",
         "RestrictedCompatibility": "Compatibilidad restringida",
+        "RestrictedCompatibilityExplanation": "La versión %s de Matomo que estás usando no es totalmente compatible con Matomo Mobile 2. Tu experiencia puede contener errores. Te recomendamos que, o bien te actualicés a la última versión o que usés Matomo Mobile 1.",
+        "SaveSuccessError": "La dirección web de Matomo o la combinación de nombre de usuario + contraseñas son incorrectos.",
         "SearchWebsite": "Buscar en los sitios web",
         "ShowAll": "Mostrar todo",
         "ShowLess": "Mostrar menos",
@@ -497,7 +584,13 @@
         "VerifyAccount": "Verificando cuenta",
         "ValidateSslCertificate": "Validar certificado SSL",
         "VerifyLoginData": "Asegurate que tu combinación de nombre de usuario + contraseña sea correcta.",
-        "YouAreOffline": "Disculpá, estás desconectado"
+        "YouAreOffline": "Disculpá, estás desconectado",
+        "ExceptionNoViewAccess": "Por favor, revisá tu nombre de usuario y contraseña para asegurarte que tenés acceso %s a al menos un sitio web.",
+        "Mobile_HowtoExitAndroid": "Por favor, hacé clic en VOLVER de nuevo para salir",
+        "MatomoMarketplace": "Mercado Matomo",
+        "EnterAuthCode": "Ingresar código de autenticación",
+        "EnterCorrectAuthCode": "Ingresar código correcto de autenticación",
+        "EnterAuthCodeExplanation": "Parece que estás usando autenticación de 2 factores. Por favor, ingresá el código de 6 dígitos para iniciar sesión en tu cuenta."
     },
     "RowEvolution": {
         "AvailableMetrics": "Mediciones disponibles",
diff --git a/app/lang/es.json b/app/lang/es.json
index 628c3e207..06ef4ac6d 100644
--- a/app/lang/es.json
+++ b/app/lang/es.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Más información sobre la visualización de gráficos en Matomo.",
         "HelloUser": "¡Hola, %s!",
         "Help": "Ayuda",
+        "HelpResources": "Recursos de ayuda",
         "HelpTranslatePiwik": "¿Quizá te gustaría %1$sayudarnos a mejorar las traducciones de Matomo%2$s?",
         "Hide": "ocultar",
         "HoursMinutes": "%1$s horas %2$s min",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Los datos recibidos son inválidos.",
         "IP": "IP",
         "JsTrackingTag": "Código de monitoreo JavaScript",
+        "KpiMetric": "Metrica KPI",
         "Language": "Idioma",
         "Languages": "Idiomas",
         "LastDays": "Últimos %s días (incluyendo hoy)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 visita",
         "OnlyEnterIfRequired": "Solo ingrese un nombre de usuario SMTP si el servidor lo solicita.",
         "OnlyEnterIfRequiredPassword": "Solo ingrese una contraseña si su servidor SMTP lo solicita.",
+        "SmtpFromEmailHelp": "El valor predeterminado es noreply @ {DOMAIN}, donde {DOMAIN} será reemplazado por su dominio Matomo \"%1$s\".<br> Si el envío de correos no funciona para usted, es posible que deba configurar esta dirección para que coincida con su nombre de usuario SMTP.",
+        "NameShownInTheSenderColumn": "El nombre que se muestra en la columna del remitente.",
         "OnlyUsedIfUserPwdIsSet": "Sólo se utiliza si se establece un nombre de usuario\/contraseña, pregunte a su proveedor si no está seguro que método utilizar.",
         "OpenSourceWebAnalytics": "Plataforma de análisis libre",
         "OperationAtLeast": "Al menos",
@@ -366,7 +370,6 @@
         "Remove": "Quitar",
         "Report": "Informe",
         "ReportGeneratedFrom": "Este informe ha sido generado usando datos de %s.",
-        "ReportRatioTooltip": "'%1$s' representa %2$s de %3$s %4$s con %5$s.",
         "Reports": "Informes",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archivar informes a lo sumo cada X segundos",
         "RearchiveTimeIntervalOnlyForTodayReports": "Esto afecto solo los informes de hoy (o cualquier otro rango de fecha incluyendo el actual)",
@@ -414,7 +417,6 @@
         "ToDeleteAllFilesRunThisCommand": "Para eliminar todos estos ficheros de una vez, puedes utilizar este comando:",
         "Total": "Total",
         "Totals": "Totales",
-        "TotalRatioTooltip": "Esto es %1$s de todos los %2$s %3$s.",
         "TotalRevenue": "Ingresos totales",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visitas, %2$s páginas vistas, %3$s acciones, %4$s ingresos)",
         "TrackingScopeAction": "Acción",
diff --git a/app/lang/et.json b/app/lang/et.json
index f6e0cd71a..da6c67cbf 100644
--- a/app/lang/et.json
+++ b/app/lang/et.json
@@ -275,7 +275,6 @@
         "RelatedReports": "Seotud raportid",
         "Remove": "Eemalda",
         "Report": "Raport",
-        "ReportRatioTooltip": "%5$s '%1$s' esindab %2$s (%4$s kokku: %3$s).",
         "Reports": "Raportid",
         "Required": "%s on nõutav",
         "Required2": "Nõutud",
@@ -310,7 +309,6 @@
         "TimeFormat": "Aja vorming",
         "TimeOnPage": "Aeg lehel",
         "Total": "Kokku",
-        "TotalRatioTooltip": "See on %1$s kõigist %2$s %3$s.",
         "TotalRevenue": "Kogutulu",
         "TrackingScopeAction": "Tegevus",
         "TrackingScopePage": "Lehekülg",
diff --git a/app/lang/fa.json b/app/lang/fa.json
index 928b45b25..4cb7a1870 100644
--- a/app/lang/fa.json
+++ b/app/lang/fa.json
@@ -366,7 +366,6 @@
         "Remove": "حذف کردن",
         "Report": "گزارش",
         "ReportGeneratedFrom": "این گزارش با استفاده از داده های %s تولید شده است.",
-        "ReportRatioTooltip": "«%1$s»، %2$s از %3$s%4$s را با %5$s نمایندگی می‌کند.",
         "Reports": "گزارش ها",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "آرشیو گزارش‌ها در حداکثر هر X ثانیه",
         "RearchiveTimeIntervalOnlyForTodayReports": "این تنها شامل گزارش‌ها برای امروز (و یا هر بازه‌ی تاریخ شامل امروز) می‌شود",
@@ -414,7 +413,6 @@
         "ToDeleteAllFilesRunThisCommand": "برای پاک کردن تمامی این فایل‌ها به صورت یکجا، از دستور زیر استفاده کنید:",
         "Total": "کل",
         "Totals": "جمع کل",
-        "TotalRatioTooltip": "این هست %1$s از کل %2$s %3$s.",
         "TotalRevenue": "درآمد کل",
         "TotalVisitsPageviewsActionsRevenue": "( جمع کل:%1$s بازدید، %2$s بازدید صفحه ای، %3$sفعل و انفعال، %4$s درآمد )",
         "TrackingScopeAction": "اعمال کن",
diff --git a/app/lang/fi.json b/app/lang/fi.json
index 55322a9ef..1381f6cd1 100644
--- a/app/lang/fi.json
+++ b/app/lang/fi.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Lisätietoa Matomon kuvaajista.",
         "HelloUser": "Hei, %s!",
         "Help": "Apua",
+        "HelpResources": "Ohjeresurssit",
         "HelpTranslatePiwik": "Haluatko %1$sauttaa parantamaan Matomon käännöksiä?%2$s?",
         "Hide": "piilota",
         "HoursMinutes": "%1$s tuntia %2$s minuuttia",
@@ -366,7 +367,6 @@
         "Remove": "Poista",
         "Report": "Raportti",
         "ReportGeneratedFrom": "Tämä raportti on luotu %s:n tiedoista.",
-        "ReportRatioTooltip": "'%1$s' kuvaa %2$s :ta %3$s %4$s :ssa %5$s:n kanssa.",
         "Reports": "Raportit",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arkistoi enintään joka X sekunti",
         "RearchiveTimeIntervalOnlyForTodayReports": "Tämä vaikuttaa ainoastaan tämän päivän raportteihin (tai mihin tahansa päiväysväliin johon tämä päivä kuuluu)",
@@ -400,6 +400,8 @@
         "SmtpPort": "SMTP:n portti",
         "SmtpServerAddress": "SMTP-palvelimen osoite",
         "SmtpUsername": "SMTP-käyttäjätunnus",
+        "SmtpFromName": "SMTP:n From-nimi",
+        "SmtpFromAddress": "SMTP:n From-osoite",
         "Source": "Lähde",
         "StatisticsAreNotRecorded": "Matomon Kävijäseuranta ei ole käytössä tällä hetkellä! Aktivoi seuranta asettamalla record_statistics = 1 tiedostossa config\/config.ini.php.",
         "Subtotal": "Yhteensä",
@@ -414,7 +416,6 @@
         "ToDeleteAllFilesRunThisCommand": "Poistaaksesi kaikki nämä tiedostot kerralla, voit ajaa tämän komennon:",
         "Total": "Yhteensä",
         "Totals": "Yhteensä",
-        "TotalRatioTooltip": "Tämä on %1$s kaikista %2$s %3$s.",
         "TotalRevenue": "Tulot yhteensä",
         "TotalVisitsPageviewsActionsRevenue": "(Yhteensä: %1$s käyntiä, %2$s sivulatausta, %3$s toiminnetta, %4$s tuloja)",
         "TrackingScopeAction": "Toiminto",
@@ -492,8 +493,10 @@
         "YouAreViewingDemoMessage": "Katselet %1$sMatomo%2$s -demoa.",
         "YouMustBeLoggedIn": "Sinun täytyy kirjautua sisään ennen tämän toiminnallisuuden käyttämistä.",
         "YourChangesHaveBeenSaved": "Muutokset on tallennettu.",
+        "YourSessionHasExpired": "Istuntosi on vanhentunut toimettomuuden vuoksi. Kirjaudu uudelleen jatkaaksesi.",
         "ThankYouForUsingMatomo": "Kiitos kun päätit käyttää Matomoa",
-        "TheMatomoTeam": "Matomo-tiimi"
+        "TheMatomoTeam": "Matomo-tiimi",
+        "PleaseTryAgain": "Yritä uudelleen"
     },
     "Mobile": {
         "AboutPiwikMobile": "Tietoja Matomo Mobilesta",
@@ -566,7 +569,13 @@
         "VerifyAccount": "Tarkistetaan tiliä",
         "ValidateSslCertificate": "Validoi SSL-varmenne",
         "VerifyLoginData": "Varmista, että käyttäjätunnus ja salasana ovat oikein.",
-        "YouAreOffline": "Sinulla ei ole verkkoyhteyttä juuri nyt"
+        "YouAreOffline": "Sinulla ei ole verkkoyhteyttä juuri nyt",
+        "ExceptionNoViewAccess": "Tarkista käyttäjätunnuksesi ja salasanasi sekä varmista, että sinulla %s-käyttöoikeus vähintään yhdelle sivustolle.",
+        "Mobile_HowtoExitAndroid": "Napsauta uudelleen TAKAISIN poistuaksesi",
+        "MatomoMarketplace": "Matomo-markkinapaikka",
+        "EnterAuthCode": "Anna tunnistuskoodi",
+        "EnterCorrectAuthCode": "Anna oikea tunnistuskoodi",
+        "EnterAuthCodeExplanation": "Vaikuttaa siltä, että käytät kaksivaiheista tunnistautumista. Anna kuusinumeroinen koodi kirjautuaksesi tilillesi."
     },
     "RowEvolution": {
         "AvailableMetrics": "Saatavilla olevat metriikat",
diff --git a/app/lang/fr.json b/app/lang/fr.json
index a3e0ce349..d80c8235b 100644
--- a/app/lang/fr.json
+++ b/app/lang/fr.json
@@ -9,13 +9,13 @@
         "Add": "Ajouter",
         "AfterEntry": "après être entré ici",
         "All": "Tous",
-        "AllowPiwikArchivingToTriggerBrowser": "Archivage des rapports lorsqu'ils sont vus depuis le navigateur.",
+        "AllowPiwikArchivingToTriggerBrowser": "Archiver les rapports lorsqu'ils sont affichés depuis le navigateur",
         "AllWebsitesDashboard": "Tableau de bord de tous les sites",
         "And": "et",
         "API": "API",
         "Apply": "Appliquer",
-        "ArchivingInlineHelp": "Pour les sites web au trafic moyen à fort, il est recommandé de désactiver l'archivage de Matomo depuis le navigateur. Nous vous recommandons de mettre en place une tâche planifiée cron qui génère les rapports toutes les heures.",
-        "ArchivingTriggerDescription": "Recommandé pour les installations importantes de Matomo, vous devriez %1$s mettre en place une tâche planifiée (cron) %2$s pour générer les rapports automatiquement.",
+        "ArchivingInlineHelp": "Pour les sites web au trafic moyen à élevé, il est recommandé de désactiver l'archivage de Matomo depuis le navigateur. Nous vous recommandons de mettre en place une tâche planifiée cron pour traiter les rapports Matomo toutes les heures.",
+        "ArchivingTriggerDescription": "Recommandé pour les installations importantes de Matomo, 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",
@@ -23,11 +23,11 @@
         "AverageX": "Moy. %s",
         "BackToPiwik": "Retourner à Matomo",
         "Broken": "Brisé",
-        "BrokenDownReportDocumentation": "Il est divisé en plusieurs rapports, qui sont affichés en lignes de tendance à la fin de la page. Vous pouvez agrandir le graphique en cliquant sur le rapport que vous souhaitez voir.",
+        "BrokenDownReportDocumentation": "Il est divisé en plusieurs rapports, qui sont affichés en lignes de tendance en bas de la page. Vous pouvez agrandir le graphique en cliquant sur le rapport que vous souhaitez voir.",
         "Cancel": "Annuler",
         "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 termes. Pour cela, utilisez les option en dessous du rapport.",
+        "ChangeTagCloudView": "Veuillez noter que vous pouvez visualiser le rapport sous une autre forme qu'un nuage d'étiquettes. Pour cela, utilisez les option en dessous du rapport.",
         "ChooseDate": "Choisissez une date, date actuellement sélectionnée : %s",
         "ChooseLanguage": "Sélectionnez la langue",
         "ChoosePeriod": "Sélectionnez la période",
@@ -38,45 +38,45 @@
         "Copy": "Copier",
         "Confirm": "Confirmer",
         "ColumnActionsPerVisit": "Actions par visite",
-        "ColumnActionsPerVisitDocumentation": "Nombre moyen d'actions (affichages de page, téléchargements ou liens sortants) qui ont été effectuées durant les visites.",
+        "ColumnActionsPerVisitDocumentation": "Nombre moyen d'actions (affichages de page, recherches, téléchargements ou liens sortants) qui ont été effectuées durant les visites.",
         "ColumnAverageGenerationTime": "Temps moyen de génération",
-        "ColumnViewsWithGenerationTime": "Vues de pages avec délais de génération",
-        "ColumnAverageGenerationTimeDocumentation": "Délais moyen de génération de la page. Cette métrique inclut le délai de génération de la page pris par le serveur, plus celui qu'il a fallu au visiteur pour télécharger la réponse du serveur. Un faible 'délai de génération moyen' signifie un site plus rapide pour vos visiteurs !",
+        "ColumnViewsWithGenerationTime": "Pages vues avec temps de génération",
+        "ColumnAverageGenerationTimeDocumentation": "Délai moyen de génération de la page. Cette métrique inclut le délai de génération de la page pris par le serveur, plus celui qu'il a fallu au visiteur pour télécharger la réponse du serveur. Un faible 'délai de génération moyen' signifie un site plus rapide pour vos visiteurs !",
         "ColumnAverageTimeOnPage": "Temps moyen sur la page",
         "ColumnAverageTimeOnPageDocumentation": "Temps moyen que les visiteurs ont passé sur cette page (seulement la page, pas le site entier).",
-        "ColumnAvgTimeOnSite": "Temps moyen sur le site",
+        "ColumnAvgTimeOnSite": "Temps moyen sur le site web",
         "ColumnSumTimeOnSite": "Temps total sur le site web",
-        "ColumnAvgTimeOnSiteDocumentation": "Durée moyenne d'une visite",
+        "ColumnAvgTimeOnSiteDocumentation": "Durée moyenne d'une visite.",
         "ColumnBounceRate": "Taux de rebond",
         "ColumnBounceRateDocumentation": "Pourcentage de visites qui ont eu un affichage unique de page. Cela signifie que le visiteur a quitté le site directement depuis la page d'entrée.",
         "ColumnBounces": "Rebonds",
         "RealTime": "Temps-réel",
         "ColumnBouncesDocumentation": "Nombre de visites qui ont commencé et se sont terminées sur cette page. Cela signifie que les visiteurs ont quitté le site après avoir vu seulement cette page.",
         "ColumnConversionRate": "Taux de conversion",
-        "ColumnConversionRateDocumentation": "Pourcentage de visites qui ont déclenché une conversion en Objectif.",
+        "ColumnConversionRateDocumentation": "Pourcentage de visites qui ont déclenché une conversion d'objectif.",
         "ColumnDestinationPage": "Page de destination",
         "ColumnEntrances": "Entrées",
         "ColumnEntrancesDocumentation": "Nombre de visites qui ont démarré sur cette page.",
         "ColumnExitRate": "Taux de sortie",
-        "ColumnExitRateDocumentation": "Pourcentage de visites qui ont quitté le site web après avoir visualisé cette page (affichages uniques divisés par sorties).",
+        "ColumnExitRateDocumentation": "Pourcentage de visites qui ont quitté le site après avoir visualisé cette page.",
         "ColumnExits": "Sorties",
         "ColumnExitsDocumentation": "Nombre de visites qui se sont terminées sur cette page.",
         "ColumnGenerationTime": "Délai de génération",
         "ColumnPageGenerationTime": "Délai de génération de la page",
-        "ColumnKeyword": "Mot-clé",
+        "ColumnKeyword": "Mot clef",
         "ColumnLabel": "Nom",
         "ColumnHits": "Hits",
         "ColumnMaxActions": "Nombre maximum d'actions en une visite",
         "ColumnNbActions": "Actions",
-        "ColumnNbActionsDocumentation": "Nombre d'actions effectuées par vos visiteurs. Les actions peuvent être des visites de pages, téléchargements, liens sortants.",
+        "ColumnNbActionsDocumentation": "Nombre d'actions effectuées par vos visiteurs. Les actions peuvent être des visites de pages, des recherches sur le site, des téléchargements ou des liens sortants.",
         "ColumnNbUniqVisitors": "Visiteurs uniques",
-        "ColumnNbUniqVisitorsDocumentation": "Le nombre de visiteurs uniques visitant votre site web. Chaque utilisateur n'est comptabilisé qu'une seule fois, même s'il visite le site web plusieurs fois dans une journée.",
+        "ColumnNbUniqVisitorsDocumentation": "Le nombre de visiteurs uniques venant sur votre site. Chaque utilisateur n'est compté qu'une seule fois, même s'il visite le site plusieurs fois par jour.",
         "ColumnNbUsers": "Utilisateurs",
-        "ColumnNbUsersDocumentation": "Le nombre de visiteurs enregistrés connectés sur votre site. C'est le nombre de visiteurs uniques actifs qui ont un ID utilisateur enregistré (via la fonction nde code de suivi 'setUserId'",
+        "ColumnNbUsersDocumentation": "Le nombre d'utilisateurs connectés à votre site. C'est le nombre de visiteurs uniques actifs qui ont un ID utilisateur (via la fonction du code de suivi 'setUserId').",
         "ColumnNbVisits": "Visites",
-        "ColumnNbVisitsDocumentation": "Si un visiteur se rend sur votre site web pour la première fois ou s'il visite une page plus de 30 minutes après sa dernière page, il sera enregistré en tant que nouvelle visite.",
-        "ColumnPageBounceRateDocumentation": "Pourcentage de visites qui ont commencé sur cette page et ont tout de suite quitté le site.",
-        "ColumnPageviews": "Vues",
+        "ColumnNbVisitsDocumentation": "Si un visiteur se rend sur votre site web pour la première fois ou s'il visite une page plus de 30 minutes après sa dernière consultation, il sera comptabilisé comme une nouvelle visite.",
+        "ColumnPageBounceRateDocumentation": "Pourcentage de visites qui ont commencé sur cette page et ont quitté le site juste après.",
+        "ColumnPageviews": "Vues de page",
         "ColumnPageviewsDocumentation": "Le nombre de fois que cette page a été visitée.",
         "ColumnPercentageVisits": "%% Visites",
         "ColumnRevenue": "Revenu",
@@ -84,43 +84,43 @@
         "ColumnTotalPageviews": "Total des pages vues",
         "ColumnUniqueEntrances": "Entrées uniques",
         "ColumnUniqueExits": "Sorties uniques",
-        "ColumnUniquePageviews": "Vues uniques",
+        "ColumnUniquePageviews": "Vues de page uniques",
         "ColumnUniquePageviewsDocumentation": "Nombre de visites qui ont inclus cette page. Si une page a été vue plusieurs fois durant la visite elle ne sera comptabilisée qu'une seule fois.",
-        "ColumnValuePerVisit": "Valeur par Visite",
+        "ColumnValuePerVisit": "Revenu par visite",
         "ColumnViewedAfterSearch": "Cliqué dans les résultats de recherche",
-        "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.",
+        "ColumnViewedAfterSearchDocumentation": "Le nombre de fois qu'un visiteur a affiché cette page après avoir effectué 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",
+        "ColumnVisitsWithConversions": "Visites avec conversions",
         "ComputedMetricAverage": "Moy. %1$spar %2$s",
-        "ComputedMetricAverageDocumentation": "Valeur moyenne de \"%1$s\" per \"%2$s\".",
+        "ComputedMetricAverageDocumentation": "Valeur moyenne de \"%1$s\" par \"%2$s\".",
         "ComputedMetricAverageShortDocumentation": "Valeur moyenne de \"%1$s\".",
         "ComputedMetricRate": "%s Taux",
-        "ComputedMetricRateDocumentation": "Le rapport de \"%1$s\" hors de tous \"%2$s\".",
+        "ComputedMetricRateDocumentation": "Le ratio de \"%1$s\" sur l'ensemble des \"%2$s\".",
         "ComputedMetricRateShortDocumentation": "Le pourcentage de \"%1$s\".",
         "ComputedMetricCountDocumentation": "Le nombre de %s",
         "ComputedMetricSum": "Total %s",
-        "ComputedMetricSumDocumentation": "Le nombre total (sum) of %s",
+        "ComputedMetricSumDocumentation": "Le nombre total (somme) of %s",
         "ComputedMetricMax": "Max %s",
-        "ComputedMetricMaxDocumentation": "La valeur maximum pour %s",
+        "ComputedMetricMaxDocumentation": "La valeur maximale pour %s",
         "ComputedMetricMin": "Min %s",
         "ComputedMetricMinDocumentation": "La valeur minimale pour %s",
         "ComputedMetricUniqueCount": "%sUnique",
         "ComputedMetricUniqueCountDocumentation": "Le nombre unique de %s",
         "ComputedMetricCountWithValue": "Entrées avec %s",
         "ComputedMetricCountWithValueDocumentation": "Le nombre d'entrées ayant une valeur définie pour %s",
-        "ConfigFileIsNotWritable": "Le fichier de configuration de Matomo %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.",
+        "ConfigFileIsNotWritable": "Le fichier de configuration de Matomo %1$s n'est pas modifiable, certains de vos changements ne seront pas sauvegardées. %2$s Veuillez modifier les permissions du fichier de configuration de manière à le rendre accessible en écriture.",
         "Continue": "Continuer",
         "ContinueToPiwik": "Continuer vers Matomo",
-        "CurrentlyUsingUnsecureHttp": "Vous utilisez Matomo en mode HTTP non sécurisé, ce qui peut être dangereux. Nous vous recommandons de configurer Matomo pour utiliser SSL (HTTPS) afin d'accroître la sécurité.",
+        "CurrentlyUsingUnsecureHttp": "Vous utilisez Matomo en mode HTTP non sécurisé, ce qui peut être dangereux. Nous vous recommandons de configurer Matomo pour utiliser SSL (HTTPS) afin d'améliorer la sécurité.",
         "CreatedByUser": "créé par %s",
         "CurrentMonth": "Mois courant",
         "CurrentWeek": "Semaine courante",
         "CurrentYear": "Année courante",
         "Daily": "Quotidiennement",
-        "DailyReport": "Journalier",
-        "DailyReports": "Rapports journaliers",
-        "DailySum": "montant journalier",
-        "DashboardForASpecificWebsite": "Tableau de bord pour un site particulier",
+        "DailyReport": "quotidiennement",
+        "DailyReports": "Rapports quotidiens",
+        "DailySum": "montant quotidien",
+        "DashboardForASpecificWebsite": "Tableau de bord pour un site web particulier",
         "DataForThisGraphHasBeenPurged": "Les données de ce graphique ont plus de %s mois et ont été purgées.",
         "DataForThisTagCloudHasBeenPurged": "Les données pour ce nuage de termes ont plus de %s mois et ont été purgées.",
         "Date": "Date",
@@ -141,22 +141,22 @@
         "Details": "Détails",
         "Discount": "Réduction",
         "DisplaySimpleTable": "Afficher un tableau simple",
-        "DisplayTableWithGoalMetrics": "Afficher un tableau avec des Objectifs en tant qu'unités",
-        "DisplayTableWithMoreMetrics": "Afficher un tableau avec plus d'unités",
+        "DisplayTableWithGoalMetrics": "Afficher un tableau avec les métriques 'Objectifs'",
+        "DisplayTableWithMoreMetrics": "Afficher un tableau avec les métriques 'Engagement visiteur'",
         "Documentation": "Documentation",
         "Donate": "Donner",
         "Done": "Effectué",
         "Download": "Télécharger",
         "DownloadFail_FileExists": "Le fichier %s existe déjà !",
-        "DownloadFail_FileExistsContinue": "Téléchargement partiel en cours pour %s, mais un téléchargement terminé existe déjà !",
-        "DownloadFail_HttpRequestFail": "Impossible de télécharger le fichier ! Le fichier n'est peut-être plus disponible, ou le site web a un petit problème. Veuillez réessayer plus tard ou téléchargez le fichier manuellement.",
+        "DownloadFail_FileExistsContinue": "Téléchargement partiel en cours pour %s, mais un téléchargement complet existe déjà !",
+        "DownloadFail_HttpRequestFail": "Impossible de télécharger le fichier ! Le site web a peut-être un problème. Veuillez réessayer plus tard ou téléchargez le fichier manuellement.",
         "DownloadFullVersion": "%1$sTéléchargez%2$s la version complète ! Rendez-vous sur %3$s",
         "DownloadPleaseRemoveExisting": "Si vous voulez le remplacer, commencer par supprimer le fichier existant.",
         "Downloads": "Téléchargements",
         "EcommerceOrders": "Commandes e-commerce",
         "EcommerceVisitStatusDesc": "Visitez le statut du E-commerce à la fin de la visite",
         "EcommerceVisitStatusEg": "Par exemple, pour sélectionner toutes les visites qui ont fait une commande E-commerce, la requête API contiendrait %s",
-        "Edit": "Éditer",
+        "Edit": "Modifier",
         "EncryptedSmtpTransport": "Entrez la couche de chiffrement requise par votre serveur SMTP.",
         "Error": "Erreur",
         "Errors": "Erreurs",
@@ -164,76 +164,77 @@
         "EvolutionOverPeriod": "Évolution sur la période",
         "EvolutionSummaryGeneric": "%1$s en %2$s comparé à %3$s en %4$s. Évolution : %5$s",
         "ExceptionContactSupportGeneric": "Si vous avez toujours ce problème veuillez %1$scontacter votre administrateur Matomo%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é",
+        "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é ou n'a pas pu être lu.",
         "ExceptionConfigurationFileExistsButNotReadable": "Le fichier de configuration %s semble exister mais Matomo n'arrive pas à le lire.",
-        "ExceptionConfigurationFilePleaseCheckReadableByUser": "Merci de vérifier que %1$s est lisible par l'utilisateur '%2$s'",
+        "ExceptionConfigurationFilePleaseCheckReadableByUser": "Merci de vérifier que %1$s est lisible par l'utilisateur '%2$s'.",
         "ExceptionDatabaseVersion": "Votre version de %1$s est %2$s mais Matomo a besoin au minimum de la version %3$s.",
         "ExceptionDatabaseVersionNewerThanCodebase": "Votre installation de Matomo 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 Matomo sont en train de terminer le processus de mise à jour en ce moment. Veuillez réessayer dans quelques minutes.",
+        "ExceptionDatabaseVersionNewerThanCodebaseWait": "Peut-être que les administrateurs de Matomo 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 '%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 : %1$s ou n'importe quel mot-clé supporté par la fonction %2$s (visitez %3$s pour plus d'informations)",
+        "ExceptionIncompatibleClientServerVersions": "La version de votre client %1$s est %2$s ce qui est incompatible avec la version du serveur %3$s.",
+        "ExceptionInvalidAggregateReportsFormat": "Le format '%1$s' des rapports agrégés n'est pas valide. Essayez plutôt l'une des options suivantes : %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 : %1$s ou n'importe quel mot-clé supporté par la fonction %2$s (consultez %3$s pour plus d'informations)",
         "ExceptionInvalidDateBeforeFirstWebsite": "La date '%1$s' se situe avant la date de mise en ligne du site. Essayez une date qui se situe après %2$s (horodatage %3$s).",
-        "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 clé partagée (token) n'est pas valide.",
+        "ExceptionInvalidDateRange": "La date '%1$s' n'est pas une période correcte. Elle devrait avoir le format suivant : %2$s.",
+        "ExceptionInvalidPeriod": "La période '%1$s' n'est pas supportée. Veuillez essayer une parmi celles-ci à la place : %2$s",
+        "ExceptionInvalidRendererFormat": "Le format de rendu '%1$s' n'est pas valide. Veuillez essayer un parmi ceux-ci à la place : %2$s.",
+        "ExceptionInvalidReportRendererFormat": "Le format de rapport '%1$s' n'est pas valide. Veuillez essayer un parmi ceux-ci à la place : %2$s.",
+        "ExceptionInvalidStaticGraphType": "Le type de graphique '%1$s' n'est pas valide. Veuillez essayer un parmi ceux-ci à la place : %2$s.",
+        "ExceptionInvalidToken": "Le jeton n'est pas valide.",
         "ExceptionLanguageFileNotFound": "Le fichier de langage '%s' n'a pas été trouvé.",
-        "ExceptionMethodNotFound": "La méthode '%1$s' n'existe pas ou n'est pas disponible dans le module '%2$s'",
+        "ExceptionMethodNotFound": "La méthode '%1$s' n'existe pas ou n'est pas disponible dans le module '%2$s'.",
         "ExceptionMissingFile": "Fichier manquant : %s",
-        "ExceptionUnexpectedFile": "Des fichiers auxquels nous ne nous attendions pas ont été trouvé dans votre installation de Matomo.",
+        "ExceptionUnexpectedFile": "Des fichiers auxquels nous ne nous attendions pas ont été trouvés dans votre installation de Matomo.",
         "ExceptionUnexpectedFilePleaseDelete": "Veuillez supprimer ces fichiers pour éviter d'avoir des erreurs.",
         "ExceptionUnexpectedDirectory": "Des répertoires auxquels nous ne nous attendions pas ont été trouvés dans votre installation de Matomo.",
-        "ExceptionUnexpectedDirectoryPleaseDelete": "Veuillez supprimer ces répertoires pour éviter d'obtenir des erreurs.",
+        "ExceptionUnexpectedDirectoryPleaseDelete": "Veuillez supprimer ces répertoires pour éviter les erreurs.",
         "ExceptionFileToDelete": "Fichier à supprimer : %s",
         "ExceptionDirectoryToDelete": "Répertoire à supprimer : %s",
-        "ExceptionNonceMismatch": "Impossible de vérifier le code (token) de sécurité pour ce formulaire.",
+        "ExceptionNonceMismatch": "Impossible de vérifier le jeton de sécurité (token) pour ce formulaire.",
         "ExceptionPrivilege": "Vous ne pouvez accéder à cette ressource, ceci requiert un accès de type %s.",
-        "ExceptionPrivilegeAccessWebsite": "Vous ne pouvez pas accéder à cette ressource car elle nécessite %s accès pour le site Web id = %d.",
-        "ExceptionCapabilityAccessWebsite": "You ne pouvez pas accéder à cette ressource car cela requiert la permission %s pour le site web id = %d.",
-        "ExceptionPrivilegeAtLeastOneWebsite": "Vous ne pouvez pas accéder à cette ressource car elle nécessite %s accès pour à au moins un site Web.",
+        "ExceptionPrivilegeAccessWebsite": "Vous ne pouvez pas accéder à cette ressource car elle nécessite l'accès %s pour le site id = %d.",
+        "ExceptionCapabilityAccessWebsite": "Vous ne pouvez pas accéder à cette ressource car cela requiert la permission %s pour le site id = %d.",
+        "ExceptionPrivilegeAtLeastOneWebsite": "Vous ne pouvez pas accéder à cette ressource car elle nécessite l'accès %s pour au moins un site.",
         "ExceptionUnableToStartSession": "Impossible de démarrer une session.",
         "ExceptionUndeletableFile": "Impossible de supprimer %s",
-        "ExceptionUnreadableFileDisabledMethod": "Le fichier de configuration {%1$s} n'a pas pu être lu. votre hébergeur a probablement désactivé %2$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.",
-        "ExceptionWidgetNotEnabled": "Le gadget demandé n'est pas activé. Ceci signifie généralement que le composant dont il fait partie est désactivé ou que vous ne possédez pas assez de permissions pour accéder à ce gadget.",
+        "ExceptionReportNotEnabled": "Le rapport demandé n'est pas activé. Cela signifie généralement que le composant qui définit le rapport est désactivé ou que vous n'avez pas suffisamment d'autorisation pour accéder à ce rapport.",
+        "ExceptionWidgetNotEnabled": "Le gadget demandé n'est pas activé. Cela signifie généralement que le composant dont il fait partie est désactivé ou que vous ne possédez pas assez de permissions pour accéder à ce gadget.",
         "ExpandDataTableFooter": "Modifier la visualisation ou configurer le rapport",
         "Export": "Exporter",
-        "ExportAsImage": "Exporter au format Image",
+        "ExportAsImage": "Exporter en tant qu'image",
         "ExportThisReport": "Exporter ce jeu de données dans d'autres formats",
         "Faq": "FAQ",
-        "FileIntegrityWarning": "Le contrôle d'intégrité a échoué et a rapporté des erreurs. Vous devriez corriger cela et rafraîchir cette page jusqu'à ce qu'il n'y ait plus d'erreur.",
-        "FileIntegrityWarningReupload": "Les erreurs ci-dessous peuvent être dues à des téléversements de fichiers Matomo partiels ou échoués.",
+        "FileIntegrityWarning": "Le contrôle d'intégrité a échoué et a rapporté des erreurs. Vous devriez corriger ces problèmes puis rafraîchir cette page jusqu'à ce qu'il n'y ait plus d'erreur.",
+        "FileIntegrityWarningReupload": "Les erreurs ci-dessous peuvent être dues à des téléversements des fichiers Matomo partiels ou échoués.",
         "FileIntegrityWarningReuploadBis": "Essayez de renvoyer tous les fichiers Matomo en utilisant le mode BINAIRE.",
         "First": "Premier",
         "Flatten": "Aplatir",
         "ForcedSSL": "Connexion SSL forcée",
-        "ForceSSLRecommended": "Nous recommandons d'utiliser Matomo au travers de connexions SSL sécurisées uniquement. Pour empêcher l'utilisation non-sécurisée au travers du http, ajoutez %1$s à la section %2$s dans votre fichier conf\/config.ini.php de Matomo.",
-        "NotPossibleWithoutHttps": "Attention : Effectuer cela sans avoir mis en place un certificat SSL pour l'utilisation du HTTPS va interrompre Matomo.",
-        "UseSSLInstall": "Nous recommandons d'utiliser Matomo au travers de connexions sécurisées par SSL uniquement. Veuillez %1$scliquer ici afin de continuer l'installation en utilisant du SSL%2$s.",
+        "ForceSSLRecommended": "Nous recommandons d'utiliser Matomo uniquement avec des connexions sécurisées SSL. Pour empêcher l'accès non sécurisée par HTTP, ajoutez %1$s à la section %2$s dans votre fichier conf\/config.ini.php de Matomo.",
+        "NotPossibleWithoutHttps": "Attention : effectuer cela sans avoir mis en place un certificat SSL pour l'utilisation du HTTPS empêchera Matomo de fonctionner.",
+        "UseSSLInstall": "Nous recommandons d'utiliser Matomo uniquement avec des connexions sécurisées SSL. Veuillez %1$scliquer ici afin de continuer l'installation en utilisant SSL%2$s.",
         "ForExampleShort": "ex.",
         "Forums": "Forums",
         "FromReferrer": "de",
         "Generic": "Générique",
         "GeneralInformation": "Informations Générales",
         "GeneralSettings": "Paramètres généraux",
-        "GetStarted": "Pour bien commencer",
+        "GetStarted": "Démarrer",
         "GiveUsYourFeedback": "Envoyez-nous vos commentaires !",
         "Goal": "Objectif",
         "GoTo": "Rendez-vous à %s",
-        "GoTo2": "Aller à",
+        "GoTo2": "Rendez-vous à",
         "GraphHelp": "Plus d'informations à propos de l'affichage des graphiques dans Matomo.",
         "HelloUser": "Bonjour, %s",
         "Help": "Aide",
-        "HelpTranslatePiwik": "Peut-être souhaiteriez-vous %1$snous aider à améliorer les traductions de Matomo%2$s ?",
+        "HelpResources": "Ressources d'aide",
+        "HelpTranslatePiwik": "Peut-être aimeriez-vous %1$snous aider à améliorer les traductions de Matomo%2$s ?",
         "Hide": "cacher",
         "HoursMinutes": "%1$s heures %2$s min",
         "Id": "Id",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Les données reçues sont invalides",
         "IP": "IP",
         "JsTrackingTag": "Code de suivi JavaScript",
+        "KpiMetric": "Métrique KPI",
         "Language": "Langue",
         "Languages": "Langues",
         "LastDays": "%s derniers jours (aujourd'hui inclus)",
@@ -258,7 +260,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 jour au plus toutes les demies heures (%1$s secondes) ou toutes les heures (%2$secondes).",
+        "MediumToHighTrafficItIsRecommendedTo": "Pour les sites à moyen et fort trafic, nous recommandons de traiter les rapports du jour au plus tard toutes les demi-heures (%1$s secondes) ou toutes les heures (%2$ssecondes).",
         "Metadata": "Méta-données",
         "Metric": "Métrique",
         "Metrics": "Métriques",
@@ -276,7 +278,7 @@
         "Name": "Nom",
         "NbActions": "Nombre d'actions",
         "NbInteractions": "Nombre d'actions",
-        "NbSearches": "Nombre de recherche interne",
+        "NbSearches": "Nombre de recherches internes",
         "NeedMoreHelp": "Besoin d'aide ?",
         "Never": "Jamais",
         "New": "Nouveau",
@@ -287,7 +289,7 @@
         "Next": "Suivant",
         "No": "Non",
         "NoDataForGraph": "Aucune donnée pour ce graphique",
-        "NoDataForTagCloud": "Aucune donnée pour ce nuage de termes.",
+        "NoDataForTagCloud": "Aucune donnée pour ce nuage d'étiquettes.",
         "NotDefined": "%s indéfini",
         "Note": "Note",
         "NotInstalled": "Non installé",
@@ -302,7 +304,9 @@
         "OneVisit": "1 visite",
         "OnlyEnterIfRequired": "Entrez un nom d'utilisateur seulement si le serveur SMTP le requiert",
         "OnlyEnterIfRequiredPassword": "Entrez un mot de passe seulement si le serveur SMTP le requiert",
-        "OnlyUsedIfUserPwdIsSet": "Seulement utilisé si un nom d'utilisateur \/ mot de passe est activé, demandez à votre fournisseur si vous n'êtes pas la méthode à utiliser.",
+        "SmtpFromEmailHelp": "La valeur par défaut est noreply@{DOMAIN}, où {DOMAIN} sera remplacé par votre domaine Matomo \"%1$s\".<br>Si l'envoi d'email ne fonctionne pas, vous devrez peut-être définir cette adresse pour correspondre à votre nom d'utilisateur SMTP.",
+        "NameShownInTheSenderColumn": "Le nom indiqué dans la colonne expéditeur",
+        "OnlyUsedIfUserPwdIsSet": "Seulement utilisé si un nom d'utilisateur \/ mot de passe est activé, demandez à votre fournisseur si vous n'êtes pas sûr(e) de la méthode à utiliser.",
         "OpenSourceWebAnalytics": "Analyse web libre",
         "OperationAtLeast": "Au moins",
         "OperationAtMost": "Au plus",
@@ -323,39 +327,39 @@
         "Others": "Autres",
         "Outlink": "Lien sortant",
         "Outlinks": "Liens sortant",
-        "OverlayRowActionTooltip": "Visualisez les données d'analyse directement sur votre site web (ouvre un nouvel onglet)",
+        "OverlayRowActionTooltip": "Visualisez les données statistiques directement sur votre site web (ouvre un nouvel onglet)",
         "OverlayRowActionTooltipTitle": "Ouvrir l'analyse des pages web",
         "Overview": "Récapitulatif",
         "Pages": "Pages",
         "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.",
+        "ParameterMustIntegerBetween": "Le paramètre %1$s doit être un nombre entier compris entre %2$s et %3$s.",
         "Password": "Mot de passe",
         "Period": "Période",
         "Piechart": "Camembert",
         "Print": "Imprimer",
         "Profiles": "Profils",
-        "MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s, anciennement Piwik, est un projet collaboratif qui vous est fourni par les membres de %7$sl'équipe Matomo%8$s ainsi que de nombreux contributeurs du monde entier. <br\/>Si vous êtes un(e) fan de Matomo vous pouvez aider : apprenez %3$sComment participer à Matomo%4$s ou %5$sdonnez maintenant%6$s pour aider à financer la prochaine version de Matomo !",
+        "MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s, anciennement Piwik, est un projet collaboratif qui vous est fourni par les membres de %7$sl'équipe Matomo%8$s ainsi que de nombreux contributeurs du monde entier. <br\/>Si vous êtes un(e) fan de Matomo vous pouvez aider : apprenez %3$sComment participer à Matomo%4$s ou %5$sfaites un don maintenant%6$s pour aider à financer la prochaine version de Matomo !",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s est disponible. Veuillez informer %2$sl'administrateur Matomo%3$s.",
         "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s est maintenant disponible. %2$s Merci de mettre à jour !%3$s (voir %4$s les modifications%5$s).",
         "PleaseContactYourPiwikAdministrator": "Merci de contacter votre administrateur Matomo.",
-        "PleaseSpecifyValue": "Merci de spécifier une valeur pour %s",
+        "PleaseSpecifyValue": "Merci de spécifier une valeur pour \"%s\"",
         "PleaseUpdatePiwik": "Merci de mettre à jour Matomo",
-        "Plugin": "Plugin",
-        "Plugins": "Plugins",
+        "Plugin": "Composant",
+        "Plugins": "Composants",
         "PoweredBy": "Propulsé par",
         "Previous": "Précédent",
         "PreviousDays": "%s derniers jours (aujourd'hui non-inclus)",
-        "PreviousDaysShort": "%s jours précédent",
+        "PreviousDaysShort": "%s derniers jours",
         "Price": "Prix",
         "ProductConversionRate": "Taux de conversion du produit",
         "ProductRevenue": "Recettes du produit",
         "Measurable": "Élément mesurable",
         "Measurables": "Éléments mesurables",
-        "MeasurableId": "ID Mesurable",
-        "PurchasedProducts": "Produits Achetés",
+        "MeasurableId": "ID de l'élément mesurable",
+        "PurchasedProducts": "Produits achetés",
         "Quantity": "Quantité",
-        "RangeReports": "Des plages de dates personnalisées",
+        "RangeReports": "Plages de dates personnalisées",
         "ReadThisToLearnMore": "%1$sConsultez ceci pour en apprendre plus.%2$s",
         "Recommended": "Recommandé",
         "RecordsToPlot": "Enregistrements à tracer",
@@ -366,7 +370,7 @@
         "Remove": "Supprimer",
         "Report": "Rapport",
         "ReportGeneratedFrom": "Ce rapport a été généré en utilisant des données de %s.",
-        "ReportRatioTooltip": "'%1$s' représente %2$s de %3$s %4$s avec %5$s.",
+        "ReportRatioTooltip": "'%1$s' représente %2$s de %3$s %4$s dans le segment%5$savec %6$s.",
         "Reports": "Rapports",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archiver les rapports au plus toutes les X secondes",
         "RearchiveTimeIntervalOnlyForTodayReports": "Cela n'affecte que les rapports du jour (ou toute autre plage de dates, y compris aujourd'hui)",
@@ -375,37 +379,39 @@
         "Required": "%s requis",
         "Required2": "Requis",
         "ReturningVisitor": "Visiteur de retour",
-        "ReturningVisitorAllVisits": "Voir tous les visiteurs",
+        "ReturningVisitorAllVisits": "Voir tous les visites",
         "RowEvolutionRowActionTooltip": "Visualisez l'évolution dans le temps des métriques de cette ligne",
-        "RowEvolutionRowActionTooltipTitle": "Ouvrir l'évolution de la ligne",
-        "Rows": "Rangées",
+        "RowEvolutionRowActionTooltipTitle": "Voir l'évolution de la ligne",
+        "Rows": "Lignes",
         "RowsToDisplay": "Lignes à afficher",
         "Save": "Enregistrer",
         "SaveImageOnYourComputer": "Pour sauvegarder l'image sur votre ordinateur, faites un clic droit dessus et sélectionnez \"Enregistrer l'image sous...\"",
         "Search": "Rechercher",
         "Clear": "Réinitialiser",
         "SearchNoResults": "Aucun résultat",
-        "SeeAll": "tout montrer",
+        "SeeAll": "tout afficher",
         "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.",
+        "SelectYesIfYouWantToSendEmailsViaServer": "Sélectionnez \"Oui\" si vous voulez ou devez envoyer un e-mail via un serveur nommé à la place de la fonction de messagerie locale",
         "Settings": "Paramètres",
         "Shipping": "Expédition",
         "Show": "afficher",
-        "SingleWebsitesDashboard": "Tableau de bord d'un seul site",
+        "SingleWebsitesDashboard": "Tableau de bord d'un seul site web",
         "SmallTrafficYouCanLeaveDefault": "Pour les sites à faible trafic, vous pouvez laisser le délai %s secondes par défaut, et ainsi accéder aux rapports en temps réel.",
         "SmtpEncryption": "Chiffrement SMTP",
         "SmtpPassword": "Mot de passe SMTP",
-        "SmtpPort": "Port du serveur SMTP",
+        "SmtpPort": "Port SMTP",
         "SmtpServerAddress": "Adresse du serveur SMTP",
         "SmtpUsername": "Nom d'utilisateur SMTP",
+        "SmtpFromName": "Nom d'origine SMTP",
+        "SmtpFromAddress": "Adresse d'origine SMTP",
         "Source": "Source",
         "StatisticsAreNotRecorded": "Le suivi des visiteurs par Matomo est actuellement désactivé ! Réactivez le suivi des visiteurs en paramétrant record_statistics = 1 dans votre fichier config\/config.ini.php.",
         "Subtotal": "Sous-Total",
-        "Summary": "Sommaire",
+        "Summary": "Résumé",
         "Table": "Tableau",
-        "TagCloud": "Nuage de termes",
+        "TagCloud": "Nuage d'étiquettes",
         "Tax": "Taxes",
         "TimeAgo": "il y a %s",
         "TimeFormat": "Format horaire",
@@ -414,23 +420,23 @@
         "ToDeleteAllFilesRunThisCommand": "Pour supprimer tous ces fichiers d'un coup, vous pouvez exécuter cette commande :",
         "Total": "Total",
         "Totals": "Totaux",
-        "TotalRatioTooltip": "C'est %1$s de %2$s %3$s.",
+        "TotalRatioTooltip": "C'est %1$s de %2$s %3$s dans %4$s.",
         "TotalRevenue": "Total des recettes",
         "TotalVisitsPageviewsActionsRevenue": "(Total : %1$s visites, %2$s pages vues, %3$s actions, %4$s revenu)",
         "TrackingScopeAction": "Action",
         "TrackingScopePage": "Page",
         "TrackingScopeVisit": "Visite",
-        "TransitionsRowActionTooltip": "Visualisez ce que les visiteurs ont fait après avoir visité cette page",
+        "TransitionsRowActionTooltip": "Visualisez ce que les visiteurs ont fait avant et après avoir visité cette page",
         "TransitionsRowActionTooltipTitle": "Ouvrir les transitions",
         "TranslatorName": "<a href=\"http:\/\/microsofttouch.fr\/default\/b\/vincent\/default.aspx\">Vincent BIRET<\/a>, Ludovic Evrard, Daniel Castronovo",
         "UniquePurchases": "Achats uniques",
         "Unknown": "Inconnu",
-        "Upload": "Téléchargement",
+        "Upload": "Téléversement",
         "UsePlusMinusIconsDocumentation": "Utilisez les icônes plus et moins sur la gauche pour naviguer.",
         "UserId": "Identifiant utilisateur",
-        "UserIds": "ID Utilisateur",
+        "UserIds": "IDs Utilisateur",
         "Username": "Nom d'utilisateur",
-        "UseSMTPServerForEmail": "Utiliser le serveur SMTP pour les mails",
+        "UseSMTPServerForEmail": "Utiliser le serveur SMTP pour les courriels",
         "Value": "Valeur",
         "VBarGraph": "Histogramme vertical",
         "View": "Vue",
@@ -451,36 +457,36 @@
         "VisitorSettings": "Paramètres visiteur",
         "VisitType": "Type de visite",
         "VisitTypes": "Types de visite",
-        "VisitTypeExample": "Par exemple, pour sélectionner tous les visiteurs qui sont retournés sur le site web, en incluant ceux qui ont acheté quelque chose lors de leur dernière visite, la requête à l'API contiendrait %s",
+        "VisitTypeExample": "Par exemple pour sélectionner tous les visiteurs qui sont revenus sur le site, en incluant ceux qui ont acheté quelque chose lors de leur dernière visite, la requête API contiendrait %s",
         "Warning": "Attention",
         "Warnings": "Avertissements",
-        "WarningPhpVersionXIsTooOld": "La version de PHP que vous utilisez (%s) est en fin de support. Nous vous incitons vivement à upgrader vers une version plus récente. Votre version actuelle vous expose à des failles de sécurité et des bugs qui ont été corrigés dans les versions les plus récentes de PHP.",
+        "WarningPhpVersionXIsTooOld": "La version de PHP que vous utilisez (%s) est en fin de support. Nous vous incitons vivement à la mettre à jour car l'utilisation de cette version peut vous exposer à des vulnérabilités de sécurité et des bogues qui ont été corrigés dans des versions plus récentes de PHP.",
         "WarningPiwikWillStopSupportingPHPVersion": "Matomo ne prendra plus en charge PHP %1$s dans la prochaine version majeure. Mettez à jour votre PHP au minimum avec une version %2$s avant qu'il ne soit trop tard !",
         "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Vous devez mettre à niveau votre version de PHP afin de recevoir la dernière mise à jour Matomo.",
         "PiwikCannotBeUpgradedBecausePhpIsTooOld": "Matomo ne peut pas être mis à jour à la dernière version majeure car votre version de PHP est trop ancienne.",
-        "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Merci de mettre à niveau votre version de PHP au minimum à PHP %s pour que vos statistiques Matomo restent sécurisées.",
+        "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Veuillez mettre à niveau votre version de PHP au minimum à PHP %s pour que vos statistiques Matomo restent sécurisées.",
         "ValidatorErrorEmptyValue": "Une valeur doit être fournie.",
         "ValidatorErrorNotANumber": "La valeur n'est pas un nombre.",
         "ValidatorErrorNumberTooLow": "La valeur \"%1$s\" est trop basse. La valeur doit être au moins %2$s.",
-        "ValidatorErrorNumberTooHigh": "La valeur \"%1$s\" est trop haute. La valeur doit être au moins %2$s",
+        "ValidatorErrorNumberTooHigh": "La valeur \"%1$s\" est trop haute. La valeur doit être au maximum %2$s",
         "ValidatorErrorCharacterTooShort": "La valeur contient \"%1$s\" caractères mais doit contenir au moins %2$scaractères.",
         "ValidatorErrorCharacterTooLong": "La valeur contient \"%1$s\" caractères mais doit contenir au plus %2$scaractères.",
         "ValidatorErrorNotUrlLike": "La valeur \"%s\" ne ressemble pas à une URL.",
-        "ValidatorErrorNotEmailLike": "La valeur \"%s\" ne ressemble pas à une adresse courriel valide.",
+        "ValidatorErrorNotEmailLike": "La valeur \"%s\" ne ressemble pas à une adresse de messagerie valide.",
         "ValidatorErrorNoValidRegex": "La valeur \"%s\" n'est pas une expression régulière valide.",
-        "ValidatorErrorXNotWhitelisted": "La valeur \"%1$s\" n'est pas autorisée, choisissez parmi : \"%2$s.",
-        "ValidatorErrorInvalidDateTimeFormat": "La date \"%1$s\" n'est pas à un format correct, veuillez utiliser %2$s",
-        "WarningFileIntegrityNoManifest": "Le contrôle d'intégrité n'a pu être effectué car le fichier manifest.inc.php est manquant.",
+        "ValidatorErrorXNotWhitelisted": "La valeur \"%1$s\" n'est pas autorisée, choisissez une valeur parmi : \"%2$s.",
+        "ValidatorErrorInvalidDateTimeFormat": "La date \"%1$s\" n'a pas le bon format, veuillez utiliser %2$s",
+        "WarningFileIntegrityNoManifest": "Le contrôle d'intégrité des fichiers n'a pas pu être effectué car le fichier manifest.inc.php est manquant.",
         "WarningFileIntegrityNoManifestDeployingFromGit": "Si vous déployez Matomo 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": "%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 suivi 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",
+        "WarningPasswordStored": "%1$sAttention :%2$s ce mot de passe sera stocké dans le fichier de configuration et il sera visible à tous ceux qui peuvent y accéder.",
+        "WarningDebugOnDemandEnabled": "Le mode %1$s du suivi est activé. Pour des raisons de sécurité ceci ne devrait être activité que pour une courte période. Pour le désactivé définir %2$s à %3$s dans %4$s",
+        "Website": "Site web",
         "Weekly": "Hebdomadaire",
         "WeeklyReport": "hebdomadaire",
         "WeeklyReports": "Rapports hebdomadaires",
         "WellDone": "Bravo !",
-        "Widgets": "Widgets",
+        "Widgets": "Gadgets",
         "Widget": "Gadget",
         "XComparedToY": "%1$s comparé à %2$s",
         "XFromY": "%1$s de %2$s",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "Vous utilisez la démo de%1$s Matomo %2$s",
         "YouMustBeLoggedIn": "Vous devez être connecté(e) pour accéder à cette fonctionnalité.",
         "YourChangesHaveBeenSaved": "Vos modifications ont été enregistrées.",
+        "YourSessionHasExpired": "Votre session a expiré pour cause d'inactivité. Veuillez vous connecter à nouveau.",
         "ThankYouForUsingMatomo": "Merci d'utiliser Matomo",
-        "TheMatomoTeam": "L'équipe Matomo"
+        "TheMatomoTeam": "L'équipe Matomo",
+        "PleaseTryAgain": "Veuillez essayer à nouveau",
+        "ComparisonRatioTooltip": "Il s'agit d'un changement %1$s par rapport au segment '%2$s' sur %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' sur %2$s contient %3$s de toutes les visites (%4$s de %5$s au total).",
+        "ComparisonCardTooltip2": "Le compte des visites est différent de %1$s par rapport au %2$s sur %3$s.",
+        "VisualizationDoesNotSupportComparison": "Cette vue ne prend pas en charge la comparaison segment\/période.",
+        "ChangeInX": "Variation en %1$s",
+        "Comparisons": "Comparaisons",
+        "ClickToRemoveComp": "Cliquer pour supprimer cette comparaison.",
+        "MaximumNumberOfSegmentsComparedIs": "Le maximum de segments qui peuvent être comparés simultanément est %s.",
+        "CompareDatesParamMustMatchComparePeriods": "La longueur du paramètre de requête %1$s doit correspondre à la longueur du paramètre de requête %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "Le nombre maximum de périodes pouvant être comparées simultanément est de %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "À propos de Matomo Mobile",
@@ -504,44 +522,44 @@
         "AddPiwikDemo": "Ajouter une démo Matomo",
         "Advanced": "Avancé",
         "AnonymousAccess": "Accès anonyme",
-        "AnonymousTracking": "Traçage anonyme",
-        "AskForAnonymousTrackingPermission": "Quand activé, Matomo Mobile enverra les données d'utilisation anonyme vers matomo.org. Le but est d'utiliser ces données pour aider les développeurs de Matomo Mobile à mieux comprendre comment l'application est utilisée. Les informations envoyées sont : clics sur les menus et paramètres, nom et version de l'OS, toute erreur affichée dans Matomo Mobile. Nous ne traquerons PAS vos données. Ces données anonymes ne seront jamais publiées. Vous pouvez désactiver\/activer le traçage anonyme dans les Paramètres à tout moment.",
-        "ChooseHttpTimeout": "Choisir la valeur du timeout HTTP",
+        "AnonymousTracking": "Suivit anonyme",
+        "AskForAnonymousTrackingPermission": "Lorsque cette option est activée, Matomo Mobile enverra des données d'utilisation anonymes à matomo.org. Le but est d'utiliser ces données pour aider les développeurs de Matomo Mobile à mieux comprendre comment l'application est utilisée. Les informations envoyées sont : les menus et paramètres cliqués, le nom et la version du système d'exploitation, toute erreur affichée dans Matomo Mobile. Nous NE suivrons PAS vos données statistiques. Ces données anonymes ne seront jamais rendues publiques. Vous pouvez désactiver\/activer le suivi anonyme dans Paramètres à tout moment.",
+        "ChooseHttpTimeout": "Choisir la valeur d'expiration HTTP",
         "ChooseMetric": "Choisissez un métrique",
         "ChooseReport": "Choisir un rapport",
         "ChooseSegment": "Sélectionner segment",
         "ConfirmRemoveAccount": "Souhaitez-vous supprimer ce compte ?",
         "DefaultReportDate": "Date du rapport",
         "EmailUs": "Nous écrire",
-        "EnableGraphsLabel": "Afficher les graphs",
+        "EnableGraphsLabel": "Afficher les graphiques",
         "EvolutionGraph": "Graphique d'historique",
         "HelpUsToImprovePiwikMobile": "Voulez-vous activer le traçage d'utilisation anonyme dans Matomo Mobile ?",
         "HowtoDeleteAnAccount": "Appuyez longtemps pour supprimer un compte.",
-        "HowtoDeleteAnAccountOniOS": "Faites glisser de gauche à droite pour supprimer un compte",
-        "HowtoLoginAnonymous": "Laissez le login et le mot de passe vide pour une connexion anonyme.",
-        "HttpIsNotSecureWarning": "Votre token d'authentification Matomo (token_auth) est envoyée en texte clair si vous utilisez \"HTTP\". Pour cette raison, nous recommandons d'utiliser HTTPS pour sécuriser le transport des données sur Internet. Voulez-vous le faire ?",
+        "HowtoDeleteAnAccountOniOS": "Faites glisser de droite à gauche pour supprimer un compte",
+        "HowtoLoginAnonymous": "Laissez le nom d'utilisateur et le mot de passe vides pour une connexion anonyme.",
+        "HttpIsNotSecureWarning": "Votre jeton d'autorisation Matomo (token_auth) est envoyée en texte clair si vous utilisez 'HTTP'. C'est pourquoi nous recommandons HTTPS pour sécuriser le transport des données sur Internet. Voulez-vous continuer ?",
         "HttpTimeout": "Timeout HTTP",
         "IncompatiblePiwikVersion": "La version de Matomo que vous utilisez est incompatible avec Matomo Mobile 2. Mettez à jour votre installation de Matomo et essayez à nouveau ou bien installez Matomo Mobile 1.",
         "LastUpdated": "Dernière mise à jour : %s",
         "LoadingReport": "Chargement %s",
         "LoginCredentials": "Identifiants",
-        "LoginToPiwikToChangeSettings": "Connectez-vous à votre serveur Matomo pour ajouter et mettre à jour les comptes de vos sites, les utilisateurs ou pour modifier les réglages généraux tels que les \"rapports à charger par défaut\" et les \"date de rapports à charger par défaut\".",
+        "LoginToPiwikToChangeSettings": "Connectez-vous à votre serveur Matomo pour ajouter et mettre à jour vos sites, les utilisateurs ou pour modifier les réglages généraux tels que les \"rapports à charger par défaut\".",
         "LoginUseHttps": "Utiliser HTTPS",
         "MatomoMobile": "Application mobile Matomo",
         "MultiChartLabel": "Afficher les sparklines",
         "NavigationBack": "Retour",
         "NetworkError": "Erreur réseau",
-        "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.",
+        "NetworkErrorWithStatusCode": "Il y a eu une erreur \"%1$s\". La requête a retourné le statut \"%2$s. L'URL était \"%3$s\". Veuillez vérifier que vous avez saisi l'URL correctement et consulter les logs du serveur pour plus d'informations à propos de l'erreur et 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é.",
-        "NoDataShort": "Données absentes",
+        "NoAccountIsSelected": "Vous devez sélectionner un compte. Ajoutez un nouveau compte si vous n'en avez pas configuré un.",
+        "NoDataShort": "Aucune donnée",
         "NoPiwikAccount": "Pas de compte Matomo ?",
-        "NoReportsShort": "Pas de rapport",
+        "NoReportsShort": "Aucun rapport",
         "NoVisitorFound": "Aucun visiteur trouvé",
         "NoVisitorsShort": "Aucun visiteur",
-        "NoWebsiteFound": "Aucun site trouvé",
-        "NoWebsitesShort": "Pas de site internet",
+        "NoWebsiteFound": "Aucun site web trouvé",
+        "NoWebsitesShort": "Aucun site web",
         "PullDownToRefresh": "Faites glisser vers le bas pour actualiser",
         "PossibleSslError": "Erreur potentielle de certificat SSL",
         "PossibleSslErrorExplanation": "Une erreur peut être causée par un certificat invalide ou auto-signé : \"%s\". La connexion peut fonctionner pour vous en ignorant la validation SSL mais cela est moins sécurisé. Vous pouvez modifier la validation SSL à n'importe quel moment depuis les paramètres.",
@@ -549,39 +567,39 @@
         "RatingDontRemindMe": "Ne pas me rappeler",
         "RatingNotNow": "Pas maintenant",
         "RatingNow": "OK, je vais le noter maintenant",
-        "RatingPleaseRateUs": "L'application Matomo 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",
+        "RatingPleaseRateUs": "L'application Matomo Mobile est un logiciel libre, 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)",
+        "RequestTimedOutShort": "Erreur réseau, délai dépassé",
         "RestrictedCompatibility": "Compatibilité limitée",
-        "RestrictedCompatibilityExplanation": "La version %s de Matomo que vous utilisez n'est pas entièrement supportée par Matomo Mobile 2. Vous pourriez rencontrer des bugs. Nous recommandons que vous mettiez à jour Matomo vers la dernière version ou bien que vous utilisiez Matomo Mobile 1.",
-        "SaveSuccessError": "Veuillez vérifier les paramètres",
+        "RestrictedCompatibilityExplanation": "La version %s de Matomo que vous utilisez n'est pas entièrement supportée par Matomo Mobile 2. Vous pourriez rencontrer des bugs. Nous recommandons de mettre à jour Matomo vers la dernière version ou bien utiliser Matomo Mobile 1.",
+        "SaveSuccessError": "L'URL de Matomo ou la combinaison nom d'utilisateur\/mot de passe est erronée.",
         "SearchWebsite": "Rechercher les sites Internet",
         "ShowAll": "Afficher tout",
         "ShowLess": "Afficher moins",
         "StaticGraph": "Graphique d'aperçu",
         "TopVisitedWebsites": "Les sites les plus visités",
         "TryIt": "Essayez le !",
-        "UseSearchBarHint": "Seuls les %s premiers sites Internet sont affichés ici. Veuillez utiliser la barre de recherche pour accéder aux autres sites Internet.",
+        "UseSearchBarHint": "Seuls les %s premiers sites sont affichés ici. Veuillez utiliser la barre de recherche pour accéder aux autres sites.",
         "VerifyAccount": "Vérification du compte",
         "ValidateSslCertificate": "Valider le certificat SSL",
-        "VerifyLoginData": "Verifier votre nom d'utilisateur et votre mot de passe.",
+        "VerifyLoginData": "Vérifiez votre nom d'utilisateur et votre mot de passe.",
         "YouAreOffline": "Désolé, vous êtes actuellement déconnecté(e)",
         "ExceptionNoViewAccess": "Veuillez vérifier votre nom d'utilisateur et mot de passe et vous assurer que vous avez un accès %s à au moins un des sites web.",
         "Mobile_HowtoExitAndroid": "Veuillez cliquer sur RETOUR une nouvelle fois pour quitter",
         "MatomoMarketplace": "Marché Matomo",
         "EnterAuthCode": "Entrez le code d'authentication",
         "EnterCorrectAuthCode": "Entrez un code d'authentification correct",
-        "EnterAuthCodeExplanation": "Il semblerait que vous utilisez de l'authentification à deux facteurs. Veuillez entrer le code à six chiffres afin de vous connecter à votre compte."
+        "EnterAuthCodeExplanation": "Il semblerait que vous utilisez l'authentification à deux facteurs. Veuillez entrer le code à six chiffres afin de vous connecter à votre compte."
     },
     "RowEvolution": {
         "AvailableMetrics": "Métriques disponibles",
-        "CompareDocumentation": "Cliquez sur le lien ci-dessous et ouvrez ce popup depuis une autre ligne du même tableau pour comparer plusieurs enregistrements.<br \/>Utilisez MAJ-clic pour marquer une ligne pour la comparaison sans ouvrir ce popup.",
+        "CompareDocumentation": "Cliquez sur le lien ci-dessous et ouvrez ce popup pour une autre ligne de la même table pour comparer plusieurs enregistrements. <br \/>Utilisez maj+clic pour marquer la ligne pour la comparaison sans ouvrir ce popup.",
         "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 MAJ-clic pour afficher plusieurs métriques en même temps.",
-        "MetricBetweenText": "entre %1$s et %2$s",
-        "MetricChangeText": "%s au cours de la période",
+        "Documentation": "Cliquez sur les métriques pour les afficher dans le grand graphique d'évolution. Utilisez maj+clic pour afficher plusieurs métriques à la fois.",
+        "MetricBetweenText": "du %1$s au %2$s",
+        "MetricChangeText": "%s changement sur la période",
         "MetricMinMax": "%1$s est compris entre %2$s et %3$s sur la période",
         "MetricsFor": "Métriques pour %s",
         "MultiRowEvolutionTitle": "Évolution de plusieurs lignes",
diff --git a/app/lang/he.json b/app/lang/he.json
index 17d328a07..26146ac3b 100644
--- a/app/lang/he.json
+++ b/app/lang/he.json
@@ -349,7 +349,6 @@
         "Remove": "מחיקה",
         "Report": "לדווח",
         "ReportGeneratedFrom": "דוח זה נוצר על ידי שימוש בנתונים מ-%s",
-        "ReportRatioTooltip": "'%1$s' represents %2$s of %3$s %4$s with %5$s.",
         "Reports": "דוחות",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "העבר דוחות לארכיון כל X שניות לכל היותר",
         "RearchiveTimeIntervalOnlyForTodayReports": "זה רק נוגע לדוחות להים (או כל טווח תאריכים שכולל את היום)",
@@ -394,7 +393,6 @@
         "ToDeleteAllDirectoriesRunThisCommand": "על מנת למחוק את כל התיקיות בבת אחת, ניתן להריץ את הפקודה הבאה:",
         "ToDeleteAllFilesRunThisCommand": "על מנת למחוק את כל הקבצים בבת אחת, ניתן להריץ את הפקודה הבאה:",
         "Total": "סך הכל",
-        "TotalRatioTooltip": "This is %1$s of all %2$s %3$s.",
         "TotalRevenue": "סה\"כ הרווח",
         "TotalVisitsPageviewsActionsRevenue": "(סל הכל: %1$s ביקורים, %2$s צפיות בדפים, %3$s פעולות, %4$s רווח)",
         "TrackingScopeAction": "פעולה",
diff --git a/app/lang/id.json b/app/lang/id.json
index c7c3ed0ff..85b90d28b 100644
--- a/app/lang/id.json
+++ b/app/lang/id.json
@@ -20,6 +20,7 @@
         "AverageOrderValue": "Rerata Nilai Permintaan",
         "AveragePrice": "Harga Rerata",
         "AverageQuantity": "Kuantitas Rerata",
+        "AverageX": "Rata-rata %s",
         "BackToPiwik": "Kembali ke Matomo",
         "Broken": "Rusak",
         "BrokenDownReportDocumentation": "Hal ini dipecah menjadi berbagai laporan, yang ditampilkan dalam bagan garis di bagian bawah halaman. Anda dapat memperbesar grafik dengan mengklik laporan yang ingin Anda lihat.",
@@ -49,6 +50,7 @@
         "ColumnBounceRate": "Tingkat Pentalan",
         "ColumnBounceRateDocumentation": "Persentase kunjungan yang hanya melihat satu halaman. Ini berarti, bahwa pengunjung meninggalkan situs langsung dari halaman awal.",
         "ColumnBounces": "Pentalan",
+        "RealTime": "Waktu-nyata",
         "ColumnBouncesDocumentation": "Jumlah kunjungan yang mulai dan berakhir pada halaman ini. Ini berarti bahwa pengunjung meninggalkan situs setelah melihat hanya halaman ini.",
         "ColumnConversionRate": "Tingkat Tayangan",
         "ColumnConversionRateDocumentation": "Persentase kunjungan yang dipicu tujuan tayangan.",
@@ -60,8 +62,10 @@
         "ColumnExits": "Keluaran",
         "ColumnExitsDocumentation": "Jumlah kunjungan yang berakhir pada halaman ini.",
         "ColumnGenerationTime": "Waktu pembangkitan",
+        "ColumnPageGenerationTime": "Waktu pembangkitan halaman",
         "ColumnKeyword": "Kata Kunci",
         "ColumnLabel": "Label",
+        "ColumnHits": "Hit",
         "ColumnMaxActions": "Tindakan Maksimum tiap kunjungan",
         "ColumnNbActions": "Tindakan",
         "ColumnNbActionsDocumentation": "Jumlah tindakan yang dilakukan oleh pengunjung. Tindakan dapat berupa menampilkan halaman, mengunduh, atau tautan keluar.",
@@ -76,8 +80,8 @@
         "ColumnPageviewsDocumentation": "Berapa kali halaman ini dikunjungi.",
         "ColumnPercentageVisits": "%% Kunjungan",
         "ColumnRevenue": "Pendapatan",
-        "ColumnSumVisitLength": "Jumlah waktu kunjungan tiap pengunjung (dalam detik)",
-        "ColumnTotalPageviews": "Jumlah Halaman Ditampilkan",
+        "ColumnSumVisitLength": "Total waktu kunjungan tiap pengunjung (dalam detik)",
+        "ColumnTotalPageviews": "Total Halaman Ditampilkan",
         "ColumnUniqueEntrances": "Masuk Unik",
         "ColumnUniqueExits": "Keluar Unik",
         "ColumnUniquePageviews": "Tampilan Halaman Unik",
@@ -87,6 +91,23 @@
         "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",
+        "ComputedMetricAverage": "Rata-rata %1$s per %2$s",
+        "ComputedMetricAverageDocumentation": "Nilai rata-rata dari \"%1$s\" per \"%2$s\"",
+        "ComputedMetricAverageShortDocumentation": "Nilai rata-rata dari \"%1$s\"",
+        "ComputedMetricRate": "%s Nilai",
+        "ComputedMetricRateDocumentation": "Rasio dari \"%1$s\" dari semua \"%2$s\".",
+        "ComputedMetricRateShortDocumentation": "Pesentase dari \"%1$s\".",
+        "ComputedMetricCountDocumentation": "Jumlah dari %s",
+        "ComputedMetricSum": "Total %s",
+        "ComputedMetricSumDocumentation": "Total jumlah (hitungan) dari %s",
+        "ComputedMetricMax": "Maks %s",
+        "ComputedMetricMaxDocumentation": "Nilai maksimum untuk %s",
+        "ComputedMetricMin": "Min %s",
+        "ComputedMetricMinDocumentation": "Nilai minimum untuk %s",
+        "ComputedMetricUniqueCount": "Unik %s",
+        "ComputedMetricUniqueCountDocumentation": "Jumlah unik dari %s",
+        "ComputedMetricCountWithValue": "Entri dengan %s",
+        "ComputedMetricCountWithValueDocumentation": "Jumlah entri yang memiliki nilai tetapan untuk %s",
         "ConfigFileIsNotWritable": "Berkas konfigurasi Matomo %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 Matomo",
@@ -156,6 +177,7 @@
         "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: %1$s atau kata kunci lain yang didukung oleh fungsi %2$s (lihat %3$s untuk informasi selengkapnya)",
+        "ExceptionInvalidDateBeforeFirstWebsite": "Tanggal '%1$s' adalah tanggal sebelum situs web pertama daring. Coba tanggal setelah %2$s(cap waktu %3$s).",
         "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.",
@@ -165,12 +187,16 @@
         "ExceptionLanguageFileNotFound": "Berkas bahasa '%s' tak ditemukan.",
         "ExceptionMethodNotFound": "Metode '%1$s' tidak ada atau tak tersedia di modul '%2$s'.",
         "ExceptionMissingFile": "Berkas hilang: %s",
+        "ExceptionUnexpectedFile": "Berkas ditemukan dalam Matomo Anda, tapi kami tidak dapat memahaminya.",
         "ExceptionUnexpectedFilePleaseDelete": "Mohon hapus berkas berikut untuk menghindari kesalahan.",
+        "ExceptionUnexpectedDirectory": "Direktori ditemukan dalam Matomo Anda, tapi kami tidak dapat memahaminya.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "Silakan haus direktori tersebut untuk menghindari kesalahan.",
         "ExceptionFileToDelete": "Berkas akan dihapus: %s",
         "ExceptionDirectoryToDelete": "Direktori untuk hapus: %s",
         "ExceptionNonceMismatch": "Tidak dapat memeriksa kepingan dari borang ini.",
         "ExceptionPrivilege": "Anda tak dapat mengakses sumber daya ini karena membutuhkan akses %s.",
+        "ExceptionPrivilegeAccessWebsite": "Anda tidak dapat mengakses sumber daya ini sebab membutuhkan sebuah akses %s untuk situs web dengan id = %d.",
+        "ExceptionPrivilegeAtLeastOneWebsite": "Anda tidak dapat mengakses sumber daya ini karena membutuhkan setidaknya akses %s untuk satu situs web.",
         "ExceptionUnableToStartSession": "Tak dapat memulai sesi.",
         "ExceptionUndeletableFile": "Tak dapat meghapus %s",
         "ExceptionUnreadableFileDisabledMethod": "Berkas konfigurasi {%1$s} tak dapat dibaca. Inang Anda kemungkungkinan mematikan %2$s.",
@@ -191,26 +217,32 @@
         "ForExampleShort": "misalnya",
         "Forums": "Forum",
         "FromReferrer": "dari",
+        "Generic": "Umum",
         "GeneralInformation": "Informasi Umum",
         "GeneralSettings": "Pengaturan Umum",
         "GetStarted": "Memulai",
         "GiveUsYourFeedback": "Beri UmpanBalik!",
         "Goal": "Tujuan",
         "GoTo": "Menuju %s",
+        "GoTo2": "Pergi ke",
         "GraphHelp": "Informasi lebih lanjut tentang menampilkan grafik di Matomo.",
         "HelloUser": "Halo, %s!",
         "Help": "Bantuan",
+        "HelpResources": "Sumber daya bantuan",
         "HelpTranslatePiwik": "Mungkin Anda berkenan untuk %1$s membantu kami meningkatkan translasi Matomo %2$s?",
         "Hide": "sembunyikan",
         "HoursMinutes": "%1$s jam %2$s menit",
         "Id": "Id",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Dengan anggapan pengarsipan adalah cepat untuk pengaturan Anda, Anda dapat mengatur crontab berjalan lebih sering.",
         "InfoFor": "Informasi untuk %s",
         "Installed": "Terpasang",
         "InvalidDateRange": "Rentang tidak sahih. Silakan ulangi lagi",
         "InvalidResponse": "Data yang diterima tak sahih.",
         "IP": "IP",
         "JsTrackingTag": "Kode Pelacakan JavaScript",
+        "KpiMetric": "Metrik KPI",
         "Language": "Bahasa",
+        "Languages": "Bahasa",
         "LastDays": "%s hari terakhir (termasuk hari ini)",
         "LastDaysShort": "%s hari terakhir",
         "LearnMore": "%1$s pelajari lebih banyak %2$s",
@@ -244,6 +276,7 @@
         "NbSearches": "Jumlah Pencarian Internal",
         "NeedMoreHelp": "Butuh bantuan lebih?",
         "Never": "TakPernah",
+        "New": "Baru",
         "NewReportsWillBeProcessedByCron": "Ketika pengarsipan Matomo tidak dipicu oleh browser, laporan baru akan diproses oleh Crontab.",
         "NewUpdatePiwikX": "Ada pembaruan: Matomo %s",
         "NewVisitor": "Penjunjung Baru",
@@ -291,10 +324,14 @@
         "OverlayRowActionTooltipTitle": "Buka Penghampar Halaman",
         "Overview": "Iktisar",
         "Pages": "Halaman",
+        "Pagination": "%1$s–%2$s dari %3$s",
+        "PaginationWithoutTotal": "%1$s–%2$s",
         "ParameterMustIntegerBetween": "Parameter %1$s harus bilangan bulat antara %2$s dan %3$s.",
         "Password": "Sandi",
         "Period": "Periode",
         "Piechart": "Bagan Lingkaran",
+        "Print": "Cetak",
+        "Profiles": "Profil",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s telah tersedia. Silakan beritahu %2$s administrator Matomo %3$s.",
         "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s tersedia. %2$sSilakan memperbarui sekarang!%3$s (lihat %4$sperubahan%5$s).",
         "PleaseContactYourPiwikAdministrator": "Silakan hubungi administrator Matomo Anda.",
@@ -311,6 +348,7 @@
         "ProductRevenue": "Pendapatan Produk",
         "Measurable": "Terukur",
         "Measurables": "Terukur",
+        "MeasurableId": "ID Terukur",
         "PurchasedProducts": "Pesan Produk",
         "Quantity": "Kuantitas",
         "RangeReports": "Rentang waktu pilihan",
@@ -324,13 +362,13 @@
         "Remove": "Hapus",
         "Report": "Laporan",
         "ReportGeneratedFrom": "Laporan ini telah dibangkitkan menggunakan data dari %s.",
-        "ReportRatioTooltip": "'%1$s' representasi %2$s dari %3$s %4$s dengan %5$s.",
         "Reports": "Laporan",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arsipkan laporan pada setiap X detik",
         "RearchiveTimeIntervalOnlyForTodayReports": "Hal ini mempengaruhi laporan hari ini (atau Rentang Tanggal lainnya termasuk hari ini)",
         "ReportsWillBeProcessedAtMostEveryHour": "Oleh karena itu laporan akan diproses paling setiap jam.",
         "RequestTimedOut": "Data yang diminta %s kehabisan waktu. Silakan coba lagi.",
         "Required": "%s diperlukan",
+        "Required2": "Diperlukan",
         "ReturningVisitor": "Pengunjung Kembali",
         "ReturningVisitorAllVisits": "Tampilkan semua kunjngan",
         "RowEvolutionRowActionTooltip": "Lihat bagaimana metrik untuk untuk perubahan ini berubah sepanjang waktu",
@@ -359,7 +397,7 @@
         "SmtpUsername": "Nama-id SMTP",
         "Source": "Sumber",
         "StatisticsAreNotRecorded": "Pelacakan Kunjungan Matomo saat ini dimatikan! Akftifkan kembali dengan mengarur setting record_statistics = 1 di berkas config\/config.ini.php Anda.",
-        "Subtotal": "Sub-Jumlah",
+        "Subtotal": "Sub-total",
         "Summary": "Ringkasan",
         "Table": "Tabel",
         "TagCloud": "Awan Etiket",
@@ -369,9 +407,9 @@
         "TimeOnPage": "Waktu dalam halaman",
         "ToDeleteAllDirectoriesRunThisCommand": "Untuk menghapus semua direktori dalam sekali, Anda dapat menjalankan perintah berikut:",
         "ToDeleteAllFilesRunThisCommand": "Untuk menghapus semua berkas dalam sekali, Anda dapat menjalankan perintah berikut:",
-        "Total": "Jumlah",
-        "TotalRatioTooltip": "Ini adalah %1$s dari semua %2$s %3$s.",
-        "TotalRevenue": "Jumalh Pendapatan",
+        "Total": "Total",
+        "Totals": "Total",
+        "TotalRevenue": "Total Pendapatan",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s kunjungan, %2$s halaman dilihat, %3$s aksi, %4$s pendapatan)",
         "TrackingScopeAction": "Aksi",
         "TrackingScopePage": "Halaman",
@@ -384,6 +422,7 @@
         "Upload": "Unggah",
         "UsePlusMinusIconsDocumentation": "Gunakan ikon plus dan minus di kiri untuk bernavigasi.",
         "UserId": "ID pengguna",
+        "UserIds": "ID pengguna",
         "Username": "Nama-Id",
         "UseSMTPServerForEmail": "Gunakan peladen SMTP untuk surel",
         "Value": "Nilai",
@@ -391,6 +430,7 @@
         "View": "Tampilan",
         "ViewDocumentationFor": "Lihat dokumentasi untuk %1$s",
         "Visit": "Kunjungan",
+        "VisitId": "ID pengunjung",
         "VisitConvertedGoal": "Kunjungi konversi dengan Sasaran minimal satu",
         "VisitConvertedGoalId": "Kunjungi konversi ID Tujusn tertentu",
         "VisitConvertedNGoals": "Kujungi %s Sasaran konversi",
@@ -398,10 +438,13 @@
         "Visitor": "Pengunjung",
         "VisitorID": "ID pengunjung",
         "VisitorIP": "IP pengujung",
+        "VisitorIPs": "IP pengujung",
         "Visitors": "Pengunjung",
         "VisitsWith": "Kunjungan dengan %s",
+        "VisitorFingerprint": "Sidik jari",
         "VisitorSettings": "Pengaturan Pengunjung",
         "VisitType": "Tipe kunjungan",
+        "VisitTypes": "Tipe kunjungan",
         "VisitTypeExample": "Sebagai contoh, untuk memilih semua pengunjung yang telah kembali ke situs, termasuk yang telah membeli sesuatu saat kunjungan sebelumnya, permintaan API akan mengandung %s",
         "Warning": "Peringatan",
         "Warnings": "Peringatan",
@@ -430,7 +473,13 @@
         "Yes": "Ya",
         "YouAreCurrentlyUsing": "Anda saat ini menggunakan Matomo %s.",
         "YouMustBeLoggedIn": "Anda harus masuk untuk mengakses fungsi ini.",
-        "YourChangesHaveBeenSaved": "Perubahan Anda telah tersimpan."
+        "YourChangesHaveBeenSaved": "Perubahan Anda telah tersimpan.",
+        "ThankYouForUsingMatomo": "Terima kasih telah menggunakan Matomo",
+        "TheMatomoTeam": "Tim Matomo",
+        "ComparisonCardTooltip1": "'%1$s' pada %2$s mengandung %3$s dari semua kunjungan (%4$s dari total %5$s).",
+        "ChangeInX": "Perubahan dalam %1$s",
+        "Comparisons": "Perbandingan",
+        "ClickToRemoveComp": "Klik untuk menghapus perbandingan."
     },
     "Mobile": {
         "AboutPiwikMobile": "Tentang Matomo Mobile",
@@ -503,7 +552,13 @@
         "VerifyAccount": "Memverifikasi Akun",
         "ValidateSslCertificate": "Pengesahan Sertifikat SSL",
         "VerifyLoginData": "Pastikan bahwa nama-id dan sandi Anda sesuai.",
-        "YouAreOffline": "Maaf, Anda sekarang luring"
+        "YouAreOffline": "Maaf, Anda sekarang luring",
+        "ExceptionNoViewAccess": "Mohon periksan nama pengguna dan sandi lewat Anda untuk memastikan Anda memiliki access %s pada satu situs web.",
+        "Mobile_HowtoExitAndroid": "Mohon klik lagi KEMBALI untuk keluar",
+        "MatomoMarketplace": "Lokapasar Matomo",
+        "EnterAuthCode": "Masukkan kode autentikasi",
+        "EnterCorrectAuthCode": "Masukkan kode autentikasi yang benar",
+        "EnterAuthCodeExplanation": "Nampaknya Anda menggunakan autentikasi dua-faktor. Mohon masukkan enam-digit kode untuk masuk ke akun Anda."
     },
     "RowEvolution": {
         "AvailableMetrics": "Metrik yang tersedia",
diff --git a/app/lang/it.json b/app/lang/it.json
index f88c2c7c2..e4a7767ff 100644
--- a/app/lang/it.json
+++ b/app/lang/it.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Maggiori informazioni su come mostrare i grafici in Matomo.",
         "HelloUser": "Ciao, %s!",
         "Help": "Aiuto",
+        "HelpResources": "Risorse per aiuto",
         "HelpTranslatePiwik": "Forse vorresti %1$saiutarci a migliorare le traduzioni di Matomo%2$s?",
         "Hide": "nascondi",
         "HoursMinutes": "%1$s ore %2$s minuti",
@@ -244,6 +245,7 @@
         "InvalidResponse": "I dati ricevuti non sono validi.",
         "IP": "IP",
         "JsTrackingTag": "Codice JavaScript",
+        "KpiMetric": "Metrica KPI",
         "Language": "Lingua",
         "Languages": "Lingue",
         "LastDays": "Ultimi %s giorni (incluso oggi)",
@@ -366,7 +368,6 @@
         "Remove": "Rimuovi",
         "Report": "Report",
         "ReportGeneratedFrom": "Questo report è stato generato utilizzando dati da %s.",
-        "ReportRatioTooltip": "'%1$s' rappresenta %2$s di %3$s %4$s con %5$s.",
         "Reports": "Report",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archivia i report al massimo ogni X secondi",
         "RearchiveTimeIntervalOnlyForTodayReports": "Questo influisce solo sui report per oggi (o per ogni intervallo di date che comprenda oggi)",
@@ -414,7 +415,6 @@
         "ToDeleteAllFilesRunThisCommand": "Per eliminare tutti questi file in una volta, puoi eseguire questo comando:",
         "Total": "Totale",
         "Totals": "Totali",
-        "TotalRatioTooltip": "Questo è %1$s di tuttti i %2$s %3$s.",
         "TotalRevenue": "Totale guadagni",
         "TotalVisitsPageviewsActionsRevenue": "(Totale: %1$s visite, %2$s pagine viste, %3$s azioni, %4$s entrate)",
         "TrackingScopeAction": "Azione",
@@ -493,7 +493,8 @@
         "YouMustBeLoggedIn": "Devi essere loggato per accedere a questa funzionalità.",
         "YourChangesHaveBeenSaved": "Le impostazioni sono state salvate.",
         "ThankYouForUsingMatomo": "Grazie per l'utilizzo di Matomo",
-        "TheMatomoTeam": "Il Team di Matomo"
+        "TheMatomoTeam": "Il Team di Matomo",
+        "PleaseTryAgain": "Prova di nuovo"
     },
     "Mobile": {
         "AboutPiwikMobile": "Informazioni su Matomo Mobile",
@@ -568,7 +569,11 @@
         "VerifyLoginData": "Verifica username e password.",
         "YouAreOffline": "Spiacente, sei al momento offline",
         "ExceptionNoViewAccess": "Si prega di controllare user name e password e di assicurarsi di avere accesso %s almeno a un sito.",
-        "Mobile_HowtoExitAndroid": "Clicca ancora su INDIETRO per uscire"
+        "Mobile_HowtoExitAndroid": "Clicca ancora su INDIETRO per uscire",
+        "MatomoMarketplace": "Marketplace di Matomo",
+        "EnterAuthCode": "Inserisci codice di autenticazione",
+        "EnterCorrectAuthCode": "Inserisci il codice di autenticazione corretto",
+        "EnterAuthCodeExplanation": "Sembra che tu stia utilizzando l'autenticazione a due fattori. Inserisci il codice a sei cifre per accedere al tuo account."
     },
     "RowEvolution": {
         "AvailableMetrics": "Metriche disponibili",
diff --git a/app/lang/ja.json b/app/lang/ja.json
index 17e90e1e1..73e215f02 100644
--- a/app/lang/ja.json
+++ b/app/lang/ja.json
@@ -36,7 +36,7 @@
         "Close": "閉じる",
         "ClickToSearch": "クリックして検索",
         "Copy": "コピー",
-        "Confirm": "確認",
+        "Confirm": "確認する",
         "ColumnActionsPerVisit": "ビジット単位のアクション数",
         "ColumnActionsPerVisitDocumentation": "訪問中に実行された平均アクション数（ページビュー、ダウンロード、外部リンク）",
         "ColumnAverageGenerationTime": "平均生成時間",
@@ -120,7 +120,7 @@
         "DailyReport": "毎日",
         "DailyReports": "日次レポート",
         "DailySum": "日計",
-        "DashboardForASpecificWebsite": "特定ウェブサイトのダッシュボード",
+        "DashboardForASpecificWebsite": "特定のWebサイト用のダッシュボード",
         "DataForThisGraphHasBeenPurged": "このグラフのデータは、%s ヶ月以上前のもので、パージされました。",
         "DataForThisTagCloudHasBeenPurged": "このタグクラウドのデータは、%s ヶ月以上経過しているためパージされました。",
         "Date": "日付",
@@ -366,7 +366,6 @@
         "Remove": "削除",
         "Report": "レポート",
         "ReportGeneratedFrom": "このレポートは、%s のデータを使用して生成しました。",
-        "ReportRatioTooltip": "'%1$s'は %3$s%4$s の %2$s を %5$s で表しています。",
         "Reports": "レポート",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "約 X 秒ごとにレポートをアーカイブする",
         "RearchiveTimeIntervalOnlyForTodayReports": "これは今日 ( あるいは今日を含む日付範囲 ) のレポートにのみ影響します。",
@@ -414,7 +413,6 @@
         "ToDeleteAllFilesRunThisCommand": "一度にこれらのファイルをすべて削除するには、次のコマンドを実行します。",
         "Total": "合計",
         "Totals": "合計",
-        "TotalRatioTooltip": "これは、全ての %2$s %3$s の %1$sです。",
         "TotalRevenue": "総収益",
         "TotalVisitsPageviewsActionsRevenue": "( 合計 : %1$s ビジット、%2$s ページビュー 、 %3$s アクション、%4$s 利益 )",
         "TrackingScopeAction": "アクション",
@@ -456,7 +454,7 @@
         "Warnings": "警告",
         "WarningPhpVersionXIsTooOld": "ご利用の PHP バージョン %s は、サポート期間が終了( EOL )しています。セキュリティの脆弱性と、最新の PHP バージョンで既に修正されたバグに対するリスクを避けるため、必ず最新バージョンへアップグレードしてください。",
         "WarningPiwikWillStopSupportingPHPVersion": "Matomo は、次のメジャーバージョンで PHP %1$s のサポートを停止します。手遅れになる前に PHP を少なくとも PHP %2$s にアップグレードしてください！",
-        "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Matomo を最新版にアップデートするには、PHP バージョンをアップグレードする必要があります。",
+        "YouMustUpgradePhpVersionToReceiveLatestPiwik": "最新のMatomoアップデートを入手するには、PHPバージョンをアップグレードする必要があります。",
         "PiwikCannotBeUpgradedBecausePhpIsTooOld": "PHP バージョンが古すぎるため、Matomo は最新のメジャーバージョンにアップグレードすることができません。",
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Matomo の解析データが安全な状態に保たれるように、PHP バージョンを少なくとも PHP %s にアップグレードしてください。",
         "ValidatorErrorEmptyValue": "値を入力してください。",
@@ -492,8 +490,9 @@
         "YouAreViewingDemoMessage": "現在、%1$s Matomo %2$s のデモを表示しています",
         "YouMustBeLoggedIn": "この機能にアクセスするにはログインする必要があります。",
         "YourChangesHaveBeenSaved": "変更内容が保存されました。",
-        "ThankYouForUsingMatomo": "Matomo のご利用ありがとうございます",
-        "TheMatomoTeam": "Matomo チーム"
+        "ThankYouForUsingMatomo": "Matomoをご利用いただきありがとうございます",
+        "TheMatomoTeam": "Matomo チーム",
+        "PleaseTryAgain": "やり直してください。"
     },
     "Mobile": {
         "AboutPiwikMobile": "Matomo モバイルについて",
@@ -507,7 +506,7 @@
         "AnonymousTracking": "匿名トラッキング",
         "AskForAnonymousTrackingPermission": "有効にすると、匿名の利用データが Matomo モバイルから matomo.org に送信されます。Matomo モバイル開発者が、アプリケーションが実際にどのように利用されているかを理解するヒントになるためです。送信される情報は、クリックされたメニューと設定、OS 名と OS バージョン、Matomo モバイルに表示された様々なエラーです。ただし、Matomo チームが、あなたの分析データを追跡することはありません。また匿名データが一般に公開されることはありません。また匿名トラッキングの有効 \/ 無効化はいつでも設定可能です。",
         "ChooseHttpTimeout": "HTTP タイムアウトの値を選択してください。",
-        "ChooseMetric": "メトリクスを選んでください",
+        "ChooseMetric": "メトリクスを選択してください",
         "ChooseReport": "レポートを選択",
         "ChooseSegment": "セグメントを選択",
         "ConfirmRemoveAccount": "このアカウントを削除しますか?",
@@ -522,13 +521,13 @@
         "HttpIsNotSecureWarning": "あなたの Matomo 認証トークン( token_auth ) は、' HTTP ' を使用するとクリアテキストで送信されます。このため、インターネット経由でデータを安全に転送するためにHTTPS を推奨します。続行しますか？",
         "HttpTimeout": "HTTP タイムアウト",
         "IncompatiblePiwikVersion": "お使いの Matomo バージョンは、Matomo モバイル 2 と互換性がありません。Matomo インストールをアップデートし再度お試し頂くか、Matomo モバイル 1 をインストールしてください。",
-        "LastUpdated": "最新アップデート: %s",
+        "LastUpdated": "最終更新: %s",
         "LoadingReport": "%s ロード中",
         "LoginCredentials": "資格情報",
         "LoginToPiwikToChangeSettings": "Matomo サーバーにログインして、Web サイト、ユーザーを作成および更新するか、' デフォルトでロードするようにレポートする ' のような一般設定を変更します。",
-        "LoginUseHttps": "https を使用する",
+        "LoginUseHttps": "https を使用",
         "MatomoMobile": "Matomo モバイルアプリ",
-        "MultiChartLabel": "スパークラインの表示",
+        "MultiChartLabel": "スパークラインを表示",
         "NavigationBack": "戻る",
         "NetworkError": "ネットワークエラー",
         "NetworkErrorWithStatusCode": "エラー \"%1$s\" があります。リクエストはステータス \"%2$s\" を返しました。URL は \"%3$s\" でした。このエラーの詳細と、解決方法については、入力した URL とこのサーバーのエラーログを確認してください。",
@@ -536,9 +535,9 @@
         "NetworkNotReachable": "ネットワークに到達できませんでした",
         "NoAccountIsSelected": "アカウントを選ぶ必要があります。まだ設定が完了していない場合、新しいアカウントを追加してください。",
         "NoDataShort": "データなし",
-        "NoPiwikAccount": "Matomo アカウントをお持ちではないですか?",
+        "NoPiwikAccount": "Matomo アカウントがありませんか？",
         "NoReportsShort": "レポートなし",
-        "NoVisitorFound": "ビジターが見つかりません",
+        "NoVisitorFound": "ビジターが見つかりませんでした",
         "NoVisitorsShort": "ビジターはいません",
         "NoWebsiteFound": "ウェブサイトが見つかりません。",
         "NoWebsitesShort": "ウェブサイトなし",
@@ -564,7 +563,7 @@
         "TryIt": "試してみる !",
         "UseSearchBarHint": "ここでは最初の %s ウェブサイトのみ表示されています。他のウェブサイトにアクセスするには、検索バーをご利用ください。",
         "VerifyAccount": "アカウントを確認",
-        "ValidateSslCertificate": "SSL 証明の確認",
+        "ValidateSslCertificate": "SSL 証明を確認する",
         "VerifyLoginData": "ユーザー名とパスワードの組み合わせが正しいことを確認してください。",
         "YouAreOffline": "申し訳ありません、現在オフラインです",
         "ExceptionNoViewAccess": "ユーザー名とパスワードを確認し、少なくとも 1 つの Web サイトに対して %s のアクセス権があることを確認してください。",
diff --git a/app/lang/ko.json b/app/lang/ko.json
index 320c5fe6a..0e5140685 100644
--- a/app/lang/ko.json
+++ b/app/lang/ko.json
@@ -20,6 +20,7 @@
         "AverageOrderValue": "평균 주문액",
         "AveragePrice": "평균 가격",
         "AverageQuantity": "평균 수량",
+        "AverageX": "평균 %s",
         "BackToPiwik": "Matomo으로 돌아가기",
         "Broken": "깨짐",
         "BrokenDownReportDocumentation": "이것은 페이지 하단에 작게 표시되어있는 다양한 보고서로 나뉘어 있습니다. 보고 싶은 보고서를 클릭하여 그래프를 확대할 수 있습니다.",
@@ -34,6 +35,8 @@
         "DoubleClickToChangePeriod": "이 기간을 적용하기 위해 더블클릭하세요.",
         "Close": "닫기",
         "ClickToSearch": "검색하기 위해서 클릭해주세요.",
+        "Copy": "복사",
+        "Confirm": "확인",
         "ColumnActionsPerVisit": "방문 당 활동 수",
         "ColumnActionsPerVisitDocumentation": "방문하는 동안 실행된 평균 작업 수 (페이지 뷰, 다운로드, 외부 링크)",
         "ColumnAverageGenerationTime": "평균 페이지 생성 시간",
@@ -41,10 +44,12 @@
         "ColumnAverageTimeOnPage": "페이지에 머문 시간 평균",
         "ColumnAverageTimeOnPageDocumentation": "이 페이지를 방문한 방문자의 머문 시간의 평균 (페이지만 해당, 전체 웹사이트 아님).",
         "ColumnAvgTimeOnSite": "웹사이트 평균 시간",
+        "ColumnSumTimeOnSite": "웹사이트에서의 총 시간",
         "ColumnAvgTimeOnSiteDocumentation": "평균 머문 시간입니다.",
         "ColumnBounceRate": "반송률",
         "ColumnBounceRateDocumentation": "한 페이지의 페이지 뷰 비율. 이것은 방문자가 첫 페이지에서 바로 이탈한 것을 의미합니다.",
         "ColumnBounces": "반송",
+        "RealTime": "실시간",
         "ColumnBouncesDocumentation": "이 페이지에서 검색을 시작하고 종료한 방문수입니다. 이것은 방문자가 이 페이지만 보고 이탈한 것을 의미합니다.",
         "ColumnConversionRate": "전환율",
         "ColumnConversionRateDocumentation": "목표를 달성한 방문 비율입니다.",
@@ -82,6 +87,9 @@
         "ColumnViewedAfterSearchDocumentation": "이미 진입한 방문자가 웹사이트내에서 검색한 결과로부터 이 페이지를 클릭한 횟수입니다.",
         "ColumnVisitDuration": "머문 시간 (초)",
         "ColumnVisitsWithConversions": "전환을 통한 방문 수",
+        "ComputedMetricSum": "총 %s",
+        "ComputedMetricMax": "최대 %s",
+        "ComputedMetricMin": "최소 %s",
         "ConfigFileIsNotWritable": "Matomo 설정 파일 %1$s를 쓸수 없기 때문에 일부 변경이 저장되지 않을 수 있습니다. %2$s 설정 파일의 권한을 쓸 수 있게 변경하세요.",
         "Continue": "계속",
         "ContinueToPiwik": "Matomo 계속 하기",
@@ -138,6 +146,7 @@
         "EvolutionSummaryGeneric": "%2$s의 %1$s와 %4$s의 %3$s 비교. 변화 추이: %5$s",
         "ExceptionContactSupportGeneric": "만약 해당 문제가 계속 발생한다면 %1$sMatomo 관리자에게 연락하여 도움%2$s을 구하세요.",
         "ExceptionConfigurationFileNotFound": "설정파일 {%s}을 찾을 수 없습니다.",
+        "ExceptionConfigurationFileExistsButNotReadable": "설정파일인 %s이 존재 하는것이 확인되었지만 Matomo가 읽는데 실패했습니다.",
         "ExceptionDatabaseVersion": "현재 %1$s 버전 %2$s 이지만 Matomo에는 적어도 %3$s가 필요합니다.",
         "ExceptionFileIntegrity": "무결성 검사 실패: %s",
         "ExceptionFilesizeMismatch": "파일 크기 불일치: %1$s (예상 크기: %2$s, 실제 크기: %3$s)",
@@ -154,6 +163,8 @@
         "ExceptionLanguageFileNotFound": "'%s' 언어 파일을 찾을 수 없습니다",
         "ExceptionMethodNotFound": "메서드 '%1$s'는 존재하지 않거나 모듈 '%2$s'에서 사용할 수 없습니다.",
         "ExceptionMissingFile": "누락된 파일: %s",
+        "ExceptionUnexpectedFile": "예상치 못한 파일이 당신의 Matomo에서 발견되었습니다.",
+        "ExceptionUnexpectedFilePleaseDelete": "에러를 방지하기위해 이 파일들을 지워주세요.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "오류 방지를 위해 이들 폴더를 삭제해주세요.",
         "ExceptionFileToDelete": "삭제할 파일: %s",
         "ExceptionDirectoryToDelete": "삭제할 디렉토리: %s",
@@ -169,7 +180,9 @@
         "ExportAsImage": "이미지로 내보내기",
         "ExportThisReport": "다른 형식으로 데이터셋 내보내기",
         "Faq": "FAQ",
+        "FileIntegrityWarningReuploadBis": "바이너리 모드에서 모든 Matomo파일를 재업로드해 보세요.",
         "First": "처음",
+        "ForcedSSL": "강제된 SSL 연결",
         "ForExampleShort": "예:",
         "Forums": "포럼",
         "FromReferrer": "소스",
@@ -260,12 +273,16 @@
         "OverlayRowActionTooltipTitle": "페이지 중첩 열기",
         "Overview": "개요",
         "Pages": "페이지",
+        "PaginationWithoutTotal": "%1$s–%2$s",
         "ParameterMustIntegerBetween": "%1$s 매개변수는 %2$s에서 %3$s까지의 정수로 값을 지정하세요.",
         "Password": "비밀번호",
         "Period": "기간",
         "Piechart": "파이차트",
+        "Print": "프린트",
+        "Profiles": "프로필",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s가 가능합니다. %2$sMatomo 관리자%3$s에게 알려주세요.",
         "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s 이 사용 가능합니다. %2$s 지금 업데이트하세요!%3$s (보기: %4$s 변경사항%5$s).",
+        "PleaseContactYourPiwikAdministrator": "Matomo 관리자에 연락해주세요.",
         "PleaseSpecifyValue": "'%s'의 값을 지정하세요.",
         "PleaseUpdatePiwik": "Matomo을 업데이트하세요",
         "Plugin": "플러그인",
@@ -292,7 +309,6 @@
         "Remove": "제거",
         "Report": "보고서",
         "ReportGeneratedFrom": "이 보고서는 %s의 데이터를 사용하여 생성되었습니다.",
-        "ReportRatioTooltip": "'%1$s'은 %5$s에서 %4$s %3$s번으로 %2$s에 해당한다.",
         "Reports": "보고서",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "보고서 아카이브를 몇 초에 한 번씩 수행",
         "RearchiveTimeIntervalOnlyForTodayReports": "이것은 오늘의 보고서(혹은 오늘이 포함된 기간)에만 영향을 줍니다.",
@@ -375,6 +391,9 @@
         "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Matomo 최신 업데이트를 받기 위해서는 PHP 버전을 업그레이드 하셔야 합니다.",
         "PiwikCannotBeUpgradedBecausePhpIsTooOld": "PHP 버전이 오래되어 Matomo는 최신 메이저 버전으로 업그레이드를 할 수 없습니다.",
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Matomo 분석 데이터를 안전하게 보관하기 위해서 PHP 버전을 최소 PHP %s이상으로 업그레이드 해주세요.",
+        "ValidatorErrorNotUrlLike": "\"%s\"는 올바른 URL형식이 아닙니다.",
+        "ValidatorErrorNotEmailLike": "\"%s\"는 유효한 이메일 형식이 아닙니다.",
+        "ValidatorErrorNoValidRegex": "\"%s\"는 유효한 정규 표현식이 아닙니다.",
         "WarningFileIntegrityNoManifest": "manifest.inc.php가 없기 때문에, 파일의 무결성 검사를 수행할 수 없습니다.",
         "WarningFileIntegrityNoManifestDeployingFromGit": "만약 Git으로부터 Matomo를 사용하고 있다면, 이 메세지는 정상입니다.",
         "WarningFileIntegrityNoMd5file": "md5_file() 함수가 존재하지 않기 때문에, 파일 무결성 검사를 완료할 수 없습니다.",
@@ -392,7 +411,10 @@
         "Yes": "예",
         "YouAreCurrentlyUsing": "현재 Matomo %s를 이용하고 있습니다.",
         "YouMustBeLoggedIn": "이 기능에 접근하려면 로그인해야합니다.",
-        "YourChangesHaveBeenSaved": "변경 사항이 저장되었습니다."
+        "YourChangesHaveBeenSaved": "변경 사항이 저장되었습니다.",
+        "ThankYouForUsingMatomo": "Matomo를 사용해 주셔서 감사합니다.",
+        "TheMatomoTeam": "Matomo 팀",
+        "PleaseTryAgain": "다시 시도해 주세요."
     },
     "Mobile": {
         "AboutPiwikMobile": "About Matomo 모바일",
@@ -425,6 +447,7 @@
         "LoadingReport": "%s 로딩중",
         "LoginCredentials": "자격",
         "LoginUseHttps": "HTTPS 사용",
+        "MatomoMobile": "Matomo 모바일 어플리케이션",
         "MultiChartLabel": "스파크라인 표시",
         "NavigationBack": "뒤로",
         "NetworkError": "네트워크 에러",
@@ -460,7 +483,12 @@
         "VerifyAccount": "계정 확인",
         "ValidateSslCertificate": "SSL 증서 확인",
         "VerifyLoginData": "사용자 이름과 비밀번호 조합이 올바른지 확인하세요.",
-        "YouAreOffline": "현재 오프라인 상태"
+        "YouAreOffline": "현재 오프라인 상태",
+        "Mobile_HowtoExitAndroid": "나가기위해 다시한번 뒤로가기 버튼을 눌러주세요.",
+        "MatomoMarketplace": "Matomo 마켓플레이스",
+        "EnterAuthCode": "인증코드를 입력하세요.",
+        "EnterCorrectAuthCode": "올바른 인증코드를 입력하세요.",
+        "EnterAuthCodeExplanation": "이단계 인증을 사용하시는 것 처럼 보입니다. 계정에 로그인 하기 위해 6자리 숫자코드를 입력해 주세요."
     },
     "RowEvolution": {
         "AvailableMetrics": "사용가능한 통계",
diff --git a/app/lang/nb.json b/app/lang/nb.json
index 714793b98..23bdbb546 100644
--- a/app/lang/nb.json
+++ b/app/lang/nb.json
@@ -330,7 +330,6 @@
         "Remove": "Fjern",
         "Report": "Rapport",
         "ReportGeneratedFrom": "Denne rapporten ble generert ved hjelp av data fra %s.",
-        "ReportRatioTooltip": "«%1$s» representerer %2$s av %3$s %4$s med %5$s.",
         "Reports": "Rapporter",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arkiver rapporter som mest hvert X sekund",
         "RearchiveTimeIntervalOnlyForTodayReports": "Dette påvirker kun rapporter for i dag (eller andre datointervaller som inkluderer i dag)",
@@ -374,7 +373,6 @@
         "TimeFormat": "Tidsformat",
         "TimeOnPage": "Tid på side",
         "Total": "Totalt",
-        "TotalRatioTooltip": "Dette er %1$s av alle %2$s %3$s.",
         "TotalRevenue": "Totale inntekter",
         "TotalVisitsPageviewsActionsRevenue": "(Totalt: %1$s besøk, %2$s sidevisninger, %3$s handlinger, %4$s inntekter)",
         "TrackingScopeAction": "Handling",
diff --git a/app/lang/nl.json b/app/lang/nl.json
index 8d269771d..a5ec2d636 100644
--- a/app/lang/nl.json
+++ b/app/lang/nl.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Meer informatie over het tonen van grafieken in Matomo.",
         "HelloUser": "Hallo, %s!",
         "Help": "Help",
+        "HelpResources": "Hulpbronnen",
         "HelpTranslatePiwik": "Misschien wilt u ons %1$shelpen met het verbeteren van de Matomo-vertalingen%2$s?",
         "Hide": "verbergen",
         "HoursMinutes": "%1$s uren %2$s minuten",
@@ -244,6 +245,7 @@
         "InvalidResponse": "De ontvangen gegevens zijn ongeldig.",
         "IP": "IP",
         "JsTrackingTag": "Javascript Tracking Code",
+        "KpiMetric": "KPI Waarde",
         "Language": "Taal",
         "Languages": "Talen",
         "LastDays": "Laatste %s dagen (inclusief vandaag)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 bezoek",
         "OnlyEnterIfRequired": "Vul alleen een gebruikersnaam in als uw SMTP server het vereist.",
         "OnlyEnterIfRequiredPassword": "Vul alleen een wachtwoord in als uw SMTP server het vereist.",
+        "SmtpFromEmailHelp": "De standaardwaarde is noreply@{DOMAIN}, waar {DOMAIN} wordt vervangen door het Matomo domein \"%1$s\". <br>Als het verzenden van e-mails niet werkt, moet dit adres mogelijk ingesteld worden op uw SMTP-gebruikersnaam.",
+        "NameShownInTheSenderColumn": "De naam wordt getoond in de verzender kolom",
         "OnlyUsedIfUserPwdIsSet": "Alleen gebruikt als een gebruikersnaam\/wachtwoord is ingesteld. Vraag na bij uw provider als u niet weet welke methode te gebruiken.",
         "OpenSourceWebAnalytics": "Open Source Web Analytics platform",
         "OperationAtLeast": "Ten minste",
@@ -366,7 +370,7 @@
         "Remove": "Verwijderen",
         "Report": "Rapport",
         "ReportGeneratedFrom": "Dit rapport was gegenereerd met gegevens van %s.",
-        "ReportRatioTooltip": "'%1$s' representeert %2$s van %3$s %4$s met %5$s.",
+        "ReportRatioTooltip": "'%1$s' representeert %2$s van %3$s %4$s in segment %5$s met%6$s.",
         "Reports": "Rapporten",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archiveer rapporten maximaal elke x seconden",
         "RearchiveTimeIntervalOnlyForTodayReports": "Dit beïnvloedt enkel rapporten voor vandaag (of elk ander datumbereik die vandaag bevat)",
@@ -400,6 +404,8 @@
         "SmtpPort": "SMTP-poort",
         "SmtpServerAddress": "SMTP-serveradres",
         "SmtpUsername": "SMTP-gebruikersnaam",
+        "SmtpFromName": "SMTP van naam",
+        "SmtpFromAddress": "SMTP van adres",
         "Source": "Bron",
         "StatisticsAreNotRecorded": "Matomo Bezoeker Tracking is momenteel uitgeschakeld! Schakel tracking opnieuw in door record_statistics = 1 in je config\/config.ini.php bestand aan te passen.",
         "Subtotal": "Subtotaal",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Om al deze bestanden in een keer te verwijderen, kunt u dit commando uitvoeren:",
         "Total": "Totaal",
         "Totals": "Totalen",
-        "TotalRatioTooltip": "Dit is %1$s van alle %2$s %3$s.",
+        "TotalRatioTooltip": "Dit is %1$s van alle %2$s %3$s in %4$s.",
         "TotalRevenue": "Totale inkomsten",
         "TotalVisitsPageviewsActionsRevenue": "(Totaal: %1$s bezoeken, %2$s paginaweergaven, %3$s acties, %4$s inkomsten)",
         "TrackingScopeAction": "Actie",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "U bekijkt de demo van %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "U moet ingelogd zijn om deze functionaliteit te gebruiken.",
         "YourChangesHaveBeenSaved": "Uw wijzigingen zijn opgeslagen.",
+        "YourSessionHasExpired": "Je sessie is verlopen vanwege inactiviteit. Log in om door te gaan.",
         "ThankYouForUsingMatomo": "Bedankt voor het gebruiken van Matomo",
-        "TheMatomoTeam": "Het Matomo team"
+        "TheMatomoTeam": "Het Matomo team",
+        "PleaseTryAgain": "Probeer nogmaals",
+        "ComparisonRatioTooltip": "Dit is een %1$s wijziging vergeleken met '%2$s' segment op%3$s.",
+        "ComparisonCardTooltip1": "'%1$s' op %2$s bevat%3$s van alle bezoeken (%4$s van het %5$s totaal).",
+        "ComparisonCardTooltip2": "Het aantal bezoeken verschilt per %1$svergeleken met %2$sover %3$s.",
+        "VisualizationDoesNotSupportComparison": "Deze visualisatie ondersteunt geen segment \/ periode vergelijking.",
+        "ChangeInX": "Wijzig in %1$s",
+        "Comparisons": "Vergelijkingen",
+        "ClickToRemoveComp": "Klik om deze vergelijking te verwijderen.",
+        "MaximumNumberOfSegmentsComparedIs": "Het maximum aantal segmenten dat te gelijk vergeleken kan worden is %s.",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s lengte van de query parameter moet overeenkomen %2$s lengte van de query parameter.",
+        "MaximumNumberOfPeriodsComparedIs": "Het maximum aantal perioden dat te gelijk vergeleken kan worden is %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Over Matomo Mobile",
@@ -568,7 +586,11 @@
         "VerifyLoginData": "Zorg ervoor dat uw gebruikersnaam- en wachtwoordcombinatie juist zijn.",
         "YouAreOffline": "Sorry, u bent momenteel offline.",
         "ExceptionNoViewAccess": "Controleer gebruikersnaam en wachtwoord. Wees er zeker van dat je op ten minste één website de volgende rechten hebt: %s",
-        "Mobile_HowtoExitAndroid": "Klik nogmaals op de terugtoets om het programma te beëindigen"
+        "Mobile_HowtoExitAndroid": "Klik nogmaals op de terugtoets om het programma te beëindigen",
+        "MatomoMarketplace": "Matomo Markplaats",
+        "EnterAuthCode": "Voer authenticatiecode in",
+        "EnterCorrectAuthCode": "Voer correcte authenticatiecode in",
+        "EnterAuthCodeExplanation": "Het lijkt erop dat je 2 factor authenticatie gebruikt. Voer de 6 cijferige code in om op je account in te loggen."
     },
     "RowEvolution": {
         "AvailableMetrics": "Beschikbare statistieken",
diff --git a/app/lang/pl.json b/app/lang/pl.json
index 4249c07f0..39078948c 100644
--- a/app/lang/pl.json
+++ b/app/lang/pl.json
@@ -110,7 +110,7 @@
         "ComputedMetricCountWithValueDocumentation": "Liczba wejść z ustawioną wartością dla %s",
         "ConfigFileIsNotWritable": "Plik konfiguracyjny Matomo %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 Matomo",
+        "ContinueToPiwik": "Przejdź do Matomo",
         "CurrentlyUsingUnsecureHttp": "Aktualnie używasz Matomo przez niezabezpieczony protokół HTTP. Zalecamy wykorzystanie SSL (HTTPS) aby poprawić bezpieczeństwo.",
         "CreatedByUser": "utworzony przez %s",
         "CurrentMonth": "bieżący miesiąc",
@@ -187,7 +187,9 @@
         "ExceptionLanguageFileNotFound": "Plik obsługi języka '%s' nie został odnaleziony.",
         "ExceptionMethodNotFound": "Metoda '%1$s' nie istnieje lub nie jest osiągalna w module '%2$s'.",
         "ExceptionMissingFile": "Brak pliku: %s",
+        "ExceptionUnexpectedFile": "W Twoim Matomo znaleźliśmy pliki, których się nie spodziewaliśmy.",
         "ExceptionUnexpectedFilePleaseDelete": "Usuń te pliki, aby uniknąć błędów.",
+        "ExceptionUnexpectedDirectory": "W Twoim Matomo znaleźliśmy katalogi , których się nie spodziewaliśmy.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "W celu uniknięcia błędów, proszę usuń wskazane katalogi.",
         "ExceptionFileToDelete": "Plik do usunięcia: %s",
         "ExceptionDirectoryToDelete": "Katalog do usunięcia: %s",
@@ -235,6 +237,7 @@
         "Hide": "ukryj",
         "HoursMinutes": "%1$s godzin %2$s min",
         "Id": "Nr",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Zakładając, że archiwizacja w Twojej konfiguracji przebiega szybko, warto ją dodać do crontab'a, aby wykonywać ją częściej.",
         "InfoFor": "Informacja dla %s",
         "Installed": "Zainstalowany",
         "InvalidDateRange": "Błędny zakres dat, wybierz ponownie",
@@ -324,6 +327,8 @@
         "OverlayRowActionTooltipTitle": "Nakładka Otwarta Strona",
         "Overview": "Przegląd",
         "Pages": "Strony",
+        "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",
@@ -361,7 +366,6 @@
         "Remove": "Usuń",
         "Report": "Raport",
         "ReportGeneratedFrom": "Ten raport został wygenerowany na podstawie danych z %s.",
-        "ReportRatioTooltip": "%1$s \"reprezentuje%2$s z%3$s%4$s z%5$s.",
         "Reports": "Raporty",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archiwizuj raporty nie rzadziej niż co X sekund",
         "RearchiveTimeIntervalOnlyForTodayReports": "To dotyczy tylko dzisiejszych raportów (lub dowolnego innego Zakresu Dat włączając dziś)",
@@ -409,7 +413,6 @@
         "ToDeleteAllFilesRunThisCommand": "Aby usunąć wszystkie te pliki na raz, wywołaj to polecenie:",
         "Total": "Ogólnie",
         "Totals": "Suma",
-        "TotalRatioTooltip": "To jest %1$s wszystkich %2$s %3$s.",
         "TotalRevenue": "Dochód razem",
         "TotalVisitsPageviewsActionsRevenue": "(Razem: %1$s odwiedzin, %2$s wyświetleń strony, %3$s akcji, %4$s dochód)",
         "TrackingScopeAction": "Akcja",
@@ -442,6 +445,7 @@
         "VisitorIPs": "IP odwiedzającego",
         "Visitors": "Oglądający",
         "VisitsWith": "Odwiedzin z %s",
+        "VisitorFingerprint": "Odcisk palca",
         "VisitorSettings": "Konfiguracje użytkownika",
         "VisitType": "Typ wizyty",
         "VisitTypes": "Typy odwiedzin",
@@ -485,7 +489,10 @@
         "YouAreCurrentlyUsing": "Aktualnie używasz Matomo %s.",
         "YouAreViewingDemoMessage": "Oglądasz demo %1$s Matomo'a %2$s",
         "YouMustBeLoggedIn": "Musisz się zalogować, by uzyskać dostęp do tej funkcjonalności.",
-        "YourChangesHaveBeenSaved": "Twoje modyfikacje zostały zapisane pomyślnie."
+        "YourChangesHaveBeenSaved": "Twoje modyfikacje zostały zapisane pomyślnie.",
+        "ThankYouForUsingMatomo": "Dziękujemy, że korzystasz z Matomo",
+        "TheMatomoTeam": "Zespół Matomo",
+        "PleaseTryAgain": "Proszę spróbuj ponownie"
     },
     "Mobile": {
         "AboutPiwikMobile": "O Matomo Mobile",
@@ -493,7 +500,7 @@
         "Account": "Konto",
         "Accounts": "Konta",
         "AddAccount": "Dodaj konto",
-        "AddPiwikDemo": "Dodaj Matomo Demo",
+        "AddPiwikDemo": "Dodaj Demo Matomo",
         "Advanced": "Zaawansowane",
         "AnonymousAccess": "Dostęp anonimowy",
         "AnonymousTracking": "Anonimowe śledzenie",
@@ -558,7 +565,13 @@
         "VerifyAccount": "Weryfikowanie Konta",
         "ValidateSslCertificate": "Zweryfikuj certyfikat SSL",
         "VerifyLoginData": "Upewnij się, że Twój login i hasło są poprawne.",
-        "YouAreOffline": "Przepraszamy, obecnie jesteś odłączony"
+        "YouAreOffline": "Przepraszamy, obecnie jesteś odłączony",
+        "ExceptionNoViewAccess": "Sprawdź nazwę użytkownika i hasło i upewnij się, że masz dostęp %s do przynajmniej jednego serwisu.",
+        "Mobile_HowtoExitAndroid": "Kliknij ponownie COFNIJ, aby wyjść",
+        "MatomoMarketplace": "Sklep Matomo",
+        "EnterAuthCode": "Wprowadź kod autentykujący",
+        "EnterCorrectAuthCode": "Wprowadź poprawny kod autentykujący",
+        "EnterAuthCodeExplanation": "Wygląda na to, że używasz uwierzytelniania 2 składnikowego. Proszę wprowadź sześciocyfrowy kod aby zalogować się do swojego konta."
     },
     "RowEvolution": {
         "AvailableMetrics": "Dostępne wskaźniki",
diff --git a/app/lang/pt-br.json b/app/lang/pt-br.json
index 6343cdd1c..ef801f404 100644
--- a/app/lang/pt-br.json
+++ b/app/lang/pt-br.json
@@ -7,10 +7,10 @@
         "Action": "Ação",
         "Actions": "Ações",
         "Add": "Adicionar",
-        "AfterEntry": "Após entrar aqui",
+        "AfterEntry": "após entrar aqui",
         "All": "Todos",
         "AllowPiwikArchivingToTriggerBrowser": "Arquivar relatórios quando visualizados através do navegador",
-        "AllWebsitesDashboard": "Painel de Todos os sites",
+        "AllWebsitesDashboard": "Painel de todos os sites",
         "And": "e",
         "API": "API",
         "Apply": "Aplicar",
@@ -19,7 +19,7 @@
         "AuthenticationMethodSmtp": "Método de autenticação para SMTP",
         "AverageOrderValue": "Média de Pedidos",
         "AveragePrice": "Preço Médio",
-        "AverageQuantity": "Média Qualidade",
+        "AverageQuantity": "Quantidade média",
         "AverageX": "Média %s",
         "BackToPiwik": "Volta ao Matomo",
         "Broken": "Quebrado",
@@ -69,7 +69,7 @@
         "ColumnMaxActions": "Ações máximas em uma visita",
         "ColumnNbActions": "Ações",
         "ColumnNbActionsDocumentation": "O número de ações realizadas pelos seus visitantes. As ações podem ser exibições de páginas, pesquisas internas no site, downloads ou outlinks.",
-        "ColumnNbUniqVisitors": "Visitantes Únicos",
+        "ColumnNbUniqVisitors": "Visitantes únicos",
         "ColumnNbUniqVisitorsDocumentation": "O número de visitantes não duplicados que chegam ao seu site. Cada usuário só é contado uma vez, mesmo se eles visitam o site várias vezes ao dia.",
         "ColumnNbUsers": "Usuários",
         "ColumnNbUsersDocumentation": "O número de usuários autenticados em seu site. É o número de usuários ativos únicos que têm um ID de usuário definido (através da função de código de rastreamento 'getUserId').",
@@ -220,35 +220,37 @@
         "NotPossibleWithoutHttps": "Atenção: Fazendo isto sem ter configurado um certificado SSL para utilizar HTTPS, o Matomo irá parar de funcionar.",
         "UseSSLInstall": "Nós recomendamos usar o Matomo apenas em conexões SSL segura. Por favor %1$s clique aqui para continuar o processo de instalação via SSL %2$s.",
         "ForExampleShort": "ex.",
-        "Forums": "Fórum",
+        "Forums": "Fóruns",
         "FromReferrer": "origem",
         "Generic": "Genérico",
-        "GeneralInformation": "Informações Gerais",
+        "GeneralInformation": "Informações gerais",
         "GeneralSettings": "Configurações gerais",
         "GetStarted": "Começar",
         "GiveUsYourFeedback": "Dê o seu feedback!",
-        "Goal": "Objetivo",
+        "Goal": "Meta",
         "GoTo": "Ir para %s",
         "GoTo2": "Ir para",
-        "GraphHelp": "Mais informações sobre mostrar gráficos em Matomo.",
+        "GraphHelp": "Mais informações sobre exibir gráficos no Matomo.",
         "HelloUser": "Olá, %s!",
         "Help": "Ajuda",
+        "HelpResources": "Recursos de ajuda",
         "HelpTranslatePiwik": "Você gostaria de %1$sajudar a melhorar as traduções do Matomo%2$s?",
         "Hide": "ocultar",
         "HoursMinutes": "%1$s horas %2$s minutos",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Assumindo que o arquivamento é rápido para as suas configurações, você pode programar o crontab para funcionar com mais frequência.",
-        "InfoFor": "informações para %s",
+        "InfoFor": "Informações para %s",
         "Installed": "Instalado",
-        "InvalidDateRange": "Período de datas inválido , Por favor tente novamente",
-        "InvalidResponse": "Os dados introduzidos são inválidos.",
+        "InvalidDateRange": "Intervalo de datas inválido, por favor tente novamente",
+        "InvalidResponse": "Os dados recebidos são inválidos.",
         "IP": "IP",
-        "JsTrackingTag": "Tag de rastreamento JavaScript",
+        "JsTrackingTag": "Código de rastreamento JavaScript",
+        "KpiMetric": "Métrica KPI",
         "Language": "Idioma",
         "Languages": "Idiomas",
-        "LastDays": "Últimos %s dias (incluíndo hoje)",
+        "LastDays": "Últimos %s dias (incluindo hoje)",
         "LastDaysShort": "Últimos %s dias",
-        "LearnMore": "%1$saprender mais%2$s",
+        "LearnMore": "%1$ssaiba mais%2$s",
         "Live": "Ao vivo",
         "Loading": "Carregando...",
         "LoadingData": "Carregando dados...",
@@ -302,6 +304,8 @@
         "OneVisit": "1 visita",
         "OnlyEnterIfRequired": "Insira um nome de usuário SMTP apenas se o servidor necessitar de um.",
         "OnlyEnterIfRequiredPassword": "Apenas insira uma senha SMTP se for requerimento do servidor.",
+        "SmtpFromEmailHelp": "O valor padrão é noreply@{DOMÍNIO}, onde {DOMÍNIO} será substituído pelo seu domínio Matomo \"%1$s\".<br>Se o envio de e-mails não funcionar para você, você pode precisar definir este endereço para coincidir com o seu nome de usuário SMTP.",
+        "NameShownInTheSenderColumn": "O nome mostrado na coluna remetente",
         "OnlyUsedIfUserPwdIsSet": "Usado apenas se um nome de usuário e senha estiverem definidas. Pergunte ao seu fornecedor, caso não tem a certeza qual método deve utilizar.",
         "OpenSourceWebAnalytics": "Web Analytics Open Source",
         "OperationAtLeast": "pelo menos",
@@ -366,7 +370,7 @@
         "Remove": "Remover",
         "Report": "Relatório",
         "ReportGeneratedFrom": "Este relatório foi gerado usando dados de %s.",
-        "ReportRatioTooltip": "'%1$s' representa %2$s de %3$s %4$s com %5$s.",
+        "ReportRatioTooltip": "'%1$s' representa %2$s de %3$s %4$s no segmento %5$s com %6$s.",
         "Reports": "Relatórios",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arquivar relatórios no máximo a cada X segundos",
         "RearchiveTimeIntervalOnlyForTodayReports": "Isso afeta apenas relatórios para hoje (ou qualquer outro Intervalo de Tempo incluindo hoje)",
@@ -400,6 +404,8 @@
         "SmtpPort": "Porta SMTP",
         "SmtpServerAddress": "Endereço do servidor SMTP",
         "SmtpUsername": "Nome de usuário SMTP",
+        "SmtpFromName": "Nome SMTP do remetente",
+        "SmtpFromAddress": "Endereço SMTP do remetente",
         "Source": "Fonte",
         "StatisticsAreNotRecorded": "O rastreamento de visitantes Matomo está desativado! Para re-habilitar o rastreamento definina record_statistics = 1 em seu arquivo config\/config.ini.php.",
         "Subtotal": "Subtoal",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Para apagar todos estes arquivos de uma vez, você pode executar esse comando:",
         "Total": "Total",
         "Totals": "Totais",
-        "TotalRatioTooltip": "Este é %1$s de todos os %2$s %3$s.",
+        "TotalRatioTooltip": "Isto é %1$s de todo %2$s %3$s em %4$s.",
         "TotalRevenue": "Total de Revendas",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visitas, %2$s visualizações, %3$s ações, %4$s receita)",
         "TrackingScopeAction": "Ação",
@@ -422,7 +428,7 @@
         "TrackingScopeVisit": "Visita",
         "TransitionsRowActionTooltip": "Veja o que os visitantes fizeram antes e depois de verem este página",
         "TransitionsRowActionTooltipTitle": "Transições abertas",
-        "TranslatorName": "A. Renato",
+        "TranslatorName": "A. Renato, Rafael Moretti",
         "UniquePurchases": "Pedidos únicos",
         "Unknown": "Desconhecido",
         "Upload": "Carregar",
@@ -492,31 +498,43 @@
         "YouAreViewingDemoMessage": "Você está visualizando a versão de demonstração do 1%1$s Matomo 2%2$s",
         "YouMustBeLoggedIn": "Tem de estar ligado para aceder a essa funcionalidade.",
         "YourChangesHaveBeenSaved": "Suas alterações foram salvas",
+        "YourSessionHasExpired": "Sua sessão expirou devido à inatividade. Por favor faça o login para continuar.",
         "ThankYouForUsingMatomo": "Obrigado por usar Matomo",
-        "TheMatomoTeam": "A equipe de Matomo"
+        "TheMatomoTeam": "A equipe de Matomo",
+        "PleaseTryAgain": "Favor tentar novamente",
+        "ComparisonRatioTooltip": "Essa é uma alteração de %1$s em comparação com o segmento '%2$s' em %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' em %2$s contém %3$s de todas as visitas (%4$s do total de %5$s).",
+        "ComparisonCardTooltip2": "A contagem de visitas é diferente em %1$s em comparação com %2$s sobre %3$s.",
+        "VisualizationDoesNotSupportComparison": "Esta visualização não suporta comparação de segmento\/período.",
+        "ChangeInX": "Mudar em %1$s",
+        "Comparisons": "Comparações",
+        "ClickToRemoveComp": "Clique para remover essa comparação.",
+        "MaximumNumberOfSegmentsComparedIs": "O número máximo de segmentos que podem ser comparados simultaneamente é %s.",
+        "CompareDatesParamMustMatchComparePeriods": "O comprimento do parâmetro de consulta %1$s deve corresponder ao comprimento do parâmetro de consulta %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "O número máximo de períodos que podem ser comparados simultaneamente é %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Sobre o Matomo Móvel",
-        "AccessUrlLabel": "Url de Acesso Matomo",
+        "AccessUrlLabel": "URL de acesso ao Matomo",
         "Account": "Conta",
         "Accounts": "Contas",
         "AddAccount": "Adicionar conta",
-        "AddPiwikDemo": "Adicionar Demonstração Matomo",
+        "AddPiwikDemo": "Adicionar demonstração do Matomo",
         "Advanced": "Avançado",
         "AnonymousAccess": "Acesso anônimo",
         "AnonymousTracking": "Rastreamento anônimo",
         "AskForAnonymousTrackingPermission": "Quando ativado, o Matomo Mobile vai enviar os dados de uso anônimos para matomo.org. A intenção é usar esses dados para ajudar os desenvolvedores do Matomo a entender melhor como o aplicativo é utilizado. Informações enviadas são: menus e configurações clicadas, nome do sistema operacional e versão, qualquer erro exibido no Matomo Mobile. Nós não iremos acompanhar qualquer de seus dados analíticos e estes dados anônimos nunca será tornados públicos. Você pode ativar\/desativar o rastreamento anônimo em Configurações a qualquer momento.",
-        "ChooseHttpTimeout": "Escolha um valor timeout HTTP",
+        "ChooseHttpTimeout": "Escolha um valor de timeout HTTP",
         "ChooseMetric": "Escolha métrica",
         "ChooseReport": "Escolha um relatório",
         "ChooseSegment": "Escolha um segmento",
-        "ConfirmRemoveAccount": "Você deseja remover sua Conta?",
+        "ConfirmRemoveAccount": "Você deseja remover esta conta?",
         "DefaultReportDate": "Data do relatório",
         "EmailUs": "Envie-nos um email",
         "EnableGraphsLabel": "Mostrar gráficos",
         "EvolutionGraph": "Gráfico histórico",
         "HelpUsToImprovePiwikMobile": "Gostaria de ativar o acompanhamento de uso anônimo em Matomo Mobile?",
-        "HowtoDeleteAnAccount": "Clique para remover a conta.",
+        "HowtoDeleteAnAccount": "Pressione e segure para remover uma conta.",
         "HowtoDeleteAnAccountOniOS": "Deslize da direita para a esquerda para apagar uma conta",
         "HowtoLoginAnonymous": "Deixe nome de usuário e senha em branco para fazer login anônimo",
         "HttpIsNotSecureWarning": "Seu token de autorização Matomo (token_auth) é enviada em texto simples, se você usar 'HTTP'. Por este motivo, recomendamos HTTPS para o transporte seguro de dados através da internet. Você quer continuar?",
@@ -582,9 +600,9 @@
         "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": "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",
-        "MultiRowEvolutionTitle": "Evolução das múltiplas linhas",
+        "MetricMinMax": "%1$s variou entre %2$s e %3$s no período",
+        "MetricsFor": "Métricas para %s",
+        "MultiRowEvolutionTitle": "Evolução de múltiplas linhas",
         "PickAnotherRow": "Escolha outra linha para comparar",
         "PickARow": "Escolha uma linha para comparar"
     }
diff --git a/app/lang/pt.json b/app/lang/pt.json
index 435887c53..d821fe59d 100644
--- a/app/lang/pt.json
+++ b/app/lang/pt.json
@@ -187,7 +187,9 @@
         "ExceptionLanguageFileNotFound": "O ficheiro de idioma '%s' não foi encontrado.",
         "ExceptionMethodNotFound": "O método '%1$s' não existe ou não está disponível no módulo '%2$s'.",
         "ExceptionMissingFile": "Ficheiro em falta: %s",
+        "ExceptionUnexpectedFile": "Foram encontrados ficheiros no seu Matomo que não estávamos à espera.",
         "ExceptionUnexpectedFilePleaseDelete": "Por favor, elimine estes ficheiros para evitar erros.",
+        "ExceptionUnexpectedDirectory": "Foram encontrados diretórios no seu Matomo que não estávamos à espera.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "Por favor, elimine estes diretórios para evitar erros.",
         "ExceptionFileToDelete": "Ficheiro a eliminar: %s",
         "ExceptionDirectoryToDelete": "Diretório a eliminar: %s",
@@ -231,16 +233,19 @@
         "GraphHelp": "Mais informação sobre mostrar gráficos no Matomo.",
         "HelloUser": "Olá, %s!",
         "Help": "Ajuda",
+        "HelpResources": "Recursos de apoio",
         "HelpTranslatePiwik": "Talvez gostasse de %1$sajudar-nos a melhorar as traduções do Matomo%2$s?",
         "Hide": "ocultar",
         "HoursMinutes": "%1$s horas %2$s min",
         "Id": "Id",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Assumindo que o processo de arquivamento é rápido para a sua configuração, pode configurar o crontab para o executar com mais frequência.",
         "InfoFor": "Informação para %s",
         "Installed": "Instalado",
         "InvalidDateRange": "Intervalo de datas inválido, por favor, tente novamente",
         "InvalidResponse": "Os dados recebidos são inválidos.",
         "IP": "IP",
         "JsTrackingTag": "Código de acompanhamento JavaScript",
+        "KpiMetric": "Métrica KPI",
         "Language": "Idioma",
         "Languages": "Idiomas",
         "LastDays": "Últimos %s dias (incluindo hoje)",
@@ -299,6 +304,8 @@
         "OneVisit": "1 visita",
         "OnlyEnterIfRequired": "Apenas introduza um nome de utilizador se for preciso para o seu servidor SMTP",
         "OnlyEnterIfRequiredPassword": "Apenas introduza uma palavra-passe se for preciso para o seu servidor SMTP",
+        "SmtpFromEmailHelp": "O valor predefinido é noreply@{DOMÍNIO}, onde {DOMÍNIO} será substituído pelo domínio do seu Matomo \"%1$s\".<br>Se o envio de e-mails não funciona para si, pode precisar de alterar este endereço para coincidir com o seu nome SMTP.",
+        "NameShownInTheSenderColumn": "O nome apresentado na coluna do remetente",
         "OnlyUsedIfUserPwdIsSet": "Apenas utilizado se um utilizador\/palavra-passe estiver definido; questione o seu fornecedor se não tiver a certeza que método deve utilizar.",
         "OpenSourceWebAnalytics": "plataforma de análise gratuita\/livre",
         "OperationAtLeast": "Pelo menos",
@@ -324,6 +331,8 @@
         "OverlayRowActionTooltipTitle": "Abrir sobreposição na página",
         "Overview": "Visão geral",
         "Pages": "Páginas",
+        "Pagination": "%1$s–%2$s de %3$s",
+        "PaginationWithoutTotal": "%1$s–%2$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",
@@ -361,7 +370,7 @@
         "Remove": "Remover",
         "Report": "Relatório",
         "ReportGeneratedFrom": "Este relatório foi gerado utilizando dados de %s.",
-        "ReportRatioTooltip": "'%1$s' representa %2$s de %3$s %4$s com %5$s.",
+        "ReportRatioTooltip": "'%1$s' representa %2$s de %3$s %4$s no segmento %5$s com %6$s.",
         "Reports": "Relatórios",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arquivar relatórios em intervalos de, no máximo, X segundos",
         "RearchiveTimeIntervalOnlyForTodayReports": "Isto apenas afeta relatórios para hoje (ou qualquer outro intervalo de datas, incluindo hoje)",
@@ -395,6 +404,8 @@
         "SmtpPort": "Porta SMTP",
         "SmtpServerAddress": "Endereço do servidor SMTP",
         "SmtpUsername": "Nome de utilizador SMTP",
+        "SmtpFromName": "SMTP a partir do nome",
+        "SmtpFromAddress": "SMTP a partir do endereço",
         "Source": "Fonte",
         "StatisticsAreNotRecorded": "O acompanhamento de visitantes do Matomo está atualmente desativado| Reative o acompanhamento definindo o record_statistics = 1 no seu ficheiro config\/config.ini.php.",
         "Subtotal": "Subtotal",
@@ -409,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Para eliminar todos estes ficheiros de uma vez, pode executar este comando:",
         "Total": "Total",
         "Totals": "Totais",
-        "TotalRatioTooltip": "Isto é %1$s de todos os %2$s %3$s.",
+        "TotalRatioTooltip": "Isto é %1$s de todos os %2$s %3$s em %4$s.",
         "TotalRevenue": "Total de receitas",
         "TotalVisitsPageviewsActionsRevenue": "(Total: %1$s visitas, %2$s visualizações de páginas, %3$s ações, %4$s receitas)",
         "TrackingScopeAction": "Ação",
@@ -442,6 +453,7 @@
         "VisitorIPs": "IPs do visitante",
         "Visitors": "Visitantes",
         "VisitsWith": "Visitas com %s",
+        "VisitorFingerprint": "Impressão digital",
         "VisitorSettings": "Definições do visitante",
         "VisitType": "Tipo de visita",
         "VisitTypes": "Tipos de visita",
@@ -485,7 +497,21 @@
         "YouAreCurrentlyUsing": "Atualmente está a utilizar o Matomo %s.",
         "YouAreViewingDemoMessage": "Está a ver a demonstração do %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Tem que estar autenticado para aceder a esta funcionalidade.",
-        "YourChangesHaveBeenSaved": "As suas alterações foram guardadas."
+        "YourChangesHaveBeenSaved": "As suas alterações foram guardadas.",
+        "YourSessionHasExpired": "A sua sessão expirou por inatividade. Por favor, inicie novamente sessão para continuar.",
+        "ThankYouForUsingMatomo": "Obrigado por utilizar o Matomo",
+        "TheMatomoTeam": "A Equipa do Matomo",
+        "PleaseTryAgain": "Por favor tente novamente",
+        "ComparisonRatioTooltip": "Isto é uma alteração de %1$s relativamente ao segmento '%2$s' de %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' em %2$s contém %3$s de todas as visitas (%4$s de um total de %5$s).",
+        "ComparisonCardTooltip2": "O total de visitas é diferente por %1$s comparativamente a %2$s sob %3$s.",
+        "VisualizationDoesNotSupportComparison": "Esta visualização não suporta comparações por período\/segmento.",
+        "ChangeInX": "Alteração em %1$s",
+        "Comparisons": "Comparações",
+        "ClickToRemoveComp": "Clique para remover esta comparação",
+        "MaximumNumberOfSegmentsComparedIs": "%s é o número máximo de segmentos que podem ser comparados em simultâneo.",
+        "CompareDatesParamMustMatchComparePeriods": "O tamanho do parâmetro %1$s deve coincidir com o tamanho do parâmetro %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "%s é o número máximo de períodos que podem ser comparados em simultâneo."
     },
     "Mobile": {
         "AboutPiwikMobile": "Sobre o Matomo Mobile",
@@ -558,7 +584,13 @@
         "VerifyAccount": "A verificar a conta",
         "ValidateSslCertificate": "Validar certificado SSL",
         "VerifyLoginData": "Confirme que a combinação do seu nome de utilizador e senha está correta.",
-        "YouAreOffline": "Desculpe, mas está offline"
+        "YouAreOffline": "Desculpe, mas está offline",
+        "ExceptionNoViewAccess": "Por favor, confirme o seu nome de utilizador e a sua palavra-passe e certifique-se que possui acesso de %s a pelo menos um site.",
+        "Mobile_HowtoExitAndroid": "Por favor, clique novamente em RETROCEDER para sair",
+        "MatomoMarketplace": "Loja do Matomo",
+        "EnterAuthCode": "Introduza o código de autenticação",
+        "EnterCorrectAuthCode": "Introduza o código de autenticação correto",
+        "EnterAuthCodeExplanation": "Parece que está a utilizar a autenticação de dois fatores. Por favor, introduza o código de seis dígitos para iniciar sessão na sua conta."
     },
     "RowEvolution": {
         "AvailableMetrics": "Métricas disponíveis",
diff --git a/app/lang/ro.json b/app/lang/ro.json
index c79cc8f53..a15614ea4 100644
--- a/app/lang/ro.json
+++ b/app/lang/ro.json
@@ -284,7 +284,6 @@
         "Remove": "Şterge",
         "Report": "Raport",
         "ReportGeneratedFrom": "Acest raport a fost creat în baza datelor din %s.",
-        "ReportRatioTooltip": "'%1$s' reprezintă %2$s din %3$s %4$s cu %5$s.",
         "Reports": "Rapoarte",
         "ReportsWillBeProcessedAtMostEveryHour": "Rapoartele vor fi procesate la maxim fiecare ora",
         "RequestTimedOut": "Un request la %s a expirat. Va rugam incercati din nou.",
@@ -323,7 +322,6 @@
         "TimeAgo": "%s in urma",
         "TimeOnPage": "Timp pe pagină",
         "Total": "Total",
-        "TotalRatioTooltip": "Aceasta este %1$s de toate %2$s %3$s.",
         "TotalRevenue": "Venit total",
         "TransitionsRowActionTooltip": "Vezi ce au făcut vizitatorii până la şi după vizionarea acestei pagini",
         "TransitionsRowActionTooltipTitle": "Treceri Deschise",
diff --git a/app/lang/ru.json b/app/lang/ru.json
index 416b06f03..c4539d938 100644
--- a/app/lang/ru.json
+++ b/app/lang/ru.json
@@ -187,7 +187,9 @@
         "ExceptionLanguageFileNotFound": "Файл языка «%s» не найден.",
         "ExceptionMethodNotFound": "Метод «%1$s» не существует или недоступен в модуле «%2$s».",
         "ExceptionMissingFile": "Отсутствует файл: %s",
+        "ExceptionUnexpectedFile": "В вашем Matomo были найдены файлы, но мы не ожидали их.",
         "ExceptionUnexpectedFilePleaseDelete": "Пожалуйста, удалите эти файлы, чтобы избежать ошибок.",
+        "ExceptionUnexpectedDirectory": "В вашем Matomo были найдены директории, но мы не ожидали их.",
         "ExceptionUnexpectedDirectoryPleaseDelete": "Пожалуйста, удалите эти директории, чтобы избежать ошибок.",
         "ExceptionFileToDelete": "Файл для удаления: %s",
         "ExceptionDirectoryToDelete": "Директория для удаления: %s",
@@ -231,16 +233,19 @@
         "GraphHelp": "Больше информации про отображение графиков в Matomo.",
         "HelloUser": "Привет, %s!",
         "Help": "Помощь",
+        "HelpResources": "Справочные ресурсы",
         "HelpTranslatePiwik": "Возможно, вы захотите %1$sпомочь нам улучшить переводы в Matomo%2$s?",
         "Hide": "скрыть",
         "HoursMinutes": "%1$s час %2$s мин",
         "Id": "Id",
+        "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Предполагая, что архивирование выполняется быстро, вы можете настроить crontab для более частой работы.",
         "InfoFor": "Информация для %s",
         "Installed": "Установлено",
         "InvalidDateRange": "Неверный период, пожалуйста, попробуйте снова",
         "InvalidResponse": "Полученные данные некорректны.",
         "IP": "IP",
         "JsTrackingTag": "JavaScript Tracking-код",
+        "KpiMetric": "KPI Метрика",
         "Language": "Язык",
         "Languages": "Языки",
         "LastDays": "Прошедшие %s дни (включая сегодня)",
@@ -363,7 +368,6 @@
         "Remove": "Удалить",
         "Report": "Отчёт",
         "ReportGeneratedFrom": "Этот отчет был сформирован с использованием данных: %s.",
-        "ReportRatioTooltip": "«%1$s» представляет %2$s из %3$s %4$s с %5$s.",
         "Reports": "Отчёты",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Архив отчётов на каждые Х секунд",
         "RearchiveTimeIntervalOnlyForTodayReports": "Это влияет только на отчёты (или другие диапазоны дат, включая сегодня)",
@@ -411,7 +415,7 @@
         "ToDeleteAllFilesRunThisCommand": "Чтобы удалить все файлы сразу, вы можете запустить эту команду:",
         "Total": "Всего",
         "Totals": "Всего",
-        "TotalRatioTooltip": "Это %1$s из всех %2$s %3$s.",
+        "TotalRatioTooltip": "Это %1$s из всех %2$s %3$s в %4$s.",
         "TotalRevenue": "Общая прибыль",
         "TotalVisitsPageviewsActionsRevenue": "(Всего: %1$s визиты, %2$s просмотры страниц, %3$s действия, %4$s выручка)",
         "TrackingScopeAction": "Действие",
@@ -444,6 +448,7 @@
         "VisitorIPs": "IPы посетителя",
         "Visitors": "Посетители",
         "VisitsWith": "Посещения с %s",
+        "VisitorFingerprint": "Отпечаток пальца",
         "VisitorSettings": "Настройки посетителей",
         "VisitType": "Тип посещения",
         "VisitTypes": "Типы посещений",
@@ -488,8 +493,14 @@
         "YouAreViewingDemoMessage": "Вы просматриваете демо %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Вы должны зайти на сайт, чтобы получить доступ к этому функционалу.",
         "YourChangesHaveBeenSaved": "Изменения сохранены.",
+        "YourSessionHasExpired": "Ваша сессия истекла в связи с неактивностью. Пожалуйста войдите, чтобы продолжить.",
         "ThankYouForUsingMatomo": "Спасибо за использование Matomo",
-        "TheMatomoTeam": "Команда Matomo"
+        "TheMatomoTeam": "Команда Matomo",
+        "PleaseTryAgain": "Пожалуйста, попробуйте еще раз",
+        "ChangeInX": "Изменения в %1$s",
+        "Comparisons": "Сравнение",
+        "ClickToRemoveComp": "Нажмите, чтобы удалить это сравнение.",
+        "MaximumNumberOfPeriodsComparedIs": "Максимальне количество периодов, которые можно сравнить одновременно: %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "О Matomo Mobile",
@@ -563,7 +574,12 @@
         "ValidateSslCertificate": "Проверить SSL-сертификат",
         "VerifyLoginData": "Убедитесь, что Вы ввели имя пользователя и пароль правильно.",
         "YouAreOffline": "Извините, но Вы сейчас офлайн",
-        "ExceptionNoViewAccess": "Пожалуйста, проверьте свои имя и пароль и убедитесь, что у вас есть доступ %s, по крайней мере, к одному сайту."
+        "ExceptionNoViewAccess": "Пожалуйста, проверьте свои имя и пароль и убедитесь, что у вас есть доступ %s, по крайней мере, к одному сайту.",
+        "Mobile_HowtoExitAndroid": "Пожалуйста, нажмите НАЗАД еще раз, чтобы выйти",
+        "MatomoMarketplace": "Matomo Marketplace",
+        "EnterAuthCode": "Введите код аутентификации",
+        "EnterCorrectAuthCode": "Введите правильный код аутентификации",
+        "EnterAuthCodeExplanation": "Похоже, вы используете двухфакторную аутентификацию. Пожалуйста, введите шестизначный код для входа в свою учетную запись."
     },
     "RowEvolution": {
         "AvailableMetrics": "Доступные показатели",
diff --git a/app/lang/sk.json b/app/lang/sk.json
index e177f8948..62ad0cfe8 100644
--- a/app/lang/sk.json
+++ b/app/lang/sk.json
@@ -20,6 +20,7 @@
         "AverageOrderValue": "Prierná hodnota objednávky",
         "AveragePrice": "Priemerná cena",
         "AverageQuantity": "Priemerné množstvo",
+        "AverageX": "Priemer %s",
         "BackToPiwik": "Späť na Matomo",
         "Broken": "Nefunkčný",
         "BrokenDownReportDocumentation": "Je to rozložené do viacerých reportov zobrazených ako čiarové grafy na konci stránky. Grafy môžete zväčšiť kliknutím na správu, ktorú chcete vidieť.",
@@ -33,6 +34,7 @@
         "ClickHere": "Klinite pre viac informácií.",
         "Close": "Zatvoriť",
         "ClickToSearch": "Kliknite pre vyhľadávanie",
+        "Copy": "Kopírovať",
         "ColumnActionsPerVisit": "Akcií na návštevu",
         "ColumnActionsPerVisitDocumentation": "Priemerná hodnota akcií (zhliadnuté stránky, stiahnutia alebo ochádzajúce prekliky) uskutočnených počas návštev.",
         "ColumnAverageGenerationTime": "Priem. čas generovania",
@@ -206,6 +208,7 @@
         "IP": "IP",
         "JsTrackingTag": "JavaScript sledovacia značka (tag)",
         "Language": "Jazyk",
+        "Languages": "Jazyky",
         "LastDays": "Posledných %s dní (vrátane dnešného dňa)",
         "LastDaysShort": "Poslených %s dní",
         "LearnMore": "%1$s naučiť sa viac %2$s",
@@ -319,7 +322,6 @@
         "Remove": "Odstrániť",
         "Report": "Report",
         "ReportGeneratedFrom": "Tento report bol vytvorený s použitím dát z %s.",
-        "ReportRatioTooltip": "'%1$s' reprezentuje %2$s z %3$s %4$s s %5$s.",
         "Reports": "Správy",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Archivovať reporty každých X sekúnd",
         "RearchiveTimeIntervalOnlyForTodayReports": "Toto ovplyvní len dnešné reporty (alebo akýkoľvek iný dátumový rozsah ktorý bude obsahovať dnešný deň)",
@@ -365,7 +367,6 @@
         "ToDeleteAllDirectoriesRunThisCommand": "Pre vymazanie týchto adresárov naraz, môžete spustiť tento príkaz:",
         "ToDeleteAllFilesRunThisCommand": "Pre vymazanie týchto sôborov naraz, môžete spustiť tento príkaz:",
         "Total": "Celkom",
-        "TotalRatioTooltip": "Toto je %1$s z celkového %2$s %3$s.",
         "TotalRevenue": "Celkový príjem",
         "TotalVisitsPageviewsActionsRevenue": "(Celkom: %1$s návštev, %2$s zobrazení, %3$s akcií, tržby: %4$s)",
         "TrackingScopeAction": "Akcia",
diff --git a/app/lang/sl.json b/app/lang/sl.json
index 9e6b2f965..a6dd1c9a4 100644
--- a/app/lang/sl.json
+++ b/app/lang/sl.json
@@ -303,7 +303,6 @@
         "Remove": "Odstrani",
         "Report": "Poročilo",
         "ReportGeneratedFrom": "To poročilo je bilo ustvarjeno s podatki iz %s.",
-        "ReportRatioTooltip": "'%1$s' predstavlja %2$s od %3$s %4$s z %5$s.",
         "Reports": "Poročila",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arhiviraj poročila največ vsakih X sekund",
         "RearchiveTimeIntervalOnlyForTodayReports": "To vpliva zgolj na poročila za današnji dan (ali katero koli drugo obdobje, ki vključuje današnji dan)",
@@ -347,7 +346,6 @@
         "TimeFormat": "Time format",
         "TimeOnPage": "Čas na strani",
         "Total": "Skupaj",
-        "TotalRatioTooltip": "To je %1$s od vseh %2$s %3$s.",
         "TotalRevenue": "Skupni prihodki",
         "TotalVisitsPageviewsActionsRevenue": "(Skupaj: %1$s obiskov, %2$s ogledov strani, %3$s akcij, %4$s prihodek)",
         "TrackingScopeAction": "Akcija",
diff --git a/app/lang/sq.json b/app/lang/sq.json
index cb7c16301..a3f8b5627 100644
--- a/app/lang/sq.json
+++ b/app/lang/sq.json
@@ -233,6 +233,7 @@
         "GraphHelp": "Më tepër të dhëna rreth shfaqjes së grafikëve në Matomo.",
         "HelloUser": "Tungjatjeta, %s!",
         "Help": "Ndihmë",
+        "HelpResources": "Burime ndihme",
         "HelpTranslatePiwik": "Ndoshta do të donit të %1$sna ndihmonit të përmirësojmë përkthimet e Matomo-s%2$s?",
         "Hide": "fshihe",
         "HoursMinutes": "%1$s orë %2$s minuta",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Të dhënat e marra janë të pavlefshme.",
         "IP": "IP",
         "JsTrackingTag": "Kod Ndjekjeje JavaScript",
+        "KpiMetric": "Matje KPI",
         "Language": "Gjuhë",
         "Languages": "Gjuhë",
         "LastDays": "%s ditët e fundit (përfshirë të sotmen)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 vizitë",
         "OnlyEnterIfRequired": "Jepni emër përdoruesi vetëm nëse shërbyesi juaj SMTP lyp një të tillë.",
         "OnlyEnterIfRequiredPassword": "Jepni fjalëkalim vetëm nëse shërbyesi juaj SMTP lyp një të tillë.",
+        "SmtpFromEmailHelp": "Vlera parazgjedhje është noreply@{DOMAIN}, ku {DOMAIN} do të zëvendësohet me përkatësinë tuaj Matomo \"%1$s\".<br>Nëse dërgimi i email-eve nuk funksionon për ju, mundet t’ju duhet ta caktoni këtë adresë që të përputhet me emrin tuaj të përdoruesit SMTP.",
+        "NameShownInTheSenderColumn": "Emri i shfaqur te shtylla e dërguesit",
         "OnlyUsedIfUserPwdIsSet": "E përdorur vetëm kur ka të caktuar një emër përdoruesi\/fjalëkalim, pyesni furnizuesin e llogarisë suaj, nëse jeni i pasigurt se cilën metodë të përdorni.",
         "OpenSourceWebAnalytics": "platformë analizash të lira\/libre",
         "OperationAtLeast": "E pakta",
@@ -366,7 +370,7 @@
         "Remove": "Hiqe",
         "Report": "Raport",
         "ReportGeneratedFrom": "Ky raport u prodhua duke përdorur të dhëna nga %s.",
-        "ReportRatioTooltip": "'%1$s' përfaqëson %2$s e %3$s %4$s me %5$s.",
+        "ReportRatioTooltip": "'%1$s' përfaqëson %2$s e %3$s %4$s në segmentin %5$s me %6$s.",
         "Reports": "Raporte",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Raportet për ditën e sotme (ose për çfarëdo Intervali Datash që përfshin ditën e sotme) do të përpunohen e shumta çdo",
         "RearchiveTimeIntervalOnlyForTodayReports": "Kjo prek vetëm raportet për sot (ose çfarëdo Interval Datash që përfshin të sotmen)",
@@ -400,6 +404,8 @@
         "SmtpPort": "Portë SMTP",
         "SmtpServerAddress": "Adresë shërbyesi SMTP",
         "SmtpUsername": "Emër përdoruesi SMTP",
+        "SmtpFromName": "Emër SMTP Nga",
+        "SmtpFromAddress": "Adresë SMTP Nga",
         "Source": "Burim",
         "StatisticsAreNotRecorded": "Ndjekja e Vizitorëve nga Matomo është i çaktivizuar! Riaktivizojeni ndjekjen duke dhënë vlerën record_statistics = 1 te kartela juaj config\/config.ini.php.",
         "Subtotal": "Nënshumë",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Që të fshini krejt kartelat njëherësh, mund të përdorni këtë urdhër:",
         "Total": "Gjithsej",
         "Totals": "Gjithsej",
-        "TotalRatioTooltip": "Kjo është %1$s e krejt %2$s %3$s.",
+        "TotalRatioTooltip": "Kjo është %1$s e krejt %2$s %3$s në %4$s.",
         "TotalRevenue": "Të ardhura Gjithsej",
         "TotalVisitsPageviewsActionsRevenue": "(Gjithsej: %1$s vizita, %2$s parje faqesh, %3$s veprime, %4$s të ardhura)",
         "TrackingScopeAction": "Veprim",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "Po shihni demonstrimin e %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Që të përdorni këtë funksion, duhet të keni bërë hyrjen.",
         "YourChangesHaveBeenSaved": "Ndryshimet tuaja u ruajtën.",
+        "YourSessionHasExpired": "Sesioni juaj ka skaduar për shkak plogështie. Që të vazhdohet, ju lutemi, bëni hyrjen.",
         "ThankYouForUsingMatomo": "Faleminderit që përdorni Matomo-n",
-        "TheMatomoTeam": "Ekipi i Matomo-s"
+        "TheMatomoTeam": "Ekipi i Matomo-s",
+        "PleaseTryAgain": "Ju lutemi, riprovoni",
+        "ComparisonRatioTooltip": "Ky është %1$s ndryshim krahasuar me segmentin '%2$s' në %3$s.",
+        "ComparisonCardTooltip1": "'%1$s' në %2$s përmban %3$s të krejt vizitave (%4$s nga %5$s gjithsej).",
+        "ComparisonCardTooltip2": "Numri i vizitave është i ndryshëm me %1$s krahasyar me %2$s gjatë %3$s.",
+        "VisualizationDoesNotSupportComparison": "Ky vizualizim nuk mbulon krahasime përgjatë segmentesh\/periudhash.",
+        "ChangeInX": "Ndryshim në %1$s",
+        "Comparisons": "Krahasime",
+        "ClickToRemoveComp": "Klikoni që të hiqet ky krahasim.",
+        "MaximumNumberOfSegmentsComparedIs": "Numri maksimum i segmenteve që mund të krahasohen në të njëjtën kohë është %s.",
+        "CompareDatesParamMustMatchComparePeriods": "Gjatësia e parametrit të kërkesës %1$s duhet të përputhet me gjatësinë e parametrit të kërkesës %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "Numri maksimum i periudhave që mund të krahasohen në të njëjtën kohë është %s."
     },
     "Mobile": {
         "AboutPiwikMobile": "Rreth Matomo-s për Celular",
diff --git a/app/lang/sr.json b/app/lang/sr.json
index 6eb32285d..aba05ed47 100644
--- a/app/lang/sr.json
+++ b/app/lang/sr.json
@@ -319,7 +319,6 @@
         "Remove": "Ukloni",
         "Report": "Izveštaj",
         "ReportGeneratedFrom": "Izveštaj je generisan uz pomoć podataka iz %s.",
-        "ReportRatioTooltip": "'%1$s' predstavlja %2$s od %3$s %4$s sa %5$s.",
         "Reports": "Izveštaji",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arhiviraj izveštaje na svakih x sekundi",
         "RearchiveTimeIntervalOnlyForTodayReports": "Ovo se odnosi samo na današnje izveštaje (ili izveštaje koji uključuju i današnji dan)",
@@ -365,7 +364,6 @@
         "ToDeleteAllDirectoriesRunThisCommand": "Ukoliko želite da obrišete sve ove direktorijume odjednom, možete pokrenuti sledeću komandu:",
         "ToDeleteAllFilesRunThisCommand": "Ukoliko želite da obrišete sve ove fajlove odjednom, možete pokrenuti sledeću komandu:",
         "Total": "Ukupno",
-        "TotalRatioTooltip": "Ovo je %1$s od %2$s %3$s.",
         "TotalRevenue": "Ukupan prihod",
         "TotalVisitsPageviewsActionsRevenue": "(Ukupno poseta %1$s, prikaza %2$s, akcija %3$s, zarada %4$s)",
         "TrackingScopeAction": "Akcija",
diff --git a/app/lang/sv.json b/app/lang/sv.json
index 3bc315aca..9acd1e797 100644
--- a/app/lang/sv.json
+++ b/app/lang/sv.json
@@ -15,7 +15,7 @@
         "API": "API",
         "Apply": "Verkställ",
         "ArchivingInlineHelp": "För webbplatser med medelhög till hög trafik rekommenderas det att du stänger av Matomos funktion för arkivering att aktiveras från webbläsare. Istället rekommenderar vi att du konfigurerar ett cronjobb för att processa Matomorapporter varje timme.",
-        "ArchivingTriggerDescription": "För större Matomo-installationer rekommenderas det att du %1$ssätta upp ett cron-jobb%2$s för att behandla rapporterna automatiskt.",
+        "ArchivingTriggerDescription": "För större Matomo-installationer rekommenderas det att du %1$ssätter upp ett cron-jobb%2$s för att behandla rapporterna automatiskt.",
         "AuthenticationMethodSmtp": "Autentiseringsmetod för SMTP",
         "AverageOrderValue": "Genomsnittligt ordervärde",
         "AveragePrice": "Genomsnittligt pris",
@@ -233,6 +233,7 @@
         "GraphHelp": "Mer information för visning av grafer i Matomo.",
         "HelloUser": "Hej %s",
         "Help": "Hjälp",
+        "HelpResources": "Hjälpresurser",
         "HelpTranslatePiwik": "Du kanske vill %1$shjälpa oss att förbättra Matomos översättning%2$s?",
         "Hide": "dölj",
         "HoursMinutes": "%1$s timmar %2$s min",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Det mottagna datat är ogiltigt.",
         "IP": "IP",
         "JsTrackingTag": "Spårningskod (JavaScript)",
+        "KpiMetric": "KPI mätvärden",
         "Language": "Språk",
         "Languages": "Språk",
         "LastDays": "Senaste %s dagarna (inklusive idag)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 besök",
         "OnlyEnterIfRequired": "Skriv endast in ett användarnamn om din SMTP-server kräver det.",
         "OnlyEnterIfRequiredPassword": "Skriv endast in ett lösenord om din SMTP-server kräver det.",
+        "SmtpFromEmailHelp": "Defaultvärdet är noreply@{DOMAIN}, där {DOMAIN} kommer ersättas med din Matomo domän %1$s.<br> Om det inte fungerar att skicka mail, kan du behöva ange denna adress för att matcha ditt SMTP användarnamn.",
+        "NameShownInTheSenderColumn": "Namnet som visas i kolumnen för avsändare",
         "OnlyUsedIfUserPwdIsSet": "Används endast om ett användarnamn\/lösenord är inställt, fråga din leverantör om du är osäker vilken metod du ska använda.",
         "OpenSourceWebAnalytics": "Webbanalys med öppen källkod",
         "OperationAtLeast": "Åtminstone",
@@ -366,7 +370,7 @@
         "Remove": "Ta bort",
         "Report": "Rapport",
         "ReportGeneratedFrom": "Den här rapporten genererades med data från %s.",
-        "ReportRatioTooltip": "'%1$s' representerar %2$s av %3$s %4$s med %5$s.",
+        "ReportRatioTooltip": "%1$s representerar %2$s av %3$s %4$s i segment %5$s med %6$s .",
         "Reports": "Rapporter",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Arkivera rapporter var X sekund",
         "RearchiveTimeIntervalOnlyForTodayReports": "Detta påverkar endast rapporter för dagens datum (eller andra datumintervall som inkluderar idag)",
@@ -400,6 +404,8 @@
         "SmtpPort": "SMTP-port",
         "SmtpServerAddress": "SMTP-serveradress",
         "SmtpUsername": "SMTP-användarnamn",
+        "SmtpFromName": "SMTP avsändarnamn",
+        "SmtpFromAddress": "SMTP avsändaradress",
         "Source": "Källa",
         "StatisticsAreNotRecorded": "Matomo 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",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "För att radera alla dessa filer samtidigt kan du köra detta kommando:",
         "Total": "Totalt",
         "Totals": "Summeringar",
-        "TotalRatioTooltip": "Det här är %1$s av alla %2$s %3$s.",
+        "TotalRatioTooltip": "Detta är %1$s av alla %2$s %3$s i %4$s .",
         "TotalRevenue": "Totala intäkter",
         "TotalVisitsPageviewsActionsRevenue": "(Totalt: %1$s besök, %2$s sidvisningar, %3$s händelser, %4$s intäkter)",
         "TrackingScopeAction": "Åtgärd",
@@ -488,12 +494,24 @@
         "YearlyReports": "Årsrapporter",
         "YearsDays": "%1$s år %2$s dagar",
         "Yes": "Ja",
-        "YouAreCurrentlyUsing": "Du använder för närvarande Matomo %s.",
+        "YouAreCurrentlyUsing": "Du använder Matomo %s för närvarande.",
         "YouAreViewingDemoMessage": "Du använder en testversion av %1$s Matomo %2$s",
         "YouMustBeLoggedIn": "Du måste vara inloggad för att komma åt denna funktion.",
         "YourChangesHaveBeenSaved": "Dina ändringar har sparats.",
+        "YourSessionHasExpired": "Din session har gått ut på grund av inaktivitet. Vänligen logga in för att fortsätta.",
         "ThankYouForUsingMatomo": "Tack för att du använder Matomo",
-        "TheMatomoTeam": "Matomo-teamet"
+        "TheMatomoTeam": "Matomo-teamet",
+        "PleaseTryAgain": "Försök gärna igen",
+        "ComparisonRatioTooltip": "Det här är en förändring med %1$s jämfört med segmentet %2$s på %3$s.",
+        "ComparisonCardTooltip1": "%1$s på %2$s innehåller %3$s av alla besök (%4$s av %5$s totalt).",
+        "ComparisonCardTooltip2": "Antalet besök avviker med %1$s jämfört med %2$s över %3$s.",
+        "VisualizationDoesNotSupportComparison": "Den här visualiseringen stödjer inte jämförelse av segment eller perioder.",
+        "ChangeInX": "Förändring av %1$s",
+        "Comparisons": "Jämförelser",
+        "ClickToRemoveComp": "Klicka för att ta bort denna jämförelse.",
+        "MaximumNumberOfSegmentsComparedIs": "Max %s segment kan jämföras samtidigt.",
+        "CompareDatesParamMustMatchComparePeriods": "Längden av frågeparametern %1$s måste matcha länden av %2$s.",
+        "MaximumNumberOfPeriodsComparedIs": "Max %s perioder kan jämföras samtidigt."
     },
     "Mobile": {
         "AboutPiwikMobile": "Om Matomo Mobile",
@@ -566,7 +584,13 @@
         "VerifyAccount": "Verifierar konto",
         "ValidateSslCertificate": "Validera SSL-certifikat",
         "VerifyLoginData": "Kontrollera så att ditt användarnamn och lösenord är korrekt.",
-        "YouAreOffline": "Tyvärr, du är offline just nu"
+        "YouAreOffline": "Tyvärr, du är offline just nu",
+        "ExceptionNoViewAccess": "Kontrollera ditt användarnamn och lösenord samt se till åtminstone ha behörigheten %s för minst en webbplats.",
+        "Mobile_HowtoExitAndroid": "Klicka BAKÅT igen för att avsluta",
+        "MatomoMarketplace": "Matomo marknadsplats",
+        "EnterAuthCode": "Fyll i autentiseringskod",
+        "EnterCorrectAuthCode": "Fyll i korrekt autentiseringskod",
+        "EnterAuthCodeExplanation": "Det ser ut som att du använder tvåfaktorsautentisering. Fyll i den sexsiffriga koden för att logga in på ditt konto."
     },
     "RowEvolution": {
         "AvailableMetrics": "Tillgänglig statistik",
diff --git a/app/lang/tl.json b/app/lang/tl.json
index 845370d1f..810d22919 100644
--- a/app/lang/tl.json
+++ b/app/lang/tl.json
@@ -275,7 +275,6 @@
         "Remove": "Tanggalin",
         "Report": "Ulat",
         "ReportGeneratedFrom": "Ang ulat na ito ay binuo gamit ang data mula sa %s",
-        "ReportRatioTooltip": "Ang %1$s ay kumakatawan sa %2$s ng %3$s %4$s na may %5$s",
         "Reports": "Mga Ulat",
         "ReportsWillBeProcessedAtMostEveryHour": "Sa gayon ang mga ulat ay mapoproseso sa bawat oras.",
         "RequestTimedOut": "Ang kahilingan ng data sa %s ay nag-time out. Pakisubukang muli.",
diff --git a/app/lang/tr.json b/app/lang/tr.json
index 7b366814a..383d74e19 100644
--- a/app/lang/tr.json
+++ b/app/lang/tr.json
@@ -110,7 +110,7 @@
         "ComputedMetricCountWithValueDocumentation": "%s için bir değer atanmış kayıt sayısı",
         "ConfigFileIsNotWritable": "%1$s Matomo yapılandırma dosyası yazılabilir değil. Yaptığınız bazı değişiklikler kaydedilemeyebilir. %2$s Lütfen yapılandırma dosyasının izinlerini yazılabilir olarak değiştirin.",
         "Continue": "Devam",
-        "ContinueToPiwik": "Matomo Kullanmaya Başlayın",
+        "ContinueToPiwik": "Matomo Uygulamasını Kullanmaya Başlayın",
         "CurrentlyUsingUnsecureHttp": "Matomo uygulamasını güvenli olmayan HTTP bağlantısı üzerinden kullanıyorsunuz. Bu durum riskli olabilir. Matomo uygulamasını güvenli olarak kullanmak için SSL ile şifrelenmiş (HTTPS) bir bağlantı kullanmanız önerilir.",
         "CreatedByUser": "%s tarafından eklendi",
         "CurrentMonth": "Bu Ay",
@@ -210,7 +210,7 @@
         "ExportAsImage": "Görsel Olarak Dışa Aktar",
         "ExportThisReport": "Bu veri kümesini diğer biçimlerde dışa aktar",
         "Faq": "SSS",
-        "FileIntegrityWarning": "Dosya bütünlüğü sağlanamadı ve bazı sorunlar bildirildi. Sorunu çözüp başka bir sorun görüntülenmeyene kadar bu sayfayı yenilemelisiniz.",
+        "FileIntegrityWarning": "Dosya bütünlüğü sağlanamadı ve bazı sorunlar bildirildi. Bu sorunları çözdükten sonra hatanın giderildiğinden emin olmak için bu sayfayı yenileyin.",
         "FileIntegrityWarningReupload": "Aşağıdaki sorunlar, Matomo dosyalarının kısmen ya da tamamen yüklenememiş olmasından kaynaklanıyor olabilir.",
         "FileIntegrityWarningReuploadBis": "Matomo dosyalarını BINARY kipinde yeniden yüklemeyi deneyin.",
         "First": "İlk",
@@ -233,6 +233,7 @@
         "GraphHelp": "Matomo çizelgelerinin görüntülenmesi hakkında ayrıntılı bilgi.",
         "HelloUser": "Merhaba, %s!",
         "Help": "Yardım",
+        "HelpResources": "Yardım kaynakları",
         "HelpTranslatePiwik": "%1$sMatomo çevirilerini geliştirmemiz için%2$s bize yardımcı olmak ister misiniz?",
         "Hide": "gizle",
         "HoursMinutes": "%1$s saat %2$s dakika",
@@ -244,6 +245,7 @@
         "InvalidResponse": "Alınan veriler geçersiz.",
         "IP": "IP",
         "JsTrackingTag": "JavaScript İzleme Kodu",
+        "KpiMetric": "Anahtar Performans Ölçütü",
         "Language": "Dil",
         "Languages": "Diller",
         "LastDays": "Son %s gün (bugün dahil)",
@@ -302,6 +304,8 @@
         "OneVisit": "1 ziyaret",
         "OnlyEnterIfRequired": "Gerekiyorsa SMTP sunucusu kullanıcı adını yazın.",
         "OnlyEnterIfRequiredPassword": "Gerekiyorsa SMTP sunucusu parolasını yazın.",
+        "SmtpFromEmailHelp": "Varsayılan değer noreply@{etkialanı}, şeklindedir. {Etki alanı} yerine \"%1$s\" Matomo etki alanınız konulur.<br>E-postalar gönderilemez ise, ybu adresi SMTP kullanıcı adınıza uygun şekilde ayarlamanız gerekebilir.",
+        "NameShownInTheSenderColumn": "Kimden sütununda görüntülenecek ad",
         "OnlyUsedIfUserPwdIsSet": "Yalnız kullanıcı adı ya da parola yazılmış ise kullanılır. Hangi yöntemi kullanacağınızdan emin değilseniz hizmet sağlayıcınıza sorun.",
         "OpenSourceWebAnalytics": "özgür açık kaynaklı istatistik platformu",
         "OperationAtLeast": "En Az Şu Olan",
@@ -366,7 +370,7 @@
         "Remove": "Sil",
         "Report": "Rapor",
         "ReportGeneratedFrom": "Bu rapor %s verileri kullanılarak oluşturuldu.",
-        "ReportRatioTooltip": "'%1$s' temsili %2$s\/ %3$s %4$s %5$s ile.",
+        "ReportRatioTooltip": "'%1$s' temsili %2$s \/ %3$s %4$s %5$s diliminde %6$s ile.",
         "Reports": "Raporlar",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Raporlar her X saniyede arşivlensin",
         "RearchiveTimeIntervalOnlyForTodayReports": "Bu işlem yalnız bugünün raporlarını etkiler (ya da bugünü kapsayan tüm Tarih Aralıklarını)",
@@ -400,6 +404,8 @@
         "SmtpPort": "SMTP Kapı Numarası",
         "SmtpServerAddress": "SMTP Sunucu Adresi",
         "SmtpUsername": "SMTP Kullanıcı Adı",
+        "SmtpFromName": "SMTP kimden adı",
+        "SmtpFromAddress": "SMTP kimden adresi",
         "Source": "Kaynak",
         "StatisticsAreNotRecorded": "Matomo Ziyaretçi İzlemesi şu anda devre dışı! config\/config.ini.php dısyasındaki record_statistics seçeneğinin değerini 1 yaparak izlemeyi yeniden etkinleştirin.",
         "Subtotal": "Ara toplam",
@@ -414,7 +420,7 @@
         "ToDeleteAllFilesRunThisCommand": "Tüm bu dosyaları bir kerede silmek için şu komutu kullanabilirsiniz:",
         "Total": "Toplam",
         "Totals": "Toplamlar",
-        "TotalRatioTooltip": "%1$s \/ %2$s %3$s.",
+        "TotalRatioTooltip": "Bu %1$s \/ %2$s %3$s tamamı %4$s içinde.",
         "TotalRevenue": "Toplam Gelir",
         "TotalVisitsPageviewsActionsRevenue": "(Toplam: %1$s ziyaretçi, %2$s sayfa görüntüleme, %3$s işlem, %4$s gelir)",
         "TrackingScopeAction": "İşlem",
@@ -492,8 +498,20 @@
         "YouAreViewingDemoMessage": "%1$sMatomo%2$s tanıtımına bakıyorsunuz",
         "YouMustBeLoggedIn": "Bu özelliği kullanabilmek için oturumu açmalısınız.",
         "YourChangesHaveBeenSaved": "Değişiklikleriniz kaydedildi.",
+        "YourSessionHasExpired": "Bir süredir işlem yapmadığınızdan oturumunuz kapatıldı. Lütfen devam etmek için oturum açın.",
         "ThankYouForUsingMatomo": "Matomo kullandığınız için teşekkürler",
-        "TheMatomoTeam": "Matomo Ekibi"
+        "TheMatomoTeam": "Matomo Ekibi",
+        "PleaseTryAgain": "Lütfen yeniden deneyin",
+        "ComparisonRatioTooltip": "%3$s üzerindeki '%2$s' dilimine göre %1$s değişiklikliği var.",
+        "ComparisonCardTooltip1": "%2$s üzerindeki '%1$s' içinde tüm ziyaretlerin %3$s kadarı bulunuyor (toplam %4$s \/ %5$s).",
+        "ComparisonCardTooltip2": "Ziyaret sayısı %2$s ile %3$s karşılaştırıldığında %1$s kadar farklı.",
+        "VisualizationDoesNotSupportComparison": "Görselleştirmede dilim\/aralık karşılaştırması yapılamaz.",
+        "ChangeInX": "%1$s içindeki değişim",
+        "Comparisons": "Karşılaştırmalar",
+        "ClickToRemoveComp": "Bu karşılaştırmayı silmek için tıklayın.",
+        "MaximumNumberOfSegmentsComparedIs": "Aynı anda en fazla %s dilim karşılaştırılabilir.",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s sorgu parametresinin uzunluğu %2$s sorgu parametresinin uzunluğuna uygun olmalıdır.",
+        "MaximumNumberOfPeriodsComparedIs": "Aynı anda en fazla %s aralık karşılaştırılabilir."
     },
     "Mobile": {
         "AboutPiwikMobile": "Matomo Mobil Hakkında",
diff --git a/app/lang/uk.json b/app/lang/uk.json
index 2fb8a3217..f5f1b5f1b 100644
--- a/app/lang/uk.json
+++ b/app/lang/uk.json
@@ -342,7 +342,6 @@
         "Remove": "Видалити",
         "Report": "Звіт",
         "ReportGeneratedFrom": "Цей звіт був сформований з використанням даних: %s.",
-        "ReportRatioTooltip": "'%1$s' представляє %2$s з %3$s %4$s з %5$s.",
         "Reports": "Звіти",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "Архів звітів на кожні Х секунд",
         "RearchiveTimeIntervalOnlyForTodayReports": "Це впливає тільки на звіти (або інші Діапазони Дат включаючи сьогодні)",
@@ -388,7 +387,6 @@
         "ToDeleteAllDirectoriesRunThisCommand": "Щоб видалити всі ці каталоги відразу, ви можете виконати наступну команду:",
         "ToDeleteAllFilesRunThisCommand": "Для того, щоб видалити всі ці файли відразу, ви можете виконати наступну команду:",
         "Total": "Усього",
-        "TotalRatioTooltip": "Це %1$s з усіх %2$s %3$s.",
         "TotalRevenue": "Загальний прибуток",
         "TotalVisitsPageviewsActionsRevenue": "(Загалом: %1$s візити, %2$s перегляди сторінок, %3$s дії, %4$s виручка)",
         "TrackingScopeAction": "Дія",
diff --git a/app/lang/vi.json b/app/lang/vi.json
index 39e3c7cc0..60803754f 100644
--- a/app/lang/vi.json
+++ b/app/lang/vi.json
@@ -1,7 +1,7 @@
 {
     "General": {
-        "12HourClock": "Đồng hồ 12-tiếng",
-        "24HourClock": "Đồng hồ 24-tiếng",
+        "12HourClock": "Đồng hồ 12 giờ",
+        "24HourClock": "Đồng hồ 24 giờ",
         "AbandonedCarts": "giỏ hàng bị bỏ quên",
         "AboutPiwikX": "Giới thiệu Matomo %s",
         "Action": "Hành vi",
@@ -62,6 +62,7 @@
         "ColumnPageGenerationTime": "Thời gian tải trang",
         "ColumnKeyword": "Từ khóa",
         "ColumnLabel": "Nhãn",
+        "ColumnHits": "Lượt truy cập",
         "ColumnMaxActions": "Hoạt động tối đa trong một lần truy cập",
         "ColumnNbActions": "Hành động",
         "ColumnNbActionsDocumentation": "Số lượng của các hành động được thực hiện bởi khách truy cập của bạn. Hành động có thể là xem trang, tìm kiếm trang web nội bộ, tải về hay outlinks.",
@@ -85,9 +86,14 @@
         "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",
         "ComputedMetricSum": "Tổng %s",
+        "ComputedMetricMax": "Cao nhất %s",
+        "ComputedMetricMaxDocumentation": "Giá trị tối đa cho %s",
+        "ComputedMetricMin": "Thấp nhất %s",
+        "ComputedMetricMinDocumentation": "Giá trị tối thiểu cho %s",
+        "ComputedMetricUniqueCount": "Duy nhất %s",
         "ConfigFileIsNotWritable": "Tập tin cấu hình Matomo %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 Matomo",
+        "ContinueToPiwik": "Tiếp tục đến Matomo",
         "CurrentlyUsingUnsecureHttp": "Bạn hiện đang sử dụng Matomo qua kết nối HTTP không an toàn, điều này có thể gặp rủi ro. Chúng tôi khuyên bạn nên thiết lập Matomo để sử dụng SSL (HTTPS) để tăng cường bảo mật.",
         "CreatedByUser": "đã tạo bởi %s",
         "CurrentMonth": "Tháng này",
@@ -114,13 +120,13 @@
         "DefaultAppended": "(mặc định)",
         "Delete": "Xóa",
         "Description": "Mô tả",
-        "Desktop": "máy tính để bàn",
+        "Desktop": "Máy tính để bàn",
         "Details": "Chi tiết",
         "Discount": "Giảm giá",
         "DisplaySimpleTable": "Hiển thị bảng đơn giản",
         "DisplayTableWithGoalMetrics": "Hiển thị bảng các chỉ số tiêu chuẩn (goals metrics)",
         "DisplayTableWithMoreMetrics": "Hiển thị một bảng với nhiều số liệu",
-        "Documentation": "tài liệu hướng dẫn",
+        "Documentation": "Tài liệu hướng dẫn",
         "Donate": "Tặng",
         "Done": "Xong",
         "Download": "Tải xuống",
@@ -170,7 +176,7 @@
         "ExceptionWidgetNotFound": "Widget được yêu cầu không tồn tại.",
         "ExpandDataTableFooter": "Thay đổi kiểu trực quan hóa hoặc định cấu hình báo cáo",
         "Export": "Xuất",
-        "ExportAsImage": "Xuất ra dạng ảnh(Image)",
+        "ExportAsImage": "Xuất ra dạng ảnh",
         "ExportThisReport": "Xuất dữ liệu này với các định dạng khác",
         "Faq": "Câu hỏi thường gặp (FAQ)",
         "First": "Đầu tiên",
@@ -184,6 +190,7 @@
         "GiveUsYourFeedback": "Thông tin phản hồi cho chúng tôi!",
         "Goal": "Chỉ tiêu",
         "GoTo": "Tới %s",
+        "GoTo2": "Đi đến",
         "GraphHelp": "Thêm thông tin về hiển thị đồ thị trong Matomo.",
         "HelloUser": "Xin chào, %s!",
         "Help": "Giúp đỡ",
@@ -197,6 +204,7 @@
         "IP": "IP",
         "JsTrackingTag": "Mã theo dõi JavaScript",
         "Language": "Ngôn ngữ",
+        "Languages": "Ngôn ngữ",
         "LastDays": "%s ngày cuối cùng (tính cả hôm nay)",
         "LastDaysShort": "%s ngày cuối cùng",
         "Live": "Tồn tại",
@@ -217,7 +225,7 @@
         "MinutesSeconds": "%1$s phút %2$ss",
         "Mobile": "Di động",
         "Monthly": "Hàng tháng",
-        "MonthlyReport": "Hàng tháng",
+        "MonthlyReport": "hàng tháng",
         "MonthlyReports": "các báo cáo Hàng tháng",
         "More": "Thêm",
         "MoreDetails": "Xem chi tiết hơn",
@@ -279,6 +287,8 @@
         "Password": "Mật khẩu",
         "Period": "Giai đoạn",
         "Piechart": "Biểu đồ hình tròn",
+        "Print": "In",
+        "Profiles": "Hồ sơ",
         "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s sẵn sàng sử dụng. %2$s Hãy cập nhật ngay !%3$s (xem %4$s thay đổi %5$s).",
         "PleaseSpecifyValue": "Hãy xác định một giá trị cho '%s'.",
         "PleaseUpdatePiwik": "Vui lòng cập nhật Matomo của bạn",
@@ -310,7 +320,8 @@
         "ReportsWillBeProcessedAtMostEveryHour": "Vì thế các báo cáo sẽ được xử lý ở mỗi giờ.",
         "RequestTimedOut": "Một yêu cầu dữ liệu tới %s đã time out. xin thử lại.",
         "Required": "%s yêu cầu",
-        "ReturningVisitor": "Người quay lại",
+        "Required2": "Bắt buộc",
+        "ReturningVisitor": "Người dùng quay lại",
         "ReturningVisitorAllVisits": "Xem tất cả các lượt truy cập",
         "RowEvolutionRowActionTooltip": "Xem cách các só liệu dòng này đã thay đổi theo thời gian",
         "RowEvolutionRowActionTooltipTitle": "Sự phát triển hàng mở",
@@ -329,7 +340,7 @@
         "Show": "Hiển thị",
         "SingleWebsitesDashboard": "Bảng điều khiển website",
         "SmallTrafficYouCanLeaveDefault": "Dành cho các trang web lưu lượng truy cập nhỏ, bạn có thể để mặc định %s giây, và truy cập tất cả các báo cáo trong thời gian thực.",
-        "SmtpEncryption": "Mã hóa SMTP",
+        "SmtpEncryption": "Chế độ mã hóa SMTP",
         "SmtpPassword": "Mật khẩu SMTP",
         "SmtpPort": "Cổng SMTP",
         "SmtpServerAddress": "Địa chỉ máy chủ SMTP",
@@ -345,6 +356,7 @@
         "TimeFormat": "Định dạng thời gian",
         "TimeOnPage": "Thời điểm trên trang",
         "Total": "Tổng",
+        "Totals": "Tổng cộng",
         "TotalRevenue": "Tổng doanh thu",
         "TotalVisitsPageviewsActionsRevenue": "(Tổng: %1$s lượt truy cập, %2$s lượt xem trang, %3$s hành động, %4$s doanh thu)",
         "TrackingScopeAction": "Hành động",
@@ -358,6 +370,7 @@
         "Upload": "Tải lên",
         "UsePlusMinusIconsDocumentation": "Sử dụng các biểu tượng cộng và trừ ở bên trái để di chuyển.",
         "UserId": "ID người dùng",
+        "UserIds": "ID người dùng",
         "Username": "Tên truy nhập",
         "UseSMTPServerForEmail": "Sử dụng máy chủ SMTP cho e-mail",
         "Value": "Giá trị",
@@ -365,6 +378,7 @@
         "View": "Xem",
         "ViewDocumentationFor": "Hiển thị tài liệu cho %1$s",
         "Visit": "Truy cập",
+        "VisitId": "ID truy cập",
         "VisitConvertedGoal": "Truy cập đã chuyển đổi ít nhất một mục tiêu",
         "VisitConvertedGoalId": "Truy cập đã chuyển đổi một Goal ID cụ thể",
         "VisitConvertedNGoals": "Truy cập đã chuyển đổi %s mục tiêu",
@@ -372,13 +386,18 @@
         "Visitor": "Người truy cập",
         "VisitorID": "ID người truy cập",
         "VisitorIP": "IP người truy cập",
+        "VisitorIPs": "IP khách truy cập",
         "Visitors": "Lượng truy cập",
         "VisitsWith": "Lượng truy cập với %s",
         "VisitorSettings": "Thiết lập lượt truy cập",
         "VisitType": "Loại ghé thăm",
         "VisitTypeExample": "Lấy ví dụ, để chọn tất cả những người truy cập đã quay lại website, bao gồm cả những người đã mua thứ gì đó trong những lượt truy cập trước, yêu cầu API có thể chứa %s",
         "Warning": "Cảnh báo",
+        "Warnings": "Các cảnh báo",
+        "ValidatorErrorEmptyValue": "Cần nhập giá trị",
+        "ValidatorErrorNotANumber": "Giá trị không phải là số",
         "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.",
+        "WarningFileIntegrityNoManifestDeployingFromGit": "Nếu bạn triển khai Matomo từ Git, thông báo này là bình thường.",
         "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": "%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",
@@ -387,6 +406,7 @@
         "WeeklyReports": "Các báo cáo hàng tuần",
         "WellDone": "Thực hiện tốt",
         "Widgets": "Các Widget",
+        "Widget": "Tiện ích",
         "XComparedToY": "%1$s So với %2$s",
         "XFromY": "%1$s từ %2$s",
         "YearlyReport": "Hàng năm",
@@ -394,8 +414,12 @@
         "YearsDays": "%1$s năm %2$s ngày",
         "Yes": "Có",
         "YouAreCurrentlyUsing": "Bạn đang sử dụng Matomo %s.",
+        "YouAreViewingDemoMessage": "Bạn đang xem thử %1$sMatomo%2$s",
         "YouMustBeLoggedIn": "Bạn phải đăng nhập để truy cập chức năng này.",
-        "YourChangesHaveBeenSaved": "Các thay đổi của bạn đã được lưu."
+        "YourChangesHaveBeenSaved": "Các thay đổi của bạn đã được lưu.",
+        "ThankYouForUsingMatomo": "Cảm ơn bạn đã xử dụng Matomo",
+        "TheMatomoTeam": "Nhóm Matomo",
+        "PleaseTryAgain": "Vui lòng thử lại"
     },
     "Mobile": {
         "AboutPiwikMobile": "Giới thiệu Matomo Mobile",
@@ -412,7 +436,7 @@
         "ChooseMetric": "Chọn số liệu",
         "ChooseReport": "Chọn một báo cáo",
         "ChooseSegment": "Chọn khung",
-        "ConfirmRemoveAccount": "Bạn có muốn loại bỏ tài khoản này không?",
+        "ConfirmRemoveAccount": "Bạn có muốn xóa bỏ tài khoản này không?",
         "DefaultReportDate": "Ngày báo cáo",
         "EmailUs": "Gửi mail cho chúng tôi",
         "EnableGraphsLabel": "Hiển thị các đồ thị",
@@ -466,7 +490,7 @@
         "UseSearchBarHint": "Chỉ trang web %s đầu tiên được hiển thị ở đây. Vui lòng sử dụng thanh tìm kiếm để truy cập vào các trang web khác của bạn.",
         "VerifyAccount": "Xác minh tài khoản",
         "ValidateSslCertificate": "Xác nhận chứng chỉ SSL",
-        "VerifyLoginData": "Hãy chắc chắn tên và mật khẩu người dùng kết hợp là chính xác.",
+        "VerifyLoginData": "Hãy chắc chắn tên và mật khẩu người dùng là hợp lệ.",
         "YouAreOffline": "Xin lỗi, hiện bạn đang offline"
     },
     "RowEvolution": {
diff --git a/app/lang/zh-cn.json b/app/lang/zh-cn.json
index 9ca3f30ef..1c563b887 100644
--- a/app/lang/zh-cn.json
+++ b/app/lang/zh-cn.json
@@ -95,6 +95,7 @@
         "ComputedMetricAverageDocumentation": "每个%2$s%1$s的平均值",
         "ComputedMetricAverageShortDocumentation": "%1$s的平均值",
         "ComputedMetricRate": "%s百分比",
+        "ComputedMetricRateDocumentation": "所有“%2$s”中的“%1$s”的比率。",
         "ComputedMetricRateShortDocumentation": "%1$s的百分比",
         "ComputedMetricCountDocumentation": "%s的数量",
         "ComputedMetricSum": "总占比%s",
@@ -106,6 +107,7 @@
         "ComputedMetricUniqueCount": "独立%s",
         "ComputedMetricUniqueCountDocumentation": "%s的唯一值",
         "ComputedMetricCountWithValue": "带%s的条目",
+        "ComputedMetricCountWithValueDocumentation": "为%s设置值的条目数",
         "ConfigFileIsNotWritable": "Matomo 配置文件 %1$s 无法写入，无法保存部分修改。%2$s 请修改配置文件的权限为可写。",
         "Continue": "继续",
         "ContinueToPiwik": "继续使用Matomo",
@@ -175,6 +177,7 @@
         "ExceptionInvalidAggregateReportsFormat": "汇总报表格式 '%1$s' 不正确，请用下面的代替: %2$s。",
         "ExceptionInvalidArchiveTimeToLive": "今日处理时间必须是一个大于 0 的秒数",
         "ExceptionInvalidDateFormat": "日期格式必须为: %1$s 或任何被 %2$s 函数支持的关键字 (详情查看%3$s)",
+        "ExceptionInvalidDateBeforeFirstWebsite": "日期%1$s是第一个网站联机之前的日期。尝试%2$s之后的日期（时间戳%3$s）。",
         "ExceptionInvalidDateRange": "时间段 '%1$s' 不正确，格式应为: %2$s。",
         "ExceptionInvalidPeriod": "目前不支持 '%1$s' ，尝试下面的选择: %2$s",
         "ExceptionInvalidRendererFormat": "'%1$s' 是不合法的。尝试以下任一来取代: %2$s 。",
@@ -193,6 +196,8 @@
         "ExceptionNonceMismatch": "无法验证此表单的安全性。",
         "ExceptionPrivilege": "您无法存取这个资源，必须要一个 %s 权限。",
         "ExceptionPrivilegeAccessWebsite": "您不能访问此处的资源。该访问需要网站ID为%d的%s权限。",
+        "ExceptionCapabilityAccessWebsite": "您无法访问此资源，因为它需要%s功能，网站ID为%d。",
+        "ExceptionPrivilegeAtLeastOneWebsite": "您无法访问此资源，因为至少有一个网站需要%s访问权限。",
         "ExceptionUnableToStartSession": "无法启动会话",
         "ExceptionUndeletableFile": "无法刪除 %s",
         "ExceptionUnreadableFileDisabledMethod": "配置文件 {%1$s} 无法读取。您的主机可能禁用 %2$s。",
@@ -228,6 +233,7 @@
         "GraphHelp": "更多关于 Matomo 显示图表的资讯",
         "HelloUser": "您好，%s！",
         "Help": "帮助",
+        "HelpResources": "帮助资源",
         "HelpTranslatePiwik": "也许你想%1$s帮助我们改进Matomo翻译%2$s？",
         "Hide": "隐藏",
         "HoursMinutes": "%1$s 小时 %2$s 分",
@@ -239,6 +245,7 @@
         "InvalidResponse": "接收到的数据无效。",
         "IP": "IP",
         "JsTrackingTag": "JavaScript 跟踪代码",
+        "KpiMetric": "KPI指标",
         "Language": "语言",
         "Languages": "语言",
         "LastDays": "最近 %s 天 (包括今天)",
@@ -297,6 +304,8 @@
         "OneVisit": "1 次访问",
         "OnlyEnterIfRequired": "在您的 SMTP 服务器需要用户名时才需要输入",
         "OnlyEnterIfRequiredPassword": "在您的 SMTP 服务器需要密码时才需要输入",
+        "SmtpFromEmailHelp": "默认为noreply @ {DOMAIN}，其中{DOMAIN}将替换为Matomo域“%1$s”。<br>如果您发送邮件不起作用，则可能需要设置此地址以匹配SMTP用户名。",
+        "NameShownInTheSenderColumn": "发件人列中显示的名称",
         "OnlyUsedIfUserPwdIsSet": "设定用户名\/密码后才生效，如果您不确定使用何种方法，请询问您的服务商。",
         "OpenSourceWebAnalytics": "开源网站流量分析工具",
         "OperationAtLeast": "至少",
@@ -322,12 +331,15 @@
         "OverlayRowActionTooltipTitle": "显示页面叠加",
         "Overview": "概览",
         "Pages": "页面",
+        "Pagination": "%1$s–%3$s的%2$s",
+        "PaginationWithoutTotal": "%1$s–%2$s",
         "ParameterMustIntegerBetween": "参数 %1$s 必须为介于 %2$s 和 %3$s 之间的整数",
         "Password": "密码",
         "Period": "统计时间",
         "Piechart": "圆饼图",
         "Print": "打印",
         "Profiles": "简介",
+        "MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s，以前称为Piwik是%7$sMatomo团队%8$s的成员以及全球其他许多贡献者为您带来的一个协作项目。<br\/>如果您是Matomo的粉丝，可以提供帮助：了解%3$s如何参与Matomo%4$s或%5$s现在捐赠%6$s以帮助资助Matomo的下一个发行！",
         "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s可用。请通知%2$sMatomo管理员%3$s。",
         "PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s 已经发布。 %2$s 请立即更新！%3$s (查看 %4$s 与%5$s 的差异)。",
         "PleaseContactYourPiwikAdministrator": "请联系您的 Matomo 管理员",
@@ -358,7 +370,7 @@
         "Remove": "删除",
         "Report": "访客报表",
         "ReportGeneratedFrom": "报表数据的时间段是 %s",
-        "ReportRatioTooltip": "'%1$s' 代表 %2$s of %3$s %4$s和 %5$s.",
+        "ReportRatioTooltip": "'%1$s'代表分段%5$s中%3$s %4$s中的%2$s与%6$s。",
         "Reports": "报表",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "最多每X秒进行归档报告",
         "RearchiveTimeIntervalOnlyForTodayReports": "这只会影响今天的报告（或任何其他日期范围包括今天）",
@@ -392,6 +404,8 @@
         "SmtpPort": "SMTP 端口",
         "SmtpServerAddress": "SMTP 服务器地址",
         "SmtpUsername": "SMTP 用户",
+        "SmtpFromName": "名称中的SMTP",
+        "SmtpFromAddress": "来自地址的SMTP",
         "Source": "来源",
         "StatisticsAreNotRecorded": "Matomo 访客跟踪已禁用! 在 config\/config.ini.php 文件中设置 record_statistics = 1 启用跟踪",
         "Subtotal": "小计",
@@ -405,7 +419,8 @@
         "ToDeleteAllDirectoriesRunThisCommand": "要一次性删除这些目录，你可以运行此命令：",
         "ToDeleteAllFilesRunThisCommand": "要一次性删除这些文件，你可以运行此命令：",
         "Total": "总额",
-        "TotalRatioTooltip": "This is %1$s of all %2$s %3$s.",
+        "Totals": "总计",
+        "TotalRatioTooltip": "这个%1$s在所有%2$s%3$s的%4$s中。",
         "TotalRevenue": "订单总额",
         "TotalVisitsPageviewsActionsRevenue": "(总访问量: %1$s 访问者, %2$s 浏览量, %3$s 活动者, %4$s 收入)",
         "TrackingScopeAction": "活动",
@@ -438,6 +453,7 @@
         "VisitorIPs": "访客IP",
         "Visitors": "访客分析",
         "VisitsWith": "有%s的访客",
+        "VisitorFingerprint": "指纹",
         "VisitorSettings": "访客设置",
         "VisitType": "访问者类型",
         "VisitTypes": "访客类型",
@@ -449,6 +465,17 @@
         "YouMustUpgradePhpVersionToReceiveLatestPiwik": "您需要升级您的 PHP 版本才能接收最新的 Matomo 更新。",
         "PiwikCannotBeUpgradedBecausePhpIsTooOld": "您当前的 PHP 版本不兼容最新的 Matomo。",
         "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "请您将 PHP 版本升级到 %s 以上，以便保持您的 Matomo 统计数据安全。",
+        "ValidatorErrorEmptyValue": "请提供一个值。",
+        "ValidatorErrorNotANumber": "不是正确的数字。",
+        "ValidatorErrorNumberTooLow": "值%1$s太低。值必须至少为%2$s。",
+        "ValidatorErrorNumberTooHigh": "值%1$s太高。值最多应为%2$s。",
+        "ValidatorErrorCharacterTooShort": "该值包含%1$s个字符，但至少需要包含%2$s个字符。",
+        "ValidatorErrorCharacterTooLong": "该值包含%1$s个字符，但最多应包含%2$s个字符。",
+        "ValidatorErrorNotUrlLike": "%s不是一个正确的URL格式。",
+        "ValidatorErrorNotEmailLike": "%s不是一个有效的email地址。",
+        "ValidatorErrorNoValidRegex": "%s不是一个有效的正则表达式。",
+        "ValidatorErrorXNotWhitelisted": "不允许值%1$s，请使用下列值之一：%2$s。",
+        "ValidatorErrorInvalidDateTimeFormat": "日期%1$s的格式不正确，请使用%2$s",
         "WarningFileIntegrityNoManifest": "缺少 manifest.inc.php，所以文件完整性检查无法完成。",
         "WarningFileIntegrityNoManifestDeployingFromGit": "如果从Git的部署Matomo，此消息是正常的。",
         "WarningFileIntegrityNoMd5file": "缺少 md5_file() 函数，所以文件完整性检查无法完成。",
@@ -468,8 +495,23 @@
         "YearsDays": "%1$s 年 %2$s 天",
         "Yes": "是",
         "YouAreCurrentlyUsing": "您正在使用 Matomo %s.",
+        "YouAreViewingDemoMessage": "您正在观看%1$sMatomo%2$s的演示",
         "YouMustBeLoggedIn": "您必须登录才能使用这个功能。",
-        "YourChangesHaveBeenSaved": "修改已保存。"
+        "YourChangesHaveBeenSaved": "修改已保存。",
+        "YourSessionHasExpired": "您的会话因不活动而过期。 请登录访问更多内容。",
+        "ThankYouForUsingMatomo": "感谢您使用Matomo",
+        "TheMatomoTeam": "Matomo 团队",
+        "PleaseTryAgain": "请再试一次",
+        "ComparisonRatioTooltip": "与%3$s的“ %2$s”细分相比，这是%1$s的变化。",
+        "ComparisonCardTooltip1": "%2$s上的“ %1$s”包含所有访问中的%3$s个（总共%5$s个访问中的%4$s个）。",
+        "ComparisonCardTooltip2": "访问次数相差%1$s，而%3$s则相差%2$s。",
+        "VisualizationDoesNotSupportComparison": "此可视化不支持段\/期间比较。",
+        "ChangeInX": "换%1$s",
+        "Comparisons": "比较",
+        "ClickToRemoveComp": "单击以删除此比较。",
+        "MaximumNumberOfSegmentsComparedIs": "可同时比较的最大细分数为%s。",
+        "CompareDatesParamMustMatchComparePeriods": "%1$s查询参数长度必须匹配%2$s查询参数长度。",
+        "MaximumNumberOfPeriodsComparedIs": "可同时比较的最大周期数为%s。"
     },
     "Mobile": {
         "AboutPiwikMobile": "关于 Matomo 移动版",
diff --git a/app/lang/zh-tw.json b/app/lang/zh-tw.json
index cec1a086a..eb790e0a5 100644
--- a/app/lang/zh-tw.json
+++ b/app/lang/zh-tw.json
@@ -363,7 +363,6 @@
         "Remove": "移除",
         "Report": "報表",
         "ReportGeneratedFrom": "這個報表使用 %s 產生資料。",
-        "ReportRatioTooltip": "「%1$s」代表 %5$s 中 %3$s %4$s 的 %2$s。",
         "Reports": "報表",
         "ReportsContainingTodayWillBeProcessedAtMostEvery": "每隔 X 秒自動彙整報表",
         "RearchiveTimeIntervalOnlyForTodayReports": "這個只影響今日的報表（或其他包含今日的日期範圍）",
@@ -411,7 +410,6 @@
         "ToDeleteAllFilesRunThisCommand": "要一次刪除這些檔案，你可以執行這個指令：",
         "Total": "總計",
         "Totals": "總計",
-        "TotalRatioTooltip": "這是全部 %2$s %3$s 的 %1$s。",
         "TotalRevenue": "總收益",
         "TotalVisitsPageviewsActionsRevenue": "（總計：%1$s 訪問數、%2$s 瀏覽數、%3$s 活動數、%4$s 收益）",
         "TrackingScopeAction": "操作",
diff --git a/app/libs/HTML/QuickForm2.php b/app/libs/HTML/QuickForm2.php
index 48d10de07..e3b768c39 100644
--- a/app/libs/HTML/QuickForm2.php
+++ b/app/libs/HTML/QuickForm2.php
@@ -106,7 +106,7 @@ public function __construct($id, $method = 'post', $attributes = null, $trackSub
                               'post' == $method && (!empty($_POST) || !empty($_FILES))))
         {
             $this->addDataSource(new HTML_QuickForm2_DataSource_SuperGlobal(
-                $method, get_magic_quotes_gpc()
+                $method, False
             ));
         }
         if ($trackSubmit) {
diff --git a/app/libs/Zend/Session.php b/app/libs/Zend/Session.php
index 38c8a1ba8..73668507a 100644
--- a/app/libs/Zend/Session.php
+++ b/app/libs/Zend/Session.php
@@ -479,14 +479,14 @@ public static function start($options = false)
                 restore_error_handler();
             }
 
-            if (!$startedCleanly || Zend_Session_Exception::$sessionStartError != null) {
+            if (!$startedCleanly || !empty(Zend_Session_Exception::$sessionStartError)) {
                 if (self::$_throwStartupExceptions) {
                     set_error_handler(array('Zend_Session_Exception', 'handleSilentWriteClose'), $errorLevel);
                 }
                 session_write_close();
                 if (self::$_throwStartupExceptions) {
                     restore_error_handler();
-                    throw new Zend_Session_Exception(__CLASS__ . '::' . __FUNCTION__ . '() - ' . Zend_Session_Exception::$sessionStartError);
+                    throw new Zend_Session_Exception(__CLASS__ . '::' . __FUNCTION__ . '() - ' . Zend_Session_Exception::$sessionStartError . ' Warnings: ' . Zend_Session_Exception::$sessionStartWarning);
                 }
             }
         }
diff --git a/app/libs/Zend/Session/Exception.php b/app/libs/Zend/Session/Exception.php
index bc82cb02a..d48a099e1 100644
--- a/app/libs/Zend/Session/Exception.php
+++ b/app/libs/Zend/Session/Exception.php
@@ -43,7 +43,8 @@ class Zend_Session_Exception extends Zend_Exception
      * @see http://framework.zend.com/issues/browse/ZF-1325
      * @var string PHP Error Message
      */
-    static public $sessionStartError = null;
+    static public $sessionStartError = '';
+    static public $sessionStartWarning = '';
 
     /**
      * handleSessionStartError() - interface for set_error_handler()
@@ -55,10 +56,12 @@ class Zend_Session_Exception extends Zend_Exception
      */
     static public function handleSessionStartError($errno, $errstr, $errfile, $errline, $errcontext)
     {
-    	if (!isset(self::$sessionStartError)) {
-		    self::$sessionStartError = '';
+    	$message = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr;
+    	if (E_ERROR === $errno || E_CORE_ERROR === $errno || E_COMPILE_ERROR === $errno) {
+		    self::$sessionStartError .= $message . ' ';
+	    } else {
+		    self::$sessionStartWarning .= $message . ' ';
 	    }
-        self::$sessionStartError .= $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr;
     }
 
     /**
diff --git a/app/libs/bower_components/angular-animate/bower.json b/app/libs/bower_components/angular-animate/bower.json
deleted file mode 100644
index fecf3a8aa..000000000
--- a/app/libs/bower_components/angular-animate/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "angular-animate",
-  "version": "1.6.5",
-  "license": "MIT",
-  "main": "./angular-animate.js",
-  "ignore": [],
-  "dependencies": {
-    "angular": "1.6.5"
-  }
-}
diff --git a/app/libs/bower_components/angular-animate/package.json b/app/libs/bower_components/angular-animate/package.json
deleted file mode 100644
index ab819a4e2..000000000
--- a/app/libs/bower_components/angular-animate/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "angular-animate",
-  "version": "1.6.5",
-  "description": "AngularJS module for animations",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.js.git"
-  },
-  "keywords": [
-    "angular",
-    "framework",
-    "browser",
-    "animation",
-    "client-side"
-  ],
-  "author": "Angular Core Team <angular-core+npm@google.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular.js/issues"
-  },
-  "homepage": "http://angularjs.org",
-  "jspm": {
-    "shim": {
-      "angular-animate": {
-        "deps": ["angular"]
-      }
-    }
-  }
-}
diff --git a/app/libs/bower_components/angular-cookies/bower.json b/app/libs/bower_components/angular-cookies/bower.json
deleted file mode 100644
index 23b6be021..000000000
--- a/app/libs/bower_components/angular-cookies/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "angular-cookies",
-  "version": "1.6.5",
-  "license": "MIT",
-  "main": "./angular-cookies.js",
-  "ignore": [],
-  "dependencies": {
-    "angular": "1.6.5"
-  }
-}
diff --git a/app/libs/bower_components/angular-cookies/package.json b/app/libs/bower_components/angular-cookies/package.json
deleted file mode 100644
index 193979091..000000000
--- a/app/libs/bower_components/angular-cookies/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "angular-cookies",
-  "version": "1.6.5",
-  "description": "AngularJS module for cookies",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.js.git"
-  },
-  "keywords": [
-    "angular",
-    "framework",
-    "browser",
-    "cookies",
-    "client-side"
-  ],
-  "author": "Angular Core Team <angular-core+npm@google.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular.js/issues"
-  },
-  "homepage": "http://angularjs.org",
-  "jspm": {
-    "shim": {
-      "angular-cookies": {
-        "deps": ["angular"]
-      }
-    }
-  }
-}
diff --git a/app/libs/bower_components/angular-mocks/bower.json b/app/libs/bower_components/angular-mocks/bower.json
deleted file mode 100644
index da2000029..000000000
--- a/app/libs/bower_components/angular-mocks/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "angular-mocks",
-  "version": "1.6.5",
-  "license": "MIT",
-  "main": "./angular-mocks.js",
-  "ignore": [],
-  "dependencies": {
-    "angular": "1.6.5"
-  }
-}
diff --git a/app/libs/bower_components/angular-mocks/package.json b/app/libs/bower_components/angular-mocks/package.json
deleted file mode 100644
index 80475f425..000000000
--- a/app/libs/bower_components/angular-mocks/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "angular-mocks",
-  "version": "1.6.5",
-  "description": "AngularJS mocks for testing",
-  "main": "angular-mocks.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.js.git"
-  },
-  "keywords": [
-    "angular",
-    "framework",
-    "browser",
-    "mocks",
-    "testing",
-    "client-side"
-  ],
-  "author": "Angular Core Team <angular-core+npm@google.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular.js/issues"
-  },
-  "homepage": "http://angularjs.org",
-  "jspm": {
-    "shim": {
-      "angular-mocks": {
-        "deps": ["angular"]
-      }
-    }
-  }
-}
diff --git a/app/libs/bower_components/angular-sanitize/bower.json b/app/libs/bower_components/angular-sanitize/bower.json
deleted file mode 100644
index c024ed7d9..000000000
--- a/app/libs/bower_components/angular-sanitize/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "angular-sanitize",
-  "version": "1.6.5",
-  "license": "MIT",
-  "main": "./angular-sanitize.js",
-  "ignore": [],
-  "dependencies": {
-    "angular": "1.6.5"
-  }
-}
diff --git a/app/libs/bower_components/angular-sanitize/package.json b/app/libs/bower_components/angular-sanitize/package.json
deleted file mode 100644
index fa5a3232a..000000000
--- a/app/libs/bower_components/angular-sanitize/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "angular-sanitize",
-  "version": "1.6.5",
-  "description": "AngularJS module for sanitizing HTML",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.js.git"
-  },
-  "keywords": [
-    "angular",
-    "framework",
-    "browser",
-    "html",
-    "client-side"
-  ],
-  "author": "Angular Core Team <angular-core+npm@google.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular.js/issues"
-  },
-  "homepage": "http://angularjs.org",
-  "jspm": {
-    "shim": {
-      "angular-sanitize": {
-        "deps": ["angular"]
-      }
-    }
-  }
-}
diff --git a/app/libs/bower_components/angular/bower.json b/app/libs/bower_components/angular/bower.json
deleted file mode 100644
index 18333fa6a..000000000
--- a/app/libs/bower_components/angular/bower.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "angular",
-  "version": "1.6.5",
-  "license": "MIT",
-  "main": "./angular.js",
-  "ignore": [],
-  "dependencies": {
-  }
-}
diff --git a/app/libs/bower_components/angular/package.json b/app/libs/bower_components/angular/package.json
deleted file mode 100644
index 445d290f9..000000000
--- a/app/libs/bower_components/angular/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "angular",
-  "version": "1.6.5",
-  "description": "HTML enhanced for web apps",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular.js.git"
-  },
-  "keywords": [
-    "angular",
-    "framework",
-    "browser",
-    "client-side"
-  ],
-  "author": "Angular Core Team <angular-core+npm@google.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular.js/issues"
-  },
-  "homepage": "http://angularjs.org"
-}
diff --git a/app/libs/bower_components/chroma-js/bower.json b/app/libs/bower_components/chroma-js/bower.json
deleted file mode 100644
index c27902351..000000000
--- a/app/libs/bower_components/chroma-js/bower.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "chroma-js",
-  "description": "JavaScript library for color conversions",
-  "version": "0.5.6",
-  "main": [
-    "./chroma.js"
-  ],
-  "ignore": [
-    "doc",
-    "src",
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "homepage": "https://github.com/gka/chroma.js",
-  "authors": [
-    "Gregor Aisch <contact@vis4.net>"
-  ],
-  "keywords": [
-    "color",
-    "scale",
-    "gradient",
-    "scheme",
-    "rgb",
-    "hsv",
-    "hsl",
-    "css",
-    "lch",
-    "lab"
-  ],
-  "license": "MIT"
-}
diff --git a/app/libs/bower_components/chroma-js/package.json b/app/libs/bower_components/chroma-js/package.json
deleted file mode 100644
index 648da55b2..000000000
--- a/app/libs/bower_components/chroma-js/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "chroma-js",
-  "description": "JavaScript library for color conversions",
-  "version": "0.6.1",
-  "author": "Gregor Aisch",
-  "homepage": "https://github.com/gka/chroma.js",
-  "keywords": [
-    "color"
-  ],
-  "maintainers": [
-    {
-      "name": "Klemen Slavič",
-      "email": "klemen@celtra.com",
-      "web": "http://about.me/klemen.slavic"
-    },
-    {
-      "name": "Gregor Aisch",
-      "email": "mail@driven-by-data.net",
-      "web": "http://driven-by-data.net"
-    }
-  ],
-  "bugs": "https://github.com/gka/chroma.js/issues",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/gka/chroma.js.git"
-  },
-  "main": "chroma.js",
-  "scripts": {
-    "test": "vows; echo"
-  },
-  "devDependencies": {
-    "coffee-script": "1.2",
-    "es6-shim": "^0.18.0",
-    "uglify-js": "2.x",
-    "vows": "0.7.x"
-  }
-}
diff --git a/app/libs/bower_components/iframe-resizer/bower.json b/app/libs/bower_components/iframe-resizer/bower.json
deleted file mode 100644
index 374949598..000000000
--- a/app/libs/bower_components/iframe-resizer/bower.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "iframe-resizer",
-  "version": "3.5.5",
-  "homepage": "https://github.com/davidjbradshaw/iframe-resizer",
-  "authors": [
-    "David J. Bradshaw <dave@bradshaw.net>"
-  ],
-  "description": "Responsively keep same and cross domain iFrames sized to their content with support for window/content resizing, multiple and nested iFrames. (Dependacy free and works with IE8+)",
-  "main": [
-    "js/iframeResizer.js",
-    "js/iframeResizer.contentWindow.js"
-  ],
-  "keywords": [
-    "CrossDomain",
-    "Cross-Domain",
-    "iFrame",
-    "Resizing",
-    "Resizer",
-    "postMessage",
-    "content",
-    "resize",
-    "height",
-    "autoheight",
-    "auto-height",
-    "iframe-auto-height",
-    "height-iframe",
-    "heightiframe",
-    "width",
-    "mutationObserver",
-    "RWD",
-    "responsive",
-    "responsiveiframes",
-    "responsive-iframes"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "example",
-    "test",
-    "gruntfile.js",
-    "*.md",
-    "*.json"
-  ],
-  "dependencies": {},
-  "devDependencies": {}
-}
diff --git a/app/libs/bower_components/jQuery.dotdotdot/bower.json b/app/libs/bower_components/jQuery.dotdotdot/bower.json
deleted file mode 100644
index 35e3547cb..000000000
--- a/app/libs/bower_components/jQuery.dotdotdot/bower.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "jQuery.dotdotdot",
-  "main": "src/js/jquery.dotdotdot.js",
-  "version": "1.7.4",
-  "homepage": "http://dotdotdot.frebsite.nl/",
-  "authors": [
-    "Fred Heusschen <info@frebsite.nl>"
-  ],
-  "description": "A jQuery plugin for advanced cross-browser ellipsis on multiple line content.",
-  "keywords": [
-    "ellipsis",
-    "dotdotdot",
-    "multiline",
-    "text",
-    "text-overflow",
-    "overflow",
-    "dots"
-  ],
-  "ignore": [
-    ".jshintrc",
-    "Guardfile",
-    "index.html",
-    "*.json",
-    "README.md"
-  ],
-  "dependencies": {
-    "jquery": ">= 1.4.3"
-  }
-}
diff --git a/app/libs/bower_components/jScrollPane/bower.json b/app/libs/bower_components/jScrollPane/bower.json
deleted file mode 100644
index 4f95e89f1..000000000
--- a/app/libs/bower_components/jScrollPane/bower.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"name": "jScrollPane",
-	"license": [
-		"MIT",
-		"GPL-2.0"
-	],
-	"main": [
-		"./script/jquery.mousewheel.js",
-		"./script/mwheelIntent.js",
-		"./script/jquery.jscrollpane.js",
-		"./script/jquery.jscrollpane.min.js",
-		"./style/jquery.jscrollpane.css"
-	],
-	"dependencies": {
-		"jquery": "latest"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/vitch/jScrollPane.git"
-	}
-}
diff --git a/app/libs/bower_components/jScrollPane/build/package.json b/app/libs/bower_components/jScrollPane/build/package.json
deleted file mode 100644
index 781719b1d..000000000
--- a/app/libs/bower_components/jScrollPane/build/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "jScrollPane-build",
-  "description": "Keep track of what you spend",
-  "version": "0.1.0",
-  "homepage": "http://jscrollpane.kelvinluck.com",
-  "author": {
-    "name": "Kelvin Luck",
-    "email": "git+jsp@kelvinluck.com"
-  },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://github.com/haggerstonjs/blob/master/LICENSE-MIT"
-    }
-  ],
-  "main": "Gruntfile.js",
-  "engines": {
-    "node": ">= 0.8.0"
-  },
-  "dependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-uglify": "~0.2.0"
-  },
-  "devDependencies": {
-    "grunt-contrib-connect": "~0.2.0",
-    "grunt-contrib-watch": "~0.2.0"
-  },
-  "peerDependencies": {},
-  "keywords": []
-}
diff --git a/app/libs/bower_components/jScrollPane/image/logo.png b/app/libs/bower_components/jScrollPane/image/logo.png
deleted file mode 100644
index f57fc4e6b..000000000
Binary files a/app/libs/bower_components/jScrollPane/image/logo.png and /dev/null differ
diff --git a/app/libs/bower_components/jScrollPane/style/demo.css b/app/libs/bower_components/jScrollPane/style/demo.css
deleted file mode 100644
index 1dab4a95d..000000000
--- a/app/libs/bower_components/jScrollPane/style/demo.css
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * CSS Styles that are used on the jScrollPane demo site - these are custom to the site and
- * you shouldn't need to use them in your own implementations of jScrollPane.
- */
-
-*
-{
-	margin: 0;
-	padding: 0;
-}
-
-html,
-body
-{
-	background: #aac;
-}
-
-body
-{
-	font: 13px/1.231 arial,helvetica,clean,sans-serif
-}
-
-#top-nav
-{
-	width: 780px;
-	background: #50506d;
-	padding: 0 20px 12px 0;
-	margin: 0 auto 20px;
-	overflow: hidden;
-
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	border-radius-topleft: 0;
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	border-radius-topright: 0;
-}
-
-#top-nav img
-{
-	float: left;
-}
-
-#top-nav ul
-{
-	margin: 28px 0 0;
-	overflow: hidden;
-	float: right;
-}
-
-#top-nav ul li
-{
-	float: left;
-	padding: 0 0 0 1em;
-	list-style: none;
-}
-
-#top-nav ul li a
-{
-	color: #fff;
-}
-
-#top-nav ul li a:hover
-{
-	color: #ffa;
-}
-
-#top-nav ul li:last-child
-{
-	padding-right: 0;
-}
-
-#container
-{
-	width: 760px;
-	background: #eeeef4;
-	padding: 20px;
-	margin: 20px auto;
-
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-h1
-{
-	font-size: 116%;
-	color: #fff;
-	background: #50506d;
-	margin: 0 0 1em;
-	padding:4px 8px 5px;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-h2
-{
-	clear: left;
-	font-size: 100%;
-	color: #fff;
-	background: #8b8b9f;
-	margin: 1em 0;
-	padding:4px 8px 5px;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-h2 span.setting-type
-{
-	font-weight: normal;
-}
-
-p
-{
-	font-size: 93%;
-	margin: 1em 0;
-}
-
-p.intro
-{
-	font-size: 116%;
-	padding: 10px;
-	background: #fff;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-
-}
-
-a
-{
-	color: #7171D4;
-	text-decoration: none;
-}
-
-a:hover
-{
-	color: #f60;
-}
-
-ul
-{
-	padding: 0 0 0 1em;
-}
-
-ul li
-{
-	margin: 0 0 .5em;
-}
-
-ul.link-list li
-{
-	margin: 0;
-}
-
-ul p
-{
-	margin: 0;
-}
-
-/* For the form demo page */
-
-form
-{
-	overflow: hidden;
-}
-
-fieldset
-{
-	border: 0;
-	overflow: hidden;
-}
-
-legend
-{
-	font-weight: bold;
-	margin: 1em 0;
-}
-
-label
-{
-	clear: left;
-	float: left;
-	margin: .5em 6px 0 0;
-	text-align: right;
-	width: 100px;
-}
-
-input,
-select,
-textarea
-{
-	float: left;
-	border: 0;
-	padding: 3px 5px;
-	margin: 0 0 .5em;
-}
-
-input[type=button],
-input[type=submit]
-{
-	clear: left;
-	background: #fff;
-	width: auto;
-	margin: 0 0 0 106px;
-}
-
-pre
-{
-	background: #fff;
-	padding: 10px;
-	font-size: 93%;
-	width: 740px;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	overflow: auto;
-}
diff --git a/app/libs/bower_components/jquery-mousewheel/bower.json b/app/libs/bower_components/jquery-mousewheel/bower.json
deleted file mode 100644
index 8bd2cc5e9..000000000
--- a/app/libs/bower_components/jquery-mousewheel/bower.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "jquery-mousewheel",
-  "version": "3.1.13",
-  "main": "./jquery.mousewheel.js",
-  "ignore": [
-    "*.json",
-    "*.markdown",
-    "*.txt",
-    ".*",
-    "!LICENSE.txt",
-    "Gruntfile.js",
-    "test"
-  ],
-  "dependencies": {
-    "jquery": ">=1.2.2"
-  }
-}
diff --git a/app/libs/bower_components/jquery-placeholder/bower.json b/app/libs/bower_components/jquery-placeholder/bower.json
deleted file mode 100644
index 8b55e1597..000000000
--- a/app/libs/bower_components/jquery-placeholder/bower.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"name": "jquery-placeholder",
-	"description": "A jQuery plugin that enables HTML5 placeholder behavior for browsers that aren’t trying hard enough yet",
-	"version": "2.0.8",
-	"license": "MIT",
-	"main": ["jquery.placeholder.js"],
-	"keywords": [
-		"form",
-		"placeholder",
-		"jQuery",
-		"jquery-plugin"
-	],
-	"dependencies": {
-		"jquery": ">=1.6"
-	},
-	"ignore": [
-		"*",
-		"!/bower.json",
-		"!/jquery.placeholder.js"
-	]
-}
diff --git a/app/libs/bower_components/jquery.scrollTo/bower.json b/app/libs/bower_components/jquery.scrollTo/bower.json
deleted file mode 100644
index 4a280bf60..000000000
--- a/app/libs/bower_components/jquery.scrollTo/bower.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "jquery.scrollTo",
-  "version": "1.4.14",
-  "description": "Easy element scrolling using jQuery.",
-  "homepage": "https://github.com/flesler/jquery.scrollTo",
-  "main": [
-    "./jquery.scrollTo.js"
-  ],
-  "ignore": [
-    "**/.*",
-    "demo",
-    "tests",
-    "changes.txt",
-    "composer.json"
-  ],
-  "dependencies": {
-    "jquery": ">=1.4"
-  },
-  "keywords": [
-    "browser", "animated", "animation", 
-    "scrolling", "scroll", "links", "anchors"
-  ],
-  "author": {
-    "name": "Ariel Flesler",
-    "web": "http://flesler.blogspot.com/"
-  }
-}
diff --git a/app/libs/bower_components/jquery.scrollTo/package.json b/app/libs/bower_components/jquery.scrollTo/package.json
deleted file mode 100644
index 08a9ec19a..000000000
--- a/app/libs/bower_components/jquery.scrollTo/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "jquery.scrollto",
-  "version": "1.4.14",
-  "description": "Easy element scrolling using jQuery.",
-  "main": "jquery.scrollTo.js",
-  "license": "MIT",
-  "ignore": ["**/.*","demo","tests","changes.txt","composer.json","scrollTo.jquery.json"],
-  "dependencies": { "jquery": ">=1.4" },
-  "homepage": "https://github.com/flesler/jquery.scrollTo/",
-  "bugs": "https://github.com/flesler/jquery.scrollTo/issues",
-  "repository": "git://github.com/flesler/jquery.scrollTo",
-  "keywords": ["browser","animated","animation","scrolling","scroll","links","anchors"],
-  "author": {
-    "name": "Ariel Flesler",
-    "web": "http://flesler.blogspot.com/"
-  }
-}
diff --git a/app/libs/bower_components/jquery.scrollTo/scrollTo.jquery.json b/app/libs/bower_components/jquery.scrollTo/scrollTo.jquery.json
deleted file mode 100644
index 7e51c080d..000000000
--- a/app/libs/bower_components/jquery.scrollTo/scrollTo.jquery.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"name": "scrollTo",
-	"title": "Ariel Flesler's jQuery scrollTo",
-	"description": "Easy element scrolling using jQuery.",
-	"keywords": ["browser", "animated", "animation", "scrolling", "scroll", "links", "anchors"],
-	"version": "1.4.14",
-	"author": {
-		"name": "Ariel Flesler",
-		"email": "aflesler@gmail.com",
-		"url": "http://flesler.blogspot.com"
-	},
-	"maintainers": [{
-		"name": "Ariel Flesler",
-		"email": "aflesler@gmail.com",
-		"url": "http://flesler.blogspot.com"
-	}],
-	"licenses": [{
-		"type": "MIT",
-		"url": "https://github.com/flesler/jquery.scrollTo/blob/master/LICENSE"
-	}],
-	"homepage": "https://github.com/flesler/jquery.scrollTo",
-	"docs": "http://flesler.blogspot.com/2007/10/jqueryscrollto.html",
-	"bugs": "https://github.com/flesler/jquery.scrollTo/issues",
-	"download": "https://github.com/flesler/jquery.scrollTo/releases",
-	"demo": "http://demos.flesler.com/jquery/scrollTo",
-	"dependencies": {
-		"jquery": ">=1.4"
-	}
-}
\ No newline at end of file
diff --git a/app/libs/bower_components/materialize/bower.json b/app/libs/bower_components/materialize/bower.json
deleted file mode 100644
index a0d5d7fee..000000000
--- a/app/libs/bower_components/materialize/bower.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "name": "Materialize",
-  "description": "A modern responsive front-end framework based on Material Design",
-  "keywords": [
-    "css",
-    "js",
-    "sass",
-    "mobile-first",
-    "responsive",
-    "front-end",
-    "framework",
-    "ux",
-    "material",
-    "design"
-  ],
-  "main": [
-    "bin/materialize.css",
-    "bin/materialize.js",
-    "fonts/roboto/Roboto-Bold.ttf",
-    "fonts/roboto/Roboto-Bold.woff",
-    "fonts/roboto/Roboto-Bold.woff2",
-    "fonts/roboto/Roboto-Light.ttf",
-    "fonts/roboto/Roboto-Light.woff",
-    "fonts/roboto/Roboto-Light.woff2",
-    "fonts/roboto/Roboto-Medium.ttf",
-    "fonts/roboto/Roboto-Medium.woff",
-    "fonts/roboto/Roboto-Medium.woff2",
-    "fonts/roboto/Roboto-Regular.ttf",
-    "fonts/roboto/Roboto-Regular.woff",
-    "fonts/roboto/Roboto-Regular.woff2",
-    "fonts/roboto/Roboto-Thin.ttf",
-    "fonts/roboto/Roboto-Thin.woff",
-    "fonts/roboto/Roboto-Thin.woff2"
-  ],
-  "ignore": [
-    "jade/",
-    ".gitignore",
-    "CNAME",
-    "css/",
-    "bower.json",
-    "README.md",
-    "images/",
-    "js/jquery.timeago.js",
-    "js/init.js",
-    "js/prism.js",
-    "res/",
-    "sass/style.scss",
-    "sass/ghpages-materialize.scss",
-    "**/*.html",
-    "**/*.zip",
-    "**/*.txt",
-    "sitemap.xml",
-    "package.json",
-    "Gruntfile.js"
-  ],
-  "dependencies": {
-    "jquery": ">=2.1.1"
-  },
-  "devDependencies": {
-  }
-}
diff --git a/app/libs/bower_components/mousetrap/package.json b/app/libs/bower_components/mousetrap/package.json
deleted file mode 100644
index 63b28a635..000000000
--- a/app/libs/bower_components/mousetrap/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "Mousetrap",
-  "version": "1.4.6",
-  "description": "Simple library for handling keyboard shortcuts",
-  "main": "mousetrap.js",
-  "directories": {
-    "test": "tests"
-  },
-  "scripts": {
-    "test": "grunt mocha"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/ccampbell/mousetrap.git"
-  },
-  "keywords": [
-    "keyboard",
-    "shortcuts",
-    "events"
-  ],
-  "author": "Craig Campbell",
-  "license": "Apache 2.0",
-  "gitHead": "c202a0bd4967d5a3064f9cb376db51dec9345336",
-  "readmeFilename": "README.md",
-  "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-complexity": "~0.1.2",
-    "grunt-mocha": "~0.3.1"
-  }
-}
diff --git a/app/libs/bower_components/ngDialog/bower.json b/app/libs/bower_components/ngDialog/bower.json
deleted file mode 100644
index 3ffe95cb4..000000000
--- a/app/libs/bower_components/ngDialog/bower.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "ng-dialog",
-  "homepage": "https://github.com/likeastore/ngDialog",
-  "description": "Modal dialogs and popups provider for Angular.js applications",
-  "main": [
-    "js/ngDialog.js",
-    "css/ngDialog.css",
-    "css/ngDialog-theme-default.css"
-  ],
-  "keywords": [
-    "angular.js",
-    "modals",
-    "popups",
-    "dialog",
-    "ng",
-    "provider",
-    "factory",
-    "directive"
-  ],
-  "authors": [
-    "Dmitri Voronianski"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "example",
-    "css/myth",
-    "Gruntfile.js"
-  ],
-  "dependencies": {
-    "angular": ">=1.5"
-  },
-  "devDependencies": {
-    "angular-mocks": ">=1.5"
-  },
-  "resolutions": {
-    "angular": "1.6.1"
-  }
-}
diff --git a/app/libs/bower_components/ngDialog/css/ngDialog-theme-plain.css b/app/libs/bower_components/ngDialog/css/ngDialog-theme-plain.css
deleted file mode 100644
index a0fc38ce6..000000000
--- a/app/libs/bower_components/ngDialog/css/ngDialog-theme-plain.css
+++ /dev/null
@@ -1,131 +0,0 @@
-.ngdialog.ngdialog-theme-plain {
-  padding-bottom: 160px;
-  padding-top: 160px;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-content {
-  background: #fff;
-  color: #444;
-  font-family: 'Helvetica Neue',sans-serif;
-  font-size: 1.1em;
-  line-height: 1.5em;
-  margin: 0 auto;
-  max-width: 100%;
-  padding: 1em;
-  position: relative;
-  width: 450px;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-content h1,
-.ngdialog.ngdialog-theme-plain .ngdialog-content h2,
-.ngdialog.ngdialog-theme-plain .ngdialog-content h3,
-.ngdialog.ngdialog-theme-plain .ngdialog-content h4,
-.ngdialog.ngdialog-theme-plain .ngdialog-content h5,
-.ngdialog.ngdialog-theme-plain .ngdialog-content h6,
-.ngdialog.ngdialog-theme-plain .ngdialog-content p,
-.ngdialog.ngdialog-theme-plain .ngdialog-content ul,
-.ngdialog.ngdialog-theme-plain .ngdialog-content li {
-  color: inherit;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-close {
-  cursor: pointer;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-close:before {
-  background: transparent;
-  color: #bbb;
-  content: "\00D7";
-  font-size: 26px;
-  font-weight: 400;
-  height: 30px;
-  line-height: 26px;
-  position: absolute;
-  right: 3px;
-  text-align: center;
-  top: 3px;
-  width: 30px;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-close:hover:before,
-.ngdialog.ngdialog-theme-plain .ngdialog-close:active:before {
-  color: #777;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-message {
-  margin-bottom: .5em;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-input {
-  margin-bottom: 1em;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-input textarea,
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="text"],
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="password"],
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="email"],
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="url"] {
-  background: #f0f0f0;
-  border: 0;
-  font-family: inherit;
-  font-size: inherit;
-  font-weight: inherit;
-  margin: 0 0 .25em;
-  min-height: 2.5em;
-  padding: .25em .67em;
-  width: 100%;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-input textarea:focus,
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="text"]:focus,
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="password"]:focus,
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="email"]:focus,
-.ngdialog.ngdialog-theme-plain .ngdialog-input input[type="url"]:focus {
-  box-shadow: inset 0 0 0 2px rgba(0,0,0,0.2);
-  outline: none;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-buttons:after {
-  clear: both;
-  content: '';
-  display: table;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-button {
-  border: 0;
-  cursor: pointer;
-  float: right;
-  font-family: inherit;
-  font-size: .8em;
-  letter-spacing: .1em;
-  line-height: 1em;
-  margin: 0 0 0 .5em;
-  padding: .75em 2em;
-  text-transform: uppercase;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-button:focus {
-  -webkit-animation: ngdialog-pulse 1.1s infinite;
-  animation: ngdialog-pulse 1.1s infinite;
-  outline: none;
-}
-
-@media (max-width: 568px) {
-  .ngdialog.ngdialog-theme-plain .ngdialog-button:focus {
-    -webkit-animation: none;
-    animation: none;
-  }
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-button.ngdialog-button-primary {
-  background: #3288e6;
-  color: #fff;
-}
-
-.ngdialog.ngdialog-theme-plain .ngdialog-button.ngdialog-button-secondary {
-  background: #e0e0e0;
-  color: #777;
-}
\ No newline at end of file
diff --git a/app/libs/bower_components/ngDialog/css/ngDialog.css b/app/libs/bower_components/ngDialog/css/ngDialog.css
deleted file mode 100644
index 0e9164367..000000000
--- a/app/libs/bower_components/ngDialog/css/ngDialog.css
+++ /dev/null
@@ -1,114 +0,0 @@
-@-webkit-keyframes ngdialog-fadeout {
-  0% {
-    opacity: 1;
-  }
-
-  100% {
-    opacity: 0;
-  }
-}
-
-@keyframes ngdialog-fadeout {
-  0% {
-    opacity: 1;
-  }
-
-  100% {
-    opacity: 0;
-  }
-}
-
-@-webkit-keyframes ngdialog-fadein {
-  0% {
-    opacity: 0;
-  }
-
-  100% {
-    opacity: 1;
-  }
-}
-
-@keyframes ngdialog-fadein {
-  0% {
-    opacity: 0;
-  }
-
-  100% {
-    opacity: 1;
-  }
-}
-
-.ngdialog {
-  box-sizing: border-box;
-}
-
-.ngdialog *,
-.ngdialog *:before,
-.ngdialog *:after {
-  box-sizing: inherit;
-}
-
-.ngdialog {
-  position: fixed;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-  z-index: 10000;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
-.ngdialog.ngdialog-disabled-animation,
-.ngdialog.ngdialog-disabled-animation .ngdialog-overlay,
-.ngdialog.ngdialog-disabled-animation .ngdialog-content {
-  -webkit-animation: none!important;
-  animation: none!important;
-}
-
-.ngdialog-overlay {
-  position: fixed;
-  background: rgba(0, 0, 0, 0.4);
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  -webkit-backface-visibility: hidden;
-  -webkit-animation: ngdialog-fadein 0.5s;
-  animation: ngdialog-fadein 0.5s;
-}
-
-.ngdialog-no-overlay {
-  pointer-events: none;
-}
-
-.ngdialog.ngdialog-closing .ngdialog-overlay {
-  -webkit-backface-visibility: hidden;
-  -webkit-animation: ngdialog-fadeout 0.5s;
-  animation: ngdialog-fadeout 0.5s;
-}
-
-.ngdialog-content {
-  background: white;
-  -webkit-backface-visibility: hidden;
-  -webkit-animation: ngdialog-fadein 0.5s;
-  animation: ngdialog-fadein 0.5s;
-  pointer-events: all;
-}
-
-.ngdialog.ngdialog-closing .ngdialog-content {
-  -webkit-backface-visibility: hidden;
-  -webkit-animation: ngdialog-fadeout 0.5s;
-  animation: ngdialog-fadeout 0.5s;
-}
-
-.ngdialog-close:before {
-  font-family: 'Helvetica', Arial, sans-serif;
-  content: '\00D7';
-  cursor: pointer;
-}
-
-html.ngdialog-open,
-body.ngdialog-open {
-  overflow: hidden;
-}
\ No newline at end of file
diff --git a/app/libs/bower_components/ngDialog/package.json b/app/libs/bower_components/ngDialog/package.json
deleted file mode 100644
index bee0455e8..000000000
--- a/app/libs/bower_components/ngDialog/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "name": "ng-dialog",
-  "version": "1.3.0",
-  "homepage": "https://github.com/likeastore/ngDialog",
-  "description": "Modal dialogs and popups provider for Angular.js applications",
-  "main": "./js/ngDialog.js",
-  "style": "./css/ngDialog.css",
-  "scripts": {
-    "pretest": "npm install && bower install --allow-root",
-    "test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS",
-    "test-min": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS --min",
-    "test-watch": "./node_modules/karma/bin/karma start --auto-watch --browsers PhantomJS",
-    "serve": "node server",
-    "webdriver-update": "node_modules/.bin/webdriver-manager update --standalone",
-    "webdriver": "node_modules/.bin/webdriver-manager start",
-    "preprotractor": "npm install && bower install --allow-root",
-    "protractor": "node_modules/.bin/protractor protractor.conf.js",
-    "protractor-a11y": "node_modules/.bin/protractor protractor.conf.js --a11y",
-    "protractor-console": "node_modules/.bin/protractor protractor.conf.js --console-error",
-    "build": "grunt build"
-  },
-  "directories": {
-    "test": "tests"
-  },
-  "keywords": [
-    "angular.js",
-    "modals",
-    "popups",
-    "dialog",
-    "ng",
-    "provider",
-    "factory",
-    "directive"
-  ],
-  "author": {
-    "name": "Dmitri Voronianski",
-    "email": "dmitri.voronianski@gmail.com",
-    "web": "http://pixelhunter.me",
-    "twitter": "voronianski"
-  },
-  "bugs": "https://github.com/likeastore/ngDialog/issues",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/likeastore/ngDialog"
-  },
-  "readmeFilename": "README.md",
-  "license": "MIT",
-  "devDependencies": {
-    "express": "^4.13.3",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-uglify": "^0.9.2",
-    "grunt-myth": "^1.0.1",
-    "jasmine-core": "^2.3.4",
-    "karma": "^1.3.0",
-    "karma-coverage": "^1.1.1",
-    "karma-jasmine": "^1.1.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "myth": "^1.5.0",
-    "phantomjs": "^2.1.7",
-    "protractor": "^2.2.0"
-  }
-}
diff --git a/app/libs/bower_components/sprintf/bower.json b/app/libs/bower_components/sprintf/bower.json
deleted file mode 100644
index d90a75989..000000000
--- a/app/libs/bower_components/sprintf/bower.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "sprintf",
-  "description": "JavaScript sprintf implementation",
-  "version": "1.0.3",
-  "main": "src/sprintf.js",
-  "license": "BSD-3-Clause-Clear",
-  "keywords": ["sprintf", "string", "formatting"],
-  "authors": ["Alexandru Marasteanu <hello@alexei.ro> (http://alexei.ro/)"],
-  "homepage": "https://github.com/alexei/sprintf.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/alexei/sprintf.js.git"
-  }
-}
diff --git a/app/libs/bower_components/sprintf/package.json b/app/libs/bower_components/sprintf/package.json
deleted file mode 100644
index 75f7eca71..000000000
--- a/app/libs/bower_components/sprintf/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "sprintf-js",
-    "version": "1.0.3",
-    "description": "JavaScript sprintf implementation",
-    "author": "Alexandru Marasteanu <hello@alexei.ro> (http://alexei.ro/)",
-    "main": "src/sprintf.js",
-    "scripts": {
-        "test": "mocha test/test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/alexei/sprintf.js.git"
-    },
-    "license": "BSD-3-Clause",
-    "readmeFilename": "README.md",
-    "devDependencies": {
-        "mocha": "*",
-        "grunt": "*",
-        "grunt-contrib-watch": "*",
-        "grunt-contrib-uglify": "*"
-    }
-}
diff --git a/app/libs/bower_components/visibilityjs/bower.json b/app/libs/bower_components/visibilityjs/bower.json
deleted file mode 100644
index d7c435f57..000000000
--- a/app/libs/bower_components/visibilityjs/bower.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "visibilityjs",
-  "version": "1.2.3",
-  "homepage": "https://github.com/ai/visibilityjs",
-  "authors": ["Andrey A.I. Sitnik <andrey@sitnik.ru>"],
-  "description": "Wrapper for the Page Visibility API",
-  "license": "MIT",
-  "main": [
-    "lib/visibility.core.js",
-    "lib/visibility.timers.js"
-  ],
-  "ignore": [
-    "package.json",
-    "*.gemspec",
-    "Cakefile",
-    "test",
-    "*.rb",
-    ".*"
-  ]
-}
diff --git a/app/libs/jqplot/build_minified_script.sh b/app/libs/jqplot/build_minified_script.sh
old mode 100644
new mode 100755
diff --git a/app/matomo.js b/app/matomo.js
index 7ad4f35d0..d3d035ca2 100644
--- a/app/matomo.js
+++ b/app/matomo.js
@@ -43,11 +43,11 @@ try{be=G.title}catch(ct){be=""}function c6(dh,df,de,dg,dd,dc){if(bg){return}var
 if(db.indexOf("//")!==0&&db.indexOf("http")!==0){if(db.indexOf("*")===0){db=db.substr(1)}if(db.indexOf(".")===0){db=db.substr(1)}db="http://"+db}dc.href=v.toAbsoluteUrl(db);if(dc.pathname){return dc.pathname}return""}function aZ(dc,db){if(!ag(db,"/")){db="/"+db}if(!ag(dc,"/")){dc="/"+dc}var dd=(db==="/"||db==="/*");if(dd){return true}if(dc===db){return true}db=String(db).toLowerCase();dc=String(dc).toLowerCase();if(R(db,"*")){db=db.slice(0,-1);dd=(!db||db==="/");if(dd){return true}if(dc===db){return true}return dc.indexOf(db)===0}if(!R(dc,"/")){dc+="/"}if(!R(db,"/")){db+="/"}return dc.indexOf(db)===0}function ao(df,dh){var dc,db,dd,de,dg;for(dc=0;dc<au.length;dc++){de=L(au[dc]);dg=cg(au[dc]);if(cB(df,de)&&aZ(dh,dg)){return true}}return false}function aR(de){var dc,db,dd;for(dc=0;dc<au.length;dc++){db=L(au[dc].toLowerCase());if(de===db){return true}if(db.slice(0,1)==="."){if(de===db.slice(1)){return true}dd=de.length-db.length;if((dd>0)&&(de.slice(dd)===db)){return true}}}return false}function cl(db,dd){db=db.replace("send_image=0","send_image=1");
 var dc=new Image(1,1);dc.onload=function(){E=0;if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:true})}};dc.onerror=function(){if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:false})}};dc.src=aA+(aA.indexOf("?")<0?"?":"&")+db}function aG(){return"object"===typeof h&&"function"===typeof h.sendBeacon&&"function"===typeof Blob}function a2(de,di){var dd=aG();if(!dd){return false}var dh={type:"application/x-www-form-urlencoded; charset=UTF-8"};var dg=false;var dc=aA;try{var db=new Blob([de],dh);if(de.length<=2000){db=new Blob([],dh);dc=dc+(dc.indexOf("?")<0?"?":"&")+de}dg=h.sendBeacon(dc,db)}catch(df){return false}if(dg&&typeof di==="function"){di({request:de,trackerUrl:aA,success:true,isSendBeacon:true})}return dg}function cY(dc,dd,db){if(!J(db)||null===db){db=true}if(m&&a2(dc,dd)){return}setTimeout(function(){if(m&&a2(dc,dd)){return}var dg;try{var df=T.XMLHttpRequest?new T.XMLHttpRequest():T.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;df.open("POST",aA,true);
 df.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){var dh=m&&a2(dc,dd);if(!dh&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false,xhr:this})}}}else{if(this.readyState===4&&(typeof dd==="function")){dd({request:dc,trackerUrl:aA,success:true,xhr:this})}}};df.setRequestHeader("Content-Type",cs);df.withCredentials=true;df.send(dc)}catch(de){dg=m&&a2(dc,dd);if(!dg&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false})}}}},50)}function cb(dc){var db=new Date();var dd=db.getTime()+dc;if(!r||dd>r){r=dd}}function cj(db){if(b7||!a1||!bw){return}b7=setTimeout(function dc(){b7=null;if(!a8){a8=(!G.hasFocus||G.hasFocus())}if(!a8){cj(a1);return}if(bM()){return}var dd=new Date(),de=a1-(dd.getTime()-cS);de=Math.min(a1,de);cj(de)},db||a1)}function bF(){if(!b7){return}clearTimeout(b7);b7=null}function a6(){a8=true;if(bM()){return}cj()}function av(){bF()}function c8(){if(aK||!a1){return}aK=true;
-ak(T,"focus",a6);ak(T,"blur",av);cj()}function cx(df){var dc=new Date();var db=dc.getTime();cS=db;if(cw&&db<cw){var dd=cw-db;setTimeout(df,dd);cb(dd+50);cw+=50;return}if(cw===false){var de=800;cw=db+de}df()}function bA(dc,db,dd){if(!bw){cE.push(dc);return}if(!cK&&dc){if(cv&&bw){dc+="&consent=1"}cx(function(){if(cQ&&a2(dc,dd)){cb(100);return}if(c3==="POST"||String(dc).length>2000){cY(dc,dd)}else{cl(dc,dd)}cb(db)})}if(!aK){c8()}else{cj()}}function cf(db){if(cK){return false}return(db&&db.length)}function cX(db,df){if(!df||df>=db.length){return[db]}var dc=0;var dd=db.length;var de=[];for(dc;dc<dd;dc+=df){de.push(db.slice(dc,dc+df))}return de}function c7(dc,db){if(!cf(dc)){return}if(!bw){cE.push(dc);return}cx(function(){var df=cX(dc,50);var dd=0,de;for(dd;dd<df.length;dd++){de='{"requests":["?'+df[dd].join('","?')+'"]}';cY(de,null,false)}cb(db)})}function aP(db){return bf+db+"."+b1+"."+bj}function b0(){if(bg){return"0"}if(!J(h.cookieEnabled)){var db=aP("testcookie");c6(db,"1");return az(db)==="1"?"1":"0"
-}return h.cookieEnabled?"1":"0"}function bd(){bj=b2((cR||cO)+(bk||"/")).slice(0,4)}function bS(){var dc=aP("cvar"),db=az(dc);if(db.length){db=JSON_PIWIK.parse(db);if(W(db)){return db}}return{}}function cy(){if(aM===false){aM=bS()}}function cL(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)+(new Date()).getTime()+Math.random()).slice(0,16)}function aw(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)).slice(0,6)}function bb(){return Math.floor((new Date()).getTime()/1000)}function aF(){var dc=bb();var dd=aw();var db=String(dc)+dd;return db}function cW(dd){dd=String(dd);var dg=aw();var de=dg.length;var df=dd.substr(-1*de,de);var dc=parseInt(dd.substr(0,dd.length-de),10);if(dc&&df&&df===dg){var db=bb();if(aV<=0){return true}if(db>=dc&&db<=(dc+aV)){return true}}return false}function c9(db){if(!cH){return""}var df=f(db,ar);if(!df){return""}df=String(df);var dd=new RegExp("^[a-zA-Z0-9]+$");if(df.length===32&&dd.test(df)){var dc=df.substr(16,32);if(cW(dc)){var de=df.substr(0,16);
-return de}}return""}function cI(){if(!bJ){bJ=c9(bI)}var dd=new Date(),db=Math.round(dd.getTime()/1000),dc=aP("id"),dg=az(dc),df,de;if(dg){df=dg.split(".");df.unshift("0");if(bJ.length){df[1]=bJ}return df}if(bJ.length){de=bJ}else{if("0"===b0()){de=""}else{de=cL()}}df=["1",de,db,0,db,"",""];return df}function aU(){var di=cI(),de=di[0],df=di[1],dc=di[2],db=di[3],dg=di[4],dd=di[5];if(!J(di[6])){di[6]=""}var dh=di[6];return{newVisitor:de,uuid:df,createTs:dc,visitCount:db,currentVisitTs:dg,lastVisitTs:dd,lastEcommerceOrderTs:dh}}function aD(){var de=new Date(),dc=de.getTime(),df=aU().createTs;var db=parseInt(df,10);var dd=(db*1000)+cD-dc;return dd}function aI(db){if(!b1){return}var dd=new Date(),dc=Math.round(dd.getTime()/1000);if(!J(db)){db=aU()}var de=db.uuid+"."+db.createTs+"."+db.visitCount+"."+dc+"."+db.lastVisitTs+"."+db.lastEcommerceOrderTs;c6(aP("id"),de,aD(),bk,cR,bN)}function bH(){var db=az(aP("ref"));if(db.length){try{db=JSON_PIWIK.parse(db);if(W(db)){return db}}catch(dc){}}return["","",0,""]
-}function bT(dd,dc,db){c6(dd,"",-86400,dc,db)}function br(dc){var db="testvalue";c6("test",db,10000,null,dc);if(az("test")===db){bT("test",null,dc);return true}return false}function aB(){var dc=bg;bg=false;var db,dd;for(db=0;db<bp.length;db++){dd=aP(bp[db]);if(dd!==cG&&dd!==a9&&0!==az(dd)){bT(dd,bk,cR)}}bg=dc}function bY(db){b1=db;aI()}function da(df){if(!df||!W(df)){return}var de=[];var dd;for(dd in df){if(Object.prototype.hasOwnProperty.call(df,dd)){de.push(dd)}}var dg={};de.sort();var db=de.length;var dc;for(dc=0;dc<db;dc++){dg[de[dc]]=df[de[dc]]}return dg}function b8(){c6(aP("ses"),"1",ck,bk,cR,bN)}function bc(){var de="";var dc="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dd=dc.length;var db;for(db=0;db<6;db++){de+=dc.charAt(Math.floor(Math.random()*dd))}return de}function co(dd,dz,dA,de){var dy,dc=new Date(),dl=Math.round(dc.getTime()/1000),di,dx,df=1024,dF,dm,dv=aM,dg=aP("ses"),dt=aP("ref"),dq=aP("cvar"),dr=az(dg),dw=bH(),dC=a0||bI,dj,db;if(bg){aB()}if(cK){return""
-}var ds=aU();if(!J(de)){de=""}var dp=G.characterSet||G.charset;if(!dp||dp.toLowerCase()==="utf-8"){dp=null}dj=dw[0];db=dw[1];di=dw[2];dx=dw[3];if(!dr){var dB=ck/1000;if(!ds.lastVisitTs||(dl-ds.lastVisitTs)>dB){ds.visitCount++;ds.lastVisitTs=ds.currentVisitTs}if(!bq||!dj.length){for(dy in cm){if(Object.prototype.hasOwnProperty.call(cm,dy)){dj=f(dC,cm[dy]);if(dj.length){break}}}for(dy in bB){if(Object.prototype.hasOwnProperty.call(bB,dy)){db=f(dC,bB[dy]);if(db.length){break}}}}dF=d(bi);dm=dx.length?d(dx):"";if(dF.length&&!aR(dF)&&(!bq||!dm.length||aR(dm))){dx=bi}if(dx.length||dj.length){di=dl;dw=[dj,db,di,bX(dx.slice(0,df))];c6(dt,JSON_PIWIK.stringify(dw),cZ,bk,cR)}}dd+="&idsite="+b1+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dc.getHours()+"&m="+dc.getMinutes()+"&s="+dc.getSeconds()+"&url="+t(bX(dC))+(bi.length?"&urlref="+t(bX(bi)):"")+((bt&&bt.length)?"&uid="+t(bt):"")+"&_id="+ds.uuid+"&_idts="+ds.createTs+"&_idvc="+ds.visitCount+"&_idn="+ds.newVisitor+(dj.length?"&_rcn="+t(dj):"")+(db.length?"&_rck="+t(db):"")+"&_refts="+di+"&_viewts="+ds.lastVisitTs+(String(ds.lastEcommerceOrderTs).length?"&_ects="+ds.lastEcommerceOrderTs:"")+(String(dx).length?"&_ref="+t(bX(dx.slice(0,df))):"")+(dp?"&cs="+t(dp):"")+"&send_image=0";
+ak(T,"focus",a6);ak(T,"blur",av);cj()}function cx(df){var dc=new Date();var db=dc.getTime();cS=db;if(cw&&db<cw){var dd=cw-db;setTimeout(df,dd);cb(dd+50);cw+=50;return}if(cw===false){var de=800;cw=db+de}df()}function bA(dc,db,dd){if(!bw){cE.push(dc);return}if(!cK&&dc){if(cv&&bw){dc+="&consent=1"}cx(function(){if(cQ&&a2(dc,dd)){cb(100);return}if(c3==="POST"||String(dc).length>2000){cY(dc,dd)}else{cl(dc,dd)}cb(db)})}if(!aK){c8()}else{cj()}}function cf(db){if(cK){return false}return(db&&db.length)}function cX(db,df){if(!df||df>=db.length){return[db]}var dc=0;var dd=db.length;var de=[];for(dc;dc<dd;dc+=df){de.push(db.slice(dc,dc+df))}return de}function c7(dc,db){if(!cf(dc)){return}if(!bw){cE.push(dc);return}cx(function(){var df=cX(dc,50);var dd=0,de;for(dd;dd<df.length;dd++){de='{"requests":["?'+df[dd].join('","?')+'"]}';cY(de,null,false)}cb(db)})}function aP(db){return bf+db+"."+b1+"."+bj}function b0(){if(bg){return"0"}var db=aP("testcookie");c6(db,"1");return az(db)==="1"?"1":"0"}function bd(){bj=b2((cR||cO)+(bk||"/")).slice(0,4)
+}function bS(){var dc=aP("cvar"),db=az(dc);if(db.length){db=JSON_PIWIK.parse(db);if(W(db)){return db}}return{}}function cy(){if(aM===false){aM=bS()}}function cL(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)+(new Date()).getTime()+Math.random()).slice(0,16)}function aw(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)).slice(0,6)}function bb(){return Math.floor((new Date()).getTime()/1000)}function aF(){var dc=bb();var dd=aw();var db=String(dc)+dd;return db}function cW(dd){dd=String(dd);var dg=aw();var de=dg.length;var df=dd.substr(-1*de,de);var dc=parseInt(dd.substr(0,dd.length-de),10);if(dc&&df&&df===dg){var db=bb();if(aV<=0){return true}if(db>=dc&&db<=(dc+aV)){return true}}return false}function c9(db){if(!cH){return""}var df=f(db,ar);if(!df){return""}df=String(df);var dd=new RegExp("^[a-zA-Z0-9]+$");if(df.length===32&&dd.test(df)){var dc=df.substr(16,32);if(cW(dc)){var de=df.substr(0,16);return de}}return""}function cI(){if(!bJ){bJ=c9(bI)
+}var dd=new Date(),db=Math.round(dd.getTime()/1000),dc=aP("id"),dg=az(dc),df,de;if(dg){df=dg.split(".");df.unshift("0");if(bJ.length){df[1]=bJ}return df}if(bJ.length){de=bJ}else{if("0"===b0()){de=""}else{de=cL()}}df=["1",de,db,0,db,"",""];return df}function aU(){var di=cI(),de=di[0],df=di[1],dc=di[2],db=di[3],dg=di[4],dd=di[5];if(!J(di[6])){di[6]=""}var dh=di[6];return{newVisitor:de,uuid:df,createTs:dc,visitCount:db,currentVisitTs:dg,lastVisitTs:dd,lastEcommerceOrderTs:dh}}function aD(){var de=new Date(),dc=de.getTime(),df=aU().createTs;var db=parseInt(df,10);var dd=(db*1000)+cD-dc;return dd}function aI(db){if(!b1){return}var dd=new Date(),dc=Math.round(dd.getTime()/1000);if(!J(db)){db=aU()}var de=db.uuid+"."+db.createTs+"."+db.visitCount+"."+dc+"."+db.lastVisitTs+"."+db.lastEcommerceOrderTs;c6(aP("id"),de,aD(),bk,cR,bN)}function bH(){var db=az(aP("ref"));if(db.length){try{db=JSON_PIWIK.parse(db);if(W(db)){return db}}catch(dc){}}return["","",0,""]}function bT(dd,dc,db){c6(dd,"",-86400,dc,db)
+}function br(dc){var db="testvalue";c6("test",db,10000,null,dc);if(az("test")===db){bT("test",null,dc);return true}return false}function aB(){var dc=bg;bg=false;var db,dd;for(db=0;db<bp.length;db++){dd=aP(bp[db]);if(dd!==cG&&dd!==a9&&0!==az(dd)){bT(dd,bk,cR)}}bg=dc}function bY(db){b1=db;aI()}function da(df){if(!df||!W(df)){return}var de=[];var dd;for(dd in df){if(Object.prototype.hasOwnProperty.call(df,dd)){de.push(dd)}}var dg={};de.sort();var db=de.length;var dc;for(dc=0;dc<db;dc++){dg[de[dc]]=df[de[dc]]}return dg}function b8(){c6(aP("ses"),"1",ck,bk,cR,bN)}function bc(){var de="";var dc="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dd=dc.length;var db;for(db=0;db<6;db++){de+=dc.charAt(Math.floor(Math.random()*dd))}return de}function co(dd,dz,dA,de){var dy,dc=new Date(),dl=Math.round(dc.getTime()/1000),di,dx,df=1024,dF,dm,dv=aM,dg=aP("ses"),dt=aP("ref"),dq=aP("cvar"),dr=az(dg),dw=bH(),dC=a0||bI,dj,db;if(bg){aB()}if(cK){return""}var ds=aU();if(!J(de)){de=""}var dp=G.characterSet||G.charset;
+if(!dp||dp.toLowerCase()==="utf-8"){dp=null}dj=dw[0];db=dw[1];di=dw[2];dx=dw[3];if(!dr){var dB=ck/1000;if(!ds.lastVisitTs||(dl-ds.lastVisitTs)>dB){ds.visitCount++;ds.lastVisitTs=ds.currentVisitTs}if(!bq||!dj.length){for(dy in cm){if(Object.prototype.hasOwnProperty.call(cm,dy)){dj=f(dC,cm[dy]);if(dj.length){break}}}for(dy in bB){if(Object.prototype.hasOwnProperty.call(bB,dy)){db=f(dC,bB[dy]);if(db.length){break}}}}dF=d(bi);dm=dx.length?d(dx):"";if(dF.length&&!aR(dF)&&(!bq||!dm.length||aR(dm))){dx=bi}if(dx.length||dj.length){di=dl;dw=[dj,db,di,bX(dx.slice(0,df))];c6(dt,JSON_PIWIK.stringify(dw),cZ,bk,cR)}}dd+="&idsite="+b1+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dc.getHours()+"&m="+dc.getMinutes()+"&s="+dc.getSeconds()+"&url="+t(bX(dC))+(bi.length?"&urlref="+t(bX(bi)):"")+((bt&&bt.length)?"&uid="+t(bt):"")+"&_id="+ds.uuid+"&_idts="+ds.createTs+"&_idvc="+ds.visitCount+"&_idn="+ds.newVisitor+(dj.length?"&_rcn="+t(dj):"")+(db.length?"&_rck="+t(db):"")+"&_refts="+di+"&_viewts="+ds.lastVisitTs+(String(ds.lastEcommerceOrderTs).length?"&_ects="+ds.lastEcommerceOrderTs:"")+(String(dx).length?"&_ref="+t(bX(dx.slice(0,df))):"")+(dp?"&cs="+t(dp):"")+"&send_image=0";
 for(dy in c1){if(Object.prototype.hasOwnProperty.call(c1,dy)){dd+="&"+dy+"="+c1[dy]}}var dE=[];if(dz){for(dy in dz){if(Object.prototype.hasOwnProperty.call(dz,dy)&&/^dimension\d+$/.test(dy)){var dh=dy.replace("dimension","");dE.push(parseInt(dh,10));dE.push(String(dh));dd+="&"+dy+"="+t(dz[dy]);delete dz[dy]}}}if(dz&&B(dz)){dz=null}for(dy in bh){if(Object.prototype.hasOwnProperty.call(bh,dy)){var dn=(-1===M(dE,dy));if(dn){dd+="&dimension"+dy+"="+t(bh[dy])}}}if(dz){dd+="&data="+t(JSON_PIWIK.stringify(dz))}else{if(al){dd+="&data="+t(JSON_PIWIK.stringify(al))}}function dk(dG,dH){var dI=JSON_PIWIK.stringify(dG);if(dI.length>2){return"&"+dH+"="+t(dI)}return""}var dD=da(bR);var du=da(ch);dd+=dk(dD,"cvar");dd+=dk(du,"e_cvar");if(aM){dd+=dk(aM,"_cvar");for(dy in dv){if(Object.prototype.hasOwnProperty.call(dv,dy)){if(aM[dy][0]===""||aM[dy][1]===""){delete aM[dy]}}}if(bL){c6(dq,JSON_PIWIK.stringify(aM),ck,bk,cR)}}if(aY){if(ci){dd+="&gt_ms="+ci}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dd+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
 }}}if(aH){dd+="&pv_id="+aH}ds.lastEcommerceOrderTs=J(de)&&String(de).length?de:ds.lastEcommerceOrderTs;aI(ds);b8();dd+=aa(dA,{tracker:bD,request:dd});if(cT.length){dd+="&"+cT}if(A(b6)){dd=b6(dd)}return dd}bM=function a3(){var db=new Date();if(cS+a1<=db.getTime()){bD.ping();return true}return false};function bl(de,dd,dj,df,db,dm){var dh="idgoal=0",di,dc=new Date(),dk=[],dl,dg=String(de).length;if(dg){dh+="&ec_id="+t(de);di=Math.round(dc.getTime()/1000)}dh+="&revenue="+dd;if(String(dj).length){dh+="&ec_st="+dj}if(String(df).length){dh+="&ec_tx="+df}if(String(db).length){dh+="&ec_sh="+db}if(String(dm).length){dh+="&ec_dt="+dm}if(cU){for(dl in cU){if(Object.prototype.hasOwnProperty.call(cU,dl)){if(!J(cU[dl][1])){cU[dl][1]=""}if(!J(cU[dl][2])){cU[dl][2]=""}if(!J(cU[dl][3])||String(cU[dl][3]).length===0){cU[dl][3]=0}if(!J(cU[dl][4])||String(cU[dl][4]).length===0){cU[dl][4]=1}dk.push(cU[dl])}}dh+="&ec_items="+t(JSON_PIWIK.stringify(dk))}dh=co(dh,al,"ecommerce",di);bA(dh,bE);if(dg){cU={}}}function bU(db,df,de,dd,dc,dg){if(String(db).length&&J(df)){bl(db,df,de,dd,dc,dg)
 }}function bn(db){if(J(db)){bl("",db,"","","","")}}function bV(dc,de,dd){aH=bc();var db=co("action_name="+t(ai(dc||be)),de,"log");bA(db,bE,dd)}function aW(dd,dc){var de,db="(^| )(piwik[_-]"+dc;if(dd){for(de=0;de<dd.length;de++){db+="|"+dd[de]}}db+=")( |$)";return new RegExp(db)}function aQ(db){return(aA&&db&&0===String(db).indexOf(aA))}function cq(df,db,dg,dc){if(aQ(db)){return 0}var de=aW(bG,"download"),dd=aW(a4,"link"),dh=new RegExp("\\.("+c0.join("|")+")([?&#]|$)","i");if(dd.test(df)){return"link"}if(dc||de.test(df)||dh.test(db)){return"download"}if(dg){return 0}return"link"}function aq(dc){var db;db=dc.parentNode;while(db!==null&&J(db)){if(ac.isLinkElement(dc)){break}dc=db;db=dc.parentNode}return dc}function c5(dg){dg=aq(dg);if(!ac.hasNodeAttribute(dg,"href")){return}if(!J(dg.href)){return}var df=ac.getAttributeValueFromNode(dg,"href");if(aQ(df)){return}var dc=dg.pathname||cg(dg.href);var dh=dg.hostname||d(dg.href);var di=dh.toLowerCase();var dd=dg.href.replace(dh,di);var de=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");
@@ -60,20 +60,20 @@ if(!dc||aQ(dc)){return}dc=k(dc,ar);var dd=bm();dc=F(dc,ar,dd);ac.setAnyAttribute
 }}function aX(db){return db.target||db.srcElement}function ay(db){return function(de){de=de||T.event;var dd=bO(de);var df=aX(de);if(de.type==="click"){var dc=false;if(db&&dd==="middle"){dc=true}if(df&&!dc){cA(df)}}else{if(de.type==="mousedown"){if(dd==="middle"&&df){aN=dd;bv=df}else{aN=bv=null}}else{if(de.type==="mouseup"){if(dd===aN&&df===bv){cA(df)}aN=bv=null}else{if(de.type==="contextmenu"){cA(df)}}}}}}function an(dd,dc){var db=typeof dc;if(db==="undefined"){dc=true}ak(dd,"click",ay(dc),false);if(dc){ak(dd,"mouseup",ay(dc),false);ak(dd,"mousedown",ay(dc),false);ak(dd,"contextmenu",ay(dc),false)}}function by(dd,df){am=true;var de,dc=aW(bu,"ignore"),dg=G.links,db=null,dh=null;if(dg){for(de=0;de<dg.length;de++){db=dg[de];if(!dc.test(db.className)){dh=typeof db.piwikTrackers;if("undefined"===dh){db.piwikTrackers=[]}if(-1===M(db.piwikTrackers,df)){db.piwikTrackers.push(df);an(db,dd)}}}}}function aO(dc,df,dg){if(ca){return true}ca=true;var dh=false;var de,dd;function db(){dh=true}n(function(){function di(dk){setTimeout(function(){if(!ca){return
 }dh=false;dg.trackVisibleContentImpressions();di(dk)},dk)}function dj(dk){setTimeout(function(){if(!ca){return}if(dh){dh=false;dg.trackVisibleContentImpressions()}dj(dk)},dk)}if(dc){de=["scroll","resize"];for(dd=0;dd<de.length;dd++){if(G.addEventListener){G.addEventListener(de[dd],db,false)}else{T.attachEvent("on"+de[dd],db)}}dj(100)}if(df&&df>0){df=parseInt(df,10);di(df)}})}function cz(){var dc,de,df={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(h.userAgent))){if(h.mimeTypes&&h.mimeTypes.length){for(dc in df){if(Object.prototype.hasOwnProperty.call(df,dc)){de=h.mimeTypes[df[dc]];c1[dc]=(de&&de.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(h.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&J(h.javaEnabled)&&h.javaEnabled()){c1.java="1"
 }if(A(T.GearsFactory)){c1.gears="1"}c1.cookie=b0()}var dd=parseInt(X.width,10);var db=parseInt(X.height,10);c1.res=parseInt(dd,10)+"x"+parseInt(db,10)}var bx={enabled:true,requests:[],timeout:null,sendRequests:function(){var db=this.requests;this.requests=[];if(db.length===1){bA(db[0],bE)}else{c7(db,bE)}},push:function(db){if(!db){return}if(m||!this.enabled){bA(db,bE);return}bx.requests.push(db);if(this.timeout){clearTimeout(this.timeout);this.timeout=null}this.timeout=setTimeout(function(){bx.timeout=null;bx.sendRequests()},1750);var dc="RequestQueue"+at;if(!Object.prototype.hasOwnProperty.call(b,dc)){b[dc]={unload:function(){if(bx.timeout){clearTimeout(bx.timeout)}bx.sendRequests()}}}}};cz();bd();aI();this.getVisitorId=function(){return aU().uuid};this.getVisitorInfo=function(){return cI()};this.getAttributionInfo=function(){return bH()};this.getAttributionCampaignName=function(){return bH()[0]};this.getAttributionCampaignKeyword=function(){return bH()[1]};this.getAttributionReferrerTimestamp=function(){return bH()[2]
-};this.getAttributionReferrerUrl=function(){return bH()[3]};this.setTrackerUrl=function(db){aA=db};this.getTrackerUrl=function(){return aA};this.getPiwikUrl=function(){return O(this.getTrackerUrl(),bC)};this.addTracker=function(db,dd){if(!dd){throw new Error("A siteId must be given to add a new tracker")}if(!J(db)||null===db){db=this.getTrackerUrl()}var dc=new Q(db,dd);I.push(dc);e.trigger("TrackerAdded",[this]);return dc};this.getSiteId=function(){return b1};this.setSiteId=function(db){bY(db)};this.resetUserId=function(){bt=""};this.setUserId=function(db){if(!J(db)||!db.length){return}bt=db};this.getUserId=function(){return bt};this.setCustomData=function(db,dc){if(W(db)){al=db}else{if(!al){al={}}al[db]=dc}};this.getCustomData=function(){return al};this.setCustomRequestProcessing=function(db){b6=db};this.appendToTrackingUrl=function(db){cT=db};this.getRequest=function(db){return co(db)};this.addPlugin=function(db,dc){b[db]=dc};this.setCustomDimension=function(db,dc){db=parseInt(db,10);
-if(db>0){if(!J(dc)){dc=""}if(!w(dc)){dc=String(dc)}bh[db]=dc}};this.getCustomDimension=function(db){db=parseInt(db,10);if(db>0&&Object.prototype.hasOwnProperty.call(bh,db)){return bh[db]}};this.deleteCustomDimension=function(db){db=parseInt(db,10);if(db>0){delete bh[db]}};this.setCustomVariable=function(dc,db,df,dd){var de;if(!J(dd)){dd="visit"}if(!J(db)){return}if(!J(df)){df=""}if(dc>0){db=!w(db)?String(db):db;df=!w(df)?String(df):df;de=[db.slice(0,bo),df.slice(0,bo)];if(dd==="visit"||dd===2){cy();aM[dc]=de}else{if(dd==="page"||dd===3){bR[dc]=de}else{if(dd==="event"){ch[dc]=de}}}}};this.getCustomVariable=function(dc,dd){var db;if(!J(dd)){dd="visit"}if(dd==="page"||dd===3){db=bR[dc]}else{if(dd==="event"){db=ch[dc]}else{if(dd==="visit"||dd===2){cy();db=aM[dc]}}}if(!J(db)||(db&&db[0]==="")){return false}return db};this.deleteCustomVariable=function(db,dc){if(this.getCustomVariable(db,dc)){this.setCustomVariable(db,"","",dc)}};this.deleteCustomVariables=function(db){if(db==="page"||db===3){bR={}
-}else{if(db==="event"){ch={}}else{if(db==="visit"||db===2){aM={}}}}};this.storeCustomVariablesInCookie=function(){bL=true};this.setLinkTrackingTimer=function(db){bE=db};this.getLinkTrackingTimer=function(){return bE};this.setDownloadExtensions=function(db){if(w(db)){db=db.split("|")}c0=db};this.addDownloadExtensions=function(dc){var db;if(w(dc)){dc=dc.split("|")}for(db=0;db<dc.length;db++){c0.push(dc[db])}};this.removeDownloadExtensions=function(dd){var dc,db=[];if(w(dd)){dd=dd.split("|")}for(dc=0;dc<c0.length;dc++){if(M(dd,c0[dc])===-1){db.push(c0[dc])}}c0=db};this.setDomains=function(db){au=w(db)?[db]:db;var df=false,dd=0,dc;for(dd;dd<au.length;dd++){dc=String(au[dd]);if(cB(cO,L(dc))){df=true;break}var de=cg(dc);if(de&&de!=="/"&&de!=="/*"){df=true;break}}if(!df){au.push(cO)}};this.enableCrossDomainLinking=function(){cH=true};this.disableCrossDomainLinking=function(){cH=false};this.isCrossDomainLinkingEnabled=function(){return cH};this.setCrossDomainLinkingTimeout=function(db){aV=db};this.getCrossDomainLinkingUrlParameter=function(){return t(ar)+"="+t(bm())
-};this.setIgnoreClasses=function(db){bu=w(db)?[db]:db};this.setRequestMethod=function(db){c3=db||cd};this.setRequestContentType=function(db){cs=db||aE};this.setReferrerUrl=function(db){bi=db};this.setCustomUrl=function(db){a0=bQ(bI,db)};this.getCurrentUrl=function(){return a0||bI};this.setDocumentTitle=function(db){be=db};this.setAPIUrl=function(db){bC=db};this.setDownloadClasses=function(db){bG=w(db)?[db]:db};this.setLinkClasses=function(db){a4=w(db)?[db]:db};this.setCampaignNameKey=function(db){cm=w(db)?[db]:db};this.setCampaignKeywordKey=function(db){bB=w(db)?[db]:db};this.discardHashTag=function(db){bK=db};this.setCookieNamePrefix=function(db){bf=db;aM=bS()};this.setCookieDomain=function(db){var dc=L(db);if(br(dc)){cR=dc;bd()}};this.getCookieDomain=function(){return cR};this.hasCookies=function(){return"1"===b0()};this.setSessionCookie=function(dd,dc,db){if(!dd){throw new Error("Missing cookie name")}if(!J(db)){db=ck}bp.push(dd);c6(aP(dd),dc,db,bk,cR)};this.getCookie=function(dc){var db=az(aP(dc));
-if(db===0){return null}return db};this.setCookiePath=function(db){bk=db;bd()};this.getCookiePath=function(db){return bk};this.setVisitorCookieTimeout=function(db){cD=db*1000};this.setSessionCookieTimeout=function(db){ck=db*1000};this.getSessionCookieTimeout=function(){return ck};this.setReferralCookieTimeout=function(db){cZ=db*1000};this.setConversionAttributionFirstReferrer=function(db){bq=db};this.setSecureCookie=function(db){bN=db};this.disableCookies=function(){bg=true;c1.cookie="0";if(b1){aB()}};this.deleteCookies=function(){aB()};this.setDoNotTrack=function(dc){var db=h.doNotTrack||h.msDoNotTrack;cK=dc&&(db==="yes"||db==="1");if(cK){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cQ=true};this.addListener=function(dc,db){an(dc,db)};this.enableLinkTracking=function(dc){c2=true;var db=this;cc(function(){q(function(){by(dc,db)})})};this.enableJSErrorTracking=function(){if(cM){return}cM=true;var db=T.onerror;T.onerror=function(dg,de,dd,df,dc){cc(function(){var dh="JavaScript Errors";
-var di=de+":"+dd;if(df){di+=":"+df}ap(dh,di,dg)});if(db){return db(dg,de,dd,df,dc)}return false}};this.disablePerformanceTracking=function(){aY=false};this.setGenerationTimeMs=function(db){ci=parseInt(db,10)};this.enableHeartBeatTimer=function(db){db=Math.max(db,1);a1=(db||15)*1000;if(cS!==null){c8()}};this.disableHeartBeatTimer=function(){bF();if(a1||aK){if(T.removeEventListener){T.removeEventListener("focus",a6,true);T.removeEventListener("blur",av,true)}else{if(T.detachEvent){T.detachEvent("onfocus",a6);T.detachEvent("onblur",av)}}}a1=null;aK=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};this.redirectFile=function(db){if(T.location.protocol==="file:"){T.location=db}};this.setCountPreRendered=function(db){ba=db};this.trackGoal=function(db,de,dd,dc){cc(function(){cN(db,de,dd,dc)})};this.trackLink=function(dc,db,de,dd){cc(function(){cV(dc,db,de,dd)})};this.getNumTrackedPageViews=function(){return cn};this.trackPageView=function(db,dd,dc){b5=[];
-cE=[];if(N(b1)){cc(function(){Y(aA,bC,b1)})}else{cc(function(){cn++;bV(db,dd,dc)})}};this.trackAllContentImpressions=function(){if(N(b1)){return}cc(function(){q(function(){var db=v.findContentNodes();var dc=cu(db);c7(dc,bE)})})};this.trackVisibleContentImpressions=function(db,dc){if(N(b1)){return}if(!J(db)){db=true}if(!J(dc)){dc=750}aO(db,dc,this);cc(function(){n(function(){var dd=v.findContentNodes();var de=a5(dd);c7(de,bE)})})};this.trackContentImpression=function(dd,db,dc){if(N(b1)){return}dd=a(dd);db=a(db);dc=a(dc);if(!dd){return}db=db||"Unknown";cc(function(){var de=aC(dd,db,dc);bA(de,bE)})};this.trackContentImpressionsWithinNode=function(db){if(N(b1)||!db){return}cc(function(){if(ca){n(function(){var dc=v.findContentNodesWithinNode(db);var dd=a5(dc);c7(dd,bE)})}else{q(function(){var dc=v.findContentNodesWithinNode(db);var dd=cu(dc);c7(dd,bE)})}})};this.trackContentInteraction=function(dd,de,db,dc){if(N(b1)){return}dd=a(dd);de=a(de);db=a(db);dc=a(dc);if(!dd||!de){return}db=db||"Unknown";
-cc(function(){var df=aL(dd,de,db,dc);if(df){bA(df,bE)}})};this.trackContentInteractionNode=function(dc,db){if(N(b1)||!dc){return}cc(function(){var dd=c4(dc,db);if(dd){bA(dd,bE)}})};this.logAllContentBlocksOnPage=function(){var dd=v.findContentNodes();var db=v.collectContent(dd);var dc=typeof console;if(dc!=="undefined"&&console&&console.log){console.log(db)}};this.trackEvent=function(dc,de,db,dd,dg,df){cc(function(){ap(dc,de,db,dd,dg,df)})};this.trackSiteSearch=function(db,dd,dc,de){b5=[];cc(function(){b3(db,dd,dc,de)})};this.setEcommerceView=function(de,db,dd,dc){if(!J(dd)||!dd.length){dd=""}else{if(dd instanceof Array){dd=JSON_PIWIK.stringify(dd)}}bR[5]=["_pkc",dd];if(J(dc)&&String(dc).length){bR[2]=["_pkp",dc]}if((!J(de)||!de.length)&&(!J(db)||!db.length)){return}if(J(de)&&de.length){bR[3]=["_pks",de]}if(!J(db)||!db.length){db=""}bR[4]=["_pkn",db]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cU))};this.addEcommerceItem=function(df,db,dd,dc,de){if(df.length){cU[df]=[df,db,dd,dc,de]
-}};this.removeEcommerceItem=function(db){if(db.length){delete cU[db]}};this.clearEcommerceCart=function(){cU={}};this.trackEcommerceOrder=function(db,df,de,dd,dc,dg){bU(db,df,de,dd,dc,dg)};this.trackEcommerceCartUpdate=function(db){bn(db)};this.trackRequest=function(dc,de,dd,db){cc(function(){var df=co(dc,de,db);bA(df,bE,dd)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bx.enabled=false};this.queueRequest=function(db){cc(function(){var dc=co(db);bx.push(dc)})};this.getRememberedConsent=function(){var db=az(a9);if(az(cG)){if(db){bT(a9,bk,cR)}return null}if(!db||db===0){return null}return db};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cv=true;bw=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bw){aB()}}}};this.setConsentGiven=function(){bw=true;bT(cG,bk,cR);var dc,db;for(dc=0;dc<cE.length;dc++){db=typeof cE[dc];if(db==="string"){bA(cE[dc],bE)
-}else{if(db==="object"){c7(cE[dc],bE)}}}cE=[]};this.rememberConsentGiven=function(dc){if(bg){ah("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");return}if(dc){dc=dc*60*60*1000}this.setConsentGiven();var db=new Date().getTime();c6(a9,db,dc,bk,cR,bN)};this.forgetConsentGiven=function(){if(bg){ah("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}bT(a9,bk,cR);c6(cG,new Date().getTime(),0,bk,cR,bN);this.requireConsent()};this.isUserOptedOut=function(){return !bw};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ad}}function c(aq,ap){var ar={};var an,ao;for(an=0;an<ap.length;an++){var al=ap[an];ar[al]=1;for(ao=0;ao<aq.length;ao++){if(aq[ao]&&aq[ao][0]){var am=aq[ao][0];if(al===am){ad(aq[ao]);delete aq[ao];if(ar[am]>1&&am!=="addTracker"){ah("The method "+am+' 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: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
-}ar[am]++}}}}return aq}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ab(al,an){var am=new Q(al,an);I.push(am);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){ad(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[am]);return am}ak(T,"beforeunload",af,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ao,an,am,al){var ap=typeof al;if(ap==="undefined"){al=false}ak(ao,an,am,al)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(am,al){if(!y[am]){y[am]=[]}y[am].push(al)},off:function(an,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){if(y[an][al]===am){y[an].splice(al,1)}}},trigger:function(an,ao,am){if(!y[an]){return}var al=0;
-for(al;al<y[an].length;al++){y[an][al].apply(am||T,ao)}},addPlugin:function(al,am){b[al]=am},getTracker:function(al,am){if(!J(am)){am=this.getAsyncTracker().getSiteId()}if(!J(al)){al=this.getAsyncTracker().getTrackerUrl()}return new Q(al,am)},getAsyncTrackers:function(){return I},addTracker:function(al,an){var am;if(!I.length){am=ab(al,an)}else{am=I[0].addTracker(al,an)}return am},getAsyncTracker:function(am,ap){var ao;if(I&&I.length&&I[0]){ao=I[0]}else{return ab(am,ap)}if(!ap&&!am){return ao}if((!J(ap)||null===ap)&&ao){ap=ao.getSiteId()}if((!J(am)||null===am)&&ao){am=ao.getTrackerUrl()}var an,al=0;for(al;al<I.length;al++){an=I[al];if(an&&String(an.getSiteId())===String(ap)&&an.getTrackerUrl()===am){return an}}},retryMissedPluginCalls:function(){var am=ae;ae=[];var al=0;for(al;al<am.length;al++){ad(am[al])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})}return e}())}
+};this.getAttributionReferrerUrl=function(){return bH()[3]};this.setTrackerUrl=function(db){aA=db};this.getTrackerUrl=function(){return aA};this.getPiwikUrl=function(){return O(this.getTrackerUrl(),bC)};this.addTracker=function(db,dd){if(!J(db)||null===db){db=this.getTrackerUrl()}var dc=new Q(db,dd);I.push(dc);e.trigger("TrackerAdded",[this]);return dc};this.getSiteId=function(){return b1};this.setSiteId=function(db){bY(db)};this.resetUserId=function(){bt=""};this.setUserId=function(db){if(!J(db)||!db.length){return}bt=db};this.getUserId=function(){return bt};this.setCustomData=function(db,dc){if(W(db)){al=db}else{if(!al){al={}}al[db]=dc}};this.getCustomData=function(){return al};this.setCustomRequestProcessing=function(db){b6=db};this.appendToTrackingUrl=function(db){cT=db};this.getRequest=function(db){return co(db)};this.addPlugin=function(db,dc){b[db]=dc};this.setCustomDimension=function(db,dc){db=parseInt(db,10);if(db>0){if(!J(dc)){dc=""}if(!w(dc)){dc=String(dc)}bh[db]=dc}};this.getCustomDimension=function(db){db=parseInt(db,10);
+if(db>0&&Object.prototype.hasOwnProperty.call(bh,db)){return bh[db]}};this.deleteCustomDimension=function(db){db=parseInt(db,10);if(db>0){delete bh[db]}};this.setCustomVariable=function(dc,db,df,dd){var de;if(!J(dd)){dd="visit"}if(!J(db)){return}if(!J(df)){df=""}if(dc>0){db=!w(db)?String(db):db;df=!w(df)?String(df):df;de=[db.slice(0,bo),df.slice(0,bo)];if(dd==="visit"||dd===2){cy();aM[dc]=de}else{if(dd==="page"||dd===3){bR[dc]=de}else{if(dd==="event"){ch[dc]=de}}}}};this.getCustomVariable=function(dc,dd){var db;if(!J(dd)){dd="visit"}if(dd==="page"||dd===3){db=bR[dc]}else{if(dd==="event"){db=ch[dc]}else{if(dd==="visit"||dd===2){cy();db=aM[dc]}}}if(!J(db)||(db&&db[0]==="")){return false}return db};this.deleteCustomVariable=function(db,dc){if(this.getCustomVariable(db,dc)){this.setCustomVariable(db,"","",dc)}};this.deleteCustomVariables=function(db){if(db==="page"||db===3){bR={}}else{if(db==="event"){ch={}}else{if(db==="visit"||db===2){aM={}}}}};this.storeCustomVariablesInCookie=function(){bL=true
+};this.setLinkTrackingTimer=function(db){bE=db};this.getLinkTrackingTimer=function(){return bE};this.setDownloadExtensions=function(db){if(w(db)){db=db.split("|")}c0=db};this.addDownloadExtensions=function(dc){var db;if(w(dc)){dc=dc.split("|")}for(db=0;db<dc.length;db++){c0.push(dc[db])}};this.removeDownloadExtensions=function(dd){var dc,db=[];if(w(dd)){dd=dd.split("|")}for(dc=0;dc<c0.length;dc++){if(M(dd,c0[dc])===-1){db.push(c0[dc])}}c0=db};this.setDomains=function(db){au=w(db)?[db]:db;var df=false,dd=0,dc;for(dd;dd<au.length;dd++){dc=String(au[dd]);if(cB(cO,L(dc))){df=true;break}var de=cg(dc);if(de&&de!=="/"&&de!=="/*"){df=true;break}}if(!df){au.push(cO)}};this.enableCrossDomainLinking=function(){cH=true};this.disableCrossDomainLinking=function(){cH=false};this.isCrossDomainLinkingEnabled=function(){return cH};this.setCrossDomainLinkingTimeout=function(db){aV=db};this.getCrossDomainLinkingUrlParameter=function(){return t(ar)+"="+t(bm())};this.setIgnoreClasses=function(db){bu=w(db)?[db]:db
+};this.setRequestMethod=function(db){c3=db||cd};this.setRequestContentType=function(db){cs=db||aE};this.setReferrerUrl=function(db){bi=db};this.setCustomUrl=function(db){a0=bQ(bI,db)};this.getCurrentUrl=function(){return a0||bI};this.setDocumentTitle=function(db){be=db};this.setAPIUrl=function(db){bC=db};this.setDownloadClasses=function(db){bG=w(db)?[db]:db};this.setLinkClasses=function(db){a4=w(db)?[db]:db};this.setCampaignNameKey=function(db){cm=w(db)?[db]:db};this.setCampaignKeywordKey=function(db){bB=w(db)?[db]:db};this.discardHashTag=function(db){bK=db};this.setCookieNamePrefix=function(db){bf=db;aM=bS()};this.setCookieDomain=function(db){var dc=L(db);if(br(dc)){cR=dc;bd()}};this.getCookieDomain=function(){return cR};this.hasCookies=function(){return"1"===b0()};this.setSessionCookie=function(dd,dc,db){if(!dd){throw new Error("Missing cookie name")}if(!J(db)){db=ck}bp.push(dd);c6(aP(dd),dc,db,bk,cR)};this.getCookie=function(dc){var db=az(aP(dc));if(db===0){return null}return db};this.setCookiePath=function(db){bk=db;
+bd()};this.getCookiePath=function(db){return bk};this.setVisitorCookieTimeout=function(db){cD=db*1000};this.setSessionCookieTimeout=function(db){ck=db*1000};this.getSessionCookieTimeout=function(){return ck};this.setReferralCookieTimeout=function(db){cZ=db*1000};this.setConversionAttributionFirstReferrer=function(db){bq=db};this.setSecureCookie=function(db){bN=db};this.disableCookies=function(){bg=true;c1.cookie="0";if(b1){aB()}};this.deleteCookies=function(){aB()};this.setDoNotTrack=function(dc){var db=h.doNotTrack||h.msDoNotTrack;cK=dc&&(db==="yes"||db==="1");if(cK){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cQ=true};this.addListener=function(dc,db){an(dc,db)};this.enableLinkTracking=function(dc){c2=true;var db=this;cc(function(){q(function(){by(dc,db)})})};this.enableJSErrorTracking=function(){if(cM){return}cM=true;var db=T.onerror;T.onerror=function(dg,de,dd,df,dc){cc(function(){var dh="JavaScript Errors";var di=de+":"+dd;if(df){di+=":"+df}ap(dh,di,dg)});if(db){return db(dg,de,dd,df,dc)
+}return false}};this.disablePerformanceTracking=function(){aY=false};this.setGenerationTimeMs=function(db){ci=parseInt(db,10)};this.enableHeartBeatTimer=function(db){db=Math.max(db,1);a1=(db||15)*1000;if(cS!==null){c8()}};this.disableHeartBeatTimer=function(){bF();if(a1||aK){if(T.removeEventListener){T.removeEventListener("focus",a6);T.removeEventListener("blur",av)}else{if(T.detachEvent){T.detachEvent("onfocus",a6);T.detachEvent("onblur",av)}}}a1=null;aK=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};this.redirectFile=function(db){if(T.location.protocol==="file:"){T.location=db}};this.setCountPreRendered=function(db){ba=db};this.trackGoal=function(db,de,dd,dc){cc(function(){cN(db,de,dd,dc)})};this.trackLink=function(dc,db,de,dd){cc(function(){cV(dc,db,de,dd)})};this.getNumTrackedPageViews=function(){return cn};this.trackPageView=function(db,dd,dc){b5=[];cE=[];if(N(b1)){cc(function(){Y(aA,bC,b1)})}else{cc(function(){cn++;bV(db,dd,dc)})}};this.trackAllContentImpressions=function(){if(N(b1)){return
+}cc(function(){q(function(){var db=v.findContentNodes();var dc=cu(db);c7(dc,bE)})})};this.trackVisibleContentImpressions=function(db,dc){if(N(b1)){return}if(!J(db)){db=true}if(!J(dc)){dc=750}aO(db,dc,this);cc(function(){n(function(){var dd=v.findContentNodes();var de=a5(dd);c7(de,bE)})})};this.trackContentImpression=function(dd,db,dc){if(N(b1)){return}dd=a(dd);db=a(db);dc=a(dc);if(!dd){return}db=db||"Unknown";cc(function(){var de=aC(dd,db,dc);bA(de,bE)})};this.trackContentImpressionsWithinNode=function(db){if(N(b1)||!db){return}cc(function(){if(ca){n(function(){var dc=v.findContentNodesWithinNode(db);var dd=a5(dc);c7(dd,bE)})}else{q(function(){var dc=v.findContentNodesWithinNode(db);var dd=cu(dc);c7(dd,bE)})}})};this.trackContentInteraction=function(dd,de,db,dc){if(N(b1)){return}dd=a(dd);de=a(de);db=a(db);dc=a(dc);if(!dd||!de){return}db=db||"Unknown";cc(function(){var df=aL(dd,de,db,dc);if(df){bA(df,bE)}})};this.trackContentInteractionNode=function(dc,db){if(N(b1)||!dc){return}cc(function(){var dd=c4(dc,db);
+if(dd){bA(dd,bE)}})};this.logAllContentBlocksOnPage=function(){var dd=v.findContentNodes();var db=v.collectContent(dd);var dc=typeof console;if(dc!=="undefined"&&console&&console.log){console.log(db)}};this.trackEvent=function(dc,de,db,dd,dg,df){cc(function(){ap(dc,de,db,dd,dg,df)})};this.trackSiteSearch=function(db,dd,dc,de){b5=[];cc(function(){b3(db,dd,dc,de)})};this.setEcommerceView=function(de,db,dd,dc){if(!J(dd)||!dd.length){dd=""}else{if(dd instanceof Array){dd=JSON_PIWIK.stringify(dd)}}bR[5]=["_pkc",dd];if(J(dc)&&String(dc).length){bR[2]=["_pkp",dc]}if((!J(de)||!de.length)&&(!J(db)||!db.length)){return}if(J(de)&&de.length){bR[3]=["_pks",de]}if(!J(db)||!db.length){db=""}bR[4]=["_pkn",db]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cU))};this.addEcommerceItem=function(df,db,dd,dc,de){if(df.length){cU[df]=[df,db,dd,dc,de]}};this.removeEcommerceItem=function(db){if(db.length){delete cU[db]}};this.clearEcommerceCart=function(){cU={}};this.trackEcommerceOrder=function(db,df,de,dd,dc,dg){bU(db,df,de,dd,dc,dg)
+};this.trackEcommerceCartUpdate=function(db){bn(db)};this.trackRequest=function(dc,de,dd,db){cc(function(){var df=co(dc,de,db);bA(df,bE,dd)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bx.enabled=false};this.queueRequest=function(db){cc(function(){var dc=co(db);bx.push(dc)})};this.getRememberedConsent=function(){var db=az(a9);if(az(cG)){if(db){bT(a9,bk,cR)}return null}if(!db||db===0){return null}return db};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cv=true;bw=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bw){aB()}}}};this.setConsentGiven=function(){bw=true;bT(cG,bk,cR);var dc,db;for(dc=0;dc<cE.length;dc++){db=typeof cE[dc];if(db==="string"){bA(cE[dc],bE)}else{if(db==="object"){c7(cE[dc],bE)}}}cE=[]};this.rememberConsentGiven=function(dc){if(bg){ah("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");
+return}if(dc){dc=dc*60*60*1000}this.setConsentGiven();var db=new Date().getTime();c6(a9,db,dc,bk,cR,bN)};this.forgetConsentGiven=function(){if(bg){ah("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}var db=30*365*24*60*60*1000;bT(a9,bk,cR);c6(cG,new Date().getTime(),db,bk,cR,bN);this.requireConsent()};this.isUserOptedOut=function(){return !bw};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ad}}function c(aq,ap){var ar={};var an,ao;for(an=0;an<ap.length;an++){var al=ap[an];ar[al]=1;for(ao=0;ao<aq.length;ao++){if(aq[ao]&&aq[ao][0]){var am=aq[ao][0];if(al===am){ad(aq[ao]);delete aq[ao];if(ar[am]>1&&am!=="addTracker"){ah("The method "+am+' 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: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
+}ar[am]++}}}}return aq}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ab(al,an){var am=new Q(al,an);I.push(am);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){ad(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[am]);return am}ak(T,"beforeunload",af,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ao,an,am,al){var ap=typeof al;if(ap==="undefined"){al=false}ak(ao,an,am,al)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(am,al){if(!y[am]){y[am]=[]}y[am].push(al)},off:function(an,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){if(y[an][al]===am){y[an].splice(al,1)
+}}},trigger:function(an,ao,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){y[an][al].apply(am||T,ao)}},addPlugin:function(al,am){b[al]=am},getTracker:function(al,am){if(!J(am)){am=this.getAsyncTracker().getSiteId()}if(!J(al)){al=this.getAsyncTracker().getTrackerUrl()}return new Q(al,am)},getAsyncTrackers:function(){return I},addTracker:function(al,an){var am;if(!I.length){am=ab(al,an)}else{am=I[0].addTracker(al,an)}return am},getAsyncTracker:function(am,ap){var ao;if(I&&I.length&&I[0]){ao=I[0]}else{return ab(am,ap)}if(!ap&&!am){return ao}if((!J(ap)||null===ap)&&ao){ap=ao.getSiteId()}if((!J(am)||null===am)&&ao){am=ao.getTrackerUrl()}var an,al=0;for(al;al<I.length;al++){an=I[al];if(an&&String(an.getSiteId())===String(ap)&&an.getTrackerUrl()===am){return an}}},retryMissedPluginCalls:function(){var am=ae;ae=[];var al=0;for(al;al<am.length;al++){ad(am[al])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})
+}return e}())}
 /*!!! pluginTrackerHook */
-(function(){function b(){if("object"!==typeof _paq){return false
-}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true
-}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
+(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)
+}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
 /*!! @license-end */;
\ No newline at end of file
diff --git a/app/misc/gpl-3.0.txt b/app/misc/gpl-3.0.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/piwik.js b/app/piwik.js
new file mode 100644
index 000000000..d3d035ca2
--- /dev/null
+++ b/app/piwik.js
@@ -0,0 +1,79 @@
+/*!!
+ * Piwik - free/libre analytics platform
+ *
+ * JavaScript tracking client
+ *
+ * @link https://piwik.org
+ * @source https://github.com/matomo-org/matomo/blob/master/js/piwik.js
+ * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt)
+ * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
+ */
+;if(typeof JSON_PIWIK!=="object"&&typeof window.JSON==="object"&&window.JSON.stringify&&window.JSON.parse){JSON_PIWIK=window.JSON}else{(function(){var a={};
+/*!! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */
+(function(){var c=typeof define==="function"&&define.amd;var e={"function":true,object:true};var h=e[typeof a]&&a&&!a.nodeType&&a;var i=e[typeof window]&&window||this,b=h&&e[typeof module]&&module&&!module.nodeType&&typeof global=="object"&&global;if(b&&(b.global===b||b.window===b||b.self===b)){i=b}function j(ab,V){ab||(ab=i.Object());V||(V=i.Object());
+var K=ab.Number||i.Number,R=ab.String||i.String,x=ab.Object||i.Object,S=ab.Date||i.Date,T=ab.SyntaxError||i.SyntaxError,aa=ab.TypeError||i.TypeError,J=ab.Math||i.Math,Y=ab.JSON||i.JSON;if(typeof Y=="object"&&Y){V.stringify=Y.stringify;V.parse=Y.parse}var n=x.prototype,u=n.toString,r,m,L;var B=new S(-3509827334573292);try{B=B.getUTCFullYear()==-109252&&B.getUTCMonth()===0&&B.getUTCDate()===1&&B.getUTCHours()==10&&B.getUTCMinutes()==37&&B.getUTCSeconds()==6&&B.getUTCMilliseconds()==708}catch(v){}function o(ac){if(o[ac]!==L){return o[ac]}var ad;if(ac=="bug-string-char-index"){ad="a"[0]!="a"}else{if(ac=="json"){ad=o("json-stringify")&&o("json-parse")}else{var ak,ah='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(ac=="json-stringify"){var ai=V.stringify,aj=typeof ai=="function"&&B;if(aj){(ak=function(){return 1}).toJSON=ak;try{aj=ai(0)==="0"&&ai(new K())==="0"&&ai(new R())=='""'&&ai(u)===L&&ai(L)===L&&ai()===L&&ai(ak)==="1"&&ai([ak])=="[1]"&&ai([L])=="[null]"&&ai(null)=="null"&&ai([L,u,null])=="[null,null,null]"&&ai({a:[ak,true,false,null,"\x00\b\n\f\r\t"]})==ah&&ai(null,ak)==="1"&&ai([1,2],null,1)=="[\n 1,\n 2\n]"&&ai(new S(-8640000000000000))=='"-271821-04-20T00:00:00.000Z"'&&ai(new S(8640000000000000))=='"+275760-09-13T00:00:00.000Z"'&&ai(new S(-62198755200000))=='"-000001-01-01T00:00:00.000Z"'&&ai(new S(-1))=='"1969-12-31T23:59:59.999Z"'
+}catch(ae){aj=false}}ad=aj}if(ac=="json-parse"){var ag=V.parse;if(typeof ag=="function"){try{if(ag("0")===0&&!ag(false)){ak=ag(ah);var af=ak.a.length==5&&ak.a[0]===1;if(af){try{af=!ag('"\t"')}catch(ae){}if(af){try{af=ag("01")!==1}catch(ae){}}if(af){try{af=ag("1.")!==1}catch(ae){}}}}}catch(ae){af=false}}ad=af}}}return o[ac]=!!ad}if(!o("json")){var U="[object Function]",Q="[object Date]",N="[object Number]",O="[object String]",E="[object Array]",A="[object Boolean]";var F=o("bug-string-char-index");if(!B){var s=J.floor;var Z=[0,31,59,90,120,151,181,212,243,273,304,334];var D=function(ac,ad){return Z[ad]+365*(ac-1970)+s((ac-1969+(ad=+(ad>1)))/4)-s((ac-1901+ad)/100)+s((ac-1601+ad)/400)}}if(!(r=n.hasOwnProperty)){r=function(ae){var ac={},ad;if((ac.__proto__=null,ac.__proto__={toString:1},ac).toString!=u){r=function(ah){var ag=this.__proto__,af=ah in (this.__proto__=null,this);this.__proto__=ag;return af}}else{ad=ac.constructor;r=function(ag){var af=(this.constructor||ad).prototype;return ag in this&&!(ag in af&&this[ag]===af[ag])
+}}ac=null;return r.call(this,ae)}}m=function(ae,ah){var af=0,ac,ad,ag;(ac=function(){this.valueOf=0}).prototype.valueOf=0;ad=new ac();for(ag in ad){if(r.call(ad,ag)){af++}}ac=ad=null;if(!af){ad=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"];m=function(aj,an){var am=u.call(aj)==U,al,ak;var ai=!am&&typeof aj.constructor!="function"&&e[typeof aj.hasOwnProperty]&&aj.hasOwnProperty||r;for(al in aj){if(!(am&&al=="prototype")&&ai.call(aj,al)){an(al)}}for(ak=ad.length;al=ad[--ak];ai.call(aj,al)&&an(al)){}}}else{if(af==2){m=function(aj,am){var ai={},al=u.call(aj)==U,ak;for(ak in aj){if(!(al&&ak=="prototype")&&!r.call(ai,ak)&&(ai[ak]=1)&&r.call(aj,ak)){am(ak)}}}}else{m=function(aj,am){var al=u.call(aj)==U,ak,ai;for(ak in aj){if(!(al&&ak=="prototype")&&r.call(aj,ak)&&!(ai=ak==="constructor")){am(ak)}}if(ai||r.call(aj,(ak="constructor"))){am(ak)}}}}return m(ae,ah)};if(!o("json-stringify")){var q={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"};
+var I="000000";var t=function(ac,ad){return(I+(ad||0)).slice(-ac)};var z="\\u00";var C=function(ai){var ad='"',ag=0,ah=ai.length,ac=!F||ah>10;var af=ac&&(F?ai.split(""):ai);for(;ag<ah;ag++){var ae=ai.charCodeAt(ag);switch(ae){case 8:case 9:case 10:case 12:case 13:case 34:case 92:ad+=q[ae];break;default:if(ae<32){ad+=z+t(2,ae.toString(16));break}ad+=ac?af[ag]:ai.charAt(ag)}}return ad+'"'};var p=function(ai,aA,ag,al,ax,ac,aj){var at,ae,ap,az,ay,ak,aw,au,aq,an,ar,ad,ah,af,av,ao;try{at=aA[ai]}catch(am){}if(typeof at=="object"&&at){ae=u.call(at);if(ae==Q&&!r.call(at,"toJSON")){if(at>-1/0&&at<1/0){if(D){ay=s(at/86400000);for(ap=s(ay/365.2425)+1970-1;D(ap+1,0)<=ay;ap++){}for(az=s((ay-D(ap,0))/30.42);D(ap,az+1)<=ay;az++){}ay=1+ay-D(ap,az);ak=(at%86400000+86400000)%86400000;aw=s(ak/3600000)%24;au=s(ak/60000)%60;aq=s(ak/1000)%60;an=ak%1000}else{ap=at.getUTCFullYear();az=at.getUTCMonth();ay=at.getUTCDate();aw=at.getUTCHours();au=at.getUTCMinutes();aq=at.getUTCSeconds();an=at.getUTCMilliseconds()}at=(ap<=0||ap>=10000?(ap<0?"-":"+")+t(6,ap<0?-ap:ap):t(4,ap))+"-"+t(2,az+1)+"-"+t(2,ay)+"T"+t(2,aw)+":"+t(2,au)+":"+t(2,aq)+"."+t(3,an)+"Z"
+}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);JSON_PIWIK=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof window.Piwik!=="object"){window.Matomo=window.Piwik=(function(){var r,b={},y={},G=document,h=navigator,X=screen,T=window,i=T.performance||T.mozPerformance||T.msPerformance||T.webkitPerformance,t=T.encodeURIComponent,S=T.decodeURIComponent,l=unescape,I=[],E,e,ae=[],x=0,U=0,m=false;
+function p(al){try{return S(al)}catch(am){return unescape(al)}}function J(am){var al=typeof am;return al!=="undefined"}function A(al){return typeof al==="function"}function W(al){return typeof al==="object"}function w(al){return typeof al==="string"||al instanceof String}function B(am){if(!am){return true}var al;var an=true;for(al in am){if(Object.prototype.hasOwnProperty.call(am,al)){an=false}}return an}function ah(al){var am=typeof console;if(am!=="undefined"&&console&&console.error){console.error(al)}}function ad(){var aq,ap,at,am,al;for(aq=0;aq<arguments.length;aq+=1){al=null;if(arguments[aq]&&arguments[aq].slice){al=arguments[aq].slice()}am=arguments[aq];at=am.shift();var ar,an;var ao=w(at)&&at.indexOf("::")>0;if(ao){ar=at.split("::");an=ar[0];at=ar[1];if("object"===typeof e[an]&&"function"===typeof e[an][at]){e[an][at].apply(e[an],am)}else{if(al){ae.push(al)}}}else{for(ap=0;ap<I.length;ap++){if(w(at)){an=I[ap];var au=at.indexOf(".")>0;if(au){ar=at.split(".");if(an&&"object"===typeof an[ar[0]]){an=an[ar[0]];
+at=ar[1]}else{if(al){ae.push(al);break}}}if(an[at]){an[at].apply(an,am)}else{var av="The method '"+at+'\' was not found in "_paq" variable.  Please have a look at the Piwik tracker documentation: https://developer.piwik.org/api-reference/tracking-javascript';ah(av);if(!au){throw new TypeError(av)}}if(at==="addTracker"){break}if(at==="setTrackerUrl"||at==="setSiteId"){break}}else{at.apply(I[ap],am)}}}}}function ak(ao,an,am,al){if(ao.addEventListener){ao.addEventListener(an,am,al);return true}if(ao.attachEvent){return ao.attachEvent("on"+an,am)}ao["on"+an]=am}function n(al){if(G.readyState==="complete"){al()}else{if(T.addEventListener){T.addEventListener("load",al,false)}else{if(T.attachEvent){T.attachEvent("onload",al)}}}}function q(ao){var al=false;if(G.attachEvent){al=G.readyState==="complete"}else{al=G.readyState!=="loading"}if(al){ao();return}var an;if(G.addEventListener){ak(G,"DOMContentLoaded",function am(){G.removeEventListener("DOMContentLoaded",am,false);if(!al){al=true;ao()}})}else{if(G.attachEvent){G.attachEvent("onreadystatechange",function am(){if(G.readyState==="complete"){G.detachEvent("onreadystatechange",am);
+if(!al){al=true;ao()}}});if(G.documentElement.doScroll&&T===T.top){(function am(){if(!al){try{G.documentElement.doScroll("left")}catch(ap){setTimeout(am,0);return}al=true;ao()}}())}}}ak(T,"load",function(){if(!al){al=true;ao()}},false)}function aa(am,ar,at){if(!am){return""}var al="",ao,an,ap,aq;for(ao in b){if(Object.prototype.hasOwnProperty.call(b,ao)){aq=b[ao]&&"function"===typeof b[ao][am];if(aq){an=b[ao][am];ap=an(ar||{},at);if(ap){al+=ap}}}}return al}function af(){var al;m=true;aa("unload");if(r){do{al=new Date()}while(al.getTimeAlias()<r)}}function o(an,am){var al=G.createElement("script");al.type="text/javascript";al.src=an;if(al.readyState){al.onreadystatechange=function(){var ao=this.readyState;if(ao==="loaded"||ao==="complete"){al.onreadystatechange=null;am()}}}else{al.onload=am}G.getElementsByTagName("head")[0].appendChild(al)}function K(){var al="";try{al=T.top.document.referrer}catch(an){if(T.parent){try{al=T.parent.document.referrer}catch(am){al=""}}}if(al===""){al=G.referrer
+}return al}function s(al){var an=new RegExp("^([a-z]+):"),am=an.exec(al);return am?am[1]:null}function d(al){var an=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),am=an.exec(al);return am?am[1]:al}function ag(am,al){am=String(am);return am.lastIndexOf(al,0)===0}function R(am,al){am=String(am);return am.indexOf(al,am.length-al.length)!==-1}function z(am,al){am=String(am);return am.indexOf(al)!==-1}function g(am,al){am=String(am);return am.substr(0,am.length-al)}function F(ao,an,aq){ao=String(ao);if(!aq){aq=""}var al=ao.indexOf("#");var ar=ao.length;if(al===-1){al=ar}var ap=ao.substr(0,al);var am=ao.substr(al,ar-al);if(ap.indexOf("?")===-1){ap+="?"}else{if(!R(ap,"?")){ap+="&"}}return ap+t(an)+"="+t(aq)+am}function k(am,an){am=String(am);if(am.indexOf("?"+an+"=")===-1&&am.indexOf("&"+an+"=")===-1){return am}var ao=am.indexOf("?");if(ao===-1){return am}var al=am.substr(ao+1);var at=am.substr(0,ao);if(al){var au="";var aw=al.indexOf("#");if(aw!==-1){au=al.substr(aw+1);al=al.substr(0,aw)
+}var ap;var ar=al.split("&");var aq=ar.length-1;for(aq;aq>=0;aq--){ap=ar[aq].split("=")[0];if(ap===an){ar.splice(aq,1)}}var av=ar.join("&");if(av){at=at+"?"+av}if(au){at+="#"+au}}return at}function f(an,am){var al="[\\?&#]"+am+"=([^&#]*)";var ap=new RegExp(al);var ao=ap.exec(an);return ao?S(ao[1]):""}function a(al){if(al&&String(al)===al){return al.replace(/^\s+|\s+$/g,"")}return al}function D(al){return unescape(t(al))}function aj(aB){var an=function(aH,aG){return(aH<<aG)|(aH>>>(32-aG))},aC=function(aJ){var aH="",aI,aG;for(aI=7;aI>=0;aI--){aG=(aJ>>>(aI*4))&15;aH+=aG.toString(16)}return aH},aq,aE,aD,am=[],av=1732584193,at=4023233417,ar=2562383102,ap=271733878,ao=3285377520,aA,az,ay,ax,aw,aF,al,au=[];aB=D(aB);al=aB.length;for(aE=0;aE<al-3;aE+=4){aD=aB.charCodeAt(aE)<<24|aB.charCodeAt(aE+1)<<16|aB.charCodeAt(aE+2)<<8|aB.charCodeAt(aE+3);au.push(aD)}switch(al&3){case 0:aE=2147483648;break;case 1:aE=aB.charCodeAt(al-1)<<24|8388608;break;case 2:aE=aB.charCodeAt(al-2)<<24|aB.charCodeAt(al-1)<<16|32768;
+break;case 3:aE=aB.charCodeAt(al-3)<<24|aB.charCodeAt(al-2)<<16|aB.charCodeAt(al-1)<<8|128;break}au.push(aE);while((au.length&15)!==14){au.push(0)}au.push(al>>>29);au.push((al<<3)&4294967295);for(aq=0;aq<au.length;aq+=16){for(aE=0;aE<16;aE++){am[aE]=au[aq+aE]}for(aE=16;aE<=79;aE++){am[aE]=an(am[aE-3]^am[aE-8]^am[aE-14]^am[aE-16],1)}aA=av;az=at;ay=ar;ax=ap;aw=ao;for(aE=0;aE<=19;aE++){aF=(an(aA,5)+((az&ay)|(~az&ax))+aw+am[aE]+1518500249)&4294967295;aw=ax;ax=ay;ay=an(az,30);az=aA;aA=aF}for(aE=20;aE<=39;aE++){aF=(an(aA,5)+(az^ay^ax)+aw+am[aE]+1859775393)&4294967295;aw=ax;ax=ay;ay=an(az,30);az=aA;aA=aF}for(aE=40;aE<=59;aE++){aF=(an(aA,5)+((az&ay)|(az&ax)|(ay&ax))+aw+am[aE]+2400959708)&4294967295;aw=ax;ax=ay;ay=an(az,30);az=aA;aA=aF}for(aE=60;aE<=79;aE++){aF=(an(aA,5)+(az^ay^ax)+aw+am[aE]+3395469782)&4294967295;aw=ax;ax=ay;ay=an(az,30);az=aA;aA=aF}av=(av+aA)&4294967295;at=(at+az)&4294967295;ar=(ar+ay)&4294967295;ap=(ap+ax)&4294967295;ao=(ao+aw)&4294967295}aF=aC(av)+aC(at)+aC(ar)+aC(ap)+aC(ao);
+return aF.toLowerCase()}function Z(an,al,am){if(!an){an=""}if(!al){al=""}if(an==="translate.googleusercontent.com"){if(am===""){am=al}al=f(al,"u");an=d(al)}else{if(an==="cc.bingj.com"||an==="webcache.googleusercontent.com"||an.slice(0,5)==="74.6."){al=G.links[0].href;an=d(al)}}return[an,al,am]}function L(am){var al=am.length;if(am.charAt(--al)==="."){am=am.slice(0,al)}if(am.slice(0,2)==="*."){am=am.slice(1)}if(am.indexOf("/")!==-1){am=am.substr(0,am.indexOf("/"))}return am}function ai(am){am=am&&am.text?am.text:am;if(!w(am)){var al=G.getElementsByTagName("title");if(al&&J(al[0])){am=al[0].text}}return am}function P(al){if(!al){return[]}if(!J(al.children)&&J(al.childNodes)){return al.children}if(J(al.children)){return al.children}return[]}function V(am,al){if(!am||!al){return false}if(am.contains){return am.contains(al)}if(am===al){return true}if(am.compareDocumentPosition){return !!(am.compareDocumentPosition(al)&16)}return false}function M(an,ao){if(an&&an.indexOf){return an.indexOf(ao)
+}if(!J(an)||an===null){return -1}if(!an.length){return -1}var al=an.length;if(al===0){return -1}var am=0;while(am<al){if(an[am]===ao){return am}am++}return -1}function j(an){if(!an){return false}function al(ap,aq){if(T.getComputedStyle){return G.defaultView.getComputedStyle(ap,null)[aq]}if(ap.currentStyle){return ap.currentStyle[aq]}}function ao(ap){ap=ap.parentNode;while(ap){if(ap===G){return true}ap=ap.parentNode}return false}function am(ar,ay,ap,av,at,aw,au){var aq=ar.parentNode,ax=1;if(!ao(ar)){return false}if(9===aq.nodeType){return true}if("0"===al(ar,"opacity")||"none"===al(ar,"display")||"hidden"===al(ar,"visibility")){return false}if(!J(ay)||!J(ap)||!J(av)||!J(at)||!J(aw)||!J(au)){ay=ar.offsetTop;at=ar.offsetLeft;av=ay+ar.offsetHeight;ap=at+ar.offsetWidth;aw=ar.offsetWidth;au=ar.offsetHeight}if(an===ar&&(0===au||0===aw)&&"hidden"===al(ar,"overflow")){return false}if(aq){if(("hidden"===al(aq,"overflow")||"scroll"===al(aq,"overflow"))){if(at+ax>aq.offsetWidth+aq.scrollLeft||at+aw-ax<aq.scrollLeft||ay+ax>aq.offsetHeight+aq.scrollTop||ay+au-ax<aq.scrollTop){return false
+}}if(ar.offsetParent===aq){at+=aq.offsetLeft;ay+=aq.offsetTop}return am(aq,ay,ap,av,at,aw,au)}return true}return am(an)}var ac={htmlCollectionToArray:function(an){var al=[],am;if(!an||!an.length){return al}for(am=0;am<an.length;am++){al.push(an[am])}return al},find:function(al){if(!document.querySelectorAll||!al){return[]}var am=document.querySelectorAll(al);return this.htmlCollectionToArray(am)},findMultiple:function(an){if(!an||!an.length){return[]}var am,ao;var al=[];for(am=0;am<an.length;am++){ao=this.find(an[am]);al=al.concat(ao)}al=this.makeNodesUnique(al);return al},findNodesByTagName:function(am,al){if(!am||!al||!am.getElementsByTagName){return[]}var an=am.getElementsByTagName(al);return this.htmlCollectionToArray(an)},makeNodesUnique:function(al){var aq=[].concat(al);al.sort(function(at,ar){if(at===ar){return 0}var av=M(aq,at);var au=M(aq,ar);if(av===au){return 0}return av>au?-1:1});if(al.length<=1){return al}var am=0;var ao=0;var ap=[];var an;an=al[am++];while(an){if(an===al[am]){ao=ap.push(am)
+}an=al[am++]||null}while(ao--){al.splice(ap[ao],1)}return al},getAttributeValueFromNode:function(ap,an){if(!this.hasNodeAttribute(ap,an)){return}if(ap&&ap.getAttribute){return ap.getAttribute(an)}if(!ap||!ap.attributes){return}var ao=(typeof ap.attributes[an]);if("undefined"===ao){return}if(ap.attributes[an].value){return ap.attributes[an].value}if(ap.attributes[an].nodeValue){return ap.attributes[an].nodeValue}var am;var al=ap.attributes;if(!al){return}for(am=0;am<al.length;am++){if(al[am].nodeName===an){return al[am].nodeValue}}return null},hasNodeAttributeWithValue:function(am,al){var an=this.getAttributeValueFromNode(am,al);return !!an},hasNodeAttribute:function(an,al){if(an&&an.hasAttribute){return an.hasAttribute(al)}if(an&&an.attributes){var am=(typeof an.attributes[al]);return"undefined"!==am}return false},hasNodeCssClass:function(an,al){if(an&&al&&an.className){var am=typeof an.className==="string"?an.className.split(" "):[];if(-1!==M(am,al)){return true}}return false},findNodesHavingAttribute:function(ap,an,al){if(!al){al=[]
+}if(!ap||!an){return al}var ao=P(ap);if(!ao||!ao.length){return al}var am,aq;for(am=0;am<ao.length;am++){aq=ao[am];if(this.hasNodeAttribute(aq,an)){al.push(aq)}al=this.findNodesHavingAttribute(aq,an,al)}return al},findFirstNodeHavingAttribute:function(an,am){if(!an||!am){return}if(this.hasNodeAttribute(an,am)){return an}var al=this.findNodesHavingAttribute(an,am);if(al&&al.length){return al[0]}},findFirstNodeHavingAttributeWithValue:function(ao,an){if(!ao||!an){return}if(this.hasNodeAttributeWithValue(ao,an)){return ao}var al=this.findNodesHavingAttribute(ao,an);if(!al||!al.length){return}var am;for(am=0;am<al.length;am++){if(this.getAttributeValueFromNode(al[am],an)){return al[am]}}},findNodesHavingCssClass:function(ap,ao,al){if(!al){al=[]}if(!ap||!ao){return al}if(ap.getElementsByClassName){var aq=ap.getElementsByClassName(ao);return this.htmlCollectionToArray(aq)}var an=P(ap);if(!an||!an.length){return[]}var am,ar;for(am=0;am<an.length;am++){ar=an[am];if(this.hasNodeCssClass(ar,ao)){al.push(ar)
+}al=this.findNodesHavingCssClass(ar,ao,al)}return al},findFirstNodeHavingClass:function(an,am){if(!an||!am){return}if(this.hasNodeCssClass(an,am)){return an}var al=this.findNodesHavingCssClass(an,am);if(al&&al.length){return al[0]}},isLinkElement:function(am){if(!am){return false}var al=String(am.nodeName).toLowerCase();var ao=["a","area"];var an=M(ao,al);return an!==-1},setAnyAttribute:function(am,al,an){if(!am||!al){return}if(am.setAttribute){am.setAttribute(al,an)}else{am[al]=an}}};var v={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 am="."+this.CONTENT_CLASS;var al="["+this.CONTENT_ATTR+"]";
+var an=ac.findMultiple([am,al]);return an},findContentNodesWithinNode:function(ao){if(!ao){return[]}var am=ac.findNodesHavingCssClass(ao,this.CONTENT_CLASS);var al=ac.findNodesHavingAttribute(ao,this.CONTENT_ATTR);if(al&&al.length){var an;for(an=0;an<al.length;an++){am.push(al[an])}}if(ac.hasNodeAttribute(ao,this.CONTENT_ATTR)){am.push(ao)}else{if(ac.hasNodeCssClass(ao,this.CONTENT_CLASS)){am.push(ao)}}am=ac.makeNodesUnique(am);return am},findParentContentNode:function(am){if(!am){return}var an=am;var al=0;while(an&&an!==G&&an.parentNode){if(ac.hasNodeAttribute(an,this.CONTENT_ATTR)){return an}if(ac.hasNodeCssClass(an,this.CONTENT_CLASS)){return an}an=an.parentNode;if(al>1000){break}al++}},findPieceNode:function(am){var al;al=ac.findFirstNodeHavingAttribute(am,this.CONTENT_PIECE_ATTR);if(!al){al=ac.findFirstNodeHavingClass(am,this.CONTENT_PIECE_CLASS)}if(al){return al}return am},findTargetNodeNoDefault:function(al){if(!al){return}var am=ac.findFirstNodeHavingAttributeWithValue(al,this.CONTENT_TARGET_ATTR);
+if(am){return am}am=ac.findFirstNodeHavingAttribute(al,this.CONTENT_TARGET_ATTR);if(am){return am}am=ac.findFirstNodeHavingClass(al,this.CONTENT_TARGET_CLASS);if(am){return am}},findTargetNode:function(al){var am=this.findTargetNodeNoDefault(al);if(am){return am}return al},findContentName:function(am){if(!am){return}var ap=ac.findFirstNodeHavingAttributeWithValue(am,this.CONTENT_NAME_ATTR);if(ap){return ac.getAttributeValueFromNode(ap,this.CONTENT_NAME_ATTR)}var al=this.findContentPiece(am);if(al){return this.removeDomainIfIsInLink(al)}if(ac.hasNodeAttributeWithValue(am,"title")){return ac.getAttributeValueFromNode(am,"title")}var an=this.findPieceNode(am);if(ac.hasNodeAttributeWithValue(an,"title")){return ac.getAttributeValueFromNode(an,"title")}var ao=this.findTargetNode(am);if(ac.hasNodeAttributeWithValue(ao,"title")){return ac.getAttributeValueFromNode(ao,"title")}},findContentPiece:function(am){if(!am){return}var ao=ac.findFirstNodeHavingAttributeWithValue(am,this.CONTENT_PIECE_ATTR);
+if(ao){return ac.getAttributeValueFromNode(ao,this.CONTENT_PIECE_ATTR)}var al=this.findPieceNode(am);var an=this.findMediaUrlInNode(al);if(an){return this.toAbsoluteUrl(an)}},findContentTarget:function(an){if(!an){return}var ao=this.findTargetNode(an);if(ac.hasNodeAttributeWithValue(ao,this.CONTENT_TARGET_ATTR)){return ac.getAttributeValueFromNode(ao,this.CONTENT_TARGET_ATTR)}var am;if(ac.hasNodeAttributeWithValue(ao,"href")){am=ac.getAttributeValueFromNode(ao,"href");return this.toAbsoluteUrl(am)}var al=this.findPieceNode(an);if(ac.hasNodeAttributeWithValue(al,"href")){am=ac.getAttributeValueFromNode(al,"href");return this.toAbsoluteUrl(am)}},isSameDomain:function(al){if(!al||!al.indexOf){return false}if(0===al.indexOf(this.getLocation().origin)){return true}var am=al.indexOf(this.getLocation().host);if(8>=am&&0<=am){return true}return false},removeDomainIfIsInLink:function(an){var am="^https?://[^/]+";var al="^.*//[^/]+";if(an&&an.search&&-1!==an.search(new RegExp(am))&&this.isSameDomain(an)){an=an.replace(new RegExp(al),"");
+if(!an){an="/"}}return an},findMediaUrlInNode:function(ap){if(!ap){return}var an=["img","embed","video","audio"];var al=ap.nodeName.toLowerCase();if(-1!==M(an,al)&&ac.findFirstNodeHavingAttributeWithValue(ap,"src")){var ao=ac.findFirstNodeHavingAttributeWithValue(ap,"src");return ac.getAttributeValueFromNode(ao,"src")}if(al==="object"&&ac.hasNodeAttributeWithValue(ap,"data")){return ac.getAttributeValueFromNode(ap,"data")}if(al==="object"){var aq=ac.findNodesByTagName(ap,"param");if(aq&&aq.length){var am;for(am=0;am<aq.length;am++){if("movie"===ac.getAttributeValueFromNode(aq[am],"name")&&ac.hasNodeAttributeWithValue(aq[am],"value")){return ac.getAttributeValueFromNode(aq[am],"value")}}}var ar=ac.findNodesByTagName(ap,"embed");if(ar&&ar.length){return this.findMediaUrlInNode(ar[0])}}},trim:function(al){return a(al)},isOrWasNodeInViewport:function(aq){if(!aq||!aq.getBoundingClientRect||aq.nodeType!==1){return true}var ap=aq.getBoundingClientRect();var ao=G.documentElement||{};var an=ap.top<0;
+if(an&&aq.offsetTop){an=(aq.offsetTop+ap.height)>0}var am=ao.clientWidth;if(T.innerWidth&&am>T.innerWidth){am=T.innerWidth}var al=ao.clientHeight;if(T.innerHeight&&al>T.innerHeight){al=T.innerHeight}return((ap.bottom>0||an)&&ap.right>0&&ap.left<am&&((ap.top<al)||an))},isNodeVisible:function(am){var al=j(am);var an=this.isOrWasNodeInViewport(am);return al&&an},buildInteractionRequestParams:function(al,am,an,ao){var ap="";if(al){ap+="c_i="+t(al)}if(am){if(ap){ap+="&"}ap+="c_n="+t(am)}if(an){if(ap){ap+="&"}ap+="c_p="+t(an)}if(ao){if(ap){ap+="&"}ap+="c_t="+t(ao)}return ap},buildImpressionRequestParams:function(al,am,an){var ao="c_n="+t(al)+"&c_p="+t(am);if(an){ao+="&c_t="+t(an)}return ao},buildContentBlock:function(an){if(!an){return}var al=this.findContentName(an);var am=this.findContentPiece(an);var ao=this.findContentTarget(an);al=this.trim(al);am=this.trim(am);ao=this.trim(ao);return{name:al||"Unknown",piece:am||"Unknown",target:ao||""}},collectContent:function(ao){if(!ao||!ao.length){return[]
+}var an=[];var al,am;for(al=0;al<ao.length;al++){am=this.buildContentBlock(ao[al]);if(J(am)){an.push(am)}}return an},setLocation:function(al){this.location=al},getLocation:function(){var al=this.location||T.location;if(!al.origin){al.origin=al.protocol+"//"+al.hostname+(al.port?":"+al.port:"")}return al},toAbsoluteUrl:function(am){if((!am||String(am)!==am)&&am!==""){return am}if(""===am){return this.getLocation().href}if(am.search(/^\/\//)!==-1){return this.getLocation().protocol+am}if(am.search(/:\/\//)!==-1){return am}if(0===am.indexOf("#")){return this.getLocation().origin+this.getLocation().pathname+am}if(0===am.indexOf("?")){return this.getLocation().origin+this.getLocation().pathname+am}if(0===am.search("^[a-zA-Z]{2,11}:")){return am}if(am.search(/^\//)!==-1){return this.getLocation().origin+am}var al="(.*/)";var an=this.getLocation().origin+this.getLocation().pathname.match(new RegExp(al))[0];return an+am},isUrlToCurrentDomain:function(am){var an=this.toAbsoluteUrl(am);if(!an){return false
+}var al=this.getLocation().origin;if(al===an){return true}if(0===String(an).indexOf(al)){if(":"===String(an).substr(al.length,1)){return false}return true}return false},setHrefAttribute:function(am,al){if(!am||!al){return}ac.setAnyAttribute(am,"href",al)},shouldIgnoreInteraction:function(an){var am=ac.hasNodeAttribute(an,this.CONTENT_IGNOREINTERACTION_ATTR);var al=ac.hasNodeCssClass(an,this.CONTENT_IGNOREINTERACTION_CLASS);return am||al}};function O(am,ap){if(ap){return ap}am=v.toAbsoluteUrl(am);if(z(am,"?")){var ao=am.indexOf("?");am=am.slice(0,ao)}if(R(am,"matomo.php")){am=g(am,"matomo.php".length)}else{if(R(am,"piwik.php")){am=g(am,"piwik.php".length)}else{if(R(am,".php")){var al=am.lastIndexOf("/");var an=1;am=am.slice(0,al+an)}}}if(R(am,"/js/")){am=g(am,"js/".length)}return am}function N(ar){var au="Piwik_Overlay";var am=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)(&segment=.*)?$");var an=am.exec(G.referrer);if(an){var ap=an[1];
+if(ap!==String(ar)){return false}var aq=an[2],al=an[3],ao=an[4];if(!ao){ao=""}else{if(ao.indexOf("&segment=")===0){ao=ao.substr("&segment=".length)}}T.name=au+"###"+aq+"###"+al+"###"+ao}var at=T.name.split("###");return at.length===4&&at[0]===au}function Y(am,at,ao){var ar=T.name.split("###"),aq=ar[1],al=ar[2],ap=ar[3],an=O(am,at);o(an+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(an,ao,aq,al,ap)})}function u(){var an;try{an=T.frameElement}catch(am){return true}if(J(an)){return(an&&String(an.nodeName).toLowerCase()==="iframe")?true:false}try{return T.self!==T.top}catch(al){return true}}function Q(b9,b4){var bD=this,a9="mtm_consent",cG="mtm_consent_removed",bZ=Z(G.domain,T.location.href,K()),cO=L(bZ[0]),bI=p(bZ[1]),bi=p(bZ[2]),cM=false,cd="GET",c3=cd,aE="application/x-www-form-urlencoded; charset=UTF-8",cs=aE,aA=b9||"",bC="",cT="",b1=b4||"",bt="",bJ="",a0,be="",c0=["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"],au=[cO],bu=[],bG=[],a4=[],bE=500,cQ=false,cC,a1,bM,bK,al,cm=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],bB=["pk_kwd","piwik_kwd","utm_term"],bf="_pk_",ar="pk_vid",aV=180,cR,bk,bN=false,bg=false,cK,ba,bq,cD=33955200000,ck=1800000,cZ=15768000000,aY=true,ci=0,bL=false,aM=false,b6,bR={},ch={},bh={},bo=200,cU={},c1={},b5=[],ca=false,cw=false,am=false,c2=false,cH=false,aK=false,a8=u(),cS=null,b7,aN,bv,b2=aj,bj,aH,cn=0,bp=["id","ses","cvar","ref"],cv=false,bw=null,cE=[],at=U++;
+try{be=G.title}catch(ct){be=""}function c6(dh,df,de,dg,dd,dc){if(bg){return}var db;if(de){db=new Date();db.setTime(db.getTime()+de)}G.cookie=dh+"="+t(df)+(de?";expires="+db.toGMTString():"")+";path="+(dg||"/")+(dd?";domain="+dd:"")+(dc?";secure":"")}function az(dd){if(bg){return 0}var db=new RegExp("(^|;)[ ]*"+dd+"=([^;]*)"),dc=db.exec(G.cookie);return dc?S(dc[2]):0}bw=!az(cG);function bX(db){var dc;db=k(db,ar);if(bK){dc=new RegExp("#.*");return db.replace(dc,"")}return db}function bQ(dd,db){var de=s(db),dc;if(de){return db}if(db.slice(0,1)==="/"){return s(dd)+"://"+d(dd)+db}dd=bX(dd);dc=dd.indexOf("?");if(dc>=0){dd=dd.slice(0,dc)}dc=dd.lastIndexOf("/");if(dc!==dd.length-1){dd=dd.slice(0,dc+1)}return dd+db}function cB(dd,db){var dc;dd=String(dd).toLowerCase();db=String(db).toLowerCase();if(dd===db){return true}if(db.slice(0,1)==="."){if(dd===db.slice(1)){return true}dc=dd.length-db.length;if((dc>0)&&(dd.slice(dc)===db)){return true}}return false}function cg(db){var dc=document.createElement("a");
+if(db.indexOf("//")!==0&&db.indexOf("http")!==0){if(db.indexOf("*")===0){db=db.substr(1)}if(db.indexOf(".")===0){db=db.substr(1)}db="http://"+db}dc.href=v.toAbsoluteUrl(db);if(dc.pathname){return dc.pathname}return""}function aZ(dc,db){if(!ag(db,"/")){db="/"+db}if(!ag(dc,"/")){dc="/"+dc}var dd=(db==="/"||db==="/*");if(dd){return true}if(dc===db){return true}db=String(db).toLowerCase();dc=String(dc).toLowerCase();if(R(db,"*")){db=db.slice(0,-1);dd=(!db||db==="/");if(dd){return true}if(dc===db){return true}return dc.indexOf(db)===0}if(!R(dc,"/")){dc+="/"}if(!R(db,"/")){db+="/"}return dc.indexOf(db)===0}function ao(df,dh){var dc,db,dd,de,dg;for(dc=0;dc<au.length;dc++){de=L(au[dc]);dg=cg(au[dc]);if(cB(df,de)&&aZ(dh,dg)){return true}}return false}function aR(de){var dc,db,dd;for(dc=0;dc<au.length;dc++){db=L(au[dc].toLowerCase());if(de===db){return true}if(db.slice(0,1)==="."){if(de===db.slice(1)){return true}dd=de.length-db.length;if((dd>0)&&(de.slice(dd)===db)){return true}}}return false}function cl(db,dd){db=db.replace("send_image=0","send_image=1");
+var dc=new Image(1,1);dc.onload=function(){E=0;if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:true})}};dc.onerror=function(){if(typeof dd==="function"){dd({request:db,trackerUrl:aA,success:false})}};dc.src=aA+(aA.indexOf("?")<0?"?":"&")+db}function aG(){return"object"===typeof h&&"function"===typeof h.sendBeacon&&"function"===typeof Blob}function a2(de,di){var dd=aG();if(!dd){return false}var dh={type:"application/x-www-form-urlencoded; charset=UTF-8"};var dg=false;var dc=aA;try{var db=new Blob([de],dh);if(de.length<=2000){db=new Blob([],dh);dc=dc+(dc.indexOf("?")<0?"?":"&")+de}dg=h.sendBeacon(dc,db)}catch(df){return false}if(dg&&typeof di==="function"){di({request:de,trackerUrl:aA,success:true,isSendBeacon:true})}return dg}function cY(dc,dd,db){if(!J(db)||null===db){db=true}if(m&&a2(dc,dd)){return}setTimeout(function(){if(m&&a2(dc,dd)){return}var dg;try{var df=T.XMLHttpRequest?new T.XMLHttpRequest():T.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;df.open("POST",aA,true);
+df.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){var dh=m&&a2(dc,dd);if(!dh&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false,xhr:this})}}}else{if(this.readyState===4&&(typeof dd==="function")){dd({request:dc,trackerUrl:aA,success:true,xhr:this})}}};df.setRequestHeader("Content-Type",cs);df.withCredentials=true;df.send(dc)}catch(de){dg=m&&a2(dc,dd);if(!dg&&db){cl(dc,dd)}else{if(typeof dd==="function"){dd({request:dc,trackerUrl:aA,success:false})}}}},50)}function cb(dc){var db=new Date();var dd=db.getTime()+dc;if(!r||dd>r){r=dd}}function cj(db){if(b7||!a1||!bw){return}b7=setTimeout(function dc(){b7=null;if(!a8){a8=(!G.hasFocus||G.hasFocus())}if(!a8){cj(a1);return}if(bM()){return}var dd=new Date(),de=a1-(dd.getTime()-cS);de=Math.min(a1,de);cj(de)},db||a1)}function bF(){if(!b7){return}clearTimeout(b7);b7=null}function a6(){a8=true;if(bM()){return}cj()}function av(){bF()}function c8(){if(aK||!a1){return}aK=true;
+ak(T,"focus",a6);ak(T,"blur",av);cj()}function cx(df){var dc=new Date();var db=dc.getTime();cS=db;if(cw&&db<cw){var dd=cw-db;setTimeout(df,dd);cb(dd+50);cw+=50;return}if(cw===false){var de=800;cw=db+de}df()}function bA(dc,db,dd){if(!bw){cE.push(dc);return}if(!cK&&dc){if(cv&&bw){dc+="&consent=1"}cx(function(){if(cQ&&a2(dc,dd)){cb(100);return}if(c3==="POST"||String(dc).length>2000){cY(dc,dd)}else{cl(dc,dd)}cb(db)})}if(!aK){c8()}else{cj()}}function cf(db){if(cK){return false}return(db&&db.length)}function cX(db,df){if(!df||df>=db.length){return[db]}var dc=0;var dd=db.length;var de=[];for(dc;dc<dd;dc+=df){de.push(db.slice(dc,dc+df))}return de}function c7(dc,db){if(!cf(dc)){return}if(!bw){cE.push(dc);return}cx(function(){var df=cX(dc,50);var dd=0,de;for(dd;dd<df.length;dd++){de='{"requests":["?'+df[dd].join('","?')+'"]}';cY(de,null,false)}cb(db)})}function aP(db){return bf+db+"."+b1+"."+bj}function b0(){if(bg){return"0"}var db=aP("testcookie");c6(db,"1");return az(db)==="1"?"1":"0"}function bd(){bj=b2((cR||cO)+(bk||"/")).slice(0,4)
+}function bS(){var dc=aP("cvar"),db=az(dc);if(db.length){db=JSON_PIWIK.parse(db);if(W(db)){return db}}return{}}function cy(){if(aM===false){aM=bS()}}function cL(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)+(new Date()).getTime()+Math.random()).slice(0,16)}function aw(){return b2((h.userAgent||"")+(h.platform||"")+JSON_PIWIK.stringify(c1)).slice(0,6)}function bb(){return Math.floor((new Date()).getTime()/1000)}function aF(){var dc=bb();var dd=aw();var db=String(dc)+dd;return db}function cW(dd){dd=String(dd);var dg=aw();var de=dg.length;var df=dd.substr(-1*de,de);var dc=parseInt(dd.substr(0,dd.length-de),10);if(dc&&df&&df===dg){var db=bb();if(aV<=0){return true}if(db>=dc&&db<=(dc+aV)){return true}}return false}function c9(db){if(!cH){return""}var df=f(db,ar);if(!df){return""}df=String(df);var dd=new RegExp("^[a-zA-Z0-9]+$");if(df.length===32&&dd.test(df)){var dc=df.substr(16,32);if(cW(dc)){var de=df.substr(0,16);return de}}return""}function cI(){if(!bJ){bJ=c9(bI)
+}var dd=new Date(),db=Math.round(dd.getTime()/1000),dc=aP("id"),dg=az(dc),df,de;if(dg){df=dg.split(".");df.unshift("0");if(bJ.length){df[1]=bJ}return df}if(bJ.length){de=bJ}else{if("0"===b0()){de=""}else{de=cL()}}df=["1",de,db,0,db,"",""];return df}function aU(){var di=cI(),de=di[0],df=di[1],dc=di[2],db=di[3],dg=di[4],dd=di[5];if(!J(di[6])){di[6]=""}var dh=di[6];return{newVisitor:de,uuid:df,createTs:dc,visitCount:db,currentVisitTs:dg,lastVisitTs:dd,lastEcommerceOrderTs:dh}}function aD(){var de=new Date(),dc=de.getTime(),df=aU().createTs;var db=parseInt(df,10);var dd=(db*1000)+cD-dc;return dd}function aI(db){if(!b1){return}var dd=new Date(),dc=Math.round(dd.getTime()/1000);if(!J(db)){db=aU()}var de=db.uuid+"."+db.createTs+"."+db.visitCount+"."+dc+"."+db.lastVisitTs+"."+db.lastEcommerceOrderTs;c6(aP("id"),de,aD(),bk,cR,bN)}function bH(){var db=az(aP("ref"));if(db.length){try{db=JSON_PIWIK.parse(db);if(W(db)){return db}}catch(dc){}}return["","",0,""]}function bT(dd,dc,db){c6(dd,"",-86400,dc,db)
+}function br(dc){var db="testvalue";c6("test",db,10000,null,dc);if(az("test")===db){bT("test",null,dc);return true}return false}function aB(){var dc=bg;bg=false;var db,dd;for(db=0;db<bp.length;db++){dd=aP(bp[db]);if(dd!==cG&&dd!==a9&&0!==az(dd)){bT(dd,bk,cR)}}bg=dc}function bY(db){b1=db;aI()}function da(df){if(!df||!W(df)){return}var de=[];var dd;for(dd in df){if(Object.prototype.hasOwnProperty.call(df,dd)){de.push(dd)}}var dg={};de.sort();var db=de.length;var dc;for(dc=0;dc<db;dc++){dg[de[dc]]=df[de[dc]]}return dg}function b8(){c6(aP("ses"),"1",ck,bk,cR,bN)}function bc(){var de="";var dc="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dd=dc.length;var db;for(db=0;db<6;db++){de+=dc.charAt(Math.floor(Math.random()*dd))}return de}function co(dd,dz,dA,de){var dy,dc=new Date(),dl=Math.round(dc.getTime()/1000),di,dx,df=1024,dF,dm,dv=aM,dg=aP("ses"),dt=aP("ref"),dq=aP("cvar"),dr=az(dg),dw=bH(),dC=a0||bI,dj,db;if(bg){aB()}if(cK){return""}var ds=aU();if(!J(de)){de=""}var dp=G.characterSet||G.charset;
+if(!dp||dp.toLowerCase()==="utf-8"){dp=null}dj=dw[0];db=dw[1];di=dw[2];dx=dw[3];if(!dr){var dB=ck/1000;if(!ds.lastVisitTs||(dl-ds.lastVisitTs)>dB){ds.visitCount++;ds.lastVisitTs=ds.currentVisitTs}if(!bq||!dj.length){for(dy in cm){if(Object.prototype.hasOwnProperty.call(cm,dy)){dj=f(dC,cm[dy]);if(dj.length){break}}}for(dy in bB){if(Object.prototype.hasOwnProperty.call(bB,dy)){db=f(dC,bB[dy]);if(db.length){break}}}}dF=d(bi);dm=dx.length?d(dx):"";if(dF.length&&!aR(dF)&&(!bq||!dm.length||aR(dm))){dx=bi}if(dx.length||dj.length){di=dl;dw=[dj,db,di,bX(dx.slice(0,df))];c6(dt,JSON_PIWIK.stringify(dw),cZ,bk,cR)}}dd+="&idsite="+b1+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dc.getHours()+"&m="+dc.getMinutes()+"&s="+dc.getSeconds()+"&url="+t(bX(dC))+(bi.length?"&urlref="+t(bX(bi)):"")+((bt&&bt.length)?"&uid="+t(bt):"")+"&_id="+ds.uuid+"&_idts="+ds.createTs+"&_idvc="+ds.visitCount+"&_idn="+ds.newVisitor+(dj.length?"&_rcn="+t(dj):"")+(db.length?"&_rck="+t(db):"")+"&_refts="+di+"&_viewts="+ds.lastVisitTs+(String(ds.lastEcommerceOrderTs).length?"&_ects="+ds.lastEcommerceOrderTs:"")+(String(dx).length?"&_ref="+t(bX(dx.slice(0,df))):"")+(dp?"&cs="+t(dp):"")+"&send_image=0";
+for(dy in c1){if(Object.prototype.hasOwnProperty.call(c1,dy)){dd+="&"+dy+"="+c1[dy]}}var dE=[];if(dz){for(dy in dz){if(Object.prototype.hasOwnProperty.call(dz,dy)&&/^dimension\d+$/.test(dy)){var dh=dy.replace("dimension","");dE.push(parseInt(dh,10));dE.push(String(dh));dd+="&"+dy+"="+t(dz[dy]);delete dz[dy]}}}if(dz&&B(dz)){dz=null}for(dy in bh){if(Object.prototype.hasOwnProperty.call(bh,dy)){var dn=(-1===M(dE,dy));if(dn){dd+="&dimension"+dy+"="+t(bh[dy])}}}if(dz){dd+="&data="+t(JSON_PIWIK.stringify(dz))}else{if(al){dd+="&data="+t(JSON_PIWIK.stringify(al))}}function dk(dG,dH){var dI=JSON_PIWIK.stringify(dG);if(dI.length>2){return"&"+dH+"="+t(dI)}return""}var dD=da(bR);var du=da(ch);dd+=dk(dD,"cvar");dd+=dk(du,"e_cvar");if(aM){dd+=dk(aM,"_cvar");for(dy in dv){if(Object.prototype.hasOwnProperty.call(dv,dy)){if(aM[dy][0]===""||aM[dy][1]===""){delete aM[dy]}}}if(bL){c6(dq,JSON_PIWIK.stringify(aM),ck,bk,cR)}}if(aY){if(ci){dd+="&gt_ms="+ci}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dd+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
+}}}if(aH){dd+="&pv_id="+aH}ds.lastEcommerceOrderTs=J(de)&&String(de).length?de:ds.lastEcommerceOrderTs;aI(ds);b8();dd+=aa(dA,{tracker:bD,request:dd});if(cT.length){dd+="&"+cT}if(A(b6)){dd=b6(dd)}return dd}bM=function a3(){var db=new Date();if(cS+a1<=db.getTime()){bD.ping();return true}return false};function bl(de,dd,dj,df,db,dm){var dh="idgoal=0",di,dc=new Date(),dk=[],dl,dg=String(de).length;if(dg){dh+="&ec_id="+t(de);di=Math.round(dc.getTime()/1000)}dh+="&revenue="+dd;if(String(dj).length){dh+="&ec_st="+dj}if(String(df).length){dh+="&ec_tx="+df}if(String(db).length){dh+="&ec_sh="+db}if(String(dm).length){dh+="&ec_dt="+dm}if(cU){for(dl in cU){if(Object.prototype.hasOwnProperty.call(cU,dl)){if(!J(cU[dl][1])){cU[dl][1]=""}if(!J(cU[dl][2])){cU[dl][2]=""}if(!J(cU[dl][3])||String(cU[dl][3]).length===0){cU[dl][3]=0}if(!J(cU[dl][4])||String(cU[dl][4]).length===0){cU[dl][4]=1}dk.push(cU[dl])}}dh+="&ec_items="+t(JSON_PIWIK.stringify(dk))}dh=co(dh,al,"ecommerce",di);bA(dh,bE);if(dg){cU={}}}function bU(db,df,de,dd,dc,dg){if(String(db).length&&J(df)){bl(db,df,de,dd,dc,dg)
+}}function bn(db){if(J(db)){bl("",db,"","","","")}}function bV(dc,de,dd){aH=bc();var db=co("action_name="+t(ai(dc||be)),de,"log");bA(db,bE,dd)}function aW(dd,dc){var de,db="(^| )(piwik[_-]"+dc;if(dd){for(de=0;de<dd.length;de++){db+="|"+dd[de]}}db+=")( |$)";return new RegExp(db)}function aQ(db){return(aA&&db&&0===String(db).indexOf(aA))}function cq(df,db,dg,dc){if(aQ(db)){return 0}var de=aW(bG,"download"),dd=aW(a4,"link"),dh=new RegExp("\\.("+c0.join("|")+")([?&#]|$)","i");if(dd.test(df)){return"link"}if(dc||de.test(df)||dh.test(db)){return"download"}if(dg){return 0}return"link"}function aq(dc){var db;db=dc.parentNode;while(db!==null&&J(db)){if(ac.isLinkElement(dc)){break}dc=db;db=dc.parentNode}return dc}function c5(dg){dg=aq(dg);if(!ac.hasNodeAttribute(dg,"href")){return}if(!J(dg.href)){return}var df=ac.getAttributeValueFromNode(dg,"href");if(aQ(df)){return}var dc=dg.pathname||cg(dg.href);var dh=dg.hostname||d(dg.href);var di=dh.toLowerCase();var dd=dg.href.replace(dh,di);var de=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");
+if(!de.test(dd)){var db=cq(dg.className,dd,ao(di,dc),ac.hasNodeAttribute(dg,"download"));if(db){return{type:db,href:dd}}}}function aL(db,dc,dd,de){var df=v.buildInteractionRequestParams(db,dc,dd,de);if(!df){return}return co(df,null,"contentInteraction")}function cF(dd,de,di,db,dc){if(!J(dd)){return}if(aQ(dd)){return dd}var dg=v.toAbsoluteUrl(dd);var df="redirecturl="+t(dg)+"&";df+=aL(de,di,db,(dc||dd));var dh="&";if(aA.indexOf("?")<0){dh="?"}return aA+dh+df}function a7(db,dc){if(!db||!dc){return false}var dd=v.findTargetNode(db);if(v.shouldIgnoreInteraction(dd)){return false}dd=v.findTargetNodeNoDefault(db);if(dd&&!V(dd,dc)){return false}return true}function cp(dd,dc,df){if(!dd){return}var db=v.findParentContentNode(dd);if(!db){return}if(!a7(db,dd)){return}var de=v.buildContentBlock(db);if(!de){return}if(!de.target&&df){de.target=df}return v.buildInteractionRequestParams(dc,de.name,de.piece,de.target)}function aS(dc){if(!b5||!b5.length){return false}var db,dd;for(db=0;db<b5.length;db++){dd=b5[db];
+if(dd&&dd.name===dc.name&&dd.piece===dc.piece&&dd.target===dc.target){return true}}return false}function bz(de){if(!de){return false}var dh=v.findTargetNode(de);if(!dh||v.shouldIgnoreInteraction(dh)){return false}var di=c5(dh);if(c2&&di&&di.type){return false}if(ac.isLinkElement(dh)&&ac.hasNodeAttributeWithValue(dh,"href")){var db=String(ac.getAttributeValueFromNode(dh,"href"));if(0===db.indexOf("#")){return false}if(aQ(db)){return true}if(!v.isUrlToCurrentDomain(db)){return false}var df=v.buildContentBlock(de);if(!df){return}var dd=df.name;var dj=df.piece;var dg=df.target;if(!ac.hasNodeAttributeWithValue(dh,v.CONTENT_TARGET_ATTR)||dh.wasContentTargetAttrReplaced){dh.wasContentTargetAttrReplaced=true;dg=v.toAbsoluteUrl(db);ac.setAnyAttribute(dh,v.CONTENT_TARGET_ATTR,dg)}var dc=cF(db,"click",dd,dj,dg);v.setHrefAttribute(dh,dc);return true}return false}function aJ(dc){if(!dc||!dc.length){return}var db;for(db=0;db<dc.length;db++){bz(dc[db])}}function aT(db){return function(dc){if(!db){return
+}var df=v.findParentContentNode(db);var dg;if(dc){dg=dc.target||dc.srcElement}if(!dg){dg=db}if(!a7(df,dg)){return}cb(bE);if(ac.isLinkElement(db)&&ac.hasNodeAttributeWithValue(db,"href")&&ac.hasNodeAttributeWithValue(db,v.CONTENT_TARGET_ATTR)){var dd=ac.getAttributeValueFromNode(db,"href");if(!aQ(dd)&&db.wasContentTargetAttrReplaced){ac.setAnyAttribute(db,v.CONTENT_TARGET_ATTR,"")}}var dk=c5(db);if(am&&dk&&dk.type){return dk.type}if(bz(df)){return"href"}var dh=v.buildContentBlock(df);if(!dh){return}var de=dh.name;var dl=dh.piece;var dj=dh.target;var di=aL("click",de,dl,dj);if(di){bA(di,bE)}return di}}function bW(dd){if(!dd||!dd.length){return}var db,dc;for(db=0;db<dd.length;db++){dc=v.findTargetNode(dd[db]);if(dc&&!dc.contentInteractionTrackingSetupDone){dc.contentInteractionTrackingSetupDone=true;ak(dc,"click",aT(dc))}}}function bs(dd,de){if(!dd||!dd.length){return[]}var db,dc;for(db=0;db<dd.length;db++){if(aS(dd[db])){dd.splice(db,1);db--}else{b5.push(dd[db])}}if(!dd||!dd.length){return[]
+}aJ(de);bW(de);var df=[];for(db=0;db<dd.length;db++){dc=co(v.buildImpressionRequestParams(dd[db].name,dd[db].piece,dd[db].target),undefined,"contentImpressions");if(dc){df.push(dc)}}return df}function cu(dc){var db=v.collectContent(dc);return bs(db,dc)}function a5(dc){if(!dc||!dc.length){return[]}var db;for(db=0;db<dc.length;db++){if(!v.isNodeVisible(dc[db])){dc.splice(db,1);db--}}if(!dc||!dc.length){return[]}return cu(dc)}function aC(dd,db,dc){var de=v.buildImpressionRequestParams(dd,db,dc);return co(de,null,"contentImpression")}function c4(de,dc){if(!de){return}var db=v.findParentContentNode(de);var dd=v.buildContentBlock(db);if(!dd){return}if(!dc){dc="Unknown"}return aL(dc,dd.name,dd.piece,dd.target)}function cJ(dc,de,db,dd){return"e_c="+t(dc)+"&e_a="+t(de)+(J(db)?"&e_n="+t(db):"")+(J(dd)?"&e_v="+t(dd):"")}function ap(dd,df,db,de,dh,dg){if(a(String(dd)).length===0||a(String(df)).length===0){ah("Error while logging event: Parameters `category` and `action` must not be empty or filled with whitespaces");
+return false}var dc=co(cJ(dd,df,db,de),dh,"event");bA(dc,bE,dg)}function b3(db,de,dc,df){var dd=co("search="+t(db)+(de?"&search_cat="+t(de):"")+(J(dc)?"&search_count="+dc:""),df,"sitesearch");bA(dd,bE)}function cN(db,df,de,dd){var dc=co("idgoal="+db+(df?"&revenue="+df:""),de,"goal");bA(dc,bE,dd)}function cV(de,db,di,dh,dd){var dg=db+"="+t(bX(de));var dc=cp(dd,"click",de);if(dc){dg+="&"+dc}var df=co(dg,di,"link");bA(df,bE,dh)}function bP(dc,db){if(dc!==""){return dc+db.charAt(0).toUpperCase()+db.slice(1)}return db}function cc(dg){var df,db,de=["","webkit","ms","moz"],dd;if(!ba){for(db=0;db<de.length;db++){dd=de[db];if(Object.prototype.hasOwnProperty.call(G,bP(dd,"hidden"))){if(G[bP(dd,"visibilityState")]==="prerender"){df=true}break}}}if(df){ak(G,dd+"visibilitychange",function dc(){G.removeEventListener(dd+"visibilitychange",dc,false);dg()});return}dg()}function bm(){var dc=aU().uuid;var db=aF();return dc+db}function ce(db){if(!db){return}if(!ac.hasNodeAttribute(db,"href")){return}var dc=ac.getAttributeValueFromNode(db,"href");
+if(!dc||aQ(dc)){return}dc=k(dc,ar);var dd=bm();dc=F(dc,ar,dd);ac.setAnyAttribute(db,"href",dc)}function ax(de){var df=ac.getAttributeValueFromNode(de,"href");if(!df){return false}df=String(df);var dc=df.indexOf("//")===0||df.indexOf("http://")===0||df.indexOf("https://")===0;if(!dc){return false}var db=de.pathname||cg(de.href);var dd=(de.hostname||d(de.href)).toLowerCase();if(ao(dd,db)){if(!cB(cO,L(dd))){return true}return false}return false}function cA(db){var dc=c5(db);if(dc&&dc.type){dc.href=p(dc.href);cV(dc.href,dc.type,undefined,null,db);return}if(cH){db=aq(db);if(ax(db)){ce(db)}}}function cr(){return G.all&&!G.addEventListener}function cP(db){var dd=db.which;var dc=(typeof db.button);if(!dd&&dc!=="undefined"){if(cr()){if(db.button&1){dd=1}else{if(db.button&2){dd=3}else{if(db.button&4){dd=2}}}}else{if(db.button===0||db.button==="0"){dd=1}else{if(db.button&1){dd=2}else{if(db.button&2){dd=3}}}}}return dd}function bO(db){switch(cP(db)){case 1:return"left";case 2:return"middle";case 3:return"right"
+}}function aX(db){return db.target||db.srcElement}function ay(db){return function(de){de=de||T.event;var dd=bO(de);var df=aX(de);if(de.type==="click"){var dc=false;if(db&&dd==="middle"){dc=true}if(df&&!dc){cA(df)}}else{if(de.type==="mousedown"){if(dd==="middle"&&df){aN=dd;bv=df}else{aN=bv=null}}else{if(de.type==="mouseup"){if(dd===aN&&df===bv){cA(df)}aN=bv=null}else{if(de.type==="contextmenu"){cA(df)}}}}}}function an(dd,dc){var db=typeof dc;if(db==="undefined"){dc=true}ak(dd,"click",ay(dc),false);if(dc){ak(dd,"mouseup",ay(dc),false);ak(dd,"mousedown",ay(dc),false);ak(dd,"contextmenu",ay(dc),false)}}function by(dd,df){am=true;var de,dc=aW(bu,"ignore"),dg=G.links,db=null,dh=null;if(dg){for(de=0;de<dg.length;de++){db=dg[de];if(!dc.test(db.className)){dh=typeof db.piwikTrackers;if("undefined"===dh){db.piwikTrackers=[]}if(-1===M(db.piwikTrackers,df)){db.piwikTrackers.push(df);an(db,dd)}}}}}function aO(dc,df,dg){if(ca){return true}ca=true;var dh=false;var de,dd;function db(){dh=true}n(function(){function di(dk){setTimeout(function(){if(!ca){return
+}dh=false;dg.trackVisibleContentImpressions();di(dk)},dk)}function dj(dk){setTimeout(function(){if(!ca){return}if(dh){dh=false;dg.trackVisibleContentImpressions()}dj(dk)},dk)}if(dc){de=["scroll","resize"];for(dd=0;dd<de.length;dd++){if(G.addEventListener){G.addEventListener(de[dd],db,false)}else{T.attachEvent("on"+de[dd],db)}}dj(100)}if(df&&df>0){df=parseInt(df,10);di(df)}})}function cz(){var dc,de,df={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(h.userAgent))){if(h.mimeTypes&&h.mimeTypes.length){for(dc in df){if(Object.prototype.hasOwnProperty.call(df,dc)){de=h.mimeTypes[df[dc]];c1[dc]=(de&&de.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(h.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&J(h.javaEnabled)&&h.javaEnabled()){c1.java="1"
+}if(A(T.GearsFactory)){c1.gears="1"}c1.cookie=b0()}var dd=parseInt(X.width,10);var db=parseInt(X.height,10);c1.res=parseInt(dd,10)+"x"+parseInt(db,10)}var bx={enabled:true,requests:[],timeout:null,sendRequests:function(){var db=this.requests;this.requests=[];if(db.length===1){bA(db[0],bE)}else{c7(db,bE)}},push:function(db){if(!db){return}if(m||!this.enabled){bA(db,bE);return}bx.requests.push(db);if(this.timeout){clearTimeout(this.timeout);this.timeout=null}this.timeout=setTimeout(function(){bx.timeout=null;bx.sendRequests()},1750);var dc="RequestQueue"+at;if(!Object.prototype.hasOwnProperty.call(b,dc)){b[dc]={unload:function(){if(bx.timeout){clearTimeout(bx.timeout)}bx.sendRequests()}}}}};cz();bd();aI();this.getVisitorId=function(){return aU().uuid};this.getVisitorInfo=function(){return cI()};this.getAttributionInfo=function(){return bH()};this.getAttributionCampaignName=function(){return bH()[0]};this.getAttributionCampaignKeyword=function(){return bH()[1]};this.getAttributionReferrerTimestamp=function(){return bH()[2]
+};this.getAttributionReferrerUrl=function(){return bH()[3]};this.setTrackerUrl=function(db){aA=db};this.getTrackerUrl=function(){return aA};this.getPiwikUrl=function(){return O(this.getTrackerUrl(),bC)};this.addTracker=function(db,dd){if(!J(db)||null===db){db=this.getTrackerUrl()}var dc=new Q(db,dd);I.push(dc);e.trigger("TrackerAdded",[this]);return dc};this.getSiteId=function(){return b1};this.setSiteId=function(db){bY(db)};this.resetUserId=function(){bt=""};this.setUserId=function(db){if(!J(db)||!db.length){return}bt=db};this.getUserId=function(){return bt};this.setCustomData=function(db,dc){if(W(db)){al=db}else{if(!al){al={}}al[db]=dc}};this.getCustomData=function(){return al};this.setCustomRequestProcessing=function(db){b6=db};this.appendToTrackingUrl=function(db){cT=db};this.getRequest=function(db){return co(db)};this.addPlugin=function(db,dc){b[db]=dc};this.setCustomDimension=function(db,dc){db=parseInt(db,10);if(db>0){if(!J(dc)){dc=""}if(!w(dc)){dc=String(dc)}bh[db]=dc}};this.getCustomDimension=function(db){db=parseInt(db,10);
+if(db>0&&Object.prototype.hasOwnProperty.call(bh,db)){return bh[db]}};this.deleteCustomDimension=function(db){db=parseInt(db,10);if(db>0){delete bh[db]}};this.setCustomVariable=function(dc,db,df,dd){var de;if(!J(dd)){dd="visit"}if(!J(db)){return}if(!J(df)){df=""}if(dc>0){db=!w(db)?String(db):db;df=!w(df)?String(df):df;de=[db.slice(0,bo),df.slice(0,bo)];if(dd==="visit"||dd===2){cy();aM[dc]=de}else{if(dd==="page"||dd===3){bR[dc]=de}else{if(dd==="event"){ch[dc]=de}}}}};this.getCustomVariable=function(dc,dd){var db;if(!J(dd)){dd="visit"}if(dd==="page"||dd===3){db=bR[dc]}else{if(dd==="event"){db=ch[dc]}else{if(dd==="visit"||dd===2){cy();db=aM[dc]}}}if(!J(db)||(db&&db[0]==="")){return false}return db};this.deleteCustomVariable=function(db,dc){if(this.getCustomVariable(db,dc)){this.setCustomVariable(db,"","",dc)}};this.deleteCustomVariables=function(db){if(db==="page"||db===3){bR={}}else{if(db==="event"){ch={}}else{if(db==="visit"||db===2){aM={}}}}};this.storeCustomVariablesInCookie=function(){bL=true
+};this.setLinkTrackingTimer=function(db){bE=db};this.getLinkTrackingTimer=function(){return bE};this.setDownloadExtensions=function(db){if(w(db)){db=db.split("|")}c0=db};this.addDownloadExtensions=function(dc){var db;if(w(dc)){dc=dc.split("|")}for(db=0;db<dc.length;db++){c0.push(dc[db])}};this.removeDownloadExtensions=function(dd){var dc,db=[];if(w(dd)){dd=dd.split("|")}for(dc=0;dc<c0.length;dc++){if(M(dd,c0[dc])===-1){db.push(c0[dc])}}c0=db};this.setDomains=function(db){au=w(db)?[db]:db;var df=false,dd=0,dc;for(dd;dd<au.length;dd++){dc=String(au[dd]);if(cB(cO,L(dc))){df=true;break}var de=cg(dc);if(de&&de!=="/"&&de!=="/*"){df=true;break}}if(!df){au.push(cO)}};this.enableCrossDomainLinking=function(){cH=true};this.disableCrossDomainLinking=function(){cH=false};this.isCrossDomainLinkingEnabled=function(){return cH};this.setCrossDomainLinkingTimeout=function(db){aV=db};this.getCrossDomainLinkingUrlParameter=function(){return t(ar)+"="+t(bm())};this.setIgnoreClasses=function(db){bu=w(db)?[db]:db
+};this.setRequestMethod=function(db){c3=db||cd};this.setRequestContentType=function(db){cs=db||aE};this.setReferrerUrl=function(db){bi=db};this.setCustomUrl=function(db){a0=bQ(bI,db)};this.getCurrentUrl=function(){return a0||bI};this.setDocumentTitle=function(db){be=db};this.setAPIUrl=function(db){bC=db};this.setDownloadClasses=function(db){bG=w(db)?[db]:db};this.setLinkClasses=function(db){a4=w(db)?[db]:db};this.setCampaignNameKey=function(db){cm=w(db)?[db]:db};this.setCampaignKeywordKey=function(db){bB=w(db)?[db]:db};this.discardHashTag=function(db){bK=db};this.setCookieNamePrefix=function(db){bf=db;aM=bS()};this.setCookieDomain=function(db){var dc=L(db);if(br(dc)){cR=dc;bd()}};this.getCookieDomain=function(){return cR};this.hasCookies=function(){return"1"===b0()};this.setSessionCookie=function(dd,dc,db){if(!dd){throw new Error("Missing cookie name")}if(!J(db)){db=ck}bp.push(dd);c6(aP(dd),dc,db,bk,cR)};this.getCookie=function(dc){var db=az(aP(dc));if(db===0){return null}return db};this.setCookiePath=function(db){bk=db;
+bd()};this.getCookiePath=function(db){return bk};this.setVisitorCookieTimeout=function(db){cD=db*1000};this.setSessionCookieTimeout=function(db){ck=db*1000};this.getSessionCookieTimeout=function(){return ck};this.setReferralCookieTimeout=function(db){cZ=db*1000};this.setConversionAttributionFirstReferrer=function(db){bq=db};this.setSecureCookie=function(db){bN=db};this.disableCookies=function(){bg=true;c1.cookie="0";if(b1){aB()}};this.deleteCookies=function(){aB()};this.setDoNotTrack=function(dc){var db=h.doNotTrack||h.msDoNotTrack;cK=dc&&(db==="yes"||db==="1");if(cK){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cQ=true};this.addListener=function(dc,db){an(dc,db)};this.enableLinkTracking=function(dc){c2=true;var db=this;cc(function(){q(function(){by(dc,db)})})};this.enableJSErrorTracking=function(){if(cM){return}cM=true;var db=T.onerror;T.onerror=function(dg,de,dd,df,dc){cc(function(){var dh="JavaScript Errors";var di=de+":"+dd;if(df){di+=":"+df}ap(dh,di,dg)});if(db){return db(dg,de,dd,df,dc)
+}return false}};this.disablePerformanceTracking=function(){aY=false};this.setGenerationTimeMs=function(db){ci=parseInt(db,10)};this.enableHeartBeatTimer=function(db){db=Math.max(db,1);a1=(db||15)*1000;if(cS!==null){c8()}};this.disableHeartBeatTimer=function(){bF();if(a1||aK){if(T.removeEventListener){T.removeEventListener("focus",a6);T.removeEventListener("blur",av)}else{if(T.detachEvent){T.detachEvent("onfocus",a6);T.detachEvent("onblur",av)}}}a1=null;aK=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};this.redirectFile=function(db){if(T.location.protocol==="file:"){T.location=db}};this.setCountPreRendered=function(db){ba=db};this.trackGoal=function(db,de,dd,dc){cc(function(){cN(db,de,dd,dc)})};this.trackLink=function(dc,db,de,dd){cc(function(){cV(dc,db,de,dd)})};this.getNumTrackedPageViews=function(){return cn};this.trackPageView=function(db,dd,dc){b5=[];cE=[];if(N(b1)){cc(function(){Y(aA,bC,b1)})}else{cc(function(){cn++;bV(db,dd,dc)})}};this.trackAllContentImpressions=function(){if(N(b1)){return
+}cc(function(){q(function(){var db=v.findContentNodes();var dc=cu(db);c7(dc,bE)})})};this.trackVisibleContentImpressions=function(db,dc){if(N(b1)){return}if(!J(db)){db=true}if(!J(dc)){dc=750}aO(db,dc,this);cc(function(){n(function(){var dd=v.findContentNodes();var de=a5(dd);c7(de,bE)})})};this.trackContentImpression=function(dd,db,dc){if(N(b1)){return}dd=a(dd);db=a(db);dc=a(dc);if(!dd){return}db=db||"Unknown";cc(function(){var de=aC(dd,db,dc);bA(de,bE)})};this.trackContentImpressionsWithinNode=function(db){if(N(b1)||!db){return}cc(function(){if(ca){n(function(){var dc=v.findContentNodesWithinNode(db);var dd=a5(dc);c7(dd,bE)})}else{q(function(){var dc=v.findContentNodesWithinNode(db);var dd=cu(dc);c7(dd,bE)})}})};this.trackContentInteraction=function(dd,de,db,dc){if(N(b1)){return}dd=a(dd);de=a(de);db=a(db);dc=a(dc);if(!dd||!de){return}db=db||"Unknown";cc(function(){var df=aL(dd,de,db,dc);if(df){bA(df,bE)}})};this.trackContentInteractionNode=function(dc,db){if(N(b1)||!dc){return}cc(function(){var dd=c4(dc,db);
+if(dd){bA(dd,bE)}})};this.logAllContentBlocksOnPage=function(){var dd=v.findContentNodes();var db=v.collectContent(dd);var dc=typeof console;if(dc!=="undefined"&&console&&console.log){console.log(db)}};this.trackEvent=function(dc,de,db,dd,dg,df){cc(function(){ap(dc,de,db,dd,dg,df)})};this.trackSiteSearch=function(db,dd,dc,de){b5=[];cc(function(){b3(db,dd,dc,de)})};this.setEcommerceView=function(de,db,dd,dc){if(!J(dd)||!dd.length){dd=""}else{if(dd instanceof Array){dd=JSON_PIWIK.stringify(dd)}}bR[5]=["_pkc",dd];if(J(dc)&&String(dc).length){bR[2]=["_pkp",dc]}if((!J(de)||!de.length)&&(!J(db)||!db.length)){return}if(J(de)&&de.length){bR[3]=["_pks",de]}if(!J(db)||!db.length){db=""}bR[4]=["_pkn",db]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cU))};this.addEcommerceItem=function(df,db,dd,dc,de){if(df.length){cU[df]=[df,db,dd,dc,de]}};this.removeEcommerceItem=function(db){if(db.length){delete cU[db]}};this.clearEcommerceCart=function(){cU={}};this.trackEcommerceOrder=function(db,df,de,dd,dc,dg){bU(db,df,de,dd,dc,dg)
+};this.trackEcommerceCartUpdate=function(db){bn(db)};this.trackRequest=function(dc,de,dd,db){cc(function(){var df=co(dc,de,db);bA(df,bE,dd)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bx.enabled=false};this.queueRequest=function(db){cc(function(){var dc=co(db);bx.push(dc)})};this.getRememberedConsent=function(){var db=az(a9);if(az(cG)){if(db){bT(a9,bk,cR)}return null}if(!db||db===0){return null}return db};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cv=true;bw=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bw){aB()}}}};this.setConsentGiven=function(){bw=true;bT(cG,bk,cR);var dc,db;for(dc=0;dc<cE.length;dc++){db=typeof cE[dc];if(db==="string"){bA(cE[dc],bE)}else{if(db==="object"){c7(cE[dc],bE)}}}cE=[]};this.rememberConsentGiven=function(dc){if(bg){ah("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");
+return}if(dc){dc=dc*60*60*1000}this.setConsentGiven();var db=new Date().getTime();c6(a9,db,dc,bk,cR,bN)};this.forgetConsentGiven=function(){if(bg){ah("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}var db=30*365*24*60*60*1000;bT(a9,bk,cR);c6(cG,new Date().getTime(),db,bk,cR,bN);this.requireConsent()};this.isUserOptedOut=function(){return !bw};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ad}}function c(aq,ap){var ar={};var an,ao;for(an=0;an<ap.length;an++){var al=ap[an];ar[al]=1;for(ao=0;ao<aq.length;ao++){if(aq[ao]&&aq[ao][0]){var am=aq[ao][0];if(al===am){ad(aq[ao]);delete aq[ao];if(ar[am]>1&&am!=="addTracker"){ah("The method "+am+' 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: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
+}ar[am]++}}}}return aq}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ab(al,an){var am=new Q(al,an);I.push(am);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){ad(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[am]);return am}ak(T,"beforeunload",af,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ao,an,am,al){var ap=typeof al;if(ap==="undefined"){al=false}ak(ao,an,am,al)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(am,al){if(!y[am]){y[am]=[]}y[am].push(al)},off:function(an,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){if(y[an][al]===am){y[an].splice(al,1)
+}}},trigger:function(an,ao,am){if(!y[an]){return}var al=0;for(al;al<y[an].length;al++){y[an][al].apply(am||T,ao)}},addPlugin:function(al,am){b[al]=am},getTracker:function(al,am){if(!J(am)){am=this.getAsyncTracker().getSiteId()}if(!J(al)){al=this.getAsyncTracker().getTrackerUrl()}return new Q(al,am)},getAsyncTrackers:function(){return I},addTracker:function(al,an){var am;if(!I.length){am=ab(al,an)}else{am=I[0].addTracker(al,an)}return am},getAsyncTracker:function(am,ap){var ao;if(I&&I.length&&I[0]){ao=I[0]}else{return ab(am,ap)}if(!ap&&!am){return ao}if((!J(ap)||null===ap)&&ao){ap=ao.getSiteId()}if((!J(am)||null===am)&&ao){am=ao.getTrackerUrl()}var an,al=0;for(al;al<I.length;al++){an=I[al];if(an&&String(an.getSiteId())===String(ap)&&an.getTrackerUrl()===am){return an}}},retryMissedPluginCalls:function(){var am=ae;ae=[];var al=0;for(al;al<am.length;al++){ad(am[al])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})
+}return e}())}
+/*!!! pluginTrackerHook */
+(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)
+}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
+/*!! @license-end */;
\ No newline at end of file
diff --git a/app/piwik.php b/app/piwik.php
index 0acf9177e..90c4412fb 100644
--- a/app/piwik.php
+++ b/app/piwik.php
@@ -22,9 +22,6 @@
 if (!defined('PIWIK_DOCUMENT_ROOT')) {
     define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
 }
-if (file_exists(PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php')) {
-	require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
-}
 if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
     require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
diff --git a/app/plugins/API/API.php b/app/plugins/API/API.php
index cfdbe9298..8d21ab11a 100644
--- a/app/plugins/API/API.php
+++ b/app/plugins/API/API.php
@@ -476,7 +476,7 @@ public function get($idSite, $period, $date, $segment = false, $columns = false)
      * @param bool|int $idDimension
      * @return array
      */
-    public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction, $label = false, $segment = false, $column = false, $language = false, $idGoal = false, $legendAppendMetric = true, $labelUseAbsoluteUrl = true, $idDimension = false)
+    public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction, $label = false, $segment = false, $column = false, $language = false, $idGoal = false, $legendAppendMetric = true, $labelUseAbsoluteUrl = true, $idDimension = false, $labelSeries = false)
     {
         // check if site exists
         $idSite = (int) $idSite;
@@ -504,7 +504,7 @@ public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction,
 
         $rowEvolution = new RowEvolution();
         return $rowEvolution->getRowEvolution($idSite, $period, $date, $apiModule, $apiAction, $label, $segment, $column,
-            $language, $apiParameters, $legendAppendMetric, $labelUseAbsoluteUrl);
+            $language, $apiParameters, $legendAppendMetric, $labelUseAbsoluteUrl, $labelSeries);
     }
 
     /**
@@ -526,6 +526,10 @@ public function getBulkRequest($urls)
         foreach ($urls as $url) {
             $params = Request::getRequestArrayFromString($url . '&format=php&serialize=0');
 
+            if (!empty($params['method']) && $params['method'] === 'API.getBulkRequest') {
+                continue;
+            }
+
             if (isset($params['urls']) && $params['urls'] == $urls) {
                 // by default 'urls' is added to $params as Request::getRequestArrayFromString adds all $_GET/$_POST
                 // default parameters
@@ -620,6 +624,37 @@ public function getSuggestedValuesForSegment($segmentName, $idSite)
         return $values;
     }
 
+    /**
+     * Returns category/subcategory pairs as "CategoryId.SubcategoryId" for whom comparison features should
+     * be disabled.
+     *
+     * @return string[]
+     */
+    public function getPagesComparisonsDisabledFor()
+    {
+        $pages = [];
+
+        /**
+         * If your plugin has pages where you'd like comparison features to be disabled, you can add them
+         * via this event. Add the pages as "CategoryId.SubcategoryId".
+         *
+         * **Example**
+         *
+         * ```
+         * public function getPagesComparisonsDisabledFor(&$pages)
+         * {
+         *     $pages[] = "General_Visitors.MyPlugin_MySubcategory";
+         *     $pages[] = "MyPlugin.myControllerAction"; // if your plugin defines a whole page you want comparison disabled for
+         * }
+         * ```
+         *
+         * @param string[] &$pages
+         */
+        Piwik::postEvent('API.getPagesComparisonsDisabledFor', [&$pages]);
+
+        return $pages;
+    }
+
     private function findSegment($segmentName, $idSite)
     {
         $segmentsMetadata = $this->getSegmentsMetadata($idSite, $_hideImplementationData = false);
diff --git a/app/plugins/API/Filter/DataComparisonFilter.php b/app/plugins/API/Filter/DataComparisonFilter.php
new file mode 100644
index 000000000..78872f3b4
--- /dev/null
+++ b/app/plugins/API/Filter/DataComparisonFilter.php
@@ -0,0 +1,590 @@
+<?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\API\Filter;
+
+use Piwik\API\Request;
+use Piwik\Common;
+use Piwik\Config;
+use Piwik\DataTable;
+use Piwik\DataTable\DataTableInterface;
+use Piwik\DataTable\Simple;
+use Piwik\Http\BadRequestException;
+use Piwik\Metrics;
+use Piwik\Period;
+use Piwik\Period\Factory;
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\API\Filter\DataComparisonFilter\ComparisonRowGenerator;
+use Piwik\Segment;
+use Piwik\Segment\SegmentExpression;
+use Piwik\Site;
+
+/**
+ * Handles the API portion of the data comparison feature.
+ *
+ * If the `compareSegments`/`comparePeriods`/`compareDates` parameters are supplied this class will fetch
+ * the data to compare with and store this data next to each row in the root report.
+ *
+ * Additionally, `..._change` columns will be added that show the percentage change for a column. This is only
+ * done when comparing periods, since segments are subsets of visits, so it doesn't make sense to consider
+ * differences between them as "changes".
+ *
+ * ### Comparing multiple periods
+ *
+ * It is possible to compare multiple periods with other multiple periods. For example, it
+ * is possible to compare period=day, date=2018-02-03,2018-02-13 with period=day, date=2018-03-01,2018-03-15.
+ * When done, this filter will compare the first period in the first set w/ the first period in the second set,
+ * etc. So in the previous example, 2018-02-03 will be compared with 2018-03-01, 2018-02-04 with 2018-03-02, etc.
+ *
+ * ### Metadata
+ *
+ * This filter adds the following metadata to DataTables:
+ *
+ * - 'compareSegments': The list of segments being compared. The first entry will always be the value of the `segment` query param.
+ * - 'comparePeriods': The list of labels of periods being compared. The first entry will always be the value of the
+ *                     `period` query param.
+ * - 'compareDates': The list of dates being compared. The first entry will always be the value of the `date` query param.
+ * - 'comparisonSeries': Prettified labels for every comparison series in order.
+ *
+ * This filter adds the following metadata to rows in the comparison DataTables:
+ *
+ * - 'compareSegment': The segment of the data for the comparison row.
+ * - 'compareSegmentPretty': The prettified label for the segment.
+ * - 'comparePeriod': The period label for the data in the comparison row. This does not have to match a value in the
+ *                    `comparePeriods` query parameter if comparing multiple periods.
+ * - 'compareDate': The date for the period in the data in the comparison row. This does not have to match a value in the
+ *                    `compareDates` query parameter if comparing multiple periods.
+ * - 'comparePeriodPretty': The prettified label for the period.
+ * - 'compareSeriesPretty': Prettified label for the comparison data represented by the row. This will match an entry
+ *                          in the DataTable's `comparisonSeries` metadata.
+ */
+class DataComparisonFilter
+{
+    /**
+     * @var array
+     */
+    private $request;
+
+    /**
+     * @var int
+     */
+    private $segmentCompareLimit;
+
+    /**
+     * @var int
+     */
+    private $periodCompareLimit;
+
+    /**
+     * @var string
+     */
+    private $segmentName;
+
+    /**
+     * @var string[]
+     */
+    private $compareSegments;
+
+    /**
+     * @var string[]
+     */
+    private $compareDates;
+
+    /**
+     * @var string[]
+     */
+    private $comparePeriods;
+
+    /**
+     * @var int[]
+     */
+    private $compareSegmentIndices;
+
+    /**
+     * @var int[]
+     */
+    private $comparePeriodIndices;
+
+    /**
+     * @var bool
+     */
+    private $isRequestMultiplePeriod;
+
+    /**
+     * @var ComparisonRowGenerator
+     */
+    private $comparisonRowGenerator;
+
+    /**
+     * @var array
+     */
+    private $columnMappings;
+
+    public function __construct($request, Report $report = null)
+    {
+        $this->request = $request;
+
+        $generalConfig = Config::getInstance()->General;
+        $this->segmentCompareLimit = (int) $generalConfig['data_comparison_segment_limit'];
+        $this->checkComparisonLimit($this->segmentCompareLimit, 'data_comparison_segment_limit');
+
+        $this->periodCompareLimit = (int) $generalConfig['data_comparison_period_limit'];
+        $this->checkComparisonLimit($this->periodCompareLimit, 'data_comparison_period_limit');
+
+        $this->segmentName = $this->getSegmentNameFromReport($report);
+
+        $this->compareSegments = self::getCompareSegments();
+        if (count($this->compareSegments) > $this->segmentCompareLimit + 1) {
+            throw new BadRequestException(Piwik::translate('General_MaximumNumberOfSegmentsComparedIs', [$this->segmentCompareLimit]));
+        }
+
+        $this->compareDates = self::getCompareDates($request);
+        $this->comparePeriods = self::getComparePeriods($request);
+
+        if (count($this->compareDates) !== count($this->comparePeriods)) {
+            throw new BadRequestException(Piwik::translate('General_CompareDatesParamMustMatchComparePeriods', ['compareDates', 'comparePeriods']));
+        }
+
+        if (count($this->compareDates) > $this->periodCompareLimit + 1) {
+            throw new BadRequestException(Piwik::translate('General_MaximumNumberOfPeriodsComparedIs', [$this->periodCompareLimit]));
+        }
+
+        if (count($this->compareSegments) == 1
+            && count($this->comparePeriods) == 1
+        ) {
+            return;
+        }
+
+        $this->checkMultiplePeriodCompare();
+
+        // map segments/periods to their indexes in the query parameter arrays for comparisonIdSubtable matching
+        $this->compareSegmentIndices = array_flip($this->compareSegments);
+        foreach ($this->comparePeriods as $index => $period) {
+            $date = $this->compareDates[$index];
+            $this->comparePeriodIndices[$period][$date] = $index;
+        }
+
+        $this->columnMappings = $this->getColumnMappings();
+        $this->comparisonRowGenerator = new ComparisonRowGenerator($this->segmentName, $this->isRequestMultiplePeriod(), $this->columnMappings);
+    }
+
+    public static function isCompareParamsPresent($request = null)
+    {
+        return !empty(Common::getRequestVar('compareSegments', [], $type = 'array', $request))
+            || !empty(Common::getRequestVar('comparePeriods', [], $type = 'array', $request))
+            || !empty(Common::getRequestVar('compareDates', [], $type = 'array', $request));
+    }
+
+    /**
+     * @param DataTable\DataTableInterface $table
+     */
+    public function compare(DataTable\DataTableInterface $table)
+    {
+        if (empty($this->compareSegments)
+            && empty($this->comparePeriods)
+        ) {
+            return;
+        }
+
+        $method = Common::getRequestVar('method', $default = null, $type = 'string', $this->request);
+        if ($method == 'Live') {
+            throw new \Exception("Data comparison is not enabled for the Live API.");
+        }
+
+        // optimization, if empty, single table, don't need to make extra queries
+        if ($table->getRowsCount() == 0) {
+            return;
+        }
+
+        $comparisonSeries = [];
+
+        // fetch data first
+        $reportsToCompare = self::getReportsToCompare($this->compareSegments, $this->comparePeriods, $this->compareDates);
+        foreach ($reportsToCompare as $index => $modifiedParams) {
+            $compareMetadata = $this->getMetadataFromModifiedParams($modifiedParams);
+            $comparisonSeries[] = $compareMetadata['compareSeriesPretty'];
+
+            $compareTable = $this->requestReport($method, $modifiedParams);
+            $this->comparisonRowGenerator->compareTables($compareMetadata, $table, $compareTable);
+        }
+
+        // calculate changes (including processed metric changes)
+        // NOTE: it doesn't make to sense to calculate these values for segments, since segments are subsets of all visits, where periods are
+        //       time periods (so things can change from one to another).
+        if (count($this->comparePeriods) > 1) {
+            $this->compareChangePercents($table);
+        }
+
+        // format comparison table metrics
+        $this->formatComparisonTables($table);
+
+        // add comparison parameters as metadata
+        $table->filter(function (DataTable $singleTable) use ($comparisonSeries) {
+            if (isset($this->compareSegments)) {
+                $singleTable->setMetadata('compareSegments', $this->compareSegments);
+            }
+
+            if (isset($this->comparePeriods)) {
+                $singleTable->setMetadata('comparePeriods', $this->comparePeriods);
+            }
+
+            if (isset($this->compareDates)) {
+                $singleTable->setMetadata('compareDates', $this->compareDates);
+            }
+
+            $singleTable->setMetadata('comparisonSeries', $comparisonSeries);
+        });
+    }
+
+    public static function getReportsToCompare($compareSegments, $comparePeriods, $compareDates)
+    {
+        $permutations = [];
+
+        // NOTE: the order of these loops determines the order of the rows in the comparison table. ie,
+        // if we loop over dates then segments, then we'll see comparison rows change segments before changing
+        // periods. this is because this loop determines in what order we fetch report data.
+        foreach ($compareDates as $index => $date) {
+            foreach ($compareSegments as $segment) {
+                $period = $comparePeriods[$index];
+
+                $params = [];
+                $params['segment'] = $segment;
+
+                if (!empty($period)
+                    && !empty($date)
+                ) {
+                    $params['date'] = $date;
+                    $params['period'] = $period;
+                }
+
+                $permutations[] = $params;
+            }
+        }
+
+        return $permutations;
+    }
+
+    /**
+     * @param $paramsToModify
+     * @return DataTable
+     */
+    private function requestReport($method, $paramsToModify)
+    {
+        $params = array_merge(
+            [
+                'filter_limit' => -1,
+                'filter_offset' => 0,
+                'filter_sort_column' => '',
+                'filter_truncate' => -1,
+                'compare' => 0,
+                'totals' => 1,
+                'disable_queued_filters' => 1,
+                'format_metrics' => 0,
+                'label' => '',
+                'flat' => Common::getRequestVar('flat', 0, 'int', $this->request),
+            ],
+            $paramsToModify
+        );
+
+        $params['keep_totals_row'] = Common::getRequestVar('keep_totals_row', 0, 'int', $this->request);
+        $params['keep_totals_row_label'] = Common::getRequestVar('keep_totals_row_label', '', 'string', $this->request);
+
+        if (!isset($params['idSite'])) {
+            $params['idSite'] = Common::getRequestVar('idSite', null, 'string', $this->request);
+        }
+        if (!isset($params['period'])) {
+            $params['period'] = Common::getRequestVar('period', null, 'string', $this->request);
+        }
+        if (!isset($params['date'])) {
+            $params['date'] = Common::getRequestVar('date', null, 'string', $this->request);
+        }
+
+        $idSubtable = Common::getRequestVar('idSubtable', 0, 'int', $this->request);
+        if ($idSubtable > 0) {
+            $comparisonIdSubtables = Common::getRequestVar('comparisonIdSubtables', $default = false, 'json', $this->request);
+            if (empty($comparisonIdSubtables)) {
+                throw new \Exception("Comparing segments/periods with subtables only works when the comparison idSubtables are supplied as well.");
+            }
+
+            $segmentIndex = empty($paramsToModify['segment']) ? 0 : $this->compareSegmentIndices[$paramsToModify['segment']];
+            $periodIndex = empty($paramsToModify['period']) ? 0 : $this->comparePeriodIndices[$paramsToModify['period']][$paramsToModify['date']];
+            $seriesIndex = self::getComparisonSeriesIndex(null, $periodIndex, $segmentIndex, count($this->compareSegments));
+
+            if (!isset($comparisonIdSubtables[$seriesIndex])) {
+                throw new \Exception("Invalid comparisonIdSubtables parameter: no idSubtable found for segment $segmentIndex and period $periodIndex");
+            }
+
+            $comparisonIdSubtable = $comparisonIdSubtables[$seriesIndex];
+            if ($comparisonIdSubtable === -1) { // no subtable in comparison row
+                $table = new DataTable();
+                $table->setMetadata('site', new Site($params['idSite']));
+                $table->setMetadata('period', Period\Factory::build($params['period'], $params['date']));
+                return $table;
+            }
+
+            $params['idSubtable'] = $comparisonIdSubtable;
+        }
+
+        return Request::processRequest($method, $params);
+    }
+
+    private function formatComparisonTables(DataTableInterface $tableOrMap)
+    {
+        $tableOrMap->filter(function (DataTable $table) {
+            $rows = $table->getRows();
+
+            $totalRow = $table->getTotalsRow();
+            if ($totalRow) {
+                $rows[] = $totalRow;
+            }
+
+            foreach ($rows as $row) {
+                /** @var DataTable $comparisonTable */
+                $comparisonTable = $row->getComparisons();
+                if (!empty($comparisonTable)) { // sanity check
+                    $columnMappings = $this->columnMappings;
+                    $comparisonTable->filter(DataTable\Filter\ReplaceColumnNames::class, [$columnMappings]);
+                }
+
+                $subtable = $row->getSubtable();
+                if ($subtable) {
+                    $this->formatComparisonTables($subtable);
+                }
+            }
+        });
+    }
+
+    private function checkComparisonLimit($n, $configName)
+    {
+        if ($n <= 1) {
+            throw new \Exception("The [General] $configName INI config option must be greater than 1.");
+        }
+    }
+
+    private function getMetadataFromModifiedParams($modifiedParams)
+    {
+        $metadata = [];
+
+        $period = isset($modifiedParams['period']) ? $modifiedParams['period'] : reset($this->comparePeriods);
+        $date = isset($modifiedParams['date']) ? $modifiedParams['date'] : reset($this->compareDates);
+        $segment = isset($modifiedParams['segment']) ? $modifiedParams['segment'] : reset($this->compareSegments);
+
+        $metadata['compareSegment'] = $segment;
+
+        $segmentObj = new Segment($segment, []);
+        $metadata['compareSegmentPretty'] = $segmentObj->getStoredSegmentName(false);
+
+        $metadata['comparePeriod'] = $period;
+        $metadata['compareDate'] = $date;
+
+        $prettyPeriod = Factory::build($period, $date)->getLocalizedLongString();
+        $metadata['comparePeriodPretty'] = ucfirst($prettyPeriod);
+
+        $metadata['compareSeriesPretty'] = self::getComparisonSeriesLabelSuffixFromParts(
+            $metadata['comparePeriodPretty'], $metadata['compareSegmentPretty']);
+
+        return $metadata;
+    }
+
+    private static function getComparisonSeriesLabelSuffixFromParts($periodPretty, $segmentPretty)
+    {
+        $comparisonLabels = [
+            $periodPretty,
+            $segmentPretty,
+        ];
+        $comparisonLabels = array_filter($comparisonLabels);
+
+        return '(' . implode(') (', $comparisonLabels) . ')';
+    }
+
+    private function getSegmentNameFromReport(Report $report = null)
+    {
+        if (empty($report)) {
+            return null;
+        }
+
+        $dimension = $report->getDimension();
+        if (empty($dimension)) {
+            return null;
+        }
+
+        $segments = $dimension->getSegments();
+        if (empty($segments)) {
+            return null;
+        }
+
+        /** @var \Piwik\Plugin\Segment $segment */
+        $segment     = reset($segments);
+        $segmentName = $segment->getSegment();
+        return $segmentName;
+    }
+
+    private function checkMultiplePeriodCompare()
+    {
+        if ($this->isRequestMultiplePeriod()) {
+            foreach ($this->comparePeriods as $index => $period) {
+                if (!Period::isMultiplePeriod($this->compareDates[$index], $period)) {
+                    throw new \Exception("Cannot compare: original request is multiple period and cannot be compared with single periods.");
+                }
+            }
+        } else {
+            foreach ($this->comparePeriods as $index => $period) {
+                if (Period::isMultiplePeriod($this->compareDates[$index], $period)) {
+                    throw new \Exception("Cannot compare: original request is single period and cannot be compared with multiple periods.");
+                }
+            }
+        }
+    }
+
+    private function isRequestMultiplePeriod()
+    {
+        if ($this->isRequestMultiplePeriod === null) {
+            $period = Common::getRequestVar('period', $default = null, 'string', $this->request);
+            $date = Common::getRequestVar('date', $default = null, 'string', $this->request);
+
+            $this->isRequestMultiplePeriod = Period::isMultiplePeriod($date, $period);
+        }
+        return $this->isRequestMultiplePeriod;
+    }
+
+    private function compareChangePercents(DataTableInterface $result)
+    {
+        $segmentCount = count($this->compareSegments);
+
+        $result->filter(function (DataTable $table) use ($segmentCount) {
+            $rows = $table->getRows();
+
+            $totalRow = $table->getTotalsRow();
+            if ($totalRow) {
+                $rows[] = $totalRow;
+            }
+
+            foreach ($rows as $row) {
+                $comparisons = $row->getComparisons();
+                if (empty($comparisons)) {
+                    continue;
+                }
+
+                /** @var DataTable\Row[] $rows */
+                $rows = array_values($comparisons->getRows());
+                foreach ($rows as $index => $compareRow) {
+                    if ($index < $segmentCount) {
+                        continue; // do not calculate for first period
+                    }
+
+                    list($periodIndex, $segmentIndex) = self::getIndividualComparisonRowIndices($table, $index, $segmentCount);
+
+                    $otherPeriodRowIndex = $segmentIndex;
+                    $otherPeriodRow = $comparisons[$otherPeriodRowIndex];
+
+                    foreach ($compareRow->getColumns() as $name => $value) {
+                        $valueToCompare = $otherPeriodRow ? $otherPeriodRow->getColumn($name) : 0;
+                        $valueToCompare = $valueToCompare ?: 0;
+
+                        $change = DataTable\Filter\CalculateEvolutionFilter::calculate($value, $valueToCompare, $precision = 1, $appendPercent = false);
+
+                        if ($change >= 0) {
+                            $change = '+' . $change;
+                        }
+                        $change .= '%';
+
+                        $compareRow->addColumn($name . '_change', $change);
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Returns the period and segment indices for a given comparison index.
+     *
+     * @param DataTable|null $table
+     * @param $comparisonRowIndex
+     * @param null $segmentCount
+     * @return array
+     */
+    public static function getIndividualComparisonRowIndices($table, $comparisonRowIndex, $segmentCount = null)
+    {
+        $segmentCount = $segmentCount ?: count($table->getMetadata('compareSegments'));
+        $segmentIndex = $comparisonRowIndex % $segmentCount;
+        $periodIndex = floor($comparisonRowIndex / $segmentCount);
+        return [$periodIndex, $segmentIndex];
+    }
+
+    /**
+     * Returns the series index for a comparison based on the period and segment indices.
+     *
+     * @param DataTable|null $table
+     * @param int $periodIndex
+     * @param int $segmentIndex
+     * @param int|null $segmentCount
+     * @return int
+     */
+    public static function getComparisonSeriesIndex($table, $periodIndex, $segmentIndex, $segmentCount = null)
+    {
+        $segmentCount = $segmentCount ?: count($table->getMetadata('compareSegments'));
+        return $periodIndex * $segmentCount + $segmentIndex;
+    }
+
+    private static function getCompareSegments($request = null)
+    {
+        $segments = Common::getRequestVar('compareSegments', $default = [], $type = 'array', $request);
+        array_unshift($segments, Common::getRequestVar('segment', '', 'string', $request));
+        $segments = Common::unsanitizeInputValues($segments);
+        return $segments;
+    }
+
+    private static function getComparePeriods($request = null)
+    {
+        $periods = Common::getRequestVar('comparePeriods', $default = [], $type = 'array', $request);
+        array_unshift($periods, Common::getRequestVar('period', '', 'string', $request));
+        return array_values($periods);
+    }
+
+    private static function getCompareDates($request = null)
+    {
+        $dates = Common::getRequestVar('compareDates', $default = [], $type = 'array', $request);
+        array_unshift($dates, Common::getRequestVar('date', '', 'string', $request));
+        return array_values($dates);
+    }
+
+    /**
+     * Returns the pretty series label for a specific comparison based on the currently set comparison query parameters.
+     *
+     * @param int $labelSeriesIndex The index of the comparison. Comparison series order is determined by {@see self::getReportsToCompare()}.
+     */
+    public static function getPrettyComparisonLabelFromSeriesIndex($labelSeriesIndex)
+    {
+        $compareSegments = self::getCompareSegments();
+        $comparePeriods = self::getComparePeriods();
+        $compareDates = self::getCompareDates();
+
+        list($periodIndex, $segmentIndex) = self::getIndividualComparisonRowIndices(null, $labelSeriesIndex, count($compareSegments));
+
+        $segmentObj = new Segment($compareSegments[$segmentIndex], []);
+        $prettySegment = $segmentObj->getStoredSegmentName(false);
+
+        $prettyPeriod = Factory::build($comparePeriods[$periodIndex], $compareDates[$periodIndex])->getLocalizedLongString();
+        $prettyPeriod = ucfirst($prettyPeriod);
+
+        return self::getComparisonSeriesLabelSuffixFromParts($prettyPeriod, $prettySegment);
+    }
+
+    private function getColumnMappings()
+    {
+        $allMappings = Metrics::getMappingFromIdToName();
+
+        $mappings = [];
+        foreach ($allMappings as $index => $name) {
+            $mappings[$index] = $name;
+            $mappings[$index . '_change'] = $name . '_change';
+        }
+        return $mappings;
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php b/app/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php
new file mode 100644
index 000000000..eaed08c13
--- /dev/null
+++ b/app/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php
@@ -0,0 +1,239 @@
+<?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\API\Filter\DataComparisonFilter;
+
+use Piwik\DataTable;
+use Piwik\DataTable\DataTableInterface;
+use Piwik\DataTable\Simple;
+use Piwik\Metrics;
+use Piwik\Period;
+use Piwik\Segment;
+use Piwik\Segment\SegmentExpression;
+
+class ComparisonRowGenerator
+{
+    /**
+     * @var bool
+     */
+    private $isRequestMultiplePeriod;
+
+    /**
+     * @var string
+     */
+    private $segmentNameForReport;
+
+    /**
+     * @var array
+     */
+    private $columnMappings;
+
+    public function __construct($segmentNameForReport, $isRequestMultiplePeriod, $columnMappings)
+    {
+        $this->segmentNameForReport = $segmentNameForReport;
+        $this->isRequestMultiplePeriod = $isRequestMultiplePeriod;
+        $this->columnMappings = $columnMappings;
+    }
+
+    public function compareTables($compareMetadata, DataTableInterface $tables, DataTableInterface $compareTables = null)
+    {
+        if ($tables instanceof DataTable) {
+            $this->compareTable($compareMetadata, $tables, $compareTables, $compareTables);
+        } else if ($tables instanceof DataTable\Map) {
+            $childTablesArray = array_values($tables->getDataTables());
+            $compareTablesArray = isset($compareTables) ? array_values($compareTables->getDataTables()) : [];
+
+            $isDatePeriod = $tables->getKeyName() == 'date';
+
+            foreach ($childTablesArray as $index => $childTable) {
+                $compareChildTable = isset($compareTablesArray[$index]) ? $compareTablesArray[$index] : null;
+                $this->compareTables($compareMetadata, $childTable, $compareChildTable);
+            }
+
+            // in case one of the compared periods has more periods than the main one, we want to fill the result with empty datatables
+            // so the comparison data is still present. this allows us to see that data in an evolution report.
+            if ($isDatePeriod) {
+                $lastTable = end($childTablesArray);
+
+                /** @var Period $lastPeriod */
+                $lastPeriod = $lastTable->getMetadata('period');
+                $periodType = $lastPeriod->getLabel();
+
+                for ($i = count($childTablesArray); $i < count($compareTablesArray); ++$i) {
+                    $periodChangeCount = $i - count($childTablesArray) + 1;
+                    $newPeriod = Period\Factory::build($periodType, $lastPeriod->getDateStart()->addPeriod($periodChangeCount, $periodType));
+
+                    // create an empty table for the main request
+                    $newTable = new DataTable();
+                    $newTable->setAllTableMetadata($lastTable->getAllTableMetadata());
+                    $newTable->setMetadata('period', $newPeriod);
+
+                    if ($newPeriod->getLabel() === 'week' || $newPeriod->getLabel() === 'range') {
+                        $periodLabel = $newPeriod->getRangeString();
+                    } else {
+                        $periodLabel = $newPeriod->getPrettyString();
+                    }
+
+                    $tables->addTable($newTable, $periodLabel);
+
+                    // compare with the empty table
+                    $compareTable = $compareTablesArray[$i];
+                    $this->compareTables($compareMetadata, $newTable, $compareTable);
+                }
+            }
+        } else {
+            throw new \Exception("Unexpected DataTable type: " . get_class($tables));
+        }
+    }
+
+    private function compareTable($compareMetadata, DataTable $table, DataTable $rootCompareTable = null, DataTable $compareTable = null)
+    {
+        // if there are no rows in the table because the metrics are 0, add one so we can still set comparison values
+        if ($table->getRowsCount() == 0) {
+            $table->addRow(new DataTable\Row());
+        }
+
+        foreach ($table->getRows() as $row) {
+            $label = $row->getColumn('label');
+
+            $compareRow = null;
+            if ($compareTable instanceof Simple) {
+                $compareRow = $compareTable->getFirstRow() ?: null;
+            } else if ($compareTable instanceof DataTable) {
+                $compareRow = $compareTable->getRowFromLabel($label) ?: null;
+            }
+
+            $this->compareRow($table, $compareMetadata, $row, $compareRow, $rootCompareTable);
+        }
+
+        $totalsRow = $table->getTotalsRow();
+        if (!empty($totalsRow)) {
+            $compareRow = $compareTable ? $compareTable->getTotalsRow() : null;
+            $this->compareRow($table, $compareMetadata, $totalsRow, $compareRow, $rootCompareTable);
+        }
+
+        if ($compareTable) {
+            $totals = $compareTable->getMetadata('totals');
+            if (!empty($totals)) {
+                $totals = $this->replaceIndexesInTotals($totals);
+                $comparisonTotalsEntry = array_merge($compareMetadata, [
+                    'totals' => $totals,
+                ]);
+
+                $allTotalsTables = $table->getMetadata('comparisonTotals');
+                $allTotalsTables[] = $comparisonTotalsEntry;
+                $table->setMetadata('comparisonTotals', $allTotalsTables);
+            }
+        }
+    }
+
+    private function compareRow(DataTable $table, $compareMetadata, DataTable\Row $row, DataTable\Row $compareRow = null, DataTable $rootTable = null)
+    {
+        $comparisonDataTable = $row->getComparisons();
+        if (empty($comparisonDataTable)) {
+            $comparisonDataTable = new DataTable();
+            $comparisonDataTable->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME,
+                $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME));
+            $row->setComparisons($comparisonDataTable);
+        }
+
+        $this->addIndividualChildPrettifiedMetadata($compareMetadata, $rootTable);
+
+        $columns = [];
+        if ($compareRow) {
+            foreach ($compareRow as $name => $value) {
+                if (!is_numeric($value)
+                    || $name == 'label'
+                ) {
+                    continue;
+                }
+
+                $columns[$name] = $value;
+            }
+        } else {
+            foreach ($row as $name => $value) {
+                if (!is_numeric($value)
+                    || $name == 'label'
+                ) {
+                    continue;
+                }
+
+                $columns[$name] = 0;
+            }
+        }
+
+        $newRow = new DataTable\Row([
+            DataTable\Row::COLUMNS => $columns,
+            DataTable\Row::METADATA => $compareMetadata,
+        ]);
+
+        // set subtable
+        $newRow->setMetadata('idsubdatatable', -1);
+        if ($compareRow) {
+            $subtableId = $compareRow->getMetadata('idsubdatatable_in_db') ?: $compareRow->getIdSubDataTable();
+            if ($subtableId) {
+                $newRow->setMetadata('idsubdatatable', $subtableId);
+            }
+        }
+
+        // add segment metadatas
+        if ($row->getMetadata('segment')) {
+            $newSegment = $row->getMetadata('segment');
+            if ($newRow->getMetadata('compareSegment')) {
+                $newSegment = Segment::combine($newRow->getMetadata('compareSegment'), SegmentExpression::AND_DELIMITER, $newSegment);
+            }
+            $newRow->setMetadata('segment', $newSegment);
+        } else if ($this->segmentNameForReport
+            && $row->getMetadata('segmentValue') !== false
+        ) {
+            $segmentValue = $row->getMetadata('segmentValue');
+            $newRow->setMetadata('segment', sprintf('%s==%s', $this->segmentNameForReport, urlencode($segmentValue)));
+        }
+
+        $comparisonDataTable->addRow($newRow);
+
+        // recurse on subtable if there
+        $subtable = $row->getSubtable();
+        if ($subtable
+            && $compareRow
+        ) {
+            $this->compareTable($compareMetadata, $subtable, $rootTable, $compareRow->getSubtable());
+        }
+    }
+
+    private function addIndividualChildPrettifiedMetadata(array &$metadata, DataTable $parentTable = null)
+    {
+        if ($parentTable
+            && $this->isRequestMultiplePeriod
+        ) {
+            /** @var Period $period */
+            $period = $parentTable->getMetadata('period');
+            if (empty($period)) {
+                return;
+            }
+
+            $prettyPeriod = $period->getLocalizedLongString();
+            $metadata['comparePeriodPretty'] = ucfirst($prettyPeriod);
+
+            $metadata['comparePeriod'] = $period->getLabel();
+            $metadata['compareDate'] = $period->getDateStart()->toString();
+        }
+    }
+
+    private function replaceIndexesInTotals($totals)
+    {
+        foreach ($totals as $index => $value) {
+            if (isset($this->columnMappings[$index])) {
+                $name = $this->columnMappings[$index];
+                $totals[$name] = $totals[$index];
+                unset($totals[$index]);
+            }
+        }
+        return $totals;
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/API/Menu.php b/app/plugins/API/Menu.php
index 67e202992..71e5f5dd9 100644
--- a/app/plugins/API/Menu.php
+++ b/app/plugins/API/Menu.php
@@ -8,7 +8,7 @@
  */
 namespace Piwik\Plugins\API;
 
-use Piwik\DeviceDetectorCache;
+use Piwik\DeviceDetector\DeviceDetectorCache;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
 use Piwik\Piwik;
diff --git a/app/plugins/API/ProcessedReport.php b/app/plugins/API/ProcessedReport.php
index 1e3d9f1b1..6e963ec41 100644
--- a/app/plugins/API/ProcessedReport.php
+++ b/app/plugins/API/ProcessedReport.php
@@ -375,7 +375,7 @@ public function getProcessedReport($idSite, $period, $date, $apiModule, $apiActi
             /** @var DataTable */
             $dataTable = $request->process();
         } catch (Exception $e) {
-            throw new Exception("API returned an error: " . $e->getMessage() . " at " . basename($e->getFile()) . ":" . $e->getLine() . "\n" . $e->getTraceAsString());
+            throw new Exception("API returned an error: " . $e->getMessage() . " at " . basename($e->getFile()) . ":" . $e->getLine() . "\n");
         }
 
         list($newReport, $columns, $rowsMetadata, $totals) = $this->handleTableReport($idSite, $dataTable, $reportMetadata, $showRawMetrics, $formatMetrics);
@@ -600,15 +600,17 @@ private function hideShowMetricsWithParams($columns, $columnsToRemove, $columnsT
      * - extract row metadata to a separate Simple $rowsMetadata
      *
      * @param int $idSite enables monetary value formatting based on site currency
-     * @param Simple $simpleDataTable
+     * @param DataTable $simpleDataTable
      * @param array $metadataColumns
      * @param boolean $hasDimension
      * @param bool $returnRawMetrics If set to true, the original metrics will be returned
      * @param bool|null $formatMetrics
      * @return array DataTable $enhancedDataTable filtered metrics with human readable format & Simple $rowsMetadata
      */
-    private function handleSimpleDataTable($idSite, $simpleDataTable, $metadataColumns, $hasDimension, $returnRawMetrics = false, $formatMetrics = null)
+    private function handleSimpleDataTable($idSite, $simpleDataTable, $metadataColumns, $hasDimension, $returnRawMetrics = false, $formatMetrics = null, $keepMetadata = false)
     {
+        $comparisonColumns = $this->getComparisonColumns($metadataColumns);
+
         // new DataTable to store metadata
         $rowsMetadata = new DataTable();
 
@@ -634,7 +636,11 @@ private function handleSimpleDataTable($idSite, $simpleDataTable, $metadataColum
                 }
             }
 
-            $enhancedRow = new Row();
+            $c = [];
+            if ($keepMetadata) {
+                $c[Row::METADATA] = $row->getMetadata();
+            }
+            $enhancedRow = new Row($c);
             $enhancedDataTable->addRow($enhancedRow);
 
             foreach ($rowMetrics as $columnName => $columnValue) {
@@ -669,11 +675,23 @@ private function handleSimpleDataTable($idSite, $simpleDataTable, $metadataColum
                 }
             }
 
+            /** @var DataTable $comparisons */
+            $comparisons = $row->getComparisons();
+
+            if (!empty($comparisons)
+                && $comparisons->getRowsCount() > 0
+            ) {
+                list($newComparisons, $ignore) = $this->handleSimpleDataTable($idSite, $comparisons, $comparisonColumns, true, $returnRawMetrics, $formatMetrics, $keepMetadata = true);
+                $enhancedRow->setComparisons($newComparisons);
+            }
+
             // If report has a dimension, extract metadata into a distinct DataTable
             if ($hasDimension) {
                 $rowMetadata = $row->getMetadata();
                 $idSubDataTable = $row->getIdSubDataTable();
 
+                unset($rowMetadata[Row::COMPARISONS_METADATA_NAME]);
+
                 // always add a metadata row - even if empty, so the number of rows and metadata are equal and can be matched directly
                 $metadataRow = new Row();
                 $rowsMetadata->addRow($metadataRow);
@@ -830,10 +848,14 @@ public static function getPrettyValue(Formatter $formatter, $idSite, $columnName
             return $value;
         }
 
+        if (strpos($columnName, '_change') !== false) { // comparison change columns are formatted by DataComparisonFilter
+            return $value == '0' ? '+0%' : $value;
+        }
+
         // Display time in human readable
 		if (strpos($columnName, 'time_generation') !== false) {
 			return $formatter->getPrettyTimeFromSeconds($value, true);
-		}
+		} 
 		if (strpos($columnName, 'time') !== false) {
             return $formatter->getPrettyTimeFromSeconds($value);
         }
@@ -853,4 +875,13 @@ public static function getPrettyValue(Formatter $formatter, $idSite, $columnName
 
         return $value;
     }
+
+    private function getComparisonColumns(array $metadataColumns)
+    {
+        $result = $metadataColumns;
+        foreach ($metadataColumns as $columnName => $columnTranslation) {
+            $result[$columnName . '_change'] = Piwik::translate('General_ChangeInX', lcfirst($columnName));
+        }
+        return $result;
+    }
 }
diff --git a/app/plugins/API/Renderer/Json.php b/app/plugins/API/Renderer/Json.php
index e33b8b7ff..d3c3a9ab4 100644
--- a/app/plugins/API/Renderer/Json.php
+++ b/app/plugins/API/Renderer/Json.php
@@ -39,7 +39,13 @@ public function renderException($message, $exception)
     {
         $exceptionMessage = str_replace(array("\r\n", "\n"), " ", $message);
 
-        $result = json_encode(array('result' => 'error', 'message' => $exceptionMessage));
+        $data = array('result' => 'error', 'message' => $exceptionMessage);
+
+        if ($this->shouldSendBacktrace()) {
+            $data['backtrace'] = $exception->getTraceAsString();
+        }
+
+        $result = json_encode($data);
 
         return $this->applyJsonpIfNeeded($result);
     }
diff --git a/app/plugins/API/Renderer/Original.php b/app/plugins/API/Renderer/Original.php
index fa6091686..8ce3a0d83 100644
--- a/app/plugins/API/Renderer/Original.php
+++ b/app/plugins/API/Renderer/Original.php
@@ -29,10 +29,16 @@ public function renderSuccess($message)
     public function renderException($message, $exception)
     {
         if ($this->shouldSerialize()) {
-            return serialize([
+            $data = [
                 'result' => 'error',
                 'message' => $message,
-            ]);
+            ];
+
+            if ($this->shouldSendBacktrace()) {
+                $data['backtrace'] = $exception->getTraceAsString();
+            }
+
+            return serialize($data);
         }
 
         throw $exception;
@@ -91,6 +97,17 @@ private function serializeIfNeeded($response)
                     $allMetadata = $table->getAllTableMetadata();
                     unset($allMetadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]);
                     $table->setAllTableMetadata($allMetadata);
+
+                    if ($this->hideIdSubDataTable) {
+                        foreach ($table->getRows() as $row) {
+                            $row->removeSubtable();
+                        }
+                    }
+
+                    // Force string value for segment metadata field (ensures consistency between PDO and mysqli)
+                    if (isset($allMetadata['segment']) && $allMetadata['segment'] === false) {
+                        $table->setMetadata('segment', '');
+                    }
                 });
             }
 
diff --git a/app/plugins/API/RowEvolution.php b/app/plugins/API/RowEvolution.php
index 9025eb343..24e695c88 100644
--- a/app/plugins/API/RowEvolution.php
+++ b/app/plugins/API/RowEvolution.php
@@ -19,6 +19,7 @@
 use Piwik\DataTable\Row;
 use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 use Piwik\Site;
 use Piwik\Url;
 
@@ -36,7 +37,7 @@ class RowEvolution
         'getPageUrl'
     );
 
-    public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction, $label = false, $segment = false, $column = false, $language = false, $apiParameters = array(), $legendAppendMetric = true, $labelUseAbsoluteUrl = true)
+    public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction, $label = false, $segment = false, $column = false, $language = false, $apiParameters = array(), $legendAppendMetric = true, $labelUseAbsoluteUrl = true, $labelSeries = '')
     {
         // validation of requested $period & $date
         if ($period == 'range') {
@@ -49,7 +50,7 @@ public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction,
         }
 
         $label = DataTablePostProcessor::unsanitizeLabelParameter($label);
-        $labels = Piwik::getArrayFromApiParameter($label);
+        $labels = Piwik::getArrayFromApiParameter($label, $onlyUnique = empty($labelSeries));
 
         $metadata = $this->getRowEvolutionMetaData($idSite, $period, $date, $apiModule, $apiAction, $language, $apiParameters);
 
@@ -72,7 +73,8 @@ public function getRowEvolution($idSite, $period, $date, $apiModule, $apiAction,
                 $labels,
                 $column,
                 $legendAppendMetric,
-                $labelUseAbsoluteUrl
+                $labelUseAbsoluteUrl,
+                $labelSeries
             );
         } else {
             $data = $this->getSingleRowEvolution(
@@ -420,8 +422,13 @@ private function enhanceRowEvolutionMetaData(&$metadata, $dataTable)
     /** Get row evolution for a multiple labels */
     private function getMultiRowEvolution(DataTable\Map $dataTable, $metadata, $apiModule, $apiAction, $labels, $column,
                                           $legendAppendMetric = true,
-                                          $labelUseAbsoluteUrl = true)
+                                          $labelUseAbsoluteUrl = true,
+                                          $labelSeries = '')
     {
+        $labelSeries = explode(',', $labelSeries);
+        $labelSeries = array_filter($labelSeries, 'strlen');
+        $labelSeries = array_map('intval', $labelSeries);
+
         if (!isset($metadata['metrics'][$column])) {
             // invalid column => use the first one that's available
             $metrics = array_keys($metadata['metrics']);
@@ -455,6 +462,11 @@ private function getMultiRowEvolution(DataTable\Map $dataTable, $metadata, $apiM
                 $cleanLabel = $this->cleanOriginalLabel($label);
                 $actualLabels[$labelIdx] = $cleanLabel;
             }
+
+            if (isset($labelSeries[$labelIdx])) {
+                $labelSeriesIndex = $labelSeries[$labelIdx];
+                $actualLabels[$labelIdx] .= ' ' . DataComparisonFilter::getPrettyComparisonLabelFromSeriesIndex($labelSeriesIndex);
+            }
         }
 
         // convert rows to be array($column.'_'.$labelIdx => $value) as opposed to
diff --git a/app/plugins/API/config/config.php b/app/plugins/API/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/API/config/config.php
+++ b/app/plugins/API/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/API/config/tracker.php b/app/plugins/API/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/API/config/tracker.php
+++ b/app/plugins/API/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/API/lang/cs.json b/app/plugins/API/lang/cs.json
index 14e955298..528776400 100644
--- a/app/plugins/API/lang/cs.json
+++ b/app/plugins/API/lang/cs.json
@@ -10,6 +10,8 @@
         "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 %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ář"
+        "Glossary": "Glosář",
+        "LearnAboutCommonlyUsedTerms2": "Přečtěte si o běžně používaných výrazech, abyste mohli co nejlépe využít Matomo Analytics.",
+        "EvolutionMetricName": "%s Vývoj"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/API/lang/da.json b/app/plugins/API/lang/da.json
index 3c8ef6914..bc4eb583d 100644
--- a/app/plugins/API/lang/da.json
+++ b/app/plugins/API/lang/da.json
@@ -11,6 +11,7 @@
         "UserAuthentication": "Brugergodkendelse",
         "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.",
         "Glossary": "Ordliste",
-        "LearnAboutCommonlyUsedTerms2": "Forstå de hyppigst anvendte ord for at få mest muligt ud af Matomo."
+        "LearnAboutCommonlyUsedTerms2": "Forstå de hyppigst anvendte ord for at få mest muligt ud af Matomo.",
+        "EvolutionMetricName": "%s Udvikling"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/API/lang/es-ar.json b/app/plugins/API/lang/es-ar.json
index d8a5fac28..ad33726ea 100644
--- a/app/plugins/API/lang/es-ar.json
+++ b/app/plugins/API/lang/es-ar.json
@@ -1,12 +1,17 @@
 {
     "API": {
         "ChangeTokenHint": "Si querés cambiar esta clave, por favor, andá a tu %1$spágina personal de configuración%2$s.",
+        "GenerateVisits": "Si no tenés los datos de hoy, primero podés generar algunos datos mediante el plugin %1$s. Podés habilitar el plugin %2$s, luego hacer clic en el menú \"Generador de visitante\" en el área de administración de Matomo.",
         "KeepTokenSecret": "Esta token_auth es tan secreta como tu nombre de usuario y contraseña, %1$s ¡no la compartás%2$s!",
         "LoadedAPIs": "Se cargaron %s APIs exitosamente",
+        "MoreInformation": "Para más información acerca de las APIs de Matomo, por favor, mirá la %1$s Introducción a la API de Matomo %2$s y a la %3$s Referencia de las API de Matomo %4$s.",
+        "PluginDescription": "Todos los datos en Matomo están disponibles a través de simples APIs. Este plugin es el punto de entrada al servicio web, al que podés llamar para obtener todos tus análisis web en XML, JSON, PHP, CSV, etc.",
         "ReportingApiReference": "Informe de referencia de API",
         "TopLinkTooltip": "Accedé a tus datos de análisis web programáticamente, a través de una sencilla API en JSON, XML, etc.",
         "UserAuthentication": "Autenticación de usuario",
         "UsingTokenAuth": "Si querés %1$s solicitar datos dentro de un script, un crontab, etc %2$s tenés que agregar el parámetro %3$s a las direcciones web de llamadas a la API que requiere autenticación.",
-        "Glossary": "Glosario"
+        "Glossary": "Glosario",
+        "LearnAboutCommonlyUsedTerms2": "Aprendé más sobre los términos usados comúnmente para sacar el mayor provecho a los análisis de Matomo.",
+        "EvolutionMetricName": "%s Evolution"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/API/lang/ja.json b/app/plugins/API/lang/ja.json
index 69148d3a3..4513a6981 100644
--- a/app/plugins/API/lang/ja.json
+++ b/app/plugins/API/lang/ja.json
@@ -11,7 +11,7 @@
         "UserAuthentication": "ユーザー認証",
         "UsingTokenAuth": "%1$sスクリプト（crontab 等）でリクエストデータを得たい場合%2$sは、API をコールする URL（認証が必要）にパラメータ %3$s を付加する必要があります。",
         "Glossary": "用語集",
-        "LearnAboutCommonlyUsedTerms2": "Matomo Analytics を最大限に活用するためによく使われる用語について学びましょう。",
+        "LearnAboutCommonlyUsedTerms2": "Matomo Analytics を最大限に活用するためによく使われる用語について説明します。",
         "EvolutionMetricName": "%s 推移"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/API/lang/pl.json b/app/plugins/API/lang/pl.json
index 1bf72d0b2..1b77cff68 100644
--- a/app/plugins/API/lang/pl.json
+++ b/app/plugins/API/lang/pl.json
@@ -5,7 +5,7 @@
         "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 Matomo, prosimy przeczytać %1$s Wprowadzenie do interfejsu API w Matomo%2$s, a także na stronie opracowania %3$s Matomo API Reference%4$s.",
-        "PluginDescription": "Wszystkie dane w Matomou są dostępne poprzez proste API. Ten plugin jest punktem końcowym serwisu web,",
+        "PluginDescription": "Wszystkie dane w Matomo są dostępne poprzez proste API. Ta wtyczka jest punktem wejściowym usługi sieciowej, którą możesz wywołać, aby uzyskać swoje statystyki w formacie xml, json, php, csv, itd.",
         "ReportingApiReference": "Referencje API Raportów",
         "TopLinkTooltip": "Dostęp do twoich danych analitycznych programistycznie poprzez proste API w formatach json, xml itp.",
         "UserAuthentication": "Uwierzytelnianie użytkownika",
diff --git a/app/plugins/API/lang/zh-cn.json b/app/plugins/API/lang/zh-cn.json
index 707220cd4..5c3d14962 100644
--- a/app/plugins/API/lang/zh-cn.json
+++ b/app/plugins/API/lang/zh-cn.json
@@ -11,6 +11,7 @@
         "UserAuthentication": "身份验证",
         "UsingTokenAuth": "如果您想在代码、定时任务中 %1$s 请求数据，%2$s 要在 API 调用需要认证的网址时增加参数 %3$s。",
         "Glossary": "词汇表",
-        "LearnAboutCommonlyUsedTerms2": "了解常用术语以便更好的利用Matomo数据分析。"
+        "LearnAboutCommonlyUsedTerms2": "了解常用术语以便更好的利用Matomo数据分析。",
+        "EvolutionMetricName": "%s演变"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/API/templates/listAllAPI.twig b/app/plugins/API/templates/listAllAPI.twig
index a8d4c7f25..17da68de1 100644
--- a/app/plugins/API/templates/listAllAPI.twig
+++ b/app/plugins/API/templates/listAllAPI.twig
@@ -14,7 +14,7 @@
         <p>{{ 'API_PluginDescription'|translate }}</p>
 
         <p>
-            {{ 'API_MoreInformation'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/analytics-api'>","</a>","<a target='_blank' rel='noreferrer' href='https://matomo.org/docs/analytics-api/reference'>","</a>")|raw }}
+            {{ 'API_MoreInformation'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/analytics-api'>","</a>","<a target='_blank' rel='noreferrer' href='https://developer.matomo.org/api-reference/reporting-api'>","</a>")|raw }}
         </p>
     </div>
     <div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}">
diff --git a/app/plugins/Actions/Archiver.php b/app/plugins/Actions/Archiver.php
index ddb05cc5a..35ecf4123 100644
--- a/app/plugins/Actions/Archiver.php
+++ b/app/plugins/Actions/Archiver.php
@@ -200,7 +200,6 @@ protected function archiveDayActions($rankingQueryLimit, array $actionTypes, $in
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn(array('idaction', 'name'));
             $rankingQuery->addColumn('url_prefix');
 
@@ -281,7 +280,6 @@ protected function archiveDayEntryActions($rankingQueryLimit)
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
             $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS);
             $rankingQuery->addColumn(array(PiwikMetrics::INDEX_PAGE_ENTRY_NB_VISITS,
@@ -330,7 +328,6 @@ protected function archiveDayExitActions($rankingQueryLimit)
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
             $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS);
             $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum');
@@ -374,7 +371,6 @@ protected function archiveDayActionsTime($rankingQueryLimit)
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn('idaction');
             $rankingQuery->addColumn(PiwikMetrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum');
             $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType));
diff --git a/app/plugins/Actions/ArchivingHelper.php b/app/plugins/Actions/ArchivingHelper.php
index 2e878a45b..e5c315d0b 100644
--- a/app/plugins/Actions/ArchivingHelper.php
+++ b/app/plugins/Actions/ArchivingHelper.php
@@ -15,6 +15,7 @@
 use Piwik\DataTable\Row;
 use Piwik\Metrics as PiwikMetrics;
 use Piwik\Piwik;
+use Piwik\RankingQuery;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
 use Zend_Db_Statement;
@@ -57,7 +58,7 @@ public static function updateActionsTableWithRowQuery($query, $fieldQueried, & $
                 continue;
             }
 
-            $hasRowName = !empty($row['name']) && $row['name'] != DataTable::LABEL_SUMMARY_ROW;
+            $hasRowName = !empty($row['name']) && $row['name'] != RankingQuery::LABEL_SUMMARY_ROW;
 
             // This will appear as <url /> in the API, which is actually very important to keep
             // eg. When there's at least one row in a report that does not have a URL, not having this <url/> would break HTML/PDF reports.
@@ -381,7 +382,7 @@ public static function getActionRow($actionName, $actionType, $urlPrefix = null,
         }
 
         // check for ranking query cut-off
-        if ($actionName == DataTable::LABEL_SUMMARY_ROW) {
+        if ($actionName == RankingQuery::LABEL_SUMMARY_ROW) {
             $summaryRow = $currentTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
             if ($summaryRow === false) {
                 $summaryRow = $currentTable->addSummaryRow(self::createSummaryRow());
@@ -499,7 +500,7 @@ public static function getActionExplodedNames($name, $type, $urlPrefix = null)
      */
     private static function getCachedActionRowKey($idAction, $actionType)
     {
-        return $idAction == DataTable::LABEL_SUMMARY_ROW
+        return $idAction == RankingQuery::LABEL_SUMMARY_ROW
             ? $actionType . '_others'
             : $idAction;
     }
diff --git a/app/plugins/Actions/DataTable/Filter/Actions.php b/app/plugins/Actions/DataTable/Filter/Actions.php
index c45716a98..29bfe1bf4 100644
--- a/app/plugins/Actions/DataTable/Filter/Actions.php
+++ b/app/plugins/Actions/DataTable/Filter/Actions.php
@@ -35,7 +35,8 @@ public function __construct($table, $actionType)
      */
     public function filter($table)
     {
-        $table->filter(function (DataTable $dataTable) {
+        $isFlattening = Common::getRequestVar('flat', 0);
+        $table->filter(function (DataTable $dataTable) use ($isFlattening) {
             $site = $dataTable->getMetadata('site');
             $urlPrefix = $site ? $site->getMainUrl() : null;
 
@@ -54,33 +55,35 @@ public function filter($table)
             }
 
             foreach ($dataTable->getRows() as $row) {
-                $url = $row->getMetadata('url');
-                $pageTitlePath = $row->getMetadata('page_title_path');
-                $folderUrlStart = $row->getMetadata('folder_url_start');
-                $label = $row->getColumn('label');
-                if ($url) {
-                    $row->setMetadata('segmentValue', urldecode($url));
-                } else if ($folderUrlStart) {
-                    $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($folderUrlStart)));
-                } else if ($pageTitlePath) {
-                    if ($row->getIdSubDataTable()) {
-                        $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim(urldecode($pageTitlePath)))));
-                    } else {
-                        $row->setMetadata('segmentValue', trim(urldecode($pageTitlePath)));
-                    }
-                } else if ($isPageTitleType && !in_array($label, [DataTable::LABEL_SUMMARY_ROW])) {
-                    // for older data w/o page_title_path metadata
-                    if ($row->getIdSubDataTable()) {
-                        $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim(urldecode($label)))));
-                    } else {
-                        $row->setMetadata('segmentValue', trim(urldecode($label)));
+                if (!$row->isSummaryRow()) {
+                    $url = $row->getMetadata('url');
+                    $pageTitlePath = $row->getMetadata('page_title_path');
+                    $folderUrlStart = $row->getMetadata('folder_url_start');
+                    $label = $row->getColumn('label');
+                    if ($url) {
+                        $row->setMetadata('segmentValue', urlencode($url));
+                    } else if ($folderUrlStart) {
+                        $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($folderUrlStart)));
+                    } else if ($pageTitlePath) {
+                        if ($row->getIdSubDataTable()) {
+                            $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim($pageTitlePath))));
+                        } else {
+                            $row->setMetadata('segmentValue', urlencode(trim($pageTitlePath)));
+                        }
+                    } else if ($isPageTitleType && !in_array($label, [DataTable::LABEL_SUMMARY_ROW])) {
+                        // for older data w/o page_title_path metadata
+                        if ($row->getIdSubDataTable()) {
+                            $row->setMetadata('segment', 'pageTitle=^' . urlencode(urlencode(trim($label))));
+                        } else {
+                            $row->setMetadata('segmentValue', urlencode(trim($label)));
+                        }
+                    } else if ($this->actionType == Action::TYPE_PAGE_URL && $urlPrefix) { // folder for older data w/ no folder URL metadata
+                        $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($urlPrefix . '/' . $label)));
                     }
-                } else if ($this->actionType == Action::TYPE_PAGE_URL && $urlPrefix) { // folder for older data w/ no folder URL metadata
-                    $row->setMetadata('segment', 'pageUrl=^' . urlencode(urlencode($urlPrefix . '/' . $label)));
                 }
 
                 // remove the default action name 'index' in the end of flattened urls and prepend $actionDelimiter
-                if (Common::getRequestVar('flat', 0)) {
+                if ($isFlattening) {
                     $label = $row->getColumn('label');
                     $stringToSearch = $actionDelimiter.$defaultActionName;
                     if (substr($label, -strlen($stringToSearch)) == $stringToSearch) {
@@ -96,11 +99,6 @@ public function filter($table)
             }
         });
 
-        // TODO can we remove this one again?
-        $table->queueFilter('GroupBy', array('label', function ($label) {
-            return urldecode($label);
-        }));
-
         foreach ($table->getRowsWithoutSummaryRow() as $row) {
             $subtable = $row->getSubtable();
             if ($subtable) {
diff --git a/app/plugins/Actions/config/config.php b/app/plugins/Actions/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Actions/config/config.php
+++ b/app/plugins/Actions/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Actions/config/tracker.php b/app/plugins/Actions/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Actions/config/tracker.php
+++ b/app/plugins/Actions/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Actions/lang/cs.json b/app/plugins/Actions/lang/cs.json
index c579b3083..2d44969ca 100644
--- a/app/plugins/Actions/lang/cs.json
+++ b/app/plugins/Actions/lang/cs.json
@@ -2,14 +2,18 @@
     "Actions": {
         "AvgGenerationTimeTooltip": "Průměr dle %1$s přístupů %2$s mezi %3$s a %4$s",
         "ColumnClickedURL": "URL prokliku",
+        "ColumnClickedURLs": "Kliknuté adresy URL",
         "ColumnActionURL": "URL akce",
         "ColumnClicks": "Prokliků",
         "ColumnClicksDocumentation": "Počet kliknutí na odkaz v závislosti na čase.",
         "ColumnDownloadURL": "URL stažení",
+        "ColumnDownloadURLs": "Stažené adresy URL",
         "ColumnEntryPageTitle": "Titulek vstupní stránky",
         "ColumnEntryPageURL": "URL vstupní stránky",
+        "ColumnEntryPageURLs": "URL vstupních stránek",
         "ColumnExitPageTitle": "Titulek výstupní stránky",
         "ColumnExitPageURL": "URL výstupní stránky",
+        "ColumnExitPageURLs": "URL odchozích stránek",
         "ColumnNoResultKeyword": "Hledané klíčové slovo nebylo nalezeno",
         "ColumnPageName": "Jméno stránky",
         "ColumnPagesPerSearch": "Stránka hledaných výsledků",
@@ -28,6 +32,7 @@
         "ColumnUniqueOutlinks": "Jedinečné externí odkazy",
         "ColumnIdPageview": "ID zobrazení stránky",
         "ColumnInteractionPosition": "Pozice interakce",
+        "ActionsInVisit": "Akce během návštěvy",
         "DownloadsReportDocumentation": "V tomto hlášení můžete vidět soubory, které byly staženy. %s Které Matomo počítá jako stažené jsou jen ty, na které bylo kliknuto. Bez ohledu na to, jestli bylo stažení dokončeno nebo přerušeno. To Matomo neumí zjistit.",
         "EntryPagesReportDocumentation": "Toto hlášení obsahuje informace o vstupních stránkách, které byly za dané časové období použity. Vstupní stránka je první stránka, kterou uživatel navštíví. %s URL jsou zobrazeny ve složkové struktuře.",
         "EntryPageTitles": "Titulky vstupních stránek",
@@ -42,6 +47,7 @@
         "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. %1$s Titulek je HTML tag %2$s, který většina prohlížečů zobrazuje v titulku okna.",
         "PageUrls": "URL stránky",
+        "PageViewsByVisitor": "Počet zobrazení této stránky návštěvníkem během všech návštěv",
         "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í.",
         "RevisitedPages": "Stránky navštívené více než jednou",
         "SiteSearchCategories1": "Toto hlášení shrnuje kategorie, které návštěvníci vybrali při vyhledávání na stránkách.",
@@ -69,6 +75,7 @@
         "WidgetSearchKeywords": "Klíčová slova hledané stránky",
         "WidgetSearchNoResultKeywords": "Hledaná Klíčová slova bez výsledku hledání",
         "ActionType": "Typ akce",
-        "ActionTypes": "Typy akcí"
+        "ActionTypes": "Typy akcí",
+        "Behaviour": "Chování"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Actions/lang/da.json b/app/plugins/Actions/lang/da.json
index 433293a37..f659e68b6 100644
--- a/app/plugins/Actions/lang/da.json
+++ b/app/plugins/Actions/lang/da.json
@@ -7,6 +7,7 @@
         "ColumnClicks": "Klik",
         "ColumnClicksDocumentation": "Antal gange linket blev klikket på.",
         "ColumnDownloadURL": "Hentet URL",
+        "ColumnDownloadURLs": "Hent URLer",
         "ColumnEntryPageTitle": "Indgangssidetitel",
         "ColumnEntryPageURL": "Indgangsside-URL",
         "ColumnEntryPageURLs": "Indgangsside-URL’er",
@@ -31,9 +32,12 @@
         "ColumnUniqueOutlinks": "Unikke udgående links",
         "ColumnIdPageview": "Sidevisning ID",
         "ColumnInteractionPosition": "Position for Interaktion",
+        "ActionsInVisit": "Handlinger i Besøg",
         "DownloadsReportDocumentation": "Rapporten viser, hvilke filer dine besøgende har hentet. %s Hvad Matomo tæller som en filhentning, er klikket på et link. Hvorvidt overførelsen er afsluttet eller ej ved Matomo ikke.",
+        "EntryPagesReportDocumentation": "Rapporten indeholder oplysninger om indgangssider, der blev anvendt i den angivne periode. En indgangsside er den første side, en bruger får vist under sit besøg. %s Indgangssiden vises med en mappestruktur.",
         "EntryPageTitles": "Indgangssidetitler",
         "EntryPageTitlesReportDocumentation": "Rapporten indeholder oplysninger om titlerne på indgangssider, der blev brugt i den angivne periode.",
+        "ExitPagesReportDocumentation": "Rapporten indeholder oplysninger om de udgangssider, der blev brugt i den angivne periode. En udgangsside er den sidste side, en bruger får vist under sit besøg. %s udgangs-URLer vises med en mappestruktur.",
         "ExitPageTitles": "Udgangssidetitler",
         "ExitPageTitlesReportDocumentation": "Rapporten indeholder oplysninger om titlerne på udgangssider, der blev brugt i den angivne periode.",
         "LearnMoreAboutSiteSearchLink": "Lær mere om sporing af hvordan besøgende bruger din søgemaskine.",
@@ -50,7 +54,10 @@
         "SiteSearchCategories2": "For eksempel har E-handel hjemmesider typisk en \"Kategori\" vælger, så besøgende kan begrænse deres søgninger til alle produkter i en bestemt kategori.",
         "SiteSearchFollowingPagesDoc": "Når besøgende søger på hjemmesiden, er de på udkig efter en bestemt side, indhold, produkt eller service. Rapporten viser de sider, der blev klikket mest på efter en intern søgning. Med andre ord, listen over sider mest søgt af besøgende allerede på hjemmesiden.",
         "SiteSearchIntro": "Sporing af søgninger, som de besøgende foretager på hjemmesiden er en meget effektiv måde at lære mere om, hvad din målgruppe er på udkig efter, det kan hjælpe med til at finde idéer til nyt indhold, nye E-handel produkter, som potentielle kunder kan søge efter, og generelt forbedre de besøgendes oplever på hjemmesiden.",
+        "SiteSearchCategory": "Kategori (Sitesøgning)",
+        "SiteSearchCategories": "Kategorier (Sitesøgning)",
         "SiteSearchKeyword": "Søgeord (intern søgning)",
+        "SiteSearchKeywords": "Nøgleord (Sitesøgning)",
         "SiteSearchKeywordsDocumentation": "Rapporten viser de søgeord, de besøgende søgte efter på den interne søgemaskine.",
         "SiteSearchKeywordsNoResultDocumentation": "Rapporten viser de søgeord, der ikke returnerede noget søgeresultat: måske søgemaskinen algoritme kan forbedres, eller måske de besøgende er på udkig efter indhold, der (endnu) ikke er på din hjemmeside?",
         "SubmenuPagesEntry": "Indgangssider",
@@ -68,6 +75,7 @@
         "WidgetSearchKeywords": "Websted søgeord",
         "WidgetSearchNoResultKeywords": "Søgeord uden nogen resultater",
         "ActionType": "Handlingstype",
+        "ActionTypes": "Handlingstyper",
         "Behaviour": "Adfærd"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Actions/lang/es-ar.json b/app/plugins/Actions/lang/es-ar.json
index b2ed4e044..c011462c6 100644
--- a/app/plugins/Actions/lang/es-ar.json
+++ b/app/plugins/Actions/lang/es-ar.json
@@ -33,7 +33,7 @@
         "ColumnIdPageview": "ID de paginas vistas",
         "ColumnInteractionPosition": "Posición de interacción",
         "ActionsInVisit": "Acciones en visita",
-        "DownloadsReportDocumentation": "En este reporte, usted puede ver que archivos han descargado sus visitantes. %s Lo que Matomo cuenta como descarga es el clic en un enlace de descarga. Matomo no puede saber si la descarga ha sido completada.",
+        "DownloadsReportDocumentation": "En este informe, podés ver qué archivos descargaron tus visitantes. %s Lo que Matomo cuenta como descarga es el clic en un enlace de descarga. Matomo no puede saber si la descarga fue completada.",
         "EntryPagesReportDocumentation": "Este informe contiene información sobre las páginas de entrada que fueron usada durante el período especificado. Una página de entrada es la primera página que un usuario ve durante su visita. %s Las direcciones web de entrada se muestran como una estructura de carpeta.",
         "EntryPageTitles": "Títulos de páginas de entrada",
         "EntryPageTitlesReportDocumentation": "Este reporte contiene información sobre los títulos de las páginas de entrada que han sido utilizadas durante el período específico.",
@@ -75,6 +75,7 @@
         "WidgetSearchKeywords": "Palabras clave de las búsquedas internas",
         "WidgetSearchNoResultKeywords": "Palabras clave sin resultados",
         "ActionType": "Tipo de Acción",
-        "ActionTypes": "Tipos de acción"
+        "ActionTypes": "Tipos de acción",
+        "Behaviour": "Comportamiento"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Annotations/config/config.php b/app/plugins/Annotations/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Annotations/config/config.php
+++ b/app/plugins/Annotations/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Annotations/config/tracker.php b/app/plugins/Annotations/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Annotations/config/tracker.php
+++ b/app/plugins/Annotations/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Annotations/lang/ja.json b/app/plugins/Annotations/lang/ja.json
index feff0c75e..40ad3c962 100644
--- a/app/plugins/Annotations/lang/ja.json
+++ b/app/plugins/Annotations/lang/ja.json
@@ -12,11 +12,11 @@
         "HideAnnotationsFor": "%sのアノテーションを非表示にする…",
         "IconDesc": "この期間のメモを表示します。",
         "IconDescHideNotes": "この期間のメモを非表示にします。",
-        "InlineQuickHelp": "データの分析結果や重要と思うものを記録するのに、特別なイベントとしてアノテーションを作成できます ( 新しいブログの投稿、ウェブサイトのリニューアルなど ) 。",
+        "InlineQuickHelp": "データの分析結果や重要と思うものを記録するために、特別なイベントとしてアノテーションを作成できます ( 新しいブログの投稿、ウェブサイトのリニューアルなど ) 。",
         "LoginToAnnotate": "アノテーションを作成するにはログインしてください。",
         "NoAnnotations": "この期間内のアノテーションはありません",
         "PluginDescription": "ウェブサイトに加えられた変更をマークしたり、データに関して行った分析を保存したり、あなたの考えを同僚と共有したりするために、それぞれの日にノートを添付することができます。 データにアノテーションを付けることで、そのデータの根拠を思い出すきっかけになります。",
         "ViewAndAddAnnotations": "%sのアノテーションの表示と追加",
-        "YouCannotModifyThisNote": "このアノテーションは変更できません。あなたが生成したアノテーションではないか、このサイトの管理者権限がないためです"
+        "YouCannotModifyThisNote": "あなたが生成したアノテーションではないか、このサイトの管理者権限がないため、このアノテーションは変更できません。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/BulkTracking/Tracker/Handler.php b/app/plugins/BulkTracking/Tracker/Handler.php
index a2ca69f3f..2cf0b507b 100644
--- a/app/plugins/BulkTracking/Tracker/Handler.php
+++ b/app/plugins/BulkTracking/Tracker/Handler.php
@@ -25,6 +25,8 @@ class Handler extends Tracker\Handler
 
     public function __construct()
     {
+        parent::__construct();
+
         $this->setResponse(new Response());
     }
 
diff --git a/app/plugins/BulkTracking/config/config.php b/app/plugins/BulkTracking/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/BulkTracking/config/config.php
+++ b/app/plugins/BulkTracking/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/BulkTracking/config/tracker.php b/app/plugins/BulkTracking/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/BulkTracking/config/tracker.php
+++ b/app/plugins/BulkTracking/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Contents/API.php b/app/plugins/Contents/API.php
index 37754b881..e2a385b35 100644
--- a/app/plugins/Contents/API.php
+++ b/app/plugins/Contents/API.php
@@ -64,11 +64,6 @@ private function filterDataTable($dataTable)
             if ($row) {
                 $row->setColumn('label', Piwik::translate('General_NotDefined', Piwik::translate('Contents_ContentPiece')));
             }
-            foreach ($table->getRows() as $row) {
-                if ($row->getMetadata('contentTarget') === Archiver::CONTENT_TARGET_NOT_SET) {
-                    $row->setMetadata('contentTarget', '');
-                }
-            }
         });
     }
 }
diff --git a/app/plugins/Contents/Archiver.php b/app/plugins/Contents/Archiver.php
index 27ead44c3..af594b723 100644
--- a/app/plugins/Contents/Archiver.php
+++ b/app/plugins/Contents/Archiver.php
@@ -76,7 +76,6 @@ private function aggregateDayImpressions()
     {
         $select = "
                 log_action_content_piece.name as contentPiece,
-                log_action_content_target.name as contentTarget,
                 log_action_content_name.name as contentName,
 
 				count(distinct log_link_visit_action.idvisit) as `" . Metrics::INDEX_NB_VISITS . "`,
@@ -111,14 +110,13 @@ private function aggregateDayImpressions()
                     log_link_visit_action.idaction_content_target,
                     log_link_visit_action.idaction_content_name";
 
-        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC";
+        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC, `contentName`";
 
         $rankingQueryLimit = ArchivingHelper::getRankingQueryLimit();
         $rankingQuery = null;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
-            $rankingQuery->addLabelColumn(array('contentPiece', 'contentTarget', 'contentName'));
+            $rankingQuery->addLabelColumn(array('contentPiece', 'contentName'));
             $rankingQuery->addColumn(array(Metrics::INDEX_NB_UNIQ_VISITORS));
             $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_IMPRESSIONS, Metrics::INDEX_NB_VISITS), 'sum');
         }
@@ -173,7 +171,6 @@ private function aggregateDayInteractions()
         $rankingQuery = null;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn(array('contentPiece', 'contentInteraction', 'contentName'));
             $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_INTERACTIONS), 'sum');
         }
@@ -260,7 +257,6 @@ private function aggregateImpressionRow($row)
             }
 
             $dataArray->sumMetricsImpressions($mainLabel, $row);
-            $this->rememberMetadataForRow($row, $mainLabel);
 
             $subDimension = $dimensions[1];
             $subLabel     = $row[$subDimension];
@@ -299,18 +295,4 @@ private function aggregateInteractionRow($row)
             $dataArray->sumMetricsContentsInteractionPivot($mainLabel, $subLabel, $row);
         }
     }
-
-    private function rememberMetadataForRow($row, $mainLabel)
-    {
-        $this->metadata[$mainLabel] = array();
-
-        $target = $row['contentTarget'];
-        if (empty($target)) {
-            $target = Archiver::CONTENT_TARGET_NOT_SET;
-        }
-
-        // there can be many different targets
-        $this->metadata[$mainLabel]['contentTarget'] = $target;
-    }
-
 }
diff --git a/app/plugins/Contents/config/config.php b/app/plugins/Contents/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Contents/config/config.php
+++ b/app/plugins/Contents/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Contents/config/tracker.php b/app/plugins/Contents/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Contents/config/tracker.php
+++ b/app/plugins/Contents/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Contents/lang/da.json b/app/plugins/Contents/lang/da.json
index d027fc8f1..ff117edb5 100644
--- a/app/plugins/Contents/lang/da.json
+++ b/app/plugins/Contents/lang/da.json
@@ -9,7 +9,9 @@
         "ContentName": "Indholdsnavn",
         "ContentNames": "Indholdsnavne",
         "ContentPiece": "Indholdsstykke",
+        "ContentPieces": "Indholdsstykker",
         "ContentTarget": "Indholdsmål",
+        "ContentTargets": "Indholdsmål",
         "Contents": "Indhold",
         "InteractionsMetricDocumentation": "Antal gange der er blevet interageret på et indhold (f.eks. et klik på et banner eller en reklame).",
         "ImpressionsMetricDocumentation": "Antal gange et indhold, som f.eks. et banner eller en reklame er vist på en side.",
diff --git a/app/plugins/Contents/lang/es-ar.json b/app/plugins/Contents/lang/es-ar.json
index fb39284cb..2c75f61a4 100644
--- a/app/plugins/Contents/lang/es-ar.json
+++ b/app/plugins/Contents/lang/es-ar.json
@@ -2,12 +2,16 @@
     "Contents": {
         "PluginDescription": "El seguimiento de báner y contenido te permite medir tu rendimiento (vistas, clics, etc) de cualquier pieza de contenido en tus páginas (publicidad en báner, imagen, cualquier elemento).",
         "Impressions": "Impresiones",
+        "ContentImpression": "Impresión de contenido",
         "ContentInteraction": "Interacción de contenido",
         "ContentInteractions": "Interacciones de contenido",
         "InteractionRate": "Tasa de interacción",
         "ContentName": "Nombre del contenido",
+        "ContentNames": "Nombres del contenido",
         "ContentPiece": "Pieza del contenido",
+        "ContentPieces": "Piezas del contenido",
         "ContentTarget": "Objetivo del contenido",
+        "ContentTargets": "Objetivos del contenido",
         "Contents": "Contenidos",
         "InteractionsMetricDocumentation": "El número de veces con que un bloque de contenido interactuó (por ejemplo, un clic en un báner o publicidad).",
         "ImpressionsMetricDocumentation": "El número de veces que un bloque de contenido, como un báner o una publicidad, fue mostrado en una página.",
diff --git a/app/plugins/CoreAdminHome/API.php b/app/plugins/CoreAdminHome/API.php
index 68d81c945..ee97d75a6 100644
--- a/app/plugins/CoreAdminHome/API.php
+++ b/app/plugins/CoreAdminHome/API.php
@@ -108,6 +108,16 @@ public function setBrandingSettings($useCustomLogo)
     {
         Piwik::checkUserHasSuperUserAccess();
 
+        $customLogo = new CustomLogo();
+
+        if ($customLogo->isCustomLogoFeatureEnabled()) {
+            if ($useCustomLogo) {
+                $customLogo->enable();
+            } else {
+                $customLogo->disable();
+            }
+        }
+
         return true;
     }
     /**
diff --git a/app/plugins/CoreAdminHome/Commands/InvalidateReportData.php b/app/plugins/CoreAdminHome/Commands/InvalidateReportData.php
index b8abd737f..75878a48f 100644
--- a/app/plugins/CoreAdminHome/Commands/InvalidateReportData.php
+++ b/app/plugins/CoreAdminHome/Commands/InvalidateReportData.php
@@ -71,6 +71,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $segments = $this->getSegmentsToInvalidateFor($input, $sites);
 
         foreach ($periodTypes as $periodType) {
+            if ($periodType === 'range') {
+                continue; // special handling for range below
+            }
             foreach ($dateRanges as $dateRange) {
                 foreach ($segments as $segment) {
                     $segmentStr = $segment ? $segment->getString() : '';
@@ -93,6 +96,31 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
+
+        $periods = trim($input->getOption('periods'));
+        $isUsingAllOption = $periods === self::ALL_OPTION_VALUE;
+        if ($isUsingAllOption || in_array('range', $periodTypes)) {
+            $rangeDates = array();
+            foreach ($dateRanges as $dateRange) {
+                if ($isUsingAllOption
+                    && !Period::isMultiplePeriod($dateRange, 'day')) {
+                    continue; // not a range, nothing to do... only when "all" option is used
+                }
+
+                $rangeDates[] = $this->getPeriodDates('range', $dateRange);
+            }
+            if (!empty($rangeDates)) {
+                foreach ($segments as $segment) {
+                    $segmentStr = $segment ? $segment->getString() : '';
+                    if ($dryRun) {
+                        $dateRangeStr = implode($dateRanges, ';');
+                        $output->writeln("Invalidating range periods overlapping $dateRangeStr [segment = $segmentStr]...");
+                    } else {
+                        $invalidator->markArchivesOverlappingRangeAsInvalidated($sites, $rangeDates, $segment);
+                    }
+                }
+            }
+        }
     }
 
     private function getSitesToInvalidateFor(InputInterface $input)
@@ -123,7 +151,6 @@ private function getPeriodTypesToInvalidateFor(InputInterface $input)
 
         if ($periods == self::ALL_OPTION_VALUE) {
             $result = array_keys(Piwik::$idPeriods);
-            unset($result[4]); // remove 'range' period
             return $result;
         }
 
@@ -131,11 +158,6 @@ private function getPeriodTypesToInvalidateFor(InputInterface $input)
         $periods = array_map('trim', $periods);
 
         foreach ($periods as $periodIdentifier) {
-            if ($periodIdentifier == 'range') {
-                throw new \InvalidArgumentException(
-                    "Invalid period type: invalidating range periods is not currently supported.");
-            }
-
             if (!isset(Piwik::$idPeriods[$periodIdentifier])) {
                 throw new \InvalidArgumentException("Invalid period type '$periodIdentifier' supplied in --periods.");
             }
@@ -165,13 +187,17 @@ private function getPeriodDates($periodType, $dateRange)
         }
 
         try {
+
             $period = PeriodFactory::build($periodType, $dateRange);
         } catch (\Exception $ex) {
             throw new \InvalidArgumentException("Invalid date or date range specifier '$dateRange'", $code = 0, $ex);
         }
 
         $result = array();
-        if ($period instanceof Range) {
+        if ($periodType === 'range') {
+            $result[] = $period->getDateStart();
+            $result[] = $period->getDateEnd();
+        } elseif ($period instanceof Range) {
             foreach ($period->getSubperiods() as $subperiod) {
                 $result[] = $subperiod->getDateStart();
             }
diff --git a/app/plugins/CoreAdminHome/Commands/PurgeOldArchiveData.php b/app/plugins/CoreAdminHome/Commands/PurgeOldArchiveData.php
index 829563333..b9dff8e56 100644
--- a/app/plugins/CoreAdminHome/Commands/PurgeOldArchiveData.php
+++ b/app/plugins/CoreAdminHome/Commands/PurgeOldArchiveData.php
@@ -60,7 +60,6 @@ protected function configure()
         $this->addOption('exclude-ranges', null, InputOption::VALUE_NONE, "Do not purge custom ranges.");
         $this->addOption('skip-optimize-tables', null, InputOption::VALUE_NONE, "Do not run OPTIMIZE TABLES query on affected archive tables.");
         $this->addOption('include-year-archives', null, InputOption::VALUE_NONE, "If supplied, the command will purge archive tables that contain year archives for every supplied date.");
-        $this->addOption('force-optimize-tables', null, InputOption::VALUE_NONE, "If supplied, forces optimize table SQL to be run, even on InnoDB tables.");
         $this->setHelp("By default old and invalidated archives are purged. Custom ranges are also purged with outdated archives.\n\n"
                      . "Note: archive purging is done during scheduled task execution, so under normal circumstances, you should not need to "
                      . "run this command manually.");
@@ -120,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($skipOptimizeTables) {
             $output->writeln("Skipping OPTIMIZE TABLES.");
         } else {
-            $this->optimizeArchiveTables($output, $dates, $input->getOption('force-optimize-tables'));
+            $this->optimizeArchiveTables($output, $dates);
         }
     }
 
@@ -186,21 +185,20 @@ private function performTimedPurging(OutputInterface $output, $startMessage, $ca
     /**
      * @param OutputInterface $output
      * @param Date[] $dates
-     * @param bool $forceOptimzation
      */
-    private function optimizeArchiveTables(OutputInterface $output, $dates, $forceOptimzation = false)
+    private function optimizeArchiveTables(OutputInterface $output, $dates)
     {
         $output->writeln("Optimizing archive tables...");
 
         foreach ($dates as $date) {
             $numericTable = ArchiveTableCreator::getNumericTable($date);
-            $this->performTimedPurging($output, "Optimizing table $numericTable...", function () use ($numericTable, $forceOptimzation) {
-                Db::optimizeTables($numericTable, $forceOptimzation);
+            $this->performTimedPurging($output, "Optimizing table $numericTable...", function () use ($numericTable) {
+                Db::optimizeTables($numericTable, $force = true);
             });
 
             $blobTable = ArchiveTableCreator::getBlobTable($date);
-            $this->performTimedPurging($output, "Optimizing table $blobTable...", function () use ($blobTable, $forceOptimzation) {
-                Db::optimizeTables($blobTable, $forceOptimzation);
+            $this->performTimedPurging($output, "Optimizing table $blobTable...", function () use ($blobTable) {
+                Db::optimizeTables($blobTable, $force = true);
             });
         }
     }
diff --git a/app/plugins/CoreAdminHome/Controller.php b/app/plugins/CoreAdminHome/Controller.php
index f76516b44..cfe609054 100644
--- a/app/plugins/CoreAdminHome/Controller.php
+++ b/app/plugins/CoreAdminHome/Controller.php
@@ -13,6 +13,7 @@
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Mail;
 use Piwik\Menu\MenuTop;
 use Piwik\Piwik;
 use Piwik\Plugin;
@@ -62,6 +63,7 @@ public function home()
         $hasNewPlugins = $widgetsList->isDefined('Marketplace', 'getNewPlugins');
         $hasDiagnostics = $widgetsList->isDefined('Installation', 'getSystemCheck');
         $hasTrackingFailures = $widgetsList->isDefined('CoreAdminHome', 'getTrackingFailures');
+        $hasQuickLinks = $widgetsList->isDefined('CoreHome', 'quickLinks');
         $hasSystemSummary = $widgetsList->isDefined('CoreHome', 'getSystemSummary');
 
         return $this->renderTemplate('home', array(
@@ -74,6 +76,7 @@ public function home()
             'hasPiwikBlog' => $hasPiwikBlog,
             'hasDiagnostics' => $hasDiagnostics,
             'hasTrackingFailures' => $hasTrackingFailures,
+            'hasQuickLinks' => $hasQuickLinks,
             'hasSystemSummary' => $hasSystemSummary,
         ));
     }
@@ -103,6 +106,7 @@ public function generalSettings()
         $view->branding              = array('use_custom_logo' => $logo->isEnabled());
         $view->fileUploadEnabled     = $logo->isFileUploadEnabled();
         $view->logosWriteable        = $logo->isCustomLogoWritable();
+        $view->customLogoEnabled     = $logo->isCustomLogoFeatureEnabled();
         $view->hasUserLogo           = CustomLogo::hasUserLogo();
         $view->pathUserLogo          = CustomLogo::getPathUserLogo();
         $view->hasUserFavicon        = CustomLogo::hasUserFavicon();
@@ -121,6 +125,8 @@ public function generalSettings()
             'ssl' => 'SSL',
             'tls' => 'TLS'
         );
+        $mail = new Mail();
+        $view->mailHost = $mail->getMailHost();
 
         $view->language = LanguagesManager::getLanguageCodeForCurrentUser();
         $this->setBasicVariablesView($view);
@@ -158,6 +164,22 @@ public function setMailSettings()
 
             Config::getInstance()->mail = $mail;
 
+            $general = Config::getInstance()->General;
+            $fromName = Common::getRequestVar('mailFromName', '');
+            $general['noreply_email_name'] = Common::unsanitizeInputValue($fromName);
+
+            $mailFrom = Common::getRequestVar('mailFromAddress', '');
+            if (empty($mailFrom)) {
+                $mailFrom = 'noreply@{DOMAIN}';
+            } else {
+                $mailFrom = Common::unsanitizeInputValue($mailFrom);
+            }
+            if (!Piwik::isValidEmailString($mailFrom) && !Common::stringEndsWith($mailFrom, '@{DOMAIN}')) {
+                throw new Exception(Piwik::translate('CoreAdminHome_ErrorEmailFromAddressNotValid'));
+            }
+            $general['noreply_email_address'] = $mailFrom;
+            Config::getInstance()->General = $general;
+
             Config::getInstance()->forceSave();
 
             $toReturn = $response->getResponse();
@@ -188,6 +210,7 @@ public function trackingCodeGenerator()
         if ($view->idSite) {
             try {
                 $view->siteName = Site::getNameFor($view->idSite);
+                $view->siteNameDecoded = Common::unsanitizeInputValue($view->siteName);
             } catch (Exception $e) {
                 // ignore if site no longer exists
             }
@@ -228,6 +251,19 @@ public function uploadCustomLogo()
     {
         Piwik::checkUserHasSuperUserAccess();
         $this->checkTokenInUrl();
+
+        $logo = new CustomLogo();
+
+        if (! $logo->isCustomLogoFeatureEnabled()) {
+            return '0';
+        }
+
+        $successLogo    = $logo->copyUploadedLogoToFilesystem();
+        $successFavicon = $logo->copyUploadedFaviconToFilesystem();
+
+        if ($successLogo || $successFavicon) {
+            return '1';
+        }
         return '0';
     }
 
@@ -258,7 +294,10 @@ private function handleGeneralSettingsAdmin($view)
         $view->todayArchiveTimeToLiveDefault = Rules::getTodayArchiveTimeToLiveDefault();
         $view->enableBrowserTriggerArchiving = $enableBrowserTriggerArchiving;
 
-        $view->mail = Config::getInstance()->mail;
+        $mail = Config::getInstance()->mail;
+        $mail['noreply_email_address'] = Config::getInstance()->General['noreply_email_address'];
+        $mail['noreply_email_name'] = Config::getInstance()->General['noreply_email_name'];
+        $view->mail = $mail;
     }
 
 }
diff --git a/app/plugins/CoreAdminHome/CoreAdminHome.php b/app/plugins/CoreAdminHome/CoreAdminHome.php
index a27d7a0fb..453196716 100644
--- a/app/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/app/plugins/CoreAdminHome/CoreAdminHome.php
@@ -115,5 +115,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreAdminHome_TrackingFailuresIntroduction';
         $translationKeys[] = 'CoreAdminHome_TrackingURL';
         $translationKeys[] = 'CoreAdminHome_NoKnownFailures';
+        $translationKeys[] = 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead';
+        $translationKeys[] = 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHeadEmail';
     }
 }
diff --git a/app/plugins/CoreAdminHome/CustomLogo.php b/app/plugins/CoreAdminHome/CustomLogo.php
index 562eb025e..e8dfffe3e 100644
--- a/app/plugins/CoreAdminHome/CustomLogo.php
+++ b/app/plugins/CoreAdminHome/CustomLogo.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreAdminHome;
 
+use DI\NotFoundException;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Filesystem;
@@ -84,6 +85,11 @@ public function isFileUploadEnabled()
         return ini_get('file_uploads') == 1;
     }
 
+    public function isCustomLogoFeatureEnabled()
+    {
+        return Config::getInstance()->General['enable_custom_logo'] != 0;
+    }
+
     /**
      * @return bool
      */
@@ -135,24 +141,39 @@ protected function getPathToLogo($pathOnly, $defaultLogo, $themeLogo, $customLog
         return Filesystem::getPathToPiwikRoot() . '/' . $logo;
     }
 
+    private static function getBasePath()
+    {
+        try {
+            $basePath = StaticContainer::get('path.misc.user');
+            return $basePath;
+        } catch (NotFoundException $e) {
+            // happens when upgrading from an older version which didn't have that global config entry yet
+            // to a newer version of Matomo when this value is being requested while the update happens
+            // basically request starts... the old global.php is loaded, then we update all PHP files, then after the
+            // update within the same request a newer version of CustomLogo.php is loaded and they are not compatible.
+            // In this case we return the default value
+            return 'misc/user/';
+        }
+    }
+
     public static function getPathUserLogo()
     {
-        return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo.png');
+        return static::rewritePath(self::getBasePath() . 'logo.png');
     }
 
     public static function getPathUserFavicon()
     {
-        return static::rewritePath(StaticContainer::get('path.misc.user') . 'favicon.png');
+        return static::rewritePath(self::getBasePath() . 'favicon.png');
     }
 
     public static function getPathUserSvgLogo()
     {
-        return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo.svg');
+        return static::rewritePath(self::getBasePath() . 'logo.svg');
     }
 
     public static function getPathUserLogoSmall()
     {
-        return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo-header.png');
+        return static::rewritePath(self::getBasePath() . 'logo-header.png');
     }
 
     protected static function rewritePath($path)
@@ -289,3 +310,4 @@ private static function logoExists($relativePath)
     }
 
 }
+
diff --git a/app/plugins/CoreAdminHome/Tasks.php b/app/plugins/CoreAdminHome/Tasks.php
index d77b28c8e..d94979c9c 100644
--- a/app/plugins/CoreAdminHome/Tasks.php
+++ b/app/plugins/CoreAdminHome/Tasks.php
@@ -23,9 +23,9 @@
 use Piwik\Plugins\CoreAdminHome\Emails\JsTrackingCodeMissingEmail;
 use Piwik\Plugins\CoreAdminHome\Emails\TrackingFailuresEmail;
 use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList;
+use Piwik\Plugins\SegmentEditor\Model;
 use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Scheduler\Schedule\SpecificTime;
-use Piwik\Segment;
 use Piwik\Settings\Storage\Backend\MeasurableSettingsTable;
 use Piwik\Tracker\Failures;
 use Piwik\Site;
@@ -74,6 +74,10 @@ public function schedule()
         $this->daily('cleanupTrackingFailures', null, self::LOWEST_PRIORITY);
         $this->weekly('notifyTrackingFailures', null, self::LOWEST_PRIORITY);
 
+        if(SettingsPiwik::isInternetEnabled() === true){
+            $this->weekly('updateSpammerBlacklist');
+        }
+
         $this->scheduleTrackingCodeReminderChecks();
     }
 
@@ -243,6 +247,26 @@ public function optimizeArchiveTable()
         Db::optimizeTables($archiveTables);
     }
 
+    /**
+     * Update the referrer spam blacklist
+     *
+     * @see https://github.com/matomo-org/referrer-spam-blacklist
+     */
+    public function updateSpammerBlacklist()
+    {
+        $url = 'https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt';
+        $list = Http::sendHttpRequest($url, 30);
+        $list = preg_split("/\r\n|\n|\r/", $list);
+        if (count($list) < 10) {
+            throw new \Exception(sprintf(
+                'The spammers list downloaded from %s contains less than 10 entries, considering it a fail',
+                $url
+            ));
+        }
+
+        Option::set(ReferrerSpamFilter::OPTION_STORAGE_NAME, serialize($list));
+    }
+
     /**
      * To test execute the following command:
      * `./console core:run-scheduled-tasks "Piwik\Plugins\CoreAdminHome\Tasks.purgeOrphanedArchives"`
@@ -251,7 +275,10 @@ public function optimizeArchiveTable()
      */
     public function purgeOrphanedArchives()
     {
-        $segmentHashesByIdSite = $this->getSegmentHashesByIdSite();
+        $eightDaysAgo = Date::factory('now')->subDay(8);
+        $model = new Model();
+        $deletedSegments = $model->getSegmentsDeletedSince($eightDaysAgo);
+
         $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled('numeric');
 
         $datesPurged = array();
@@ -262,34 +289,14 @@ public function purgeOrphanedArchives()
             $dateObj = Date::factory("$year-$month-15");
 
             $this->archivePurger->purgeDeletedSiteArchives($dateObj);
-            $this->archivePurger->purgeDeletedSegmentArchives($dateObj, $segmentHashesByIdSite);
+            if (count($deletedSegments)) {
+                $this->archivePurger->purgeDeletedSegmentArchives($dateObj, $deletedSegments);
+            }
 
             $datesPurged[$date] = true;
         }
     }
 
-    /**
-     * Get a list of all segment hashes that currently exist, indexed by idSite.
-     * @return array
-     */
-    public function getSegmentHashesByIdSite()
-    {
-        //Get a list of hashes of all segments that exist now
-        $sql = "SELECT DISTINCT definition, enable_only_idsite FROM " . Common::prefixTable('segment')
-            . " WHERE deleted = 0";
-        $rows = Db::fetchAll($sql);
-        $segmentHashes = array();
-        foreach ($rows as $row) {
-            $idSite = (int)$row['enable_only_idsite'];
-            if (! isset($segmentHashes[$idSite])) {
-                $segmentHashes[$idSite] = array();
-            }
-            $segmentHashes[$idSite][] = Segment::getSegmentHash($row['definition']);
-        }
-
-        return $segmentHashes;
-    }
-
     /**
      * we should only purge outdated & custom range archives if we know cron archiving has just run,
      * or if browser triggered archiving is enabled. if cron archiving has run, then we know the latest
diff --git a/app/plugins/CoreAdminHome/config/config.php b/app/plugins/CoreAdminHome/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/CoreAdminHome/config/config.php
+++ b/app/plugins/CoreAdminHome/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/config/tracker.php b/app/plugins/CoreAdminHome/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CoreAdminHome/config/tracker.php
+++ b/app/plugins/CoreAdminHome/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/da.json b/app/plugins/CoreAdminHome/lang/da.json
index 437f846fc..7f26f21c6 100644
--- a/app/plugins/CoreAdminHome/lang/da.json
+++ b/app/plugins/CoreAdminHome/lang/da.json
@@ -7,8 +7,11 @@
         "ReleaseChannel": "Frigiv kanal",
         "ClickHereToOptIn": "Klik her for at vælge.",
         "ClickHereToOptOut": "Klik her for at fravælge.",
+        "CorsDomains": "Cross-Origin Resource Sharing (CORS) domæner",
+        "CorsDomainsHelp": "Du kan definere domæner eller subdomæner som for eksempel http:\/\/eksempel.dk eller http:\/\/stats.eksempel.dk. Eller for at tillade tværgående domæneforespørgsler for alle domæner kan du tilføje en *",
         "CustomLogoFeedbackInfo": "Hvis du tilpasser Matomo 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 Matomo logo, der bliver vist i brugergrænsefladen og e-mail rapporter.",
+        "DevelopmentProcess": "Mens vores udviklingsproces inkluderer tusindvis af automatiserede tests, spiller Betatestere en nøglerolle i at opnå vores \"Ingen fejl politik\" i Matomo.",
         "EmailServerSettings": "E-mailserverindstillinger",
         "ForBetaTestersOnly": "Kun for beta testere",
         "ImageTracking": "Sporing vha. et billede",
@@ -22,10 +25,14 @@
         "InvalidPluginsYouCanUninstall": "Du kan opdatere eller afinstallere disse udvidelsesmoduler på %1$sManage Plugins%2$s-siden.",
         "JavaScriptTracking": "Sporing med JavaScript",
         "HttpTrackingApi": "HTTP-sporings-API",
+        "HttpTrackingApiDescription": "%1$s HTTP tracking API %2$s giver dig mulighed for at tracke alt. Det kan måske være brugbart hvis du bruger et programmeringssprog hvor der endnu ikke findes et SDK. Det kan også være brugbart, når du ønsker at tracke enheder eller applikationer på en bestemt måde.",
         "JSTracking_CampaignKwdParam": "Parameter for kampagnenøgleord",
         "JSTracking_CampaignNameParam": "Parameter for kampagnenavn",
+        "JSTracking_CodeNoteBeforeClosingHead": "Du skal sikre dig at denne kode findes på alle sider af dit website. Vi anbefaler at indsætte den umiddelbart før slut %1$s tag.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Du skal sikre dig at denne kode er indlejret som et script element på alle sider af dit website. Vi anbefaler at indsætte den umiddelbart før slutning af head tag.",
         "JSTracking_CustomCampaignQueryParam": "Brug brugerdefineret forespørgsel parameternavne for kampagnenavnet & søgeord",
         "JSTracking_CrossDomain": "Som standard, er det Visitor ID som identificere en unik besøgende gemt i browserens første-parts cookies, som kun kan tilgås af sider på samme domæne. Aktivering af kryds domæne linkning lader dig spore alle handlinger og sidevisninger af en bestemt bruger i det samme besøg, selv når de ser sider på adskillige domæner. Når en bruger klikker på et link til et af dine websites alias URL'er, vil der bliver tilføjet en URL paramter pk_vid, som viderestiller brugerens Visitor ID.",
+        "JSTracking_CrossDomain_NeedsMultipleDomains": "Note: For at brug tværgående domænelinking skal du først angive mere end et domænenavn (URLer) for dit website.",
         "JSTracking_CustomCampaignQueryParamDesc": "Note: %1$sMatomo registrerer automatisk Google Analytics parametre.%2$s",
         "JSTracking_DisableCookies": "Deaktivere alle sporingscookies",
         "JSTracking_DisableCookiesDesc": "Deaktiverer alle førstepartscookies. Eksisterende Matomo cookies for denne hjemmeside vil blive slettet ved den næste side visning.",
@@ -45,7 +52,10 @@
         "JSTracking_VisitorCustomVars": "Spor brugerdefinerede variabler for denne besøgende",
         "JSTracking_VisitorCustomVarsDesc": "For eksempel med variabelnavn \"Type\" og værdi \"Kunde\".",
         "JSTracking_EndNote": "Bemærk: Du kan generere en tilpasset sporingskode i %1$sSporingskode%2$s administrationssektionen.",
+        "JSTrackingIntro1": "Du kan spore besøgende til hjemmesiden på mange forskellige måder. Den anbefalede måde at gøre det på er vha. JavaScript. For at bruge denne metode, skal du sørge for alle sider på hjemmesiden har noget JavaScript-kode, som du kan generere her.",
         "JSTrackingIntro2": "Når du har JavaScript sporingskoden til hjemmesiden, kopier og indsæt den på alle de sider, der skal spores med Matomo.",
+        "JSTrackingIntro3a": "De fleste hjemmesider, blogs, CMS, mv. kan bruge et foruddefineret modul til at gøre det tekniske arbejde for dig. (Se vores %1$s liste med moduler, der kan bruges til at integrere matomo%2$s.)",
+        "JSTrackingIntro3b": "Hvis der ikke findes et modul, kan du redigere dit websites skabelon og tilføje Javascript tracking koden til &lt;\/head&gt; taggen som ofte er defineret i en 'header.php', 'header.tlp' eller tilsvarende skabelonfil.",
         "JSTrackingIntro4": "Hvis du ikke ønsker at bruge JavaScript til at spore besøgende,%1$sgenerere et billed sporingslink herunder%2$s.",
         "JSTrackingIntro5": "Hvis du vil gøre mere end at spore sidevisninger, kan du tjekke %1$sMatomo Javascript sporingsdokumentation%2$s for listen over tilgængelige funktioner. Ved hjælp af disse funktioner kan du spore mål, brugerdefinerede variabler, e-handelsordrer, afbrudte ordrer og meget mere.",
         "LogoNotWriteableInstruction": "Hvis du vil bruge din brugerdefinerede logo i stedet for standard Matomo logoet, giver skriverettigheder til denne mappe: %1$s Matomo brug skriveadgang til dine logoer gemt i filer %2$s.",
@@ -63,6 +73,7 @@
         "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\"-indstilling i dine browserindstillinger.",
         "OptOutExplanation": "Matomo er dedikeret til at værne om personlige oplysninger på internettet. For at give dine besøgende valgmulighed for at framelde Matomo Web Analyse, kan du tilføje den følgende HTML-kode på en af dine hjemmesider, f. eks. på en fortrolighedspolitik side.",
+        "OptOutExplanationIntro": "Koden vil vise en Iframe, der indeholder et link til dine besøgende til at framelde Matomo ved at sætte en opt out-cookie i browseren. Se herunder (eller %1$sKlik her%2$s) for at få vist indholdet af iFramen.",
         "OptOutForYourVisitors": "Matomo opt-out for dine besøgende",
         "PiwikIsInstalledAt": "Matomo er installeret på",
         "PersonalPluginSettings": "Personlige indstillinger for udvidelsesmoduler",
@@ -91,16 +102,37 @@
         "ValidPiwikHostname": "Gyldigt Matomo værtsnavn",
         "WithOptionalRevenue": "med valgfri indtægter",
         "YouAreOptedOut": "Du har fravalgt cookies til webanalyse.",
+        "YouAreNotOptedOut": "Du har nu fravalgt cookies.",
         "YouMayOptOut": "Når du besøger websitet bliver du tildelt et unikt identifikationsnummer, som er placeret i en cookie på din computer, og som bruges til at analysere, hvor mange, der besøger websitet, hvilke sider, der bliver set og lignende.",
         "YouMayOptOutBis": "Du har mulighed for at fravælge, at denne cookie placeres på din enhed.",
         "OptingYouOut": "Vælger dig fra, vent venligst...",
         "ProtocolNotDetectedCorrectly": "Du benhytter i øjeblikket Matomo over en sikker SSL-forbindelse (via HTTPS), men Matomo kunne kun detektere en ikke-sikker forbindelse på serveren.",
         "ProtocolNotDetectedCorrectlySolution": "For at sikre at Matomo behandler anmodninger og dit indhold over HTTPS, skal du måske redigere din %1$s fil og enten konfigurere dine proxy indstillinger, eller du kan tilføje linjen %2$s under sektionen %3$s. %4$sLæs mere%5$s",
+        "YouMayOptOut2": "Du har mulighed for at vælge at dette website ikke sammenlægger eller analyserer de handlinger du foretager her.",
+        "YouMayOptOut3": "Hvis du gør det, beskytter du dit privatliv, men du forhindrer også ejeren af websitet fra at lære af dine handlinger, og dermed blive i stand til at forbedre brugeroplevelsen for dig og andre brugere.",
+        "UncheckToOptOut": "Fjern markering for at fravælge.",
+        "CheckToOptIn": "Sæt markering for at vælge.",
+        "MissingTrackingCodeEmailSubject": "Ingen trafik for %s er registreret i Matomo Analytics. Kom i gang nu",
+        "JsTrackingCodeMissingEmail1": "For få dage siden tilføjede du websitet '%s' til din Matomo Analytics. Vi tjekkede lige og det ser ikke ud til at din Matomo registrerer nogen trafik fra dette website.",
+        "JsTrackingCodeMissingEmail2": "For at påbegynde tracking og få indsigt i dine brugere, er det nødvendigt at tilslutte tracking til dit website eller mobil-app. For websites skal du blot tilføje trackingkoden lige før %s-taggen.",
+        "JsTrackingCodeMissingEmail3": "For at finde og tilpasse din trackingkode, skal du %1$s klikke her %2$s (eller kigge nærmere på %3$s JavaScript Tracking Client guide %4$s).",
+        "TrackingFailuresIntroduction": "Denne side vider trackingfejl som opstod de sidste %s dage. Vær venligst opmærksom på, at kun de mest almindelige former for trackingfejl er registreret og ikke dem alle.",
         "NoKnownFailures": "Der er ikke kendte sporingsfejl.",
+        "Problem": "Problem",
+        "Solution": "Løsning",
+        "TrackingURL": "Tracking URL",
         "LearnMore": "Læs mere",
+        "DeleteAllFailures": "Slet alle fejl",
         "NTrackingFailures": "%s sporingsfejl",
         "ViewAllTrackingFailures": "Vis alle sporingsfejl",
+        "TrackingFailureInvalidSiteProblem": "Sitet eksisterer ikke.",
+        "TrackingFailureInvalidSiteSolution": "Opdatér det konfigurerede idSite i trackeren.",
+        "TrackingFailureAuthenticationProblem": "Forespørgsel var ikke autentificeret, men autentifikation var krævet.",
+        "TrackingFailureAuthenticationSolution": "Sæt eller ret et \"token_auth\" i din tracking-forespørgsel.",
         "ConfirmDeleteAllTrackingFailures": "Er du sikker på, at du vil slette alle sporingsfejl?",
-        "TrackingFailuresEmail1": "Dette er blot for at fortælle dig, at der i de seneste dage har optrådt %s forskellige sporingsfejl."
+        "ConfirmDeleteThisTrackingFailure": "Er du sikker på, at du vil slette denne sporingsfejl?",
+        "TrackingFailuresEmailSubject": "Trackingfejl i din Matomo Analytics",
+        "TrackingFailuresEmail1": "Dette er blot for at fortælle dig, at der i de seneste dage har optrådt %s forskellige sporingsfejl.",
+        "TrackingFailuresEmail2": "For at se alle fejlede tracking-forespørgsler, %1$s klik her %2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/de.json b/app/plugins/CoreAdminHome/lang/de.json
index 216bef9f5..d0696dd2a 100644
--- a/app/plugins/CoreAdminHome/lang/de.json
+++ b/app/plugins/CoreAdminHome/lang/de.json
@@ -4,6 +4,7 @@
         "Administration": "Administration",
         "ArchivingSettings": "Archivierungseinstellungen",
         "BrandingSettings": "Branding Einstellungen",
+        "ErrorEmailFromAddressNotValid": "Die SMTP Von-Adresse ist ungültig",
         "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.",
@@ -29,12 +30,13 @@
         "JSTracking_CampaignKwdParam": "Kampagnen Suchbegriff Parameter",
         "JSTracking_CampaignNameParam": "Parameter für Kampagnenname",
         "JSTracking_CodeNoteBeforeClosingHead": "Stellen Sie sicher, dass sich dieser Code auf jeder Seite Ihrer Webseite befindet. Wir empfehlen, ihn direkt vor dem schließenden %1$s Tag zu positionieren.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Stelen Sie sicher, dass dieser Code innerhalb eines Skript-Elementes auf jeder Seite Ihrer Webseite enthalten ist. Wir empfehlen den Code direkt vor dem schließenden Head-Tag einzubauen.",
         "JSTracking_CustomCampaignQueryParam": "Eigene Anfrage-Parameter für Kampagnen Name & Suchbegriff verwenden",
-        "JSTracking_CrossDomain": "Standardmäßig wird die Besucher-ID, welche einen eindeutigen Besucher identifiziert, in den Cookies des Browsers, auf welche nur von einer einzelnen Domain zugegriffen werden kann, gespeichert. Wenn Sie Domainübergreifendes Tracking aktivieren, können Sie alle Aktionen und Seitenaufrufe eines bestimmten Besuchers in demselben Besuch verfolgen, auch wenn sie Seiten auf mehreren Domänen anzeigen. Wenn ein Benutzer auf einen Link zu einer der Alias-URL Ihrer Website klickt, wird automatisch der URL-Parameter pk_vid angefügt, der die Besucher-ID an die neue Domain übergibt.",
+        "JSTracking_CrossDomain": "Standardmäßig wird die Besucher-ID, welche einen eindeutigen Besucher identifiziert, in den Cookies des Browsers, auf welche nur von einer einzelnen Domain zugegriffen werden kann, gespeichert. Wenn Sie Domainübergreifendes Tracking aktivieren, können Sie alle Aktionen und Seitenaufrufe eines bestimmten Besuchers in demselben Besuch verfolgen, auch wenn sie Seiten auf mehreren Domänen anzeigen. Wenn ein Benutzer auf einen Link zu einer der Alias-URL Ihrer Webseite klickt, wird automatisch der URL-Parameter pk_vid angefügt, der die Besucher-ID an die neue Domain übergibt.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Hinweis: Um Cross Domain Linking zu unterstützen, müssen Sie mehr als einen Domainnamen (URLs) für Ihre Webseite definieren.",
         "JSTracking_CustomCampaignQueryParamDesc": "Hinweis: %1$sMatomo erkennt Parameter von Google Analytics automatisch.%2$s",
         "JSTracking_DisableCookies": "Alle Tracking Cookies deaktivieren",
-        "JSTracking_DisableCookiesDesc": "Deaktiviert alle First-Party Cookies. Bestehende Matomo Cookies für diese Website werden beim nächsten Seitenaufruf gelöscht.",
+        "JSTracking_DisableCookiesDesc": "Deaktiviert alle First-Party Cookies. Bestehende Matomo Cookies für diese Webseite werden beim nächsten Seitenaufruf gelöscht.",
         "JSTracking_EnableCrossDomainLinking": "Domainübergreifendes Tracking aktivieren",
         "JSTracking_EnableDoNotTrack": "Clientseitige Do-Not-Track Erkennung aktivieren",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Hinweis: Diese Einstellung hat keine Auswirkung, da die Do-Not-Track Unterstützung serverseitig aktiviert ist.",
@@ -52,14 +54,15 @@
         "JSTracking_VisitorCustomVarsDesc": "Zum Beispiel mit dem Variablennamen \"Typ\" und dem Wert \"Kunde\".",
         "JSTracking_EndNote": "Hinweis: Sie können sich einen angepassten Tracking Code unter Einstellungen > %1$sTracking Code%2$s erzeugen.",
         "JSTrackingIntro1": "Es gibt viele verschiedene Möglichkeiten, Besucher Ihrer Webseite zu tracken. Die empfohlene Art und Weise dies zu tun, ist die Verwendung von JavaScript. Um diese Methode zu nutzen müssen Sie sicher stellen, dass auf jeder Seite Ihrer Webseite der entsprechende JavaScript-Code eingebunden ist. Diesen können Sie hier generieren.",
-        "JSTrackingIntro2": "Sobald Sie den JavaScript Tracking Code für Ihre Website haben, fügen Sie ihn auf allen Seiten ein, die Sie mit Matomo überwachen möchten.",
-        "JSTrackingIntro3b": "Bei den meisten Webseiten, Blogs und CMS, etc. können Sie ein existierendes Plugin benutzen, das Ihnen die technische Arbeit abnimmt. (Schauen Sie hierzu in die %1$sListe der Plugins um Matomo zu integrieren%2$s.) Falls kein passendes Plugin besteht können Sie die Templates Ihrer Webseite bearbeiten und diesen Quellcode in den &lt;\/head&gt;-Tag einfügen. Dieser ist häufig in einer 'header.php' oder header.tpl' oder ähnlich benannten Template-Datei definiert.",
+        "JSTrackingIntro2": "Sobald Sie den JavaScript Tracking Code für Ihre Webseite haben, fügen Sie ihn auf allen Seiten ein, die Sie mit Matomo überwachen möchten.",
+        "JSTrackingIntro3a": "Für die meisten Webseiten, Blogs, CMS usw. können Sie ein Plugin verwenden, das die Implementierung für Sie erledigt. (Siehe unsere %1$sListe der zur Integration von Matomo vorhandenen Plugins%2$s.)",
+        "JSTrackingIntro3b": "Wenn kein Plugin vorhanden ist, können Sie Ihre Webseiten-Vorlagen bearbeiten und den JavaScript-Tracking-Code zum &lt;\/head&gt; tag hinzufügen, der häufig in einer 'header.php', 'header.tpl' oder ähnlichen Vorlagendatei definiert ist.",
         "JSTrackingIntro4": "Falls Sie kein JavaScript nutzen möchten um Ihre Besucher zu tracken, %1$sgenerieren Sie einen Link zum Tracking mit Hilfe eines Bildes unterhalb.%2$s",
         "JSTrackingIntro5": "Sollte Sie mehr als nur Seitenaufrufe aufzeichnen wollen, werfen Sie einen Blick in die %1$sMatomo 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 Matomo Logos verwenden zu können werden Schreibrechte auf diesen Ordner benötigt: %1$s Matomo 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",
+        "LogoUpload": "Wählen Sie ein Logo für den Upload aus",
         "FaviconUpload": "Wählen Sie ein Favicon für den Upload aus",
         "LogoUploadHelp": "Bitte laden Sie eine Datei in den Formaten %1$s mit einer minimalen Höhe von %2$s Pixeln hoch.",
         "MenuDiagnostic": "Diagnose",
@@ -67,10 +70,10 @@
         "MenuSystem": "System",
         "MenuDevelopment": "Entwicklung",
         "MenuMeasurables": "Messgrößen",
-        "OptOutComplete": "Deaktivierung durchgeführt! Ihre Besuche auf dieser Website werden von der Webanalyse nicht mehr erfasst.",
-        "OptOutCompleteBis": "Bitte beachten Sie, dass auch der Matomo-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.",
+        "OptOutComplete": "Deaktivierung durchgeführt! Ihre Besuche auf dieser Webseite werden von der Webanalyse nicht mehr erfasst.",
+        "OptOutCompleteBis": "Bitte beachten Sie, dass auch der Matomo-Deaktivierungs-Cookie dieser Webseite 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": "Matomo 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 Matomo zu entscheiden.",
+        "OptOutExplanation": "Matomo ist es wichtig, die Privatsphäre Ihrer Besucher zu wahren. Fügen Sie den folgenden HTML-Code auf einer Seite Ihrer Webseite (z.B der Datenschutz-Seite) ein, um den Besuchern Ihrer Webseite die Möglichkeit zu geben, sich gegen eine Erfassung ihres Besuches durch Matomo zu entscheiden.",
         "OptOutExplanationIntro": "Dieser Code erzeugt ein Iframe und enthält einen Link, über den ein Cookie im Browser Ihrer Besucher abgelegt wird, womit die Erfassung durch Matomo deaktiviert wird. %1$s Klicken Sie hier%2$s, um eine Vorschau auf den Inhalt zu bekommen, der den Besuchern in dem Iframe angezeigt wird.",
         "OptOutForYourVisitors": "Matomo-Deaktivierung für Ihre Besucher",
         "PiwikIsInstalledAt": "Matomo ist installiert unter",
@@ -91,7 +94,7 @@
         "SystemPluginSettings": "Globale Plugin Einstellungen",
         "TrackAGoal": "Ein Ziel aufzeichnen",
         "TrackingCode": "Tracking-Code",
-        "TrackingCodeIntro": "Matomo bietet Ihnen verschiedene Möglichkeiten, den Tracking-Code für Ihre Website, Ihre Mobile-App und sogar für jedes Gerät oder jede Anwendung einzubetten.",
+        "TrackingCodeIntro": "Matomo bietet Ihnen verschiedene Möglichkeiten, den Tracking-Code für Ihre Webseite, Ihre Mobile-App und sogar für jedes Gerät oder jede Anwendung einzubetten.",
         "TrustedHostConfirm": "Wollen Sie wirklich den Vertrauten Matomo Hostnamen ändern?",
         "TrustedHostSettings": "Vertrauter Matomo Hostname",
         "UiDemo": "Oberflächen Demo",
@@ -99,9 +102,9 @@
         "UseCustomLogo": "Eigenes Logo verwenden",
         "ValidPiwikHostname": "Gültiger Matomo Hostname",
         "WithOptionalRevenue": "mit optionalen Einnahmen",
-        "YouAreOptedOut": "Ihr Besuch dieser Website wird aktuell von der Matomo Webanalyse nicht erfasst.",
-        "YouAreNotOptedOut": "Ihr Besuch dieser Website wird aktuell von der Matomo Webanalyse 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.",
+        "YouAreOptedOut": "Ihr Besuch dieser Webseite wird aktuell von der Matomo Webanalyse nicht erfasst.",
+        "YouAreNotOptedOut": "Ihr Besuch dieser Webseite wird aktuell von der Matomo Webanalyse erfasst.",
+        "YouMayOptOut": "Sie können sich hier entscheiden, ob in Ihrem Browser ein eindeutiger Webanalyse-Cookie abgelegt werden darf, um dem Betreiber der Webseite die Erfassung und Analyse verschiedener statistischer Daten zu ermöglichen.",
         "YouMayOptOutBis": "Wenn Sie sich dagegen entscheiden möchten, entfernen Sie den folgenden Haken, um den Matomo-Deaktivierungs-Cookie in Ihrem Browser abzulegen.",
         "OptingYouOut": "Deaktivierung wird durchgeführt, bitte warten...",
         "ProtocolNotDetectedCorrectly": "Sie betrachten Matomo konnte auf dem Server nur eine nicht sichere Verbindung feststellen.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Sind Sie sicher, dass Sie diesen Tracking Fehlschlag löschen wollen?",
         "TrackingFailuresEmailSubject": "Fehlschläge in Ihrem Matomo Analytics tracken",
         "TrackingFailuresEmail1": "Dies ist nur um Sie wissen zu lassen, dass in den letzten Tagen %s verschiedene Arten von Tracking Fehlschlägen aufgetreten sind.",
-        "TrackingFailuresEmail2": "%1$sHier klicken%2$s, um alle Tracking Fehlschläge anzuzeigen."
+        "TrackingFailuresEmail2": "%1$sHier klicken%2$s, um alle Tracking Fehlschläge anzuzeigen.",
+        "ImportFromGoogleAnalytics": "Von Google Analytics importieren",
+        "ImportFromGoogleAnalyticsDescription": "Wenn Sie über ein Google Analytics-Konto verfügen und zu Matomo wechseln, können Sie Ihre vorhandenen Daten mithilfe des %1$sGoogleAnalyticsImporter-Plugins%2$s importieren."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/el.json b/app/plugins/CoreAdminHome/lang/el.json
index d13869631..81033de88 100644
--- a/app/plugins/CoreAdminHome/lang/el.json
+++ b/app/plugins/CoreAdminHome/lang/el.json
@@ -4,6 +4,7 @@
         "Administration": "Διαχείριση",
         "ArchivingSettings": "Ρυθμίσεις αρχειοθέτησης",
         "BrandingSettings": "Εταιρικές ρυθμίσεις",
+        "ErrorEmailFromAddressNotValid": "Η διεύθυνση από στο SMTP δεν είναι έγκυρη",
         "ReleaseChannel": "Κανάλι εκδόσεων",
         "ClickHereToOptIn": "Πατήστε εδώ για να καταγράφεστε",
         "ClickHereToOptOut": "Πατήστε εδώ για να μην καταγράφεστε",
@@ -29,6 +30,7 @@
         "JSTracking_CampaignKwdParam": "Παράμετρος Κλειδιού Καμπάνιας",
         "JSTracking_CampaignNameParam": "Παράμετρος Όνομα Καμπάνιας",
         "JSTracking_CodeNoteBeforeClosingHead": "Βεβαιωθείτε ότι ο κώδικας υπάρχει σε κάθε σελίδα στον ιστοτόπο σας. Προτείνουμε να τον επικολλήσετε ακριβώς πριν τη σήμανση κλεισίματος %1$s.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Βεβαιωθείτε ότι ο κώδικας είναι ενσωματωμένος σε ένα στοιχείο τύπου script σε κάθε σελίδα στον ιστοτόπο σας. Προτείνουμε να επικολληθεί αμέσως μετά το κλείσιμο της σήμανσης head.",
         "JSTracking_CustomCampaignQueryParam": "Χρήση προσαρμοσμένων ονομάτων παραμέτρων αναζητήσεων για το όνομα της καμπάνιας και τις λέξεις-κλειδιά",
         "JSTracking_CrossDomain": "Εξ ορισμού, το αναγνωριστικό επισκέπτη, που ταυτοποιεί μοναδικά έναν επισκέπτη, αποθηκεύεται στα cookies του προγράμματος πλοήγησης τα οποία είναι προσπελάσιμα από σελίδες από τον ίδιο τομέα ονόματος. Η ενεργοποίηση της σύνδεσης από διάφορους τομείς ονομάτων σάς επιτρέπει την παρακολούθηση των ενεργειών και αναγνώσεων σελίδων ενός συγκεκριμένου επισκέπτη, στην ίδια επίσκεψη, όταν επισκέπεται σελίδες από διάφορους τομείς ονομάτων. Όταν ένας χρήστης κάνει κλικ σε σύνδεσμο σε κάποιο alias του ιστοτόπου σας, θα συμπεριληφθεί μια παράμετρος στη διεύθυνση URL με όνομα pk_vid με το αναγνωριστικό του επισκέπτη.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Σημείωση: Για να χρησιμοποιηθούν συνδέσεις εκτός ονόματος χώρου, θα πρέπει να καθορίσετε περισσότερα από ένα ονόματα χώρου (URL) για τον ιστοτόπο σας.",
@@ -53,7 +55,8 @@
         "JSTracking_EndNote": "Σημείωση: Μπορείτε να δημιουργήσετε προσαρμοσμένο κώδικα παρακολούθησης στο τμήμα διαχείρισης του %1$sΚώδικα Παρακολούθησης%2$s.",
         "JSTrackingIntro1": "Μπορείτε να ιχνηλατείτε τους επισκέπτες στον ιστοτόπο σας με πολλούς διαφορετικούς τρόπους. Ο προτεινόμενος τρόπος είναι μέσω JavaScript. Για να χρησιμοποιήσετε αυτόν τον τρόπο βεβαιωθείτε ότι κάθε σελίδα του ιστοτόπου σας περιέχει κάποιο κώδικα JavaScript, που μπορείτε να παράξετε εδώ.",
         "JSTrackingIntro2": "Μόλις έχετε το JavaScript κώδικα παρακολούθησης για την ιστοσελίδα σας, αντιγράψετε και επικολλήστε τον σε όλες τις σελίδες που θέλετε να παρακολουθήσετε με το Matomo.",
-        "JSTrackingIntro3b": "Στους περισσότερους ιστοτόπους, ιστολόγια, CMS, κτλ. μπορείτε να χρησιμοποιήσετε ένα προ-κατασκευασμένο πρόσθετο που θα εκτελεί την τεχνική εργασία για εσάς. (Δείτε τη %1$sλίστα των πρόσθετων για ενσωμάτωση με το Matomo%2$s.) Αν δεν υπάρχει πρόσθετο μπορείτε να επεξεργαστείτε τα αρχεία προτύπου του ιστοτόπου σας και να προσθέσετε τον κώδικα στη σήμανση &lt;\/head&gt; που συχνά ορίζεται στο αρχείο 'header.php', 'header.tpl' ή παρόμοιο αρχείο προτύπου.",
+        "JSTrackingIntro3a": "Στους περισσότερους ιστοτόπους, ιστολόγια, CMS, κτλ. μπορείτε να χρησιμοποιήσετε ένα πρόσθετο που θα κάνει την τεχνική δουλειά για εσάς. (Δείτε τη %1$sλίστα των πρόσθετων που είναι για χρήση με το Matomo%2$s.)",
+        "JSTrackingIntro3b": "Αν δεν υπάρχει πρόσθετο μπορείτε να επεξεργαστείτε τα πρότυπα του ιστοτόπου σας και να προσθέσετε τον κώδικα ιχνηλάτησης στη σήμανση &lt;\/head&gt; που συχνά υπάρχει σε κάποιο αρχείο 'header.php', 'header.tpl' ή παρόμοιο αρχείο προτύπου σελίδας.",
         "JSTrackingIntro4": "Αν δεν θέλετε να χρησιμοποιήσετε JavaScript για να παρακολουθείτε τους επισκέπτες, %1$sΔημιουργήστε ένα σύνδεσμο παρακολούθησης εικόνας παρακάτω%2$s.",
         "JSTrackingIntro5": "Αν θέλετε να κάνετε περισσότερα από να παρακολουθείτε προβολές σελίδων, παρακαλώ ελέγξτε το %1$sΤεκμηρίωση Matomo για Παρακολούθηση με Javascript%2$s για να δείτε τη λίστα με τις διαθέσιμες λειτουργίες. Χρησιμοποιώντας αυτές τις λειτουργίες, μπορείτε να παρακολουθείτε τους στόχους, προσαρμοσμένες μεταβλητές, παραγγελίες ηλεκτρονικού εμπορίου, εγκαταλελειμμένα καλάθια αγορών και πολλά άλλα.",
         "LogoNotWriteableInstruction": "Για να χρησιμοποιήσετε το δικό σας λογότυπο αντί του προκαθορισμένου του Matomo πρέπει να δώσετε δικαίωμα εγγραφής σε αυτό τον κατάλογο: %1$s Το Matomo χρειάζεται πρόσβαση για εγγραφή στα λογότυπά σας που είναι αποθηκευμένα στα αρχεία %2$s.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Είστε σίγουροι για την διαγραφή αυτής της αποτυχίας παρακολούθησης;",
         "TrackingFailuresEmailSubject": "Αποτυχίες παρακολούθησης στο Matomo Analytics",
         "TrackingFailuresEmail1": "Αυτό μόνο και μόνο για να γνωρίζετε ότι %s διαφορετικά είδη αποτυχιών παρακολούθησης έχουν συμβεί τις τελευταίες ημέρες.",
-        "TrackingFailuresEmail2": "Για να δείτε όλες τις αποτυχημένες αιτήσεις παρακολούθησης %1$sκάντε κλικ εδώ%2$s."
+        "TrackingFailuresEmail2": "Για να δείτε όλες τις αποτυχημένες αιτήσεις παρακολούθησης %1$sκάντε κλικ εδώ%2$s.",
+        "ImportFromGoogleAnalytics": "Εισαγωγή από το Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Αν έχετε μια ιδιοκτησία του Google Analytics και αλλάζετε στο Matomo, μπορείτε να εισαγάγετε τα υπάρχοντα δεδομένα σας με χρήση του πρόσθετου %1$sGoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/en.json b/app/plugins/CoreAdminHome/lang/en.json
index 7e4430739..c84b970b4 100644
--- a/app/plugins/CoreAdminHome/lang/en.json
+++ b/app/plugins/CoreAdminHome/lang/en.json
@@ -4,6 +4,7 @@
         "Administration": "Administration",
         "ArchivingSettings": "Archiving settings",
         "BrandingSettings": "Branding settings",
+        "ErrorEmailFromAddressNotValid": "The SMTP from address is not valid",
         "ReleaseChannel": "Release channel",
         "ClickHereToOptIn": "Click here to opt in.",
         "ClickHereToOptOut": "Click here to opt out.",
@@ -29,6 +30,7 @@
         "JSTracking_CampaignKwdParam": "Campaign Keyword parameter",
         "JSTracking_CampaignNameParam": "Campaign Name parameter",
         "JSTracking_CodeNoteBeforeClosingHead": "Make sure this code is on every page of your website. We recommend pasting it immediately before the closing %1$s tag.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Make sure this code is embedded within a script element on every page of your website. We recommend pasting it immediately before the closing head tag.",
         "JSTracking_CustomCampaignQueryParam": "Use custom query parameter names for the campaign name & keyword",
         "JSTracking_CrossDomain": "By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies which can only be accessed by pages on the same domain. Enabling cross domain linking lets you track all the actions and pageviews of a specific visitor into the same visit even when they view pages on several domains. Whenever a user clicks on a link to one of your website's alias URLs, it will append a URL parameter pk_vid forwarding the Visitor ID.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Note: To use cross domain linking, you must specify more than one domain name (URLs) for your website.",
@@ -53,7 +55,8 @@
         "JSTracking_EndNote": "Note: You can generate a customized tracking code in the %1$sTracking Code%2$s admin section.",
         "JSTrackingIntro1": "You can track visitors to your website in many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.",
         "JSTrackingIntro2": "Once you have the JavaScript tracking code for your website, copy and paste it to all the pages you want to track with Matomo.",
-        "JSTrackingIntro3b": "In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Matomo%2$s.) If no plugin exists you can edit your website templates and add the JavaScript tracking code to the &lt;/head&gt; tag   which is often defined in a 'header.php', 'header.tpl' or similar template file.",
+        "JSTrackingIntro3a": "In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Matomo%2$s.)",
+        "JSTrackingIntro3b": "If no plugin exists you can edit your website templates and add the JavaScript tracking code to the &lt;/head&gt; tag   which is often defined in a 'header.php', 'header.tpl' or similar template file.",
         "JSTrackingIntro4": "If you don't want to use JavaScript to track visitors, %1$sgenerate an image tracking link below%2$s.",
         "JSTrackingIntro5": "If you want to do more than track page views, please check out the %1$sMatomo 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 Matomo logo, give write permission to this directory: %1$s Matomo needs write access for your logos stored in the files %2$s.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Are you sure you want to delete this tracking failure?",
         "TrackingFailuresEmailSubject": "Tracking failures in your Matomo Analytics",
         "TrackingFailuresEmail1": "This is just to let you know that %s different kinds of tracking failures have occurred in the last days.",
-        "TrackingFailuresEmail2": "To view all the failed tracking requests %1$sclick here%2$s."
+        "TrackingFailuresEmail2": "To view all the failed tracking requests %1$sclick here%2$s.",
+        "ImportFromGoogleAnalytics": "Import from Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "If you have a Google Analytics property and are switching to Matomo, you can import your existing data using the %1$sGoogleAnalyticsImporter%2$s plugin."
     }
 }
diff --git a/app/plugins/CoreAdminHome/lang/es-ar.json b/app/plugins/CoreAdminHome/lang/es-ar.json
index 8461ac712..23af9f60c 100644
--- a/app/plugins/CoreAdminHome/lang/es-ar.json
+++ b/app/plugins/CoreAdminHome/lang/es-ar.json
@@ -4,9 +4,15 @@
         "Administration": "Administración",
         "ArchivingSettings": "Configuración de archivado",
         "BrandingSettings": "Configuración de marcas y logos",
+        "ErrorEmailFromAddressNotValid": "La dirección SMTP no es válida",
         "ReleaseChannel": "Canal de lanzamiento",
         "ClickHereToOptIn": "Hacé clic acá para adherirte.",
         "ClickHereToOptOut": "Hacé clic acá para quitar adhesión.",
+        "CorsDomains": "Dominios de compartición de recursos de origen cruzados (CORS)",
+        "CorsDomainsHelp": "Podés definir dominios o subdominios como http:\/\/ejemplo.com o http:\/\/stats.ejemplo.com. O agregar solicitudes de dominios cruzados para todos los dominios, somplemente agregando un asterisco.",
+        "CustomLogoFeedbackInfo": "Si personalizás el logo de Matomo, quizá también te interese ocultar el enlace de %1$s en el menú principal. Para hacerlo, simplemente deshabilitá el plugin Feedback en la página de %2$sAdministrador de plugins%3$s.",
+        "CustomLogoHelpText": "Podés personalizar el logo de Matomo, el cual será visualizado en la interface de usuario y en los informes de correo electrónico.",
+        "DevelopmentProcess": "Mientras nuestro proceso de desarrollo incluye miles de pruebas automatizadas, los Beta Testers juegan un rol fundamental en lograr la \"Política sin errores\" de Matomo.",
         "EmailServerSettings": "Configuración del servidor de correo electrónico",
         "ForBetaTestersOnly": "Solamente para probadores de versiones beta",
         "ImageTracking": "Rastreo mediante imágenes",
@@ -19,12 +25,18 @@
         "InvalidPluginsWarning": "Los siguientes plugins no son compatibles con %1$s y pueden que no se carguen: %2$s.",
         "InvalidPluginsYouCanUninstall": "Podés actualizar o desinstalar estos plugins en la página %1$sAdministrar plugins%2$s.",
         "JavaScriptTracking": "Seguimiento vía JavaScript",
+        "HttpTrackingApi": "API de rastreo HTTP",
+        "HttpTrackingApiDescription": "La %1$sAPI de rastreo HTTP%2$s te permite rastrear todo. Esto puede resultar útil si estás programando un lenguaje para el cual todavía no existe un SDK. También podría ser útil cuando querés rastrear ciertos dispositivos o aplicaciones en particular.",
         "JSTracking_CampaignKwdParam": "Parámetro de palabra clave por campaña",
         "JSTracking_CampaignNameParam": "Parámetro de nombre de campaña",
+        "JSTracking_CodeNoteBeforeClosingHead": "Asegurate de que este código esté en cada página de tu sitio web. Te recomendamos pegarlo inmediatamente antes de la etiqueta de cierre de %1$s.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Asegurate de que este código esté en cada página de tu sitio web. Te recomendamos pegarlo inmediatamente antes de la etiqueta de cierre del encabezado.",
         "JSTracking_CustomCampaignQueryParam": "Usá nombres de parámetros de consultas personalizadas, tanto para el nombre como para la palabra clave",
         "JSTracking_CrossDomain": "Predeterminadamente, el identificador del visitante que registra a un visitante único se almacena en la cookie propia en el navegador, la cual sólo se puede acceder por páginas del mismo dominio. Habilitar enlaces de dominio cruzado te permite hacer un seguimiento de todas las acciones y vistas de página de un visitante específico en la misma visita, incluso cuando visita páginas de diferentes dominios. Cuando un usuario hace clic en una de las direcciones web alias de tu sitio, obtendrá un parámetro \"pk_vid\" en la dirección, seguido de la identificación del visitante.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Nota: para usar enlace de dominio cruzado, tenés que especificar más de un nombre de dominio (dirección web) para tu sitio web.",
+        "JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sMatomo detectará automáticamente los parámetros de Google Analytics.%2$s",
         "JSTracking_DisableCookies": "Deshabilitar todas las cookies de rastreo",
+        "JSTracking_DisableCookiesDesc": "Deshabilita todas las cookies propias. Las cookies existentes de Matomo para este sitio web serán eliminadas en la vista de la próxima página.",
         "JSTracking_EnableCrossDomainLinking": "Habilita los enlaces de dominio cruzado",
         "JSTracking_EnableDoNotTrack": "Habilitar detección de DoNotTrack en el lado del cliente",
         "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Nota: el soporte para DoNotTrack en el lado del servidor fue activado, por lo que esta opción no tendrá ningún efecto.",
@@ -41,7 +53,13 @@
         "JSTracking_VisitorCustomVars": "Rastrear variables personalizadas para este visitante",
         "JSTracking_VisitorCustomVarsDesc": "Por ejemplo, con el nombre de variable \"Tipo\" y el valor \"Cliente\".",
         "JSTracking_EndNote": "Nota: podés generar un código de rastreo personalizado en la sección de administración del %1$s código de rastreo %2$s.",
+        "JSTrackingIntro1": "Podés rastrear a los visitantes de tu sitio web de diferentes maneras. Lo más recomendado es hacerlo a través de JavaScript. Para usar este método, tenés que asegurarte de que cada página de tu sitio web tiene código JavaScript, el cual podés generar acá.",
+        "JSTrackingIntro2": "Una vez que tengás el código de rastreo de JavaScript para tu sitio web, copialo y pegalo en todas las páginas en las que querés rastrear con Matomo.",
+        "JSTrackingIntro3a": "En la mayoría de los sitios web, blogs, foros, etc, podés usar un plugin prediseñado para hacer el trabajo técnico por vos. (Mirá nuestra %1$slista de plugins usados para integrar Matomo%2$s.)",
+        "JSTrackingIntro3b": "Si no existe ningún plugin, podés editar las plantillas de tu sitio web y agregar el código de seguimiento de JavaScript a la etiqueta &lt;\/head&gt;, la cual está definida habitualmente en un archivo de plantilla \"headed.php\", \"header.tpl\", o similar.",
         "JSTrackingIntro4": "Si no querés usar JavaScript para rastrear visitantes, %1$sgenerá un enlace de imagen de rastreo, abajo%2$s.",
+        "JSTrackingIntro5": "Si querés hacer más cosas que rastrear las visualizaciones de lás páginas, por favor, revisá la %1$sdocumentación de rastreo de JavaScript de Matomo%2$s para ver la lista de funciones disponibles. Con estas funciones podés rastrear metas, variables personalizadas, órdenes de comercio electrónicos, changuitos abandonados y más.",
+        "LogoNotWriteableInstruction": "Para usar tu logo personalizado en lugar del logo predeterminado de Matomo, dale permiso de escritura a este directorio: %1$sMatomo necesita el acceso de escritura a tus logos guardados en los archivos %2$s.",
         "FileUploadDisabled": "No está habilitada la subida de archivos en tu configuración PHP. Para subir un logo personalizado, por favor, establecé %s en php.ini, y reiniciá tu servidor web.",
         "LogoUploadFailed": "No se pudo procesar el archivo subido. Por favor, revisá si el archivo tiene un formato válido.",
         "LogoUpload": "Seleccioná un logo para subir",
@@ -55,6 +73,10 @@
         "OptOutComplete": "Quitado de adhesión completo; tus visitas a este sitio web no serán registradas por la herramienta de análisis web.",
         "OptOutCompleteBis": "Tené en cuenta que si eliminás tus cookies, eliminás la cookie de quitado de adhesión, o si cambiás de computadora o navegador web, deberás realizar el proceso de quitado de adhesión nuevamente.",
         "OptOutDntFound": "No estás siendo rastreado, ya que tu navegador web está informando que no querés que suceda esto. Esto es una configuración de tu navegador, por lo tanto no vas a poder adherirte hasta que no deshabilités la función \"Do Not Track\" \/ \"DNT\" \/ \"Rastreo\".",
+        "OptOutExplanation": "Matomo está comprometida a ofrecer privacidad en Internet. Para proveer a tus visitantes la opción de no recolectar sus datos de navegación con las herramientas de análisis web de Matomo, podés agregar el siguiente código HTML en alguna página de tu sitio web, como por ejemplo la página de \"Política de privacidad\".",
+        "OptOutExplanationIntro": "Este código mostrará un iFrame conteniendo un enlace para que tus visitantes puedan dejar de ser rastreados por Matomo, estableciendo una cookie de no seguimiento en sus navegadores web. Mirá abajo (o %1$shacé clic acá%2$s) para ver el contenido que será mostrado por el iFrame.",
+        "OptOutForYourVisitors": "No seguimiento de Matomo para tus visitantes",
+        "PiwikIsInstalledAt": "Matomo está instalado en",
         "PersonalPluginSettings": "Configuración de plugins personales",
         "PluginSettingChangeNotAllowed": "No estás permitido de cambiar el valor de la configuración \"%1$s\" en el plugin \"%2$s\"",
         "PluginSettingReadNotAllowed": "No tenés permisos para cambiar el valor de la configuración \"%1$s\" en el plugin \"%2$s\"",
@@ -63,19 +85,57 @@
         "PluginSettingsValueNotAllowed": "No está permitido el valor para el campo \"%1$s\" en el plugin \"%2$s\"",
         "PluginSettingsSaveFailed": "Ocurrió un error al guardar la configuración del plugin",
         "PluginSettingsSaveSuccess": "Se actualizó la configuración del plugin.",
+        "TrackingFailures": "Fallas de rastreo",
         "SettingsSaveSuccess": "Configuración actualizada.",
         "SendPluginUpdateCommunication": "Enviar un correo electrónico cuando haya disponible una actualización del plugin",
         "SendPluginUpdateCommunicationHelp": "Se enviará un correo electrónico a los súperusuarios cuando haya una nueva versión disponible del plugin.",
+        "StableReleases": "Si Matomo es parte fundamental de tu modelo de negocios, entonces te recomendamos que usés la última versión estable. Si usás la última versión beta y encontrás algún error o tenés alguna sugerencia, por favor, %1$smirá esto%2$s.",
         "LtsReleases": "Las versiones LTS (soporte a largo plazo) reciben sólo actualizaciones de seguridad y correcciones de fallos.",
         "SystemPluginSettings": "Configuración de plugin de sistema",
         "TrackAGoal": "Rastreá una meta",
         "TrackingCode": "Código de rastreo",
+        "TrackingCodeIntro": "Matomo te ofrece varias formas de insertar el código de rastreo para tu sitio web, aplicación móvil e incluso cualquier dispositivo o aplicación.",
+        "TrustedHostConfirm": "¿Estás seguro que querés cambiar el nombre de dominio (\"hostname\") de confianza de Matomo?",
+        "TrustedHostSettings": "Nombre de dominio de confianza de Matomo",
+        "UiDemo": "Demo de interface gráfica",
         "UpdateSettings": "Configuración de actualización",
         "UseCustomLogo": "Usar un logo personalizado",
+        "ValidPiwikHostname": "Nombre de dominio válido de Matomo",
         "WithOptionalRevenue": "con una facturación opcional",
         "YouAreOptedOut": "Actualmente no estás siendo rastrado.",
+        "YouAreNotOptedOut": "No estás excluido del seguimiento.",
         "YouMayOptOut": "Podés elegir no tener un único número de identificación de la cookie de análisis web asignada a tu computadora para prevenir la agregación y el análisis de datos recolectados en este sitio web.",
         "YouMayOptOutBis": "Para elegir esto, por favor, hacé clic debajo para recibir una cookie para no adherirte a ser rastreado.",
-        "OptingYouOut": "Quitando adhesión. Por favor, esperá"
+        "OptingYouOut": "Quitando adhesión. Por favor, esperá",
+        "ProtocolNotDetectedCorrectly": "Actualmente estás viendo Matomo sobre una conexión SSL segura (usando HTTPS), pero Matomo podría no detectar una conexión no segura en el servidor.",
+        "ProtocolNotDetectedCorrectlySolution": "Para asegurarte de que Matomo solicita y ofrece tu contenido de forma segura sobre HTTPS, podés editar tu archivo %1$s y, o bien configurar tu proxy, o bien agregar la línea %2$s debajo de la sección %3$s. %4$sAprendé más%5$s",
+        "YouMayOptOut2": "Podés evitar que este sitio web agregue y analice las acciones que hagás acá.",
+        "YouMayOptOut3": "Al hacerlo protegerás tu privacidad, pero también evitarás que el propietario conozca tus acciones y cree una mejor experiencia para vos y para otros usuarios.",
+        "UncheckToOptOut": "No seleccionés esta casilla para excluirte.",
+        "CheckToOptIn": "Seleccioná esta casilla para incluirte.",
+        "MissingTrackingCodeEmailSubject": "No hay registro de tráfico para %s en Matomo Analytics; comenzá ahora",
+        "JsTrackingCodeMissingEmail1": "Hace unos días agregaste el sitio web \"%s\" a tu cuenta de Matomo Analytics. Recién revisamos y Matomo no parece tener registros de tráfico para este sitio web.",
+        "JsTrackingCodeMissingEmail2": "Para comenzar a rastrear datos y entender a tus usuarios, necesitás configurar el rastreo en tu sitio web o aplicación móvil. Para el caso de los sitios web, simplemente insertá el código de rastreo justo antes de la etiqueta %s.",
+        "JsTrackingCodeMissingEmail3": "Para encontrar y personalizar tu código de rastreo, %1$shacé clic acá%2$s (o mirá la %3$sguía de cliente de rastreo de JavaScript%4$s).",
+        "TrackingFailuresIntroduction": "Esta página lista los fallos de rastreo que han ocurrido en los últimos %s días. Por favor, tené en cuenta sólo se registran las clases de fallos más comunes y no todos ellos.",
+        "NoKnownFailures": "No hay fallos conocidos de rastreo.",
+        "Problem": "Problema",
+        "Solution": "Solución",
+        "TrackingURL": "Dirección web de rastreo",
+        "LearnMore": "Aprendé más",
+        "DeleteAllFailures": "Eliminar todas las fallas",
+        "NTrackingFailures": "%s fallas de rastreo",
+        "ViewAllTrackingFailures": "Ver todas las fallas de rastreo",
+        "TrackingFailureInvalidSiteProblem": "El sitio no existe.",
+        "TrackingFailureInvalidSiteSolution": "Actualizá el idSite configurado en el rastreador.",
+        "TrackingFailureAuthenticationProblem": "La solicitud no fue autenticada, pero se requería autenticación.",
+        "TrackingFailureAuthenticationSolution": "Establecé o corregí la \"token_auth\" en tu solicitud de rastreo.",
+        "ConfirmDeleteAllTrackingFailures": "¿Estás seguro que querés eliminar todas las fallas de rastreo?",
+        "ConfirmDeleteThisTrackingFailure": "¿Estás seguro que querés eliminar esta falla de rastreo?",
+        "TrackingFailuresEmailSubject": "Fallas de rastreo en tu cuenta de Matomo Analytics",
+        "TrackingFailuresEmail1": "Esto es sólo para hacerte saber que %s diferentes tipos de fallos de rastreo han ocurrido en los últimos días.",
+        "TrackingFailuresEmail2": "Para ver todas las solicitudes de rastreo que fallaron, %1$shacé clic acá%2$s.",
+        "ImportFromGoogleAnalytics": "Importar desde Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Si tenés datos existentes en Google Analytics y te estás cambiando a Matomo, podés exportar esos datos usando el plugin %1$sGoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/es.json b/app/plugins/CoreAdminHome/lang/es.json
index d59ec9e48..654e4cdba 100644
--- a/app/plugins/CoreAdminHome/lang/es.json
+++ b/app/plugins/CoreAdminHome/lang/es.json
@@ -53,7 +53,6 @@
         "JSTracking_EndNote": "Nota: Puedes generar un código de seguimiento personalizado en la sección %1$sCódigo de seguimiento%2$s",
         "JSTrackingIntro1": "Puedes rastrear visitantes hacia su sitio web de muchas maneras. La forma recomendada de hacerlo es con JavaScript. Para usar este método solo debe asegurarse de que cada página de su sitio de internet tenga cierto código JavaScript, el cual puede generar aquí.",
         "JSTrackingIntro2": "Una vez que tenga el código de seguimiento JavaScript para su sitio web, cópielo y péguelo en todas las páginas que desee rastrear con Matomo.",
-        "JSTrackingIntro3b": "En la mayoría de los sitios web, blogs, CMS, etc., puede utilizar un complemento prefabricado para hacer el trabajo técnico por usted. (Consulte nuestra %1$slista de complementos utilizados para integrar Matomo%2$s). Si no existe ningún complemento, puede editar las plantillas de su sitio web y agregar el código de seguimiento de JavaScript a la etiqueta &lt;\/head&gt; que a menudo se encuentra en 'header.php', 'header.tpl' o un archivo de plantilla similar.",
         "JSTrackingIntro4": "Si no desea utilizar JavaScript para rastrear visitantes, %1$sgenere un enlace de imagen de rastreo%2$s.",
         "JSTrackingIntro5": "Si desea hacer más que rastrear vistas de páginas, revise la %1$sDocumentación de Javascript de Matomo%2$s acerca de las funciones disponibles. Estas puede rastrear objetivos, variables personalizadas, órdenes de comercio electrónico, carritos abandonados y más.",
         "LogoNotWriteableInstruction": "Para utilizar su logo personalizado en lugar del logo estándar de Matomo puede conceder permisos de escritura a este directorio: %1$s Matomo necesita el permiso de escritura para sus logos guardados en los archivos %2$s.",
diff --git a/app/plugins/CoreAdminHome/lang/fi.json b/app/plugins/CoreAdminHome/lang/fi.json
index 2e65807ac..ee135af52 100644
--- a/app/plugins/CoreAdminHome/lang/fi.json
+++ b/app/plugins/CoreAdminHome/lang/fi.json
@@ -4,6 +4,7 @@
         "Administration": "Ylläpito",
         "ArchivingSettings": "Arkistointiasetukset",
         "BrandingSettings": "Käyttöliittymän muokkaaminen",
+        "ErrorEmailFromAddressNotValid": "SMTP:n From-osoite ei ole kelvollinen",
         "ReleaseChannel": "Julkaisukanava",
         "ClickHereToOptIn": "Klikkaa tästä, jos haluat mukaan seurantaan.",
         "ClickHereToOptOut": "Klikkaa tästä poistuaksesi seurannasta.",
@@ -103,6 +104,10 @@
         "YouMayOptOut": "Jos haluat, voit estää yksilöllisen tunnisteen tallentamisen tietokoneellesi, ja samalla estää tämän sivun analytiikan osaltasi.",
         "YouMayOptOutBis": "Tee valinta klikkaamalla alla olevaa linkkiä.",
         "OptingYouOut": "Seurantasi estetään, hetkinen...",
+        "YouMayOptOut2": "Voit päättää, ettet halua sinua ja tekemiäsi seurattavan tällä sivustolla.",
+        "YouMayOptOut3": "Niin toimimalla suojaat yksityisyyttäsi, mutta samalla estät sivuston omistajaa oppimasta toimistasi ja siten estät paremman käyttökokemuksen kehittämisen sinulle sekä muille sivuston käyttäjille.",
+        "UncheckToOptOut": "Poista valinta tästä estääksesi seurannan.",
+        "CheckToOptIn": "Lisää valinta osallistuaksesi seurantaan.",
         "MissingTrackingCodeEmailSubject": "Sivuston %s osalta ei ole tallennettu liikennettä Matomo-analytiikkaan, aloitetaanpa",
         "JsTrackingCodeMissingEmail1": "Lisäsit sivuston '%s' Matomo-analytikkaasi joitain päiviä sitten. Tarkastimme juuri, ettei Matomo vaikuta tallentaneen lainkaan liikennettä tämän sivuston osalta.",
         "TrackingFailuresIntroduction": "Tällä sivulla näytetään seurantavirheet, jotka ovat sattuneet viimeisen %späivän aikana. Huomaathan, että ainoastaan yleisimmät seurantavirheet tallennetaan, eikä niistäkään kaikkia.",
@@ -122,6 +127,7 @@
         "ConfirmDeleteThisTrackingFailure": "Haluat varmasti poistaa tämän virhetiedon?",
         "TrackingFailuresEmailSubject": "Seurantavirheet Matomo-analytiikassasi",
         "TrackingFailuresEmail1": "Ilmoitamme, että Matomassasi on havaittu %s erityyppistä seurantavirhettä viime päivien aikana.",
-        "TrackingFailuresEmail2": "Nähdäksesi kaikki seurantavirheet, voit seurata %1$stätä linkkiä%2$s."
+        "TrackingFailuresEmail2": "Nähdäksesi kaikki seurantavirheet, voit seurata %1$stätä linkkiä%2$s.",
+        "ImportFromGoogleAnalytics": "Tuo Google Analyticsista"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/fr.json b/app/plugins/CoreAdminHome/lang/fr.json
index df0122ee8..7a5427a71 100644
--- a/app/plugins/CoreAdminHome/lang/fr.json
+++ b/app/plugins/CoreAdminHome/lang/fr.json
@@ -4,6 +4,7 @@
         "Administration": "Administration",
         "ArchivingSettings": "Paramètres d'archivage",
         "BrandingSettings": "Paramètres de l'image de marque",
+        "ErrorEmailFromAddressNotValid": "L'adresse d'origine SMTP n'est pas valide",
         "ReleaseChannel": "Canal de sortie",
         "ClickHereToOptIn": "Cliquez ici pour inclure votre ordinateur.",
         "ClickHereToOptOut": "Cliquez ici pour exclure votre ordinateur.",
@@ -24,11 +25,12 @@
         "InvalidPluginsWarning": "Les plugins suivants ne sont pas compatibles avec %1$s et ne peuvent pas être chargés : %2$s.",
         "InvalidPluginsYouCanUninstall": "Vous pouvez mettre à jour ou désinstaller ces plugins sur la page %1$sManagePlugins%2$s.",
         "JavaScriptTracking": "Suivi par JavaScript",
-        "HttpTrackingApi": "API de suivit HTTP",
-        "HttpTrackingApiDescription": "%1$sL'API de suivit HTTP %2$svous permet de suivre ce que vous souhaitez. Elle peut être utile si vous utilisez un langage de programmation qui n'a pas encore de SDK. Cela peut aussi être utile si vous souhaitez suivre des périphériques ou applications de manière particulière.",
+        "HttpTrackingApi": "API de suivi HTTP",
+        "HttpTrackingApiDescription": "%1$sL'API de suivi HTTP %2$svous permet de suivre ce que vous souhaitez. Elle peut être utile si vous utilisez un langage de programmation qui n'a pas encore de SDK. Cela peut aussi être utile si vous souhaitez suivre des périphériques ou applications de manière particulière.",
         "JSTracking_CampaignKwdParam": "Paramètre de la campagne de mot-clé",
         "JSTracking_CampaignNameParam": "Paramètre nom de la campagne",
         "JSTracking_CodeNoteBeforeClosingHead": "Vérifiez que ce code est présent sur l'ensemble des pages de votre site web. Nous vous recommandons de le placer immédiatement avant la balise de fermeture 1%1$s .",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Assurez-vous que ce code est intégré dans un élément de script sur chaque page de votre site web. Nous vous conseillons de le coller juste avant la balise de fermeture des entêtes 'head'.",
         "JSTracking_CustomCampaignQueryParam": "Utilisez des paramètres de requête personnalisés pour le nom et le mot-clé de la campagne",
         "JSTracking_CrossDomain": "Par défaut, l'ID du visiteur qui identifie un visiteur unique est stocké dans les cookies de premier niveau ne peuvant uniquement être accédés par des pages du même domaine. Activer l'association croisée des domaines vous permet de suivre toutes les actions et vues de pages d'un visiteur spécifique sur plusieurs domaines. Quand un utilisateur clique sur le lien vers une des URL alias de votre site web, cela va ajouter un paramètre d'URL pk_vid faisant suivre l'ID du visiteur.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Note : pour utiliser la liaison inter-domaine, vous devez spécifier plus qu'un nom de domaine (URLs) pour votre site web.",
@@ -53,7 +55,8 @@
         "JSTracking_EndNote": "Note : vous pouvez générer un code de suivi personnalisé dans la section d'administration %1$sCode de suivi%2$s.",
         "JSTrackingIntro1": "Vous pouvez suivre les visiteurs de votre site web de différentes manières. La méthode recommandée est de le faire via JavaScript. Pour utiliser cette méthode, vous devez vous assurer que chaque page de votre site web contient du code JavaScript; que vous pouvez générer ici.",
         "JSTrackingIntro2": "Une fois que vous avez le code de suivi JavaScript pour votre site web, copiez-collez le sur toutes les pages dont vous voulez effectuer le suivi avec Matomo.",
-        "JSTrackingIntro3b": "Avec la plupart des sites web, blogs, CMS, etc, vous pouvez utilier un composant pré-fait qui effectuera le travail technique pour vous. (Voir notre %1$sliste de composants utilisés pour intégrer Matomo%2$s.) S'il n'existe pas de composant, vous pouvez modifier les modèles de page de votre site web et ajouter le code de suivit JavaScript à la balise &lt;\/head&gt; qui est souvent définie dans un fichier modèle 'header.php', 'header.tpl' ou similaire.",
+        "JSTrackingIntro3a": "Dans la plupart des sites web, blogs, CMS, etc. vous pouvez utiliser un plugin pour faire le travail technique à votre place (voir notre %1$sliste de plugins existants pour intégrer Matomo%2$s).",
+        "JSTrackingIntro3b": "Si aucun plugin n'existe, vous pouvez éditer les modèles de votre site web et ajouter le code de suivi JavaScript juste avant la balise &lt;\/head&gt ; qui est souvent définie dans un fichier 'header.php', 'header.tpl' ou similaire.",
         "JSTrackingIntro4": "Si vous ne souhaitez pas utiliser JavaScript pour effectuer le suivi des visiteurs, %1$sgénérez un lien de suivi par image ci-dessous%2$s.",
         "JSTrackingIntro5": "Si vous voulez faire plus qu'effectuer le suivi des visites de pages, veuillez consulter %1$sla documentation Matomo JavaScript Tracking%2$s pour connaître 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": "Afin d'utiliser votre logo personnalité au lieu du logo par défaut Matomo, ajoutez des permissions à ce répertoire : %1$s Matomo a besoin d'un accès en écriture à vos logos stockés dans les fichiers %2$s.",
@@ -91,7 +94,7 @@
         "SystemPluginSettings": "Paramètres système de plugins",
         "TrackAGoal": "Effectuer le suivi d'un objectif",
         "TrackingCode": "Code de suivi",
-        "TrackingCodeIntro": "Matomo vous permet d'intégrer le code de suivit dans votre site web, application mobile ou même pour n'import quel périphérique ou application de plusieurs manières.",
+        "TrackingCodeIntro": "Matomo vous permet d'intégrer le code de suivi dans votre site web, application mobile ou même pour n'importe quel périphérique ou application de plusieurs manières.",
         "TrustedHostConfirm": "Êtes-vous sûr(e) de vouloir changer le nom d'hote autorisé",
         "TrustedHostSettings": "Nom d'hôte",
         "UiDemo": "Demo interface utilisateur",
@@ -129,8 +132,10 @@
         "TrackingFailureAuthenticationSolution": "Définissez or corrigez le \"token_auth\" dans vos requêtes de suivi.",
         "ConfirmDeleteAllTrackingFailures": "Êtes-vous sûr(e) de vouloir supprimer toutes les erreurs de suivi ?",
         "ConfirmDeleteThisTrackingFailure": "Êtes-vous sûr(e) de vouloir supprimer cette erreur de suivi ?",
-        "TrackingFailuresEmailSubject": "Erreurs de suivit dans Matomo",
+        "TrackingFailuresEmailSubject": "Erreurs de suivi dans Matomo",
         "TrackingFailuresEmail1": "C'est simplement pour vous avertir %s sortes différentes d'erreurs de suivi sont survenues ces derniers jours.",
-        "TrackingFailuresEmail2": "Afin de visualiser toutes les erreurs de suivi %1$s cliquez ici %2$s."
+        "TrackingFailuresEmail2": "Afin de visualiser toutes les erreurs de suivi %1$s cliquez ici %2$s.",
+        "ImportFromGoogleAnalytics": "Importer depuis Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Si vous avez une propriété Google Analytics et que vous passez à Matomo, vous pouvez importer vos données existantes en utilisant le %1$splugin GoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/it.json b/app/plugins/CoreAdminHome/lang/it.json
index 966ac7fa9..d384fb6cc 100644
--- a/app/plugins/CoreAdminHome/lang/it.json
+++ b/app/plugins/CoreAdminHome/lang/it.json
@@ -29,6 +29,7 @@
         "JSTracking_CampaignKwdParam": "Parametro Keyword Campagna",
         "JSTracking_CampaignNameParam": "Parametro Nome Campagna",
         "JSTracking_CodeNoteBeforeClosingHead": "Assicurati che questo codice sia presente su ogni pagina del tuo sito web. Ti consigliamo di incollarlo subito prima del tag di chiusura %1$s.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Assicurati che questo codice sia incorporato in un elemento dello script in ogni pagina del tuo sito web. Ti consigliamo di incollarlo immediatamente prima del tag head di chiusura.",
         "JSTracking_CustomCampaignQueryParam": "Utilizza i nomi dei parametri di query personalizzati per il nome della campagna e parola chiave",
         "JSTracking_CrossDomain": "Per impostazione predefinita, l'ID visitatore che identifica un visitatore unico è memorizzato nel primo gruppo di cookies del browser al quale si può accedere solamente dalle pagine che si trovano nello stesso dominio. Abilitando i collegamenti cross domain, potrai tracciare tutte le azioni e le pagine viste da un determinato visitatore nell'ambito della stessa visita, anche quando esso visita le pagine di diversi domini. Quando un utente clicca su un link a un URL di uno degli alias del tuo sito web, verrà aggiunto un parametro URL pk_vid dopo l'ID Visitatore.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Nota: Per usare i collegamenti cross domain, devi specificare più di un nome di dominio (URL) per il tuo sito web.",
@@ -53,7 +54,8 @@
         "JSTracking_EndNote": "Nota: Puoi generare un codice di tracciamento personalizzato nella sezione di amministrazione %1$sTracking Code %2$s.",
         "JSTrackingIntro1": "Puoi tenere traccia dei visitatori del tuo sito web in molti modi diversi. Il modo consigliato per farlo è tramite JavaScript. Per utilizzare questo metodo devi assicurarti che ogni pagina web del tuo sito web abbia il codice JavaScript che puoi generare qui.",
         "JSTrackingIntro2": "Una volta ottenuto il codice JavaScript per il tuo sito web, copialo e incollalo in tutte le pagine che vuoi monitorare con Matomo.",
-        "JSTrackingIntro3b": "In molti siti web, blog, CMS, ecc. puoi utilizzare un plugin già pronto che faccia per te il lavoro tecnico. (Vedi il nostro %1$selenco di plugin usati per integrare Matomo%2$s.) Se non esiste alcun plugin, puoi modificare le template del tuo sito web e aggiungere il codice di tracking JavaScript al tag &lt;\/head&gt;, che spesso è definito in 'header.php', 'header.tpl' o in un file di template simile.",
+        "JSTrackingIntro3a": "Nella maggior parte dei siti web, blog, CMS, ecc. È possibile utilizzare un plug-in già pronto per eseguire per te il lavoro tecnico. (Vedi il nostro %1$selenco di plugin usati per integrare Matomo%2$s.)",
+        "JSTrackingIntro3b": "Se non esiste alcun plug-in, puoi modificare i modelli del tuo sito web e aggiungere il codice tracking JavaScript al tag &lt;\/head&gt; che viene spesso definito in 'header.php', 'header.tpl' o in un file di template simile.",
         "JSTrackingIntro4": "Se non vuoi usare il codice JavaScript per monitorare i visitatori, %1$sgenera qui sotto un'immagine per monitorare senza JavaScript%2$s.",
         "JSTrackingIntro5": "Se volete fare altro oltre che tracciare le viste pagina, preghiamo di controllare la %1$sDocumentazione Matomo 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 predefinito di Matomo, devi dare l'accesso in scrittura a questa directory: %1$sMatomo richiede l'accesso in scrittura per i tuoi loghi conservati nei files %2$s.",
diff --git a/app/plugins/CoreAdminHome/lang/ja.json b/app/plugins/CoreAdminHome/lang/ja.json
index 64dd48b1a..9b957cb26 100644
--- a/app/plugins/CoreAdminHome/lang/ja.json
+++ b/app/plugins/CoreAdminHome/lang/ja.json
@@ -44,16 +44,15 @@
         "JSTracking_MergeAliases": "” アウトリンク ” レポートでは、次のような既知のエイリアス URL へのクリックを非表示にします。",
         "JSTracking_MergeAliasesDesc": "したがって、エイリアス URL ( 例：%s ) へのリンクのクリックは \" アウトリンク \" としてカウントされません。",
         "JSTracking_MergeSubdomains": "のすべてのサブドメインのビジターをトラッキングする",
-        "JSTracking_MergeSubdomainsDesc": "したがって、1 人のビジターが %1$s と %2$s を訪問すると、それらはユニークビジターとしてカウントされます。",
+        "JSTracking_MergeSubdomainsDesc": "したがって、1 人のビジターが %1$s と %2$s を訪問した場合、それらはユニークビジターとしてカウントされます。",
         "JSTracking_PageCustomVars": "各ページビューのカスタム変数をトラッキングする",
-        "JSTracking_PageCustomVarsDesc": "たとえば、変数名 \"Category\" で、値が \"White Papers\" の場合、",
+        "JSTracking_PageCustomVarsDesc": "たとえば、変数名 \"Category\" で、値が \"White Papers\" の場合。",
         "JSTracking_TrackNoScript": "JavaScript を無効にしてユーザーを追跡する",
         "JSTracking_VisitorCustomVars": "このユーザーのカスタム変数を追跡する",
         "JSTracking_VisitorCustomVarsDesc": "たとえば、変数名 \" Type \" と値 \" Customer \" を使用します。",
         "JSTracking_EndNote": "注：カスタマイズしたトラッキングコードは、%1$sトラッキングコード%2$s管理セクションで生成できます。",
         "JSTrackingIntro1": "Web サイトへのビジターをさまざまな方法で追跡できます。 推奨される方法は JavaScript を使用することです。 この方法を使用するには、Web サイトのすべての Web ページに JavaScript コードがあることを確認する必要があります。これはここで生成できます。",
-        "JSTrackingIntro2": "ウェブサイトのための JavaScript のトラッキングコードをコピーして、追跡したいすべてのページにペーストします。",
-        "JSTrackingIntro3b": "ほとんどの Web サイト、ブログ、CMS などでは、事前に作られたプラグインを使って技術的な作業を行うことができます。 （%1$s Matomoの統合に使用されているプラグインのリスト%2$s を参照してください。）プラグインが存在しない場合は、Web サイトテンプレートを編集できます。'header.php'、 'header.tpl' などのテンプレートファイルで定義されていることが多い &lt;\/head&gt; タグに JavaScript トラッキングコードを追加します。",
+        "JSTrackingIntro2": "WebサイトのJavaScriptトラッキングコードを入手したら、それをコピーしてMatomoで追跡したいすべてのページに貼り付けます。",
         "JSTrackingIntro4": "ビジターの追跡に JavaScript を使用したくない場合は、%1$s以下の画像によるトラッキングリンクを生成します。%2$s",
         "JSTrackingIntro5": "ページビューを追跡する以外にも、%1$sMatomo Javascript Tracking のドキュメント%2$sで利用可能な機能のリストを確認してください。 これらの機能を使用すると、目標、カスタム変数、e コマース注文、放棄されたカートなどを追跡できます。",
         "LogoNotWriteableInstruction": "Matomo デフォルトロゴの代わりにカスタムロゴを使用するには、このディレクトリへの書込権限を与えて下さい。 :%1$s ロゴをファイルに保存するには、書込アクセスが必要です。%2$s",
@@ -68,7 +67,7 @@
         "MenuDevelopment": "開発",
         "MenuMeasurables": "Measurables",
         "OptOutComplete": "オプトアウト完了； このWebサイトへの訪問は、Web Analyticsツールによって記録されません。",
-        "OptOutCompleteBis": "Cookie をクリアしてオプトアウト Cookie を削除したり、コンピュータやブラウザを変更した場合は、オプトアウト手続きを再度実行する必要があることに注意してください。",
+        "OptOutCompleteBis": "Cookie のクリア、オプトアウト Cookie の削除、コンピュータやブラウザを変更した場合は、オプトアウト手続きを再度実行する必要があることに注意してください。",
         "OptOutDntFound": "ユーザーにより、このブラウザではトラッキングしない設定になっています。これはブラウザの設定によるもので、'Do Not Track' 機能を無効にするまでオプトインできません。",
         "OptOutExplanation": "Matomo はインターネット上でのプライバシーを提供することに注力しています。 ビジターにMatomo Web Analytics オプトアウトの選択肢を提供するため、Web サイトページの 1 つ、たとえばプライバシーポリシーページに次の HTML コードを追加することができます。",
         "OptOutExplanationIntro": "このコードでは、ブラウザにオプトアウト Cookie を設定することで、Matomo をオプトアウトするためのリンクを含む iFrame が表示されます。 iFrame で表示されるコンテンツを表示するには、下記（または%1$sここをクリック%2$s）を参照してください。",
@@ -86,12 +85,12 @@
         "SettingsSaveSuccess": "設定が更新されました。",
         "SendPluginUpdateCommunication": "プラグインの更新が利用可能になった時、メールを送信します",
         "SendPluginUpdateCommunicationHelp": "使用可能な新しいプラグインのバージョンがある場合、ユーザーユーザーへメールが通知されます。",
-        "StableReleases": "Matomo がビジネスにおいて重要である場合、最新の安定版を使用することを推奨します。また、最新のベータ版を使用し、バグを見つけたり、提案があれば、%1$sこちらをご覧ください%2$s。",
+        "StableReleases": "Matomo がビジネスにおいて重要である場合、最新の安定版を使用することを推奨します。また、最新のベータ版を使用中にバグを見つけたり、提案がある場合は%1$sこちらをご覧ください%2$s。",
         "LtsReleases": "LTS (長期サポート) バージョンは、セキュリティとバグ修正のみ受信します。",
         "SystemPluginSettings": "システムプラグイン設定",
         "TrackAGoal": "目標を追跡する",
         "TrackingCode": "トラッキングコード",
-        "TrackingCodeIntro": "Matomo では、ウェブサイト、モバイルアプリ、さらにはデバイスやアプリケーションのトラッキングコードをさまざまな方法で埋め込むことができます。",
+        "TrackingCodeIntro": "Matomo は、ウェブサイト、モバイルアプリ、さらにはデバイスやアプリケーションにも、さまざまな方法でトラッキングコードを埋め込むことができます。",
         "TrustedHostConfirm": "信頼できる Matomo ホスト名を変更してもよろしいですか？",
         "TrustedHostSettings": "信頼できる Matomo ホスト名",
         "UiDemo": "UI デモ",
@@ -101,7 +100,7 @@
         "WithOptionalRevenue": "オプションの収益と",
         "YouAreOptedOut": "現在オプトアウトされています。",
         "YouAreNotOptedOut": "オプトアウトされていません。",
-        "YouMayOptOut": "このウェブサイトに集められるデータの収集と解析を回避するために、あなたのコンピュータにウェブ解析 Cookie 識別番号を割り当てない選択をすることができます。",
+        "YouMayOptOut": "このWebサイトで収集されたデータの集計と分析を回避するために、ユニークなWeb分析Cookie識別番号をコンピュータに割り当てないように選択することができます。",
         "YouMayOptOutBis": "これを選択するには、以下をクリックしてオプトアウト Cookie を受信してください。",
         "OptingYouOut": "オプトアウト中、お待ちください…",
         "ProtocolNotDetectedCorrectly": "現在、安全な SSL 接続 ( httpsを使用 ) で Matomo はサーバー上の非セキュア接続のみを検出できます。",
diff --git a/app/plugins/CoreAdminHome/lang/nl.json b/app/plugins/CoreAdminHome/lang/nl.json
index ff9d74166..e9a2a4252 100644
--- a/app/plugins/CoreAdminHome/lang/nl.json
+++ b/app/plugins/CoreAdminHome/lang/nl.json
@@ -11,6 +11,7 @@
         "CorsDomainsHelp": "U kunt domeinen of subdomeinen definiëren, zoals http:\/\/example.com of http:\/\/stats.example.com. Of om crossdomeinverzoeken voor alle domeinen toe te staan, kunt u een * toevoegen.",
         "CustomLogoFeedbackInfo": "Als u het Matomo 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 Matomo logo aanpassen dat wordt weergegeven in de gebruikersinterface en in de e-mail rapportages.",
+        "DevelopmentProcess": "Hoewel ons ontwikkelproces duizenden geautomatiseerde tests kent, spelen Beta Testers een sleutelrol in het bereiken van de \"Geen bugs policy\" in Matomo.",
         "EmailServerSettings": "E-mailserverinstellingen",
         "ForBetaTestersOnly": "Alleen voor bèta testers",
         "ImageTracking": "Afbeelding tracking",
@@ -23,9 +24,15 @@
         "InvalidPluginsWarning": "De volgende plugins werken niet met %1$s en konden niet geladen worden: %2$s.",
         "InvalidPluginsYouCanUninstall": "U kunt deze plugins updaten of installatie ongedaan maken op de %1$sManage Plugins%2$s pagina.",
         "JavaScriptTracking": "JavaScript Tracking",
+        "HttpTrackingApi": "HTTP Tracking API",
+        "HttpTrackingApiDescription": "De %1$sHTTP Tracking API%2$s stelt je in staat om alles te volgen. Dit kan nuttig zijn als je een programmeertaal gebruikt waarvoor nog geen SDK bestaat. Dit kan ook nuttig zijn als je apparaten of applicaties op een speciale manier wilt volgen.",
         "JSTracking_CampaignKwdParam": "Campagne sleutelwoord parameter",
         "JSTracking_CampaignNameParam": "Campagna naam parameter",
+        "JSTracking_CodeNoteBeforeClosingHead": "Zorg ervoor dat deze code op elke pagina van je website staat. We raden je aan om de code vlak voor de sluit %1$s tag in te plakken.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Zorg ervoor dat deze code is ingebed in een scriptelement op elke pagina van je website. We raden je aan om de code voor de sluit head tag in te plakken.",
         "JSTracking_CustomCampaignQueryParam": "Gebruik aangepaste query parameter namen voor de campagne naam & sleutelwoorden",
+        "JSTracking_CrossDomain": "Standaard wordt de bezoeker-ID die een unieke bezoeker identificeert opgeslagen in de browsers first-party cookies die alleen benaderd kunnen worden door pagina's vanuit hetzelfde domein. Door domein cross linking in te schakelen kun je alle acties en pageviews van een specifieke bezoeker volgen, ook al bekijken ze pagina's van verschillende domeinen. Als een bezoeker klikt op een link van een van je website alias URL's dan wordt een URL-parameter pk_vid met de bezoeker-ID toegevoegd.",
+        "JSTracking_CrossDomain_NeedsMultipleDomains": "Let op: Om cross domein linking te gebruiken moet je meer dan een domeinnaam (URL's) voor je website specificeren.",
         "JSTracking_CustomCampaignQueryParamDesc": "Opmerking: %1$s Matomo detecteert automatisch Google Analytics parameters.%2$s",
         "JSTracking_DisableCookies": "Schakel alle tracking cookies uit",
         "JSTracking_DisableCookiesDesc": "Schakelt alle first party cookies uit. Bestaande Matomo cookies voor deze website zullen worden verwijderd bij het opnieuw laden van de pagina.",
@@ -45,9 +52,13 @@
         "JSTracking_VisitorCustomVars": "Hou custom variabelen bij voor deze bezoeker",
         "JSTracking_VisitorCustomVarsDesc": "Bijvoorbeeld met variabele naam \"Type\" en waarde \"Klant\"",
         "JSTracking_EndNote": "Opmerking: Na het installatie proces, kun je custom tracking code genereren in het %1$sTracking Code%2$s admin gedeelte.",
+        "JSTrackingIntro1": "Je kunt bezoekers aan je website op meerdere manieren volgen. De geadviseerde manier is om dit via JavaScript te doen. Om deze manier te gebruiken moet je ervoor zorgen dat elke pagina van je website een stukje JavaScript-code bevat die je hier kunt genereren.",
         "JSTrackingIntro2": "Wanneer je de JavaScript code voor je website hebt, kopieer en plak de code naar alle pagina's die je wilt volgen met Matomo",
+        "JSTrackingIntro3a": "In de meeste websites, blogs, CMS'en etc. kun je een plugin gebruiken om het technische werk voor je uit te voeren. (Kijk op onze %1$slijst met plugins om Matomo%2$s te integreren.)",
+        "JSTrackingIntro3b": "Als er geen plugin bestaat dan kun je je website template aanpassen en daar de JavaScript tracking-code aan de &lt;\/head&gt; tag toe te voegen. Dit wordt vaak gedefinieerd in een 'header.php', 'header.tpl' of vergelijkbaar bestand.",
         "JSTrackingIntro4": "Indien je geen gebruik wilt maken van JavaScript om gebruikers te volgen, %1$skun je een afbeelding tracking link hieronder genereren.%2$s",
         "JSTrackingIntro5": "Indien je meer wilt bijhouden dan paginaweergaves, lees dan de %1$sMatomo Javascript Tracking documentatie%2$s voor de lijst van beschikbare functies. Via deze functies kun je doelen, eigen variabelen, ecommerce bestellingen, afgebroken bestellingen en meer.",
+        "LogoNotWriteableInstruction": "Om je eigen logo te gebruiken in plaats van het standaard Matomo-logo moet je schrijfrechten geven op de directory: %1$s. Matomo heeft schrijfrechten nodig voor je logo's die opgeslagen zijn in de bestanden %2$s.",
         "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.",
         "LogoUploadFailed": "Het geüploade bestand kon niet worden verwerkt. Controleer of het bestand een geldig bestandsformaat heeft.",
         "LogoUpload": "Selecteer een logo om te uploaden",
@@ -62,6 +73,7 @@
         "OptOutCompleteBis": "Als u uw cookies wist, de opt-out cookie verwijdert of wisselt van computer of webbrowser, 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": "Matomo is ingericht om privacy op internet te respecteren. U kunt uw bezoekers de opt-out optie van Matomo Web Analytics aanbieden. Daartoe kunt u de volgende HTML-code toevoegen aan uw website, bijvoorbeeld op een pagina met een Privacybeleid.",
+        "OptOutExplanationIntro": "Deze code toont een Iframe met een link waarmee je bezoekers kunnen aangeven dat ze niet gevolgd willen worden door Matomo, hiervoor wordt een opt-out cookie geplaatst in hun webbrowser. Kijk hieronder(of %1$s klik hier%2$s) om de inhoud van het te tonen Iframe te bekijken.",
         "OptOutForYourVisitors": "Matomo opt-out voor uw bezoekers",
         "PiwikIsInstalledAt": "Matomo is geïnstalleerd in",
         "PersonalPluginSettings": "Persoonlijke plugin-instellingen",
@@ -72,6 +84,7 @@
         "PluginSettingsValueNotAllowed": "De waarde voor veld \"%1$s\" in plugin \"%2$s\" is niet toegestaan",
         "PluginSettingsSaveFailed": "Opslaan van plugin instellingen niet gelukt",
         "PluginSettingsSaveSuccess": "Plugin-instellingen bijgewerkt.",
+        "TrackingFailures": "Tracking fouten",
         "SettingsSaveSuccess": "Instellingen bijgewerkt.",
         "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.",
@@ -80,8 +93,10 @@
         "SystemPluginSettings": "Systeem Plugin Instellingen",
         "TrackAGoal": "Hou een doel bij.",
         "TrackingCode": "Trackingcode",
+        "TrackingCodeIntro": "Matomo biedt je meerdere manieren om de tracking code op je website, mobiele app en zelfs voor elk apparaat of applicatie in te voegen",
         "TrustedHostConfirm": "Weet je zker dat je de vertrouwde Matomo hostnaam wilt aanpassen?",
         "TrustedHostSettings": "Toegestane Matomo hostnaam",
+        "UiDemo": "UI Demo",
         "UpdateSettings": "Instellingen bijwerken",
         "UseCustomLogo": "Aangepast logo gebruiken",
         "ValidPiwikHostname": "Geldige Matomo hostnaam.",
@@ -97,14 +112,27 @@
         "YouMayOptOut3": "Hierdoor wordt uw privacy beschermd, maar wordt ook voorkomen dat de beheerder van de website van uw acties kan leren en een betere ervaring voor u en andere gebruikers kan creëren.",
         "UncheckToOptOut": "Schakel dit vakje uit om u af te melden.",
         "CheckToOptIn": "Schakel dit vakje in om u aan te melden.",
+        "MissingTrackingCodeEmailSubject": "Geen verkeer voor %s opgenomen in Matomo Analyses, begin er nu mee.",
+        "JsTrackingCodeMissingEmail1": "Een par dagen geleden heb je de website '%s' aan je Matomo Analyses toegevoegd. We hebben net een controle uitgevoerd en het lijkt alsof Matomo helemaal geen verkeer heeft vastgelegd voor deze website.",
+        "JsTrackingCodeMissingEmail2": "Om te beginnen met tracking data en daardoor inzicht te krijgen in je bezoekers moet je eerst tracking inrichten op je website of mobiele app. Voor een website voeg je simpelweg de tracking code in vlak voor de %s tag.",
+        "JsTrackingCodeMissingEmail3": "Om je tracking code te vinden en aan te passen, %1$s klik hier%2$s (of kijk in de %3$sJavaScript Tracking Client handleiding%4$s).",
+        "TrackingFailuresIntroduction": "Deze pagina toont de tracking fouten die tijdens de afgelopen %s dagen zijn opgetreden. Bedenk daarbij dat alleen de meest voorkomende tracking fouten zijn gelogd en dus niet alle.",
+        "NoKnownFailures": "Er zijn geen bekende tracking fouten",
         "Problem": "Probleem",
         "Solution": "Oplossing",
+        "TrackingURL": "Tracking URL",
         "LearnMore": "Meer weten",
         "DeleteAllFailures": "Verwijder alle mislukkingen",
+        "NTrackingFailures": "%s tracking fouten",
+        "ViewAllTrackingFailures": "Bekijk alle tracking fouten",
         "TrackingFailureInvalidSiteProblem": "Deze website bestaat niet.",
         "TrackingFailureInvalidSiteSolution": "Update de geconfigureerde idSite in de tracker.",
         "TrackingFailureAuthenticationProblem": "Aanvraag was niet geautoriseerd maar autorisatie was verplicht.",
         "TrackingFailureAuthenticationSolution": "Zet of corrigeer een \"token_auth\" in je tracking aanvraag.",
-        "ConfirmDeleteAllTrackingFailures": "Weet u zeker dat u alle tracking mislukkingen wilt verwijderen?"
+        "ConfirmDeleteAllTrackingFailures": "Weet u zeker dat u alle tracking fouten wilt verwijderen?",
+        "ConfirmDeleteThisTrackingFailure": "Weet u zeker dat u deze tracking fout wilt verwijderen?",
+        "TrackingFailuresEmailSubject": "Tracking fouten in je Matomo Analyses",
+        "TrackingFailuresEmail1": "Dit is om je te laten weten dat er gedurende de afgelopen dagen %s verschillende tracking fouten zijn opgetreden.",
+        "TrackingFailuresEmail2": "Om alle foute tracking aanvragen te bekijken %1$sklik hier%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/pl.json b/app/plugins/CoreAdminHome/lang/pl.json
index d69c20cd1..8134ea7f7 100644
--- a/app/plugins/CoreAdminHome/lang/pl.json
+++ b/app/plugins/CoreAdminHome/lang/pl.json
@@ -31,7 +31,7 @@
         "JSTracking_CustomCampaignQueryParam": "Użyto niestandardowych nazw parametrów dla nazwy kampanii i słów kluczowych",
         "JSTracking_CrossDomain": "Domyślnie, ID użytkownika identyfikujące unikalnego odwiedzającego jest przechowywane w podstawowych ciasteczkach przeglądarki, które dostępne są jedynie w ramach stron w tej samej domenie. Włączenie linkowania między domenami pozwala Ci śledzić działania i otwarcia stron wybranego użytkownika podczas całej wizyty, nawet gdy dotyczy ona kilku domen. Za każdym razem, gdy użytkownik kliknie w link, który został skonfigurowany jako alias URL, do adresu URL zostanie dołączony parametr pk_vid przekazujący ID odwiedzającego.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "NOTKA: Aby korzystać z linkować między domenami, musisz podać co najmniej 2 domeny (URL'e) dla swojego serwisu.",
-        "JSTracking_CustomCampaignQueryParamDesc": "Ważne: %1$sMatomo automatycznie wykryje parametry Google Analystics..%2$s",
+        "JSTracking_CustomCampaignQueryParamDesc": "Ważne: %1$sMatomo automatycznie wykryje parametry Google Analystics.%2$s",
         "JSTracking_DisableCookies": "Wyłącz wszystkie pliki cookie",
         "JSTracking_DisableCookiesDesc": "Wyłącza wszystkie pliki cookie. Istniejące pliki cookie Matomo dla tej witryny zostaną usunięte po następnym odświeżeniu strony.",
         "JSTracking_EnableCrossDomainLinking": "Włącza powiązania między domenowe",
diff --git a/app/plugins/CoreAdminHome/lang/pt-br.json b/app/plugins/CoreAdminHome/lang/pt-br.json
index dce93ab39..053fa7aa4 100644
--- a/app/plugins/CoreAdminHome/lang/pt-br.json
+++ b/app/plugins/CoreAdminHome/lang/pt-br.json
@@ -4,6 +4,7 @@
         "Administration": "Administração",
         "ArchivingSettings": "Configurações de arquivamento",
         "BrandingSettings": "Configurações da identidade visual",
+        "ErrorEmailFromAddressNotValid": "O endereço SMTP`do remetente não é válido",
         "ReleaseChannel": "Canal de liberação",
         "ClickHereToOptIn": "Clique aqui para aceitar",
         "ClickHereToOptOut": "Clique aqui para optar por sair.",
@@ -19,16 +20,17 @@
         "ImageTrackingIntro2": "Gerar o link abaixo e copiar e colar o código HTML gerado na página. Se você está usando isso como uma alternativa para controle de JavaScript, você pode inclui-lo na tag %1$s",
         "ImageTrackingIntro3": "Para a lista completa de opções que você pode usar com um link de monitoramento de imagem, consulte a %1$sDocumentação da API%2$s.",
         "ImageTrackingLink": "Link de rastreamento por imagem",
-        "ImportingServerLogs": "Importando Logs do servidor",
+        "ImportingServerLogs": "Importando logs do servidor",
         "ImportingServerLogsDesc": "Uma alternativa para o monitoramento de visitantes através do browser (via JavaScript ou um link de imagem) é continuamente importar logs do servidor. Saiba mais sobre em %1$sAnalisador de Logs do Servidor%2$s.",
         "InvalidPluginsWarning": "Os seguintes plugins não são compatíveis com %1$s e não pôde ser carregado: %2$s.",
         "InvalidPluginsYouCanUninstall": "Você pode atualizar ou desinstalar estes plugins na página %1$sGerenciar plugins%2$s.",
-        "JavaScriptTracking": "Rastreamento de JavaScript",
+        "JavaScriptTracking": "Rastreamento JavaScript",
         "HttpTrackingApi": "API de Rastreamento HTTP",
         "HttpTrackingApiDescription": "A %1$sAPI de Rastreamento HTTP%2$s permite rastrear qualquer coisa. Isso pode ser útil se você esta usando uma linguagem de programação para a qual ainda não existe SDK. Também pode ser útil quando você deseja rastrear dispositivos ou aplicativos de uma maneira especial.",
         "JSTracking_CampaignKwdParam": "Parâmetro de Palavra-Chave da campanha",
         "JSTracking_CampaignNameParam": "Parâmetro Nome da Campanha",
         "JSTracking_CodeNoteBeforeClosingHead": "Certifique-se de que este código esteja em todas as páginas do seu site. Recomendamos colá-lo imediatamente antes da tag %1$s de fechamento.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Certifique-se de que este código esteja dentro de um elemento script em todas as páginas do seu site. Recomendamos colá-lo imediatamente antes da tag head de fechamento.",
         "JSTracking_CustomCampaignQueryParam": "Utilizar nomes de parâmetros de consultas personalizados para o nome da campanha e a palavra-chave.",
         "JSTracking_CrossDomain": "Por padrão, o ID do visitante que identifica um visitante único é armazenado nos cookies primários do navegador, que só podem ser acessados por páginas no mesmo domínio. A ativação da vinculação entre domínios permite acompanhar todas as ações e exibições de páginas de um visitante específico na mesma visita, mesmo quando elas visualizam páginas em vários domínios. Sempre que um usuário clicar em um link para uma das URLs de alias do seu website, ele adicionará um parâmetro de URL pk_id encaminhando o ID do visitante.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Nota: Para usar a vinculação entre domínios, você deve especificar mais de um nome de domínio (URLs) para o seu site.",
@@ -53,9 +55,10 @@
         "JSTracking_EndNote": "Nota: Você pode gerar um código de rastreamento personalizado nas configurações de %1$sCódigo de rastreamento %2$s.",
         "JSTrackingIntro1": "Você pode acompanhar os visitantes do seu site de várias maneiras diferentes. A maneira recomendada de fazer isso é através do JavaScript. Para usar este método, você deve certificar-se de que toda página do seu site tenha algum código JavaScript, que você pode gerar aqui.",
         "JSTrackingIntro2": "Depois de obter o código de rastreamento JavaScript para o seu site, copie e cole em todas as páginas que você deseja acompanhar com Matomo.",
-        "JSTrackingIntro3b": "Na maioria dos sites, blogs, CMS, etc, você pode usar um plug-in pré-fabricado para fazer o trabalho técnico para você. (Veja a nossa %1$slista de plugins usados ​​para integrar Matomo%2$s.) Se não existir nenhum plugin você pode editar os arquivos de modelos do seu site e adicionar a tag de código de rastreamento JavaScript &lt;\/head&gt; que geralmente é definida em um 'header.php', 'header.tpl' ou arquivo de modelo similar.",
+        "JSTrackingIntro3a": "Na maioria dos sites, blogs, CMS, etc, você pode usar um plugin pré-fabricado para fazer o trabalho técnico para vocẽ. (Veja nossa %1$slista de plugins para integrar o Matomo%2$s.)",
+        "JSTrackingIntro3b": "Se não existir plugin, você pode editar os templates do seu site e adicionar o código de rastreamento JavaScript à tag &lt;\/head&gt; que frequentemente está definida em um arquivo 'header.php', 'header,tpl' ou arquivo template similar.",
         "JSTrackingIntro4": "Se você não quiser usar JavaScript para monitorar visitantes, %1$sgere abaixo, um link para rastreamento por imagem%2$s.",
-        "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 Matomo%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.",
+        "JSTrackingIntro5": "Se você deseja mais do que apenas monitorar exibições de página, por favor verifique a %1$sdocumentação do rastreamento por javascript do Matomo%2$s para uma lista de funções disponíveis. Usando essas funções você pode acompanhar metas, variáveis ​​personalizadas, ordens de comércio eletrônico, compras abandonadas e muito mais.",
         "LogoNotWriteableInstruction": "Para usar seu logotipo personalizado em vez do logotipo padrão do Matomo, conceda permissão de gravação a este diretório: %1$s O Matomo precisa de permissão para gravação dos seus logotipos armazenados %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.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Você tem certeza que deseja remover esta falha de rastreamento?",
         "TrackingFailuresEmailSubject": "Falhas de rastreamento no seu Matomo Analytics",
         "TrackingFailuresEmail1": "Isso é apenas para informá-lo que %s diferentes tipos de falhas de rastreamento ocorreram nos últimos dias.",
-        "TrackingFailuresEmail2": "Para ver todas as solicitações de rastreamento com falhas %1$sclicar aqui%2$s."
+        "TrackingFailuresEmail2": "Para ver todas as solicitações de rastreamento com falhas %1$sclicar aqui%2$s.",
+        "ImportFromGoogleAnalytics": "Importar do Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Se você tem uma propriedade Google Analytics e está trocando para o Matomo, você pode importar seus dados atuais usando o plugin %1$sGoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/pt.json b/app/plugins/CoreAdminHome/lang/pt.json
index b5ee0a8c5..a0fb27786 100644
--- a/app/plugins/CoreAdminHome/lang/pt.json
+++ b/app/plugins/CoreAdminHome/lang/pt.json
@@ -4,6 +4,7 @@
         "Administration": "Administração",
         "ArchivingSettings": "Definições de arquivo",
         "BrandingSettings": "Definições de marca",
+        "ErrorEmailFromAddressNotValid": "O endereço a partir do SMTP não é válido",
         "ReleaseChannel": "Canal de lançamento",
         "ClickHereToOptIn": "Clique aqui para participar.",
         "ClickHereToOptOut": "Clique aqui para deixar de participar.",
@@ -28,6 +29,8 @@
         "HttpTrackingApiDescription": "A %1$sAPI HTTP de acompanhamento%2$s permite-lhe monitorizar tudo. Isto pode ser útil se está a utilizar uma linguagem de desenvolvimento para a qual ainda não exista SDK. Pode também ser útil quando pretende monitorizar dispositivos ou aplicações de uma forma específica.",
         "JSTracking_CampaignKwdParam": "Parâmetro da Palavra-chave da campanha",
         "JSTracking_CampaignNameParam": "Parâmetro do Nome da campanha",
+        "JSTracking_CodeNoteBeforeClosingHead": "Certifique-se que este código se encontra em todas as páginas do seu site. Recomendamos que o insira imediatamente antes da tag de fecho %1$s.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Certifique-se que este código é incorporado dentro de um elemento script em todas as páginas do seu site. Nós recomendamos que insira imediatamente antes do tag de fecho head.",
         "JSTracking_CustomCampaignQueryParam": "Utilize parâmetros personalizados de endereço para o nome e palavra-chave da campanha",
         "JSTracking_CrossDomain": "Por omissão, o ID do visitante que identifica um visitante único é armazenado nas cookies de primeiro nível do navegador que só podem ser acedidos por páginas do mesmo domínio. A ativação de ligações transversais entre domínios permite-lhe acompanhar as ações e visualizações de páginas de um visitante específico na mesma visita mesmo quando estes visualizam páginas de vários domínios. Sempre que um utilizador clica numa ligação para um dos pseudónimos dos seus sites, será adicionado um parâmetro pk_vid ao endereço encaminhando o ID do visitante.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Nota: Para utilizar ligações transversais entre domínios, deve especificar mais do que um domínio (endereço) para o seu site.",
@@ -50,7 +53,10 @@
         "JSTracking_VisitorCustomVars": "Acompanhar variáveis personalizadas para este visitante",
         "JSTracking_VisitorCustomVarsDesc": "Por exemplo, com uma variável com o nome \"Tipo\" e valor \"Cliente\".",
         "JSTracking_EndNote": "Nota: Pode gerar um código de acompanhamento específico na secção administrativa %1$sCódigo de acompanhamento%2$s.",
+        "JSTrackingIntro1": "Pode acompanhar os visitantes do seu site de diversas formas. A forma recomendada é através de JavaScript. Para utilizar este método, deve garantir que todas as páginas do seu site contêm um código JavaScript, o qual pode ser gerado aqui.",
         "JSTrackingIntro2": "Assim que tiver o código de acompanhamento JavaScript para o seu site, copie o mesmo para todas as páginas que pretende monitorizar com o Matomo.",
+        "JSTrackingIntro3a": "Na maioria dos sites, blogues, sistemas de gestão de conteúdos, etc. pode utilizar uma extensão existente que faça o trabalho técnico por si. (Consulte a nossa %1$slista de extensões usadas para integrar o Matomo %2$s).",
+        "JSTrackingIntro3b": "Caso não exista nenhuma extensão, pode editar os modelos do seu site e adicionar o código de acompanhamento JavaScript à tag &lt;\/head&gt; habitualmente definida num ficheiro 'header.php', 'header.tpl' ou noutro ficheiro de modelo semelhante.",
         "JSTrackingIntro4": "Se não quiser utilizar JavaScript para monitorizar os visitantes, %1$sconstrua uma ligação de acompanhamento baseada numa imagem abaixo %2$s.",
         "JSTrackingIntro5": "Se quiser fazer mais do que acompanhar as visualizações de páginas, por favor consulte a %1$sdocumentação de JavaScript de acompanhamento do Matomo%2$s para uma lista de funções disponíveis. Pode utilizar estas funções para acompanhar objetivos, variáveis personalizadas, pedidos de comércio eletrónico, carrinhos de compras abandonados, entre outros.",
         "LogoNotWriteableInstruction": "Para utilizar o seu logótipo personalizado em vez do logótipo predefinido do Matomo, atribua permissões de escrita a este diretório: %1$s O Matomo necessita de acesso para escrita aos seus logótipos armazenados nos ficheiros %2$s.",
@@ -109,6 +115,7 @@
         "CheckToOptIn": "Marque esta caixa para participar.",
         "MissingTrackingCodeEmailSubject": "Sem tráfego registado no Matomo Analytics para %s. Comece agora",
         "JsTrackingCodeMissingEmail1": "Já passaram alguns dias desde que adicionou o site '%s' ao seu Matomo Analytics. Acabámos de confirmar e parece que o seu Matomo não tem qualquer tráfego registado para este site.",
+        "JsTrackingCodeMissingEmail2": "Para iniciar o acompanhamento de dados e obter conhecimentos sobre os seus utilizadores, é necessário configurar o processo de acompanhamento no seu site ou aplicação móvel. Para sites, basta incorporar o código de acompanhamento imediatamente antes da tag %s.",
         "JsTrackingCodeMissingEmail3": "Para encontrar e personalizar o seu código de acompanhamento, %1$sclique aqui%2$s (ou dê uma vista de olhos no %3$sguia do JavaScript de acompanhamento do cliente%4$s).",
         "TrackingFailuresIntroduction": "Esta página lista as falhas de acompanhamento que ocorreram nos últimos %sdias. Por favor, note que foram apenas registadas as falhas de acompanhamento mais comuns, e não todas as falhas.",
         "NoKnownFailures": "Não existem falhas de acompanhamento.",
@@ -127,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Tem a certeza que deseja eliminar esta falha de acompanhamento?",
         "TrackingFailuresEmailSubject": "Falhas de acompanhamento no seu Matomo Analytics",
         "TrackingFailuresEmail1": "Isto serve apenas para informar que ocorreram %s tipos diferentes de falhas de acompanhamento nos últimos dias.",
-        "TrackingFailuresEmail2": "Para ver todos os pedidos de acompanhamento falhados %1$s clique aqui %2$s."
+        "TrackingFailuresEmail2": "Para ver todos os pedidos de acompanhamento falhados %1$s clique aqui %2$s.",
+        "ImportFromGoogleAnalytics": "Importar do Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Se está a utilizar uma propriedade do Google Analytics e está a mudar para o Matomo, pode importar os dados existentes utilizando a extensão %1$sGoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/ru.json b/app/plugins/CoreAdminHome/lang/ru.json
index e899faea3..ae6d2d128 100644
--- a/app/plugins/CoreAdminHome/lang/ru.json
+++ b/app/plugins/CoreAdminHome/lang/ru.json
@@ -28,6 +28,7 @@
         "HttpTrackingApiDescription": "%1$sHTTP Tracking API%2$s позволяет отслеживать что угодно. Это может быть полезно, если вы используете язык программирования, для которого еще нет SDK. Это также может быть полезно, если вы хотите отслеживать устройства или приложения особым образом.",
         "JSTracking_CampaignKwdParam": "Параметр Ключевого слова кампании",
         "JSTracking_CampaignNameParam": "Параметр Имени кампании",
+        "JSTracking_CodeNoteBeforeClosingHead": "Убедитесь, что этот код находится на каждой странице вашего вебсайта. Мы рекомендуем вставить его непосредственно перед закрывающим %1$s тегом.",
         "JSTracking_CustomCampaignQueryParam": "Использовать пользовательские имена параметров в запросе для названия кампании и ключевого слова",
         "JSTracking_CrossDomain": "По умолчанию, ID посетителя, которое идентифицирует уникального посетителя, хранится в файлах cookies браузера, которые доступны только страницам этого же домена. Включение кросс-доменной связи позволяет вам отслеживать все действия и просмотры страниц определенного пользователя за одно посещение, даже если он просматривал страницы на нескольких доменах. Когда пользователь нажимает на одну из ссылок на вашем веб-сайте , будет добавлен параметр URL pk_vid, возвращающий ID посетителя.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Примечание: чтобы использовать кросс-доменное соединение, вы должны указать более одного домена (URL) для своего сайта.",
diff --git a/app/plugins/CoreAdminHome/lang/sq.json b/app/plugins/CoreAdminHome/lang/sq.json
index 9ee551597..64ebe6f3d 100644
--- a/app/plugins/CoreAdminHome/lang/sq.json
+++ b/app/plugins/CoreAdminHome/lang/sq.json
@@ -4,6 +4,7 @@
         "Administration": "Administrim",
         "ArchivingSettings": "Rregullime arkivimi",
         "BrandingSettings": "Rregullime marke",
+        "ErrorEmailFromAddressNotValid": "Adresa SMTP për fushën Nga s’është e vlefshme",
         "ReleaseChannel": "Kanal hedhjesh në qarkullim",
         "ClickHereToOptIn": "Klikoni këtu për të kryer \"opt in\"",
         "ClickHereToOptOut": "Klikoni këtu për të kryer \"opt out\".",
@@ -29,6 +30,7 @@
         "JSTracking_CampaignKwdParam": "Parametër Fjalëkyçesh Fushatash",
         "JSTracking_CampaignNameParam": "Parametër Emrash Fushatash",
         "JSTracking_CodeNoteBeforeClosingHead": "Bëni të mundur që ky kod të gjendet në çdo faqe të sajtit tuaj. Këshillojmë ta ngjitni mu para etiketës mbyllëse %1$s.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Bëni të mundur që ky kod të jetë i trupëzuar brenda një elementi programthi në çdo faqe të sajtit tuaj. Këshillojmë ta ngjitni mu para etiketës mbyllëse të kreut.",
         "JSTracking_CustomCampaignQueryParam": "Përdorni emra vetjakë parametrash kërkese për emra & fjalëkyçe të fushatës",
         "JSTracking_CrossDomain": "Si parazgjedhje, ID-ja e vizitorit që identifikon një vizitor unik depozitohet në cookies shfletuesi nga pala e interesuar, të cilat mund të lexohen vetëm nga faqe të së njëjtës përkatësi. Aktivizimi i lidhjes nga përkatësia në përkatësi ju lejon të ndiqni krejt veprimet dhe parjet e faqeve të një vizitori të dhënë për të njëjtën vizitë edhe kur ai sheh faqe në disa përkatësi. Kurdo që një përdorues klikon mbi një lidhje te një nga URL-të alias të sajtit tuaj, do të shtohet një parametër URL-je pk_vid që jep ID-në e Vizitorit.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Që të mund të përdorni lidhje ndërpërkatësore, duhet të përcaktoni më shumë se një emër përkatësie (URL-ra) për sajtin tuaj.",
@@ -53,7 +55,8 @@
         "JSTracking_EndNote": "Shënim: Te ndarja %1$sKod Ndjekjeje%2$s e përgjegjësit mund të prodhoni kod vetjak ndjekjesh.",
         "JSTrackingIntro1": "Vizitorët në sajtin tuaj mund t’i ndiqni në mjaft rrugë të ndryshme. Rruga e këshilluar për ta bërë është përmes JavaScript-it. Që të përdoret kjo metodë, duhet të garantoni që çdo faqe e sajtit tuaj të përmbajë një copëz kodi JavaScript, të cilin mund ta prodhoni nga këtu.",
         "JSTrackingIntro2": "Pasi të keni kodin JavaScript të ndjekjeve për sajtin tuaj, kopjojeni dhe hidheni te krejt faqet që dëshironi të ndiqet me Matomo.",
-        "JSTrackingIntro3b": "Në shumicën e sajteve, blogjeve, CMS-ve, etj. mund të përdorni shtojca të parapërgatitura që do të bënin për ju punën teknike. (Shihni %1$slistën tonë të shtojcave të përdorura për të integruar Matomo-n%2$s.) Nëse s’ka shtojcë të tillë, mund të përpunoni gjedhet e sajtit tuaj dhe të shtoni kodin e gjurmimit JavaScript te etiketa &lt;\/head&gt;, e cila shpesh përkufizohet brenda një kartele gjedhe 'header.php', 'header.tpl' ose të ngjashme.",
+        "JSTrackingIntro3a": "Në shumicën e sajteve, blogjeve, CMS-ve, etj. mund të përdorni një shtojcë të gatshme, për të bërë punën teknike në vendin tuaj. (Shihni %1$slistën tonë të shtojcave të përdorura për integrim të Matomo-s%2$s).",
+        "JSTrackingIntro3b": "Nëse s’ka shtojcë të tillë, mund të përpunoni gjedhet e sajtit tuaj dhe të shtoni kodin e gjurmimit JavaScript te etiketa &lt;\/head&gt;, e cila shpesh përkufizohet brenda një kartele gjedhe 'header.php', 'header.tpl' ose të ngjashme.",
         "JSTrackingIntro4": "Nëse s’doni të përdorni JavaScript-in për ndjekje vizitorësh, %1$sprodhoni më poshtë një lidhje ndjekjeje figurash%2$s.",
         "JSTrackingIntro5": "Nëse dëshironi të bëni më shumë se sa thjesht ndjekje parjesh të faqeve, ju lutemi, hidhini një sy %1$sdokumentimit të Ndjekjeve Matomo me Javascript%2$s për listën e plotë të funksioneve të mundshëm. Duke përdorur këto funksione mund të ndiqni objektiva, ndryshore vetjake, porosi e-tregtie, shporta të braktisura, etj.",
         "LogoNotWriteableInstruction": "Që të përdorni logon tuaj vetjake në vend të asaj parazgjedhje të Matomo-s, jepni të drejta shkrimi mbi këtë drejtori: %1$s Matomo lyp hyrje shkrimi për logot tuaja të depozituara në kartelat %2$s.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Jeni i sigurt se doni të fshihet ky dështim ndjekje?",
         "TrackingFailuresEmailSubject": "Dështime ndjekjeje te Matomo Analytics juaj",
         "TrackingFailuresEmail1": "Kjo bëhet vetëm për t’ju bërë të ditur se ditët e fundit kanë ndodhur %s lloje të ndryshme dështimesh ndjekjeje.",
-        "TrackingFailuresEmail2": "Që të shihni krejt kërkesat me ndjekje të dështuar %1$sklikoni këtu%2$s."
+        "TrackingFailuresEmail2": "Që të shihni krejt kërkesat me ndjekje të dështuar %1$sklikoni këtu%2$s.",
+        "ImportFromGoogleAnalytics": "Importim prej Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Nëse keni një zotërim Google Analytics dhe po kaloni në Matomo, mund të importoni të dhënat tuaja ekzistuese duke përdorur shtojcën %1$sGoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/sv.json b/app/plugins/CoreAdminHome/lang/sv.json
index 2a62ac828..6ef44549f 100644
--- a/app/plugins/CoreAdminHome/lang/sv.json
+++ b/app/plugins/CoreAdminHome/lang/sv.json
@@ -4,6 +4,7 @@
         "Administration": "Administration",
         "ArchivingSettings": "Inställningar för arkivering",
         "BrandingSettings": "Varumärkesinställningar",
+        "ErrorEmailFromAddressNotValid": "SMTP-adressen är inte giltig",
         "ReleaseChannel": "Lanseringskanal",
         "ClickHereToOptIn": "Klicka här för att gå med.",
         "ClickHereToOptOut": "Klicka här för att gå ur.",
@@ -29,6 +30,7 @@
         "JSTracking_CampaignKwdParam": "Parameter för nyckelorden i kampanjen",
         "JSTracking_CampaignNameParam": "villkor för kampanjnamn",
         "JSTracking_CodeNoteBeforeClosingHead": "Se till att den här koden finns på varje sida på din webbplats. Vi rekommenderar att den klistras in precis innan den avslutande %1$s-taggen.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Försäkra dig om att denna kod läggs till inom ett skriptelement på varje sida av din webbplats. Vi rekommenderar att klistra in den precis före den avslutande head-taggen.",
         "JSTracking_CustomCampaignQueryParam": "Använd den egna förfrågan för parameterns namn för kampanjnamn och nyckelord",
         "JSTracking_CrossDomain": "Som standard lagras besökarens ID i webbläsarens förstapartscookies som bara kan nås från samma domän. Genom att möjliggöra cross domain-länkning kan du spåra alla aktiviteter och sidvisningar av en användare även om de besöker flera olika domäner. När en användare klickar på en länk till en alias-URL kommer den lägga till URL-parametern pk_vid för att vidarebefordra besökarens ID.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Notering: Om du vill använda korsdomän måste du ange mer än ett domännamn (webbadresser) för din webbplats.",
@@ -53,6 +55,8 @@
         "JSTracking_EndNote": "OBS: Du kan skapa anpassad spårkningskod under %1$sSpårningskod %2$si administrationsgränssnittet.",
         "JSTrackingIntro1": "Du kan spåra din webbplats besökare på många olika vis. Det rekommenderade sättet att göra det är med hjälp av JavaScript. För att använda den här metoden behöver du se till att varje sida på din webbplats innehåller lite JavaScript-kod, som du kan skapa här.",
         "JSTrackingIntro2": "När du har JavaScripts spårningskod till din webbsida, kopiera och klistra in det på alla sidor du vill spåra med Matomo.",
+        "JSTrackingIntro3a": "På de flesta webbplatser, bloggar, CMS:er osv kan du använda ett förberett insticksprogram som gör det tekniska arbetet åt dig. (Se vår %1$s lista med insticksprogram som används för att integrera Matomo %2$s.)",
+        "JSTrackingIntro3b": "Om det inte finns något insticksprogram kan du redigera din webbplats mallar och lägga till JavaScript spårningskoden till taggen &lt;\/head&gt; vilken ofta definieras i 'header.php', 'header.tpl' eller liknande fil för mallar.",
         "JSTrackingIntro4": "Om du inte vill använda JavaScript för att spåra besökare, %1$sgenerera en bild spårningslänk nedan%2$s.",
         "JSTrackingIntro5": "Om du vill göra mer än att spåra antal sedda sidor, titta på %1$sMatomos lista av dokumentation för Javascripts Spårning%2$s, där hittar du en lista med tillgängliga funktioner. Använd dessa funktioner för att spåra mål, skräddarsy variabler, e-handel, övergivna korgar med mera.",
         "LogoNotWriteableInstruction": "Om du vill använda din egen logotyp istället för Matomos logotyp, se till så att det finns skrivrättigheter till denna katalog: %1$s. Matomo behöver skrivrättighet för dina logotyper som lagras i filerna %2$s.",
@@ -130,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Är du säker på att du vill radera detta misslyckade spårningsförsöket?",
         "TrackingFailuresEmailSubject": "Misslyckade spårningsförsök i ditt Matomo Analytics",
         "TrackingFailuresEmail1": "Bara så du vet, har %s olika sorters misslyckade spårningsförsök inträffat de senaste dagarna.",
-        "TrackingFailuresEmail2": "%1$sKlicka här%2$s för att visa samtliga misslyckade spårningsförsök."
+        "TrackingFailuresEmail2": "%1$sKlicka här%2$s för att visa samtliga misslyckade spårningsförsök.",
+        "ImportFromGoogleAnalytics": "Importera från Google Analytics",
+        "ImportFromGoogleAnalyticsDescription": "Om du har en Google Analytics egendom och byter till Matomo kan du importera dina befintliga data genom att använda insticksprogram %1$s GoogleAnalyticsImporter%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/tr.json b/app/plugins/CoreAdminHome/lang/tr.json
index 773ea5f17..bf9d4b3cf 100644
--- a/app/plugins/CoreAdminHome/lang/tr.json
+++ b/app/plugins/CoreAdminHome/lang/tr.json
@@ -4,6 +4,7 @@
         "Administration": "Yönetim",
         "ArchivingSettings": "Arşivleme ayarları",
         "BrandingSettings": "Markalama ayarları",
+        "ErrorEmailFromAddressNotValid": "SMTP kimden adresi geçersiz",
         "ReleaseChannel": "Dağıtım kanalı",
         "ClickHereToOptIn": "İzin vermek için tıklayın.",
         "ClickHereToOptOut": "İzni iptal etmek için tıklayın.",
@@ -29,6 +30,7 @@
         "JSTracking_CampaignKwdParam": "Kampanya Anahtar Sözcük Parametreleri",
         "JSTracking_CampaignNameParam": "Kampanya Adı Parametresi",
         "JSTracking_CodeNoteBeforeClosingHead": "Bu kodun web sitenizin her sayfasında bulunduğundan emin olun. Kodu %1$s kapanış kod iminin hemen öncesine yapıştırmanız önerilir.",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "Bu kodun web sitenizin her sayfasında bulunduğundan emin olun. Kodu head kod iminin kapanışının hemen öncesine yapıştırmanız önerilir.",
         "JSTracking_CustomCampaignQueryParam": "Kampanya adı ve anahtar sözcük için özel sorgu parametresi adları kullanılsın",
         "JSTracking_CrossDomain": "Varsayılan olarak, yalnız aynı etki alanındaki sayfalar tarafından erişilen ve web tarayıcının birinci elden çerezlerinde bulunarak tekil ziyaretçiyi tanımlayan ziyaretçi kodu. Etki alanları arası bağlantılar etkinleştirildiğinde aynı ziyarette farklı etki alanlarındaki sayfaları ziyaret ediyor olsa bile belirli bir kullanıcının tüm işlem ve sayfa görüntülemeleri izlenebilir. Bir kullanıcı web sitelerinizden birinin kısaltma adresinin bağlantısına tıkladığında, adrese ziyaretçi kodunu ileten bir pk_vid parametresi eklenir.",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "Not: Etki alanları arası bağlantıları kullanırken web siteniz için birden fazla etki alanı (adres) belirtmelisiniz.",
@@ -53,7 +55,8 @@
         "JSTracking_EndNote": "Not: Yönetim bölümündeki %1$sİzleme Kodu%2$s ile özel bir izleme kodu oluşturabilirsiniz.",
         "JSTrackingIntro1": "Web sitenize gelen ziyaretçileri birkaç farklı yolla izleyebilirsiniz. JavaScript yönteminin kullanılması önerilir. Bu yöntemi kullanabilmek için, buradan üretebileceğiniz JavaScript kodunun web sitenizin tüm sayfalarına ekleneceğinden emin olmalısınız.",
         "JSTrackingIntro2": "JavaScript izleme kodunu Matomo ile izlemek istediğiniz web sitesinin tüm sayfalarına ya da içerik yönetimi sistemindeki uygun bölüme yapıştırın.",
-        "JSTrackingIntro3b": "Blog, CMS gibi çoğu web sitesinde teknik işleri sizin için yapacak bir uygulama eki bulunur (%1$sMatomo ile birlikte çalışan uygulama ekleri%2$s listesine bakın). Size uygun bir uygulama eki yoksa web sitenizin sayfa kalıplarını düzenleyerek JavaScript izleme kodunu, genellikle 'header.php', 'header.tpl' gibi bir adı olan dosyada bulunan &lt;\/head&gt; kod imi içine ekleyebilirsiniz.",
+        "JSTrackingIntro3a": "Blog, CMS gibi çoğu web sitesinde teknik işleri sizin için yapacak bir uygulama eki bulunur (%1$sMatomo ile birlikte çalışan uygulama ekleri%2$s listesine bakın).",
+        "JSTrackingIntro3b": "Size uygun bir uygulama eki yoksa web sitenizin sayfa kalıplarını düzenleyerek JavaScript kodunu, genellikle 'header.php', 'header.tpl' gibi bir adı olan dosyada bulunan &lt;\/head&gt; kod imi içine ekleyebilirsiniz.",
         "JSTrackingIntro4": "Ziyaretçileri izlemek için JavaScript kodunu kullanmak istemiyorsanız %1$saşağıdaki bağlantıya tıklayarak bir izleme görseli oluşturabilirsiniz%2$s.",
         "JSTrackingIntro5": "Sayfa görüntülenme sayısından fazlasını izlemek istiyorsanız, lütfen %1$sMatomo JavaScript izleme belgesi%2$s içinden kullanabileceğiniz işlevlere bakın. Bu işlevleri kullanarak hedefleri, özel değişkenleri, e-ticaret siparişlerini, terk edilen sepetleri ve başka bilgileri izleyebilirsiniz.",
         "LogoNotWriteableInstruction": "Varsayılan Matomo logosu yerine özel bir logo görseli kullanmak için şu klasöre yazma izni vermelisiniz: %1$s Matomo uygulamasının %2$s dosyalarındaki logolara yazma izni olmalıdır.",
@@ -131,6 +134,8 @@
         "ConfirmDeleteThisTrackingFailure": "Bu izleme sorununu silmek istediğinize emin misiniz?",
         "TrackingFailuresEmailSubject": "Matomo İstatistiklerindeki izleme sorunları",
         "TrackingFailuresEmail1": "Bu ileti, son günlerde %s farklı izleme sorunu oluştuğunu bildirir.",
-        "TrackingFailuresEmail2": "Tüm izleme sorunlarını görüntülemek için %1$sburaya tıklayın%2$s."
+        "TrackingFailuresEmail2": "Tüm izleme sorunlarını görüntülemek için %1$sburaya tıklayın%2$s.",
+        "ImportFromGoogleAnalytics": "Google Analytics Üzerinden İçe Aktar",
+        "ImportFromGoogleAnalyticsDescription": "Bir Google Analytics mülkünüz varsa ve Matomo uygulamasına geçiyorsanız, %1$sGoogleAnalyticsImporter%2$s uygulama ekini kullanarak var olan verilerinizi içe aktarabilirsiniz."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/lang/zh-cn.json b/app/plugins/CoreAdminHome/lang/zh-cn.json
index 2ed7ca780..c653825d1 100644
--- a/app/plugins/CoreAdminHome/lang/zh-cn.json
+++ b/app/plugins/CoreAdminHome/lang/zh-cn.json
@@ -4,6 +4,7 @@
         "Administration": "管理",
         "ArchivingSettings": "归档设置",
         "BrandingSettings": "图标设置",
+        "ErrorEmailFromAddressNotValid": "SMTP发件人地址无效",
         "ReleaseChannel": "发布通道",
         "ClickHereToOptIn": "点这里主动加入。",
         "ClickHereToOptOut": "点这里主动退出。",
@@ -11,6 +12,7 @@
         "CorsDomainsHelp": "你可以在此处定义跨域访问的白名单域名（用于解决开发者工具中出现的CROS错误），填写的值应该形如： http:\/\/你的域名.com或 http:\/\/子域名.你的域名.com 你也可以使用“*”作为通配符来添加多个子域名，如：http:\/\/*.你的域名.com",
         "CustomLogoFeedbackInfo": "如果您定制了 Matomo 图标，那您可能也想在顶部菜单隐藏 %1$s 链接。在 %2$s管理插件%3$s 页面禁用反馈（Feedback）插件就可以了。",
         "CustomLogoHelpText": "您可以定制 Matomo 图标，它会显示在用户界面和报表邮件中。",
+        "DevelopmentProcess": "虽然我们的开发过程包括数千个自动化测试，但Beta测试人员在实现Matomo中的“无错误策略”方面发挥着关键作用。",
         "EmailServerSettings": "邮件服务器设置",
         "ForBetaTestersOnly": "仅限 Beta 测试者",
         "ImageTracking": "使用img标签追踪",
@@ -23,8 +25,12 @@
         "InvalidPluginsWarning": "以下插件不兼容 %1$s，无法加载：%2$s。",
         "InvalidPluginsYouCanUninstall": "您可以在%1$s插件管理%2$s页面更新或者卸载这些插件。",
         "JavaScriptTracking": "JavaScript 追踪",
+        "HttpTrackingApi": "HTTP Tracking API",
+        "HttpTrackingApiDescription": "%1$s跟踪API%2$s允许您跟踪任何内容。 如果您使用的是尚未存在SDK的编程语言，这可能很有用。 当您想要以特殊方式跟踪设备或应用程序时，它也可能很有用。",
         "JSTracking_CampaignKwdParam": "广告活动关键词参数",
         "JSTracking_CampaignNameParam": "广告活动名称参数",
+        "JSTracking_CodeNoteBeforeClosingHead": "确保此代码位于您网站的每个页面上。 我们建议在结束%1$s标签之前立即粘贴它。",
+        "JSTracking_CodeNoteBeforeClosingHeadEmail": "确保此代码嵌入在您网站的每个页面上的脚本元素中。 我们建议在关闭头标签之前立即粘贴它。",
         "JSTracking_CustomCampaignQueryParam": "广告活动名称和关键词使用自定义搜索参数",
         "JSTracking_CrossDomain": "用来辨识独立访客的访问者 ID 默认被储存在浏览器的第一方 \u0004Cookies 中，并且只能被相同域名的网页访问。启用跨域链接将能辨识出某位用户在不同域名下的活动和页面访问是同一位用户所为。每当用户点击任何一个您网站的别名地址，都会在网址后方添加参数 pk_vid 来传递访问者 ID。",
         "JSTracking_CrossDomain_NeedsMultipleDomains": "注意：如果使用跨越链接，请为你的网站指定一个以上的域名（URL）。",
@@ -47,7 +53,10 @@
         "JSTracking_VisitorCustomVars": "为此访客追踪自定义变量",
         "JSTracking_VisitorCustomVarsDesc": "例如，使用变量名“类型”，值“顾客”。",
         "JSTracking_EndNote": "提示：您可以在管理模块的%1$s跟踪代码%2$s页面中生成自定义的追踪代码。",
+        "JSTrackingIntro1": "您可以通过多种不同方式跟踪您网站的访问者。 推荐的方法是通过JavaScript。 要使用此方法，您必须确保您网站的每个网页都有一些JavaScript代码，您可以在此处生成这些代码。",
         "JSTrackingIntro2": "当有了网站的 JavaScript 追踪代码，您就可以复制并粘贴到所有需要 Matomo 追踪的页面上。",
+        "JSTrackingIntro3a": "在大多数网站，博客，CMS等中，您可以使用预制插件为您完成技术工作。 （参见用于集成Matomo%1$s的%2$s插件。）",
+        "JSTrackingIntro3b": "如果不存在插件，则可以编辑网站模板，并将JavaScript跟踪代码添加到标记中，该标记通常在“header.php”、“header.tpl”或类似的模板文件中定义。",
         "JSTrackingIntro4": "如果您不想用 JavaScript 来追踪访客，%1$s在下面生成img标签追踪链接%2$s。",
         "JSTrackingIntro5": "如果您不只是想追踪页面访问，请查看 %1$sMatomo Javascript 追踪文档%2$s 中的更多功能列表。通过这些功能，您可以追踪目标、自定义变量、电子商务订单、被放弃的购物车等等。",
         "LogoNotWriteableInstruction": "要使用您的自定义图标替代 Matomo 默认的，请给予此文件夹写入权限：%1$s。Matomo 需要%2$s的写入权限以便将您的图标存储下来。",
@@ -65,6 +74,7 @@
         "OptOutCompleteBis": "注意：如果您清空了浏览器的 Cookies、删除了退出追踪的 Cookie 或是您更换了电脑或浏览器，您需要重新执行选择退出追踪的操作。",
         "OptOutDntFound": "您的访问没有被记录，因为您的浏览器禁止追踪（Do Not Track）。这是您的浏览器的设置，所以除非您关闭禁止追踪，否则无法记录、追踪您的访问。",
         "OptOutExplanation": "Matomo 致力于互联网隐私保护。要让您的访客可以选择退出 Matomo 网页分析追踪，您可以在类似隐私保护的某个网页上添加以下 HTML 代码。",
+        "OptOutExplanationIntro": "此代码将显示一个Iframe，其中包含一个链接，供访问者通过在浏览器中设置退出Cookie来选择退出Matomo。 请参阅下文（或%1$s点击此处%2$s）查看iFrame将显示的内容。",
         "OptOutForYourVisitors": "访客选择退出 Matomo 追踪",
         "PiwikIsInstalledAt": "Matomo 安装在",
         "PersonalPluginSettings": "个人插件设置",
@@ -84,22 +94,48 @@
         "SystemPluginSettings": "系统插件设置",
         "TrackAGoal": "追踪目标",
         "TrackingCode": "追踪代码",
+        "TrackingCodeIntro": "Matomo为您提供各种方法来嵌入您的网站，移动应用程序，甚至任何设备或应用程序的跟踪代码。",
         "TrustedHostConfirm": "您确定要变更 Matomo 信任的域名？",
         "TrustedHostSettings": "受 Matomo 信任的域名",
+        "UiDemo": "UI演示",
         "UpdateSettings": "更新设置",
         "UseCustomLogo": "使用自定义图标",
         "ValidPiwikHostname": "有效的 Matomo 域名",
         "WithOptionalRevenue": "选填的收入",
         "YouAreOptedOut": "您目前选择退出追踪。",
+        "YouAreNotOptedOut": "您没有选择退出。",
         "YouMayOptOut": "您可以选择不让您的电脑分配唯一的网站分析 Cookie 标识编码，以避免被此网站搜集和分析访问数据。",
         "YouMayOptOutBis": "想要如此的话，请点击下方以设置一个选择退出追踪的 Cookie 记录。",
         "OptingYouOut": "正在帮您设置选择退出追踪，请稍候……",
         "ProtocolNotDetectedCorrectly": "您目前正在以安全 SSL 连接（HTTPS）查看 Matomo，但 Matomo 服务器上只检测到非安全连接。",
         "ProtocolNotDetectedCorrectlySolution": "为了确保 Matomo 通过 HTTPS 来安全地请求和响应您的内容，您可以编辑%1$s 文件，要么配置代理设置，要么在%3$s下添加代码%2$s。 %4$s了解详情%5$s",
+        "YouMayOptOut2": "您可以选择阻止此网站汇总和分析您在此处执行的操作。",
+        "YouMayOptOut3": "这样做可以保护您的隐私，但也会阻止所有者从您的行为中学习，并为您和其他用户创造更好的体验。",
         "UncheckToOptOut": "取消勾选此复选框以防止数据追踪",
         "CheckToOptIn": "勾选此复选框以接受数据追踪",
+        "MissingTrackingCodeEmailSubject": "Matomo Analytics中没有记录%s的流量，现在开始使用",
+        "JsTrackingCodeMissingEmail1": "几天前，您将网站“%s”添加到您的Matomo Analytics。 我们刚检查过，您的Matomo似乎没有任何此网站的流量记录。",
+        "JsTrackingCodeMissingEmail2": "要开始跟踪数据并深入了解用户，您需要在自己的网站或移动应用中设置跟踪功能。 对于网站，只需在%s标记之前嵌入跟踪代码。",
+        "JsTrackingCodeMissingEmail3": "要查找和自定义跟踪代码，%1$s点击此处%2$s（或查看%3$s JavaScript跟踪客户端指南%4$s）。",
+        "TrackingFailuresIntroduction": "此页面列出了在过去的%s天内发生的跟踪失败。 请注意，只记录最常见的追踪故障，而不是全部记录。",
         "NoKnownFailures": "暂无已知的错误追踪分析数据",
+        "Problem": "问题",
+        "Solution": "解",
+        "TrackingURL": "追踪网址",
+        "LearnMore": "学到更多",
+        "DeleteAllFailures": "删除所有失败",
+        "NTrackingFailures": "%s跟踪失败",
+        "ViewAllTrackingFailures": "查看所有跟踪失败",
+        "TrackingFailureInvalidSiteProblem": "该网站不存在。",
+        "TrackingFailureInvalidSiteSolution": "更新跟踪器中已配置的idSite。",
+        "TrackingFailureAuthenticationProblem": "请求未经过身份验证，但需要身份验证。",
+        "TrackingFailureAuthenticationSolution": "在跟踪请求中设置或更正“token_auth”。",
         "ConfirmDeleteAllTrackingFailures": "您确定要删除所有错误追踪记录吗？",
-        "ConfirmDeleteThisTrackingFailure": "您确定要删除这条错误追踪记录吗？"
+        "ConfirmDeleteThisTrackingFailure": "您确定要删除这条错误追踪记录吗？",
+        "TrackingFailuresEmailSubject": "在您的Matomo Analytics中跟踪故障",
+        "TrackingFailuresEmail1": "这只是为了让您知道%s在过去几天发生了不同类型的跟踪失败。",
+        "TrackingFailuresEmail2": "要查看所有失败的跟踪请求%1$s，请点击此处%2$s。",
+        "ImportFromGoogleAnalytics": "从Google Analytics（分析）导入",
+        "ImportFromGoogleAnalyticsDescription": "如果您拥有Google Analytics（分析）媒体资源，并且要切换到Matomo，则可以使用%1$s GoogleAnalyticsImporter%2$s插件导入现有数据。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreAdminHome/templates/generalSettings.twig b/app/plugins/CoreAdminHome/templates/generalSettings.twig
index 8f0ef412b..d959492b8 100644
--- a/app/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/app/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -51,7 +51,7 @@
                     {{ 'General_ReportsContainingTodayWillBeProcessedAtMostEvery'|translate }}
                 </h3>
                 <div class="input-field col s12 m6">
-                    <input  type="text" value='{{ todayArchiveTimeToLive  }}' id='todayArchiveTimeToLive' {% if not isGeneralSettingsAdminEnabled %}disabled="disabled"{% endif %} />
+                    <input  type="text" value='{{ todayArchiveTimeToLive|e('html_attr') }}' id='todayArchiveTimeToLive' {% if not isGeneralSettingsAdminEnabled %}disabled="disabled"{% endif %} />
                     <span class="form-description">
                         {{ 'General_RearchiveTimeIntervalOnlyForTodayReports'|translate }}
                     </span>
@@ -93,26 +93,26 @@
                 <div piwik-field uicontrol="text" name="mailHost"
                      ng-model="mailSettings.mailHost"
                      data-title="{{ 'General_SmtpServerAddress'|translate|e('html_attr') }}"
-                     value="{{ mail.host }}">
+                     value="{{ mail.host|e('html_attr') }}">
                 </div>
 
                 <div piwik-field uicontrol="text" name="mailPort"
                      ng-model="mailSettings.mailPort"
                      data-title="{{ 'General_SmtpPort'|translate|e('html_attr') }}"
-                     value="{{ mail.port }}" inline-help="{{ 'General_OptionalSmtpPort'|translate|e('html_attr') }}">
+                     value="{{ mail.port|e('html_attr') }}" inline-help="{{ 'General_OptionalSmtpPort'|translate|e('html_attr') }}">
                 </div>
 
                 <div piwik-field uicontrol="select" name="mailType"
                      ng-model="mailSettings.mailType"
                      data-title="{{ 'General_AuthenticationMethodSmtp'|translate|e('html_attr') }}"
                      options="{{ mailTypes|json_encode }}"
-                     value="{{ mail.type }}" inline-help="{{ 'General_OnlyUsedIfUserPwdIsSet'|translate|e('html_attr') }}">
+                     value="{{ mail.type|e('html_attr') }}" inline-help="{{ 'General_OnlyUsedIfUserPwdIsSet'|translate|e('html_attr') }}">
                 </div>
 
                 <div piwik-field uicontrol="text" name="mailUsername"
                      ng-model="mailSettings.mailUsername"
                      data-title="{{ 'General_SmtpUsername'|translate|e('html_attr') }}"
-                     value="{{ mail.username }}" inline-help="{{ 'General_OnlyEnterIfRequired'|translate|e('html_attr') }}"
+                     value="{{ mail.username|e('html_attr') }}" inline-help="{{ 'General_OnlyEnterIfRequired'|translate|e('html_attr') }}"
                      autocomplete="off">
                 </div>
 
@@ -129,11 +129,25 @@
                      autocomplete="off">
                 </div>
 
+                <div piwik-field uicontrol="text" name="mailFromAddress"
+                     ng-model="mailSettings.mailFromAddress"
+                     title="{{ 'General_SmtpFromAddress'|translate|e('html_attr') }}"
+                     value="{{ mail.noreply_email_address|e('html_attr') }}" inline-help="{{ 'General_SmtpFromEmailHelp'|translate(mailHost)|e('html_attr') }}"
+                     autocomplete="off">
+                </div>
+
+                <div piwik-field uicontrol="text" name="mailFromName"
+                     ng-model="mailSettings.mailFromName"
+                     title="{{ 'General_SmtpFromName'|translate|e('html_attr') }}"
+                     value="{{ mail.noreply_email_name|e('html_attr') }}" inline-help="{{ 'General_NameShownInTheSenderColumn'|translate|e('html_attr') }}"
+                     autocomplete="off">
+                </div>
+
                 <div piwik-field uicontrol="select" name="mailEncryption"
                      ng-model="mailSettings.mailEncryption"
                      data-title="{{ 'General_SmtpEncryption'|translate|e('html_attr') }}"
                      options="{{ mailEncryptions|json_encode }}"
-                     value="{{ mail.encryption }}" inline-help="{{ 'General_EncryptedSmtpTransport'|translate|e('html_attr') }}">
+                     value="{{ mail.encryption|e('html_attr') }}" inline-help="{{ 'General_EncryptedSmtpTransport'|translate|e('html_attr') }}">
                 </div>
             </div>
 
@@ -142,6 +156,83 @@
     </div>
 {% endif %}
 
+{% if customLogoEnabled %}
+<div piwik-content-block content-title="{{ 'CoreAdminHome_BrandingSettings'|translate|e('html_attr') }}">
+
+    <div piwik-form ng-controller="BrandingController as brandingSettings">
+
+        <p>{{ 'CoreAdminHome_CustomLogoHelpText'|translate }}</p>
+
+        {% set help -%}
+            {% set giveUsFeedbackText %}"{{ 'General_GiveUsYourFeedback'|translate }}"{% endset %}
+            {{ 'CoreAdminHome_CustomLogoFeedbackInfo'|translate(giveUsFeedbackText,"<a href='?module=CorePluginsAdmin&action=plugins' rel='noreferrer noopener' target='_blank'>","</a>")|raw }}
+        {%- endset %}
+
+        <div piwik-field uicontrol="checkbox" name="useCustomLogo"
+             ng-model="brandingSettings.enabled"
+             ng-change="brandingSettings.toggleCustomLogo()"
+             data-title="{{ 'CoreAdminHome_UseCustomLogo'|translate|e('html_attr') }}"
+             value="{% if branding.use_custom_logo == 1 %}1{% endif %}"
+             {% if isPluginsAdminEnabled %}inline-help="{{ help|e('html_attr') }}"{% endif %}>
+        </div>
+
+        <div id="logoSettings" ng-show="brandingSettings.enabled">
+            <form id="logoUploadForm" method="post" enctype="multipart/form-data" action="index.php?module=CoreAdminHome&format=json&action=uploadCustomLogo">
+                {% if fileUploadEnabled %}
+                    <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 piwik-field uicontrol="file" name="customLogo"
+                             ng-change="brandingSettings.updateLogo()"
+                             ng-model="brandingSettings.customLogo"
+                             data-title="{{ 'CoreAdminHome_LogoUpload'|translate|e('html_attr') }}"
+                             inline-help="{{ 'CoreAdminHome_LogoUploadHelp'|translate("JPG / PNG / GIF", 110)|e('html_attr') }}">
+                        </div>
+
+                        <div class="row">
+                            <div class="col s12">
+                                <img data-src="{{ pathUserLogo }}" data-src-exists="{{ hasUserLogo ? '1':'0' }}"
+                                     id="currentLogo" style="max-height: 150px"/>
+                            </div>
+                        </div>
+
+                        <div piwik-field uicontrol="file" name="customFavicon"
+                             ng-change="brandingSettings.updateLogo()"
+                             ng-model="brandingSettings.customFavicon"
+                             data-title="{{ 'CoreAdminHome_FaviconUpload'|translate|e('html_attr') }}"
+                             inline-help="{{ 'CoreAdminHome_LogoUploadHelp'|translate("JPG / PNG / GIF", 16)|e('html_attr') }}">
+                        </div>
+
+                        <div class="row">
+                            <div class="col s12">
+                                <img data-src="{{ pathUserFavicon }}" data-src-exists="{{ hasUserFavicon ? '1':'0' }}"
+                                     id="currentFavicon" width="16" height="16"/>
+                            </div>
+                        </div>
+
+                    {% else %}
+                        <div class="alert alert-warning">
+                            {{ 'CoreAdminHome_LogoNotWriteableInstruction'
+                                |translate("<code>"~pathUserLogoDirectory~"</code><br/>", pathUserLogo ~", "~ pathUserLogoSmall ~", "~ pathUserLogoSVG ~"")|raw }}
+                        </div>
+                    {% endif %}
+                {% else %}
+                    <div class="alert alert-warning">
+                        {{ 'CoreAdminHome_FileUploadDisabled'|translate("file_uploads=1") }}
+                    </div>
+                {% endif %}
+            </form>
+        </div>
+
+        <div onconfirm="brandingSettings.save()" saving="brandingSettings.isLoading" piwik-save-button></div>
+    </div>
+</div>
+{% endif %}
+
 {% if isDataPurgeSettingsEnabled %}
     <div piwik-content-block content-title="{{ 'PrivacyManager_DeleteDataSettings'|translate|e('html_attr') }}">
         <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }}</p>
diff --git a/app/plugins/CoreAdminHome/templates/home.twig b/app/plugins/CoreAdminHome/templates/home.twig
index 40cc7860c..2f8e8cb90 100644
--- a/app/plugins/CoreAdminHome/templates/home.twig
+++ b/app/plugins/CoreAdminHome/templates/home.twig
@@ -18,10 +18,11 @@
 
     {% if isSuperUser %}
         <div class="row">
-            {% if hasSystemSummary %}
-            <div class="col s12 {% if isFeedbackEnabled %}m4{% else %}m6{% endif %}">
-                <div piwik-widget-loader='{"module":"CoreHome","action":"getSystemSummary"}'></div>
-            </div>
+            {% if hasQuickLinks or hasSystemSummary %}
+                <div class="col s12 {% if isFeedbackEnabled %}m4{% else %}m6{% endif %}">
+                    {% if hasQuickLinks %}<div piwik-widget-loader='{"module":"CoreHome","action":"quickLinks"}'></div>{% endif %}
+                    {% if hasSystemSummary %}<div piwik-widget-loader='{"module":"CoreHome","action":"getSystemSummary"}'></div>{% endif %}
+                </div>
             {% endif %}
             {% if hasDiagnostics or hasTrackingFailures %}
                 <div class="col s12 {% if isFeedbackEnabled %}m4{% else %}m6{% endif %}">
@@ -33,11 +34,11 @@
                     {% endif %}
                 </div>
             {% endif %}
+            <div class="col s12 m4">
             {% if isFeedbackEnabled %}
-                <div class="col s12 m4">
-                    {{ feedbackHelp|raw }}
-                </div>
+                {{ feedbackHelp|raw }}
             {% endif %}
+            </div>
         </div>
     {% elseif isFeedbackEnabled %}
         {{ feedbackHelp|raw }}
diff --git a/app/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/app/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 6059f4bf6..652589717 100644
--- a/app/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/app/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -39,7 +39,7 @@
         <p>
             {{ 'CoreAdminHome_JSTrackingIntro1'|translate }}
             <br/><br/>
-            {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }}
+            {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3a'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate|raw }}
             <br/><br/>
             {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }}
             <br/><br/>
@@ -243,14 +243,22 @@
         </div>
 
         <div id="javascript-output-section">
-            <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
+            <div class="valign-wrapper trackingHelpHeader matchWidth">
+                <div>
+                    <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
 
-            <p>{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead'|translate("&lt;/head&gt;")|raw }}</p>
+                    <p>{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead'|translate("&lt;/head&gt;")|raw }}</p>
+                </div>
 
+                <button class="btn" id="emailJsBtn" ng-click="jsTrackingCode.sendEmail()">
+                    {{ 'SitesManager_EmailInstructionsButton'|translate }}
+                </button>
+            </div>
             <div id="javascript-text">
                 <pre piwik-select-on-focus class="codeblock"
                      ng-bind="jsTrackingCode.trackingCode"> </pre>
             </div>
+
         </div>
     </div>
 </div>
diff --git a/app/plugins/CoreConsole/Commands/CoreArchiver.php b/app/plugins/CoreConsole/Commands/CoreArchiver.php
index e1b3f2104..a4ce1d026 100644
--- a/app/plugins/CoreConsole/Commands/CoreArchiver.php
+++ b/app/plugins/CoreConsole/Commands/CoreArchiver.php
@@ -52,6 +52,7 @@ public static function makeArchiver($url, InputInterface $input)
         $archiver->maxConcurrentArchivers = $input->getOption('concurrent-archivers');
 
         $archiver->disableSegmentsArchiving = $input->getOption('skip-all-segments');
+        $archiver->skipSegmentsToday = $input->getOption('skip-segments-today');
 
         $segmentIds = $input->getOption('force-idsegments');
         $segmentIds = explode(',', $segmentIds);
@@ -101,6 +102,8 @@ public static function configureArchiveCommand(ConsoleCommand $command)
             'If specified, all segments will be skipped during archiving.');
         $command->addOption('force-idsites', null, InputOption::VALUE_OPTIONAL,
             'If specified, archiving will be processed only for these Sites Ids (comma separated)');
+        $command->addOption('skip-segments-today', null, InputOption::VALUE_NONE,
+            'If specified, segments will be only archived for yesterday, but not today. If the segment was created or changed recently, then it will still be archived for today and the setting will be ignored for this segment.');
         $command->addOption('force-periods', null, InputOption::VALUE_OPTIONAL,
             "If specified, archiving will be processed only for these Periods (comma separated eg. day,week,month,year,range)");
         $command->addOption('force-date-last-n', null, InputOption::VALUE_REQUIRED,
diff --git a/app/plugins/CoreConsole/config/config.php b/app/plugins/CoreConsole/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/CoreConsole/config/config.php
+++ b/app/plugins/CoreConsole/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreConsole/config/tracker.php b/app/plugins/CoreConsole/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CoreConsole/config/tracker.php
+++ b/app/plugins/CoreConsole/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreHome/Categories/GenericCategory.php b/app/plugins/CoreHome/Categories/GenericCategory.php
index 3d3cefe2d..a2bd78008 100644
--- a/app/plugins/CoreHome/Categories/GenericCategory.php
+++ b/app/plugins/CoreHome/Categories/GenericCategory.php
@@ -12,6 +12,6 @@
 
 class GenericCategory extends Category
 {
-    protected $id = 'General_Generic';
-    protected $order = 70;
+    protected $id = 'General_KpiMetric';
+    protected $order = 1;
 }
diff --git a/app/plugins/CoreHome/Columns/VisitFirstActionMinute.php b/app/plugins/CoreHome/Columns/VisitFirstActionMinute.php
index 545de365a..9365886d5 100644
--- a/app/plugins/CoreHome/Columns/VisitFirstActionMinute.php
+++ b/app/plugins/CoreHome/Columns/VisitFirstActionMinute.php
@@ -20,7 +20,7 @@ class VisitFirstActionMinute extends VisitDimension
     protected $columnName = 'visit_first_action_time';
     protected $type = self::TYPE_DATETIME;
 
-    protected $sqlSegment = 'HOUR(log_visit.visit_first_action_time)';
+    protected $sqlSegment = 'MINUTE(log_visit.visit_first_action_time)';
     protected $segmentName = 'visitStartServerMinute';
     protected $acceptValues = '0, 1, 2, 3, ..., 56, 57, 58, 59';
     protected $nameSingular = 'VisitTime_ColumnVisitStartServerMinute';
@@ -42,4 +42,4 @@ public function formatValue($value, $idSite, Formatter $formatter)
         return $value;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/plugins/CoreHome/CoreHome.php b/app/plugins/CoreHome/CoreHome.php
index e583ea540..29fe78c2c 100644
--- a/app/plugins/CoreHome/CoreHome.php
+++ b/app/plugins/CoreHome/CoreHome.php
@@ -106,7 +106,6 @@ public function getStylesheetFiles(&$stylesheets)
         $stylesheets[] = "plugins/CoreHome/stylesheets/dataTable.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/cloud.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css";
-        $stylesheets[] = "plugins/CoreHome/stylesheets/jqplotColors.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/sparklineColors.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/promo.less";
         $stylesheets[] = "plugins/CoreHome/stylesheets/color_manager.css";
@@ -130,6 +129,7 @@ public function getStylesheetFiles(&$stylesheets)
         $stylesheets[] = "plugins/CoreHome/angularjs/dropdown-menu/dropdown-menu.directive.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/sparkline/sparkline.component.less";
         $stylesheets[] = "plugins/CoreHome/angularjs/field-array/field-array.directive.less";
+        $stylesheets[] = "plugins/CoreHome/angularjs/comparisons/comparisons.component.less";
     }
 
     public function getJsFiles(&$jsFiles)
@@ -279,6 +279,9 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = "plugins/CoreHome/angularjs/field-array/field-array.directive.js";
         $jsFiles[] = "plugins/CoreHome/angularjs/field-array/field-array.controller.js";
 
+        $jsFiles[] = "plugins/CoreHome/angularjs/comparisons/comparisons.service.js";
+        $jsFiles[] = "plugins/CoreHome/angularjs/comparisons/comparisons.component.js";
+
         // we have to load these CoreAdminHome files here. If we loaded them in CoreAdminHome,
         // there would be JS errors as CoreAdminHome is loaded first. Meaning it is loaded before
         // any angular JS file is loaded etc.
@@ -303,6 +306,7 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/plugins/plugin-management.directive.js";
         $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/plugins/plugin-upload.directive.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/iframeResizer.min.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/iframeResizer.contentWindow.min.js";
     }
 
     public function getClientSideTranslationKeys(&$translationKeys)
@@ -461,5 +465,11 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreHome_PageDownShortcutDescription';
         $translationKeys[] = 'CoreHome_MacPageUp';
         $translationKeys[] = 'CoreHome_MacPageDown';
+        $translationKeys[] = 'General_ComputedMetricMax';
+        $translationKeys[] = 'General_XComparedToY';
+        $translationKeys[] = 'General_ComparisonCardTooltip1';
+        $translationKeys[] = 'General_ComparisonCardTooltip2';
+        $translationKeys[] = 'General_Comparisons';
+        $translationKeys[] = 'General_ClickToRemoveComp';
     }
 }
diff --git a/app/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/app/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
index f708515eb..38fd48fa2 100644
--- a/app/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
+++ b/app/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\CoreHome\DataTableRowAction;
 
 use Piwik\Common;
+use Piwik\Context;
 use Piwik\Piwik;
 
 /**
@@ -68,4 +69,28 @@ public function renderPopover($controller, $view)
 
         return parent::renderPopover($controller, $view);
     }
+
+    protected function getRowEvolutionGraphFromController(\Piwik\Plugins\CoreHome\Controller $controller)
+    {
+        // the row evolution graphs should not compare serieses
+        return Context::executeWithQueryParameters(['compareSegments' => [], 'comparePeriods' => [], 'compareDates' => []], function () use ($controller) {
+            return parent::getRowEvolutionGraphFromController($controller);
+        });
+    }
+
+    public function getRowEvolutionGraph($graphType = false, $metrics = false)
+    {
+        // the row evolution graphs should not compare serieses
+        return Context::executeWithQueryParameters(['compareSegments' => [], 'comparePeriods' => [], 'compareDates' => []], function () use ($graphType, $metrics) {
+            return parent::getRowEvolutionGraph($graphType, $metrics);
+        });
+    }
+
+    protected function getSparkline($metric)
+    {
+        // the row evolution graphs should not compare serieses
+        return Context::executeWithQueryParameters(['compareSegments' => [], 'comparePeriods' => [], 'compareDates' => []], function () use ($metric) {
+            return parent::getSparkline($metric);
+        });
+    }
 }
diff --git a/app/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/app/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 68b490dee..1da36555d 100644
--- a/app/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/app/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -17,6 +17,7 @@
 use Piwik\NumberFormatter;
 use Piwik\Period\Factory as PeriodFactory;
 use Piwik\Piwik;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz;
 use Piwik\Url;
 use Piwik\ViewDataTable\Factory;
@@ -126,7 +127,7 @@ public function renderPopover($controller, $view)
         // render main evolution graph
         $this->graphType = 'graphEvolution';
         $this->graphMetrics = $this->availableMetrics;
-        $view->graph = $controller->getRowEvolutionGraph($fetch = true, $rowEvolution = $this);
+        $view->graph = $this->getRowEvolutionGraphFromController($controller);
 
         // render metrics overview
         $view->metrics = $this->getMetricsToggles();
@@ -160,8 +161,9 @@ protected function loadEvolutionReport($column = false)
             'period'    => $this->period,
             'date'      => $this->date,
             'format'    => 'original',
-            'serialize' => '0'
+            'serialize' => '0',
         );
+
         if (!empty($this->segment)) {
             $parameters['segment'] = $this->segment;
         }
@@ -170,11 +172,54 @@ protected function loadEvolutionReport($column = false)
             $parameters['column'] = $column;
         }
 
+        $isComparing = DataComparisonFilter::isCompareParamsPresent();
+        if ($isComparing) {
+            $compareDates = Common::getRequestVar('compareDates', [], 'array');
+            $comparePeriods = Common::getRequestVar('comparePeriods', [], 'array');
+            $compareSegments = Common::getRequestVar('compareSegments', [], 'array');
+
+            $totalSeriesCount = (count($compareSegments) + 1) * (count($comparePeriods) + 1);
+
+            $unmodifiedSeriesLabels = [];
+            for ($i = 0; $i < $totalSeriesCount; ++$i) {
+                $unmodifiedSeriesLabels[] = DataComparisonFilter::getPrettyComparisonLabelFromSeriesIndex($i);
+            }
+
+            $parameters['compare'] = 1;
+
+            foreach ($comparePeriods as $index => $period) {
+                $date = $compareDates[$index];
+
+                if ($period == 'range') {
+                    $comparePeriods[$index] = 'day';
+                } else {
+                    list($newDate, $lastN) = EvolutionViz::getDateRangeAndLastN($period, $date);
+                    $compareDates[$index] = $newDate;
+                }
+            }
+
+            $parameters['compareDates'] = $compareDates;
+            $parameters['comparePeriods'] = $comparePeriods;
+        }
+
         $url = Url::getQueryStringFromParameters($parameters);
 
         $request = new Request($url);
         $report = $request->process();
 
+        // at this point the report data will reference the comparison series labels for the changed compare periods/dates. We don't
+        // want to show this to users because they will not recognize the changed periods, so we have to replace them.
+        if ($isComparing) {
+            $modifiedSeriesLabels = reset($report['reportData']->getDataTables())->getMetadata('comparisonSeries');
+            $seriesMap = array_combine($modifiedSeriesLabels, $unmodifiedSeriesLabels);
+
+            foreach ($report['metadata']['metrics'] as $key => $metricInfo) {
+                foreach ($seriesMap as $modified => $unmodified) {
+                    $report['metadata']['metrics'][$key]['name'] = str_replace($modified, $unmodified, $report['metadata']['metrics'][$key]['name']);
+                }
+            }
+        }
+
         $this->extractEvolutionReport($report);
     }
 
@@ -374,4 +419,9 @@ private function getFractionDigits($value)
         $fraction = substr(strrchr($value, "."), 1);
         return strlen($fraction);
     }
+
+    protected function getRowEvolutionGraphFromController(\Piwik\Plugins\CoreHome\Controller $controller)
+    {
+        return $controller->getRowEvolutionGraph($fetch = true, $rowEvolution = $this);
+    }
 }
diff --git a/app/plugins/CoreHome/Tracker/LogTable/Conversion.php b/app/plugins/CoreHome/Tracker/LogTable/Conversion.php
index cdc3fa629..39a46dfcc 100644
--- a/app/plugins/CoreHome/Tracker/LogTable/Conversion.php
+++ b/app/plugins/CoreHome/Tracker/LogTable/Conversion.php
@@ -27,6 +27,11 @@ public function getColumnToJoinOnIdVisit()
         return 'idvisit';
     }
 
+    public function getDateTimeColumn()
+    {
+        return 'server_time';
+    }
+
     public function getPrimaryKey()
     {
         return array('idvisit', 'idgoal', 'buster');
diff --git a/app/plugins/CoreHome/Tracker/LogTable/LinkVisitAction.php b/app/plugins/CoreHome/Tracker/LogTable/LinkVisitAction.php
index b09cd92c6..0b175f899 100644
--- a/app/plugins/CoreHome/Tracker/LogTable/LinkVisitAction.php
+++ b/app/plugins/CoreHome/Tracker/LogTable/LinkVisitAction.php
@@ -32,6 +32,11 @@ public function getColumnToJoinOnIdVisit()
         return 'idvisit';
     }
 
+    public function getDateTimeColumn()
+    {
+        return 'server_time';
+    }
+
     public function getPrimaryKey()
     {
         return array('idlink_va');
diff --git a/app/plugins/CoreHome/Tracker/LogTable/Visit.php b/app/plugins/CoreHome/Tracker/LogTable/Visit.php
index 9b2bf9108..6c0726970 100644
--- a/app/plugins/CoreHome/Tracker/LogTable/Visit.php
+++ b/app/plugins/CoreHome/Tracker/LogTable/Visit.php
@@ -26,6 +26,11 @@ public function getColumnToJoinOnIdVisit()
     {
         return 'idvisit';
     }
+    
+    public function getDateTimeColumn()
+    {
+        return 'visit_last_action_time';
+    }
 
     public function shouldJoinWithSubSelect()
     {
diff --git a/app/plugins/CoreHome/Widgets/QuickLinks.php b/app/plugins/CoreHome/Widgets/QuickLinks.php
new file mode 100644
index 000000000..88349e743
--- /dev/null
+++ b/app/plugins/CoreHome/Widgets/QuickLinks.php
@@ -0,0 +1,34 @@
+<?php
+
+
+namespace Piwik\Plugins\CoreHome\Widgets;
+
+
+use Piwik\Piwik;
+use Piwik\Plugins\SitesManager\SitesManager;
+use Piwik\Plugins\UsersManager\UsersManager;
+use Piwik\Widget\Widget;
+use Piwik\Widget\WidgetConfig;
+
+class QuickLinks extends Widget
+{
+    public static function configure(WidgetConfig $config)
+    {
+        $config->setCategoryId('About Matomo');
+        $config->setName('CoreHome_QuickLinks');
+        $config->setOrder(16);
+        $config->setIsEnabled(Piwik::hasUserSuperUserAccess());
+    }
+
+    public function render()
+    {
+        $hasUsersAdmin = UsersManager::isUsersAdminEnabled();
+        $hasSitesAdmin = SitesManager::isSitesAdminEnabled();
+
+        return $this->renderTemplate('quickLinks', array(
+            'hasUsersAdmin' => $hasUsersAdmin,
+            'hasSitesAdmin' => $hasSitesAdmin,
+        ));
+    }
+
+}
\ No newline at end of file
diff --git a/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.html b/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.html
new file mode 100644
index 000000000..f9fe8a3b2
--- /dev/null
+++ b/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.html
@@ -0,0 +1,28 @@
+<div ng-if="$ctrl.comparisonsService.isComparing()">
+    <h3>{{ 'General_Comparisons'|translate }}</h3>
+
+    <div class="comparison card" ng-repeat="comparison in $ctrl.comparisonsService.getSegmentComparisons() track by $index">
+        <div class="comparison-type">{{ 'General_Segment'|translate }}</div>
+
+        <div class="title" title="{{ comparison.title }}">
+            {{ comparison.title }}
+        </div>
+
+        <div class="comparison-period"
+             ng-repeat="periodComparison in $ctrl.comparisonsService.getPeriodComparisons() track by $index"
+             title="{{ $ctrl.getComparisonTooltip(comparison, periodComparison) }}"
+        >
+            <span class="comparison-dot" ng-style="{'background-color': $ctrl.comparisonsService.getSeriesColor(comparison, periodComparison)}"></span>
+            <span class="comparison-period-label">{{ periodComparison.title }} ({{ $ctrl.getComparisonPeriodType(periodComparison) }})</span>
+        </div>
+
+        <a class="remove-button" ng-click="$ctrl.comparisonsService.removeSegmentComparison($index)" ng-if="$ctrl.comparisonsService.getSegmentComparisons().length > 1">
+            <span class="icon icon-close" title="{{ 'General_ClickToRemoveComp'|translate }}"></span>
+        </a>
+    </div>
+
+    <div class="loadingPiwik" style="display:none;">
+        <img src="plugins/Morpheus/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />
+        {{ 'General_LoadingData'|translate }}
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.less b/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.less
new file mode 100644
index 000000000..c2eecb3a2
--- /dev/null
+++ b/app/plugins/CoreHome/angularjs/comparisons/comparisons.component.less
@@ -0,0 +1,74 @@
+piwik-comparisons {
+  h3 {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
+  .comparison {
+    display: inline-block;
+    min-width: 164px;
+    margin-right: 16px;
+    padding: 14px;
+    background-color: white;
+    margin-bottom: 16px;
+    position: relative;
+  }
+
+  .comparison-type {
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: .7em;
+    color: #999;
+  }
+
+  .remove-button {
+    font-size: .6em;
+    color: #666;
+    position: absolute;
+    right: 12px;
+    top: 12px;
+  }
+
+  .title {
+    font-size: 1.1rem;
+    margin-top: 4px;
+    margin-bottom: 12px;
+
+    overflow-x: hidden;
+    max-width: 250px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .comparison-period {
+    margin-top: 4px;
+
+    > span {
+      display: inline-block;
+    }
+
+    .comparison-dot {
+      width: 1em;
+      height: 1em;
+      display: inline-block;
+      border-radius: .5em;
+    }
+
+    .comparison-period-label {
+      position: relative;
+      top: -3px;
+      margin-left: 2px;
+      display: inline-block;
+      font-size: .85rem;
+      font-style: italic;
+    }
+  }
+}
+
+.comparison-card-tooltip {
+  p {
+    font-size: 1.1em;
+    line-height: 1.3em;
+    color: #fff;
+  }
+}
\ No newline at end of file
diff --git a/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html b/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html
index ac7312c71..6641d6714 100644
--- a/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html
+++ b/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html
@@ -62,25 +62,71 @@ <h6>{{ 'General_Period'|translate }}</h6>
                                 </label>
                             </p>
                         </div>
-                        <input
-                            type="submit"
-                            value="{{ 'General_Apply'|translate }}"
-                            id="calendarApply"
-                            class="btn"
-                            ng-click="periodSelector.onApplyClicked()"
-                            ng-disabled="!periodSelector.isApplyEnabled()"
-                        />
-                        <div id="ajaxLoadingCalendar" ng-if="periodSelector.isLoadingNewPage">
-                            <div class="loadingPiwik">
-                                <img src="plugins/Morpheus/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }}
-                            </div>
-                            <div class="loadingSegment">
-                                {{ 'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime'|translate }}
-                            </div>
-                        </div>
                     </div>
                 </td>
             </tr>
         </table>
+
+        <div class="compare-checkbox" ng-if="periodSelector.isComparisonEnabled()">
+            <input id="comparePeriodTo" type="checkbox" ng-model="periodSelector.isComparing"/>
+            <label for="comparePeriodTo">Compare to:</label>
+
+            <div
+                    id="comparePeriodToDropdown"
+                    piwik-field
+                    name="comparePeriodToDropdown"
+                    uicontrol="select"
+                    options="[{key: 'custom', value: 'Custom'}, {key: 'previousPeriod', value: 'Previous period'}, {key: 'previousYear', value: 'Previous year'}]"
+                    ng-model="periodSelector.comparePeriodType"
+                    full-width="true"
+                    disabled="!periodSelector.isComparing"
+            ></div>
+        </div>
+
+        <div class="compare-date-range" ng-if="periodSelector.isComparing && periodSelector.comparePeriodType == 'custom'">
+            <div>
+                <div
+                        id="comparePeriodStartDate"
+                        piwik-field
+                        name="comparePeriodStartDate"
+                        uicontrol="text"
+                        ng-model="periodSelector.compareStartDate"
+                        full-width="true"
+                        title="Start Date"
+                        placeholder="YYYY-MM-DD"
+                ></div>
+
+                <span class="compare-dates-separator"></span>
+
+                <div
+                        id="comparePeriodEndDate"
+                        piwik-field
+                        name="comparePeriodEndDate"
+                        uicontrol="text"
+                        ng-model="periodSelector.compareEndDate"
+                        full-width="true"
+                        title="End Date"
+                        placeholder="YYYY-MM-DD"
+                ></div>
+            </div>
+        </div>
+
+        <div class="apply-button-container">
+            <input
+                    type="submit"
+                    value="{{ 'General_Apply'|translate }}"
+                    id="calendarApply"
+                    class="btn"
+                    ng-click="periodSelector.onApplyClicked()"
+                    ng-disabled="!periodSelector.isApplyEnabled()"
+            />
+        </div>
+
+        <div id="ajaxLoadingCalendar" ng-if="periodSelector.isLoadingNewPage">
+            <div piwik-activity-indicator loading="true"></div>
+            <div class="loadingSegment">
+                {{ 'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime'|translate }}
+            </div>
+        </div>
     </div>
 </div>
diff --git a/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less b/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less
index e44e0e0f2..2cf453fd5 100644
--- a/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less
+++ b/app/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less
@@ -1,10 +1,91 @@
 [piwik-period-selector] {
   display: inline-block;
 
+  &.compare-dropdown-open {
+    label[for=comparePeriodEndDate] {
+      visibility: hidden;
+    }
+
+    #comparePeriodEndDate .input-field {
+      position: static; // needed when dropdown is open, since dropdown content is position: absolute, and this is position: relative, which causes it to show up in the background of the dropdown
+    }
+  }
+
   // overrides theme CSS that always hides .loadingPiwik. since we use an ng-if to make
   // sure it's only shown when we're actually loading a new page, it's not necessary to
   // forcefully hide it.
   .loadingPiwik {
     display: inline-block !important;
   }
+
+  .compare-checkbox {
+    margin-bottom: 20px;
+  }
+
+  .compare-date-range {
+    padding-top: 20px;
+  }
+
+  #comparePeriodToDropdown {
+    height: 30px;
+    display: inline-block;
+    width: 60%;
+    transform: scale(.8);
+    margin-left: -5%;
+    margin-right: -5%;
+
+    .form-group {
+      margin: 0;
+    }
+
+    .input-field {
+      margin-top: 0;
+    }
+
+    .select-dropdown {
+      margin-bottom: 0;
+    }
+
+    .dropdown-content {
+      overflow-y: visible;
+    }
+  }
+
+  div#comparePeriodStartDate, div#comparePeriodEndDate {
+    display: inline-block;
+    width: calc(~"50% - 20px");
+
+    .form-group {
+      margin: 0;
+    }
+
+    .input-field {
+      margin-top: 0;
+      padding: 0;
+    }
+
+    .select-dropdown {
+      margin-bottom: 0;
+    }
+  }
+
+  .compare-dates-separator {
+    height: 1px;
+    margin-left: 8px;
+    margin-right: 8px;
+    background-color: @color-silver-l14;
+    width: 16px;
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 30px;
+  }
+
+  label[for=comparePeriodTo] {
+    transform: scale(.9);
+  }
+
+  .apply-button-container {
+    text-align: right;
+  }
+
 }
diff --git a/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html b/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
index 374e3b1d8..5de3a7eeb 100644
--- a/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
+++ b/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
@@ -23,7 +23,7 @@
                 ng-click="quickAccess.selectMenuItem(submenuEntry.index)"
                 ng-repeat="submenuEntry in subcategory.items"><a>{{ submenuEntry.name | trim }}</a></li>
         </ul>
-        <ul>
+        <ul class="quickAccessMatomoSearch">
             <li class="quick-access-category websiteCategory"
                 ng-show="hasSitesSelector && ((quickAccess.sitesModel.sites | length) || quickAccess.sitesModel.isLoading)"
             >{{ 'SitesManager_Sites' | translate }}</li>
@@ -36,5 +36,13 @@
                 ng-click="quickAccess.selectSite(site.idsite)"
                 ng-repeat="site in quickAccess.sitesModel.sites"><a ng-bind="site.name"></a></li>
         </ul>
+        <ul>
+            <li class="quick-access-category helpCategory">{{ 'General_HelpResources' | translate }}</li>
+            <li ng-class="{selected: search.index == 'help'}"
+                class="quick-access-help"
+                ng-mouseenter="search.index='help'">
+                    <a ng-href="https://matomo.org?s={{ urlEncode(search.term) }}" target="_blank">{{'Feedback_SearchOnMatomo' | translate:(search.term)}}</a>
+            </li>
+        </ul>
     </div>
 </div>
diff --git a/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less b/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
index d0ec71ec9..3bad77b9b 100644
--- a/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
+++ b/app/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
@@ -59,4 +59,7 @@
   .websiteCategory {
     cursor: default;
   }
+  li.quick-access-help a {
+    word-break: break-word;
+  }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/angularjs/report-export/reportexport.popover.html b/app/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
index b435b6986..f80b896a4 100644
--- a/app/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
+++ b/app/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
@@ -37,6 +37,7 @@
             <div piwik-field uicontrol="radio" name="filter_limit_all"
                  data-title="{{ 'CoreHome_RowLimit'|translate }}"
                  ng-model="$parent.reportLimitAll"
+                 ng-hide="maxFilterLimit > 0"
                  full-width="false"
                  options="limitAllOptions">
             </div>
@@ -44,7 +45,17 @@
                  min="1"
                  ng-model="$parent.reportLimit"
                  full-width="false"
-                 ng-show="$parent.reportLimitAll == 'no'">
+                 ng-show="$parent.reportLimitAll == 'no' && maxFilterLimit <= 0">
+            </div>
+
+            <div piwik-field uicontrol="number" name="filter_limit"
+                 min="1"
+                 max="{{ scope.reportLimit }}"
+                 ng-model="$parent.reportLimit"
+                 ng-keypress="scope.checkNumberForLimit"
+                 full-width="false"
+                 data-title="{{ 'CoreHome_RowLimit'|translate }} ({{ 'General_ComputedMetricMax'|translate:maxFilterLimit }})"
+                 ng-show="$parent.reportLimitAll == 'no' && maxFilterLimit > 0">
             </div>
         </div>
     </div>
diff --git a/app/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less b/app/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less
index 698d2ca5e..32a89b3c6 100644
--- a/app/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less
+++ b/app/plugins/CoreHome/angularjs/widget-bydimension-container/widget-bydimension-container.directive.less
@@ -1,17 +1,23 @@
 .reportsByDimensionView {
 
+    float: left;
+    width: 100%;
+
     .dimensionCategory {
         color: @theme-color-text-contrast;
     }
 
     .reportContainer {
-        position: absolute;
-        margin-left: 230px;
+        padding-left: 230px;
         min-width: 500px;
+        width: 100%;
 
         table.dataTable tr td.label {
             max-width: 380px;
         }
+        .dimensionReport {
+            float: left;
+        }
     }
 }
 
diff --git a/app/plugins/CoreHome/config/tracker.php b/app/plugins/CoreHome/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CoreHome/config/tracker.php
+++ b/app/plugins/CoreHome/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/cs.json b/app/plugins/CoreHome/lang/cs.json
index 173463c3a..89412ce69 100644
--- a/app/plugins/CoreHome/lang/cs.json
+++ b/app/plugins/CoreHome/lang/cs.json
@@ -2,6 +2,7 @@
     "CoreHome": {
         "CategoryNoData": "V této kategorii nejsou k dispozici žádná data. Zkuste \"Zobrazit všechny výsledky\".",
         "ChangeVisualization": "Změnit vizualizaci",
+        "ChangePeriod": "Změnit období",
         "CheckForUpdates": "Zkontrolovat aktualizace",
         "CheckPiwikOut": "Vyzkoušejte Matomo!",
         "ClickToEditX": "Klikněte pro úpravu %s",
@@ -13,15 +14,24 @@
         "DataTableExcludeAggregateRows": "Agregované řádky jsou zobrazeny %s Skrýt",
         "DataTableIncludeAggregateRows": "Agregované řádky jsou skryty %s Zobrazit",
         "DataTableHowToSearch": "Pro hledání stiskněte enter, nebo klikněte na ikonu vyhledávání",
+        "DataTableShowDimensions": "Rozměry jsou kombinovány %s Zobrazit rozměry samostatně",
+        "DataTableCombineDimensions": "Rozměry jsou zobrazeny samostatně %s Zobrazit rozměry dohromady",
         "Default": "výchozí",
         "DonateCall1": "Matomo lze používat zadarmo, to ale neznamená, že jeho vývoj nic nestojí.",
         "DonateCall2": "Matomo potřebuje Vaši podporu, aby mohl růst a prosperovat.",
         "DonateCall3": "Pokud se domníváte, že vám Matomo významně pomohl při vašem podnikání nebo projektu, %1$sprosím zvažte příspěvek%2$s nebo %3$szakoupení prémiové funkce%4$s. Každý cent pomůže.",
         "DonateFormInstructions": "Klikněte na posuvník ke zvolení částky, poté klikněte na tlačítko Subscribe.",
+        "EndShortcut": "Konec",
+        "EnterZenMode": "Vstup do režimu Zen (skrýt nabídky)",
+        "ExitZenMode": "Ukončit režim Zen (zobrazit nabídky)",
         "ExceptionNotWhitelistedIP": "Nemůžete použít Matomo, protože vaše IP adresa %s není na seznamu povolených",
         "ExcludeRowsWithLowPopulation": "Všechny řádky jsou zobrazeny %s Vyloučit nízkou populaci",
         "ExternalHelp": "Nápověda (otevře se v nové záložce)",
         "FlattenDataTable": "Hlášení je hierarchické %s Zploštit",
+        "FormatMetrics": "Formátovat metriky",
+        "ShowExportUrl": "Zobrazit URL exportu",
+        "HideExportUrl": "Skrýt URL exportu",
+        "HomeShortcut": "Domů",
         "HowMuchIsPiwikWorth": "Jak moc si ceníte Matomou?",
         "IncludeRowsWithLowPopulation": "Řádky s nízkou populací jsou skryty %s Zobrazit všechny řádky",
         "InjectedHostEmailBody": "Ahoj. Dnes jsem se snažil dostat do \\Matomou a dostal jsem varování o neznámém ménu hostitele.",
@@ -47,6 +57,10 @@
         "ShareThis": "Sdílet",
         "ShortcutsAvailable": "Dostupné zkratky",
         "ShortcutZenMode": "pro Zen mód",
+        "ShortcutSegmentSelector": "k otevření selektoru segmentu",
+        "ShortcutWebsiteSelector": "k otevření selektoru webové stránky",
+        "ShortcutCalendar": "k otevření kalendáře (d znamená datum)",
+        "ShortcutSearch": "k otevření vyhledávání (f znamená hledání)",
         "ShortcutHelp": "pro zobrazení této nápovědy",
         "ShowJSCode": "Zobrazit JavaScriptový kód ke vložení",
         "SkipToContent": "Přejít k obsahu",
@@ -55,12 +69,16 @@
         "TableNoData": "Žádná data",
         "ThereIsNoDataForThisReport": "Pro toto hlášení nejsou k dispozici žádná data",
         "UnFlattenDataTable": "Hlášení je ploché %s Vytvořit hierarchický",
+        "RemoveTotalsRowDataTable": "Sestava zobrazuje řádek součtů %s Odebrat řádek součtů",
+        "AddTotalsRowDataTable": "Sestava nezobrazuje řádek součtů %s Zobrazit řádek součtů",
         "ViewAllPiwikVideoTutorials": "Zobrazit všechny návody Matomo",
         "WebAnalyticsReports": "Hlášení",
         "YouAreUsingTheLatestVersion": "Používáte nejnovější verzi Matomou.",
         "ClickRowToExpandOrContract": "Klikněte na tento řádek pro rozbalení nebo zbalení podtabulky.",
         "UndoPivotBySubtable": "Toto hlášení bylo zaměřeno %s Vrátit zpět",
         "NoSuchPage": "Tato stránka neexistuje",
+        "PageUpShortcutDescription": "dostat se na začátek stránky",
+        "PageDownShortcutDescription": "dostat se na konec stránky",
         "PivotBySubtable": "Toto hlášení není zaměřené %1$s Zaměřit na %2$s",
         "SystemSummaryWidget": "Souhrn systému",
         "SystemSummaryNWebsites": "%d webových stránek",
@@ -73,10 +91,22 @@
         "MenuEntries": "Položky menu",
         "Segments": "Segmenty",
         "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Aktualizace na jedno kliknutí není dostupná při nasazení Matomou na několika serverech naráz. Stáhněte prosím nejnovější verzi z %1$s a pokračujte.",
+        "CssDidntLoad": "Vášmu prohlížeči se nepodařilo načíst styl této stránky.",
+        "JsDidntLoad": "Vášmu prohlížeči se nepodařilo načíst skripty této stránky.",
         "AdblockIsMaybeUsed": "Pokud používáte blokovač reklam, zakažte ho pro tyto stránky, aby Matomo správně fungoval.",
         "ChangeCurrentWebsite": "Vyberte web, aktuálně vybraný web: %s",
         "LeadingAnalyticsPlatformRespectsYourPrivacy": "Nejrozšířenější otevřená aplatforma pro analýzu, která respektuje vaše soukromí.",
         "MacPageUp": "Fn + levá šipka",
-        "MacPageDown": "Fn + pravá šipka"
+        "MacPageDown": "Fn + pravá šipka",
+        "ReportType": "Typ reportu",
+        "RowLimit": "Limit řádků",
+        "CustomLimit": "Vlastní limit",
+        "ExportFormat": "Formát exportu",
+        "ExpandSubtables": "Rozbalit dílčí tabulky",
+        "StandardReport": "Standartní report",
+        "FlattenReport": "Srovnat report",
+        "ReportWithMetadata": "Report s metadaty",
+        "SeeAvailableVersions": "Prohlédnout dostupné verze",
+        "QuickLinks": "Rychlé odkazy"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/da.json b/app/plugins/CoreHome/lang/da.json
index b3ded817a..e67261a62 100644
--- a/app/plugins/CoreHome/lang/da.json
+++ b/app/plugins/CoreHome/lang/da.json
@@ -2,6 +2,7 @@
     "CoreHome": {
         "CategoryNoData": "Ingen data i kategorien. Prøv at 'Inkluder hele populationen'.",
         "ChangeVisualization": "Skift visualisering",
+        "ChangePeriod": "Skift periode",
         "CheckForUpdates": "Søg efter opdateringer",
         "CheckPiwikOut": "Prøv Matomo!",
         "ClickToEditX": "Klik for at redigere %s",
@@ -13,14 +14,24 @@
         "DataTableExcludeAggregateRows": "Samlede rækker vises %s Skjul dem",
         "DataTableIncludeAggregateRows": "Samlede rækker er skjult %s Vis dem",
         "DataTableHowToSearch": "Tryk enter og klik på søgeikonet for at søge",
+        "DataTableShowDimensions": "Dimensioner er kombineret %s Vis dimensioner separat",
+        "DataTableCombineDimensions": "Dimensioner vises seperate %s Vis dimensioner kombineret",
         "Default": "standard",
         "DonateCall1": "Matomo vil altid være gratis at bruge, men det betyder ikke, at den er gratis at lave.",
         "DonateCall2": "Matomo har brug for din fortsatte støtte til at vokse og trives.",
         "DonateCall3": "Hvis Matomo har skabt værdi for din forretning eller dit projekt, kan du overveje at %1$sgive et økonomisk bidrag%2$s eller %3$skøbe en betalt funktion%4$s. Hver krone tæller.",
         "DonateFormInstructions": "Klik på skyderen for at vælge et beløb, og klik derefter på vælg at donere.",
+        "EndShortcut": "Slut",
+        "EnterZenMode": "Gå i Zen tilstand (skjul menuen)",
+        "ExitZenMode": "Forlad Zen tilstand (vis menuen)",
+        "ExceptionNotWhitelistedIP": "Du kan ikke bruge denne Matomo, da din IP %s ikke er hvidlistet",
         "ExcludeRowsWithLowPopulation": "Alle rækker vises %s Udeluk lav population",
         "ExternalHelp": "Hjælp (åbnes i en ny fane)",
         "FlattenDataTable": "Rapporten er hierarkisk %s lav den ikke hierakisk",
+        "FormatMetrics": "Format målinger",
+        "ShowExportUrl": "Vis eksport URL",
+        "HideExportUrl": "Skjul eksport URL",
+        "HomeShortcut": "Hjem",
         "HowMuchIsPiwikWorth": "Hvor meget er Matomo værd for dig?",
         "IncludeRowsWithLowPopulation": "Rækker med lav population er skjult %s Vis alle rækker",
         "InjectedHostEmailBody": "Hej, jeg forsøgte at få adgang Matomo i dag og stødte på den ukendte værtsnavn advarsel.",
@@ -29,6 +40,10 @@
         "InjectedHostSuperUserWarning": "Matomo kan være konfigureret forkert (f.eks. Hvis Matomo for nylig blev flyttet til en ny server eller en URL-adresse). Du kan enten %1$sklikke her og føje %2$s som gyldigt Matomo værtsnavn (hvis du har tillid til det) %3$s eller %4$sklikke her og få %5$s adgang til Matomo sikkert %6$s.",
         "InjectedHostWarningIntro": "Du tilgår Matomo fra %1$s, men Matomo er konfigureret til at køre på denne adresse: %2$s.",
         "JavascriptDisabled": "JavaSript skal være aktiveret for at Matomo kan bruges i standardvisning. JavaScript er enten deaktiveret eller ikke understøttet i netlæseren.<br \/>For at bruge standardvisning, aktiver JavaScript i indstillingerne for netlæseren, og %1$s prøv igen %2$s.<br \/>",
+        "VisitStatusOrdered": "Sorteret",
+        "VisitStatusOrderedThenAbandoned": "Sorteret, herefter efterladte ordrer",
+        "VisitTypeReturning": "Tilbagevendende",
+        "VisitTypeReturningCustomer": "Tilbagevendende kunder",
         "MainNavigation": "Hovednavigation",
         "MakeOneTimeDonation": "Giv et éngangsbidrag i stedet.",
         "Menu": "Menu",
@@ -40,6 +55,13 @@
         "SharePiwikLong": "Hej! Jeg har lige fundet et fantastisk open source program: Matomo!\n\nMatomo kan gratis spore besøgende på din hjemmeside. Du bør helt klart undersøge det!",
         "SharePiwikShort": "Matomo! Gratis og open source internet analyse. Ej dine egne data.",
         "ShareThis": "Del dette",
+        "ShortcutsAvailable": "Tilgængelige genveje",
+        "ShortcutZenMode": "for Zen tilstand",
+        "ShortcutSegmentSelector": "for at åbne segment-vælger",
+        "ShortcutWebsiteSelector": "for at åbne website-vælger",
+        "ShortcutCalendar": "for at åbne kalender (d står for dato)",
+        "ShortcutSearch": "for at åbne for søgning (f står for find)",
+        "ShortcutHelp": "for at vise denne hjælp",
         "ShowJSCode": "Vis JavaScript-koden til at indsætte.",
         "SkipToContent": "Gå til indhold",
         "SubscribeAndBecomePiwikSupporter": "Fortsæt til sikker kreditkort betalingsside (Paypal) for at blive en Matomo supporter!",
@@ -55,6 +77,8 @@
         "ClickRowToExpandOrContract": "Klik på rækken for at udvide eller sammentrække undertabelen.",
         "UndoPivotBySubtable": "Rapporten er blevet pivoteret %s Fortryd pivot.",
         "NoSuchPage": "Denne side findes ikke",
+        "PageUpShortcutDescription": "for at komme til toppen af siden",
+        "PageDownShortcutDescription": "for at komme til bunden af siden",
         "PivotBySubtable": "Rapporten er ikke pivoteret %1$s Pivoter med %2$s.",
         "SystemSummaryWidget": "Systemoversigt",
         "SystemSummaryNWebsites": "%d websteder",
@@ -66,8 +90,23 @@
         "QuickAccessTitle": "Søg efter %s. Brug pil-tasterne for at navigere igennem søgeresultaterne. Genvej: Tryk 'f' for at søge.",
         "MenuEntries": "Menu indgange",
         "Segments": "Segmenter",
+        "OneClickUpdateNotPossibleAsMultiServerEnvironment": "Et-klik opdatering er ikke tilgængelig, da du bruger Matomo med flere servere. Hent venligst den seneste version fra %1$s for at fortsætte.",
+        "CssDidntLoad": "Din browser var ikke i stand til at indlæse style for denne side.",
+        "JsDidntLoad": "Den browser var ikke i stand til at indlæse scriptet for denne side.",
         "AdblockIsMaybeUsed": "Hvis du bruger en annonce blokering skal du deaktivere denne for at sikre, at Matomo arbejder uden problemer.",
         "ChangeCurrentWebsite": "Vælg et website. Det aktuelle website er: %s",
-        "LeadingAnalyticsPlatformRespectsYourPrivacy": "Den førende åbne analyseplatform som respekterer dit privatliv."
+        "LeadingAnalyticsPlatformRespectsYourPrivacy": "Den førende åbne analyseplatform som respekterer dit privatliv.",
+        "MacPageUp": "Fn + venstre pil",
+        "MacPageDown": "Fn + højre pil",
+        "ReportType": "Rapporttype",
+        "RowLimit": "Rækkegrænse",
+        "CustomLimit": "Brugerdefineret grænse",
+        "ExportFormat": "Eksportformat",
+        "ExpandSubtables": "Udvid undertabeller",
+        "StandardReport": "Standard rapport",
+        "FlattenReport": "Flad rapport",
+        "ReportWithMetadata": "Rapport med metadata",
+        "SeeAvailableVersions": "Se tilgængelige versioner",
+        "QuickLinks": "Hurtiglinks"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/de.json b/app/plugins/CoreHome/lang/de.json
index 91074d2a1..49caa29cd 100644
--- a/app/plugins/CoreHome/lang/de.json
+++ b/app/plugins/CoreHome/lang/de.json
@@ -106,6 +106,7 @@
         "StandardReport": "Standard Bericht",
         "FlattenReport": "Flacher Bericht",
         "ReportWithMetadata": "Bericht mit Metadaten",
-        "SeeAvailableVersions": "Zeige verfügbare Versionen"
+        "SeeAvailableVersions": "Zeige verfügbare Versionen",
+        "QuickLinks": "Schnelllinks"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/el.json b/app/plugins/CoreHome/lang/el.json
index b101060da..6e1c62379 100644
--- a/app/plugins/CoreHome/lang/el.json
+++ b/app/plugins/CoreHome/lang/el.json
@@ -106,6 +106,7 @@
         "StandardReport": "Κανονική αναφορά",
         "FlattenReport": "Επίπεδη αναφορά",
         "ReportWithMetadata": "Αναφορά με μεταδεδομένα",
-        "SeeAvailableVersions": "Εμφάνιση Διαθέσιμων Εκδόσεων"
+        "SeeAvailableVersions": "Εμφάνιση Διαθέσιμων Εκδόσεων",
+        "QuickLinks": "Γρήγοροι Σύνδεσμοι"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/en.json b/app/plugins/CoreHome/lang/en.json
index 1c6970ce5..00ce74d0b 100644
--- a/app/plugins/CoreHome/lang/en.json
+++ b/app/plugins/CoreHome/lang/en.json
@@ -106,6 +106,7 @@
         "StandardReport": "Standard report",
         "FlattenReport": "Flatten report",
         "ReportWithMetadata": "Report with metadata",
-        "SeeAvailableVersions": "See Available Versions"
+        "SeeAvailableVersions": "See Available Versions",
+        "QuickLinks": "Quick Links"
     }
 }
diff --git a/app/plugins/CoreHome/lang/es-ar.json b/app/plugins/CoreHome/lang/es-ar.json
index 34d4e6676..c751182b1 100644
--- a/app/plugins/CoreHome/lang/es-ar.json
+++ b/app/plugins/CoreHome/lang/es-ar.json
@@ -2,7 +2,9 @@
     "CoreHome": {
         "CategoryNoData": "No hay datos en esta categoría. Intentá \"Incluir toda la población\".",
         "ChangeVisualization": "Cambiar la visualización",
+        "ChangePeriod": "Cambiar período",
         "CheckForUpdates": "Buscar actualizaciones",
+        "CheckPiwikOut": "¡Probá Matomo!",
         "ClickToEditX": "Hacé clic para editar %s",
         "ClickToSeeFullInformation": "Hacé clic para ver la información completa",
         "CloseSearch": "Cerrar búsqueda",
@@ -12,12 +14,32 @@
         "DataTableExcludeAggregateRows": "Se muestran las filas acumuladas %s Ocultarlas",
         "DataTableIncludeAggregateRows": "Se ocultan las filas agregadas %s Mostrarlas",
         "DataTableHowToSearch": "Presioná \"Enter\" o hacé clic en el ícono de búsqueda para buscar",
+        "DataTableShowDimensions": "Las dimensiones están combinadas %s Mostrar dimensiones separadamente",
+        "DataTableCombineDimensions": "Las dimensiones se muestran separadamente %s Mostrar dimensiones combinadas",
         "Default": "predeterminado",
+        "DonateCall1": "Matomo nunca te costará nada para usarlo, pero eso no significa que no nos cueste hacerlo.",
+        "DonateCall2": "Matomo necesita de tu contínuo apoyo para crecer y prosperar.",
+        "DonateCall3": "Si sentís que Matomo agregó valor significativo a tu negocio o emprendimiento, %1$spor favor, considerá donar%2$s o %3$scomprar una función prémium%4$s. Cada centavo cuenta.",
         "DonateFormInstructions": "Hagé clic en el control deslizante para seleccionar una cantidad, luego hagé clic en \"Suscribirse\" para donar.",
+        "EndShortcut": "Fin",
+        "EnterZenMode": "Entrar al modo Zen (ocultar los menús)",
+        "ExitZenMode": "Salir del modo Zen (mostrar los menús)",
+        "ExceptionNotWhitelistedIP": "No podés usar tu Matomo ya que tu dirección IP %s no es aceptada",
         "ExcludeRowsWithLowPopulation": "Se muestran todas las filas %s Excluir baja población",
         "ExternalHelp": "Ayuda (se abre en una nueva pestaña)",
         "FlattenDataTable": "Este informe es jerárquico %s Hacelo plano",
+        "FormatMetrics": "Formatear mediciones",
+        "ShowExportUrl": "Mostrar dirección web de exportación",
+        "HideExportUrl": "Ocultar dirección web de exportación",
+        "HomeShortcut": "Página principal",
+        "HowMuchIsPiwikWorth": "¿Cuánto valor tiene Matomo para vos?",
         "IncludeRowsWithLowPopulation": "Se ocultan las filas con baja población %s Mostrar todas las filas",
+        "InjectedHostEmailBody": "Hola, hoy intenté acceder a Matomo pero encontré la advertencia sobre nombre de dominio (\"hostname\") desconocido.",
+        "InjectedHostEmailSubject": "Se accedió a Matomo desde un servidor desconocido: %s",
+        "InjectedHostNonSuperUserWarning": "%1$sHacé clic acá para acceder de forma segura a Matomo%2$s y quitar esta advertencia. Podés contactarte con tu administrador de Matomo y notificarlo acerca de este problema (%3$shacé clic acá para enviarle un correo electrónico%4$s).",
+        "InjectedHostSuperUserWarning": "Matomo puede estar desconfigurado (por ejemplo, si Matomo fue mudado recientemente a un nuevo servidor o cambió su dirección web). Podés, o bien %1$shacer clic acá y agregar %2$s como servidores válidos Matomo (si los considerás confiables)%3$s, o bien %4$shacé clic acá y andá a %5$s para acceder de forma segura a Matomo%6$s.",
+        "InjectedHostWarningIntro": "Está accediendo a Matomo desde %1$s, pero Matomo fue configurado para ejecutarse en esta dirección: %2$s.",
+        "JavascriptDisabled": "JavaScript debe estar habilitado para que puedas usar la vista estándar de Matomo .<br \/>Sin embargo, parece que JavaScript, o bien está deshabilitado, o bien no es soportado por tu navegador. <br \/>Para usar la vista estándar, habilitá JavaScript cambiando la configuración de tu navegador, luego%1$sintentá nuevamente%2$s.<br \/>",
         "VisitStatusOrdered": "Ordenado",
         "VisitStatusOrderedThenAbandoned": "Ordenado, entonces changuito abandonado",
         "VisitTypeReturning": "Regresos",
@@ -25,32 +47,66 @@
         "MainNavigation": "Navegación principal",
         "MakeOneTimeDonation": "O hacé una donación por única vez.",
         "Menu": "Menú",
+        "NoPrivilegesAskPiwikAdmin": "Iniciaste sesión como \"%1$s\", pero parece que no tenés ningún permiso configurado en Matomo. %2$sConsultá al administrador de tu Matomo (hacé clic para enviarle un correo electrónico)%3$s para que te dé acceso de lectura al sitio web.",
         "OnlyForSuperUserAccess": "Este widget se muestra en el panel principal sólo a los usuarios que tengan acceso de súper usuario.",
         "PeriodRange": "Rango",
         "ReportGeneratedOn": "Informe generado el %s",
         "ReportGeneratedXAgo": "Informe generado hace %s",
+        "SharePiwikLong": "¡Hola! Acabo de encontrar otro software libre de calidad: ¡Matomo!\n\nMatomo te permite rastrear visitantes en tu sitio web, gratis. ¡Deberían probarlo!",
         "SharePiwikShort": "Matomo: análisis web gratis y de código abierto. Conservá tus propios datos.",
         "ShareThis": "Compartilo",
+        "ShortcutsAvailable": "Atajos disponibles",
+        "ShortcutZenMode": "para el modo Zen",
+        "ShortcutSegmentSelector": "para abrir el selector de Segmento",
+        "ShortcutWebsiteSelector": "para abrir el selector de Sitio web",
+        "ShortcutCalendar": "para abrir el calendario (\"d\" significa \"fecha\")",
+        "ShortcutSearch": "para abrir la búsqueda (\"f\" significa \"buscar\")",
+        "ShortcutHelp": "para mostrar esta ayuda",
         "ShowJSCode": "Mostrar el código JavaScript para insertar",
         "SkipToContent": "Pasar al contenido",
+        "SubscribeAndBecomePiwikSupporter": "Continuar a una página de pago con tarjeta de crédito segura (PayPal) ¡para ser un colaborador de Matomo!",
+        "SupportPiwik": "¡Apoyá a Matomo!",
         "TableNoData": "Sin datos para esta tabla.",
         "ThereIsNoDataForThisReport": "No hay datos para este informe.",
         "UnFlattenDataTable": "Este informe es plano %s Hacelo jerárquico",
+        "RemoveTotalsRowDataTable": "El informe muestra la fila de totales %s Quitar la fila de totales",
+        "AddTotalsRowDataTable": "El informe no muestra la fila de totales %s Mostrar la fila de totales",
+        "ViewAllPiwikVideoTutorials": "Ver todos los videos tutoriales de Matomo",
         "WebAnalyticsReports": "Informes de análisis web",
+        "YouAreUsingTheLatestVersion": "¡Estás usando la última versión de Matomo!",
         "ClickRowToExpandOrContract": "Hacé clic para expandir o contraer la subtabla.",
         "UndoPivotBySubtable": "Este informe fue pivotado %s Deshacerlo",
         "NoSuchPage": "Esta página no existe",
+        "PageUpShortcutDescription": "para ir al comienzo de la página",
+        "PageDownShortcutDescription": "para ir al fin de la página",
         "PivotBySubtable": "Este informe no fue pivotado %1$s Pivote por %2$s",
         "SystemSummaryWidget": "Resumen del sistema",
         "SystemSummaryNWebsites": "%d sitios web",
         "SystemSummaryNSegments": "%d segmentos",
         "SystemSummaryNActivatedPlugins": "%d plugins activos",
+        "SystemSummaryPiwikVersion": "Versión de Matomo",
         "SystemSummaryMysqlVersion": "Versión de MySQL",
         "SystemSummaryPhpVersion": "Versión de PHP",
         "QuickAccessTitle": "Buscar %s. Usá las teclas de flechas para navegar entre los resultados de la búsqueda. Atajo: presioná \"f\" para buscar.",
         "MenuEntries": "Entradas del menú",
         "Segments": "Segmentos",
+        "OneClickUpdateNotPossibleAsMultiServerEnvironment": "La actualización de un clic no está disponible, ya que estás usando Matomo con múltiples servidores. Por favor, descargá la última versión desde %1$s para continuar.",
+        "CssDidntLoad": "Tu navegador web no fue capaz de cargar el estilo de esta página.",
+        "JsDidntLoad": "Tu navegador web no fue capaz de cargar los scripts de esta página.",
+        "AdblockIsMaybeUsed": "En el caso de que estés usando un bloqueador de publicidad, por favor, deshabilitalo para este sitio, para asegurarte de que Matomo funciona sin ningún problema.",
         "ChangeCurrentWebsite": "Elegí un sitio web, actualmente está elegido: %s",
-        "LeadingAnalyticsPlatformRespectsYourPrivacy": "La plataforma abierta líder de análisis que respeta tu privacidad."
+        "LeadingAnalyticsPlatformRespectsYourPrivacy": "La plataforma abierta líder de análisis que respeta tu privacidad.",
+        "MacPageUp": "\"Fn\" + flecha izquierda",
+        "MacPageDown": "\"Fn\" + flecha derecha",
+        "ReportType": "Tipo de informe",
+        "RowLimit": "Límite fe fila",
+        "CustomLimit": "Límite personalizado",
+        "ExportFormat": "Exportar formato",
+        "ExpandSubtables": "Expandir subtablas",
+        "StandardReport": "Informe estándar",
+        "FlattenReport": "Aplanar informe",
+        "ReportWithMetadata": "Informe con metadatos",
+        "SeeAvailableVersions": "Ver las versiones disponibles",
+        "QuickLinks": "Enlaces rápidos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/es.json b/app/plugins/CoreHome/lang/es.json
index 34104be09..87cd63a6e 100644
--- a/app/plugins/CoreHome/lang/es.json
+++ b/app/plugins/CoreHome/lang/es.json
@@ -106,6 +106,7 @@
         "StandardReport": "Informe estándar",
         "FlattenReport": "Aplanar informe",
         "ReportWithMetadata": "Informe con metadatos",
-        "SeeAvailableVersions": "Ver versiones disponibles"
+        "SeeAvailableVersions": "Ver versiones disponibles",
+        "QuickLinks": "Enlaces rápidos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/fi.json b/app/plugins/CoreHome/lang/fi.json
index 119fba5b7..bc5e72204 100644
--- a/app/plugins/CoreHome/lang/fi.json
+++ b/app/plugins/CoreHome/lang/fi.json
@@ -104,6 +104,7 @@
         "StandardReport": "Standardiraportti",
         "FlattenReport": "Litistä raportti",
         "ReportWithMetadata": "Raportti metadatan kera",
-        "SeeAvailableVersions": "Näytä saatavilla olevat versiot"
+        "SeeAvailableVersions": "Näytä saatavilla olevat versiot",
+        "QuickLinks": "Pikalinkit"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/fr.json b/app/plugins/CoreHome/lang/fr.json
index b01f303b9..3b546c92d 100644
--- a/app/plugins/CoreHome/lang/fr.json
+++ b/app/plugins/CoreHome/lang/fr.json
@@ -106,6 +106,7 @@
         "StandardReport": "Rapport standard",
         "FlattenReport": "Aplatir le rapport",
         "ReportWithMetadata": "Rapport avec métadonnées",
-        "SeeAvailableVersions": "Voir les versions disponibles"
+        "SeeAvailableVersions": "Voir les versions disponibles",
+        "QuickLinks": "Liens rapides"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/it.json b/app/plugins/CoreHome/lang/it.json
index 9836dcfce..28c39a7f0 100644
--- a/app/plugins/CoreHome/lang/it.json
+++ b/app/plugins/CoreHome/lang/it.json
@@ -106,6 +106,7 @@
         "StandardReport": "Report standard",
         "FlattenReport": "Report piatto",
         "ReportWithMetadata": "Report con metadati",
-        "SeeAvailableVersions": "Vedi le Versioni Disponibili"
+        "SeeAvailableVersions": "Vedi le Versioni Disponibili",
+        "QuickLinks": "Link Rapidi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/ja.json b/app/plugins/CoreHome/lang/ja.json
index 4f1b58000..1dd70d460 100644
--- a/app/plugins/CoreHome/lang/ja.json
+++ b/app/plugins/CoreHome/lang/ja.json
@@ -8,7 +8,7 @@
         "ClickToEditX": "クリックして %s を編集",
         "ClickToSeeFullInformation": "クリックすると詳しい情報が表示されます",
         "CloseSearch": "クローズ検索",
-        "CloseWidgetDirections": "このウィジェットを閉じるには、ウィジェットの上部にある「X」アイコンをクリックします。",
+        "CloseWidgetDirections": "このウィジェットを閉じるには、ウィジェットの上部にある ' × ' アイコンをクリックします。",
         "ChooseX": "%1$s を選択",
         "DataForThisReportHasBeenPurged": "このレポートのデータは、%sヶ月以上経過しており、パージされています。",
         "DataTableExcludeAggregateRows": "%s で表示している集計行を非表示にする",
@@ -17,8 +17,8 @@
         "DataTableShowDimensions": "ディメンションは %s の合計です。ディメンションを別々に表示",
         "DataTableCombineDimensions": "ディメンションは %s で別々に表示されています。組み合わせたディメンションを表示",
         "Default": "デフォルト",
-        "DonateCall1": "Matomo を使用するのに費用はかかりません。しかし、 Matomo の制作に費用がかかっていないと言う意味ではありません。",
-        "DonateCall2": "Matomo の成長と発展には、みなさんの継続的なサポートが必要です。",
+        "DonateCall1": "Matomo は無料でご利用いただけますが、 Matomo の制作に費用がかかっていないと言う意味ではありません。",
+        "DonateCall2": "Matomo の成長と発展には、みなさんの継続的なご支援が必要です。",
         "DonateCall3": "Matomo がビジネスや努力に重大な付加価値を感じる場合は、%3$sプレミアム機能を購入%4$sまたは%1$s寄付する%2$sことをご検討ください。 すべての寄付金が助けになるでしょう。",
         "DonateFormInstructions": "スライダで寄付する金額を選択して寄付するをクリックしてください。",
         "EndShortcut": "終了",
@@ -34,7 +34,7 @@
         "HomeShortcut": "ホーム",
         "HowMuchIsPiwikWorth": "あなたにとって Matomo の価値はどのくらいですか？",
         "IncludeRowsWithLowPopulation": "数が少ない行は非表示 %s 全ての行を表示",
-        "InjectedHostEmailBody": "お知らせします。本日 Matomo にアクセスしようとしましたが、未知のホスト名の警告が発生しました。",
+        "InjectedHostEmailBody": "お知らせ：本日 Matomo にアクセスしようとしましたが、未知のホスト名の警告が発生しました。",
         "InjectedHostEmailSubject": "Matomo が未知のホスト名にアクセスされました :%s",
         "InjectedHostNonSuperUserWarning": "%1$sMatomo に安全にアクセスし、この警告を削除するにはここをクリック%2$sしてください。 また、Matomo 管理者に連絡して、この問題について通知することもできます (%3$sここをクリックしてメールを送る%4$s)。",
         "InjectedHostSuperUserWarning": "Matomo が誤って設定されている可能性があります ( たとえば、Matomo が最近新しいサーバーまたは URL に移動した場合など ) 。 %1$sここをクリックして、有効な Matomo ホスト名 ( 信頼する場合 ) として%2$sを追加するか%3$s、%4$sここをクリックして%5$sに移動し、Matomo に安全にアクセスしてください%6$s。",
@@ -49,7 +49,7 @@
         "Menu": "メニュー",
         "NoPrivilegesAskPiwikAdmin": "'%1$s'としてログインしていますが、権限が設定されていないようです。 %2$s Matomo の管理者 ( クリックして E メール ) %3$s に'表示'の権限を与えてもらってください。",
         "OnlyForSuperUserAccess": "このウィジェットは、スーパーユーザー権限を持つユーザーにのみデフォルトのダッシュボードに表示されます。",
-        "PeriodRange": "期間",
+        "PeriodRange": "範囲",
         "ReportGeneratedOn": "%s に生成されたリポート",
         "ReportGeneratedXAgo": "%s 前に生成されたリポート",
         "SharePiwikLong": "素晴らしい無償ソフトウェアが見つかりました ! : Matomo です! \n\nMatomo はあなたのウェブサイトのビジターを無料で追跡します。要チェック !",
@@ -71,13 +71,13 @@
         "UnFlattenDataTable": "リポートはフラット表示です %s 階層表示にする",
         "RemoveTotalsRowDataTable": "レポートには合計 %s 行が表示されています　合計行を削除する",
         "AddTotalsRowDataTable": "レポートに合計 %s 行が表示されていません　合計行を表示する",
-        "ViewAllPiwikVideoTutorials": "Matomo のチュートリアルビデオを全て見ます",
+        "ViewAllPiwikVideoTutorials": "Matomo のチュートリアルビデオを全て表示する",
         "WebAnalyticsReports": "ウェブ解析リポート",
         "YouAreUsingTheLatestVersion": "Matomo の最新バージョンを使用しています ！",
         "ClickRowToExpandOrContract": "サブテーブルを拡大または縮小するには、この列をクリックしてください。",
-        "UndoPivotBySubtable": "このレポートは、%s 元に戻すピボットを旋回しました。",
+        "UndoPivotBySubtable": "このレポートは、%sにピボットされました。ピボットをもとに戻す。",
         "NoSuchPage": "このページは存在しません",
-        "PageUpShortcutDescription": "ページのトップに戻る",
+        "PageUpShortcutDescription": "ページのトップに移動する",
         "PageDownShortcutDescription": "ページの下部に移動する",
         "PivotBySubtable": "このレポートは、%1$s が %2$s ピボット を旋回していません。",
         "SystemSummaryWidget": "システム概要",
@@ -91,8 +91,8 @@
         "MenuEntries": "メニュー エントリー",
         "Segments": "セグメント",
         "OneClickUpdateNotPossibleAsMultiServerEnvironment": "複数のサーバーで Matomo を使用しているため、ワンクリック更新は利用できません。続行するには、%1$s から最新バージョンをダウンロードしてください。",
-        "CssDidntLoad": "あなたのブラウザはこのページのスタイルを読み込めませんでした。",
-        "JsDidntLoad": "あなたのブラウザはこのページのスクリプトを読み込めませんでした。",
+        "CssDidntLoad": "お使いのブラウザではこのページのスタイルを読み込めませんでした。",
+        "JsDidntLoad": "お使いのブラウザではこのページのスクリプトを読み込めませんでした。",
         "AdblockIsMaybeUsed": "広告ブロッカーを使用している場合には、Matomo が問題なく動作することを確認するために、このサイトでそれを無効にしてください。",
         "ChangeCurrentWebsite": "ウェブサイトを選ぶ　現在選択されている Web サイト：%s",
         "LeadingAnalyticsPlatformRespectsYourPrivacy": "あなたのプライバシーを尊重するオープンな分析プラットフォームです。",
@@ -104,8 +104,9 @@
         "ExportFormat": "エクスポート形式",
         "ExpandSubtables": "サブテーブルを展開する",
         "StandardReport": "標準レポート",
-        "FlattenReport": "レポートを展開する",
+        "FlattenReport": "レポートのフラット化",
         "ReportWithMetadata": "メタデータを使用したレポート",
-        "SeeAvailableVersions": "使用可能なバージョンを表示する"
+        "SeeAvailableVersions": "使用可能なバージョンを表示する",
+        "QuickLinks": "クイックリンク"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/nl.json b/app/plugins/CoreHome/lang/nl.json
index 736579c83..4ac98c642 100644
--- a/app/plugins/CoreHome/lang/nl.json
+++ b/app/plugins/CoreHome/lang/nl.json
@@ -2,6 +2,7 @@
     "CoreHome": {
         "CategoryNoData": "Geen data in deze categorie. Probeer \"Toon alle data\".",
         "ChangeVisualization": "Verander visualisatie",
+        "ChangePeriod": "Wijzigingsperiode",
         "CheckForUpdates": "Controleer op updates",
         "CheckPiwikOut": "Bekijk Matomo eens!",
         "ClickToEditX": "Klik om %s te bewerken",
@@ -18,11 +19,17 @@
         "DonateCall2": "Matomo heeft uw voortdurende steun nodig om te groeien en te bloeien.",
         "DonateCall3": "Als u het gevoel heeft dat Matomo van toegevoegde waarde is voor uw bedrijf of inspanningen, %1$soverweeg dan te doneren %2$s of %3$skoop een premium-functie%4$s. Elke cent helpt.",
         "DonateFormInstructions": "Klik op de schuifbalk om een bedrag te selecteren, en klik dan subscribe om te doneren.",
+        "EndShortcut": "Einde",
         "EnterZenMode": "Activeer Zen-modus (verberg menu's)",
         "ExitZenMode": "Deactiveer Zen-modus (toon menu's)",
+        "ExceptionNotWhitelistedIP": "Je kunt Matomo niet gebruiken als je IP %s niet op de whitelist staat",
         "ExcludeRowsWithLowPopulation": "Alle rijen worden getoond %s Verberg de rijen met een lage populatie",
         "ExternalHelp": "Help (opent in een nieuw tabblad)",
         "FlattenDataTable": "De rapportweergave is hierarchisch %s Maak het vlak",
+        "FormatMetrics": "Waarden opmaken",
+        "ShowExportUrl": "Toon Export URL",
+        "HideExportUrl": "Verberg Export URL",
+        "HomeShortcut": "Home",
         "HowMuchIsPiwikWorth": "Hoeveel is Matomo u waard?",
         "IncludeRowsWithLowPopulation": "Rijen met een lage populatie zijn verborgen %s Laat alle rijen zien",
         "InjectedHostEmailBody": "Hallo, ik probeerde Matomo vandaag te benaderen, en kreeg de onbekende hostnaam waarschuwing.",
@@ -44,6 +51,8 @@
         "ReportGeneratedXAgo": "Rapport %s geleden gegenereerd",
         "SharePiwikShort": "Matomo! Gratis en open source web analyse. Beheer je data.",
         "ShareThis": "Deel dit",
+        "ShortcutsAvailable": "Beschikbare snelkoppelingen",
+        "ShortcutZenMode": "voor Zen mode",
         "ShowJSCode": "toon de javascript code",
         "SkipToContent": "Ga naar de inhoud",
         "SubscribeAndBecomePiwikSupporter": "Ga verder naar een veilige kredietkaart betaalpagina (Paypal) en wordt een Matomo Supporter!",
diff --git a/app/plugins/CoreHome/lang/pt-br.json b/app/plugins/CoreHome/lang/pt-br.json
index c237dae16..ae14add82 100644
--- a/app/plugins/CoreHome/lang/pt-br.json
+++ b/app/plugins/CoreHome/lang/pt-br.json
@@ -106,6 +106,7 @@
         "StandardReport": "Relatório padrão",
         "FlattenReport": "Achatar relatório",
         "ReportWithMetadata": "Relatório com metadados",
-        "SeeAvailableVersions": "Veja Versões Disponíveis"
+        "SeeAvailableVersions": "Veja Versões Disponíveis",
+        "QuickLinks": "Links rápidos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/pt.json b/app/plugins/CoreHome/lang/pt.json
index 1e7354351..44e7362d5 100644
--- a/app/plugins/CoreHome/lang/pt.json
+++ b/app/plugins/CoreHome/lang/pt.json
@@ -14,6 +14,8 @@
         "DataTableExcludeAggregateRows": "As linhas agregadas encontram-se visíveis %s Oculte-as",
         "DataTableIncludeAggregateRows": "As linhas agregadas encontram-se escondidas %s Mostre-as",
         "DataTableHowToSearch": "Pressione enter ou clique no ícone de pesquisa para pesquisar",
+        "DataTableShowDimensions": "As dimensões estão combinadas %s Mostrar dimensões em separado",
+        "DataTableCombineDimensions": "As dimensões estão separadas %s Mostrar dimensões combinadas",
         "Default": "predefinido",
         "DonateCall1": "O Matomo nunca lhe custará nada para usar, mas isso não quer dizer que não nos custe nada para o criar.",
         "DonateCall2": "O Matomo precisa do seu apoio contínuo para crescer e prosperar.",
@@ -104,6 +106,7 @@
         "StandardReport": "Relatório padrão",
         "FlattenReport": "Nivelar relatório",
         "ReportWithMetadata": "Relatório com meta-dados",
-        "SeeAvailableVersions": "Ver versões disponíveis"
+        "SeeAvailableVersions": "Ver versões disponíveis",
+        "QuickLinks": "Ligações rápidas"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/ru.json b/app/plugins/CoreHome/lang/ru.json
index 27bf330f9..f853167e8 100644
--- a/app/plugins/CoreHome/lang/ru.json
+++ b/app/plugins/CoreHome/lang/ru.json
@@ -14,6 +14,8 @@
         "DataTableExcludeAggregateRows": "Выбранные строки отображены %s Скрыть их",
         "DataTableIncludeAggregateRows": "Выбранные строки скрыты %s Показать их",
         "DataTableHowToSearch": "Нажмите ввод или щелкните значок поиска для поиска",
+        "DataTableShowDimensions": "Размеры объединены %s Показать размеры отдельно",
+        "DataTableCombineDimensions": "Размеры указаны отдельно %s Показать размеры вместе",
         "Default": "по умолчанию",
         "DonateCall1": "Matomo всегда будет бесплатным для использования, но это не значит, что нам это ничего не стоит.",
         "DonateCall2": "Matomo нуждается в вашей постоянной поддержке, чтобы расти и процветать.",
@@ -104,6 +106,7 @@
         "StandardReport": "Стандартный отчёт",
         "FlattenReport": "Сокращённый отчёт",
         "ReportWithMetadata": "Отчёт с метаданными",
-        "SeeAvailableVersions": "Посмотреть доступные версии"
+        "SeeAvailableVersions": "Посмотреть доступные версии",
+        "QuickLinks": "Быстрые ссылки"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/sq.json b/app/plugins/CoreHome/lang/sq.json
index 587df752b..0f4161658 100644
--- a/app/plugins/CoreHome/lang/sq.json
+++ b/app/plugins/CoreHome/lang/sq.json
@@ -106,6 +106,7 @@
         "StandardReport": "Raport standard",
         "FlattenReport": "Raport i sheshtë",
         "ReportWithMetadata": "Raport me tejtëdhëna",
-        "SeeAvailableVersions": "Shihni Versione të Gatshëm"
+        "SeeAvailableVersions": "Shihni Versione të Gatshëm",
+        "QuickLinks": "Lidhje të Shpejta"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/sv.json b/app/plugins/CoreHome/lang/sv.json
index 6411a74c2..bc998ff45 100644
--- a/app/plugins/CoreHome/lang/sv.json
+++ b/app/plugins/CoreHome/lang/sv.json
@@ -14,6 +14,8 @@
         "DataTableExcludeAggregateRows": "Aggregerade rader dolda %s Dölj dem",
         "DataTableIncludeAggregateRows": "Aggregerade rader dolda %s Visa dem",
         "DataTableHowToSearch": "Tryck enter eller klicka på sökikonen för att söka",
+        "DataTableShowDimensions": "Dimensioner som är kombinerade %s Visa dimensioner separerade",
+        "DataTableCombineDimensions": "Dimensioner som visas separerade %s Visa dimensioner kombinerade",
         "Default": "standard",
         "DonateCall1": "Matomo kommer alltid vara gratis att använda men det innebär inte att det inte kostar något att skapa den.",
         "DonateCall2": "Matomo behöver ditt fortsatta stöd för att växa och frodas.",
@@ -104,6 +106,7 @@
         "StandardReport": "Standardrapport",
         "FlattenReport": "Platta till rapport",
         "ReportWithMetadata": "Rapport med metadata",
-        "SeeAvailableVersions": "Se tillgängliga versioner"
+        "SeeAvailableVersions": "Se tillgängliga versioner",
+        "QuickLinks": "Snabblänkar"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/tr.json b/app/plugins/CoreHome/lang/tr.json
index 930092ef5..0a9030ccb 100644
--- a/app/plugins/CoreHome/lang/tr.json
+++ b/app/plugins/CoreHome/lang/tr.json
@@ -106,6 +106,7 @@
         "StandardReport": "Standart rapor",
         "FlattenReport": "Düz rapor",
         "ReportWithMetadata": "Üst veriler ile rapor",
-        "SeeAvailableVersions": "Kullanılabilecek Sürümlere Bakın"
+        "SeeAvailableVersions": "Kullanılabilecek Sürümlere Bakın",
+        "QuickLinks": "Kestirme Bağlantıları"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/uk.json b/app/plugins/CoreHome/lang/uk.json
index c52e99c40..e93c0436c 100644
--- a/app/plugins/CoreHome/lang/uk.json
+++ b/app/plugins/CoreHome/lang/uk.json
@@ -15,6 +15,7 @@
         "DataTableIncludeAggregateRows": "Вибрані рядки приховані %s Показати їх",
         "DataTableHowToSearch": "Натисніть enter або клацніть значок пошуку для пошуку",
         "DataTableShowDimensions": "Обє'кти об'єднані %s Показувати об'єкти окремо",
+        "DataTableCombineDimensions": "Аспекти вказано окремо для %s Показати аспекти в поєднанні",
         "Default": "за замовчуванням",
         "DonateCall1": "Matomo завжди буде безкоштовним для використання, але це не означає, що нам це нічого не коштує.",
         "DonateCall2": "Matomo потребує вашої постійної підтримки, щоб рости і процвітати.",
@@ -68,6 +69,8 @@
         "TableNoData": "Немає даних для цієї таблиці.",
         "ThereIsNoDataForThisReport": "Не існує даних для складання звіту.",
         "UnFlattenDataTable": "Конкретніший звіт %s Побудувати його по ієрархії",
+        "RemoveTotalsRowDataTable": "Звіт показує підсумковий рядок %s Видалити підсумкові рядки",
+        "AddTotalsRowDataTable": "Звіт не показує підсумковий рядок %s Показати підсумкові рядки",
         "ViewAllPiwikVideoTutorials": "Переглянути всі навчальні ролики про Matomo",
         "WebAnalyticsReports": "Звіти веб аналітики",
         "YouAreUsingTheLatestVersion": "У вас остання версія Matomo!",
@@ -103,6 +106,7 @@
         "StandardReport": "Стандартний звіт",
         "FlattenReport": "Згладити звіт",
         "ReportWithMetadata": "Звіт з метаданими",
-        "SeeAvailableVersions": "Див. Доступні версії"
+        "SeeAvailableVersions": "Див. Доступні версії",
+        "QuickLinks": "Швидкі посилання"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/lang/vi.json b/app/plugins/CoreHome/lang/vi.json
index adbce30f5..6202a5554 100644
--- a/app/plugins/CoreHome/lang/vi.json
+++ b/app/plugins/CoreHome/lang/vi.json
@@ -12,7 +12,7 @@
         "DonateCall2": "Matomo cần sự hỗ trợ của bạn để phát triển và phát triển mạnh hơn.",
         "DonateFormInstructions": "Click vào thanh trượt để chọn một số tiền, sau đó nhấp vào đăng ký để tài trợ",
         "ExcludeRowsWithLowPopulation": "Tất cả các hàng được hiển thị %s Loại trừ dân số thấp",
-        "ExternalHelp": "Giúp đỡ (mở tab mới)",
+        "ExternalHelp": "Giúp đỡ (mở trong tab mới)",
         "FlattenDataTable": "Báo cáo này là phân cấp %s Làm cho nó minh bạch",
         "HowMuchIsPiwikWorth": "Giá trị Matomo đối với bạn là bao nhiêu?",
         "IncludeRowsWithLowPopulation": "Các Hàng với mật độ tập trung thấp đang ẩn %s Hiển thị tất cả các hàng",
diff --git a/app/plugins/CoreHome/lang/zh-cn.json b/app/plugins/CoreHome/lang/zh-cn.json
index 9eff7a056..f95f93cd1 100644
--- a/app/plugins/CoreHome/lang/zh-cn.json
+++ b/app/plugins/CoreHome/lang/zh-cn.json
@@ -2,6 +2,7 @@
     "CoreHome": {
         "CategoryNoData": "该分类没有数据！ 请试试 \"包含所有数据\"！",
         "ChangeVisualization": "转换可视化",
+        "ChangePeriod": "改变期限",
         "CheckForUpdates": "检查更新",
         "CheckPiwikOut": "访问 Matomo",
         "ClickToEditX": "点击编辑 %s",
@@ -13,14 +14,24 @@
         "DataTableExcludeAggregateRows": "汇总行已显示 %s 隐藏汇总",
         "DataTableIncludeAggregateRows": "汇总行已隐藏 %s 显示汇总",
         "DataTableHowToSearch": "按回车或者点击搜索图标进行搜索",
+        "DataTableShowDimensions": "尺寸合并%s单独显示尺寸",
+        "DataTableCombineDimensions": "尺寸单独显示%s显示组合尺寸",
         "Default": "默认",
         "DonateCall1": "Matomo 对您来说可以免费使用，但对我们来说并非零成本。",
         "DonateCall2": "Matomo 的茁壮成长离不开您的支持。",
         "DonateCall3": "如果你觉得Matomo对你的商业有价值的话，%1$s请考虑资助%2$s 或者 %3$s购买会员%4$s。任何一分都会有帮助。",
         "DonateFormInstructions": "点击下面的滑动条设定金额，然后点 Subscribe 按钮捐款",
+        "EndShortcut": "结束",
+        "EnterZenMode": "进入Zen模式（隐藏菜单）",
+        "ExitZenMode": "退出Zen模式（显示菜单）",
+        "ExceptionNotWhitelistedIP": "您不能使用此Matomo，因为您的IP%s未列入白名单",
         "ExcludeRowsWithLowPopulation": "显示了所有的数据 %s 不显示低密度数据",
         "ExternalHelp": "帮助（在新标签页打开）",
         "FlattenDataTable": "本报表已分级显示 %s 改为不分级显示",
+        "FormatMetrics": "格式指标",
+        "ShowExportUrl": "显示导出URL",
+        "HideExportUrl": "隐藏导出URL",
+        "HomeShortcut": "Home",
         "HowMuchIsPiwikWorth": "对于您来说Matomo的价值?",
         "IncludeRowsWithLowPopulation": "没有显示低密度数据 %s 显示所有数据",
         "InjectedHostEmailBody": "您好，我今天访问 Matomo 时遇到未知主机名的警告。",
@@ -29,6 +40,10 @@
         "InjectedHostSuperUserWarning": "可能 Matomo 配置有误 (例如，Matomo 刚移到新的服务器)。您可以 %1$s点这里添加 %2$s 为 Matomo 主机名 (如果您信任)%3$s, 或者 %4$s点这里转到 %5$s 安全访问 Matomo %6$s。",
         "InjectedHostWarningIntro": "您现在是通过 %1$s 访问 Matomo，但 Matomo 设置的地址是: %2$s.",
         "JavascriptDisabled": "使用 Matomo 的标准视图时必须启用 JavaScript。<br \/>然而，看来您的浏览器已停用或不支持 JavaScript。<br \/>若要使用标准视图，请修改您的浏览器选项并启用 JavaScript, 然后%1$s重试一次%2$s。<br \/>",
+        "VisitStatusOrdered": "有序",
+        "VisitStatusOrderedThenAbandoned": "订购了Abandoned Cart",
+        "VisitTypeReturning": "返回",
+        "VisitTypeReturningCustomer": "回归客户",
         "MainNavigation": "主导航",
         "MakeOneTimeDonation": "一次性捐款",
         "Menu": "菜单",
@@ -40,6 +55,13 @@
         "SharePiwikLong": "您好！我刚刚发现了一个很棒的开源软件: Matomo！\n\nMatomo 可以免费统计网站的访问情况，您一定要看一看！",
         "SharePiwikShort": "Matomo！自由和开源的网络分析程序，掌控您自己的统计数据。",
         "ShareThis": "分享这个",
+        "ShortcutsAvailable": "可用的快捷方式",
+        "ShortcutZenMode": "对于Zen模式",
+        "ShortcutSegmentSelector": "打开Segment选择器",
+        "ShortcutWebsiteSelector": "打开网站选择器",
+        "ShortcutCalendar": "打开日历（d代表日期）",
+        "ShortcutSearch": "打开搜索（f代表查找）",
+        "ShortcutHelp": "显示这个帮助",
         "ShowJSCode": "显示插入的Javascript代码",
         "SkipToContent": "跳过，查看内容",
         "SubscribeAndBecomePiwikSupporter": "进入安全的信用卡付款页面 (Paypal) 支持 Matomo !",
@@ -47,12 +69,16 @@
         "TableNoData": "此表格无数据",
         "ThereIsNoDataForThisReport": "此报表沒有数据。",
         "UnFlattenDataTable": "本报表不分级显示 %s 改为分级显示",
+        "RemoveTotalsRowDataTable": "该报告显示总计行%s删除总计行",
+        "AddTotalsRowDataTable": "该报告未显示总计行%s显示总计行",
         "ViewAllPiwikVideoTutorials": "查看所有的 Matomo 视频教程",
         "WebAnalyticsReports": "网站分析报表",
         "YouAreUsingTheLatestVersion": "您正在使用最新版的 Matomo！",
         "ClickRowToExpandOrContract": "点击这行可以扩展或压缩小工作台。",
         "UndoPivotBySubtable": "这个报表被 pivot 了 %s 撤销 Pivot",
         "NoSuchPage": "页面不存在。",
+        "PageUpShortcutDescription": "到达页面顶部",
+        "PageDownShortcutDescription": "到达页面底部",
         "PivotBySubtable": "这个报表尚未 pivot %1$s 以 %2$s 的身份 pivot",
         "SystemSummaryWidget": "系统概要",
         "SystemSummaryNWebsites": "%d网站",
@@ -65,8 +91,22 @@
         "MenuEntries": "菜单项",
         "Segments": "段",
         "OneClickUpdateNotPossibleAsMultiServerEnvironment": "由于你在多个服务器上部署Matomo，所以一键升级不可用。请直接从%1$s下周最新版本。",
+        "CssDidntLoad": "您的浏览器无法加载此页面的样式。",
+        "JsDidntLoad": "您的浏览器无法加载此页面的脚本。",
         "AdblockIsMaybeUsed": "如果您使用的是广告拦截，请禁用此网站，以确保Matomo工作没有任何问题。",
         "ChangeCurrentWebsite": "选择一个网站，当前选择的网站： %s",
-        "LeadingAnalyticsPlatformRespectsYourPrivacy": "领先的开源分析平台尊重你的隐私。"
+        "LeadingAnalyticsPlatformRespectsYourPrivacy": "领先的开源分析平台尊重你的隐私。",
+        "MacPageUp": "Fn + 向左箭头",
+        "MacPageDown": "Fn + 右箭头",
+        "ReportType": "报告类型",
+        "RowLimit": "行限制",
+        "CustomLimit": "自定义限制",
+        "ExportFormat": "出口格式",
+        "ExpandSubtables": "展开子表",
+        "StandardReport": "标准报告",
+        "FlattenReport": "展平报告",
+        "ReportWithMetadata": "报告元数据",
+        "SeeAvailableVersions": "请参阅可用版本",
+        "QuickLinks": "快速链接"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreHome/stylesheets/dataTable.less b/app/plugins/CoreHome/stylesheets/dataTable.less
index 06ad9623f..2478032b7 100644
--- a/app/plugins/CoreHome/stylesheets/dataTable.less
+++ b/app/plugins/CoreHome/stylesheets/dataTable.less
@@ -4,4 +4,5 @@
 @import "dataTable/_rowActions.less";
 @import "dataTable/_subDataTable.less";
 @import "dataTable/_tableConfiguration.less";
-@import "dataTable/_entityTable.less";
\ No newline at end of file
+@import "dataTable/_entityTable.less";
+@import "dataTable/_comparisonsTable.less";
\ No newline at end of file
diff --git a/app/plugins/CoreHome/stylesheets/dataTable/_comparisonsTable.less b/app/plugins/CoreHome/stylesheets/dataTable/_comparisonsTable.less
new file mode 100644
index 000000000..aa5e3f861
--- /dev/null
+++ b/app/plugins/CoreHome/stylesheets/dataTable/_comparisonsTable.less
@@ -0,0 +1,71 @@
+.theWidgetContent .card .card-content table.dataTable, table.dataTable {
+  tr.comparePeriod, tr.comparisonRow {
+    > td:first-child {
+      padding-left: 45px;
+    }
+  }
+
+  tr.parentComparisonRow {
+    .dataTableRowActions {
+      display: none !important;
+    }
+
+    > td:not(.label) > * {
+      visibility: hidden;
+    }
+  }
+
+  tr.comparePeriod {
+    .dataTableRowActions {
+      display: none !important;
+    }
+
+    td.label {
+      font-weight: bold;
+      color: @color-silver-l60;
+    }
+  }
+
+  td.label .prefix-numeral {
+    display: inline-block;
+    width: 20px;
+  }
+
+  .totalsRow,.summaryRow {
+    td.label .prefix-numeral {
+      visibility: hidden;
+    }
+  }
+
+  img {
+    margin-left: 1px;
+  }
+}
+
+tr.comparePeriod, tr.comparisonRow {
+  &.level0 td.label {
+    padding-left: 44px !important;
+  }
+
+  &.level1 td.label {
+    padding-left: 68px !important;
+  }
+
+  &.level2 td.label {
+    padding-left: 90px !important;
+  }
+}
+
+tr.parentComparisonRow {
+  td.label img.plusMinus {
+    margin-right: 8px;
+  }
+
+  &.level1 td.label {
+    padding-left: 44px !important;
+  }
+
+  &.level2 td.label {
+    padding-left: 68px !important;
+  }
+}
diff --git a/app/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/app/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index d15b3017a..c0e280876 100644
--- a/app/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/app/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -4,8 +4,13 @@
   width: 100%;
   padding: 0;
   border-spacing: 0;
+  border-collapse: separate;
   margin: 0;
 
+  td {
+    border-radius: 1px;
+  }
+
   td .ratio {
     color: #999999;
     display: inline-block;
@@ -44,6 +49,11 @@ table.dataTable img {
   margin-left: 0.5em;
 }
 
+table.dataTable tr:not(.parentComparisonRow) img.link {
+  position: relative;
+  top: 5px;
+}
+
 table.subDataTable img.link {
   transform: translateY(-50%);
 }
@@ -78,9 +88,7 @@ body>.widget table.dataTable {
 }
 
 // for dataTables in report pages (not for widgets in the dashboard)
-.theWidgetContent .card .card-content table.dataTable {
-  margin-left: -20px;
-  width: ~"calc(100% + 40px)";
+.theWidgetContent .card .card-content table.dataTable, table.dataTable, table.subDataTable {
 
   th {
     background: @theme-color-background-base !important;
@@ -115,8 +123,9 @@ table.dataTable th.columnSorted {
 }
 
 table.dataTable td {
-  padding: 5px 1px 5px 12px;
+  padding: 5px 0px 5px 12px;
   background: @theme-color-background-base;
+  z-index: 99;
 }
 
 table.dataTable td,
@@ -138,15 +147,16 @@ table.dataTable td.column {
   font-weight: bold;
 }
 
+table.dataTable th.label,
 table.dataTable td.label,
 table.subActionsDataTable td.label,
 table.actionsDataTable td.label {
   border-top: 0;
   border-left: 0;
-}
-
-table.dataTable th.label {
-  border-left: 0;
+  position: sticky; position: -webkit-sticky;
+  left: 0;
+  z-index: 1;
+  background-clip: padding-box;
 }
 
 .dataTableActions table.dataTable th.label {
@@ -158,11 +168,17 @@ table.dataTable span.label.highlighted {
   font-style: italic;
 }
 
+.widget div.dataTable:not(.isComparing) table.dataTable tbody > tr > td:not(.cellSubDataTable):first-child {
+  padding-left: 12px;
+}
+
 /* the cell containing the subdatatable */
-table.dataTable .cellSubDataTable {
-  margin: 0;
-  border-left: 0;
-  padding: 6px 12px 6px;
+table.dataTable tr td.cellSubDataTable {
+  &, .widget & {
+    margin: 0;
+    border-left: 0;
+    padding: 6px 20px 6px;
+  }
 }
 
 .cellSubDataTable > .dataTable {
@@ -440,13 +456,18 @@ tr.level0 td.label {
 }
 
 .widget {
-  tr.level0 td.label {
+  div.dataTable:not(.isComparing) table.dataTable tr.level0 td.label,
+  div.dataTable:not(.isComparing) table.dataTable th {
     padding-left: 12px !important;
   }
 }
 
 tr.level1 td.label {
   padding-left: 2.5em !important;
+
+  .widget & {
+    padding-left: 28px !important;
+  }
 }
 
 tr.level2 td.label {
@@ -488,7 +509,7 @@ tr.level12 td.label {
 /* less right margins for the link image in the Pa*/
 .dataTableActions table.dataTable img.link {
   margin-right: 0.5em;
-  margin-left: 0;
+  margin-left: 1px;
   margin-bottom: 4px;
   vertical-align: text-bottom;
 }
@@ -500,7 +521,7 @@ table.dataTable td.label img {
 
 tr td.label img.plusMinus {
   margin-left: -3px;
-  margin-right: 3px;
+  margin-right: 6px;
   margin-top: 0;
 }
 
@@ -606,6 +627,17 @@ td.cellSubDataTable .loadingPiwik {
   }
 }
 
+div.dataTableScroller {
+  overflow-x: scroll;
+}
+
+.theWidgetContent .card .card-content, table.dataTable {
+  div.dataTableScroller {
+    margin-left: -20px;
+    width: ~"calc(100% + 40px)";
+  }
+}
+
 @media only screen and (min-width: 993px) {
   #dashboardWidgetsArea .widget,
   .theWidgetContent > div:not(#dashboard) {
diff --git a/app/plugins/CoreHome/stylesheets/dataTable/_subDataTable.less b/app/plugins/CoreHome/stylesheets/dataTable/_subDataTable.less
index 3dcfea86d..e7f2dcda3 100644
--- a/app/plugins/CoreHome/stylesheets/dataTable/_subDataTable.less
+++ b/app/plugins/CoreHome/stylesheets/dataTable/_subDataTable.less
@@ -31,14 +31,6 @@ table.subDataTable td.label, table.subDataTable td.column {
   color: #2D2A27;
 }
 
-table.subDataTable td.label {
-  width: 80%;
-}
-
-table.subDataTable td.label {
-  padding: 5px;
-}
-
 /* are the following two supposed to be together? */
 .subDataTable.dataTableFeatures {
   padding-top: 0;
diff --git a/app/plugins/CoreHome/stylesheets/jqplotColors.less b/app/plugins/CoreHome/stylesheets/jqplotColors.less
deleted file mode 100644
index 6abb9a742..000000000
--- a/app/plugins/CoreHome/stylesheets/jqplotColors.less
+++ /dev/null
@@ -1,150 +0,0 @@
-// evolution graph colors
-.evolution-graph-colors[data-name=grid-background] {
-  color: #fff;
-}
-
-.evolution-graph-colors[data-name=grid-border] {
-  color: #f00;
-}
-
-.evolution-graph-colors[data-name=series1] {
-    color: #5170AE;
-}
-
-.evolution-graph-colors[data-name=series2] {
-    color: #F29007;
-}
-
-.evolution-graph-colors[data-name=series3] {
-    color: #CC3399;
-}
-
-.evolution-graph-colors[data-name=series4] {
-    color: #9933CC;
-}
-
-.evolution-graph-colors[data-name=series5] {
-    color: #80a033;
-}
-
-.evolution-graph-colors[data-name=series6] {
-    color: #246AD2;
-}
-
-.evolution-graph-colors[data-name=series7] {
-    color: #FD16EA;
-}
-
-.evolution-graph-colors[data-name=series8] {
-    color: #49C100;
-}
-
-.evolution-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.evolution-graph-colors[data-name=single-metric-label] {
-    color: @theme-color-text-lighter;
-}
-
-// bar graph colors
-.bar-graph-colors[data-name=grid-background] {
-  color: #fff;
-}
-
-.bar-graph-colors[data-name=grid-border] {
-  color: #f00;
-}
-
-.bar-graph-colors[data-name=series1] {
-    color: #5170AE;
-}
-
-.bar-graph-colors[data-name=series2] {
-    color: #F3A010;
-}
-
-.bar-graph-colors[data-name=series3] {
-    color: #CC3399;
-}
-
-.bar-graph-colors[data-name=series4] {
-    color: #9933CC;
-}
-
-.bar-graph-colors[data-name=series5] {
-    color: #80a033;
-}
-
-.bar-graph-colors[data-name=series6] {
-    color: #246AD2;
-}
-
-.bar-graph-colors[data-name=series7] {
-    color: #FD16EA;
-}
-
-.bar-graph-colors[data-name=series8] {
-    color: #49C100;
-}
-
-.bar-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.bar-graph-colors[data-name=single-metric-label] {
-    color: @theme-color-text-lighter;
-}
-
-// pie graph colors
-.pie-graph-colors[data-name=grid-background] {
-  color: #fff;
-}
-
-.pie-graph-colors[data-name=grid-border] {
-  color: #f00;
-}
-
-.pie-graph-colors[data-name=series1] {
-    color: #59727F;
-}
-
-.pie-graph-colors[data-name=series2] {
-    color: #7DAAC0;
-}
-
-.pie-graph-colors[data-name=series3] {
-    color: #7F7259;
-}
-
-.pie-graph-colors[data-name=series4] {
-    color: #C09E7D;
-}
-
-.pie-graph-colors[data-name=series5] {
-    color: #9BB39B;
-}
-
-.pie-graph-colors[data-name=series6] {
-    color: #B1D8B3;
-}
-
-.pie-graph-colors[data-name=series7] {
-    color: #B39BA7;
-}
-
-.pie-graph-colors[data-name=series8] {
-    color: #D8B1C5;
-}
-
-.pie-graph-colors[data-name=series9] {
-    color: #A5A5A5;
-}
-
-.pie-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.pie-graph-colors[data-name=single-metric-label] {
-    color: @theme-color-text-lighter;
-}
diff --git a/app/plugins/CoreHome/stylesheets/layout.less b/app/plugins/CoreHome/stylesheets/layout.less
index 10bad8ede..25136cf8e 100644
--- a/app/plugins/CoreHome/stylesheets/layout.less
+++ b/app/plugins/CoreHome/stylesheets/layout.less
@@ -7,7 +7,7 @@ nav {
   background-color: @theme-color-header-background !important;
 
   .brand-logo {
-    font-size: 28px;
+    font-size: 30px;
   }
 
   .activateLeftMenu {
diff --git a/app/plugins/CoreHome/templates/_dataTable.twig b/app/plugins/CoreHome/templates/_dataTable.twig
index 3d8be6103..33cfa2c50 100644
--- a/app/plugins/CoreHome/templates/_dataTable.twig
+++ b/app/plugins/CoreHome/templates/_dataTable.twig
@@ -2,7 +2,7 @@
     {% include visualizationTemplate %}
 {%- else -%}
 
-{% set isDataTableEmpty = (dataTable is empty or dataTableHasNoData|default(false)) %}
+{% set isDataTableEmpty = (dataTable is not defined or dataTable is null or dataTableHasNoData|default(false)) %}
 
 {% set showCardAsContentBlock = (properties.show_as_content_block and properties.show_title and not isWidget) %}
 {% set showOnlyTitleWithoutCard = not showCardAsContentBlock and properties.title and properties.show_title %}
@@ -29,7 +29,7 @@
 
 {% set summaryRowId = constant('Piwik\\DataTable::ID_SUMMARY_ROW') %}{# ID_SUMMARY_ROW #}
 {% set isSubtable = javascriptVariablesToSet.idSubtable is defined and javascriptVariablesToSet.idSubtable != 0 %}
-<div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %}"
+<div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %} {% if isComparing|default(false) %}isComparing{% endif %}"
      data-table-type="{{ properties.datatable_js_type }}"
      data-report="{{ properties.report_id }}"
      data-report-metadata="{{ reportMetdadata|json_encode|e('html_attr') }}"
@@ -47,7 +47,7 @@
 
     <div class="dataTableWrapper">
         {% if error is defined %}
-            {{ error.message }}
+            <div piwik-alert="danger">{{ error.message }}</div>
         {% else %}
             {% if properties.show_header_message is defined and properties.show_header_message is not empty %}
                 <div class='datatableHeaderMessage'>{{ properties.show_header_message | raw }}</div>
diff --git a/app/plugins/CoreHome/templates/_dataTableActions.twig b/app/plugins/CoreHome/templates/_dataTableActions.twig
index 426664444..05be8b983 100644
--- a/app/plugins/CoreHome/templates/_dataTableActions.twig
+++ b/app/plugins/CoreHome/templates/_dataTableActions.twig
@@ -76,6 +76,7 @@
                report-title="{{ properties.title|e('html_attr') }}" request-params="{{ requestParams|e('html_attr') }}"
                api-method="{{ properties.apiMethodToRequestDataTable }}" report-formats="{{ formats|json_encode|e('html_attr') }}"
                href='javascript:;' title="{{ 'General_ExportThisReport'|translate|e('html_attr') }}"
+               max-filter-limit="{{ properties.max_export_filter_limit|e('html_attr') }}"
                ><span class="icon-export"></span></a>
         {% endif %}
 
diff --git a/app/plugins/CoreHome/templates/_dataTableCell.twig b/app/plugins/CoreHome/templates/_dataTableCell.twig
index 7aca38def..7c72b5738 100644
--- a/app/plugins/CoreHome/templates/_dataTableCell.twig
+++ b/app/plugins/CoreHome/templates/_dataTableCell.twig
@@ -12,31 +12,14 @@
 {% endif %}
 
 {% set totals = dataTable.getMetadata('totals') %}
-{% if column in properties.report_ratio_columns and column in totals|keys -%}
-    {% set labelColumn   = columns_to_display|first %}
-    {% set reportTotal   = totals[column] %}
-    {% if siteSummary is defined and siteSummary is not empty and siteSummary.getFirstRow %}
-        {% set siteTotal = siteSummary.getFirstRow.getColumn(column) %}
-    {% else %}
-        {% set siteTotal = 0 %}
-    {% endif %}
-    {% set rowPercentage = row.getColumn(column)|percentage(reportTotal, 1) %}
-    {% set metricTitle   = translations[column]|default(column) %}
-    {% set reportLabel   = row.getColumn(labelColumn)|truncate(40)|rawSafeDecoded %}
-
-    {% set reportRatioTooltip = 'General_ReportRatioTooltip'|translate(reportLabel, rowPercentage|e('html_attr'), reportTotal|e('html_attr'), metricTitle|e('html_attr'), translations[labelColumn]|default(labelColumn)|e('html_attr')) %}
-
-    {% if siteTotal and siteTotal > reportTotal %}
-        {% set totalPercentage   = row.getColumn(column)|percentage(siteTotal, 1) %}
-        {% set totalRatioTooltip = 'General_TotalRatioTooltip'|translate(totalPercentage, siteTotal|number(2,0), metricTitle) %}
-    {% else %}
-        {% set totalRatioTooltip = '' %}
-    {% endif %}
+{% set labelColumn   = columns_to_display|first %}
+{% set reportLabel   = row.getColumn(labelColumn)|truncate(40)|rawSafeDecoded %}
+{% include "@CoreVisualizations/_dataTableViz_htmlTable_ratio.twig" with {
+    'label': reportLabel,
+    'labelColumn': labelColumn,
+    'translations': properties.translations
+} %}
 
-    <span class="ratio"
-          title="{{ reportRatioTooltip|raw }} {{ totalRatioTooltip|e('html_attr') }}"
-          >&nbsp;{{ rowPercentage }}</span>
-{%- endif %}
 {% set dimensions = dataTable.getMetadata('dimensions')|default([]) %}
 {% if column=='label' or column in dimensions %}
     {% import 'macros.twig' as piwik %}
diff --git a/app/plugins/CoreHome/templates/_dataTableHead.twig b/app/plugins/CoreHome/templates/_dataTableHead.twig
index 719f59975..d607f7ad0 100644
--- a/app/plugins/CoreHome/templates/_dataTableHead.twig
+++ b/app/plugins/CoreHome/templates/_dataTableHead.twig
@@ -1,7 +1,7 @@
 <thead>
    <tr>
        {% for column in properties.columns_to_display %}
-           <th class="{% if properties.enable_sort %}sortable{% endif %} {% if loop.first %}first{% elseif loop.last %}last{% endif %}" id="{{ column }}">
+           <th class="{% if properties.enable_sort %}sortable{% endif %} {% if loop.first %}first{% elseif loop.last %}last{% endif %} {% if column == 'label' %}label{% endif %}" id="{{ column }}">
                {% if properties.metrics_documentation[column]|default is not empty %}
                    <div class="columnDocumentation">
                        <div class="columnDocumentationTitle">
diff --git a/app/plugins/CoreHome/templates/_headerMessage.twig b/app/plugins/CoreHome/templates/_headerMessage.twig
index 280a64d63..7f4ea2a01 100644
--- a/app/plugins/CoreHome/templates/_headerMessage.twig
+++ b/app/plugins/CoreHome/templates/_headerMessage.twig
@@ -35,8 +35,7 @@
 
     <div class="dropdown positionInViewport">
         {% if latest_version_available and isSuperUser %}
-            {% if isMultiServerEnvironment %}
-                {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer noopener' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }}
+            {% if isMultiServerEnvironment %}{{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer noopener' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip</a>")|raw }}
             {% else %}
                 {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&amp;action=newVersionAvailable'>","</a>","<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/changelog/'>","</a>")|raw }}
             {% endif %}
diff --git a/app/plugins/CoreHome/templates/_htmlEmailHeader.twig b/app/plugins/CoreHome/templates/_htmlEmailHeader.twig
index b992ee0de..330f76d1b 100644
--- a/app/plugins/CoreHome/templates/_htmlEmailHeader.twig
+++ b/app/plugins/CoreHome/templates/_htmlEmailHeader.twig
@@ -13,11 +13,11 @@
 <table style="width:100%; background-color: {{ themeStyles.colorHeaderBackground|e('html_attr') }}; color: {{ themeStyles.colorHeaderText|e('html_attr') }}; padding:10px 0; margin: 0 0 25px 0; height:64px;">
     <tr>
         <td>
-            <a style="{{ fontStyle|raw }}; font-size:16px;padding:0 15px;color: {{ themeStyles.colorHeaderText|e('html_attr') }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}">
+            <a style="{{ fontStyle|raw }}; font-size:16px;padding:0 15px;{% if not isCustomLogo or not logoHeader %}padding-bottom: 8px;{% endif %}color: {{ themeStyles.colorHeaderText|e('html_attr') }};height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}">
                 {% if isCustomLogo and logoHeader %}
                     <img src="{{ logoHeader }}" height="20px" width="auto" />
                 {% else %}
-                    <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="{{ emailStyles.brandNameLong|e('html_attr') }}" />
+                    <img src="{{ piwikUrl }}/plugins/Morpheus/images/logo-email.png" height="30px" width="auto" alt="{{ emailStyles.brandNameLong|e('html_attr') }}" />
                 {% endif %}
             </a>
         </td>
diff --git a/app/plugins/CoreHome/templates/_siteSelectHeader.twig b/app/plugins/CoreHome/templates/_siteSelectHeader.twig
index 13fd59cd2..a1dd8e1f4 100644
--- a/app/plugins/CoreHome/templates/_siteSelectHeader.twig
+++ b/app/plugins/CoreHome/templates/_siteSelectHeader.twig
@@ -1,3 +1,3 @@
 <div class="top_bar_sites_selector piwikTopControl">
-    <div piwik-siteselector show-selected-site="true" show-all-sites-item="{{ (isMultiSitesEnabled|default) ? 'true' : 'false' }}" class="sites_autocomplete"></div>
-</div>
\ No newline at end of file
+    <div piwik-siteselector show-selected-site="true" show-all-sites-item="{{ isMultiSitesEnabled ? 'true' : 'false' }}" class="sites_autocomplete"></div>
+</div>
diff --git a/app/plugins/CoreHome/templates/quickLinks.twig b/app/plugins/CoreHome/templates/quickLinks.twig
new file mode 100644
index 000000000..a44bda723
--- /dev/null
+++ b/app/plugins/CoreHome/templates/quickLinks.twig
@@ -0,0 +1,19 @@
+<div class="widgetBody quickLinks">
+    {% if hasSitesAdmin %}
+    <div class="quickLink">
+        <span class="icon icon-open-source">&nbsp;</span>
+        <a href="{{ linkTo({'module': 'SitesManager', 'action': 'index', 'showaddsite': '1'}) }}" class="itemLabel">
+            {{ 'SitesManager_AddSite'|translate|e }}
+        </a>
+    </div>
+    {% endif %}
+    {% if hasUsersAdmin %}
+    <div class="quickLink">
+        <span class="icon icon-user-add">&nbsp;</span>
+        <a href="{{ linkTo({'module': 'UsersManager', 'action': 'index', 'showadduser': '1'}) }}" class="itemLabel">
+            {{ 'UsersManager_AddUser'|translate|e }}
+        </a>
+    </div>
+    {% endif %}
+    <br />
+</div>
diff --git a/app/plugins/CorePluginsAdmin/config/config.php b/app/plugins/CorePluginsAdmin/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/CorePluginsAdmin/config/config.php
+++ b/app/plugins/CorePluginsAdmin/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/config/tracker.php b/app/plugins/CorePluginsAdmin/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CorePluginsAdmin/config/tracker.php
+++ b/app/plugins/CorePluginsAdmin/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/lang/da.json b/app/plugins/CorePluginsAdmin/lang/da.json
index 6cb38586a..a79d1e3fb 100644
--- a/app/plugins/CorePluginsAdmin/lang/da.json
+++ b/app/plugins/CorePluginsAdmin/lang/da.json
@@ -5,6 +5,7 @@
         "Activated": "Aktiveret",
         "Active": "Aktiv",
         "Activity": "Aktivitet",
+        "AlwaysActivatedPluginsList": "Følgende plugins er altid aktiveret og kan ikke deaktiveres: %s",
         "AuthorHomepage": "Forfatter hjemmeside",
         "Changelog": "Ændringslog",
         "ChangeSettingsPossible": "Du kan ændre %1$sindstillinger%2$s for denne programudvidelse",
@@ -14,6 +15,8 @@
         "ChangeLookByManageThemes": "Skift udseendet på Matomo med %1$sAdministration af temaer%2$s.",
         "History": "Historik",
         "Inactive": "Inaktiv",
+        "InstalledPlugins": "Installerede plugins",
+        "InstalledThemes": "Installerede temaer",
         "InfoPluginUpdateIsRecommended": "Opdater dine programudvidelser nu og drag fordel af de seneste forbedringer.",
         "InfoThemeIsUsedByOtherUsersAsWell": "Bemærk: Den anden %1$s bruger der er registreret i denne Matomo bruger også temaet %2$s.",
         "InfoThemeUpdateIsRecommended": "Opdater dine temaer for at nyde den nyeste version.",
@@ -31,11 +34,14 @@
         "MissingRequirementsPleaseInstallNotice": "Installer %1$s %2$s, da det kræves af %3$s.",
         "NoZipFileSelected": "Vælg venligst en ZIP-fil.",
         "NumUpdatesAvailable": "%s opdateringer tilgængelige",
+        "NoPluginSettings": "Ingen plugin-indstillinger kan konfigureres",
         "Origin": "Kilde",
         "OriginCore": "Kernen",
+        "OriginOfficial": "Officiel",
         "OriginThirdParty": "Tredjeparts",
         "PluginHomepage": "Udvidelsesmodul hjemmeside",
         "PluginNotCompatibleWith": "%1$s udvidelsesmodul er ikke kompatibelt med %2$s.",
+        "PluginNotFound": "Plugin %1$s ikke fundet i filsystem.",
         "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": "Administrer udvidelsesmoduler",
diff --git a/app/plugins/CorePluginsAdmin/lang/es-ar.json b/app/plugins/CorePluginsAdmin/lang/es-ar.json
index d6dd64103..9dc86d285 100644
--- a/app/plugins/CorePluginsAdmin/lang/es-ar.json
+++ b/app/plugins/CorePluginsAdmin/lang/es-ar.json
@@ -9,12 +9,16 @@
         "AuthorHomepage": "Sitio web del autor",
         "Changelog": "Registro de cambios",
         "ChangeSettingsPossible": "Cambiaste la %1$sconfiguración%2$s de este plugin.",
+        "CorePluginTooltip": "Los plugins principales no tienen versión, ya que son distribuidos con Matomo.",
         "Deactivate": "Desactivar",
+        "DoMoreContactPiwikAdmins": "Para instalar un nuevo plugin o un nuevo tema, por favor, ponete en contacto con tus administradores de Matomo.",
+        "ChangeLookByManageThemes": "Podés cambiar la apariencia de Matomo %1$sadministrando los temas%2$s.",
         "History": "Historial",
         "Inactive": "Inactivo",
         "InstalledPlugins": "Plugins instalados",
         "InstalledThemes": "Temas instalados",
         "InfoPluginUpdateIsRecommended": "Actualizá tus plugins ahora para beneficiarte con las últimas mejoras.",
+        "InfoThemeIsUsedByOtherUsersAsWell": "Nota: los otros %1$s usuarios registrados en este Matomo también están usando el tema %2$s.",
         "InfoThemeUpdateIsRecommended": "Actualizá tus temas para disfrutar de la última versión.",
         "InstallNewPlugins": "Instalar nuevos plugins",
         "InstallNewThemes": "Instalar nuevos temas",
@@ -23,6 +27,7 @@
         "ConsiderDonating": "Considerá hacer una donación",
         "CommunityContributedPlugin": "Este plugin es una contribución de la comunidad, ofrecido gratis para vos.",
         "ConsiderDonatingCreatorOf": "Por favor, considerá hacer una donación al creador de %s",
+        "PluginsExtendPiwik": "Los plugins extienden y expanden la funcionalidad de Matomo.",
         "OncePluginIsInstalledYouMayActivateHere": "Una vez que el plugin está instalado, podés activarlo o desactivarlo acá.",
         "MenuPlatform": "Plataforma",
         "MissingRequirementsNotice": "Por favor, actualizá %1$s %2$s a una versión más reciente, se requiere %1$s %3$s.",
@@ -32,26 +37,53 @@
         "NoPluginSettings": "No hay configuración disponible para el plugin",
         "Origin": "Origen",
         "OriginCore": "Núcleo",
+        "OriginOfficial": "Oficial",
         "OriginThirdParty": "Terceros",
         "PluginHomepage": "Página principal del plugin",
         "PluginNotCompatibleWith": "%1$s complemento no es compatible con %2$s.",
+        "PluginNotFound": "No se encontró al plugin %1$s en el sistema de archivos.",
+        "PluginNotFoundAlternative": "Si estuviste usando este plugin, intentá resubirlo o reinstalarlo desde el mercado. Si no, podés desinstalarlo para quitarlo de la lista.",
         "PluginNotWorkingAlternative": "Si estuviste usando este plugin, puede que encuentres una versión más reciente en el mercado. Si no, podés desinstalarlo.",
         "PluginRequirement": "%1$s requiere %2$s.",
         "PluginsManagement": "Administrar plugins",
         "NotDownloadable": "No descargable",
         "PluginNotDownloadable": "Este plugin no es descargable.",
         "PluginNotDownloadablePaidReason": "Las posibles razones on una licencia vencida o excedida.",
+        "PluginRequiresInternet": "Este plugin requiere una conexión estable a Internet. Por favor, revisá el valor de tu configuración para \"enable_internet_features\" si querés usar esta función.",
         "PluginActivated": "Plugin activado",
         "Status": "Estado",
         "SuccessfullyActicated": "Se activó exitosamente <strong>%s<\/strong>.",
+        "TeaserExtendPiwik": "Extendé Matomo con plugins y temas",
+        "TeaserExtendPiwikByPlugin": "Extendé Matomo %1$sinstalando plugins desde el Mercado%2$s o %3$ssubí un plugin en formato \".zip\"%4$s.",
         "TeaserExtendPiwikByTheme": "Disfrutá de un nuevo entorno %1$sinstalando un nuevo tema%2$s.",
         "InstallingNewPluginViaMarketplaceOrUpload": "Podés instalar plugins automáticamente desde el mercado o %1$ssubir un plugin%2$s en formato \".zip\".",
+        "TagManagerNowAvailableTitle": "Ya está disponible el administrador de etiquetas de Matomo",
+        "TagManagerNowAvailableSubtitle": "Administrá fácilmente todas tus etiquetas a través de la plataforma para obtener la información que querés; ¡las oportunidades son infinitas!",
+        "ActivateTagManagerNow": "Activar ahora el administrador de etiquetas",
+        "TagManagerEmailSuperUserToActivate": "Enviale un correo electrónico a los súperusuarios para actuvar esta nueva función",
+        "TagManagerTeaserHideSuperUser": "No mostrar esta página a ningún usuario",
+        "TagManagerTeaserHideNonSuperUser": "No estoy interesado; no mostrar esta página de nuevo",
+        "TagManagerTeaserEmailSuperUserBody": "Hola, %1$sel administrador de etiquetas de Matomo ya está disponible y me gustaría usar esta nueva función. Como vos tenés acceso de súperusuario, ¿podrías activar esta función en la página de administrador de etiquetas, en el menú principal?%2$s La dirección web de Matomo es: %3$s. %4$s Muchas gracias",
+        "WhatIsTagManager": "¿Qué es el administrador de etiquetas?",
+        "WhatIsTagManagerDetails1": "Similar a cómo un sistema de administración de contenido (CMS) te ofrece toda la flexibilidad para publicar contenido a tu sitio web sin tener el conocimiento técnico HTML\/CSS, un sistema de administración de etiquetas (TMS) es tu herramienta para simplificar el proceso de inserción de etiquetas de rastreo para aplicaciones propias y de terceros (también conocidos como \"snippets\" o \"píxeles\") en tu sitio web.",
+        "WhatIsTagManagerDetails2": "Digamos que querés ver los resultados de tus conversiones\/metas, registros a tu boletín de noticias, widgets sociales, ventanas emergentes de salida y campañas de remercadeo; lo que una vez fue un proceso altamente técnico y de mucho consumo de tiempo es ahora una tarea fácil con el TMS y sólo lleva unos clics implementarlo.",
+        "TagManagerLearnMoreInUserGuide": "Aprendé más en la guía de usuario del administrador de etiquetas",
+        "WhyUsingATagManager": "¿Por qué un administrador de etiquetas?",
+        "WhyUsingATagManagerDetails1": "¡Un administrador de etiquetas te simplifica la vida! Ya no necesitás esperar a que un desarrollador te modifique snippets propios o de terceros en tu sitio web, ya que el administrador de etiquetas te da una experiencia sin estrés para hacer estos cambios y administrar vos mismo tu sitio web.",
+        "WhyUsingATagManagerDetails2": "No podría ser más conveniente y no sólo te deja hacerle cambios más rápidos al mercado, sino también a reducir costos.",
+        "WhyUsingATagManagerDetails3": "Esto vuelve feliz a los equipos de mercadotecnia, administración digital y de investigación y desarrollo. ¡Es una goleada para todos!",
+        "AreThereAnyRisks": "¿Existen riesgos?",
+        "AreThereAnyRisksDetails1": "Cuando activás el administrador de etiquetas, los usuarios con acceso a administrador serán capaces de crear etiquetas HTML personalizadas, accionadores y variables que ejecuten JavaScript en tu sitio web. Estas plantillas personalizadas podrían ser malutilizadas para, por ejemplo, robar información sensible a los visitantes de tu sitio web (conocido como %1$sXSS%2$s).",
+        "AreThereAnyRisksDetails2": "Podés deshabilitar estas plantillas personalizadas bajo \"Administración\" > \"Configuración general\" una vez que hayás activado el administrador de etiquetas. Alternativamente, también podés restringir el uso de estas plantillas para usuarios específicos o sólo para súperusuarios.",
         "Theme": "Tema",
         "Themes": "Temas",
+        "ThemesDescription": "Los temas pueden cambiar la apariencia de la interface de Matomo, y ofrecer una nueva experiencia visual para disfrutar tus informes de análisis.",
         "ThemesManagement": "Administrar temas",
         "UninstallConfirm": "Estás a punto de desinstalar el plugin %s. El mismo será completamente quitado de tu plataforma y no será recuperable. ¿Estás seguro que querés hacer esto?",
         "Version": "Versión",
         "ViewAllMarketplacePlugins": "Ver todos los plugins del mercado",
-        "Websites": "Sitios web"
+        "WeCouldNotLoadThePluginAsItHasMissingDependencies": "El plugin %1$s no pudo ser cargado ya que tiene dependencias faltantes: %2$s",
+        "Websites": "Sitios web",
+        "UpdateSelected": "Actualizar lo seleccionado"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/lang/ja.json b/app/plugins/CorePluginsAdmin/lang/ja.json
index 808d3191c..835482a84 100644
--- a/app/plugins/CorePluginsAdmin/lang/ja.json
+++ b/app/plugins/CorePluginsAdmin/lang/ja.json
@@ -5,36 +5,36 @@
         "Activated": "有効",
         "Active": "有効",
         "Activity": "アクティビティ",
-        "AlwaysActivatedPluginsList": "以下のプラグインは常に有効になっており、無効にすることはできません：%s",
+        "AlwaysActivatedPluginsList": "次のプラグインは常に有効になっており、無効にすることはできません：%s",
         "AuthorHomepage": "著者ホームページ",
         "Changelog": "変更履歴",
-        "ChangeSettingsPossible": "このプラグインのために、 %1$ssettings%2$s を変更できます。",
-        "CorePluginTooltip": "コアプラグインは、 Matomo と一緒に配布されているため、バージョンはありません",
+        "ChangeSettingsPossible": "このプラグインの%1$s設定%2$sを変えることができます。",
+        "CorePluginTooltip": "コアプラグインは、 Matomo と一緒に配布されているため、バージョンはありません。",
         "Deactivate": "無効化",
         "DoMoreContactPiwikAdmins": "新しいプラグインやテーマをインストールするには、 Matomo の管理者に連絡をしてください",
-        "ChangeLookByManageThemes": "%1$s テーマの管理 %2$sによって Matomo の外観を変更できます。",
+        "ChangeLookByManageThemes": "%1$s テーマの管理 %2$sで Matomo の外観を変更できます。",
         "History": "履歴",
         "Inactive": "無効",
-        "InstalledPlugins": "インストールされたプラグイン",
-        "InstalledThemes": "インストールされたテーマ",
+        "InstalledPlugins": "インストールされているプラグイン",
+        "InstalledThemes": "インストールされているテーマ",
         "InfoPluginUpdateIsRecommended": "最新の改良による恩恵を受けるには、今すぐプラグインをアップデートしてください。",
-        "InfoThemeIsUsedByOtherUsersAsWell": "注 : Matomo に登録されている他の %1$s のユーザーは、テーマ %2$s も使用しています。",
-        "InfoThemeUpdateIsRecommended": "最新バージョンを使用するためにテーマを更新します。",
+        "InfoThemeIsUsedByOtherUsersAsWell": "注 : Matomo に登録されている他の %1$s のユーザーも、テーマ %2$s を使用しています。",
+        "InfoThemeUpdateIsRecommended": "テーマを更新し、最新バージョンをお楽しみください。",
         "InstallNewPlugins": "新しいプラグインをインストール",
         "InstallNewThemes": "新しいテーマをインストール",
         "LicenseHomepage": "ライセンスのホームページ",
         "LikeThisPlugin": "このプラグインを気に入りましたか？",
         "ConsiderDonating": "寄付を検討",
         "CommunityContributedPlugin": "このプラグインは、コミュニティの貢献により無料で公開されています。",
-        "ConsiderDonatingCreatorOf": "%s の作成者への寄付を検討",
+        "ConsiderDonatingCreatorOf": "%s の作成者への寄付をご検討ください",
         "PluginsExtendPiwik": "プラグイン及び Matomo の機能を拡張します。",
         "OncePluginIsInstalledYouMayActivateHere": "プラグインをインストールすると、ここで有効化と無効化を行うことができます。",
         "MenuPlatform": "プラットフォーム",
         "MissingRequirementsNotice": "%1$s %3$s が必要です。 %1$s %2$s を最新バージョンにアップデートしてください。",
-        "MissingRequirementsPleaseInstallNotice": "%3$s で必要とされる、 %1$s %2$s をインストールしてください。",
+        "MissingRequirementsPleaseInstallNotice": "%3$sで必要とされる、 %1$s%2$sをインストールしてください。",
         "NoZipFileSelected": "ZIP ファイルを選択してください。",
         "NumUpdatesAvailable": "%s アップデートがあります",
-        "NoPluginSettings": "設定可能なプラグイン設定がありません",
+        "NoPluginSettings": "設定可能なプラグイン設定はありません",
         "Origin": "開発元",
         "OriginCore": "コア",
         "OriginOfficial": "公式",
@@ -47,16 +47,16 @@
         "PluginRequirement": "%1$s 必須 %2$s.",
         "PluginsManagement": "プラグインの管理",
         "NotDownloadable": "ダウンロード不可",
-        "PluginNotDownloadable": "プラグインはダウンロードできません。",
+        "PluginNotDownloadable": "このプラグインはダウンロードできません。",
         "PluginNotDownloadablePaidReason": "考えられる理由は、期限切れまたは超過ライセンスです。",
         "PluginRequiresInternet": "このプラグインは、インターネットに接続する必要があります。 この機能を使用するには、 `enable_internet_features` の設定値を確認してください。",
-        "PluginActivated": "プラグイン有効化",
+        "PluginActivated": "プラグインの有効化",
         "Status": "ステータス",
-        "SuccessfullyActicated": "<strong> %s <\/strong> の有効化に成功しました。",
+        "SuccessfullyActicated": "<strong> %s <\/strong> の有効にしました。",
         "TeaserExtendPiwik": "Matomo のプラグインとテーマを拡張",
         "TeaserExtendPiwikByPlugin": "%1$sマーケットプレイスからプラグインをインストール%2$sするか、%3$s.zip 形式のプラグインをアップロード%4$sして Matomo を拡張します。",
         "TeaserExtendPiwikByTheme": "%1$s新しいテーマをインストール%2$s し、別の外観と雰囲気をお楽しみください。",
-        "InstallingNewPluginViaMarketplaceOrUpload": "自動的にマーケットプレイスからプラグインをインストールまたは .zip 形式のプラグイン %1$s を %2$s アップロードすることができます。",
+        "InstallingNewPluginViaMarketplaceOrUpload": "自動的にマーケットプレイスからプラグインをインストールまたは .zip 形式の%1$sプラグインをアップロード%2$sすることができます。",
         "TagManagerNowAvailableTitle": "Matomo Tag Manager が利用可能になりました",
         "TagManagerNowAvailableSubtitle": "1 つのプラットフォームですべてのタグを簡単に管理して、必要な情報を得ることができます。チャンスは無限です！",
         "ActivateTagManagerNow": "今すぐタグマネージャを有効にする",
@@ -79,7 +79,7 @@
         "Themes": "テーマ",
         "ThemesDescription": "テーマは Matomo のユーザーインターフェースの外観を変えることができ、分析レポートを楽しむための全く新しい視覚的体験を提供します。",
         "ThemesManagement": "テーマの管理",
-        "UninstallConfirm": "プラグイン %s をアンインストールしようとしています。実行されると、プラグインは完全にプラットフォームから削除され、回復できなくなります。本当にアンインストールを実行してもよろしいですか？",
+        "UninstallConfirm": "プラグイン %s をアンインストールしようとしています。これを実行すると、プラグインは完全にプラットフォームから削除され、回復できなくなります。本当にアンインストールを実行してもよろしいですか？",
         "Version": "バージョン",
         "ViewAllMarketplacePlugins": "マーケットプレイスのプラグインをすべて表示",
         "WeCouldNotLoadThePluginAsItHasMissingDependencies": "依存関係がないため、プラグイン%1$sをロードできませんでした：%2$s",
diff --git a/app/plugins/CorePluginsAdmin/lang/pt-br.json b/app/plugins/CorePluginsAdmin/lang/pt-br.json
index f3d0bb8a6..8c9591907 100644
--- a/app/plugins/CorePluginsAdmin/lang/pt-br.json
+++ b/app/plugins/CorePluginsAdmin/lang/pt-br.json
@@ -9,7 +9,7 @@
         "AuthorHomepage": "Página do autor",
         "Changelog": "Changelog",
         "ChangeSettingsPossible": "Você pode alterar as %1$sconfigurações%2$s para este plugin.",
-        "CorePluginTooltip": "Plugins core não possuem versão uma que são distribuídos com Matomo.",
+        "CorePluginTooltip": "Plugins core não possuem versão já que são distribuídos com o Matomo.",
         "Deactivate": "Desativar",
         "DoMoreContactPiwikAdmins": "Para instalar um novo plugin ou um novo tema, por favor, entrar em contato com os administradores do servidor Matomo.",
         "ChangeLookByManageThemes": "Você pode alterar a aparência do Matomo %1$sGerenciando Temas%2$s.",
@@ -57,6 +57,24 @@
         "TeaserExtendPiwikByPlugin": "Estenda o Matomo %1$sinstalando plugins do Marketplace%2$s ou %3$s fazer um upload de um plugin no formato .zip%4$s.",
         "TeaserExtendPiwikByTheme": "Aproveite uma outra aparência %1$sinstalando um novo tema%2$s.",
         "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente plugins do Marketplace ou %1$scarregar um plugin%2$s no formato .zip",
+        "TagManagerNowAvailableTitle": "O Gerenciador de Tags do Matomo já está disponível",
+        "TagManagerNowAvailableSubtitle": "Gerencie todas as suas tags facilmente através de uma plataforma para receber os insights que você quer. As oportunidades são infinitas!",
+        "ActivateTagManagerNow": "Ativar Gerenciador de Tags agora",
+        "TagManagerEmailSuperUserToActivate": "Enviar email aos super usuários para ativar esta nova funcionalidade",
+        "TagManagerTeaserHideSuperUser": "Não mostrar esta página a nenhum usuário",
+        "TagManagerTeaserHideNonSuperUser": "Não estou interessado, não mostre esta página novamente",
+        "TagManagerTeaserEmailSuperUserBody": "Olá,%1$sO Gerenciador de Tags do Matomo já está disponível dentro do Matomo e eu adoraria usar esta nova funcionalidade. Como você tem acesso de super usuário, você poderia ativar esta funcionalidade na página do Gerenciador de Tags no menu superior?%2$sO URL do Matomo é %3$s.%4$sObrigado",
+        "WhatIsTagManager": "O que é um Gerenciador de Tags?",
+        "WhatIsTagManagerDetails1": "Similar a como um Sistema de Gerenciamento de Conteúdo (CMS) traz toda a flexibilidade para você publicar conteúdo em seu site sem ter o conhecimento técnico de HTML\/CSS, um Sistema de Gerenciamento de Tags (TMS) é sua referência para simplificar o processo de incorporar tags de rastreamento próprias e de terceiros (também conhecidas como snippets ou pixels) em seu site.",
+        "WhatIsTagManagerDetails2": "Digamos que você queira ver os resultados de suas conversões\/metas, inscrições em boletins informativos, widgets sociais, popups de saída e campanhas de remarketing; o que antes era um processo altamente técnico e demorado agora é facilmente realizado com o TMS e leva apenas alguns cliques para implementar.",
+        "TagManagerLearnMoreInUserGuide": "Saiba mais no Guia de Usuário do Gerenciador de Tags",
+        "WhyUsingATagManager": "Por que um Gerenciador de Tags?",
+        "WhyUsingATagManagerDetails1": "Um Gerenciador de Tags facilita a sua vida! Você não precisa mais esperar que um desenvolvedor modifique snippets próprios ou de terceiros no seu site já que o Gerenciador de Tags te dá uma experiência sem estresse para fazer estas alterações e implantar seu site você mesmo.",
+        "WhyUsingATagManagerDetails2": "Não poderia ser mais conveniente e não apenas permite trazer mudanças para o mercado de forma mais rápida, mas também reduz custo.",
+        "WhyUsingATagManagerDetails3": "Isto mantém os times de marketing, os times digitais e o pessoal de TI felizes... É um ganha-ganha para todos!",
+        "AreThereAnyRisks": "Existe algum risco?",
+        "AreThereAnyRisksDetails1": "Quando você ativa o Gerenciador de Tags, os usuários com acesso de administrador poderão criar tags HTML customizadas, gatilhos, e variáveis que podem executar JavaScript em seu site. Estes templates customizados podem ser mal utilizados para roubar, por exemplo, informação sensível dos visitantes do seu site (conhecidos como %1$sXSS%2$s).",
+        "AreThereAnyRisksDetails2": "Você pode desabilitar estes templates customizados em \"Administração => Configurações gerais\" uma vez que você tenha ativado o Gerenciador de Tags. Alternativamente, você também pode restringir o uso destes templates para apenas usuários específicos ou super usuários.",
         "Theme": "Tema",
         "Themes": "Temas",
         "ThemesDescription": "Os temas podem alterar a aparência da interface do usuário do Matomo, e fornecer uma experiência completamente nova visual para desfrutar dos seus relatórios de análise.",
@@ -64,7 +82,8 @@
         "UninstallConfirm": "Você está prestes a desinstalar um plugin %s. O plugin será completamente removido da sua plataforma e isso não poderá ser desfeito. Tem certeza que deseja fazer isso?",
         "Version": "Versão",
         "ViewAllMarketplacePlugins": "Ver todos os plugins no Marketplace",
-        "WeCouldNotLoadThePluginAsItHasMissingDependencies": "Este plugin %1$s não pôde ser carregado pois tem dependências ausentes:%2$s",
-        "Websites": "Websites"
+        "WeCouldNotLoadThePluginAsItHasMissingDependencies": "O plugin %1$s não pôde ser carregado pois tem dependências ausentes: %2$s",
+        "Websites": "Sites",
+        "UpdateSelected": "Atualização selecionada"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/lang/pt.json b/app/plugins/CorePluginsAdmin/lang/pt.json
index 2e8d2a2bd..bd8024c82 100644
--- a/app/plugins/CorePluginsAdmin/lang/pt.json
+++ b/app/plugins/CorePluginsAdmin/lang/pt.json
@@ -66,6 +66,7 @@
         "TagManagerTeaserEmailSuperUserBody": "Olá,%1$sO Gestor de tags do Matomo já está disponível na aplicação e, como tal, gostaria de poder usufruir desta nova funcionalidade. Dado que possui perfil de Super Utilizador, seria possível ativar a funcionalidade através da página Gestor de tags no menu de topo?%2$sO URL é %3$s.%4$sObrigado",
         "WhatIsTagManager": "O que é um Gestor de tags?",
         "WhatIsTagManagerDetails1": "Tal como um Sistema de Gestão de Conteúdos (CMS) disponibiliza a flexibilidade necessária para que possa publicar conteúdo no seu site sem precisar de conhecimentos técnicos de HTML\/CSS, um Sistema de Gestão de tags (TMS) é a sua melhor aposta para simplificar o processo de incorporação de tags de acompanhamento de aplicação (também conhecidas por excertos ou pixeis) de terceiros ou próprias, no seu site.",
+        "WhatIsTagManagerDetails2": "Suponhamos que quer ver os resultados das suas conversões\/objetivos, subscrições a newsletters, widgets sociais, popups de saída e campanhas de remarketing; o que antes era um processo altamente técnico e moroso é agora facilmente realizado no TMS, precisando somente de uns quantos cliques para ser implementado.",
         "TagManagerLearnMoreInUserGuide": "Saiba mais no Guia de Utilizador de Gestor de tags",
         "WhyUsingATagManager": "Porquê optar por um Gestor de tags?",
         "WhyUsingATagManagerDetails1": "Um Gestor de tags facilita a sua vida! Com ele, já não precisa de aguardar que um programador modifique quaisquer excertos de terceiros ou próprios no seu site, o Gestor de tags confere-lhe a oportunidade isenta de stress de ser você mesmo a fazer estas alterações e as publicar de forma autónoma no seu site.",
@@ -82,6 +83,7 @@
         "Version": "Versão",
         "ViewAllMarketplacePlugins": "Ver todas as extensões da loja",
         "WeCouldNotLoadThePluginAsItHasMissingDependencies": "A extensão %1$s não pôde ser carregada dado que tem dependências em falta: %2$s",
-        "Websites": "Sites"
+        "Websites": "Sites",
+        "UpdateSelected": "Atualizar selecionados"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/lang/ru.json b/app/plugins/CorePluginsAdmin/lang/ru.json
index 463acfe41..c79e797c1 100644
--- a/app/plugins/CorePluginsAdmin/lang/ru.json
+++ b/app/plugins/CorePluginsAdmin/lang/ru.json
@@ -82,6 +82,7 @@
         "Version": "Версия",
         "ViewAllMarketplacePlugins": "Посмотреть все плагины в Marketplace",
         "WeCouldNotLoadThePluginAsItHasMissingDependencies": "Плагин %1$s не может быть загружен, потому что у него есть недостающие зависимости: %2$s",
-        "Websites": "Сайты"
+        "Websites": "Сайты",
+        "UpdateSelected": "Обновить выбранное"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/lang/sv.json b/app/plugins/CorePluginsAdmin/lang/sv.json
index 9de415b65..28ee9133b 100644
--- a/app/plugins/CorePluginsAdmin/lang/sv.json
+++ b/app/plugins/CorePluginsAdmin/lang/sv.json
@@ -57,6 +57,24 @@
         "TeaserExtendPiwikByPlugin": "Utöka Matomo genom att %1$sinstallera plugins från marknadsplatsen%2$s eller %3$sladda upp i zipformat%4$s.",
         "TeaserExtendPiwikByTheme": "Njut av ett nytt utseende genom att%1$sinstallera ett nytt tema%2$s.",
         "InstallingNewPluginViaMarketplaceOrUpload": "Du kan automatiskt installera plugin från Butiken eller %1$sladda upp en plugin%2$s i .zip format.",
+        "TagManagerNowAvailableTitle": "Matomo Tag Manager är nu tillgänglig",
+        "TagManagerNowAvailableSubtitle": "Hantera smidigt alla dina taggar med en plattform för att nå de insikter du önskar, möjligheterna är oändliga!",
+        "ActivateTagManagerNow": "Aktivera Tag Manager nu",
+        "TagManagerEmailSuperUserToActivate": "Mejla superanvändare för att aktivera denna nya funktion",
+        "TagManagerTeaserHideSuperUser": "Visa inte den här sidan för någon användare",
+        "TagManagerTeaserHideNonSuperUser": "Inte intresserad. Visa inte den här sidan igen",
+        "TagManagerTeaserEmailSuperUserBody": "Hej! %1$s Matomo Tag Manager finns nu tillgänglig i Matomo och jag skulle gilla att använda denna nya funktion. Eftersom du har superanvändarbehörighet, skulle du kunna aktivera denna funktion via Tag Manager sidan som finns i topp menyn?%2$s Matomo URL:en är %3$s. %4$s Tack så mycket!",
+        "WhatIsTagManager": "Vad är en Tag Manager?",
+        "WhatIsTagManagerDetails1": "På liknande sätt som ett Content Management System (CMS) ger dig all flexibilitet för att publicera innehåll på din webbplats utan att du behöver ha teknisk kunskap om HTML\/CSS, är ett Tag Managment System (TMS) ditt ställe att gå till för att förenkla processen för att inbädda första- och tredjeparts spårningstaggar för applikationer (också känt som snippets eller pixels) på din webbplats.",
+        "WhatIsTagManagerDetails2": "Säg att du vill se resultatet från dina omvandlingar\/mål, nyhetsbrev, anmälningar, sociala widgetar, utgångar med popups och marknadsföringskampanjer; Det som tidigare var en högst teknisk och tidsödande process görs nu lätt med TMS och tar bara några få klick att införa.",
+        "TagManagerLearnMoreInUserGuide": "Lär dig mer i användarguiden för Tag Manager",
+        "WhyUsingATagManager": "Vaför en Tag Manager?",
+        "WhyUsingATagManagerDetails1": "En Tag Manager gör ditt liv lättare! Du behöver inte längre vänta på att en utvecklare ska ändra första- eller tredjepartssnippets på din webbplats eftersom Tag Manager ger dig en stressfri upplevelse för att göra dessa förändringar och driftsätta din webbplats på egen hand.",
+        "WhyUsingATagManagerDetails2": "Det kan inte bli mer bekvämt och den låter dig inte bara ta förändringarna till marknaden snabbare, utan minskar även kostnaderna.",
+        "WhyUsingATagManagerDetails3": "Detta gör teamen inom marknadsföring, digitala team och IT-personalen glada... Det är en vinst för alla!",
+        "AreThereAnyRisks": "Finns det några risker?",
+        "AreThereAnyRisksDetails1": "När du aktiverar Tag Manager kommer användare med admin behörighet kunna skapa skräddarsydda HTML taggar, utlösare och variabler som kan exekvera JavaScript på din webbplats. Dessa anpassade mallar kan missbrukas för att stjäla t ex känslig information från din webbplats besökare (känt som %1$s XSS %2$s).",
+        "AreThereAnyRisksDetails2": "Du kan avaktivera dessa anpassade mallar under \"Administration => Allmänna inställningar\" så snart du har aktiverat Tag Manager. Alternativt kan du även begränsa användningen av dessa mallar till specifika användare eller bara superanvändare.",
         "Theme": "Tema",
         "Themes": "Teman",
         "ThemesDescription": "Teman kan förändra utseendet på Matomos gränssnitt, och erbjuda en helt ny visuell upplevelse där du kan ta del av dina analysrapporter.",
@@ -65,6 +83,7 @@
         "Version": "Version",
         "ViewAllMarketplacePlugins": "Visa alla plugins på marknadsplatsen",
         "WeCouldNotLoadThePluginAsItHasMissingDependencies": "Insticksprogrammet %1$s kan inte startas eftersom följande viktiga filer saknas: %2$s",
-        "Websites": "Webbsidor"
+        "Websites": "Webbsidor",
+        "UpdateSelected": "Uppdatering är vald"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CorePluginsAdmin/templates/macros.twig b/app/plugins/CorePluginsAdmin/templates/macros.twig
index 9c753c77d..d5cb16bdf 100644
--- a/app/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/app/plugins/CorePluginsAdmin/templates/macros.twig
@@ -3,14 +3,14 @@
     {% import '@Marketplace/macros.twig' as marketplaceMacro %}
 
     <div>
-        <a id="update-selected-plugins" href="javascript:" class="btn">{{ 'CorePluginsAdmin_UpdateSelected'|translate }}</a>
+        <a id="update-selected-plugins" href="javascript:" class="btn disabled">{{ 'CorePluginsAdmin_UpdateSelected'|translate }}</a>
     </div>
     <table piwik-content-table>
         <thead>
         <tr>
             <th>
                 <span class="checkbox-container">
-                    <input type="checkbox" id="select-plugin-all" />
+                    <input type="checkbox" id="select-plugin-all"/>
                     <label for="select-plugin-all"></label>
                 </span>
             </th>
@@ -74,6 +74,11 @@
 
     <script>
         $(function () {
+            $('span.checkbox-container').on('change', function() {
+                var isAtLeastOneChecked = $('span.checkbox-container > input:checked').length >= 1;
+                isAtLeastOneChecked ? $('#update-selected-plugins').removeClass('disabled') : $('#update-selected-plugins').addClass('disabled');
+            });
+
             $('#update-selected-plugins').on('click', function () {
                 var pluginsToUpdate = [];
                 $('tbody#plugins td.select-cell input').each(function () {
diff --git a/app/plugins/CoreUpdater/config/tracker.php b/app/plugins/CoreUpdater/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CoreUpdater/config/tracker.php
+++ b/app/plugins/CoreUpdater/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreUpdater/lang/es-ar.json b/app/plugins/CoreUpdater/lang/es-ar.json
index 24111949c..03f787ce8 100644
--- a/app/plugins/CoreUpdater/lang/es-ar.json
+++ b/app/plugins/CoreUpdater/lang/es-ar.json
@@ -1,44 +1,96 @@
 {
     "CoreUpdater": {
+        "CheckingForPluginUpdates": "Buscar actualizaciones de plugin",
+        "ClickHereToViewSqlQueries": "Hacé clic acá para ver y copiar la lista de solicitudes SQL que será ejecutada",
         "CriticalErrorDuringTheUpgradeProcess": "Error crítico durante el proceso de actualización:",
         "DatabaseUpgradeRequired": "La base de datos necesita actualizarse",
         "DisablingIncompatiblePlugins": "Deshabilitando plugins incompatibles: %s",
         "DownloadingUpdateFromX": "Descargando actualización desde %s",
         "DownloadX": "Descargar %s",
+        "EmptyDatabaseError": "La base de datos %s está vacía. Tenés que editar o quitar tu archivo de configuración de Matomo.",
         "ErrorDIYHelp": "Si sos un usuario avanzado y encontrás un error en la actualización de la base de datos:",
         "ErrorDIYHelp_1": "identificá y corregí el origen del problema (por ejemplo, memory_limit o max_execution_time)",
         "ErrorDIYHelp_2": "ejecutá las solicitudes restantes que fallaron en la actualización",
+        "ErrorDIYHelp_3": "actualizá manualmente la tabla \"option\" en tu base de datos Matomo, estableciendo el valor de version_core a la versión de la actualización fallida",
         "ErrorDIYHelp_4": "volvé a ejecutar el actualizador (a través del navegador web o de la línea de comandos) para continuar con el las actualizaciones restantes",
+        "ErrorDIYHelp_5": "reportar el problema (y solución) de modo que Matomo pueda ser mejorado",
         "ErrorDuringPluginsUpdates": "Error durante la actualización del plugin:",
+        "ExceptionAlreadyLatestVersion": "Tu versión de Matomo %s está actualizada.",
         "ExceptionArchiveEmpty": "Archivo vacío.",
         "ExceptionArchiveIncompatible": "Archivo incompatible: %s",
         "ExceptionArchiveIncomplete": "Archivo incompleto: faltan algunos archivos (por ejemplo, %s).",
+        "FeedbackRequest": "Animate a compartir tus ideas y sugerencias con el Equipo de Matomo, acá:",
+        "HelpMessageContent": "Revisá las %1$s preguntas frecuentes de Matomo %2$s que explica la mayoría de los errores más comunes durante la actualización. %3$s Preguntale a tu administrador de sistema, que puede ser capaz de ayudarte con el error, que es más probable que esté relacionado a tu servidor o a la configuración de MySQL.",
         "HelpMessageIntroductionWhenError": "Lo anterior es un mensaje de error del núcleo. Debería ayudarte a explicar la causa, pero si necesitás más ayuda, por favor:",
         "HelpMessageIntroductionWhenWarning": "La actualización se completó exitosamente. Sin embargo, hubo problemas durante el proceso. Por favor, leé las descripciones anteriores para obtener más detalles. Para obtener más ayuda:",
+        "HighTrafficPiwikServerEnableMaintenance": "Si administrás un servidor Matomo de alto tráfico, te recomendamos %1$sdeshabilitar temporalmente el rastreo de visitantes y poner la interface de Matomo en modo de mantenimiento%2$s.",
+        "IncompatbilePluginsWillBeDisabledInfo": "Nota: algunos plugins no son compatibles con Matomo %s. Los vamos a actualizar si hay una actualización en el mercado. De lo contrario, lo deshabilitaremos cuando actualicés:",
         "InstallingTheLatestVersion": "Instalando la última versión",
+        "LatestBetaRelease": "Último lanzamiento beta",
+        "LatestStableRelease": "Último lanzamiento estable",
+        "Latest2XStableRelease": "Última versión estable 2.X",
+        "Latest2XBetaRelease": "Última versión beta 2.X",
+        "LtsSupportVersion": "Versión de soporte a largo plazo",
+        "ListOfSqlQueriesFYI": "Para tu información: estas son las solicitudes SQL y los comandos de consola que serán ejecutados para actualizar tu base de datos a Matomo %s",
+        "TheseSqlQueriesWillBeExecuted": "Serán ejecutadas estas solicitudes SQL:",
+        "TheseCommandsWillBeExecuted": "Se ejecutarán estos comando de consola:",
         "MajorUpdateWarning1": "¡Esta es una actualización principal! Tardará más de lo normal.",
         "MajorUpdateWarning2": "El siguiente consejo es especialmente importante para instalaciones grandes.",
+        "NeedHelpUpgrading": "¿Necesitás ayuda para actualizar Matomo?",
+        "NeedHelpUpgradingText": "Si necesitás ayuda para actualizar tu Matomo, sus creadores pueden darte una mano. %1$sContactá con los expertos de Matomo para comenzar a actualizar tu Matomo con seguridad.%2$s",
+        "NoteForLargePiwikInstances": "Notas importantes para instalaciones grandes de Matomo",
         "NotificationClickToUpdatePlugins": "Hacé clic acá para actualizar tus plugins ahora:",
         "NotificationClickToUpdateThemes": "Hacé clic acá para actualizar tus temas ahora:",
+        "NotificationSubjectAvailableCoreUpdate": "Está disponible el nuevo Matomo %s",
+        "NotificationSubjectAvailablePluginUpdate": "Actualizaciones disponibles para tus plugins de Matomo",
+        "PiwikHasBeenSuccessfullyUpgraded": "¡Matomo se actualizó exitosamente!",
+        "PiwikUpdatedSuccessfully": "¡Matomo se actualizó exitosamente!",
+        "PiwikWillBeUpgradedFromVersionXToVersionY": "La base de datos de Matomo será actualizada de la versión %1$s a la nueva versión %2$s.",
         "ReadyToGo": "¿Estás listo?",
         "TheFollowingPluginsWillBeUpgradedX": "Los siguientes plugins serán actualizados: %s.",
         "TheFollowingDimensionsWillBeUpgradedX": "Las siguientes dimensiones serán actualizadas: %s.",
         "ThereIsNewPluginVersionAvailableForUpdate": "Algunos plugins que usás se actualizaron en el mercado:",
+        "ThereIsNewVersionAvailableForUpdate": "Hay una nueva versión de Matomo disponible para actualizar",
+        "TheUpgradeProcessMayFailExecuteCommand": "Si tenés una base de datos grande de Matomo, las actualizaciones podrían llevar mucho tiempo para ejecutarse en el navegador. En ese caso, podés ejecutar las actualizaciones desde la línea de comandos: %s",
         "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "El proceso de actualización de la base de datos puede llevar un tiempo, así que, por favor, se paciente.",
         "UnpackingTheUpdate": "Desempaquetando la actualización",
         "UpdateAutomatically": "Actualizar automáticamente",
+        "UpdateHasBeenCancelledExplanation": "Se canceló la actualización de Matomo One Click Update. Si no podé solucionar el mensaje de error anterior, se recomienda que actualicés Matomo manualmente. %1$s ¡Por favor, consultá la %2$sdocumentación de actualización%3$s para empezar!",
         "UpdateTitle": "Actualizar",
+        "UpdatingPluginXToVersionY": "Actualizando plugin %1$s a la versión %2$s",
+        "UpdateSuccessTitle": "¡Matomo se actualizó exitosamente!",
         "UpdateErrorTitle": "Error de actualización",
+        "ThankYouUpdatePiwik": "¡Gracias por usar Matomo y mantenerlo al día!",
+        "PostUpdateMessage": "Matomo siempre será gratis para descargar y usar, pero necesita de tu contínuo apoyo para crecer y mejorar.",
+        "PostUpdateSupport": "Si necesitás ayuda al usar Matomo, podés obtenerla de sus creadores:",
+        "ServicesSupport": "Soporte y servicios",
         "CloudHosting": "Alojamiento en la nube",
         "Updating": "Actualizando",
+        "UpdateUsingHttpsFailed": "No se pudo descargar la última versión de Matomo sobre conexión segura HTTPS debido al siguiente error:",
+        "UpdateUsingHttpsFailedHelp": "¿Por qué falló? Descargar la última versión de Matomo (sobre una conexión segura HTTPS) puede fallar por varias razones. Por ejemplo: debido a un error de red, a una saturación en la velocidad de red o a una configuración errónea de sistema. Tené en cuenta que también podría significar que tu servidor está siendo objetivo de un ataque intrusivo (\"Man In The Middle\") y que alguien podría estar intentando reemplazar la actualización de Matomo con una versión maliciosa del mismo.",
         "UpdateUsingHttpsFailedHelpWhatToDo": "Se recomienda reintentar la descarga usando la conexión segura HTTPS, ya que previene los ataques MITM.",
         "UsingHttps": "usando la conexión segura HTTPS (recomendado)",
         "UsingHttp": "usando la conexión no segura HTTP",
         "UpgradeComplete": "¡Actualización completa!",
+        "UpgradePiwik": "Actualizar Matomo",
+        "ConsoleStartingDbUpgrade": "Iniciando ahora el proceso de actualización de la base de datos. Esto puede llevar un tiempo, así que, por favor, se paciente.",
+        "DbUpgradeNotExecuted": "Actualización de base de datos no ejecutada.",
+        "ConsoleUpdateUnexpectedUserWarning": "Parece que ejecutaste esta actualización con el usuario %1$s, mientras que tus archivos de Matomo son propiedad de %2$s.\n\nPara asegurarte de los archivos de Matomo son accesibles por el usuario correcto, necesitás ejecutar el siguiente comando (o un comando similar dependiendo de la configuración de tu servidor):\n\n$ %3$s",
+        "ConsoleUpdateFailure": "¡Matomo no se pudo actualizar! Mirá arriba para más información.",
+        "ConsoleUpdateNoSqlQueries": "Nota: no hay consultas SQL o comandos de consola para ejecutar.",
+        "AlreadyUpToDate": "Todo está actualizado.",
+        "ExecuteDbUpgrade": "Se necesita una actualización de la base de datos. ¿Ejecutar la actualización?",
+        "DryRun": "Nota: esta es una ejecución seca",
+        "DryRunEnd": "Fin de la ejecución seca",
+        "ConsoleCommandDescription": "Actualizaciones de los accionadores. Usalo después de que el núcleo de Matomo o los archivos de cualquier plugin se hayan actualizado. Agregá \"--yes\" para actualizar sin confirmación.",
+        "ConsoleParameterDescription": "Ejecutá la actualización directamente, sin pedir confirmación.",
         "VerifyingUnpackedFiles": "Verificando los archivos desempaquetados",
         "WarningMessages": "Mensajes de advertencia:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Desactivaremos automáticamente los siguientes plugins: %s",
         "YouCanUpgradeAutomaticallyOrDownloadPackage": "Podé actualizar automáticamente a la versión %s o descargar el paquete e instalarlo manualmente:",
-        "ViewVersionChangelog": "Ver el registro de cambios de esta versión:"
+        "YouMustDownloadPackageOrFixPermissions": "Matomo no puede sobreescribir tu instalación actual. Podés, o bien corregir los permisos del directorio o archivo, o bien descargar el paquete e instalar la versión %s manualmente:",
+        "YourDatabaseIsOutOfDate": "Tu basde de datos de Matomo está desactualizada y debe ser actualizada antes de continuar.",
+        "ViewVersionChangelog": "Ver el registro de cambios de esta versión:",
+        "ReceiveEmailBecauseIsSuperUser": "Recibís este correo electrónico porque sos un súperusuario en la instalación de Matomo en: %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CoreUpdater/lang/fi.json b/app/plugins/CoreUpdater/lang/fi.json
index 4844e46ef..077608d43 100644
--- a/app/plugins/CoreUpdater/lang/fi.json
+++ b/app/plugins/CoreUpdater/lang/fi.json
@@ -24,12 +24,14 @@
         "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 Matomo-palvelimellasi on suuria määriä liikennettä, suosittelemme %1$spoistamaan käyttäjäseurannan hetkellisesti käytöstä ja laittamaan Matomon käyttöliittymän huoltotilaan%2$s.",
+        "IncompatbilePluginsWillBeDisabledInfo": "Huomio: jotkin lisäosat eivät ole yhteensopivia Matomon version %s kanssa. Päivitämme ne, jos niille on saatavilla päivitys markkinapaikalta, muussa tapauksessa poistamme ne käytöstä päivityksen yhteydessä:",
         "InstallingTheLatestVersion": "Asennetaan uusinta versiota",
         "LatestBetaRelease": "Viimeisin beta-julkaisu",
         "LatestStableRelease": "Viimeisin vakaa julkaisu",
         "Latest2XStableRelease": "Viimeisin vakaa 2.X",
         "Latest2XBetaRelease": "Viimeisin beta 2.X",
         "LtsSupportVersion": "Pitkään tuettu versio",
+        "ListOfSqlQueriesFYI": "Tiedoksesi: tässä ovat SQL-kyselyt ja konsolikomennot, jotka suoritetaan tietokantasi päivityksen yhteydessä Matomon versioon %s",
         "TheseSqlQueriesWillBeExecuted": "Nämä SQL-kyselyt suoritetaan:",
         "TheseCommandsWillBeExecuted": "Nämä konsolikomennot suoritetaan:",
         "MajorUpdateWarning1": "Tämä on iso päivitys! Päivityksessä kestää kauemmin kuin normaalisti.",
diff --git a/app/plugins/CoreUpdater/lang/ja.json b/app/plugins/CoreUpdater/lang/ja.json
index 909d50bb2..aac99f706 100644
--- a/app/plugins/CoreUpdater/lang/ja.json
+++ b/app/plugins/CoreUpdater/lang/ja.json
@@ -38,7 +38,7 @@
         "MajorUpdateWarning2": "以下のアドバイスは、特に大規模なインストールの際、重要です。",
         "NeedHelpUpgrading": "Matomo のアップグレードをお手伝いしますか？",
         "NeedHelpUpgradingText": "Matomo をアップグレードするためのサポートが必要な場合は、Matomo のクリエイターがMatomo のアップグレードを成功させ、すべての解説、ベストプラクティス、継続的なサポートを提供致します。%1$s Matomo の専門家に連絡して、安全に Matomo をアップグレードしてください。%2$s",
-        "NoteForLargePiwikInstances": "Matomo のデータベースが大きい場合の重要注意",
+        "NoteForLargePiwikInstances": "大規模なMatomoのインストールに関する注意事項",
         "NotificationClickToUpdatePlugins": "お使いのプラグインをアップデートするには今すぐここをクリックしてください:",
         "NotificationClickToUpdateThemes": "お使いのテーマをアップデートするには今すぐここをクリックしてください:",
         "NotificationSubjectAvailableCoreUpdate": "新しい Matomo %s が利用可能です。",
@@ -47,7 +47,7 @@
         "PiwikUpdatedSuccessfully": "Matomo は正常にアップデートされました！",
         "PiwikWillBeUpgradedFromVersionXToVersionY": "Matomo データベースが %1$s から新バージョン %2$s にアップグレードされます。",
         "ReadyToGo": "実行してもよろしいですか？",
-        "TheFollowingPluginsWillBeUpgradedX": "次のプラグインはアップグレードされます： %s",
+        "TheFollowingPluginsWillBeUpgradedX": "以下のプラグインが更新されます： %s",
         "TheFollowingDimensionsWillBeUpgradedX": "以下の範囲をアップデートします: %s",
         "ThereIsNewPluginVersionAvailableForUpdate": "お使いのいくつかのプラグインは、マーケットプレイス上でアップデートされています:",
         "ThereIsNewVersionAvailableForUpdate": "アップデート可能な Matomo の新バージョンがあります。",
@@ -61,8 +61,8 @@
         "UpdateSuccessTitle": "Matomo は正常にアップグレードされました！",
         "UpdateErrorTitle": "アップデートエラー",
         "ThankYouUpdatePiwik": "Matomo を利用し、最新の状態を維持して頂きありがとうございます！",
-        "PostUpdateMessage": "Matomo は、常に無料でダウンロードして自由に使用できますが、成長し、改善するためには皆様のご支援が必要です。",
-        "PostUpdateSupport": "Matomo の使い方で助けが必要な場合は、そのクリエイターからサポートを得ることができます：",
+        "PostUpdateMessage": "Matomo は、常に無料でダウンロードして自由にご利用いただけますが、成長し、改善するためには皆様のご支援が必要です。",
+        "PostUpdateSupport": "Matomo の使い方で助けが必要な場合は、クリエイターからサポートを得ることができます：",
         "ServicesSupport": "サービスとサポート",
         "CloudHosting": "クラウドホスティング",
         "Updating": "アップデート",
@@ -74,11 +74,11 @@
         "UpgradeComplete": "アップグレードが完了しました！",
         "UpgradePiwik": "Matomo のアップグレード",
         "ConsoleStartingDbUpgrade": "今すぐデータベースアップグレードプロセスを開始してください。 これには時間がかかることがありますので、しばらくお待ちください。",
-        "DbUpgradeNotExecuted": "データベースのアップグレードは実行されません。",
+        "DbUpgradeNotExecuted": "データベースのアップグレードは実行されませんでした。",
         "ConsoleUpdateUnexpectedUserWarning": "Matomo ファイルの所有者である %2$s がユーザー %1$s と同時にこの更新プログラムを実行したようです。\n\n正しいユーザーが Matomo ファイルを確実に読み取れるようにするには、次のコマンドを実行する必要があります（またはサーバーの構成に応じて同様のコマンド）：\n\n$ %3$s",
-        "ConsoleUpdateFailure": "Matomo は更新できませんでした！ 詳細については上記を参照してください。",
+        "ConsoleUpdateFailure": "Matomoを更新できませんでした。 詳しくは上記を参照してください。",
         "ConsoleUpdateNoSqlQueries": "注：実行する SQL クエリまたはコンソールコマンドはありません。",
-        "AlreadyUpToDate": "既にすべて最新です。",
+        "AlreadyUpToDate": "既にすべて最新の状態です。",
         "ExecuteDbUpgrade": "データベースのアップグレードが必要です。 更新を実行しますか？",
         "DryRun": "注：これは Dry Run です",
         "DryRunEnd": "Dry Run 終了",
diff --git a/app/plugins/CoreUpdater/lang/pt-br.json b/app/plugins/CoreUpdater/lang/pt-br.json
index 807c29ae5..c6a741a75 100644
--- a/app/plugins/CoreUpdater/lang/pt-br.json
+++ b/app/plugins/CoreUpdater/lang/pt-br.json
@@ -1,19 +1,20 @@
 {
     "CoreUpdater": {
-        "CheckingForPluginUpdates": "Verificando atualizações do novo plugin",
+        "CheckingForPluginUpdates": "Verificando novas atualizações do plugin",
+        "ClickHereToViewSqlQueries": "Clique aqui para visualizar e copiar a lista de consultas SQL e comandos de console que serão executados",
         "CriticalErrorDuringTheUpgradeProcess": "Erro crítico durante o processo de atualização:",
         "DatabaseUpgradeRequired": "Atualização do banco de dados requerida",
         "DisablingIncompatiblePlugins": "Desabilitar plugins incompatíveis: %s",
         "DownloadingUpdateFromX": "Baixando atualização de %s",
-        "DownloadX": "Dowload %s",
+        "DownloadX": "Baixar %s",
         "EmptyDatabaseError": "O banco de dados %s está vazio. Você deve editar ou remover o seu arquivo de configuração do Matomo.",
         "ErrorDIYHelp": "Se você é um usuário avançado e encontrou um erro na atualização do banco de dados:",
         "ErrorDIYHelp_1": "identifique e corrija a fonte do problema (ex: memory_limit ou max_execution_time)",
-        "ErrorDIYHelp_2": "Executar as queries remanescentes que falharam na atualização",
-        "ErrorDIYHelp_3": "Atualiza manualmente a tabela `option` no banco de dados Matomo, ajustando o valor de version_core para a versão da atualização que falhou",
-        "ErrorDIYHelp_4": "roda novamente o script de atualização (através do navegador ou da linha de comando) para continuar com as atualizações restantes",
+        "ErrorDIYHelp_2": "execute as consultas remanescentes que falharam na atualização",
+        "ErrorDIYHelp_3": "atualize manualmente a tabela `option` no banco de dados Matomo, ajustando o valor de version_core para a versão da atualização que falhou",
+        "ErrorDIYHelp_4": "rode novamente o script de atualização (através do navegador ou da linha de comando) para continuar com as atualizações restantes",
         "ErrorDIYHelp_5": "relate o problema (e solução) para que o Matomo possa ser melhorado",
-        "ErrorDuringPluginsUpdates": "Erros durante atualização de plugins:",
+        "ErrorDuringPluginsUpdates": "Erro durante atualização de plugins:",
         "ExceptionAlreadyLatestVersion": "Sua versão %s do Matomo está atualizada.",
         "ExceptionArchiveEmpty": "Arquivo vazio.",
         "ExceptionArchiveIncompatible": "Arquivo incompatível: %s",
@@ -23,12 +24,16 @@
         "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 Matomo com alto tráfego, recomendamos %1$sdesativar momentaneamente o Rastreamento de visitantes e colocar a interface de usuário do servidor Matomo no modo de manutenção%2$s.",
+        "IncompatbilePluginsWillBeDisabledInfo": "Obs: alguns plugins não são compatíveis com o Matomo %s. Nós iremos atualizá-los se houver uma atualização no Marketplace, caso contrário iremos desabilitá-los quando você atualizar:",
         "InstallingTheLatestVersion": "Instalando a versão mais recente",
         "LatestBetaRelease": "Último lançamento beta",
         "LatestStableRelease": "Último lançamento estável",
         "Latest2XStableRelease": "Último estável 2.X",
         "Latest2XBetaRelease": "Último beta 2.X",
         "LtsSupportVersion": "Versão Suporte de Longo Prazo",
+        "ListOfSqlQueriesFYI": "FYI: estas são as consultas SQL e comandos de console que serão executados para atualizar seu banco de dados para o Matomo %s",
+        "TheseSqlQueriesWillBeExecuted": "Estas consultas SQL serão executadas:",
+        "TheseCommandsWillBeExecuted": "Estes comandos de console serão rodados:",
         "MajorUpdateWarning1": "Esta é uma grande atualização! Vai levar mais tempo do que o habitual.",
         "MajorUpdateWarning2": "A consultoria é especialmente importante para grandes instalações.",
         "NeedHelpUpgrading": "Precisa de ajuda para atualizar o Matomo?",
@@ -66,7 +71,11 @@
         "UsingHttps": "usando a conexão HTTPS segura (recomendado)",
         "UsingHttp": "usando a conexão HTTP não segura",
         "UpgradeComplete": "Atualização completa!",
-        "UpgradePiwik": "Atualiza o Matomo",
+        "UpgradePiwik": "Atualizar o Matomo",
+        "ConsoleStartingDbUpgrade": "Iniciando agora o processo de atualização da base de dados. Isto pode demorar um pouco, seja paciente.",
+        "DbUpgradeNotExecuted": "Atualização da base de dados não executada.",
+        "AlreadyUpToDate": "Tudo está atualizado.",
+        "ExecuteDbUpgrade": "Uma atualização da base de dados é requerida. Executar atualização?",
         "VerifyingUnpackedFiles": "Verificando os arquivos descompactados",
         "WarningMessages": "Mensagens de alerta:",
         "WeAutomaticallyDeactivatedTheFollowingPlugins": "Nós automaticamente desativamos os seguintes plugins: %s",
diff --git a/app/plugins/CoreUpdater/lang/pt.json b/app/plugins/CoreUpdater/lang/pt.json
index fffa908cb..2360ecfb2 100644
--- a/app/plugins/CoreUpdater/lang/pt.json
+++ b/app/plugins/CoreUpdater/lang/pt.json
@@ -1,6 +1,7 @@
 {
     "CoreUpdater": {
         "CheckingForPluginUpdates": "A procurar por novas atualizações de extensões",
+        "ClickHereToViewSqlQueries": "Clique aqui para ver e copiar a lista de instruções SQL e comandos da consola que serão executados.",
         "CriticalErrorDuringTheUpgradeProcess": "Erro crítico durante o processo de atualização:",
         "DatabaseUpgradeRequired": "Necessária uma atualização da base de dados",
         "DisablingIncompatiblePlugins": "A desativar extensões incompatíveis: %s",
@@ -23,12 +24,16 @@
         "HelpMessageIntroductionWhenError": "A mensagem acima é um erro do núcleo. Deve ajudar a explicar a causa, mas se precisar de mais ajuda por favor:",
         "HelpMessageIntroductionWhenWarning": "A atualização foi concluída com sucesso. No entanto, ocorreram problemas durante o processo. Por favor, leia as descrições acima para mais detalhes. Para mais ajuda:",
         "HighTrafficPiwikServerEnableMaintenance": "Se gere um servidor Matomo com um grande volume de tráfego, recomendamos que %1$sdesative momentaneamente o Acompanhamento de visitantes e coloque o interface de utilizador do Matomo em modo de manutenção%2$s.",
+        "IncompatbilePluginsWillBeDisabledInfo": "Nota: algumas extensões não são compatíveis com o Matomo %s. Sempre que se encontre disponível uma atualização na loja, procederemos à atualização destas extensões. Caso contrário, serão desativadas quando fizer a atualização:",
         "InstallingTheLatestVersion": "A instalar a versão mais recente",
         "LatestBetaRelease": "Último lançamento beta",
         "LatestStableRelease": "Último lançamento estável",
         "Latest2XStableRelease": "Última 2.X estável",
         "Latest2XBetaRelease": "Última 2.X beta",
         "LtsSupportVersion": "Versão de suporte de longo termo",
+        "ListOfSqlQueriesFYI": "Para sua informação: estas são as instruções SQL e os comandos da consola que serão executados para a atualização da sua base de dados do Matomo %s",
+        "TheseSqlQueriesWillBeExecuted": "Serão executadas as seguintes instruções SQL:",
+        "TheseCommandsWillBeExecuted": "Serão executados os seguintes comandos da consola:",
         "MajorUpdateWarning1": "Esta é uma grande atualização! Irá demorar mais tempo do que é habitual.",
         "MajorUpdateWarning2": "A recomendação seguinte é especialmente importante para grandes instalações.",
         "NeedHelpUpgrading": "Precisa de ajuda para atualizar o Matomo?",
@@ -72,6 +77,7 @@
         "DbUpgradeNotExecuted": "Atualização da base de dados não executada.",
         "ConsoleUpdateUnexpectedUserWarning": "Parece que executou esta atualização com o utilizador %1$s, enquanto os seus ficheiros do Matomo são propriedade de %2$s. \n\nPara garantir que os ficheiros do Matomo são legíveis pelo utilizador correto, deve executar o seguinte comando (ou similar, dependendo da configuração do seu servidor):\n\n$ %3$s",
         "ConsoleUpdateFailure": "O Matomo não pôde ser atualizado! Consulte mais informação acima.",
+        "ConsoleUpdateNoSqlQueries": "Nota: Não existem instruções SQL ou comandos da consola para executar.",
         "AlreadyUpToDate": "Está tudo atualizado.",
         "ExecuteDbUpgrade": "É necessária uma atualização da base de dados. Executar atualização?",
         "DryRun": "Nota: isto é uma simulação",
diff --git a/app/plugins/CoreUpdater/lang/uk.json b/app/plugins/CoreUpdater/lang/uk.json
index 0e77c6c8d..e4ad096af 100644
--- a/app/plugins/CoreUpdater/lang/uk.json
+++ b/app/plugins/CoreUpdater/lang/uk.json
@@ -1,6 +1,7 @@
 {
     "CoreUpdater": {
         "CheckingForPluginUpdates": "Перевірка на наявність нових оновлень плагінів",
+        "ClickHereToViewSqlQueries": "Натисніть тут, щоб переглянути та скопіювати список запитів SQL і консольних команд, які будуть виконані",
         "CriticalErrorDuringTheUpgradeProcess": "Критична помилка протягом процесу поновлення:",
         "DatabaseUpgradeRequired": "Необхідно поновити базу даних",
         "DisablingIncompatiblePlugins": "Відключення несумісних плагінів: %s",
@@ -23,12 +24,16 @@
         "HelpMessageIntroductionWhenError": "Вище знаходиться повідомлення про помилку рівня ядра. Це повинно допомогти у виявлення причини, але якщо потрібна подальша допомога, будьласка:",
         "HelpMessageIntroductionWhenWarning": "Поновлення завершено успішно, однак були інциденти протягом проходження процесу. Будь-ласка прочитайте опис щоб дізнатися деталі. Для подальшої допомоги:",
         "HighTrafficPiwikServerEnableMaintenance": "Якщо ви керуєте сервером Matomo з великим обсягом трафіку, ми рекомендуємо %1$sна мить вимкнути Відстеження відвідувачів і перемкнути Інтерфейс Matomo в режим%2$s підтримки.",
+        "IncompatbilePluginsWillBeDisabledInfo": "Примітка: деякі плагіни не сумісні з Matomo %s. Ми будемо оновлювати їх, якщо є оновлення на Маркеті, в іншому випадку ми будемо відключати їх при оновленні:",
         "InstallingTheLatestVersion": "Встановлення останньої версії",
         "LatestBetaRelease": "Останній тестовий випуск",
         "LatestStableRelease": "Останній стабільний випуск",
         "Latest2XStableRelease": "Останній стабільний 2.X",
         "Latest2XBetaRelease": "Останній тестовий 2.X",
         "LtsSupportVersion": "Версія Довгострокової підтримки",
+        "ListOfSqlQueriesFYI": "P.S.: ці запити SQL і консольні команди, які будуть виконуватися для оновлення бази даних в Matomo %s",
+        "TheseSqlQueriesWillBeExecuted": "Ці запити SQL будуть виконуватися:",
+        "TheseCommandsWillBeExecuted": "Ці команди консолі будуть працювати:",
         "MajorUpdateWarning1": "Це велике оновлення! Може знадобитися більше часу, ніж зазвичай.",
         "MajorUpdateWarning2": "Наступна порада особливо важлива для великих оновлень!",
         "NeedHelpUpgrading": "Потрібна допомога в оновленні Matomo?",
@@ -72,10 +77,12 @@
         "DbUpgradeNotExecuted": "Оновлення бази даних не виконано.",
         "ConsoleUpdateUnexpectedUserWarning": "Схоже, ви виконали це оновлення користувачем %1$s, а ваші файли Matomo належать.%2$s\nЩоб забезпечити читання файлів Matomo правильним користувачем, вам може знадобитися запустити таку команду (або подібну команду залежно від конфігурації вашого сервера).:\n\n$ %3$s",
         "ConsoleUpdateFailure": "Matomo не може бути оновлено! Докладніше див. вище.",
+        "ConsoleUpdateNoSqlQueries": "Примітка: Немає SQL запитів або консольних команд для виконання.",
         "AlreadyUpToDate": "Все вже оновлені.",
         "ExecuteDbUpgrade": "Потрібно оновити базу даних. Виконати оновлення?",
         "DryRun": "Примітка: це сухий пробіг",
         "DryRunEnd": "Кінець сухого пробігу",
+        "ConsoleCommandDescription": "Тригери оновлено. Використовуйте їх тільки після того, як ядро ​​Matomo або будь-які вставні файли були оновлені. Append --yes для поновлення без підтвердження.",
         "ConsoleParameterDescription": "Безпосередньо виконувати оновлення, не питаючи підтвердження",
         "VerifyingUnpackedFiles": "Перевірка розпакованих файлів",
         "WarningMessages": "Застережні повідомлення:",
diff --git a/app/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/app/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index a855fd695..998cfb977 100644
--- a/app/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
+++ b/app/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -64,7 +64,7 @@
                 {% endif %}
 
                 <h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2>
-                <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer noopener' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
+                <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer noopener' target='_blank' href='https://matomo.org/support-plans/?pk_campaign=App_Upgrading&pk_source=Matomo_App&pk_medium=NeedHelpUpgrading'>", "</a>")|raw }}</p>
 
                 <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2>
                 <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
diff --git a/app/plugins/CoreUpdater/templates/updateSuccess.twig b/app/plugins/CoreUpdater/templates/updateSuccess.twig
index 84bb7bd90..7a1c118e7 100644
--- a/app/plugins/CoreUpdater/templates/updateSuccess.twig
+++ b/app/plugins/CoreUpdater/templates/updateSuccess.twig
@@ -29,10 +29,10 @@
 
         <div class="row">
             <div class="col s5 offset-s1">
-                <a href="https://matomo.org/support-plans/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
+                <a href="https://matomo.org/support-plans/?pk_medium=Update_Success_button&pk_source=Matomo_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
             </div>
             <div class="col s5">
-                <a href="https://matomo.org/hosting/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
+                <a href="https://matomo.org/hosting/?pk_medium=App_Cloud_button&pk_source=Matomo_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
             </div>
         </div>
 
diff --git a/app/plugins/CoreVisualizations/JqplotDataGenerator.php b/app/plugins/CoreVisualizations/JqplotDataGenerator.php
index d725d22b0..e12076400 100644
--- a/app/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/app/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -10,11 +10,16 @@
 namespace Piwik\Plugins\CoreVisualizations;
 
 use Exception;
+use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Metrics;
+use Piwik\Period\Factory;
 use Piwik\Piwik;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator\Chart;
+use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php';
 
@@ -26,7 +31,7 @@
 class JqplotDataGenerator
 {
     /**
-     * View properties. @see Piwik\ViewDataTable for more info.
+     * View properties. @see \Piwik\ViewDataTable for more info.
      *
      * @var array
      */
@@ -34,6 +39,15 @@ class JqplotDataGenerator
 
     protected $graphType;
 
+    protected $isComparing;
+
+    private $availableSegments;
+
+    /**
+     * @var JqplotGraph
+     */
+    protected $graph;
+
     /**
      * Creates a new JqplotDataGenerator instance for a graph type and view properties.
      *
@@ -42,14 +56,14 @@ class JqplotDataGenerator
      * @throws \Exception
      * @return JqplotDataGenerator
      */
-    public static function factory($type, $properties)
+    public static function factory($type, $properties, JqplotGraph $graph)
     {
         switch ($type) {
             case 'evolution':
-                return new JqplotDataGenerator\Evolution($properties, $type);
+                return new JqplotDataGenerator\Evolution($properties, $type, $graph);
             case 'pie':
             case 'bar':
-                return new JqplotDataGenerator($properties, $type);
+                return new JqplotDataGenerator($properties, $type, $graph);
             default:
                 throw new Exception("Unknown JqplotDataGenerator type '$type'.");
         }
@@ -63,10 +77,14 @@ public static function factory($type, $properties)
      *
      * @internal param \Piwik\Plugin\ViewDataTable $visualization
      */
-    public function __construct($properties, $graphType)
+    public function __construct($properties, $graphType, JqplotGraph $graph)
     {
         $this->properties = $properties;
         $this->graphType = $graphType;
+        $this->isComparing = $graph->isComparing();
+        $this->graph = $graph;
+
+        $this->availableSegments = Request::processRequest('SegmentEditor.getAll', $override = [], $default = []);
     }
 
     /**
@@ -80,12 +98,6 @@ public function generate($dataTable)
         $visualization = new Chart();
 
         if ($dataTable->getRowsCount() > 0) {
-            // if addTotalRow was called in GenerateGraphHTML, add a row containing totals of
-            // different metrics
-            if ($this->properties['add_total_row']) {
-                $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total'));
-            }
-
             $dataTable->applyQueuedFilters();
             $this->initChartObjectData($dataTable, $visualization);
         }
@@ -101,47 +113,123 @@ protected function initChartObjectData($dataTable, $visualization)
     {
         $xLabels = $dataTable->getColumn('label');
 
-        $columnNames = $this->properties['columns_to_display'];
-        if (($labelColumnIndex = array_search('label', $columnNames)) !== false) {
-            unset($columnNames[$labelColumnIndex]);
+        $columnsToDisplay = array_values($this->properties['columns_to_display']);
+        if (($labelColumnIndex = array_search('label', $columnsToDisplay)) !== false) {
+            unset($columnsToDisplay[$labelColumnIndex]);
         }
 
-        $columnNameToTranslation = $columnNameToValue = array();
-        foreach ($columnNames as $columnName) {
-            $columnNameToTranslation[$columnName] = @$this->properties['translations'][$columnName];
-
-            $columnNameToValue[$columnName] = $dataTable->getColumn($columnName);
+        $seriesMetadata = null;
+        if ($this->isComparing) {
+            list($yLabels, $serieses, $seriesMetadata) = $this->getComparisonTableSerieses($dataTable, $columnsToDisplay);
+        } else {
+            list($yLabels, $serieses) = $this->getMainTableSerieses($dataTable, $columnsToDisplay);
         }
 
         $visualization->dataTable = $dataTable;
         $visualization->properties = $this->properties;
 
         $visualization->setAxisXLabels($xLabels);
-        $visualization->setAxisYValues($columnNameToValue);
-        $visualization->setAxisYLabels($columnNameToTranslation);
+        $visualization->setAxisYValues($serieses, $seriesMetadata);
+        $visualization->setAxisYLabels($yLabels);
 
-        $units = $this->getUnitsForColumnsToDisplay();
+        $units = $this->getUnitsForSerieses($yLabels);
         $visualization->setAxisYUnits($units);
     }
 
-    protected function getUnitsForColumnsToDisplay()
+    private function getMainTableSerieses(DataTable $dataTable, $columnNames)
+    {
+        $columnNameToTranslation = [];
+
+        foreach ($columnNames as $columnName) {
+            $columnNameToTranslation[$columnName] = @$this->properties['translations'][$columnName];
+        }
+
+        $columnNameToValue = array();
+        foreach ($columnNames as $columnName) {
+            $columnNameToValue[$columnName] = $dataTable->getColumn($columnName);
+        }
+
+        return [$columnNameToTranslation, $columnNameToValue];
+    }
+
+    private function getComparisonTableSerieses(DataTable $dataTable, $columnsToDisplay)
+    {
+        $seriesLabels = [];
+        $serieses = [];
+        $seriesMetadata = [];
+
+        $seriesIndices = [];
+
+        foreach ($dataTable->getRows() as $row) {
+            /** @var DataTable $comparisonTable */
+            $comparisonTable = $row->getComparisons();
+            if (empty($comparisonTable)) {
+                continue;
+            }
+
+            foreach ($comparisonTable->getRows() as $index => $compareRow) {
+                foreach ($columnsToDisplay as $columnIndex => $columnName) {
+                    $seriesId = $columnName . '|' . $index;
+
+                    if (!isset($seriesIndices[$seriesId])) {
+                        $seriesIndices[$seriesId] = count($seriesIndices);
+                    }
+
+                    $seriesLabel = $this->getComparisonSeriesLabel($compareRow, $columnName);
+                    $seriesLabels[$seriesId] = $seriesLabel;
+                    $serieses[$seriesId][] = $compareRow->getColumn($columnName);
+
+                    $seriesMetadata[$seriesId] = [
+                        'seriesIndex' => $seriesIndices[$seriesId],
+                        'metricIndex' => $columnIndex,
+                    ];
+                }
+            }
+        }
+
+        return [$seriesLabels, $serieses, $seriesMetadata];
+    }
+
+    protected function getComparisonSeriesLabel(Row $compareRow, $columnName, $rowLabel = false)
+    {
+        return $this->getComparisonSeriesLabelFromCompareSeries($compareRow->getMetadata('compareSeriesPretty'), $columnName, $rowLabel);
+    }
+
+    protected function getComparisonSeriesLabelFromCompareSeries($compareSeriesPretty, $columnName, $rowLabel = false)
+    {
+        $columnTranslation = @$this->properties['translations'][$columnName];
+
+        if (empty($rowLabel)) {
+            $label = $columnTranslation;
+        } else {
+            $label = "$rowLabel ($columnTranslation)";
+        }
+
+        $label .= ' ' . $compareSeriesPretty;
+        return $label;
+    }
+
+    protected function getUnitsForSerieses($yLabels)
     {
         // derive units from column names
-        $units = $this->deriveUnitsFromRequestedColumnNames();
+        $units = $this->deriveUnitsFromRequestedColumnNames($yLabels);
         if (!empty($this->properties['y_axis_unit'])) {
             $units = array_fill(0, count($units), $this->properties['y_axis_unit']);
         }
         return $units;
     }
 
-    private function deriveUnitsFromRequestedColumnNames()
+    private function deriveUnitsFromRequestedColumnNames($yLabels)
     {
         $idSite = Common::getRequestVar('idSite', null, 'int');
 
         $units = array();
-        foreach ($this->properties['columns_to_display'] as $columnName) {
+        foreach ($yLabels as $seriesId => $ignore) {
+            $parts = explode('|', $seriesId, 2);
+            $columnName = $parts[0];
+
             $derivedUnit = Metrics::getUnit($columnName, $idSite);
-            $units[$columnName] = empty($derivedUnit) ? false : $derivedUnit;
+            $units[$seriesId] = empty($derivedUnit) ? false : $derivedUnit;
         }
         return $units;
     }
diff --git a/app/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php b/app/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
index 44be4af35..2ac4b6f8d 100644
--- a/app/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
+++ b/app/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
@@ -25,14 +25,16 @@ class Chart
     // temporary
     public $properties;
 
-    public function setAxisXLabels($xLabels)
+    public function setAxisXLabels($xLabels, $xTicks = null, $index = 0)
     {
+        $axisName = $this->getXAxis($index);
+
         $xSteps = $this->properties['x_axis_step_size'];
         $showAllTicks = $this->properties['show_all_ticks'];
 
-        $this->axes['xaxis']['labels'] = array_values($xLabels);
+        $this->axes[$axisName]['labels'] = array_values($xLabels);
 
-        $ticks = array_values($xLabels);
+        $ticks = array_values($xTicks ?: $xLabels);
 
         if (!$showAllTicks) {
             // unset labels so there are $xSteps number of blank ticks between labels
@@ -42,7 +44,7 @@ public function setAxisXLabels($xLabels)
                 }
             }
         }
-        $this->axes['xaxis']['ticks'] = $ticks;
+        $this->axes[$axisName]['ticks'] = $ticks;
     }
 
     public function setAxisXOnClick(&$onClick)
@@ -50,14 +52,20 @@ public function setAxisXOnClick(&$onClick)
         $this->axes['xaxis']['onclick'] = & $onClick;
     }
 
-    public function setAxisYValues(&$values)
+    public function setAxisYValues(&$values, $seriesMetadata = null)
     {
         foreach ($values as $label => &$data) {
-            $this->series[] = array(
+            $seriesInfo = array(
                 'label'         => $label,
-                'internalLabel' => $label
+                'internalLabel' => $label,
             );
 
+            if (isset($seriesMetadata[$label])) {
+                $seriesInfo = array_merge($seriesInfo, $seriesMetadata[$label]);
+            }
+
+            $this->series[] = $seriesInfo;
+
             array_walk($data, function (&$v) {
                 $v = (float) Common::forceDotAsSeparatorForDecimalPoint($v);
             });
@@ -116,4 +124,28 @@ public function render()
 
         return $data;
     }
+
+    public function setAxisXLabelsMultiple($xLabels, $seriesToXAxis, $ticks = null)
+    {
+        foreach ($xLabels as $index => $labels) {
+            $this->setAxisXLabels($labels, $ticks === null ? null : $ticks[$index], $index);
+        }
+
+        foreach ($seriesToXAxis as $seriesIndex => $xAxisIndex) {
+            $axisName = $this->getXAxis($xAxisIndex);
+
+            // don't actually set xaxis otherwise jqplot will show too many axes. however, we need the xaxis labels, so we add them
+            // to the jqplot config
+            $this->series[$seriesIndex]['_xaxis'] = $axisName;
+        }
+    }
+
+    private function getXAxis($index)
+    {
+        $axisName = 'xaxis';
+        if ($index != 0) {
+            $axisName = 'x' . ($index + 1) . 'axis';
+        }
+        return $axisName;
+    }
 }
diff --git a/app/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php b/app/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
index cae257796..814903265 100644
--- a/app/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
+++ b/app/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
@@ -11,6 +11,13 @@
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\DataTable\DataTableInterface;
+use Piwik\DataTable\Row;
+use Piwik\Date;
+use Piwik\Metrics;
+use Piwik\Period;
+use Piwik\Period\Factory;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
 use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
 use Piwik\Url;
 
@@ -19,6 +26,18 @@
  */
 class Evolution extends JqplotDataGenerator
 {
+    protected function getUnitsForColumnsToDisplay()
+    {
+        $idSite = Common::getRequestVar('idSite', null, 'int');
+
+        $units = [];
+        foreach ($this->properties['columns_to_display'] as $columnName) {
+            $derivedUnit = Metrics::getUnit($columnName, $idSite);
+            $units[$columnName] = empty($derivedUnit) ? false : $derivedUnit;
+        }
+        return $units;
+    }
+
     /**
      * @param DataTable|DataTable\Map $dataTable
      * @param Chart $visualization
@@ -33,11 +52,16 @@ protected function initChartObjectData($dataTable, $visualization)
             return;
         }
 
-        // the X label is extracted from the 'period' object in the table's metadata
-        $xLabels = array();
-        foreach ($dataTable->getDataTables() as $metadataDataTable) {
-            $xLabels[] = $metadataDataTable->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX)->getLocalizedShortString(); // eg. "Aug 2009"
-        }
+        $dataTables = $dataTable->getDataTables();
+
+        // determine x labels based on both the displayed date range and the compared periods
+        /** @var Period[][] $xLabels */
+        $xLabels = [
+            [], // placeholder for first series
+        ];
+
+        $this->addComparisonXLabels($xLabels, reset($dataTables));
+        $this->addSelectedSeriesXLabels($xLabels, $dataTables);
 
         $units = $this->getUnitsForColumnsToDisplay();
 
@@ -47,27 +71,37 @@ protected function initChartObjectData($dataTable, $visualization)
                 ? : array(false) // make sure that a series is plotted even if there is no data
         ;
 
+        $columnsToDisplay = array_values($this->properties['columns_to_display']);
+
+        list($seriesMetadata, $seriesUnits, $seriesLabels, $seriesToXAxis) =
+            $this->getSeriesMetadata($rowsToDisplay, $columnsToDisplay, $units, $dataTables);
+
         // collect series data to show. each row-to-display/column-to-display permutation creates a series.
         $allSeriesData = array();
-        $seriesUnits = array();
         foreach ($rowsToDisplay as $rowLabel) {
-            foreach ($this->properties['columns_to_display'] as $columnName) {
-                $seriesLabel = $this->getSeriesLabel($rowLabel, $columnName);
-                $seriesData = $this->getSeriesData($rowLabel, $columnName, $dataTable);
-
-                $allSeriesData[$seriesLabel] = $seriesData;
-                $seriesUnits[$seriesLabel] = $units[$columnName];
+            foreach ($columnsToDisplay as $columnName) {
+                if (!$this->isComparing) {
+                    $this->setNonComparisonSeriesData($allSeriesData, $rowLabel, $columnName, $dataTable);
+                } else {
+                    $this->setComparisonSeriesData($allSeriesData, $seriesLabels, $rowLabel, $columnName, $dataTable);
+                }
             }
         }
 
         $visualization->dataTable = $dataTable;
         $visualization->properties = $this->properties;
 
-        $visualization->setAxisXLabels($xLabels);
-        $visualization->setAxisYValues($allSeriesData);
+        $visualization->setAxisYValues($allSeriesData, $seriesMetadata);
         $visualization->setAxisYUnits($seriesUnits);
 
-        $dataTables = $dataTable->getDataTables();
+        $xLabelStrs = [];
+        $xAxisTicks = [];
+        foreach ($xLabels as $index => $seriesXLabels) {
+            $xLabelStrs[$index] = array_map(function (Period $p) { return $p->getLocalizedLongString(); }, $seriesXLabels);
+            $xAxisTicks[$index] = array_map(function (Period $p) { return $p->getLocalizedShortString(); }, $seriesXLabels);
+        }
+
+        $visualization->setAxisXLabelsMultiple($xLabelStrs, $seriesToXAxis, $xAxisTicks);
 
         if ($this->isLinkEnabled()) {
             $idSite = Common::getRequestVar('idSite', null, 'int');
@@ -144,4 +178,131 @@ private function isLinkEnabled()
         }
         return $linkEnabled;
     }
+
+    /**
+     * Each period comparison shows data over different data points than the main series (eg, 2014-02-03,1014-02-06 compared w/ 2015-03-04,2015-03-15).
+     * Though we only display the selected period's x labels, we need to both have the labels for all these data points for tooltips and to stretch
+     * out the selected period x axis, in case it is shorter than one of the compared periods (as in the example above).
+     */
+    private function addComparisonXLabels(array &$xLabels, DataTable $table)
+    {
+        $comparePeriods = $table->getMetadata('comparePeriods') ?: [];
+        $compareDates = $table->getMetadata('compareDates') ?: [];
+
+        // get rid of selected period
+        array_shift($comparePeriods);
+        array_shift($compareDates);
+
+        foreach (array_values($comparePeriods) as $index => $period) {
+            $date = $compareDates[$index];
+
+            $range = Factory::build($period, $date);
+            foreach ($range->getSubperiods() as $subperiod) {
+                $xLabels[$index + 1][] = $subperiod;
+            }
+        }
+    }
+
+    /**
+     * @param array $xLabels
+     * @param DataTable[] $dataTables
+     * @throws \Exception
+     */
+    private function addSelectedSeriesXLabels(array &$xLabels, array $dataTables)
+    {
+        $xTicksCount = count($dataTables);
+        foreach ($xLabels as $labelSeries) {
+            $xTicksCount = max(count($labelSeries), $xTicksCount);
+        }
+
+        /** @var Date $startDate */
+        $startDate = reset($dataTables)->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX)->getDateStart();
+        $periodType = reset($dataTables)->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX)->getLabel();
+
+        for ($i = 0; $i < $xTicksCount; ++$i) {
+            $period = Factory::build($periodType, $startDate->addPeriod($i, $periodType));
+            $xLabels[0][] = $period;
+        }
+    }
+
+    private function setNonComparisonSeriesData(array &$allSeriesData, $rowLabel, $columnName, DataTable\Map $dataTable)
+    {
+        $seriesLabel = $this->getSeriesLabel($rowLabel, $columnName);
+
+        $seriesData = $this->getSeriesData($rowLabel, $columnName, $dataTable);
+        $allSeriesData[$seriesLabel] = $seriesData;
+    }
+
+    private function setComparisonSeriesData(array &$allSeriesData, array $seriesLabels, $rowLabel, $columnName, DataTable\Map $dataTable)
+    {
+        foreach ($dataTable->getDataTables() as $label => $childTable) {
+            // get the row for this label (use the first if $rowLabel is false)
+            if ($rowLabel === false) {
+                $row = $childTable->getFirstRow();
+            } else {
+                $row = $childTable->getRowFromLabel($rowLabel);
+            }
+
+            if (empty($row)
+                || empty($row->getComparisons())
+            ) {
+                foreach ($seriesLabels as $seriesIndex => $seriesLabelPrefix) {
+                    $wholeSeriesLabel = $this->getComparisonSeriesLabelFromCompareSeries($seriesLabelPrefix, $columnName, $rowLabel);
+                    $allSeriesData[$wholeSeriesLabel][] = 0;
+                }
+
+                continue;
+            }
+
+            /** @var DataTable $comparisonTable */
+            $comparisonTable = $row->getComparisons();
+            foreach ($comparisonTable->getRows() as $compareRow) {
+                $seriesLabel = $this->getComparisonSeriesLabel($compareRow, $columnName, $rowLabel);
+                $allSeriesData[$seriesLabel][] = $compareRow->getColumn($columnName);
+            }
+
+            $totalsRow = $comparisonTable->getTotalsRow();
+            if ($totalsRow) {
+                $seriesLabel = $this->getComparisonSeriesLabel($totalsRow, $columnName, $rowLabel);
+                $allSeriesData[$seriesLabel][] = $totalsRow->getColumn($columnName);
+            }
+        }
+    }
+
+    private function getSeriesMetadata(array $rowsToDisplay, array $columnsToDisplay, array $units, array $dataTables)
+    {
+        $seriesMetadata = null; // maps series labels to any metadata of the series
+        $seriesUnits = array(); // maps series labels to unit labels
+        $seriesToXAxis = []; // maps series index to x-axis index (groups of metrics for a single comparison will use the same x-axis)
+
+        $table = reset($dataTables);
+        $seriesLabels = $table->getMetadata('comparisonSeries') ?: [];
+        foreach ($rowsToDisplay as $rowIndex => $rowLabel) {
+            foreach ($columnsToDisplay as $columnIndex => $columnName) {
+                if ($this->isComparing) {
+                    foreach ($seriesLabels as $seriesIndex => $seriesLabel) {
+                        $wholeSeriesLabel = $this->getComparisonSeriesLabelFromCompareSeries($seriesLabel, $columnName, $rowLabel);
+
+                        $allSeriesData[$wholeSeriesLabel] = [];
+
+                        $metricIndex = $rowIndex * count($columnsToDisplay) + $columnIndex;
+                        $seriesMetadata[$wholeSeriesLabel] = [
+                            'metricIndex' => $metricIndex,
+                            'seriesIndex' => $seriesIndex,
+                        ];
+
+                        $seriesUnits[$wholeSeriesLabel] = $units[$columnName];
+
+                        list($periodIndex, $segmentIndex) = DataComparisonFilter::getIndividualComparisonRowIndices($table, $seriesIndex);
+                        $seriesToXAxis[] = $periodIndex;
+                    }
+                } else {
+                    $seriesLabel = $this->getSeriesLabel($rowLabel, $columnName);
+                    $seriesUnits[$seriesLabel] = $units[$columnName];
+                }
+            }
+        }
+
+        return [$seriesMetadata, $seriesUnits, $seriesLabels, $seriesToXAxis];
+    }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/Graph.php b/app/plugins/CoreVisualizations/Visualizations/Graph.php
index f7767d952..ffed83f8e 100644
--- a/app/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/app/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
+use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Plugin\Metric;
@@ -15,6 +16,7 @@
 use Piwik\Plugins\CoreVisualizations\Metrics\Formatter\Numeric;
 use Piwik\Piwik;
 use Piwik\Plugin\Visualization;
+use Piwik\SettingsPiwik;
 
 /**
  * This is an abstract visualization that should be the base of any 'graph' visualization.
@@ -63,6 +65,27 @@ public function beforeLoadDataTable()
 
         $this->requestConfig->request_parameters_to_modify['format_metrics'] = 1;
 
+        // if addTotalRow was called in GenerateGraphHTML, add a row containing totals of
+        // different metrics
+        if ($this->config->add_total_row) {
+            $this->requestConfig->request_parameters_to_modify['totals'] = 1;
+            $this->requestConfig->request_parameters_to_modify['keep_totals_row'] = 1;
+            $this->requestConfig->request_parameters_to_modify['keep_totals_row_label'] = Piwik::translate('General_Total');
+        }
+
+        if (!empty($this->config->columns_to_display)) {
+            $metrics = $this->removeUnavailableMetrics($this->config->columns_to_display);
+            if (empty($metrics)) {
+                if (!empty($this->config->selectable_columns)) {
+                    $this->config->columns_to_display = array(reset($this->config->selectable_columns));
+                } else {
+                    $this->config->columns_to_display = array('nb_visit');
+                }
+                $this->requestConfig->request_parameters_to_modify['columns'] = 'nb_visits';
+                $this->requestConfig->request_parameters_to_modify['columns_to_display'] = 'nb_visits';
+            }
+        }
+
         $this->metricsFormatter = new Numeric();
     }
 
@@ -228,7 +251,7 @@ protected function ensureValidColumnsToDisplay()
             $allColumns = $this->getDefaultColumnsToDisplay();
         }
 
-        $this->config->columns_to_display = array_intersect($columnsToDisplay, $allColumns);
+        $this->config->columns_to_display = $this->removeUnavailableMetrics(array_intersect($columnsToDisplay, $allColumns));
     }
 
     private function getDefaultColumnsToDisplay()
@@ -240,4 +263,15 @@ private function getDefaultColumnsToDisplay()
             'nb_users'
         );
     }
+
+    private function removeUnavailableMetrics($metrics)
+    {
+        $currentPeriod = Common::getRequestVar('period', false);
+
+        if (!SettingsPiwik::isUniqueVisitorsEnabled($currentPeriod)) {
+            $metrics = array_diff($metrics, ['nb_uniq_visitors', 'nb_users']);
+        }
+
+        return $metrics;
+    }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/app/plugins/CoreVisualizations/Visualizations/HtmlTable.php
index 4bf717fd1..a07cc6af2 100644
--- a/app/plugins/CoreVisualizations/Visualizations/HtmlTable.php
+++ b/app/plugins/CoreVisualizations/Visualizations/HtmlTable.php
@@ -42,6 +42,15 @@ public static function getDefaultRequestConfig()
     public function beforeLoadDataTable()
     {
         $this->checkRequestIsNotForMultiplePeriods();
+
+        if ($this->isComparing()) {
+            // forward the comparisonIdSubtables var if present so it will be used when next/prev links are clicked
+            $comparisonIdSubtables = Common::getRequestVar('comparisonIdSubtables', false, 'string');
+            if (!empty($comparisonIdSubtables)) {
+                $comparisonIdSubtables = Common::unsanitizeInputValue($comparisonIdSubtables);
+                $this->config->custom_parameters['comparisonIdSubtables'] = $comparisonIdSubtables;
+            }
+        }
     }
 
     public function beforeRender()
@@ -96,6 +105,12 @@ public function beforeRender()
             $this->config->columns_to_display = $this->dataTable->getColumns();
         }
 
+        if ($this->isComparing()
+            && !empty($this->dataTable)
+        ) {
+            $this->assignTemplateVar('comparisonTotals', $this->dataTable->getMetadata('comparisonTotals'));
+        }
+
         // Note: This needs to be done right before rendering, as otherwise some plugins might change the columns to display again
         if ($this->isFlattened()) {
             $dimensions = $this->dataTable->getMetadata('dimensions');
@@ -144,6 +159,11 @@ public function beforeRender()
                 });
             }
         }
+
+        $this->assignTemplateVar('segmentTitlePretty', $this->dataTable->getMetadata('segmentPretty'));
+
+        $period = $this->dataTable->getMetadata('period');
+        $this->assignTemplateVar('periodTitlePretty', $period ? $period->getLocalizedShortString() : '');
     }
 
     public function beforeGenericFiltersAreAppliedToLoadedDataTable()
@@ -212,6 +232,11 @@ public function getCellHtmlAttributes(Row $row, $column)
         return null;
     }
 
+    public function supportsComparison()
+    {
+        return true;
+    }
+
     protected function isFlattened()
     {
         return $this->requestConfig->flat || Common::getRequestVar('flat', '');
diff --git a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
index 579016f12..0da05ea68 100644
--- a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
+++ b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
@@ -50,6 +50,11 @@ protected function ensureValidColumnsToDisplay()
 
     protected function makeDataGenerator($properties)
     {
-        return JqplotDataGenerator::factory('bar', $properties);
+        return JqplotDataGenerator::factory('bar', $properties, $this);
+    }
+
+    public function supportsComparison()
+    {
+        return true;
     }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
index 5de7fc511..c93a44c12 100644
--- a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
+++ b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -9,8 +9,11 @@
 
 namespace Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph;
 
+use Piwik\API\Request as ApiRequest;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\Period;
+use Piwik\Period\Factory;
 use Piwik\Period\Range;
 use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph;
@@ -43,7 +46,9 @@ public function beforeRender()
 
     public function beforeLoadDataTable()
     {
-        $this->calculateEvolutionDateRange();
+        if (!$this->isComparing()) {
+            $this->calculateEvolutionDateRange();
+        }
 
         parent::beforeLoadDataTable();
 
@@ -55,6 +60,35 @@ public function beforeLoadDataTable()
         }
 
         $this->config->custom_parameters['columns'] = $this->config->columns_to_display;
+
+        if ($this->isComparing()) {
+            $this->config->show_limit_control = false; // since we always show the days over the period, there's no point in changing the limit
+
+            $requestArray = $this->request->getRequestArray();
+            $requestArray = ApiRequest::getRequestArrayFromString($requestArray);
+
+            $requestingPeriod = Factory::build($requestArray['period'], $requestArray['date']);
+
+            $this->requestConfig->request_parameters_to_modify['period'] = 'day';
+            $this->requestConfig->request_parameters_to_modify['date'] = $requestingPeriod->getDateStart()->toString() . ',' . $requestingPeriod->getDateEnd()->toString();
+
+            if (!empty($requestArray['comparePeriods'])) {
+                foreach ($requestArray['comparePeriods'] as $index => $comparePeriod) {
+                    $compareDate = $requestArray['compareDates'][$index];
+                    if (Period::isMultiplePeriod($compareDate, $comparePeriod)) {
+                        continue;
+                    }
+
+                    $comparePeriodObj = Factory::build($comparePeriod, $compareDate);
+
+                    $requestArray['comparePeriods'][$index] = 'day';
+                    $requestArray['compareDates'][$index] = $comparePeriodObj->getRangeString();
+                }
+
+                $this->requestConfig->request_parameters_to_modify['compareDates'] = $requestArray['compareDates'];
+                $this->requestConfig->request_parameters_to_modify['comparePeriods'] = $requestArray['comparePeriods'];
+            }
+        }
     }
 
     public function afterAllFiltersAreApplied()
@@ -70,7 +104,7 @@ public function afterAllFiltersAreApplied()
 
     protected function makeDataGenerator($properties)
     {
-        return JqplotDataGenerator::factory('evolution', $properties);
+        return JqplotDataGenerator::factory('evolution', $properties, $this);
     }
 
     /**
@@ -199,4 +233,19 @@ public function getDefaultXAxisStepSize($countGraphElements)
 
         return ceil($paddedCount / $steps);
     }
+
+    public function supportsComparison()
+    {
+        return true;
+    }
+
+    protected function ensureValidColumnsToDisplay()
+    {
+        parent::ensureValidColumnsToDisplay();
+
+        $columnsToDisplay = $this->config->columns_to_display;
+
+        // Use a sensible default if the columns_to_display is empty
+        $this->config->columns_to_display = $columnsToDisplay ? : array('nb_visits');
+    }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
index 3fafdd5e7..045047049 100644
--- a/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
+++ b/app/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
@@ -55,6 +55,6 @@ protected function ensureValidColumnsToDisplay()
 
     protected function makeDataGenerator($properties)
     {
-        return JqplotDataGenerator::factory('pie', $properties);
+        return JqplotDataGenerator::factory('pie', $properties, $this);
     }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/Sparkline.php b/app/plugins/CoreVisualizations/Visualizations/Sparkline.php
index a2bdb09d2..46b333fad 100644
--- a/app/plugins/CoreVisualizations/Visualizations/Sparkline.php
+++ b/app/plugins/CoreVisualizations/Visualizations/Sparkline.php
@@ -11,7 +11,9 @@
 use Exception;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\Period;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\Site;
 
 /**
  * Reads the requested DataTable from the API and prepare data for the Sparkline view.
@@ -21,6 +23,11 @@ class Sparkline extends ViewDataTable
 {
     const ID = 'sparkline';
 
+    public function supportsComparison()
+    {
+        return true;
+    }
+
     /**
      * @see ViewDataTable::main()
      * @return mixed
@@ -29,22 +36,61 @@ public function render()
     {
         // If period=range, we force the sparkline to draw daily data points
         $period = Common::getRequestVar('period');
-        if ($period == 'range') {
+        $date = Common::getRequestVar('date');
+
+        if ($period == 'range'
+            || $this->isComparing()
+        ) {
+            $periodObj = Period\Factory::build($period, $date);
             $_GET['period'] = 'day';
+            $_GET['date'] = $periodObj->getRangeString();
+        }
+
+        if ($this->isComparing()) {
+            $this->transformSingleComparisonPeriods();
         }
 
         $this->loadDataTableFromAPI();
 
         // then revert the hack for potentially subsequent getRequestVar
         $_GET['period'] = $period;
+        $_GET['date'] = $date;
 
-        $values = $this->getValuesFromDataTable($this->dataTable);
-        if (empty($values)) {
-            $values = array_fill(0, 30, 0);
-        }
+        $columnToPlot = $this->getColumnToPlot();
 
         $graph = new \Piwik\Visualization\Sparkline();
-        $graph->setValues($values);
+
+        if ($this->isComparing()) {
+            $otherSeries = [];
+
+            $comparisonSeries = $this->getComparisonSeries($this->dataTable);
+            foreach ($comparisonSeries as $seriesName) {
+                $otherSeries[$seriesName] = [];
+            }
+
+            $this->dataTable->filter(function (DataTable $table) use ($comparisonSeries, &$otherSeries, $columnToPlot) {
+                foreach ($table->getRows() as $row) {
+                    $comparisons = $row->getComparisons();
+                    if (empty($comparisons)) {
+                        continue;
+                    }
+
+                    foreach ($comparisons->getRows() as $comparisonRow) {
+                        $compareSeriesPretty = $comparisonRow->getMetadata('compareSeriesPretty');
+                        $otherSeries[$compareSeriesPretty][] = $comparisonRow->getColumn($columnToPlot);
+                    }
+                }
+            });
+
+            foreach ($otherSeries as $seriesValues) {
+                $seriesValues = $this->ensureValuesEvenIfEmpty($seriesValues);
+                $graph->addSeries($seriesValues);
+            }
+        } else {
+            $values = $this->getValuesFromDataTable($this->dataTable, $columnToPlot);
+            $values = $this->ensureValuesEvenIfEmpty($values);
+            $graph->addSeries($values);
+        }
 
         $height = Common::getRequestVar('height', 0, 'int');
         if (!empty($height)) {
@@ -100,7 +146,7 @@ protected function getValuesFromDataTableMap($dataTableMap, $columnToPlot)
         return $values;
     }
 
-    protected function getValuesFromDataTable($dataTable)
+    private function getColumnToPlot()
     {
         $columns = $this->config->columns_to_display;
 
@@ -113,6 +159,11 @@ protected function getValuesFromDataTable($dataTable)
             }
         }
 
+        return $columnToPlot;
+    }
+
+    protected function getValuesFromDataTable($dataTable, $columnToPlot)
+    {
         // a Set is returned when using the normal code path to request data from Archives, in all core plugins
         // however plugins can also return simple datatable, hence why the sparkline can accept both data types
         if ($this->dataTable instanceof DataTable\Map) {
@@ -125,4 +176,42 @@ protected function getValuesFromDataTable($dataTable)
 
         return $values;
     }
+
+    private function ensureValuesEvenIfEmpty(array $values)
+    {
+        if (empty($values)) {
+            return array_fill(0, 30, 0);
+        }
+        return $values;
+    }
+
+    private function getComparisonSeries(DataTable\DataTableInterface $dataTable)
+    {
+        if ($dataTable instanceof DataTable\Map) {
+            $tables = $dataTable->getDataTables();
+            return reset($tables)->getMetadata('comparisonSeries') ?: [];
+        } else {
+            return $dataTable->getMetadata('comparisonSeries') ?: [];
+        }
+    }
+
+    private function transformSingleComparisonPeriods()
+    {
+        $comparePeriods = Common::getRequestVar('comparePeriods', $default = [], $type = 'array');
+        $compareDates = Common::getRequestVar('compareDates', $default = [], $type = 'array');
+
+        foreach ($comparePeriods as $index => $comparePeriod) {
+            $compareDate = $compareDates[$index];
+            if (Period::isMultiplePeriod($compareDate, $comparePeriod)) {
+                continue;
+            }
+
+            $periodObj = Period\Factory::build($comparePeriod, $compareDate);
+            $comparePeriods[$index] = 'day';
+            $compareDates[$index] = $periodObj->getRangeString();
+        }
+
+        $this->requestConfig->request_parameters_to_modify['comparePeriods'] = $comparePeriods;
+        $this->requestConfig->request_parameters_to_modify['compareDates'] = $compareDates;
+    }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/Sparklines.php b/app/plugins/CoreVisualizations/Visualizations/Sparklines.php
index 2d11723be..c3d8556e0 100644
--- a/app/plugins/CoreVisualizations/Visualizations/Sparklines.php
+++ b/app/plugins/CoreVisualizations/Visualizations/Sparklines.php
@@ -8,10 +8,14 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
+use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Metrics;
+use Piwik\Period\Factory;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\API\Filter\DataComparisonFilter;
+use Piwik\SettingsPiwik;
 use Piwik\Url;
 use Piwik\View;
 
@@ -48,6 +52,11 @@ public static function getDefaultConfig()
         return new Sparklines\Config();
     }
 
+    public function supportsComparison()
+    {
+        return true;
+    }
+
     /**
      * @see ViewDataTable::main()
      * @return mixed
@@ -82,6 +91,7 @@ public function render()
         $view->titleAttributes = $this->config->title_attributes;
         $view->footerMessage = $this->config->show_footer_message;
         $view->areSparklinesLinkable = $this->config->areSparklinesLinkable();
+        $view->isComparing = $this->isComparing();
 
         $view->title = '';
         if ($this->config->show_title) {
@@ -103,13 +113,35 @@ private function fetchConfiguredSparklines()
             }
         }
 
-        $translations = $this->config->translations;
-
         $firstRow = $data->getFirstRow();
+        $comparisons = $firstRow->getComparisons();
+
+        $originalDate = Common::getRequestVar('date');
+        $originalPeriod = Common::getRequestVar('period');
+
+        if ($this->isComparing() && !empty($comparisons)) {
+            $comparisonRows = [];
+            foreach ($comparisons->getRows() as $comparisonRow) {
+                $segment = $comparisonRow->getMetadata('compareSegment');
+                if ($segment === false) {
+                    $segment = Request::getRawSegmentFromRequest() ?: '';;
+                }
 
-        foreach ($this->config->getSparklineMetrics() as $sparklineMetric) {
+                $date = $comparisonRow->getMetadata('compareDate');
+                $period = $comparisonRow->getMetadata('comparePeriod');
+
+                $comparisonRows[$segment][$period][$date] = $comparisonRow;
+            }
+        }
+
+        foreach ($this->config->getSparklineMetrics() as $sparklineMetricIndex => $sparklineMetric) {
             $column = $sparklineMetric['columns'];
             $order  = $sparklineMetric['order'];
+            $graphParams = $sparklineMetric['graphParams'];
+
+            if (!isset($order)) {
+                $order = 1000;
+            }
 
             if ($column === 'label') {
                 continue;
@@ -120,31 +152,87 @@ private function fetchConfiguredSparklines()
                 continue;
             }
 
-            if (!is_array($column)) {
-                $column = array($column);
-            }
+            $sparklineUrlParams = array(
+                'columns' => $column,
+                'module'  => $this->requestConfig->getApiModuleToRequest(),
+                'action'  => $this->requestConfig->getApiMethodToRequest()
+            );
+
+            if ($this->isComparing() && !empty($comparisons)) {
+                $periodObj = Factory::build($originalPeriod, $originalDate);
+
+                $sparklineUrlParams['compareSegments'] = [];
+
+                $comparePeriods = $data->getMetadata('comparePeriods');
+                $compareDates = $data->getMetadata('compareDates');
+
+                $compareSegments = $data->getMetadata('compareSegments');
+                foreach ($compareSegments as $segmentIndex => $segment) {
+                    $metrics = [];
+                    $seriesIndices = [];
 
-            $values = array();
-            $descriptions = array();
+                    foreach ($comparePeriods as $periodIndex => $period) {
+                        $date = $compareDates[$periodIndex];
 
-            foreach ($column as $col) {
-                $value = $firstRow->getColumn($col);
+                        $compareRow = $comparisonRows[$segment][$period][$date];
+                        $segmentPretty = $compareRow->getMetadata('compareSegmentPretty');
+                        $periodPretty = $compareRow->getMetadata('comparePeriodPretty');
 
-                if ($value === false) {
-                    $value = 0;
+                        $columnToUse = $this->removeUniqueVisitorsIfNotEnabledForPeriod($column, $period);
+                        list($compareValues, $compareDescriptions, $evolutions) = $this->getValuesAndDescriptions($compareRow, $columnToUse);
+
+                        foreach ($compareValues as $i => $value) {
+                            $metricInfo = [
+                                'value' => $value,
+                                'description' => $compareDescriptions[$i],
+                                'group' => $periodPretty,
+                            ];
+
+                            if ($periodIndex > 0
+                                && isset($evolutions[$i])
+                            ) {
+                                $metricInfo['evolution'] = $evolutions[$i];
+                            }
+
+                            $metrics[] = $metricInfo;
+                        }
+
+                        $seriesIndices[] = DataComparisonFilter::getComparisonSeriesIndex($data, $periodIndex, $segmentIndex);
+                    }
+
+                    // only set the title (which is the segment) if comparing more than one segment
+                    $title = count($compareSegments) > 1 ? $segmentPretty : null;
+
+                    $params = array_merge($sparklineUrlParams, [
+                        'segment' => $segment,
+                        'period' => $periodObj->getLabel(),
+                        'date' => $periodObj->getRangeString(),
+                    ]);
+                    $this->config->addSparkline($params, $metrics, $desc = null, null, ($order * 100) + $segmentIndex, $title, $sparklineMetricIndex, $seriesIndices, $graphParams);
                 }
+            } else {
+                list($values, $descriptions) = $this->getValuesAndDescriptions($firstRow, $column);
 
-                $values[] = $value;
-                $descriptions[] = isset($translations[$col]) ? $translations[$col] : $col;
-            }
+                $metrics = [];
+                foreach ($values as $i => $value) {
+                    $newMetric = [
+                        'value' => $value,
+                        'description' => $descriptions[$i],
+                    ];
 
-            $sparklineUrlParams = array(
-                'columns' => $column,
-                'module'  => $this->requestConfig->getApiModuleToRequest(),
-                'action'  => $this->requestConfig->getApiMethodToRequest()
-            );
+                    $metrics[] = $newMetric;
+                }
 
-            $this->config->addSparkline($sparklineUrlParams, $values, $descriptions, null, $order);
+                $evolution = null;
+
+                $computeEvolution = $this->config->compute_evolution;
+                if ($computeEvolution) {
+                    $evolution = $computeEvolution(array_combine($column, $values));
+                    $newMetric['evolution'] = $evolution;
+                }
+
+                $this->config->addSparkline($sparklineUrlParams, $metrics, $desc = null, $evolution, $order, $title = null, $group = $sparklineMetricIndex, $seriesIndices = null, $graphParams);
+            }
         }
     }
 
@@ -161,4 +249,44 @@ private function applyFilters(DataTable\DataTableInterface $table)
 
         $table->applyQueuedFilters();
     }
+
+    private function getValuesAndDescriptions(DataTable\Row $firstRow, $columns)
+    {
+        if (!is_array($columns)) {
+            $columns = array($columns);
+        }
+
+        $translations = $this->config->translations;
+
+        $values = array();
+        $descriptions = array();
+        $evolutions = [];
+
+        foreach ($columns as $col) {
+            $value = $firstRow->getColumn($col);
+
+            if ($value === false) {
+                $value = 0;
+            }
+
+            $evolution = $firstRow->getColumn($col . '_change'); // for comparison rows
+            if ($evolution !== false) {
+                $evolutions[] = ['percent' => ltrim($evolution, '+'), 'tooltip' => ''];
+            }
+
+            $values[] = $value;
+            $descriptions[] = isset($translations[$col]) ? $translations[$col] : $col;
+        }
+
+        return [$values, $descriptions, $evolutions];
+    }
+
+    private function removeUniqueVisitorsIfNotEnabledForPeriod($columns, $period)
+    {
+        if (SettingsPiwik::isUniqueVisitorsEnabled($period)) {
+            return $columns;
+        }
+
+        return array_diff($columns, ['nb_users', 'nb_uniq_visitors']);
+    }
 }
diff --git a/app/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php b/app/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
index 86944ccc5..e5fe3da1c 100644
--- a/app/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
+++ b/app/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
@@ -12,6 +12,7 @@
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\Metrics;
 use Piwik\NoAccessException;
+use Piwik\Period\Factory;
 use Piwik\Period\Range;
 use Piwik\Site;
 use Piwik\Url;
@@ -46,6 +47,15 @@ class Config extends \Piwik\ViewDataTable\Config
      */
     public $title_attributes = array();
 
+    /**
+     * If supplied, this function is used to compute the evolution percent displayed next to non-comparison sparkline views.
+     *
+     * The function is passed an array mapping column names with column values.
+     *
+     * @var callable
+     */
+    public $compute_evolution = null;
+
     public function __construct()
     {
         parent::__construct();
@@ -145,12 +155,15 @@ public function replaceSparklineMetric($metricNames, $replacementColumns)
      * @param string|array $metricName  Either one metric name (eg 'nb_visits') or an array of metric names
      * @param int|null $order  Defines the order. The lower the order the earlier the sparkline will be displayed.
      *                         By default the sparkline will be appended to the end.
+     * @param array $graphParams The params to use when changing an associated evolution graph. By default this is determined
+     *                           from the sparkline URL, but sometimes the sparkline API method may not match the evolution graph API method.
      */
-    public function addSparklineMetric($metricName, $order = null)
+    public function addSparklineMetric($metricName, $order = null, $graphParams = null)
     {
         $this->sparkline_metrics[] = array(
             'columns' => $metricName,
-            'order'   => $order
+            'order'   => $order,
+            'graphParams' => $graphParams,
         );
     }
 
@@ -167,7 +180,10 @@ public function addPlaceholder($order = null)
         $this->sparklines[] = array(
             'url' => '',
             'metrics' => array(),
-            'order' => $this->getSparklineOrder($order)
+            'order' => $this->getSparklineOrder($order),
+
+            // adding this group ensures the sparkline will be placed between individual sparklines, and not in their own group together
+            'group' => 'placeholder' . count($this->sparklines),
         );
     }
 
@@ -194,62 +210,87 @@ public function addPlaceholder($order = null)
      *                                               'tooltip' => '10 visits in 2015-07-26 compared to 20 visits in 2015-07-25')
      * @param int $order                       Defines the order. The lower the order the earlier the sparkline will be
      *                                         displayed. By default the sparkline will be appended to the end.
+     * @param string $title                    The title of this specific sparkline. It is displayed on the left above the sparkline image.
+     * @param string $group                    The ID of the group for this sparkline.
+     * @param int $seriesIndices               The indexes of each series displayed in the sparkline. This determines what color is used for each series. Mainly used for comparison.
+     * @param array $graphParams               The params to use when changing an associated evolution graph. By default this is determined
+     *                                         from the sparkline URL, but sometimes the sparkline API method may not match the evolution graph API method.
      * @throws \Exception In case an evolution parameter is set but has wrong data structure
      */
-    public function addSparkline($requestParamsForSparkline, $value, $description, $evolution = null, $order = null)
+    public function addSparkline($requestParamsForSparkline, $metricInfos, $description, $evolution = null, $order = null, $title = null, $group = '', $seriesIndices = null, $graphParams = null)
     {
         $metrics = array();
 
-        if (is_array($value)) {
-            $values = $value;
+        if ($description === null && is_array($metricInfos)) {
+            $metrics = $metricInfos;
         } else {
-            $values = array($value);
-        }
+            $value = $metricInfos;
 
-        if (!is_array($description)) {
-            $description = array($description);
+            if (is_array($value)) {
+                $values = $value;
+            } else {
+                $values = array($value);
+            }
+
+            if (!is_array($description)) {
+                $description = array($description);
+            }
+
+            if (count($values) === count($description)) {
+                foreach ($values as $index => $value) {
+                    $metrics[] = array(
+                        'value' => $value,
+                        'description' => $description[$index]
+                    );
+                }
+            } else {
+                $msg  = 'The number of values and descriptions need to be the same to add a sparkline. ';
+                $msg .= 'Values: ' . implode(', ', $values). ' Descriptions: ' . implode(', ', $description);
+                throw new \Exception($msg);
+            }
         }
 
         if (!empty($requestParamsForSparkline['columns'])
             && is_array($requestParamsForSparkline['columns'])
-            && count($requestParamsForSparkline['columns']) === count($values)) {
+            && count($requestParamsForSparkline['columns']) === count($metrics)) {
             $columns = array_values($requestParamsForSparkline['columns']);
         } elseif (!empty($requestParamsForSparkline['columns'])
                   && is_string($requestParamsForSparkline['columns'])
-                  && count($values) === 1) {
+                  && count($metrics) === 1) {
             $columns = array($requestParamsForSparkline['columns']);
         } else{
             $columns = array();
         }
 
-        if (count($values) === count($description)) {
-            foreach ($values as $index => $value) {
-                $metrics[] = array(
-                    'column' => isset($columns[$index]) ? $columns[$index] : '',
-                    'value' => $value,
-                    'description' => $description[$index]
-                );
-            }
-        } else {
-            $msg  = 'The number of values and descriptions need to be the same to add a sparkline. ';
-            $msg .= 'Values: ' . implode(', ', $values). ' Descriptions: ' . implode(', ', $description);
-            throw new \Exception($msg);
+        foreach ($metrics as $index => $metricInfo) {
+            $metrics[$index]['column'] = isset($columns[$index]) ? $columns[$index] : '';
         }
 
         if (empty($metrics)) {
             return;
         }
 
+        $groupedMetrics = [];
+        foreach ($metrics as $metricInfo) {
+            $metricGroup = isset($metricInfo['group']) ? $metricInfo['group'] : '';
+            $groupedMetrics[$metricGroup][] = $metricInfo;
+        }
+
         $sparkline = array(
             'url' => $this->getUrlSparkline($requestParamsForSparkline),
-            'metrics' => $metrics,
-            'order' => $this->getSparklineOrder($order)
+            'metrics' => $groupedMetrics,
+            'order' => $this->getSparklineOrder($order),
+            'title' => $title,
+            'group' => $group,
+            'seriesIndices' => $seriesIndices,
+            'graphParams' => $graphParams,
         );
 
         if (!empty($evolution)) {
             if (!is_array($evolution) ||
                 !array_key_exists('currentValue', $evolution) ||
-                !array_key_exists('pastValue', $evolution)) {
+                !array_key_exists('pastValue', $evolution)
+            ) {
                 throw new \Exception('In order to show an evolution in the sparklines view a currentValue and pastValue array key needs to be present');
             }
 
@@ -300,7 +341,12 @@ public function getSortedSparklines()
             return ($a['order'] < $b['order']) ? -1 : 1;
         });
 
-        return $this->sparklines;
+        $sparklines = [];
+        foreach ($this->sparklines as $sparkline) {
+            $group = $sparkline['group'];
+            $sparklines[$group][] = $sparkline;
+        }
+        return $sparklines;
     }
 
     private function getSparklineOrder($order)
@@ -390,7 +436,13 @@ private function getGraphParamsModified($paramsToSet = array())
             throw new NoAccessException("Website not initialized, check that you are logged in and/or using the correct token_auth.");
         }
 
-        $paramDate = Range::getRelativeToEndDate($period, $range, $endDate, $site);
+        if (!isset($paramsToSet['date'])
+            || !Range::isMultiplePeriod($paramsToSet['date'], $period)
+        ) {
+            $paramDate = Range::getRelativeToEndDate($period, $range, $endDate, $site);
+        } else {
+            $paramDate = $paramsToSet['date'];
+        }
 
         $params = array_merge($paramsToSet, array('date' => $paramDate));
         return $params;
diff --git a/app/plugins/CoreVisualizations/Widgets/SingleMetricView.php b/app/plugins/CoreVisualizations/Widgets/SingleMetricView.php
index fa5bc910b..4d866f10e 100644
--- a/app/plugins/CoreVisualizations/Widgets/SingleMetricView.php
+++ b/app/plugins/CoreVisualizations/Widgets/SingleMetricView.php
@@ -25,8 +25,8 @@ public static function configure(WidgetConfig $config)
         $column = Common::getRequestVar('column', '', 'string');
 
         $config->addParameters(['column' => $column]);
-        $config->setCategoryId('General_Generic');
-        $config->setName('General_Metric');
+        $config->setCategoryId('General_KpiMetric');
+        $config->setName('General_KpiMetric');
         $config->setIsWidgetizable();
     }
 
diff --git a/app/plugins/CoreVisualizations/config/config.php b/app/plugins/CoreVisualizations/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/CoreVisualizations/config/config.php
+++ b/app/plugins/CoreVisualizations/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreVisualizations/config/tracker.php b/app/plugins/CoreVisualizations/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CoreVisualizations/config/tracker.php
+++ b/app/plugins/CoreVisualizations/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CoreVisualizations/stylesheets/dataTableVisualizations.less b/app/plugins/CoreVisualizations/stylesheets/dataTableVisualizations.less
index ff2118b95..15edf722c 100644
--- a/app/plugins/CoreVisualizations/stylesheets/dataTableVisualizations.less
+++ b/app/plugins/CoreVisualizations/stylesheets/dataTableVisualizations.less
@@ -23,4 +23,18 @@
 }
 .widget .dataTableVizBar .jqplot-graph {
     padding: 0 10px 10px 10px;
+}
+
+.tooltip-series-color {
+    display: inline-block;
+    width: 11px;
+    height: 11px;
+    border-radius: 6px;
+    margin-right: 3px;
+    position: relative;
+    top: 1px;
+}
+
+.ui-tooltip h3.evolution-tooltip-header {
+    margin-top: 4px;
 }
\ No newline at end of file
diff --git a/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index c4b4659e0..a9ac3f4da 100644
--- a/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -6,6 +6,7 @@
     {{ error.message }}
 {% else %}
     {%- if not showingEmbeddedSubtable -%}
+    <div class="dataTableScroller">
     <table cellspacing="0" class="dataTable">
         {% include "@CoreHome/_dataTableHead.twig" %}
 
@@ -18,11 +19,13 @@
                 </tr>
             {% endif %}
         {% else %}
+            {% set rowIndex = properties.filter_offset|default(0) + 1 %}
             {%- for rowId, row in dataTable.getRows() -%}
                 {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%}
                 {%- set rowSubtableId = row.getMetadata('idsubdatatable_in_db')|default(row.getIdSubDataTable()) -%}
                 {%- set isSummaryRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') or row.getMetadata('is_summary') -%}
                 {%- set shouldHighlightRow = isSummaryRow and properties.highlight_summary_row -%}
+                {% set dimensions = dataTable.getMetadata('dimensions')|default([]) %}
 
                 {# display this row if it doesn't have a subtable or if we don't replace the row with the subtable #}
                 {%- set showRow = subtablesAreDisabled
@@ -35,21 +38,38 @@
                     {% if row.getMetadata('segment') is not false %} data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %}
                     {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %}
                     data-row-metadata="{{ row.getMetadata|json_encode|e('html_attr') }}"
-                    class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}"
+                    class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %} {% if isComparing %}parentComparisonRow{% endif %}"
                     {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}>
                     {% for column in properties.columns_to_display %}
                         {% set cellAttributes = visualization.getCellHtmlAttributes(row, column) %}
-                        <td {% if cellAttributes is not empty %}{% for name, value in cellAttributes %}{{ name|e('html') }}="{{ value|e('html_attr') }}" {% endfor %}{% endif %}>
+                        <td class="{% if column =='label' or column in dimensions %}label{% else %}column{% endif %} {{ cellAttributes.class|default|e('html_attr') }}"
+                            {% if cellAttributes is not empty %}{% for name, value in cellAttributes %}{{ name|e('html') }}="{{ value|e('html_attr') }}" {% endfor %}{% endif %}
+                        >
+                            {% if isComparing and column == 'label' %}
+                                <span class="prefix-numeral">{{ rowIndex }}.</span>
+                            {% endif %}
+
                             {% include "@CoreHome/_dataTableCell.twig" with properties %}
                         </td>
                     {% endfor %}
                 </tr>
+
+                {% if row.getComparisons() %}
+                {% include "@CoreVisualizations/_dataTableViz_htmlTable_comparisons.twig" with {
+                    'comparedRow': row,
+                    'dataTable': row.getComparisons(),
+                    'rootDataTable': dataTable,
+                    'dimensions': dimensions,
+                } %}
+                {% endif %}
                 {% endif %}
 
                 {# display subtable if present and showing expanded datatable #}
                 {% if properties.show_expanded|default(false) and rowHasSubtable %}
                     {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': rowSubtableId} %}
                 {% endif %}
+
+                {% set rowIndex = rowIndex + 1 %}
             {%- endfor -%}
             {% if dataTable.getTotalsRow and properties.show_totals_row %}
                 {% set row = dataTable.getTotalsRow %}
@@ -57,7 +77,7 @@
                 <tr class="{{ row.getMetadata('css_class') }} totalsRow"
                         title="Total values for this table">
                     {% for column in properties.columns_to_display %}
-                        <td>
+                        <td class="{% if column =='label' %}label{% else %}column{% endif %}">
                             {% include "@CoreHome/_dataTableCell.twig" with properties %}
                         </td>
                     {% endfor %}
@@ -67,5 +87,6 @@
     {%- if not showingEmbeddedSubtable -%}
         </tbody>
     </table>
+    </div>
     {%- endif -%}
 {% endif %}
\ No newline at end of file
diff --git a/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig
new file mode 100644
index 000000000..2a5852b21
--- /dev/null
+++ b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig
@@ -0,0 +1,83 @@
+{% if properties.columns_to_display is not empty %}
+{% set lastSeenComparePeriod = false %}
+{% set comparedPeriodPretty = dataTable.getFirstRow().getMetadata('comparePeriodPretty') %}
+{% set isComparingSegments = rootDataTable.getMetadata('compareSegments')|default([])|length > 1 %}
+{% set isComparingPeriods = rootDataTable.getMetadata('comparePeriods')|default([])|length > 1 %}
+{%- for rowId, row in dataTable.getRows() -%}
+    {% set comparePeriod = row.getMetadata('comparePeriodPretty') %}
+    {% if lastSeenComparePeriod != comparePeriod and isComparingSegments and isComparingPeriods %}
+    <tr class="comparePeriod">
+        <td class="label">
+            {{ comparePeriod }}
+        </td>
+
+        {# add extra empty columns for sticky column scrolling to work #}
+        {% for column in properties.columns_to_display %}
+        {% if column != 'label' %}
+        <td class="column">&nbsp;</td>
+        {% endif %}
+        {% endfor %}
+    </tr>
+    {% endif %}
+    {% set overrideParams = {} %}
+
+    {% if row.getMetadata('compareSegment')|default is not empty %}{% set overrideParams = overrideParams|merge({ segment: row.getMetadata('compareSegment'), compareSegments: '' }) %}{% endif %}
+    {% if row.getMetadata('comparePeriod')|default is not empty %}{% set overrideParams = overrideParams|merge({ period: row.getMetadata('comparePeriod'), comparePeriods: '' }) %}{% endif %}
+    {% if row.getMetadata('compareDate')|default is not empty %}{% set overrideParams = overrideParams|merge({ date: row.getMetadata('compareDate'), compareDates: '' }) %}{% endif %}
+    {% set idSubtable = row.getMetadata('idsubdatatable') %}
+    {% set seriesIndex = loop.index0 %}
+    <tr
+        {% if idSubtable != false %}data-idsubtable="{{ idSubtable|e('html_attr') }}"{% endif %}
+        data-comparison-series="{{ seriesIndex }}"
+        class="comparisonRow"
+        data-param-override="{{ overrideParams|json_encode|e('html_attr') }}" data-label="{{ comparedRow.getColumn('label')|e('html_attr') }}"
+        {% if row.getMetadata('segment') is not false %}data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %}
+    >
+        <td class="label">
+            {% if isComparingSegments %}
+                {%- set comparisonLabel = row.getMetadata('compareSegmentPretty') -%}
+            {% else %}
+                {%- set comparisonLabel = comparePeriod -%}
+            {% endif %}
+            <span class="label">{{ comparisonLabel }}</span>
+        </td>
+        {% for dimension in dimensions %}
+        {% if loop.index0 != 0 and dimension in properties.columns_to_display %}
+        <td class="label">
+            &nbsp;
+        </td>
+        {% endif %}
+        {% endfor %}
+        {% for column in properties.columns_to_display %}
+        {% if column != 'label' and column not in dimensions %}
+        {% set columnValue = row.getColumn(column) %}
+        <td class="column">
+            {% set rowComparisonTotals = comparisonTotals[seriesIndex].totals|default(null) %}
+
+            {% set comparisonTooltipSuffix = '' %}
+            {% set columnChange = false %}
+            {% if row.getColumn(column ~ '_change')|default is not empty %}
+                {% set columnChange = row.getColumn(column ~ '_change')|default('+0%') %}
+                {% set comparisonTooltipSuffix = 'General_ComparisonRatioTooltip'|translate(columnChange, row.getMetadata('compareSegmentPretty'), comparedPeriodPretty) %}
+            {% endif %}
+
+            {% include "@CoreVisualizations/_dataTableViz_htmlTable_ratio.twig" with {
+                'changePercentage': columnChange,
+                'totals': rowComparisonTotals,
+                'label': comparedRow.getColumn('label'),
+                'labelColumn': properties.columns_to_display|first,
+                'changePercantage': columnChange,
+                'forceZero': true,
+                'tooltipSuffix': comparisonTooltipSuffix,
+                'translations': properties.translations,
+                'segmentTitlePretty': row.getMetadata('compareSegmentPretty'),
+                'periodTitlePretty': row.getMetadata('comparePeriodPretty')
+            } %}
+            <span class="value">{{ columnValue|default(0)|number(2,0)|rawSafeDecoded }}</span>
+        </td>
+        {% endif %}
+        {% endfor %}
+    </tr>
+    {% set lastSeenComparePeriod = comparePeriod %}
+{%- endfor -%}
+{% endif %}
\ No newline at end of file
diff --git a/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig
new file mode 100644
index 000000000..8d14bb126
--- /dev/null
+++ b/app/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig
@@ -0,0 +1,26 @@
+{% if column in properties.report_ratio_columns and (column in totals|keys or forceZero|default) -%}
+    {% set reportTotal   = totals[column]|default(0) %}
+    {% if siteTotalRow|default is not empty %}
+        {% set siteTotal = siteTotalRow.getColumn(column) %}
+    {% elseif siteSummary is defined and siteSummary is not empty and siteSummary.getFirstRow %}
+        {% set siteTotal = siteSummary.getFirstRow.getColumn(column) %}
+    {% else %}
+        {% set siteTotal = 0 %}
+    {% endif %}
+
+    {% set rowPercentage = row.getColumn(column)|percentage(reportTotal, 1) %}
+    {% set metricTitle   = translations[column]|default(column) %}
+
+    {% set reportRatioTooltip = 'General_ReportRatioTooltip'|translate(label, rowPercentage|e('html_attr'), reportTotal|e('html_attr'), metricTitle|e('html_attr'), '"' ~ segmentTitlePretty ~ '"', translations[labelColumn]|default(labelColumn)|e('html_attr')) %}
+
+    {% if siteTotal and siteTotal > reportTotal %}
+        {% set totalPercentage   = row.getColumn(column)|percentage(siteTotal, 1) %}
+        {% set totalRatioTooltip = 'General_TotalRatioTooltip'|translate(totalPercentage, siteTotal|number(2,0), metricTitle, periodTitlePretty) %}
+    {% else %}
+        {% set totalRatioTooltip = '' %}
+    {% endif %}
+
+    <span class="ratio"
+          title="{{ reportRatioTooltip|rawSafeDecoded|raw }} {{ totalRatioTooltip|rawSafeDecoded|e('html_attr') }}{% if tooltipSuffix|default is not empty %}<br/><br/> {{ tooltipSuffix|rawSafeDecoded|e('html_attr') }}{% endif %}"
+    >&nbsp;{{ rowPercentage }} {% if changePercantage|default is not empty %}({{ changePercentage }}){% endif %}</span>
+{%- endif %}
diff --git a/app/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig b/app/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig
index 5c8390d91..e1932c523 100644
--- a/app/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig
+++ b/app/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig
@@ -10,12 +10,23 @@
     <div class="row">
         <div class="col m6">
     {% endif %}
-
-            {% for key, sparkline in sparklines %}
-                {% if key is even %}
+            {% if sparklines|length == 1 %}
+            {% for key, sparkline in sparklines|first %}
+                {% if loop.index0 is even %}
                     {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }}
                 {% endif %}
             {% endfor %}
+            {% else %}
+                {% for group in sparklines %}
+                    {% if loop.index0 is even %}
+                        <div>
+                            {% for key, sparkline in group %}
+                                {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }}
+                            {% endfor %}
+                        </div>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
 
     {% if not isWidget %}
             <br style="clear:left"/>
@@ -23,11 +34,23 @@
         <div class="col m6">
     {% endif %}
 
+            {% if sparklines|length == 1 %}
             {% for key, sparkline in sparklines %}
-                {% if key is odd %}
+                {% if loop.index0 is odd %}
                     {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }}
                 {% endif %}
             {% endfor %}
+            {% else %}
+                {% for group in sparklines %}
+                    {% if loop.index0 is odd %}
+                        <div>
+                            {% for key, sparkline in group %}
+                                {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }}
+                            {% endfor %}
+                        </div>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
 
             <br style="clear:left"/>
 
diff --git a/app/plugins/CoreVisualizations/templates/macros.twig b/app/plugins/CoreVisualizations/templates/macros.twig
index 7562b88f7..bc754f2c1 100644
--- a/app/plugins/CoreVisualizations/templates/macros.twig
+++ b/app/plugins/CoreVisualizations/templates/macros.twig
@@ -1,36 +1,52 @@
+
+{% macro sparklineEvolution(evolution) %}
+    {% set evolutionPretty = evolution.percent %}
+
+    {% if evolution.percent < 0 %}
+        {% set evolutionClass = 'negative-evolution' %}
+        {% set evolutionIcon  = 'arrow_down.png' %}
+    {% elseif evolution.percent == 0 %}
+        {% set evolutionClass = 'neutral-evolution' %}
+        {% set evolutionIcon  = 'stop.png' %}
+    {% else %}
+        {% set evolutionClass  = 'positive-evolution' %}
+        {% set evolutionIcon   = 'arrow_up.png' %}
+        {% set evolutionPretty = '+' ~ evolution.percent %}
+    {% endif %}
+
+    <span class="metricEvolution" title="{{ evolution.tooltip|rawSafeDecoded|e('html_attr') }}">
+    <img style="padding-right:4px" src="plugins/MultiSites/images/{{ evolutionIcon }}"/>
+    <strong class="{{ evolutionClass }}">{{ evolutionPretty }}</strong></span>
+{% endmacro %}
+
 {% macro singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) %}
 
-    <div class="sparkline {% if areSparklinesLinkable is defined and not areSparklinesLinkable %}notLinkable{% endif %}">
-        {% if sparkline.url %}{{ sparkline(sparkline.url)|raw }}{% endif %}
+    <div class="sparkline {% if areSparklinesLinkable is defined and not areSparklinesLinkable %}notLinkable{% endif %}"
+         {% if sparkline.seriesIndices|default is not empty %}data-series-indices="{{ sparkline.seriesIndices|json_encode|e('html_attr') }}"{% endif %}
+         {% if sparkline.graphParams|default is not empty %}data-graph-params="{{ sparkline.graphParams|json_encode|e('html_attr') }}"{% endif %}
+    >
+        <div>
+            {% if sparkline.title|default is not empty %}<h6 class="sparkline-title" title="{{ sparkline.title|rawSafeDecoded|e('html_attr') }}">{{ sparkline.title }}</h6>{% endif %}
+            {% if sparkline.url %}{{ sparkline(sparkline.url)|raw }}{% endif %}
+        </div>
 	<div>
-        {% for metric in sparkline.metrics %}
-            <span {% if allMetricsDocumentation[metric.column] is defined and allMetricsDocumentation[metric.column] %}title="{{ allMetricsDocumentation[metric.column] }}"{% endif %}>
-            {% if '%s' in metric.description -%}
-                {{ metric.description|translate("<strong>"~metric.value~"</strong>")|raw }}
-            {%- else %}
-                <strong>{{ metric.value }}</strong> {{ metric.description }}
-            {%- endif %}{% if not loop.last %}, {% endif %}
-            </span>
+        {% for groupName, group in sparkline.metrics %}
+            {% if groupName is not empty %}<span class="metric-group-title">{{ groupName }}</span>{% endif %}
+            {% for metric in group %}
+                <span class="sparkline-metrics" {% if allMetricsDocumentation[metric.column] is defined and allMetricsDocumentation[metric.column] %}title="{{ allMetricsDocumentation[metric.column] }}"{% endif %}>
+                {% if '%s' in metric.description -%}
+                    {{ metric.description|translate("<strong>"~metric.value~"</strong>")|raw }}
+                {%- else %}
+                    <strong>{{ metric.value }}</strong> {{ metric.description }}
+                {%- endif %}{% if not loop.last %}, {% endif %}
+                </span>
+                {% if metric.evolution is defined %}
+                    {{ _self.sparklineEvolution(metric.evolution) }}
+                {% endif %}
+            {% endfor %}
         {% endfor %}
         {% if sparkline.evolution is defined %}
-
-            {% set evolutionPretty = sparkline.evolution.percent %}
-
-            {% if sparkline.evolution.percent < 0 %}
-                {% set evolutionClass = 'negative-evolution' %}
-                {% set evolutionIcon  = 'arrow_down.png' %}
-            {% elseif sparkline.evolution.percent == 0 %}
-                {% set evolutionClass = 'neutral-evolution' %}
-                {% set evolutionIcon  = 'stop.png' %}
-            {% else %}
-                {% set evolutionClass  = 'positive-evolution' %}
-                {% set evolutionIcon   = 'arrow_up.png' %}
-                {% set evolutionPretty = '+' ~ sparkline.evolution.percent %}
-            {% endif %}
-
-            <span class="metricEvolution" title="{{ sparkline.evolution.tooltip }}"><img
-                        style="padding-right:4px" src="plugins/MultiSites/images/{{ evolutionIcon }}"/>
-                <strong class="{{ evolutionClass }}">{{ evolutionPretty }}</strong></span>
+            {{ _self.sparklineEvolution(sparkline.evolution) }}
         {% endif %}
 	</div>
     </div>
diff --git a/app/plugins/CustomPiwikJs/CustomPiwikJs.php b/app/plugins/CustomPiwikJs/CustomPiwikJs.php
index b4028c812..1dcb0c4c6 100644
--- a/app/plugins/CustomPiwikJs/CustomPiwikJs.php
+++ b/app/plugins/CustomPiwikJs/CustomPiwikJs.php
@@ -18,7 +18,6 @@ public function getListHooksRegistered()
     {
         return array(
             'CoreUpdater.update.end' => 'updateTracker',
-            'CronArchive.end' => 'updateTracker',
             'PluginManager.pluginActivated' => 'updateTracker',
             'PluginManager.pluginDeactivated' => 'updateTracker',
             'PluginManager.pluginInstalled' => 'updateTracker',
diff --git a/app/plugins/CustomPiwikJs/config/tracker.php b/app/plugins/CustomPiwikJs/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CustomPiwikJs/config/tracker.php
+++ b/app/plugins/CustomPiwikJs/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CustomPiwikJs/lang/cs.json b/app/plugins/CustomPiwikJs/lang/cs.json
index 1aa72457b..0d8fde41a 100644
--- a/app/plugins/CustomPiwikJs/lang/cs.json
+++ b/app/plugins/CustomPiwikJs/lang/cs.json
@@ -1,7 +1,5 @@
 {
     "CustomPiwikJs": {
-        "PluginDescription": "Umožňuje libovolnému zásuvnému modulu rozšířit javascriptový sledovací soubor (piwik.js) o nové funkce a měření webových stránek.",
-        "DiagnosticPiwikJsWritable": "Zapisovatelný JavaScript záznam (\"\/piwik.js\")",
-        "DiagnosticPiwikJsMakeWritable": "Doporučujeme povolit zápis do piwik.js například pomocí příkazu: %s"
+        "DiagnosticPiwikJsWritable": "Zapisovatelný JavaScript záznam (%s)"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomPiwikJs/lang/es-ar.json b/app/plugins/CustomPiwikJs/lang/es-ar.json
new file mode 100644
index 000000000..d2dbe88b3
--- /dev/null
+++ b/app/plugins/CustomPiwikJs/lang/es-ar.json
@@ -0,0 +1,8 @@
+{
+    "CustomPiwikJs": {
+        "PluginDescription": "Permite a cualquier plugin extender el archivo de rastreo vía JavaScript de Matomo (\"matomo.js\"), y agrega nuevas capacidades de medición de funcionalidad y sitios web.",
+        "DiagnosticPiwikJsWritable": "Rastreador escribible de JavaScript (%s)",
+        "DiagnosticPiwikJsNotWritable": "El archivo rastreador vía JavaScript de Matomo %s no es escribible, lo cual significa que otros plugins no pueden extender el rastreador de JavaScript. En el futuro es posible que incluso funciones centrales no funcionen como lo esperado.",
+        "DiagnosticPiwikJsMakeWritable": "Recomendamos hacer que %1$s sea escribible mediante este comando: %2$s"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/CustomPiwikJs/lang/pt-br.json b/app/plugins/CustomPiwikJs/lang/pt-br.json
index 5cd0b7ea4..6da26dbee 100644
--- a/app/plugins/CustomPiwikJs/lang/pt-br.json
+++ b/app/plugins/CustomPiwikJs/lang/pt-br.json
@@ -1,8 +1,8 @@
 {
     "CustomPiwikJs": {
-        "PluginDescription": "Permitir que qualquer plugin estenda o arquivo de Rastreador Matomo JavaScript (matomo.js) e adicionar novas funcionalidades e recursos de medição de site.",
-        "DiagnosticPiwikJsWritable": "Rastreador de Javascript gravável (%s)",
-        "DiagnosticPiwikJsNotWritable": "O arquivo rastreador %s Matomo JavaScript não é gravável, que significa que outros plugins não podem estender o rastreador JavaScript. No futuro até mesmo alguns recursos principais podem não funcionar como esperado.",
-        "DiagnosticPiwikJsMakeWritable": "Recomendamos tornar gravável %1$s o comando executando: %2$s"
+        "PluginDescription": "Permite que qualquer plugin estenda o arquivo JavaScript de Rastreamento do Matomo (matomo.js) e adicione novas funcionalidades e recursos de medição de site.",
+        "DiagnosticPiwikJsWritable": "Rastreador Javascript gravável (%s)",
+        "DiagnosticPiwikJsNotWritable": "O arquivo JavaScript rastreador do Matomo %s não é gravável, o que significa que outros plugins não podem estender o rastreador JavaScript. No futuro até mesmo alguns recursos principais podem não funcionar como esperado.",
+        "DiagnosticPiwikJsMakeWritable": "Recomendamos tornar %1$s gravável executando este comando: %2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomPiwikJs/lang/pt.json b/app/plugins/CustomPiwikJs/lang/pt.json
index 990dd8bdb..a44a37418 100644
--- a/app/plugins/CustomPiwikJs/lang/pt.json
+++ b/app/plugins/CustomPiwikJs/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "CustomPiwikJs": {
+        "PluginDescription": "Permite que qualquer extensão complemente o ficheiro de acompanhamento de JavaScript do Matomo (matomo.js) e adicione novas funcionalidades e capacidades de medição de sites.",
         "DiagnosticPiwikJsWritable": "Permissões de escrita no JavaScript de acompanhamento (%s)",
         "DiagnosticPiwikJsNotWritable": "O ficheiro JavaScript de acompanhamento do Matomo %snão tem permissões de escrita, o que significa que outras extensões não conseguem complementar o tracker JavaScript. É possível que no futuro certas funcionalidades centrais não funcionem como o esperado.",
         "DiagnosticPiwikJsMakeWritable": "Recomendamos que dê permissões de escrita a %1$s, executando o seguinte comando %2$s"
diff --git a/app/plugins/CustomPiwikJs/lang/sv.json b/app/plugins/CustomPiwikJs/lang/sv.json
index 086690d65..42b11d736 100644
--- a/app/plugins/CustomPiwikJs/lang/sv.json
+++ b/app/plugins/CustomPiwikJs/lang/sv.json
@@ -1,8 +1,8 @@
 {
     "CustomPiwikJs": {
-        "PluginDescription": "Låter alla plugins utöka Matomos trackfil (piwik.js) med ny funktionalitet och webbplatsmätningsmöjligheter.",
-        "DiagnosticPiwikJsWritable": "Skrivbar javskript-tracker (\"\/piwik.js\")",
-        "DiagnosticPiwikJsNotWritable": "Matomos JavaScriptsbaserade spårningsfil \"\/piwik.js\" har inte skrivrättighet vilket innebär att andra plugins inte kan utöka den. Det är möjligt att framtida funktionalitet i Matomo inte fungerar som förväntat.",
-        "DiagnosticPiwikJsMakeWritable": "Vi rekommenderar att göra piwik.js skrivbar genom att köra detta kommando: %s"
+        "PluginDescription": "Gör att insticksprogram kan bygga vidare på Matomos JavaScript-spårare (matomo.js) för att lägga till nya funktioner och möjligheter för att mäta webbplatser.",
+        "DiagnosticPiwikJsWritable": "Skrivbar JavaScript-spårare (%s)",
+        "DiagnosticPiwikJsNotWritable": "JavaScript-filen innehållande Matomos spårare (%s) är skrivskyddad, vilket innebär att insticksprogram inte kan utöka JavaScript-spåraren. I framtiden kan även vissa andra grundfunktioner upphöra fungera som väntat.",
+        "DiagnosticPiwikJsMakeWritable": "Vi rekommenderar att ta bort skrivskyddet från filen %1$s genom att använda följande kommando: %2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomPiwikJs/lang/zh-cn.json b/app/plugins/CustomPiwikJs/lang/zh-cn.json
index ce7bde90e..cd3f4e91d 100644
--- a/app/plugins/CustomPiwikJs/lang/zh-cn.json
+++ b/app/plugins/CustomPiwikJs/lang/zh-cn.json
@@ -1,7 +1,8 @@
 {
     "CustomPiwikJs": {
-        "PluginDescription": "允许任意插件扩展 Matomo Javascript 追踪文件（piwik.js）并添加新的功能及网站测度能力。",
-        "DiagnosticPiwikJsWritable": "可写的 Javascript 追踪器（“\/piwik.js”）",
-        "DiagnosticPiwikJsMakeWritable": "我们建议通过运行这条命令来使 Piwki.js 文件可写：%s"
+        "PluginDescription": "允许任何插件扩展Matomo JavaScript追踪文件（matomo.js）并添加新功能和网站评估功能。",
+        "DiagnosticPiwikJsWritable": "可写的JavaScript追踪器（%s）",
+        "DiagnosticPiwikJsNotWritable": "Matomo JavaScript追踪器文件%s不可写，这意味着其他插件无法扩展JavaScript追踪器。 将来，甚至某些核心功能可能也无法按预期运行。",
+        "DiagnosticPiwikJsMakeWritable": "我们建议通过运行以下命令使%1$s可写：%2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomVariables/CustomVariables.php b/app/plugins/CustomVariables/CustomVariables.php
index ab213ee64..5d35438d3 100644
--- a/app/plugins/CustomVariables/CustomVariables.php
+++ b/app/plugins/CustomVariables/CustomVariables.php
@@ -82,6 +82,7 @@ public static function getNumUsableCustomVariables()
         if (isset($cache[$cacheKey])) {
             return $cache[$cacheKey];
         }
+
         return 0;
     }
 
diff --git a/app/plugins/CustomVariables/config/tracker.php b/app/plugins/CustomVariables/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/CustomVariables/config/tracker.php
+++ b/app/plugins/CustomVariables/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/CustomVariables/lang/es-ar.json b/app/plugins/CustomVariables/lang/es-ar.json
index 033eb7a86..9f77cf458 100644
--- a/app/plugins/CustomVariables/lang/es-ar.json
+++ b/app/plugins/CustomVariables/lang/es-ar.json
@@ -1,10 +1,25 @@
 {
     "CustomVariables": {
-        "ColumnCustomVariableName": "Nombre de la Variable Personalizada",
-        "ColumnCustomVariableValue": "Valor de la Variable Personalizada",
-        "CustomVariables": "Variables Personalizadas",
-        "CustomVariablesReportDocumentation": "Este reporte 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 matomo.org%3$s",
+        "ColumnCustomVariableName": "Nombre de la variable personalizada",
+        "ColumnCustomVariableValue": "Valor de la variable personalizada",
+        "CustomVariables": "Variables personalizadas",
+        "CustomVariablesReportDocumentation": "Este informe contiene información sobre tus variables personalizadas. Hacé 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, leé la %2$sDocumentación de variables personalizadas en matomo.org%3$s.",
+        "PluginDescription": "Las variables personalizadas (nombre, valor) son pares que podés asignar usando la API de JavaScript a los visitantes o a cualquiera de sus acciones. Matomo informará la cantidad de visitas, páginas y conversiones para cada una de esos nombre y valores personalizados. Mirá las variables personalizadas en detalle para cada usuario y acción en el registro de visitas. ¡Se requiere este plugin para usar la función de análisis de comercio electrónico!",
         "ScopePage": "ámbito de la página",
-        "ScopeVisit": "ámbito de la visita"
+        "ScopeVisit": "ámbito de la visita",
+        "ScopeConversion": "ámbito de la conversión",
+        "ManageDescription": "La vista general muestra todas las ranuras de variables personalizadas y sus usos para el sitio web \"%s\". Los nombres dentro de cada ranura están ordenados por su uso frecuente.",
+        "ScopeX": "Ámbito %s",
+        "Index": "Índice",
+        "Usages": "Usos",
+        "Unused": "Sin usar",
+        "CreateNewSlot": "Aumentar el número de ranuras de variables personalizadas",
+        "UsageDetails": "%1$s visitas y %2$s acciones desde la creación de este sitio web.",
+        "CreatingCustomVariableTakesTime": "Crear una nueva ranura de variable personalizada puede llevar mucho tiempo dependiendo del tamaño de tu base de datos. Por lo tanto, esto es posible de hacer sólo a través de un comando que necesita ejecutarse en una línea de comandos.",
+        "CurrentAvailableCustomVariables": "Actualmente, podés establecer hasta %s variables personalizadas por sitio web.",
+        "ToCreateCustomVarExecute": "Para crear una nueva ranura de variable personalizada, ejecutá el siguiente comando dentro de tu instalación de Matomo:",
+        "SlotsReportIsGeneratedOverTime": "Los datos para este informe será popularizados en el tiempo. Puede tomar un día o dos para ver cualquier dato, y algunas semanas hasta que el informe sea completamente preciso.",
+        "MetricsAreOnlyAvailableForVisitScope": "Nota: las mediciones de %1$s sólo están disponibles para variables personalizadas del ámbito de %2$s.",
+        "MetricsNotAvailableForPageScope": "Para variables personalizadas del ámbito de %1$s, el valor de columna de estas mediciones es %2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomVariables/lang/ja.json b/app/plugins/CustomVariables/lang/ja.json
index e528e2c01..30cc32e76 100644
--- a/app/plugins/CustomVariables/lang/ja.json
+++ b/app/plugins/CustomVariables/lang/ja.json
@@ -3,8 +3,23 @@
         "ColumnCustomVariableName": "カスタム変数名",
         "ColumnCustomVariableValue": "カスタム変数値",
         "CustomVariables": "カスタム変数",
-        "CustomVariablesReportDocumentation": "このレポートには、カスタム変数に関する情報が含まれています。値の分布を表示するには、変数名をクリックして下さい。%s 一般的なカスタム変数の詳細については、%sCustom Variables documentation on piwik.org%s をお読み下さい。",
-        "ScopePage": "スコープはページ",
-        "ScopeVisit": "スコープはビジット"
+        "CustomVariablesReportDocumentation": "このレポートには、カスタム変数に関する情報が含まれています。値の分布を表示するには、変数名をクリックして下さい。%1$s 一般的なカスタム変数の詳細については、%2$sCustom Variables documentation on matomo.org%3$s をお読み下さい。",
+        "PluginDescription": "カスタム変数は、Javascript API を使用してビジターまたはそのアクションに割り当てることができる（名前、値）のペアです。 Matomo はこれらのカスタム名と値のそれぞれについて、ビジット数、ページ数、コンバージョン数をレポートします。 ビジターログの各ユーザーとアクションの詳細なカスタム変数を表示します。 このプラグインは、Eコマース分析機能を使用するために必要です。",
+        "ScopePage": "ページの範囲",
+        "ScopeVisit": "ビジットの範囲",
+        "ScopeConversion": "スコープコンバージョン",
+        "ManageDescription": "この概観では、すべてのカスタム変数スロットと、ウェブサイト '%s' の用途を示します。 各スロット内の名前は、合計で使用された頻度によって並べられます。",
+        "ScopeX": "範囲 %s",
+        "Index": "インデックス",
+        "Usages": "使用",
+        "Unused": "未使用",
+        "CreateNewSlot": "利用可能なカスタム変数スロットの数を増やす",
+        "UsageDetails": "このサイト作成以来、%1$s のビジット数と %2$s のアクション数",
+        "CreatingCustomVariableTakesTime": "データベースのサイズによっては、新しいカスタム変数スロットの作成に時間がかかることがあります。 したがって、コマンドラインで実行する必要があるコマンドを介してのみこれを実行できます。",
+        "CurrentAvailableCustomVariables": "現在は、1 サイトあたり最大 %s のカスタム変数を使用できます。",
+        "ToCreateCustomVarExecute": "新しいカスタム変数スロットを作成するには、Matomo インストール内で次のコマンドを実行します。",
+        "SlotsReportIsGeneratedOverTime": "このレポートのデータ集計には時間がかかります。 レポートが完全に正確になるまで、データを見るには1 ～2日、または数週間かかる場合があります。",
+        "MetricsAreOnlyAvailableForVisitScope": "注：%1$s メトリックは、スコープ %2$s のカスタム変数でのみ使用できます。",
+        "MetricsNotAvailableForPageScope": "スコープ %1$s のカスタム変数の場合、これらのメトリックの列値は %2$s です"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/CustomVariables/lang/pl.json b/app/plugins/CustomVariables/lang/pl.json
index bf4862748..0eaa6c26f 100644
--- a/app/plugins/CustomVariables/lang/pl.json
+++ b/app/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 Zmiennych Niestandardowych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %1$sAby uzyskać więcej informacji na temat Zmiennych Niestandardowych, przeczytaj dokumentację %2$sZmienne Niestandardowe na matomo.org%3$s",
+        "CustomVariablesReportDocumentation": "Raport ten zawiera informacje na temat Zmiennych Niestandardowych. Kliknij na nazwę zmiennej, aby zobaczyć rozkład wartości. %1$sWięcej informacji o Zmiennych Niestandardowych, znajdziesz w dokumentacji %2$sZmienne Niestandardowe na matomo.org%3$s",
         "ScopePage": "zakres stron",
         "ScopeVisit": "zakres wizyt",
         "ScopeConversion": "zakres konwersji",
diff --git a/app/plugins/CustomVariables/lang/pt.json b/app/plugins/CustomVariables/lang/pt.json
index 6867dd51d..8e8f14542 100644
--- a/app/plugins/CustomVariables/lang/pt.json
+++ b/app/plugins/CustomVariables/lang/pt.json
@@ -15,6 +15,7 @@
         "Unused": "Não utilizado",
         "CreateNewSlot": "Aumentar o número de espaços disponíveis para Variáveis personalizadas",
         "UsageDetails": "%1$s visitas e %2$s ações desde a criação deste site.",
+        "CreatingCustomVariableTakesTime": "A criação de um novo espaço para uma variável personalizada pode demorar algum tempo, dependendo do tamanho da sua base de dados. Assim sendo, torna-se somente possível fazê-lo através de um comando que precisa de ser executado na linha de comandos.",
         "CurrentAvailableCustomVariables": "Atualmente pode utilizar até %s variáveis personalizadas por site.",
         "ToCreateCustomVarExecute": "Para criar um novo espaço para uma variável personalizada, execute o seguinte comando na sua instalação do Matomo:",
         "SlotsReportIsGeneratedOverTime": "Os dados para este relatório serão apurados ao longo do tempo. Pode demorar um dia ou dois até serem apresentados alguns dados e algumas semanas até o relatório ser completamente fidedigno.",
diff --git a/app/plugins/CustomVariables/lang/sv.json b/app/plugins/CustomVariables/lang/sv.json
index ca8a9d045..b93391185 100644
--- a/app/plugins/CustomVariables/lang/sv.json
+++ b/app/plugins/CustomVariables/lang/sv.json
@@ -4,6 +4,7 @@
         "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. %1$s För mer information om anpassade variabler i allmänhet, läs %2$sdokumentationen om anpassade variabler på matomo.org%3$s",
+        "PluginDescription": "Anpassade variabler är (namn, värde) par som du kan tillskriva genom att använda Javascript API till besökare eller någon av deras handlingar. Matomo kommer då rapportera hur många besök, sidor, omvandlingar för var och en av dessa anpassade namn och värden. Se de detaljerade anpassade variablerna för varje användare och handlingar i besöksloggen. Detta insticksprogram är nödvändigt för att använda funktionen Ecommerce Analytics.",
         "ScopePage": "omfattning sida",
         "ScopeVisit": "omfattning besök",
         "ScopeConversion": "Omfattning av konvertering",
@@ -14,6 +15,7 @@
         "Unused": "Oanvänd",
         "CreateNewSlot": "Öka antalet tillgängliga anpassade variabelspår",
         "UsageDetails": "%1$s besök och %2$s händelser sedan webbplatsen skapandet av denna webbplats.",
+        "CreatingCustomVariableTakesTime": "Att skapa en plats för ny anpassad variabel kan ta lång tid beroende på storleken på databasen. Därför är det bara möjligt att göra detta via ett kommando som behöver exekveras på kommandoraden.",
         "CurrentAvailableCustomVariables": "För tillfället kan du använda upp till %s anpassade variabler per webbsida.",
         "ToCreateCustomVarExecute": "För att skapa en ny anpassad variabel använd följande kommando i din Matomo miljö:",
         "SlotsReportIsGeneratedOverTime": "Data för den här rapporten kommer att samlas in allt eftersom. Det kan ta en dag eller två innan du ser någon data och ett par veckor innan rapporten är helt tillförlitlig.",
diff --git a/app/plugins/CustomVariables/lang/zh-cn.json b/app/plugins/CustomVariables/lang/zh-cn.json
index 8cf8feb73..8472b38a1 100644
--- a/app/plugins/CustomVariables/lang/zh-cn.json
+++ b/app/plugins/CustomVariables/lang/zh-cn.json
@@ -4,8 +4,10 @@
         "ColumnCustomVariableValue": "自定义变量值",
         "CustomVariables": "自定义变量",
         "CustomVariablesReportDocumentation": "本报表包含您的自定义变量的资料，点击变量名查看数据。%1$s 关于自定义变量的详情，请阅读 %2$smatomo.org 上的自定义变量文档%3$s",
+        "PluginDescription": "自定义变量是（名称、值），可以使用Javascript API将其分配给访问者或其任何操作。然后，Matomo将报告这些自定义名称和值的访问次数、页数、转换次数。查看访问者日志中每个用户和操作的详细自定义变量。此插件需要使用电子商务分析功能！",
         "ScopePage": "页面范围",
         "ScopeVisit": "访问范围",
+        "ScopeConversion": "范围转换",
         "ManageDescription": "这个概览显示了所有的自定义变量位置和它们在各个站点“%s”的使用方法。各个位置的变量名字按总的使用频率进行排序。",
         "ScopeX": "范围 %s",
         "Index": "主页",
@@ -13,7 +15,9 @@
         "Unused": "未使用",
         "CreateNewSlot": "增加可用自定义变量的数量",
         "UsageDetails": "本站建立开始共计有%1$s访问记录和%2$s 笔互动记录。",
+        "CreatingCustomVariableTakesTime": "根据数据库的大小，创建新的自定义变量槽可能需要很长时间。因此，只有通过需要在命令行上执行的命令才能执行此操作。",
         "CurrentAvailableCustomVariables": "目前你可以在每个站点里使用高达 %s条自定义变量。",
+        "ToCreateCustomVarExecute": "要创建新的自定义变量槽，请在您的Matomo安装中执行以下命令：",
         "SlotsReportIsGeneratedOverTime": "本报告的数据将随着时间的推移被填充。这可能需要一两天看到任何数据，并在几个星期之前，该报告是完全准确的。",
         "MetricsAreOnlyAvailableForVisitScope": "注意：自定义变量%1$s只能用于 %2$s范围。",
         "MetricsNotAvailableForPageScope": "自定义变量%1$s的列值范围为%2$s"
diff --git a/app/plugins/DBStats/DBStats.php b/app/plugins/DBStats/DBStats.php
index f75d4e8c9..47f83c044 100644
--- a/app/plugins/DBStats/DBStats.php
+++ b/app/plugins/DBStats/DBStats.php
@@ -23,10 +23,16 @@ class DBStats extends \Piwik\Plugin
     public function registerEvents()
     {
         return array(
-            "TestingEnvironment.addHooks" => 'setupTestEnvironment'
+            "TestingEnvironment.addHooks" => 'setupTestEnvironment',
+            'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
         );
     }
 
+    public function getStylesheetFiles(&$stylesheets)
+    {
+        $stylesheets[] = 'plugins/DBStats/stylesheets/dbstats.less';
+    }
+
     public function setupTestEnvironment($environment)
     {
         Piwik::addAction("MySQLMetadataProvider.createDao", function (&$dao) {
diff --git a/app/plugins/DBStats/config/config.php b/app/plugins/DBStats/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/DBStats/config/config.php
+++ b/app/plugins/DBStats/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/DBStats/config/tracker.php b/app/plugins/DBStats/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/DBStats/config/tracker.php
+++ b/app/plugins/DBStats/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/DBStats/lang/de.json b/app/plugins/DBStats/lang/de.json
index aa8744884..2cf76fdb3 100644
--- a/app/plugins/DBStats/lang/de.json
+++ b/app/plugins/DBStats/lang/de.json
@@ -5,12 +5,12 @@
         "DBSize": "Datenbankgröße",
         "EstimatedSize": "Erwartete Größe",
         "IndexSize": "Indexgröße",
-        "LearnMore": "Um mehr darüber zu erfahren, wie Matomo Daten verarbeitet und wie Sie Matomo auf stark besuchten Websites einsetzen können, lesen Sie die Dokumentation unter %s.",
-        "MainDescription": "Matomo speichert sämtliche Webanalyse-Daten in der MySQL-Datenbank. Aktuell belegter Speicherplatz %s.",
+        "LearnMore": "Um mehr darüber zu erfahren, wie Matomo Daten verarbeitet und wie Matomo gut mit Websites mit mittlerem und hohem Traffic funktioniert, lesen Sie diese Dokumentation: %s.",
+        "MainDescription": "Matomo speichert sämtliche Webanalyse-Daten in einer MySQL-Datenbank. Aktuell durch Matomo belegter Speicherplatz %s.",
         "MetricDataByYear": "Metriktabellen pro Jahr",
         "MetricTables": "Metriktabellen",
         "OtherTables": "Andere Tabellen",
-        "PluginDescription": "Stellt detaillierte MySQL Datenbank Auslastungsberichte zur Verfügung. Verfügbar für Hauptadministratoren unter Diagnose.",
+        "PluginDescription": "Stellt detaillierte Berichte über Auslastung der MySQL Datenbank zur Verfügung. Verfügbar für Hauptadministratoren unter Diagnose.",
         "ReportDataByYear": "Berichtstabellen pro Jahr",
         "ReportTables": "Berichtstabellen",
         "RowCount": "Zeilenanzahl",
diff --git a/app/plugins/DBStats/lang/es-ar.json b/app/plugins/DBStats/lang/es-ar.json
index 07e677c00..17a289df3 100644
--- a/app/plugins/DBStats/lang/es-ar.json
+++ b/app/plugins/DBStats/lang/es-ar.json
@@ -1,5 +1,21 @@
 {
     "DBStats": {
-        "Table": "Tabla"
+        "DatabaseUsage": "Uso de la base de datos",
+        "DataSize": "Tamaño de los datos",
+        "DBSize": "Tamaño de la base de datos",
+        "EstimatedSize": "Tamaño estimado",
+        "IndexSize": "Tamaño del índice",
+        "LearnMore": "Para aprender más sobre cómo Matomo procesa datos y cómo hacer para que Matomo trabaje bien con sitios web de medio y alto tráfico, leé esta documentación: %s.",
+        "MainDescription": "Matomo almacena todos tus datos de análisis web en una base de datos MySQL. Actualmente las tablas de Matomo ocupan hasta %s de espacio.",
+        "MetricDataByYear": "Tablas de mediciones por año",
+        "MetricTables": "Tablas de mediciones",
+        "OtherTables": "Otras tablas",
+        "PluginDescription": "Provee informes de uso detallados de base de datos MySQL. Disponible para súperusuarios bajo Diagnósticos.",
+        "ReportDataByYear": "Tablas de informe por año",
+        "ReportTables": "Tablas de informe",
+        "RowCount": "Conteo de fila",
+        "Table": "Tabla",
+        "TotalSize": "Tamaño total",
+        "TrackerTables": "Tablas de seguimiento"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/DBStats/lang/ja.json b/app/plugins/DBStats/lang/ja.json
index 5c019b041..3c56e5d41 100644
--- a/app/plugins/DBStats/lang/ja.json
+++ b/app/plugins/DBStats/lang/ja.json
@@ -5,12 +5,12 @@
         "DBSize": "DB サイズ",
         "EstimatedSize": "推定サイズ",
         "IndexSize": "インデックスサイズ",
-        "LearnMore": "Matomo のデータ処理方法やトラフィックの比較的高いウェブサイトで Matomo をうまく機能させる方法についての詳細は、ドキュメント %s を参照してください。",
-        "MainDescription": "Matomo はすべてのウェブ解析データを Mysql データベースに保存します。 現在のところ、Matomo テーブルは %s を使用しています。",
-        "MetricDataByYear": "年次のメトリック表",
-        "MetricTables": "メトリック表",
-        "OtherTables": "その他の表",
-        "PluginDescription": "詳細な MySQL データベースの利用状況のレポートを提供します。診断中のスーパー ユーザーに対して使用できます。",
+        "LearnMore": "Matomo のデータ処理方法やトラフィックの比較的高いウェブサイトで Matomo をうまく機能させる方法についての詳細は、次のドキュメント を参照してください：%s",
+        "MainDescription": "Matomo はすべてのウェブ解析データを Mysql データベースに保存します。 現在、Matomo テーブルは %s を使用しています。",
+        "MetricDataByYear": "年次のメトリックテーブル",
+        "MetricTables": "メトリックテーブル",
+        "OtherTables": "その他のテーブル",
+        "PluginDescription": "詳細な MySQL データベース利用状況のレポートを提供します。診断中のスーパー ユーザーに対して使用できます。",
         "ReportDataByYear": "年次のリポートテーブル",
         "ReportTables": "リポートテーブル",
         "RowCount": "行数",
diff --git a/app/plugins/DBStats/stylesheets/dbstats.less b/app/plugins/DBStats/stylesheets/dbstats.less
new file mode 100644
index 000000000..b2c1c7e99
--- /dev/null
+++ b/app/plugins/DBStats/stylesheets/dbstats.less
@@ -0,0 +1,5 @@
+div.dataTable[data-report^=DBStats] {
+  table.dataTable th.label, table.dataTable td.label {
+    padding-left: 12px;
+  }
+}
\ No newline at end of file
diff --git a/app/plugins/Dashboard/Dashboard.php b/app/plugins/Dashboard/Dashboard.php
index 714905fa1..cf027c6c6 100644
--- a/app/plugins/Dashboard/Dashboard.php
+++ b/app/plugins/Dashboard/Dashboard.php
@@ -316,6 +316,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'Dashboard_Dashboard';
         $translationKeys[] = 'Dashboard_RemoveDefaultDashboardNotPossible';
         $translationKeys[] = 'General_Close';
+        $translationKeys[] = 'General_HelpResources';
         $translationKeys[] = 'General_Refresh';
     }
 }
diff --git a/app/plugins/Dashboard/config/config.php b/app/plugins/Dashboard/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Dashboard/config/config.php
+++ b/app/plugins/Dashboard/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Dashboard/config/tracker.php b/app/plugins/Dashboard/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Dashboard/config/tracker.php
+++ b/app/plugins/Dashboard/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Dashboard/lang/ja.json b/app/plugins/Dashboard/lang/ja.json
index 17c325677..da184019e 100644
--- a/app/plugins/Dashboard/lang/ja.json
+++ b/app/plugins/Dashboard/lang/ja.json
@@ -7,7 +7,7 @@
         "CreateNewDashboard": "新しいダッシュボードを作成する",
         "Dashboard": "ダッシュボード",
         "DashboardCopied": "現在のダッシュボードは選択したユーザーへコピーされました。",
-        "DashboardEmptyNotification": "ダッシュボードには一つもウィジェットがありません。ダッシュボードにウィジェットを追加するか、あるいはダッシュボードをデフォルトのウィジェットにリセットしてから始めてください。",
+        "DashboardEmptyNotification": "ダッシュボードにウィジェットがありません。ダッシュボードにウィジェットを追加するか、ダッシュボードをデフォルトのウィジェットにリセットしてから始めてください。",
         "DashboardName": "ダッシュボード名:",
         "DashboardOf": "%s のダッシュボード",
         "DefaultDashboard": "デフォルトのダッシュボード - デフォルトのウィジェットとカラムレイアウトを使用します",
@@ -29,8 +29,8 @@
         "SelectWidget": "ダッシュボードに追加するウィジェットを選択してください",
         "SetAsDefaultWidgets": "デフォルトのウィジェット選択として設定",
         "SetAsDefaultWidgetsConfirm": "現在のウィジェットとダッシュボードのレイアウトをデフォルトのテンプレートとして設定しますか？",
-        "SetAsDefaultWidgetsConfirmHelp": "これらのウィジェットとダッシュボードのレイアウトは、新規ダッシュボードの作成時か、あるいは %s 機能の使用時に使われれます。",
-        "TopLinkTooltip": "%s のウェブ解析レポートを表示",
+        "SetAsDefaultWidgetsConfirmHelp": "これらのウィジェットとダッシュボードのレイアウトは、新規ダッシュボードの作成時か、あるいは %s 機能の使用時に使用されます。",
+        "TopLinkTooltip": "%s のウェブ解析レポートを表示します。",
         "WidgetNotFound": "ウィジェットが見つかりませんでした",
         "WidgetPreview": "ウィジェットのプレビュー"
     }
diff --git a/app/plugins/Dashboard/lang/tr.json b/app/plugins/Dashboard/lang/tr.json
index 19d27369d..6d0c64eb5 100644
--- a/app/plugins/Dashboard/lang/tr.json
+++ b/app/plugins/Dashboard/lang/tr.json
@@ -12,7 +12,7 @@
         "DashboardOf": "%s panosu",
         "DefaultDashboard": "Varsayılan pano - Varsayılan gereç seçimlerini ve sütun düzenini kullanır",
         "DeleteWidgetConfirm": "Bu gereci panodan silmek istediğinize emin misiniz?",
-        "EmptyDashboard": "Boş panı - Kullanmak istediğiniz gereçleri seçin",
+        "EmptyDashboard": "Boş pano - Kullanmak istediğiniz gereçleri seçin",
         "LoadingWidget": "Lütfen gereç yüklenirken bekleyin...",
         "ManageDashboard": "Pano yönetimi",
         "Maximise": "Büyüt",
diff --git a/app/plugins/Dashboard/lang/vi.json b/app/plugins/Dashboard/lang/vi.json
index 9f56c6aa3..20eace9d5 100644
--- a/app/plugins/Dashboard/lang/vi.json
+++ b/app/plugins/Dashboard/lang/vi.json
@@ -15,15 +15,15 @@
         "EmptyDashboard": "Bảng điều khiển trống - Chọn các widget yêu thích của bạn.",
         "LoadingWidget": "Đang tải widget, vui lòng đợi ...",
         "ManageDashboard": "Quản lý bảng điều khiển",
-        "Maximise": "Tối đa",
-        "Minimise": "Tối thiểu",
-        "NotUndo": "Bạn sẽ không thể lùi lại hoạt động này",
+        "Maximise": "Phóng to",
+        "Minimise": "Thu nhỏ",
+        "NotUndo": "Bạn sẽ không thể khôi phục hành động này",
         "PluginDescription": "Bảng điều khiển của bạn. Có thể tùy biến bằng cách thêm widget, kéo thả hoặc thêm các trường dữ liệu. Mỗi người dùng có thể tùy biến bảng điều khiến cho riêng mình.",
         "RemoveDashboard": "Loại bỏ bảng điều khiển",
         "RemoveDashboardConfirm": "Bạn có chắc chắn muốn loại bỏ bảng điều khiển \"%s\"?",
         "RemoveDefaultDashboardNotPossible": "Các bảng điều khiển mặc định không thể bị gỡ bỏ",
         "RenameDashboard": "Đổi tên bảng điều khiển",
-        "ResetDashboard": "Bảng điều khiển mặc định",
+        "ResetDashboard": "Đặt bảng điều khiển về mặc định",
         "ResetDashboardConfirm": "Bạn có chắc chắn muốn thiết lập lại bố trí bảng điều khiển của bạn cho thiết lập các Widget mặc định?",
         "SelectDashboardLayout": "Vui lòng chọn bố trí bảng điều khiển mới của bạn",
         "SelectWidget": "Chọn widget để thêm vào trong bảng điều khiển",
diff --git a/app/plugins/Dashboard/templates/_header.twig b/app/plugins/Dashboard/templates/_header.twig
index 7905cb060..98bfa2209 100644
--- a/app/plugins/Dashboard/templates/_header.twig
+++ b/app/plugins/Dashboard/templates/_header.twig
@@ -7,7 +7,6 @@
     <meta name="google" content="notranslate">
     <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
     <title>{{ 'Dashboard_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
-
     <link rel="stylesheet" type="text/css" href="plugins/Dashboard/stylesheets/standalone.css" />
 {% include "_jsGlobalVariables.twig" %}
 {% include "_jsCssIncludes.twig" %}
diff --git a/app/plugins/DevicePlugins/config/config.php b/app/plugins/DevicePlugins/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/DevicePlugins/config/config.php
+++ b/app/plugins/DevicePlugins/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/DevicePlugins/config/tracker.php b/app/plugins/DevicePlugins/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/DevicePlugins/config/tracker.php
+++ b/app/plugins/DevicePlugins/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/DevicePlugins/lang/ja.json b/app/plugins/DevicePlugins/lang/ja.json
index 51bb53afd..1ba80c7ae 100644
--- a/app/plugins/DevicePlugins/lang/ja.json
+++ b/app/plugins/DevicePlugins/lang/ja.json
@@ -2,7 +2,7 @@
     "DevicePlugins": {
         "BrowserWithNoPluginsEnabled": "%1$s のプラグインが有効ではありません",
         "BrowserWithPluginsEnabled": "%1$s のプラグイン %2$s は有効",
-        "PluginDescription": "ビジターのブラウザでサポートされているプラグインの一覧を報告します。",
+        "PluginDescription": "ビジターのブラウザでサポートされているプラグインの一覧をレポートします。",
         "PluginDetectionDoesNotWorkInIE": "注：プラグインの検出は Internet Explorer 11 より前では機能しません。このレポートは IE 以外のブラウザーと IE の新しいバージョンにのみ基づいています。",
         "WidgetPlugins": "ブラウザプラグイン",
         "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。"
diff --git a/app/plugins/DevicesDetection/Columns/Base.php b/app/plugins/DevicesDetection/Columns/Base.php
index c837c2e0b..efc3a6a0d 100644
--- a/app/plugins/DevicesDetection/Columns/Base.php
+++ b/app/plugins/DevicesDetection/Columns/Base.php
@@ -8,13 +8,14 @@
  */
 namespace Piwik\Plugins\DevicesDetection\Columns;
 
-use Piwik\DeviceDetectorFactory;
+use Piwik\Container\StaticContainer;
+use Piwik\DeviceDetector\DeviceDetectorFactory;
 use Piwik\Plugin\Dimension\VisitDimension;
 
 abstract class Base extends VisitDimension
 {
     protected function getUAParser($userAgent)
     {
-        return DeviceDetectorFactory::getInstance($userAgent);
+        return StaticContainer::get(DeviceDetectorFactory::class)->makeInstance($userAgent);
     }
 }
diff --git a/app/plugins/DevicesDetection/Controller.php b/app/plugins/DevicesDetection/Controller.php
index a26964e03..2a355bc55 100644
--- a/app/plugins/DevicesDetection/Controller.php
+++ b/app/plugins/DevicesDetection/Controller.php
@@ -32,6 +32,7 @@ public function detection()
         $uaParser->parse();
 
         $view->userAgent           = $userAgent;
+        $view->bot_info            = $uaParser->getBot();
         $view->browser_name        = $uaParser->getClient('name');
         $view->browser_short_name  = $uaParser->getClient('short_name');
         $view->browser_version     = $uaParser->getClient('version');
diff --git a/app/plugins/DevicesDetection/config/config.php b/app/plugins/DevicesDetection/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/DevicesDetection/config/config.php
+++ b/app/plugins/DevicesDetection/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/DevicesDetection/config/tracker.php b/app/plugins/DevicesDetection/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/DevicesDetection/config/tracker.php
+++ b/app/plugins/DevicesDetection/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/DevicesDetection/functions.php b/app/plugins/DevicesDetection/functions.php
index 92f2ebba4..578c2f349 100644
--- a/app/plugins/DevicesDetection/functions.php
+++ b/app/plugins/DevicesDetection/functions.php
@@ -17,7 +17,7 @@
 function getBrandLogo($label)
 {
     $path = 'plugins/Morpheus/icons/dist/brand/%s.png';
-    $label = preg_replace("/[^a-z0-9_-]+/i", "_", $label);
+    $label = preg_replace("/[^a-z0-9_\-äöü]+/i", "_", $label);
     if (!file_exists(PIWIK_INCLUDE_PATH . '/' . sprintf($path, $label))) {
         $label = "unk";
     }
diff --git a/app/plugins/DevicesDetection/lang/da.json b/app/plugins/DevicesDetection/lang/da.json
index 940650e86..e172d008f 100644
--- a/app/plugins/DevicesDetection/lang/da.json
+++ b/app/plugins/DevicesDetection/lang/da.json
@@ -11,6 +11,7 @@
         "CarBrowser": "Bilbrowser",
         "Software": "Software",
         "ColumnBrowser": "Browser",
+        "BrowserCode": "Browserkode",
         "ColumnOperatingSystem": "Operativsystem",
         "ColumnOperatingSystemVersion": "Operativsystemversion",
         "Console": "Konsol",
@@ -20,13 +21,17 @@
         "dataTableLabelTypes": "Type",
         "Device": "Enhed",
         "DeviceBrand": "Enhedsmærke",
+        "DeviceBrands": "Enhedsmærker",
         "DeviceDetection": "Detektering af enheder",
         "DeviceModel": "Enhedsmodel",
+        "DeviceModels": "Enhedsmodeller",
         "DevicesDetection": "Besøgendes enheder",
         "DeviceType": "Enhedstypen",
+        "DeviceTypes": "Enhedstyper",
         "FeaturePhone": "Telefonfunktioner",
         "OperatingSystemFamilies": "Operativsystem familier",
         "OperatingSystemFamily": "Operativsystemsfamilie",
+        "OperatingSystemCode": "Operativsystemkode",
         "OperatingSystems": "Operativsystemer",
         "OperatingSystemVersions": "Operativsystemversioner",
         "PluginDescription": "Giver udvidet information om brugerens enheder, såsom mærke (fremstiller), model (enhedsversion), enhedstype (tv, konsoller, smartphones, desktop, osv) m. m.",
@@ -35,10 +40,12 @@
         "PortableMediaPlayer": "Bærbar medieafspiller",
         "Devices": "Enheder",
         "GenericDevice": "Uspecificeret %s",
+        "MobileDevice": "Mobil enhed",
         "Tablet": "Tablet",
         "Phablet": "Phablet",
         "TV": "TV",
         "UserAgent": "Brugeragent",
+        "XVisitsFromDevices": "%1$s besøg fra %2$s enheder",
         "WidgetBrowsers": "Besøgendes browser",
         "WidgetBrowsersDocumentation": "Rapporten indeholder oplysninger om hvilken browser de besøgende bruger. Hver version er angivet særskilt."
     }
diff --git a/app/plugins/DevicesDetection/lang/de.json b/app/plugins/DevicesDetection/lang/de.json
index 6e7414885..5c154a306 100644
--- a/app/plugins/DevicesDetection/lang/de.json
+++ b/app/plugins/DevicesDetection/lang/de.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Dieser User-Agent wird als %1$s erkannt. Besuche mit diesem Benutzer-Agenten werden in Matomo standardmäßig nicht protokolliert.",
         "BrowserEngine": "Browser-Engine",
         "BrowserEngineDocumentation": "Dieser Bericht zeigt Ihnen die Browser Ihrer Besucher aufgeteilt nach Browserfamilien. %s Die wichtigste Information für Webentwickler ist, welche Rendering-Engine ihre Besucher verwenden. Die Beschriftungen enthalten den Namen der Engine und in Klammern den Namen des bekanntesten Browsers, der diese verwendet.",
         "BrowserEngines": "Browser-Engines",
diff --git a/app/plugins/DevicesDetection/lang/el.json b/app/plugins/DevicesDetection/lang/el.json
index bb3ef3676..4095fcb87 100644
--- a/app/plugins/DevicesDetection/lang/el.json
+++ b/app/plugins/DevicesDetection/lang/el.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Αυτό το πρόγραμμα-πελάτης εντοπίζεται ως %1$s. Οι επισκέψεις με αυτό το πρόγραμμα-πελάτη εξ' ορισμού δε θα ιχνηλατούνται από το Matomo.",
         "BrowserEngine": "Μηχανή προγράμματος πλοήγησης",
         "BrowserEngineDocumentation": "Η αναφορά αυτή δείχνει τα προγράμματα πλοήγησης των επισκεπτών σας ταξινομημένα με την εσωτερική τους μηχανή. %s Η πιο κρίσιμη πληροφορία για τους προγραμματιστές ιστοσελίδων είναι το είδος της μηχανής απεικόνισης που χρησιμοποιούν τα προγράμματα πλοήγησης των επισκεπτών τους. Οι ετικέτες περιέχουν τα ονόματα των μηχανών ακολουθούμενα σε αγκύλες από τα πιο συχνά χρησιμοποιούμενα προγράμματα πλοήγησης που χρησιμοποιούν αυτή τη μηχανή.",
         "BrowserEngines": "Μηχανές προγράμματος πλοήγησης",
diff --git a/app/plugins/DevicesDetection/lang/en.json b/app/plugins/DevicesDetection/lang/en.json
index 33789201e..1f7a1a169 100644
--- a/app/plugins/DevicesDetection/lang/en.json
+++ b/app/plugins/DevicesDetection/lang/en.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "This User-Agent is detected as %1$s. Visits with this user agent will not be tracked in Matomo by default.",
         "BrowserEngine": "Browser engine",
         "BrowserEngineDocumentation": "This report shows your visitors' browsers broken down into browser engines. %s The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.",
         "BrowserEngines": "Browser engines",
diff --git a/app/plugins/DevicesDetection/lang/es-ar.json b/app/plugins/DevicesDetection/lang/es-ar.json
index 7cd1e4915..b7c6d27fa 100644
--- a/app/plugins/DevicesDetection/lang/es-ar.json
+++ b/app/plugins/DevicesDetection/lang/es-ar.json
@@ -1,16 +1,53 @@
 {
     "DevicesDetection": {
-        "BrowserEngine": "Navegador",
-        "BrowserEngineDocumentation": "Este cuadro muestra los navegadores de internet de los visitantes divididos en sus respectivas familias. %s La información más importante para los desarrolladores de sitios de internet es conocer que motor de interpretador están utilizando los visitantes. Los rótulos contienen los nombres de los motores seguidos por el navegador más usual utilizando dicho motor entre corchetes.",
-        "BrowserFamily": "Buscadores por familia",
-        "Browsers": "Navegadores",
-        "BrowserVersion": "Versión del navegador",
-        "ColumnBrowser": "Navegador",
-        "ColumnOperatingSystem": "Sistemas operativos",
+        "BotDetected": "Este agente de usuario es detectado como %1$s. Las visitas con esta cadena de agente de usuario no serán rastreadas por Matomo predeterminadamente.",
+        "BrowserEngine": "Motor del navegador",
+        "BrowserEngineDocumentation": "Este informe muestra los navegadores web de tus visitantes divididos en sus respectivos motores. %s La información más importante para los desarrolladores de sitios web es saber qué motor de renderizado están usando sus visitantes. Las etiquetas contienen los nombres de los motores seguidos por el navegador web más usual utilizando dicho motor entre corchetes.",
+        "BrowserEngines": "Motores de navegador",
+        "BrowserFamily": "Familia del navegador",
+        "Browsers": "Navegadores web",
+        "BrowserVersion": "Versión del navegador web",
+        "BrowserVersions": "Versiones del navegador",
+        "Camera": "Cámara",
+        "CarBrowser": "Navegador web de auto",
+        "Software": "Software",
+        "ColumnBrowser": "Navegador web",
+        "BrowserCode": "Código del navegador web",
+        "ColumnOperatingSystem": "Sistema operativo",
+        "ColumnOperatingSystemVersion": "Versión del sistema operativo",
+        "Console": "Consola",
+        "dataTableLabelBrands": "Marca",
+        "dataTableLabelModels": "Modelo",
+        "dataTableLabelSystemVersion": "Versión del sistema operativo",
         "dataTableLabelTypes": "Tipo",
+        "Device": "Dispositivo",
+        "DeviceBrand": "Marca del dispositivo",
+        "DeviceBrands": "Marcas del dispositivo",
+        "DeviceDetection": "Detección del dispositivo",
+        "DeviceModel": "Modelo del dispositivo",
+        "DeviceModels": "Modelos del dispositivo",
+        "DevicesDetection": "Dispositivos del visitante",
+        "DeviceType": "Tipo de dispositivo",
+        "DeviceTypes": "Tipos de dispositivo",
+        "FeaturePhone": "Teléfono celular",
+        "OperatingSystemFamilies": "Familias de sistema operativo",
         "OperatingSystemFamily": "Familia de sistema operativo",
+        "OperatingSystemCode": "Código del sistema operativo",
         "OperatingSystems": "Sistemas operativos",
-        "WidgetBrowsers": "Navegadores de los visitantes",
-        "WidgetBrowsersDocumentation": "Este informe contiene información acerca de qué tipo de navegador el visitante está utilizando. Cada versión de navegador está alistado separadamente."
+        "OperatingSystemVersions": "Versiones del sistema operativo",
+        "PluginDescription": "Provee información extendida acerca de los dispositivos del usuario como \"Marca\" (fabricante), \"Modelo\" (versión del dispositivo), \"Tipo de dispositivo\" (televisor inteligente, consolas de videojuegos, teléfonos inteligentes, computadoras de escritorio, etc) y más.",
+        "SmartDisplay": "Televisor inteligente",
+        "Smartphone": "Teléfono inteligente",
+        "PortableMediaPlayer": "Reproductor de medios portátil",
+        "Devices": "Dispositivo",
+        "GenericDevice": "%s genérico",
+        "MobileDevice": "Dispositivo móvil",
+        "Tablet": "Tableta",
+        "Phablet": "Fableta",
+        "TV": "Televisor",
+        "UserAgent": "Agente de usuario",
+        "XVisitsFromDevices": "%1$s visitas desde %2$s dispositivos",
+        "WidgetBrowsers": "Navegador web de los visitantes",
+        "WidgetBrowsersDocumentation": "Este informe contiene información acerca de qué tipo de navegador web están usando tus visitantes. Cada versión de navegador web está alistado separadamente."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/DevicesDetection/lang/es.json b/app/plugins/DevicesDetection/lang/es.json
index fefa95135..84d226114 100644
--- a/app/plugins/DevicesDetection/lang/es.json
+++ b/app/plugins/DevicesDetection/lang/es.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Este agente-de-usuario es detectado como %1$s. Los visitantes con este tipo de agente de usuario no será monitoreado de manera predeterminado por Matomo.",
         "BrowserEngine": "Motor del navegador",
         "BrowserEngineDocumentation": "Este informe muestra los navegadores de sus visitantes desglosados en los motores de los navegadores. %s La información más importante para los desarrolladores de internet es que clase de motor de renderizado sus visitantes están utilizando. Las etiquetas contienen los nombres de los motores seguido por el navegador más común utilizando dicho motor entre paréntesis.",
         "BrowserEngines": "Motores de navegador",
diff --git a/app/plugins/DevicesDetection/lang/fr.json b/app/plugins/DevicesDetection/lang/fr.json
index 2f1ea7b40..f6d12c187 100644
--- a/app/plugins/DevicesDetection/lang/fr.json
+++ b/app/plugins/DevicesDetection/lang/fr.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Ce User-Agent est détecté comme %1$s. Les visites avec ce user agent ne seront pas traquées par défaut dans Matomo.",
         "BrowserEngine": "Moteur de rendu HTML",
         "BrowserEngineDocumentation": "Ce rapport affiche les navigateurs de vos visiteurs divisés par moteurs. %s L'information la plus importante pour des développeurs web est quelle sorte de moteur de rendu utilisent les visiteurs. Les labels contiennent le nom du moteur suivi par le navigateur le plus commun utilisant ce moteur entre parenthèses.",
         "BrowserEngines": "Moteurs de rendu HTML",
diff --git a/app/plugins/DevicesDetection/lang/it.json b/app/plugins/DevicesDetection/lang/it.json
index e4f4b9919..96bf9eb22 100644
--- a/app/plugins/DevicesDetection/lang/it.json
+++ b/app/plugins/DevicesDetection/lang/it.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Questo User-Agent è stato individuato come %1$s. Per impostazione predefinita le visite che avvengono tramite questo user agent non verranno tracciate da Matomo.",
         "BrowserEngine": "Motore browser",
         "BrowserEngineDocumentation": "Questo report mostra i browser dei vostri visitatori suddivisi in famiglie di browser. %s Le informazioni più importanti per gli sviluppatori web sono che tipo di motore di rendering i loro visitatori stanno usando. Le etichette contengono i nomi dei motori seguiti dal browser più comune che utilizza quel motore, messo tra parentesi.",
         "BrowserEngines": "Motori browser",
diff --git a/app/plugins/DevicesDetection/lang/ja.json b/app/plugins/DevicesDetection/lang/ja.json
index b3d66edd6..b410e0366 100644
--- a/app/plugins/DevicesDetection/lang/ja.json
+++ b/app/plugins/DevicesDetection/lang/ja.json
@@ -47,6 +47,6 @@
         "UserAgent": "ユーザーエージェント",
         "XVisitsFromDevices": "%2$s デバイスからの %1$s ビジット",
         "WidgetBrowsers": "ブラウザ",
-        "WidgetBrowsersDocumentation": "ビジターがどのブラウザを使っているかについてのリポートです。各ブラウザのバージョンは別途記載されています。"
+        "WidgetBrowsersDocumentation": "ビジターが使用しているブラウザについてのリポートです。各ブラウザのバージョンは別途記載されています。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/DevicesDetection/lang/pt-br.json b/app/plugins/DevicesDetection/lang/pt-br.json
index ea02b49c4..4eaa51dd4 100644
--- a/app/plugins/DevicesDetection/lang/pt-br.json
+++ b/app/plugins/DevicesDetection/lang/pt-br.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Este User-Agent é detectado como %1$s. Visitas com este user-agent não serão rastreadas no Matomo por padrão.",
         "BrowserEngine": "Navegador",
         "BrowserEngineDocumentation": "Este gráfico mostra os navegadores dos seus visitantes divididos em famílias de navegadores. %s A informação mais importante para os desenvolvedores web é o tipo de motor de renderização que seus visitantes estão usando. As etiquetas contêm os nomes dos motores seguido pelo navegador mais comum usando esse motor entre parênteses.",
         "BrowserEngines": "Mecanismos de navegação",
diff --git a/app/plugins/DevicesDetection/lang/pt.json b/app/plugins/DevicesDetection/lang/pt.json
index ecfbac4af..4a7b2a456 100644
--- a/app/plugins/DevicesDetection/lang/pt.json
+++ b/app/plugins/DevicesDetection/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Este User-Agent é detetado como %1$s. Por predefinição, as visitas com este agente de utilizador não serão acompanhadas pelo Matomo.",
         "BrowserEngine": "Motor do navegador",
         "BrowserEngineDocumentation": "Este relatório mostra os navegadores dos seus visitantes divididos por famílias. %s A informação mais importante para os programadores web é o tipo de motor de renderização que os seus visitantes estão a utilizar. As etiquetas contêm os nomes dos motores seguido pelo navegador mais comum que utiliza esse motor entre parênteses.",
         "BrowserEngines": "Motores de navegadores",
@@ -11,6 +12,7 @@
         "CarBrowser": "Navegador de automóvel",
         "Software": "Software",
         "ColumnBrowser": "Navegador",
+        "BrowserCode": "Código do navegador",
         "ColumnOperatingSystem": "Sistema operativo",
         "ColumnOperatingSystemVersion": "Versão do sistema operativo",
         "Console": "Consola",
@@ -30,6 +32,7 @@
         "FeaturePhone": "Telemóvel simples",
         "OperatingSystemFamilies": "Famílias de sistemas operativos",
         "OperatingSystemFamily": "Família do sistema operativo",
+        "OperatingSystemCode": "Código do sistema operativo",
         "OperatingSystems": "Sistemas operativos",
         "OperatingSystemVersions": "Versões de sistemas operativos",
         "PluginDescription": "Fornece informações adicionais sobre os dispositivos dos utilizadores, tais como Marca (fabricante), Modelo (versão do dispositivo), tipo de dispositivo (tv, consolas, smartphones, computador, etc.), entre outras.",
diff --git a/app/plugins/DevicesDetection/lang/sq.json b/app/plugins/DevicesDetection/lang/sq.json
index 7f0860a8f..aa43c2db0 100644
--- a/app/plugins/DevicesDetection/lang/sq.json
+++ b/app/plugins/DevicesDetection/lang/sq.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Ky Agjent Përdoruesi është pikasur si %1$s. Si parazgjedhje, vizita me këtë agjent përdoruesi s’do të ndiqen në Matomo.",
         "BrowserEngine": "Motor shfletuesi",
         "BrowserEngineDocumentation": "Ky grafik tregon shfletuesit e vizitorëve tuaj, grupuar sipas familjesh shfletuesish. %s Informacioni më i rëndësishëm për programuesit web është lloji i mekanizmit vizatues që përdor shfletuesi. Etiketat përmbajnë emrat e mekanizmave, pasuar në kllapa nga shfletuesit më të zakonshëm që përdorin secilin prej tyre.",
         "BrowserEngines": "Motorë shfletuesi",
diff --git a/app/plugins/DevicesDetection/lang/sv.json b/app/plugins/DevicesDetection/lang/sv.json
index a3fa16efc..0990b2872 100644
--- a/app/plugins/DevicesDetection/lang/sv.json
+++ b/app/plugins/DevicesDetection/lang/sv.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Den här användaragenten är upptäckt som %1$s. Besök med denna användaragent kommer inte att spåras i Matomo som default.",
         "BrowserEngine": "Webbläsarmotor",
         "BrowserEngineDocumentation": "Detta diagram visar besökarnas webbläsare uppdelat i webbläsarfamiljer. %s Den viktigaste informationen för webbutvecklare är vilken typ av renderingsmotor besökarna använder. Etiketterna innehåller namnen på de renderingsmotorn följt av den vanligaste webbläsaren med den motorn inom parentes.",
         "BrowserEngines": "Webbläsarmotorer",
@@ -11,6 +12,7 @@
         "CarBrowser": "Bilwebbläsare",
         "Software": "Mjukvara",
         "ColumnBrowser": "Webbläsare",
+        "BrowserCode": "Webbläsarkod",
         "ColumnOperatingSystem": "Operativsystem",
         "ColumnOperatingSystemVersion": "Operativsystemversion",
         "Console": "Konsol",
@@ -30,6 +32,7 @@
         "FeaturePhone": "Telefonmodell",
         "OperatingSystemFamilies": "Operativsystemfamiljer",
         "OperatingSystemFamily": "Operativsystemfamilj",
+        "OperatingSystemCode": "Operativsystemskod",
         "OperatingSystems": "Operativsystem",
         "OperatingSystemVersions": "Operativsystemversion",
         "PluginDescription": "Visar utökad information om användarenheter som t.ex. tillverkare, modell, typ av enhet mm.",
diff --git a/app/plugins/DevicesDetection/lang/tr.json b/app/plugins/DevicesDetection/lang/tr.json
index 0a5ccaa36..cca9d8e71 100644
--- a/app/plugins/DevicesDetection/lang/tr.json
+++ b/app/plugins/DevicesDetection/lang/tr.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "Kullanıcı uygulaması %1$s olarak algılandı. Bu kullanıcı uygulaması ile yapılan ziyaretler Matomo tarafından varsayılan olarak izlenmeyecek.",
         "BrowserEngine": "Tarayıcı motoru",
         "BrowserEngineDocumentation": "Bu rapor ziyaretçilerin web tarayıcılarının tarayıcı motorlarına göre dağılımını görüntüler. %s Web tasarımcıları için en önemli bilgi ziyaretçilerin kullandığı görüntüleme motorudur. Etiketlerde motorların adı ve yanında köşeli parantez içinde bu motoru en çok kullanan tarayıcı görüntülenir.",
         "BrowserEngines": "Tarayıcı motorları",
diff --git a/app/plugins/DevicesDetection/lang/zh-cn.json b/app/plugins/DevicesDetection/lang/zh-cn.json
index f39336aea..68ff89b15 100644
--- a/app/plugins/DevicesDetection/lang/zh-cn.json
+++ b/app/plugins/DevicesDetection/lang/zh-cn.json
@@ -1,5 +1,6 @@
 {
     "DevicesDetection": {
+        "BotDetected": "此User-Agent被检测为%1$s。 默认情况下，Matomo中不会跟踪此用户代理的默认访问。",
         "BrowserEngine": "浏览器引擎",
         "BrowserEngineDocumentation": "此报表展示访客使用的浏览器核心。%s对网站开发者来说最重要的就是访客使用何种渲染引擎。标签包括引擎名称以及在括号中标注的此引擎最常见浏览器。",
         "BrowserEngines": "浏览器引擎",
@@ -11,6 +12,7 @@
         "CarBrowser": "车用浏览器",
         "Software": "软件",
         "ColumnBrowser": "浏览器",
+        "BrowserCode": "浏览器代码",
         "ColumnOperatingSystem": "操作系统",
         "ColumnOperatingSystemVersion": "操作系统版本",
         "Console": "控制台",
@@ -30,6 +32,7 @@
         "FeaturePhone": "功能手机",
         "OperatingSystemFamilies": "操作系统家族",
         "OperatingSystemFamily": "操作系统家族",
+        "OperatingSystemCode": "操作系统代码",
         "OperatingSystems": "操作系统",
         "OperatingSystemVersions": "操作系统版本",
         "PluginDescription": "提供使用者设备的品牌（制造商）、型号（版本）、类型（电视、手机或电脑等）以及更多扩展信息。",
@@ -37,10 +40,13 @@
         "Smartphone": "智能手机",
         "PortableMediaPlayer": "便携媒体播放器",
         "Devices": "设备",
+        "GenericDevice": "通用%s",
+        "MobileDevice": "移动设备",
         "Tablet": "平板电脑",
         "Phablet": "平板手机",
         "TV": "TV",
         "UserAgent": "用户代理（User-Agent）",
+        "XVisitsFromDevices": "来自%2$s设备的%1$s次访问",
         "WidgetBrowsers": "访客浏览器",
         "WidgetBrowsersDocumentation": "此报表包含访客所用的浏览器信息，每个浏览器版本单独列出。"
     }
diff --git a/app/plugins/DevicesDetection/templates/detection.twig b/app/plugins/DevicesDetection/templates/detection.twig
index 7c10c0abe..399e6434c 100644
--- a/app/plugins/DevicesDetection/templates/detection.twig
+++ b/app/plugins/DevicesDetection/templates/detection.twig
@@ -50,6 +50,12 @@
             <input type="submit" value="{{ 'General_Refresh'|translate }}" class="btn" />
         </form>
 
+        {% if bot_info %}
+
+        <h3>{{ 'DevicesDetection_BotDetected'|translate(bot_info.name) }}</h3>
+
+        {% else %}
+
         <h3>{{ 'DevicesDetection_ColumnOperatingSystem'|translate|e('html_attr') }}</h3>
         <table class="detection" piwik-content-table>
             <tbody>
@@ -103,6 +109,7 @@
             </tr></tbody>
         </table>
 
+        {% endif %}
     </div>
 
     <div class="ui-confirm" id="deviceDetectionItemList">
diff --git a/app/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/app/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
index 73a69b1db..7ce15e635 100644
--- a/app/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
+++ b/app/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
@@ -58,7 +58,8 @@ public function execute()
         $lastRunTime = (int)Option::get(CronArchive::OPTION_ARCHIVING_FINISHED_TS);
         if (empty($lastRunTime)) {
             $comment = $this->translator->translate('Diagnostics_CronArchivingHasNotRun')
-                . '<br/><br/>' . $this->translator->translate('Diagnostics_CronArchivingRunDetails', [$coreArchiveShort, $mailto, $commandToRerun, '', '']);
+                . '<br/><br/>' . $this->translator->translate('Diagnostics_CronArchivingRunDetails',
+                    [$coreArchiveShort, $mailto, $commandToRerun, '<a href="https://matomo.org/docs/setup-auto-archiving/" target="_blank" rel="noreferrer noopener">', '</a>']);;
             return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_ERROR, $comment)];
         }
 
diff --git a/app/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php b/app/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php
new file mode 100644
index 000000000..505f43cb4
--- /dev/null
+++ b/app/plugins/Diagnostics/Diagnostic/FileIntegrityCheck.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\Diagnostics\Diagnostic;
+
+use Piwik\Development;
+use Piwik\FileIntegrity;
+use Piwik\Translation\Translator;
+
+/**
+ * Check the files integrity.
+ */
+class FileIntegrityCheck implements Diagnostic
+{
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function execute()
+    {
+        $label = $this->translator->translate('Installation_SystemCheckFileIntegrity');
+
+        if(Development::isEnabled()) {
+            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, '(Disabled in development mode)'));
+        }
+
+        list($ok, $messages) = FileIntegrity::getFileIntegrityInformation();
+
+        if ($ok) {
+            return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, implode('<br/>', $messages)));
+        }
+
+        $comment = $this->translator->translate('General_FileIntegrityWarning');
+
+        // Keep only the 20 first lines else it becomes unmanageable
+        if (count($messages) > 20) {
+            $messages = array_slice($messages, 0, 20);
+            $messages[] = '...';
+        }
+        $comment .= '<br/><br/><pre style="overflow-x: scroll;max-width: 600px;">'
+            . implode("\n", $messages) . '</pre>';
+
+        return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment));
+    }
+}
diff --git a/app/plugins/Diagnostics/Diagnostic/WriteAccessCheck.php b/app/plugins/Diagnostics/Diagnostic/WriteAccessCheck.php
index 9279b0e7a..45a498f2f 100644
--- a/app/plugins/Diagnostics/Diagnostic/WriteAccessCheck.php
+++ b/app/plugins/Diagnostics/Diagnostic/WriteAccessCheck.php
@@ -91,7 +91,7 @@ private function getDirectories()
 
         if (! DbHelper::isInstalled()) {
             // at install, need /config to be writable (so we can create config.ini.php)
-            $directoriesToCheck[] = '/config/';
+            $directoriesToCheck[] = PIWIK_USER_PATH . '/config/';
         }
 
         return $directoriesToCheck;
diff --git a/app/plugins/Diagnostics/config/config.php b/app/plugins/Diagnostics/config/config.php
index 53b8e2aab..3bf076e01 100644
--- a/app/plugins/Diagnostics/config/config.php
+++ b/app/plugins/Diagnostics/config/config.php
@@ -15,6 +15,7 @@
     ),
     // Diagnostics for recommended features
     'diagnostics.optional' => array(
+        DI\get('Piwik\Plugins\Diagnostics\Diagnostic\FileIntegrityCheck'),
         DI\get('Piwik\Plugins\Diagnostics\Diagnostic\TrackerCheck'),
         DI\get('Piwik\Plugins\Diagnostics\Diagnostic\MemoryLimitCheck'),
         DI\get('Piwik\Plugins\Diagnostics\Diagnostic\TimezoneCheck'),
@@ -26,6 +27,7 @@
         DI\get('Piwik\Plugins\Diagnostics\Diagnostic\NfsDiskCheck'),
         DI\get('Piwik\Plugins\Diagnostics\Diagnostic\CronArchivingCheck'),
         DI\get(CronArchivingLastRunCheck::class),
+        DI\get('Piwik\Plugins\Diagnostics\Diagnostic\LoadDataInfileCheck'),
         Di\get('Piwik\Plugins\Diagnostics\Diagnostic\DbOverSSLCheck'),
         Di\get('Piwik\Plugins\Diagnostics\Diagnostic\DbMaxPacket'),
         Di\get('Piwik\Plugins\Diagnostics\Diagnostic\ForceSSLCheck'),
diff --git a/app/plugins/Diagnostics/config/tracker.php b/app/plugins/Diagnostics/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Diagnostics/config/tracker.php
+++ b/app/plugins/Diagnostics/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Diagnostics/lang/de.json b/app/plugins/Diagnostics/lang/de.json
index 40ca66164..a3e90e0bd 100644
--- a/app/plugins/Diagnostics/lang/de.json
+++ b/app/plugins/Diagnostics/lang/de.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Hier können Sie die Matomo Konfiguration einsehen. Sollten Sie Matomo 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",
+        "DatabaseReaderConnection": "Datenbankleserecht-Verbindung",
         "CronArchivingLastRunCheck": "Letzter erfolgreicher Abschluss der Archivierung",
         "CronArchivingHasNotRun": "Die Archivierung wurde noch nicht erfolgreich abgeschlossen.",
         "CronArchivingHasNotRunInAWhile": "Die Archivierung ist zuletzt am %1$s erfolgreich gelaufen, also vor %2$s.",
diff --git a/app/plugins/Diagnostics/lang/el.json b/app/plugins/Diagnostics/lang/el.json
index e00bf30be..a549c337b 100644
--- a/app/plugins/Diagnostics/lang/el.json
+++ b/app/plugins/Diagnostics/lang/el.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Εδώ μπορείτε να δείτε την παραμετροποίηση του Matomo. Αν εκτελείτε το Matomo σε περιβάλλον μοιραζόμενου φόρτου, η σελίδα ενδέχεται να είναι διαφορετικά ανάλογα με τον διακομιστή από τον οποίο φορτώνεται. Οι γραμμές με διαφορετικό χρώμα υποβάθρου αποτελούν τροποποιημένες τιμές παραμετροποίησης που έχουν οριστεί για παράδειγμα στο αρχείο %1$s.",
         "HideUnchanged": "Αν επιθυμείτε να δείτε μόνο τις τιμές που άλλαξαν, μπορείτε να %1$sαποκρύψετε τις τιμές που παρέμειναν ίδιες%2$s.",
         "Sections": "Τμήματα",
+        "DatabaseReaderConnection": "Σύνδεση Αναγνώστη Βάσης Δεδομένων",
         "CronArchivingLastRunCheck": "Τελευταία Επιτυχής Εκτέλεση Αρχειοθέτησης",
         "CronArchivingHasNotRun": "Η αρχειοθέτηση δεν εκτελέστηκε ακόμη με επιτυχία.",
         "CronArchivingHasNotRunInAWhile": "Η αρχειοθέτηση εκτελέστηκε με επιτυχία στις %1$s που είναι πριν από %2$s.",
diff --git a/app/plugins/Diagnostics/lang/es-ar.json b/app/plugins/Diagnostics/lang/es-ar.json
new file mode 100644
index 000000000..03e990f47
--- /dev/null
+++ b/app/plugins/Diagnostics/lang/es-ar.json
@@ -0,0 +1,18 @@
+{
+    "Diagnostics": {
+        "ConfigFileTitle": "Archivo de configuración",
+        "MysqlMaxPacketSize": "Tamaño máximo del paquete",
+        "MysqlMaxPacketSizeWarning": "Se recomienda configurar el tamaño de \"max_allowed_packet\" en tu base de datos MySQL en al menos %1$s. La configuración actual es de %2$s.",
+        "ConfigFileIntroduction": "Acá podés ver la configuración de Matomo. Si estás ejecutando Matomo en un entorno de carga balanceada, la página podría ser diferente dependiendo desde qué servidor se página esta página. Las filas con diferente fondo de color son valores de configuración cambiadas que están especificadas, por ejemplo, en el archivo %1$s.",
+        "HideUnchanged": "Sí sólo querés ver valores cambiados, podés %1$socultar todos los valores sin cambios%2$s.",
+        "Sections": "Secciones",
+        "DatabaseReaderConnection": "Conexión de lector de base de datos",
+        "CronArchivingLastRunCheck": "Último archivado exitoso",
+        "CronArchivingHasNotRun": "El archivado todavía no se ejecutó exitosamente.",
+        "CronArchivingHasNotRunInAWhile": "El último archivado exitoso se ejecutó el %1$s, lo cual ya tiene %2$s.",
+        "CronArchivingRunDetails": "Por favor, revisá que hayás configurado un crontab llamando al comando de consola %1$s, y que configuraste un %2$s para recibir errores por correo electrónico si el archivado falla. También podés intentar ejecutar el comando de consola para archivar tus informes manualmente: %3$s. %4$sAprendé más.%5$s",
+        "CronArchivingRanSuccessfullyXAgo": "El proceso de archivado se completó exitosamente hace %1$s.",
+        "BrowserTriggeredArchivingEnabled": "Para un rendimiento óptimo y un Matomo rápido, es altamente recomendable establecer un crontab para archivar automáticamente tus informes, y deshabilitar el accionar del navegador web en la configuración de Matomo. %1$sAprendé más%2$s.",
+        "NoDataForReportArchivingNotRun": "El archivado de tus informes no fue ejecutado recientemente. %1$sAprendé más sobre cómo generar tus informes%2$s."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Diagnostics/lang/es.json b/app/plugins/Diagnostics/lang/es.json
index ea3a0211c..4f0cf179f 100644
--- a/app/plugins/Diagnostics/lang/es.json
+++ b/app/plugins/Diagnostics/lang/es.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Aquí puede ver la configuración de Matomo. Si está ejecutando Matomo en un ambiente balanceado puede que la página sea diferente sea por el servidor que la esté cargando. Las filas con un color de fondo diferente son valores de configuración modificados que son especificados por ejemplo en el archivo %1$s.",
         "HideUnchanged": "Si desea ver solo los valores modificados puede %1$socultar todos los valores no modificados%2$s.",
         "Sections": "Secciones",
+        "DatabaseReaderConnection": "Conexión con el lector de la base de datos",
         "CronArchivingLastRunCheck": "Ultimo archivado completado exitosamente.",
         "CronArchivingHasNotRun": "El archivado aún no se ha ejecutado correctamente.",
         "CronArchivingHasNotRunInAWhile": "El último archivado se ejecutó exitosamente en %1$s el cual es %2$s.",
diff --git a/app/plugins/Diagnostics/lang/fr.json b/app/plugins/Diagnostics/lang/fr.json
index 091184759..8b178bc44 100644
--- a/app/plugins/Diagnostics/lang/fr.json
+++ b/app/plugins/Diagnostics/lang/fr.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Ici vous pouvez visualiser la configuration de Matomo. Si vous exécutez Matomo depuis un environnement où la charge est répartie, la page peut être différente en fonction du serveur depuis lequel la page est chargée. Les lignes avec une couleur de fond différentes représentent les valeurs de configuration modifiées qui sont spécifiées par exemple dans le fichier %1$s.",
         "HideUnchanged": "Si vous souhaitez afficher uniquement les valeurs modifiées, vous pouvez cliquer sur %1$smasquer toutes les valeurs inchangées%2$s.",
         "Sections": "Sections",
+        "DatabaseReaderConnection": "Connexion au lecteur de la base de données",
         "CronArchivingLastRunCheck": "Dernière exécution d'archivage réussie",
         "CronArchivingHasNotRun": "L'archivage ne s'est pas encore exécuté avec succès.",
         "CronArchivingHasNotRunInAWhile": "L'archivage s'est exécuté avec succès le %1$s soit il y a %2$s.",
diff --git a/app/plugins/Diagnostics/lang/it.json b/app/plugins/Diagnostics/lang/it.json
index 80e75b37b..89db0c1c8 100644
--- a/app/plugins/Diagnostics/lang/it.json
+++ b/app/plugins/Diagnostics/lang/it.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Qui puoi vedere la configurazione di Matomo. Se si esegue Matomo in un ambiente con bilanciamento del carico, la pagina potrebbe essere diversa a seconda del server su cui viene caricata. Righe con un colore di sfondo diverso hanno valori di configurazione cambiati, specificati per esempio nel file %1$s.",
         "HideUnchanged": "Se vuoi vedere soltanto i valori cambiati, puoi %1$snascondere tutti quelli che non sono cambiati%2$s.",
         "Sections": "Sezioni",
+        "DatabaseReaderConnection": "Connessione al Lettore del Database",
         "CronArchivingLastRunCheck": "Ultima Archiviazione Completata con Successo",
         "CronArchivingHasNotRun": "L'archiviazione non è ancora stata eseguita con successo.",
         "CronArchivingHasNotRunInAWhile": "L'ultima archiviazione è stata eseguita con successo il %1$s, cioè %2$s fa.",
diff --git a/app/plugins/Diagnostics/lang/ja.json b/app/plugins/Diagnostics/lang/ja.json
index eb8fbc139..cf65ff367 100644
--- a/app/plugins/Diagnostics/lang/ja.json
+++ b/app/plugins/Diagnostics/lang/ja.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "ここで Matomo の設定を見ることができます。 負荷分散環境で Matomo を実行している場合、このページがどのサーバーからロードされるかによってページが異なる場合があります。 背景色が異なる行は、 %1$sファイルなどで指定されている構成値が変更されます。",
         "HideUnchanged": "変更された値だけを表示する場合は、%1$s変更されていない値をすべて非表示にすることができます。%2$s",
         "Sections": "セクション",
+        "DatabaseReaderConnection": "データベースリーダー接続",
         "CronArchivingLastRunCheck": "最後に正常に完了したアーカイブ",
         "CronArchivingHasNotRun": "アーカイブはまだ正常に実行されていません。",
         "CronArchivingHasNotRunInAWhile": "アーカイブは、 %2$s 前の %1$s で正常に実行されました。",
diff --git a/app/plugins/Diagnostics/lang/pt-br.json b/app/plugins/Diagnostics/lang/pt-br.json
index 7279f06f5..91e19f2d6 100644
--- a/app/plugins/Diagnostics/lang/pt-br.json
+++ b/app/plugins/Diagnostics/lang/pt-br.json
@@ -1,7 +1,18 @@
 {
     "Diagnostics": {
         "ConfigFileTitle": "Arquivo de configuração",
+        "MysqlMaxPacketSize": "Tamanho máximo de pacote",
+        "MysqlMaxPacketSizeWarning": "É recomendado configurar um tamanho máximo de pacote (max_allowed_packet) no seu banco de dados MySQL de pelo menos %1$s. Atualmente está configurado %2$s.",
+        "ConfigFileIntroduction": "Aqui você pode ver a configuração do Matomo. Se você estiver rodando o Matomo em um ambiente com balanceamento de carga, a página pode estar diferente dependendo de qual servidor esta página é carregada. Linhas com diferentes cores de fundo são valores de configuração alterados que estão especificados 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"
+        "Sections": "Seções",
+        "DatabaseReaderConnection": "Conexão do leitor de banco de dados",
+        "CronArchivingLastRunCheck": "Última conclusão de arquivamento com sucesso",
+        "CronArchivingHasNotRun": "O arquivamento ainda não foi realizado com sucesso.",
+        "CronArchivingHasNotRunInAWhile": "O último arquivamento realizado com sucesso foi em %1$s que é %2$s atrás.",
+        "CronArchivingRunDetails": "Favor checar que há um agendamento crontab chamando o %1$sconsole de comandos, e que há um %2$s configurado para receber erros por email se o arquivamento falhar. Você também pode tentar rodar o console de comandos para arquivar seus relatórios manualmente: %3$s. %4$sSaiba mais.%5$s",
+        "CronArchivingRanSuccessfullyXAgo": "O processo de arquivamento foi completado com sucesso %1$s atrás.",
+        "BrowserTriggeredArchivingEnabled": "Para uma performance ótima e um Matomo veloz, é altamente recomendável definir um crontab para automaticamente arquivar seus relatórios, e desabilitar o acionamento de navegador nas configurações do Matomo. %1$sSaiba mais.%2$s",
+        "NoDataForReportArchivingNotRun": "O arquivamento de seus relatórios não foi executado recentemente. %1$sSaiba mais sobre como gerar seus relatórios.%2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Diagnostics/lang/pt.json b/app/plugins/Diagnostics/lang/pt.json
index c87327ab3..4c980dbbd 100644
--- a/app/plugins/Diagnostics/lang/pt.json
+++ b/app/plugins/Diagnostics/lang/pt.json
@@ -3,7 +3,16 @@
         "ConfigFileTitle": "Ficheiro de configuração",
         "MysqlMaxPacketSize": "Tamanho máximo do pacote",
         "MysqlMaxPacketSizeWarning": "É recomendável a configuração de um tamanho de pacote 'max_allowed_packet' na sua base de dados MySQL de, pelo menos, %1$s. Atualmente está configurado como %2$s.",
+        "ConfigFileIntroduction": "Aqui, pode consultar a configuração do Matomo. Se estiver a executar o Matomo num ambiente distribuído, a página pode ser diferente mediante o servidor a partir do qual foi carregada. As linhas com uma cor de fundo diferente são valores alterados de configuração especificados, por exemplo, no ficheiro %1$s.",
         "HideUnchanged": "Se quiser ver apenas os valores alterados, pode %1$socultar todos os valores inalterados%2$s.",
-        "Sections": "Secções"
+        "Sections": "Secções",
+        "DatabaseReaderConnection": "Ligação do leitor da base de dados",
+        "CronArchivingLastRunCheck": "Última conclusão do processo de arquivamento",
+        "CronArchivingHasNotRun": "O arquivamento ainda não foi executado com sucesso.",
+        "CronArchivingHasNotRunInAWhile": "O arquivamento foi executado com sucesso pela última a %1$s há %2$s.",
+        "CronArchivingRunDetails": "Por favor confirme que configurou um crontab a invocar o comando da consola %1$s e que configurou um %2$s para receber erros por e-mail se o arquivamento falhar. Pode também tentar executar o comando na consola para arquivar os seus relatórios manualmente: %3$s. %4$sSaber mais.%5$s",
+        "CronArchivingRanSuccessfullyXAgo": "O processo de arquivamento concluído com sucesso há %1$s.",
+        "BrowserTriggeredArchivingEnabled": "Para um Matomo rápido e com uma boa performance, é altamente recomendado que configure um crontab para arquivar automaticamente os seus relatórios e desativar a execução do arquivamento através do navegador nas definições do Matomo. %1$sSaber mais.%2$s",
+        "NoDataForReportArchivingNotRun": "O arquivamento dos seus relatórios não foi executado recentemente. %1$sSaber mais sobre como gerar os seus relatórios.%2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Diagnostics/lang/sq.json b/app/plugins/Diagnostics/lang/sq.json
index b986912ea..5c29c045d 100644
--- a/app/plugins/Diagnostics/lang/sq.json
+++ b/app/plugins/Diagnostics/lang/sq.json
@@ -2,10 +2,11 @@
     "Diagnostics": {
         "ConfigFileTitle": "Kartelë formësimesh",
         "MysqlMaxPacketSize": "Maksimum Madhësie Paketi",
-        "MysqlMaxPacketSizeWarning": "Këshillohet të formësoni te baza juaj e të dhënave MySQL një madhësi 'max_allowed_packet' size të paktën %1$s. Formësimi i tanishëm për të është %2$s.",
+        "MysqlMaxPacketSizeWarning": "Këshillohet të formësoni te baza juaj e të dhënave MySQL një madhësi 'max_allowed_packet' të paktën %1$s. Formësimi i tanishëm për të është %2$s.",
         "ConfigFileIntroduction": "Këtu mund të shihni formësimin e Matomo-s. Nëse Matomo-n e xhironi në një mjedis me ngarkesë të balancuar, faqja mund të jetë ndryshe, varet se nga cili shërbyes ngarkohet faqja. Rreshtat me një ngjyrë tjetër për sfondin përfaqësojnë vlera formësimi që janë dhënë si shembull te kartela %1$s.",
         "HideUnchanged": "Nëse dëshironi të shihni vetëm vlerat e ndryshuara, mund të %1$sfshihni krejt vlerat e pandryshuara%2$s.",
         "Sections": "Ndarje",
+        "DatabaseReaderConnection": "Lidhje Leximi Baze të Dhënash",
         "CronArchivingLastRunCheck": "Plotësimi i Fundit i Suksesshëm i Arkivimit",
         "CronArchivingHasNotRun": "Arkivimi ende s’është xhiruar me sukses.",
         "CronArchivingHasNotRunInAWhile": "Hera e fundit që arkivimi u bë me sukses qe më %1$s, që do të thotë %2$s më parë.",
diff --git a/app/plugins/Diagnostics/lang/tr.json b/app/plugins/Diagnostics/lang/tr.json
index 79f0f5aca..5748def81 100644
--- a/app/plugins/Diagnostics/lang/tr.json
+++ b/app/plugins/Diagnostics/lang/tr.json
@@ -6,6 +6,7 @@
         "ConfigFileIntroduction": "Matomo ayarları bu bölümde görülebilir. Matomo yazılımını yük dengeleme yapılan bir ortamda kullanıyorsanız sayfadaki bilgiler yüklendiği sunucuya göre değişiklik gösterebilir. %1$s dosyasındaki örnek dosyada belirtilen değerlere göre değiştirilmiş olan satırlar farklı art alan renginde görüntülenir.",
         "HideUnchanged": "Yalnız değiştirilmiş değerlerin görüntülenmesi için %1$sdeğiştirilmemiş tüm değerleri gizleyin%2$s.",
         "Sections": "Bölümler",
+        "DatabaseReaderConnection": "Veritabanı Okuyucu Bağlantısı",
         "CronArchivingLastRunCheck": "Son Tamamlanmış Arşivleme İşlemi",
         "CronArchivingHasNotRun": "Henüz tamamlanmış bir arşivleme işlemi yapılmamış.",
         "CronArchivingHasNotRunInAWhile": "Son tamamlanmış arşivleme işlemi %1$s tarihinde %2$s önce yapılmış.",
diff --git a/app/plugins/Diagnostics/lang/zh-cn.json b/app/plugins/Diagnostics/lang/zh-cn.json
index 38bb79256..6570235a8 100644
--- a/app/plugins/Diagnostics/lang/zh-cn.json
+++ b/app/plugins/Diagnostics/lang/zh-cn.json
@@ -1,7 +1,18 @@
 {
     "Diagnostics": {
         "ConfigFileTitle": "配置文件",
+        "MysqlMaxPacketSize": "最大包大小",
+        "MysqlMaxPacketSizeWarning": "建议在您的MySQL数据库中配置至少%1$s的'max_allowed_packet'大小。 配置目前为%2$s。",
+        "ConfigFileIntroduction": "在这里，您可以查看Matomo配置。 如果您在负载平衡环境中运行Matomo，则页面可能会有所不同，具体取决于加载此页面的服务器。 具有不同背景颜色的行是更改的配置值，例如在%1$s文件中指定。",
         "HideUnchanged": "如果只想看改变的值可以%1$s，隐藏所有为改变的值%2$s。",
-        "Sections": "部分"
+        "Sections": "部分",
+        "DatabaseReaderConnection": "数据库读取器连接",
+        "CronArchivingLastRunCheck": "上次成功完成归档",
+        "CronArchivingHasNotRun": "存档尚未成功运行。",
+        "CronArchivingHasNotRunInAWhile": "归档最后一次在%1$s上成功运行，这是%2$s之前。",
+        "CronArchivingRunDetails": "请检查您是否设置了调用%1$s控制台命令的crontab，并且如果存档失败，您已配置%2$s以通过电子邮件接收错误。 您还可以尝试运行console命令手动存档报告：%3$s。 %4$s了解更多。%5$s",
+        "CronArchivingRanSuccessfullyXAgo": "归档过程已成功完成%1$s之前。",
+        "BrowserTriggeredArchivingEnabled": "为了获得最佳性能和快速的Matomo，强烈建议您设置crontab以自动存档报告，并在Matomo设置中禁用浏览器触发。 %1$s了解更多。%2$s",
+        "NoDataForReportArchivingNotRun": "最近没有执行您的报告存档，%1$s更多关于如何生成报告。%2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Diagnostics/lang/zh-tw.json b/app/plugins/Diagnostics/lang/zh-tw.json
index 6623cbc4f..1dfc71cb5 100644
--- a/app/plugins/Diagnostics/lang/zh-tw.json
+++ b/app/plugins/Diagnostics/lang/zh-tw.json
@@ -4,6 +4,13 @@
         "MysqlMaxPacketSize": "最大封包大小",
         "MysqlMaxPacketSizeWarning": "推薦將 MySQL 資料庫中的「max_allowed_packet」值至少設定為 %1$s。目前的設定為 %2$s。",
         "HideUnchanged": "如果你只想看有變更過值的設定，你可以%1$s隱藏未修改的值%2$s。",
-        "Sections": "分區"
+        "Sections": "分區",
+        "CronArchivingLastRunCheck": "上次成功彙整報表的時間",
+        "CronArchivingHasNotRun": "報表尚未成功彙整過。",
+        "CronArchivingHasNotRunInAWhile": "上次於 %1$s 時成功彙整了報表 ( %2$s 之前 )",
+        "CronArchivingRunDetails": "請你檢查是否已經設定了 crontab 工作排程指令 %1$s，且已設定了 %2$s 以便在報表彙整失敗時可以收到信件。你也能試著執行此指令來手動彙整報表：%3$s。%4$s了解更多。%5$s",
+        "CronArchivingRanSuccessfullyXAgo": "報表彙整程序於 %1$s 時執行成功。",
+        "BrowserTriggeredArchivingEnabled": "為使 Matomo 能最佳化，我們強烈建議你設定 crontab 工作排程來自動彙整你的報告，且在 Matomo 一般設定內關閉瀏覽器的自動觸發彙整。%1$s 了解更多。%2$s",
+        "NoDataForReportArchivingNotRun": "你最近尚未執行彙整報表，%1$s 了解如何產生你的報表。%2$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Ecommerce/config/config.php b/app/plugins/Ecommerce/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Ecommerce/config/config.php
+++ b/app/plugins/Ecommerce/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Ecommerce/config/tracker.php b/app/plugins/Ecommerce/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Ecommerce/config/tracker.php
+++ b/app/plugins/Ecommerce/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Ecommerce/lang/da.json b/app/plugins/Ecommerce/lang/da.json
index 5590f3429..7d169d397 100644
--- a/app/plugins/Ecommerce/lang/da.json
+++ b/app/plugins/Ecommerce/lang/da.json
@@ -1,7 +1,18 @@
 {
     "Ecommerce": {
+        "PluginDescription": "E-handel giver dig mulighed for at tracke når brugere tilføjer produkter til indkøbskurve og når de konvertere til et e-handel salg. Track tillige visning af produktkategorier og efterladte indkøbskurve.",
         "Sales": "Salg",
+        "Order": "Ordre",
+        "OrderId": "Ordre ID",
+        "Orders": "Ordrer",
         "SalesBy": "Salg af %s",
-        "SalesAdjective": "Salg %s"
+        "SalesAdjective": "Salg %s",
+        "NumberOfItems": "Antal elementer i indkøbskurv",
+        "OrderValue": "Ordreværdi",
+        "LifeTimeValue": "E-handel livstidsværdi",
+        "LifeTimeValueDescription": "Den totale e-handel omsætning tilskrevet denne kunde på tværs af alle besøg: Summen af omsætningen af alle e-handelordrer for Besøg ID %s",
+        "VisitorProfileLTV": "Genererede en livstidsomsætning på %1$s.",
+        "VisitorProfileItemsAndOrders": "Købt %1$s varer i %2$s e-handelordrer.",
+        "VisitorProfileAbandonedCartSummary": "Forladte %1$s indkøbskurve inkusiv %2$s varer til en værdi på i alt %3$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Ecommerce/lang/es-ar.json b/app/plugins/Ecommerce/lang/es-ar.json
index 7ecefa1c6..dbe984f3b 100644
--- a/app/plugins/Ecommerce/lang/es-ar.json
+++ b/app/plugins/Ecommerce/lang/es-ar.json
@@ -1,8 +1,14 @@
 {
     "Ecommerce": {
+        "PluginDescription": "eCommerce te permite hacer un seguimiento de los usuarios al agregar productos a sus changuitos, y cuando realizan una compra en línea. También hace un seguimiento de los productos y las vistas de categorías de productos, así como los changuitos abandonados.",
         "Sales": "Ventas",
+        "Order": "Orden",
+        "OrderId": "Identificación de la orden",
+        "Orders": "Órdenes",
         "SalesBy": "Ventas por %s",
         "SalesAdjective": "Ventas %s",
+        "NumberOfItems": "Números de elementos en el changuito",
+        "OrderValue": "Valor de la orden",
         "LifeTimeValue": "Valor de vida útil de eCommerce",
         "LifeTimeValueDescription": "Los ingresos totales de eCommerce atribuidos a este consumidor en todas sus visitas: la suma de todas las órdenes de eCommerce para el visitante con identificación %s.",
         "VisitorProfileLTV": "Generó un ingreso útil de %1$s.",
diff --git a/app/plugins/Ecommerce/lang/pt.json b/app/plugins/Ecommerce/lang/pt.json
index 14bf6a90f..89b34b390 100644
--- a/app/plugins/Ecommerce/lang/pt.json
+++ b/app/plugins/Ecommerce/lang/pt.json
@@ -1,7 +1,9 @@
 {
     "Ecommerce": {
+        "PluginDescription": "O comércio eletrónico permite-lhe acompanhar quando os utilizadores adicionam produtos a carrinhos, e quando estes são convertidos em vendas de comércio eletrónico. Ainda, permite acompanhar visualizações de produtos e de categorias de produtos e carrinhos abandonados.",
         "Sales": "Vendas",
         "Order": "Pedido",
+        "OrderId": "ID do pedido",
         "Orders": "Pedidos",
         "SalesBy": "Vendas por %s",
         "SalesAdjective": "%s vendas",
diff --git a/app/plugins/Ecommerce/lang/zh-cn.json b/app/plugins/Ecommerce/lang/zh-cn.json
index e24d970b9..0a5611f27 100644
--- a/app/plugins/Ecommerce/lang/zh-cn.json
+++ b/app/plugins/Ecommerce/lang/zh-cn.json
@@ -1,8 +1,14 @@
 {
     "Ecommerce": {
+        "PluginDescription": "电子商务使您可以跟踪用户何时将产品添加到购物车以及何时将其转换为电子商务销售。 还可以跟踪产品和产品类别视图以及废弃的购物车。",
         "Sales": "销售",
+        "Order": "订单",
+        "OrderId": "订单编号",
+        "Orders": "订单管理",
         "SalesBy": "由%s销售",
         "SalesAdjective": "销售%s",
+        "NumberOfItems": "购物车中的物品数",
+        "OrderValue": "订单价格",
         "LifeTimeValue": "电商终生价值",
         "LifeTimeValueDescription": "电子商务总收入由此客户的全部行为而来：访客编码%s的所有电商订单的收入总和。",
         "VisitorProfileLTV": "生成一个%1$s的终生收入。",
diff --git a/app/plugins/Events/Archiver.php b/app/plugins/Events/Archiver.php
index bfa4813e3..21d1eaae9 100644
--- a/app/plugins/Events/Archiver.php
+++ b/app/plugins/Events/Archiver.php
@@ -174,13 +174,12 @@ protected function aggregateDayEvents()
                     log_link_visit_action.idaction_event_action,
                     log_link_visit_action.idaction_name";
 
-        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC";
+        $orderBy = "`" . Metrics::INDEX_NB_VISITS . "` DESC, `eventName`";
 
         $rankingQueryLimit = ArchivingHelper::getRankingQueryLimit();
         $rankingQuery = null;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn(array('eventCategory', 'eventAction', 'eventName'));
             $rankingQuery->addColumn(array(Metrics::INDEX_NB_UNIQ_VISITORS));
             $rankingQuery->addColumn(array(Metrics::INDEX_EVENT_NB_HITS, Metrics::INDEX_NB_VISITS, Metrics::INDEX_EVENT_NB_HITS_WITH_VALUE), 'sum');
diff --git a/app/plugins/Events/config/config.php b/app/plugins/Events/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Events/config/config.php
+++ b/app/plugins/Events/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Events/config/tracker.php b/app/plugins/Events/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Events/config/tracker.php
+++ b/app/plugins/Events/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Events/lang/da.json b/app/plugins/Events/lang/da.json
index baef70688..03e6d628f 100644
--- a/app/plugins/Events/lang/da.json
+++ b/app/plugins/Events/lang/da.json
@@ -4,6 +4,7 @@
         "AvgEventValue": "Gennemsnitlig værdi for hændelsen er: %s",
         "AvgValue": "Gennemsnitsværdi",
         "AvgValueDocumentation": "Gennemsnittet af alle værdier for denne hændelse",
+        "Category": "Kategori",
         "Event": "Hændelse",
         "EventAction": "Hændelsesaktion",
         "EventActions": "Hændelsesforløb",
diff --git a/app/plugins/Events/lang/es-ar.json b/app/plugins/Events/lang/es-ar.json
index d52a5c400..2efd567b7 100644
--- a/app/plugins/Events/lang/es-ar.json
+++ b/app/plugins/Events/lang/es-ar.json
@@ -1,9 +1,35 @@
 {
     "Events": {
-        "Event": "Event",
-        "EventAction": "Event Action",
-        "EventCategory": "Event Category",
-        "EventName": "Event Name",
-        "Events": "Events"
+        "PluginDescription": "Rastreá eventos y obtené informes de la actividad de tus visitantes.",
+        "AvgEventValue": "El valor promedio del evento es: %s",
+        "AvgValue": "Valor promedio",
+        "AvgValueDocumentation": "El promedio de todos los valores para este evento",
+        "Category": "Categoria",
+        "Event": "Evento",
+        "EventAction": "Acción del evento",
+        "EventActions": "Acciones del evento",
+        "EventCategories": "Categorías del evento",
+        "EventCategory": "Categoría del evento",
+        "EventName": "Nombre del evento",
+        "EventNames": "Nombres del evento",
+        "EventUrl": "Dirección web del evento",
+        "EventUrls": "Direcciones web del evento",
+        "Events": "Eventos",
+        "EventsWithValue": "Eventos con un valor",
+        "EventsWithValueDocumentation": "Número de eventos en el cual se estableció un valor de evento",
+        "EventValue": "Valor del evento",
+        "EventValueTooltip": "El valor total del evento es la suma de los %1$svalores de eventos%2$s entre un mínimo de %3$s y un máximo de %4$s.",
+        "MaxValue": "Valor máximo del evento",
+        "MaxValueDocumentation": "El valor máximo para este evento",
+        "MinValue": "Valor mínimo del evento",
+        "MinValueDocumentation": "El valor mínimo para este evento",
+        "SecondaryDimension": "La dimensión secundaria es %s.",
+        "SwitchToSecondaryDimension": "Cambiar a %s",
+        "TopEvents": "Eventos principales",
+        "TotalEvents": "Eventos totales",
+        "TotalEventsDocumentation": "Número total de eventos",
+        "TotalValue": "Valor del evento",
+        "TotalValueDocumentation": "La suma de los valores del evento",
+        "ViewEvents": "Ver eventos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Events/lang/zh-cn.json b/app/plugins/Events/lang/zh-cn.json
index 1e5111534..ba806aa38 100644
--- a/app/plugins/Events/lang/zh-cn.json
+++ b/app/plugins/Events/lang/zh-cn.json
@@ -1,11 +1,35 @@
 {
     "Events": {
+        "PluginDescription": "跟踪活动并获取有关访客活动的报告。",
+        "AvgEventValue": "平均事件值为：%s",
         "AvgValue": "平均值",
+        "AvgValueDocumentation": "此事件的所有值的平均值",
+        "Category": "类别",
         "Event": "事件",
         "EventAction": "事件行为",
+        "EventActions": "事件动作",
+        "EventCategories": "事件类别",
         "EventCategory": "事件分类",
         "EventName": "事件名字",
         "EventNames": "事件名称",
-        "Events": "事件"
+        "EventUrl": "事件网址",
+        "EventUrls": "更多事件网址",
+        "Events": "事件",
+        "EventsWithValue": "有价值的事件",
+        "EventsWithValueDocumentation": "设置事件值的事件数",
+        "EventValue": "事件值",
+        "EventValueTooltip": "总事件值是最小值%3$s和最大值%4$s之间的%1$s事件值%2$s之和。",
+        "MaxValue": "最大事件值",
+        "MaxValueDocumentation": "此事件的最大值",
+        "MinValue": "最小事件值",
+        "MinValueDocumentation": "此事件的最小值",
+        "SecondaryDimension": "次要维度为%s。",
+        "SwitchToSecondaryDimension": "切换到%s",
+        "TopEvents": "热门活动",
+        "TotalEvents": "总事件",
+        "TotalEventsDocumentation": "事件总数",
+        "TotalValue": "事件值",
+        "TotalValueDocumentation": "事件值的总和",
+        "ViewEvents": "查看活动"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/Controller.php b/app/plugins/Feedback/Controller.php
index a72754264..97c5469d9 100644
--- a/app/plugins/Feedback/Controller.php
+++ b/app/plugins/Feedback/Controller.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Feedback;
 
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -24,6 +25,8 @@ function index()
     {
         $view = new View('@Feedback/index');
         $this->setGeneralVariablesView($view);
+        $popularHelpTopics = StaticContainer::get('popularHelpTopics');
+        $view->popularHelpTopics = $popularHelpTopics;
         $view->piwikVersion = Version::VERSION;
         return $view->render();
     }
diff --git a/app/plugins/Feedback/Feedback.php b/app/plugins/Feedback/Feedback.php
index e9f1ca19c..834cff1c0 100644
--- a/app/plugins/Feedback/Feedback.php
+++ b/app/plugins/Feedback/Feedback.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Feedback;
 
+use Piwik\Common;
 use Piwik\Date;
 use Piwik\Option;
 use Piwik\Piwik;
@@ -63,6 +64,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'Feedback_PleaseLeaveExternalReviewForMatomo';
         $translationKeys[] = 'Feedback_RemindMeLater';
         $translationKeys[] = 'Feedback_NeverAskMeAgain';
+        $translationKeys[] = 'Feedback_SearchOnMatomo';
         $translationKeys[] = 'General_Ok';
         $translationKeys[] = 'General_Cancel';
     }
@@ -82,6 +84,11 @@ public function getShouldPromptForFeedback()
             return false;
         }
 
+        // Hide Feedback popup in all tests except if forced
+        if ($this->isDisabledInTestMode()) {
+            return false;
+        }
+
         $login = Piwik::getCurrentUserLogin();
         $feedbackReminderKey = 'Feedback.nextFeedbackReminder.' . Piwik::getCurrentUserLogin();
         $nextReminderDate = Option::get($feedbackReminderKey);
@@ -90,15 +97,13 @@ public function getShouldPromptForFeedback()
             return false;
         }
 
-        if (empty($nextReminderDate)) {
-            if (!empty($user['date_registered']) ){
-
-                $model = new Model();
-                $user = $model->getUser($login);
-                $nextReminderDate = Date::factory($user['date_registered'])->addDay(90)->getStartOfDay();
-            } else {
+        if ($nextReminderDate === false) {
+            $model = new Model();
+            $user = $model->getUser($login);
+            if (empty($user['date_registered'])) {
                 return false;
             }
+            $nextReminderDate = Date::factory($user['date_registered'])->addDay(90)->getStartOfDay();
         } else {
             $nextReminderDate = Date::factory($nextReminderDate);
         }
@@ -107,4 +112,10 @@ public function getShouldPromptForFeedback()
         return $nextReminderDate->getTimestamp() <= $now;
     }
 
+    // needs to be protected not private for testing purpose
+    protected function isDisabledInTestMode()
+    {
+        return defined('PIWIK_TEST_MODE') && PIWIK_TEST_MODE && !Common::getRequestVar('forceFeedbackTest', false);
+    }
+
 }
diff --git a/app/plugins/Feedback/config/config.php b/app/plugins/Feedback/config/config.php
index d0743b871..2261fb951 100644
--- a/app/plugins/Feedback/config/config.php
+++ b/app/plugins/Feedback/config/config.php
@@ -1,3 +1,9 @@
 <?php
-return array();
-?>
+return array(
+    'popularHelpTopics' => array(
+        array('title' => 'Feedback_NotTrackingVisits', 'url' => 'https://matomo.org/faq/troubleshooting/faq_58/'),
+        array('title' => 'Feedback_TrackMultipleSites', 'url' => 'https://matomo.org/faq/troubleshooting/faq_104/'),
+        array('title' => 'Feedback_RemoveOtherLabel', 'url' => 'https://matomo.org/faq/troubleshooting/faq_54/'),
+        array('title' => 'Feedback_PurgeOldData', 'url' => 'https://matomo.org/faq/troubleshooting/faq_42/'),
+    )
+);
diff --git a/app/plugins/Feedback/config/tracker.php b/app/plugins/Feedback/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Feedback/config/tracker.php
+++ b/app/plugins/Feedback/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/ar.json b/app/plugins/Feedback/lang/ar.json
index efcafcbe9..ee3432f99 100644
--- a/app/plugins/Feedback/lang/ar.json
+++ b/app/plugins/Feedback/lang/ar.json
@@ -5,6 +5,7 @@
         "LearnWaysToParticipate": "تعرف على كافة الطرق التي يمكنك %1$s المساهمة %2$s بها.",
         "ManuallySendEmailTo": "الرجاء إرسال رسالتك يدوياً إلى",
         "SendFeedback": "أرسل التغذية الراجعة",
-        "ThankYou": "شكراً لمساعدتك في جعل Matomo أفضل!"
+        "ThankYou": "شكراً لمساعدتك في جعل Matomo أفضل!",
+        "Forums": "المنتديات"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/bg.json b/app/plugins/Feedback/lang/bg.json
index 97e865b6d..0bda26fde 100644
--- a/app/plugins/Feedback/lang/bg.json
+++ b/app/plugins/Feedback/lang/bg.json
@@ -7,6 +7,7 @@
         "RateFeatureThankYouTitle": "Благодарим ви, че оценихте '%s'!",
         "SendFeedback": "Изпрати съобщението",
         "ThankYou": "Благодаря, че помогнахте да направим Matomo по-добър!",
-        "TopLinkTooltip": "Може да ни кажете какво мислите, както и да изискате професионална помощ."
+        "TopLinkTooltip": "Може да ни кажете какво мислите, както и да изискате професионална помощ.",
+        "Forums": "Форуми"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/ca.json b/app/plugins/Feedback/lang/ca.json
index 320a16598..d97350d91 100644
--- a/app/plugins/Feedback/lang/ca.json
+++ b/app/plugins/Feedback/lang/ca.json
@@ -6,6 +6,7 @@
         "ManuallySendEmailTo": "Siusplau envia el vostre missatge manualmetn a",
         "SendFeedback": "Enviar Feedback",
         "ThankYou": "Gràcies per ajudar-nos a fer el Matomo millor!",
-        "TopLinkTooltip": "Digue'ns que en penses o demana suport Professional."
+        "TopLinkTooltip": "Digue'ns que en penses o demana suport Professional.",
+        "Forums": "Fòrums"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/cs.json b/app/plugins/Feedback/lang/cs.json
index 2c6a9fa4c..8ed8bf3a8 100644
--- a/app/plugins/Feedback/lang/cs.json
+++ b/app/plugins/Feedback/lang/cs.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "Naučte se, jak konfigurovat Matomo a efektivně analyzovat data s našimi %1$suživatelskými příručkami%2$s",
         "CommunityHelp": "Komunitní pomoc",
         "ProfessionalHelp": "Profesionální pomoc",
-        "ProfessionalServicesIntro": "Naše celosvětová síť profesionálních Matomo konzultantů podporuje klienty, kteří hostují Matomo na vlastní infrastruktuře.",
         "ProfessionalServicesOfferIntro": "Ze kterých služeb můžete profitovat?",
-        "ProfessionalServicesReviewPiwikSetup": "Kontrola vaší instalace Matomou",
-        "ProfessionalServicesOptimizationMaintenance": "Služby optimalizace a údržby Matomou",
-        "ProfessionalServicesPhoneEmailSupport": "Telefonická a emailová podpora",
-        "ProfessionalServicesTraining": "Školení uživatelů, techniků a vývoářů",
-        "ProfessionalServicesPremiumFeatures": "Prémiové funkce",
-        "ProfessionalServicesCustomDevelopment": "Vývojářské služby na míru",
-        "ProfessionalServicesAnalystConsulting": "Služby konzultace analytika",
         "ContactUs": "Kontaktujte nás",
-        "VisitTheForums": "Navštivte %1$s fóra%2$s a nechte si pomoci komunitou uživatelů aplikace Matomo"
+        "VisitTheForums": "Navštivte %1$s fóra%2$s a nechte si pomoci komunitou uživatelů aplikace Matomo",
+        "Forums": "Fóra"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/da.json b/app/plugins/Feedback/lang/da.json
index c5160dfe7..a91eff61c 100644
--- a/app/plugins/Feedback/lang/da.json
+++ b/app/plugins/Feedback/lang/da.json
@@ -17,17 +17,11 @@
         "TopLinkTooltip": "Fortæl os hvad du mener eller anmod om professionel support",
         "ViewAnswersToFAQ": "Se svarene på %1$sOfte stillede spørgsmål%2$s",
         "ViewUserGuides": "Lær at konfigurere Matomo og hvordan man effektivt analyserer data med vores %1$sbrugervejledninger%2$s",
+        "CommunityHelp": "Community hjælp",
         "ProfessionalHelp": "Professionel hjælp",
-        "ProfessionalServicesIntro": "Vores verdensomspændende netværk af profesionelle Matomo-konsulenter hjælper kunder, der hoster Matomo i egen infrastruktur.",
         "ProfessionalServicesOfferIntro": "Hvilke ydelser kan du gøre brug af?",
-        "ProfessionalServicesReviewPiwikSetup": "En gennemgang af din Matomo-installation",
-        "ProfessionalServicesOptimizationMaintenance": "Optimering og vedligehold",
-        "ProfessionalServicesPhoneEmailSupport": "Telefon- og e-mailsupport",
-        "ProfessionalServicesTraining": "Oplæring af brugere, teknikere og udviklere",
-        "ProfessionalServicesPremiumFeatures": "Betalte funktioner",
-        "ProfessionalServicesCustomDevelopment": "Kundespecifik udvikling",
-        "ProfessionalServicesAnalystConsulting": "Analysekonsulentydelser",
         "ContactUs": "Kontakt os",
-        "VisitTheForums": "Besøg %1$sforummet%2$s og få hjælp fra andre Matomo-brugere"
+        "VisitTheForums": "Besøg %1$sforummet%2$s og få hjælp fra andre Matomo-brugere",
+        "Forums": "Forum"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/de.json b/app/plugins/Feedback/lang/de.json
index 0be7ead2a..7b5a2201d 100644
--- a/app/plugins/Feedback/lang/de.json
+++ b/app/plugins/Feedback/lang/de.json
@@ -16,23 +16,32 @@
         "ThankYou": "Danke für Ihre Unterstützung, Matomo zu verbessern!",
         "TopLinkTooltip": "Teilen Sie uns Ihre Meinung mit, oder fordern professionelle Unterstützung an.",
         "ViewAnswersToFAQ": "Antworten zu %1$sFrequently Asked Questions%2$s ansehen",
+        "FAQs": "FAQs",
         "ViewUserGuides": "Lernen Sie mithilfe unseres %1$sBenutzerhandbuches%2$s, wie Sie Matomo konfigurieren können und wie Sie effektiv Ihre Daten analysieren.",
+        "UserGuides": "Benutzeranleitungen",
         "CommunityHelp": "Hilfe aus der Community",
         "ProfessionalHelp": "Professionelle Hilfe",
-        "ProfessionalServicesIntro": "Unser weltweites Netzwerk von professionellen Beratern für Matomo unterstützt Kunden die Matomo auf ihrer eigenen Infrastruktur betreiben wollen.",
+        "ProfessionalServicesIntro": "Mit einem Matomo On-Premise Support Abonnement erhalten Sie online Unterstützung durch unser erfahrenes Team bei der Verwendung von Matomo Analytics.",
         "ProfessionalServicesOfferIntro": "Von welchen Diensten können Sie profitieren?",
-        "ProfessionalServicesReviewPiwikSetup": "Eine Überprüfung Ihrer Matomo-Installation",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo-Optimierung & -Wartung",
-        "ProfessionalServicesPhoneEmailSupport": "Telefon und E-Mail-Support",
-        "ProfessionalServicesTraining": "Benutzer-, Technik- und Entwickler-Schulungen",
-        "ProfessionalServicesPremiumFeatures": "Premium Funktionen",
-        "ProfessionalServicesCustomDevelopment": "Individuelle Programmierung",
-        "ProfessionalServicesAnalystConsulting": "Analysenberatung",
+        "ProfessionalServicesDedicatedSupport": "Fortwährende Unterstützung durch ein engagiertes Matomo Teammitglied.",
+        "ProfessionalServicesOnboarding": "Fragebogen zur Einarbeitung und Treffen mit einem Matomo Supportmitglied.",
+        "ProfessionalServicesSupport": "24\/7 Online Anfrageservice",
+        "ProfessionalServicesTraining": "Exklusiven Zugriff auf Matomo Trainingvideos",
+        "ProfessionalServicesEmailAlerts": "E-Mail Alarme für Matomo Sicherheitsrelease",
         "ContactUs": "Kontaktieren Sie uns",
         "VisitTheForums": "Besuchen Sie die %1$s Foren%2$s und erhalten Sie Hilfe von der Matomo Community",
+        "Forums": "Forum",
         "ReviewMatomoTitle": "Vertrauen Sie Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Teilen Sie Ihre Überlegungen auf einer dieser Seiten und inspirieren Sie so andere, Ihrer Datenrevolution zu folgen.",
         "RemindMeLater": "Erinnere mich später daran",
-        "NeverAskMeAgain": "Nie mehr fragen"
+        "NeverAskMeAgain": "Nie mehr fragen",
+        "HowCanWeHelp": "Wie können wir helfen?",
+        "NotTrackingVisits": "Matamo zeichnet keinerlei Besuche auf",
+        "TrackMultipleSites": "Ich möchte mehrer Seiten oder Subdomains aufzeichnen",
+        "RemoveOtherLabel": "Ich moöchte meine 'Anderen' Daten sehen",
+        "PurgeOldData": "I möchte einige alte Daten entfernen",
+        "SearchHelpResources": "Matamo.org Hilfequellen durchsuchen",
+        "PopularHelpTopics": "Beliebet Hilfethemen",
+        "SearchOnMatomo": "Suche '%1$s' auf Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/el.json b/app/plugins/Feedback/lang/el.json
index 604966511..82d3b71f5 100644
--- a/app/plugins/Feedback/lang/el.json
+++ b/app/plugins/Feedback/lang/el.json
@@ -16,23 +16,32 @@
         "ThankYou": "Ευχαριστούμε που βοηθήσατε να κάνουμε το Matomo καλύτερο!",
         "TopLinkTooltip": "Πείτε μας τι σκέφτεστε ή ζητήστε Επαγγελματική Υποστήριξη.",
         "ViewAnswersToFAQ": "Δείτε απαντήσεις στις %1$sΣυχνές Ερωτήσεις%2$s",
+        "FAQs": "Συχνές ερωτήσεις-απαντήσεις",
         "ViewUserGuides": "Μάθετε πως να παραμετροποιείτε το Matomo και να αναλύετε αποτελεσματικά τα δεδομένα σας με τους %1$sοδηγούς χρήσης μας%2$s",
+        "UserGuides": "Οδηγοί χρήστη",
         "CommunityHelp": "Βοήθεια από την κοινότητα",
         "ProfessionalHelp": "Βοήθεια από επαγγελματίες",
-        "ProfessionalServicesIntro": "Το παγκόσμιο δίκτυό μας επαγγελματιών συμβούλων για υποστήριξη των πελατών του Matomo που φιλοξενούν το Matomo στη δική τους υποδομή.",
+        "ProfessionalServicesIntro": "Με μια Συνδρομή Υποστήριξης στην Υποδομή σας για το Matomo, αφήστε την έμπειρη ομάδα μας να σας βοηθήσει να εκμεταλλευτείτε το Matomo Analytics για να μεγαλώσει η επιχείρησή σας.",
         "ProfessionalServicesOfferIntro": "Από ποιές υπηρεσίες μπορείτε να κερδίσετε;",
-        "ProfessionalServicesReviewPiwikSetup": "Μια σύνοψη της εγκατάστασής σας του Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Βελτιστοποίηση του Matomo και υπηρεσίες συντήρησης",
-        "ProfessionalServicesPhoneEmailSupport": "Τηλεφωνική και μέσω e-mail υποστήριξη",
-        "ProfessionalServicesTraining": "Εκπαίδευση σε χρηστικό, τεχνικό και προγραμματιστικό επίπεδο",
-        "ProfessionalServicesPremiumFeatures": "Χαρακτηριστικά επί πληρωμή",
-        "ProfessionalServicesCustomDevelopment": "Προσαρμοσμένες υπηρεσίες ανάπτυξης",
-        "ProfessionalServicesAnalystConsulting": "Υπηρεσίες συμβουλευτικής αναλυτικών",
+        "ProfessionalServicesDedicatedSupport": "Υποστήριξη από ένα εξειδικευμένο μέλος της ομάδας του Matomo σε κάθε βήμα στην πορεία",
+        "ProfessionalServicesOnboarding": "Επιτόπου ερωτηματολόγια και συνάντηση με μέλος της Υποστήριξης του Matomo",
+        "ProfessionalServicesSupport": "Υπηρεσία online αιτήσεων 24\/7",
+        "ProfessionalServicesTraining": "Αποκλειστική πρόσβαση σε εκπαιδευτικά βίντεο για το Matomo",
+        "ProfessionalServicesEmailAlerts": "Ειδοποιήσεις ηλεκτρονικού ταχυδρομείου για εκδόσεις ασφαλείας για το Matomo",
         "ContactUs": "Επικοινωνήστε μαζί μας",
         "VisitTheForums": "Δείτε τα %1$sΦόρουμ%2$s και λάβετε βοήθεια από την κοινότητα χρηστών του Matomo",
+        "Forums": "Φόρουμ",
         "ReviewMatomoTitle": "Πιστεύετε στο Matomo;",
         "PleaseLeaveExternalReviewForMatomo": "Μοιραστείτε τις σκέψεις σας σχετικά με τις ιστοσελίδες αυτές και εμπνεύστε άλλους να συμμετέχουν στην επανάστασή μας των δεδομένων.",
         "RemindMeLater": "Να μου γίνει αργότερα υπενθύμιση",
-        "NeverAskMeAgain": "Να μην ερωτηθώ ποτέ ξανά"
+        "NeverAskMeAgain": "Να μην ερωτηθώ ποτέ ξανά",
+        "HowCanWeHelp": "Πώς μπορούμε να βοηθήσουμε;",
+        "NotTrackingVisits": "Το Matomo δεν ιχνηλατεί οποιεσδήποτε επισκέψεις",
+        "TrackMultipleSites": "Επιθυμώ την ιχνηλάτηση πολλαπλών ιστοσελίδων ή υπο-ονομάτων χώρου",
+        "RemoveOtherLabel": "Θέλω να δω τα δεδομένα 'για άλλους'",
+        "PurgeOldData": "Επιθυμώ να διαγράψω ορισμένα παλιά δεδομένα",
+        "SearchHelpResources": "Αναζήτηση στους πόρους βοήθειας του matomo.org",
+        "PopularHelpTopics": "Δημοφιλή θέματα βοήθειας",
+        "SearchOnMatomo": "Αναζήτηση του '%1$s' στο Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/en.json b/app/plugins/Feedback/lang/en.json
index 374a6b5e9..95139b8b7 100644
--- a/app/plugins/Feedback/lang/en.json
+++ b/app/plugins/Feedback/lang/en.json
@@ -16,23 +16,32 @@
         "ThankYou": "Thank you for helping us to make Matomo better!",
         "TopLinkTooltip": "Tell us what you think, or request Professional Support.",
         "ViewAnswersToFAQ": "View answers to %1$sFrequently Asked Questions%2$s",
+        "FAQs": "FAQs",
         "ViewUserGuides": "Learn how to configure Matomo and how to effectively analyze your data with our %1$suser guides%2$s",
+        "UserGuides": "User guides",
         "CommunityHelp": "Community Help",
         "ProfessionalHelp": "Professional Help",
-        "ProfessionalServicesIntro": "Our worldwide network of professional consultants for Matomo support clients who host Matomo on their own infrastructure.",
+        "ProfessionalServicesIntro": "With a Matomo On-Premise Support Subscription, let our experienced team assist you online in utilising Matomo Analytics to grow your business.",
         "ProfessionalServicesOfferIntro": "What services can you benefit from?",
-        "ProfessionalServicesReviewPiwikSetup": "A review of your Matomo setup",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo optimization & maintenance services",
-        "ProfessionalServicesPhoneEmailSupport": "Phone and Email support",
-        "ProfessionalServicesTraining": "User, Technical and Developer training",
-        "ProfessionalServicesPremiumFeatures": "Premium features",
-        "ProfessionalServicesCustomDevelopment": "Custom Development services",
-        "ProfessionalServicesAnalystConsulting": "Analyst consulting services",
+        "ProfessionalServicesDedicatedSupport": "Support from a dedicated Matomo team member every step of the way",
+        "ProfessionalServicesOnboarding": "Onboarding questionnaire and meeting with a Matomo Support member",
+        "ProfessionalServicesSupport": "24/7 online request service",
+        "ProfessionalServicesTraining": "Exclusive access to Matomo training videos",
+        "ProfessionalServicesEmailAlerts": "Email alerts for security releases for Matomo",
         "ContactUs": "Contact us",
         "VisitTheForums": "Visit the %1$s Forums%2$s and get help from the community of Matomo users",
+        "Forums": "Forums",
         "ReviewMatomoTitle": "Believe in Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Share your thoughts on one of these sites and inspire others to join our data revolution.",
         "RemindMeLater": "Remind me later",
-        "NeverAskMeAgain": "Never ask me again"
+        "NeverAskMeAgain": "Never ask me again",
+        "HowCanWeHelp": "How can we help?",
+        "NotTrackingVisits": "Matomo isn't tracking any visits",
+        "TrackMultipleSites": "I need to track multiple sites or subdomains",
+        "RemoveOtherLabel": "I want to see my 'Others' data",
+        "PurgeOldData": "I want to remove some old data",
+        "SearchHelpResources": "Search matomo.org help resources",
+        "PopularHelpTopics": "Popular help topics",
+        "SearchOnMatomo": "Search '%1$s' on Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/eo.json b/app/plugins/Feedback/lang/eo.json
new file mode 100644
index 000000000..6ee3f5df6
--- /dev/null
+++ b/app/plugins/Feedback/lang/eo.json
@@ -0,0 +1,5 @@
+{
+    "Feedback": {
+        "Forums": "Forumoj"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/es-ar.json b/app/plugins/Feedback/lang/es-ar.json
index 5487be567..9eb8f7610 100644
--- a/app/plugins/Feedback/lang/es-ar.json
+++ b/app/plugins/Feedback/lang/es-ar.json
@@ -1,10 +1,47 @@
 {
     "Feedback": {
-        "DoYouHaveBugReportOrFeatureRequest": "Tienes un error que reportar o una nueva característica?",
-        "IWantTo": "Yo quiero:",
-        "LearnWaysToParticipate": "Aprende sobre todas las formas de %1$sparticipar%2$s",
-        "ManuallySendEmailTo": "Por favor envíe su mensaje manualmente a",
+        "DoYouHaveBugReportOrFeatureRequest": "¿Tenés un error para informar o una solicitud de nueva función?",
+        "HowToCreateTicket": "Por favor, leé las recomendaciones sobre cómo escribir un buen %1$sinforme de error%2$s o %3$ssolicitud de función%4$s. Luego, registrate o iniciá sesión en %5$snuestro historial de problemas%6$s y completá un registro de %7$snuevo problema%8$s.",
+        "IWantTo": "Quiero:",
+        "LearnWaysToParticipate": "Conocé todas las formas en las que podés %1$sparticipar%2$s",
+        "ManuallySendEmailTo": "Por favor, enviá tu mensaje manualmente a",
+        "PluginDescription": "Enviá tus comentarios al equipo de Matomo. ¡Compartí tus ideas y sugerencias para hacer que Matomo sea la mejor plataforma de análisis del mundo!",
+        "PrivacyClaim": "Matomo respeta tu %1$sprivacidad%2$s y te da el control total de tus datos.",
+        "RateFeatureLeaveMessageDislike": "¡Lamentamos que no te guste! Por favor, contanos cómo podemos mejorar.",
+        "RateFeatureLeaveMessageLike": "¡Estamos contentos que te guste! Por favor, contanos qué es lo que más te gusta o si tenés alguna solicitud de nueva función.",
+        "RateFeatureSendFeedbackInformation": "Tu plataforma de Matomo nos enviará a nosotros (el equipo de Matomo) un correo electrónico (incluyendo tu dirección de correo electrónico), así podemos estar en contacto si tenés alguna pregunta.",
+        "RateFeatureThankYouTitle": "¡Gracias por puntuar \"%s\"!",
+        "RateFeatureTitle": "¿Te gusta la función \"%s\"? Por favor, puntuala y dejá un comentario.",
         "SendFeedback": "Enviar comentario",
-        "TopLinkTooltip": "Danos tu opinión o solicita Soporte Profesional"
+        "ThankYou": "¡Gracias por ayudarnos a hacer un mejor Matomo!",
+        "TopLinkTooltip": "Decinos qué pensás, o solicitá soporte profesional.",
+        "ViewAnswersToFAQ": "Leé las respuestas a las %1$spreguntas frecuentes%2$s",
+        "FAQs": "Preguntas frecuentes",
+        "ViewUserGuides": "Aprendé a configurar Matomo y cómo analizar eficazmente tus datos, con nuestras %1$sguías de usuario%2$s",
+        "UserGuides": "Guías de usuario",
+        "CommunityHelp": "Ayuda de la comunidad",
+        "ProfessionalHelp": "Ayuda profesional",
+        "ProfessionalServicesIntro": "Con una suscripción a Matomo On-Premise Support, dejá que nuestro equipo experimentado te ayude en línea sobre cómo usar Matomo Analytics para hacer crecer tu negocio.",
+        "ProfessionalServicesOfferIntro": "¿De qué servicios te podés beneficiar?",
+        "ProfessionalServicesDedicatedSupport": "Soporte de un miembro del equipo Matomo dedicado a cada paso",
+        "ProfessionalServicesOnboarding": "Organización y comunicación directa con un miembro de soporte de Matomo",
+        "ProfessionalServicesSupport": "Servicio de solicitud en línea, las 24 horas del día, los 7 días de la semana",
+        "ProfessionalServicesTraining": "Acceso exclusivo a videos de entrenamiento de Matomo",
+        "ProfessionalServicesEmailAlerts": "Alertas por correo electrónico de lanzamientos de seguridad para Matomo",
+        "ContactUs": "Contactanos",
+        "VisitTheForums": "Visitá los %1$sforos%2$s y obtené ayuda de la comunidad de usuarios de Matomo",
+        "Forums": "Foros",
+        "ReviewMatomoTitle": "¿Creés en Matomo?",
+        "PleaseLeaveExternalReviewForMatomo": "Compartí tus pensamientos en uno de estos sitios e inspirá a que otros se unan a nuestra revolución de los datos.",
+        "RemindMeLater": "Recordarme después",
+        "NeverAskMeAgain": "No volver a preguntarme",
+        "HowCanWeHelp": "¿Cómo podemos ayudar?",
+        "NotTrackingVisits": "Matomo no está rastreando ninguna visita",
+        "TrackMultipleSites": "Necesito rastrear múltiples sitios o subdominios",
+        "RemoveOtherLabel": "Quiero ver los datos de mis \"Otros\"",
+        "PurgeOldData": "Quiero quitar datos viejos",
+        "SearchHelpResources": "Buscá los recursos de ayuda de matomo.org",
+        "PopularHelpTopics": "Temas populares de ayuda",
+        "SearchOnMatomo": "Buscá \"%1$s\" en matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/es.json b/app/plugins/Feedback/lang/es.json
index 7de69dbcd..331320b3f 100644
--- a/app/plugins/Feedback/lang/es.json
+++ b/app/plugins/Feedback/lang/es.json
@@ -19,17 +19,11 @@
         "ViewUserGuides": "Aprenda a configurar Matomo y analizar sus datos de modo eficaz con nuestras %1$sguías de usuario%2$s",
         "CommunityHelp": "Ayuda comunitaria",
         "ProfessionalHelp": "Ayuda profesional",
-        "ProfessionalServicesIntro": "Nuestra red mundial de consultores profesionales que brindan asistencia a todos los clientes que hospedan Matomo en su propia infraestructura.",
         "ProfessionalServicesOfferIntro": "¿De qué servicios puedes beneficiarte?",
-        "ProfessionalServicesReviewPiwikSetup": "Una reseña de su instalación Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Servicios de mantenimiento & optimización Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Asistencia por teléfono y correo electrónico",
-        "ProfessionalServicesTraining": "Cursos de usuario, técnico y desarrollador",
-        "ProfessionalServicesPremiumFeatures": "Funciones premium",
-        "ProfessionalServicesCustomDevelopment": "Servicios de desarrollo personalizado",
-        "ProfessionalServicesAnalystConsulting": "Servicios de consultoría de análisis",
+        "ProfessionalServicesEmailAlerts": "Alertas por correo electrónico de comunicados de seguridad de Matomo",
         "ContactUs": "Contáctanos",
         "VisitTheForums": "Visite el %1$sForo%2$s y obtenga ayuda de la comunidad de usuarios Matomo",
+        "Forums": "Foros",
         "ReviewMatomoTitle": "¿Crées en Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Comparte sus pensamientos en uno de estos sitios e inspira a otros a unirse en nuestra revolución de datos.",
         "RemindMeLater": "Recordármelo nuevamente",
diff --git a/app/plugins/Feedback/lang/et.json b/app/plugins/Feedback/lang/et.json
index 0ad1d9bad..8c6f0817a 100644
--- a/app/plugins/Feedback/lang/et.json
+++ b/app/plugins/Feedback/lang/et.json
@@ -4,6 +4,7 @@
         "SendFeedback": "Saada tagasisidet",
         "CommunityHelp": "Kogukonna abi",
         "ProfessionalHelp": "Proffesionaalne abi",
-        "ContactUs": "Võta meiega ühendust"
+        "ContactUs": "Võta meiega ühendust",
+        "Forums": "Foorumid"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/fa.json b/app/plugins/Feedback/lang/fa.json
index 4eb2a5803..2b8526d2e 100644
--- a/app/plugins/Feedback/lang/fa.json
+++ b/app/plugins/Feedback/lang/fa.json
@@ -6,6 +6,7 @@
         "ManuallySendEmailTo": "لطفا پیام خود را به صورت دستی ارسال کنید به",
         "SendFeedback": "ارسال بازخورد",
         "ThankYou": "از شما برای کمک به بهتر کردن پیویک متشکریم!",
-        "TopLinkTooltip": "به ما بگویید چه می اندیشید یا پشتیبانی حرفه ای درخواست کنید."
+        "TopLinkTooltip": "به ما بگویید چه می اندیشید یا پشتیبانی حرفه ای درخواست کنید.",
+        "Forums": "فرم ها"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/fi.json b/app/plugins/Feedback/lang/fi.json
index 91650cc7a..3ef2e53a0 100644
--- a/app/plugins/Feedback/lang/fi.json
+++ b/app/plugins/Feedback/lang/fi.json
@@ -13,18 +13,18 @@
         "TopLinkTooltip": "Kerro meille mitä ajattelet, tai osta tukipalveluita (englanniksi).",
         "ViewAnswersToFAQ": "Katso vastauksia %1$susein kysyttyihin kysymyksiin%2$s",
         "ViewUserGuides": "Lue kuinka Matomo määritellään ja kuinka analysoida kerättyjä tietoja tehokkaasti %1$skäyttäjäoppaasta%2$s",
+        "UserGuides": "Käyttäjäoppaat",
         "CommunityHelp": "Yhteisön apu",
         "ProfessionalHelp": "Ammattilaisapu",
-        "ProfessionalServicesIntro": "Ympäri maailmaa toimivat ammattilaiskonsulttimme tarjoavat Matomo-tukea niille, jotka ylläpitävät omaa Matomo-ympäristöä.",
         "ProfessionalServicesOfferIntro": "Mistä palveluista on hyötyä sinulle?",
-        "ProfessionalServicesReviewPiwikSetup": "Katsaus Matomo-asennukseesi",
-        "ProfessionalServicesOptimizationMaintenance": "Matomon optimointi- ja ylläpitopalvelut",
-        "ProfessionalServicesPhoneEmailSupport": "Puhelin- ja sähköpostituki",
-        "ProfessionalServicesTraining": "Käyttäjä-, tekninen- ja kehittäjäkoulutus",
-        "ProfessionalServicesPremiumFeatures": "Premium-ominaisuudet",
-        "ProfessionalServicesCustomDevelopment": "Kustomoidut kehityspalvelut",
-        "ProfessionalServicesAnalystConsulting": "Analytiikan konsultointipalvelut",
         "ContactUs": "Ota yhteyttä",
-        "VisitTheForums": "Käy %1$skeskustelupalstalla%2$s ja saa apua Matomo-käyttäjien yhteisöltä"
+        "VisitTheForums": "Käy %1$skeskustelupalstalla%2$s ja saa apua Matomo-käyttäjien yhteisöltä",
+        "Forums": "Foorumit",
+        "RemindMeLater": "Muistuta myöhemmin",
+        "NeverAskMeAgain": "Älä kysy uudestaan",
+        "HowCanWeHelp": "Miten voimme auttaa?",
+        "NotTrackingVisits": "Matomo ei seuraa käyntejä",
+        "TrackMultipleSites": "Minun pitää seurata useita sivustoja tai aliverkkotunnuksia",
+        "PurgeOldData": "Haluan poistaa vanhoja tietoja"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/fr.json b/app/plugins/Feedback/lang/fr.json
index 375b833e7..8e598edd1 100644
--- a/app/plugins/Feedback/lang/fr.json
+++ b/app/plugins/Feedback/lang/fr.json
@@ -16,23 +16,32 @@
         "ThankYou": "Merci d'avoir aidé à améliorer Matomo !",
         "TopLinkTooltip": "Dites-nous ce que vous en pensez, ou demandez un Support Professionnel.",
         "ViewAnswersToFAQ": "Voir les réponses aux %1$squestions fréquemment posées%2$s",
+        "FAQs": "Questions fréquentes",
         "ViewUserGuides": "Apprenez comment configurer Matomo et comment analyser de manière efficaces vos données avec notre %1$sguide utilisateur%2$s",
+        "UserGuides": "Guides de l'utilisateur",
         "CommunityHelp": "Aide de la communauté",
         "ProfessionalHelp": "Aide professionnelle",
-        "ProfessionalServicesIntro": "Notre réseau mondial de consultants professionnels Matomo supporte nos clients qui hébergent Matomo sur leurs propres infrastructures.",
+        "ProfessionalServicesIntro": "Avec un abonnement au support Matomo On-Premise, notre équipe d'experts vous assiste en ligne dans l'utilisation des statistiques Matomo pour faire grandir votre entreprise.",
         "ProfessionalServicesOfferIntro": "De quel services pouvez-vous bénéficier ?",
-        "ProfessionalServicesReviewPiwikSetup": "Une revue de votre installation Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Services d'optimisation et de maintenance pour Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Support courriel et téléphonique",
-        "ProfessionalServicesTraining": "Formation d'utilisation, technique et en développement",
-        "ProfessionalServicesPremiumFeatures": "Fonctionnalités premium",
-        "ProfessionalServicesCustomDevelopment": "Services de développement personnalisés",
-        "ProfessionalServicesAnalystConsulting": "Services de consultation en analyse",
+        "ProfessionalServicesDedicatedSupport": "L'assistance d'un membre dédié de l'équipe Matomo à chaque étape du processus.",
+        "ProfessionalServicesOnboarding": "Questionnaire d'accueil et rencontre avec un membre du support Matomo",
+        "ProfessionalServicesSupport": "Service de demande en ligne 24\/7",
+        "ProfessionalServicesTraining": "Accès en exclusivité aux vidéos de formation Matomo",
+        "ProfessionalServicesEmailAlerts": "Alertes par courriel des versions de sécurité de Matomo",
         "ContactUs": "Nous contacter",
         "VisitTheForums": "Visitez les %1$sForums%2$s et obtenez de l'aide de la communauté d'utilisateurs Matomo.",
+        "Forums": "Forums",
         "ReviewMatomoTitle": "Vous croyez en Matomo ?",
         "PleaseLeaveExternalReviewForMatomo": "Partagez votre avis sur un de ces sites web et encouragez les autres à se joindre à notre révolution des données.",
         "RemindMeLater": "Me le rappeler plus tard",
-        "NeverAskMeAgain": "Ne plus me demander"
+        "NeverAskMeAgain": "Ne plus me demander",
+        "HowCanWeHelp": "Comment pouvons-nous vous aider?",
+        "NotTrackingVisits": "Matomo ne suit aucune visite.",
+        "TrackMultipleSites": "J'ai besoin de suivre plusieurs sites ou sous-domaines",
+        "RemoveOtherLabel": "Je veux voir mes 'Autres' données",
+        "PurgeOldData": "Je veux supprimer d'anciennes données",
+        "SearchHelpResources": "Rechercher dans les ressources de matomo.org",
+        "PopularHelpTopics": "Rubriques d'aide les plus populaires",
+        "SearchOnMatomo": "Rechercher '%1$s' sur Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/he.json b/app/plugins/Feedback/lang/he.json
new file mode 100644
index 000000000..db17d7b41
--- /dev/null
+++ b/app/plugins/Feedback/lang/he.json
@@ -0,0 +1,5 @@
+{
+    "Feedback": {
+        "Forums": "פורומים"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/hi.json b/app/plugins/Feedback/lang/hi.json
index b280fe78f..9f1bb9692 100644
--- a/app/plugins/Feedback/lang/hi.json
+++ b/app/plugins/Feedback/lang/hi.json
@@ -10,6 +10,7 @@
         "ThankYou": "Matomo बेहतर बनाने में हमें मदद करने के लिए आपका शुक्रिया",
         "TopLinkTooltip": "आप क्या सोचते हैं हमें बताओ,या व्यावसायिक सहायता का अनुरोध करे",
         "CommunityHelp": "समुदाय सहायता",
-        "ProfessionalHelp": "पेशेवर मदद"
+        "ProfessionalHelp": "पेशेवर मदद",
+        "Forums": "फ़ड़"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/hu.json b/app/plugins/Feedback/lang/hu.json
index fc2945c33..d52d1b943 100644
--- a/app/plugins/Feedback/lang/hu.json
+++ b/app/plugins/Feedback/lang/hu.json
@@ -5,6 +5,7 @@
         "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 Matomo-et!"
+        "ThankYou": "Köszönjük, hogy segítesz jobbá tenni a Matomo-et!",
+        "Forums": "Fórumok"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/id.json b/app/plugins/Feedback/lang/id.json
index a1d476d4c..fc5bf1f4e 100644
--- a/app/plugins/Feedback/lang/id.json
+++ b/app/plugins/Feedback/lang/id.json
@@ -4,9 +4,19 @@
         "IWantTo": "Saya ingin:",
         "LearnWaysToParticipate": "Pelajari bagaimana kamu dapat %1$s berpartisipasi%2$s",
         "ManuallySendEmailTo": "Silakan kirim manual pesan Anda ke",
+        "RateFeatureThankYouTitle": "Terima kasih atas penilaian '%s' Anda!",
         "SendFeedback": "Kirim Umpanbalik",
-        "ThankYou": "Terimaksih telah membantu kami menjadikan Matomo lebih baik!",
+        "ThankYou": "Terima kasih telah membantu kami menjadikan Matomo lebih baik!",
         "TopLinkTooltip": "Katakan apa yang Anda pikirkan, atau membutuhkan Bantuan Profesional.",
-        "ContactUs": "Kontak kami"
+        "UserGuides": "Panduan pengguna",
+        "CommunityHelp": "Bantuan Komunitas",
+        "ProfessionalHelp": "Bantuan Profesional",
+        "ContactUs": "Kontak kami",
+        "Forums": "Forum",
+        "RemindMeLater": "Ingatkan saya nani",
+        "NeverAskMeAgain": "Jangan tanyakan saya lagi",
+        "HowCanWeHelp": "Bagaimana kami bisa membantu?",
+        "PurgeOldData": "Saya ingin menghapus beberapa data lama",
+        "SearchOnMatomo": "Cari '%1$s' pada Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/it.json b/app/plugins/Feedback/lang/it.json
index e2c434b1c..146e684ed 100644
--- a/app/plugins/Feedback/lang/it.json
+++ b/app/plugins/Feedback/lang/it.json
@@ -16,23 +16,32 @@
         "ThankYou": "Grazie per il tuo aiuto per rendere Matomo migliore!",
         "TopLinkTooltip": "Dicci cosa ne pensi, o richiedi supporto professionale.",
         "ViewAnswersToFAQ": "Guarda le risposte alle %1$sDomande frequenti%2$s",
+        "FAQs": "FAQ",
         "ViewUserGuides": "Impara a configurare Matomo e ad analizzare efficacemente i tuoi dati con le nostre %1$sguide utente%2$s",
+        "UserGuides": "Guide utente",
         "CommunityHelp": "Aiuto dalla comunità",
         "ProfessionalHelp": "Aiuto professionale",
-        "ProfessionalServicesIntro": "La nostra rete mondiale di consulenti professionali per l'assistenza a Matomo ai clienti che ospitano Matomo in infrastrutture proprie.",
+        "ProfessionalServicesIntro": "Con un abbonamento al Supporto Locale di Matomo, consenti al nostro team di esperti di assisterti online nell'utilizzo di Matomo Analytics per far crescere la tua attività.",
         "ProfessionalServicesOfferIntro": "Di quali servizi potete beneficiare?",
-        "ProfessionalServicesReviewPiwikSetup": "Un'analisi della tua configurazione di Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Servizi per l'ottimizzazione e la manutenzione di Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Assistenza Telefonica ed Email",
-        "ProfessionalServicesTraining": "Formazione per Utenti, Tecnici e Sviluppatori",
-        "ProfessionalServicesPremiumFeatures": "Funzionalità Premium",
-        "ProfessionalServicesCustomDevelopment": "Servizi di sviluppo per il cliente",
-        "ProfessionalServicesAnalystConsulting": "Servizi di Consulenza per analisti",
+        "ProfessionalServicesDedicatedSupport": "Assistenza dedicata da parte di un membro del team Matomo in ogni fase del processo",
+        "ProfessionalServicesOnboarding": "Questionario di benvenuto e incontro con un membro dell'Assistenza Matomo",
+        "ProfessionalServicesSupport": "Servizio di richieste online 24\/7",
+        "ProfessionalServicesTraining": "Accesso esclusivo ai video addestrativi di Matomo",
+        "ProfessionalServicesEmailAlerts": "Avvisi via email per le correzioni di sicurezza per Matomo",
         "ContactUs": "Contattaci",
         "VisitTheForums": "Visita il %1$s Forum%2$s e ottieni aiuto dalla comunità degli utenti Matomo",
+        "Forums": "Forum",
         "ReviewMatomoTitle": "Credi in Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Condividi ciò che pensi su uno di questi siti e ispira altri a unirsi alla nostra rivoluzione dei dati.",
         "RemindMeLater": "Ricordamelo più tardi",
-        "NeverAskMeAgain": "Non chiedermelo di nuovo"
+        "NeverAskMeAgain": "Non chiedermelo di nuovo",
+        "HowCanWeHelp": "Come possiamo aiutarti?",
+        "NotTrackingVisits": "Matomo non sta tracciando visite",
+        "TrackMultipleSites": "Devo tracciare siti o sottodomini multipli",
+        "RemoveOtherLabel": "Voglio vedere gli \"Altri\" dati",
+        "PurgeOldData": "Voglio eliminare alcuni dati vecchi",
+        "SearchHelpResources": "Cerca nelle risorse di matomo.org per aiuto",
+        "PopularHelpTopics": "Argomenti di aiuto popolari",
+        "SearchOnMatomo": "Cerca '%1$s' su matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/ja.json b/app/plugins/Feedback/lang/ja.json
index 39d8a59fa..1c723dc66 100644
--- a/app/plugins/Feedback/lang/ja.json
+++ b/app/plugins/Feedback/lang/ja.json
@@ -3,10 +3,10 @@
         "DoYouHaveBugReportOrFeatureRequest": "報告するべきバグや機能要望がありますか？",
         "HowToCreateTicket": "推奨事項をお読みになり、%1$s バグ報告 %2$s や %3$s 機能のリクエスト %4$s を書いてください。その後、登録又は %5$s 課題トラッカー%6$s にログインして、%7$s 新しい課題 %8$s を作成します。",
         "IWantTo": "あなたの希望：",
-        "LearnWaysToParticipate": "あなたが参加できるすべての方法を%1$s学んでください%2$s",
-        "ManuallySendEmailTo": "あなたのメッセージを手作業で次のアドレスへ送ってください：",
+        "LearnWaysToParticipate": "参加できるすべての方法について%1$s学ぶ%2$s",
+        "ManuallySendEmailTo": "に手動でメッセージを送ってください",
         "PluginDescription": "Matomo チームにフィードバックをお送りください。あなたのアイデアや提案をシェアすることで、Matomo を世界で最高のアナリティックス・プラットフォームにしましょう。",
-        "PrivacyClaim": "Matomo は あなたの %1$sプライバシー%2$s を尊重します。あなたのデータに関する全ての管理はあなたにお任せします。",
+        "PrivacyClaim": "Matomo は %1$sプライバシー%2$s を尊重します。あなたのデータに関する全ての管理はあなたにお任せします。",
         "RateFeatureLeaveMessageDislike": "好きではない とのこと、非常に残念です。ぜひどのように改善すべきかお知らせください。",
         "RateFeatureLeaveMessageLike": "気に入った　とのこと、とても嬉しいです ! ぜひあなたの最も気に入った内容や今後のリクエストをお知らせください。",
         "RateFeatureSendFeedbackInformation": "Matomo プラットフォームは私たち ( Matomo チーム ) に電子メール ( あなたの電子メールアドレスを含む ) を送信しますので、質問があれば連絡を取ることができます。",
@@ -15,21 +15,20 @@
         "SendFeedback": "フィードバックを送信",
         "ThankYou": "Matomo の改善にご支援いただきありがとうございます！",
         "TopLinkTooltip": "あなたの意見をお知らせください。または、プロフェッショナルサポートをリクエストしてください。",
-        "ViewAnswersToFAQ": "%1$s Frequently Asked Questions %2$s への回答をご覧ください。",
+        "ViewAnswersToFAQ": "%1$s FAQ %2$s への回答をご覧ください。",
         "ViewUserGuides": "Matomo の設定方法と、効果的なデータ分析方法は、%1$s ユーザーガイド %2$s をご確認ください。",
         "CommunityHelp": "コミュニティヘルプ",
         "ProfessionalHelp": "プロフェッショナルヘルプ",
-        "ProfessionalServicesIntro": "世界的なネットワークである我々 Matomo のプロコンサルタントは、独自のインフラストラクチャで Matomo をホストするクライアントをサポートします。",
+        "ProfessionalServicesIntro": "Matomo オンプレミス サポートサブスクリプションでは、経験豊富なチームがオンラインでMatomo Analyticsを利用してビジネスを成長させるお手伝いをします。",
         "ProfessionalServicesOfferIntro": "どのようなサービスを利用できますか？",
-        "ProfessionalServicesReviewPiwikSetup": "Matomo セットアップのレビュー",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo 最適化および保守サービス",
-        "ProfessionalServicesPhoneEmailSupport": "電話とメールのサポート",
-        "ProfessionalServicesTraining": "ユーザー、テクニカル、開発者のトレーニング",
-        "ProfessionalServicesPremiumFeatures": "プレミアム機能",
-        "ProfessionalServicesCustomDevelopment": "カスタム開発サービス",
-        "ProfessionalServicesAnalystConsulting": "アナリストコンサルティングサービス",
+        "ProfessionalServicesDedicatedSupport": "あらゆる段階で専任のMatomoチームメンバーからのサポート",
+        "ProfessionalServicesOnboarding": "講習アンケートおよびMatomoサポートメンバーとの会議",
+        "ProfessionalServicesSupport": "24時間年中無休のオンラインリクエストサービス",
+        "ProfessionalServicesTraining": "Matomoトレーニングビデオへの直接アクセス",
+        "ProfessionalServicesEmailAlerts": "Matomoのセキュリティリリースの電子メールアラート",
         "ContactUs": "お問い合わせ",
         "VisitTheForums": "%1$s フォーラム %2$s にアクセスし、Matomo ユーザーのコミュニティから助けを得る",
+        "Forums": "フォーラム",
         "ReviewMatomoTitle": "Matomo を信じますか？",
         "PleaseLeaveExternalReviewForMatomo": "これらのサイトの1つについてあなたの考えを分かち合い、他の人々に私たちのデータ革命に加わるよう促してください。",
         "RemindMeLater": "後で通知する",
diff --git a/app/plugins/Feedback/lang/ko.json b/app/plugins/Feedback/lang/ko.json
index 9b39b6e55..5de5b01ec 100644
--- a/app/plugins/Feedback/lang/ko.json
+++ b/app/plugins/Feedback/lang/ko.json
@@ -19,6 +19,7 @@
         "ViewUserGuides": "%1$s사용자 가이드%2$s에서 효율적으로 당신의 데이터를 분석하는 방법과 Matomo를 구성하는 법에 대해서 알 수 있습니다.",
         "CommunityHelp": "커뮤니티에서의 도움",
         "ProfessionalHelp": "전문가의 도움",
-        "ContactUs": "연락주세요"
+        "ContactUs": "연락주세요",
+        "Forums": "포럼"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/lt.json b/app/plugins/Feedback/lang/lt.json
index a9ec1e0e6..201858a8f 100644
--- a/app/plugins/Feedback/lang/lt.json
+++ b/app/plugins/Feedback/lang/lt.json
@@ -12,6 +12,7 @@
         "SendFeedback": "Siųsti atsiliepimą",
         "ThankYou": "Dėkojame už pagalbą kuriant tobulesnį Matomo!",
         "CommunityHelp": "Bendruomenės pagalba",
-        "ProfessionalHelp": "Profesionali pagalba"
+        "ProfessionalHelp": "Profesionali pagalba",
+        "Forums": "Forumai"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/lv.json b/app/plugins/Feedback/lang/lv.json
index 2a9f450b0..e5e2fcd39 100644
--- a/app/plugins/Feedback/lang/lv.json
+++ b/app/plugins/Feedback/lang/lv.json
@@ -5,6 +5,7 @@
         "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 Matomo!"
+        "ThankYou": "Paldies, ka palīdzat uzlabot Matomo!",
+        "Forums": "Forumi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/nb.json b/app/plugins/Feedback/lang/nb.json
index e1bb3f4f8..e079b7566 100644
--- a/app/plugins/Feedback/lang/nb.json
+++ b/app/plugins/Feedback/lang/nb.json
@@ -12,8 +12,7 @@
         "TopLinkTooltip": "Fortell oss hva du synes eller be om profesjonell støtte.",
         "CommunityHelp": "Hjelp fra Matomo-samfunnet",
         "ProfessionalHelp": "Profesjonell hjelp",
-        "ProfessionalServicesPhoneEmailSupport": "Telefon- og e-poststøtte",
-        "ProfessionalServicesPremiumFeatures": "Premium-funksjoner",
-        "ContactUs": "Kontakt oss"
+        "ContactUs": "Kontakt oss",
+        "Forums": "Forum"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/nl.json b/app/plugins/Feedback/lang/nl.json
index a2f669c7d..fb15c47c7 100644
--- a/app/plugins/Feedback/lang/nl.json
+++ b/app/plugins/Feedback/lang/nl.json
@@ -19,11 +19,8 @@
         "ViewUserGuides": "Leer hoe je Matomo moet configureren en hoe je data te analyseren met onze %1$sgebruikers handleidingen%2$s",
         "CommunityHelp": "Hulp van de gemeenschap",
         "ProfessionalHelp": "Professionele hulp",
-        "ProfessionalServicesReviewPiwikSetup": "Een overzicht van je Matomo omgeving",
-        "ProfessionalServicesPhoneEmailSupport": "Telefoon en Email ondersteuning",
-        "ProfessionalServicesPremiumFeatures": "Premium functies",
-        "ProfessionalServicesAnalystConsulting": "Analytisch consulting services",
         "ContactUs": "Neem contact met ons op",
-        "VisitTheForums": "Bezoek het %1$s Forums%2$s en ontvang hulp van de community van Matomo users"
+        "VisitTheForums": "Bezoek het %1$s Forums%2$s en ontvang hulp van de community van Matomo users",
+        "Forums": "Forums"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/nn.json b/app/plugins/Feedback/lang/nn.json
index d7db87c00..4d9e274af 100644
--- a/app/plugins/Feedback/lang/nn.json
+++ b/app/plugins/Feedback/lang/nn.json
@@ -5,6 +5,7 @@
         "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 Matomo!"
+        "ThankYou": "Takk for at hjelper oss med å forbetra Matomo!",
+        "Forums": "Forums"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/pl.json b/app/plugins/Feedback/lang/pl.json
index 3b271916b..f0c8990c9 100644
--- a/app/plugins/Feedback/lang/pl.json
+++ b/app/plugins/Feedback/lang/pl.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "Naucz się jak skonfigurować Matomo i jak efektywnie analizować twoje dane z naszym %1$spodręcznikiem użytkownika%2$s",
         "CommunityHelp": "Wsparcie społeczności",
         "ProfessionalHelp": "Profesjonalna pomoc",
-        "ProfessionalServicesIntro": "Nasza ogólnoświatowa sieć profesjonalnych konsultantów wsparcia Matomo dla Klientów korzystających z własnej instalacji Matomo.",
         "ProfessionalServicesOfferIntro": "Jakie usługi przyniosą Ci korzyści?",
-        "ProfessionalServicesReviewPiwikSetup": "Przegląd ustawień Twojego Matomo'a",
-        "ProfessionalServicesOptimizationMaintenance": "Usługi optymalizacji i utrzymania Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Wsparcie telefoniczne i e-mail",
-        "ProfessionalServicesTraining": "Szkolenie użytkowników, techników i deweloperów",
-        "ProfessionalServicesPremiumFeatures": "Funkcjonalności premium",
-        "ProfessionalServicesCustomDevelopment": "Usługi programistyczne na zamówienie",
-        "ProfessionalServicesAnalystConsulting": "Usługi konsultacji analitycznej",
         "ContactUs": "Skontaktuj się z nami",
-        "VisitTheForums": "Odwiedź %1$sFora%2$s i uzyskaj pomoc społeczności użytkowników Matomo"
+        "VisitTheForums": "Odwiedź %1$sFora%2$s i uzyskaj pomoc społeczności użytkowników Matomo",
+        "Forums": "Forum"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/pt-br.json b/app/plugins/Feedback/lang/pt-br.json
index 78c1ee3ff..62978d7c4 100644
--- a/app/plugins/Feedback/lang/pt-br.json
+++ b/app/plugins/Feedback/lang/pt-br.json
@@ -1,38 +1,47 @@
 {
     "Feedback": {
-        "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.",
+        "DoYouHaveBugReportOrFeatureRequest": "Você tem algum bug para relatar ou alguma funcionalidade para solicitar?",
+        "HowToCreateTicket": "Por favor, leia as recomendações de como escrever um bom %1$srelatório de bug%2$s ou %3$spedido de funcionalidade%4$s. Então, registre-se ou faça login em %5$snosso gerenciador de tarefas%6$s e crie uma %7$snova tarefa%8$s.",
         "IWantTo": "Eu quero:",
         "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 Matomo. Compartilhe as suas ideias e sugestões para tornar Matomo a melhor plataforma de análise do mundo!",
         "PrivacyClaim": "Matomo respeita sua %1$sprivacy%2$s e lhe dá controle total de seus dados.",
         "RateFeatureLeaveMessageDislike": "Lamentamos saber que você não gosta! Por favor, diga-nos como podemos melhorar.",
-        "RateFeatureLeaveMessageLike": "Estamos felizes por você gostar! Por favor, diga-nos o que você mais gosta ou se tem um pedido de função.",
+        "RateFeatureLeaveMessageLike": "Estamos felizes por você gostar! Por favor, diga-nos o que você mais gosta ou se tem um pedido de funcionalidade.",
         "RateFeatureSendFeedbackInformation": "Sua plataforma Matomo irá enviar-nos (equipe Matomo) um e-mail (incluindo o seu endereço de e-mail) para que possamos entrar em contato com você, caso você tenha alguma dúvida.",
         "RateFeatureThankYouTitle": "Obrigado por avaliar '%s'!",
-        "RateFeatureTitle": "Você gosta da função '%s'? Por favor, classifique e deixe um comentário",
-        "SendFeedback": "Envie FeedBack",
+        "RateFeatureTitle": "Você gosta da funcionalidade '%s'? Por favor, classifique e deixe um comentário",
+        "SendFeedback": "Enviar feedback",
         "ThankYou": "Obrigado por nos ajudar a fazer o Matomo melhor!",
-        "TopLinkTooltip": "Diga-nos o que você pensa, ou suporte.",
+        "TopLinkTooltip": "Diga-nos o que você pensa, ou solicite Suporte Profissional.",
         "ViewAnswersToFAQ": "Ver respostas para %1$sPerguntas Frequentes%2$s",
+        "FAQs": "FAQs",
         "ViewUserGuides": "Saiba como configurar o Matomo e como efetivamente analisar seus dados com o nosso %1$sguias do usuário%2$s",
+        "UserGuides": "Guias de usuário",
         "CommunityHelp": "Ajuda da Comunidade",
         "ProfessionalHelp": "Suporte Profissional",
-        "ProfessionalServicesIntro": "Nossa rede mundial de consultores profissionais de suporte para clientes Matomo que hospedam o Matomo em sua própria infraestrutura.",
+        "ProfessionalServicesIntro": "Com uma inscrição do Suporte Local Matomo, deixe nossa experiente equipe te ajudar online a utilizar o Matomo Analytics para fazer seu negócio crescer.",
         "ProfessionalServicesOfferIntro": "Quais serviços você pode se beneficiar?",
-        "ProfessionalServicesReviewPiwikSetup": "Uma revisão da sua configuração Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Serviços de otimização & manutenção Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Suporte por telefone e email",
-        "ProfessionalServicesTraining": "Treinamento de Desenvolvedores, Técnicos e Usuários",
-        "ProfessionalServicesPremiumFeatures": "Características Premium",
-        "ProfessionalServicesCustomDevelopment": "Serviços de Desenvolvimento Personalizados",
-        "ProfessionalServicesAnalystConsulting": "Serviços de Consulturia Analítica",
-        "ContactUs": "Contato",
+        "ProfessionalServicesDedicatedSupport": "Suporte de um membro dedicado da equipe Matomo em cada etapa",
+        "ProfessionalServicesOnboarding": "Questionário de integração e reunião com um membro do Suporte Matomo",
+        "ProfessionalServicesSupport": "Serviço de solicitação online 24\/7",
+        "ProfessionalServicesTraining": "Acesso exclusivo a vídeos de treinamento de Matomo",
+        "ProfessionalServicesEmailAlerts": "Alertas por email de atualizações de segurança do Matomo",
+        "ContactUs": "Entre em contato",
         "VisitTheForums": "Visite o %1$s Fóruns%2$s e obtenha ajuda da comunidade de usuários Matomo",
-        "ReviewMatomoTitle": "Acredita em Matomo?",
+        "Forums": "Fóruns",
+        "ReviewMatomoTitle": "Acredita no Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Compartilhe seus pensamentos em um desses sites e inspire outras pessoas a participarem da nossa revolução de dados.",
-        "RemindMeLater": "Lembre-me mais tarde",
-        "NeverAskMeAgain": "Nunca pergunte-me novamente"
+        "RemindMeLater": "Lembrar-me mais tarde",
+        "NeverAskMeAgain": "Não me perguntar novamente",
+        "HowCanWeHelp": "Como podemos ajudar?",
+        "NotTrackingVisits": "O Matomo não está rastreando visitas",
+        "TrackMultipleSites": "Preciso rastrear múltiplos sites ou subdomínios",
+        "RemoveOtherLabel": "Quero ver os dados de 'Outros'",
+        "PurgeOldData": "Quero remover alguns dados antigos",
+        "SearchHelpResources": "Procurar recursos de ajuda do matomo.org",
+        "PopularHelpTopics": "Tópicos populares de ajuda",
+        "SearchOnMatomo": "Procurar '%1$s' em Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/pt.json b/app/plugins/Feedback/lang/pt.json
index 402ae9452..dbb14faa3 100644
--- a/app/plugins/Feedback/lang/pt.json
+++ b/app/plugins/Feedback/lang/pt.json
@@ -16,19 +16,32 @@
         "ThankYou": "Obrigado por nos ajudar a melhorar o Matomo!",
         "TopLinkTooltip": "Diga-nos o que acha ou solicite apoio profissional.",
         "ViewAnswersToFAQ": "Ver respostas às %1$sperguntas frequentes%2$s",
+        "FAQs": "Perguntas frequentes",
         "ViewUserGuides": "Saiba como configurar o Matomo e como analisar eficazmente os seus dados com os nossos %1$sguias do utilizador%2$s",
+        "UserGuides": "Guias do utilizador",
         "CommunityHelp": "Ajuda da comunidade",
         "ProfessionalHelp": "Ajuda profissional",
-        "ProfessionalServicesIntro": "A nossa rede mundial de consultores profissionais do Matomo apoia clientes que alojam o Matomo nas suas próprias infraestruturas.",
+        "ProfessionalServicesIntro": "Com subscrição de suporte técnico no local do Matomo, permita que a nossa equipa experiente o apoie online na utilização do Matomo Analytics para ajudar o seu negócio a crescer.",
         "ProfessionalServicesOfferIntro": "Quais os serviços que pode beneficiar?",
-        "ProfessionalServicesReviewPiwikSetup": "Uma análise da sua configuração do Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Serviços de otimização e manutenção do Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Apoio por telefone ou e-mail",
-        "ProfessionalServicesTraining": "Formação de utilizadores, de técnicos e de programadores",
-        "ProfessionalServicesPremiumFeatures": "Funcionalidades exclusivas",
-        "ProfessionalServicesCustomDevelopment": "Serviços de programação à medida",
-        "ProfessionalServicesAnalystConsulting": "Serviços de consultoria de analistas",
+        "ProfessionalServicesDedicatedSupport": "Acompanhamento por um membro dedicado da equipa do Matomo a cada passo do percurso",
+        "ProfessionalServicesOnboarding": "Questionário de contextualização e reunião com um membro do apoio do Matomo",
+        "ProfessionalServicesSupport": "Pedido de serviço online, 24\/7",
+        "ProfessionalServicesTraining": "Acesso exclusivo a vídeos de formação do Matomo",
+        "ProfessionalServicesEmailAlerts": "Avisos por e-mail para lançamentos de segurança do Matomo",
         "ContactUs": "Contacte-nos",
-        "VisitTheForums": "Visite os %1$s fóruns%2$s e obtenha ajuda da comunidade de utilizadores do Matomo"
+        "VisitTheForums": "Visite os %1$s fóruns%2$s e obtenha ajuda da comunidade de utilizadores do Matomo",
+        "Forums": "Fóruns",
+        "ReviewMatomoTitle": "Acredita no Matomo?",
+        "PleaseLeaveExternalReviewForMatomo": "Partilhe a sua opinião num destes sites e inspire outro a participar na nossa revolução dos dados.",
+        "RemindMeLater": "Lembrar mais tarde",
+        "NeverAskMeAgain": "Não voltar a perguntar",
+        "HowCanWeHelp": "Como podemos ajudar?",
+        "NotTrackingVisits": "O Matomo não está a registar quaisquer visitas",
+        "TrackMultipleSites": "Eu preciso de acompanhar múltiplos sites ou subdomínios",
+        "RemoveOtherLabel": "E quero ver os dados do meu 'Outros'",
+        "PurgeOldData": "Eu quero remover alguns dados antigos",
+        "SearchHelpResources": "Procurar por recursos de apoio em matomo.org",
+        "PopularHelpTopics": "Tópicos de ajuda populares",
+        "SearchOnMatomo": "Procurar por '%1$s' em Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/ro.json b/app/plugins/Feedback/lang/ro.json
index 8d4156fd9..2e88722f0 100644
--- a/app/plugins/Feedback/lang/ro.json
+++ b/app/plugins/Feedback/lang/ro.json
@@ -15,6 +15,7 @@
         "TopLinkTooltip": "Transmiteti-ne parerea Dvs sau cereti Support Profesional.",
         "ViewAnswersToFAQ": "Vedeti raspunsurile la %1$sIntrebari Frecvente(FAQ)%2$s",
         "ViewUserGuides": "Invata cum sa configurezi Matomo si cum sa analizezi datele eficient cu %1$sghidurile de utilizare%2$s",
-        "VisitTheForums": "Vizitati %1$s Forumurile%2$s si primiti ajutor de la comunitatea de utilizatori Matomo."
+        "VisitTheForums": "Vizitati %1$s Forumurile%2$s si primiti ajutor de la comunitatea de utilizatori Matomo.",
+        "Forums": "Forumuri"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/ru.json b/app/plugins/Feedback/lang/ru.json
index 97ff3e6ef..bfde2e6c6 100644
--- a/app/plugins/Feedback/lang/ru.json
+++ b/app/plugins/Feedback/lang/ru.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "Узнайте, как настроить Matomo и эффективно анализировать Ваши данные, используя %1$s руководства пользователя%2$s",
         "CommunityHelp": "Помощь сообщества",
         "ProfessionalHelp": "Помощь профессионала",
-        "ProfessionalServicesIntro": "Наша всемирная сеть профессиональных консультантов для технической поддержки клиентов Matomo, которые интегрируют Matomo в свою собственную инфраструктуру.",
         "ProfessionalServicesOfferIntro": "Какими услугами вы можете воспользоваться?",
-        "ProfessionalServicesReviewPiwikSetup": "Аудит ваших настроек Matomo",
-        "ProfessionalServicesOptimizationMaintenance": "Услуги по оптимизации и техническому обслуживанию Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Поддержка по телефону и email.",
-        "ProfessionalServicesTraining": "Обучение пользователей, технических специалистов и разработчиков",
-        "ProfessionalServicesPremiumFeatures": "Премиальные особенности",
-        "ProfessionalServicesCustomDevelopment": "Индивидуальные услуги по разработке",
-        "ProfessionalServicesAnalystConsulting": "Консультации аналитиков",
         "ContactUs": "Свяжитесь с нами",
-        "VisitTheForums": "Посетите %1$s Форумы%2$s и получите помощь от сообщества пользователей Matomo"
+        "VisitTheForums": "Посетите %1$s Форумы%2$s и получите помощь от сообщества пользователей Matomo",
+        "Forums": "Форумы"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/sk.json b/app/plugins/Feedback/lang/sk.json
index fe7afe056..5eb03fee9 100644
--- a/app/plugins/Feedback/lang/sk.json
+++ b/app/plugins/Feedback/lang/sk.json
@@ -1,6 +1,7 @@
 {
     "Feedback": {
         "IWantTo": "Chcem:",
-        "SendFeedback": "Odoslať spätnú väzbu"
+        "SendFeedback": "Odoslať spätnú väzbu",
+        "Forums": "Fóra"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/sl.json b/app/plugins/Feedback/lang/sl.json
index 1dc71184f..7be2d4f97 100644
--- a/app/plugins/Feedback/lang/sl.json
+++ b/app/plugins/Feedback/lang/sl.json
@@ -5,6 +5,7 @@
         "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 Matomo!"
+        "ThankYou": "Hvala, ker nam pomagate izboljšati Matomo!",
+        "Forums": "Forumi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/sq.json b/app/plugins/Feedback/lang/sq.json
index 607387836..2ee1b4f98 100644
--- a/app/plugins/Feedback/lang/sq.json
+++ b/app/plugins/Feedback/lang/sq.json
@@ -16,23 +16,32 @@
         "ThankYou": "Faleminderit që na ndihmoni ta bëjmë më të mirë Matomo-n!",
         "TopLinkTooltip": "Na thoni se ç’mendim keni, ose kërkoni Asistencë Profesionale.",
         "ViewAnswersToFAQ": "Shihni përgjigjet te %1$sPyetje të Bëra Shpesh%2$s",
+        "FAQs": "FAQ",
         "ViewUserGuides": "Mësoni përmes %1$sudhërrëfyesit tonë për përdoruesit%2$s se si ta formësoni Matomo-n dhe si të analizoni me efikasitet të dhënat tuaja",
+        "UserGuides": "Udhërrëfyes përdoruesi",
         "CommunityHelp": "Ndihmë nga Bashkësia",
         "ProfessionalHelp": "Ndihmë Profesionale",
-        "ProfessionalServicesIntro": "Rrjeti ynë mbarëbotëror i konsulentëve profesionalë për Matomo ofron asistencë për klientë që kanë të instaluar Matomo-n në infrastrukturën e tyre.",
+        "ProfessionalServicesIntro": "Me një Matomo On-Premise Support Subscription, lërjani ekipit tonë të sprovuar t’ju asistojë <em>online<\/em> lidhur me përdorimin e Matomo Analytics që të fuqizoni biznesin tuaj.",
         "ProfessionalServicesOfferIntro": "Prej cilave shërbime mund të përfitoni?",
-        "ProfessionalServicesReviewPiwikSetup": "Një përmbledhje e rregullimit të Matomo-s tuaj",
-        "ProfessionalServicesOptimizationMaintenance": "Shërbime optimizimi & mirëmbajtjeje të Matomo-s",
-        "ProfessionalServicesPhoneEmailSupport": "Asistencë me Telefon dhe Email",
-        "ProfessionalServicesTraining": "Trajnim Përdoruesish, Teknik, dhe Zhvilluesish",
-        "ProfessionalServicesPremiumFeatures": "Veçori me pagesë",
-        "ProfessionalServicesCustomDevelopment": "Shërbime Zhvillimi Përshtatjesh",
-        "ProfessionalServicesAnalystConsulting": "Shërbime konsulence analisti",
+        "ProfessionalServicesDedicatedSupport": "Asistencë enkas prej një anëtari të ekipit Matomo përgjatë çdo hapi të udhës",
+        "ProfessionalServicesOnboarding": "Pyetje për fillimin dhe takim me një anëtar të Asistencës Matomo",
+        "ProfessionalServicesSupport": "Shërbim kërkesash <em>online<\/em> 24\/7",
+        "ProfessionalServicesTraining": "Përdorim ekskluziv videosh trajnimi Matomo",
+        "ProfessionalServicesEmailAlerts": "Sinjalizime me email për hedhje në qarkullim lidhur me sigurinë për Matomo-n",
         "ContactUs": "Lidhuni me ne",
         "VisitTheForums": "Vizitoni %1$s Forumet%2$s dhe merrni ndihmë prej bashkësisë së përdoruesve të Matomo-s",
+        "Forums": "Forume",
         "ReviewMatomoTitle": "Besoni në Matomo?",
         "PleaseLeaveExternalReviewForMatomo": "Ndajini mendimet tuaja me të tjerët në një nga këto sajte dhe frymëzoni të tjerët të bahen pjesë e revolucionet tonë të të dhënave.",
         "RemindMeLater": "Kujtomë më vonë",
-        "NeverAskMeAgain": "Mos më ripyet më kurrë"
+        "NeverAskMeAgain": "Mos më ripyet më kurrë",
+        "HowCanWeHelp": "Si mund t’ju ndihmojmë?",
+        "NotTrackingVisits": "Matomo nuk po gjurmon ndonjë vizitë",
+        "TrackMultipleSites": "Kam nevojë të gjurmoj disa sajte apo nënpërkatësi",
+        "RemoveOtherLabel": "Dua të shoh të dhëna 'Të tjera' të miat",
+        "PurgeOldData": "Dua të heq ca të dhëna të vjetra",
+        "SearchHelpResources": "Kërkoni për burime ndihme te matomo.org",
+        "PopularHelpTopics": "Tema popullore ndihme",
+        "SearchOnMatomo": "Kërkoni për '%1$s' te Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/sr.json b/app/plugins/Feedback/lang/sr.json
index fc639e6a6..f9f4a95d2 100644
--- a/app/plugins/Feedback/lang/sr.json
+++ b/app/plugins/Feedback/lang/sr.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "Naučite kako da podesite Matomo i kako da efikasno analizirate vaše podatke prateći %1$skorisničko uputstvo%2$s",
         "CommunityHelp": "Pomoć zajednice",
         "ProfessionalHelp": "Profesionalna pomoć",
-        "ProfessionalServicesIntro": "Svetska mreža profesionalnih konsultanata za podršku klijentima koji hostuju Matomo na sopstvenim platformama.",
         "ProfessionalServicesOfferIntro": "Od kojih usluga možete imati koristi?",
-        "ProfessionalServicesReviewPiwikSetup": "Provera vaše Matomo instalacije",
-        "ProfessionalServicesOptimizationMaintenance": "Usluge optimizacije i održavanja Matomo-a",
-        "ProfessionalServicesPhoneEmailSupport": "Telefonska i podrška putem mejla",
-        "ProfessionalServicesTraining": "Korisnički, tehnički i razvojni trening",
-        "ProfessionalServicesPremiumFeatures": "Premium sadržaji",
-        "ProfessionalServicesCustomDevelopment": "Razvoj usluga po vašoj želji",
-        "ProfessionalServicesAnalystConsulting": "Usluge analitičkog konsaltinga",
         "ContactUs": "Kontaktirajte nas",
-        "VisitTheForums": "Posetite %1$s Forum%2$s kako biste dobili pomoć zajednice Matomo korisnika"
+        "VisitTheForums": "Posetite %1$s Forum%2$s kako biste dobili pomoć zajednice Matomo korisnika",
+        "Forums": "Forumi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/sv.json b/app/plugins/Feedback/lang/sv.json
index 58a33399e..655cb5653 100644
--- a/app/plugins/Feedback/lang/sv.json
+++ b/app/plugins/Feedback/lang/sv.json
@@ -19,16 +19,14 @@
         "ViewUserGuides": "Lär dig att konfigurera Matomo och hur man på ett effektivt sätt analyserar data med våra %1$sanvändarguider%2$s",
         "CommunityHelp": "Community Hjälp",
         "ProfessionalHelp": "Professionell hjälp",
-        "ProfessionalServicesIntro": "Vårt globala nätverk av professionella Matomo-konsulter stöttar de kunder som själva driftar sina Matomo-installationer på egen infrastruktur.",
         "ProfessionalServicesOfferIntro": "Vilka tjänster kan du dra nytta av?",
-        "ProfessionalServicesReviewPiwikSetup": "En utvärdering av din Matomoinstallation",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo optimerings-tjänster och applikationsdrift.",
-        "ProfessionalServicesPhoneEmailSupport": "Support via telefon och e-post",
-        "ProfessionalServicesTraining": "Utbildning för användare, tekniker och utvecklare.",
-        "ProfessionalServicesPremiumFeatures": "Premium-funktioner",
-        "ProfessionalServicesCustomDevelopment": "Utvecklingstjänster",
-        "ProfessionalServicesAnalystConsulting": "Analystjänster",
         "ContactUs": "Kontakta oss",
-        "VisitTheForums": "Besök %1$s forumet%2$s och få hjälp av Matomo-användare"
+        "VisitTheForums": "Besök %1$s forumet%2$s och få hjälp av Matomo-användare",
+        "Forums": "Forum",
+        "RemindMeLater": "Påminn mig senare",
+        "NeverAskMeAgain": "Fråga mig inte igen",
+        "HowCanWeHelp": "Hur kan vi hjälpa?",
+        "NotTrackingVisits": "Matomo spårar inte några besök",
+        "SearchOnMatomo": "Sök efter '%1$s' på Matomo.org"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/tl.json b/app/plugins/Feedback/lang/tl.json
index 18cced288..b9d971541 100644
--- a/app/plugins/Feedback/lang/tl.json
+++ b/app/plugins/Feedback/lang/tl.json
@@ -16,6 +16,7 @@
         "TopLinkTooltip": "Sabihin sa amin ang iyong iniisip o humiling ng Propesyonal na Suporta.",
         "ViewAnswersToFAQ": "Ipakita ang sagot sa %1$s Mga Madalas Itanong %2$s",
         "ViewUserGuides": "Alamin kung paano i-configure ang Matomo at kung paano epektibong pag-aralan ang iyong data sa aming %1$suser gabay sa %2$s.",
-        "VisitTheForums": "Bisitahin ang mga %1$s Forum %2$s at makakuha ng tulong mula sa komunidad ng mga Matomo user."
+        "VisitTheForums": "Bisitahin ang mga %1$s Forum %2$s at makakuha ng tulong mula sa komunidad ng mga Matomo user.",
+        "Forums": "Mga Forum"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/tr.json b/app/plugins/Feedback/lang/tr.json
index d53710fd2..f40d01b23 100644
--- a/app/plugins/Feedback/lang/tr.json
+++ b/app/plugins/Feedback/lang/tr.json
@@ -16,23 +16,32 @@
         "ThankYou": "Matomo uygulamasını geliştirmemize yardımcı olduğunuz için teşekkür ederiz!",
         "TopLinkTooltip": "Bize düşüncelerinizi iletin ya da Profesyonel Destek isteyin.",
         "ViewAnswersToFAQ": "%1$sSık Sorulan Soruların%2$s yanıtlarına bakın",
+        "FAQs": "SSS",
         "ViewUserGuides": "%1$sKullanıcı kitaplarını%2$s okuyarak Matomo yapılandırmasını nasıl yapacağınızı ve verilerinizi nasıl inceleyeceğinizi öğrenin",
+        "UserGuides": "Kullanıcı kılavuzları",
         "CommunityHelp": "Topluluk Desteği",
         "ProfessionalHelp": "Profesyonel Destek",
-        "ProfessionalServicesIntro": "Kendi sisteminde Matomo kullanan müşterilerimiz için dünya çapında profesyonel danışman ağımız bulunuyor.",
+        "ProfessionalServicesIntro": "Matomo Yerinde Destek Aboneliği ile işinizi büyütmek için Matomo Analytics kurarken ve kullanırken deneyimli ekibimizden çevrimiçi yardım alabilirsiniz.",
         "ProfessionalServicesOfferIntro": "Alabileceğiniz hizmetler nelerdir?",
-        "ProfessionalServicesReviewPiwikSetup": "Matomo kurulumunuzun özeti",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo iyileştirme ve bakım hizmetleri",
-        "ProfessionalServicesPhoneEmailSupport": "Telefon ve E-posta ile destek",
-        "ProfessionalServicesTraining": "Kullanıcı, Teknik ve Geliştirici eğitimleri",
-        "ProfessionalServicesPremiumFeatures": "Ücretli özellikler",
-        "ProfessionalServicesCustomDevelopment": "Özel Geliştirme hizmetleri",
-        "ProfessionalServicesAnalystConsulting": "İstatistik danışmanlığı hizmetleri",
+        "ProfessionalServicesDedicatedSupport": "Her adımınızda size eşlik edecek bir Matomo ekibi üyesinin desteği",
+        "ProfessionalServicesOnboarding": "Çalışmaya başlama anketi ve bir Matomo Destek ekibi üyesi ile görüşme",
+        "ProfessionalServicesSupport": "24\/7 çevrimiçi destek isteği hizmeti",
+        "ProfessionalServicesTraining": "Matomo görüntülü eğitimlerine ayrıcalıklı erişim",
+        "ProfessionalServicesEmailAlerts": "Matomo güvenlik güncellemeleri hakkında e-posta bildirimleri",
         "ContactUs": "Bizimle görüşün",
         "VisitTheForums": "%1$sForumları%2$s ziyaret ederek Matomo kullanıcı topluluğundan destek alabilirsiniz",
+        "Forums": "Forum",
         "ReviewMatomoTitle": "Matomo uygulamasına güveniyor musunuz?",
         "PleaseLeaveExternalReviewForMatomo": "Düşüncelerinizi bu sitelerden birinde paylaşın ve başkalarına da veri devrimimize katılmaları için ilham verin.",
         "RemindMeLater": "Daha sonra anımsat",
-        "NeverAskMeAgain": "Bir daha sorma"
+        "NeverAskMeAgain": "Bir daha sorma",
+        "HowCanWeHelp": "Nasıl yardımcı olabiliriz?",
+        "NotTrackingVisits": "Matomo herhangi bir ziyareti kaydetmiyor",
+        "TrackMultipleSites": "Birden çok site ya da alt etki alanını izlemek istiyorum",
+        "RemoveOtherLabel": "'Diğerleri' ile ilgili bilgilerimi görmek istiyorum",
+        "PurgeOldData": "Bazı eski verileri silmek istiyorum",
+        "SearchHelpResources": "Matomo.org yardım kaynaklarında arayın",
+        "PopularHelpTopics": "Sık başvurulan yardım konuları",
+        "SearchOnMatomo": "Matomo.org üzerinde '%1$s' arayın"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/uk.json b/app/plugins/Feedback/lang/uk.json
index f28205373..a4d2f7fd6 100644
--- a/app/plugins/Feedback/lang/uk.json
+++ b/app/plugins/Feedback/lang/uk.json
@@ -5,6 +5,7 @@
         "LearnWaysToParticipate": "Дізнатися про всі способи %1$sдолучитися%2$s",
         "ManuallySendEmailTo": "Будь-ласка надішліть ваше повідомлення власноручно на",
         "SendFeedback": "Надіслати відгук",
-        "ThankYou": "Дякуємо що допомагаєте робити Matomo кращим!"
+        "ThankYou": "Дякуємо що допомагаєте робити Matomo кращим!",
+        "Forums": "Форуми"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/vi.json b/app/plugins/Feedback/lang/vi.json
index 361b0e84d..c6295cb06 100644
--- a/app/plugins/Feedback/lang/vi.json
+++ b/app/plugins/Feedback/lang/vi.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "Tìm hiểu cách định cấu hình Matomo và cách phân tích hiệu quả dữ liệu của bạn với %1$shướng dẫn%2$s của chúng tôi",
         "CommunityHelp": "Trợ giúp cộng đồng",
         "ProfessionalHelp": "Trợ giúp chuyên nghiệp",
-        "ProfessionalServicesIntro": "Mạng lưới tư vấn chuyên nghiệp trên toàn thế giới của chúng tôi hỗ trợ khách hàng lưu trữ Matomo trên cơ sở hạ tầng của riêng họ.",
         "ProfessionalServicesOfferIntro": "Những dịch vụ bạn có thể được hưởng lợi từ?",
-        "ProfessionalServicesReviewPiwikSetup": "Đánh giá về thiết lập Matomo của bạn",
-        "ProfessionalServicesOptimizationMaintenance": "Dịch vụ bảo trì và tối ưu hóa Matomo",
-        "ProfessionalServicesPhoneEmailSupport": "Hỗ trợ qua điện thoại và email",
-        "ProfessionalServicesTraining": "Đào tạo người dùng, kỹ thuật và nhà phát triển",
-        "ProfessionalServicesPremiumFeatures": "Tính năng cao cấp",
-        "ProfessionalServicesCustomDevelopment": "Dịch vụ phát triển tùy chỉnh",
-        "ProfessionalServicesAnalystConsulting": "Dịch vụ tư vấn phân tích",
         "ContactUs": "Liên hệ chúng tôi",
-        "VisitTheForums": "Truy cập %1$sdiễn đàn%2$s và nhận trợ giúp từ cộng đồng người dùng Matomo"
+        "VisitTheForums": "Truy cập %1$sdiễn đàn%2$s và nhận trợ giúp từ cộng đồng người dùng Matomo",
+        "Forums": "Các diễn đàn"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/zh-cn.json b/app/plugins/Feedback/lang/zh-cn.json
index d17fe88e6..f3a156683 100644
--- a/app/plugins/Feedback/lang/zh-cn.json
+++ b/app/plugins/Feedback/lang/zh-cn.json
@@ -7,6 +7,7 @@
         "SendFeedback": "提交反馈",
         "ThankYou": "感谢您帮助我们改进 Matomo ！",
         "TopLinkTooltip": "告诉我们您的想法，或者寻求专业技术支持。",
-        "ContactUs": "联系我们"
+        "ContactUs": "联系我们",
+        "Forums": "论坛"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/lang/zh-tw.json b/app/plugins/Feedback/lang/zh-tw.json
index fa6644dd3..36033ae47 100644
--- a/app/plugins/Feedback/lang/zh-tw.json
+++ b/app/plugins/Feedback/lang/zh-tw.json
@@ -19,16 +19,9 @@
         "ViewUserGuides": "查看我們的%1$s使用者指南%2$s以了解如何設定 Matomo 及如何有效分你的資料。",
         "CommunityHelp": "社區協助",
         "ProfessionalHelp": "專業協助",
-        "ProfessionalServicesIntro": "我們的 Matomo 全球性網路專業顧問支援那些自己架設 Matomo 的客戶。",
         "ProfessionalServicesOfferIntro": "你可以獲得哪些服務？",
-        "ProfessionalServicesReviewPiwikSetup": "Matomo 安裝的評價",
-        "ProfessionalServicesOptimizationMaintenance": "Matomo 優化及維護服務",
-        "ProfessionalServicesPhoneEmailSupport": "電話及 Email 支援",
-        "ProfessionalServicesTraining": "使用者、技術和開發人員訓練",
-        "ProfessionalServicesPremiumFeatures": "高級功能",
-        "ProfessionalServicesCustomDevelopment": "自訂服務開發",
-        "ProfessionalServicesAnalystConsulting": "分析諮詢服務",
         "ContactUs": "聯絡我們",
-        "VisitTheForums": "訪問%1$s論壇%2$s從社區中的 Matomo 使用者中取得協助。"
+        "VisitTheForums": "訪問%1$s論壇%2$s從社區中的 Matomo 使用者中取得協助。",
+        "Forums": "論壇"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Feedback/stylesheets/feedback.less b/app/plugins/Feedback/stylesheets/feedback.less
index 9f33886fc..5f89291d0 100644
--- a/app/plugins/Feedback/stylesheets/feedback.less
+++ b/app/plugins/Feedback/stylesheets/feedback.less
@@ -9,9 +9,17 @@
     line-height: 18px;
   }
 
-  p {
-    line-height: 1.7em;
+  p, h4 {
     font-size: 13px;
+    padding-bottom: 4px;
+  }
+
+  .browse-matomo-help {
+    padding-top: 10px;
+  }
+
+  h4 {
+    font-weight: bold;
   }
 
   .piwik-donate-call {
@@ -35,6 +43,45 @@
     font-style: normal;
   }
 
+  .feedback-help-resources {
+    h4 {
+      padding-top: 20px;
+      padding-bottom: 8px;
+    }
+
+    .search-matomo-form {
+      margin-right: 20px;
+      padding-bottom: 10px;
+      width: 100%;
+      display: table-row;
+
+      div.search-field {
+        display: table-cell;
+        width: 100%;
+        padding-left: 10px;
+      }
+
+      div.search-button {
+        height: 100%;
+        vertical-align: middle;
+        display: table-cell;
+        padding-right: 10px;
+      }
+
+      input[type="text"] {
+        width: 87%;
+        padding-left: 10px;
+        border: none;
+        margin-bottom: 0;
+
+        &:focus {
+          border: none;
+          box-shadow: none;
+        }
+      }
+    }
+  }
+
   .footer {
     text-align: center;
     margin-top: 48px;
diff --git a/app/plugins/Feedback/templates/index.twig b/app/plugins/Feedback/templates/index.twig
index d26d3a9e7..c8099a020 100644
--- a/app/plugins/Feedback/templates/index.twig
+++ b/app/plugins/Feedback/templates/index.twig
@@ -12,43 +12,58 @@
              content-title="{{ headline|e('html_attr') }}"
              feature="{{ 'General_Help'|translate|e('html_attr') }}">
             <p>{{ 'General_MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
-                "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org'>",
-                "</a>",
-                "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/get-involved/'>",
-                "</a>",
-                "<a href='#donate'>",
-                "</a>",
-                "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/team/'>",
-                "</a>"
+                    "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org'>",
+                    "</a>",
+                    "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/get-involved/'>",
+                    "</a>",
+                    "<a href='#donate'>",
+                    "</a>",
+                    "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/team/'>",
+                    "</a>"
                 )|raw }}
             </p>
         </div>
 
-        <div piwik-content-block content-title="{{ 'Feedback_CommunityHelp'|translate|e('html_attr') }}">
-            <p> &bull; {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/'>","</a>")|raw }}.</p>
-            <p> &bull; {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/faq/'>","</a>")|raw }}.</p>
-            <p> &bull; {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' rel='noreferrer noopener' href='https://forum.matomo.org/'>","</a>")|raw }}.</p>
-            <p> &bull; {{ 'API_LearnAboutCommonlyUsedTerms2'|translate }} <a href="{{ linkTo({'module':"API",'action':"glossary"}) }}">({{ 'API_Glossary'|translate }})</a></p>
-        </div>
+        <div piwik-content-block content-title="{{ "Feedback_HowCanWeHelp"|translate|e('html_attr') }}" class="feedback-help-resources">
+            <form target="_blank" method="GET" action="https://matomo.org/">
+                <div class="search-matomo-form z-depth-1">
+                    <div class="search-field">
+                        <span class="icon-search"></span>
+                        <input type="text" placeholder="{{'Feedback_SearchHelpResources'|translate|e('html_attr')}}" name="s"/>
+                    </div>
+                    <div class="search-button">
+                        <input type="submit" value="Search" class="btn hide-on-small-only"/>
+                    </div>
+                </div>
+            </form>
+
+            <h4>{{'Feedback_PopularHelpTopics'|translate}}</h4>
+            {% for helpTopic in popularHelpTopics %}
+                <p> &bull;  <a rel="noreferrer noopener" target="_blank" href="{{helpTopic.url|e('html_attr')}}">{{helpTopic.title|translate}}</a></p>
+            {% endfor %}
+
+            <h4>{{ 'Feedback_CommunityHelp'|translate }}</h4>
+            <p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/docs/">{{ 'Feedback_UserGuides'|translate }}</a> - {{ 'Feedback_ViewUserGuides'|translate("","") }}.</p>
+            <p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/">{{ 'Feedback_FAQs'|translate }}</a> - {{ 'Feedback_ViewAnswersToFAQ'|translate("","") }}.</p>
+            <p> &bull; <a target="_blank" rel="noreferrer noopener" href="https://forum.matomo.org/">{{ 'Feedback_Forums'|translate }}</a> - {{ 'Feedback_VisitTheForums'|translate("","") }}.</p>
+            <p> &bull; <a target="_blank" rel="noreferrer noopener" href="{{ linkTo({'module':"API",'action':"glossary"}) }}">{{ 'API_Glossary'|translate }}</a> - {{ 'API_LearnAboutCommonlyUsedTerms2'|translate }}</p>
 
-        <div piwik-content-block content-title="{{ 'Feedback_ProfessionalHelp'|translate|e('html_attr') }}">
+            <h4>{{ 'Feedback_ProfessionalHelp'|translate }}</h4>
             <p>{{ 'Feedback_ProfessionalServicesIntro'|translate }}</p>
 
             <p>{{ 'Feedback_ProfessionalServicesOfferIntro'|translate }}</p>
-            <p> &bull; {{ 'Feedback_ProfessionalServicesReviewPiwikSetup'|translate }}</p>
-            <p> &bull; {{ 'Feedback_ProfessionalServicesOptimizationMaintenance'|translate }}</p>
-            <p> &bull; {{ 'Feedback_ProfessionalServicesPhoneEmailSupport'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesDedicatedSupport'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesOnboarding'|translate }}</p>
             <p> &bull; {{ 'Feedback_ProfessionalServicesTraining'|translate }}</p>
-            <p> &bull; <a  rel='noreferrer noopener' target='_blank' href='https://matomo.org/recommends/premium-plugins'>{{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</a></p>
-            <p> &bull; {{ 'Feedback_ProfessionalServicesCustomDevelopment'|translate }}</p>
-            <p> &bull; {{ 'Feedback_ProfessionalServicesAnalystConsulting'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesSupport'|translate }}</p>
+            <p> &bull; {{ 'Feedback_ProfessionalServicesEmailAlerts'|translate }}</p>
 
-            <form target="_blank" action="https://matomo.org/support/">
+            <form target="_blank" action="https://matomo.org/support-plans/">
                 <input type="hidden" name="pk_campaign" value="App_Help">
-                <input type="hidden" name="pk_source" value="Piwik_App">
+                <input type="hidden" name="pk_source" value="Matomo_App">
                 <input type="hidden" name="pk_medium" value="App_ContactUs_button">
                 <br />
-                <input type="submit" class="btn" value="{{ 'Feedback_ContactUs'|translate }}">
+                <input type="submit" class="btn" value="{{ 'General_MoreDetails'|translate }}">
             </form>
         </div>
 
diff --git a/app/plugins/GeoIp2/Commands/UpdateRegionCodes.php b/app/plugins/GeoIp2/Commands/UpdateRegionCodes.php
new file mode 100644
index 000000000..66f18aa70
--- /dev/null
+++ b/app/plugins/GeoIp2/Commands/UpdateRegionCodes.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\GeoIp2\Commands;
+
+use Piwik\Development;
+use Piwik\Http;
+use Piwik\Plugin\ConsoleCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class UpdateRegionCodes extends ConsoleCommand
+{
+    public $source = 'https://salsa.debian.org/iso-codes-team/iso-codes/raw/master/data/iso_3166-2.json';
+
+    protected function configure()
+    {
+        $this->setName('usercountry:update-region-codes');
+        $this->setDescription("Updates the ISO region names");
+    }
+
+    public function isEnabled()
+    {
+        return Development::isEnabled();
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return void|int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $regionsFile = __DIR__ . '/../data/isoRegionNames.php';
+
+        $output->setDecorated(true);
+
+        $output->writeln('Starting region codes update');
+
+        $output->write('Fetching region codes from ' . $this->source);
+
+        try {
+            $newContent = Http::sendHttpRequest($this->source, 1000);
+        } catch (\Exception $e) {
+            $output->writeln(' <fg=red>X (Fetching content failed)</>');
+            return 1;
+        }
+
+        $regionData = json_decode($newContent, true);
+
+        if (empty($regionData)) {
+            $output->writeln(' <fg=red>X (Content could not be parsed)</>');
+            return 1;
+        }
+
+        $output->writeln(' <fg=green>✓</>');
+
+        $newRegions = [];
+        foreach ($regionData['3166-2'] as $region) {
+
+            // some fixes of incorrect region codes
+            if ($region['code'] === 'SS-EE8') {
+                $region['code'] = 'SS-EE';
+            }
+            if ($region['code'] === 'ML-BK0') {
+                $region['code'] = 'ML-BKO';
+            }
+            if ($region['code'] === 'IQ-SW') {
+                $region['code'] = 'IQ-SU';
+            }
+            if ($region['code'] === 'MU-RP') {
+                $region['code'] = 'MU-RR';
+            }
+
+            list($countryCode, $regionCode) = explode('-', $region['code']);
+            $newRegions[$countryCode][$regionCode] = $region['name'];
+        }
+
+        $currentRegions = include $regionsFile;
+
+        // regions for Saint Lucia missing in iso-codes
+        if (empty($newRegions['LC']) && !empty($currentRegions['LC'])) {
+            $newRegions['LC'] = $currentRegions['LC'];
+        }
+
+        // regions for Republic of Côte d'Ivoire still outdated in iso-codes
+        $newRegions['CI'] = $currentRegions['CI'];
+
+        // regions missing in iso-codes
+        $isoCodesMissing = [
+            'AR-F', 'BI-MY', 'DO-31', 'DO-32', 'DO-33', 'DO-34', 'DO-35', 'DO-36', 'DO-37', 'DO-38', 'DO-39', 'DO-40', 'DO-41', 'DO-42',
+            'EG-LX', 'HT-NI', 'IQ-KI', 'IR-32', 'KG-GO', 'KZ-BAY', 'LR-GP', 'LR-RG', 'MK-85', 'QA-SH', 'SD-GK', 'SI-212', 'SI-213',
+            'TH-38', 'TJ-DU', 'TJ-RA', 'TT-MRC', 'TT-TOB', 'YE-HU'
+        ];
+
+        foreach ($isoCodesMissing as $isoCode) {
+            list($countryCode, $regionCode) = explode('-', $isoCode);
+
+            if (!empty($newRegions[$countryCode][$regionCode])) {
+                continue; // skip if it was already icnluded
+            }
+
+            $newRegions[$countryCode][$regionCode] = $currentRegions[$countryCode][$regionCode];
+            ksort($newRegions[$countryCode], SORT_NATURAL);
+        }
+
+        ksort($newRegions);
+
+        if (json_encode($newRegions) === json_encode($currentRegions)) {
+            $output->writeln('Everything already up to date <fg=green>✓</>');
+            return 0;
+        }
+
+        $content = <<<CONTENT
+<?php
+// Generated file containing all ISO region codes and names
+return 
+CONTENT;
+
+        $content .= var_export($newRegions, true) . ';';
+
+        file_put_contents($regionsFile, $content);
+
+        $output->writeln('File successfully updated <fg=green>✓</>');
+        return 0;
+
+    }
+
+
+}
diff --git a/app/plugins/GeoIp2/config/tracker.php b/app/plugins/GeoIp2/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/GeoIp2/config/tracker.php
+++ b/app/plugins/GeoIp2/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/data/isoRegionNames.php b/app/plugins/GeoIp2/data/isoRegionNames.php
index f29350ad4..cdde9df9c 100644
--- a/app/plugins/GeoIp2/data/isoRegionNames.php
+++ b/app/plugins/GeoIp2/data/isoRegionNames.php
@@ -1,5476 +1,5483 @@
 <?php
 // Generated file containing all ISO region codes and names
 return array (
-    'AD' =>
-        array (
-            '02' => 'Canillo',
-            '03' => 'Encamp',
-            '04' => 'La Massana',
-            '05' => 'Ordino',
-            '06' => 'Sant Julià de Lòria',
-            '07' => 'Andorra la Vella',
-            '08' => 'Escaldes-Engordany',
-        ),
-    'AE' =>
-        array (
-            'AJ' => '\'Ajmān',
-            'AZ' => 'Abū Ȥaby [Abu Dhabi]',
-            'DU' => 'Dubayy',
-            'FU' => 'Al Fujayrah',
-            'RK' => 'Ra’s al Khaymah',
-            'SH' => 'Ash Shāriqah',
-            'UQ' => 'Umm al Qaywayn',
-        ),
-    'AF' =>
-        array (
-            'BAL' => 'Balkh',
-            'BAM' => 'Bāmyān',
-            'BDG' => 'Bādghīs',
-            'BDS' => 'Badakhshān',
-            'BGL' => 'Baghlān',
-            'DAY' => 'Dāykundī',
-            'FRA' => 'Farāh',
-            'FYB' => 'Fāryāb',
-            'GHA' => 'Ghaznī',
-            'GHO' => 'Ghōr',
-            'HEL' => 'Helmand',
-            'HER' => 'Herāt',
-            'JOW' => 'Jowzjān',
-            'KAB' => 'Kābul',
-            'KAN' => 'Kandahār',
-            'KAP' => 'Kāpīsā',
-            'KDZ' => 'Kunduz',
-            'KHO' => 'Khōst',
-            'KNR' => 'Kunar',
-            'LAG' => 'Laghmān',
-            'LOG' => 'Lōgar',
-            'NAN' => 'Nangarhār',
-            'NIM' => 'Nīmrōz',
-            'NUR' => 'Nūristān',
-            'PAN' => 'Panjshayr',
-            'PAR' => 'Parwān',
-            'PIA' => 'Paktiyā',
-            'PKA' => 'Paktīkā',
-            'SAM' => 'Samangān',
-            'SAR' => 'Sar-e Pul',
-            'TAK' => 'Takhār',
-            'URU' => 'Uruzgān',
-            'WAR' => 'Wardak',
-            'ZAB' => 'Zābul',
-        ),
-    'AG' =>
-        array (
-            '03' => 'Saint George',
-            '04' => 'Saint John',
-            '05' => 'Saint Mary',
-            '06' => 'Saint Paul',
-            '07' => 'Saint Peter',
-            '08' => 'Saint Philip',
-            10 => 'Barbuda',
-            11 => 'Redonda',
-        ),
-    'AL' =>
-        array (
-            '01' => 'Berat',
-            '02' => 'Durrës',
-            '03' => 'Elbasan',
-            '04' => 'Fier',
-            '05' => 'Gjirokastër',
-            '06' => 'Korçë',
-            '07' => 'Kukës',
-            '08' => 'Lezhë',
-            '09' => 'Dibër',
-            10 => 'Shkodër',
-            11 => 'Tiranë',
-            12 => 'Vlorë',
-            'BR' => 'Berat',
-            'BU' => 'Bulqizë',
-            'DI' => 'Dibër',
-            'DL' => 'Delvinë',
-            'DR' => 'Durrës',
-            'DV' => 'Devoll',
-            'EL' => 'Elbasan',
-            'ER' => 'Kolonjë',
-            'FR' => 'Fier',
-            'GJ' => 'Gjirokastër',
-            'GR' => 'Gramsh',
-            'HA' => 'Has',
-            'KA' => 'Kavajë',
-            'KB' => 'Kurbin',
-            'KC' => 'Kuçovë',
-            'KO' => 'Korçë',
-            'KR' => 'Krujë',
-            'KU' => 'Kukës',
-            'LB' => 'Librazhd',
-            'LE' => 'Lezhë',
-            'LU' => 'Lushnjë',
-            'MK' => 'Mallakastër',
-            'MM' => 'Malësi e Madhe',
-            'MR' => 'Mirditë',
-            'MT' => 'Mat',
-            'PG' => 'Pogradec',
-            'PQ' => 'Peqin',
-            'PR' => 'Përmet',
-            'PU' => 'Pukë',
-            'SH' => 'Shkodër',
-            'SK' => 'Skrapar',
-            'SR' => 'Sarandë',
-            'TE' => 'Tepelenë',
-            'TP' => 'Tropojë',
-            'TR' => 'Tiranë',
-            'VL' => 'Vlorë',
-        ),
-    'AM' =>
-        array (
-            'AG' => 'Aragacotn',
-            'AR' => 'Ararat',
-            'AV' => 'Armavir',
-            'ER' => 'Erevan',
-            'GR' => 'Gegarkunik\'',
-            'KT' => 'Kotayk\'',
-            'LO' => 'Lory',
-            'SH' => 'Sirak',
-            'SU' => 'Syunik\'',
-            'TV' => 'Tavus',
-            'VD' => 'Vayoc Jor',
-        ),
-    'AO' =>
-        array (
-            'BGO' => 'Bengo',
-            'BGU' => 'Benguela',
-            'BIE' => 'Bié',
-            'CAB' => 'Cabinda',
-            'CCU' => 'Cuando-Cubango',
-            'CNN' => 'Cunene',
-            'CNO' => 'Cuanza Norte',
-            'CUS' => 'Cuanza Sul',
-            'HUA' => 'Huambo',
-            'HUI' => 'Huíla',
-            'LNO' => 'Lunda Norte',
-            'LSU' => 'Lunda Sul',
-            'LUA' => 'Luanda',
-            'MAL' => 'Malange',
-            'MOX' => 'Moxico',
-            'NAM' => 'Namibe',
-            'UIG' => 'Uíge',
-            'ZAI' => 'Zaire',
-        ),
-    'AR' =>
-        array (
-            'A' => 'Salta',
-            'B' => 'Buenos Aires',
-            'C' => 'Ciudad Autónoma de Buenos Aires',
-            'D' => 'San Luis',
-            'E' => 'Entre Rios',
-            'F' => 'La Rioja',
-            'G' => 'Santiago del Estero',
-            'H' => 'Chaco',
-            'J' => 'San Juan',
-            'K' => 'Catamarca',
-            'L' => 'La Pampa',
-            'M' => 'Mendoza',
-            'N' => 'Misiones',
-            'P' => 'Formosa',
-            'Q' => 'Neuquen',
-            'R' => 'Rio Negro',
-            'S' => 'Santa Fe',
-            'T' => 'Tucuman',
-            'U' => 'Chubut',
-            'V' => 'Tierra del Fuego',
-            'W' => 'Corrientes',
-            'X' => 'Cordoba',
-            'Y' => 'Jujuy',
-            'Z' => 'Santa Cruz',
-        ),
-    'AT' =>
-        array (
-            1 => 'Burgenland',
-            2 => 'Kärnten',
-            3 => 'Niederösterreich',
-            4 => 'Oberösterreich',
-            5 => 'Salzburg',
-            6 => 'Steiermark',
-            7 => 'Tirol',
-            8 => 'Vorarlberg',
-            9 => 'Wien',
-        ),
-    'AU' =>
-        array (
-            'ACT' => 'Australian Capital Territory',
-            'NSW' => 'New South Wales',
-            'NT' => 'Northern Territory',
-            'QLD' => 'Queensland',
-            'SA' => 'South Australia',
-            'TAS' => 'Tasmania',
-            'VIC' => 'Victoria',
-            'WA' => 'Western Australia',
-        ),
-    'AZ' =>
-        array (
-            'ABS' => 'Abşeron',
-            'AGA' => 'Ağstafa',
-            'AGC' => 'Ağcabədi',
-            'AGM' => 'Ağdam',
-            'AGS' => 'Ağdaş',
-            'AGU' => 'Ağsu',
-            'AST' => 'Astara',
-            'BA' => 'Bakı',
-            'BAB' => 'Babək',
-            'BAL' => 'Balakən',
-            'BAR' => 'Bərdə',
-            'BEY' => 'Beyləqan',
-            'BIL' => 'Biləsuvar',
-            'CAB' => 'Cəbrayıl',
-            'CAL' => 'Cəlilabab',
-            'CUL' => 'Culfa',
-            'DAS' => 'Daşkəsən',
-            'FUZ' => 'Füzuli',
-            'GA' => 'Gəncə',
-            'GAD' => 'Gədəbəy',
-            'GOR' => 'Goranboy',
-            'GOY' => 'Göyçay',
-            'GYG' => 'Göygöl',
-            'HAC' => 'Hacıqabul',
-            'IMI' => 'İmişli',
-            'ISM' => 'İsmayıllı',
-            'KAL' => 'Kəlbəcər',
-            'KAN' => 'Kǝngǝrli',
-            'KUR' => 'Kürdəmir',
-            'LA' => 'Lənkəran',
-            'LAC' => 'Laçın',
-            'LAN' => 'Lənkəran',
-            'LER' => 'Lerik',
-            'MAS' => 'Masallı',
-            'MI' => 'Mingəçevir',
-            'NA' => 'Naftalan',
-            'NEF' => 'Neftçala',
-            'NV' => 'Naxçıvan',
-            'NX' => 'Naxçıvan',
-            'OGU' => 'Oğuz',
-            'ORD' => 'Ordubad',
-            'QAB' => 'Qəbələ',
-            'QAX' => 'Qax',
-            'QAZ' => 'Qazax',
-            'QBA' => 'Quba',
-            'QBI' => 'Qubadlı',
-            'QOB' => 'Qobustan',
-            'QUS' => 'Qusar',
-            'SA' => 'Şəki',
-            'SAB' => 'Sabirabad',
-            'SAD' => 'Sədərək',
-            'SAH' => 'Şahbuz',
-            'SAK' => 'Şəki',
-            'SAL' => 'Salyan',
-            'SAR' => 'Şərur',
-            'SAT' => 'Saatlı',
-            'SBN' => 'Şabran',
-            'SIY' => 'Siyəzən',
-            'SKR' => 'Şəmkir',
-            'SM' => 'Sumqayıt',
-            'SMI' => 'Şamaxı',
-            'SMX' => 'Samux',
-            'SR' => 'Şirvan',
-            'SUS' => 'Şuşa',
-            'TAR' => 'Tərtər',
-            'TOV' => 'Tovuz',
-            'UCA' => 'Ucar',
-            'XA' => 'Xankəndi',
-            'XAC' => 'Xaçmaz',
-            'XCI' => 'Xocalı',
-            'XIZ' => 'Xızı',
-            'XVD' => 'Xocavənd',
-            'YAR' => 'Yardımlı',
-            'YE' => 'Yevlax',
-            'YEV' => 'Yevlax',
-            'ZAN' => 'Zəngilan',
-            'ZAQ' => 'Zaqatala',
-            'ZAR' => 'Zərdab',
-        ),
-    'BA' =>
-        array (
-            '01' => 'Unsko-sanski kanton',
-            '02' => 'Posavski kanton',
-            '03' => 'Tuzlanski kanton',
-            '04' => 'Zeničko-dobojski kanton',
-            '05' => 'Bosansko-podrinjski kanton',
-            '06' => 'Srednjobosanski kanton',
-            '07' => 'Hercegovačko-neretvanski kanton',
-            '08' => 'Zapadnohercegovački kanton',
-            '09' => 'Kanton Sarajevo',
-            10 => 'Kanton br. 10 (Livanjski kanton)',
-            'BIH' => 'Federacija Bosne i Hercegovine',
-            'BRC' => 'Brčko distrikt',
-            'SRP' => 'Republika Srpska',
-        ),
-    'BB' =>
-        array (
-            '01' => 'Christ Church',
-            '02' => 'Saint Andrew',
-            '03' => 'Saint George',
-            '04' => 'Saint James',
-            '05' => 'Saint John',
-            '06' => 'Saint Joseph',
-            '07' => 'Saint Lucy',
-            '08' => 'Saint Michael',
-            '09' => 'Saint Peter',
-            10 => 'Saint Philip',
-            11 => 'Saint Thomas',
-        ),
-    'BD' =>
-        array (
-            '01' => 'Bandarban',
-            '02' => 'Barguna',
-            '03' => 'Bogra',
-            '04' => 'Brahmanbaria',
-            '05' => 'Bagerhat',
-            '06' => 'Barisal',
-            '07' => 'Bhola',
-            '08' => 'Comilla',
-            '09' => 'Chandpur',
-            10 => 'Chittagong',
-            11 => 'Cox\'s Bazar',
-            12 => 'Chuadanga',
-            13 => 'Dhaka',
-            14 => 'Dinajpur',
-            15 => 'Faridpur',
-            16 => 'Feni',
-            17 => 'Gopalganj',
-            18 => 'Gazipur',
-            19 => 'Gaibandha',
-            20 => 'Habiganj',
-            21 => 'Jamalpur',
-            22 => 'Jessore',
-            23 => 'Jhenaidah',
-            24 => 'Jaipurhat',
-            25 => 'Jhalakati',
-            26 => 'Kishorganj',
-            27 => 'Khulna',
-            28 => 'Kurigram',
-            29 => 'Khagrachari',
-            30 => 'Kushtia',
-            31 => 'Lakshmipur',
-            32 => 'Lalmonirhat',
-            33 => 'Manikganj',
-            34 => 'Mymensingh',
-            35 => 'Munshiganj',
-            36 => 'Madaripur',
-            37 => 'Magura',
-            38 => 'Moulvibazar',
-            39 => 'Meherpur',
-            40 => 'Narayanganj',
-            41 => 'Netrakona',
-            42 => 'Narsingdi',
-            43 => 'Narail',
-            44 => 'Natore',
-            45 => 'Nawabganj',
-            46 => 'Nilphamari',
-            47 => 'Noakhali',
-            48 => 'Naogaon',
-            49 => 'Pabna',
-            50 => 'Pirojpur',
-            51 => 'Patuakhali',
-            52 => 'Panchagarh',
-            53 => 'Rajbari',
-            54 => 'Rajshahi',
-            55 => 'Rangpur',
-            56 => 'Rangamati',
-            57 => 'Sherpur',
-            58 => 'Satkhira',
-            59 => 'Sirajganj',
-            60 => 'Sylhet',
-            61 => 'Sunamganj',
-            62 => 'Shariatpur',
-            63 => 'Tangail',
-            64 => 'Thakurgaon',
-            'A' => 'Barisal',
-            'B' => 'Chittagong',
-            'C' => 'Dhaka',
-            'D' => 'Khulna',
-            'E' => 'Rajshahi',
-            'F' => 'Rangpur',
-            'G' => 'Sylhet',
-        ),
-    'BE' =>
-        array (
-            'BRU' => 'Bruxelles-Capitale, Région de;Brussels Hoofdstedelijk Gewest',
-            'VAN' => 'Antwerpen',
-            'VBR' => 'Vlaams-Brabant',
-            'VLG' => 'Vlaams Gewest',
-            'VLI' => 'Limburg',
-            'VOV' => 'Oost-Vlaanderen',
-            'VWV' => 'West-Vlaanderen',
-            'WAL' => 'wallonne, Région',
-            'WBR' => 'Brabant wallon',
-            'WHT' => 'Hainaut',
-            'WLG' => 'Liège',
-            'WLX' => 'Luxembourg',
-            'WNA' => 'Namur',
-        ),
-    'BF' =>
-        array (
-            '01' => 'Boucle du Mouhoun',
-            '02' => 'Cascades',
-            '03' => 'Centre',
-            '04' => 'Centre-Est',
-            '05' => 'Centre-Nord',
-            '06' => 'Centre-Ouest',
-            '07' => 'Centre-Sud',
-            '08' => 'Est',
-            '09' => 'Hauts-Bassins',
-            10 => 'Nord',
-            11 => 'Plateau-Central',
-            12 => 'Sahel',
-            13 => 'Sud-Ouest',
-            'BAL' => 'Balé',
-            'BAM' => 'Bam',
-            'BAN' => 'Banwa',
-            'BAZ' => 'Bazèga',
-            'BGR' => 'Bougouriba',
-            'BLG' => 'Boulgou',
-            'BLK' => 'Boulkiemdé',
-            'COM' => 'Comoé',
-            'GAN' => 'Ganzourgou',
-            'GNA' => 'Gnagna',
-            'GOU' => 'Gourma',
-            'HOU' => 'Houet',
-            'IOB' => 'Ioba',
-            'KAD' => 'Kadiogo',
-            'KEN' => 'Kénédougou',
-            'KMD' => 'Komondjari',
-            'KMP' => 'Kompienga',
-            'KOP' => 'Koulpélogo',
-            'KOS' => 'Kossi',
-            'KOT' => 'Kouritenga',
-            'KOW' => 'Kourwéogo',
-            'LER' => 'Léraba',
-            'LOR' => 'Loroum',
-            'MOU' => 'Mouhoun',
-            'NAM' => 'Namentenga',
-            'NAO' => 'Naouri',
-            'NAY' => 'Nayala',
-            'NOU' => 'Noumbiel',
-            'OUB' => 'Oubritenga',
-            'OUD' => 'Oudalan',
-            'PAS' => 'Passoré',
-            'PON' => 'Poni',
-            'SEN' => 'Séno',
-            'SIS' => 'Sissili',
-            'SMT' => 'Sanmatenga',
-            'SNG' => 'Sanguié',
-            'SOM' => 'Soum',
-            'SOR' => 'Sourou',
-            'TAP' => 'Tapoa',
-            'TUI' => 'Tui',
-            'YAG' => 'Yagha',
-            'YAT' => 'Yatenga',
-            'ZIR' => 'Ziro',
-            'ZON' => 'Zondoma',
-            'ZOU' => 'Zoundwéogo',
-        ),
-    'BG' =>
-        array (
-            '01' => 'Blagoevgrad',
-            '02' => 'Burgas',
-            '03' => 'Varna',
-            '04' => 'Veliko Tarnovo',
-            '05' => 'Vidin',
-            '06' => 'Vratsa',
-            '07' => 'Gabrovo',
-            '08' => 'Dobrich',
-            '09' => 'Kardzhali',
-            10 => 'Kyustendil',
-            11 => 'Lovech',
-            12 => 'Montana',
-            13 => 'Pazardzhik',
-            14 => 'Pernik',
-            15 => 'Pleven',
-            16 => 'Plovdiv',
-            17 => 'Razgrad',
-            18 => 'Ruse',
-            19 => 'Silistra',
-            20 => 'Sliven',
-            21 => 'Smolyan',
-            22 => 'Sofia-Grad',
-            23 => 'Sofia',
-            24 => 'Stara Zagora',
-            25 => 'Targovishte',
-            26 => 'Haskovo',
-            27 => 'Shumen',
-            28 => 'Yambol',
-        ),
-    'BH' =>
-        array (
-            13 => 'Al Manāmah (Al ‘Āşimah)',
-            14 => 'Al Janūbīyah',
-            15 => 'Al Muḩarraq',
-            16 => 'Al Wusţá',
-            17 => 'Ash Shamālīyah',
-        ),
-    'BI' =>
-        array (
-            'BB' => 'Bubanza',
-            'BL' => 'Bujumbura Rural',
-            'BM' => 'Bujumbura Mairie',
-            'BR' => 'Bururi',
-            'CA' => 'Cankuzo',
-            'CI' => 'Cibitoke',
-            'GI' => 'Gitega',
-            'KI' => 'Kirundo',
-            'KR' => 'Karuzi',
-            'KY' => 'Kayanza',
-            'MA' => 'Makamba',
-            'MU' => 'Muramvya',
-            'MW' => 'Mwaro',
-            'MY' => 'Muyinga',
-            'NG' => 'Ngozi',
-            'RT' => 'Rutana',
-            'RY' => 'Ruyigi',
-        ),
-    'BJ' =>
-        array (
-            'AK' => 'Atakora',
-            'AL' => 'Alibori',
-            'AQ' => 'Atlantique',
-            'BO' => 'Borgou',
-            'CO' => 'Collines',
-            'DO' => 'Donga',
-            'KO' => 'Kouffo',
-            'LI' => 'Littoral',
-            'MO' => 'Mono',
-            'OU' => 'Ouémé',
-            'PL' => 'Plateau',
-            'ZO' => 'Zou',
-        ),
-    'BN' =>
-        array (
-            'BE' => 'Belait',
-            'BM' => 'Brunei-Muara',
-            'TE' => 'Temburong',
-            'TU' => 'Tutong',
-        ),
-    'BO' =>
-        array (
-            'B' => 'El Beni',
-            'C' => 'Cochabamba',
-            'H' => 'Chuquisaca',
-            'L' => 'La Paz',
-            'N' => 'Pando',
-            'O' => 'Oruro',
-            'P' => 'Potosí',
-            'S' => 'Santa Cruz',
-            'T' => 'Tarija',
-        ),
-    'BQ' =>
-        array (
-            'BO' => 'Bonaire',
-            'SA' => 'Saba',
-            'SE' => 'Sint Eustatius',
-        ),
-    'BR' =>
-        array (
-            'AC' => 'Acre',
-            'AL' => 'Alagoas',
-            'AM' => 'Amazonas',
-            'AP' => 'Amapá',
-            'BA' => 'Bahia',
-            'CE' => 'Ceará',
-            'DF' => 'Distrito Federal',
-            'ES' => 'Espírito Santo',
-            'FN' => 'Fernando de Noronha',
-            'GO' => 'Goiás',
-            'MA' => 'Maranhão',
-            'MG' => 'Minas Gerais',
-            'MS' => 'Mato Grosso do Sul',
-            'MT' => 'Mato Grosso',
-            'PA' => 'Pará',
-            'PB' => 'Paraíba',
-            'PE' => 'Pernambuco',
-            'PI' => 'Piauí',
-            'PR' => 'Paraná',
-            'RJ' => 'Rio de Janeiro',
-            'RN' => 'Rio Grande do Norte',
-            'RO' => 'Rondônia',
-            'RR' => 'Roraima',
-            'RS' => 'Rio Grande do Sul',
-            'SC' => 'Santa Catarina',
-            'SE' => 'Sergipe',
-            'SP' => 'São Paulo',
-            'TO' => 'Tocantins',
-        ),
-    'BS' =>
-        array (
-            'AK' => 'Acklins',
-            'BI' => 'Bimini',
-            'BP' => 'Black Point',
-            'BY' => 'Berry Islands',
-            'CE' => 'Central Eleuthera',
-            'CI' => 'Cat Island',
-            'CK' => 'Crooked Island and Long Cay',
-            'CO' => 'Central Abaco',
-            'CS' => 'Central Andros',
-            'EG' => 'East Grand Bahama',
-            'EX' => 'Exuma',
-            'FP' => 'City of Freeport',
-            'GC' => 'Grand Cay',
-            'HI' => 'Harbour Island',
-            'HT' => 'Hope Town',
-            'IN' => 'Inagua',
-            'LI' => 'Long Island',
-            'MC' => 'Mangrove Cay',
-            'MG' => 'Mayaguana',
-            'MI' => 'Moore\'s Island',
-            'NE' => 'North Eleuthera',
-            'NO' => 'North Abaco',
-            'NS' => 'North Andros',
-            'RC' => 'Rum Cay',
-            'RI' => 'Ragged Island',
-            'SA' => 'South Andros',
-            'SE' => 'South Eleuthera',
-            'SO' => 'South Abaco',
-            'SS' => 'San Salvador',
-            'SW' => 'Spanish Wells',
-            'WG' => 'West Grand Bahama',
-        ),
-    'BT' =>
-        array (
-            11 => 'Paro',
-            12 => 'Chhukha',
-            13 => 'Ha',
-            14 => 'Samtee',
-            15 => 'Thimphu',
-            21 => 'Tsirang',
-            22 => 'Dagana',
-            23 => 'Punakha',
-            24 => 'Wangdue Phodrang',
-            31 => 'Sarpang',
-            32 => 'Trongsa',
-            33 => 'Bumthang',
-            34 => 'Zhemgang',
-            41 => 'Trashigang',
-            42 => 'Monggar',
-            43 => 'Pemagatshel',
-            44 => 'Lhuentse',
-            45 => 'Samdrup Jongkha',
-            'GA' => 'Gasa',
-            'TY' => 'Trashi Yangtse',
-        ),
-    'BW' =>
-        array (
-            'CE' => 'Central',
-            'GH' => 'Ghanzi',
-            'KG' => 'Kgalagadi',
-            'KL' => 'Kgatleng',
-            'KW' => 'Kweneng',
-            'NE' => 'North-East',
-            'NW' => 'North-West',
-            'SE' => 'South-East',
-            'SO' => 'Southern',
-        ),
-    'BY' =>
-        array (
-            'BR' => 'Brèsckaja voblasc\'',
-            'HM' => 'Horad Minsk',
-            'HO' => 'Homel\'skaja voblasc\'',
-            'HR' => 'Hrodzenskaja voblasc\'',
-            'MA' => 'Mahilëuskaja voblasc\'',
-            'MI' => 'Minskaja voblasc\'',
-            'VI' => 'Vicebskaja voblasc\'',
-        ),
-    'BZ' =>
-        array (
-            'BZ' => 'Belize',
-            'CY' => 'Cayo',
-            'CZL' => 'Corozal',
-            'OW' => 'Orange Walk',
-            'SC' => 'Stann Creek',
-            'TOL' => 'Toledo',
-        ),
-    'CA' =>
-        array (
-            'AB' => 'Alberta',
-            'BC' => 'British Columbia',
-            'MB' => 'Manitoba',
-            'NB' => 'New Brunswick',
-            'NL' => 'Newfoundland and Labrador',
-            'NS' => 'Nova Scotia',
-            'NT' => 'Northwest Territories',
-            'NU' => 'Nunavut',
-            'ON' => 'Ontario',
-            'PE' => 'Prince Edward Island',
-            'QC' => 'Quebec',
-            'SK' => 'Saskatchewan',
-            'YT' => 'Yukon Territory',
-        ),
-    'CD' =>
-        array (
-            'BC' => 'Bas-Congo',
-            'BN' => 'Bandundu',
-            'EQ' => 'Équateur',
-            'KA' => 'Katanga',
-            'KE' => 'Kasai-Oriental',
-            'KN' => 'Kinshasa',
-            'KW' => 'Kasai-Occidental',
-            'MA' => 'Maniema',
-            'NK' => 'Nord-Kivu',
-            'OR' => 'Orientale',
-            'SK' => 'Sud-Kivu',
-        ),
-    'CF' =>
-        array (
-            'AC' => 'Ouham',
-            'BB' => 'Bamingui-Bangoran',
-            'BGF' => 'Bangui',
-            'BK' => 'Basse-Kotto',
-            'HK' => 'Haute-Kotto',
-            'HM' => 'Haut-Mbomou',
-            'HS' => 'Haute-Sangha / Mambéré-Kadéï',
-            'KB' => 'Gribingui',
-            'KG' => 'Kémo-Gribingui',
-            'LB' => 'Lobaye',
-            'MB' => 'Mbomou',
-            'MP' => 'Ombella-M\'poko',
-            'NM' => 'Nana-Mambéré',
-            'OP' => 'Ouham-Pendé',
-            'SE' => 'Sangha',
-            'UK' => 'Ouaka',
-            'VK' => 'Vakaga',
-        ),
-    'CG' =>
-        array (
-            11 => 'Bouenza',
-            12 => 'Pool',
-            13 => 'Sangha',
-            14 => 'Plateaux',
-            15 => 'Cuvette-Ouest',
-            2 => 'Lékoumou',
-            5 => 'Kouilou',
-            7 => 'Likouala',
-            8 => 'Cuvette',
-            9 => 'Niari',
-            'BZV' => 'Brazzaville',
-        ),
-    'CH' =>
-        array (
-            'AG' => 'Aargau',
-            'AI' => 'Appenzell Innerrhoden',
-            'AR' => 'Appenzell Ausserrhoden',
-            'BE' => 'Bern',
-            'BL' => 'Basel-Landschaft',
-            'BS' => 'Basel-Stadt',
-            'FR' => 'Fribourg',
-            'GE' => 'Genève',
-            'GL' => 'Glarus',
-            'GR' => 'Graubünden',
-            'JU' => 'Jura',
-            'LU' => 'Luzern',
-            'NE' => 'Neuchâtel',
-            'NW' => 'Nidwalden',
-            'OW' => 'Obwalden',
-            'SG' => 'Sankt Gallen',
-            'SH' => 'Schaffhausen',
-            'SO' => 'Solothurn',
-            'SZ' => 'Schwyz',
-            'TG' => 'Thurgau',
-            'TI' => 'Ticino',
-            'UR' => 'Uri',
-            'VD' => 'Vaud',
-            'VS' => 'Valais',
-            'ZG' => 'Zug',
-            'ZH' => 'Zürich',
-        ),
-    'CI' =>
-        array (
-            'AB' => 'Abidjan',
-            'BS' => 'Bas-Sassandra',
-            'CM' => 'Comoé',
-            'DN' => 'Denguélé',
-            'GD' => 'Gôh-Djiboua',
-            'LC' => 'Lacs',
-            'LG' => 'Lagunes',
-            'MG' => 'Montagnes',
-            'SM' => 'Sassandra-Marahoué',
-            'SV' => 'Savanes',
-            'VB' => 'Vallée du Bandama',
-            'WR' => 'Woroba',
-            'YM' => 'Yamoussoukro',
-            'ZZ' => 'Zanzan',
-        ),
-    'CL' =>
-        array (
-            'AI' => 'Aisén del General Carlos Ibáñez del Campo',
-            'AN' => 'Antofagasta',
-            'AP' => 'Arica y Parinacota',
-            'AR' => 'Araucanía',
-            'AT' => 'Atacama',
-            'BI' => 'Bío-Bío',
-            'CO' => 'Coquimbo',
-            'LI' => 'Libertador General Bernardo O\'Higgins',
-            'LL' => 'Los Lagos',
-            'LR' => 'Los Ríos',
-            'MA' => 'Magallanes y Antártica Chilena',
-            'ML' => 'Maule',
-            'RM' => 'Región Metropolitana de Santiago',
-            'TA' => 'Tarapacá',
-            'VS' => 'Valparaíso',
-        ),
-    'CM' =>
-        array (
-            'AD' => 'Adamaoua',
-            'CE' => 'Centre',
-            'EN' => 'Far North',
-            'ES' => 'East',
-            'LT' => 'Littoral',
-            'NO' => 'North',
-            'NW' => 'North-West (Cameroon)',
-            'OU' => 'West',
-            'SU' => 'South',
-            'SW' => 'South-West',
-        ),
-    'CN' =>
-        array (
-            'BJ' => 'Beijing',
-            'TJ' => 'Tianjin',
-            'HE' => 'Hebei',
-            'SX' => 'Shanxi',
-            'NM' => 'Nei Mongol',
-            'LN' => 'Liaoning',
-            'JL' => 'Jilin',
-            'HL' => 'Heilongjiang',
-            'SH' => 'Shanghai',
-            'JS' => 'Jiangsu',
-            'ZJ' => 'Zhejiang',
-            'AH' => 'Anhui',
-            'FJ' => 'Fujian',
-            'JX' => 'Jiangxi',
-            'SD' => 'Shandong',
-            'HA' => 'Henan',
-            'HB' => 'Hubei',
-            'HN' => 'Hunan',
-            'GD' => 'Guangdong',
-            'GX' => 'Guangxi',
-            'HI' => 'Hainan',
-            'CQ' => 'Chongqing',
-            'SC' => 'Sichuan',
-            'GZ' => 'Guizhou',
-            'YN' => 'Yunnan',
-            'XZ' => 'Xizang',
-            'SN' => 'Shaanxi',
-            'GS' => 'Gansu',
-            'QH' => 'Qinghai',
-            'NX' => 'Ningxia',
-            'XJ' => 'Xinjiang',
-            'TW' => 'Taiwan',
-            'HK' => 'Xianggang (Hong-Kong)',
-            'MO' => 'Aomen (Macau)',
-        ),
-    'CO' =>
-        array (
-            'AMA' => 'Amazonas',
-            'ANT' => 'Antioquia',
-            'ARA' => 'Arauca',
-            'ATL' => 'Atlántico',
-            'BOL' => 'Bolívar',
-            'BOY' => 'Boyacá',
-            'CAL' => 'Caldas',
-            'CAQ' => 'Caquetá',
-            'CAS' => 'Casanare',
-            'CAU' => 'Cauca',
-            'CES' => 'Cesar',
-            'CHO' => 'Chocó',
-            'COR' => 'Córdoba',
-            'CUN' => 'Cundinamarca',
-            'DC' => 'Distrito Capital de Bogotá',
-            'GUA' => 'Guainía',
-            'GUV' => 'Guaviare',
-            'HUI' => 'Huila',
-            'LAG' => 'La Guajira',
-            'MAG' => 'Magdalena',
-            'MET' => 'Meta',
-            'NAR' => 'Nariño',
-            'NSA' => 'Norte de Santander',
-            'PUT' => 'Putumayo',
-            'QUI' => 'Quindío',
-            'RIS' => 'Risaralda',
-            'SAN' => 'Santander',
-            'SAP' => 'San Andrés, Providencia y Santa Catalina',
-            'SUC' => 'Sucre',
-            'TOL' => 'Tolima',
-            'VAC' => 'Valle del Cauca',
-            'VAU' => 'Vaupés',
-            'VID' => 'Vichada',
-        ),
-    'CR' =>
-        array (
-            'A' => 'Alajuela',
-            'C' => 'Cartago',
-            'G' => 'Guanacaste',
-            'H' => 'Heredia',
-            'L' => 'Limón',
-            'P' => 'Puntarenas',
-            'SJ' => 'San José',
-        ),
-    'CU' =>
-        array (
-            '01' => 'Pinar del Rio',
-            '02' => 'La Habana',
-            '03' => 'Ciudad de La Habana',
-            '04' => 'Matanzas',
-            '05' => 'Villa Clara',
-            '06' => 'Cienfuegos',
-            '07' => 'Sancti Spíritus',
-            '08' => 'Ciego de Ávila',
-            '09' => 'Camagüey',
-            10 => 'Las Tunas',
-            11 => 'Holguín',
-            12 => 'Granma',
-            13 => 'Santiago de Cuba',
-            14 => 'Guantánamo',
-            99 => 'Isla de la Juventud',
-        ),
-    'CV' =>
-        array (
-            'B' => 'Ilhas de Barlavento',
-            'BR' => 'Brava',
-            'BV' => 'Boa Vista',
-            'CA' => 'Santa Catarina',
-            'CF' => 'Santa Catarina de Fogo',
-            'CR' => 'Santa Cruz',
-            'MA' => 'Maio',
-            'MO' => 'Mosteiros',
-            'PA' => 'Paul',
-            'PN' => 'Porto Novo',
-            'PR' => 'Praia',
-            'RB' => 'Ribeira Brava',
-            'RG' => 'Ribeira Grande',
-            'RS' => 'Ribeira Grande de Santiago',
-            'S' => 'Ilhas de Sotavento',
-            'SD' => 'São Domingos',
-            'SF' => 'São Filipe',
-            'SL' => 'Sal',
-            'SM' => 'São Miguel',
-            'SO' => 'São Lourenço dos Órgãos',
-            'SS' => 'São Salvador do Mundo',
-            'SV' => 'São Vicente',
-            'TA' => 'Tarrafal',
-            'TS' => 'Tarrafal de São Nicolau',
-        ),
-    'CY' =>
-        array (
-            '01' => 'Lefkosía',
-            '02' => 'Lemesós',
-            '03' => 'Lárnaka',
-            '04' => 'Ammóchostos',
-            '05' => 'Páfos',
-            '06' => 'Kerýneia',
-        ),
-    'CZ' =>
-        array (
-            10 => 'Praha, Hlavní mešto',
-            101 => 'Praha 1',
-            102 => 'Praha 2',
-            103 => 'Praha 3',
-            104 => 'Praha 4',
-            105 => 'Praha 5',
-            106 => 'Praha 6',
-            107 => 'Praha 7',
-            108 => 'Praha 8',
-            109 => 'Praha 9',
-            110 => 'Praha 10',
-            111 => 'Praha 11',
-            112 => 'Praha 12',
-            113 => 'Praha 13',
-            114 => 'Praha 14',
-            115 => 'Praha 15',
-            116 => 'Praha 16',
-            117 => 'Praha 17',
-            118 => 'Praha 18',
-            119 => 'Praha 19',
-            120 => 'Praha 20',
-            121 => 'Praha 21',
-            122 => 'Praha 22',
-            20 => 'Středočeský kraj',
-            201 => 'Benešov',
-            202 => 'Beroun',
-            203 => 'Kladno',
-            204 => 'Kolín',
-            205 => 'Kutná Hora',
-            206 => 'Mělník',
-            207 => 'Mladá Boleslav',
-            208 => 'Nymburk',
-            209 => 'Praha-východ',
-            '20A' => 'Praha-západ',
-            '20B' => 'Příbram',
-            '20C' => 'Rakovník',
-            31 => 'Jihočeský kraj',
-            311 => 'České Budějovice',
-            312 => 'Český Krumlov',
-            313 => 'Jindřichův Hradec',
-            314 => 'Písek',
-            315 => 'Prachatice',
-            316 => 'Strakonice',
-            317 => 'Tábor',
-            32 => 'Plzeňský kraj',
-            321 => 'Domažlice',
-            322 => 'Klatovy',
-            323 => 'Plzeň-město',
-            324 => 'Plzeň-jih',
-            325 => 'Plzeň-sever',
-            326 => 'Rokycany',
-            327 => 'Tachov',
-            41 => 'Karlovarský kraj',
-            411 => 'Cheb',
-            412 => 'Karlovy Vary',
-            413 => 'Sokolov',
-            42 => 'Ústecký kraj',
-            421 => 'Děčín',
-            422 => 'Chomutov',
-            423 => 'Litoměřice',
-            424 => 'Louny',
-            425 => 'Most',
-            426 => 'Teplice',
-            427 => 'Ústí nad Labem',
-            51 => 'Liberecký kraj',
-            511 => 'Česká Lípa',
-            512 => 'Jablonec nad Nisou',
-            513 => 'Liberec',
-            514 => 'Semily',
-            52 => 'Královéhradecký kraj',
-            521 => 'Hradec Králové',
-            522 => 'Jičín',
-            523 => 'Náchod',
-            524 => 'Rychnov nad Kněžnou',
-            525 => 'Trutnov',
-            53 => 'Pardubický kraj',
-            531 => 'Chrudim',
-            532 => 'Pardubice',
-            533 => 'Svitavy',
-            534 => 'Ústí nad Orlicí',
-            63 => 'Kraj Vysočina',
-            631 => 'Havlíčkův Brod',
-            632 => 'Jihlava',
-            633 => 'Pelhřimov',
-            634 => 'Třebíč',
-            635 => 'Žďár nad Sázavou',
-            64 => 'Jihomoravský kraj',
-            641 => 'Blansko',
-            642 => 'Brno-město',
-            643 => 'Brno-venkov',
-            644 => 'Břeclav',
-            645 => 'Hodonín',
-            646 => 'Vyškov',
-            647 => 'Znojmo',
-            71 => 'Olomoucký kraj',
-            711 => 'Jeseník',
-            712 => 'Olomouc',
-            713 => 'Prostějov',
-            714 => 'Přerov',
-            715 => 'Šumperk',
-            72 => 'Zlínský kraj',
-            721 => 'Kroměříž',
-            722 => 'Uherské Hradiště',
-            723 => 'Vsetín',
-            724 => 'Zlín',
-            80 => 'Moravskoslezský kraj',
-            801 => 'Bruntál',
-            802 => 'Frýdek Místek',
-            803 => 'Karviná',
-            804 => 'Nový Jičín',
-            805 => 'Opava',
-            806 => 'Ostrava-město',
-        ),
-    'DE' =>
-        array (
-            'BB' => 'Brandenburg',
-            'BE' => 'Berlin',
-            'BW' => 'Baden-Württemberg',
-            'BY' => 'Bayern',
-            'HB' => 'Bremen',
-            'HE' => 'Hessen',
-            'HH' => 'Hamburg',
-            'MV' => 'Mecklenburg-Vorpommern',
-            'NI' => 'Niedersachsen',
-            'NW' => 'Nordrhein-Westfalen',
-            'RP' => 'Rheinland-Pfalz',
-            'SH' => 'Schleswig-Holstein',
-            'SL' => 'Saarland',
-            'SN' => 'Sachsen',
-            'ST' => 'Sachsen-Anhalt',
-            'TH' => 'Thüringen',
-        ),
-    'DJ' =>
-        array (
-            'AR' => 'Arta',
-            'AS' => 'Ali Sabieh',
-            'DI' => 'Dikhil',
-            'DJ' => 'Djibouti',
-            'OB' => 'Obock',
-            'TA' => 'Tadjourah',
-        ),
-    'DK' =>
-        array (
-            81 => 'Nordjylland',
-            82 => 'Midtjylland',
-            83 => 'Syddanmark',
-            84 => 'Hovedstaden',
-            85 => 'Sjælland',
-        ),
-    'DM' =>
-        array (
-            '01' => 'Saint Peter',
-            '02' => 'Saint Andrew',
-            '03' => 'Saint David',
-            '04' => 'Saint George',
-            '05' => 'Saint John',
-            '06' => 'Saint Joseph',
-            '07' => 'Saint Luke',
-            '08' => 'Saint Mark',
-            '09' => 'Saint Patrick',
-            10 => 'Saint Paul',
-        ),
-    'DO' =>
-        array (
-            '01' => 'Distrito Nacional (Santo Domingo)',
-            '02' => 'Azua',
-            '03' => 'Bahoruco',
-            '04' => 'Barahona',
-            '05' => 'Dajabón',
-            '06' => 'Duarte',
-            '07' => 'La Estrelleta [Elías Piña]',
-            '08' => 'El Seybo [El Seibo]',
-            '09' => 'Espaillat',
-            10 => 'Independencia',
-            11 => 'La Altagracia',
-            12 => 'La Romana',
-            13 => 'La Vega',
-            14 => 'María Trinidad Sánchez',
-            15 => 'Monte Cristi',
-            16 => 'Pedernales',
-            17 => 'Peravia',
-            18 => 'Puerto Plata',
-            19 => 'Salcedo',
-            20 => 'Samaná',
-            21 => 'San Cristóbal',
-            22 => 'San Juan',
-            23 => 'San Pedro de Macorís',
-            24 => 'Sánchez Ramírez',
-            25 => 'Santiago',
-            26 => 'Santiago Rodríguez',
-            27 => 'Valverde',
-            28 => 'Monseñor Nouel',
-            29 => 'Monte Plata',
-            30 => 'Hato Mayor',
-            31 => 'San José de Ocoa',
-            32 => 'Santo Domingo',
-            33 => 'Cibao Nordeste',
-            34 => 'Cibao Noroeste',
-            35 => 'Cibao Norte',
-            36 => 'Cibao Sur',
-            37 => 'El Valle',
-            38 => 'Enriquillo',
-            39 => 'Higuamo',
-            40 => 'Ozama',
-            41 => 'Valdesia',
-            42 => 'Yuma',
-        ),
-    'DZ' =>
-        array (
-            '01' => 'Adrar',
-            '02' => 'Chlef',
-            '03' => 'Laghouat',
-            '04' => 'Oum el Bouaghi',
-            '05' => 'Batna',
-            '06' => 'Béjaïa',
-            '07' => 'Biskra',
-            '08' => 'Béchar',
-            '09' => 'Blida',
-            10 => 'Bouira',
-            11 => 'Tamanghasset',
-            12 => 'Tébessa',
-            13 => 'Tlemcen',
-            14 => 'Tiaret',
-            15 => 'Tizi Ouzou',
-            16 => 'Alger',
-            17 => 'Djelfa',
-            18 => 'Jijel',
-            19 => 'Sétif',
-            20 => 'Saïda',
-            21 => 'Skikda',
-            22 => 'Sidi Bel Abbès',
-            23 => 'Annaba',
-            24 => 'Guelma',
-            25 => 'Constantine',
-            26 => 'Médéa',
-            27 => 'Mostaganem',
-            28 => 'Msila',
-            29 => 'Mascara',
-            30 => 'Ouargla',
-            31 => 'Oran',
-            32 => 'El Bayadh',
-            33 => 'Illizi',
-            34 => 'Bordj Bou Arréridj',
-            35 => 'Boumerdès',
-            36 => 'El Tarf',
-            37 => 'Tindouf',
-            38 => 'Tissemsilt',
-            39 => 'El Oued',
-            40 => 'Khenchela',
-            41 => 'Souk Ahras',
-            42 => 'Tipaza',
-            43 => 'Mila',
-            44 => 'Aïn Defla',
-            45 => 'Naama',
-            46 => 'Aïn Témouchent',
-            47 => 'Ghardaïa',
-            48 => 'Relizane',
-        ),
-    'EC' =>
-        array (
-            'A' => 'Azuay',
-            'B' => 'Bolívar',
-            'C' => 'Carchi',
-            'D' => 'Orellana',
-            'E' => 'Esmeraldas',
-            'F' => 'Cañar',
-            'G' => 'Guayas',
-            'H' => 'Chimborazo',
-            'I' => 'Imbabura',
-            'L' => 'Loja',
-            'M' => 'Manabí',
-            'N' => 'Napo',
-            'O' => 'El Oro',
-            'P' => 'Pichincha',
-            'R' => 'Los Ríos',
-            'S' => 'Morona-Santiago',
-            'SD' => 'Santo Domingo de los Tsáchilas',
-            'SE' => 'Santa Elena',
-            'T' => 'Tungurahua',
-            'U' => 'Sucumbíos',
-            'W' => 'Galápagos',
-            'X' => 'Cotopaxi',
-            'Y' => 'Pastaza',
-            'Z' => 'Zamora-Chinchipe',
-        ),
-    'EE' =>
-        array (
-            37 => 'Harjumaa',
-            39 => 'Hiiumaa',
-            44 => 'Ida-Virumaa',
-            49 => 'Jõgevamaa',
-            51 => 'Järvamaa',
-            57 => 'Läänemaa',
-            59 => 'Lääne-Virumaa',
-            65 => 'Põlvamaa',
-            67 => 'Pärnumaa',
-            70 => 'Raplamaa',
-            74 => 'Saaremaa',
-            78 => 'Tartumaa',
-            82 => 'Valgamaa',
-            84 => 'Viljandimaa',
-            86 => 'Võrumaa',
-        ),
-    'EG' =>
-        array (
-            'ALX' => 'Al Iskandarīyah',
-            'ASN' => 'Aswān',
-            'AST' => 'Asyūt',
-            'BA' => 'Al Bahr al Ahmar',
-            'BH' => 'Al Buhayrah',
-            'BNS' => 'Banī Suwayf',
-            'C' => 'Al Qāhirah',
-            'DK' => 'Ad Daqahlīyah',
-            'DT' => 'Dumyāt',
-            'FYM' => 'Al Fayyūm',
-            'GH' => 'Al Gharbīyah',
-            'GZ' => 'Al Jīzah',
-            'HU' => 'Ḩulwān',
-            'IS' => 'Al Ismā`īlīyah',
-            'JS' => 'Janūb Sīnā\'',
-            'KB' => 'Al Qalyūbīyah',
-            'KFS' => 'Kafr ash Shaykh',
-            'KN' => 'Qinā',
-            'LX' => 'Al Uqşur',
-            'MN' => 'Al Minyā',
-            'MNF' => 'Al Minūfīyah',
-            'MT' => 'Matrūh',
-            'PTS' => 'Būr Sa`īd',
-            'SHG' => 'Sūhāj',
-            'SHR' => 'Ash Sharqīyah',
-            'SIN' => 'Shamal Sīnā\'',
-            'SU' => 'As Sādis min Uktūbar',
-            'SUZ' => 'As Suways',
-            'WAD' => 'Al Wādī al Jadīd',
-        ),
-    'ER' =>
-        array (
-            'AN' => 'Ansabā',
-            'DK' => 'Janūbī al Baḩrī al Aḩmar',
-            'DU' => 'Al Janūbī',
-            'GB' => 'Qāsh-Barkah',
-            'MA' => 'Al Awsaţ',
-            'SK' => 'Shimālī al Baḩrī al Aḩmar',
-        ),
-    'ES' =>
-        array (
-            'A' => 'Alicante',
-            'AB' => 'Albacete',
-            'AL' => 'Almería',
-            'AN' => 'Andalucía',
-            'AR' => 'Aragón',
-            'AS' => 'Asturias, Principado de',
-            'AV' => 'Ávila',
-            'B' => 'Barcelona',
-            'BA' => 'Badajoz',
-            'BI' => 'Bizkaia',
-            'BU' => 'Burgos',
-            'C' => 'A Coruña',
-            'CA' => 'Cádiz',
-            'CB' => 'Cantabria',
-            'CC' => 'Cáceres',
-            'CE' => 'Ceuta',
-            'CL' => 'Castilla y León',
-            'CM' => 'Castilla-La Mancha',
-            'CN' => 'Canarias',
-            'CO' => 'Córdoba',
-            'CR' => 'Ciudad Real',
-            'CS' => 'Castellón',
-            'CT' => 'Catalunya',
-            'CU' => 'Cuenca',
-            'EX' => 'Extremadura',
-            'GA' => 'Galicia',
-            'GC' => 'Las Palmas',
-            'GI' => 'Girona',
-            'GR' => 'Granada',
-            'GU' => 'Guadalajara',
-            'H' => 'Huelva',
-            'HU' => 'Huesca',
-            'IB' => 'Illes Balears',
-            'J' => 'Jaén',
-            'L' => 'Lleida',
-            'LE' => 'León',
-            'LO' => 'La Rioja',
-            'LU' => 'Lugo',
-            'M' => 'Madrid',
-            'MA' => 'Málaga',
-            'MC' => 'Murcia, Región de',
-            'MD' => 'Madrid, Comunidad de',
-            'ML' => 'Melilla',
-            'MU' => 'Murcia',
-            'NA' => 'Navarra / Nafarroa',
-            'NC' => 'Navarra, Comunidad Foral de / Nafarroako Foru Komunitatea',
-            'O' => 'Asturias',
-            'OR' => 'Ourense',
-            'P' => 'Palencia',
-            'PM' => 'Balears',
-            'PO' => 'Pontevedra',
-            'PV' => 'País Vasco / Euskal Herria',
-            'RI' => 'La Rioja',
-            'S' => 'Cantabria',
-            'SA' => 'Salamanca',
-            'SE' => 'Sevilla',
-            'SG' => 'Segovia',
-            'SO' => 'Soria',
-            'SS' => 'Gipuzkoa',
-            'T' => 'Tarragona',
-            'TE' => 'Teruel',
-            'TF' => 'Santa Cruz de Tenerife',
-            'TO' => 'Toledo',
-            'V' => 'Valencia / València',
-            'VA' => 'Valladolid',
-            'VC' => 'Valenciana, Comunidad / Valenciana, Comunitat',
-            'VI' => 'Álava',
-            'Z' => 'Zaragoza',
-            'ZA' => 'Zamora',
-        ),
-    'ET' =>
-        array (
-            'AA' => 'Ādīs Ābeba',
-            'AF' => 'Āfar',
-            'AM' => 'Āmara',
-            'BE' => 'Bīnshangul Gumuz',
-            'DD' => 'Dirē Dawa',
-            'GA' => 'Gambēla Hizboch',
-            'HA' => 'Hārerī Hizb',
-            'OR' => 'Oromīya',
-            'SN' => 'YeDebub Bihēroch Bihēreseboch na Hizboch',
-            'SO' => 'Sumalē',
-            'TI' => 'Tigray',
-        ),
-    'FI' =>
-        array (
-            '01' => 'Ahvenanmaan maakunta',
-            '02' => 'Etelä-Karjala',
-            '03' => 'Etelä-Pohjanmaa',
-            '04' => 'Etelä-Savo',
-            '05' => 'Kainuu',
-            '06' => 'Kanta-Häme',
-            '07' => 'Keski-Pohjanmaa',
-            '08' => 'Keski-Suomi',
-            '09' => 'Kymenlaakso',
-            10 => 'Lappi',
-            11 => 'Pirkanmaa',
-            12 => 'Pohjanmaa',
-            13 => 'Pohjois-Karjala',
-            14 => 'Pohjois-Pohjanmaa',
-            15 => 'Pohjois-Savo',
-            16 => 'Päijät-Häme',
-            17 => 'Satakunta',
-            18 => 'Uusimaa',
-            19 => 'Varsinais-Suomi',
-        ),
-    'FJ' =>
-        array (
-            'C' => 'Central',
-            'E' => 'Eastern',
-            'N' => 'Northern',
-            'R' => 'Rotuma',
-            'W' => 'Western',
-        ),
-    'FM' =>
-        array (
-            'KSA' => 'Kosrae',
-            'PNI' => 'Pohnpei',
-            'TRK' => 'Chuuk',
-            'YAP' => 'Yap',
-        ),
-    'FR' =>
-        array (
-            '01' => 'Ain',
-            '02' => 'Aisne',
-            '03' => 'Allier',
-            '04' => 'Alpes-de-Haute-Provence',
-            '05' => 'Hautes-Alpes',
-            '06' => 'Alpes-Maritimes',
-            '07' => 'Ardèche',
-            '08' => 'Ardennes',
-            '09' => 'Ariège',
-            10 => 'Aube',
-            11 => 'Aude',
-            12 => 'Aveyron',
-            13 => 'Bouches-du-Rhône',
-            14 => 'Calvados',
-            15 => 'Cantal',
-            16 => 'Charente',
-            17 => 'Charente-Maritime',
-            18 => 'Cher',
-            19 => 'Corrèze',
-            21 => 'Côte-d\'Or',
-            22 => 'Côtes-d\'Armor',
-            23 => 'Creuse',
-            24 => 'Dordogne',
-            25 => 'Doubs',
-            26 => 'Drôme',
-            27 => 'Eure',
-            28 => 'Eure-et-Loir',
-            29 => 'Finistère',
-            '2A' => 'Corse-du-Sud',
-            '2B' => 'Haute-Corse',
-            30 => 'Gard',
-            31 => 'Haute-Garonne',
-            32 => 'Gers',
-            33 => 'Gironde',
-            34 => 'Hérault',
-            35 => 'Ille-et-Vilaine',
-            36 => 'Indre',
-            37 => 'Indre-et-Loire',
-            38 => 'Isère',
-            39 => 'Jura',
-            40 => 'Landes',
-            41 => 'Loir-et-Cher',
-            42 => 'Loire',
-            43 => 'Haute-Loire',
-            44 => 'Loire-Atlantique',
-            45 => 'Loiret',
-            46 => 'Lot',
-            47 => 'Lot-et-Garonne',
-            48 => 'Lozère',
-            49 => 'Maine-et-Loire',
-            50 => 'Manche',
-            51 => 'Marne',
-            52 => 'Haute-Marne',
-            53 => 'Mayenne',
-            54 => 'Meurthe-et-Moselle',
-            55 => 'Meuse',
-            56 => 'Morbihan',
-            57 => 'Moselle',
-            58 => 'Nièvre',
-            59 => 'Nord',
-            60 => 'Oise',
-            61 => 'Orne',
-            62 => 'Pas-de-Calais',
-            63 => 'Puy-de-Dôme',
-            64 => 'Pyrénées-Atlantiques',
-            65 => 'Hautes-Pyrénées',
-            66 => 'Pyrénées-Orientales',
-            67 => 'Bas-Rhin',
-            68 => 'Haut-Rhin',
-            69 => 'Rhône',
-            70 => 'Haute-Saône',
-            71 => 'Saône-et-Loire',
-            72 => 'Sarthe',
-            73 => 'Savoie',
-            74 => 'Haute-Savoie',
-            75 => 'Paris',
-            76 => 'Seine-Maritime',
-            77 => 'Seine-et-Marne',
-            78 => 'Yvelines',
-            79 => 'Deux-Sèvres',
-            80 => 'Somme',
-            81 => 'Tarn',
-            82 => 'Tarn-et-Garonne',
-            83 => 'Var',
-            84 => 'Vaucluse',
-            85 => 'Vendée',
-            86 => 'Vienne',
-            87 => 'Haute-Vienne',
-            88 => 'Vosges',
-            89 => 'Yonne',
-            90 => 'Territoire de Belfort',
-            91 => 'Essonne',
-            92 => 'Hauts-de-Seine',
-            93 => 'Seine-Saint-Denis',
-            94 => 'Val-de-Marne',
-            95 => 'Val-d\'Oise',
-            'ARA' => 'Auvergne-Rhône-Alpes',
-            'BFC' => 'Bourgogne-Franche-Comté',
-            'BL' => 'Saint-Barthélemy',
-            'BRE' => 'Bretagne',
-            'COR' => 'Corse',
-            'CP' => 'Clipperton',
-            'CVL' => 'Centre-Val de Loire',
-            'GES' => 'Grand-Est',
-            'GF' => 'Guyane (française)',
-            'GP' => 'Guadeloupe',
-            'GUA' => 'Guadeloupe',
-            'HDF' => 'Hauts-de-France',
-            'IDF' => 'Île-de-France',
-            'LRE' => 'La Réunion',
-            'MAY' => 'Mayotte',
-            'MF' => 'Saint-Martin',
-            'MQ' => 'Martinique',
-            'NAQ' => 'Nouvelle-Aquitaine',
-            'NC' => 'Nouvelle-Calédonie',
-            'NOR' => 'Normandie',
-            'OCC' => 'Occitanie',
-            'PAC' => 'Provence-Alpes-Côte-d’Azur',
-            'PDL' => 'Pays-de-la-Loire',
-            'PF' => 'Polynésie française',
-            'PM' => 'Saint-Pierre-et-Miquelon',
-            'RE' => 'La Réunion',
-            'TF' => 'Terres australes françaises',
-            'WF' => 'Wallis-et-Futuna',
-            'YT' => 'Mayotte',
-        ),
-    'GA' =>
-        array (
-            1 => 'Estuaire',
-            2 => 'Haut-Ogooué',
-            3 => 'Moyen-Ogooué',
-            4 => 'Ngounié',
-            5 => 'Nyanga',
-            6 => 'Ogooué-Ivindo',
-            7 => 'Ogooué-Lolo',
-            8 => 'Ogooué-Maritime',
-            9 => 'Woleu-Ntem',
-        ),
-    'GB' =>
-        array (
-            'ABC' => 'Armagh, Banbridge and Craigavon',
-            'ABD' => 'Aberdeenshire',
-            'ABE' => 'Aberdeen City',
-            'AGB' => 'Argyll and Bute',
-            'AGY' => 'Isle of Anglesey; Sir Ynys Môn',
-            'AND' => 'Ards and North Down',
-            'ANN' => 'Antrim and Newtownabbey',
-            'ANS' => 'Angus',
-            'BAS' => 'Bath and North East Somerset',
-            'BBD' => 'Blackburn with Darwen',
-            'BDF' => 'Bedford',
-            'BDG' => 'Barking and Dagenham',
-            'BEN' => 'Brent',
-            'BEX' => 'Bexley',
-            'BFS' => 'Belfast',
-            'BGE' => 'Bridgend; Pen-y-bont ar Ogwr',
-            'BGW' => 'Blaenau Gwent',
-            'BIR' => 'Birmingham',
-            'BKM' => 'Buckinghamshire',
-            'BMH' => 'Bournemouth',
-            'BNE' => 'Barnet',
-            'BNH' => 'Brighton and Hove',
-            'BNS' => 'Barnsley',
-            'BOL' => 'Bolton',
-            'BPL' => 'Blackpool',
-            'BRC' => 'Bracknell Forest',
-            'BRD' => 'Bradford',
-            'BRY' => 'Bromley',
-            'BST' => 'Bristol, City of',
-            'BUR' => 'Bury',
-            'CAM' => 'Cambridgeshire',
-            'CAY' => 'Caerphilly; Caerffili',
-            'CBF' => 'Central Bedfordshire',
-            'CCG' => 'Causeway Coast and Glens',
-            'CGN' => 'Ceredigion; Sir Ceredigion',
-            'CHE' => 'Cheshire East',
-            'CHW' => 'Cheshire West and Chester',
-            'CLD' => 'Calderdale',
-            'CLK' => 'Clackmannanshire',
-            'CMA' => 'Cumbria',
-            'CMD' => 'Camden',
-            'CMN' => 'Carmarthenshire; Sir Gaerfyrddin',
-            'CON' => 'Cornwall',
-            'COV' => 'Coventry',
-            'CRF' => 'Cardiff; Caerdydd',
-            'CRY' => 'Croydon',
-            'CWY' => 'Conwy',
-            'DAL' => 'Darlington',
-            'DBY' => 'Derbyshire',
-            'DEN' => 'Denbighshire; Sir Ddinbych',
-            'DER' => 'Derby',
-            'DEV' => 'Devon',
-            'DGY' => 'Dumfries and Galloway',
-            'DNC' => 'Doncaster',
-            'DND' => 'Dundee City',
-            'DOR' => 'Dorset',
-            'DRS' => 'Derry and Strabane',
-            'DUD' => 'Dudley',
-            'DUR' => 'Durham County',
-            'EAL' => 'Ealing',
-            'EAW' => 'England and Wales',
-            'EAY' => 'East Ayrshire',
-            'EDH' => 'Edinburgh, City of',
-            'EDU' => 'East Dunbartonshire',
-            'ELN' => 'East Lothian',
-            'ELS' => 'Eilean Siar',
-            'ENF' => 'Enfield',
-            'ENG' => 'England',
-            'ERW' => 'East Renfrewshire',
-            'ERY' => 'East Riding of Yorkshire',
-            'ESS' => 'Essex',
-            'ESX' => 'East Sussex',
-            'FAL' => 'Falkirk',
-            'FIF' => 'Fife',
-            'FLN' => 'Flintshire; Sir y Fflint',
-            'FMO' => 'Fermanagh and Omagh',
-            'GAT' => 'Gateshead',
-            'GBN' => 'Great Britain',
-            'GLG' => 'Glasgow City',
-            'GLS' => 'Gloucestershire',
-            'GRE' => 'Greenwich',
-            'GWN' => 'Gwynedd',
-            'HAL' => 'Halton',
-            'HAM' => 'Hampshire',
-            'HAV' => 'Havering',
-            'HCK' => 'Hackney',
-            'HEF' => 'Herefordshire',
-            'HIL' => 'Hillingdon',
-            'HLD' => 'Highland',
-            'HMF' => 'Hammersmith and Fulham',
-            'HNS' => 'Hounslow',
-            'HPL' => 'Hartlepool',
-            'HRT' => 'Hertfordshire',
-            'HRW' => 'Harrow',
-            'HRY' => 'Haringey',
-            'IOS' => 'Isles of Scilly',
-            'IOW' => 'Isle of Wight',
-            'ISL' => 'Islington',
-            'IVC' => 'Inverclyde',
-            'KEC' => 'Kensington and Chelsea',
-            'KEN' => 'Kent',
-            'KHL' => 'Kingston upon Hull',
-            'KIR' => 'Kirklees',
-            'KTT' => 'Kingston upon Thames',
-            'KWL' => 'Knowsley',
-            'LAN' => 'Lancashire',
-            'LBC' => 'Lisburn and Castlereagh',
-            'LBH' => 'Lambeth',
-            'LCE' => 'Leicester',
-            'LDS' => 'Leeds',
-            'LEC' => 'Leicestershire',
-            'LEW' => 'Lewisham',
-            'LIN' => 'Lincolnshire',
-            'LIV' => 'Liverpool',
-            'LND' => 'London, City of',
-            'LUT' => 'Luton',
-            'MAN' => 'Manchester',
-            'MDB' => 'Middlesbrough',
-            'MDW' => 'Medway',
-            'MEA' => 'Mid and East Antrim',
-            'MIK' => 'Milton Keynes',
-            'MLN' => 'Midlothian',
-            'MON' => 'Monmouthshire; Sir Fynwy',
-            'MRT' => 'Merton',
-            'MRY' => 'Moray',
-            'MTY' => 'Merthyr Tydfil; Merthyr Tudful',
-            'MUL' => 'Mid Ulster',
-            'NAY' => 'North Ayrshire',
-            'NBL' => 'Northumberland',
-            'NEL' => 'North East Lincolnshire',
-            'NET' => 'Newcastle upon Tyne',
-            'NFK' => 'Norfolk',
-            'NGM' => 'Nottingham',
-            'NIR' => 'Northern Ireland',
-            'NLK' => 'North Lanarkshire',
-            'NLN' => 'North Lincolnshire',
-            'NMD' => 'Newry, Mourne and Down',
-            'NSM' => 'North Somerset',
-            'NTH' => 'Northamptonshire',
-            'NTL' => 'Neath Port Talbot; Castell-nedd Port Talbot',
-            'NTT' => 'Nottinghamshire',
-            'NTY' => 'North Tyneside',
-            'NWM' => 'Newham',
-            'NWP' => 'Newport; Casnewydd',
-            'NYK' => 'North Yorkshire',
-            'OLD' => 'Oldham',
-            'ORK' => 'Orkney Islands',
-            'OXF' => 'Oxfordshire',
-            'PEM' => 'Pembrokeshire; Sir Benfro',
-            'PKN' => 'Perth and Kinross',
-            'PLY' => 'Plymouth',
-            'POL' => 'Poole',
-            'POR' => 'Portsmouth',
-            'POW' => 'Powys',
-            'PTE' => 'Peterborough',
-            'RCC' => 'Redcar and Cleveland',
-            'RCH' => 'Rochdale',
-            'RCT' => 'Rhondda, Cynon, Taff; Rhondda, Cynon, Taf',
-            'RDB' => 'Redbridge',
-            'RDG' => 'Reading',
-            'RFW' => 'Renfrewshire',
-            'RIC' => 'Richmond upon Thames',
-            'ROT' => 'Rotherham',
-            'RUT' => 'Rutland',
-            'SAW' => 'Sandwell',
-            'SAY' => 'South Ayrshire',
-            'SCB' => 'Scottish Borders, The',
-            'SCT' => 'Scotland',
-            'SFK' => 'Suffolk',
-            'SFT' => 'Sefton',
-            'SGC' => 'South Gloucestershire',
-            'SHF' => 'Sheffield',
-            'SHN' => 'St. Helens',
-            'SHR' => 'Shropshire',
-            'SKP' => 'Stockport',
-            'SLF' => 'Salford',
-            'SLG' => 'Slough',
-            'SLK' => 'South Lanarkshire',
-            'SND' => 'Sunderland',
-            'SOL' => 'Solihull',
-            'SOM' => 'Somerset',
-            'SOS' => 'Southend-on-Sea',
-            'SRY' => 'Surrey',
-            'STE' => 'Stoke-on-Trent',
-            'STG' => 'Stirling',
-            'STH' => 'Southampton',
-            'STN' => 'Sutton',
-            'STS' => 'Staffordshire',
-            'STT' => 'Stockton-on-Tees',
-            'STY' => 'South Tyneside',
-            'SWA' => 'Swansea; Abertawe',
-            'SWD' => 'Swindon',
-            'SWK' => 'Southwark',
-            'TAM' => 'Tameside',
-            'TFW' => 'Telford and Wrekin',
-            'THR' => 'Thurrock',
-            'TOB' => 'Torbay',
-            'TOF' => 'Torfaen; Tor-faen',
-            'TRF' => 'Trafford',
-            'TWH' => 'Tower Hamlets',
-            'UKM' => 'United Kingdom',
-            'VGL' => 'Vale of Glamorgan, The; Bro Morgannwg',
-            'WAR' => 'Warwickshire',
-            'WBK' => 'West Berkshire',
-            'WDU' => 'West Dunbartonshire',
-            'WFT' => 'Waltham Forest',
-            'WGN' => 'Wigan',
-            'WIL' => 'Wiltshire',
-            'WKF' => 'Wakefield',
-            'WLL' => 'Walsall',
-            'WLN' => 'West Lothian',
-            'WLS' => 'Wales; Cymru',
-            'WLV' => 'Wolverhampton',
-            'WND' => 'Wandsworth',
-            'WNM' => 'Windsor and Maidenhead',
-            'WOK' => 'Wokingham',
-            'WOR' => 'Worcestershire',
-            'WRL' => 'Wirral',
-            'WRT' => 'Warrington',
-            'WRX' => 'Wrexham; Wrecsam',
-            'WSM' => 'Westminster',
-            'WSX' => 'West Sussex',
-            'YOR' => 'York',
-            'ZET' => 'Shetland Islands',
-        ),
-    'GD' =>
-        array (
-            '01' => 'Saint Andrew',
-            '02' => 'Saint David',
-            '03' => 'Saint George',
-            '04' => 'Saint John',
-            '05' => 'Saint Mark',
-            '06' => 'Saint Patrick',
-            10 => 'Southern Grenadine Islands',
-        ),
-    'GE' =>
-        array (
-            'AB' => 'Abkhazia',
-            'AJ' => 'Ajaria',
-            'GU' => 'Guria',
-            'IM' => 'Imeret’i',
-            'KA' => 'Kakhet’i',
-            'KK' => 'K’vemo K’art’li',
-            'MM' => 'Mts’khet’a-Mt’ianet’i',
-            'RL' => 'Racha-Lech’khumi-K’vemo Svanet’i',
-            'SJ' => 'Samts’khe-Javakhet’i',
-            'SK' => 'Shida K’art’li',
-            'SZ' => 'Samegrelo-Zemo Svanet’i',
-            'TB' => 'T’bilisi',
-        ),
-    'GH' =>
-        array (
-            'AA' => 'Greater Accra',
-            'AH' => 'Ashanti',
-            'BA' => 'Brong-Ahafo',
-            'CP' => 'Central',
-            'EP' => 'Eastern',
-            'NP' => 'Northern',
-            'TV' => 'Volta',
-            'UE' => 'Upper East',
-            'UW' => 'Upper West',
-            'WP' => 'Western',
-        ),
-    'GL' =>
-        array (
-            'KU' => 'Kommune Kujalleq',
-            'QA' => 'Qaasuitsup Kommunia',
-            'QE' => 'Qeqqata Kommunia',
-            'SM' => 'Kommuneqarfik Sermersooq',
-        ),
-    'GM' =>
-        array (
-            'B' => 'Banjul',
-            'L' => 'Lower River',
-            'M' => 'Central River',
-            'N' => 'North Bank',
-            'U' => 'Upper River',
-            'W' => 'Western',
-        ),
-    'GN' =>
-        array (
-            'B' => 'Boké',
-            'BE' => 'Beyla',
-            'BF' => 'Boffa',
-            'BK' => 'Boké',
-            'C' => 'Conakry',
-            'CO' => 'Coyah',
-            'D' => 'Kindia',
-            'DB' => 'Dabola',
-            'DI' => 'Dinguiraye',
-            'DL' => 'Dalaba',
-            'DU' => 'Dubréka',
-            'F' => 'Faranah',
-            'FA' => 'Faranah',
-            'FO' => 'Forécariah',
-            'FR' => 'Fria',
-            'GA' => 'Gaoual',
-            'GU' => 'Guékédou',
-            'K' => 'Kankan',
-            'KA' => 'Kankan',
-            'KB' => 'Koubia',
-            'KD' => 'Kindia',
-            'KE' => 'Kérouané',
-            'KN' => 'Koundara',
-            'KO' => 'Kouroussa',
-            'KS' => 'Kissidougou',
-            'L' => 'Labé',
-            'LA' => 'Labé',
-            'LE' => 'Lélouma',
-            'LO' => 'Lola',
-            'M' => 'Mamou',
-            'MC' => 'Macenta',
-            'MD' => 'Mandiana',
-            'ML' => 'Mali',
-            'MM' => 'Mamou',
-            'N' => 'Nzérékoré',
-            'NZ' => 'Nzérékoré',
-            'PI' => 'Pita',
-            'SI' => 'Siguiri',
-            'TE' => 'Télimélé',
-            'TO' => 'Tougué',
-            'YO' => 'Yomou',
-        ),
-    'GQ' =>
-        array (
-            'AN' => 'Annobón',
-            'BN' => 'Bioko Norte',
-            'BS' => 'Bioko Sur',
-            'C' => 'Región Continental',
-            'CS' => 'Centro Sur',
-            'I' => 'Región Insular',
-            'KN' => 'Kié-Ntem',
-            'LI' => 'Litoral',
-            'WN' => 'Wele-Nzas',
-        ),
-    'GR' =>
-        array (
-            '01' => 'Aitolia kai Akarnania',
-            '03' => 'Voiotia',
-            '04' => 'Evvoias',
-            '05' => 'Evrytania',
-            '06' => 'Fthiotida',
-            '07' => 'Fokida',
-            11 => 'Argolida',
-            12 => 'Arkadia',
-            13 => 'Achaïa',
-            14 => 'Ileia',
-            15 => 'Korinthia',
-            16 => 'Lakonia',
-            17 => 'Messinia',
-            21 => 'Zakynthos',
-            22 => 'Kerkyra',
-            23 => 'Kefallonia',
-            24 => 'Lefkada',
-            31 => 'Arta',
-            32 => 'Thesprotia',
-            33 => 'Ioannina',
-            34 => 'Preveza',
-            41 => 'Karditsa',
-            42 => 'Larisa',
-            43 => 'Magnisia',
-            44 => 'Trikala',
-            51 => 'Grevena',
-            52 => 'Drama',
-            53 => 'Imathia',
-            54 => 'Thessaloniki',
-            55 => 'Kavala',
-            56 => 'Kastoria',
-            57 => 'Kilkis',
-            58 => 'Kozani',
-            59 => 'Pella',
-            61 => 'Pieria',
-            62 => 'Serres',
-            63 => 'Florina',
-            64 => 'Chalkidiki',
-            69 => 'Agio Oros',
-            71 => 'Evros',
-            72 => 'Xanthi',
-            73 => 'Rodopi',
-            81 => 'Dodekanisos',
-            82 => 'Kyklades',
-            83 => 'Lesvos',
-            84 => 'Samos',
-            85 => 'Chios',
-            91 => 'Irakleio',
-            92 => 'Lasithi',
-            93 => 'Rethymno',
-            94 => 'Chania',
-            'A' => 'Anatoliki Makedonia kai Thraki',
-            'A1' => 'Attiki',
-            'B' => 'Kentriki Makedonia',
-            'C' => 'Dytiki Makedonia',
-            'D' => 'Ipeiros',
-            'E' => 'Thessalia',
-            'F' => 'Ionia Nisia',
-            'G' => 'Dytiki Ellada',
-            'H' => 'Sterea Ellada',
-            'I' => 'Attiki',
-            'J' => 'Peloponnisos',
-            'K' => 'Voreio Aigaio',
-            'L' => 'Notio Aigaio',
-            'M' => 'Kriti',
-        ),
-    'GT' =>
-        array (
-            'AV' => 'Alta Verapaz',
-            'BV' => 'Baja Verapaz',
-            'CM' => 'Chimaltenango',
-            'CQ' => 'Chiquimula',
-            'ES' => 'Escuintla',
-            'GU' => 'Guatemala',
-            'HU' => 'Huehuetenango',
-            'IZ' => 'Izabal',
-            'JA' => 'Jalapa',
-            'JU' => 'Jutiapa',
-            'PE' => 'Petén',
-            'PR' => 'El Progreso',
-            'QC' => 'Quiché',
-            'QZ' => 'Quetzaltenango',
-            'RE' => 'Retalhuleu',
-            'SA' => 'Sacatepéquez',
-            'SM' => 'San Marcos',
-            'SO' => 'Sololá',
-            'SR' => 'Santa Rosa',
-            'SU' => 'Suchitepéquez',
-            'TO' => 'Totonicapán',
-            'ZA' => 'Zacapa',
-        ),
-    'GW' =>
-        array (
-            'BA' => 'Bafatá',
-            'BL' => 'Bolama',
-            'BM' => 'Biombo',
-            'BS' => 'Bissau',
-            'CA' => 'Cacheu',
-            'GA' => 'Gabú',
-            'L' => 'Leste',
-            'N' => 'Norte',
-            'OI' => 'Oio',
-            'QU' => 'Quinara',
-            'S' => 'Sul',
-            'TO' => 'Tombali',
-        ),
-    'GY' =>
-        array (
-            'BA' => 'Barima-Waini',
-            'CU' => 'Cuyuni-Mazaruni',
-            'DE' => 'Demerara-Mahaica',
-            'EB' => 'East Berbice-Corentyne',
-            'ES' => 'Essequibo Islands-West Demerara',
-            'MA' => 'Mahaica-Berbice',
-            'PM' => 'Pomeroon-Supenaam',
-            'PT' => 'Potaro-Siparuni',
-            'UD' => 'Upper Demerara-Berbice',
-            'UT' => 'Upper Takutu-Upper Essequibo',
-        ),
-    'HN' =>
-        array (
-            'AT' => 'Atlántida',
-            'CH' => 'Choluteca',
-            'CL' => 'Colón',
-            'CM' => 'Comayagua',
-            'CP' => 'Copán',
-            'CR' => 'Cortés',
-            'EP' => 'El Paraíso',
-            'FM' => 'Francisco Morazán',
-            'GD' => 'Gracias a Dios',
-            'IB' => 'Islas de la Bahía',
-            'IN' => 'Intibucá',
-            'LE' => 'Lempira',
-            'LP' => 'La Paz',
-            'OC' => 'Ocotepeque',
-            'OL' => 'Olancho',
-            'SB' => 'Santa Bárbara',
-            'VA' => 'Valle',
-            'YO' => 'Yoro',
-        ),
-    'HR' =>
-        array (
-            '01' => 'Zagrebačka županija',
-            '02' => 'Krapinsko-zagorska županija',
-            '03' => 'Sisačko-moslavačka županija',
-            '04' => 'Karlovačka županija',
-            '05' => 'Varaždinska županija',
-            '06' => 'Koprivničko-križevačka županija',
-            '07' => 'Bjelovarsko-bilogorska županija',
-            '08' => 'Primorsko-goranska županija',
-            '09' => 'Ličko-senjska županija',
-            10 => 'Virovitičko-podravska županija',
-            11 => 'Požeško-slavonska županija',
-            12 => 'Brodsko-posavska županija',
-            13 => 'Zadarska županija',
-            14 => 'Osječko-baranjska županija',
-            15 => 'Šibensko-kninska županija',
-            16 => 'Vukovarsko-srijemska županija',
-            17 => 'Splitsko-dalmatinska županija',
-            18 => 'Istarska županija',
-            19 => 'Dubrovačko-neretvanska županija',
-            20 => 'Međimurska županija',
-            21 => 'Grad Zagreb',
-        ),
-    'HT' =>
-        array (
-            'AR' => 'Artibonite',
-            'CE' => 'Centre',
-            'GA' => 'Grande-Anse',
-            'ND' => 'Nord',
-            'NE' => 'Nord-Est',
-            'NI' => 'Nippes',
-            'NO' => 'Nord-Ouest',
-            'OU' => 'Ouest',
-            'SD' => 'Sud',
-            'SE' => 'Sud-Est',
-        ),
-    'HU' =>
-        array (
-            'BA' => 'Baranya',
-            'BC' => 'Békéscsaba',
-            'BE' => 'Békés',
-            'BK' => 'Bács-Kiskun',
-            'BU' => 'Budapest',
-            'BZ' => 'Borsod-Abaúj-Zemplén',
-            'CS' => 'Csongrád',
-            'DE' => 'Debrecen',
-            'DU' => 'Dunaújváros',
-            'EG' => 'Eger',
-            'ER' => 'Érd',
-            'FE' => 'Fejér',
-            'GS' => 'Győr-Moson-Sopron',
-            'GY' => 'Győr',
-            'HB' => 'Hajdú-Bihar',
-            'HE' => 'Heves',
-            'HV' => 'Hódmezővásárhely',
-            'JN' => 'Jász-Nagykun-Szolnok',
-            'KE' => 'Komárom-Esztergom',
-            'KM' => 'Kecskemét',
-            'KV' => 'Kaposvár',
-            'MI' => 'Miskolc',
-            'NK' => 'Nagykanizsa',
-            'NO' => 'Nógrád',
-            'NY' => 'Nyíregyháza',
-            'PE' => 'Pest',
-            'PS' => 'Pécs',
-            'SD' => 'Szeged',
-            'SF' => 'Székesfehérvár',
-            'SH' => 'Szombathely',
-            'SK' => 'Szolnok',
-            'SN' => 'Sopron',
-            'SO' => 'Somogy',
-            'SS' => 'Szekszárd',
-            'ST' => 'Salgótarján',
-            'SZ' => 'Szabolcs-Szatmár-Bereg',
-            'TB' => 'Tatabánya',
-            'TO' => 'Tolna',
-            'VA' => 'Vas',
-            'VE' => 'Veszprém (county)',
-            'VM' => 'Veszprém',
-            'ZA' => 'Zala',
-            'ZE' => 'Zalaegerszeg',
-        ),
-    'ID' =>
-        array (
-            'AC' => 'Aceh',
-            'BA' => 'Bali',
-            'BB' => 'Bangka Belitung',
-            'BE' => 'Bengkulu',
-            'BT' => 'Banten',
-            'GO' => 'Gorontalo',
-            'IJ' => 'Papua',
-            'JA' => 'Jambi',
-            'JB' => 'Jawa Barat',
-            'JI' => 'Jawa Timur',
-            'JK' => 'Jakarta Raya',
-            'JT' => 'Jawa Tengah',
-            'JW' => 'Jawa',
-            'KA' => 'Kalimantan',
-            'KB' => 'Kalimantan Barat',
-            'KI' => 'Kalimantan Timur',
-            'KR' => 'Kepulauan Riau',
-            'KS' => 'Kalimantan Selatan',
-            'KT' => 'Kalimantan Tengah',
-            'LA' => 'Lampung',
-            'MA' => 'Maluku',
-            'ML' => 'Maluku',
-            'MU' => 'Maluku Utara',
-            'NB' => 'Nusa Tenggara Barat',
-            'NT' => 'Nusa Tenggara Timur',
-            'NU' => 'Nusa Tenggara',
-            'PA' => 'Papua',
-            'PB' => 'Papua Barat',
-            'RI' => 'Riau',
-            'SA' => 'Sulawesi Utara',
-            'SB' => 'Sumatra Barat',
-            'SG' => 'Sulawesi Tenggara',
-            'SL' => 'Sulawesi',
-            'SM' => 'Sumatera',
-            'SN' => 'Sulawesi Selatan',
-            'SR' => 'Sulawesi Barat',
-            'SS' => 'Sumatra Selatan',
-            'ST' => 'Sulawesi Tengah',
-            'SU' => 'Sumatera Utara',
-            'YO' => 'Yogyakarta',
-        ),
-    'IE' =>
-        array (
-            'C' => 'Connacht',
-            'CE' => 'Clare',
-            'CN' => 'Cavan',
-            'CO' => 'Cork',
-            'CW' => 'Carlow',
-            'D' => 'Dublin',
-            'DL' => 'Donegal',
-            'G' => 'Galway',
-            'KE' => 'Kildare',
-            'KK' => 'Kilkenny',
-            'KY' => 'Kerry',
-            'L' => 'Leinster',
-            'LD' => 'Longford',
-            'LH' => 'Louth',
-            'LK' => 'Limerick',
-            'LM' => 'Leitrim',
-            'LS' => 'Laois',
-            'M' => 'Munster',
-            'MH' => 'Meath',
-            'MN' => 'Monaghan',
-            'MO' => 'Mayo',
-            'OY' => 'Offaly',
-            'RN' => 'Roscommon',
-            'SO' => 'Sligo',
-            'TA' => 'Tipperary',
-            'U' => 'Ulster',
-            'WD' => 'Waterford',
-            'WH' => 'Westmeath',
-            'WW' => 'Wicklow',
-            'WX' => 'Wexford',
-        ),
-    'IL' =>
-        array (
-            'D' => 'HaDarom',
-            'HA' => 'Hefa',
-            'JM' => 'Yerushalayim Al Quds',
-            'M' => 'HaMerkaz',
-            'TA' => 'Tel-Aviv',
-            'Z' => 'HaZafon',
-        ),
-    'IN' =>
-        array (
-            'AN' => 'Andaman and Nicobar Islands',
-            'AP' => 'Andhra Pradesh',
-            'AR' => 'Arunachal Pradesh',
-            'AS' => 'Assam',
-            'BR' => 'Bihar',
-            'CH' => 'Chandigarh',
-            'CT' => 'Chhattisgarh',
-            'DD' => 'Damen and Diu',
-            'DL' => 'Delhi',
-            'DN' => 'Dadra and Nagar Haveli',
-            'GA' => 'Goa',
-            'GJ' => 'Gujarat',
-            'HP' => 'Himachal Pradesh',
-            'HR' => 'Haryana',
-            'JH' => 'Jharkhand',
-            'JK' => 'Jammu and Kashmir',
-            'KA' => 'Karnataka',
-            'KL' => 'Kerala',
-            'LD' => 'Lakshadweep',
-            'MH' => 'Maharashtra',
-            'ML' => 'Meghalaya',
-            'MN' => 'Manipur',
-            'MP' => 'Madhya Pradesh',
-            'MZ' => 'Mizoram',
-            'NL' => 'Nagaland',
-            'OR' => 'Orissa',
-            'PB' => 'Punjab',
-            'PY' => 'Puducherry',
-            'RJ' => 'Rajasthan',
-            'SK' => 'Sikkim',
-            'TN' => 'Tamil Nadu',
-            'TR' => 'Tripura',
-            'UP' => 'Uttar Pradesh',
-            'UT' => 'Uttarakhand',
-            'WB' => 'West Bengal',
-        ),
-    'IQ' =>
-        array (
-            'AN' => 'Al Anbar',
-            'AR' => 'Arbil',
-            'BA' => 'Al Basrah',
-            'BB' => 'Babil',
-            'BG' => 'Baghdad',
-            'DA' => 'Dahuk',
-            'DI' => 'Diyala',
-            'DQ' => 'Dhi Qar',
-            'KA' => 'Karbala\'',
-            'KI' => 'Kirkūk',
-            'MA' => 'Maysan',
-            'MU' => 'Al Muthanna',
-            'NA' => 'An Najef',
-            'NI' => 'Ninawa',
-            'QA' => 'Al Qadisiyah',
-            'SD' => 'Salah ad Din',
-            'SU' => 'As Sulaymaniyah',
-            'TS' => 'At Ta\'mim',
-            'WA' => 'Wasit',
-        ),
-    'IR' =>
-        array (
-            '01' => 'Āzarbāyjān-e Sharqī',
-            '02' => 'Āzarbāyjān-e Gharbī',
-            '03' => 'Ardabīl',
-            '04' => 'Eşfahān',
-            '05' => 'Īlām',
-            '06' => 'Būshehr',
-            '07' => 'Tehrān',
-            '08' => 'Chahār Mahāll va Bakhtīārī',
-            10 => 'Khūzestān',
-            11 => 'Zanjān',
-            12 => 'Semnān',
-            13 => 'Sīstān va Balūchestān',
-            14 => 'Fārs',
-            15 => 'Kermān',
-            16 => 'Kordestān',
-            17 => 'Kermānshāh',
-            18 => 'Kohgīlūyeh va Būyer Ahmad',
-            19 => 'Gīlān',
-            20 => 'Lorestān',
-            21 => 'Māzandarān',
-            22 => 'Markazī',
-            23 => 'Hormozgān',
-            24 => 'Hamadān',
-            25 => 'Yazd',
-            26 => 'Qom',
-            27 => 'Golestān',
-            28 => 'Qazvīn',
-            29 => 'Khorāsān-e Janūbī',
-            30 => 'Khorāsān-e Razavī',
-            31 => 'Khorāsān-e Shemālī',
-            32 => 'Alborz',
-        ),
-    'IS' =>
-        array (
-            0 => 'Reykjavík',
-            1 => 'Höfuðborgarsvæðið',
-            2 => 'Suðurnes',
-            3 => 'Vesturland',
-            4 => 'Vestfirðir',
-            5 => 'Norðurland vestra',
-            6 => 'Norðurland eystra',
-            7 => 'Austurland',
-            8 => 'Suðurland',
-        ),
-    'IT' =>
-        array (
-            21 => 'Piemonte',
-            23 => 'Valle d\'Aosta',
-            25 => 'Lombardia',
-            32 => 'Trentino-Alto Adige',
-            34 => 'Veneto',
-            36 => 'Friuli-Venezia Giulia',
-            42 => 'Liguria',
-            45 => 'Emilia-Romagna',
-            52 => 'Toscana',
-            55 => 'Umbria',
-            57 => 'Marche',
-            62 => 'Lazio',
-            65 => 'Abruzzo',
-            67 => 'Molise',
-            72 => 'Campania',
-            75 => 'Puglia',
-            77 => 'Basilicata',
-            78 => 'Calabria',
-            82 => 'Sicilia',
-            88 => 'Sardegna',
-            'AG' => 'Agrigento',
-            'AL' => 'Alessandria',
-            'AN' => 'Ancona',
-            'AO' => 'Aosta',
-            'AP' => 'Ascoli Piceno',
-            'AQ' => 'L\'Aquila',
-            'AR' => 'Arezzo',
-            'AT' => 'Asti',
-            'AV' => 'Avellino',
-            'BA' => 'Bari',
-            'BG' => 'Bergamo',
-            'BI' => 'Biella',
-            'BL' => 'Belluno',
-            'BN' => 'Benevento',
-            'BO' => 'Bologna',
-            'BR' => 'Brindisi',
-            'BS' => 'Brescia',
-            'BT' => 'Barletta-Andria-Trani',
-            'BZ' => 'Bolzano',
-            'CA' => 'Cagliari',
-            'CB' => 'Campobasso',
-            'CE' => 'Caserta',
-            'CH' => 'Chieti',
-            'CI' => 'Carbonia-Iglesias',
-            'CL' => 'Caltanissetta',
-            'CN' => 'Cuneo',
-            'CO' => 'Como',
-            'CR' => 'Cremona',
-            'CS' => 'Cosenza',
-            'CT' => 'Catania',
-            'CZ' => 'Catanzaro',
-            'EN' => 'Enna',
-            'FC' => 'Forlì-Cesena',
-            'FE' => 'Ferrara',
-            'FG' => 'Foggia',
-            'FI' => 'Firenze',
-            'FM' => 'Fermo',
-            'FR' => 'Frosinone',
-            'GE' => 'Genova',
-            'GO' => 'Gorizia',
-            'GR' => 'Grosseto',
-            'IM' => 'Imperia',
-            'IS' => 'Isernia',
-            'KR' => 'Crotone',
-            'LC' => 'Lecco',
-            'LE' => 'Lecce',
-            'LI' => 'Livorno',
-            'LO' => 'Lodi',
-            'LT' => 'Latina',
-            'LU' => 'Lucca',
-            'MB' => 'Monza e Brianza',
-            'MC' => 'Macerata',
-            'ME' => 'Messina',
-            'MI' => 'Milano',
-            'MN' => 'Mantova',
-            'MO' => 'Modena',
-            'MS' => 'Massa-Carrara',
-            'MT' => 'Matera',
-            'NA' => 'Napoli',
-            'NO' => 'Novara',
-            'NU' => 'Nuoro',
-            'OG' => 'Ogliastra',
-            'OR' => 'Oristano',
-            'OT' => 'Olbia-Tempio',
-            'PA' => 'Palermo',
-            'PC' => 'Piacenza',
-            'PD' => 'Padova',
-            'PE' => 'Pescara',
-            'PG' => 'Perugia',
-            'PI' => 'Pisa',
-            'PN' => 'Pordenone',
-            'PO' => 'Prato',
-            'PR' => 'Parma',
-            'PT' => 'Pistoia',
-            'PU' => 'Pesaro e Urbino',
-            'PV' => 'Pavia',
-            'PZ' => 'Potenza',
-            'RA' => 'Ravenna',
-            'RC' => 'Reggio Calabria',
-            'RE' => 'Reggio Emilia',
-            'RG' => 'Ragusa',
-            'RI' => 'Rieti',
-            'RM' => 'Roma',
-            'RN' => 'Rimini',
-            'RO' => 'Rovigo',
-            'SA' => 'Salerno',
-            'SI' => 'Siena',
-            'SO' => 'Sondrio',
-            'SP' => 'La Spezia',
-            'SR' => 'Siracusa',
-            'SS' => 'Sassari',
-            'SV' => 'Savona',
-            'TA' => 'Taranto',
-            'TE' => 'Teramo',
-            'TN' => 'Trento',
-            'TO' => 'Torino',
-            'TP' => 'Trapani',
-            'TR' => 'Terni',
-            'TS' => 'Trieste',
-            'TV' => 'Treviso',
-            'UD' => 'Udine',
-            'VA' => 'Varese',
-            'VB' => 'Verbano-Cusio-Ossola',
-            'VC' => 'Vercelli',
-            'VE' => 'Venezia',
-            'VI' => 'Vicenza',
-            'VR' => 'Verona',
-            'VS' => 'Medio Campidano',
-            'VT' => 'Viterbo',
-            'VV' => 'Vibo Valentia',
-        ),
-    'JM' =>
-        array (
-            '01' => 'Kingston',
-            '02' => 'Saint Andrew',
-            '03' => 'Saint Thomas',
-            '04' => 'Portland',
-            '05' => 'Saint Mary',
-            '06' => 'Saint Ann',
-            '07' => 'Trelawny',
-            '08' => 'Saint James',
-            '09' => 'Hanover',
-            10 => 'Westmoreland',
-            11 => 'Saint Elizabeth',
-            12 => 'Manchester',
-            13 => 'Clarendon',
-            14 => 'Saint Catherine',
-        ),
-    'JO' =>
-        array (
-            'AJ' => '‘Ajlūn',
-            'AM' => '‘Ammān (Al ‘Aşimah)',
-            'AQ' => 'Al ‘Aqabah',
-            'AT' => 'Aţ Ţafīlah',
-            'AZ' => 'Az Zarqā\'',
-            'BA' => 'Al Balqā\'',
-            'IR' => 'Irbid',
-            'JA' => 'Jarash',
-            'KA' => 'Al Karak',
-            'MA' => 'Al Mafraq',
-            'MD' => 'Mādabā',
-            'MN' => 'Ma‘ān',
-        ),
-    'JP' =>
-        array (
-            '01' => 'Hokkaido',
-            '02' => 'Aomori',
-            '03' => 'Iwate',
-            '04' => 'Miyagi',
-            '05' => 'Akita',
-            '06' => 'Yamagata',
-            '07' => 'Fukushima',
-            '08' => 'Ibaraki',
-            '09' => 'Tochigi',
-            10 => 'Gunma',
-            11 => 'Saitama',
-            12 => 'Chiba',
-            13 => 'Tokyo',
-            14 => 'Kanagawa',
-            15 => 'Niigata',
-            16 => 'Toyama',
-            17 => 'Ishikawa',
-            18 => 'Fukui',
-            19 => 'Yamanashi',
-            20 => 'Nagano',
-            21 => 'Gifu',
-            22 => 'Shizuoka',
-            23 => 'Aichi',
-            24 => 'Mie',
-            25 => 'Shiga',
-            26 => 'Kyoto',
-            27 => 'Osaka',
-            28 => 'Hyogo',
-            29 => 'Nara',
-            30 => 'Wakayama',
-            31 => 'Tottori',
-            32 => 'Shimane',
-            33 => 'Okayama',
-            34 => 'Hiroshima',
-            35 => 'Yamaguchi',
-            36 => 'Tokushima',
-            37 => 'Kagawa',
-            38 => 'Ehime',
-            39 => 'Kochi',
-            40 => 'Fukuoka',
-            41 => 'Saga',
-            42 => 'Nagasaki',
-            43 => 'Kumamoto',
-            44 => 'Oita',
-            45 => 'Miyazaki',
-            46 => 'Kagoshima',
-            47 => 'Okinawa',
-        ),
-    'KE' =>
-        array (
-            110 => 'Nairobi Municipality',
-            200 => 'Central',
-            300 => 'Coast',
-            400 => 'Eastern',
-            500 => 'North-Eastern Kaskazini Mashariki',
-            700 => 'Rift Valley',
-            800 => 'Western Magharibi',
-        ),
-    'KG' =>
-        array (
-            'B' => 'Batken',
-            'C' => 'Chü',
-            'GB' => 'Bishkek',
-            'GO' => 'Osh',
-            'J' => 'Jalal-Abad',
-            'N' => 'Naryn',
-            'O' => 'Osh',
-            'T' => 'Talas',
-            'Y' => 'Ysyk-Köl',
-        ),
-    'KH' =>
-        array (
-            1 => 'Banteay Mean Chey',
-            10 => 'Krachoh',
-            11 => 'Mondol Kiri',
-            12 => 'Phnom Penh',
-            13 => 'Preah Vihear',
-            14 => 'Prey Veaeng',
-            15 => 'Pousaat',
-            16 => 'Rotanak Kiri',
-            17 => 'Siem Reab',
-            18 => 'Krong Preah Sihanouk',
-            19 => 'Stueng Traeng',
-            2 => 'Battambang',
-            20 => 'Svaay Rieng',
-            21 => 'Taakaev',
-            22 => 'Otdar Mean Chey',
-            23 => 'Krong Kaeb',
-            24 => 'Krong Pailin',
-            3 => 'Kampong Cham',
-            4 => 'Kampong Chhnang',
-            5 => 'Kampong Speu',
-            6 => 'Kampong Thom',
-            7 => 'Kampot',
-            8 => 'Kandal',
-            9 => 'Kach Kong',
-        ),
-    'KI' =>
-        array (
-            'G' => 'Gilbert Islands',
-            'L' => 'Line Islands',
-            'P' => 'Phoenix Islands',
-        ),
-    'KM' =>
-        array (
-            'A' => 'Andjouân (Anjwān)',
-            'G' => 'Andjazîdja (Anjazījah)',
-            'M' => 'Moûhîlî (Mūhīlī)',
-        ),
-    'KN' =>
-        array (
-            '01' => 'Christ Church Nichola Town',
-            '02' => 'Saint Anne Sandy Point',
-            '03' => 'Saint George Basseterre',
-            '04' => 'Saint George Gingerland',
-            '05' => 'Saint James Windward',
-            '06' => 'Saint John Capisterre',
-            '07' => 'Saint John Figtree',
-            '08' => 'Saint Mary Cayon',
-            '09' => 'Saint Paul Capisterre',
-            10 => 'Saint Paul Charlestown',
-            11 => 'Saint Peter Basseterre',
-            12 => 'Saint Thomas Lowland',
-            13 => 'Saint Thomas Middle Island',
-            15 => 'Trinity Palmetto Point',
-            'K' => 'Saint Kitts',
-            'N' => 'Nevis',
-        ),
-    'KP' =>
-        array (
-            '01' => 'P’yŏngyang',
-            '02' => 'P’yŏngan-namdo',
-            '03' => 'P’yŏngan-bukto',
-            '04' => 'Chagang-do',
-            '05' => 'Hwanghae-namdo',
-            '06' => 'Hwanghae-bukto',
-            '07' => 'Kangwŏn-do',
-            '08' => 'Hamgyŏng-namdo',
-            '09' => 'Hamgyŏng-bukto',
-            10 => 'Yanggang-do',
-            13 => 'Nasŏn (Najin-Sŏnbong)',
-        ),
-    'KR' =>
-        array (
-            11 => 'Seoul Teugbyeolsi',
-            26 => 'Busan Gwang\'yeogsi',
-            27 => 'Daegu Gwang\'yeogsi',
-            28 => 'Incheon Gwang\'yeogsi',
-            29 => 'Gwangju Gwang\'yeogsi',
-            30 => 'Daejeon Gwang\'yeogsi',
-            31 => 'Ulsan Gwang\'yeogsi',
-            41 => 'Gyeonggido',
-            42 => 'Gang\'weondo',
-            43 => 'Chungcheongbukdo',
-            44 => 'Chungcheongnamdo',
-            45 => 'Jeonrabukdo',
-            46 => 'Jeonranamdo',
-            47 => 'Gyeongsangbukdo',
-            48 => 'Gyeongsangnamdo',
-            49 => 'Jejudo',
-        ),
-    'KW' =>
-        array (
-            'AH' => 'Al Ahmadi',
-            'FA' => 'Al Farwānīyah',
-            'HA' => 'Hawallī',
-            'JA' => 'Al Jahrrā’',
-            'KU' => 'Al Kuwayt (Al ‘Āşimah)',
-            'MU' => 'Mubārak al Kabīr',
-        ),
-    'KZ' =>
-        array (
-            'AKM' => 'Aqmola oblysy',
-            'AKT' => 'Aqtöbe oblysy',
-            'ALA' => 'Almaty',
-            'ALM' => 'Almaty oblysy',
-            'AST' => 'Astana',
-            'ATY' => 'Atyraū oblysy',
-            'BAY' => 'Bayqongyr',
-            'KAR' => 'Qaraghandy oblysy',
-            'KUS' => 'Qostanay oblysy',
-            'KZY' => 'Qyzylorda oblysy',
-            'MAN' => 'Mangghystaū oblysy',
-            'PAV' => 'Pavlodar oblysy',
-            'SEV' => 'Soltüstik Quzaqstan oblysy',
-            'VOS' => 'Shyghys Qazaqstan oblysy',
-            'YUZ' => 'Ongtüstik Qazaqstan oblysy',
-            'ZAP' => 'Batys Quzaqstan oblysy',
-            'ZHA' => 'Zhambyl oblysy',
-        ),
-    'LA' =>
-        array (
-            'AT' => 'Attapu',
-            'BK' => 'Bokèo',
-            'BL' => 'Bolikhamxai',
-            'CH' => 'Champasak',
-            'HO' => 'Houaphan',
-            'KH' => 'Khammouan',
-            'LM' => 'Louang Namtha',
-            'LP' => 'Louangphabang',
-            'OU' => 'Oudômxai',
-            'PH' => 'Phôngsali',
-            'SL' => 'Salavan',
-            'SV' => 'Savannakhét',
-            'VI' => 'Vientiane',
-            'VT' => 'Vientiane',
-            'XA' => 'Xaignabouli',
-            'XE' => 'Xékong',
-            'XI' => 'Xiangkhouang',
-            'XS' => 'Xaisômboun',
-        ),
-    'LB' =>
-        array (
-            'AK' => 'Aakkâr',
-            'AS' => 'Liban-Nord',
-            'BA' => 'Beyrouth',
-            'BH' => 'Baalbek-Hermel',
-            'BI' => 'Béqaa',
-            'JA' => 'Liban-Sud',
-            'JL' => 'Mont-Liban',
-            'NA' => 'Nabatîyé',
-        ),
-    'LC' =>
-        array (
-            '01' => 'Anse la Raye',
-            '02' => 'Castries',
-            '03' => 'Choiseul',
-            '05' => 'Dennery',
-            '06' => 'Gros Islet',
-            '07' => 'Laborie',
-            '08' => 'Micoud',
-            10 => 'Soufrière',
-            11 => 'Vieux Fort',
-            12 => 'Canaries',
-        ),
-    'LI' =>
-        array (
-            '01' => 'Balzers',
-            '02' => 'Eschen',
-            '03' => 'Gamprin',
-            '04' => 'Mauren',
-            '05' => 'Planken',
-            '06' => 'Ruggell',
-            '07' => 'Schaan',
-            '08' => 'Schellenberg',
-            '09' => 'Triesen',
-            10 => 'Triesenberg',
-            11 => 'Vaduz',
-        ),
-    'LK' =>
-        array (
-            1 => 'Basnāhira paḷāta',
-            11 => 'Kŏḷamba',
-            12 => 'Gampaha',
-            13 => 'Kaḷutara',
-            2 => 'Madhyama paḷāta',
-            21 => 'Mahanuvara',
-            22 => 'Mātale',
-            23 => 'Nuvara Ĕliya',
-            3 => 'Dakuṇu paḷāta',
-            31 => 'Gālla',
-            32 => 'Mātara',
-            33 => 'Hambantŏṭa',
-            4 => 'Uturu paḷāta',
-            41 => 'Yāpanaya',
-            42 => 'Kilinŏchchi',
-            43 => 'Mannārama',
-            44 => 'Vavuniyāva',
-            45 => 'Mulativ',
-            5 => 'Næ̆gĕnahira paḷāta',
-            51 => 'Maḍakalapuva',
-            52 => 'Ampāara',
-            53 => 'Trikuṇāmalaya',
-            6 => 'Vayamba paḷāta',
-            61 => 'Kuruṇægala',
-            62 => 'Puttalama',
-            7 => 'Uturumæ̆da paḷāta',
-            71 => 'Anurādhapura',
-            72 => 'Pŏḷŏnnaruva',
-            8 => 'Ūva paḷāta',
-            81 => 'Badulla',
-            82 => 'Mŏṇarāgala',
-            9 => 'Sabaragamuva paḷāta',
-            91 => 'Ratnapura',
-            92 => 'Kægalla',
-        ),
-    'LR' =>
-        array (
-            'BG' => 'Bong',
-            'BM' => 'Bomi',
-            'CM' => 'Grand Cape Mount',
-            'GB' => 'Grand Bassa',
-            'GG' => 'Grand Gedeh',
-            'GK' => 'Grand Kru',
-            'GP' => 'Gbarpolu',
-            'LO' => 'Lofa',
-            'MG' => 'Margibi',
-            'MO' => 'Montserrado',
-            'MY' => 'Maryland',
-            'NI' => 'Nimba',
-            'RG' => 'River Gee',
-            'RI' => 'Rivercess',
-            'SI' => 'Sinoe',
-        ),
-    'LS' =>
-        array (
-            'A' => 'Maseru',
-            'B' => 'Butha-Buthe',
-            'C' => 'Leribe',
-            'D' => 'Berea',
-            'E' => 'Mafeteng',
-            'F' => 'Mohale\'s Hoek',
-            'G' => 'Quthing',
-            'H' => 'Qacha\'s Nek',
-            'J' => 'Mokhotlong',
-            'K' => 'Thaba-Tseka',
-        ),
-    'LT' =>
-        array (
-            'AL' => 'Alytaus Apskritis',
-            'KL' => 'Klaipėdos Apskritis',
-            'KU' => 'Kauno Apskritis',
-            'MR' => 'Marijampolės Apskritis',
-            'PN' => 'Panevėžio Apskritis',
-            'SA' => 'Šiaulių Apskritis',
-            'TA' => 'Tauragés Apskritis',
-            'TE' => 'Telšių Apskritis',
-            'UT' => 'Utenos Apskritis',
-            'VL' => 'Vilniaus Apskritis',
-        ),
-    'LU' =>
-        array (
-            'D' => 'Diekirch',
-            'G' => 'Grevenmacher',
-            'L' => 'Luxembourg',
-        ),
-    'LV' =>
-        array (
-            '001' => 'Aglonas novads',
-            '002' => 'Aizkraukles novads',
-            '003' => 'Aizputes novads',
-            '004' => 'Aknīstes novads',
-            '005' => 'Alojas novads',
-            '006' => 'Alsungas novads',
-            '007' => 'Alūksnes novads',
-            '008' => 'Amatas novads',
-            '009' => 'Apes novads',
-            '010' => 'Auces novads',
-            '011' => 'Ādažu novads',
-            '012' => 'Babītes novads',
-            '013' => 'Baldones novads',
-            '014' => 'Baltinavas novads',
-            '015' => 'Balvu novads',
-            '016' => 'Bauskas novads',
-            '017' => 'Beverīnas novads',
-            '018' => 'Brocēnu novads',
-            '019' => 'Burtnieku novads',
-            '020' => 'Carnikavas novads',
-            '021' => 'Cesvaines novads',
-            '022' => 'Cēsu novads',
-            '023' => 'Ciblas novads',
-            '024' => 'Dagdas novads',
-            '025' => 'Daugavpils novads',
-            '026' => 'Dobeles novads',
-            '027' => 'Dundagas novads',
-            '028' => 'Durbes novads',
-            '029' => 'Engures novads',
-            '030' => 'Ērgļu novads',
-            '031' => 'Garkalnes novads',
-            '032' => 'Grobiņas novads',
-            '033' => 'Gulbenes novads',
-            '034' => 'Iecavas novads',
-            '035' => 'Ikšķiles novads',
-            '036' => 'Ilūkstes novads',
-            '037' => 'Inčukalna novads',
-            '038' => 'Jaunjelgavas novads',
-            '039' => 'Jaunpiebalgas novads',
-            '040' => 'Jaunpils novads',
-            '041' => 'Jelgavas novads',
-            '042' => 'Jēkabpils novads',
-            '043' => 'Kandavas novads',
-            '044' => 'Kārsavas novads',
-            '045' => 'Kocēnu novads',
-            '046' => 'Kokneses novads',
-            '047' => 'Krāslavas novads',
-            '048' => 'Krimuldas novads',
-            '049' => 'Krustpils novads',
-            '050' => 'Kuldīgas novads',
-            '051' => 'Ķeguma novads',
-            '052' => 'Ķekavas novads',
-            '053' => 'Lielvārdes novads',
-            '054' => 'Limbažu novads',
-            '055' => 'Līgatnes novads',
-            '056' => 'Līvānu novads',
-            '057' => 'Lubānas novads',
-            '058' => 'Ludzas novads',
-            '059' => 'Madonas novads',
-            '060' => 'Mazsalacas novads',
-            '061' => 'Mālpils novads',
-            '062' => 'Mārupes novads',
-            '063' => 'Mērsraga novads',
-            '064' => 'Naukšēnu novads',
-            '065' => 'Neretas novads',
-            '066' => 'Nīcas novads',
-            '067' => 'Ogres novads',
-            '068' => 'Olaines novads',
-            '069' => 'Ozolnieku novads',
-            '070' => 'Pārgaujas novads',
-            '071' => 'Pāvilostas novads',
-            '072' => 'Pļaviņu novads',
-            '073' => 'Preiļu novads',
-            '074' => 'Priekules novads',
-            '075' => 'Priekuļu novads',
-            '076' => 'Raunas novads',
-            '077' => 'Rēzeknes novads',
-            '078' => 'Riebiņu novads',
-            '079' => 'Rojas novads',
-            '080' => 'Ropažu novads',
-            '081' => 'Rucavas novads',
-            '082' => 'Rugāju novads',
-            '083' => 'Rundāles novads',
-            '084' => 'Rūjienas novads',
-            '085' => 'Salas novads',
-            '086' => 'Salacgrīvas novads',
-            '087' => 'Salaspils novads',
-            '088' => 'Saldus novads',
-            '089' => 'Saulkrastu novads',
-            '090' => 'Sējas novads',
-            '091' => 'Siguldas novads',
-            '092' => 'Skrīveru novads',
-            '093' => 'Skrundas novads',
-            '094' => 'Smiltenes novads',
-            '095' => 'Stopiņu novads',
-            '096' => 'Strenču novads',
-            '097' => 'Talsu novads',
-            '098' => 'Tērvetes novads',
-            '099' => 'Tukuma novads',
-            100 => 'Vaiņodes novads',
-            101 => 'Valkas novads',
-            102 => 'Varakļānu novads',
-            103 => 'Vārkavas novads',
-            104 => 'Vecpiebalgas novads',
-            105 => 'Vecumnieku novads',
-            106 => 'Ventspils novads',
-            107 => 'Viesītes novads',
-            108 => 'Viļakas novads',
-            109 => 'Viļānu novads',
-            110 => 'Zilupes novads',
-            'DGV' => 'Daugavpils',
-            'JEL' => 'Jelgava',
-            'JKB' => 'Jēkabpils',
-            'JUR' => 'Jūrmala',
-            'LPX' => 'Liepāja',
-            'REZ' => 'Rēzekne',
-            'RIX' => 'Rīga',
-            'VEN' => 'Ventspils',
-            'VMR' => 'Valmiera',
-        ),
-    'LY' =>
-        array (
-            'BA' => 'Banghāzī',
-            'BU' => 'Al Buţnān',
-            'DR' => 'Darnah',
-            'GT' => 'Ghāt',
-            'JA' => 'Al Jabal al Akhḑar',
-            'JB' => 'Jaghbūb',
-            'JG' => 'Al Jabal al Gharbī',
-            'JI' => 'Al Jifārah',
-            'JU' => 'Al Jufrah',
-            'KF' => 'Al Kufrah',
-            'MB' => 'Al Marqab',
-            'MI' => 'Mişrātah',
-            'MJ' => 'Al Marj',
-            'MQ' => 'Murzuq',
-            'NL' => 'Nālūt',
-            'NQ' => 'An Nuqaţ al Khams',
-            'SB' => 'Sabhā',
-            'SR' => 'Surt',
-            'TB' => 'Ţarābulus',
-            'WA' => 'Al Wāḩāt',
-            'WD' => 'Wādī al Ḩayāt',
-            'WS' => 'Wādī ash Shāţiʾ',
-            'ZA' => 'Az Zāwiyah',
-        ),
-    'MA' =>
-        array (
-            '01' => 'Tanger-Tétouan',
-            '02' => 'Gharb-Chrarda-Beni Hssen',
-            '03' => 'Taza-Al Hoceima-Taounate',
-            '04' => 'L\'Oriental',
-            '05' => 'Fès-Boulemane',
-            '06' => 'Meknès-Tafilalet',
-            '07' => 'Rabat-Salé-Zemmour-Zaer',
-            '08' => 'Grand Casablanca',
-            '09' => 'Chaouia-Ouardigha',
-            10 => 'Doukhala-Abda',
-            11 => 'Marrakech-Tensift-Al Haouz',
-            12 => 'Tadla-Azilal',
-            13 => 'Sous-Massa-Draa',
-            14 => 'Guelmim-Es Smara',
-            15 => 'Laâyoune-Boujdour-Sakia el Hamra',
-            16 => 'Oued ed Dahab-Lagouira',
-            'AGD' => 'Agadir-Ida-Outanane',
-            'AOU' => 'Aousserd',
-            'ASZ' => 'Assa-Zag',
-            'AZI' => 'Azilal',
-            'BEM' => 'Beni Mellal',
-            'BER' => 'Berkane',
-            'BES' => 'Ben Slimane',
-            'BOD' => 'Boujdour (EH)',
-            'BOM' => 'Boulemane',
-            'CAS' => 'Casablanca [Dar el Beïda]',
-            'CHE' => 'Chefchaouen',
-            'CHI' => 'Chichaoua',
-            'CHT' => 'Chtouka-Ait Baha',
-            'ERR' => 'Errachidia',
-            'ESI' => 'Essaouira',
-            'ESM' => 'Es Smara (EH)',
-            'FAH' => 'Fahs-Beni Makada',
-            'FES' => 'Fès-Dar-Dbibegh',
-            'FIG' => 'Figuig',
-            'GUE' => 'Guelmim',
-            'HAJ' => 'El Hajeb',
-            'HAO' => 'Al Haouz',
-            'HOC' => 'Al Hoceïma',
-            'IFR' => 'Ifrane',
-            'INE' => 'Inezgane-Ait Melloul',
-            'JDI' => 'El Jadida',
-            'JRA' => 'Jrada',
-            'KEN' => 'Kénitra',
-            'KES' => 'Kelaat es Sraghna',
-            'KHE' => 'Khemisaet',
-            'KHN' => 'Khenifra',
-            'KHO' => 'Khouribga',
-            'LAA' => 'Laâyoune (EH)',
-            'LAR' => 'Larache',
-            'MED' => 'Médiouna',
-            'MEK' => 'Meknès',
-            'MMD' => 'Marrakech-Medina',
-            'MMN' => 'Marrakech-Menara',
-            'MOH' => 'Mohammadia',
-            'MOU' => 'Moulay Yacoub',
-            'NAD' => 'Nador',
-            'NOU' => 'Nouaceur',
-            'OUA' => 'Ouarzazate',
-            'OUD' => 'Oued ed Dahab (EH)',
-            'OUJ' => 'Oujda-Angad',
-            'RAB' => 'Rabat',
-            'SAF' => 'Safi',
-            'SAL' => 'Salé',
-            'SEF' => 'Sefrou',
-            'SET' => 'Settat',
-            'SIK' => 'Sidl Kacem',
-            'SKH' => 'Skhirate-Témara',
-            'SYB' => 'Sidi Youssef Ben Ali',
-            'TAI' => 'Taourirt',
-            'TAO' => 'Taounate',
-            'TAR' => 'Taroudant',
-            'TAT' => 'Tata',
-            'TAZ' => 'Taza',
-            'TET' => 'Tétouan',
-            'TIZ' => 'Tiznit',
-            'TNG' => 'Tanger-Assilah',
-            'TNT' => 'Tan-Tan',
-            'ZAG' => 'Zagora',
-        ),
-    'MC' =>
-        array (
-            'CL' => 'La Colle',
-            'CO' => 'La Condamine',
-            'FO' => 'Fontvieille',
-            'GA' => 'La Gare',
-            'JE' => 'Jardin Exotique',
-            'LA' => 'Larvotto',
-            'MA' => 'Malbousquet',
-            'MC' => 'Monte-Carlo',
-            'MG' => 'Moneghetti',
-            'MO' => 'Monaco-Ville',
-            'MU' => 'Moulins',
-            'PH' => 'Port-Hercule',
-            'SD' => 'Sainte-Dévote',
-            'SO' => 'La Source',
-            'SP' => 'Spélugues',
-            'SR' => 'Saint-Roman',
-            'VR' => 'Vallon de la Rousse',
-        ),
-    'MD' =>
-        array (
-            'AN' => 'Anenii Noi',
-            'BA' => 'Bălți',
-            'BD' => 'Tighina',
-            'BR' => 'Briceni',
-            'BS' => 'Basarabeasca',
-            'CA' => 'Cahul',
-            'CL' => 'Călărași',
-            'CM' => 'Cimișlia',
-            'CR' => 'Criuleni',
-            'CS' => 'Căușeni',
-            'CT' => 'Cantemir',
-            'CU' => 'Chișinău',
-            'DO' => 'Dondușeni',
-            'DR' => 'Drochia',
-            'DU' => 'Dubăsari',
-            'ED' => 'Edineț',
-            'FA' => 'Fălești',
-            'FL' => 'Florești',
-            'GA' => 'Găgăuzia, Unitatea teritorială autonomă',
-            'GL' => 'Glodeni',
-            'HI' => 'Hîncești',
-            'IA' => 'Ialoveni',
-            'LE' => 'Leova',
-            'NI' => 'Nisporeni',
-            'OC' => 'Ocnița',
-            'OR' => 'Orhei',
-            'RE' => 'Rezina',
-            'RI' => 'Rîșcani',
-            'SD' => 'Șoldănești',
-            'SI' => 'Sîngerei',
-            'SN' => 'Stînga Nistrului, unitatea teritorială din',
-            'SO' => 'Soroca',
-            'ST' => 'Strășeni',
-            'SV' => 'Ștefan Vodă',
-            'TA' => 'Taraclia',
-            'TE' => 'Telenești',
-            'UN' => 'Ungheni',
-        ),
-    'ME' =>
-        array (
-            '01' => 'Andrijevica',
-            '02' => 'Bar',
-            '03' => 'Berane',
-            '04' => 'Bijelo Polje',
-            '05' => 'Budva',
-            '06' => 'Cetinje',
-            '07' => 'Danilovgrad',
-            '08' => 'Herceg-Novi',
-            '09' => 'Kolašin',
-            10 => 'Kotor',
-            11 => 'Mojkovac',
-            12 => 'Nikšić',
-            13 => 'Plav',
-            14 => 'Pljevlja',
-            15 => 'Plužine',
-            16 => 'Podgorica',
-            17 => 'Rožaje',
-            18 => 'Šavnik',
-            19 => 'Tivat',
-            20 => 'Ulcinj',
-            21 => 'Žabljak',
-        ),
-    'MG' =>
-        array (
-            'A' => 'Toamasina',
-            'D' => 'Antsiranana',
-            'F' => 'Fianarantsoa',
-            'M' => 'Mahajanga',
-            'T' => 'Antananarivo',
-            'U' => 'Toliara',
-        ),
-    'MH' =>
-        array (
-            'ALK' => 'Ailuk',
-            'ALL' => 'Ailinglaplap',
-            'ARN' => 'Arno',
-            'AUR' => 'Aur',
-            'EBO' => 'Ebon',
-            'ENI' => 'Enewetak',
-            'JAB' => 'Jabat',
-            'JAL' => 'Jaluit',
-            'KIL' => 'Kili',
-            'KWA' => 'Kwajalein',
-            'L' => 'Ralik chain',
-            'LAE' => 'Lae',
-            'LIB' => 'Lib',
-            'LIK' => 'Likiep',
-            'MAJ' => 'Majuro',
-            'MAL' => 'Maloelap',
-            'MEJ' => 'Mejit',
-            'MIL' => 'Mili',
-            'NMK' => 'Namdrik',
-            'NMU' => 'Namu',
-            'RON' => 'Rongelap',
-            'T' => 'Ratak chain',
-            'UJA' => 'Ujae',
-            'UTI' => 'Utirik',
-            'WTJ' => 'Wotje',
-            'WTN' => 'Wotho',
-        ),
-    'MK' =>
-        array (
-            '01' => 'Aerodrom',
-            '02' => 'Aračinovo',
-            '03' => 'Berovo',
-            '04' => 'Bitola',
-            '05' => 'Bogdanci',
-            '06' => 'Bogovinje',
-            '07' => 'Bosilovo',
-            '08' => 'Brvenica',
-            '09' => 'Butel',
-            10 => 'Valandovo',
-            11 => 'Vasilevo',
-            12 => 'Vevčani',
-            13 => 'Veles',
-            14 => 'Vinica',
-            15 => 'Vraneštica',
-            16 => 'Vrapčište',
-            17 => 'Gazi Baba',
-            18 => 'Gevgelija',
-            19 => 'Gostivar',
-            20 => 'Gradsko',
-            21 => 'Debar',
-            22 => 'Debarca',
-            23 => 'Delčevo',
-            24 => 'Demir Kapija',
-            25 => 'Demir Hisar',
-            26 => 'Dojran',
-            27 => 'Dolneni',
-            28 => 'Drugovo',
-            29 => 'Gjorče Petrov',
-            30 => 'Želino',
-            31 => 'Zajas',
-            32 => 'Zelenikovo',
-            33 => 'Zrnovci',
-            34 => 'Ilinden',
-            35 => 'Jegunovce',
-            36 => 'Kavadarci',
-            37 => 'Karbinci',
-            38 => 'Karpoš',
-            39 => 'Kisela Voda',
-            40 => 'Kičevo',
-            41 => 'Konče',
-            42 => 'Kočani',
-            43 => 'Kratovo',
-            44 => 'Kriva Palanka',
-            45 => 'Krivogaštani',
-            46 => 'Kruševo',
-            47 => 'Kumanovo',
-            48 => 'Lipkovo',
-            49 => 'Lozovo',
-            50 => 'Mavrovo-i-Rostuša',
-            51 => 'Makedonska Kamenica',
-            52 => 'Makedonski Brod',
-            53 => 'Mogila',
-            54 => 'Negotino',
-            55 => 'Novaci',
-            56 => 'Novo Selo',
-            57 => 'Oslomej',
-            58 => 'Ohrid',
-            59 => 'Petrovec',
-            60 => 'Pehčevo',
-            61 => 'Plasnica',
-            62 => 'Prilep',
-            63 => 'Probištip',
-            64 => 'Radoviš',
-            65 => 'Rankovce',
-            66 => 'Resen',
-            67 => 'Rosoman',
-            68 => 'Saraj',
-            69 => 'Sveti Nikole',
-            70 => 'Sopište',
-            71 => 'Staro Nagoričane',
-            72 => 'Struga',
-            73 => 'Strumica',
-            74 => 'Studeničani',
-            75 => 'Tearce',
-            76 => 'Tetovo',
-            77 => 'Centar',
-            78 => 'Centar Župa',
-            79 => 'Čair',
-            80 => 'Čaška',
-            81 => 'Češinovo-Obleševo',
-            82 => 'Čučer Sandevo',
-            83 => 'Štip',
-            84 => 'Šuto Orizari',
-            85 => 'Skopje',
-        ),
-    'ML' =>
-        array (
-            1 => 'Kayes',
-            2 => 'Koulikoro',
-            3 => 'Sikasso',
-            4 => 'Ségou',
-            5 => 'Mopti',
-            6 => 'Tombouctou',
-            7 => 'Gao',
-            8 => 'Kidal',
-            'BKO' => 'Bamako',
-        ),
-    'MM' =>
-        array (
-            '01' => 'Sagaing',
-            '02' => 'Bago',
-            '03' => 'Magway',
-            '04' => 'Mandalay',
-            '05' => 'Tanintharyi',
-            '06' => 'Yangon',
-            '07' => 'Ayeyarwady',
-            11 => 'Kachin',
-            12 => 'Kayah',
-            13 => 'Kayin',
-            14 => 'Chin',
-            15 => 'Mon',
-            16 => 'Rakhine',
-            17 => 'Shan',
-        ),
-    'MN' =>
-        array (
-            '035' => 'Orhon',
-            '037' => 'Darhan uul',
-            '039' => 'Hentiy',
-            '041' => 'Hövsgöl',
-            '043' => 'Hovd',
-            '046' => 'Uvs',
-            '047' => 'Töv',
-            '049' => 'Selenge',
-            '051' => 'Sühbaatar',
-            '053' => 'Ömnögovi',
-            '055' => 'Övörhangay',
-            '057' => 'Dzavhan',
-            '059' => 'Dundgovi',
-            '061' => 'Dornod',
-            '063' => 'Dornogovi',
-            '064' => 'Govi-Sumber',
-            '065' => 'Govi-Altay',
-            '067' => 'Bulgan',
-            '069' => 'Bayanhongor',
-            '071' => 'Bayan-Ölgiy',
-            '073' => 'Arhangay',
-            1 => 'Ulanbaatar',
-        ),
-    'MR' =>
-        array (
-            '01' => 'Hodh ech Chargui',
-            '02' => 'Hodh el Charbi',
-            '03' => 'Assaba',
-            '04' => 'Gorgol',
-            '05' => 'Brakna',
-            '06' => 'Trarza',
-            '07' => 'Adrar',
-            '08' => 'Dakhlet Nouadhibou',
-            '09' => 'Tagant',
-            10 => 'Guidimaka',
-            11 => 'Tiris Zemmour',
-            12 => 'Inchiri',
-            'NKC' => 'Nouakchott',
-        ),
-    'MT' =>
-        array (
-            '01' => 'Attard',
-            '02' => 'Balzan',
-            '03' => 'Birgu',
-            '04' => 'Birkirkara',
-            '05' => 'Birżebbuġa',
-            '06' => 'Bormla',
-            '07' => 'Dingli',
-            '08' => 'Fgura',
-            '09' => 'Floriana',
-            10 => 'Fontana',
-            11 => 'Gudja',
-            12 => 'Gżira',
-            13 => 'Għajnsielem',
-            14 => 'Għarb',
-            15 => 'Għargħur',
-            16 => 'Għasri',
-            17 => 'Għaxaq',
-            18 => 'Ħamrun',
-            19 => 'Iklin',
-            20 => 'Isla',
-            21 => 'Kalkara',
-            22 => 'Kerċem',
-            23 => 'Kirkop',
-            24 => 'Lija',
-            25 => 'Luqa',
-            26 => 'Marsa',
-            27 => 'Marsaskala',
-            28 => 'Marsaxlokk',
-            29 => 'Mdina',
-            30 => 'Mellieħa',
-            31 => 'Mġarr',
-            32 => 'Mosta',
-            33 => 'Mqabba',
-            34 => 'Msida',
-            35 => 'Mtarfa',
-            36 => 'Munxar',
-            37 => 'Nadur',
-            38 => 'Naxxar',
-            39 => 'Paola',
-            40 => 'Pembroke',
-            41 => 'Pietà',
-            42 => 'Qala',
-            43 => 'Qormi',
-            44 => 'Qrendi',
-            45 => 'Rabat Għawdex',
-            46 => 'Rabat Malta',
-            47 => 'Safi',
-            48 => 'San Ġiljan',
-            49 => 'San Ġwann',
-            50 => 'San Lawrenz',
-            51 => 'San Pawl il-Baħar',
-            52 => 'Sannat',
-            53 => 'Santa Luċija',
-            54 => 'Santa Venera',
-            55 => 'Siġġiewi',
-            56 => 'Sliema',
-            57 => 'Swieqi',
-            58 => 'Ta’ Xbiex',
-            59 => 'Tarxien',
-            60 => 'Valletta',
-            61 => 'Xagħra',
-            62 => 'Xewkija',
-            63 => 'Xgħajra',
-            64 => 'Żabbar',
-            65 => 'Żebbuġ Għawdex',
-            66 => 'Żebbuġ Malta',
-            67 => 'Żejtun',
-            68 => 'Żurrieq',
-        ),
-    'MU' =>
-        array (
-            'AG' => 'Agalega Islands',
-            'BL' => 'Black River',
-            'BR' => 'Beau Bassin-Rose Hill',
-            'CC' => 'Cargados Carajos Shoals',
-            'CU' => 'Curepipe',
-            'FL' => 'Flacq',
-            'GP' => 'Grand Port',
-            'MO' => 'Moka',
-            'PA' => 'Pamplemousses',
-            'PL' => 'Port Louis',
-            'PU' => 'Port Louis',
-            'PW' => 'Plaines Wilhems',
-            'QB' => 'Quatre Bornes',
-            'RO' => 'Rodrigues Island',
-            'RR' => 'Rivière du Rempart',
-            'SA' => 'Savanne',
-            'VP' => 'Vacoas-Phoenix',
-        ),
-    'MV' =>
-        array (
-            '00' => 'Alifu Dhaalu',
-            '01' => 'Seenu',
-            '02' => 'Alifu Alifu',
-            '03' => 'Lhaviyani',
-            '04' => 'Vaavu',
-            '05' => 'Laamu',
-            '07' => 'Haa Alifu',
-            '08' => 'Thaa',
-            12 => 'Meemu',
-            13 => 'Raa',
-            14 => 'Faafu',
-            17 => 'Dhaalu',
-            20 => 'Baa',
-            23 => 'Haa Dhaalu',
-            24 => 'Shaviyani',
-            25 => 'Noonu',
-            26 => 'Kaafu',
-            27 => 'Gaafu Alifu',
-            28 => 'Gaafu Dhaalu',
-            29 => 'Gnaviyani',
-            'CE' => 'Central',
-            'MLE' => 'Male',
-            'NC' => 'North Central',
-            'NO' => 'North',
-            'SC' => 'South Central',
-            'SU' => 'South',
-            'UN' => 'Upper North',
-            'US' => 'Upper South',
-        ),
-    'MW' =>
-        array (
-            'BA' => 'Balaka',
-            'BL' => 'Blantyre',
-            'C' => 'Central Region',
-            'CK' => 'Chikwawa',
-            'CR' => 'Chiradzulu',
-            'CT' => 'Chitipa',
-            'DE' => 'Dedza',
-            'DO' => 'Dowa',
-            'KR' => 'Karonga',
-            'KS' => 'Kasungu',
-            'LI' => 'Lilongwe',
-            'LK' => 'Likoma',
-            'MC' => 'Mchinji',
-            'MG' => 'Mangochi',
-            'MH' => 'Machinga',
-            'MU' => 'Mulanje',
-            'MW' => 'Mwanza',
-            'MZ' => 'Mzimba',
-            'N' => 'Northern Region',
-            'NB' => 'Nkhata Bay',
-            'NE' => 'Neno',
-            'NI' => 'Ntchisi',
-            'NK' => 'Nkhotakota',
-            'NS' => 'Nsanje',
-            'NU' => 'Ntcheu',
-            'PH' => 'Phalombe',
-            'RU' => 'Rumphi',
-            'S' => 'Southern Region',
-            'SA' => 'Salima',
-            'TH' => 'Thyolo',
-            'ZO' => 'Zomba',
-        ),
-    'MX' =>
-        array (
-            'AGU' => 'Aguascalientes',
-            'BCN' => 'Baja California',
-            'BCS' => 'Baja California Sur',
-            'CAM' => 'Campeche',
-            'CHH' => 'Chihuahua',
-            'CHP' => 'Chiapas',
-            'CMX' => 'Ciudad de México',
-            'COA' => 'Coahuila',
-            'COL' => 'Colima',
-            'DIF' => 'Distrito Federal',
-            'DUR' => 'Durango',
-            'GRO' => 'Guerrero',
-            'GUA' => 'Guanajuato',
-            'HID' => 'Hidalgo',
-            'JAL' => 'Jalisco',
-            'MEX' => 'México',
-            'MIC' => 'Michoacán',
-            'MOR' => 'Morelos',
-            'NAY' => 'Nayarit',
-            'NLE' => 'Nuevo León',
-            'OAX' => 'Oaxaca',
-            'PUE' => 'Puebla',
-            'QUE' => 'Querétaro',
-            'ROO' => 'Quintana Roo',
-            'SIN' => 'Sinaloa',
-            'SLP' => 'San Luis Potosí',
-            'SON' => 'Sonora',
-            'TAB' => 'Tabasco',
-            'TAM' => 'Tamaulipas',
-            'TLA' => 'Tlaxcala',
-            'VER' => 'Veracruz',
-            'YUC' => 'Yucatán',
-            'ZAC' => 'Zacatecas',
-        ),
-    'MY' =>
-        array (
-            '01' => 'Johor',
-            '02' => 'Kedah',
-            '03' => 'Kelantan',
-            '04' => 'Melaka',
-            '05' => 'Negeri Sembilan',
-            '06' => 'Pahang',
-            '07' => 'Pulau Pinang',
-            '08' => 'Perak',
-            '09' => 'Perlis',
-            10 => 'Selangor',
-            11 => 'Terengganu',
-            12 => 'Sabah',
-            13 => 'Sarawak',
-            14 => 'Wilayah Persekutuan Kuala Lumpur',
-            15 => 'Wilayah Persekutuan Labuan',
-            16 => 'Wilayah Persekutuan Putrajaya',
-        ),
-    'MZ' =>
-        array (
-            'A' => 'Niassa',
-            'B' => 'Manica',
-            'G' => 'Gaza',
-            'I' => 'Inhambane',
-            'L' => 'Maputo',
-            'MPM' => 'Maputo (city)',
-            'N' => 'Numpula',
-            'P' => 'Cabo Delgado',
-            'Q' => 'Zambezia',
-            'S' => 'Sofala',
-            'T' => 'Tete',
-        ),
-    'NA' =>
-        array (
-            'CA' => 'Caprivi',
-            'ER' => 'Erongo',
-            'HA' => 'Hardap',
-            'KA' => 'Karas',
-            'KH' => 'Khomas',
-            'KU' => 'Kunene',
-            'OD' => 'Otjozondjupa',
-            'OH' => 'Omaheke',
-            'OK' => 'Okavango',
-            'ON' => 'Oshana',
-            'OS' => 'Omusati',
-            'OT' => 'Oshikoto',
-            'OW' => 'Ohangwena',
-        ),
-    'NE' =>
-        array (
-            1 => 'Agadez',
-            2 => 'Diffa',
-            3 => 'Dosso',
-            4 => 'Maradi',
-            5 => 'Tahoua',
-            6 => 'Tillabéri',
-            7 => 'Zinder',
-            8 => 'Niamey',
-        ),
-    'NG' =>
-        array (
-            'AB' => 'Abia',
-            'AD' => 'Adamawa',
-            'AK' => 'Akwa Ibom',
-            'AN' => 'Anambra',
-            'BA' => 'Bauchi',
-            'BE' => 'Benue',
-            'BO' => 'Borno',
-            'BY' => 'Bayelsa',
-            'CR' => 'Cross River',
-            'DE' => 'Delta',
-            'EB' => 'Ebonyi',
-            'ED' => 'Edo',
-            'EK' => 'Ekiti',
-            'EN' => 'Enugu',
-            'FC' => 'Abuja Capital Territory',
-            'GO' => 'Gombe',
-            'IM' => 'Imo',
-            'JI' => 'Jigawa',
-            'KD' => 'Kaduna',
-            'KE' => 'Kebbi',
-            'KN' => 'Kano',
-            'KO' => 'Kogi',
-            'KT' => 'Katsina',
-            'KW' => 'Kwara',
-            'LA' => 'Lagos',
-            'NA' => 'Nassarawa',
-            'NI' => 'Niger',
-            'OG' => 'Ogun',
-            'ON' => 'Ondo',
-            'OS' => 'Osun',
-            'OY' => 'Oyo',
-            'PL' => 'Plateau',
-            'RI' => 'Rivers',
-            'SO' => 'Sokoto',
-            'TA' => 'Taraba',
-            'YO' => 'Yobe',
-            'ZA' => 'Zamfara',
-        ),
-    'NI' =>
-        array (
-            'AN' => 'Atlántico Norte',
-            'AS' => 'Atlántico Sur',
-            'BO' => 'Boaco',
-            'CA' => 'Carazo',
-            'CI' => 'Chinandega',
-            'CO' => 'Chontales',
-            'ES' => 'Estelí',
-            'GR' => 'Granada',
-            'JI' => 'Jinotega',
-            'LE' => 'León',
-            'MD' => 'Madriz',
-            'MN' => 'Managua',
-            'MS' => 'Masaya',
-            'MT' => 'Matagalpa',
-            'NS' => 'Nueva Segovia',
-            'RI' => 'Rivas',
-            'SJ' => 'Río San Juan',
-        ),
-    'NL' =>
-        array (
-            'AW' => 'Aruba',
-            'BQ1' => 'Bonaire',
-            'BQ2' => 'Saba',
-            'BQ3' => 'Sint Eustatius',
-            'CW' => 'Curaçao',
-            'DR' => 'Drenthe',
-            'FL' => 'Flevoland',
-            'FR' => 'Friesland',
-            'GE' => 'Gelderland',
-            'GR' => 'Groningen',
-            'LI' => 'Limburg',
-            'NB' => 'Noord-Brabant',
-            'NH' => 'Noord-Holland',
-            'OV' => 'Overijssel',
-            'SX' => 'Sint Maarten',
-            'UT' => 'Utrecht',
-            'ZE' => 'Zeeland',
-            'ZH' => 'Zuid-Holland',
-        ),
-    'NO' =>
-        array (
-            '01' => 'Østfold',
-            '02' => 'Akershus',
-            '03' => 'Oslo',
-            '04' => 'Hedmark',
-            '05' => 'Oppland',
-            '06' => 'Buskerud',
-            '07' => 'Vestfold',
-            '08' => 'Telemark',
-            '09' => 'Aust-Agder',
-            10 => 'Vest-Agder',
-            11 => 'Rogaland',
-            12 => 'Hordaland',
-            14 => 'Sogn og Fjordane',
-            15 => 'Møre og Romsdal',
-            16 => 'Sør-Trøndelag',
-            17 => 'Nord-Trøndelag',
-            18 => 'Nordland',
-            19 => 'Troms',
-            20 => 'Finnmark',
-            21 => 'Svalbard (Arctic Region)',
-            22 => 'Jan Mayen (Arctic Region)',
-        ),
-    'NP' =>
-        array (
-            1 => 'Madhyamanchal',
-            2 => 'Madhya Pashchimanchal',
-            3 => 'Pashchimanchal',
-            4 => 'Purwanchal',
-            5 => 'Sudur Pashchimanchal',
-            'BA' => 'Bagmati',
-            'BH' => 'Bheri',
-            'DH' => 'Dhawalagiri',
-            'GA' => 'Gandaki',
-            'JA' => 'Janakpur',
-            'KA' => 'Karnali',
-            'KO' => 'Kosi',
-            'LU' => 'Lumbini',
-            'MA' => 'Mahakali',
-            'ME' => 'Mechi',
-            'NA' => 'Narayani',
-            'RA' => 'Rapti',
-            'SA' => 'Sagarmatha',
-            'SE' => 'Seti',
-        ),
-    'NR' =>
-        array (
-            '01' => 'Aiwo',
-            '02' => 'Anabar',
-            '03' => 'Anetan',
-            '04' => 'Anibare',
-            '05' => 'Baiti',
-            '06' => 'Boe',
-            '07' => 'Buada',
-            '08' => 'Denigomodu',
-            '09' => 'Ewa',
-            10 => 'Ijuw',
-            11 => 'Meneng',
-            12 => 'Nibok',
-            13 => 'Uaboe',
-            14 => 'Yaren',
-        ),
-    'NZ' =>
-        array (
-            'AUK' => 'Auckland',
-            'BOP' => 'Bay of Plenty',
-            'CAN' => 'Canterbury',
-            'CIT' => 'Chatham Islands Territory',
-            'GIS' => 'Gisborne District',
-            'HKB' => 'Hawke\'s Bay',
-            'MBH' => 'Marlborough District',
-            'MWT' => 'Manawatu-Wanganui',
-            'N' => 'North Island',
-            'NSN' => 'Nelson City',
-            'NTL' => 'Northland',
-            'OTA' => 'Otago',
-            'S' => 'South Island',
-            'STL' => 'Southland',
-            'TAS' => 'Tasman District',
-            'TKI' => 'Taranaki',
-            'WGN' => 'Wellington',
-            'WKO' => 'Waikato',
-            'WTC' => 'West Coast',
-        ),
-    'OM' =>
-        array (
-            'BA' => 'Al Bāţinah',
-            'BU' => 'Al Buraymī',
-            'DA' => 'Ad Dākhilīya',
-            'MA' => 'Masqaţ',
-            'MU' => 'Musandam',
-            'SH' => 'Ash Sharqīyah',
-            'WU' => 'Al Wusţá',
-            'ZA' => 'Az̧ Z̧āhirah',
-            'ZU' => 'Z̧ufār',
-        ),
-    'PA' =>
-        array (
-            1 => 'Bocas del Toro',
-            2 => 'Coclé',
-            3 => 'Colón',
-            4 => 'Chiriquí',
-            5 => 'Darién',
-            6 => 'Herrera',
-            7 => 'Los Santos',
-            8 => 'Panamá',
-            9 => 'Veraguas',
-            'EM' => 'Emberá',
-            'KY' => 'Kuna Yala',
-            'NB' => 'Ngöbe-Buglé',
-        ),
-    'PE' =>
-        array (
-            'AMA' => 'Amazonas',
-            'ANC' => 'Ancash',
-            'APU' => 'Apurímac',
-            'ARE' => 'Arequipa',
-            'AYA' => 'Ayacucho',
-            'CAJ' => 'Cajamarca',
-            'CAL' => 'El Callao',
-            'CUS' => 'Cusco [Cuzco]',
-            'HUC' => 'Huánuco',
-            'HUV' => 'Huancavelica',
-            'ICA' => 'Ica',
-            'JUN' => 'Junín',
-            'LAL' => 'La Libertad',
-            'LAM' => 'Lambayeque',
-            'LIM' => 'Lima',
-            'LMA' => 'Municipalidad Metropolitana de Lima',
-            'LOR' => 'Loreto',
-            'MDD' => 'Madre de Dios',
-            'MOQ' => 'Moquegua',
-            'PAS' => 'Pasco',
-            'PIU' => 'Piura',
-            'PUN' => 'Puno',
-            'SAM' => 'San Martín',
-            'TAC' => 'Tacna',
-            'TUM' => 'Tumbes',
-            'UCA' => 'Ucayali',
-        ),
-    'PG' =>
-        array (
-            'CPK' => 'Chimbu',
-            'CPM' => 'Central',
-            'EBR' => 'East New Britain',
-            'EHG' => 'Eastern Highlands',
-            'EPW' => 'Enga',
-            'ESW' => 'East Sepik',
-            'GPK' => 'Gulf',
-            'MBA' => 'Milne Bay',
-            'MPL' => 'Morobe',
-            'MPM' => 'Madang',
-            'MRL' => 'Manus',
-            'NCD' => 'National Capital District (Port Moresby)',
-            'NIK' => 'New Ireland',
-            'NPP' => 'Northern',
-            'NSB' => 'Bougainville',
-            'SAN' => 'Sandaun',
-            'SHM' => 'Southern Highlands',
-            'WBK' => 'West New Britain',
-            'WHM' => 'Western Highlands',
-            'WPD' => 'Western',
-        ),
-    'PH' =>
-        array (
-            '00' => 'National Capital Region',
-            '01' => 'Ilocos (Region I)',
-            '02' => 'Cagayan Valley (Region II)',
-            '03' => 'Central Luzon (Region III)',
-            '05' => 'Bicol (Region V)',
-            '06' => 'Western Visayas (Region VI)',
-            '07' => 'Central Visayas (Region VII)',
-            '08' => 'Eastern Visayas (Region VIII)',
-            '09' => 'Zamboanga Peninsula (Region IX)',
-            10 => 'Northern Mindanao (Region X)',
-            11 => 'Davao (Region XI)',
-            12 => 'Soccsksargen (Region XII)',
-            13 => 'Caraga (Region XIII)',
-            14 => 'Autonomous Region in Muslim Mindanao (ARMM)',
-            15 => 'Cordillera Administrative Region (CAR)',
-            40 => 'CALABARZON (Region IV-A)',
-            41 => 'MIMAROPA (Region IV-B)',
-            'ABR' => 'Abra',
-            'AGN' => 'Agusan del Norte',
-            'AGS' => 'Agusan del Sur',
-            'AKL' => 'Aklan',
-            'ALB' => 'Albay',
-            'ANT' => 'Antique',
-            'APA' => 'Apayao',
-            'AUR' => 'Aurora',
-            'BAN' => 'Batasn',
-            'BAS' => 'Basilan',
-            'BEN' => 'Benguet',
-            'BIL' => 'Biliran',
-            'BOH' => 'Bohol',
-            'BTG' => 'Batangas',
-            'BTN' => 'Batanes',
-            'BUK' => 'Bukidnon',
-            'BUL' => 'Bulacan',
-            'CAG' => 'Cagayan',
-            'CAM' => 'Camiguin',
-            'CAN' => 'Camarines Norte',
-            'CAP' => 'Capiz',
-            'CAS' => 'Camarines Sur',
-            'CAT' => 'Catanduanes',
-            'CAV' => 'Cavite',
-            'CEB' => 'Cebu',
-            'COM' => 'Compostela Valley',
-            'DAO' => 'Davao Oriental',
-            'DAS' => 'Davao del Sur',
-            'DAV' => 'Davao del Norte',
-            'DIN' => 'Dinagat Islands',
-            'EAS' => 'Eastern Samar',
-            'GUI' => 'Guimaras',
-            'IFU' => 'Ifugao',
-            'ILI' => 'Iloilo',
-            'ILN' => 'Ilocos Norte',
-            'ILS' => 'Ilocos Sur',
-            'ISA' => 'Isabela',
-            'KAL' => 'Kalinga-Apayso',
-            'LAG' => 'Laguna',
-            'LAN' => 'Lanao del Norte',
-            'LAS' => 'Lanao del Sur',
-            'LEY' => 'Leyte',
-            'LUN' => 'La Union',
-            'MAD' => 'Marinduque',
-            'MAG' => 'Maguindanao',
-            'MAS' => 'Masbate',
-            'MDC' => 'Mindoro Occidental',
-            'MDR' => 'Mindoro Oriental',
-            'MOU' => 'Mountain Province',
-            'MSC' => 'Misamis Occidental',
-            'MSR' => 'Misamis Oriental',
-            'NCO' => 'North Cotabato',
-            'NEC' => 'Negros Occidental',
-            'NER' => 'Negros Oriental',
-            'NSA' => 'Northern Samar',
-            'NUE' => 'Nueva Ecija',
-            'NUV' => 'Nueva Vizcaya',
-            'PAM' => 'Pampanga',
-            'PAN' => 'Pangasinan',
-            'PLW' => 'Palawan',
-            'QUE' => 'Quezon',
-            'QUI' => 'Quirino',
-            'RIZ' => 'Rizal',
-            'ROM' => 'Romblon',
-            'SAR' => 'Sarangani',
-            'SCO' => 'South Cotabato',
-            'SIG' => 'Siquijor',
-            'SLE' => 'Southern Leyte',
-            'SLU' => 'Sulu',
-            'SOR' => 'Sorsogon',
-            'SUK' => 'Sultan Kudarat',
-            'SUN' => 'Surigao del Norte',
-            'SUR' => 'Surigao del Sur',
-            'TAR' => 'Tarlac',
-            'TAW' => 'Tawi-Tawi',
-            'WSA' => 'Western Samar',
-            'ZAN' => 'Zamboanga del Norte',
-            'ZAS' => 'Zamboanga del Sur',
-            'ZMB' => 'Zambales',
-            'ZSI' => 'Zamboanga Sibugay',
-        ),
-    'PK' =>
-        array (
-            'BA' => 'Balochistan',
-            'GB' => 'Gilgit-Baltistan',
-            'IS' => 'Islamabad',
-            'JK' => 'Azad Kashmir',
-            'KP' => 'Khyber Pakhtunkhwa',
-            'PB' => 'Punjab',
-            'SD' => 'Sindh',
-            'TA' => 'Federally Administered Tribal Areas',
-        ),
-    'PL' =>
-        array (
-            'DS' => 'Dolnośląskie',
-            'KP' => 'Kujawsko-pomorskie',
-            'LB' => 'Lubuskie',
-            'LD' => 'Łódzkie',
-            'LU' => 'Lubelskie',
-            'MA' => 'Małopolskie',
-            'MZ' => 'Mazowieckie',
-            'OP' => 'Opolskie',
-            'PD' => 'Podlaskie',
-            'PK' => 'Podkarpackie',
-            'PM' => 'Pomorskie',
-            'SK' => 'Świętokrzyskie',
-            'SL' => 'Śląskie',
-            'WN' => 'Warmińsko-mazurskie',
-            'WP' => 'Wielkopolskie',
-            'ZP' => 'Zachodniopomorskie',
-        ),
-    'PS' =>
-        array (
-            'BTH' => 'Bethlehem',
-            'DEB' => 'Deir El Balah',
-            'GZA' => 'Gaza',
-            'HBN' => 'Hebron',
-            'JEM' => 'Jerusalem',
-            'JEN' => 'Jenin',
-            'JRH' => 'Jericho - Al Aghwar',
-            'KYS' => 'Khan Yunis',
-            'NBS' => 'Nablus',
-            'NGZ' => 'North Gaza',
-            'QQA' => 'Qalqilya',
-            'RBH' => 'Ramallah',
-            'RFH' => 'Rafah',
-            'SLT' => 'Salfit',
-            'TBS' => 'Tubas',
-            'TKM' => 'Tulkarm',
-        ),
-    'PT' =>
-        array (
-            '01' => 'Aveiro',
-            '02' => 'Beja',
-            '03' => 'Braga',
-            '04' => 'Bragança',
-            '05' => 'Castelo Branco',
-            '06' => 'Coimbra',
-            '07' => 'Évora',
-            '08' => 'Faro',
-            '09' => 'Guarda',
-            10 => 'Leiria',
-            11 => 'Lisboa',
-            12 => 'Portalegre',
-            13 => 'Porto',
-            14 => 'Santarém',
-            15 => 'Setúbal',
-            16 => 'Viana do Castelo',
-            17 => 'Vila Real',
-            18 => 'Viseu',
-            20 => 'Região Autónoma dos Açores',
-            30 => 'Região Autónoma da Madeira',
-        ),
-    'PW' =>
-        array (
-            '002' => 'Aimeliik',
-            '004' => 'Airai',
-            '010' => 'Angaur',
-            '050' => 'Hatobohei',
-            100 => 'Kayangel',
-            150 => 'Koror',
-            212 => 'Melekeok',
-            214 => 'Ngaraard',
-            218 => 'Ngarchelong',
-            222 => 'Ngardmau',
-            224 => 'Ngatpang',
-            226 => 'Ngchesar',
-            227 => 'Ngeremlengui',
-            228 => 'Ngiwal',
-            350 => 'Peleliu',
-            370 => 'Sonsorol',
-        ),
-    'PY' =>
-        array (
-            1 => 'Concepción',
-            10 => 'Alto Paraná',
-            11 => 'Central',
-            12 => 'Ñeembucú',
-            13 => 'Amambay',
-            14 => 'Canindeyú',
-            15 => 'Presidente Hayes',
-            16 => 'Alto Paraguay',
-            19 => 'Boquerón',
-            2 => 'San Pedro',
-            3 => 'Cordillera',
-            4 => 'Guairá',
-            5 => 'Caaguazú',
-            6 => 'Caazapá',
-            7 => 'Itapúa',
-            8 => 'Misiones',
-            9 => 'Paraguarí',
-            'ASU' => 'Asunción',
-        ),
-    'QA' =>
-        array (
-            'DA' => 'Ad Dawhah',
-            'KH' => 'Al Khawr wa adh Dhakhīrah',
-            'MS' => 'Ash Shamal',
-            'RA' => 'Ar Rayyan',
-            'SH' => 'Ash Shīḩānīyah',
-            'US' => 'Umm Salal',
-            'WA' => 'Al Wakrah',
-            'ZA' => 'Az̧ Z̧a‘āyin',
-        ),
-    'RO' =>
-        array (
-            'AB' => 'Alba',
-            'AG' => 'Argeș',
-            'AR' => 'Arad',
-            'B' => 'București',
-            'BC' => 'Bacău',
-            'BH' => 'Bihor',
-            'BN' => 'Bistrița-Năsăud',
-            'BR' => 'Brăila',
-            'BT' => 'Botoșani',
-            'BV' => 'Brașov',
-            'BZ' => 'Buzău',
-            'CJ' => 'Cluj',
-            'CL' => 'Călărași',
-            'CS' => 'Caraș-Severin',
-            'CT' => 'Constanța',
-            'CV' => 'Covasna',
-            'DB' => 'Dâmbovița',
-            'DJ' => 'Dolj',
-            'GJ' => 'Gorj',
-            'GL' => 'Galați',
-            'GR' => 'Giurgiu',
-            'HD' => 'Hunedoara',
-            'HR' => 'Harghita',
-            'IF' => 'Ilfov',
-            'IL' => 'Ialomița',
-            'IS' => 'Iași',
-            'MH' => 'Mehedinți',
-            'MM' => 'Maramureș',
-            'MS' => 'Mureș',
-            'NT' => 'Neamț',
-            'OT' => 'Olt',
-            'PH' => 'Prahova',
-            'SB' => 'Sibiu',
-            'SJ' => 'Sălaj',
-            'SM' => 'Satu Mare',
-            'SV' => 'Suceava',
-            'TL' => 'Tulcea',
-            'TM' => 'Timiș',
-            'TR' => 'Teleorman',
-            'VL' => 'Vâlcea',
-            'VN' => 'Vrancea',
-            'VS' => 'Vaslui',
-        ),
-    'RS' =>
-        array (
-            '00' => 'Beograd',
-            '01' => 'Severnobački okrug',
-            '02' => 'Srednjebanatski okrug',
-            '03' => 'Severnobanatski okrug',
-            '04' => 'Južnobanatski okrug',
-            '05' => 'Zapadnobački okrug',
-            '06' => 'Južnobački okrug',
-            '07' => 'Sremski okrug',
-            '08' => 'Mačvanski okrug',
-            '09' => 'Kolubarski okrug',
-            10 => 'Podunavski okrug',
-            11 => 'Braničevski okrug',
-            12 => 'Šumadijski okrug',
-            13 => 'Pomoravski okrug',
-            14 => 'Borski okrug',
-            15 => 'Zaječarski okrug',
-            16 => 'Zlatiborski okrug',
-            17 => 'Moravički okrug',
-            18 => 'Raški okrug',
-            19 => 'Rasinski okrug',
-            20 => 'Nišavski okrug',
-            21 => 'Toplički okrug',
-            22 => 'Pirotski okrug',
-            23 => 'Jablanički okrug',
-            24 => 'Pčinjski okrug',
-            25 => 'Kosovski okrug',
-            26 => 'Pećki okrug',
-            27 => 'Prizrenski okrug',
-            28 => 'Kosovsko-Mitrovački okrug',
-            29 => 'Kosovsko-Pomoravski okrug',
-            'KM' => 'Kosovo-Metohija',
-            'VO' => 'Vojvodina',
-        ),
-    'RU' =>
-        array (
-            'AD' => 'Adygeya, Respublika',
-            'AL' => 'Altay, Respublika',
-            'ALT' => 'Altayskiy kray',
-            'AMU' => 'Amurskaya oblast\'',
-            'ARK' => 'Arkhangel\'skaya oblast\'',
-            'AST' => 'Astrakhanskaya oblast\'',
-            'BA' => 'Bashkortostan, Respublika',
-            'BEL' => 'Belgorodskaya oblast\'',
-            'BRY' => 'Bryanskaya oblast\'',
-            'BU' => 'Buryatiya, Respublika',
-            'CE' => 'Chechenskaya Respublika',
-            'CHE' => 'Chelyabinskaya oblast\'',
-            'CHU' => 'Chukotskiy avtonomnyy okrug',
-            'CU' => 'Chuvashskaya Respublika',
-            'DA' => 'Dagestan, Respublika',
-            'IN' => 'Respublika Ingushetiya',
-            'IRK' => 'Irkutiskaya oblast\'',
-            'IVA' => 'Ivanovskaya oblast\'',
-            'KAM' => 'Kamchatskiy kray',
-            'KB' => 'Kabardino-Balkarskaya Respublika',
-            'KC' => 'Karachayevo-Cherkesskaya Respublika',
-            'KDA' => 'Krasnodarskiy kray',
-            'KEM' => 'Kemerovskaya oblast\'',
-            'KGD' => 'Kaliningradskaya oblast\'',
-            'KGN' => 'Kurganskaya oblast\'',
-            'KHA' => 'Khabarovskiy kray',
-            'KHM' => 'Khanty-Mansiysky avtonomnyy okrug-Yugra',
-            'KIR' => 'Kirovskaya oblast\'',
-            'KK' => 'Khakasiya, Respublika',
-            'KL' => 'Kalmykiya, Respublika',
-            'KLU' => 'Kaluzhskaya oblast\'',
-            'KO' => 'Komi, Respublika',
-            'KOS' => 'Kostromskaya oblast\'',
-            'KR' => 'Kareliya, Respublika',
-            'KRS' => 'Kurskaya oblast\'',
-            'KYA' => 'Krasnoyarskiy kray',
-            'LEN' => 'Leningradskaya oblast\'',
-            'LIP' => 'Lipetskaya oblast\'',
-            'MAG' => 'Magadanskaya oblast\'',
-            'ME' => 'Mariy El, Respublika',
-            'MO' => 'Mordoviya, Respublika',
-            'MOS' => 'Moskovskaya oblast\'',
-            'MOW' => 'Moskva',
-            'MUR' => 'Murmanskaya oblast\'',
-            'NEN' => 'Nenetskiy avtonomnyy okrug',
-            'NGR' => 'Novgorodskaya oblast\'',
-            'NIZ' => 'Nizhegorodskaya oblast\'',
-            'NVS' => 'Novosibirskaya oblast\'',
-            'OMS' => 'Omskaya oblast\'',
-            'ORE' => 'Orenburgskaya oblast\'',
-            'ORL' => 'Orlovskaya oblast\'',
-            'PER' => 'Permskiy kray',
-            'PNZ' => 'Penzenskaya oblast\'',
-            'PRI' => 'Primorskiy kray',
-            'PSK' => 'Pskovskaya oblast\'',
-            'ROS' => 'Rostovskaya oblast\'',
-            'RYA' => 'Ryazanskaya oblast\'',
-            'SA' => 'Sakha, Respublika [Yakutiya]',
-            'SAK' => 'Sakhalinskaya oblast\'',
-            'SAM' => 'Samaraskaya oblast\'',
-            'SAR' => 'Saratovskaya oblast\'',
-            'SE' => 'Severnaya Osetiya-Alaniya, Respublika',
-            'SMO' => 'Smolenskaya oblast\'',
-            'SPE' => 'Sankt-Peterburg',
-            'STA' => 'Stavropol\'skiy kray',
-            'SVE' => 'Sverdlovskaya oblast\'',
-            'TA' => 'Tatarstan, Respublika',
-            'TAM' => 'Tambovskaya oblast\'',
-            'TOM' => 'Tomskaya oblast\'',
-            'TUL' => 'Tul\'skaya oblast\'',
-            'TVE' => 'Tverskaya oblast\'',
-            'TY' => 'Tyva, Respublika [Tuva]',
-            'TYU' => 'Tyumenskaya oblast\'',
-            'UD' => 'Udmurtskaya Respublika',
-            'ULY' => 'Ul\'yanovskaya oblast\'',
-            'VGG' => 'Volgogradskaya oblast\'',
-            'VLA' => 'Vladimirskaya oblast\'',
-            'VLG' => 'Vologodskaya oblast\'',
-            'VOR' => 'Voronezhskaya oblast\'',
-            'YAN' => 'Yamalo-Nenetskiy avtonomnyy okrug',
-            'YAR' => 'Yaroslavskaya oblast\'',
-            'YEV' => 'Yevreyskaya avtonomnaya oblast\'',
-            'ZAB' => 'Zabajkal\'skij kraj',
-        ),
-    'RW' =>
-        array (
-            '01' => 'Ville de Kigali',
-            '02' => 'Est',
-            '03' => 'Nord',
-            '04' => 'Ouest',
-            '05' => 'Sud',
-        ),
-    'SA' =>
-        array (
-            '01' => 'Ar Riyāḍ',
-            '02' => 'Makkah',
-            '03' => 'Al Madīnah',
-            '04' => 'Ash Sharqīyah',
-            '05' => 'Al Qaşīm',
-            '06' => 'Ḥā\'il',
-            '07' => 'Tabūk',
-            '08' => 'Al Ḥudūd ash Shamāliyah',
-            '09' => 'Jīzan',
-            10 => 'Najrān',
-            11 => 'Al Bāhah',
-            12 => 'Al Jawf',
-            14 => '`Asīr',
-        ),
-    'SB' =>
-        array (
-            'CE' => 'Central',
-            'CH' => 'Choiseul',
-            'CT' => 'Capital Territory (Honiara)',
-            'GU' => 'Guadalcanal',
-            'IS' => 'Isabel',
-            'MK' => 'Makira',
-            'ML' => 'Malaita',
-            'RB' => 'Rennell and Bellona',
-            'TE' => 'Temotu',
-            'WE' => 'Western',
-        ),
-    'SC' =>
-        array (
-            '01' => 'Anse aux Pins',
-            '02' => 'Anse Boileau',
-            '03' => 'Anse Etoile',
-            '04' => 'Anse Louis',
-            '05' => 'Anse Royale',
-            '06' => 'Baie Lazare',
-            '07' => 'Baie Sainte Anne',
-            '08' => 'Beau Vallon',
-            '09' => 'Bel Air',
-            10 => 'Bel Ombre',
-            11 => 'Cascade',
-            12 => 'Glacis',
-            13 => 'Grand Anse Mahe',
-            14 => 'Grand Anse Praslin',
-            15 => 'La Digue',
-            16 => 'English River',
-            17 => 'Mont Buxton',
-            18 => 'Mont Fleuri',
-            19 => 'Plaisance',
-            20 => 'Pointe Larue',
-            21 => 'Port Glaud',
-            22 => 'Saint Louis',
-            23 => 'Takamaka',
-            24 => 'Les Mamelles',
-            25 => 'Roche Caiman',
-        ),
-    'SD' =>
-        array (
-            'DC' => 'Zalingei',
-            'DE' => 'Sharq Dārfūr',
-            'DN' => 'Shamāl Dārfūr',
-            'DS' => 'Janūb Dārfūr',
-            'DW' => 'Gharb Dārfūr',
-            'GD' => 'Al Qaḑārif',
-            'GK' => 'Gharb Kurdufān',
-            'GZ' => 'Al Jazīrah',
-            'KA' => 'Kassalā',
-            'KH' => 'Al Kharţūm',
-            'KN' => 'Shamāl Kurdufān',
-            'KS' => 'Janūb Kurdufān',
-            'NB' => 'An Nīl al Azraq',
-            'NO' => 'Ash Shamālīyah',
-            'NR' => 'An Nīl',
-            'NW' => 'An Nīl al Abyaḑ',
-            'RS' => 'Al Baḩr al Aḩmar',
-            'SI' => 'Sinnār',
-        ),
-    'SE' =>
-        array (
-            'AB' => 'Stockholms län',
-            'AC' => 'Västerbottens län',
-            'BD' => 'Norrbottens län',
-            'C' => 'Uppsala län',
-            'D' => 'Södermanlands län',
-            'E' => 'Östergötlands län',
-            'F' => 'Jönköpings län',
-            'G' => 'Kronobergs län',
-            'H' => 'Kalmar län',
-            'I' => 'Gotlands län',
-            'K' => 'Blekinge län',
-            'M' => 'Skåne län',
-            'N' => 'Hallands län',
-            'O' => 'Västra Götalands län',
-            'S' => 'Värmlands län',
-            'T' => 'Örebro län',
-            'U' => 'Västmanlands län',
-            'W' => 'Dalarnas län',
-            'X' => 'Gävleborgs län',
-            'Y' => 'Västernorrlands län',
-            'Z' => 'Jämtlands län',
-        ),
-    'SG' =>
-        array (
-            '01' => 'Central Singapore',
-            '02' => 'North East',
-            '03' => 'North West',
-            '04' => 'South East',
-            '05' => 'South West',
-        ),
-    'SH' =>
-        array (
-            'AC' => 'Ascension',
-            'HL' => 'Saint Helena',
-            'TA' => 'Tristan da Cunha',
-        ),
-    'SI' =>
-        array (
-            '001' => 'Ajdovščina',
-            '002' => 'Beltinci',
-            '003' => 'Bled',
-            '004' => 'Bohinj',
-            '005' => 'Borovnica',
-            '006' => 'Bovec',
-            '007' => 'Brda',
-            '008' => 'Brezovica',
-            '009' => 'Brežice',
-            '010' => 'Tišina',
-            '011' => 'Celje',
-            '012' => 'Cerklje na Gorenjskem',
-            '013' => 'Cerknica',
-            '014' => 'Cerkno',
-            '015' => 'Črenšovci',
-            '016' => 'Črna na Koroškem',
-            '017' => 'Črnomelj',
-            '018' => 'Destrnik',
-            '019' => 'Divača',
-            '020' => 'Dobrepolje',
-            '021' => 'Dobrova-Polhov Gradec',
-            '022' => 'Dol pri Ljubljani',
-            '023' => 'Domžale',
-            '024' => 'Dornava',
-            '025' => 'Dravograd',
-            '026' => 'Duplek',
-            '027' => 'Gorenja vas-Poljane',
-            '028' => 'Gorišnica',
-            '029' => 'Gornja Radgona',
-            '030' => 'Gornji Grad',
-            '031' => 'Gornji Petrovci',
-            '032' => 'Grosuplje',
-            '033' => 'Šalovci',
-            '034' => 'Hrastnik',
-            '035' => 'Hrpelje-Kozina',
-            '036' => 'Idrija',
-            '037' => 'Ig',
-            '038' => 'Ilirska Bistrica',
-            '039' => 'Ivančna Gorica',
-            '040' => 'Izola/Isola',
-            '041' => 'Jesenice',
-            '042' => 'Juršinci',
-            '043' => 'Kamnik',
-            '044' => 'Kanal',
-            '045' => 'Kidričevo',
-            '046' => 'Kobarid',
-            '047' => 'Kobilje',
-            '048' => 'Kočevje',
-            '049' => 'Komen',
-            '050' => 'Koper/Capodistria',
-            '051' => 'Kozje',
-            '052' => 'Kranj',
-            '053' => 'Kranjska Gora',
-            '054' => 'Krško',
-            '055' => 'Kungota',
-            '056' => 'Kuzma',
-            '057' => 'Laško',
-            '058' => 'Lenart',
-            '059' => 'Lendava/Lendva',
-            '060' => 'Litija',
-            '061' => 'Ljubljana',
-            '062' => 'Ljubno',
-            '063' => 'Ljutomer',
-            '064' => 'Logatec',
-            '065' => 'Loška dolina',
-            '066' => 'Loški Potok',
-            '067' => 'Luče',
-            '068' => 'Lukovica',
-            '069' => 'Majšperk',
-            '070' => 'Maribor',
-            '071' => 'Medvode',
-            '072' => 'Mengeš',
-            '073' => 'Metlika',
-            '074' => 'Mežica',
-            '075' => 'Miren-Kostanjevica',
-            '076' => 'Mislinja',
-            '077' => 'Moravče',
-            '078' => 'Moravske Toplice',
-            '079' => 'Mozirje',
-            '080' => 'Murska Sobota',
-            '081' => 'Muta',
-            '082' => 'Naklo',
-            '083' => 'Nazarje',
-            '084' => 'Nova Gorica',
-            '085' => 'Novo mesto',
-            '086' => 'Odranci',
-            '087' => 'Ormož',
-            '088' => 'Osilnica',
-            '089' => 'Pesnica',
-            '090' => 'Piran/Pirano',
-            '091' => 'Pivka',
-            '092' => 'Podčetrtek',
-            '093' => 'Podvelka',
-            '094' => 'Postojna',
-            '095' => 'Preddvor',
-            '096' => 'Ptuj',
-            '097' => 'Puconci',
-            '098' => 'Rače-Fram',
-            '099' => 'Radeče',
-            100 => 'Radenci',
-            101 => 'Radlje ob Dravi',
-            102 => 'Radovljica',
-            103 => 'Ravne na Koroškem',
-            104 => 'Ribnica',
-            105 => 'Rogašovci',
-            106 => 'Rogaška Slatina',
-            107 => 'Rogatec',
-            108 => 'Ruše',
-            109 => 'Semič',
-            110 => 'Sevnica',
-            111 => 'Sežana',
-            112 => 'Slovenj Gradec',
-            113 => 'Slovenska Bistrica',
-            114 => 'Slovenske Konjice',
-            115 => 'Starče',
-            116 => 'Sveti Jurij',
-            117 => 'Šenčur',
-            118 => 'Šentilj',
-            119 => 'Šentjernej',
-            120 => 'Šentjur',
-            121 => 'Škocjan',
-            122 => 'Škofja Loka',
-            123 => 'Škofljica',
-            124 => 'Šmarje pri Jelšah',
-            125 => 'Šmartno ob Paki',
-            126 => 'Šoštanj',
-            127 => 'Štore',
-            128 => 'Tolmin',
-            129 => 'Trbovlje',
-            130 => 'Trebnje',
-            131 => 'Tržič',
-            132 => 'Turnišče',
-            133 => 'Velenje',
-            134 => 'Velike Lašče',
-            135 => 'Videm',
-            136 => 'Vipava',
-            137 => 'Vitanje',
-            138 => 'Vodice',
-            139 => 'Vojnik',
-            140 => 'Vrhnika',
-            141 => 'Vuzenica',
-            142 => 'Zagorje ob Savi',
-            143 => 'Zavrč',
-            144 => 'Zreče',
-            146 => 'Železniki',
-            147 => 'Žiri',
-            148 => 'Benedikt',
-            149 => 'Bistrica ob Sotli',
-            150 => 'Bloke',
-            151 => 'Braslovče',
-            152 => 'Cankova',
-            153 => 'Cerkvenjak',
-            154 => 'Dobje',
-            155 => 'Dobrna',
-            156 => 'Dobrovnik/Dobronak',
-            157 => 'Dolenjske Toplice',
-            158 => 'Grad',
-            159 => 'Hajdina',
-            160 => 'Hoče-Slivnica',
-            161 => 'Hodoš/Hodos',
-            162 => 'Horjul',
-            163 => 'Jezersko',
-            164 => 'Komenda',
-            165 => 'Kostel',
-            166 => 'Križevci',
-            167 => 'Lovrenc na Pohorju',
-            168 => 'Markovci',
-            169 => 'Miklavž na Dravskem polju',
-            170 => 'Mirna Peč',
-            171 => 'Oplotnica',
-            172 => 'Podlehnik',
-            173 => 'Polzela',
-            174 => 'Prebold',
-            175 => 'Prevalje',
-            176 => 'Razkrižje',
-            177 => 'Ribnica na Pohorju',
-            178 => 'Selnica ob Dravi',
-            179 => 'Sodražica',
-            180 => 'Solčava',
-            181 => 'Sveta Ana',
-            182 => 'Sveta Andraž v Slovenskih Goricah',
-            183 => 'Šempeter-Vrtojba',
-            184 => 'Tabor',
-            185 => 'Trnovska vas',
-            186 => 'Trzin',
-            187 => 'Velika Polana',
-            188 => 'Veržej',
-            189 => 'Vransko',
-            190 => 'Žalec',
-            191 => 'Žetale',
-            192 => 'Žirovnica',
-            193 => 'Žužemberk',
-            194 => 'Šmartno pri Litiji',
-            195 => 'Apače',
-            196 => 'Cirkulane',
-            197 => 'Kosanjevica na Krki',
-            198 => 'Makole',
-            199 => 'Mokronog-Trebelno',
-            200 => 'Poljčane',
-            201 => 'Renče-Vogrsko',
-            202 => 'Središče ob Dravi',
-            203 => 'Straža',
-            204 => 'Sveta Trojica v Slovenskih Goricah',
-            205 => 'Sveti Tomaž',
-            206 => 'Šmarjeske Topliče',
-            207 => 'Gorje',
-            208 => 'Log-Dragomer',
-            209 => 'Rečica ob Savinji',
-            210 => 'Sveti Jurij v Slovenskih Goricah',
-            211 => 'Šentrupert',
-            212 => 'Mirna',
-            213 => 'Ankaran/Ancarano',
-        ),
-    'SK' =>
-        array (
-            'BC' => 'Banskobystrický kraj',
-            'BL' => 'Bratislavský kraj',
-            'KI' => 'Košický kraj',
-            'NI' => 'Nitriansky kraj',
-            'PV' => 'Prešovský kraj',
-            'TA' => 'Trnavský kraj',
-            'TC' => 'Trenčiansky kraj',
-            'ZI' => 'Žilinský kraj',
-        ),
-    'SL' =>
-        array (
-            'E' => 'Eastern',
-            'N' => 'Northern',
-            'S' => 'Southern (Sierra Leone)',
-            'W' => 'Western Area (Freetown)',
-        ),
-    'SM' =>
-        array (
-            '01' => 'Acquaviva',
-            '02' => 'Chiesanuova',
-            '03' => 'Domagnano',
-            '04' => 'Faetano',
-            '05' => 'Fiorentino',
-            '06' => 'Borgo Maggiore',
-            '07' => 'San Marino',
-            '08' => 'Montegiardino',
-            '09' => 'Serravalle',
-        ),
-    'SN' =>
-        array (
-            'DB' => 'Diourbel',
-            'DK' => 'Dakar',
-            'FK' => 'Fatick',
-            'KA' => 'Kaffrine',
-            'KD' => 'Kolda',
-            'KE' => 'Kédougou',
-            'KL' => 'Kaolack',
-            'LG' => 'Louga',
-            'MT' => 'Matam',
-            'SE' => 'Sédhiou',
-            'SL' => 'Saint-Louis',
-            'TC' => 'Tambacounda',
-            'TH' => 'Thiès',
-            'ZG' => 'Ziguinchor',
-        ),
-    'SO' =>
-        array (
-            'AW' => 'Awdal',
-            'BK' => 'Bakool',
-            'BN' => 'Banaadir',
-            'BR' => 'Bari',
-            'BY' => 'Bay',
-            'GA' => 'Galguduud',
-            'GE' => 'Gedo',
-            'HI' => 'Hiirsan',
-            'JD' => 'Jubbada Dhexe',
-            'JH' => 'Jubbada Hoose',
-            'MU' => 'Mudug',
-            'NU' => 'Nugaal',
-            'SA' => 'Saneag',
-            'SD' => 'Shabeellaha Dhexe',
-            'SH' => 'Shabeellaha Hoose',
-            'SO' => 'Sool',
-            'TO' => 'Togdheer',
-            'WO' => 'Woqooyi Galbeed',
-        ),
-    'SR' =>
-        array (
-            'BR' => 'Brokopondo',
-            'CM' => 'Commewijne',
-            'CR' => 'Coronie',
-            'MA' => 'Marowijne',
-            'NI' => 'Nickerie',
-            'PM' => 'Paramaribo',
-            'PR' => 'Para',
-            'SA' => 'Saramacca',
-            'SI' => 'Sipaliwini',
-            'WA' => 'Wanica',
-        ),
-    'SS' =>
-        array (
-            'BN' => 'Northern Bahr el-Ghazal',
-            'BW' => 'Western Bahr el-Ghazal',
-            'EC' => 'Central Equatoria',
-            'EE' => 'Eastern Equatoria',
-            'EW' => 'Western Equatoria',
-            'JG' => 'Jonglei',
-            'LK' => 'Lakes',
-            'NU' => 'Upper Nile',
-            'UY' => 'Unity',
-            'WR' => 'Warrap',
-        ),
-    'ST' =>
-        array (
-            'P' => 'Príncipe',
-            'S' => 'São Tomé',
-        ),
-    'SV' =>
-        array (
-            'AH' => 'Ahuachapán',
-            'CA' => 'Cabañas',
-            'CH' => 'Chalatenango',
-            'CU' => 'Cuscatlán',
-            'LI' => 'La Libertad',
-            'MO' => 'Morazán',
-            'PA' => 'La Paz',
-            'SA' => 'Santa Ana',
-            'SM' => 'San Miguel',
-            'SO' => 'Sonsonate',
-            'SS' => 'San Salvador',
-            'SV' => 'San Vicente',
-            'UN' => 'La Unión',
-            'US' => 'Usulután',
-        ),
-    'SY' =>
-        array (
-            'DI' => 'Dimashq',
-            'DR' => 'Dar\'a',
-            'DY' => 'Dayr az Zawr',
-            'HA' => 'Al Hasakah',
-            'HI' => 'Homs',
-            'HL' => 'Halab',
-            'HM' => 'Hamah',
-            'ID' => 'Idlib',
-            'LA' => 'Al Ladhiqiyah',
-            'QU' => 'Al Qunaytirah',
-            'RA' => 'Ar Raqqah',
-            'RD' => 'Rif Dimashq',
-            'SU' => 'As Suwayda\'',
-            'TA' => 'Tartus',
-        ),
-    'SZ' =>
-        array (
-            'HH' => 'Hhohho',
-            'LU' => 'Lubombo',
-            'MA' => 'Manzini',
-            'SH' => 'Shiselweni',
-        ),
-    'TD' =>
-        array (
-            'BA' => 'Al Baṭḩah',
-            'BG' => 'Baḩr al Ghazāl',
-            'BO' => 'Būrkū',
-            'CB' => 'Shārī Bāqirmī',
-            'EN' => 'Innīdī',
-            'GR' => 'Qīrā',
-            'HL' => 'Ḥajjar Lamīs',
-            'KA' => 'Kānim',
-            'LC' => 'Al Buḩayrah',
-            'LO' => 'Lūqūn al Gharbī',
-            'LR' => 'Lūqūn ash Sharqī',
-            'MA' => 'Māndūl',
-            'MC' => 'Shārī al Awsaṭ',
-            'ME' => 'Māyū Kībbī ash Sharqī',
-            'MO' => 'Māyū Kībbī al Gharbī',
-            'ND' => 'Madīnat Injamīnā',
-            'OD' => 'Waddāy',
-            'SA' => 'Salāmāt',
-            'SI' => 'Sīlā',
-            'TA' => 'Tānjilī',
-            'TI' => 'Tibastī',
-            'WF' => 'Wādī Fīrā',
-        ),
-    'TG' =>
-        array (
-            'C' => 'Région du Centre',
-            'K' => 'Région de la Kara',
-            'M' => 'Région Maritime',
-            'P' => 'Région des Plateaux',
-            'S' => 'Région des Savannes',
-        ),
-    'TH' =>
-        array (
-            10 => 'Krung Thep Maha Nakhon Bangkok',
-            11 => 'Samut Prakan',
-            12 => 'Nonthaburi',
-            13 => 'Pathum Thani',
-            14 => 'Phra Nakhon Si Ayutthaya',
-            15 => 'Ang Thong',
-            16 => 'Lop Buri',
-            17 => 'Sing Buri',
-            18 => 'Chai Nat',
-            19 => 'Saraburi',
-            20 => 'Chon Buri',
-            21 => 'Rayong',
-            22 => 'Chanthaburi',
-            23 => 'Trat',
-            24 => 'Chachoengsao',
-            25 => 'Prachin Buri',
-            26 => 'Nakhon Nayok',
-            27 => 'Sa Kaeo',
-            30 => 'Nakhon Ratchasima',
-            31 => 'Buri Ram',
-            32 => 'Surin',
-            33 => 'Si Sa Ket',
-            34 => 'Ubon Ratchathani',
-            35 => 'Yasothon',
-            36 => 'Chaiyaphum',
-            37 => 'Amnat Charoen',
-            38 => 'Bueng Kan',
-            39 => 'Nong Bua Lam Phu',
-            40 => 'Khon Kaen',
-            41 => 'Udon Thani',
-            42 => 'Loei',
-            43 => 'Nong Khai',
-            44 => 'Maha Sarakham',
-            45 => 'Roi Et',
-            46 => 'Kalasin',
-            47 => 'Sakon Nakhon',
-            48 => 'Nakhon Phanom',
-            49 => 'Mukdahan',
-            50 => 'Chiang Mai',
-            51 => 'Lamphun',
-            52 => 'Lampang',
-            53 => 'Uttaradit',
-            54 => 'Phrae',
-            55 => 'Nan',
-            56 => 'Phayao',
-            57 => 'Chiang Rai',
-            58 => 'Mae Hong Son',
-            60 => 'Nakhon Sawan',
-            61 => 'Uthai Thani',
-            62 => 'Kamphaeng Phet',
-            63 => 'Tak',
-            64 => 'Sukhothai',
-            65 => 'Phitsanulok',
-            66 => 'Phichit',
-            67 => 'Phetchabun',
-            70 => 'Ratchaburi',
-            71 => 'Kanchanaburi',
-            72 => 'Suphan Buri',
-            73 => 'Nakhon Pathom',
-            74 => 'Samut Sakhon',
-            75 => 'Samut Songkhram',
-            76 => 'Phetchaburi',
-            77 => 'Prachuap Khiri Khan',
-            80 => 'Nakhon Si Thammarat',
-            81 => 'Krabi',
-            82 => 'Phangnga',
-            83 => 'Phuket',
-            84 => 'Surat Thani',
-            85 => 'Ranong',
-            86 => 'Chumphon',
-            90 => 'Songkhla',
-            91 => 'Satun',
-            92 => 'Trang',
-            93 => 'Phatthalung',
-            94 => 'Pattani',
-            95 => 'Yala',
-            96 => 'Narathiwat',
-            'S' => 'Phatthaya',
-        ),
-    'TJ' =>
-        array (
-            'DU' => 'Dushanbe',
-            'GB' => 'Gorno-Badakhshan',
-            'KT' => 'Khatlon',
-            'RA' => 'Nohiyahoi Tobei Jumhurí',
-            'SU' => 'Sughd',
-        ),
-    'TL' =>
-        array (
-            'AL' => 'Aileu',
-            'AN' => 'Ainaro',
-            'BA' => 'Baucau',
-            'BO' => 'Bobonaro',
-            'CO' => 'Cova Lima',
-            'DI' => 'Díli',
-            'ER' => 'Ermera',
-            'LA' => 'Lautem',
-            'LI' => 'Liquiça',
-            'MF' => 'Manufahi',
-            'MT' => 'Manatuto',
-            'OE' => 'Oecussi',
-            'VI' => 'Viqueque',
-        ),
-    'TM' =>
-        array (
-            'A' => 'Ahal',
-            'B' => 'Balkan',
-            'D' => 'Daşoguz',
-            'L' => 'Lebap',
-            'M' => 'Mary',
-            'S' => 'Aşgabat',
-        ),
-    'TN' =>
-        array (
-            11 => 'Tunis',
-            12 => 'Ariana',
-            13 => 'Ben Arous',
-            14 => 'La Manouba',
-            21 => 'Nabeul',
-            22 => 'Zaghouan',
-            23 => 'Bizerte',
-            31 => 'Béja',
-            32 => 'Jendouba',
-            33 => 'Le Kef',
-            34 => 'Siliana',
-            41 => 'Kairouan',
-            42 => 'Kasserine',
-            43 => 'Sidi Bouzid',
-            51 => 'Sousse',
-            52 => 'Monastir',
-            53 => 'Mahdia',
-            61 => 'Sfax',
-            71 => 'Gafsa',
-            72 => 'Tozeur',
-            73 => 'Kebili',
-            81 => 'Gabès',
-            82 => 'Medenine',
-            83 => 'Tataouine',
-        ),
-    'TO' =>
-        array (
-            '01' => '\'Eua',
-            '02' => 'Ha\'apai',
-            '03' => 'Niuas',
-            '04' => 'Tongatapu',
-            '05' => 'Vava\'u',
-        ),
-    'TR' =>
-        array (
-            '01' => 'Adana',
-            '02' => 'Adıyaman',
-            '03' => 'Afyonkarahisar',
-            '04' => 'Ağrı',
-            '05' => 'Amasya',
-            '06' => 'Ankara',
-            '07' => 'Antalya',
-            '08' => 'Artvin',
-            '09' => 'Aydın',
-            10 => 'Balıkesir',
-            11 => 'Bilecik',
-            12 => 'Bingöl',
-            13 => 'Bitlis',
-            14 => 'Bolu',
-            15 => 'Burdur',
-            16 => 'Bursa',
-            17 => 'Çanakkale',
-            18 => 'Çankırı',
-            19 => 'Çorum',
-            20 => 'Denizli',
-            21 => 'Diyarbakır',
-            22 => 'Edirne',
-            23 => 'Elazığ',
-            24 => 'Erzincan',
-            25 => 'Erzurum',
-            26 => 'Eskişehir',
-            27 => 'Gaziantep',
-            28 => 'Giresun',
-            29 => 'Gümüşhane',
-            30 => 'Hakkâri',
-            31 => 'Hatay',
-            32 => 'Isparta',
-            33 => 'Mersin',
-            34 => 'İstanbul',
-            35 => 'İzmir',
-            36 => 'Kars',
-            37 => 'Kastamonu',
-            38 => 'Kayseri',
-            39 => 'Kırklareli',
-            40 => 'Kırşehir',
-            41 => 'Kocaeli',
-            42 => 'Konya',
-            43 => 'Kütahya',
-            44 => 'Malatya',
-            45 => 'Manisa',
-            46 => 'Kahramanmaraş',
-            47 => 'Mardin',
-            48 => 'Muğla',
-            49 => 'Muş',
-            50 => 'Nevşehir',
-            51 => 'Niğde',
-            52 => 'Ordu',
-            53 => 'Rize',
-            54 => 'Sakarya',
-            55 => 'Samsun',
-            56 => 'Siirt',
-            57 => 'Sinop',
-            58 => 'Sivas',
-            59 => 'Tekirdağ',
-            60 => 'Tokat',
-            61 => 'Trabzon',
-            62 => 'Tunceli',
-            63 => 'Şanlıurfa',
-            64 => 'Uşak',
-            65 => 'Van',
-            66 => 'Yozgat',
-            67 => 'Zonguldak',
-            68 => 'Aksaray',
-            69 => 'Bayburt',
-            70 => 'Karaman',
-            71 => 'Kırıkkale',
-            72 => 'Batman',
-            73 => 'Şırnak',
-            74 => 'Bartın',
-            75 => 'Ardahan',
-            76 => 'Iğdır',
-            77 => 'Yalova',
-            78 => 'Karabük',
-            79 => 'Kilis',
-            80 => 'Osmaniye',
-            81 => 'Düzce',
-        ),
-    'TT' =>
-        array (
-            'ARI' => 'Arima',
-            'CHA' => 'Chaguanas',
-            'CTT' => 'Couva-Tabaquite-Talparo',
-            'DMN' => 'Diego Martin',
-            'ETO' => 'Eastern Tobago',
-            'MRC' => 'Mayaro-Rio Claro',
-            'PED' => 'Penal-Debe',
-            'POS' => 'Port of Spain',
-            'PRT' => 'Princes Town',
-            'PTF' => 'Point Fortin',
-            'RCM' => 'Rio Claro-Mayaro',
-            'SFO' => 'San Fernando',
-            'SGE' => 'Sangre Grande',
-            'SIP' => 'Siparia',
-            'SJL' => 'San Juan-Laventille',
-            'TOB' => 'Tobago',
-            'TUP' => 'Tunapuna-Piarco',
-            'WTO' => 'Western Tobago',
-        ),
-    'TV' =>
-        array (
-            'FUN' => 'Funafuti',
-            'NIT' => 'Niutao',
-            'NKF' => 'Nukufetau',
-            'NKL' => 'Nukulaelae',
-            'NMA' => 'Nanumea',
-            'NMG' => 'Nanumanga',
-            'NUI' => 'Nui',
-            'VAI' => 'Vaitupu',
-        ),
-    'TW' =>
-        array (
-            'CHA' => 'Changhua',
-            'CYI' => 'Chiay City',
-            'CYQ' => 'Chiayi',
-            'HSQ' => 'Hsinchu',
-            'HSZ' => 'Hsinchui City',
-            'HUA' => 'Hualien',
-            'ILA' => 'Ilan',
-            'KEE' => 'Keelung City',
-            'KHH' => 'Kaohsiung City',
-            'KHQ' => 'Kaohsiung',
-            'MIA' => 'Miaoli',
-            'NAN' => 'Nantou',
-            'PEN' => 'Penghu',
-            'PIF' => 'Pingtung',
-            'TAO' => 'Taoyuan',
-            'TNN' => 'Tainan City',
-            'TNQ' => 'Tainan',
-            'TPE' => 'Taipei City',
-            'TPQ' => 'Taipei',
-            'TTT' => 'Taitung',
-            'TXG' => 'Taichung City',
-            'TXQ' => 'Taichung',
-            'YUN' => 'Yunlin',
-        ),
-    'TZ' =>
-        array (
-            '01' => 'Arusha',
-            '02' => 'Dar-es-Salaam',
-            '03' => 'Dodoma',
-            '04' => 'Iringa',
-            '05' => 'Kagera',
-            '06' => 'Kaskazini Pemba',
-            '07' => 'Kaskazini Unguja',
-            '08' => 'Kigoma',
-            '09' => 'Kilimanjaro',
-            10 => 'Kusini Pemba',
-            11 => 'Kusini Unguja',
-            12 => 'Lindi',
-            13 => 'Mara',
-            14 => 'Mbeya',
-            15 => 'Mjini Magharibi',
-            16 => 'Morogoro',
-            17 => 'Mtwara',
-            18 => 'Mwanza',
-            19 => 'Pwani',
-            20 => 'Rukwa',
-            21 => 'Ruvuma',
-            22 => 'Shinyanga',
-            23 => 'Singida',
-            24 => 'Tabora',
-            25 => 'Tanga',
-            26 => 'Manyara',
-        ),
-    'UA' =>
-        array (
-            '05' => 'Vinnyts\'ka Oblast\'',
-            '07' => 'Volyns\'ka Oblast\'',
-            '09' => 'Luhans\'ka Oblast\'',
-            12 => 'Dnipropetrovs\'ka Oblast\'',
-            14 => 'Donets\'ka Oblast\'',
-            18 => 'Zhytomyrs\'ka Oblast\'',
-            21 => 'Zakarpats\'ka Oblast\'',
-            23 => 'Zaporiz\'ka Oblast\'',
-            26 => 'Ivano-Frankivs\'ka Oblast\'',
-            30 => 'Kyïvs\'ka mis\'ka rada',
-            32 => 'Kyïvs\'ka Oblast\'',
-            35 => 'Kirovohrads\'ka Oblast\'',
-            40 => 'Sevastopol',
-            43 => 'Respublika Krym',
-            46 => 'L\'vivs\'ka Oblast\'',
-            48 => 'Mykolaïvs\'ka Oblast\'',
-            51 => 'Odes\'ka Oblast\'',
-            53 => 'Poltavs\'ka Oblast\'',
-            56 => 'Rivnens\'ka Oblast\'',
-            59 => 'Sums \'ka Oblast\'',
-            61 => 'Ternopil\'s\'ka Oblast\'',
-            63 => 'Kharkivs\'ka Oblast\'',
-            65 => 'Khersons\'ka Oblast\'',
-            68 => 'Khmel\'nyts\'ka Oblast\'',
-            71 => 'Cherkas\'ka Oblast\'',
-            74 => 'Chernihivs\'ka Oblast\'',
-            77 => 'Chernivets\'ka Oblast\'',
-        ),
-    'UG' =>
-        array (
-            101 => 'Kalangala',
-            102 => 'Kampala',
-            103 => 'Kiboga',
-            104 => 'Luwero',
-            105 => 'Masaka',
-            106 => 'Mpigi',
-            107 => 'Mubende',
-            108 => 'Mukono',
-            109 => 'Nakasongola',
-            110 => 'Rakai',
-            111 => 'Sembabule',
-            112 => 'Kayunga',
-            113 => 'Wakiso',
-            114 => 'Mityana',
-            115 => 'Nakaseke',
-            116 => 'Lyantonde',
-            201 => 'Bugiri',
-            202 => 'Busia',
-            203 => 'Iganga',
-            204 => 'Jinja',
-            205 => 'Kamuli',
-            206 => 'Kapchorwa',
-            207 => 'Katakwi',
-            208 => 'Kumi',
-            209 => 'Mbale',
-            210 => 'Pallisa',
-            211 => 'Soroti',
-            212 => 'Tororo',
-            213 => 'Kaberamaido',
-            214 => 'Mayuge',
-            215 => 'Sironko',
-            216 => 'Amuria',
-            217 => 'Budaka',
-            218 => 'Bukwa',
-            219 => 'Butaleja',
-            220 => 'Kaliro',
-            221 => 'Manafwa',
-            222 => 'Namutumba',
-            223 => 'Bududa',
-            224 => 'Bukedea',
-            301 => 'Adjumani',
-            302 => 'Apac',
-            303 => 'Arua',
-            304 => 'Gulu',
-            305 => 'Kitgum',
-            306 => 'Kotido',
-            307 => 'Lira',
-            308 => 'Moroto',
-            309 => 'Moyo',
-            310 => 'Nebbi',
-            311 => 'Nakapiripirit',
-            312 => 'Pader',
-            313 => 'Yumbe',
-            314 => 'Amolatar',
-            315 => 'Kaabong',
-            316 => 'Koboko',
-            317 => 'Abim',
-            318 => 'Dokolo',
-            319 => 'Amuru',
-            320 => 'Maracha',
-            321 => 'Oyam',
-            401 => 'Bundibugyo',
-            402 => 'Bushenyi',
-            403 => 'Hoima',
-            404 => 'Kabale',
-            405 => 'Kabarole',
-            406 => 'Kasese',
-            407 => 'Kibaale',
-            408 => 'Kisoro',
-            409 => 'Masindi',
-            410 => 'Mbarara',
-            411 => 'Ntungamo',
-            412 => 'Rukungiri',
-            413 => 'Kamwenge',
-            414 => 'Kanungu',
-            415 => 'Kyenjojo',
-            416 => 'Ibanda',
-            417 => 'Isingiro',
-            418 => 'Kiruhura',
-            419 => 'Buliisa',
-            'C' => 'Central',
-            'E' => 'Eastern',
-            'N' => 'Northern',
-            'W' => 'Western',
-        ),
-    'UM' =>
-        array (
-            67 => 'Johnston Atoll',
-            71 => 'Midway Islands',
-            76 => 'Navassa Island',
-            79 => 'Wake Island',
-            81 => 'Baker Island',
-            84 => 'Howland Island',
-            86 => 'Jarvis Island',
-            89 => 'Kingman Reef',
-            95 => 'Palmyra Atoll',
-        ),
-    'US' =>
-        array (
-            'AK' => 'Alaska',
-            'AL' => 'Alabama',
-            'AR' => 'Arkansas',
-            'AS' => 'American Samoa',
-            'AZ' => 'Arizona',
-            'CA' => 'California',
-            'CO' => 'Colorado',
-            'CT' => 'Connecticut',
-            'DC' => 'District of Columbia',
-            'DE' => 'Delaware',
-            'FL' => 'Florida',
-            'GA' => 'Georgia',
-            'GU' => 'Guam',
-            'HI' => 'Hawaii',
-            'IA' => 'Iowa',
-            'ID' => 'Idaho',
-            'IL' => 'Illinois',
-            'IN' => 'Indiana',
-            'KS' => 'Kansas',
-            'KY' => 'Kentucky',
-            'LA' => 'Louisiana',
-            'MA' => 'Massachusetts',
-            'MD' => 'Maryland',
-            'ME' => 'Maine',
-            'MI' => 'Michigan',
-            'MN' => 'Minnesota',
-            'MO' => 'Missouri',
-            'MP' => 'Northern Mariana Islands',
-            'MS' => 'Mississippi',
-            'MT' => 'Montana',
-            'NC' => 'North Carolina',
-            'ND' => 'North Dakota',
-            'NE' => 'Nebraska',
-            'NH' => 'New Hampshire',
-            'NJ' => 'New Jersey',
-            'NM' => 'New Mexico',
-            'NV' => 'Nevada',
-            'NY' => 'New York',
-            'OH' => 'Ohio',
-            'OK' => 'Oklahoma',
-            'OR' => 'Oregon',
-            'PA' => 'Pennsylvania',
-            'PR' => 'Puerto Rico',
-            'RI' => 'Rhode Island',
-            'SC' => 'South Carolina',
-            'SD' => 'South Dakota',
-            'TN' => 'Tennessee',
-            'TX' => 'Texas',
-            'UM' => 'United States Minor Outlying Islands',
-            'UT' => 'Utah',
-            'VA' => 'Virginia',
-            'VI' => 'Virgin Islands',
-            'VT' => 'Vermont',
-            'WA' => 'Washington',
-            'WI' => 'Wisconsin',
-            'WV' => 'West Virginia',
-            'WY' => 'Wyoming',
-        ),
-    'UY' =>
-        array (
-            'AR' => 'Artigas',
-            'CA' => 'Canelones',
-            'CL' => 'Cerro Largo',
-            'CO' => 'Colonia',
-            'DU' => 'Durazno',
-            'FD' => 'Florida',
-            'FS' => 'Flores',
-            'LA' => 'Lavalleja',
-            'MA' => 'Maldonado',
-            'MO' => 'Montevideo',
-            'PA' => 'Paysandú',
-            'RN' => 'Río Negro',
-            'RO' => 'Rocha',
-            'RV' => 'Rivera',
-            'SA' => 'Salto',
-            'SJ' => 'San José',
-            'SO' => 'Soriano',
-            'TA' => 'Tacuarembó',
-            'TT' => 'Treinta y Tres',
-        ),
-    'UZ' =>
-        array (
-            'AN' => 'Andijon',
-            'BU' => 'Buxoro',
-            'FA' => 'Farg\'ona',
-            'JI' => 'Jizzax',
-            'NG' => 'Namangan',
-            'NW' => 'Navoiy',
-            'QA' => 'Qashqadaryo',
-            'QR' => 'Qoraqalpog\'iston Respublikasi',
-            'SA' => 'Samarqand',
-            'SI' => 'Sirdaryo',
-            'SU' => 'Surxondaryo',
-            'TK' => 'Toshkent',
-            'TO' => 'Toshkent',
-            'XO' => 'Xorazm',
-        ),
-    'VC' =>
-        array (
-            '01' => 'Charlotte',
-            '02' => 'Saint Andrew',
-            '03' => 'Saint David',
-            '04' => 'Saint George',
-            '05' => 'Saint Patrick',
-            '06' => 'Grenadines',
-        ),
-    'VE' =>
-        array (
-            'A' => 'Distrito Federal',
-            'B' => 'Anzoátegui',
-            'C' => 'Apure',
-            'D' => 'Aragua',
-            'E' => 'Barinas',
-            'F' => 'Bolívar',
-            'G' => 'Carabobo',
-            'H' => 'Cojedes',
-            'I' => 'Falcón',
-            'J' => 'Guárico',
-            'K' => 'Lara',
-            'L' => 'Mérida',
-            'M' => 'Miranda',
-            'N' => 'Monagas',
-            'O' => 'Nueva Esparta',
-            'P' => 'Portuguesa',
-            'R' => 'Sucre',
-            'S' => 'Táchira',
-            'T' => 'Trujillo',
-            'U' => 'Yaracuy',
-            'V' => 'Zulia',
-            'W' => 'Dependencias Federales',
-            'X' => 'Vargas',
-            'Y' => 'Delta Amacuro',
-            'Z' => 'Amazonas',
-        ),
-    'VN' =>
-        array (
-            '01' => 'Lai Châu',
-            '02' => 'Lào Cai',
-            '03' => 'Hà Giang',
-            '04' => 'Cao Bằng',
-            '05' => 'Sơn La',
-            '06' => 'Yên Bái',
-            '07' => 'Tuyên Quang',
-            '09' => 'Lạng Sơn',
-            13 => 'Quảng Ninh',
-            14 => 'Hoà Bình',
-            15 => 'Hà Tây',
-            18 => 'Ninh Bình',
-            20 => 'Thái Bình',
-            21 => 'Thanh Hóa',
-            22 => 'Nghệ An',
-            23 => 'Hà Tỉnh',
-            24 => 'Quảng Bình',
-            25 => 'Quảng Trị',
-            26 => 'Thừa Thiên-Huế',
-            27 => 'Quảng Nam',
-            28 => 'Kon Tum',
-            29 => 'Quảng Ngãi',
-            30 => 'Gia Lai',
-            31 => 'Bình Định',
-            32 => 'Phú Yên',
-            33 => 'Đắc Lắk',
-            34 => 'Khánh Hòa',
-            35 => 'Lâm Đồng',
-            36 => 'Ninh Thuận',
-            37 => 'Tây Ninh',
-            39 => 'Đồng Nai',
-            40 => 'Bình Thuận',
-            41 => 'Long An',
-            43 => 'Bà Rịa-Vũng Tàu',
-            44 => 'An Giang',
-            45 => 'Đồng Tháp',
-            46 => 'Tiền Giang',
-            47 => 'Kiên Giang',
-            49 => 'Vĩnh Long',
-            50 => 'Bến Tre',
-            51 => 'Trà Vinh',
-            52 => 'Sóc Trăng',
-            53 => 'Bắc Kạn',
-            54 => 'Bắc Giang',
-            55 => 'Bạc Liêu',
-            56 => 'Bắc Ninh',
-            57 => 'Bình Dương',
-            58 => 'Bình Phước',
-            59 => 'Cà Mau',
-            61 => 'Hải Duong',
-            63 => 'Hà Nam',
-            66 => 'Hưng Yên',
-            67 => 'Nam Định',
-            68 => 'Phú Thọ',
-            69 => 'Thái Nguyên',
-            70 => 'Vĩnh Phúc',
-            71 => 'Điện Biên',
-            72 => 'Đắk Nông',
-            73 => 'Hậu Giang',
-            'CT' => 'Cần Thơ',
-            'DN' => 'Đà Nẵng',
-            'HN' => 'Hà Nội',
-            'HP' => 'Hải Phòng',
-            'SG' => 'Hồ Chí Minh [Sài Gòn]',
-        ),
-    'VU' =>
-        array (
-            'MAP' => 'Malampa',
-            'PAM' => 'Pénama',
-            'SAM' => 'Sanma',
-            'SEE' => 'Shéfa',
-            'TAE' => 'Taféa',
-            'TOB' => 'Torba',
-        ),
-    'WS' =>
-        array (
-            'AA' => 'A\'ana',
-            'AL' => 'Aiga-i-le-Tai',
-            'AT' => 'Atua',
-            'FA' => 'Fa\'asaleleaga',
-            'GE' => 'Gaga\'emauga',
-            'GI' => 'Gagaifomauga',
-            'PA' => 'Palauli',
-            'SA' => 'Satupa\'itea',
-            'TU' => 'Tuamasaga',
-            'VF' => 'Va\'a-o-Fonoti',
-            'VS' => 'Vaisigano',
-        ),
-    'YE' =>
-        array (
-            'AB' => 'Abyān',
-            'AD' => '\'Adan',
-            'AM' => '\'Amrān',
-            'BA' => 'Al Bayḑā\'',
-            'DA' => 'Aḑ Ḑāli‘',
-            'DH' => 'Dhamār',
-            'HD' => 'Ḩaḑramawt',
-            'HJ' => 'Ḩajjah',
-            'HU' => 'Al Ḩudaydah',
-            'IB' => 'Ibb',
-            'JA' => 'Al Jawf',
-            'LA' => 'Laḩij',
-            'MA' => 'Ma\'rib',
-            'MR' => 'Al Mahrah',
-            'MU' => 'Al Ḩudaydah',
-            'MW' => 'Al Maḩwīt',
-            'RA' => 'Raymah',
-            'SD' => 'Şa\'dah',
-            'SH' => 'Shabwah',
-            'SN' => 'Şan\'ā\'',
-            'TA' => 'Tā\'izz',
-        ),
-    'ZA' =>
-        array (
-            'EC' => 'Eastern Cape',
-            'FS' => 'Free State',
-            'GT' => 'Gauteng',
-            'LP' => 'Limpopo',
-            'MP' => 'Mpumalanga',
-            'NC' => 'Northern Cape',
-            'NL' => 'Kwazulu-Natal',
-            'NW' => 'North-West (South Africa)',
-            'WC' => 'Western Cape',
-            'ZN' => 'Kwazulu-Natal',
-        ),
-    'ZM' =>
-        array (
-            '01' => 'Western',
-            '02' => 'Central',
-            '03' => 'Eastern',
-            '04' => 'Luapula',
-            '05' => 'Northern',
-            '06' => 'North-Western',
-            '07' => 'Southern (Zambia)',
-            '08' => 'Copperbelt',
-            '09' => 'Lusaka',
-        ),
-    'ZW' =>
-        array (
-            'BU' => 'Bulawayo',
-            'HA' => 'Harare',
-            'MA' => 'Manicaland',
-            'MC' => 'Mashonaland Central',
-            'ME' => 'Mashonaland East',
-            'MI' => 'Midlands',
-            'MN' => 'Matabeleland North',
-            'MS' => 'Matabeleland South',
-            'MV' => 'Masvingo',
-            'MW' => 'Mashonaland West',
-        ),
+  'AD' => 
+  array (
+    '02' => 'Canillo',
+    '03' => 'Encamp',
+    '04' => 'La Massana',
+    '05' => 'Ordino',
+    '06' => 'Sant Julià de Lòria',
+    '07' => 'Andorra la Vella',
+    '08' => 'Escaldes-Engordany',
+  ),
+  'AE' => 
+  array (
+    'AJ' => '\'Ajmān',
+    'AZ' => 'Abū Ȥaby [Abu Dhabi]',
+    'DU' => 'Dubayy',
+    'FU' => 'Al Fujayrah',
+    'RK' => 'Ra’s al Khaymah',
+    'SH' => 'Ash Shāriqah',
+    'UQ' => 'Umm al Qaywayn',
+  ),
+  'AF' => 
+  array (
+    'BAL' => 'Balkh',
+    'BAM' => 'Bāmyān',
+    'BDG' => 'Bādghīs',
+    'BDS' => 'Badakhshān',
+    'BGL' => 'Baghlān',
+    'DAY' => 'Dāykundī',
+    'FRA' => 'Farāh',
+    'FYB' => 'Fāryāb',
+    'GHA' => 'Ghaznī',
+    'GHO' => 'Ghōr',
+    'HEL' => 'Helmand',
+    'HER' => 'Herāt',
+    'JOW' => 'Jowzjān',
+    'KAB' => 'Kābul',
+    'KAN' => 'Kandahār',
+    'KAP' => 'Kāpīsā',
+    'KDZ' => 'Kunduz',
+    'KHO' => 'Khōst',
+    'KNR' => 'Kunar',
+    'LAG' => 'Laghmān',
+    'LOG' => 'Lōgar',
+    'NAN' => 'Nangarhār',
+    'NIM' => 'Nīmrōz',
+    'NUR' => 'Nūristān',
+    'PAN' => 'Panjshayr',
+    'PAR' => 'Parwān',
+    'PIA' => 'Paktiyā',
+    'PKA' => 'Paktīkā',
+    'SAM' => 'Samangān',
+    'SAR' => 'Sar-e Pul',
+    'TAK' => 'Takhār',
+    'URU' => 'Uruzgān',
+    'WAR' => 'Wardak',
+    'ZAB' => 'Zābul',
+  ),
+  'AG' => 
+  array (
+    '03' => 'Saint George',
+    '04' => 'Saint John',
+    '05' => 'Saint Mary',
+    '06' => 'Saint Paul',
+    '07' => 'Saint Peter',
+    '08' => 'Saint Philip',
+    10 => 'Barbuda',
+    11 => 'Redonda',
+  ),
+  'AL' => 
+  array (
+    '01' => 'Berat',
+    '02' => 'Durrës',
+    '03' => 'Elbasan',
+    '04' => 'Fier',
+    '05' => 'Gjirokastër',
+    '06' => 'Korçë',
+    '07' => 'Kukës',
+    '08' => 'Lezhë',
+    '09' => 'Dibër',
+    10 => 'Shkodër',
+    11 => 'Tiranë',
+    12 => 'Vlorë',
+    'BR' => 'Berat',
+    'BU' => 'Bulqizë',
+    'DI' => 'Dibër',
+    'DL' => 'Delvinë',
+    'DR' => 'Durrës',
+    'DV' => 'Devoll',
+    'EL' => 'Elbasan',
+    'ER' => 'Kolonjë',
+    'FR' => 'Fier',
+    'GJ' => 'Gjirokastër',
+    'GR' => 'Gramsh',
+    'HA' => 'Has',
+    'KA' => 'Kavajë',
+    'KB' => 'Kurbin',
+    'KC' => 'Kuçovë',
+    'KO' => 'Korçë',
+    'KR' => 'Krujë',
+    'KU' => 'Kukës',
+    'LB' => 'Librazhd',
+    'LE' => 'Lezhë',
+    'LU' => 'Lushnjë',
+    'MK' => 'Mallakastër',
+    'MM' => 'Malësi e Madhe',
+    'MR' => 'Mirditë',
+    'MT' => 'Mat',
+    'PG' => 'Pogradec',
+    'PQ' => 'Peqin',
+    'PR' => 'Përmet',
+    'PU' => 'Pukë',
+    'SH' => 'Shkodër',
+    'SK' => 'Skrapar',
+    'SR' => 'Sarandë',
+    'TE' => 'Tepelenë',
+    'TP' => 'Tropojë',
+    'TR' => 'Tiranë',
+    'VL' => 'Vlorë',
+  ),
+  'AM' => 
+  array (
+    'AG' => 'Aragacotn',
+    'AR' => 'Ararat',
+    'AV' => 'Armavir',
+    'ER' => 'Erevan',
+    'GR' => 'Gegarkunik\'',
+    'KT' => 'Kotayk\'',
+    'LO' => 'Lory',
+    'SH' => 'Sirak',
+    'SU' => 'Syunik\'',
+    'TV' => 'Tavus',
+    'VD' => 'Vayoc Jor',
+  ),
+  'AO' => 
+  array (
+    'BGO' => 'Bengo',
+    'BGU' => 'Benguela',
+    'BIE' => 'Bié',
+    'CAB' => 'Cabinda',
+    'CCU' => 'Cuando-Cubango',
+    'CNN' => 'Cunene',
+    'CNO' => 'Cuanza Norte',
+    'CUS' => 'Cuanza Sul',
+    'HUA' => 'Huambo',
+    'HUI' => 'Huíla',
+    'LNO' => 'Lunda Norte',
+    'LSU' => 'Lunda Sul',
+    'LUA' => 'Luanda',
+    'MAL' => 'Malange',
+    'MOX' => 'Moxico',
+    'NAM' => 'Namibe',
+    'UIG' => 'Uíge',
+    'ZAI' => 'Zaire',
+  ),
+  'AR' => 
+  array (
+    'A' => 'Salta',
+    'B' => 'Buenos Aires',
+    'C' => 'Ciudad Autónoma de Buenos Aires',
+    'D' => 'San Luis',
+    'E' => 'Entre Rios',
+    'F' => 'La Rioja',
+    'G' => 'Santiago del Estero',
+    'H' => 'Chaco',
+    'J' => 'San Juan',
+    'K' => 'Catamarca',
+    'L' => 'La Pampa',
+    'M' => 'Mendoza',
+    'N' => 'Misiones',
+    'P' => 'Formosa',
+    'Q' => 'Neuquen',
+    'R' => 'Rio Negro',
+    'S' => 'Santa Fe',
+    'T' => 'Tucuman',
+    'U' => 'Chubut',
+    'V' => 'Tierra del Fuego',
+    'W' => 'Corrientes',
+    'X' => 'Cordoba',
+    'Y' => 'Jujuy',
+    'Z' => 'Santa Cruz',
+  ),
+  'AT' => 
+  array (
+    1 => 'Burgenland',
+    2 => 'Kärnten',
+    3 => 'Niederösterreich',
+    4 => 'Oberösterreich',
+    5 => 'Salzburg',
+    6 => 'Steiermark',
+    7 => 'Tirol',
+    8 => 'Vorarlberg',
+    9 => 'Wien',
+  ),
+  'AU' => 
+  array (
+    'ACT' => 'Australian Capital Territory',
+    'NSW' => 'New South Wales',
+    'NT' => 'Northern Territory',
+    'QLD' => 'Queensland',
+    'SA' => 'South Australia',
+    'TAS' => 'Tasmania',
+    'VIC' => 'Victoria',
+    'WA' => 'Western Australia',
+  ),
+  'AZ' => 
+  array (
+    'ABS' => 'Abşeron',
+    'AGA' => 'Ağstafa',
+    'AGC' => 'Ağcabədi',
+    'AGM' => 'Ağdam',
+    'AGS' => 'Ağdaş',
+    'AGU' => 'Ağsu',
+    'AST' => 'Astara',
+    'BA' => 'Bakı',
+    'BAB' => 'Babək',
+    'BAL' => 'Balakən',
+    'BAR' => 'Bərdə',
+    'BEY' => 'Beyləqan',
+    'BIL' => 'Biləsuvar',
+    'CAB' => 'Cəbrayıl',
+    'CAL' => 'Cəlilabab',
+    'CUL' => 'Culfa',
+    'DAS' => 'Daşkəsən',
+    'FUZ' => 'Füzuli',
+    'GA' => 'Gəncə',
+    'GAD' => 'Gədəbəy',
+    'GOR' => 'Goranboy',
+    'GOY' => 'Göyçay',
+    'GYG' => 'Göygöl',
+    'HAC' => 'Hacıqabul',
+    'IMI' => 'İmişli',
+    'ISM' => 'İsmayıllı',
+    'KAL' => 'Kəlbəcər',
+    'KAN' => 'Kǝngǝrli',
+    'KUR' => 'Kürdəmir',
+    'LA' => 'Lənkəran',
+    'LAC' => 'Laçın',
+    'LAN' => 'Lənkəran',
+    'LER' => 'Lerik',
+    'MAS' => 'Masallı',
+    'MI' => 'Mingəçevir',
+    'NA' => 'Naftalan',
+    'NEF' => 'Neftçala',
+    'NV' => 'Naxçıvan',
+    'NX' => 'Naxçıvan',
+    'OGU' => 'Oğuz',
+    'ORD' => 'Ordubad',
+    'QAB' => 'Qəbələ',
+    'QAX' => 'Qax',
+    'QAZ' => 'Qazax',
+    'QBA' => 'Quba',
+    'QBI' => 'Qubadlı',
+    'QOB' => 'Qobustan',
+    'QUS' => 'Qusar',
+    'SA' => 'Şəki',
+    'SAB' => 'Sabirabad',
+    'SAD' => 'Sədərək',
+    'SAH' => 'Şahbuz',
+    'SAK' => 'Şəki',
+    'SAL' => 'Salyan',
+    'SAR' => 'Şərur',
+    'SAT' => 'Saatlı',
+    'SBN' => 'Şabran',
+    'SIY' => 'Siyəzən',
+    'SKR' => 'Şəmkir',
+    'SM' => 'Sumqayıt',
+    'SMI' => 'Şamaxı',
+    'SMX' => 'Samux',
+    'SR' => 'Şirvan',
+    'SUS' => 'Şuşa',
+    'TAR' => 'Tərtər',
+    'TOV' => 'Tovuz',
+    'UCA' => 'Ucar',
+    'XA' => 'Xankəndi',
+    'XAC' => 'Xaçmaz',
+    'XCI' => 'Xocalı',
+    'XIZ' => 'Xızı',
+    'XVD' => 'Xocavənd',
+    'YAR' => 'Yardımlı',
+    'YE' => 'Yevlax',
+    'YEV' => 'Yevlax',
+    'ZAN' => 'Zəngilan',
+    'ZAQ' => 'Zaqatala',
+    'ZAR' => 'Zərdab',
+  ),
+  'BA' => 
+  array (
+    '01' => 'Unsko-sanski kanton',
+    '02' => 'Posavski kanton',
+    '03' => 'Tuzlanski kanton',
+    '04' => 'Zeničko-dobojski kanton',
+    '05' => 'Bosansko-podrinjski kanton',
+    '06' => 'Srednjobosanski kanton',
+    '07' => 'Hercegovačko-neretvanski kanton',
+    '08' => 'Zapadnohercegovački kanton',
+    '09' => 'Kanton Sarajevo',
+    10 => 'Kanton br. 10 (Livanjski kanton)',
+    'BIH' => 'Federacija Bosne i Hercegovine',
+    'BRC' => 'Brčko distrikt',
+    'SRP' => 'Republika Srpska',
+  ),
+  'BB' => 
+  array (
+    '01' => 'Christ Church',
+    '02' => 'Saint Andrew',
+    '03' => 'Saint George',
+    '04' => 'Saint James',
+    '05' => 'Saint John',
+    '06' => 'Saint Joseph',
+    '07' => 'Saint Lucy',
+    '08' => 'Saint Michael',
+    '09' => 'Saint Peter',
+    10 => 'Saint Philip',
+    11 => 'Saint Thomas',
+  ),
+  'BD' => 
+  array (
+    '01' => 'Bandarban',
+    '02' => 'Barguna',
+    '03' => 'Bogra',
+    '04' => 'Brahmanbaria',
+    '05' => 'Bagerhat',
+    '06' => 'Barisal',
+    '07' => 'Bhola',
+    '08' => 'Comilla',
+    '09' => 'Chandpur',
+    10 => 'Chittagong',
+    11 => 'Cox\'s Bazar',
+    12 => 'Chuadanga',
+    13 => 'Dhaka',
+    14 => 'Dinajpur',
+    15 => 'Faridpur',
+    16 => 'Feni',
+    17 => 'Gopalganj',
+    18 => 'Gazipur',
+    19 => 'Gaibandha',
+    20 => 'Habiganj',
+    21 => 'Jamalpur',
+    22 => 'Jessore',
+    23 => 'Jhenaidah',
+    24 => 'Jaipurhat',
+    25 => 'Jhalakati',
+    26 => 'Kishorganj',
+    27 => 'Khulna',
+    28 => 'Kurigram',
+    29 => 'Khagrachari',
+    30 => 'Kushtia',
+    31 => 'Lakshmipur',
+    32 => 'Lalmonirhat',
+    33 => 'Manikganj',
+    34 => 'Mymensingh',
+    35 => 'Munshiganj',
+    36 => 'Madaripur',
+    37 => 'Magura',
+    38 => 'Moulvibazar',
+    39 => 'Meherpur',
+    40 => 'Narayanganj',
+    41 => 'Netrakona',
+    42 => 'Narsingdi',
+    43 => 'Narail',
+    44 => 'Natore',
+    45 => 'Nawabganj',
+    46 => 'Nilphamari',
+    47 => 'Noakhali',
+    48 => 'Naogaon',
+    49 => 'Pabna',
+    50 => 'Pirojpur',
+    51 => 'Patuakhali',
+    52 => 'Panchagarh',
+    53 => 'Rajbari',
+    54 => 'Rajshahi',
+    55 => 'Rangpur',
+    56 => 'Rangamati',
+    57 => 'Sherpur',
+    58 => 'Satkhira',
+    59 => 'Sirajganj',
+    60 => 'Sylhet',
+    61 => 'Sunamganj',
+    62 => 'Shariatpur',
+    63 => 'Tangail',
+    64 => 'Thakurgaon',
+    'A' => 'Barisal',
+    'B' => 'Chittagong',
+    'C' => 'Dhaka',
+    'D' => 'Khulna',
+    'E' => 'Rajshahi',
+    'F' => 'Rangpur',
+    'G' => 'Sylhet',
+  ),
+  'BE' => 
+  array (
+    'BRU' => 'Bruxelles-Capitale, Région de;Brussels Hoofdstedelijk Gewest',
+    'VAN' => 'Antwerpen',
+    'VBR' => 'Vlaams-Brabant',
+    'VLG' => 'Vlaams Gewest',
+    'VLI' => 'Limburg',
+    'VOV' => 'Oost-Vlaanderen',
+    'VWV' => 'West-Vlaanderen',
+    'WAL' => 'wallonne, Région',
+    'WBR' => 'Brabant wallon',
+    'WHT' => 'Hainaut',
+    'WLG' => 'Liège',
+    'WLX' => 'Luxembourg',
+    'WNA' => 'Namur',
+  ),
+  'BF' => 
+  array (
+    '01' => 'Boucle du Mouhoun',
+    '02' => 'Cascades',
+    '03' => 'Centre',
+    '04' => 'Centre-Est',
+    '05' => 'Centre-Nord',
+    '06' => 'Centre-Ouest',
+    '07' => 'Centre-Sud',
+    '08' => 'Est',
+    '09' => 'Hauts-Bassins',
+    10 => 'Nord',
+    11 => 'Plateau-Central',
+    12 => 'Sahel',
+    13 => 'Sud-Ouest',
+    'BAL' => 'Balé',
+    'BAM' => 'Bam',
+    'BAN' => 'Banwa',
+    'BAZ' => 'Bazèga',
+    'BGR' => 'Bougouriba',
+    'BLG' => 'Boulgou',
+    'BLK' => 'Boulkiemdé',
+    'COM' => 'Comoé',
+    'GAN' => 'Ganzourgou',
+    'GNA' => 'Gnagna',
+    'GOU' => 'Gourma',
+    'HOU' => 'Houet',
+    'IOB' => 'Ioba',
+    'KAD' => 'Kadiogo',
+    'KEN' => 'Kénédougou',
+    'KMD' => 'Komondjari',
+    'KMP' => 'Kompienga',
+    'KOP' => 'Koulpélogo',
+    'KOS' => 'Kossi',
+    'KOT' => 'Kouritenga',
+    'KOW' => 'Kourwéogo',
+    'LER' => 'Léraba',
+    'LOR' => 'Loroum',
+    'MOU' => 'Mouhoun',
+    'NAM' => 'Namentenga',
+    'NAO' => 'Naouri',
+    'NAY' => 'Nayala',
+    'NOU' => 'Noumbiel',
+    'OUB' => 'Oubritenga',
+    'OUD' => 'Oudalan',
+    'PAS' => 'Passoré',
+    'PON' => 'Poni',
+    'SEN' => 'Séno',
+    'SIS' => 'Sissili',
+    'SMT' => 'Sanmatenga',
+    'SNG' => 'Sanguié',
+    'SOM' => 'Soum',
+    'SOR' => 'Sourou',
+    'TAP' => 'Tapoa',
+    'TUI' => 'Tui',
+    'YAG' => 'Yagha',
+    'YAT' => 'Yatenga',
+    'ZIR' => 'Ziro',
+    'ZON' => 'Zondoma',
+    'ZOU' => 'Zoundwéogo',
+  ),
+  'BG' => 
+  array (
+    '01' => 'Blagoevgrad',
+    '02' => 'Burgas',
+    '03' => 'Varna',
+    '04' => 'Veliko Tarnovo',
+    '05' => 'Vidin',
+    '06' => 'Vratsa',
+    '07' => 'Gabrovo',
+    '08' => 'Dobrich',
+    '09' => 'Kardzhali',
+    10 => 'Kyustendil',
+    11 => 'Lovech',
+    12 => 'Montana',
+    13 => 'Pazardzhik',
+    14 => 'Pernik',
+    15 => 'Pleven',
+    16 => 'Plovdiv',
+    17 => 'Razgrad',
+    18 => 'Ruse',
+    19 => 'Silistra',
+    20 => 'Sliven',
+    21 => 'Smolyan',
+    22 => 'Sofia-Grad',
+    23 => 'Sofia',
+    24 => 'Stara Zagora',
+    25 => 'Targovishte',
+    26 => 'Haskovo',
+    27 => 'Shumen',
+    28 => 'Yambol',
+  ),
+  'BH' => 
+  array (
+    13 => 'Al Manāmah (Al ‘Āşimah)',
+    14 => 'Al Janūbīyah',
+    15 => 'Al Muḩarraq',
+    16 => 'Al Wusţá',
+    17 => 'Ash Shamālīyah',
+  ),
+  'BI' => 
+  array (
+    'BB' => 'Bubanza',
+    'BL' => 'Bujumbura Rural',
+    'BM' => 'Bujumbura Mairie',
+    'BR' => 'Bururi',
+    'CA' => 'Cankuzo',
+    'CI' => 'Cibitoke',
+    'GI' => 'Gitega',
+    'KI' => 'Kirundo',
+    'KR' => 'Karuzi',
+    'KY' => 'Kayanza',
+    'MA' => 'Makamba',
+    'MU' => 'Muramvya',
+    'MW' => 'Mwaro',
+    'MY' => 'Muyinga',
+    'NG' => 'Ngozi',
+    'RT' => 'Rutana',
+    'RY' => 'Ruyigi',
+  ),
+  'BJ' => 
+  array (
+    'AK' => 'Atakora',
+    'AL' => 'Alibori',
+    'AQ' => 'Atlantique',
+    'BO' => 'Borgou',
+    'CO' => 'Collines',
+    'DO' => 'Donga',
+    'KO' => 'Kouffo',
+    'LI' => 'Littoral',
+    'MO' => 'Mono',
+    'OU' => 'Ouémé',
+    'PL' => 'Plateau',
+    'ZO' => 'Zou',
+  ),
+  'BN' => 
+  array (
+    'BE' => 'Belait',
+    'BM' => 'Brunei-Muara',
+    'TE' => 'Temburong',
+    'TU' => 'Tutong',
+  ),
+  'BO' => 
+  array (
+    'B' => 'El Beni',
+    'C' => 'Cochabamba',
+    'H' => 'Chuquisaca',
+    'L' => 'La Paz',
+    'N' => 'Pando',
+    'O' => 'Oruro',
+    'P' => 'Potosí',
+    'S' => 'Santa Cruz',
+    'T' => 'Tarija',
+  ),
+  'BQ' => 
+  array (
+    'BO' => 'Bonaire',
+    'SA' => 'Saba',
+    'SE' => 'Sint Eustatius',
+  ),
+  'BR' => 
+  array (
+    'AC' => 'Acre',
+    'AL' => 'Alagoas',
+    'AM' => 'Amazonas',
+    'AP' => 'Amapá',
+    'BA' => 'Bahia',
+    'CE' => 'Ceará',
+    'DF' => 'Distrito Federal',
+    'ES' => 'Espírito Santo',
+    'FN' => 'Fernando de Noronha',
+    'GO' => 'Goiás',
+    'MA' => 'Maranhão',
+    'MG' => 'Minas Gerais',
+    'MS' => 'Mato Grosso do Sul',
+    'MT' => 'Mato Grosso',
+    'PA' => 'Pará',
+    'PB' => 'Paraíba',
+    'PE' => 'Pernambuco',
+    'PI' => 'Piauí',
+    'PR' => 'Paraná',
+    'RJ' => 'Rio de Janeiro',
+    'RN' => 'Rio Grande do Norte',
+    'RO' => 'Rondônia',
+    'RR' => 'Roraima',
+    'RS' => 'Rio Grande do Sul',
+    'SC' => 'Santa Catarina',
+    'SE' => 'Sergipe',
+    'SP' => 'São Paulo',
+    'TO' => 'Tocantins',
+  ),
+  'BS' => 
+  array (
+    'AK' => 'Acklins',
+    'BI' => 'Bimini',
+    'BP' => 'Black Point',
+    'BY' => 'Berry Islands',
+    'CE' => 'Central Eleuthera',
+    'CI' => 'Cat Island',
+    'CK' => 'Crooked Island and Long Cay',
+    'CO' => 'Central Abaco',
+    'CS' => 'Central Andros',
+    'EG' => 'East Grand Bahama',
+    'EX' => 'Exuma',
+    'FP' => 'City of Freeport',
+    'GC' => 'Grand Cay',
+    'HI' => 'Harbour Island',
+    'HT' => 'Hope Town',
+    'IN' => 'Inagua',
+    'LI' => 'Long Island',
+    'MC' => 'Mangrove Cay',
+    'MG' => 'Mayaguana',
+    'MI' => 'Moore\'s Island',
+    'NE' => 'North Eleuthera',
+    'NO' => 'North Abaco',
+    'NS' => 'North Andros',
+    'RC' => 'Rum Cay',
+    'RI' => 'Ragged Island',
+    'SA' => 'South Andros',
+    'SE' => 'South Eleuthera',
+    'SO' => 'South Abaco',
+    'SS' => 'San Salvador',
+    'SW' => 'Spanish Wells',
+    'WG' => 'West Grand Bahama',
+  ),
+  'BT' => 
+  array (
+    11 => 'Paro',
+    12 => 'Chhukha',
+    13 => 'Ha',
+    14 => 'Samtee',
+    15 => 'Thimphu',
+    21 => 'Tsirang',
+    22 => 'Dagana',
+    23 => 'Punakha',
+    24 => 'Wangdue Phodrang',
+    31 => 'Sarpang',
+    32 => 'Trongsa',
+    33 => 'Bumthang',
+    34 => 'Zhemgang',
+    41 => 'Trashigang',
+    42 => 'Monggar',
+    43 => 'Pemagatshel',
+    44 => 'Lhuentse',
+    45 => 'Samdrup Jongkha',
+    'GA' => 'Gasa',
+    'TY' => 'Trashi Yangtse',
+  ),
+  'BW' => 
+  array (
+    'CE' => 'Central',
+    'GH' => 'Ghanzi',
+    'KG' => 'Kgalagadi',
+    'KL' => 'Kgatleng',
+    'KW' => 'Kweneng',
+    'NE' => 'North-East',
+    'NW' => 'North-West',
+    'SE' => 'South-East',
+    'SO' => 'Southern',
+  ),
+  'BY' => 
+  array (
+    'BR' => 'Brèsckaja voblasc\'',
+    'HM' => 'Horad Minsk',
+    'HO' => 'Homel\'skaja voblasc\'',
+    'HR' => 'Hrodzenskaja voblasc\'',
+    'MA' => 'Mahilëuskaja voblasc\'',
+    'MI' => 'Minskaja voblasc\'',
+    'VI' => 'Vicebskaja voblasc\'',
+  ),
+  'BZ' => 
+  array (
+    'BZ' => 'Belize',
+    'CY' => 'Cayo',
+    'CZL' => 'Corozal',
+    'OW' => 'Orange Walk',
+    'SC' => 'Stann Creek',
+    'TOL' => 'Toledo',
+  ),
+  'CA' => 
+  array (
+    'AB' => 'Alberta',
+    'BC' => 'British Columbia',
+    'MB' => 'Manitoba',
+    'NB' => 'New Brunswick',
+    'NL' => 'Newfoundland and Labrador',
+    'NS' => 'Nova Scotia',
+    'NT' => 'Northwest Territories',
+    'NU' => 'Nunavut',
+    'ON' => 'Ontario',
+    'PE' => 'Prince Edward Island',
+    'QC' => 'Quebec',
+    'SK' => 'Saskatchewan',
+    'YT' => 'Yukon Territory',
+  ),
+  'CD' => 
+  array (
+    'BC' => 'Bas-Congo',
+    'BN' => 'Bandundu',
+    'EQ' => 'Équateur',
+    'KA' => 'Katanga',
+    'KE' => 'Kasai-Oriental',
+    'KN' => 'Kinshasa',
+    'KW' => 'Kasai-Occidental',
+    'MA' => 'Maniema',
+    'NK' => 'Nord-Kivu',
+    'OR' => 'Orientale',
+    'SK' => 'Sud-Kivu',
+  ),
+  'CF' => 
+  array (
+    'AC' => 'Ouham',
+    'BB' => 'Bamingui-Bangoran',
+    'BGF' => 'Bangui',
+    'BK' => 'Basse-Kotto',
+    'HK' => 'Haute-Kotto',
+    'HM' => 'Haut-Mbomou',
+    'HS' => 'Haute-Sangha / Mambéré-Kadéï',
+    'KB' => 'Gribingui',
+    'KG' => 'Kémo-Gribingui',
+    'LB' => 'Lobaye',
+    'MB' => 'Mbomou',
+    'MP' => 'Ombella-M\'poko',
+    'NM' => 'Nana-Mambéré',
+    'OP' => 'Ouham-Pendé',
+    'SE' => 'Sangha',
+    'UK' => 'Ouaka',
+    'VK' => 'Vakaga',
+  ),
+  'CG' => 
+  array (
+    11 => 'Bouenza',
+    12 => 'Pool',
+    13 => 'Sangha',
+    14 => 'Plateaux',
+    15 => 'Cuvette-Ouest',
+    2 => 'Lékoumou',
+    5 => 'Kouilou',
+    7 => 'Likouala',
+    8 => 'Cuvette',
+    9 => 'Niari',
+    'BZV' => 'Brazzaville',
+  ),
+  'CH' => 
+  array (
+    'AG' => 'Aargau',
+    'AI' => 'Appenzell Innerrhoden',
+    'AR' => 'Appenzell Ausserrhoden',
+    'BE' => 'Bern',
+    'BL' => 'Basel-Landschaft',
+    'BS' => 'Basel-Stadt',
+    'FR' => 'Fribourg',
+    'GE' => 'Genève',
+    'GL' => 'Glarus',
+    'GR' => 'Graubünden',
+    'JU' => 'Jura',
+    'LU' => 'Luzern',
+    'NE' => 'Neuchâtel',
+    'NW' => 'Nidwalden',
+    'OW' => 'Obwalden',
+    'SG' => 'Sankt Gallen',
+    'SH' => 'Schaffhausen',
+    'SO' => 'Solothurn',
+    'SZ' => 'Schwyz',
+    'TG' => 'Thurgau',
+    'TI' => 'Ticino',
+    'UR' => 'Uri',
+    'VD' => 'Vaud',
+    'VS' => 'Valais',
+    'ZG' => 'Zug',
+    'ZH' => 'Zürich',
+  ),
+  'CI' => 
+  array (
+    'AB' => 'Abidjan',
+    'BS' => 'Bas-Sassandra',
+    'CM' => 'Comoé',
+    'DN' => 'Denguélé',
+    'GD' => 'Gôh-Djiboua',
+    'LC' => 'Lacs',
+    'LG' => 'Lagunes',
+    'MG' => 'Montagnes',
+    'SM' => 'Sassandra-Marahoué',
+    'SV' => 'Savanes',
+    'VB' => 'Vallée du Bandama',
+    'WR' => 'Woroba',
+    'YM' => 'Yamoussoukro',
+    'ZZ' => 'Zanzan',
+  ),
+  'CL' => 
+  array (
+    'AI' => 'Aisén del General Carlos Ibáñez del Campo',
+    'AN' => 'Antofagasta',
+    'AP' => 'Arica y Parinacota',
+    'AR' => 'Araucanía',
+    'AT' => 'Atacama',
+    'BI' => 'Bío-Bío',
+    'CO' => 'Coquimbo',
+    'LI' => 'Libertador General Bernardo O\'Higgins',
+    'LL' => 'Los Lagos',
+    'LR' => 'Los Ríos',
+    'MA' => 'Magallanes y Antártica Chilena',
+    'ML' => 'Maule',
+    'RM' => 'Región Metropolitana de Santiago',
+    'TA' => 'Tarapacá',
+    'VS' => 'Valparaíso',
+  ),
+  'CM' => 
+  array (
+    'AD' => 'Adamaoua',
+    'CE' => 'Centre',
+    'EN' => 'Far North',
+    'ES' => 'East',
+    'LT' => 'Littoral',
+    'NO' => 'North',
+    'NW' => 'North-West (Cameroon)',
+    'OU' => 'West',
+    'SU' => 'South',
+    'SW' => 'South-West',
+  ),
+  'CN' => 
+  array (
+    'AH' => 'Anhui Sheng',
+    'BJ' => 'Beijing Shi',
+    'CQ' => 'Chongqing Shi',
+    'FJ' => 'Fujian Sheng',
+    'GD' => 'Guangdong Sheng',
+    'GS' => 'Gansu Sheng',
+    'GX' => 'Guangxi Zhuangzu Zizhiqu',
+    'GZ' => 'Guizhou Sheng',
+    'HA' => 'Henan Sheng',
+    'HB' => 'Hubei Sheng',
+    'HE' => 'Hebei Sheng',
+    'HI' => 'Hainan Sheng',
+    'HK' => 'Hong Kong SAR (see also separate country code entry under HK)',
+    'HL' => 'Heilongjiang Sheng',
+    'HN' => 'Hunan Sheng',
+    'JL' => 'Jilin Sheng',
+    'JS' => 'Jiangsu Sheng',
+    'JX' => 'Jiangxi Sheng',
+    'LN' => 'Liaoning Sheng',
+    'MO' => 'Macao SAR (see also separate country code entry under MO)',
+    'NM' => 'Nei Mongol Zizhiqu',
+    'NX' => 'Ningxia Huizi Zizhiqu',
+    'QH' => 'Qinghai Sheng',
+    'SC' => 'Sichuan Sheng',
+    'SD' => 'Shandong Sheng',
+    'SH' => 'Shanghai Shi',
+    'SN' => 'Shaanxi Sheng',
+    'SX' => 'Shanxi Sheng',
+    'TJ' => 'Tianjin Shi',
+    'TW' => 'Taiwan Sheng (see also separate country code entry under TW)',
+    'XJ' => 'Xinjiang Uygur Zizhiqu',
+    'XZ' => 'Xizang Zizhiqu',
+    'YN' => 'Yunnan Sheng',
+    'ZJ' => 'Zhejiang Sheng',
+  ),
+  'CO' => 
+  array (
+    'AMA' => 'Amazonas',
+    'ANT' => 'Antioquia',
+    'ARA' => 'Arauca',
+    'ATL' => 'Atlántico',
+    'BOL' => 'Bolívar',
+    'BOY' => 'Boyacá',
+    'CAL' => 'Caldas',
+    'CAQ' => 'Caquetá',
+    'CAS' => 'Casanare',
+    'CAU' => 'Cauca',
+    'CES' => 'Cesar',
+    'CHO' => 'Chocó',
+    'COR' => 'Córdoba',
+    'CUN' => 'Cundinamarca',
+    'DC' => 'Distrito Capital de Bogotá',
+    'GUA' => 'Guainía',
+    'GUV' => 'Guaviare',
+    'HUI' => 'Huila',
+    'LAG' => 'La Guajira',
+    'MAG' => 'Magdalena',
+    'MET' => 'Meta',
+    'NAR' => 'Nariño',
+    'NSA' => 'Norte de Santander',
+    'PUT' => 'Putumayo',
+    'QUI' => 'Quindío',
+    'RIS' => 'Risaralda',
+    'SAN' => 'Santander',
+    'SAP' => 'San Andrés, Providencia y Santa Catalina',
+    'SUC' => 'Sucre',
+    'TOL' => 'Tolima',
+    'VAC' => 'Valle del Cauca',
+    'VAU' => 'Vaupés',
+    'VID' => 'Vichada',
+  ),
+  'CR' => 
+  array (
+    'A' => 'Alajuela',
+    'C' => 'Cartago',
+    'G' => 'Guanacaste',
+    'H' => 'Heredia',
+    'L' => 'Limón',
+    'P' => 'Puntarenas',
+    'SJ' => 'San José',
+  ),
+  'CU' => 
+  array (
+    '01' => 'Pinar del Rio',
+    '02' => 'La Habana',
+    '03' => 'Ciudad de La Habana',
+    '04' => 'Matanzas',
+    '05' => 'Villa Clara',
+    '06' => 'Cienfuegos',
+    '07' => 'Sancti Spíritus',
+    '08' => 'Ciego de Ávila',
+    '09' => 'Camagüey',
+    10 => 'Las Tunas',
+    11 => 'Holguín',
+    12 => 'Granma',
+    13 => 'Santiago de Cuba',
+    14 => 'Guantánamo',
+    99 => 'Isla de la Juventud',
+  ),
+  'CV' => 
+  array (
+    'B' => 'Ilhas de Barlavento',
+    'BR' => 'Brava',
+    'BV' => 'Boa Vista',
+    'CA' => 'Santa Catarina',
+    'CF' => 'Santa Catarina de Fogo',
+    'CR' => 'Santa Cruz',
+    'MA' => 'Maio',
+    'MO' => 'Mosteiros',
+    'PA' => 'Paul',
+    'PN' => 'Porto Novo',
+    'PR' => 'Praia',
+    'RB' => 'Ribeira Brava',
+    'RG' => 'Ribeira Grande',
+    'RS' => 'Ribeira Grande de Santiago',
+    'S' => 'Ilhas de Sotavento',
+    'SD' => 'São Domingos',
+    'SF' => 'São Filipe',
+    'SL' => 'Sal',
+    'SM' => 'São Miguel',
+    'SO' => 'São Lourenço dos Órgãos',
+    'SS' => 'São Salvador do Mundo',
+    'SV' => 'São Vicente',
+    'TA' => 'Tarrafal',
+    'TS' => 'Tarrafal de São Nicolau',
+  ),
+  'CY' => 
+  array (
+    '01' => 'Lefkosía',
+    '02' => 'Lemesós',
+    '03' => 'Lárnaka',
+    '04' => 'Ammóchostos',
+    '05' => 'Páfos',
+    '06' => 'Kerýneia',
+  ),
+  'CZ' => 
+  array (
+    10 => 'Praha, Hlavní mešto',
+    101 => 'Praha 1',
+    102 => 'Praha 2',
+    103 => 'Praha 3',
+    104 => 'Praha 4',
+    105 => 'Praha 5',
+    106 => 'Praha 6',
+    107 => 'Praha 7',
+    108 => 'Praha 8',
+    109 => 'Praha 9',
+    110 => 'Praha 10',
+    111 => 'Praha 11',
+    112 => 'Praha 12',
+    113 => 'Praha 13',
+    114 => 'Praha 14',
+    115 => 'Praha 15',
+    116 => 'Praha 16',
+    117 => 'Praha 17',
+    118 => 'Praha 18',
+    119 => 'Praha 19',
+    120 => 'Praha 20',
+    121 => 'Praha 21',
+    122 => 'Praha 22',
+    20 => 'Středočeský kraj',
+    201 => 'Benešov',
+    202 => 'Beroun',
+    203 => 'Kladno',
+    204 => 'Kolín',
+    205 => 'Kutná Hora',
+    206 => 'Mělník',
+    207 => 'Mladá Boleslav',
+    208 => 'Nymburk',
+    209 => 'Praha-východ',
+    '20A' => 'Praha-západ',
+    '20B' => 'Příbram',
+    '20C' => 'Rakovník',
+    31 => 'Jihočeský kraj',
+    311 => 'České Budějovice',
+    312 => 'Český Krumlov',
+    313 => 'Jindřichův Hradec',
+    314 => 'Písek',
+    315 => 'Prachatice',
+    316 => 'Strakonice',
+    317 => 'Tábor',
+    32 => 'Plzeňský kraj',
+    321 => 'Domažlice',
+    322 => 'Klatovy',
+    323 => 'Plzeň-město',
+    324 => 'Plzeň-jih',
+    325 => 'Plzeň-sever',
+    326 => 'Rokycany',
+    327 => 'Tachov',
+    41 => 'Karlovarský kraj',
+    411 => 'Cheb',
+    412 => 'Karlovy Vary',
+    413 => 'Sokolov',
+    42 => 'Ústecký kraj',
+    421 => 'Děčín',
+    422 => 'Chomutov',
+    423 => 'Litoměřice',
+    424 => 'Louny',
+    425 => 'Most',
+    426 => 'Teplice',
+    427 => 'Ústí nad Labem',
+    51 => 'Liberecký kraj',
+    511 => 'Česká Lípa',
+    512 => 'Jablonec nad Nisou',
+    513 => 'Liberec',
+    514 => 'Semily',
+    52 => 'Královéhradecký kraj',
+    521 => 'Hradec Králové',
+    522 => 'Jičín',
+    523 => 'Náchod',
+    524 => 'Rychnov nad Kněžnou',
+    525 => 'Trutnov',
+    53 => 'Pardubický kraj',
+    531 => 'Chrudim',
+    532 => 'Pardubice',
+    533 => 'Svitavy',
+    534 => 'Ústí nad Orlicí',
+    63 => 'Kraj Vysočina',
+    631 => 'Havlíčkův Brod',
+    632 => 'Jihlava',
+    633 => 'Pelhřimov',
+    634 => 'Třebíč',
+    635 => 'Žďár nad Sázavou',
+    64 => 'Jihomoravský kraj',
+    641 => 'Blansko',
+    642 => 'Brno-město',
+    643 => 'Brno-venkov',
+    644 => 'Břeclav',
+    645 => 'Hodonín',
+    646 => 'Vyškov',
+    647 => 'Znojmo',
+    71 => 'Olomoucký kraj',
+    711 => 'Jeseník',
+    712 => 'Olomouc',
+    713 => 'Prostějov',
+    714 => 'Přerov',
+    715 => 'Šumperk',
+    72 => 'Zlínský kraj',
+    721 => 'Kroměříž',
+    722 => 'Uherské Hradiště',
+    723 => 'Vsetín',
+    724 => 'Zlín',
+    80 => 'Moravskoslezský kraj',
+    801 => 'Bruntál',
+    802 => 'Frýdek Místek',
+    803 => 'Karviná',
+    804 => 'Nový Jičín',
+    805 => 'Opava',
+    806 => 'Ostrava-město',
+  ),
+  'DE' => 
+  array (
+    'BB' => 'Brandenburg',
+    'BE' => 'Berlin',
+    'BW' => 'Baden-Württemberg',
+    'BY' => 'Bayern',
+    'HB' => 'Bremen',
+    'HE' => 'Hessen',
+    'HH' => 'Hamburg',
+    'MV' => 'Mecklenburg-Vorpommern',
+    'NI' => 'Niedersachsen',
+    'NW' => 'Nordrhein-Westfalen',
+    'RP' => 'Rheinland-Pfalz',
+    'SH' => 'Schleswig-Holstein',
+    'SL' => 'Saarland',
+    'SN' => 'Sachsen',
+    'ST' => 'Sachsen-Anhalt',
+    'TH' => 'Thüringen',
+  ),
+  'DJ' => 
+  array (
+    'AR' => 'Arta',
+    'AS' => 'Ali Sabieh',
+    'DI' => 'Dikhil',
+    'DJ' => 'Djibouti',
+    'OB' => 'Obock',
+    'TA' => 'Tadjourah',
+  ),
+  'DK' => 
+  array (
+    81 => 'Nordjylland',
+    82 => 'Midtjylland',
+    83 => 'Syddanmark',
+    84 => 'Hovedstaden',
+    85 => 'Sjælland',
+  ),
+  'DM' => 
+  array (
+    '01' => 'Saint Peter',
+    '02' => 'Saint Andrew',
+    '03' => 'Saint David',
+    '04' => 'Saint George',
+    '05' => 'Saint John',
+    '06' => 'Saint Joseph',
+    '07' => 'Saint Luke',
+    '08' => 'Saint Mark',
+    '09' => 'Saint Patrick',
+    10 => 'Saint Paul',
+  ),
+  'DO' => 
+  array (
+    '01' => 'Distrito Nacional (Santo Domingo)',
+    '02' => 'Azua',
+    '03' => 'Bahoruco',
+    '04' => 'Barahona',
+    '05' => 'Dajabón',
+    '06' => 'Duarte',
+    '07' => 'La Estrelleta [Elías Piña]',
+    '08' => 'El Seybo [El Seibo]',
+    '09' => 'Espaillat',
+    10 => 'Independencia',
+    11 => 'La Altagracia',
+    12 => 'La Romana',
+    13 => 'La Vega',
+    14 => 'María Trinidad Sánchez',
+    15 => 'Monte Cristi',
+    16 => 'Pedernales',
+    17 => 'Peravia',
+    18 => 'Puerto Plata',
+    19 => 'Salcedo',
+    20 => 'Samaná',
+    21 => 'San Cristóbal',
+    22 => 'San Juan',
+    23 => 'San Pedro de Macorís',
+    24 => 'Sánchez Ramírez',
+    25 => 'Santiago',
+    26 => 'Santiago Rodríguez',
+    27 => 'Valverde',
+    28 => 'Monseñor Nouel',
+    29 => 'Monte Plata',
+    30 => 'Hato Mayor',
+    31 => 'San José de Ocoa',
+    32 => 'Santo Domingo',
+    33 => 'Cibao Nordeste',
+    34 => 'Cibao Noroeste',
+    35 => 'Cibao Norte',
+    36 => 'Cibao Sur',
+    37 => 'El Valle',
+    38 => 'Enriquillo',
+    39 => 'Higuamo',
+    40 => 'Ozama',
+    41 => 'Valdesia',
+    42 => 'Yuma',
+  ),
+  'DZ' => 
+  array (
+    '01' => 'Adrar',
+    '02' => 'Chlef',
+    '03' => 'Laghouat',
+    '04' => 'Oum el Bouaghi',
+    '05' => 'Batna',
+    '06' => 'Béjaïa',
+    '07' => 'Biskra',
+    '08' => 'Béchar',
+    '09' => 'Blida',
+    10 => 'Bouira',
+    11 => 'Tamanghasset',
+    12 => 'Tébessa',
+    13 => 'Tlemcen',
+    14 => 'Tiaret',
+    15 => 'Tizi Ouzou',
+    16 => 'Alger',
+    17 => 'Djelfa',
+    18 => 'Jijel',
+    19 => 'Sétif',
+    20 => 'Saïda',
+    21 => 'Skikda',
+    22 => 'Sidi Bel Abbès',
+    23 => 'Annaba',
+    24 => 'Guelma',
+    25 => 'Constantine',
+    26 => 'Médéa',
+    27 => 'Mostaganem',
+    28 => 'Msila',
+    29 => 'Mascara',
+    30 => 'Ouargla',
+    31 => 'Oran',
+    32 => 'El Bayadh',
+    33 => 'Illizi',
+    34 => 'Bordj Bou Arréridj',
+    35 => 'Boumerdès',
+    36 => 'El Tarf',
+    37 => 'Tindouf',
+    38 => 'Tissemsilt',
+    39 => 'El Oued',
+    40 => 'Khenchela',
+    41 => 'Souk Ahras',
+    42 => 'Tipaza',
+    43 => 'Mila',
+    44 => 'Aïn Defla',
+    45 => 'Naama',
+    46 => 'Aïn Témouchent',
+    47 => 'Ghardaïa',
+    48 => 'Relizane',
+  ),
+  'EC' => 
+  array (
+    'A' => 'Azuay',
+    'B' => 'Bolívar',
+    'C' => 'Carchi',
+    'D' => 'Orellana',
+    'E' => 'Esmeraldas',
+    'F' => 'Cañar',
+    'G' => 'Guayas',
+    'H' => 'Chimborazo',
+    'I' => 'Imbabura',
+    'L' => 'Loja',
+    'M' => 'Manabí',
+    'N' => 'Napo',
+    'O' => 'El Oro',
+    'P' => 'Pichincha',
+    'R' => 'Los Ríos',
+    'S' => 'Morona-Santiago',
+    'SD' => 'Santo Domingo de los Tsáchilas',
+    'SE' => 'Santa Elena',
+    'T' => 'Tungurahua',
+    'U' => 'Sucumbíos',
+    'W' => 'Galápagos',
+    'X' => 'Cotopaxi',
+    'Y' => 'Pastaza',
+    'Z' => 'Zamora-Chinchipe',
+  ),
+  'EE' => 
+  array (
+    37 => 'Harjumaa',
+    39 => 'Hiiumaa',
+    44 => 'Ida-Virumaa',
+    49 => 'Jõgevamaa',
+    51 => 'Järvamaa',
+    57 => 'Läänemaa',
+    59 => 'Lääne-Virumaa',
+    65 => 'Põlvamaa',
+    67 => 'Pärnumaa',
+    70 => 'Raplamaa',
+    74 => 'Saaremaa',
+    78 => 'Tartumaa',
+    82 => 'Valgamaa',
+    84 => 'Viljandimaa',
+    86 => 'Võrumaa',
+  ),
+  'EG' => 
+  array (
+    'ALX' => 'Al Iskandarīyah',
+    'ASN' => 'Aswān',
+    'AST' => 'Asyūt',
+    'BA' => 'Al Bahr al Ahmar',
+    'BH' => 'Al Buhayrah',
+    'BNS' => 'Banī Suwayf',
+    'C' => 'Al Qāhirah',
+    'DK' => 'Ad Daqahlīyah',
+    'DT' => 'Dumyāt',
+    'FYM' => 'Al Fayyūm',
+    'GH' => 'Al Gharbīyah',
+    'GZ' => 'Al Jīzah',
+    'HU' => 'Ḩulwān',
+    'IS' => 'Al Ismā`īlīyah',
+    'JS' => 'Janūb Sīnā\'',
+    'KB' => 'Al Qalyūbīyah',
+    'KFS' => 'Kafr ash Shaykh',
+    'KN' => 'Qinā',
+    'LX' => 'Al Uqşur',
+    'MN' => 'Al Minyā',
+    'MNF' => 'Al Minūfīyah',
+    'MT' => 'Matrūh',
+    'PTS' => 'Būr Sa`īd',
+    'SHG' => 'Sūhāj',
+    'SHR' => 'Ash Sharqīyah',
+    'SIN' => 'Shamal Sīnā\'',
+    'SU' => 'As Sādis min Uktūbar',
+    'SUZ' => 'As Suways',
+    'WAD' => 'Al Wādī al Jadīd',
+  ),
+  'ER' => 
+  array (
+    'AN' => 'Ansabā',
+    'DK' => 'Janūbī al Baḩrī al Aḩmar',
+    'DU' => 'Al Janūbī',
+    'GB' => 'Qāsh-Barkah',
+    'MA' => 'Al Awsaţ',
+    'SK' => 'Shimālī al Baḩrī al Aḩmar',
+  ),
+  'ES' => 
+  array (
+    'A' => 'Alicante',
+    'AB' => 'Albacete',
+    'AL' => 'Almería',
+    'AN' => 'Andalucía',
+    'AR' => 'Aragón',
+    'AS' => 'Asturias, Principado de',
+    'AV' => 'Ávila',
+    'B' => 'Barcelona',
+    'BA' => 'Badajoz',
+    'BI' => 'Bizkaia',
+    'BU' => 'Burgos',
+    'C' => 'A Coruña',
+    'CA' => 'Cádiz',
+    'CB' => 'Cantabria',
+    'CC' => 'Cáceres',
+    'CE' => 'Ceuta',
+    'CL' => 'Castilla y León',
+    'CM' => 'Castilla-La Mancha',
+    'CN' => 'Canarias',
+    'CO' => 'Córdoba',
+    'CR' => 'Ciudad Real',
+    'CS' => 'Castellón',
+    'CT' => 'Catalunya',
+    'CU' => 'Cuenca',
+    'EX' => 'Extremadura',
+    'GA' => 'Galicia',
+    'GC' => 'Las Palmas',
+    'GI' => 'Girona',
+    'GR' => 'Granada',
+    'GU' => 'Guadalajara',
+    'H' => 'Huelva',
+    'HU' => 'Huesca',
+    'IB' => 'Illes Balears',
+    'J' => 'Jaén',
+    'L' => 'Lleida',
+    'LE' => 'León',
+    'LO' => 'La Rioja',
+    'LU' => 'Lugo',
+    'M' => 'Madrid',
+    'MA' => 'Málaga',
+    'MC' => 'Murcia, Región de',
+    'MD' => 'Madrid, Comunidad de',
+    'ML' => 'Melilla',
+    'MU' => 'Murcia',
+    'NA' => 'Navarra / Nafarroa',
+    'NC' => 'Navarra, Comunidad Foral de / Nafarroako Foru Komunitatea',
+    'O' => 'Asturias',
+    'OR' => 'Ourense',
+    'P' => 'Palencia',
+    'PM' => 'Balears',
+    'PO' => 'Pontevedra',
+    'PV' => 'País Vasco / Euskal Herria',
+    'RI' => 'La Rioja',
+    'S' => 'Cantabria',
+    'SA' => 'Salamanca',
+    'SE' => 'Sevilla',
+    'SG' => 'Segovia',
+    'SO' => 'Soria',
+    'SS' => 'Gipuzkoa',
+    'T' => 'Tarragona',
+    'TE' => 'Teruel',
+    'TF' => 'Santa Cruz de Tenerife',
+    'TO' => 'Toledo',
+    'V' => 'Valencia / València',
+    'VA' => 'Valladolid',
+    'VC' => 'Valenciana, Comunidad / Valenciana, Comunitat',
+    'VI' => 'Álava',
+    'Z' => 'Zaragoza',
+    'ZA' => 'Zamora',
+  ),
+  'ET' => 
+  array (
+    'AA' => 'Ādīs Ābeba',
+    'AF' => 'Āfar',
+    'AM' => 'Āmara',
+    'BE' => 'Bīnshangul Gumuz',
+    'DD' => 'Dirē Dawa',
+    'GA' => 'Gambēla Hizboch',
+    'HA' => 'Hārerī Hizb',
+    'OR' => 'Oromīya',
+    'SN' => 'YeDebub Bihēroch Bihēreseboch na Hizboch',
+    'SO' => 'Sumalē',
+    'TI' => 'Tigray',
+  ),
+  'FI' => 
+  array (
+    '01' => 'Ahvenanmaan maakunta',
+    '02' => 'Etelä-Karjala',
+    '03' => 'Etelä-Pohjanmaa',
+    '04' => 'Etelä-Savo',
+    '05' => 'Kainuu',
+    '06' => 'Kanta-Häme',
+    '07' => 'Keski-Pohjanmaa',
+    '08' => 'Keski-Suomi',
+    '09' => 'Kymenlaakso',
+    10 => 'Lappi',
+    11 => 'Pirkanmaa',
+    12 => 'Pohjanmaa',
+    13 => 'Pohjois-Karjala',
+    14 => 'Pohjois-Pohjanmaa',
+    15 => 'Pohjois-Savo',
+    16 => 'Päijät-Häme',
+    17 => 'Satakunta',
+    18 => 'Uusimaa',
+    19 => 'Varsinais-Suomi',
+  ),
+  'FJ' => 
+  array (
+    'C' => 'Central',
+    'E' => 'Eastern',
+    'N' => 'Northern',
+    'R' => 'Rotuma',
+    'W' => 'Western',
+  ),
+  'FM' => 
+  array (
+    'KSA' => 'Kosrae',
+    'PNI' => 'Pohnpei',
+    'TRK' => 'Chuuk',
+    'YAP' => 'Yap',
+  ),
+  'FR' => 
+  array (
+    '01' => 'Ain',
+    '02' => 'Aisne',
+    '03' => 'Allier',
+    '04' => 'Alpes-de-Haute-Provence',
+    '05' => 'Hautes-Alpes',
+    '06' => 'Alpes-Maritimes',
+    '07' => 'Ardèche',
+    '08' => 'Ardennes',
+    '09' => 'Ariège',
+    10 => 'Aube',
+    11 => 'Aude',
+    12 => 'Aveyron',
+    13 => 'Bouches-du-Rhône',
+    14 => 'Calvados',
+    15 => 'Cantal',
+    16 => 'Charente',
+    17 => 'Charente-Maritime',
+    18 => 'Cher',
+    19 => 'Corrèze',
+    21 => 'Côte-d\'Or',
+    22 => 'Côtes-d\'Armor',
+    23 => 'Creuse',
+    24 => 'Dordogne',
+    25 => 'Doubs',
+    26 => 'Drôme',
+    27 => 'Eure',
+    28 => 'Eure-et-Loir',
+    29 => 'Finistère',
+    '2A' => 'Corse-du-Sud',
+    '2B' => 'Haute-Corse',
+    30 => 'Gard',
+    31 => 'Haute-Garonne',
+    32 => 'Gers',
+    33 => 'Gironde',
+    34 => 'Hérault',
+    35 => 'Ille-et-Vilaine',
+    36 => 'Indre',
+    37 => 'Indre-et-Loire',
+    38 => 'Isère',
+    39 => 'Jura',
+    40 => 'Landes',
+    41 => 'Loir-et-Cher',
+    42 => 'Loire',
+    43 => 'Haute-Loire',
+    44 => 'Loire-Atlantique',
+    45 => 'Loiret',
+    46 => 'Lot',
+    47 => 'Lot-et-Garonne',
+    48 => 'Lozère',
+    49 => 'Maine-et-Loire',
+    50 => 'Manche',
+    51 => 'Marne',
+    52 => 'Haute-Marne',
+    53 => 'Mayenne',
+    54 => 'Meurthe-et-Moselle',
+    55 => 'Meuse',
+    56 => 'Morbihan',
+    57 => 'Moselle',
+    58 => 'Nièvre',
+    59 => 'Nord',
+    60 => 'Oise',
+    61 => 'Orne',
+    62 => 'Pas-de-Calais',
+    63 => 'Puy-de-Dôme',
+    64 => 'Pyrénées-Atlantiques',
+    65 => 'Hautes-Pyrénées',
+    66 => 'Pyrénées-Orientales',
+    67 => 'Bas-Rhin',
+    68 => 'Haut-Rhin',
+    69 => 'Rhône',
+    70 => 'Haute-Saône',
+    71 => 'Saône-et-Loire',
+    72 => 'Sarthe',
+    73 => 'Savoie',
+    74 => 'Haute-Savoie',
+    75 => 'Paris',
+    76 => 'Seine-Maritime',
+    77 => 'Seine-et-Marne',
+    78 => 'Yvelines',
+    79 => 'Deux-Sèvres',
+    80 => 'Somme',
+    81 => 'Tarn',
+    82 => 'Tarn-et-Garonne',
+    83 => 'Var',
+    84 => 'Vaucluse',
+    85 => 'Vendée',
+    86 => 'Vienne',
+    87 => 'Haute-Vienne',
+    88 => 'Vosges',
+    89 => 'Yonne',
+    90 => 'Territoire de Belfort',
+    91 => 'Essonne',
+    92 => 'Hauts-de-Seine',
+    93 => 'Seine-Saint-Denis',
+    94 => 'Val-de-Marne',
+    95 => 'Val-d\'Oise',
+    'ARA' => 'Auvergne-Rhône-Alpes',
+    'BFC' => 'Bourgogne-Franche-Comté',
+    'BL' => 'Saint-Barthélemy',
+    'BRE' => 'Bretagne',
+    'COR' => 'Corse',
+    'CP' => 'Clipperton',
+    'CVL' => 'Centre-Val de Loire',
+    'GES' => 'Grand-Est',
+    'GF' => 'Guyane (française)',
+    'GP' => 'Guadeloupe',
+    'GUA' => 'Guadeloupe',
+    'HDF' => 'Hauts-de-France',
+    'IDF' => 'Île-de-France',
+    'LRE' => 'La Réunion',
+    'MAY' => 'Mayotte',
+    'MF' => 'Saint-Martin',
+    'MQ' => 'Martinique',
+    'NAQ' => 'Nouvelle-Aquitaine',
+    'NC' => 'Nouvelle-Calédonie',
+    'NOR' => 'Normandie',
+    'OCC' => 'Occitanie',
+    'PAC' => 'Provence-Alpes-Côte-d’Azur',
+    'PDL' => 'Pays-de-la-Loire',
+    'PF' => 'Polynésie française',
+    'PM' => 'Saint-Pierre-et-Miquelon',
+    'RE' => 'La Réunion',
+    'TF' => 'Terres australes françaises',
+    'WF' => 'Wallis-et-Futuna',
+    'YT' => 'Mayotte',
+  ),
+  'GA' => 
+  array (
+    1 => 'Estuaire',
+    2 => 'Haut-Ogooué',
+    3 => 'Moyen-Ogooué',
+    4 => 'Ngounié',
+    5 => 'Nyanga',
+    6 => 'Ogooué-Ivindo',
+    7 => 'Ogooué-Lolo',
+    8 => 'Ogooué-Maritime',
+    9 => 'Woleu-Ntem',
+  ),
+  'GB' => 
+  array (
+    'ABC' => 'Armagh, Banbridge and Craigavon',
+    'ABD' => 'Aberdeenshire',
+    'ABE' => 'Aberdeen City',
+    'AGB' => 'Argyll and Bute',
+    'AGY' => 'Isle of Anglesey; Sir Ynys Môn',
+    'AND' => 'Ards and North Down',
+    'ANN' => 'Antrim and Newtownabbey',
+    'ANS' => 'Angus',
+    'BAS' => 'Bath and North East Somerset',
+    'BBD' => 'Blackburn with Darwen',
+    'BDF' => 'Bedford',
+    'BDG' => 'Barking and Dagenham',
+    'BEN' => 'Brent',
+    'BEX' => 'Bexley',
+    'BFS' => 'Belfast',
+    'BGE' => 'Bridgend; Pen-y-bont ar Ogwr',
+    'BGW' => 'Blaenau Gwent',
+    'BIR' => 'Birmingham',
+    'BKM' => 'Buckinghamshire',
+    'BMH' => 'Bournemouth',
+    'BNE' => 'Barnet',
+    'BNH' => 'Brighton and Hove',
+    'BNS' => 'Barnsley',
+    'BOL' => 'Bolton',
+    'BPL' => 'Blackpool',
+    'BRC' => 'Bracknell Forest',
+    'BRD' => 'Bradford',
+    'BRY' => 'Bromley',
+    'BST' => 'Bristol, City of',
+    'BUR' => 'Bury',
+    'CAM' => 'Cambridgeshire',
+    'CAY' => 'Caerphilly; Caerffili',
+    'CBF' => 'Central Bedfordshire',
+    'CCG' => 'Causeway Coast and Glens',
+    'CGN' => 'Ceredigion; Sir Ceredigion',
+    'CHE' => 'Cheshire East',
+    'CHW' => 'Cheshire West and Chester',
+    'CLD' => 'Calderdale',
+    'CLK' => 'Clackmannanshire',
+    'CMA' => 'Cumbria',
+    'CMD' => 'Camden',
+    'CMN' => 'Carmarthenshire; Sir Gaerfyrddin',
+    'CON' => 'Cornwall',
+    'COV' => 'Coventry',
+    'CRF' => 'Cardiff; Caerdydd',
+    'CRY' => 'Croydon',
+    'CWY' => 'Conwy',
+    'DAL' => 'Darlington',
+    'DBY' => 'Derbyshire',
+    'DEN' => 'Denbighshire; Sir Ddinbych',
+    'DER' => 'Derby',
+    'DEV' => 'Devon',
+    'DGY' => 'Dumfries and Galloway',
+    'DNC' => 'Doncaster',
+    'DND' => 'Dundee City',
+    'DOR' => 'Dorset',
+    'DRS' => 'Derry and Strabane',
+    'DUD' => 'Dudley',
+    'DUR' => 'Durham County',
+    'EAL' => 'Ealing',
+    'EAW' => 'England and Wales',
+    'EAY' => 'East Ayrshire',
+    'EDH' => 'Edinburgh, City of',
+    'EDU' => 'East Dunbartonshire',
+    'ELN' => 'East Lothian',
+    'ELS' => 'Eilean Siar',
+    'ENF' => 'Enfield',
+    'ENG' => 'England',
+    'ERW' => 'East Renfrewshire',
+    'ERY' => 'East Riding of Yorkshire',
+    'ESS' => 'Essex',
+    'ESX' => 'East Sussex',
+    'FAL' => 'Falkirk',
+    'FIF' => 'Fife',
+    'FLN' => 'Flintshire; Sir y Fflint',
+    'FMO' => 'Fermanagh and Omagh',
+    'GAT' => 'Gateshead',
+    'GBN' => 'Great Britain',
+    'GLG' => 'Glasgow City',
+    'GLS' => 'Gloucestershire',
+    'GRE' => 'Greenwich',
+    'GWN' => 'Gwynedd',
+    'HAL' => 'Halton',
+    'HAM' => 'Hampshire',
+    'HAV' => 'Havering',
+    'HCK' => 'Hackney',
+    'HEF' => 'Herefordshire',
+    'HIL' => 'Hillingdon',
+    'HLD' => 'Highland',
+    'HMF' => 'Hammersmith and Fulham',
+    'HNS' => 'Hounslow',
+    'HPL' => 'Hartlepool',
+    'HRT' => 'Hertfordshire',
+    'HRW' => 'Harrow',
+    'HRY' => 'Haringey',
+    'IOS' => 'Isles of Scilly',
+    'IOW' => 'Isle of Wight',
+    'ISL' => 'Islington',
+    'IVC' => 'Inverclyde',
+    'KEC' => 'Kensington and Chelsea',
+    'KEN' => 'Kent',
+    'KHL' => 'Kingston upon Hull',
+    'KIR' => 'Kirklees',
+    'KTT' => 'Kingston upon Thames',
+    'KWL' => 'Knowsley',
+    'LAN' => 'Lancashire',
+    'LBC' => 'Lisburn and Castlereagh',
+    'LBH' => 'Lambeth',
+    'LCE' => 'Leicester',
+    'LDS' => 'Leeds',
+    'LEC' => 'Leicestershire',
+    'LEW' => 'Lewisham',
+    'LIN' => 'Lincolnshire',
+    'LIV' => 'Liverpool',
+    'LND' => 'London, City of',
+    'LUT' => 'Luton',
+    'MAN' => 'Manchester',
+    'MDB' => 'Middlesbrough',
+    'MDW' => 'Medway',
+    'MEA' => 'Mid and East Antrim',
+    'MIK' => 'Milton Keynes',
+    'MLN' => 'Midlothian',
+    'MON' => 'Monmouthshire; Sir Fynwy',
+    'MRT' => 'Merton',
+    'MRY' => 'Moray',
+    'MTY' => 'Merthyr Tydfil; Merthyr Tudful',
+    'MUL' => 'Mid Ulster',
+    'NAY' => 'North Ayrshire',
+    'NBL' => 'Northumberland',
+    'NEL' => 'North East Lincolnshire',
+    'NET' => 'Newcastle upon Tyne',
+    'NFK' => 'Norfolk',
+    'NGM' => 'Nottingham',
+    'NIR' => 'Northern Ireland',
+    'NLK' => 'North Lanarkshire',
+    'NLN' => 'North Lincolnshire',
+    'NMD' => 'Newry, Mourne and Down',
+    'NSM' => 'North Somerset',
+    'NTH' => 'Northamptonshire',
+    'NTL' => 'Neath Port Talbot; Castell-nedd Port Talbot',
+    'NTT' => 'Nottinghamshire',
+    'NTY' => 'North Tyneside',
+    'NWM' => 'Newham',
+    'NWP' => 'Newport; Casnewydd',
+    'NYK' => 'North Yorkshire',
+    'OLD' => 'Oldham',
+    'ORK' => 'Orkney Islands',
+    'OXF' => 'Oxfordshire',
+    'PEM' => 'Pembrokeshire; Sir Benfro',
+    'PKN' => 'Perth and Kinross',
+    'PLY' => 'Plymouth',
+    'POL' => 'Poole',
+    'POR' => 'Portsmouth',
+    'POW' => 'Powys',
+    'PTE' => 'Peterborough',
+    'RCC' => 'Redcar and Cleveland',
+    'RCH' => 'Rochdale',
+    'RCT' => 'Rhondda, Cynon, Taff; Rhondda, Cynon, Taf',
+    'RDB' => 'Redbridge',
+    'RDG' => 'Reading',
+    'RFW' => 'Renfrewshire',
+    'RIC' => 'Richmond upon Thames',
+    'ROT' => 'Rotherham',
+    'RUT' => 'Rutland',
+    'SAW' => 'Sandwell',
+    'SAY' => 'South Ayrshire',
+    'SCB' => 'Scottish Borders, The',
+    'SCT' => 'Scotland',
+    'SFK' => 'Suffolk',
+    'SFT' => 'Sefton',
+    'SGC' => 'South Gloucestershire',
+    'SHF' => 'Sheffield',
+    'SHN' => 'St. Helens',
+    'SHR' => 'Shropshire',
+    'SKP' => 'Stockport',
+    'SLF' => 'Salford',
+    'SLG' => 'Slough',
+    'SLK' => 'South Lanarkshire',
+    'SND' => 'Sunderland',
+    'SOL' => 'Solihull',
+    'SOM' => 'Somerset',
+    'SOS' => 'Southend-on-Sea',
+    'SRY' => 'Surrey',
+    'STE' => 'Stoke-on-Trent',
+    'STG' => 'Stirling',
+    'STH' => 'Southampton',
+    'STN' => 'Sutton',
+    'STS' => 'Staffordshire',
+    'STT' => 'Stockton-on-Tees',
+    'STY' => 'South Tyneside',
+    'SWA' => 'Swansea; Abertawe',
+    'SWD' => 'Swindon',
+    'SWK' => 'Southwark',
+    'TAM' => 'Tameside',
+    'TFW' => 'Telford and Wrekin',
+    'THR' => 'Thurrock',
+    'TOB' => 'Torbay',
+    'TOF' => 'Torfaen; Tor-faen',
+    'TRF' => 'Trafford',
+    'TWH' => 'Tower Hamlets',
+    'UKM' => 'United Kingdom',
+    'VGL' => 'Vale of Glamorgan, The; Bro Morgannwg',
+    'WAR' => 'Warwickshire',
+    'WBK' => 'West Berkshire',
+    'WDU' => 'West Dunbartonshire',
+    'WFT' => 'Waltham Forest',
+    'WGN' => 'Wigan',
+    'WIL' => 'Wiltshire',
+    'WKF' => 'Wakefield',
+    'WLL' => 'Walsall',
+    'WLN' => 'West Lothian',
+    'WLS' => 'Wales; Cymru',
+    'WLV' => 'Wolverhampton',
+    'WND' => 'Wandsworth',
+    'WNM' => 'Windsor and Maidenhead',
+    'WOK' => 'Wokingham',
+    'WOR' => 'Worcestershire',
+    'WRL' => 'Wirral',
+    'WRT' => 'Warrington',
+    'WRX' => 'Wrexham; Wrecsam',
+    'WSM' => 'Westminster',
+    'WSX' => 'West Sussex',
+    'YOR' => 'York',
+    'ZET' => 'Shetland Islands',
+  ),
+  'GD' => 
+  array (
+    '01' => 'Saint Andrew',
+    '02' => 'Saint David',
+    '03' => 'Saint George',
+    '04' => 'Saint John',
+    '05' => 'Saint Mark',
+    '06' => 'Saint Patrick',
+    10 => 'Southern Grenadine Islands',
+  ),
+  'GE' => 
+  array (
+    'AB' => 'Abkhazia',
+    'AJ' => 'Ajaria',
+    'GU' => 'Guria',
+    'IM' => 'Imeret’i',
+    'KA' => 'Kakhet’i',
+    'KK' => 'K’vemo K’art’li',
+    'MM' => 'Mts’khet’a-Mt’ianet’i',
+    'RL' => 'Racha-Lech’khumi-K’vemo Svanet’i',
+    'SJ' => 'Samts’khe-Javakhet’i',
+    'SK' => 'Shida K’art’li',
+    'SZ' => 'Samegrelo-Zemo Svanet’i',
+    'TB' => 'T’bilisi',
+  ),
+  'GH' => 
+  array (
+    'AA' => 'Greater Accra',
+    'AH' => 'Ashanti',
+    'BA' => 'Brong-Ahafo',
+    'CP' => 'Central',
+    'EP' => 'Eastern',
+    'NP' => 'Northern',
+    'TV' => 'Volta',
+    'UE' => 'Upper East',
+    'UW' => 'Upper West',
+    'WP' => 'Western',
+  ),
+  'GL' => 
+  array (
+    'KU' => 'Kommune Kujalleq',
+    'QA' => 'Qaasuitsup Kommunia',
+    'QE' => 'Qeqqata Kommunia',
+    'SM' => 'Kommuneqarfik Sermersooq',
+  ),
+  'GM' => 
+  array (
+    'B' => 'Banjul',
+    'L' => 'Lower River',
+    'M' => 'Central River',
+    'N' => 'North Bank',
+    'U' => 'Upper River',
+    'W' => 'Western',
+  ),
+  'GN' => 
+  array (
+    'B' => 'Boké',
+    'BE' => 'Beyla',
+    'BF' => 'Boffa',
+    'BK' => 'Boké',
+    'C' => 'Conakry',
+    'CO' => 'Coyah',
+    'D' => 'Kindia',
+    'DB' => 'Dabola',
+    'DI' => 'Dinguiraye',
+    'DL' => 'Dalaba',
+    'DU' => 'Dubréka',
+    'F' => 'Faranah',
+    'FA' => 'Faranah',
+    'FO' => 'Forécariah',
+    'FR' => 'Fria',
+    'GA' => 'Gaoual',
+    'GU' => 'Guékédou',
+    'K' => 'Kankan',
+    'KA' => 'Kankan',
+    'KB' => 'Koubia',
+    'KD' => 'Kindia',
+    'KE' => 'Kérouané',
+    'KN' => 'Koundara',
+    'KO' => 'Kouroussa',
+    'KS' => 'Kissidougou',
+    'L' => 'Labé',
+    'LA' => 'Labé',
+    'LE' => 'Lélouma',
+    'LO' => 'Lola',
+    'M' => 'Mamou',
+    'MC' => 'Macenta',
+    'MD' => 'Mandiana',
+    'ML' => 'Mali',
+    'MM' => 'Mamou',
+    'N' => 'Nzérékoré',
+    'NZ' => 'Nzérékoré',
+    'PI' => 'Pita',
+    'SI' => 'Siguiri',
+    'TE' => 'Télimélé',
+    'TO' => 'Tougué',
+    'YO' => 'Yomou',
+  ),
+  'GQ' => 
+  array (
+    'AN' => 'Annobón',
+    'BN' => 'Bioko Norte',
+    'BS' => 'Bioko Sur',
+    'C' => 'Región Continental',
+    'CS' => 'Centro Sur',
+    'I' => 'Región Insular',
+    'KN' => 'Kié-Ntem',
+    'LI' => 'Litoral',
+    'WN' => 'Wele-Nzas',
+  ),
+  'GR' => 
+  array (
+    '01' => 'Aitolia kai Akarnania',
+    '03' => 'Voiotia',
+    '04' => 'Evvoias',
+    '05' => 'Evrytania',
+    '06' => 'Fthiotida',
+    '07' => 'Fokida',
+    11 => 'Argolida',
+    12 => 'Arkadia',
+    13 => 'Achaïa',
+    14 => 'Ileia',
+    15 => 'Korinthia',
+    16 => 'Lakonia',
+    17 => 'Messinia',
+    21 => 'Zakynthos',
+    22 => 'Kerkyra',
+    23 => 'Kefallonia',
+    24 => 'Lefkada',
+    31 => 'Arta',
+    32 => 'Thesprotia',
+    33 => 'Ioannina',
+    34 => 'Preveza',
+    41 => 'Karditsa',
+    42 => 'Larisa',
+    43 => 'Magnisia',
+    44 => 'Trikala',
+    51 => 'Grevena',
+    52 => 'Drama',
+    53 => 'Imathia',
+    54 => 'Thessaloniki',
+    55 => 'Kavala',
+    56 => 'Kastoria',
+    57 => 'Kilkis',
+    58 => 'Kozani',
+    59 => 'Pella',
+    61 => 'Pieria',
+    62 => 'Serres',
+    63 => 'Florina',
+    64 => 'Chalkidiki',
+    69 => 'Agio Oros',
+    71 => 'Evros',
+    72 => 'Xanthi',
+    73 => 'Rodopi',
+    81 => 'Dodekanisos',
+    82 => 'Kyklades',
+    83 => 'Lesvos',
+    84 => 'Samos',
+    85 => 'Chios',
+    91 => 'Irakleio',
+    92 => 'Lasithi',
+    93 => 'Rethymno',
+    94 => 'Chania',
+    'A' => 'Anatoliki Makedonia kai Thraki',
+    'A1' => 'Attiki',
+    'B' => 'Kentriki Makedonia',
+    'C' => 'Dytiki Makedonia',
+    'D' => 'Ipeiros',
+    'E' => 'Thessalia',
+    'F' => 'Ionia Nisia',
+    'G' => 'Dytiki Ellada',
+    'H' => 'Sterea Ellada',
+    'I' => 'Attiki',
+    'J' => 'Peloponnisos',
+    'K' => 'Voreio Aigaio',
+    'L' => 'Notio Aigaio',
+    'M' => 'Kriti',
+  ),
+  'GT' => 
+  array (
+    'AV' => 'Alta Verapaz',
+    'BV' => 'Baja Verapaz',
+    'CM' => 'Chimaltenango',
+    'CQ' => 'Chiquimula',
+    'ES' => 'Escuintla',
+    'GU' => 'Guatemala',
+    'HU' => 'Huehuetenango',
+    'IZ' => 'Izabal',
+    'JA' => 'Jalapa',
+    'JU' => 'Jutiapa',
+    'PE' => 'Petén',
+    'PR' => 'El Progreso',
+    'QC' => 'Quiché',
+    'QZ' => 'Quetzaltenango',
+    'RE' => 'Retalhuleu',
+    'SA' => 'Sacatepéquez',
+    'SM' => 'San Marcos',
+    'SO' => 'Sololá',
+    'SR' => 'Santa Rosa',
+    'SU' => 'Suchitepéquez',
+    'TO' => 'Totonicapán',
+    'ZA' => 'Zacapa',
+  ),
+  'GW' => 
+  array (
+    'BA' => 'Bafatá',
+    'BL' => 'Bolama',
+    'BM' => 'Biombo',
+    'BS' => 'Bissau',
+    'CA' => 'Cacheu',
+    'GA' => 'Gabú',
+    'L' => 'Leste',
+    'N' => 'Norte',
+    'OI' => 'Oio',
+    'QU' => 'Quinara',
+    'S' => 'Sul',
+    'TO' => 'Tombali',
+  ),
+  'GY' => 
+  array (
+    'BA' => 'Barima-Waini',
+    'CU' => 'Cuyuni-Mazaruni',
+    'DE' => 'Demerara-Mahaica',
+    'EB' => 'East Berbice-Corentyne',
+    'ES' => 'Essequibo Islands-West Demerara',
+    'MA' => 'Mahaica-Berbice',
+    'PM' => 'Pomeroon-Supenaam',
+    'PT' => 'Potaro-Siparuni',
+    'UD' => 'Upper Demerara-Berbice',
+    'UT' => 'Upper Takutu-Upper Essequibo',
+  ),
+  'HN' => 
+  array (
+    'AT' => 'Atlántida',
+    'CH' => 'Choluteca',
+    'CL' => 'Colón',
+    'CM' => 'Comayagua',
+    'CP' => 'Copán',
+    'CR' => 'Cortés',
+    'EP' => 'El Paraíso',
+    'FM' => 'Francisco Morazán',
+    'GD' => 'Gracias a Dios',
+    'IB' => 'Islas de la Bahía',
+    'IN' => 'Intibucá',
+    'LE' => 'Lempira',
+    'LP' => 'La Paz',
+    'OC' => 'Ocotepeque',
+    'OL' => 'Olancho',
+    'SB' => 'Santa Bárbara',
+    'VA' => 'Valle',
+    'YO' => 'Yoro',
+  ),
+  'HR' => 
+  array (
+    '01' => 'Zagrebačka županija',
+    '02' => 'Krapinsko-zagorska županija',
+    '03' => 'Sisačko-moslavačka županija',
+    '04' => 'Karlovačka županija',
+    '05' => 'Varaždinska županija',
+    '06' => 'Koprivničko-križevačka županija',
+    '07' => 'Bjelovarsko-bilogorska županija',
+    '08' => 'Primorsko-goranska županija',
+    '09' => 'Ličko-senjska županija',
+    10 => 'Virovitičko-podravska županija',
+    11 => 'Požeško-slavonska županija',
+    12 => 'Brodsko-posavska županija',
+    13 => 'Zadarska županija',
+    14 => 'Osječko-baranjska županija',
+    15 => 'Šibensko-kninska županija',
+    16 => 'Vukovarsko-srijemska županija',
+    17 => 'Splitsko-dalmatinska županija',
+    18 => 'Istarska županija',
+    19 => 'Dubrovačko-neretvanska županija',
+    20 => 'Međimurska županija',
+    21 => 'Grad Zagreb',
+  ),
+  'HT' => 
+  array (
+    'AR' => 'Artibonite',
+    'CE' => 'Centre',
+    'GA' => 'Grande-Anse',
+    'ND' => 'Nord',
+    'NE' => 'Nord-Est',
+    'NI' => 'Nippes',
+    'NO' => 'Nord-Ouest',
+    'OU' => 'Ouest',
+    'SD' => 'Sud',
+    'SE' => 'Sud-Est',
+  ),
+  'HU' => 
+  array (
+    'BA' => 'Baranya',
+    'BC' => 'Békéscsaba',
+    'BE' => 'Békés',
+    'BK' => 'Bács-Kiskun',
+    'BU' => 'Budapest',
+    'BZ' => 'Borsod-Abaúj-Zemplén',
+    'CS' => 'Csongrád',
+    'DE' => 'Debrecen',
+    'DU' => 'Dunaújváros',
+    'EG' => 'Eger',
+    'ER' => 'Érd',
+    'FE' => 'Fejér',
+    'GS' => 'Győr-Moson-Sopron',
+    'GY' => 'Győr',
+    'HB' => 'Hajdú-Bihar',
+    'HE' => 'Heves',
+    'HV' => 'Hódmezővásárhely',
+    'JN' => 'Jász-Nagykun-Szolnok',
+    'KE' => 'Komárom-Esztergom',
+    'KM' => 'Kecskemét',
+    'KV' => 'Kaposvár',
+    'MI' => 'Miskolc',
+    'NK' => 'Nagykanizsa',
+    'NO' => 'Nógrád',
+    'NY' => 'Nyíregyháza',
+    'PE' => 'Pest',
+    'PS' => 'Pécs',
+    'SD' => 'Szeged',
+    'SF' => 'Székesfehérvár',
+    'SH' => 'Szombathely',
+    'SK' => 'Szolnok',
+    'SN' => 'Sopron',
+    'SO' => 'Somogy',
+    'SS' => 'Szekszárd',
+    'ST' => 'Salgótarján',
+    'SZ' => 'Szabolcs-Szatmár-Bereg',
+    'TB' => 'Tatabánya',
+    'TO' => 'Tolna',
+    'VA' => 'Vas',
+    'VE' => 'Veszprém (county)',
+    'VM' => 'Veszprém',
+    'ZA' => 'Zala',
+    'ZE' => 'Zalaegerszeg',
+  ),
+  'ID' => 
+  array (
+    'AC' => 'Aceh',
+    'BA' => 'Bali',
+    'BB' => 'Bangka Belitung',
+    'BE' => 'Bengkulu',
+    'BT' => 'Banten',
+    'GO' => 'Gorontalo',
+    'IJ' => 'Papua',
+    'JA' => 'Jambi',
+    'JB' => 'Jawa Barat',
+    'JI' => 'Jawa Timur',
+    'JK' => 'Jakarta Raya',
+    'JT' => 'Jawa Tengah',
+    'JW' => 'Jawa',
+    'KA' => 'Kalimantan',
+    'KB' => 'Kalimantan Barat',
+    'KI' => 'Kalimantan Timur',
+    'KR' => 'Kepulauan Riau',
+    'KS' => 'Kalimantan Selatan',
+    'KT' => 'Kalimantan Tengah',
+    'LA' => 'Lampung',
+    'MA' => 'Maluku',
+    'ML' => 'Maluku',
+    'MU' => 'Maluku Utara',
+    'NB' => 'Nusa Tenggara Barat',
+    'NT' => 'Nusa Tenggara Timur',
+    'NU' => 'Nusa Tenggara',
+    'PA' => 'Papua',
+    'PB' => 'Papua Barat',
+    'RI' => 'Riau',
+    'SA' => 'Sulawesi Utara',
+    'SB' => 'Sumatra Barat',
+    'SG' => 'Sulawesi Tenggara',
+    'SL' => 'Sulawesi',
+    'SM' => 'Sumatera',
+    'SN' => 'Sulawesi Selatan',
+    'SR' => 'Sulawesi Barat',
+    'SS' => 'Sumatra Selatan',
+    'ST' => 'Sulawesi Tengah',
+    'SU' => 'Sumatera Utara',
+    'YO' => 'Yogyakarta',
+  ),
+  'IE' => 
+  array (
+    'C' => 'Connacht',
+    'CE' => 'Clare',
+    'CN' => 'Cavan',
+    'CO' => 'Cork',
+    'CW' => 'Carlow',
+    'D' => 'Dublin',
+    'DL' => 'Donegal',
+    'G' => 'Galway',
+    'KE' => 'Kildare',
+    'KK' => 'Kilkenny',
+    'KY' => 'Kerry',
+    'L' => 'Leinster',
+    'LD' => 'Longford',
+    'LH' => 'Louth',
+    'LK' => 'Limerick',
+    'LM' => 'Leitrim',
+    'LS' => 'Laois',
+    'M' => 'Munster',
+    'MH' => 'Meath',
+    'MN' => 'Monaghan',
+    'MO' => 'Mayo',
+    'OY' => 'Offaly',
+    'RN' => 'Roscommon',
+    'SO' => 'Sligo',
+    'TA' => 'Tipperary',
+    'U' => 'Ulster',
+    'WD' => 'Waterford',
+    'WH' => 'Westmeath',
+    'WW' => 'Wicklow',
+    'WX' => 'Wexford',
+  ),
+  'IL' => 
+  array (
+    'D' => 'HaDarom',
+    'HA' => 'Hefa',
+    'JM' => 'Yerushalayim Al Quds',
+    'M' => 'HaMerkaz',
+    'TA' => 'Tel-Aviv',
+    'Z' => 'HaZafon',
+  ),
+  'IN' => 
+  array (
+    'AN' => 'Andaman and Nicobar Islands',
+    'AP' => 'Andhra Pradesh',
+    'AR' => 'Arunachal Pradesh',
+    'AS' => 'Assam',
+    'BR' => 'Bihar',
+    'CH' => 'Chandigarh',
+    'CT' => 'Chhattisgarh',
+    'DD' => 'Daman and Diu',
+    'DL' => 'Delhi',
+    'DN' => 'Dadra and Nagar Haveli',
+    'GA' => 'Goa',
+    'GJ' => 'Gujarat',
+    'HP' => 'Himachal Pradesh',
+    'HR' => 'Haryana',
+    'JH' => 'Jharkhand',
+    'JK' => 'Jammu and Kashmir',
+    'KA' => 'Karnataka',
+    'KL' => 'Kerala',
+    'LD' => 'Lakshadweep',
+    'MH' => 'Maharashtra',
+    'ML' => 'Meghalaya',
+    'MN' => 'Manipur',
+    'MP' => 'Madhya Pradesh',
+    'MZ' => 'Mizoram',
+    'NL' => 'Nagaland',
+    'OR' => 'Odisha',
+    'PB' => 'Punjab',
+    'PY' => 'Puducherry',
+    'RJ' => 'Rajasthan',
+    'SK' => 'Sikkim',
+    'TG' => 'Telangana',
+    'TN' => 'Tamil Nadu',
+    'TR' => 'Tripura',
+    'UP' => 'Uttar Pradesh',
+    'UT' => 'Uttarakhand',
+    'WB' => 'West Bengal',
+  ),
+  'IQ' => 
+  array (
+    'AN' => 'Al Anbar',
+    'AR' => 'Arbil',
+    'BA' => 'Al Basrah',
+    'BB' => 'Babil',
+    'BG' => 'Baghdad',
+    'DA' => 'Dahuk',
+    'DI' => 'Diyala',
+    'DQ' => 'Dhi Qar',
+    'KA' => 'Karbala\'',
+    'KI' => 'Kirkūk',
+    'MA' => 'Maysan',
+    'MU' => 'Al Muthanna',
+    'NA' => 'An Najef',
+    'NI' => 'Ninawa',
+    'QA' => 'Al Qadisiyah',
+    'SD' => 'Salah ad Din',
+    'SU' => 'As Sulaymaniyah',
+    'TS' => 'At Ta\'mim',
+    'WA' => 'Wasit',
+  ),
+  'IR' => 
+  array (
+    '01' => 'Āzarbāyjān-e Sharqī',
+    '02' => 'Āzarbāyjān-e Gharbī',
+    '03' => 'Ardabīl',
+    '04' => 'Eşfahān',
+    '05' => 'Īlām',
+    '06' => 'Būshehr',
+    '07' => 'Tehrān',
+    '08' => 'Chahār Mahāll va Bakhtīārī',
+    10 => 'Khūzestān',
+    11 => 'Zanjān',
+    12 => 'Semnān',
+    13 => 'Sīstān va Balūchestān',
+    14 => 'Fārs',
+    15 => 'Kermān',
+    16 => 'Kordestān',
+    17 => 'Kermānshāh',
+    18 => 'Kohgīlūyeh va Būyer Ahmad',
+    19 => 'Gīlān',
+    20 => 'Lorestān',
+    21 => 'Māzandarān',
+    22 => 'Markazī',
+    23 => 'Hormozgān',
+    24 => 'Hamadān',
+    25 => 'Yazd',
+    26 => 'Qom',
+    27 => 'Golestān',
+    28 => 'Qazvīn',
+    29 => 'Khorāsān-e Janūbī',
+    30 => 'Khorāsān-e Razavī',
+    31 => 'Khorāsān-e Shemālī',
+    32 => 'Alborz',
+  ),
+  'IS' => 
+  array (
+    0 => 'Reykjavík',
+    1 => 'Höfuðborgarsvæðið',
+    2 => 'Suðurnes',
+    3 => 'Vesturland',
+    4 => 'Vestfirðir',
+    5 => 'Norðurland vestra',
+    6 => 'Norðurland eystra',
+    7 => 'Austurland',
+    8 => 'Suðurland',
+  ),
+  'IT' => 
+  array (
+    21 => 'Piemonte',
+    23 => 'Valle d\'Aosta',
+    25 => 'Lombardia',
+    32 => 'Trentino-Alto Adige',
+    34 => 'Veneto',
+    36 => 'Friuli-Venezia Giulia',
+    42 => 'Liguria',
+    45 => 'Emilia-Romagna',
+    52 => 'Toscana',
+    55 => 'Umbria',
+    57 => 'Marche',
+    62 => 'Lazio',
+    65 => 'Abruzzo',
+    67 => 'Molise',
+    72 => 'Campania',
+    75 => 'Puglia',
+    77 => 'Basilicata',
+    78 => 'Calabria',
+    82 => 'Sicilia',
+    88 => 'Sardegna',
+    'AG' => 'Agrigento',
+    'AL' => 'Alessandria',
+    'AN' => 'Ancona',
+    'AO' => 'Aosta',
+    'AP' => 'Ascoli Piceno',
+    'AQ' => 'L\'Aquila',
+    'AR' => 'Arezzo',
+    'AT' => 'Asti',
+    'AV' => 'Avellino',
+    'BA' => 'Bari',
+    'BG' => 'Bergamo',
+    'BI' => 'Biella',
+    'BL' => 'Belluno',
+    'BN' => 'Benevento',
+    'BO' => 'Bologna',
+    'BR' => 'Brindisi',
+    'BS' => 'Brescia',
+    'BT' => 'Barletta-Andria-Trani',
+    'BZ' => 'Bolzano',
+    'CA' => 'Cagliari',
+    'CB' => 'Campobasso',
+    'CE' => 'Caserta',
+    'CH' => 'Chieti',
+    'CI' => 'Carbonia-Iglesias',
+    'CL' => 'Caltanissetta',
+    'CN' => 'Cuneo',
+    'CO' => 'Como',
+    'CR' => 'Cremona',
+    'CS' => 'Cosenza',
+    'CT' => 'Catania',
+    'CZ' => 'Catanzaro',
+    'EN' => 'Enna',
+    'FC' => 'Forlì-Cesena',
+    'FE' => 'Ferrara',
+    'FG' => 'Foggia',
+    'FI' => 'Firenze',
+    'FM' => 'Fermo',
+    'FR' => 'Frosinone',
+    'GE' => 'Genova',
+    'GO' => 'Gorizia',
+    'GR' => 'Grosseto',
+    'IM' => 'Imperia',
+    'IS' => 'Isernia',
+    'KR' => 'Crotone',
+    'LC' => 'Lecco',
+    'LE' => 'Lecce',
+    'LI' => 'Livorno',
+    'LO' => 'Lodi',
+    'LT' => 'Latina',
+    'LU' => 'Lucca',
+    'MB' => 'Monza e Brianza',
+    'MC' => 'Macerata',
+    'ME' => 'Messina',
+    'MI' => 'Milano',
+    'MN' => 'Mantova',
+    'MO' => 'Modena',
+    'MS' => 'Massa-Carrara',
+    'MT' => 'Matera',
+    'NA' => 'Napoli',
+    'NO' => 'Novara',
+    'NU' => 'Nuoro',
+    'OG' => 'Ogliastra',
+    'OR' => 'Oristano',
+    'OT' => 'Olbia-Tempio',
+    'PA' => 'Palermo',
+    'PC' => 'Piacenza',
+    'PD' => 'Padova',
+    'PE' => 'Pescara',
+    'PG' => 'Perugia',
+    'PI' => 'Pisa',
+    'PN' => 'Pordenone',
+    'PO' => 'Prato',
+    'PR' => 'Parma',
+    'PT' => 'Pistoia',
+    'PU' => 'Pesaro e Urbino',
+    'PV' => 'Pavia',
+    'PZ' => 'Potenza',
+    'RA' => 'Ravenna',
+    'RC' => 'Reggio Calabria',
+    'RE' => 'Reggio Emilia',
+    'RG' => 'Ragusa',
+    'RI' => 'Rieti',
+    'RM' => 'Roma',
+    'RN' => 'Rimini',
+    'RO' => 'Rovigo',
+    'SA' => 'Salerno',
+    'SI' => 'Siena',
+    'SO' => 'Sondrio',
+    'SP' => 'La Spezia',
+    'SR' => 'Siracusa',
+    'SS' => 'Sassari',
+    'SV' => 'Savona',
+    'TA' => 'Taranto',
+    'TE' => 'Teramo',
+    'TN' => 'Trento',
+    'TO' => 'Torino',
+    'TP' => 'Trapani',
+    'TR' => 'Terni',
+    'TS' => 'Trieste',
+    'TV' => 'Treviso',
+    'UD' => 'Udine',
+    'VA' => 'Varese',
+    'VB' => 'Verbano-Cusio-Ossola',
+    'VC' => 'Vercelli',
+    'VE' => 'Venezia',
+    'VI' => 'Vicenza',
+    'VR' => 'Verona',
+    'VS' => 'Medio Campidano',
+    'VT' => 'Viterbo',
+    'VV' => 'Vibo Valentia',
+  ),
+  'JM' => 
+  array (
+    '01' => 'Kingston',
+    '02' => 'Saint Andrew',
+    '03' => 'Saint Thomas',
+    '04' => 'Portland',
+    '05' => 'Saint Mary',
+    '06' => 'Saint Ann',
+    '07' => 'Trelawny',
+    '08' => 'Saint James',
+    '09' => 'Hanover',
+    10 => 'Westmoreland',
+    11 => 'Saint Elizabeth',
+    12 => 'Manchester',
+    13 => 'Clarendon',
+    14 => 'Saint Catherine',
+  ),
+  'JO' => 
+  array (
+    'AJ' => '‘Ajlūn',
+    'AM' => '‘Ammān (Al ‘Aşimah)',
+    'AQ' => 'Al ‘Aqabah',
+    'AT' => 'Aţ Ţafīlah',
+    'AZ' => 'Az Zarqā\'',
+    'BA' => 'Al Balqā\'',
+    'IR' => 'Irbid',
+    'JA' => 'Jarash',
+    'KA' => 'Al Karak',
+    'MA' => 'Al Mafraq',
+    'MD' => 'Mādabā',
+    'MN' => 'Ma‘ān',
+  ),
+  'JP' => 
+  array (
+    '01' => 'Hokkaido',
+    '02' => 'Aomori',
+    '03' => 'Iwate',
+    '04' => 'Miyagi',
+    '05' => 'Akita',
+    '06' => 'Yamagata',
+    '07' => 'Fukushima',
+    '08' => 'Ibaraki',
+    '09' => 'Tochigi',
+    10 => 'Gunma',
+    11 => 'Saitama',
+    12 => 'Chiba',
+    13 => 'Tokyo',
+    14 => 'Kanagawa',
+    15 => 'Niigata',
+    16 => 'Toyama',
+    17 => 'Ishikawa',
+    18 => 'Fukui',
+    19 => 'Yamanashi',
+    20 => 'Nagano',
+    21 => 'Gifu',
+    22 => 'Shizuoka',
+    23 => 'Aichi',
+    24 => 'Mie',
+    25 => 'Shiga',
+    26 => 'Kyoto',
+    27 => 'Osaka',
+    28 => 'Hyogo',
+    29 => 'Nara',
+    30 => 'Wakayama',
+    31 => 'Tottori',
+    32 => 'Shimane',
+    33 => 'Okayama',
+    34 => 'Hiroshima',
+    35 => 'Yamaguchi',
+    36 => 'Tokushima',
+    37 => 'Kagawa',
+    38 => 'Ehime',
+    39 => 'Kochi',
+    40 => 'Fukuoka',
+    41 => 'Saga',
+    42 => 'Nagasaki',
+    43 => 'Kumamoto',
+    44 => 'Oita',
+    45 => 'Miyazaki',
+    46 => 'Kagoshima',
+    47 => 'Okinawa',
+  ),
+  'KE' => 
+  array (
+    110 => 'Nairobi Municipality',
+    200 => 'Central',
+    300 => 'Coast',
+    400 => 'Eastern',
+    500 => 'North-Eastern Kaskazini Mashariki',
+    700 => 'Rift Valley',
+    800 => 'Western Magharibi',
+  ),
+  'KG' => 
+  array (
+    'B' => 'Batken',
+    'C' => 'Chü',
+    'GB' => 'Bishkek',
+    'GO' => 'Osh',
+    'J' => 'Jalal-Abad',
+    'N' => 'Naryn',
+    'O' => 'Osh',
+    'T' => 'Talas',
+    'Y' => 'Ysyk-Köl',
+  ),
+  'KH' => 
+  array (
+    1 => 'Banteay Mean Chey',
+    10 => 'Krachoh',
+    11 => 'Mondol Kiri',
+    12 => 'Phnom Penh',
+    13 => 'Preah Vihear',
+    14 => 'Prey Veaeng',
+    15 => 'Pousaat',
+    16 => 'Rotanak Kiri',
+    17 => 'Siem Reab',
+    18 => 'Krong Preah Sihanouk',
+    19 => 'Stueng Traeng',
+    2 => 'Battambang',
+    20 => 'Svaay Rieng',
+    21 => 'Taakaev',
+    22 => 'Otdar Mean Chey',
+    23 => 'Krong Kaeb',
+    24 => 'Krong Pailin',
+    3 => 'Kampong Cham',
+    4 => 'Kampong Chhnang',
+    5 => 'Kampong Speu',
+    6 => 'Kampong Thom',
+    7 => 'Kampot',
+    8 => 'Kandal',
+    9 => 'Kach Kong',
+  ),
+  'KI' => 
+  array (
+    'G' => 'Gilbert Islands',
+    'L' => 'Line Islands',
+    'P' => 'Phoenix Islands',
+  ),
+  'KM' => 
+  array (
+    'A' => 'Andjouân (Anjwān)',
+    'G' => 'Andjazîdja (Anjazījah)',
+    'M' => 'Moûhîlî (Mūhīlī)',
+  ),
+  'KN' => 
+  array (
+    '01' => 'Christ Church Nichola Town',
+    '02' => 'Saint Anne Sandy Point',
+    '03' => 'Saint George Basseterre',
+    '04' => 'Saint George Gingerland',
+    '05' => 'Saint James Windward',
+    '06' => 'Saint John Capisterre',
+    '07' => 'Saint John Figtree',
+    '08' => 'Saint Mary Cayon',
+    '09' => 'Saint Paul Capisterre',
+    10 => 'Saint Paul Charlestown',
+    11 => 'Saint Peter Basseterre',
+    12 => 'Saint Thomas Lowland',
+    13 => 'Saint Thomas Middle Island',
+    15 => 'Trinity Palmetto Point',
+    'K' => 'Saint Kitts',
+    'N' => 'Nevis',
+  ),
+  'KP' => 
+  array (
+    '01' => 'P’yŏngyang',
+    '02' => 'P’yŏngan-namdo',
+    '03' => 'P’yŏngan-bukto',
+    '04' => 'Chagang-do',
+    '05' => 'Hwanghae-namdo',
+    '06' => 'Hwanghae-bukto',
+    '07' => 'Kangwŏn-do',
+    '08' => 'Hamgyŏng-namdo',
+    '09' => 'Hamgyŏng-bukto',
+    10 => 'Yanggang-do',
+    13 => 'Nasŏn (Najin-Sŏnbong)',
+  ),
+  'KR' => 
+  array (
+    11 => 'Seoul Teugbyeolsi',
+    26 => 'Busan Gwang\'yeogsi',
+    27 => 'Daegu Gwang\'yeogsi',
+    28 => 'Incheon Gwang\'yeogsi',
+    29 => 'Gwangju Gwang\'yeogsi',
+    30 => 'Daejeon Gwang\'yeogsi',
+    31 => 'Ulsan Gwang\'yeogsi',
+    41 => 'Gyeonggido',
+    42 => 'Gang\'weondo',
+    43 => 'Chungcheongbukdo',
+    44 => 'Chungcheongnamdo',
+    45 => 'Jeonrabukdo',
+    46 => 'Jeonranamdo',
+    47 => 'Gyeongsangbukdo',
+    48 => 'Gyeongsangnamdo',
+    49 => 'Jejudo',
+  ),
+  'KW' => 
+  array (
+    'AH' => 'Al Ahmadi',
+    'FA' => 'Al Farwānīyah',
+    'HA' => 'Hawallī',
+    'JA' => 'Al Jahrrā’',
+    'KU' => 'Al Kuwayt (Al ‘Āşimah)',
+    'MU' => 'Mubārak al Kabīr',
+  ),
+  'KZ' => 
+  array (
+    'AKM' => 'Aqmola oblysy',
+    'AKT' => 'Aqtöbe oblysy',
+    'ALA' => 'Almaty',
+    'ALM' => 'Almaty oblysy',
+    'AST' => 'Astana',
+    'ATY' => 'Atyraū oblysy',
+    'BAY' => 'Bayqongyr',
+    'KAR' => 'Qaraghandy oblysy',
+    'KUS' => 'Qostanay oblysy',
+    'KZY' => 'Qyzylorda oblysy',
+    'MAN' => 'Mangghystaū oblysy',
+    'PAV' => 'Pavlodar oblysy',
+    'SEV' => 'Soltüstik Quzaqstan oblysy',
+    'VOS' => 'Shyghys Qazaqstan oblysy',
+    'YUZ' => 'Ongtüstik Qazaqstan oblysy',
+    'ZAP' => 'Batys Quzaqstan oblysy',
+    'ZHA' => 'Zhambyl oblysy',
+  ),
+  'LA' => 
+  array (
+    'AT' => 'Attapu',
+    'BK' => 'Bokèo',
+    'BL' => 'Bolikhamxai',
+    'CH' => 'Champasak',
+    'HO' => 'Houaphan',
+    'KH' => 'Khammouan',
+    'LM' => 'Louang Namtha',
+    'LP' => 'Louangphabang',
+    'OU' => 'Oudômxai',
+    'PH' => 'Phôngsali',
+    'SL' => 'Salavan',
+    'SV' => 'Savannakhét',
+    'VI' => 'Vientiane',
+    'VT' => 'Vientiane',
+    'XA' => 'Xaignabouli',
+    'XE' => 'Xékong',
+    'XI' => 'Xiangkhouang',
+    'XS' => 'Xaisômboun',
+  ),
+  'LB' => 
+  array (
+    'AK' => 'Aakkâr',
+    'AS' => 'Liban-Nord',
+    'BA' => 'Beyrouth',
+    'BH' => 'Baalbek-Hermel',
+    'BI' => 'Béqaa',
+    'JA' => 'Liban-Sud',
+    'JL' => 'Mont-Liban',
+    'NA' => 'Nabatîyé',
+  ),
+  'LC' => 
+  array (
+    '01' => 'Anse la Raye',
+    '02' => 'Castries',
+    '03' => 'Choiseul',
+    '05' => 'Dennery',
+    '06' => 'Gros Islet',
+    '07' => 'Laborie',
+    '08' => 'Micoud',
+    10 => 'Soufrière',
+    11 => 'Vieux Fort',
+    12 => 'Canaries',
+  ),
+  'LI' => 
+  array (
+    '01' => 'Balzers',
+    '02' => 'Eschen',
+    '03' => 'Gamprin',
+    '04' => 'Mauren',
+    '05' => 'Planken',
+    '06' => 'Ruggell',
+    '07' => 'Schaan',
+    '08' => 'Schellenberg',
+    '09' => 'Triesen',
+    10 => 'Triesenberg',
+    11 => 'Vaduz',
+  ),
+  'LK' => 
+  array (
+    1 => 'Basnāhira paḷāta',
+    11 => 'Kŏḷamba',
+    12 => 'Gampaha',
+    13 => 'Kaḷutara',
+    2 => 'Madhyama paḷāta',
+    21 => 'Mahanuvara',
+    22 => 'Mātale',
+    23 => 'Nuvara Ĕliya',
+    3 => 'Dakuṇu paḷāta',
+    31 => 'Gālla',
+    32 => 'Mātara',
+    33 => 'Hambantŏṭa',
+    4 => 'Uturu paḷāta',
+    41 => 'Yāpanaya',
+    42 => 'Kilinŏchchi',
+    43 => 'Mannārama',
+    44 => 'Vavuniyāva',
+    45 => 'Mulativ',
+    5 => 'Næ̆gĕnahira paḷāta',
+    51 => 'Maḍakalapuva',
+    52 => 'Ampāara',
+    53 => 'Trikuṇāmalaya',
+    6 => 'Vayamba paḷāta',
+    61 => 'Kuruṇægala',
+    62 => 'Puttalama',
+    7 => 'Uturumæ̆da paḷāta',
+    71 => 'Anurādhapura',
+    72 => 'Pŏḷŏnnaruva',
+    8 => 'Ūva paḷāta',
+    81 => 'Badulla',
+    82 => 'Mŏṇarāgala',
+    9 => 'Sabaragamuva paḷāta',
+    91 => 'Ratnapura',
+    92 => 'Kægalla',
+  ),
+  'LR' => 
+  array (
+    'BG' => 'Bong',
+    'BM' => 'Bomi',
+    'CM' => 'Grand Cape Mount',
+    'GB' => 'Grand Bassa',
+    'GG' => 'Grand Gedeh',
+    'GK' => 'Grand Kru',
+    'GP' => 'Gbarpolu',
+    'LO' => 'Lofa',
+    'MG' => 'Margibi',
+    'MO' => 'Montserrado',
+    'MY' => 'Maryland',
+    'NI' => 'Nimba',
+    'RG' => 'River Gee',
+    'RI' => 'Rivercess',
+    'SI' => 'Sinoe',
+  ),
+  'LS' => 
+  array (
+    'A' => 'Maseru',
+    'B' => 'Butha-Buthe',
+    'C' => 'Leribe',
+    'D' => 'Berea',
+    'E' => 'Mafeteng',
+    'F' => 'Mohale\'s Hoek',
+    'G' => 'Quthing',
+    'H' => 'Qacha\'s Nek',
+    'J' => 'Mokhotlong',
+    'K' => 'Thaba-Tseka',
+  ),
+  'LT' => 
+  array (
+    'AL' => 'Alytaus Apskritis',
+    'KL' => 'Klaipėdos Apskritis',
+    'KU' => 'Kauno Apskritis',
+    'MR' => 'Marijampolės Apskritis',
+    'PN' => 'Panevėžio Apskritis',
+    'SA' => 'Šiaulių Apskritis',
+    'TA' => 'Tauragés Apskritis',
+    'TE' => 'Telšių Apskritis',
+    'UT' => 'Utenos Apskritis',
+    'VL' => 'Vilniaus Apskritis',
+  ),
+  'LU' => 
+  array (
+    'D' => 'Diekirch',
+    'G' => 'Grevenmacher',
+    'L' => 'Luxembourg',
+  ),
+  'LV' => 
+  array (
+    '001' => 'Aglonas novads',
+    '002' => 'Aizkraukles novads',
+    '003' => 'Aizputes novads',
+    '004' => 'Aknīstes novads',
+    '005' => 'Alojas novads',
+    '006' => 'Alsungas novads',
+    '007' => 'Alūksnes novads',
+    '008' => 'Amatas novads',
+    '009' => 'Apes novads',
+    '010' => 'Auces novads',
+    '011' => 'Ādažu novads',
+    '012' => 'Babītes novads',
+    '013' => 'Baldones novads',
+    '014' => 'Baltinavas novads',
+    '015' => 'Balvu novads',
+    '016' => 'Bauskas novads',
+    '017' => 'Beverīnas novads',
+    '018' => 'Brocēnu novads',
+    '019' => 'Burtnieku novads',
+    '020' => 'Carnikavas novads',
+    '021' => 'Cesvaines novads',
+    '022' => 'Cēsu novads',
+    '023' => 'Ciblas novads',
+    '024' => 'Dagdas novads',
+    '025' => 'Daugavpils novads',
+    '026' => 'Dobeles novads',
+    '027' => 'Dundagas novads',
+    '028' => 'Durbes novads',
+    '029' => 'Engures novads',
+    '030' => 'Ērgļu novads',
+    '031' => 'Garkalnes novads',
+    '032' => 'Grobiņas novads',
+    '033' => 'Gulbenes novads',
+    '034' => 'Iecavas novads',
+    '035' => 'Ikšķiles novads',
+    '036' => 'Ilūkstes novads',
+    '037' => 'Inčukalna novads',
+    '038' => 'Jaunjelgavas novads',
+    '039' => 'Jaunpiebalgas novads',
+    '040' => 'Jaunpils novads',
+    '041' => 'Jelgavas novads',
+    '042' => 'Jēkabpils novads',
+    '043' => 'Kandavas novads',
+    '044' => 'Kārsavas novads',
+    '045' => 'Kocēnu novads',
+    '046' => 'Kokneses novads',
+    '047' => 'Krāslavas novads',
+    '048' => 'Krimuldas novads',
+    '049' => 'Krustpils novads',
+    '050' => 'Kuldīgas novads',
+    '051' => 'Ķeguma novads',
+    '052' => 'Ķekavas novads',
+    '053' => 'Lielvārdes novads',
+    '054' => 'Limbažu novads',
+    '055' => 'Līgatnes novads',
+    '056' => 'Līvānu novads',
+    '057' => 'Lubānas novads',
+    '058' => 'Ludzas novads',
+    '059' => 'Madonas novads',
+    '060' => 'Mazsalacas novads',
+    '061' => 'Mālpils novads',
+    '062' => 'Mārupes novads',
+    '063' => 'Mērsraga novads',
+    '064' => 'Naukšēnu novads',
+    '065' => 'Neretas novads',
+    '066' => 'Nīcas novads',
+    '067' => 'Ogres novads',
+    '068' => 'Olaines novads',
+    '069' => 'Ozolnieku novads',
+    '070' => 'Pārgaujas novads',
+    '071' => 'Pāvilostas novads',
+    '072' => 'Pļaviņu novads',
+    '073' => 'Preiļu novads',
+    '074' => 'Priekules novads',
+    '075' => 'Priekuļu novads',
+    '076' => 'Raunas novads',
+    '077' => 'Rēzeknes novads',
+    '078' => 'Riebiņu novads',
+    '079' => 'Rojas novads',
+    '080' => 'Ropažu novads',
+    '081' => 'Rucavas novads',
+    '082' => 'Rugāju novads',
+    '083' => 'Rundāles novads',
+    '084' => 'Rūjienas novads',
+    '085' => 'Salas novads',
+    '086' => 'Salacgrīvas novads',
+    '087' => 'Salaspils novads',
+    '088' => 'Saldus novads',
+    '089' => 'Saulkrastu novads',
+    '090' => 'Sējas novads',
+    '091' => 'Siguldas novads',
+    '092' => 'Skrīveru novads',
+    '093' => 'Skrundas novads',
+    '094' => 'Smiltenes novads',
+    '095' => 'Stopiņu novads',
+    '096' => 'Strenču novads',
+    '097' => 'Talsu novads',
+    '098' => 'Tērvetes novads',
+    '099' => 'Tukuma novads',
+    100 => 'Vaiņodes novads',
+    101 => 'Valkas novads',
+    102 => 'Varakļānu novads',
+    103 => 'Vārkavas novads',
+    104 => 'Vecpiebalgas novads',
+    105 => 'Vecumnieku novads',
+    106 => 'Ventspils novads',
+    107 => 'Viesītes novads',
+    108 => 'Viļakas novads',
+    109 => 'Viļānu novads',
+    110 => 'Zilupes novads',
+    'DGV' => 'Daugavpils',
+    'JEL' => 'Jelgava',
+    'JKB' => 'Jēkabpils',
+    'JUR' => 'Jūrmala',
+    'LPX' => 'Liepāja',
+    'REZ' => 'Rēzekne',
+    'RIX' => 'Rīga',
+    'VEN' => 'Ventspils',
+    'VMR' => 'Valmiera',
+  ),
+  'LY' => 
+  array (
+    'BA' => 'Banghāzī',
+    'BU' => 'Al Buţnān',
+    'DR' => 'Darnah',
+    'GT' => 'Ghāt',
+    'JA' => 'Al Jabal al Akhḑar',
+    'JB' => 'Jaghbūb',
+    'JG' => 'Al Jabal al Gharbī',
+    'JI' => 'Al Jifārah',
+    'JU' => 'Al Jufrah',
+    'KF' => 'Al Kufrah',
+    'MB' => 'Al Marqab',
+    'MI' => 'Mişrātah',
+    'MJ' => 'Al Marj',
+    'MQ' => 'Murzuq',
+    'NL' => 'Nālūt',
+    'NQ' => 'An Nuqaţ al Khams',
+    'SB' => 'Sabhā',
+    'SR' => 'Surt',
+    'TB' => 'Ţarābulus',
+    'WA' => 'Al Wāḩāt',
+    'WD' => 'Wādī al Ḩayāt',
+    'WS' => 'Wādī ash Shāţiʾ',
+    'ZA' => 'Az Zāwiyah',
+  ),
+  'MA' => 
+  array (
+    '01' => 'Tanger-Tétouan-Al Hoceïma',
+    '02' => 'L\'Oriental',
+    '03' => 'Fès-Meknès',
+    '04' => 'Rabat-Salé-Kénitra',
+    '05' => 'Béni Mellal-Khénifra',
+    '06' => 'Casablanca-Settat',
+    '07' => 'Marrakech-Safi',
+    '08' => 'Drâa-Tafilalet',
+    '09' => 'Souss-Massa',
+    10 => 'Guelmim-Oued Noun (EH-partial)',
+    11 => 'Laâyoune-Sakia El Hamra (EH-partial)',
+    12 => 'Dakhla-Oued Ed-Dahab (EH)',
+    'AGD' => 'Agadir-Ida-Ou-Tanane',
+    'AOU' => 'Aousserd (EH)',
+    'ASZ' => 'Assa-Zag (EH-partial)',
+    'AZI' => 'Azilal',
+    'BEM' => 'Béni Mellal',
+    'BER' => 'Berkane',
+    'BES' => 'Benslimane',
+    'BOD' => 'Boujdour (EH)',
+    'BOM' => 'Boulemane',
+    'BRR' => 'Berrechid',
+    'CAS' => 'Casablanca',
+    'CHE' => 'Chefchaouen',
+    'CHI' => 'Chichaoua',
+    'CHT' => 'Chtouka-Ait Baha',
+    'DRI' => 'Driouch',
+    'ERR' => 'Errachidia',
+    'ESI' => 'Essaouira',
+    'ESM' => 'Es-Semara (EH-partial)',
+    'FAH' => 'Fahs-Anjra',
+    'FES' => 'Fès',
+    'FIG' => 'Figuig',
+    'FQH' => 'Fquih Ben Salah',
+    'GUE' => 'Guelmim',
+    'GUF' => 'Guercif',
+    'HAJ' => 'El Hajeb',
+    'HAO' => 'Al Haouz',
+    'HOC' => 'Al Hoceïma',
+    'IFR' => 'Ifrane',
+    'INE' => 'Inezgane-Ait Melloul',
+    'JDI' => 'El Jadida',
+    'JRA' => 'Jerada',
+    'KEN' => 'Kénitra',
+    'KES' => 'El Kelâa des Sraghna',
+    'KHE' => 'Khemisset',
+    'KHN' => 'Khenifra',
+    'KHO' => 'Khouribga',
+    'LAA' => 'Laâyoune (EH)',
+    'LAR' => 'Larache',
+    'MAR' => 'Marrakech',
+    'MDF' => 'M’diq-Fnideq',
+    'MED' => 'Médiouna',
+    'MEK' => 'Meknès',
+    'MID' => 'Midelt',
+    'MOH' => 'Mohammadia',
+    'MOU' => 'Moulay Yacoub',
+    'NAD' => 'Nador',
+    'NOU' => 'Nouaceur',
+    'OUA' => 'Ouarzazate',
+    'OUD' => 'Oued Ed-Dahab (EH)',
+    'OUJ' => 'Oujda-Angad',
+    'OUZ' => 'Ouezzane',
+    'RAB' => 'Rabat',
+    'REH' => 'Rehamna',
+    'SAF' => 'Safi',
+    'SAL' => 'Salé',
+    'SEF' => 'Sefrou',
+    'SET' => 'Settat',
+    'SIB' => 'Sidi Bennour',
+    'SIF' => 'Sidi Ifni',
+    'SIK' => 'Sidi Kacem',
+    'SIL' => 'Sidi Slimane',
+    'SKH' => 'Skhirate-Témara',
+    'TAF' => 'Tarfaya (EH-partial)',
+    'TAI' => 'Taourirt',
+    'TAO' => 'Taounate',
+    'TAR' => 'Taroudant',
+    'TAT' => 'Tata',
+    'TAZ' => 'Taza',
+    'TET' => 'Tétouan',
+    'TIN' => 'Tinghir',
+    'TIZ' => 'Tiznit',
+    'TNG' => 'Tanger-Assilah',
+    'TNT' => 'Tan-Tan (EH-partial)',
+    'YUS' => 'Youssoufia',
+    'ZAG' => 'Zagora',
+  ),
+  'MC' => 
+  array (
+    'CL' => 'La Colle',
+    'CO' => 'La Condamine',
+    'FO' => 'Fontvieille',
+    'GA' => 'La Gare',
+    'JE' => 'Jardin Exotique',
+    'LA' => 'Larvotto',
+    'MA' => 'Malbousquet',
+    'MC' => 'Monte-Carlo',
+    'MG' => 'Moneghetti',
+    'MO' => 'Monaco-Ville',
+    'MU' => 'Moulins',
+    'PH' => 'Port-Hercule',
+    'SD' => 'Sainte-Dévote',
+    'SO' => 'La Source',
+    'SP' => 'Spélugues',
+    'SR' => 'Saint-Roman',
+    'VR' => 'Vallon de la Rousse',
+  ),
+  'MD' => 
+  array (
+    'AN' => 'Anenii Noi',
+    'BA' => 'Bălți',
+    'BD' => 'Tighina',
+    'BR' => 'Briceni',
+    'BS' => 'Basarabeasca',
+    'CA' => 'Cahul',
+    'CL' => 'Călărași',
+    'CM' => 'Cimișlia',
+    'CR' => 'Criuleni',
+    'CS' => 'Căușeni',
+    'CT' => 'Cantemir',
+    'CU' => 'Chișinău',
+    'DO' => 'Dondușeni',
+    'DR' => 'Drochia',
+    'DU' => 'Dubăsari',
+    'ED' => 'Edineț',
+    'FA' => 'Fălești',
+    'FL' => 'Florești',
+    'GA' => 'Găgăuzia, Unitatea teritorială autonomă',
+    'GL' => 'Glodeni',
+    'HI' => 'Hîncești',
+    'IA' => 'Ialoveni',
+    'LE' => 'Leova',
+    'NI' => 'Nisporeni',
+    'OC' => 'Ocnița',
+    'OR' => 'Orhei',
+    'RE' => 'Rezina',
+    'RI' => 'Rîșcani',
+    'SD' => 'Șoldănești',
+    'SI' => 'Sîngerei',
+    'SN' => 'Stînga Nistrului, unitatea teritorială din',
+    'SO' => 'Soroca',
+    'ST' => 'Strășeni',
+    'SV' => 'Ștefan Vodă',
+    'TA' => 'Taraclia',
+    'TE' => 'Telenești',
+    'UN' => 'Ungheni',
+  ),
+  'ME' => 
+  array (
+    '01' => 'Andrijevica',
+    '02' => 'Bar',
+    '03' => 'Berane',
+    '04' => 'Bijelo Polje',
+    '05' => 'Budva',
+    '06' => 'Cetinje',
+    '07' => 'Danilovgrad',
+    '08' => 'Herceg-Novi',
+    '09' => 'Kolašin',
+    10 => 'Kotor',
+    11 => 'Mojkovac',
+    12 => 'Nikšić',
+    13 => 'Plav',
+    14 => 'Pljevlja',
+    15 => 'Plužine',
+    16 => 'Podgorica',
+    17 => 'Rožaje',
+    18 => 'Šavnik',
+    19 => 'Tivat',
+    20 => 'Ulcinj',
+    21 => 'Žabljak',
+  ),
+  'MG' => 
+  array (
+    'A' => 'Toamasina',
+    'D' => 'Antsiranana',
+    'F' => 'Fianarantsoa',
+    'M' => 'Mahajanga',
+    'T' => 'Antananarivo',
+    'U' => 'Toliara',
+  ),
+  'MH' => 
+  array (
+    'ALK' => 'Ailuk',
+    'ALL' => 'Ailinglaplap',
+    'ARN' => 'Arno',
+    'AUR' => 'Aur',
+    'EBO' => 'Ebon',
+    'ENI' => 'Enewetak',
+    'JAB' => 'Jabat',
+    'JAL' => 'Jaluit',
+    'KIL' => 'Kili',
+    'KWA' => 'Kwajalein',
+    'L' => 'Ralik chain',
+    'LAE' => 'Lae',
+    'LIB' => 'Lib',
+    'LIK' => 'Likiep',
+    'MAJ' => 'Majuro',
+    'MAL' => 'Maloelap',
+    'MEJ' => 'Mejit',
+    'MIL' => 'Mili',
+    'NMK' => 'Namdrik',
+    'NMU' => 'Namu',
+    'RON' => 'Rongelap',
+    'T' => 'Ratak chain',
+    'UJA' => 'Ujae',
+    'UTI' => 'Utirik',
+    'WTJ' => 'Wotje',
+    'WTN' => 'Wotho',
+  ),
+  'MK' => 
+  array (
+    '01' => 'Aerodrom',
+    '02' => 'Aračinovo',
+    '03' => 'Berovo',
+    '04' => 'Bitola',
+    '05' => 'Bogdanci',
+    '06' => 'Bogovinje',
+    '07' => 'Bosilovo',
+    '08' => 'Brvenica',
+    '09' => 'Butel',
+    10 => 'Valandovo',
+    11 => 'Vasilevo',
+    12 => 'Vevčani',
+    13 => 'Veles',
+    14 => 'Vinica',
+    15 => 'Vraneštica',
+    16 => 'Vrapčište',
+    17 => 'Gazi Baba',
+    18 => 'Gevgelija',
+    19 => 'Gostivar',
+    20 => 'Gradsko',
+    21 => 'Debar',
+    22 => 'Debarca',
+    23 => 'Delčevo',
+    24 => 'Demir Kapija',
+    25 => 'Demir Hisar',
+    26 => 'Dojran',
+    27 => 'Dolneni',
+    28 => 'Drugovo',
+    29 => 'Gjorče Petrov',
+    30 => 'Želino',
+    31 => 'Zajas',
+    32 => 'Zelenikovo',
+    33 => 'Zrnovci',
+    34 => 'Ilinden',
+    35 => 'Jegunovce',
+    36 => 'Kavadarci',
+    37 => 'Karbinci',
+    38 => 'Karpoš',
+    39 => 'Kisela Voda',
+    40 => 'Kičevo',
+    41 => 'Konče',
+    42 => 'Kočani',
+    43 => 'Kratovo',
+    44 => 'Kriva Palanka',
+    45 => 'Krivogaštani',
+    46 => 'Kruševo',
+    47 => 'Kumanovo',
+    48 => 'Lipkovo',
+    49 => 'Lozovo',
+    50 => 'Mavrovo-i-Rostuša',
+    51 => 'Makedonska Kamenica',
+    52 => 'Makedonski Brod',
+    53 => 'Mogila',
+    54 => 'Negotino',
+    55 => 'Novaci',
+    56 => 'Novo Selo',
+    57 => 'Oslomej',
+    58 => 'Ohrid',
+    59 => 'Petrovec',
+    60 => 'Pehčevo',
+    61 => 'Plasnica',
+    62 => 'Prilep',
+    63 => 'Probištip',
+    64 => 'Radoviš',
+    65 => 'Rankovce',
+    66 => 'Resen',
+    67 => 'Rosoman',
+    68 => 'Saraj',
+    69 => 'Sveti Nikole',
+    70 => 'Sopište',
+    71 => 'Staro Nagoričane',
+    72 => 'Struga',
+    73 => 'Strumica',
+    74 => 'Studeničani',
+    75 => 'Tearce',
+    76 => 'Tetovo',
+    77 => 'Centar',
+    78 => 'Centar Župa',
+    79 => 'Čair',
+    80 => 'Čaška',
+    81 => 'Češinovo-Obleševo',
+    82 => 'Čučer Sandevo',
+    83 => 'Štip',
+    84 => 'Šuto Orizari',
+    85 => 'Skopje',
+  ),
+  'ML' => 
+  array (
+    1 => 'Kayes',
+    2 => 'Koulikoro',
+    3 => 'Sikasso',
+    4 => 'Ségou',
+    5 => 'Mopti',
+    6 => 'Tombouctou',
+    7 => 'Gao',
+    8 => 'Kidal',
+    'BKO' => 'Bamako',
+  ),
+  'MM' => 
+  array (
+    '01' => 'Sagaing',
+    '02' => 'Bago',
+    '03' => 'Magway',
+    '04' => 'Mandalay',
+    '05' => 'Tanintharyi',
+    '06' => 'Yangon',
+    '07' => 'Ayeyarwady',
+    11 => 'Kachin',
+    12 => 'Kayah',
+    13 => 'Kayin',
+    14 => 'Chin',
+    15 => 'Mon',
+    16 => 'Rakhine',
+    17 => 'Shan',
+  ),
+  'MN' => 
+  array (
+    '035' => 'Orhon',
+    '037' => 'Darhan uul',
+    '039' => 'Hentiy',
+    '041' => 'Hövsgöl',
+    '043' => 'Hovd',
+    '046' => 'Uvs',
+    '047' => 'Töv',
+    '049' => 'Selenge',
+    '051' => 'Sühbaatar',
+    '053' => 'Ömnögovi',
+    '055' => 'Övörhangay',
+    '057' => 'Dzavhan',
+    '059' => 'Dundgovi',
+    '061' => 'Dornod',
+    '063' => 'Dornogovi',
+    '064' => 'Govi-Sumber',
+    '065' => 'Govi-Altay',
+    '067' => 'Bulgan',
+    '069' => 'Bayanhongor',
+    '071' => 'Bayan-Ölgiy',
+    '073' => 'Arhangay',
+    1 => 'Ulanbaatar',
+  ),
+  'MR' => 
+  array (
+    '01' => 'Hodh ech Chargui',
+    '02' => 'Hodh el Charbi',
+    '03' => 'Assaba',
+    '04' => 'Gorgol',
+    '05' => 'Brakna',
+    '06' => 'Trarza',
+    '07' => 'Adrar',
+    '08' => 'Dakhlet Nouadhibou',
+    '09' => 'Tagant',
+    10 => 'Guidimaka',
+    11 => 'Tiris Zemmour',
+    12 => 'Inchiri',
+    'NKC' => 'Nouakchott',
+  ),
+  'MT' => 
+  array (
+    '01' => 'Attard',
+    '02' => 'Balzan',
+    '03' => 'Birgu',
+    '04' => 'Birkirkara',
+    '05' => 'Birżebbuġa',
+    '06' => 'Bormla',
+    '07' => 'Dingli',
+    '08' => 'Fgura',
+    '09' => 'Floriana',
+    10 => 'Fontana',
+    11 => 'Gudja',
+    12 => 'Gżira',
+    13 => 'Għajnsielem',
+    14 => 'Għarb',
+    15 => 'Għargħur',
+    16 => 'Għasri',
+    17 => 'Għaxaq',
+    18 => 'Ħamrun',
+    19 => 'Iklin',
+    20 => 'Isla',
+    21 => 'Kalkara',
+    22 => 'Kerċem',
+    23 => 'Kirkop',
+    24 => 'Lija',
+    25 => 'Luqa',
+    26 => 'Marsa',
+    27 => 'Marsaskala',
+    28 => 'Marsaxlokk',
+    29 => 'Mdina',
+    30 => 'Mellieħa',
+    31 => 'Mġarr',
+    32 => 'Mosta',
+    33 => 'Mqabba',
+    34 => 'Msida',
+    35 => 'Mtarfa',
+    36 => 'Munxar',
+    37 => 'Nadur',
+    38 => 'Naxxar',
+    39 => 'Paola',
+    40 => 'Pembroke',
+    41 => 'Pietà',
+    42 => 'Qala',
+    43 => 'Qormi',
+    44 => 'Qrendi',
+    45 => 'Rabat Għawdex',
+    46 => 'Rabat Malta',
+    47 => 'Safi',
+    48 => 'San Ġiljan',
+    49 => 'San Ġwann',
+    50 => 'San Lawrenz',
+    51 => 'San Pawl il-Baħar',
+    52 => 'Sannat',
+    53 => 'Santa Luċija',
+    54 => 'Santa Venera',
+    55 => 'Siġġiewi',
+    56 => 'Sliema',
+    57 => 'Swieqi',
+    58 => 'Ta’ Xbiex',
+    59 => 'Tarxien',
+    60 => 'Valletta',
+    61 => 'Xagħra',
+    62 => 'Xewkija',
+    63 => 'Xgħajra',
+    64 => 'Żabbar',
+    65 => 'Żebbuġ Għawdex',
+    66 => 'Żebbuġ Malta',
+    67 => 'Żejtun',
+    68 => 'Żurrieq',
+  ),
+  'MU' => 
+  array (
+    'AG' => 'Agalega Islands',
+    'BL' => 'Black River',
+    'BR' => 'Beau Bassin-Rose Hill',
+    'CC' => 'Cargados Carajos Shoals',
+    'CU' => 'Curepipe',
+    'FL' => 'Flacq',
+    'GP' => 'Grand Port',
+    'MO' => 'Moka',
+    'PA' => 'Pamplemousses',
+    'PL' => 'Port Louis',
+    'PU' => 'Port Louis',
+    'PW' => 'Plaines Wilhems',
+    'QB' => 'Quatre Bornes',
+    'RO' => 'Rodrigues Island',
+    'RR' => 'Rivière du Rempart',
+    'SA' => 'Savanne',
+    'VP' => 'Vacoas-Phoenix',
+  ),
+  'MV' => 
+  array (
+    '00' => 'Alifu Dhaalu',
+    '01' => 'Seenu',
+    '02' => 'Alifu Alifu',
+    '03' => 'Lhaviyani',
+    '04' => 'Vaavu',
+    '05' => 'Laamu',
+    '07' => 'Haa Alifu',
+    '08' => 'Thaa',
+    12 => 'Meemu',
+    13 => 'Raa',
+    14 => 'Faafu',
+    17 => 'Dhaalu',
+    20 => 'Baa',
+    23 => 'Haa Dhaalu',
+    24 => 'Shaviyani',
+    25 => 'Noonu',
+    26 => 'Kaafu',
+    27 => 'Gaafu Alifu',
+    28 => 'Gaafu Dhaalu',
+    29 => 'Gnaviyani',
+    'CE' => 'Central',
+    'MLE' => 'Male',
+    'NC' => 'North Central',
+    'NO' => 'North',
+    'SC' => 'South Central',
+    'SU' => 'South',
+    'UN' => 'Upper North',
+    'US' => 'Upper South',
+  ),
+  'MW' => 
+  array (
+    'BA' => 'Balaka',
+    'BL' => 'Blantyre',
+    'C' => 'Central Region',
+    'CK' => 'Chikwawa',
+    'CR' => 'Chiradzulu',
+    'CT' => 'Chitipa',
+    'DE' => 'Dedza',
+    'DO' => 'Dowa',
+    'KR' => 'Karonga',
+    'KS' => 'Kasungu',
+    'LI' => 'Lilongwe',
+    'LK' => 'Likoma',
+    'MC' => 'Mchinji',
+    'MG' => 'Mangochi',
+    'MH' => 'Machinga',
+    'MU' => 'Mulanje',
+    'MW' => 'Mwanza',
+    'MZ' => 'Mzimba',
+    'N' => 'Northern Region',
+    'NB' => 'Nkhata Bay',
+    'NE' => 'Neno',
+    'NI' => 'Ntchisi',
+    'NK' => 'Nkhotakota',
+    'NS' => 'Nsanje',
+    'NU' => 'Ntcheu',
+    'PH' => 'Phalombe',
+    'RU' => 'Rumphi',
+    'S' => 'Southern Region',
+    'SA' => 'Salima',
+    'TH' => 'Thyolo',
+    'ZO' => 'Zomba',
+  ),
+  'MX' => 
+  array (
+    'AGU' => 'Aguascalientes',
+    'BCN' => 'Baja California',
+    'BCS' => 'Baja California Sur',
+    'CAM' => 'Campeche',
+    'CHH' => 'Chihuahua',
+    'CHP' => 'Chiapas',
+    'CMX' => 'Ciudad de México',
+    'COA' => 'Coahuila de Zaragoza',
+    'COL' => 'Colima',
+    'DUR' => 'Durango',
+    'GRO' => 'Guerrero',
+    'GUA' => 'Guanajuato',
+    'HID' => 'Hidalgo',
+    'JAL' => 'Jalisco',
+    'MEX' => 'México',
+    'MIC' => 'Michoacán de Ocampo',
+    'MOR' => 'Morelos',
+    'NAY' => 'Nayarit',
+    'NLE' => 'Nuevo León',
+    'OAX' => 'Oaxaca',
+    'PUE' => 'Puebla',
+    'QUE' => 'Querétaro',
+    'ROO' => 'Quintana Roo',
+    'SIN' => 'Sinaloa',
+    'SLP' => 'San Luis Potosí',
+    'SON' => 'Sonora',
+    'TAB' => 'Tabasco',
+    'TAM' => 'Tamaulipas',
+    'TLA' => 'Tlaxcala',
+    'VER' => 'Veracruz de Ignacio de la Llave',
+    'YUC' => 'Yucatán',
+    'ZAC' => 'Zacatecas',
+  ),
+  'MY' => 
+  array (
+    '01' => 'Johor',
+    '02' => 'Kedah',
+    '03' => 'Kelantan',
+    '04' => 'Melaka',
+    '05' => 'Negeri Sembilan',
+    '06' => 'Pahang',
+    '07' => 'Pulau Pinang',
+    '08' => 'Perak',
+    '09' => 'Perlis',
+    10 => 'Selangor',
+    11 => 'Terengganu',
+    12 => 'Sabah',
+    13 => 'Sarawak',
+    14 => 'Wilayah Persekutuan Kuala Lumpur',
+    15 => 'Wilayah Persekutuan Labuan',
+    16 => 'Wilayah Persekutuan Putrajaya',
+  ),
+  'MZ' => 
+  array (
+    'A' => 'Niassa',
+    'B' => 'Manica',
+    'G' => 'Gaza',
+    'I' => 'Inhambane',
+    'L' => 'Maputo',
+    'MPM' => 'Maputo (city)',
+    'N' => 'Numpula',
+    'P' => 'Cabo Delgado',
+    'Q' => 'Zambezia',
+    'S' => 'Sofala',
+    'T' => 'Tete',
+  ),
+  'NA' => 
+  array (
+    'CA' => 'Caprivi',
+    'ER' => 'Erongo',
+    'HA' => 'Hardap',
+    'KA' => 'Karas',
+    'KH' => 'Khomas',
+    'KU' => 'Kunene',
+    'OD' => 'Otjozondjupa',
+    'OH' => 'Omaheke',
+    'OK' => 'Okavango',
+    'ON' => 'Oshana',
+    'OS' => 'Omusati',
+    'OT' => 'Oshikoto',
+    'OW' => 'Ohangwena',
+  ),
+  'NE' => 
+  array (
+    1 => 'Agadez',
+    2 => 'Diffa',
+    3 => 'Dosso',
+    4 => 'Maradi',
+    5 => 'Tahoua',
+    6 => 'Tillabéri',
+    7 => 'Zinder',
+    8 => 'Niamey',
+  ),
+  'NG' => 
+  array (
+    'AB' => 'Abia',
+    'AD' => 'Adamawa',
+    'AK' => 'Akwa Ibom',
+    'AN' => 'Anambra',
+    'BA' => 'Bauchi',
+    'BE' => 'Benue',
+    'BO' => 'Borno',
+    'BY' => 'Bayelsa',
+    'CR' => 'Cross River',
+    'DE' => 'Delta',
+    'EB' => 'Ebonyi',
+    'ED' => 'Edo',
+    'EK' => 'Ekiti',
+    'EN' => 'Enugu',
+    'FC' => 'Abuja Capital Territory',
+    'GO' => 'Gombe',
+    'IM' => 'Imo',
+    'JI' => 'Jigawa',
+    'KD' => 'Kaduna',
+    'KE' => 'Kebbi',
+    'KN' => 'Kano',
+    'KO' => 'Kogi',
+    'KT' => 'Katsina',
+    'KW' => 'Kwara',
+    'LA' => 'Lagos',
+    'NA' => 'Nassarawa',
+    'NI' => 'Niger',
+    'OG' => 'Ogun',
+    'ON' => 'Ondo',
+    'OS' => 'Osun',
+    'OY' => 'Oyo',
+    'PL' => 'Plateau',
+    'RI' => 'Rivers',
+    'SO' => 'Sokoto',
+    'TA' => 'Taraba',
+    'YO' => 'Yobe',
+    'ZA' => 'Zamfara',
+  ),
+  'NI' => 
+  array (
+    'AN' => 'Atlántico Norte',
+    'AS' => 'Atlántico Sur',
+    'BO' => 'Boaco',
+    'CA' => 'Carazo',
+    'CI' => 'Chinandega',
+    'CO' => 'Chontales',
+    'ES' => 'Estelí',
+    'GR' => 'Granada',
+    'JI' => 'Jinotega',
+    'LE' => 'León',
+    'MD' => 'Madriz',
+    'MN' => 'Managua',
+    'MS' => 'Masaya',
+    'MT' => 'Matagalpa',
+    'NS' => 'Nueva Segovia',
+    'RI' => 'Rivas',
+    'SJ' => 'Río San Juan',
+  ),
+  'NL' => 
+  array (
+    'AW' => 'Aruba',
+    'BQ1' => 'Bonaire',
+    'BQ2' => 'Saba',
+    'BQ3' => 'Sint Eustatius',
+    'CW' => 'Curaçao',
+    'DR' => 'Drenthe',
+    'FL' => 'Flevoland',
+    'FR' => 'Friesland',
+    'GE' => 'Gelderland',
+    'GR' => 'Groningen',
+    'LI' => 'Limburg',
+    'NB' => 'Noord-Brabant',
+    'NH' => 'Noord-Holland',
+    'OV' => 'Overijssel',
+    'SX' => 'Sint Maarten',
+    'UT' => 'Utrecht',
+    'ZE' => 'Zeeland',
+    'ZH' => 'Zuid-Holland',
+  ),
+  'NO' => 
+  array (
+    '01' => 'Østfold',
+    '02' => 'Akershus',
+    '03' => 'Oslo',
+    '04' => 'Hedmark',
+    '05' => 'Oppland',
+    '06' => 'Buskerud',
+    '07' => 'Vestfold',
+    '08' => 'Telemark',
+    '09' => 'Aust-Agder',
+    10 => 'Vest-Agder',
+    11 => 'Rogaland',
+    12 => 'Hordaland',
+    14 => 'Sogn og Fjordane',
+    15 => 'Møre og Romsdal',
+    16 => 'Sør-Trøndelag',
+    17 => 'Nord-Trøndelag',
+    18 => 'Nordland',
+    19 => 'Troms',
+    20 => 'Finnmark',
+    21 => 'Svalbard (Arctic Region)',
+    22 => 'Jan Mayen (Arctic Region)',
+  ),
+  'NP' => 
+  array (
+    1 => 'Madhyamanchal',
+    2 => 'Madhya Pashchimanchal',
+    3 => 'Pashchimanchal',
+    4 => 'Purwanchal',
+    5 => 'Sudur Pashchimanchal',
+    'BA' => 'Bagmati',
+    'BH' => 'Bheri',
+    'DH' => 'Dhawalagiri',
+    'GA' => 'Gandaki',
+    'JA' => 'Janakpur',
+    'KA' => 'Karnali',
+    'KO' => 'Kosi',
+    'LU' => 'Lumbini',
+    'MA' => 'Mahakali',
+    'ME' => 'Mechi',
+    'NA' => 'Narayani',
+    'RA' => 'Rapti',
+    'SA' => 'Sagarmatha',
+    'SE' => 'Seti',
+  ),
+  'NR' => 
+  array (
+    '01' => 'Aiwo',
+    '02' => 'Anabar',
+    '03' => 'Anetan',
+    '04' => 'Anibare',
+    '05' => 'Baiti',
+    '06' => 'Boe',
+    '07' => 'Buada',
+    '08' => 'Denigomodu',
+    '09' => 'Ewa',
+    10 => 'Ijuw',
+    11 => 'Meneng',
+    12 => 'Nibok',
+    13 => 'Uaboe',
+    14 => 'Yaren',
+  ),
+  'NZ' => 
+  array (
+    'AUK' => 'Auckland',
+    'BOP' => 'Bay of Plenty',
+    'CAN' => 'Canterbury',
+    'CIT' => 'Chatham Islands Territory',
+    'GIS' => 'Gisborne District',
+    'HKB' => 'Hawke\'s Bay',
+    'MBH' => 'Marlborough District',
+    'MWT' => 'Manawatu-Wanganui',
+    'N' => 'North Island',
+    'NSN' => 'Nelson City',
+    'NTL' => 'Northland',
+    'OTA' => 'Otago',
+    'S' => 'South Island',
+    'STL' => 'Southland',
+    'TAS' => 'Tasman District',
+    'TKI' => 'Taranaki',
+    'WGN' => 'Wellington',
+    'WKO' => 'Waikato',
+    'WTC' => 'West Coast',
+  ),
+  'OM' => 
+  array (
+    'BA' => 'Al Bāţinah',
+    'BU' => 'Al Buraymī',
+    'DA' => 'Ad Dākhilīya',
+    'MA' => 'Masqaţ',
+    'MU' => 'Musandam',
+    'SH' => 'Ash Sharqīyah',
+    'WU' => 'Al Wusţá',
+    'ZA' => 'Az̧ Z̧āhirah',
+    'ZU' => 'Z̧ufār',
+  ),
+  'PA' => 
+  array (
+    1 => 'Bocas del Toro',
+    2 => 'Coclé',
+    3 => 'Colón',
+    4 => 'Chiriquí',
+    5 => 'Darién',
+    6 => 'Herrera',
+    7 => 'Los Santos',
+    8 => 'Panamá',
+    9 => 'Veraguas',
+    'EM' => 'Emberá',
+    'KY' => 'Kuna Yala',
+    'NB' => 'Ngöbe-Buglé',
+  ),
+  'PE' => 
+  array (
+    'AMA' => 'Amazonas',
+    'ANC' => 'Ancash',
+    'APU' => 'Apurímac',
+    'ARE' => 'Arequipa',
+    'AYA' => 'Ayacucho',
+    'CAJ' => 'Cajamarca',
+    'CAL' => 'El Callao',
+    'CUS' => 'Cusco [Cuzco]',
+    'HUC' => 'Huánuco',
+    'HUV' => 'Huancavelica',
+    'ICA' => 'Ica',
+    'JUN' => 'Junín',
+    'LAL' => 'La Libertad',
+    'LAM' => 'Lambayeque',
+    'LIM' => 'Lima',
+    'LMA' => 'Municipalidad Metropolitana de Lima',
+    'LOR' => 'Loreto',
+    'MDD' => 'Madre de Dios',
+    'MOQ' => 'Moquegua',
+    'PAS' => 'Pasco',
+    'PIU' => 'Piura',
+    'PUN' => 'Puno',
+    'SAM' => 'San Martín',
+    'TAC' => 'Tacna',
+    'TUM' => 'Tumbes',
+    'UCA' => 'Ucayali',
+  ),
+  'PG' => 
+  array (
+    'CPK' => 'Chimbu',
+    'CPM' => 'Central',
+    'EBR' => 'East New Britain',
+    'EHG' => 'Eastern Highlands',
+    'EPW' => 'Enga',
+    'ESW' => 'East Sepik',
+    'GPK' => 'Gulf',
+    'MBA' => 'Milne Bay',
+    'MPL' => 'Morobe',
+    'MPM' => 'Madang',
+    'MRL' => 'Manus',
+    'NCD' => 'National Capital District (Port Moresby)',
+    'NIK' => 'New Ireland',
+    'NPP' => 'Northern',
+    'NSB' => 'Bougainville',
+    'SAN' => 'Sandaun',
+    'SHM' => 'Southern Highlands',
+    'WBK' => 'West New Britain',
+    'WHM' => 'Western Highlands',
+    'WPD' => 'Western',
+  ),
+  'PH' => 
+  array (
+    '00' => 'National Capital Region',
+    '01' => 'Ilocos (Region I)',
+    '02' => 'Cagayan Valley (Region II)',
+    '03' => 'Central Luzon (Region III)',
+    '05' => 'Bicol (Region V)',
+    '06' => 'Western Visayas (Region VI)',
+    '07' => 'Central Visayas (Region VII)',
+    '08' => 'Eastern Visayas (Region VIII)',
+    '09' => 'Zamboanga Peninsula (Region IX)',
+    10 => 'Northern Mindanao (Region X)',
+    11 => 'Davao (Region XI)',
+    12 => 'Soccsksargen (Region XII)',
+    13 => 'Caraga (Region XIII)',
+    14 => 'Autonomous Region in Muslim Mindanao (ARMM)',
+    15 => 'Cordillera Administrative Region (CAR)',
+    40 => 'CALABARZON (Region IV-A)',
+    41 => 'MIMAROPA (Region IV-B)',
+    'ABR' => 'Abra',
+    'AGN' => 'Agusan del Norte',
+    'AGS' => 'Agusan del Sur',
+    'AKL' => 'Aklan',
+    'ALB' => 'Albay',
+    'ANT' => 'Antique',
+    'APA' => 'Apayao',
+    'AUR' => 'Aurora',
+    'BAN' => 'Batasn',
+    'BAS' => 'Basilan',
+    'BEN' => 'Benguet',
+    'BIL' => 'Biliran',
+    'BOH' => 'Bohol',
+    'BTG' => 'Batangas',
+    'BTN' => 'Batanes',
+    'BUK' => 'Bukidnon',
+    'BUL' => 'Bulacan',
+    'CAG' => 'Cagayan',
+    'CAM' => 'Camiguin',
+    'CAN' => 'Camarines Norte',
+    'CAP' => 'Capiz',
+    'CAS' => 'Camarines Sur',
+    'CAT' => 'Catanduanes',
+    'CAV' => 'Cavite',
+    'CEB' => 'Cebu',
+    'COM' => 'Compostela Valley',
+    'DAO' => 'Davao Oriental',
+    'DAS' => 'Davao del Sur',
+    'DAV' => 'Davao del Norte',
+    'DIN' => 'Dinagat Islands',
+    'EAS' => 'Eastern Samar',
+    'GUI' => 'Guimaras',
+    'IFU' => 'Ifugao',
+    'ILI' => 'Iloilo',
+    'ILN' => 'Ilocos Norte',
+    'ILS' => 'Ilocos Sur',
+    'ISA' => 'Isabela',
+    'KAL' => 'Kalinga-Apayso',
+    'LAG' => 'Laguna',
+    'LAN' => 'Lanao del Norte',
+    'LAS' => 'Lanao del Sur',
+    'LEY' => 'Leyte',
+    'LUN' => 'La Union',
+    'MAD' => 'Marinduque',
+    'MAG' => 'Maguindanao',
+    'MAS' => 'Masbate',
+    'MDC' => 'Mindoro Occidental',
+    'MDR' => 'Mindoro Oriental',
+    'MOU' => 'Mountain Province',
+    'MSC' => 'Misamis Occidental',
+    'MSR' => 'Misamis Oriental',
+    'NCO' => 'North Cotabato',
+    'NEC' => 'Negros Occidental',
+    'NER' => 'Negros Oriental',
+    'NSA' => 'Northern Samar',
+    'NUE' => 'Nueva Ecija',
+    'NUV' => 'Nueva Vizcaya',
+    'PAM' => 'Pampanga',
+    'PAN' => 'Pangasinan',
+    'PLW' => 'Palawan',
+    'QUE' => 'Quezon',
+    'QUI' => 'Quirino',
+    'RIZ' => 'Rizal',
+    'ROM' => 'Romblon',
+    'SAR' => 'Sarangani',
+    'SCO' => 'South Cotabato',
+    'SIG' => 'Siquijor',
+    'SLE' => 'Southern Leyte',
+    'SLU' => 'Sulu',
+    'SOR' => 'Sorsogon',
+    'SUK' => 'Sultan Kudarat',
+    'SUN' => 'Surigao del Norte',
+    'SUR' => 'Surigao del Sur',
+    'TAR' => 'Tarlac',
+    'TAW' => 'Tawi-Tawi',
+    'WSA' => 'Western Samar',
+    'ZAN' => 'Zamboanga del Norte',
+    'ZAS' => 'Zamboanga del Sur',
+    'ZMB' => 'Zambales',
+    'ZSI' => 'Zamboanga Sibugay',
+  ),
+  'PK' => 
+  array (
+    'BA' => 'Balochistan',
+    'GB' => 'Gilgit-Baltistan',
+    'IS' => 'Islamabad',
+    'JK' => 'Azad Kashmir',
+    'KP' => 'Khyber Pakhtunkhwa',
+    'PB' => 'Punjab',
+    'SD' => 'Sindh',
+    'TA' => 'Federally Administered Tribal Areas',
+  ),
+  'PL' => 
+  array (
+    'DS' => 'Dolnośląskie',
+    'KP' => 'Kujawsko-pomorskie',
+    'LB' => 'Lubuskie',
+    'LD' => 'Łódzkie',
+    'LU' => 'Lubelskie',
+    'MA' => 'Małopolskie',
+    'MZ' => 'Mazowieckie',
+    'OP' => 'Opolskie',
+    'PD' => 'Podlaskie',
+    'PK' => 'Podkarpackie',
+    'PM' => 'Pomorskie',
+    'SK' => 'Świętokrzyskie',
+    'SL' => 'Śląskie',
+    'WN' => 'Warmińsko-mazurskie',
+    'WP' => 'Wielkopolskie',
+    'ZP' => 'Zachodniopomorskie',
+  ),
+  'PS' => 
+  array (
+    'BTH' => 'Bethlehem',
+    'DEB' => 'Deir El Balah',
+    'GZA' => 'Gaza',
+    'HBN' => 'Hebron',
+    'JEM' => 'Jerusalem',
+    'JEN' => 'Jenin',
+    'JRH' => 'Jericho - Al Aghwar',
+    'KYS' => 'Khan Yunis',
+    'NBS' => 'Nablus',
+    'NGZ' => 'North Gaza',
+    'QQA' => 'Qalqilya',
+    'RBH' => 'Ramallah',
+    'RFH' => 'Rafah',
+    'SLT' => 'Salfit',
+    'TBS' => 'Tubas',
+    'TKM' => 'Tulkarm',
+  ),
+  'PT' => 
+  array (
+    '01' => 'Aveiro',
+    '02' => 'Beja',
+    '03' => 'Braga',
+    '04' => 'Bragança',
+    '05' => 'Castelo Branco',
+    '06' => 'Coimbra',
+    '07' => 'Évora',
+    '08' => 'Faro',
+    '09' => 'Guarda',
+    10 => 'Leiria',
+    11 => 'Lisboa',
+    12 => 'Portalegre',
+    13 => 'Porto',
+    14 => 'Santarém',
+    15 => 'Setúbal',
+    16 => 'Viana do Castelo',
+    17 => 'Vila Real',
+    18 => 'Viseu',
+    20 => 'Região Autónoma dos Açores',
+    30 => 'Região Autónoma da Madeira',
+  ),
+  'PW' => 
+  array (
+    '002' => 'Aimeliik',
+    '004' => 'Airai',
+    '010' => 'Angaur',
+    '050' => 'Hatobohei',
+    100 => 'Kayangel',
+    150 => 'Koror',
+    212 => 'Melekeok',
+    214 => 'Ngaraard',
+    218 => 'Ngarchelong',
+    222 => 'Ngardmau',
+    224 => 'Ngatpang',
+    226 => 'Ngchesar',
+    227 => 'Ngeremlengui',
+    228 => 'Ngiwal',
+    350 => 'Peleliu',
+    370 => 'Sonsorol',
+  ),
+  'PY' => 
+  array (
+    1 => 'Concepción',
+    10 => 'Alto Paraná',
+    11 => 'Central',
+    12 => 'Ñeembucú',
+    13 => 'Amambay',
+    14 => 'Canindeyú',
+    15 => 'Presidente Hayes',
+    16 => 'Alto Paraguay',
+    19 => 'Boquerón',
+    2 => 'San Pedro',
+    3 => 'Cordillera',
+    4 => 'Guairá',
+    5 => 'Caaguazú',
+    6 => 'Caazapá',
+    7 => 'Itapúa',
+    8 => 'Misiones',
+    9 => 'Paraguarí',
+    'ASU' => 'Asunción',
+  ),
+  'QA' => 
+  array (
+    'DA' => 'Ad Dawhah',
+    'KH' => 'Al Khawr wa adh Dhakhīrah',
+    'MS' => 'Ash Shamal',
+    'RA' => 'Ar Rayyan',
+    'SH' => 'Ash Shīḩānīyah',
+    'US' => 'Umm Salal',
+    'WA' => 'Al Wakrah',
+    'ZA' => 'Az̧ Z̧a‘āyin',
+  ),
+  'RO' => 
+  array (
+    'AB' => 'Alba',
+    'AG' => 'Argeș',
+    'AR' => 'Arad',
+    'B' => 'București',
+    'BC' => 'Bacău',
+    'BH' => 'Bihor',
+    'BN' => 'Bistrița-Năsăud',
+    'BR' => 'Brăila',
+    'BT' => 'Botoșani',
+    'BV' => 'Brașov',
+    'BZ' => 'Buzău',
+    'CJ' => 'Cluj',
+    'CL' => 'Călărași',
+    'CS' => 'Caraș-Severin',
+    'CT' => 'Constanța',
+    'CV' => 'Covasna',
+    'DB' => 'Dâmbovița',
+    'DJ' => 'Dolj',
+    'GJ' => 'Gorj',
+    'GL' => 'Galați',
+    'GR' => 'Giurgiu',
+    'HD' => 'Hunedoara',
+    'HR' => 'Harghita',
+    'IF' => 'Ilfov',
+    'IL' => 'Ialomița',
+    'IS' => 'Iași',
+    'MH' => 'Mehedinți',
+    'MM' => 'Maramureș',
+    'MS' => 'Mureș',
+    'NT' => 'Neamț',
+    'OT' => 'Olt',
+    'PH' => 'Prahova',
+    'SB' => 'Sibiu',
+    'SJ' => 'Sălaj',
+    'SM' => 'Satu Mare',
+    'SV' => 'Suceava',
+    'TL' => 'Tulcea',
+    'TM' => 'Timiș',
+    'TR' => 'Teleorman',
+    'VL' => 'Vâlcea',
+    'VN' => 'Vrancea',
+    'VS' => 'Vaslui',
+  ),
+  'RS' => 
+  array (
+    '00' => 'Beograd',
+    '01' => 'Severnobački okrug',
+    '02' => 'Srednjebanatski okrug',
+    '03' => 'Severnobanatski okrug',
+    '04' => 'Južnobanatski okrug',
+    '05' => 'Zapadnobački okrug',
+    '06' => 'Južnobački okrug',
+    '07' => 'Sremski okrug',
+    '08' => 'Mačvanski okrug',
+    '09' => 'Kolubarski okrug',
+    10 => 'Podunavski okrug',
+    11 => 'Braničevski okrug',
+    12 => 'Šumadijski okrug',
+    13 => 'Pomoravski okrug',
+    14 => 'Borski okrug',
+    15 => 'Zaječarski okrug',
+    16 => 'Zlatiborski okrug',
+    17 => 'Moravički okrug',
+    18 => 'Raški okrug',
+    19 => 'Rasinski okrug',
+    20 => 'Nišavski okrug',
+    21 => 'Toplički okrug',
+    22 => 'Pirotski okrug',
+    23 => 'Jablanički okrug',
+    24 => 'Pčinjski okrug',
+    25 => 'Kosovski okrug',
+    26 => 'Pećki okrug',
+    27 => 'Prizrenski okrug',
+    28 => 'Kosovsko-Mitrovački okrug',
+    29 => 'Kosovsko-Pomoravski okrug',
+    'KM' => 'Kosovo-Metohija',
+    'VO' => 'Vojvodina',
+  ),
+  'RU' => 
+  array (
+    'AD' => 'Adygeya, Respublika',
+    'AL' => 'Altay, Respublika',
+    'ALT' => 'Altayskiy kray',
+    'AMU' => 'Amurskaya oblast\'',
+    'ARK' => 'Arkhangel\'skaya oblast\'',
+    'AST' => 'Astrakhanskaya oblast\'',
+    'BA' => 'Bashkortostan, Respublika',
+    'BEL' => 'Belgorodskaya oblast\'',
+    'BRY' => 'Bryanskaya oblast\'',
+    'BU' => 'Buryatiya, Respublika',
+    'CE' => 'Chechenskaya Respublika',
+    'CHE' => 'Chelyabinskaya oblast\'',
+    'CHU' => 'Chukotskiy avtonomnyy okrug',
+    'CU' => 'Chuvashskaya Respublika',
+    'DA' => 'Dagestan, Respublika',
+    'IN' => 'Respublika Ingushetiya',
+    'IRK' => 'Irkutiskaya oblast\'',
+    'IVA' => 'Ivanovskaya oblast\'',
+    'KAM' => 'Kamchatskiy kray',
+    'KB' => 'Kabardino-Balkarskaya Respublika',
+    'KC' => 'Karachayevo-Cherkesskaya Respublika',
+    'KDA' => 'Krasnodarskiy kray',
+    'KEM' => 'Kemerovskaya oblast\'',
+    'KGD' => 'Kaliningradskaya oblast\'',
+    'KGN' => 'Kurganskaya oblast\'',
+    'KHA' => 'Khabarovskiy kray',
+    'KHM' => 'Khanty-Mansiysky avtonomnyy okrug-Yugra',
+    'KIR' => 'Kirovskaya oblast\'',
+    'KK' => 'Khakasiya, Respublika',
+    'KL' => 'Kalmykiya, Respublika',
+    'KLU' => 'Kaluzhskaya oblast\'',
+    'KO' => 'Komi, Respublika',
+    'KOS' => 'Kostromskaya oblast\'',
+    'KR' => 'Kareliya, Respublika',
+    'KRS' => 'Kurskaya oblast\'',
+    'KYA' => 'Krasnoyarskiy kray',
+    'LEN' => 'Leningradskaya oblast\'',
+    'LIP' => 'Lipetskaya oblast\'',
+    'MAG' => 'Magadanskaya oblast\'',
+    'ME' => 'Mariy El, Respublika',
+    'MO' => 'Mordoviya, Respublika',
+    'MOS' => 'Moskovskaya oblast\'',
+    'MOW' => 'Moskva',
+    'MUR' => 'Murmanskaya oblast\'',
+    'NEN' => 'Nenetskiy avtonomnyy okrug',
+    'NGR' => 'Novgorodskaya oblast\'',
+    'NIZ' => 'Nizhegorodskaya oblast\'',
+    'NVS' => 'Novosibirskaya oblast\'',
+    'OMS' => 'Omskaya oblast\'',
+    'ORE' => 'Orenburgskaya oblast\'',
+    'ORL' => 'Orlovskaya oblast\'',
+    'PER' => 'Permskiy kray',
+    'PNZ' => 'Penzenskaya oblast\'',
+    'PRI' => 'Primorskiy kray',
+    'PSK' => 'Pskovskaya oblast\'',
+    'ROS' => 'Rostovskaya oblast\'',
+    'RYA' => 'Ryazanskaya oblast\'',
+    'SA' => 'Sakha, Respublika [Yakutiya]',
+    'SAK' => 'Sakhalinskaya oblast\'',
+    'SAM' => 'Samaraskaya oblast\'',
+    'SAR' => 'Saratovskaya oblast\'',
+    'SE' => 'Severnaya Osetiya-Alaniya, Respublika',
+    'SMO' => 'Smolenskaya oblast\'',
+    'SPE' => 'Sankt-Peterburg',
+    'STA' => 'Stavropol\'skiy kray',
+    'SVE' => 'Sverdlovskaya oblast\'',
+    'TA' => 'Tatarstan, Respublika',
+    'TAM' => 'Tambovskaya oblast\'',
+    'TOM' => 'Tomskaya oblast\'',
+    'TUL' => 'Tul\'skaya oblast\'',
+    'TVE' => 'Tverskaya oblast\'',
+    'TY' => 'Tyva, Respublika [Tuva]',
+    'TYU' => 'Tyumenskaya oblast\'',
+    'UD' => 'Udmurtskaya Respublika',
+    'ULY' => 'Ul\'yanovskaya oblast\'',
+    'VGG' => 'Volgogradskaya oblast\'',
+    'VLA' => 'Vladimirskaya oblast\'',
+    'VLG' => 'Vologodskaya oblast\'',
+    'VOR' => 'Voronezhskaya oblast\'',
+    'YAN' => 'Yamalo-Nenetskiy avtonomnyy okrug',
+    'YAR' => 'Yaroslavskaya oblast\'',
+    'YEV' => 'Yevreyskaya avtonomnaya oblast\'',
+    'ZAB' => 'Zabajkal\'skij kraj',
+  ),
+  'RW' => 
+  array (
+    '01' => 'Ville de Kigali',
+    '02' => 'Est',
+    '03' => 'Nord',
+    '04' => 'Ouest',
+    '05' => 'Sud',
+  ),
+  'SA' => 
+  array (
+    '01' => 'Ar Riyāḍ',
+    '02' => 'Makkah',
+    '03' => 'Al Madīnah',
+    '04' => 'Ash Sharqīyah',
+    '05' => 'Al Qaşīm',
+    '06' => 'Ḥā\'il',
+    '07' => 'Tabūk',
+    '08' => 'Al Ḥudūd ash Shamāliyah',
+    '09' => 'Jīzan',
+    10 => 'Najrān',
+    11 => 'Al Bāhah',
+    12 => 'Al Jawf',
+    14 => '`Asīr',
+  ),
+  'SB' => 
+  array (
+    'CE' => 'Central',
+    'CH' => 'Choiseul',
+    'CT' => 'Capital Territory (Honiara)',
+    'GU' => 'Guadalcanal',
+    'IS' => 'Isabel',
+    'MK' => 'Makira',
+    'ML' => 'Malaita',
+    'RB' => 'Rennell and Bellona',
+    'TE' => 'Temotu',
+    'WE' => 'Western',
+  ),
+  'SC' => 
+  array (
+    '01' => 'Anse aux Pins',
+    '02' => 'Anse Boileau',
+    '03' => 'Anse Etoile',
+    '04' => 'Anse Louis',
+    '05' => 'Anse Royale',
+    '06' => 'Baie Lazare',
+    '07' => 'Baie Sainte Anne',
+    '08' => 'Beau Vallon',
+    '09' => 'Bel Air',
+    10 => 'Bel Ombre',
+    11 => 'Cascade',
+    12 => 'Glacis',
+    13 => 'Grand Anse Mahe',
+    14 => 'Grand Anse Praslin',
+    15 => 'La Digue',
+    16 => 'English River',
+    17 => 'Mont Buxton',
+    18 => 'Mont Fleuri',
+    19 => 'Plaisance',
+    20 => 'Pointe Larue',
+    21 => 'Port Glaud',
+    22 => 'Saint Louis',
+    23 => 'Takamaka',
+    24 => 'Les Mamelles',
+    25 => 'Roche Caiman',
+  ),
+  'SD' => 
+  array (
+    'DC' => 'Zalingei',
+    'DE' => 'Sharq Dārfūr',
+    'DN' => 'Shamāl Dārfūr',
+    'DS' => 'Janūb Dārfūr',
+    'DW' => 'Gharb Dārfūr',
+    'GD' => 'Al Qaḑārif',
+    'GK' => 'Gharb Kurdufān',
+    'GZ' => 'Al Jazīrah',
+    'KA' => 'Kassalā',
+    'KH' => 'Al Kharţūm',
+    'KN' => 'Shamāl Kurdufān',
+    'KS' => 'Janūb Kurdufān',
+    'NB' => 'An Nīl al Azraq',
+    'NO' => 'Ash Shamālīyah',
+    'NR' => 'An Nīl',
+    'NW' => 'An Nīl al Abyaḑ',
+    'RS' => 'Al Baḩr al Aḩmar',
+    'SI' => 'Sinnār',
+  ),
+  'SE' => 
+  array (
+    'AB' => 'Stockholms län',
+    'AC' => 'Västerbottens län',
+    'BD' => 'Norrbottens län',
+    'C' => 'Uppsala län',
+    'D' => 'Södermanlands län',
+    'E' => 'Östergötlands län',
+    'F' => 'Jönköpings län',
+    'G' => 'Kronobergs län',
+    'H' => 'Kalmar län',
+    'I' => 'Gotlands län',
+    'K' => 'Blekinge län',
+    'M' => 'Skåne län',
+    'N' => 'Hallands län',
+    'O' => 'Västra Götalands län',
+    'S' => 'Värmlands län',
+    'T' => 'Örebro län',
+    'U' => 'Västmanlands län',
+    'W' => 'Dalarnas län',
+    'X' => 'Gävleborgs län',
+    'Y' => 'Västernorrlands län',
+    'Z' => 'Jämtlands län',
+  ),
+  'SG' => 
+  array (
+    '01' => 'Central Singapore',
+    '02' => 'North East',
+    '03' => 'North West',
+    '04' => 'South East',
+    '05' => 'South West',
+  ),
+  'SH' => 
+  array (
+    'AC' => 'Ascension',
+    'HL' => 'Saint Helena',
+    'TA' => 'Tristan da Cunha',
+  ),
+  'SI' => 
+  array (
+    '001' => 'Ajdovščina',
+    '002' => 'Beltinci',
+    '003' => 'Bled',
+    '004' => 'Bohinj',
+    '005' => 'Borovnica',
+    '006' => 'Bovec',
+    '007' => 'Brda',
+    '008' => 'Brezovica',
+    '009' => 'Brežice',
+    '010' => 'Tišina',
+    '011' => 'Celje',
+    '012' => 'Cerklje na Gorenjskem',
+    '013' => 'Cerknica',
+    '014' => 'Cerkno',
+    '015' => 'Črenšovci',
+    '016' => 'Črna na Koroškem',
+    '017' => 'Črnomelj',
+    '018' => 'Destrnik',
+    '019' => 'Divača',
+    '020' => 'Dobrepolje',
+    '021' => 'Dobrova-Polhov Gradec',
+    '022' => 'Dol pri Ljubljani',
+    '023' => 'Domžale',
+    '024' => 'Dornava',
+    '025' => 'Dravograd',
+    '026' => 'Duplek',
+    '027' => 'Gorenja vas-Poljane',
+    '028' => 'Gorišnica',
+    '029' => 'Gornja Radgona',
+    '030' => 'Gornji Grad',
+    '031' => 'Gornji Petrovci',
+    '032' => 'Grosuplje',
+    '033' => 'Šalovci',
+    '034' => 'Hrastnik',
+    '035' => 'Hrpelje-Kozina',
+    '036' => 'Idrija',
+    '037' => 'Ig',
+    '038' => 'Ilirska Bistrica',
+    '039' => 'Ivančna Gorica',
+    '040' => 'Izola/Isola',
+    '041' => 'Jesenice',
+    '042' => 'Juršinci',
+    '043' => 'Kamnik',
+    '044' => 'Kanal',
+    '045' => 'Kidričevo',
+    '046' => 'Kobarid',
+    '047' => 'Kobilje',
+    '048' => 'Kočevje',
+    '049' => 'Komen',
+    '050' => 'Koper/Capodistria',
+    '051' => 'Kozje',
+    '052' => 'Kranj',
+    '053' => 'Kranjska Gora',
+    '054' => 'Krško',
+    '055' => 'Kungota',
+    '056' => 'Kuzma',
+    '057' => 'Laško',
+    '058' => 'Lenart',
+    '059' => 'Lendava/Lendva',
+    '060' => 'Litija',
+    '061' => 'Ljubljana',
+    '062' => 'Ljubno',
+    '063' => 'Ljutomer',
+    '064' => 'Logatec',
+    '065' => 'Loška dolina',
+    '066' => 'Loški Potok',
+    '067' => 'Luče',
+    '068' => 'Lukovica',
+    '069' => 'Majšperk',
+    '070' => 'Maribor',
+    '071' => 'Medvode',
+    '072' => 'Mengeš',
+    '073' => 'Metlika',
+    '074' => 'Mežica',
+    '075' => 'Miren-Kostanjevica',
+    '076' => 'Mislinja',
+    '077' => 'Moravče',
+    '078' => 'Moravske Toplice',
+    '079' => 'Mozirje',
+    '080' => 'Murska Sobota',
+    '081' => 'Muta',
+    '082' => 'Naklo',
+    '083' => 'Nazarje',
+    '084' => 'Nova Gorica',
+    '085' => 'Novo mesto',
+    '086' => 'Odranci',
+    '087' => 'Ormož',
+    '088' => 'Osilnica',
+    '089' => 'Pesnica',
+    '090' => 'Piran/Pirano',
+    '091' => 'Pivka',
+    '092' => 'Podčetrtek',
+    '093' => 'Podvelka',
+    '094' => 'Postojna',
+    '095' => 'Preddvor',
+    '096' => 'Ptuj',
+    '097' => 'Puconci',
+    '098' => 'Rače-Fram',
+    '099' => 'Radeče',
+    100 => 'Radenci',
+    101 => 'Radlje ob Dravi',
+    102 => 'Radovljica',
+    103 => 'Ravne na Koroškem',
+    104 => 'Ribnica',
+    105 => 'Rogašovci',
+    106 => 'Rogaška Slatina',
+    107 => 'Rogatec',
+    108 => 'Ruše',
+    109 => 'Semič',
+    110 => 'Sevnica',
+    111 => 'Sežana',
+    112 => 'Slovenj Gradec',
+    113 => 'Slovenska Bistrica',
+    114 => 'Slovenske Konjice',
+    115 => 'Starče',
+    116 => 'Sveti Jurij',
+    117 => 'Šenčur',
+    118 => 'Šentilj',
+    119 => 'Šentjernej',
+    120 => 'Šentjur',
+    121 => 'Škocjan',
+    122 => 'Škofja Loka',
+    123 => 'Škofljica',
+    124 => 'Šmarje pri Jelšah',
+    125 => 'Šmartno ob Paki',
+    126 => 'Šoštanj',
+    127 => 'Štore',
+    128 => 'Tolmin',
+    129 => 'Trbovlje',
+    130 => 'Trebnje',
+    131 => 'Tržič',
+    132 => 'Turnišče',
+    133 => 'Velenje',
+    134 => 'Velike Lašče',
+    135 => 'Videm',
+    136 => 'Vipava',
+    137 => 'Vitanje',
+    138 => 'Vodice',
+    139 => 'Vojnik',
+    140 => 'Vrhnika',
+    141 => 'Vuzenica',
+    142 => 'Zagorje ob Savi',
+    143 => 'Zavrč',
+    144 => 'Zreče',
+    146 => 'Železniki',
+    147 => 'Žiri',
+    148 => 'Benedikt',
+    149 => 'Bistrica ob Sotli',
+    150 => 'Bloke',
+    151 => 'Braslovče',
+    152 => 'Cankova',
+    153 => 'Cerkvenjak',
+    154 => 'Dobje',
+    155 => 'Dobrna',
+    156 => 'Dobrovnik/Dobronak',
+    157 => 'Dolenjske Toplice',
+    158 => 'Grad',
+    159 => 'Hajdina',
+    160 => 'Hoče-Slivnica',
+    161 => 'Hodoš/Hodos',
+    162 => 'Horjul',
+    163 => 'Jezersko',
+    164 => 'Komenda',
+    165 => 'Kostel',
+    166 => 'Križevci',
+    167 => 'Lovrenc na Pohorju',
+    168 => 'Markovci',
+    169 => 'Miklavž na Dravskem polju',
+    170 => 'Mirna Peč',
+    171 => 'Oplotnica',
+    172 => 'Podlehnik',
+    173 => 'Polzela',
+    174 => 'Prebold',
+    175 => 'Prevalje',
+    176 => 'Razkrižje',
+    177 => 'Ribnica na Pohorju',
+    178 => 'Selnica ob Dravi',
+    179 => 'Sodražica',
+    180 => 'Solčava',
+    181 => 'Sveta Ana',
+    182 => 'Sveta Andraž v Slovenskih Goricah',
+    183 => 'Šempeter-Vrtojba',
+    184 => 'Tabor',
+    185 => 'Trnovska vas',
+    186 => 'Trzin',
+    187 => 'Velika Polana',
+    188 => 'Veržej',
+    189 => 'Vransko',
+    190 => 'Žalec',
+    191 => 'Žetale',
+    192 => 'Žirovnica',
+    193 => 'Žužemberk',
+    194 => 'Šmartno pri Litiji',
+    195 => 'Apače',
+    196 => 'Cirkulane',
+    197 => 'Kosanjevica na Krki',
+    198 => 'Makole',
+    199 => 'Mokronog-Trebelno',
+    200 => 'Poljčane',
+    201 => 'Renče-Vogrsko',
+    202 => 'Središče ob Dravi',
+    203 => 'Straža',
+    204 => 'Sveta Trojica v Slovenskih Goricah',
+    205 => 'Sveti Tomaž',
+    206 => 'Šmarjeske Topliče',
+    207 => 'Gorje',
+    208 => 'Log-Dragomer',
+    209 => 'Rečica ob Savinji',
+    210 => 'Sveti Jurij v Slovenskih Goricah',
+    211 => 'Šentrupert',
+    212 => 'Mirna',
+    213 => 'Ankaran/Ancarano',
+  ),
+  'SK' => 
+  array (
+    'BC' => 'Banskobystrický kraj',
+    'BL' => 'Bratislavský kraj',
+    'KI' => 'Košický kraj',
+    'NI' => 'Nitriansky kraj',
+    'PV' => 'Prešovský kraj',
+    'TA' => 'Trnavský kraj',
+    'TC' => 'Trenčiansky kraj',
+    'ZI' => 'Žilinský kraj',
+  ),
+  'SL' => 
+  array (
+    'E' => 'Eastern',
+    'N' => 'Northern',
+    'S' => 'Southern (Sierra Leone)',
+    'W' => 'Western Area (Freetown)',
+  ),
+  'SM' => 
+  array (
+    '01' => 'Acquaviva',
+    '02' => 'Chiesanuova',
+    '03' => 'Domagnano',
+    '04' => 'Faetano',
+    '05' => 'Fiorentino',
+    '06' => 'Borgo Maggiore',
+    '07' => 'San Marino',
+    '08' => 'Montegiardino',
+    '09' => 'Serravalle',
+  ),
+  'SN' => 
+  array (
+    'DB' => 'Diourbel',
+    'DK' => 'Dakar',
+    'FK' => 'Fatick',
+    'KA' => 'Kaffrine',
+    'KD' => 'Kolda',
+    'KE' => 'Kédougou',
+    'KL' => 'Kaolack',
+    'LG' => 'Louga',
+    'MT' => 'Matam',
+    'SE' => 'Sédhiou',
+    'SL' => 'Saint-Louis',
+    'TC' => 'Tambacounda',
+    'TH' => 'Thiès',
+    'ZG' => 'Ziguinchor',
+  ),
+  'SO' => 
+  array (
+    'AW' => 'Awdal',
+    'BK' => 'Bakool',
+    'BN' => 'Banaadir',
+    'BR' => 'Bari',
+    'BY' => 'Bay',
+    'GA' => 'Galguduud',
+    'GE' => 'Gedo',
+    'HI' => 'Hiirsan',
+    'JD' => 'Jubbada Dhexe',
+    'JH' => 'Jubbada Hoose',
+    'MU' => 'Mudug',
+    'NU' => 'Nugaal',
+    'SA' => 'Saneag',
+    'SD' => 'Shabeellaha Dhexe',
+    'SH' => 'Shabeellaha Hoose',
+    'SO' => 'Sool',
+    'TO' => 'Togdheer',
+    'WO' => 'Woqooyi Galbeed',
+  ),
+  'SR' => 
+  array (
+    'BR' => 'Brokopondo',
+    'CM' => 'Commewijne',
+    'CR' => 'Coronie',
+    'MA' => 'Marowijne',
+    'NI' => 'Nickerie',
+    'PM' => 'Paramaribo',
+    'PR' => 'Para',
+    'SA' => 'Saramacca',
+    'SI' => 'Sipaliwini',
+    'WA' => 'Wanica',
+  ),
+  'SS' => 
+  array (
+    'BN' => 'Northern Bahr el-Ghazal',
+    'BW' => 'Western Bahr el-Ghazal',
+    'EC' => 'Central Equatoria',
+    'EE' => 'Eastern Equatoria',
+    'EW' => 'Western Equatoria',
+    'JG' => 'Jonglei',
+    'LK' => 'Lakes',
+    'NU' => 'Upper Nile',
+    'UY' => 'Unity',
+    'WR' => 'Warrap',
+  ),
+  'ST' => 
+  array (
+    'P' => 'Príncipe',
+    'S' => 'São Tomé',
+  ),
+  'SV' => 
+  array (
+    'AH' => 'Ahuachapán',
+    'CA' => 'Cabañas',
+    'CH' => 'Chalatenango',
+    'CU' => 'Cuscatlán',
+    'LI' => 'La Libertad',
+    'MO' => 'Morazán',
+    'PA' => 'La Paz',
+    'SA' => 'Santa Ana',
+    'SM' => 'San Miguel',
+    'SO' => 'Sonsonate',
+    'SS' => 'San Salvador',
+    'SV' => 'San Vicente',
+    'UN' => 'La Unión',
+    'US' => 'Usulután',
+  ),
+  'SY' => 
+  array (
+    'DI' => 'Dimashq',
+    'DR' => 'Dar\'a',
+    'DY' => 'Dayr az Zawr',
+    'HA' => 'Al Hasakah',
+    'HI' => 'Homs',
+    'HL' => 'Halab',
+    'HM' => 'Hamah',
+    'ID' => 'Idlib',
+    'LA' => 'Al Ladhiqiyah',
+    'QU' => 'Al Qunaytirah',
+    'RA' => 'Ar Raqqah',
+    'RD' => 'Rif Dimashq',
+    'SU' => 'As Suwayda\'',
+    'TA' => 'Tartus',
+  ),
+  'SZ' => 
+  array (
+    'HH' => 'Hhohho',
+    'LU' => 'Lubombo',
+    'MA' => 'Manzini',
+    'SH' => 'Shiselweni',
+  ),
+  'TD' => 
+  array (
+    'BA' => 'Al Baṭḩah',
+    'BG' => 'Baḩr al Ghazāl',
+    'BO' => 'Būrkū',
+    'CB' => 'Shārī Bāqirmī',
+    'EN' => 'Innīdī',
+    'GR' => 'Qīrā',
+    'HL' => 'Ḥajjar Lamīs',
+    'KA' => 'Kānim',
+    'LC' => 'Al Buḩayrah',
+    'LO' => 'Lūqūn al Gharbī',
+    'LR' => 'Lūqūn ash Sharqī',
+    'MA' => 'Māndūl',
+    'MC' => 'Shārī al Awsaṭ',
+    'ME' => 'Māyū Kībbī ash Sharqī',
+    'MO' => 'Māyū Kībbī al Gharbī',
+    'ND' => 'Madīnat Injamīnā',
+    'OD' => 'Waddāy',
+    'SA' => 'Salāmāt',
+    'SI' => 'Sīlā',
+    'TA' => 'Tānjilī',
+    'TI' => 'Tibastī',
+    'WF' => 'Wādī Fīrā',
+  ),
+  'TG' => 
+  array (
+    'C' => 'Région du Centre',
+    'K' => 'Région de la Kara',
+    'M' => 'Région Maritime',
+    'P' => 'Région des Plateaux',
+    'S' => 'Région des Savannes',
+  ),
+  'TH' => 
+  array (
+    10 => 'Krung Thep Maha Nakhon Bangkok',
+    11 => 'Samut Prakan',
+    12 => 'Nonthaburi',
+    13 => 'Pathum Thani',
+    14 => 'Phra Nakhon Si Ayutthaya',
+    15 => 'Ang Thong',
+    16 => 'Lop Buri',
+    17 => 'Sing Buri',
+    18 => 'Chai Nat',
+    19 => 'Saraburi',
+    20 => 'Chon Buri',
+    21 => 'Rayong',
+    22 => 'Chanthaburi',
+    23 => 'Trat',
+    24 => 'Chachoengsao',
+    25 => 'Prachin Buri',
+    26 => 'Nakhon Nayok',
+    27 => 'Sa Kaeo',
+    30 => 'Nakhon Ratchasima',
+    31 => 'Buri Ram',
+    32 => 'Surin',
+    33 => 'Si Sa Ket',
+    34 => 'Ubon Ratchathani',
+    35 => 'Yasothon',
+    36 => 'Chaiyaphum',
+    37 => 'Amnat Charoen',
+    38 => 'Bueng Kan',
+    39 => 'Nong Bua Lam Phu',
+    40 => 'Khon Kaen',
+    41 => 'Udon Thani',
+    42 => 'Loei',
+    43 => 'Nong Khai',
+    44 => 'Maha Sarakham',
+    45 => 'Roi Et',
+    46 => 'Kalasin',
+    47 => 'Sakon Nakhon',
+    48 => 'Nakhon Phanom',
+    49 => 'Mukdahan',
+    50 => 'Chiang Mai',
+    51 => 'Lamphun',
+    52 => 'Lampang',
+    53 => 'Uttaradit',
+    54 => 'Phrae',
+    55 => 'Nan',
+    56 => 'Phayao',
+    57 => 'Chiang Rai',
+    58 => 'Mae Hong Son',
+    60 => 'Nakhon Sawan',
+    61 => 'Uthai Thani',
+    62 => 'Kamphaeng Phet',
+    63 => 'Tak',
+    64 => 'Sukhothai',
+    65 => 'Phitsanulok',
+    66 => 'Phichit',
+    67 => 'Phetchabun',
+    70 => 'Ratchaburi',
+    71 => 'Kanchanaburi',
+    72 => 'Suphan Buri',
+    73 => 'Nakhon Pathom',
+    74 => 'Samut Sakhon',
+    75 => 'Samut Songkhram',
+    76 => 'Phetchaburi',
+    77 => 'Prachuap Khiri Khan',
+    80 => 'Nakhon Si Thammarat',
+    81 => 'Krabi',
+    82 => 'Phangnga',
+    83 => 'Phuket',
+    84 => 'Surat Thani',
+    85 => 'Ranong',
+    86 => 'Chumphon',
+    90 => 'Songkhla',
+    91 => 'Satun',
+    92 => 'Trang',
+    93 => 'Phatthalung',
+    94 => 'Pattani',
+    95 => 'Yala',
+    96 => 'Narathiwat',
+    'S' => 'Phatthaya',
+  ),
+  'TJ' => 
+  array (
+    'DU' => 'Dushanbe',
+    'GB' => 'Gorno-Badakhshan',
+    'KT' => 'Khatlon',
+    'RA' => 'Nohiyahoi Tobei Jumhurí',
+    'SU' => 'Sughd',
+  ),
+  'TL' => 
+  array (
+    'AL' => 'Aileu',
+    'AN' => 'Ainaro',
+    'BA' => 'Baucau',
+    'BO' => 'Bobonaro',
+    'CO' => 'Cova Lima',
+    'DI' => 'Díli',
+    'ER' => 'Ermera',
+    'LA' => 'Lautem',
+    'LI' => 'Liquiça',
+    'MF' => 'Manufahi',
+    'MT' => 'Manatuto',
+    'OE' => 'Oecussi',
+    'VI' => 'Viqueque',
+  ),
+  'TM' => 
+  array (
+    'A' => 'Ahal',
+    'B' => 'Balkan',
+    'D' => 'Daşoguz',
+    'L' => 'Lebap',
+    'M' => 'Mary',
+    'S' => 'Aşgabat',
+  ),
+  'TN' => 
+  array (
+    11 => 'Tunis',
+    12 => 'Ariana',
+    13 => 'Ben Arous',
+    14 => 'La Manouba',
+    21 => 'Nabeul',
+    22 => 'Zaghouan',
+    23 => 'Bizerte',
+    31 => 'Béja',
+    32 => 'Jendouba',
+    33 => 'Le Kef',
+    34 => 'Siliana',
+    41 => 'Kairouan',
+    42 => 'Kasserine',
+    43 => 'Sidi Bouzid',
+    51 => 'Sousse',
+    52 => 'Monastir',
+    53 => 'Mahdia',
+    61 => 'Sfax',
+    71 => 'Gafsa',
+    72 => 'Tozeur',
+    73 => 'Kebili',
+    81 => 'Gabès',
+    82 => 'Medenine',
+    83 => 'Tataouine',
+  ),
+  'TO' => 
+  array (
+    '01' => '\'Eua',
+    '02' => 'Ha\'apai',
+    '03' => 'Niuas',
+    '04' => 'Tongatapu',
+    '05' => 'Vava\'u',
+  ),
+  'TR' => 
+  array (
+    '01' => 'Adana',
+    '02' => 'Adıyaman',
+    '03' => 'Afyonkarahisar',
+    '04' => 'Ağrı',
+    '05' => 'Amasya',
+    '06' => 'Ankara',
+    '07' => 'Antalya',
+    '08' => 'Artvin',
+    '09' => 'Aydın',
+    10 => 'Balıkesir',
+    11 => 'Bilecik',
+    12 => 'Bingöl',
+    13 => 'Bitlis',
+    14 => 'Bolu',
+    15 => 'Burdur',
+    16 => 'Bursa',
+    17 => 'Çanakkale',
+    18 => 'Çankırı',
+    19 => 'Çorum',
+    20 => 'Denizli',
+    21 => 'Diyarbakır',
+    22 => 'Edirne',
+    23 => 'Elazığ',
+    24 => 'Erzincan',
+    25 => 'Erzurum',
+    26 => 'Eskişehir',
+    27 => 'Gaziantep',
+    28 => 'Giresun',
+    29 => 'Gümüşhane',
+    30 => 'Hakkâri',
+    31 => 'Hatay',
+    32 => 'Isparta',
+    33 => 'Mersin',
+    34 => 'İstanbul',
+    35 => 'İzmir',
+    36 => 'Kars',
+    37 => 'Kastamonu',
+    38 => 'Kayseri',
+    39 => 'Kırklareli',
+    40 => 'Kırşehir',
+    41 => 'Kocaeli',
+    42 => 'Konya',
+    43 => 'Kütahya',
+    44 => 'Malatya',
+    45 => 'Manisa',
+    46 => 'Kahramanmaraş',
+    47 => 'Mardin',
+    48 => 'Muğla',
+    49 => 'Muş',
+    50 => 'Nevşehir',
+    51 => 'Niğde',
+    52 => 'Ordu',
+    53 => 'Rize',
+    54 => 'Sakarya',
+    55 => 'Samsun',
+    56 => 'Siirt',
+    57 => 'Sinop',
+    58 => 'Sivas',
+    59 => 'Tekirdağ',
+    60 => 'Tokat',
+    61 => 'Trabzon',
+    62 => 'Tunceli',
+    63 => 'Şanlıurfa',
+    64 => 'Uşak',
+    65 => 'Van',
+    66 => 'Yozgat',
+    67 => 'Zonguldak',
+    68 => 'Aksaray',
+    69 => 'Bayburt',
+    70 => 'Karaman',
+    71 => 'Kırıkkale',
+    72 => 'Batman',
+    73 => 'Şırnak',
+    74 => 'Bartın',
+    75 => 'Ardahan',
+    76 => 'Iğdır',
+    77 => 'Yalova',
+    78 => 'Karabük',
+    79 => 'Kilis',
+    80 => 'Osmaniye',
+    81 => 'Düzce',
+  ),
+  'TT' => 
+  array (
+    'ARI' => 'Arima',
+    'CHA' => 'Chaguanas',
+    'CTT' => 'Couva-Tabaquite-Talparo',
+    'DMN' => 'Diego Martin',
+    'ETO' => 'Eastern Tobago',
+    'MRC' => 'Mayaro-Rio Claro',
+    'PED' => 'Penal-Debe',
+    'POS' => 'Port of Spain',
+    'PRT' => 'Princes Town',
+    'PTF' => 'Point Fortin',
+    'RCM' => 'Rio Claro-Mayaro',
+    'SFO' => 'San Fernando',
+    'SGE' => 'Sangre Grande',
+    'SIP' => 'Siparia',
+    'SJL' => 'San Juan-Laventille',
+    'TOB' => 'Tobago',
+    'TUP' => 'Tunapuna-Piarco',
+    'WTO' => 'Western Tobago',
+  ),
+  'TV' => 
+  array (
+    'FUN' => 'Funafuti',
+    'NIT' => 'Niutao',
+    'NKF' => 'Nukufetau',
+    'NKL' => 'Nukulaelae',
+    'NMA' => 'Nanumea',
+    'NMG' => 'Nanumanga',
+    'NUI' => 'Nui',
+    'VAI' => 'Vaitupu',
+  ),
+  'TW' => 
+  array (
+    'CHA' => 'Changhua',
+    'CYI' => 'Chiay City',
+    'CYQ' => 'Chiayi',
+    'HSQ' => 'Hsinchu',
+    'HSZ' => 'Hsinchui City',
+    'HUA' => 'Hualien',
+    'ILA' => 'Ilan',
+    'KEE' => 'Keelung City',
+    'KHH' => 'Kaohsiung City',
+    'KHQ' => 'Kaohsiung',
+    'MIA' => 'Miaoli',
+    'NAN' => 'Nantou',
+    'PEN' => 'Penghu',
+    'PIF' => 'Pingtung',
+    'TAO' => 'Taoyuan',
+    'TNN' => 'Tainan City',
+    'TNQ' => 'Tainan',
+    'TPE' => 'Taipei City',
+    'TPQ' => 'Taipei',
+    'TTT' => 'Taitung',
+    'TXG' => 'Taichung City',
+    'TXQ' => 'Taichung',
+    'YUN' => 'Yunlin',
+  ),
+  'TZ' => 
+  array (
+    '01' => 'Arusha',
+    '02' => 'Dar-es-Salaam',
+    '03' => 'Dodoma',
+    '04' => 'Iringa',
+    '05' => 'Kagera',
+    '06' => 'Kaskazini Pemba',
+    '07' => 'Kaskazini Unguja',
+    '08' => 'Kigoma',
+    '09' => 'Kilimanjaro',
+    10 => 'Kusini Pemba',
+    11 => 'Kusini Unguja',
+    12 => 'Lindi',
+    13 => 'Mara',
+    14 => 'Mbeya',
+    15 => 'Mjini Magharibi',
+    16 => 'Morogoro',
+    17 => 'Mtwara',
+    18 => 'Mwanza',
+    19 => 'Pwani',
+    20 => 'Rukwa',
+    21 => 'Ruvuma',
+    22 => 'Shinyanga',
+    23 => 'Singida',
+    24 => 'Tabora',
+    25 => 'Tanga',
+    26 => 'Manyara',
+  ),
+  'UA' => 
+  array (
+    '05' => 'Vinnyts\'ka Oblast\'',
+    '07' => 'Volyns\'ka Oblast\'',
+    '09' => 'Luhans\'ka Oblast\'',
+    12 => 'Dnipropetrovs\'ka Oblast\'',
+    14 => 'Donets\'ka Oblast\'',
+    18 => 'Zhytomyrs\'ka Oblast\'',
+    21 => 'Zakarpats\'ka Oblast\'',
+    23 => 'Zaporiz\'ka Oblast\'',
+    26 => 'Ivano-Frankivs\'ka Oblast\'',
+    30 => 'Kyïvs\'ka mis\'ka rada',
+    32 => 'Kyïvs\'ka Oblast\'',
+    35 => 'Kirovohrads\'ka Oblast\'',
+    40 => 'Sevastopol',
+    43 => 'Respublika Krym',
+    46 => 'L\'vivs\'ka Oblast\'',
+    48 => 'Mykolaïvs\'ka Oblast\'',
+    51 => 'Odes\'ka Oblast\'',
+    53 => 'Poltavs\'ka Oblast\'',
+    56 => 'Rivnens\'ka Oblast\'',
+    59 => 'Sums \'ka Oblast\'',
+    61 => 'Ternopil\'s\'ka Oblast\'',
+    63 => 'Kharkivs\'ka Oblast\'',
+    65 => 'Khersons\'ka Oblast\'',
+    68 => 'Khmel\'nyts\'ka Oblast\'',
+    71 => 'Cherkas\'ka Oblast\'',
+    74 => 'Chernihivs\'ka Oblast\'',
+    77 => 'Chernivets\'ka Oblast\'',
+  ),
+  'UG' => 
+  array (
+    101 => 'Kalangala',
+    102 => 'Kampala',
+    103 => 'Kiboga',
+    104 => 'Luwero',
+    105 => 'Masaka',
+    106 => 'Mpigi',
+    107 => 'Mubende',
+    108 => 'Mukono',
+    109 => 'Nakasongola',
+    110 => 'Rakai',
+    111 => 'Sembabule',
+    112 => 'Kayunga',
+    113 => 'Wakiso',
+    114 => 'Mityana',
+    115 => 'Nakaseke',
+    116 => 'Lyantonde',
+    201 => 'Bugiri',
+    202 => 'Busia',
+    203 => 'Iganga',
+    204 => 'Jinja',
+    205 => 'Kamuli',
+    206 => 'Kapchorwa',
+    207 => 'Katakwi',
+    208 => 'Kumi',
+    209 => 'Mbale',
+    210 => 'Pallisa',
+    211 => 'Soroti',
+    212 => 'Tororo',
+    213 => 'Kaberamaido',
+    214 => 'Mayuge',
+    215 => 'Sironko',
+    216 => 'Amuria',
+    217 => 'Budaka',
+    218 => 'Bukwa',
+    219 => 'Butaleja',
+    220 => 'Kaliro',
+    221 => 'Manafwa',
+    222 => 'Namutumba',
+    223 => 'Bududa',
+    224 => 'Bukedea',
+    301 => 'Adjumani',
+    302 => 'Apac',
+    303 => 'Arua',
+    304 => 'Gulu',
+    305 => 'Kitgum',
+    306 => 'Kotido',
+    307 => 'Lira',
+    308 => 'Moroto',
+    309 => 'Moyo',
+    310 => 'Nebbi',
+    311 => 'Nakapiripirit',
+    312 => 'Pader',
+    313 => 'Yumbe',
+    314 => 'Amolatar',
+    315 => 'Kaabong',
+    316 => 'Koboko',
+    317 => 'Abim',
+    318 => 'Dokolo',
+    319 => 'Amuru',
+    320 => 'Maracha',
+    321 => 'Oyam',
+    401 => 'Bundibugyo',
+    402 => 'Bushenyi',
+    403 => 'Hoima',
+    404 => 'Kabale',
+    405 => 'Kabarole',
+    406 => 'Kasese',
+    407 => 'Kibaale',
+    408 => 'Kisoro',
+    409 => 'Masindi',
+    410 => 'Mbarara',
+    411 => 'Ntungamo',
+    412 => 'Rukungiri',
+    413 => 'Kamwenge',
+    414 => 'Kanungu',
+    415 => 'Kyenjojo',
+    416 => 'Ibanda',
+    417 => 'Isingiro',
+    418 => 'Kiruhura',
+    419 => 'Buliisa',
+    'C' => 'Central',
+    'E' => 'Eastern',
+    'N' => 'Northern',
+    'W' => 'Western',
+  ),
+  'UM' => 
+  array (
+    67 => 'Johnston Atoll',
+    71 => 'Midway Islands',
+    76 => 'Navassa Island',
+    79 => 'Wake Island',
+    81 => 'Baker Island',
+    84 => 'Howland Island',
+    86 => 'Jarvis Island',
+    89 => 'Kingman Reef',
+    95 => 'Palmyra Atoll',
+  ),
+  'US' => 
+  array (
+    'AK' => 'Alaska',
+    'AL' => 'Alabama',
+    'AR' => 'Arkansas',
+    'AS' => 'American Samoa',
+    'AZ' => 'Arizona',
+    'CA' => 'California',
+    'CO' => 'Colorado',
+    'CT' => 'Connecticut',
+    'DC' => 'District of Columbia',
+    'DE' => 'Delaware',
+    'FL' => 'Florida',
+    'GA' => 'Georgia',
+    'GU' => 'Guam',
+    'HI' => 'Hawaii',
+    'IA' => 'Iowa',
+    'ID' => 'Idaho',
+    'IL' => 'Illinois',
+    'IN' => 'Indiana',
+    'KS' => 'Kansas',
+    'KY' => 'Kentucky',
+    'LA' => 'Louisiana',
+    'MA' => 'Massachusetts',
+    'MD' => 'Maryland',
+    'ME' => 'Maine',
+    'MI' => 'Michigan',
+    'MN' => 'Minnesota',
+    'MO' => 'Missouri',
+    'MP' => 'Northern Mariana Islands',
+    'MS' => 'Mississippi',
+    'MT' => 'Montana',
+    'NC' => 'North Carolina',
+    'ND' => 'North Dakota',
+    'NE' => 'Nebraska',
+    'NH' => 'New Hampshire',
+    'NJ' => 'New Jersey',
+    'NM' => 'New Mexico',
+    'NV' => 'Nevada',
+    'NY' => 'New York',
+    'OH' => 'Ohio',
+    'OK' => 'Oklahoma',
+    'OR' => 'Oregon',
+    'PA' => 'Pennsylvania',
+    'PR' => 'Puerto Rico',
+    'RI' => 'Rhode Island',
+    'SC' => 'South Carolina',
+    'SD' => 'South Dakota',
+    'TN' => 'Tennessee',
+    'TX' => 'Texas',
+    'UM' => 'United States Minor Outlying Islands',
+    'UT' => 'Utah',
+    'VA' => 'Virginia',
+    'VI' => 'Virgin Islands',
+    'VT' => 'Vermont',
+    'WA' => 'Washington',
+    'WI' => 'Wisconsin',
+    'WV' => 'West Virginia',
+    'WY' => 'Wyoming',
+  ),
+  'UY' => 
+  array (
+    'AR' => 'Artigas',
+    'CA' => 'Canelones',
+    'CL' => 'Cerro Largo',
+    'CO' => 'Colonia',
+    'DU' => 'Durazno',
+    'FD' => 'Florida',
+    'FS' => 'Flores',
+    'LA' => 'Lavalleja',
+    'MA' => 'Maldonado',
+    'MO' => 'Montevideo',
+    'PA' => 'Paysandú',
+    'RN' => 'Río Negro',
+    'RO' => 'Rocha',
+    'RV' => 'Rivera',
+    'SA' => 'Salto',
+    'SJ' => 'San José',
+    'SO' => 'Soriano',
+    'TA' => 'Tacuarembó',
+    'TT' => 'Treinta y Tres',
+  ),
+  'UZ' => 
+  array (
+    'AN' => 'Andijon',
+    'BU' => 'Buxoro',
+    'FA' => 'Farg\'ona',
+    'JI' => 'Jizzax',
+    'NG' => 'Namangan',
+    'NW' => 'Navoiy',
+    'QA' => 'Qashqadaryo',
+    'QR' => 'Qoraqalpog\'iston Respublikasi',
+    'SA' => 'Samarqand',
+    'SI' => 'Sirdaryo',
+    'SU' => 'Surxondaryo',
+    'TK' => 'Toshkent',
+    'TO' => 'Toshkent',
+    'XO' => 'Xorazm',
+  ),
+  'VC' => 
+  array (
+    '01' => 'Charlotte',
+    '02' => 'Saint Andrew',
+    '03' => 'Saint David',
+    '04' => 'Saint George',
+    '05' => 'Saint Patrick',
+    '06' => 'Grenadines',
+  ),
+  'VE' => 
+  array (
+    'A' => 'Distrito Federal',
+    'B' => 'Anzoátegui',
+    'C' => 'Apure',
+    'D' => 'Aragua',
+    'E' => 'Barinas',
+    'F' => 'Bolívar',
+    'G' => 'Carabobo',
+    'H' => 'Cojedes',
+    'I' => 'Falcón',
+    'J' => 'Guárico',
+    'K' => 'Lara',
+    'L' => 'Mérida',
+    'M' => 'Miranda',
+    'N' => 'Monagas',
+    'O' => 'Nueva Esparta',
+    'P' => 'Portuguesa',
+    'R' => 'Sucre',
+    'S' => 'Táchira',
+    'T' => 'Trujillo',
+    'U' => 'Yaracuy',
+    'V' => 'Zulia',
+    'W' => 'Dependencias Federales',
+    'X' => 'Vargas',
+    'Y' => 'Delta Amacuro',
+    'Z' => 'Amazonas',
+  ),
+  'VN' => 
+  array (
+    '01' => 'Lai Châu',
+    '02' => 'Lào Cai',
+    '03' => 'Hà Giang',
+    '04' => 'Cao Bằng',
+    '05' => 'Sơn La',
+    '06' => 'Yên Bái',
+    '07' => 'Tuyên Quang',
+    '09' => 'Lạng Sơn',
+    13 => 'Quảng Ninh',
+    14 => 'Hoà Bình',
+    15 => 'Hà Tây',
+    18 => 'Ninh Bình',
+    20 => 'Thái Bình',
+    21 => 'Thanh Hóa',
+    22 => 'Nghệ An',
+    23 => 'Hà Tỉnh',
+    24 => 'Quảng Bình',
+    25 => 'Quảng Trị',
+    26 => 'Thừa Thiên-Huế',
+    27 => 'Quảng Nam',
+    28 => 'Kon Tum',
+    29 => 'Quảng Ngãi',
+    30 => 'Gia Lai',
+    31 => 'Bình Định',
+    32 => 'Phú Yên',
+    33 => 'Đắc Lắk',
+    34 => 'Khánh Hòa',
+    35 => 'Lâm Đồng',
+    36 => 'Ninh Thuận',
+    37 => 'Tây Ninh',
+    39 => 'Đồng Nai',
+    40 => 'Bình Thuận',
+    41 => 'Long An',
+    43 => 'Bà Rịa-Vũng Tàu',
+    44 => 'An Giang',
+    45 => 'Đồng Tháp',
+    46 => 'Tiền Giang',
+    47 => 'Kiên Giang',
+    49 => 'Vĩnh Long',
+    50 => 'Bến Tre',
+    51 => 'Trà Vinh',
+    52 => 'Sóc Trăng',
+    53 => 'Bắc Kạn',
+    54 => 'Bắc Giang',
+    55 => 'Bạc Liêu',
+    56 => 'Bắc Ninh',
+    57 => 'Bình Dương',
+    58 => 'Bình Phước',
+    59 => 'Cà Mau',
+    61 => 'Hải Duong',
+    63 => 'Hà Nam',
+    66 => 'Hưng Yên',
+    67 => 'Nam Định',
+    68 => 'Phú Thọ',
+    69 => 'Thái Nguyên',
+    70 => 'Vĩnh Phúc',
+    71 => 'Điện Biên',
+    72 => 'Đắk Nông',
+    73 => 'Hậu Giang',
+    'CT' => 'Cần Thơ',
+    'DN' => 'Đà Nẵng',
+    'HN' => 'Hà Nội',
+    'HP' => 'Hải Phòng',
+    'SG' => 'Hồ Chí Minh [Sài Gòn]',
+  ),
+  'VU' => 
+  array (
+    'MAP' => 'Malampa',
+    'PAM' => 'Pénama',
+    'SAM' => 'Sanma',
+    'SEE' => 'Shéfa',
+    'TAE' => 'Taféa',
+    'TOB' => 'Torba',
+  ),
+  'WS' => 
+  array (
+    'AA' => 'A\'ana',
+    'AL' => 'Aiga-i-le-Tai',
+    'AT' => 'Atua',
+    'FA' => 'Fa\'asaleleaga',
+    'GE' => 'Gaga\'emauga',
+    'GI' => 'Gagaifomauga',
+    'PA' => 'Palauli',
+    'SA' => 'Satupa\'itea',
+    'TU' => 'Tuamasaga',
+    'VF' => 'Va\'a-o-Fonoti',
+    'VS' => 'Vaisigano',
+  ),
+  'YE' => 
+  array (
+    'AB' => 'Abyān',
+    'AD' => '\'Adan',
+    'AM' => '\'Amrān',
+    'BA' => 'Al Bayḑā\'',
+    'DA' => 'Aḑ Ḑāli‘',
+    'DH' => 'Dhamār',
+    'HD' => 'Ḩaḑramawt',
+    'HJ' => 'Ḩajjah',
+    'HU' => 'Al Ḩudaydah',
+    'IB' => 'Ibb',
+    'JA' => 'Al Jawf',
+    'LA' => 'Laḩij',
+    'MA' => 'Ma\'rib',
+    'MR' => 'Al Mahrah',
+    'MU' => 'Al Ḩudaydah',
+    'MW' => 'Al Maḩwīt',
+    'RA' => 'Raymah',
+    'SD' => 'Şa\'dah',
+    'SH' => 'Shabwah',
+    'SN' => 'Şan\'ā\'',
+    'TA' => 'Tā\'izz',
+  ),
+  'ZA' => 
+  array (
+    'EC' => 'Eastern Cape',
+    'FS' => 'Free State',
+    'GT' => 'Gauteng',
+    'LP' => 'Limpopo',
+    'MP' => 'Mpumalanga',
+    'NC' => 'Northern Cape',
+    'NL' => 'Kwazulu-Natal',
+    'NW' => 'North-West (South Africa)',
+    'WC' => 'Western Cape',
+  ),
+  'ZM' => 
+  array (
+    '01' => 'Western',
+    '02' => 'Central',
+    '03' => 'Eastern',
+    '04' => 'Luapula',
+    '05' => 'Northern',
+    '06' => 'North-Western',
+    '07' => 'Southern (Zambia)',
+    '08' => 'Copperbelt',
+    '09' => 'Lusaka',
+  ),
+  'ZW' => 
+  array (
+    'BU' => 'Bulawayo',
+    'HA' => 'Harare',
+    'MA' => 'Manicaland',
+    'MC' => 'Mashonaland Central',
+    'ME' => 'Mashonaland East',
+    'MI' => 'Midlands',
+    'MN' => 'Matabeleland North',
+    'MS' => 'Matabeleland South',
+    'MV' => 'Masvingo',
+    'MW' => 'Mashonaland West',
+  ),
 );
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/de.json b/app/plugins/GeoIp2/lang/de.json
index c493f52a6..589ac9cb3 100644
--- a/app/plugins/GeoIp2/lang/de.json
+++ b/app/plugins/GeoIp2/lang/de.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "Im TAR Archiv %1$s konnte keine gültige GeoIP Datenbank gefunden werden!",
         "CannotUnzipGeoIPFile": "Konnte GeoIP-Datei in %1$s nicht entpacken: %2$s",
         "PluginDescription": "Liefert GeoIP 2 Standorterkennungsdienste.",
-        "LocationProviderDesc_Php": "Diese Art der Standortbestimmung ist am einfachsten zu installieren, da Sie keine Serverkonfiguration benötigt (Ideal für Shared Hosting!). Sie verwendet eine GeoIP2-Datenbank und die PHP-API von MaxMind um den Standort eines Besuchers genau zu bestimmen.",
+        "LocationProviderDesc_Php": "Dieser Location Provider ist am einfachsten zu installieren, da er keine Server-Konfiguration benötigt (ideal für Shared Hosting!). Er nutzt eine GeoIP 2 Datenbank und MaxMind's PHP API um den Standort Ihrer Besucher akkurat zu bestimmen.",
         "LocationProviderDesc_Php_WithExtension": "Dieser Standorterkennungsdienst wird durch die installierte %1$smaxminddb%2$s Erweiterung beschleunigt.",
         "LocationProviderDesc_ServerModule": "Diese Art der Standortbestimmung verwendet das GeoIP2-Modul das auf ihrem HTTP-Server installiert ist. Diese ist am schnellsten und genauesten, aber %1$skann nur bei normalem Browser-Tracking benutzt werden%2$s",
         "LocationProviderDesc_ServerModule2": "Falls Sie Protokolldateien oder andere Dinge importieren welche IP-Adressen enthalten sollten Sie die %3$sPHP GeoIP 2 Implementierung%4$s nutzen und die %1$smaxminddb Erweiterung%2$s installieren.",
         "ServerBasedVariablesConfiguration": "Einstellungen für die Servervariablen die vom GeoIP 2 HTTP-Server-Modul benutzt werden.",
         "GeoIPVariablesConfigurationHere": "Sie können benutze Servervariablen %1$shier%2$s konfigurieren.",
+        "ShowCustomServerVariablesConfig": "Ich benutze das Geoip2 Server-Modul (Nginx, Apache...) und möchte die Server-Variablen konfigurieren",
         "ServerVariableFor": "Servervariable für %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/el.json b/app/plugins/GeoIp2/lang/el.json
index 89e8a45df..4879f037e 100644
--- a/app/plugins/GeoIp2/lang/el.json
+++ b/app/plugins/GeoIp2/lang/el.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "Δεν βρέθηκε έγκυρη βάση GeoIP στο αρχείο tar %1$s!",
         "CannotUnzipGeoIPFile": "Δεν ήταν δυνατή η αποσυμπίεση του αρχείου GeoIP στο %1$s: %2$s",
         "PluginDescription": "Δίνει τους παρόχους τοποθεσιών GeoIP2.",
-        "LocationProviderDesc_Php": "Αυτός ο πάροχος τοποθεσιών είναι ο πιο απλός στην εγκατάσταση, καθώς δεν απαιτεί παραμετροποίηση στον διακομιστή (ιδανικός για μοιραζόμενη φιλοξενία!). Χρησιμοποιεί μια βάση GeoIP 2 και το PHP API της MaxMind για να καθορίσει με ακρίβεια την τοποθεσία των επισκεπτών σας.",
+        "LocationProviderDesc_Php": "Αυτός ο πάροχος τοποθεσίας είναι ο απλούστερος στην εγκατάσταση αλλά δεν απαιτεί παραμετροποίηση στο διακομιστή (ιδανικός για διαμοιραζόμενη φιλοξενία!). Χρησιμοποιεί μια βάση δεδομένων GeoIP 2 και το PHP API της MaxMind για τον ακριβή καθορισμό της τοποθεσίας των επισκεπτών σας.",
         "LocationProviderDesc_Php_WithExtension": "Αυτός ο πάροχος τοποθεσίας αυξάνει την ταχύτητά του με την εγκατεστημένη επέκταση %1$smaxminddb%2$s.",
         "LocationProviderDesc_ServerModule": "Αυτός ο πάροχος τοποθεσίας χρησιμοποιεί το άρθρωμα GeoIP 2 που έχει εγκατασταθεί στον διακομιστή ιστού σας. Ο πάροχος είναι γρήγορος και ακριβής, αλλά %1$sμπορεί να χρησιμοποιηθεί μόνο με την κλασική παρακολούθηση μέσω του φυλλομετρητή σας.%2$s",
         "LocationProviderDesc_ServerModule2": "Αν επιθυμείτε να εισαγάγετε αρχεία καταγραφής ή να κάνετε κάτι άλλο που απαιτεί τον ορισμό διευθύνσεων IP, χρησιμοποιήστε την %3$sPHP GeoIP 2 υλοποίηση%4$s και εγκαταστήστε την %1$sεπέκταση maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Παραμετροποίηση των μεταβλητών διακομιστή που χρησιμοποιούνται από τα αρθρώματα GeoIP 2 του διακομιστή",
         "GeoIPVariablesConfigurationHere": "Μπορείτε να παραμετροποιήσετε τις μεταβλητές διακομιστή που χρησιμοποιούνται %1$sεδώ%2$s.",
+        "ShowCustomServerVariablesConfig": "Χρησιμοποιώ το άρθρωμα διακομιστή Geoip2 (Nxing, Apache...) και θέλω να παραμετροποιήσω τις μεταβλητές διακομιστή",
         "ServerVariableFor": "Μεταβλητή διακομιστή για %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/es.json b/app/plugins/GeoIp2/lang/es.json
index 614a39c51..5077fc964 100644
--- a/app/plugins/GeoIp2/lang/es.json
+++ b/app/plugins/GeoIp2/lang/es.json
@@ -9,6 +9,7 @@
         "LocationProviderDesc_ServerModule2": "Si tiene que importar archivos de registro u otras tareas que requieran configurar direcciones IP, use la %3$simplementación de PHP GeoIP 2%4$s e instale la %1$sextensión maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Configuración para variables de servidor utilizadas por los módulos de servidor GeoIP 2",
         "GeoIPVariablesConfigurationHere": "Puede configurar las variables de servidor usadas %1$saquí%2$s",
+        "ShowCustomServerVariablesConfig": "Uso el módulo de servidor Geoip2 (Nginx, Apache...) y deseo configurar las variables del servidor",
         "ServerVariableFor": "Variable del servidor para %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/fr.json b/app/plugins/GeoIp2/lang/fr.json
index 1cb9aa09d..df14ef771 100644
--- a/app/plugins/GeoIp2/lang/fr.json
+++ b/app/plugins/GeoIp2/lang/fr.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "Aucune base de données GeoIP valide trouvée dans l'archive tar %1$s !",
         "CannotUnzipGeoIPFile": "Impossible de décompresser le fichier GeoIP dans %1$s: %2$s",
         "PluginDescription": "Fournit des services de localisation GeoIP2.",
-        "LocationProviderDesc_Php": "Ce service de localisation est le plus simple à installer et ne requiert aucune configuration du serveur (idéal pour les hébergements partagés !). Il utilise une base de données GeoIP 2 et l'API PHP MaxMind afin de déterminer précisément la localisation de vos visiteurs.",
+        "LocationProviderDesc_Php": "Ce fournisseur de localisation est le plus simple à installer puisqu'il ne requiert aucune configuration du serveur (idéal pour les hébergements mutualisés !). Il utilise une base de données GeoIP et l'API PHP MaxMind's pour déterminer avec précision l'emplacement de vos visiteurs.",
         "LocationProviderDesc_Php_WithExtension": "Ce service de localisation est plus performant grâce à l'installation de l'extension %1$smaxminddb%2$s.",
-        "LocationProviderDesc_ServerModule": "Ce service de localisation utilise le module GeoIP 2 qui peut être installé sur votre serveur HTTP. Ce service est rapide est précis mais %1$speut uniquement être utilisé avec le système de suivit du navigateur classique. %2$s",
+        "LocationProviderDesc_ServerModule": "Ce service de localisation utilise le module GeoIP 2 qui peut être installé sur votre serveur HTTP. Ce service est rapide est précis mais %1$speut uniquement être utilisé avec le système de suivi du navigateur classique. %2$s",
         "LocationProviderDesc_ServerModule2": "Si vous devez importer des fichiers de journaux ou bien effectuer quoi que ce soit d'autre qui requiert la définition des adresses IP, utilisez %3$sl'implémentation PHP GeoIP 2%4$s et installez %1$sl'extension maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Configuration des variables serveur utilisées par le module GeoIP 2.",
         "GeoIPVariablesConfigurationHere": "Vous pouvez configurer les variables serveur utilisées %1$sici%2$s.",
+        "ShowCustomServerVariablesConfig": "J'utilise le module serveur Goip2 (Nginx, Apache...) et je veux configurer les variables de serveur",
         "ServerVariableFor": "Variable serveur pour %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/it.json b/app/plugins/GeoIp2/lang/it.json
index d392373d8..300a6fdcf 100644
--- a/app/plugins/GeoIp2/lang/it.json
+++ b/app/plugins/GeoIp2/lang/it.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "Nell'archivio tar %1$s non è stato trovato un database GeoIP valido!",
         "CannotUnzipGeoIPFile": "impossibile scompattare il file geoIP in %1$s: %2$s",
         "PluginDescription": "Fornisce i provider di posizione GeoIP2.",
-        "LocationProviderDesc_Php": "Il provider di localizzazione è molto semplice da installare poiché non richiede una configurazione del server (ideale per gli hosting condivisi). Esso utilizza un database GeoIP 2 e un'API PHP di MaxMind per determinare con accuratezza la posizione dei tuoi visitatori.",
+        "LocationProviderDesc_Php": "Questo provider di posizione è il più semplice da installare perché non richiede una configurazione del server (ideale per hosting condivisi). Esso utilizza il database GeoIP 2 e l'API PHP di MaxMind per determinare accuratamente la posizione dei tuoi visitatori.",
         "LocationProviderDesc_Php_WithExtension": "Questo provider di posizione viene velocizzato dall'estensione installata %1$smaxminddb%2$s.",
         "LocationProviderDesc_ServerModule": "Questo provider di posizione utilizza il modulo GeoIP 2 che è stato installato nel tuo server HTTP. Questo provider è veloce e accurato, ma %1$s può solo essere utilizzato con il normale tracciamento del browser.%2$s",
         "LocationProviderDesc_ServerModule2": "Se devi importare i file di log o fare qualcos'altro che richiede l'impostazione di indirizzi IP, usa %3$sl'implementazione PHP geoIP 2%4$s e installa %1$sl'estensione maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Configurazione per le variabili del server utilizzate dai moduli server di GeoIP 2",
         "GeoIPVariablesConfigurationHere": "Puoi configurare %1$squi%2$s le variabili del server utilizzate.",
+        "ShowCustomServerVariablesConfig": "Io utilizzo il modulo server GeoIP2 (Nginx, Apache...) e voglio configurare le variabili del server",
         "ServerVariableFor": "Variabili del server per %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/ja.json b/app/plugins/GeoIp2/lang/ja.json
index 6af571c5f..64ba1ea20 100644
--- a/app/plugins/GeoIp2/lang/ja.json
+++ b/app/plugins/GeoIp2/lang/ja.json
@@ -1,14 +1,15 @@
 {
     "GeoIp2": {
-        "CannotFindGeoIPDatabaseInArchive": "TAR アーカイブ %1$sに有効な GeoIP データベースが見つかりません!",
+        "CannotFindGeoIPDatabaseInArchive": "tar アーカイブ %1$sに有効な GeoIP データベースが見つかりません!",
         "CannotUnzipGeoIPFile": "%1$s の GeoIP ファイルを解凍できません: %2$s",
         "PluginDescription": "GeoIP2 ロケーションプロバイダを提供します。",
-        "LocationProviderDesc_Php": "サーバー設定 が必要ないため(共有ホスティングに最適です!) 、この位置情報プロバイダーは非常に簡単にインストールできます。ビジターの位置情報を正確に決定するために、GeoIP2 データベースと MaxMind の PHP API を使用します。",
-        "LocationProviderDesc_Php_WithExtension": "この位置情報プロバイダーは、インストールされた %1$smaxminddb%2$s 拡張により高速化されています。",
+        "LocationProviderDesc_Php": "この位置情報プロバイダーはサーバーを設定する必要がないため一番簡単です（共有ホストに最適）。このプロバイダーは訪問者の位置情報を決定するためにGeoIP 2データベースとMaxMindのPHP APIを使用します。",
+        "LocationProviderDesc_Php_WithExtension": "この位置情報プロバイダーは、インストールされている%1$smaxminddb%2$s 拡張機能により高速化されています。",
         "LocationProviderDesc_ServerModule": "このロケーションプロバイダーは、HTTP サーバーにインストールされている GeoIP2 モジュールを使用します。 このプロバイダは高速で正確ですが、%1$s通常のブラウザトラッキングでのみ使用できます。%2$s",
-        "LocationProviderDesc_ServerModule2": "ログファイルをインポートする必要がある場合やIPアドレスの設定が必要な場合は、 %3$sPHP GeoIP2 実装%4$s を使用し、%1$smaxminddb 拡張%2$sをインストールしてください。",
+        "LocationProviderDesc_ServerModule2": "ログファイルをインポートやIPアドレスの設定が必要な場合は、 %3$sPHP GeoIP2 実装%4$s を使用し、%1$smaxminddb 拡張モジュール%2$sをインストールしてください。",
         "ServerBasedVariablesConfiguration": "GeoIP2 サーバーモジュールで使用されるサーバー変数の設定",
         "GeoIPVariablesConfigurationHere": "%1$sこちら%2$s で使用しているサーバー変数の設定ができます。",
+        "ShowCustomServerVariablesConfig": "Geoip2サーバーモジュール（Nginx,Apacheなど）を使いサーバーの設定を調整します。",
         "ServerVariableFor": "%s のサーバー変数"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/pl.json b/app/plugins/GeoIp2/lang/pl.json
index 572a4dda7..e20808871 100644
--- a/app/plugins/GeoIp2/lang/pl.json
+++ b/app/plugins/GeoIp2/lang/pl.json
@@ -3,7 +3,6 @@
         "CannotFindGeoIPDatabaseInArchive": "Archiwum tar %1$s nie zawiera poprawnej bazy GeoIP!",
         "CannotUnzipGeoIPFile": "Nie udało się rozpakować pliku GeoIP %1$s: %2$s",
         "PluginDescription": "Dostarcza dostawców lokalizacji GeoIP2.",
-        "LocationProviderDesc_Php": "Ten dostawca lokalizacji jest najprostszy w instalacji ponieważ nie wymaga konfiguracji serwera (idealne w hostingu współdzielonym!). Korzysta z bazy GeoIP2 i API PHP firmy MaxMind aby dokładnie określać lokalizację Twoich odwiedzających.",
         "LocationProviderDesc_Php_WithExtension": "Ten dostawca lokalizacji przyspiesza dzięki zainstalowanemu rozszerzeniu %1$smaxminddb%2$s.",
         "LocationProviderDesc_ServerModule": "Ten dostawca lokalizacji wykorzystuje moduł GeoIP2 zainstalowany w Twoim serwerze WWW. Działa szybko i dokładnie, ale %1$smoże być wykorzystany przy śledzeniu ruchu przeglądarek.%2$s",
         "LocationProviderDesc_ServerModule2": "Jeśli musisz zaimportować pliki logów lub zrobić coś innego, co wymaga ustawienia adresu IP, użyj %3$simplementacji PHP dla GeoIP2%4$s i zainstaluj %1$srozszerzenie maxminddb%2$s.",
diff --git a/app/plugins/GeoIp2/lang/pt-br.json b/app/plugins/GeoIp2/lang/pt-br.json
new file mode 100644
index 000000000..a9e3d5ac1
--- /dev/null
+++ b/app/plugins/GeoIp2/lang/pt-br.json
@@ -0,0 +1,15 @@
+{
+    "GeoIp2": {
+        "CannotFindGeoIPDatabaseInArchive": "Nenhuma base de dados GeoIP válida foi encontrada no arquivo tar %1$s!",
+        "CannotUnzipGeoIPFile": "Não foi possível descompactar o arquivo GeoIP em %1$s:%2$s",
+        "PluginDescription": "Fornece provedores de localização GeoIP2.",
+        "LocationProviderDesc_Php": "Este provedor de localização é o mais simples de ser instalado pois não requer configuração de servidor (ideal para hospedagem compartilhada!). Ele usa uma base de dados GeoIP2 e a API PHP da MaxMind para determinar com precisão a localização dos seus visitantes.",
+        "LocationProviderDesc_Php_WithExtension": "Este provedor de localização é acelerado pela extensão %1$s maxminddb %2$s.",
+        "LocationProviderDesc_ServerModule": "Este provedor de localização usa o módulo GeoIP2 que foi instalado no seu servidor HTTP. Este provedor é rápido e preciso, mas %1$ssó pode ser usado com o rastreamento normal do navegador. %2$s",
+        "LocationProviderDesc_ServerModule2": "Se você precisa importar arquivos de log ou fazer algo que requeira definir endereços IP, use a implementação %3$s GeoIP2 PHP %4$s e instale a extensão %1$s maxminddb %2$s.",
+        "ServerBasedVariablesConfiguration": "Configuração para as variáveis de servidor usadas pelos módulos GeoIP2 do servidor.",
+        "GeoIPVariablesConfigurationHere": "Você pode configurar as variáves de servidor usadas %1$s aqui %2$s,",
+        "ShowCustomServerVariablesConfig": "Eu uso o módulo GeoIP2 para servidor (Nginx, Apache...) e quero configurar variáveis de servidor",
+        "ServerVariableFor": "Variável de servidor para %s"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/pt.json b/app/plugins/GeoIp2/lang/pt.json
index d8a755f8b..7375c8b4e 100644
--- a/app/plugins/GeoIp2/lang/pt.json
+++ b/app/plugins/GeoIp2/lang/pt.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "Não foi encontrada uma base de dados GeoIP válida no arquivo tar %1$s!",
         "CannotUnzipGeoIPFile": "Não foi possível extrair o ficheiro GeoIP em %1$s: %2$s",
         "PluginDescription": "Fornece fornecedores de localização GeoIP2.",
-        "LocationProviderDesc_Php": "Este fornecedor de localização é o mais simples de instalar e não requer configurações no servidor (ideal para alojamentos partilhados). Utiliza uma base de dados GeoIP 2 e a API PHP do MaxMind para determinar com precisão a localização dos seus visitantes.",
+        "LocationProviderDesc_Php": "Este fornecedor de localização é o mais simples de instalar, dado que não exige configurações no servidor (é ideal para alojamentos partilhados!). Utiliza uma base de dados GeoIP 2 e a API PHP do MaxMind para determinar com precisão a localização dos seus visitantes.",
         "LocationProviderDesc_Php_WithExtension": "Este fornecedor de localização é acelerado pela extensão %1$smaxminddb%2$s instalada.",
         "LocationProviderDesc_ServerModule": "Este fornecedor de localização utiliza o módulo GeoIP 2 que foi instalado no seu servidor HTTP. Este fornecedor é rápido e preciso, mas %1$ssó pode ser utilizado para um acompanhamento normal de navegadores.%2$s",
         "LocationProviderDesc_ServerModule2": "Se tiver de importar ficheiros de registo ou fazer algo mais que necessite da definição de endereços de IP, utilize a %3$simplementação PHP do GeoIP 2%4$s e instale a %1$sextensão maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Configuração para variáveis do servidor utilizadas pelos módulos do servidor GeoIP 2",
         "GeoIPVariablesConfigurationHere": "Pode configurar as variáveis de servidor utilizadas %1$saqui%2$s.",
+        "ShowCustomServerVariablesConfig": "Eu utilizo o módulo do servidor Geoip2 (Nginx, Apache...) e pretendo configurar variáveis do servidor",
         "ServerVariableFor": "Variável do servidor para %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/ru.json b/app/plugins/GeoIp2/lang/ru.json
index 7bddd9c81..fa5e5b539 100644
--- a/app/plugins/GeoIp2/lang/ru.json
+++ b/app/plugins/GeoIp2/lang/ru.json
@@ -3,7 +3,6 @@
         "CannotFindGeoIPDatabaseInArchive": "В tar-архиве %1$s не найдено корректной базы данных GeoIP!",
         "CannotUnzipGeoIPFile": "Не получилось распаковать файл GeoIP за %1$s:%2$s",
         "PluginDescription": "Механизмы определения местонахождения GeoIP 2.",
-        "LocationProviderDesc_Php": "Этот механизм определения местонахождения является наиболее простым в установке, поскольку не требует настройки сервера (идеально для виртуального хостинга!). Он использует базы данных GeoIP2 и PHP API от MaxMind, чтобы точно определить местоположение ваших посетителей.",
         "LocationProviderDesc_Php_WithExtension": "Этот механизм определения местонахождения ускорен установленным расширением %1$smaxminddb%2$s.",
         "LocationProviderDesc_ServerModule": "Этот механизм определения местонахождения использует модуль GeoIP 2, установленный на ваш HTTP-сервер. Он быстр и точен, но %1$s может быть использован только при отслеживании обычных браузеров.%2$s",
         "LocationProviderDesc_ServerModule2": "Если вам нужно импортировать лог-файлы или сделать что-то еще, требующее использование IP-адресов, используйте %3$sPHP GeoIp 2%4$s и установите расширение %1$smaxminddb%2$s.",
diff --git a/app/plugins/GeoIp2/lang/sq.json b/app/plugins/GeoIp2/lang/sq.json
index cda294333..c88fbcc47 100644
--- a/app/plugins/GeoIp2/lang/sq.json
+++ b/app/plugins/GeoIp2/lang/sq.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "S’u gjet dot bazë e vlefshme të dhënash GeoIP te arkivi tar %1$s!",
         "CannotUnzipGeoIPFile": "S’u shzipua dot kartela GeoIP te %1$s: %2$s",
         "PluginDescription": "Furnizon shërbime vendndodhjesh GeoIP2.",
-        "LocationProviderDesc_Php": "Ky furnizues vendndodhjesh është më i thjeshti për t’u instaluar, ngaqë s’lyp formësim shërbyesi (i përsosur për strehim të përbashkët!). Për përcaktimin me saktësi të vendndodhjes së vizitorëve tuaj, ai përdor një bazë të dhënash GeoIP 2 dhe API-n PHP të MaxMind-it.",
+        "LocationProviderDesc_Php": "Ky furnizues vendesh është më i thjeshti për t’u instaluar, ngaqë nuk lyp formësim shërbyesish (ideal për strehim të përbashkët!). Për të përcaktuar saktë vendin e vizitorëve tuaj, përdor një bazë të dhënash GeoIP 2 dhe API-n PHP të MaxMind-it.",
         "LocationProviderDesc_Php_WithExtension": "Ky furnizues vendndodhjesh përshpejtohet nga zgjerimi %1$smaxminddb%2$s i instaluar.",
         "LocationProviderDesc_ServerModule": "Ky furnizues vendndodhjesh përdor modulin GeoIP 2 që është instaluar te shërbyesi juaj HTTP. Ky furnizues është i shpejtë dhe i përpiktë, por %1$smund të përdoret vetëm me ndjekje të zakonshme të shfletimit.%2$s",
         "LocationProviderDesc_ServerModule2": "Nëse ju duhet të importoni kartela regjistër ose të bëni diçka tjetër që lyp caktim adresash IP, përdorni %3$ssendërtimin PHP GeoIP 2%4$s dhe instaloni %1$szgjerimin maxminddb%2$s.",
         "ServerBasedVariablesConfiguration": "Formësim për ndryshore shërbyesi të përdorura nga module GeoIP 2 shërbyesi",
         "GeoIPVariablesConfigurationHere": "Ndryshoret e shërbyesit që përdoren mund t’i formësoni nga %1$skëtu%2$s.",
+        "ShowCustomServerVariablesConfig": "Përdor modulin e shërbyesit Geoip2 (Nginx, Apache…) dhe dua të formësoj ndryshore shërbyesi",
         "ServerVariableFor": "Ndryshore shërbyesi për %s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/sv.json b/app/plugins/GeoIp2/lang/sv.json
index a671209d6..8c22f55f7 100644
--- a/app/plugins/GeoIp2/lang/sv.json
+++ b/app/plugins/GeoIp2/lang/sv.json
@@ -3,7 +3,6 @@
         "CannotFindGeoIPDatabaseInArchive": "Tar-arkivet %1$sinnehåller ingen GeoIP-databas!",
         "CannotUnzipGeoIPFile": "Kan inte packa upp GeoIP-filen i %1$s: %2$s",
         "PluginDescription": "Tillhandahåller platstjänster för GeoIP2.",
-        "LocationProviderDesc_Php": "Den här platstjänsten är enklast att installera och kräver ingen serverkonfiguration (perfekt för delade webbhotell!). Den använder en GeoIP 2-databas och MaxMinds PHP-API för att med stor precision fastställa dina besökares platser.",
         "LocationProviderDesc_Php_WithExtension": "Den här platstjänsten kan göras snabbare med det installerade %1$smaxminddb%2$s-tillägget.",
         "LocationProviderDesc_ServerModule": "Den här platstjänsten använder GeoIP 2-modulen som installerats på din HTTP-server. Den här tjänsten är snabb och träffsäker, men %1$skan endast användas tillsammans med normal webbläsarspårning.%2$s",
         "LocationProviderDesc_ServerModule2": "Om du behöver importera loggfiler eller göra något annat som kräver IP-adresser: Använd %1$sPECL GeoIP (rekommenderas)%2$s eller %3$sPHP GeoIP%4$s.",
diff --git a/app/plugins/GeoIp2/lang/tr.json b/app/plugins/GeoIp2/lang/tr.json
index 8c8e1751c..63158f7ca 100644
--- a/app/plugins/GeoIp2/lang/tr.json
+++ b/app/plugins/GeoIp2/lang/tr.json
@@ -3,12 +3,13 @@
         "CannotFindGeoIPDatabaseInArchive": "%1$s tar arşivi dosyasında geçerli bir GeoIP veritabanı bulunamadı!",
         "CannotUnzipGeoIPFile": "%1$s içindeki GeoIP arşivi dosyası ayıklanamadı: %2$s",
         "PluginDescription": "GeoIP2 konum hizmeti sağlayıcılarını sunar.",
-        "LocationProviderDesc_Php": "Bu konum hizmeti sağlayıcısı, sunucu yapılandırması gerektirmediğinden kurulumu en kolay olanıdır (paylaşımlı barındırma için idealdir). GeoIP 2 veritabanı ve MaxMind PHP API uygulamasını kullanarak ziyaretçilerinizin konumunu büyük doğruluk ile belirler.",
+        "LocationProviderDesc_Php": "Bu konum hizmeti sağlayıcı en basit kurulanıdır ve sunucu yapılandırmasına gerek duymaz (paylaşılan barındırma hizmetleri için idealdir). GeoIP 2 veritabanını ve MaxMind PHP API uygulamasını kullanarak ziyaretçilerinizin konumunu doğru olarak belirler.",
         "LocationProviderDesc_Php_WithExtension": "Bu konum hizmeti sağlayıcısı %1$smaxminddb%2$s eklentisi kurularak hızlandırılmıştır.",
         "LocationProviderDesc_ServerModule": "Bu konum hizmeti sağlayıcısı HTTP sunucunuz üzerine kurulmuş GeoIP 2 modülünü kullanır. Bu hizmet sağlayıcı hızlı ve doğrudur ancak %1$syalnız normal web tarayıcı izlemesi ile kullanılabilir%2$s.",
         "LocationProviderDesc_ServerModule2": "Günlük dosyalarını içe aktarmak ya da IP adresinin ayarlanmasını gerektiren başka bir işlem yapmak zorundaysanız, %3$sPHP GeoIp 2 uygulamasını%4$s kullanarak %1$smaxminddb eklentisini%2$s kurun.",
         "ServerBasedVariablesConfiguration": "GeoIP 2 sunucu modülleri tarafından kullanılan sunucu değişkeni yapılandırması",
         "GeoIPVariablesConfigurationHere": "Kullanılan sunucu değişkenleri %1$sburadan%2$s yapılandırılabilir.",
+        "ShowCustomServerVariablesConfig": "GeoIP 2 sunucu modülünü (Nginx, Apache...) kullanacağım ve sunucu ayarlarını yapılandırmak istiyorum",
         "ServerVariableFor": "%s için sunucu değişkeni"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/zh-cn.json b/app/plugins/GeoIp2/lang/zh-cn.json
new file mode 100644
index 000000000..ef81c752a
--- /dev/null
+++ b/app/plugins/GeoIp2/lang/zh-cn.json
@@ -0,0 +1,15 @@
+{
+    "GeoIp2": {
+        "CannotFindGeoIPDatabaseInArchive": "在tar存档%1$s中找不到有效的GeoIP 数据库！",
+        "CannotUnzipGeoIPFile": "无法在%1$s中解压缩GeoIP 文件：%2$s",
+        "PluginDescription": "提供GeoIP2 位置提供程序。",
+        "LocationProviderDesc_Php": "此位置提供程序安装最简单，因为它不需要服务器配置（非常适合共享宿主！）它使用GeoIP 2数据库和MaxMind's的PHP API精确地确定访问者的位置。",
+        "LocationProviderDesc_Php_WithExtension": "安装的%1$sMaxMindDB%2$s扩展加快了此位置提供程序的速度。",
+        "LocationProviderDesc_ServerModule": "该位置提供者使用HTTP服务器中已安装的GeoIP 2模块。 此提供程序快速准确，但是%1$s只能与正常的浏览器跟踪一起使用。%2$s",
+        "LocationProviderDesc_ServerModule2": "如果您必须导入日志文件或执行其他需要设置IP地址的操作，请使用%3$sPHP GeoIP 2实现%4$s并安装%1$smaxminddb extension%2$s。",
+        "ServerBasedVariablesConfiguration": "配置GeoIP 2服务器模块使用的服务器变量",
+        "GeoIPVariablesConfigurationHere": "您可以在此处%2$s配置使用的服务器变量%1$s。",
+        "ShowCustomServerVariablesConfig": "我使用Geoip2服务器模块（Nginx，Apache ...），并希望配置服务器变量",
+        "ServerVariableFor": "服务器变量为%s"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/GeoIp2/lang/zh-tw.json b/app/plugins/GeoIp2/lang/zh-tw.json
index d16d26365..95832331d 100644
--- a/app/plugins/GeoIp2/lang/zh-tw.json
+++ b/app/plugins/GeoIp2/lang/zh-tw.json
@@ -3,7 +3,6 @@
         "CannotFindGeoIPDatabaseInArchive": "在 tar 壓縮檔 %1$s 中找不到可用的 GeoIP 資料庫。",
         "CannotUnzipGeoIPFile": "無法解壓縮 %1$s 中的 GeoIP 檔案：%2$s",
         "PluginDescription": "提供 GeoIP2 地理位置供應商。",
-        "LocationProviderDesc_Php": "這個地理位置供應商是安裝方式最簡單的，因為它不需要更動任何伺服器設定（共享主機適用！）。它使用 GeoIP 2 資料庫和 MaxMind 的 PHP API 來精準的判別訪客的位置。",
         "LocationProviderDesc_Php_WithExtension": "這個地理位置供應商已透過安裝的 %1$smaxminddb%2$s 擴充功能加速。",
         "LocationProviderDesc_ServerModule": "這個地理位置供應商使用安裝在你 HTTP 伺服器上的 GeoIP 2 模組。這個供應商快又精準，但是%1$s只適用於一般瀏覽器上的追蹤%2$s。",
         "LocationProviderDesc_ServerModule2": "如果你需要匯入紀錄檔或是其他需要設定 IP 位址的事情，使用 %3$sPHP GeoIP 2 implementation%4$s 並安裝 %1$smaxminddb 擴充功能%2$s。",
diff --git a/app/plugins/Goals/API.php b/app/plugins/Goals/API.php
index 6ee19e66c..b09519e37 100644
--- a/app/plugins/Goals/API.php
+++ b/app/plugins/Goals/API.php
@@ -440,7 +440,7 @@ protected static function convertSpecialGoalIds($idGoal)
      * @param bool $showAllGoalSpecificMetrics whether to show all goal specific metrics when no goal is set
      * @return DataTable
      */
-    public function get($idSite, $period, $date, $segment = false, $idGoal = false, $columns = array(), $showAllGoalSpecificMetrics = false)
+    public function get($idSite, $period, $date, $segment = false, $idGoal = false, $columns = array(), $showAllGoalSpecificMetrics = false, $compare = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
 
@@ -479,6 +479,19 @@ public function get($idSite, $period, $date, $segment = false, $idGoal = false,
             }
         }
 
+        // if we are comparing, this will be queried with format_metrics=0, but we will eventually need to format the metrics.
+        // unfortunately, we can't do that since the processed metric information is in the GetMetrics report. in this case,
+        // we queue the filter so it will eventually be formatted.
+        if (!empty($compare)) {
+            $getMetricsReport = ReportsProvider::factory('Goals', 'getMetrics');
+            $table->queueFilter(function (DataTable $t) use ($getMetricsReport) {
+                $t->setMetadata(Metrics\Formatter::PROCESSED_METRICS_FORMATTED_FLAG, false);
+
+                $formatter = new Metrics\Formatter();
+                $formatter->formatMetrics($t, $getMetricsReport, $metricsToFormat = null, $formatAll = true);
+            });
+        }
+
         return $table;
     }
 
diff --git a/app/plugins/Goals/Goals.php b/app/plugins/Goals/Goals.php
index d0c84ec7c..8ad81a114 100644
--- a/app/plugins/Goals/Goals.php
+++ b/app/plugins/Goals/Goals.php
@@ -368,5 +368,6 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'Goals_Ecommerce';
         $translationKeys[] = 'Goals_Optional';
         $translationKeys[] = 'Goals_TimeInMinutes';
+        $translationKeys[] = 'Goals_Pattern';
     }
 }
diff --git a/app/plugins/Goals/config/config.php b/app/plugins/Goals/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Goals/config/config.php
+++ b/app/plugins/Goals/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Goals/config/tracker.php b/app/plugins/Goals/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Goals/config/tracker.php
+++ b/app/plugins/Goals/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/da.json b/app/plugins/Goals/lang/da.json
index c3c118fde..808ca1dcd 100644
--- a/app/plugins/Goals/lang/da.json
+++ b/app/plugins/Goals/lang/da.json
@@ -43,6 +43,7 @@
         "DaysToConv": "Dage til konvertering",
         "Details": "Mål detaljer",
         "DefaultGoalConvertedOncePerVisit": "(standard) Målet kan kun konverteres én gang pr. besøg",
+        "DefaultRevenueLabel": "Mål standard omsætning",
         "DefaultRevenueHelp": "F.eks. en kontaktformular sendt af en besøgende kan være 10 kr. værd i gennemsnit. Matomo vil hjælpe dig med at forstå, hvor godt dine besøgssegmenter klarer sig.",
         "DeleteGoalConfirm": "Bekræft sletning af mål %s?",
         "DocumentationRevenueGeneratedByProductSales": "Produktsalg. Omfatter ikke moms, forsendelse og rabat",
@@ -64,6 +65,8 @@
         "GoalName": "Navn",
         "Goals": "Mål",
         "NGoals": "%s mål",
+        "NRevenue": "%s omsætning",
+        "NItems": "%s emner",
         "ManageGoals": "Administrer mål",
         "GoalsOverview": "Måloversigt",
         "GoalsOverviewDocumentation": "Oversigt over dine målkonverteringer. I første omgang viser diagrammet summen af alle konverteringer. %s Under diagrammet, kan du se konverteringsrapporter for hvert af dine mål. Minidiagrammer kan udvides ved at klikke på dem.",
@@ -77,18 +80,24 @@
         "MatchesExpression": "matcher udtrykket %s",
         "NewGoalIntro": "Sporing af målkonvertering er et af de mest effektive måder at måle og forbedre dine forretningsmæssige målsætninger.",
         "NewVisitorsConversionRateIs": "Nye besøgendes konverteringsrate er %s",
+        "NoGoalsNeedAccess2": "Kun en bruger med skriveadgang, en administrator eller en superbruger kan håndtere Mål for en given hjemmeside, Henvend dig venligst til din Matomo administrator for at få sat Mål op for hjemmesiden. <br>Tracking af Mål er en god måde at forstå og maksimere din hjemmesides præstation!",
         "NoConversionsNoReportsMessage": "Rapporter bliver ikke vist fordi der ikke er nogen salgsdata for det valgte mål og periode.",
         "NeedAccess": "Kun en administrator eller en bruger med superbrugeradgang kan administrere mål for en given hjemmeside.",
         "Optional": "(valgfri)",
         "OverallConversionRate": "samlet konverteringsrate (besøg med et færdigt mål)",
+        "ColumnOverallRevenue": "Samlet omsætning",
         "OverallRevenue": "samlede indtægter",
         "PageTitle": "sidetitel",
         "Pattern": "Mønster",
         "PluginDescription": "Opret mål og se detaljerede rapporter om målkonverteringer: udvikling over tid, indtjening pr. besøg, konverteringer pr. henviser, pr. søgeord og meget mere.",
         "ProductCategory": "Produktkategori",
         "ProductName": "Produktnavn",
+        "ProductNames": "Produktnavne",
+        "ProductPrice": "Produktpris",
+        "ProductQuantity": "Produktantal",
         "Products": "Produkter",
         "ProductSKU": "Produkt-SKU",
+        "ProductSKUs": "Produkt varenummer",
         "ReturningVisitorsConversionRateIs": "Tilbagevendende besøgendes konverteringsrate er %s",
         "SingleGoalOverviewDocumentation": "Oversigt over konverteringer for et enkelt mål. %s Minidiagrammer under diagrammet kan forstørres ved at klikke på dem.",
         "ThereIsNoGoalToManage": "Der er ingen mål at administrere for hjemmesiden %s",
@@ -100,9 +109,17 @@
         "VisitPageTitle": "Besøger en given sidetitel",
         "VisitsUntilConv": "Besøg til konvertering",
         "VisitUrl": "Besøger en bestemt hjemmeside (side eller en gruppe af sider)",
+        "VisitDurationMatchAttr": "Bliv i et bestem tidsrum",
+        "VisitDuration": "besøgs varighed er",
         "WhenVisitors": "når de besøgende",
         "WhereThe": "Hvor",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Den besøgte side skal indeholde et kald til JavaScript 'trackGoal' metode (%1$slær mere%2$s)",
-        "YouCanEnableEcommerceReports": "Du kan aktivere %1$s for hjemmesiden på %2$s siden."
+        "YouCanEnableEcommerceReports": "Du kan aktivere %1$s for hjemmesiden på %2$s siden.",
+        "UseEventValueAsRevenue": "Brug begivenheds værdien (hvis den findes) som Mål konverterings omsætning.",
+        "GoalRevenue": "Mål omsætning",
+        "EventValueAsRevenueHelp": "Hvis begivenheden som du matcher har en omsætning, og omsætningen er tracket som begivenhedsværdi, kan du aktivere denne mulighed for at registrere begivenhedsværdien som Målets konverteringsomsætning. Hvis dit Måls omsætning ikke vil variere mellem konverteringer, kan du ignorere denne mulighed og blot angive en standard omsætning herover.",
+        "EventValueAsRevenueHelp2": "Note: Hvis både standard Mål konvertering og begivenhedsværdi er defineret, vil begivenhedsværdi blive anvendt. Hvis denne mulighed er aktiveret og ingen begivenhedsværdi er sendt i en forespørgsel, vil standard omsætningen blive anvendt (hvis defineret).",
+        "AtLeastMinutes": "mindst %1$sminutter. Brug decimaler for at matche sekunder, for eksempel %2$s for at matche 30 sekunder.",
+        "TimeInMinutes": "Tid i minutter"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/de.json b/app/plugins/Goals/lang/de.json
index 9bd397374..330775f70 100644
--- a/app/plugins/Goals/lang/de.json
+++ b/app/plugins/Goals/lang/de.json
@@ -109,6 +109,8 @@
         "VisitPageTitle": "eine Seite mit einem bestimmten Titel besucht",
         "VisitsUntilConv": "Besuche bis zur Konversion",
         "VisitUrl": "Die angegebene URL (Seite oder Gruppe von Seiten) wird besucht",
+        "VisitDurationMatchAttr": "Verweilt für eine bestimmte Zeitdauer",
+        "VisitDuration": "Besuchsdauer ist",
         "WhenVisitors": "wenn vom Besucher",
         "WhereThe": "bei denen die",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Die besuchte Seite muss einen Aufruf der JavaScript-Methode \"trackGoal\" enthalten (%1$serfahren Sie mehr%2$s)",
@@ -116,6 +118,8 @@
         "UseEventValueAsRevenue": "Den Ereigniswert (falls er existiert) als Zielertragsumsatz verwenden.",
         "GoalRevenue": "Ertrags-Ziel",
         "EventValueAsRevenueHelp": "Wenn das passende Ereignis einen Ertrag hat, und dieser Ertrag als Ereignis-Wert getrackt wird, können Sie diese Option verwenden, um den Ereignis-Wert als Zielertragsumsatz aufzuzeichnen. Wenn Ihr Ertrags-Ziel im Umsatz nicht variiert, können Sie diese Option ignorieren und einfach oebn einen Standardertrag setzen.",
-        "EventValueAsRevenueHelp2": "Hinweis: Wenn sowohl ein Ertragsziel als auch ein Ereignis-Wert definiert ist, wird der Ereignis-Wert verwendet. Wenn diese Option aktiviert ist und in einer Anfrage kein Ereignis-Wert gesangt wird, dann wird das Standard Ertrags-Ziel (falls definiert) verwendet."
+        "EventValueAsRevenueHelp2": "Hinweis: Wenn sowohl ein Ertragsziel als auch ein Ereignis-Wert definiert ist, wird der Ereignis-Wert verwendet. Wenn diese Option aktiviert ist und in einer Anfrage kein Ereignis-Wert gesangt wird, dann wird das Standard Ertrags-Ziel (falls definiert) verwendet.",
+        "AtLeastMinutes": "mindestens %1$s Minuten. Verwenden Sie Dezimale um Sekunden anzugeben, zum Beispiel %2$s um 30 Sekunden zu definieren.",
+        "TimeInMinutes": "Zeit in Minuten"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/es-ar.json b/app/plugins/Goals/lang/es-ar.json
index ad9cde6f6..7e82d23d2 100644
--- a/app/plugins/Goals/lang/es-ar.json
+++ b/app/plugins/Goals/lang/es-ar.json
@@ -1,85 +1,125 @@
 {
     "Goals": {
-        "AbandonedCart": "Carro Abandonado",
-        "AddGoal": "Agregar Objetivo",
-        "AddNewGoal": "Agregar un nuevo Objetivo",
-        "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.",
+        "AbandonedCart": "Changuito abandonado",
+        "AddGoal": "Agregar meta",
+        "AddNewGoal": "Agregar una nueva meta",
+        "AddNewGoalOrEditExistingGoal": "%1$sAgregá una nueva meta%2$s o %3$seditá%4$s metas existentes.",
+        "AllowGoalConvertedMoreThanOncePerVisit": "Permitir que la meta sea convertida más de una vez por visita",
+        "AllowMultipleConversionsPerVisit": "Permitir múltiples conversiones por visita",
         "BestCountries": "Tus mejores países son:",
-        "BestKeywords": "Tus mejores palabras de búsqueda son:",
-        "BestReferrers": "Tus mejores palabras de búsqueda son:",
+        "BestKeywords": "Tus mejores palabras claves son:",
+        "BestReferrers": "Tus mejores orígenes de visitas son:",
         "CaseSensitive": "Coincidir mayúsculas y minúsculas",
-        "ClickOutlink": "Clic en un Enlace a un sitio web externo",
-        "ColumnAverageOrderRevenueDocumentation": "Valor Medio del Pedido (VMP) es el valor obtenido dividiendo los ingresos totales de todos los pedidos entre el número de pedidos.",
+        "CancelAndReturnToGoals": "Cancelar y %1$svolver a la lista de metas%2$s",
+        "CategoryTextGeneral_Visitors": "Ubicación del usuario",
+        "CategoryTextReferrers_Referrers": "Orígenes de visitas",
+        "CategoryTextVisitsSummary_VisitsSummary": "Atributo del usuario",
+        "CategoryTextDevicesDetection_DevicesDetection": "Dispositivos",
+        "CategoryTextGeneral_Visit": "compromiso",
+        "ClickOutlink": "Hacé clic en un enlace a un sitio web externo",
+        "SendEvent": "Enviar como evento",
+        "ColumnAverageOrderRevenueDocumentation": "Valor medio del pedido (\"AOV\") es el valor obtenido dividiendo los ingresos totales de todos los pedidos entre el número de pedidos.",
         "ColumnAveragePriceDocumentation": "El promedio de ingresos para este %s.",
         "ColumnAverageQuantityDocumentation": "La cantidad media de este %s vendida en los pedidos de comercio electrónico.",
-        "ColumnConversionRateDocumentation": "El porcentaje de visitas que cumplieron el objetivo %s.",
-        "ColumnConversionRateProductDocumentation": "El ratio de conversión %s es el número de pedidos que contienen este producto dividido por el número de visitas en la página del producto.",
+        "ColumnConversionRateDocumentation": "El porcentaje de visitas que cumplió la meta %s.",
+        "ColumnConversionRateProductDocumentation": "La tasa de conversión %s es el número de pedidos que contienen este producto dividido por el número de visitas en la página del producto.",
         "ColumnConversions": "Conversiones",
+        "Conversion": "Conversión",
         "ColumnConversionsDocumentation": "El número de conversiones para %s.",
         "ColumnOrdersDocumentation": "El número total de pedidos de comercio electrónico que contenían este %s al menos una vez.",
         "ColumnPurchasedProductsDocumentation": "El número de productos comprados es la suma de la cantidad de los productos vendidos en todos los pedidos de comercio electrónico.",
         "ColumnQuantityDocumentation": "Cantidad es el número total de productos vendidos por cada %s.",
         "ColumnRevenueDocumentation": "Ingresos totales generados por %s.",
         "ColumnRevenuePerVisitDocumentation": "Los ingresos totales generados por %s divididos por el número de visitas.",
-        "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 reporte si el seguimiento del comercio electrónico fue configurado en las páginas de Producto\/Categoría.",
+        "ColumnVisits": "El número total de visitas, sin importar si se estableció una meta o no.",
+        "ColumnVisitsProductDocumentation": "El número de visitas en la página de Producto\/Categoría. Esto también se usa para procesar la tasa 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. %1$s Por favor, haga clic en una de las categorías para ver el reporte. %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 conversiones",
+        "ConversionByTypeReportDocumentation": "Este informe proporciona información detallada sobre el rendimiento del objetivo (conversiones, tasa de conversión y ingresos por visita) para cada de las categorías disponibles en el panel de la izquierda. %1$s Por favor, hacé clic en una de las categorías para ver el informe. %2$s Para más información, leé la %3$sdocumentación sobre Seguimiento de metas%4$s.",
+        "ConversionRate": "%s tasa de conversión",
         "Conversions": "%s conversiones",
-        "ConversionsOverview": "Información de Conversiones",
-        "ConversionsOverviewBy": "Visión general de las conversiones por tipo de visita",
-        "DaysToConv": "Días hasta la Conversión",
-        "DefaultGoalConvertedOncePerVisit": "(por defecto) El objetivo solo se puede convertir una ver por visita",
-        "DeleteGoalConfirm": "Esta seguro que desea eliminar el Objetivo %s?",
+        "ConversionsDescription": "conversiones",
+        "ConversionsOverview": "Vista general de las conversiones",
+        "ConversionsOverviewBy": "Vista general de las conversiones por tipo de visita",
+        "DaysToConv": "Días para la conversión",
+        "Details": "Detalles de la meta",
+        "DefaultGoalConvertedOncePerVisit": "(predeterminado) La meta sólo se puede convertir una vez por visita",
+        "DefaultRevenueLabel": "Ganancia predeterminada de la meta",
+        "DefaultRevenueHelp": "Por ejemplo, un formulario de contacto enviado por un visitante puede tener un valor de $10 en promedio. Matomo te ayudará a entender qué tan bien se desarrollan los segmentos de tus visitantes.",
+        "DeleteGoalConfirm": "¡Estás seguro que querés eliminar la meta %s?",
         "DocumentationRevenueGeneratedByProductSales": "Ventas del producto. Excluye impuestos, envío y descuentos",
         "Download": "Descargar un archivo",
-        "Ecommerce": "Comercio Electrónico",
-        "EcommerceAndGoalsMenu": "Comercio Electrónico y Objetivos",
-        "EcommerceLog": "Registro del Comercio Electrónico",
-        "EcommerceOrder": "Pedido de Comercio Electrónico",
-        "EcommerceOverview": "Información general de Comercio Electrónico",
-        "EcommerceReports": "Reportes de Comercio Electrónico",
-        "ExceptionInvalidMatchingString": "Si elije 'coincidencia exacta', la cadena debe ser una URL que comience con %1$s. Por ejemplo, '%2$s'.",
-        "ExternalWebsiteUrl": "URL del sitio web externo",
-        "Filename": "archivo",
-        "GoalConversion": "Conversión de objetivos",
-        "GoalConversions": "Conversiones de objetivos",
-        "GoalConversionsBy": "Conversiones %s del objetivo por el tipo de visita",
-        "GoalIsTriggered": "Objetivo activado",
-        "GoalIsTriggeredWhen": "Objetivo activado cuando",
-        "GoalName": "Nombre del Objetivo",
-        "Goals": "Objetivos",
-        "GoalsOverview": "Vista de objetivos",
-        "GoalsOverviewDocumentation": "Esta es la información general de las conversiones de sus objetivos. Inicialmente, el gráfico muestra la suma de todas las conversiones. %s Debajo del gráfico, usted puede ver los reportes de conversiones para cada uno de sus objetivos. Los gráficos pueden ser agrandados haciendo clic en ellos.",
-        "GoalX": "Objetivos %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.",
+        "Ecommerce": "Comercio electrónico",
+        "EcommerceAndGoalsMenu": "Comercio electrónico y metas",
+        "EcommerceLog": "Registro del comercio electrónico",
+        "EcommerceOrder": "Pedido de comercio electrónico",
+        "EcommerceOverview": "Vista general de comercio electrónico",
+        "EcommerceReports": "Informes de comercio electrónico",
+        "ExceptionInvalidMatchingString": "Si elegís \"coincidencia exacta\", la cadena debe ser una dirección web que comience con %1$s. Por ejemplo: \"%2$s\".",
+        "ExternalWebsiteUrl": "Dirección web del sitio externo",
+        "Filename": "nombre del archivo",
+        "GoalConversion": "Conversión de metas",
+        "GoalConversions": "Conversiones de metas",
+        "GoalConversionsBy": "Conversiones %s de metas por tipo de visita",
+        "GoalIsTriggered": "Meta activada",
+        "GoalIsTriggeredWhen": "La meta se activa cuando",
+        "GoalName": "Nombre de la meta",
+        "Goals": "Metas",
+        "NGoals": "%s metas",
+        "NRevenue": "%s ganancia",
+        "NItems": "%s elementos",
+        "ManageGoals": "Administrar metas",
+        "GoalsOverview": "Vista general de metas",
+        "GoalsOverviewDocumentation": "Esta es la vista general de las conversiones de tus metas. Inicialmente, el gráfico muestra la suma de todas las conversiones. %s Debajo del gráfico, podés ver los informes de conversiones para cada una de tus metas. Los gráficos pueden ser agrandados haciendo clic en ellos.",
+        "GoalX": "Meta %s",
+        "HelpOneConversionPerVisit": "Si una página que coincide con esta meta es actualizada o vista más de una vez en una visita, la meta sólo será convertida la primera vez que la página fue cargada durante la visita.",
         "IsExactly": "es exactamente %s",
-        "LeftInCart": "%s abandonado en el carro",
+        "LearnMoreAboutGoalTrackingDocumentation": "Aprendé más sobre %1$sSeguimiento de metas en Matomo%2$s, en la documentación del usuario.",
+        "LeftInCart": "%s abandonado en el changuito",
         "Manually": "manualmente",
-        "ManuallyTriggeredUsingJavascriptFunction": "Los Objetivos son manualmente activados usando la API Javascript trackGoal()",
+        "ManuallyTriggeredUsingJavascriptFunction": "Las metas son manualmente activadas usando la API Javascript trackGoal()",
         "MatchesExpression": "coincide con la expresión %s",
-        "NewGoalIntro": "Goal Conversion tracking is one of the most efficient ways to measure and improve your business objectives.",
+        "NewGoalIntro": "El seguimiento de conversión de meta es uno de los modos más eficientes de medir y mejorar las metas de tu negocio.",
         "NewVisitorsConversionRateIs": "La tasa de visitantes nuevos es %s",
+        "NoGoalsNeedAccess2": "Sólo un usuario con permisos de escritura, un administrador o un usuario con acceso de súperusuario pueden administrar las metas para un determinado sitio web. Por favor, pedile a tu administrador de Matomo que establezca una meta para tu sitio web.<br>¡El seguimiento de metas es una espectacular forma de entender y maximizar el rendimiento de tu sitio web!",
+        "NoConversionsNoReportsMessage": "No se muestran los informes porque no hay datos de conversión para la meta y período elegidos.",
+        "NeedAccess": "Sólo un administrador o un usuario con acceso de súperusuario pueden administrar las metas para un determinado sitio web.",
         "Optional": "(opcional)",
-        "PageTitle": "Título de la Página",
+        "OverallConversionRate": "tasa global de conversión (visitas con una meta completada)",
+        "ColumnOverallRevenue": "Ganancia general",
+        "OverallRevenue": "ganancia general",
+        "PageTitle": "Título de la página",
         "Pattern": "Patrón",
-        "ProductCategory": "Categoría del Producto",
-        "ProductName": "Nombre del Producto",
+        "PluginDescription": "Creá metas y mirá informes detalaldos sobre tus conversiones de meta: evolución en el tiempo, ingreso por visita, conversiones por origen del visitante, por palabra clave y más.",
+        "ProductCategory": "Categoría del producto",
+        "ProductName": "Nombre del producto",
+        "ProductNames": "Nombres del producto",
+        "ProductPrice": "Precio del producto",
+        "ProductQuantity": "Cantidad del producto",
         "Products": "Productos",
-        "ProductSKU": "SKU (número de referencia) del Producto",
-        "ReturningVisitorsConversionRateIs": "La tasa de visitantes que retornan es %s",
-        "SingleGoalOverviewDocumentation": "Esta es la información general de las conversiones de un solo objetivo. %s Los gráficos pueden ser agrandados haciendo clic en ellos.",
-        "UpdateGoal": "Actualizar Objetivo",
-        "URL": "URL",
-        "ViewAndEditGoals": "Ver y Editar Objetivos",
-        "VisitPageTitle": "Visitar un Título de Página proporcionado.",
-        "VisitsUntilConv": "Visitas hasta la Conversión",
-        "VisitUrl": "Visita una URL (página o grupo de páginas)",
+        "ProductSKU": "SKU (número de referencia) del producto",
+        "ProductSKUs": "SKUs (números de referencia) del producto",
+        "ReturningVisitorsConversionRateIs": "La tasa de visitantes que vuelven es %s",
+        "SingleGoalOverviewDocumentation": "Esta es la vista general de las conversiones de una sola meta. %s Los gráficos pueden ser agrandados haciendo clic en ellos.",
+        "ThereIsNoGoalToManage": "No hay meta para administrar del sitio web %s",
+        "UpdateGoal": "Actualizar meta",
+        "URL": "Dirección web",
+        "ViewAndEditGoals": "Ver y editar metas",
+        "GoalsBy": "Metas por %s",
+        "GoalsAdjective": "Metas %s",
+        "VisitPageTitle": "Visitar un título de página proporcionado",
+        "VisitsUntilConv": "Visitas hasta la conversión",
+        "VisitUrl": "Visita una dirección web proporcionada (página o grupo de páginas)",
+        "VisitDurationMatchAttr": "Permanecer un cierto tiempo",
+        "VisitDuration": "la duración de la visita es",
         "WhenVisitors": "cuando los visitantes",
         "WhereThe": "donde el",
-        "YouCanEnableEcommerceReports": "Puede habilitar %1$s para este sitio web en la página %2$s."
+        "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "La página visitada necesita contener un llamado al método \"trackGoal\" de JavaScript (%1$saprendé más%2$s)",
+        "YouCanEnableEcommerceReports": "Podés habilitar %1$s para este sitio web en la página %2$s.",
+        "UseEventValueAsRevenue": "Usá el valor de evento (si existe) como los ingresos de conversión de meta.",
+        "GoalRevenue": "Ingresos de meta",
+        "EventValueAsRevenueHelp": "Si el evento que estás coincidiendo tiene un ingreso, y dicho ingreso está siendo rastreado como el valor del evento, podés habilitar esta opción para registrar el valor del evento como los ingresos de la conversión de la meta. Si los ingresos de tu meta no variarán por conversión, podés ignorar esta opción y simplemente establecer un ingreso predeterminado arriba.",
+        "EventValueAsRevenueHelp2": "Nota: si se establecen tanto un ingreso predeterminado de meta como un valor de evento, se usará el valor del evento. Si esta opción está habilitada y no se envió un valor de evento en una solicitud, se usará el ingreso predeterminado (si está establecido).",
+        "AtLeastMinutes": "al menos %1$s minutos. Usá decimales para coincidir con los segundos. Por ejemplo: %2$s para coincidir con 30 segundos.",
+        "TimeInMinutes": "Tiempo en minutos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/es.json b/app/plugins/Goals/lang/es.json
index c436df042..57bfb03b8 100644
--- a/app/plugins/Goals/lang/es.json
+++ b/app/plugins/Goals/lang/es.json
@@ -118,6 +118,7 @@
         "UseEventValueAsRevenue": "Use el valor del evento (si existiera) como la meta de ingreso de conversión",
         "GoalRevenue": "Meta de ingresos",
         "EventValueAsRevenueHelp": "Si el evento que está haciendo coincidir tiene un ingreso y ese ingreso se registra como el valor del evento, puede habilitar esta opción para registrar el valor del evento como el ingreso de la conversión del objetivo. Si la meta del ingreso no varía según la conversión, puede ignorar esta opción y simplemente establecer un ingreso predeterminado.",
-        "EventValueAsRevenueHelp2": "Nota: Si se definen tanto una meta de ingreso predeterminado tanto como un valor del evento, se utilizará el valor del evento. Si esta opción está habilitada y no se envía ningún valor del evento en una solicitud, se utilizarán los ingresos predeterminados (si están definidos)."
+        "EventValueAsRevenueHelp2": "Nota: Si se definen tanto una meta de ingreso predeterminado tanto como un valor del evento, se utilizará el valor del evento. Si esta opción está habilitada y no se envía ningún valor del evento en una solicitud, se utilizarán los ingresos predeterminados (si están definidos).",
+        "TimeInMinutes": "Tiempo en minutos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/fr.json b/app/plugins/Goals/lang/fr.json
index 731dcf2ad..eb1be0f88 100644
--- a/app/plugins/Goals/lang/fr.json
+++ b/app/plugins/Goals/lang/fr.json
@@ -109,6 +109,8 @@
         "VisitPageTitle": "Visitent un titre de page donné.",
         "VisitsUntilConv": "Visites par conversion",
         "VisitUrl": "Visitent une URL donnée (page ou groupe de pages)",
+        "VisitDurationMatchAttr": "Rester pendant un certain temps",
+        "VisitDuration": "durée de visite est",
         "WhenVisitors": "quand les visiteurs",
         "WhereThe": "où le",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "La page visité doit contenir un appel à la méthode JavaScript 'trackGoal' (%1$sapprenez-en plus%2$s)",
@@ -116,6 +118,8 @@
         "UseEventValueAsRevenue": "Utilisez la valeur de l'évènement (si elle existe) en tant que revenu lié à la conversion de l'objectif.",
         "GoalRevenue": "Revenu de l'objectif",
         "EventValueAsRevenueHelp": "Si l'évènement correspondant a un revenu, et que ce revenu est suivi en tant que valeur de l'évènement, vous pouvez activer cette option pour enregistrement la valeur de l'évènement en tant que revenu de conversion d'objectif. Si votre revenu objectif ne varie pas par conversion, vous pouvez ignorer cette option et simplement définir un revenu par défaut ci-dessus.",
-        "EventValueAsRevenueHelp2": "Note : si un objectif de revenu par défaut ainsi qu'une valeur d'évènement sont définis, la valeur de l'évènement sera utilisée. Si cette option est activée et qu'aucune valeur d'évènement est envoyée avec la requête, la valeur par défault sera utilisée (si définie)."
+        "EventValueAsRevenueHelp2": "Note : si un objectif de revenu par défaut ainsi qu'une valeur d'évènement sont définis, la valeur de l'évènement sera utilisée. Si cette option est activée et qu'aucune valeur d'évènement est envoyée avec la requête, la valeur par défault sera utilisée (si définie).",
+        "AtLeastMinutes": "au moins %1$s minutes. Utiliser les décimales pour les secondes, par exemple, %2$s pour 30 secondes.",
+        "TimeInMinutes": "Durée en minute"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/it.json b/app/plugins/Goals/lang/it.json
index 0110a209e..24a672e5a 100644
--- a/app/plugins/Goals/lang/it.json
+++ b/app/plugins/Goals/lang/it.json
@@ -109,6 +109,8 @@
         "VisitPageTitle": "Visita un determinato Titolo Pagina",
         "VisitsUntilConv": "Visite alla Conversione",
         "VisitUrl": "Visitano uno specifico URL (pagina o gruppo di pagine)",
+        "VisitDurationMatchAttr": "Rimani per un certo periodo di tempo",
+        "VisitDuration": "la durata della visita è",
         "WhenVisitors": "quando i visitatori",
         "WhereThe": "dove le",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "La pagina visitata deve contenere una chiamata al metodo JavaScript 'trackGoal' (%1$sleggi di più%2$s)",
@@ -116,6 +118,8 @@
         "UseEventValueAsRevenue": "Usa il valore evento (se esiste) come ricavo della conversione obiettivo.",
         "GoalRevenue": "Ricavi Obiettivo",
         "EventValueAsRevenueHelp": "Se l'evento di cui si sta eseguendo la corrispondenza ha dei ricavi, ed essi sono tracciati come valore dell'evento, è possibile abilitare questa opzione per registrare il valore dell'evento come ricavi della conversione dell'obiettivo. Se le entrate del tuo obiettivo non variano in base alla conversione, puoi ignorare questa opzione e impostare solo le entrate predefinite qui sopra.",
-        "EventValueAsRevenueHelp2": "Nota: se sono definiti sia un guadagno obiettivo che un valore evento, verrà utilizzato il valore dell'evento. Se questa opzione è abilitata e nessun valore evento viene inviato in una richiesta, verranno utilizzate le entrate predefinite (se definite)."
+        "EventValueAsRevenueHelp2": "Nota: se sono definiti sia un guadagno obiettivo che un valore evento, verrà utilizzato il valore dell'evento. Se questa opzione è abilitata e nessun valore evento viene inviato in una richiesta, verranno utilizzate le entrate predefinite (se definite).",
+        "AtLeastMinutes": "almeno %1$s minuti. Usa i decimali per aggiungere i secondi, per esempio, %2$s per aggiungere 30 secondi.",
+        "TimeInMinutes": "Tempo in Minuti"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/ja.json b/app/plugins/Goals/lang/ja.json
index 38aad830f..4ca078fec 100644
--- a/app/plugins/Goals/lang/ja.json
+++ b/app/plugins/Goals/lang/ja.json
@@ -78,7 +78,7 @@
         "Manually": "手動",
         "ManuallyTriggeredUsingJavascriptFunction": "JavaScript API の trackGoal() を使用した手動トリガー",
         "MatchesExpression": "正規表現 %s に一致する",
-        "NewGoalIntro": "目標コンバージョントラッキングは、あなたのビジネス目標の測定や改善のために、最も効率的な方法の一つです。",
+        "NewGoalIntro": "目標コンバージョントラッキングは、ビジネス目標の測定や改善のために、最も効率的な方法の一つです。",
         "NewVisitorsConversionRateIs": "新規ビジターのコンバージョン率は %s です",
         "NoGoalsNeedAccess2": "書き込みユーザー、管理者、またはスーパーユーザー権限を持つユーザーのみが、指定した Web サイトの目標を管理できます。 Matomo の管理者にウェブサイトの目標を設定するよう依頼してください。<br>トラッキング目標は、ウェブサイトの掲載結果を理解して最大限に活用するのに最適な方法です。",
         "NoConversionsNoReportsMessage": "選択した目標と期間のコンバージョンデータがないため、レポートは表示されません。",
@@ -89,7 +89,7 @@
         "OverallRevenue": "全体の収益",
         "PageTitle": "ページタイトル",
         "Pattern": "パターン",
-        "PluginDescription": "目標を作成し、目標のコンバージョンに関する詳細なレポートを参照してください : 時間がたつにつれての推移、1 ビジットあたりの収入、1 キーワードあたり、リファラーあたりのコンバージョン、およびその他。",
+        "PluginDescription": "目標を作成し、目標のコンバージョンに関する詳細なレポートを参照してください : 時間の経過に伴う推移、1 ビジットあたりの収入、1 キーワードあたり、リファラーあたりのコンバージョン、およびその他。",
         "ProductCategory": "製品カテゴリー",
         "ProductName": "製品名",
         "ProductNames": "製品名",
@@ -99,7 +99,7 @@
         "ProductSKU": "製品番号",
         "ProductSKUs": "製品番号",
         "ReturningVisitorsConversionRateIs": "リピーターのコンバージョン率は %s です",
-        "SingleGoalOverviewDocumentation": "これは単一の目標のコンバージョンの概観です。 %s グラフの下のスパークラインは、クリックして拡大できます。",
+        "SingleGoalOverviewDocumentation": "これは単一の目標に対するコンバージョンの概観です。 %s グラフの下のスパークラインは、クリックして拡大できます。",
         "ThereIsNoGoalToManage": "Web サイト %s の管理目標はありません。",
         "UpdateGoal": "目標を更新",
         "URL": "URL",
@@ -109,6 +109,8 @@
         "VisitPageTitle": "入力されたタイトルのページを訪問",
         "VisitsUntilConv": "ビジット数別のコンバージョン",
         "VisitUrl": "特定の URL を訪問（ページまたはページグループ）",
+        "VisitDurationMatchAttr": "一定時間滞在する",
+        "VisitDuration": "訪問時間は",
         "WhenVisitors": "ビジター",
         "WhereThe": "対象：",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "訪問したページに JavaScript の 'trackGoal' メソッドを呼び出す必要があります( %1$s詳細はこちら%2$s )",
@@ -117,6 +119,7 @@
         "GoalRevenue": "目標収益",
         "EventValueAsRevenueHelp": "一致するイベントに収益があり、その収益がイベント値としてトラッキングされている場合は、このオプションを有効にすると、イベントの値を目標コンバージョンの収益として記録できます。 コンバージョンごとに目標収入が変化しない場合は、このオプションを無視して上のデフォルト収益額を設定することができます。",
         "EventValueAsRevenueHelp2": "注：デフォルトの目標収入とイベント値の両方が定義されている場合は、イベント値が使用されます。 このオプションを有効にして、要求でイベント値が送信されない場合は、デフォルト収益が使用されます（定義されている場合）。",
-        "AtLeastMinutes": "少なくとも%1$s分。秒を一致させるには小数を使用します。たとえば、30秒を一致させるには%2$sを使用します。"
+        "AtLeastMinutes": "少なくとも%1$s分。秒を一致させるには小数を使用します。たとえば、30秒を一致させるには%2$sを使用します。",
+        "TimeInMinutes": "分単位の時間"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/pt-br.json b/app/plugins/Goals/lang/pt-br.json
index 01f359096..c1e6f6c0e 100644
--- a/app/plugins/Goals/lang/pt-br.json
+++ b/app/plugins/Goals/lang/pt-br.json
@@ -43,6 +43,7 @@
         "DaysToConv": "Dias para Conversão",
         "Details": "Detalhes da Meta",
         "DefaultGoalConvertedOncePerVisit": "(padrão) A meta só pode ser convertida uma vez por visita",
+        "DefaultRevenueLabel": "Receita padrão da meta",
         "DefaultRevenueHelp": "Por exemplo, um Form Contato submetido por um visitante pode valer $10 em média. Matomo ajudará a entender quão bem o segmento de seus visitantes está funcionando.",
         "DeleteGoalConfirm": "Tem certeza que deseja deletar a meta %s?",
         "DocumentationRevenueGeneratedByProductSales": "As vendas de produtos. Exclui o de impostos transporte, e desconto.",
@@ -64,6 +65,8 @@
         "GoalName": "Nome da meta",
         "Goals": "Metas",
         "NGoals": "%s metas",
+        "NRevenue": "%s receita",
+        "NItems": "%s itens",
         "ManageGoals": "Gerenciar meta",
         "GoalsOverview": "Visão geral de metas",
         "GoalsOverviewDocumentation": "Esta é uma visão geral de suas conversões de metas. Inicialmente, o gráfico mostra a soma de todas as conversões. %s abaixo do gráfico, você pode ver relatórios de conversão para cada uma de suas metas. Os minigráficos podem ser ampliados clicando sobre eles.",
@@ -77,6 +80,7 @@
         "MatchesExpression": "corresponde com a expressão %s",
         "NewGoalIntro": "O acompanhamento de conversões de metas é uma das maneiras mais eficientes para medir e melhorar seus objetivos de negócios.",
         "NewVisitorsConversionRateIs": "Taxa de conversão de novos usuários é %s",
+        "NoGoalsNeedAccess2": "Somente um usuário de escrita, um administrador ou um super usuário pode gerenciar Metas de um site web. Favor pedir ao administrador do Matomo que defina uma Meta para seu site web.<br> Metas de Acompanhamento é uma ótima maneira de entender e maximizar a performance do seu site web!",
         "NoConversionsNoReportsMessage": "Os relatórios não são exibidos porque não há dados de conversão para a meta e o período selecionados.",
         "NeedAccess": "Apenas um Administrador ou um usuário com acesso Super Usuário pode gerenciar Metas para um determinado website.",
         "Optional": "(opcional)",
@@ -105,9 +109,17 @@
         "VisitPageTitle": "Visitas por um título de página",
         "VisitsUntilConv": "Visitas para conversão",
         "VisitUrl": "Visitar a URL dada(página ou grupo de páginas)",
+        "VisitDurationMatchAttr": "Permanecer por um certo período de tempo",
+        "VisitDuration": "duração da visita é",
         "WhenVisitors": "quando visitantes",
         "WhereThe": "onde o(a)",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "A página visitada precisa conter uma chamada para o método JavaScript 'trackGoal' (%1$saprenda mais%2$s)",
-        "YouCanEnableEcommerceReports": "Você pode habilitar %1$s para este site na página %2$s."
+        "YouCanEnableEcommerceReports": "Você pode habilitar %1$s para este site na página %2$s.",
+        "UseEventValueAsRevenue": "Usar o valor do evento (se existir) como a receita de conversão da meta.",
+        "GoalRevenue": "Receita da meta",
+        "EventValueAsRevenueHelp": "Se o evento correspondente tem uma receita, e essa receita é monitorada como o valor do evento, você pode habilitar esta opção para registrar o valor do evento como a receita de conversão da meta. Se a receita da meta não irá variar por conversão, você pode ignorar esta opção e apenas definir acima uma receita padrão.",
+        "EventValueAsRevenueHelp2": "Observação: Se uma receita padrão de meta e um valor de evento ambos estiverem definidos, o valor do evento será usado. Se esta opção estiver habilitada e nenhum valor de evento for enviado em uma solicitação, a receita padrão será usada (se definida).",
+        "AtLeastMinutes": "pelo menos %1$s minutos. Use decimais para corresponder com segundos, por exemplo, %2$s para corresponder a 30 segundos.",
+        "TimeInMinutes": "Tempo em minutos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/pt.json b/app/plugins/Goals/lang/pt.json
index 922313585..facfd71e1 100644
--- a/app/plugins/Goals/lang/pt.json
+++ b/app/plugins/Goals/lang/pt.json
@@ -109,6 +109,8 @@
         "VisitPageTitle": "Visita num título de página específico",
         "VisitsUntilConv": "Visitas até à conversão",
         "VisitUrl": "Visitar um dado endereço (página ou grupo de páginas)",
+        "VisitDurationMatchAttr": "Ficar por um determinado período de tempo",
+        "VisitDuration": "a duração da visita é",
         "WhenVisitors": "quando os visitantes",
         "WhereThe": "onde o",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "As páginas visitadas necessitam de conter uma invocação ao método JavaScript 'trackGoal' (%1$ssaber mais%2$s)",
@@ -116,6 +118,8 @@
         "UseEventValueAsRevenue": "Utilizar o valor do evento (se este existir) como o rendimento da conversão do objetivo.",
         "GoalRevenue": "Rendimento do objetivo",
         "EventValueAsRevenueHelp": "Se o evento que está a corresponder tem um rendimento e, se esse rendimento é acompanhado como o valor do evento, pode ativar esta opção para registar o valor do evento como rendimento da conversão do objetivo. Se o rendimento do objetivo não vai variar por conversão, pode ignorar esta opção e definir apenas um valor predefinido de rendimento acima.",
-        "EventValueAsRevenueHelp2": "Nota: Se estiverem definidos o rendimento predefinido do objetivo e o valor do evento, será utilizado o valor do evento. Se esta opção estiver ativa e se nenhum valor de evento for enviado num pedido, será utilizador o valor predefinido de rendimento (se definido)."
+        "EventValueAsRevenueHelp2": "Nota: Se estiverem definidos o rendimento predefinido do objetivo e o valor do evento, será utilizado o valor do evento. Se esta opção estiver ativa e se nenhum valor de evento for enviado num pedido, será utilizador o valor predefinido de rendimento (se definido).",
+        "AtLeastMinutes": "pelo menos %1$s minutos. Utilize decimais para corresponder segundos, por exemplo, %2$s para corresponder 30 segundos.",
+        "TimeInMinutes": "Tempo em minutos"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/sq.json b/app/plugins/Goals/lang/sq.json
index 6e51fc225..066d7127b 100644
--- a/app/plugins/Goals/lang/sq.json
+++ b/app/plugins/Goals/lang/sq.json
@@ -109,6 +109,8 @@
         "VisitPageTitle": "Vizitoni një Titull Faqeje të dhënë",
         "VisitsUntilConv": "Vizita për Shndërrim",
         "VisitUrl": "Vizitoni një URL të dhënë (faqe ose grup faqesh)",
+        "VisitDurationMatchAttr": "Qëndro për një kohë të caktuar",
+        "VisitDuration": "gjatësia e vizitës është",
         "WhenVisitors": "kur vizitorët",
         "WhereThe": "kur",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Faqja e vizituar lypset të përmbajë një thirrje të metodës JavaScript 'trackGoal' (%1$smësoni më tepër%2$s)",
@@ -116,6 +118,8 @@
         "UseEventValueAsRevenue": "Përdore vlerën e veprimtarisë (në pastë) si të ardhur shndërrimi objektivi.",
         "GoalRevenue": "Të ardhura Objektivi",
         "EventValueAsRevenueHelp": "Nëse veprimtaria për të cilën keni përputhje ka të ardhura, dhe këto të ardhura ndiqen si vlera e veprimtarisë, mund ta aktivizoni këtë mundësi për të regjistruar vlerën e veprimtarisë si të ardhura shndërrimi objektivi. Nëse të ardhurat e objektivit tuaja nuk ndryshojnë sipas shndërrimesh, mund ta shpërfillni këtë mundësi dhe thjesht të caktoni më sipër një të ardhur parazgjedhje.",
-        "EventValueAsRevenueHelp2": "Shënim: Nëse janë caktuar si e ardhura parazgjedhje e objektivit, ashtu edhe vlera e veprimtarisë, do të përdoret vlera e veprimtarisë. Nëse kjo mundësi është e aktivizuar dhe në një kërkesë nuk është dërguar vlerë veprimtarie, do të përdoret vlera parazgjedhje (në pastë të caktuar një të tillë)."
+        "EventValueAsRevenueHelp2": "Shënim: Nëse janë caktuar si e ardhura parazgjedhje e objektivit, ashtu edhe vlera e veprimtarisë, do të përdoret vlera e veprimtarisë. Nëse kjo mundësi është e aktivizuar dhe në një kërkesë nuk është dërguar vlerë veprimtarie, do të përdoret vlera parazgjedhje (në pastë të caktuar një të tillë).",
+        "AtLeastMinutes": "të paktën %1$s minuta. Përdorni shifra dhjetore për sekonda, për shembull, %2$s për përputhje me 30 sekonda.",
+        "TimeInMinutes": "Kohë në Minuta"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Goals/lang/sv.json b/app/plugins/Goals/lang/sv.json
index 2ad847679..bfe0d9c57 100644
--- a/app/plugins/Goals/lang/sv.json
+++ b/app/plugins/Goals/lang/sv.json
@@ -113,6 +113,7 @@
         "WhereThe": "där",
         "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "Den besökta sidan behöver inkludera ett anrop till 'trackGoal'-metoden i javaskript (%1$slär dig mer%2$s)",
         "YouCanEnableEcommerceReports": "Du kan aktivera %1$s för denna webbplats på sidan %2$s.",
-        "GoalRevenue": "Målsatt intäkt"
+        "GoalRevenue": "Målsatt intäkt",
+        "TimeInMinutes": "Tid i minuter"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Heartbeat/config/config.php b/app/plugins/Heartbeat/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Heartbeat/config/config.php
+++ b/app/plugins/Heartbeat/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Heartbeat/config/tracker.php b/app/plugins/Heartbeat/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Heartbeat/config/tracker.php
+++ b/app/plugins/Heartbeat/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/ImageGraph/API.php b/app/plugins/ImageGraph/API.php
index ae52f6d83..e0e064a59 100644
--- a/app/plugins/ImageGraph/API.php
+++ b/app/plugins/ImageGraph/API.php
@@ -28,7 +28,7 @@
  * - $colors accepts a comma delimited list of colors that will overwrite the default Matomo colors <br/>
  * - you can also customize the width, height, font size, metric being plotted (in case the data contains multiple columns/metrics).
  *
- * See also <a href='http://matomo.org/docs/analytics-api/metadata/#toc-static-image-graphs'>How to embed static Image Graphs?</a> for more information.
+ * See also <a href='https://developer.matomo.org/api-reference/reporting-api-metadata#static-image-graphs'>How to embed static Image Graphs?</a> for more information.
  *
  * @method static \Piwik\Plugins\ImageGraph\API getInstance()
  */
diff --git a/app/plugins/ImageGraph/StaticGraph/Pie.php b/app/plugins/ImageGraph/StaticGraph/Pie.php
index 63d7bf075..6bae61723 100644
--- a/app/plugins/ImageGraph/StaticGraph/Pie.php
+++ b/app/plugins/ImageGraph/StaticGraph/Pie.php
@@ -23,4 +23,9 @@ public function renderGraph()
             $this->pieConfig
         );
     }
+
+    public function supportsComparison()
+    {
+        return false;
+    }
 }
diff --git a/app/plugins/ImageGraph/config/config.php b/app/plugins/ImageGraph/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/ImageGraph/config/config.php
+++ b/app/plugins/ImageGraph/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/ImageGraph/config/tracker.php b/app/plugins/ImageGraph/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/ImageGraph/config/tracker.php
+++ b/app/plugins/ImageGraph/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/ImageGraph/lang/de.json b/app/plugins/ImageGraph/lang/de.json
index 5f14931a4..4b8513ac7 100644
--- a/app/plugins/ImageGraph/lang/de.json
+++ b/app/plugins/ImageGraph/lang/de.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "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."
+        "PluginDescription": "Generieren Sie schöne statische Graphen für beliebige Datenberichte als PNG-Bilder."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ImageGraph/lang/ja.json b/app/plugins/ImageGraph/lang/ja.json
index d60ea45b7..378c14dfa 100644
--- a/app/plugins/ImageGraph/lang/ja.json
+++ b/app/plugins/ImageGraph/lang/ja.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "ColumnOrdinateMissing": "列 '%1$s' は、このレポートで見つかりませんでした。%2$s のいずれかをお試しください。",
-        "PluginDescription": "データ報告のいずれかのための美しい静的なPNGグラフの画像を生成します。"
+        "PluginDescription": "データレポート用の美しい静的なPNGグラフの画像を生成します。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ImageGraph/lang/pt-br.json b/app/plugins/ImageGraph/lang/pt-br.json
index 58bb5d406..f09e478e9 100644
--- a/app/plugins/ImageGraph/lang/pt-br.json
+++ b/app/plugins/ImageGraph/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "ImageGraph": {
         "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."
+        "PluginDescription": "Gere belas imagens estáticas PNG para quaisquer dos seus relatórios de dados."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Insights/config/config.php b/app/plugins/Insights/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Insights/config/config.php
+++ b/app/plugins/Insights/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Insights/config/tracker.php b/app/plugins/Insights/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Insights/config/tracker.php
+++ b/app/plugins/Insights/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Insights/lang/da.json b/app/plugins/Insights/lang/da.json
index cd1e4139d..8cac1c733 100644
--- a/app/plugins/Insights/lang/da.json
+++ b/app/plugins/Insights/lang/da.json
@@ -1,5 +1,6 @@
 {
     "Insights": {
+        "PluginDescription": "Få indsigt om din trafik. Indsigt er tilgængelig som dashboardwidgets såvel som et nyt ikon i rapporter, som giver dig mulighed for at se tendenser i dine data.",
         "ControlComparedToDescription": "Vækst i forhold til",
         "ControlFilterByDescription": "Vis alle, kun ændringer, kun nye eller kun forsvundne",
         "DatePeriodCombinationNotSupported": "Det er ikke muligt at generere rapporter til disse datoer og kombination af perioder.",
@@ -25,6 +26,7 @@
         "TitleConsideredMoversAndShakersGrowth": "%1$s ændret fra %2$s til %3$s i forhold til %4$s. Baseret på dette forventes en videreudvikling for hver række på %5$s%%.",
         "TitleRowChangeDetails": "'%1$s' ændres fra %2$s (%3$s) til %4$s (%5$s) %6$s.",
         "TitleRowDisappearedDetails": "'%1$s' faldt med %2$s og er forsvand i %3$s i forhold til %4$s.",
+        "TitleRowMoverAndShaker": "Denne række havde en højere effekt end gennemsnittet.",
         "TitleRowNewDetails": "'%1$s' øget med %2$s og er ny i forhold til %3$s.",
         "WeekComparedToPreviousWeek": "forrige uge",
         "WidgetCategory": "Indsigt",
diff --git a/app/plugins/Insights/lang/es-ar.json b/app/plugins/Insights/lang/es-ar.json
new file mode 100644
index 000000000..12ab92f8e
--- /dev/null
+++ b/app/plugins/Insights/lang/es-ar.json
@@ -0,0 +1,35 @@
+{
+    "Insights": {
+        "PluginDescription": "Te ofrece información en detalle sobre tu tráfico. Esta información en detalle está disponible como widgets de panel así como un nuevo ícono en los informes, dejándote ver las tendencias más importantes en tus datos.",
+        "ControlComparedToDescription": "Crecimiento comparado al",
+        "ControlFilterByDescription": "Mostrar todo, sólo tendencias, sólo lo nuevo o sólo lo desaparecido",
+        "DatePeriodCombinationNotSupported": "No es posible generar información detallada para esta combinación de fecha y período.",
+        "DayComparedToPreviousDay": "día anterior",
+        "DayComparedToPreviousWeek": "mismo día de la semana pasada",
+        "DayComparedToPreviousYear": "mismo día del año pasado",
+        "Filter": "Filtrar",
+        "FilterIncreaserAndDecreaser": "En ascenso y descenso",
+        "FilterOnlyDecreaser": "Sólo en descenso",
+        "FilterOnlyDisappeared": "Sólo desaparecidos",
+        "FilterOnlyIncreaser": "Sólo en ascenso",
+        "FilterOnlyMovers": "Sólo tendencias",
+        "FilterOnlyNew": "Sólo lo nuevo",
+        "IgnoredChanges": "Los cambios que afectan a menos de %s visitas fueron ignorados.",
+        "MonthComparedToPreviousMonth": "mes anterior",
+        "MonthComparedToPreviousYear": "mismo mes del año anterior",
+        "MoversAndShakersWidgetTitle": "Variaciones",
+        "NoResultMatchesCriteria": "Ninguna fila coincide con los criterios",
+        "OverviewWidgetTitle": "Vista general de información detallada",
+        "TitleConsideredInsightsChanges": "Las filas aumentaron o descendieron por al menos %1$s visitas (%2$s %% de %3$s visitas totales).",
+        "TitleConsideredInsightsGrowth": "Las siguientes filas tuvieron un crecimiento de al menos %1$s%% comparadas a %2$s.",
+        "TitleConsideredMoversAndShakersChanges": "Se consideran influyentes sólo si crecieron por más de %1$s%% visitas o si se achicaron menos de %2$s%% visitas, nuevas etradas sólo si aumentaron por más de %3$s%% visitas (%4$s), y filas desaparecidas si se achicaron por menos de %5$s%% visitas (%6$s).",
+        "TitleConsideredMoversAndShakersGrowth": "%1$s cambió de %2$s a %3$s comparado a %4$s. Basado en esto, se espera una evolución de cada fila de %5$s%%.",
+        "TitleRowChangeDetails": "\"%1$s\" cambió de %2$s (%3$s) a %4$s (%5$s) %6$s.",
+        "TitleRowDisappearedDetails": "\"%1$s\" disminuyó por %2$s y desapareció en %3$s comparado a %4$s.",
+        "TitleRowMoverAndShaker": "Esta fila tuvo un impacto más alto que el promedio",
+        "TitleRowNewDetails": "\"%1$s\" aumentó por %2$s y es nuevo comparado a %3$s.",
+        "WeekComparedToPreviousWeek": "semana pasada",
+        "WidgetCategory": "Información detallada",
+        "YearComparedToPreviousYear": "año pasado"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Insights/lang/pt.json b/app/plugins/Insights/lang/pt.json
index 92d3d5ebb..1f44d85fa 100644
--- a/app/plugins/Insights/lang/pt.json
+++ b/app/plugins/Insights/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "Insights": {
+        "PluginDescription": "Disponibiliza perspetivas sobre o seu tráfego. As perspetivas encontram-se disponíveis como widgets nos painéis, bem como um novo ícone nos relatórios, para que possa analisar as tendências mais importantes nos seus dados.",
         "ControlComparedToDescription": "Crescimento comparado ao",
         "ControlFilterByDescription": "Mostrar tudo, apenas movidos, apenas novos ou apenas os que desapareceram",
         "DatePeriodCombinationNotSupported": "Não é possível gerar perspetivas para esta combinação de datas e de períodos.",
@@ -25,6 +26,7 @@
         "TitleConsideredMoversAndShakersGrowth": "%1$s mudaram de %2$s para %3$s comparativamente a %4$s. Com base nesta evolução para cada linha de %5$s%% é esperado.",
         "TitleRowChangeDetails": "'%1$s' mudou de %2$s (%3$s) para %4$s (%5$s) %6$s.",
         "TitleRowDisappearedDetails": "'%1$s' decresceu por %2$s e desapareceu em %3$s comparativamente a %4$s.",
+        "TitleRowMoverAndShaker": "Esta linha teve um impacto maior do que a média.",
         "TitleRowNewDetails": "'%1$s' cresceu por %2$s e é nova comparativamente a %3$s.",
         "WeekComparedToPreviousWeek": "semana anterior",
         "WidgetCategory": "Perspetivas",
diff --git a/app/plugins/Insights/lang/sq.json b/app/plugins/Insights/lang/sq.json
index e5a65e62b..d62348248 100644
--- a/app/plugins/Insights/lang/sq.json
+++ b/app/plugins/Insights/lang/sq.json
@@ -1,5 +1,6 @@
 {
     "Insights": {
+        "PluginDescription": "Furnizon Prirje të trafikut tuaj. Prirjet mund të kihen në formë widget-esh pulti, si edhe në formën e një ikone të re në raporte, që t’ju lejojë të shihni tendencat më të rëndësishme në të dhënat tuaja.",
         "ControlComparedToDescription": "Rritja e krahasuar me",
         "ControlFilterByDescription": "Shfaqi krejt, vetëm protagonistët, vetëm të rinjtë ose vetëm të zhdukurit",
         "DatePeriodCombinationNotSupported": "S’është e mundur të prodhohen prirje për këtë ndërthurje date dhe periudhe.",
@@ -25,6 +26,7 @@
         "TitleConsideredMoversAndShakersGrowth": "%1$s ndryshoi nga %2$s në %3$s krahasuar me %4$s. Bazuar në këtë, pritet një evolucion %5$s%% për çdo rresht.",
         "TitleRowChangeDetails": "'%1$s' ndryshoi nga %2$s (%3$s) to %4$s (%5$s) %6$s.",
         "TitleRowDisappearedDetails": "'%1$s' u pakësua me %2$s dhe u zhduk në %3$s krahasuar me %4$s.",
+        "TitleRowMoverAndShaker": "Ky rresht ka një ndikim më të madh se mesatarja.",
         "TitleRowNewDetails": "'%1$s' u rrit me %2$s dhe është i ri krahasuar me %3$s.",
         "WeekComparedToPreviousWeek": "java e mëparshme",
         "WidgetCategory": "Prirje",
diff --git a/app/plugins/Installation/Controller.php b/app/plugins/Installation/Controller.php
index 4b44fe4e0..0392f96b5 100644
--- a/app/plugins/Installation/Controller.php
+++ b/app/plugins/Installation/Controller.php
@@ -18,7 +18,6 @@
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Filesystem;
-use Piwik\Http;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
@@ -26,7 +25,9 @@
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
+use Piwik\Plugins\UsersManager\NewsletterSignup;
 use Piwik\Plugins\UsersManager\UserUpdater;
+
 use Piwik\ProxyHeaders;
 use Piwik\SettingsPiwik;
 use Piwik\Tracker\TrackerCodeGenerator;
@@ -275,14 +276,21 @@ function setupSuperUser()
         if ($form->validate()) {
 
             try {
-                $this->createSuperUser($form->getSubmitValue('login'),
+                $loginName = $form->getSubmitValue('login');
+                $email = $form->getSubmitValue('email');
+
+                $this->createSuperUser($loginName,
                                        $form->getSubmitValue('password'),
-                                       $form->getSubmitValue('email'));
+                                       $email);
 
-                $email = $form->getSubmitValue('email');
                 $newsletterPiwikORG = $form->getSubmitValue('subscribe_newsletter_piwikorg');
                 $newsletterProfessionalServices = $form->getSubmitValue('subscribe_newsletter_professionalservices');
-                $this->registerNewsletter($email, $newsletterPiwikORG, $newsletterProfessionalServices);
+                NewsletterSignup::signupForNewsletter(
+                    $loginName,
+                    $email,
+                    $newsletterPiwikORG,
+                    $newsletterProfessionalServices
+                );
                 $this->redirectToNextStep(__FUNCTION__);
 
             } catch (Exception $e) {
@@ -368,11 +376,27 @@ public function trackingCode()
         $siteName = Common::unsanitizeInputValue($this->getParam('site_name'));
         $idSite = $this->getParam('site_idSite');
 
+        $javascriptGenerator = new TrackerCodeGenerator();
+        $jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
+        $rawJsTag = TrackerCodeGenerator::stripTags($jsTag);
+
+        $showMatomoLinks = true;
+        Piwik::postEvent('SitesManager.showMatomoLinksInTrackingCodeEmail', array(&$showMatomoLinks));
+
+        $trackingUrl = trim(SettingsPiwik::getPiwikUrl(), '/') . '/' . $javascriptGenerator->getPhpTrackerEndpoint();
+
+        $emailBody = $this->renderTemplateAs('@SitesManager/_trackingCodeEmail', array(
+            'jsTag' => $rawJsTag,
+            'showMatomoLinks' => $showMatomoLinks,
+            'trackingUrl' => $trackingUrl,
+            'idSite' => $idSite
+        ), $viewType = 'basic');
+
         // Load the Tracking code and help text from the SitesManager
         $viewTrackingHelp = new \Piwik\View('@SitesManager/_displayJavascriptCode');
         $viewTrackingHelp->displaySiteName = $siteName;
-        $javascriptGenerator = new TrackerCodeGenerator();
-        $viewTrackingHelp->jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
+        $viewTrackingHelp->jsTag = $jsTag;
+        $viewTrackingHelp->emailBody = $emailBody;
         $viewTrackingHelp->idSite = $idSite;
         $viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName();
         $viewTrackingHelp->isInstall = true;
@@ -716,40 +740,6 @@ private function deleteConfigFileIfNeeded()
         }
     }
 
-    /**
-     * @param $email
-     * @param $newsletterPiwikORG
-     * @param $newsletterProfessionalServices
-     */
-    protected function registerNewsletter($email, $newsletterPiwikORG, $newsletterProfessionalServices)
-    {
-        $url = Config::getInstance()->General['api_service_url'];
-        $url .= '/1.0/subscribeNewsletter/';
-        $params = array(
-            'email'     => $email,
-            'piwikorg'  => $newsletterPiwikORG,
-            'piwikpro'  => $newsletterProfessionalServices,
-            'url'       => Url::getCurrentUrlWithoutQueryString(),
-            'language'  => StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage(),
-        );
-        if ($params['piwikorg'] == '1'
-            || $params['piwikpro'] == '1'
-        ) {
-            if (!isset($params['piwikorg'])) {
-                $params['piwikorg'] = '0';
-            }
-            if (!isset($params['piwikpro'])) {
-                $params['piwikpro'] = '0';
-            }
-            $url .= '?' . Http::buildQuery($params);
-            try {
-                Http::sendHttpRequest($url, $timeout = 2);
-            } catch (Exception $e) {
-                // e.g., disable_functions = fsockopen; allow_url_open = Off
-            }
-        }
-    }
-
     /**
      * @return array|bool
      */
diff --git a/app/plugins/Installation/FormDatabaseSetup.php b/app/plugins/Installation/FormDatabaseSetup.php
index 9a26b7f48..9eebfd8f7 100644
--- a/app/plugins/Installation/FormDatabaseSetup.php
+++ b/app/plugins/Installation/FormDatabaseSetup.php
@@ -119,11 +119,6 @@ public function createDatabaseObject()
         $adapter = $this->getSubmitValue('adapter');
         $port = Adapter::getDefaultPortForAdapter($adapter);
 
-        $hostParts = explode(':', DB_HOST);
-        if (count($hostParts) === 2 && is_numeric($hostParts[1])) {
-            $port = $hostParts[1];
-        }
-
         $host = $this->getSubmitValue('host');
         $tables_prefix = $this->getSubmitValue('tables_prefix');
         
diff --git a/app/plugins/Installation/FormSuperUser.php b/app/plugins/Installation/FormSuperUser.php
index 28c81f94c..e57eac5b2 100644
--- a/app/plugins/Installation/FormSuperUser.php
+++ b/app/plugins/Installation/FormSuperUser.php
@@ -59,7 +59,7 @@ function init()
             ));
 
         $professionalServicesNewsletter = Piwik::translate('Installation_ProfessionalServicesNewsletter',
-            array("<a href='https://matomo.org/support/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer noopener' target='_blank'>", "</a>")
+            array("<a href='https://matomo.org/support/?pk_medium=App_Newsletter_link&pk_source=Matomo_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer noopener' target='_blank'>", "</a>")
         );
 
         $privacyNoticeLink = '<a href="https://matomo.org/privacy-policy/" target="_blank" rel="noreferrer noopener">';
diff --git a/app/plugins/Installation/Installation.php b/app/plugins/Installation/Installation.php
index 9d7d40847..5bd24575a 100644
--- a/app/plugins/Installation/Installation.php
+++ b/app/plugins/Installation/Installation.php
@@ -11,6 +11,7 @@
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Exception\NotYetInstalledException;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Installation\Exception\DatabaseConnectionFailedException;
@@ -64,7 +65,7 @@ public function dispatchIfNotInstalledYet(&$module, &$action, &$parameters)
         $general = Config::getInstance()->General;
 
         if (!SettingsPiwik::isPiwikInstalled() && !$general['enable_installer']) {
-            throw new \Exception('Matomo is not set up yet');
+            throw new NotYetInstalledException('Matomo is not set up yet');
         }
 
         if (empty($general['installation_in_progress'])) {
diff --git a/app/plugins/Installation/ServerFilesGenerator.php b/app/plugins/Installation/ServerFilesGenerator.php
index fddc0fc14..3bc5750e2 100644
--- a/app/plugins/Installation/ServerFilesGenerator.php
+++ b/app/plugins/Installation/ServerFilesGenerator.php
@@ -74,15 +74,15 @@ public static function createHtAccessFiles()
         // deny access to these folders
         $directoriesToProtect = array(
             PIWIK_USER_PATH . '/config' => $denyAll,
-	        PIWIK_INCLUDE_PATH. '/core' => $denyAll,
-	        PIWIK_INCLUDE_PATH . '/lang' => $denyAll,
+            PIWIK_INCLUDE_PATH. '/core' => $denyAll,
+            PIWIK_INCLUDE_PATH . '/lang' => $denyAll,
             StaticContainer::get('path.tmp') => $denyAll,
         );
-
-	    if (!empty($GLOBALS['CONFIG_INI_PATH_RESOLVER']) && is_callable($GLOBALS['CONFIG_INI_PATH_RESOLVER'])) {
-		    $file = call_user_func($GLOBALS['CONFIG_INI_PATH_RESOLVER']);
-		    $directoriesToProtect[dirname($file)] = $denyAll;
-	    }
+	    
+        if (!empty($GLOBALS['CONFIG_INI_PATH_RESOLVER']) && is_callable($GLOBALS['CONFIG_INI_PATH_RESOLVER'])) {
+            $file = call_user_func($GLOBALS['CONFIG_INI_PATH_RESOLVER']);
+            $directoriesToProtect[dirname($file)] = $denyAll;
+        }
 
         foreach ($directoriesToProtect as $directoryToProtect => $content) {
             self::createHtAccess($directoryToProtect, $overwrite = true, $content);
diff --git a/app/plugins/Installation/config/config.php b/app/plugins/Installation/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Installation/config/config.php
+++ b/app/plugins/Installation/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Installation/config/tracker.php b/app/plugins/Installation/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Installation/config/tracker.php
+++ b/app/plugins/Installation/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Installation/lang/cs.json b/app/plugins/Installation/lang/cs.json
index ef18de9e6..1181976e5 100644
--- a/app/plugins/Installation/lang/cs.json
+++ b/app/plugins/Installation/lang/cs.json
@@ -149,6 +149,7 @@
         "WelcomeHelp": "<p>Matomo je bezplatný software pro webovou analýzu, který usnadňuje získání informací, které chcete od svých návštěvníků.<\/p><p>Tento proces je rozdělen do %s jednoduchých kroků a trvá přibližně 5 minut.<\/p>",
         "WelcomeToCommunity": "Vítejte v komunitě Matomou!",
         "CannotConnectToDb": "Nelze se připojit k databázi",
-        "CannotConnectToDbResolvingExplanation": "To může být dočasný problém, zkuste %1$sobnovit stránku%2$s. Pokud problém přetrvá, kontaktujte svého administrátora Matomou."
+        "CannotConnectToDbResolvingExplanation": "To může být dočasný problém, zkuste %1$sobnovit stránku%2$s. Pokud problém přetrvá, kontaktujte svého administrátora Matomou.",
+        "EmailPrivacyNotice": "Vaše e-mailová adresa bude použita pouze k zasílání zpravodaje Matomo. Odběr můžete kdykoli zrušit kliknutím na odkaz pro odhlášení. Váš e-mail nebudeme sdílet s nikým jiným, ani jej nebudeme používat k žádnému jinému účelu než k zasílání zpravodaje Matomo. Pro více informací prosím shlédněte naše %1$szásady ochrany osobních údajů%2$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Installation/lang/da.json b/app/plugins/Installation/lang/da.json
index 0a47d7c46..0e7f20f0f 100644
--- a/app/plugins/Installation/lang/da.json
+++ b/app/plugins/Installation/lang/da.json
@@ -4,6 +4,7 @@
         "ConfigurationHelp": "Din Matomo-konfigurationsfil ser ud til at være fejlkonfigureret. Du kan enten fjerne config\/config.ini.php og fortsætte installationen eller rette databaseindstillingerne.",
         "ConfirmDeleteExistingTables": "Bekræft sletning af tabellerne: %s fra databasen? ADVARSEL: DATA FRA DISSE TABELLER KAN IKKE GENSKABES!",
         "Congratulations": "Tillykke",
+        "CongratulationsHelp": "<p>Tillykke! Din Matomo installation er gennemført.<\/p> <p>Du bør sikre dig at din JavaScript kode er indsat på dine sider, og herefter vente på dine første besøg!<\/p>",
         "DatabaseAbilities": "Databaseegenskaber",
         "DatabaseCreation": "Database oprettet",
         "DatabaseErrorConnect": "Fejl ved tilkobling til databaseserveren",
@@ -30,16 +31,22 @@
         "JSTracking_Intro": "For at spore hjemmeside trafik med Matomo skal du sørge for nogle ekstra kode til hver af hjemmesiderne.",
         "LargePiwikInstances": "Hjælp til store Matomo installationer",
         "Legend": "Beskrivelse",
+        "LoadDataInfileRecommended": "Hvis din Matomo tracker websites med meget trafik (f. eks. > 100.000 sider om måneden), anbefaler vi at dette problem løses.",
         "LoadDataInfileUnavailableHelp": "Brug af %1$s vil i høj grad sætte Matomos arkiveringhastighed op. For at gøre det tilgængeligt for Matomo, opdater PHP & MySQL-softwaren og sørg for at databasebruger har %2$s privilegium.",
         "NfsFilesystemWarning": "Din server benytter et NFS filsystem.",
         "NfsFilesystemWarningSuffixAdmin": "Det betyder at Matomo vil være ekstremt langsom når der benyttes filbaserede sessioner.",
         "NfsFilesystemWarningSuffixInstall": "Brug af filbaserede sessioner på et NFS filsystem er ekstrem langsomt, så Matomo vil benytte database sessioner. Hvis du har mange samtidige kontrolpanelsbrugere, vil du muligvis være nødt til at hæve det maksimale antal af klient forbindelser til database serveren.",
+        "NoConfigFileFound": "Matomos konfigurationsfil kunne ikke findes og du forsøger at få adgang til en Matomo-side.",
         "YouMayInstallPiwikNow": "Du kan %1$sinstallere Matomo nu%2$s",
+        "IfPiwikInstalledBeforeTablesCanBeKept": "Vær ikke bekymret hvis du installerede Matomo før og har nogle tabeller i din DB. Du ken genbruge de samme tabeller og beholde dine eksisterende data!",
         "Optional": "Valgfri",
         "Password": "Adgangskode",
         "PasswordDoNotMatch": "adgangskoder stemmer ikke overens",
         "PasswordRepeat": "Adgangskode (gentag)",
         "PercentDone": "%s %% udført",
+        "ProfessionalServicesAdTitle": "Avancerede analyser & services",
+        "ProfessionalServicesfessionalServicesAdText": "Vores netværk af eksperter kan hjælpe din organisation med at slippe Matomo Analytics kræfter løs.",
+        "ProfessionalServicesfessionalDiscoverHow": "Lær om %1$s øvrige produkter og services %2$stil Matomo og om hvordan du øger dine konverteringer og omsætning.",
         "PleaseFixTheFollowingErrors": "Ret følgende fejl",
         "DefaultSettings": "Matomo standardindstillinger",
         "DefaultSettingsHelp": "Matomo leveres med standardindstillinger. Tilpas dem nu, eller gør det senere på adminskærmen.",
@@ -65,6 +72,12 @@
         "SystemCheckCreateFunctionHelp": "Matomo bruger anonyme funktioner til tilbagekald.",
         "SystemCheckDatabaseExtensions": "MySQL udvidelser",
         "SystemCheckDatabaseHelp": "Matomo behøver enten mysqli-udvidelsen eller både PDO- og pdo_mysql-udvidelserne.",
+        "SystemCheckDatabaseSSL": "Database SSL-forbindelse",
+        "SystemCheckDatabaseSSLCipher": "SSL cipher bruges",
+        "SystemCheckDatabaseSSLDisabled": "SSL understøttelse på din databaseserver er deaktiveret",
+        "SystemCheckDatabaseSSLNo": "Databaseserver er ikke kompileret med SSL understøttelse",
+        "SystemCheckDatabaseSSLNotWorking": "%s er sat til '1' men SSL forbindelse virker ikke",
+        "SystemCheckDatabaseSSLOn": "Din database understøtter SSL forbindelser med SSL forbindelse bruges ikke. Tjek din databases SSL indstillinger i din Matomo konfigurationsfil",
         "SystemCheckDebugBacktraceHelp": "View:: factory kan ikke oprette visninger for det modul.",
         "SystemCheckError": "En fejl opstod - skal rettes før der fortsættes",
         "SystemCheckEvalHelp": "Kræves af HTML QuickForm og Smarty skabelon system.",
@@ -77,10 +90,12 @@
         "SystemCheckGlobHelp": "Den indbyggede funktion er blevet deaktiveret på din vært. Matomo vil forsøge at efterligne funktionen, men kan støde yderligere sikkerhedsrestriktioner. Funktionaliteten kan blive påvirket.",
         "SystemCheckGzcompressHelp": "zlib udvidelsen og gzcompress funktionen skal aktiveres.",
         "SystemCheckGzuncompressHelp": "zlib udvidelsen og gzuncompress funktionen skal aktiveres.",
+        "SystemCheckHashHelp": "Du mangler at konfigurere og genopbygge PHP med hash() understøttelse aktiveret ved at ekskludere valget --disable-hash.",
         "SystemCheckIconvHelp": "PHP skal konfigureres og genstartes med \"iconv\" støtte aktiveret, --with-iconv.",
         "SystemCheckJsonHelp": "php5-json udvidelsen er nødvendig for at Matomo kan læse og skrive JSON data.",
         "SystemCheckMailHelp": "Tilbagemelding og Glemt adgangskode vil ikke blive sendt uden mail() funktion",
         "SystemCheckMbstring": "mbstring",
+        "SystemCheckMbstringHelp": "Udvidelsen mbstring er krævet for at håndtere multibyte karakterer i brugergrænsefladen og i API responser. Tjek venligst også at mbstring.func_overload er sat til \"0\" i php.ini.",
         "SystemCheckMemoryLimit": "Hukommelsesgrænse",
         "SystemCheckMemoryLimitHelp": "På et stærkt trafikeret hjemmesider, kan arkiveringsprocessen kræve mere hukommelse end der er tilladt.<br \/>Se på memory_limit i php.ini filen hvis nødvendig.",
         "SystemCheckNoErrorsOrWarnings": "Der er ingen fejl eller advarsler",
@@ -90,6 +105,7 @@
         "SystemCheckOtherExtensions": "Andre udvidelser",
         "SystemCheckOtherFunctions": "Andre funktioner",
         "SystemCheckPageSpeedDisabled": "PageSpeed er deaktiveret",
+        "SystemCheckPageSpeedWarning": "Vi anbefaler at PageSpeed modulet deaktiveres i den webserver %s: PageSpeed blev rapporteret at være årsag til adskillige problemstillinger i Matomo, som for eksempel: Defekte siderapporter, ødelagte rækkeudviklingsdata og andre forhold som er svære at fejlsøge på. Deaktiverer venligst mod_pagespeed på denne server.",
         "SystemCheckPackHelp": "Funktionen pack() er nødvendig for at spore besøgende i Matomo.",
         "SystemCheckParseIniFileHelp": "Den indbyggede funktion er blevet deaktiveret hos udbyderen. Matomo vil forsøge at efterligne funktionen, men kan støde på yderligere sikkerhed restriktioner. Sporingsydelsen vil også blive påvirket.",
         "SystemCheckPdoAndMysqliHelp": "På en linux-server kan php kompileres med følgende valg: %1$sn i php.ini, tilføj følgende linjer: %2$s",
@@ -102,6 +118,7 @@
         "SystemCheckSummaryThereWereWarnings": "Der er nogle problemer med dit system. Matomo vil virke, men du kan opleve nogle mindre problemer.",
         "SystemCheckTimeLimitHelp": "På en stærkt trafikeret hjemmeside, kan arkiveringsprocessen kræve mere tid end der tilladt.<br \/>Se på max_execution_time i php.ini filen hvis nødvendig.",
         "SystemCheckTracker": "Sporingsstatus",
+        "SystemCheckTrackerHelp": "GET forespørgsel til matomo.php fejlede. Prøv at hvisliste denne URL fra HTTP autentificering og deaktivér mod_security (du skal måske snakke med din hostingudbyder). Tjek din webservers fejl-logfil for yderligere information om denne fejl.",
         "SystemCheckWarnDomHelp": "Aktiver \"Dom\" udvidelsen (f.eks. installere \"php-dom\"og\/eller \"php-xml-pakken\").",
         "SystemCheckWarning": "Matomo vil virke normalt, men nogle funktioner vil måske mangle",
         "SystemCheckWarnJsonHelp": "Aktiver \"JSON\" udvidelsen (f.eks. installere \"php-JSON\" pakken) for bedre ydeevne.",
@@ -115,6 +132,7 @@
         "SystemCheckCronArchiveProcessCLI": "Håndtering af processer via kommandolinje",
         "SystemCheckPhpSetting": "For at undgå nogle kritiske punkter, skal følgende indstilles i din php.ini-fil: %s",
         "SystemCheckUpdateHttps": "Opdater over HTTPS",
+        "SystemCheckUpdateHttpsNotSupported": "Matomo kan ikke anvende HTTPS til opdatering men vil falde tilbage til en usikker HTTP opdatering. Tjek at CURL eller allow_url_fopen understøttes og at openssl PHP udvidelse er installeret: https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/.",
         "NotSupported": "Ikke supporteret",
         "Tables": "Opretter tabeller",
         "TablesCreatedSuccess": "Tabellerne blev oprettet!",
diff --git a/app/plugins/Installation/lang/es-ar.json b/app/plugins/Installation/lang/es-ar.json
index e53834e0e..ffa7f29c2 100644
--- a/app/plugins/Installation/lang/es-ar.json
+++ b/app/plugins/Installation/lang/es-ar.json
@@ -1,81 +1,155 @@
 {
     "Installation": {
-        "ConfirmDeleteExistingTables": "¿Está seguro de que desea borrar las tablas: %s de su base de datos? ADVERTENCIA: ¡LOS DATOS DE ESTAS TABLAS NO SE PUEDEN RECUPERAR!",
-        "Congratulations": "Enhorabuena",
+        "CollaborativeProject": "Matomo es un proyecto colaborativo, construido con el corazón, por gente desde todos los rincones del planeta.",
+        "ConfigurationHelp": "Tu archivo de configuración de Matomo parece no estar configurado. Podés, o bien quitar \"config\/config.ini.php\" y reanudar la instalación, o bien corregir la configuración de la conexión de la base de datos.",
+        "ConfirmDeleteExistingTables": "¿Estás seguro que querés eliminar las tablas: %s de tu base de datos? ADVERTENCIA: ¡LOS DATOS DE ESTAS TABLAS NO SE PUEDEN RECUPERAR!",
+        "Congratulations": "Felicitaciones",
+        "CongratulationsHelp": "<p>¡Felicitaciones! Tu instalación de Matomo está completa.<\/p><p>Asegurate que tu código de JavaScript haya sido insertado en tus páginas, ¡y esperá a tus primeros visitantes!<\/p>",
         "DatabaseAbilities": "Capacidades de la base de datos",
         "DatabaseCreation": "Creación de la base de datos",
         "DatabaseErrorConnect": "Error al intentar conectarse al servidor de la base de datos",
         "DatabaseServerVersion": "Versión del servidor de la base de datos",
         "DatabaseSetup": "Configuración de la base de datos",
-        "DatabaseSetupAdapter": "adaptador",
-        "DatabaseSetupDatabaseName": "nombre de la base de datos",
-        "DatabaseSetupLogin": "usuario",
-        "DatabaseSetupServer": "servidor de la base de datos",
-        "DatabaseSetupTablePrefix": "prefijo de tabla",
+        "DatabaseSetupAdapter": "Adaptador",
+        "DatabaseSetupDatabaseName": "Nombre de la base de datos",
+        "DatabaseSetupLogin": "Inicio de sesión",
+        "DatabaseSetupServer": "Servidor de la base de datos",
+        "DatabaseSetupTablePrefix": "Prefijo de tabla",
+        "Email": "Correo electrónico",
         "Extension": "extensión",
-        "Filesystem": "Filesystem",
-        "GetInvolved": "If you like what you see, you can %1$sget involved%2$s.",
-        "HappyAnalysing": "Happy analysing!",
+        "Filesystem": "Sistema de archivo",
+        "GetInvolved": "Si te gusta lo que ves, podés %1$sinvolucrarte%2$s.",
+        "GoBackAndDefinePrefix": "Volvé y definí un prefijo para las tablas de Matomo",
+        "HappyAnalysing": "¡Que la pasés bien!",
         "Installation": "Instalación",
         "InstallationStatus": "Estado de la instalación",
-        "InsufficientPrivilegesHelp": "Puedes agregar estos privilegios utilizando una herramienta como phpMyAdmin o ejecutando las consultas SQL correspondientes. Si no sabes cómo hacer ninguna de estas operaciones, por favor solicita asistencia a tu sysadmin para que te conceda estos privilegios.",
-        "InsufficientPrivilegesMain": "Either the Database does not exist (and could not be created), or the specified User has insufficient privileges. Database user must have the following privileges: %s",
-        "JSTracking_EndNote": "Nota: Después del proceso de instalación, puedes generar código de seguimiento personalizado en la sección de administración %1$sCódigo de Seguimiento%2$s.",
-        "LargePiwikInstances": "Ayuda para las grandes instancias de Matomo",
+        "InsufficientPrivilegesHelp": "Podés agregar estos privilegios utilizando una herramienta como phpMyAdmin o ejecutando las solicitudes SQL correspondientes. Si no sabés cómo hacer ninguna de estas operaciones, por favor, solicitá asistencia a tu administrador de sistema para que te conceda estos privilegios.",
+        "InsufficientPrivilegesMain": "O bien la base de datos no existe (y pudo no ser creada), o bien el usuario especificado tiene privilegios insuficientes. El usuario de base de datos debe tener los siguientes privilegios: %s",
+        "InvalidStateError": "Error: Matomo ya está instalado. %1$s Volvé %2$sa Matomo%3$s.",
+        "JsTagArchivingHelp1": "Para sitios web de medio y alto tráfico hay ciertas optimizaciones que deberían ayudar a Matomo a ejecutarse más rápido (como %1$sconfigurar un archivado automático%2$s).",
+        "JSTracking_EndNote": "Nota: Después del proceso de instalación, podés generar el código de seguimiento personalizado en la sección de administración %1$sCódigo de Seguimiento%2$s.",
+        "JSTracking_Intro": "Para rastrear tu tráfico web con Matomo, necesitás asegurarte que cierto código extra se agregue a cada una de tus páginas web.",
+        "LargePiwikInstances": "Ayuda para los usuarios con sitios web de alto tráfico",
         "Legend": "Leyenda",
-        "NfsFilesystemWarning": "Su servidor está utilizando un sistema de archivos NFS.",
+        "LoadDataInfileRecommended": "Si tu servidor de Matomo rastrea sitios web de alto tráfico (esto es, más de 100.000 páginas por mes), te recomendamos intentar solucionar este problema.",
+        "LoadDataInfileUnavailableHelp": "Usar %1$s aumentará considerablemente la velocidad de Matomo en el proceso de archivado. Para hacer que esté disponible para Matomo, intentá actualizar tu software de PHP y MySQL, y asegurate que el usuario de la base de datos tenga el privilegio %2$s.",
+        "NfsFilesystemWarning": "Tu servidor está utilizando un sistema de archivos NFS.",
+        "NfsFilesystemWarningSuffixAdmin": "Esto significa que Matomo será extremadamente lento al usar las sesiones basadas en archivo.",
+        "NfsFilesystemWarningSuffixInstall": "Usar sesiones basadas en archivo en NFS es extremadamente lento, por lo que Matomo usará las sesiones de base de datos. Si tenés muchos usuarios concurrentes al panel, podrías necesitar aumentar la cantidad máxima de clientes conectados al servidor de la base de datos.",
+        "NoConfigFileFound": "El archivo de configuración de Matomo no pudo ser encontrado y estás intentando acceder a una página de Matomo.",
+        "YouMayInstallPiwikNow": "Podés %1$sinstalar Matomo ahora%2$s",
+        "IfPiwikInstalledBeforeTablesCanBeKept": "Si instalaste Matomo antes y tenés algunas tables en tu base de datos, no te preocupés: ¡podés reusar las mismas tablas y conservar tus datos existentes!",
         "Optional": "Opcional",
+        "Password": "Contraseña",
         "PasswordDoNotMatch": "las contraseñas no coinciden",
         "PasswordRepeat": "Contraseña (repetirla)",
-        "PercentDone": "%s %% Hecho",
-        "PleaseFixTheFollowingErrors": "Por favor solucione los siguientes errores",
-        "RestartWebServer": "Luego de realizar este cambio renicia tu servidor web.",
-        "ReusingTables": "Reusing the Tables",
-        "SeeBelowForMoreInfo": "Véase más adelante para mayor información.",
-        "SetupWebsite": "Configurar una página web",
-        "SetupWebsiteError": "Se ha producido un error al añadir el sitio web",
-        "SuperUser": "Súper Usuario",
-        "SuperUserSetupError": "There was an error when adding the Super User",
+        "PercentDone": "%s %% Listo",
+        "ProfessionalServicesAdTitle": "Servicios analíticos avanzados",
+        "ProfessionalServicesfessionalServicesAdText": "Nuestra red de expertos pueden ayudar a que tu organización descubra la potencia de los análisis de Matomo.",
+        "ProfessionalServicesfessionalDiscoverHow": "Aprendé sobre %1$sservicios y productos adicionales%2$s para Matomo, y cómo incrementar tus conversaciones y ganancias.",
+        "PleaseFixTheFollowingErrors": "Por favor, solucioná los siguientes errores",
+        "DefaultSettings": "Configuración predeterminada de Matomo",
+        "DefaultSettingsHelp": "Matomo viene con una configuración predeterminada. Podés personalizarlas ahora o hacerlo después en la pantalla de administración.",
+        "Requirements": "Requisitos de Matomo",
+        "RestartWebServer": "Luego de realizar este cambio, reiniciá tu servidor web.",
+        "ReusingTables": "Reusando las tablas",
+        "PiwikOrgNewsletter": "enviarme un correo electrónico con las principales actualizaciones de la comunidad de Matomo",
+        "ProfessionalServicesNewsletter": "enviarme información sobre los %1$sproductos y servicios profesionales%2$s de Matomo",
+        "SeeBelowForMoreInfo": "Mirá abajo para más información.",
+        "SetupWebsite": "Configurar un sitio web",
+        "SetupWebsiteError": "Ocurrió un error al agregar el sitio web",
+        "SetupWebSiteName": "Nombre del sitio web",
+        "SetupWebsiteSetupSuccess": "¡Sitio web %s creado exitosamente!",
+        "SetupWebSiteURL": "Dirección web del sitio",
+        "SiteSetup": "Por favor, configurá el primer sitio web que te gustaría rastrear y analizar con Matomo:",
+        "SiteSetupFootnote": "Nota: una vez que la instalación de Matomo esté finalizada, ¡vas a poder agregar más sitios web para rastrear!",
+        "SuperUser": "Súperusuario",
+        "SuperUserLogin": "Inicio de sesión de súperusuario",
+        "SuperUserSetupError": "Ocurrió un error al agregar al súperusuario",
+        "SuperUserSetupSuccess": "¡Súperusuario creado exitosamente!",
         "SystemCheck": "Comprobación del sistema",
+        "SystemCheckAutoUpdateHelp": "Nota: las actualizaciones de Matomo de un sólo clic requieren de permisos de escritura a la carpeta de Matomo y sus contenidos.",
+        "SystemCheckCreateFunctionHelp": "Matomo usa funciones anónimas para devoluciones de llamadas.",
+        "SystemCheckDatabaseExtensions": "Extensiones de MySQL",
+        "SystemCheckDatabaseHelp": "Matomo requiere o bien la extensión mysqli, o tanto las extensiones PDO y pdo_mysql.",
+        "SystemCheckDatabaseSSL": "Conexión SSL a la base de datos",
+        "SystemCheckDatabaseSSLCipher": "se está usando cifrado SSL",
+        "SystemCheckDatabaseSSLDisabled": "El soporte SSL en el servidor de tu base de datos está deshabilitado",
+        "SystemCheckDatabaseSSLNo": "El servidor de la base de datos no está compilado con soporte SSL",
+        "SystemCheckDatabaseSSLNotWorking": "%s está establecido en \"1\", pero la conexión SSL no está funcionando",
+        "SystemCheckDatabaseSSLOn": "Tu base de datos soporta conexiones SSL pero no se está usando ninguna. Revisá la configuración SSL de tu base de datos en el archivo de configuración de Matomo.",
         "SystemCheckDebugBacktraceHelp": "View::factory no estará disponible para crear vistas para el módulo de llamadas.",
-        "SystemCheckError": "Se ha producido un error - debe ser arreglado antes de continuar",
-        "SystemCheckEvalHelp": "Requerido por el formulario HTML y el sistema de plantillas.",
-        "SystemCheckExtensions": "Extensiones requeridas",
-        "SystemCheckFileIntegrity": "Integridad de archivos",
+        "SystemCheckError": "Ocurrió un error - debe ser arreglado antes de continuar",
+        "SystemCheckEvalHelp": "Requerido por el formulario HTML QuickForm y el sistema inteligente de plantillas.",
+        "SystemCheckExtensions": "Otras extensiones requeridas",
+        "SystemCheckFileIntegrity": "Integridad de archivo",
         "SystemCheckFunctions": "Funciones requeridas",
-        "SystemCheckGDFreeType": "GD > 2.x + Freetype (graphics)",
-        "SystemCheckGzcompressHelp": "Es necesario habilitar la extensión zlib y la función gzcompress.",
-        "SystemCheckGzuncompressHelp": "Es necesario habilitar la extensión zlib y la función gzcompress.",
-        "SystemCheckIconvHelp": "Necesita configurar y reconstruir PHP con soporte \"iconv\" habilitado, --with-iconv.",
+        "SystemCheckFunctionHelp": "Necesitás habilitar esta función incorporada.",
+        "SystemCheckGDFreeType": "GD > 2.x + Freetype (gráficos)",
+        "SystemCheckGDHelp": "Los minigráficos y gráficos de imagen (en la aplicación móvil de Matomo y en los informes de correo electrónico) no funcionarán.",
+        "SystemCheckGlobHelp": "Esta función incorporada fue deshabilitada en tu servidor. Matomo intentará emular su función pero podría encontrar más restricciones de seguridad. La funcionalidad podría per perjudicada.",
+        "SystemCheckGzcompressHelp": "Necesitás habilitar la extensión zlib y la función gzcompress.",
+        "SystemCheckGzuncompressHelp": "Necesitás habilitar la extensión zlib y la función gzcompress.",
+        "SystemCheckHashHelp": "Necesitás configurar y reconstruir PHP con el soporte \"hash()\" habilitado excluyendo la opción --disable-hash.",
+        "SystemCheckIconvHelp": "Necesitás configurar y reconstruir PHP con soporte \"iconv\" habilitado, --with-iconv.",
+        "SystemCheckJsonHelp": "Para que Matomo lea y escriba datos JSON, se necesita la extensión php5-json.",
         "SystemCheckMailHelp": "Los mensajes de Feedback y Recuperar Contraseña no se enviarán sin mail().",
         "SystemCheckMbstring": "mbstring",
+        "SystemCheckMbstringHelp": "Se requiere la extensión mbstring para manejar caracteres multibyte en la interface de usuario y en las respuestas de API. También, por favor revisá que mbstring.func_overload esté establecido a \"0\" en \"php.ini\".",
         "SystemCheckMemoryLimit": "Límite de memoria",
-        "SystemCheckMemoryLimitHelp": "En un sitio web de alto tráfico, el proceso de archivo puede requerir más memoria de la que se permite actualmente.<br \/>Véase la Directiva memory_limit en su archivo php.ini si es necesario.",
-        "SystemCheckOpenURL": "Abrir URL",
-        "SystemCheckOpenURLHelp": "Suscripciones a boletines, notificaciones de actualización, y actualizaciones con un clic necesitan la extensión \"curl\", allow_url_fopen=On, o fsockopen() habilitado.",
+        "SystemCheckMemoryLimitHelp": "En un sitio web de alto tráfico, el proceso de archivo puede requerir más memoria de la que se permite actualmente.<br \/>De ser necesario, cambiá la directiva memory_limit en tu archivo \"php.ini\".",
+        "SystemCheckNoErrorsOrWarnings": "No hay errores o advertencias",
+        "SystemCheckViewFullSystemCheck": "Ver el informe completo de revisión del sistema",
+        "SystemCheckOpenURL": "Abrir dirección web",
+        "SystemCheckOpenURLHelp": "Suscripciones a boletines, notificaciones de actualización, y actualizaciones con un clic necesitan la extensión \"curl\", allow_url_fopen=On, o fsockopen() habilitada.",
         "SystemCheckOtherExtensions": "Otras extensiones",
         "SystemCheckOtherFunctions": "Otras funciones",
-        "SystemCheckPdoAndMysqliHelp": "En un servidor Linux puede compilar php con las siguientes opciones: %1$s En su php.ini, añada las siguientes líneas: %2$s",
+        "SystemCheckPageSpeedDisabled": "PageSpeed deshabilitado",
+        "SystemCheckPageSpeedWarning": "Recomendamos deshabilitar el módulo PageSpeed en tu servidor web %s: se informó que PageSpeed causa varios problemas con Matomo, como: informes de páginas rotas, Row Evolution roto y otros problemas que son difíciles de solucionar. Por favor, deshabilitá \"mod_pagespeed\" en este servidor.",
+        "SystemCheckPackHelp": "La función pack() es requerida para rastrear visitantes en Matomo.",
+        "SystemCheckParseIniFileHelp": "Esta función incorporada fue deshabilitada en tu servidor. Matomo intentará emular su función pero podría encontrar más restricciones de seguridad. La funcionalidad de rastreo también será perjudicada.",
+        "SystemCheckPdoAndMysqliHelp": "En un servidor GNU\/Linux podés compilar php con las siguientes opciones: %1$s En tu \"php.ini\", agregá las siguientes líneas: %2$s",
         "SystemCheckPhp": "Versión PHP",
         "SystemCheckPhpPdoAndMysqli": "Más información en: %1$sPHP PDO%2$s y %3$sMYSQLI%4$s.",
-        "SystemCheckSplHelp": "Necesita configurar y reconstruir PHP con la Librería Estándar de PHP habilitada (por defecto).",
-        "SystemCheckTimeLimitHelp": "En un sitio web con un tráfico elevado, la ejecución del proceso de archivado puede requerir más tiempo del permitido.<br \/>Mire la directiva max_execution_time en su archivo php.ini si es necesario",
+        "SystemCheckSplHelp": "Necesitás configurar y reconstruir PHP con la Librería Estándar de PHP habilitada (predeterminadamente).",
+        "SystemCheckSettings": "Se requiere configuración PHP (php.ini)",
+        "SystemCheckSummaryNoProblems": "¡Esssa! No hay problemas con tu configuración de Matomo. Date una palmadita en la espalda.",
+        "SystemCheckSummaryThereWereErrors": "¡Epa! Matomo detectó algunos %1$sproblemas críticos%2$s con tu configuración Matomo. %3$sEstos problemas deberían corregirse inmediatamente.%4$s",
+        "SystemCheckSummaryThereWereWarnings": "Hay algunos problemas con tu sistema. Matomo funcionará, pero podrías encontrarte con algunos problemas menores.",
+        "SystemCheckTimeLimitHelp": "En un sitio web de alto tráfico, la ejecución del proceso de archivado puede requerir más tiempo del permitido. De ser necesario, cambiá la directiva max_execution_time en su archivo \"php.ini\".",
         "SystemCheckTracker": "Estado del tracker",
-        "SystemCheckWarnDomHelp": "Usted debería habilitar la extensión \"dom\" (ej., instalar el paquete \"php-dom\" y\/o el paquete \"php-xml\").",
-        "SystemCheckWarnJsonHelp": "Usted debería habilitar la extensión \"json\" (ej., instalar el paquete \"php-json\") para un mejor rendimiento.",
-        "SystemCheckWarnLibXmlHelp": "Usted debería habilitar la extensión \"libxml\" (ej., instalar el paquete \"php-libxml\") ya que esta es requerida por otras extensiones de PHP.",
-        "SystemCheckWarnSimpleXMLHelp": "Usted debería habilitar la extensión \"SimpleXML\" (ej., instalar el paquete \"php-simplexml\" y\/o el paquete \"php-xml\").",
-        "SystemCheckWinPdoAndMysqliHelp": "En un servidor Windows puede añadir las siguientes líneas a su php.ini: %s",
+        "SystemCheckTrackerHelp": "Falló la solicitud GET a \"matomo.php\". Intentá permitir esta dirección web en tu autenticación HTTP y deshabilitá \"mod_security\" (podés pedírselo a tu administrador web). Para más información sobre el error, revisá el archivo de registro de errores de tu servidor web.",
+        "SystemCheckWarnDomHelp": "Deberías habilitar la extensión \"dom\" (ej., instalar el paquete \"php-dom\" y\/o el paquete \"php-xml\").",
+        "SystemCheckWarning": "Matomo funcionará normalmente, pero algunas funciones pueden estar ausentes",
+        "SystemCheckWarnJsonHelp": "Deberías habilitar la extensión \"json\" (ej., instalar el paquete \"php-json\") para un mejor rendimiento.",
+        "SystemCheckWarnLibXmlHelp": "Deberías habilitar la extensión \"libxml\" (ej., instalar el paquete \"php-libxml\") ya que esta es requerida por otras extensiones de PHP.",
+        "SystemCheckWarnSimpleXMLHelp": "Deberías habilitar la extensión \"SimpleXML\" (ej., instalar el paquete \"php-simplexml\" y\/o el paquete \"php-xml\").",
+        "SystemCheckWinPdoAndMysqliHelp": "En un servidor Windows podés agregar las siguientes líneas a tu php.ini: %s",
         "SystemCheckWriteDirs": "Directorios con acceso de escritura",
-        "SystemCheckWriteDirsHelp": "Para arreglar este error en su sistema Linux, intente tecleando los siguientes comandos",
-        "SystemCheckZlibHelp": "Necesita configurar y reconstruir PHP con el soporte \"zlib\" habilitado, --with-zlib.",
+        "SystemCheckWriteDirsHelp": "Para arreglar este error en tu sistema GNU\/Linux, intentá escribir los siguientes comandos",
+        "SystemCheckZlibHelp": "Necesitás configurar y reconstruir PHP con el soporte \"zlib\" habilitado, --with-zlib.",
+        "SystemCheckCronArchiveProcess": "Archivar Cron",
+        "SystemCheckCronArchiveProcessCLI": "Administración de procesos vía CLI",
+        "SystemCheckPhpSetting": "Para prevenir algunos problemas críticos, debés establecer lo siguiente en tu archivo \"php.ini\": %s",
+        "SystemCheckUpdateHttps": "Actualización sobre HTTPS",
+        "SystemCheckUpdateHttpsNotSupported": "Matomo no puede usar HTTPS para actualizar, por lo que volverá a la actualización no segura vía HTTP. Revisá que CURL o \"allow_url_fopen\" sea soportada y que la extensión openssl PHP esté instalada: https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/",
+        "NotSupported": "no soportado",
         "Tables": "Creando las tablas",
         "TablesCreatedSuccess": "¡Tablas creadas con éxito!",
-        "TablesDelete": "Borrar las tablas detectadas",
-        "TablesFound": "Las siguientes tablas se han encontrado en la base de datos",
+        "TablesDelete": "Eliminar las tablas detectadas",
+        "TablesDeletedSuccess": "Se eliminaron las tablas de Matomo exitosamente",
+        "TablesFound": "Se encontraron las siguiente tablas en la base de datos",
         "TablesReuse": "Reutilizar las tablas ya existentes",
-        "TablesUpdatedSuccess": "The database was successfully updated from %1$s to %2$s!",
-        "TablesWarningHelp": "O bien optar por la reutilización de las tablas de bases de datos existentes o seleccionar una instalación limpia para borrar todos los datos existentes en la base de datos.",
-        "Welcome": "¡Bienvenido!"
+        "TablesUpdatedSuccess": "¡La base de datos fue actualizada exitosamente de %1$s a %2$s!",
+        "TablesWarningHelp": "O bien elegir la reutilización de las tablas de bases de datos existentes, o bien seleccionar una instalación limpia para eliminar todos los datos existentes en la base de datos.",
+        "TablesWithSameNamesFound": "Algunas %1$stablas en tu base de datos%2$s tienen los mismos nombres como las tablas Matomo que estás intentando crear",
+        "Timezone": "Huso horario del sitio web",
+        "WeHopeYouWillEnjoyPiwik": "Esperamos que estés disfrutando de Matomo tanto como nosotros disfrutamos hacerlo.",
+        "Welcome": "¡Bienvenido!",
+        "WelcomeHelp": "<p>Matomo es software libre de análisis de web que hace fácil obtener la información que querés de tus visitantes.<\/p> <p>Este proceso está dividido hasta en %s fáciles pasos y llevará unos 5 minutos.<\/p>",
+        "WelcomeToCommunity": "¡Bienvenido a la comunidad Matomo!",
+        "CannotConnectToDb": "No se puede conectar a la base de datos",
+        "CannotConnectToDbResolvingExplanation": "Esto podría ser un problema tempóral, intentá %1$srecargar la página%2$s. Si el problema persiste, por favor, contactá a tu administrador de Matomo.",
+        "EmailPrivacyNotice": "Tu dirección de correo electrónico sólo será usado para enviarte el boletín de noticias de Matomo. Podés desuscribirte cuando quieras haciendo clic en el enlace de desuscripción. No compartiremos tu correo electrónico con nadie más ni usaremos el mismo para ningún otro propósito que el que acabamos de mencionar. Por favor, consultá nuestra %1$spolítica de privacidad%2$s para más información."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Installation/lang/ja.json b/app/plugins/Installation/lang/ja.json
index 331215263..ec5455561 100644
--- a/app/plugins/Installation/lang/ja.json
+++ b/app/plugins/Installation/lang/ja.json
@@ -19,21 +19,21 @@
         "Extension": "エクステンション",
         "Filesystem": "ファイルシステム",
         "GetInvolved": "もし Matomo を気に入って頂けたら、是非 %1$s参加してください%2$s 。",
-        "GoBackAndDefinePrefix": "戻って、Matomo テーブルのプレフィックスを定義する",
+        "GoBackAndDefinePrefix": "前に戻って、Matomo テーブルのプレフィックスを定義する",
         "HappyAnalysing": "ハッピーな解析を！",
         "Installation": "インストール",
         "InstallationStatus": "インストール状況",
         "InsufficientPrivilegesHelp": "phpMyAdmin のようなツールを使用するか、正しい SQL クエリを実行することにより、これらの権限を追加できます。やり方がわからない場合は、システム管理者に依頼して、権限を付与してもらってください。",
         "InsufficientPrivilegesMain": "データベースが存在しない（または作成できなかった）か、指定されたユーザーに十分な特権がありません。 データベースユーザーは次の権限を持っている必要があります: %s",
         "InvalidStateError": "エラー: Matomo が既にインストールされています。Matomo %3$s へ %1$s 戻る %2$s 。",
-        "JsTagArchivingHelp1": "中～高トラフィックのウェブサイトのために、Matomo をより早く(例えば %1$ssetting up auto-archiving%2$s のように) 実行するための最適化の手段があります。",
+        "JsTagArchivingHelp1": "中～高トラフィックのウェブサイトでは、Matomo をより早く(例えば %1$ssetting up auto-archiving%2$s のように) 実行するために最適化を行う必要があります。",
         "JSTracking_EndNote": "注:インストールの処理後、%1$sTracking Code%2$s の管理セクションで、トラッキングコードのカスタマイズを行うことができます。",
-        "JSTracking_Intro": "Matomo でウェブトラフィックの追跡をするには、一部の特別なコードが各 web ページに追加されているかどうかを確認する必要があります。",
+        "JSTracking_Intro": "Matomo でウェブトラフィックの追跡をするには、コードが各 web ページに追加されているかどうかを確認する必要があります。",
         "LargePiwikInstances": "高トラフィック環境で Matomo を使用するためのヒント",
         "Legend": "説明",
         "LoadDataInfileRecommended": "あなたの Matomo サーバーがトラフィックの多いウェブサイトを追跡している場合（例えば、月に 100,000 ページ以上）、この問題を解決することをお勧めします。",
         "LoadDataInfileUnavailableHelp": "%1$s を使用すると、Matomo のアーカイブプロセスを大幅に高速化させます。それを Matomo で利用可能にするには、お使いの PHP と MySQL ソフトウェアのアップデートをお試しください。またデータベースユーザーが %2$s 権限を持っているかどうかご確認ください。",
-        "NfsFilesystemWarning": "あなたのサーバーは、NFS ファイルシステムを使用しています。",
+        "NfsFilesystemWarning": "サーバーは、NFS ファイルシステムを使用しています。",
         "NfsFilesystemWarningSuffixAdmin": "これは、ファイルベースのセッションを利用する際、Matomo が極端に遅くなることを意味します。",
         "NfsFilesystemWarningSuffixInstall": "NFS 上でファイルベースのセッションを利用すると極端に遅いので、Matomo はデータベースセッションを使用します。同時に多くのダッシュボードユーザーがいる場合、データベースサーバーへのクライアント接続の最大数を増やす必要があります。",
         "NoConfigFileFound": "Matomo 設定ファイルが見つからず、Matomo ページにアクセスしようとしています。",
@@ -84,39 +84,39 @@
         "SystemCheckExtensions": "その他の必須エクステンション",
         "SystemCheckFileIntegrity": "ファイルの整合性",
         "SystemCheckFunctions": "必須関数",
-        "SystemCheckFunctionHelp": "あなたは、このビルトイン関数を有効にする必要があります。",
+        "SystemCheckFunctionHelp": "このビルトイン関数を有効にする必要があります。",
         "SystemCheckGDFreeType": "GD > 2.x + Freetype (graphics)",
-        "SystemCheckGDHelp": "スパークライン（小さなグラフ）は動作しません。",
+        "SystemCheckGDHelp": "スパークライン（小さなグラフ）と画像グラフ（Matomo Mobileアプリと電子メールレポート）は機能しません。",
         "SystemCheckGlobHelp": "この組み込み関数はホストで無効化されています。 Matomo はこの関数のエミュレートを試みますが、さらなるセキュリティ制限に遭遇する場合があります。 また、機能性にも影響を与える場合があります。",
-        "SystemCheckGzcompressHelp": "zlib エクステンションと gzcompress() 関数を有効にする必要があります。",
-        "SystemCheckGzuncompressHelp": "zlib エクステンションと gzuncompress() 関数を有効にする必要があります。",
+        "SystemCheckGzcompressHelp": "zlib エクステンションと gzcompress 機能を有効にする必要があります。",
+        "SystemCheckGzuncompressHelp": "zlib エクステンションと gzuncompress機能を有効にする必要があります。",
         "SystemCheckHashHelp": "--disable-hash オプションを除外し、hash() サポートを有効にして PHP を設定して再構築する必要があります。",
         "SystemCheckIconvHelp": "\"iconv\" のサポートを有効にして、PHP の再構築と設定を行う必要があります（--with-iconv）。",
-        "SystemCheckJsonHelp": "JSON データの読取と書込には、Matomo に php5-json の拡張モジュールが必要です。",
+        "SystemCheckJsonHelp": "JSON データの読取と書込には、Matomo に php5-json エクステンションが必要です。",
         "SystemCheckMailHelp": "mail() 関数がない場合、フィードバックとパスワード紛失のメッセージを送信することができません。",
         "SystemCheckMbstring": "mbstring",
         "SystemCheckMbstringHelp": "mbstring 拡張子は、ユーザーインターフェイスと API レスポンスでマルチバイト文字を処理するために必要です。 また、php.ini で mbstring.func_overload が \" 0 \" に設定されていることを確認してください。",
         "SystemCheckMemoryLimit": "メモリ制限",
-        "SystemCheckMemoryLimitHelp": "アクセス数の多いウェブサイトでは、アーカイブ処理の実行に、現在許可されている以上に多くのメモリを必要とする場合があります。<br \/>必要であれば、php.ini ファイルのディレクティブ memory_limit を参照してください。",
+        "SystemCheckMemoryLimitHelp": "アクセス数の多いウェブサイトでは、アーカイブ処理の実行に、現在許可されている以上に多くのメモリを必要とする場合があります。必要に応じて、php.ini ファイルのディレクティブ memory_limit を変更してください。",
         "SystemCheckNoErrorsOrWarnings": "エラーや警告はありません",
         "SystemCheckViewFullSystemCheck": "完全なシステムチェックレポートを表示する",
-        "SystemCheckOpenURL": "オープン URL",
+        "SystemCheckOpenURL": "URL を開く",
         "SystemCheckOpenURLHelp": "ニュースレターの定期購読、アップデートの通知、ワンクリックアップデートには、\"curl\" エクステンション、allow_url_fopen=On、または fsockopen() が有効である必要があります。",
         "SystemCheckOtherExtensions": "その他のエクステンション",
         "SystemCheckOtherFunctions": "その他の関数",
         "SystemCheckPageSpeedDisabled": "PageSpeed が無効になりました",
         "SystemCheckPageSpeedWarning": "Web サーバ %sで PageSpeed モジュールを無効にすることをお勧めします。PageSpeed は、壊れたPages レポート、壊れた Row Evolution、およびトラブルシューティングが難しいその他の問題など、Matomo に関するいくつかの問題を引き起こすことが報告されています。 このサーバーでmod_pagespeed を無効にしてください。",
-        "SystemCheckPackHelp": "pack() ファンクションは Matomo でビジターをトラックするのに必要です。",
+        "SystemCheckPackHelp": "Matomo でビジターを追跡するには pack() 関数が必要です。",
         "SystemCheckParseIniFileHelp": "この組み込み関数はホストで無効化されています。 Matomo はこの関数のエミュレートを試みますが、さらなるセキュリティ制限に遭遇する場合があります。 また、トラッカーのパフォーマンスにも影響を与えます。",
-        "SystemCheckPdoAndMysqliHelp": "Linux サーバーでは、次のオプションで PHP をコンパイルします：%1$sphp.ini に次の行を追加します：%2$s",
+        "SystemCheckPdoAndMysqliHelp": "GNU \/ Linuxサーバーでは、次のオプションを付けてphpをコンパイルできます：%1$sphp.iniに次の行を追加します：%2$s",
         "SystemCheckPhp": "PHP バージョン",
         "SystemCheckPhpPdoAndMysqli": "詳細ドキュメント：%1$sPHP PDO%2$s、%3$sMYSQLI%4$s",
         "SystemCheckSplHelp": "Standard PHP Library (SPL) を有効にして、PHP の再構築と設定を行う必要があります（通常はデフォルト）。",
-        "SystemCheckSettings": "必要な PHP の設定 (PHP,ini)",
+        "SystemCheckSettings": "必要な PHP 設定 (php,ini)",
         "SystemCheckSummaryNoProblems": "安心してください。Matomo のセットアップに問題はありません。",
         "SystemCheckSummaryThereWereErrors": "Matomo セットアップで、いくつかの %1$scritical issues%2$s が検知されました。 %3$sこれらの問題はすぐに修正する必要があります。%4$s",
-        "SystemCheckSummaryThereWereWarnings": "システムにいくつかの問題があります。Matomo は実行できますが、いくつか小さな問題がみられる可能性があります。",
-        "SystemCheckTimeLimitHelp": "アクセス数の多いウェブサイトでは、アーカイブ処理の実行に、現在許可されている以上に多くの時間を必要とする場合があります。<br \/>必要であれば、php.ini ファイルのディレクティブ max_execution_time を参照してください。",
+        "SystemCheckSummaryThereWereWarnings": "システムにいくつかの問題があります。Matomo は動作しますが、いくつか小さな問題が発生する可能性があります。",
+        "SystemCheckTimeLimitHelp": "アクセス数の多いウェブサイトでは、アーカイブ処理の実行に、現在許可されている以上に多くの時間を必要とする場合があります。必要に応じて、php.ini ファイルの max_execution_time ディレクティブを変更してください。",
         "SystemCheckTracker": "トラッカー状況",
         "SystemCheckTrackerHelp": "matomo.php への GET リクエストが失敗しました。 HTTP 認証からこの URL をホワイトリストに入れ、mod_security を無効にしてください（あなたのウェブホストに尋ねる必要があるかもしれません）。 エラーの詳細については、Web サーバーのエラーログファイルを確認してください。",
         "SystemCheckWarnDomHelp": "\"dom\" エクステンションを有効にする必要があります（例えば \"php-dom\" と \"php-xml\" パッケージのどちらか、あるいは両方をインストールする）。",
@@ -129,7 +129,7 @@
         "SystemCheckWriteDirsHelp": "この Linux システムでこの問題を修正するには、次のコマンドを打ち込んでみてください",
         "SystemCheckZlibHelp": "\"zlib\" のサポートを有効にして、PHP の再構築と設定を行う必要があります（--with-zlib）。",
         "SystemCheckCronArchiveProcess": "アーカイブ cron",
-        "SystemCheckCronArchiveProcessCLI": "CLI を経由して処理を管理する",
+        "SystemCheckCronArchiveProcessCLI": "CLI を経由してプロセス管理する",
         "SystemCheckPhpSetting": "いくつかの重大な問題を防ぐためには、php.ini ファイルで以下を設定する必要があります: %s　",
         "SystemCheckUpdateHttps": "HTTPS 経由で更新",
         "SystemCheckUpdateHttpsNotSupported": "Matomo は更新に HTTPS を使用することはできません。安全でない HTTP 更新にフォールバックします。 CURL または allow_url_fopen がサポートされていることと、openssl PHP エクステンションがインストールされていることを確認してください：https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/",
diff --git a/app/plugins/Installation/lang/pt.json b/app/plugins/Installation/lang/pt.json
index d608d62c3..81d532e67 100644
--- a/app/plugins/Installation/lang/pt.json
+++ b/app/plugins/Installation/lang/pt.json
@@ -31,6 +31,7 @@
         "JSTracking_Intro": "Para acompanhar o seu tráfego web como o Matomo, tem de garantir que é adicionado algum código adicional a cada uma das suas páginas.",
         "LargePiwikInstances": "Ajuda para utilizadores de sites com um grande volume de tráfego",
         "Legend": "Legenda",
+        "LoadDataInfileRecommended": "Se o seu servidor Matomo acompanha sites com tráfego elevado (por exemplo, mais de 100 000 páginas por mês), recomendamos que procure resolver este problema.",
         "LoadDataInfileUnavailableHelp": "Utilizar %1$s irá acelerar consideravelmente a velocidade de arquivamento do Matomo. Para o disponibilizar para o Matomo, tente atualizar o seu PHP e MySQL, e confirme que o seu utilizar da base de dados tem o privilégio %2$s.",
         "NfsFilesystemWarning": "O seu servidor está utilizar um sistema de ficheiros NFS.",
         "NfsFilesystemWarningSuffixAdmin": "Isto significa que o seu Matomo será extremamente lento quando a utilizar sessões baseadas em ficheiros.",
@@ -94,6 +95,7 @@
         "SystemCheckJsonHelp": "A extensão php5-json é necessária para o Matomo ler e escrever dados JSON.",
         "SystemCheckMailHelp": "Mensagens de feedback e de palavras-passe perdida não serão enviadas sem mail().",
         "SystemCheckMbstring": "mbstring",
+        "SystemCheckMbstringHelp": "A extensão mbstring é necessária para trabalhar com caracteres multibyte na interface do utilizador e com respostas da API. Confirme ainda que mbstring.func_overload está definido como \"0\" no php.ini.",
         "SystemCheckMemoryLimit": "Limite de memória",
         "SystemCheckMemoryLimitHelp": "Num site com tráfego elevado, o processo de arquivamento pode exigir mais memória do que o permitido atualmente. Se necessário, altere a diretiva memory_limit no seu ficheiro php.ini.",
         "SystemCheckNoErrorsOrWarnings": "Não existem erros ou avisos",
@@ -103,6 +105,7 @@
         "SystemCheckOtherExtensions": "Outras extensões",
         "SystemCheckOtherFunctions": "Outras funções",
         "SystemCheckPageSpeedDisabled": "PageSpeed desativado",
+        "SystemCheckPageSpeedWarning": "Recomendamos que desative o módulo PageSpeed no seu servidor web %s: foi reportado que o PageSpeed origina vários problemas no Matomo, tais como: relatórios falaciosos de páginas, evolução falaciosa da linha e outros problemas difíceis de diagnosticar. Por favor, desative o mod_pagespeed neste servidor.",
         "SystemCheckPackHelp": "A função pack () é necessária para acompanhar os visitantes no Matomo.",
         "SystemCheckParseIniFileHelp": "Esta função incorporada foi desativada no seu servidor. O Matomo irá tentar emular esta função mas pode encontrar restrições de segurança adicionais. O desempenho do acompanhamento também será afetado.",
         "SystemCheckPdoAndMysqliHelp": "Num servidor Linux pode compilar php com as seguintes opções: %1$s No seu ficheiro php.ini, adicione as seguintes linhas: %2$s",
@@ -129,6 +132,7 @@
         "SystemCheckCronArchiveProcessCLI": "Gerir processo via linha de comandos",
         "SystemCheckPhpSetting": "Para impedir algum problema crítico, pode definir o seguinte no seu ficheiro php.ini: %s",
         "SystemCheckUpdateHttps": "Atualização sob HTTPS",
+        "SystemCheckUpdateHttpsNotSupported": "O Matomo não consegue utilizar HTTPS para atualizar, pelo que irá reverter para uma atualização insegura por HTTP. Confirme que o CURL ou allow_url_fopen é suportado e que a extensão openssl do PHP está instalada: https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/.",
         "NotSupported": "não suportado",
         "Tables": "A criar as Tabelas",
         "TablesCreatedSuccess": "Tabelas criadas com sucesso!",
diff --git a/app/plugins/Installation/lang/zh-cn.json b/app/plugins/Installation/lang/zh-cn.json
index 80ac14770..5082ac575 100644
--- a/app/plugins/Installation/lang/zh-cn.json
+++ b/app/plugins/Installation/lang/zh-cn.json
@@ -1,8 +1,10 @@
 {
     "Installation": {
         "CollaborativeProject": "Matomo 是协作项目，由世界各地的人们带着爱所创建。",
+        "ConfigurationHelp": "您的Matomo配置文件似乎配置错误。 您可以删除config\/config.ini.php并继续安装，或更正数据库连接设置。",
         "ConfirmDeleteExistingTables": "您确定要从您的数据库中删除表: %s吗？警告：这些表中的数据将无法恢复！",
         "Congratulations": "恭喜",
+        "CongratulationsHelp": "<p>恭喜！ 您的Matomo安装已完成。<\/p><p>确保您的JavaScript代码已在您的网页上输入，并等待您的第一批访客！<\/p>",
         "DatabaseAbilities": "数据库能力",
         "DatabaseCreation": "创建数据库",
         "DatabaseErrorConnect": "连接至数据库服务器时发生错误",
@@ -29,6 +31,7 @@
         "JSTracking_Intro": "要用 Matomo 追踪您网站的流量，您需要确认在您网站的每个页面都增加了一些额外的代码。",
         "LargePiwikInstances": "给予高流量网站的协助",
         "Legend": "说明",
+        "LoadDataInfileRecommended": "如果您的Matomo服务器跟踪高流量网站（例如每月> 100,000页），我们建议您尝试解决此问题。",
         "LoadDataInfileUnavailableHelp": "使用 %1$s 会大大加速 Matomo 的处理速度。要让 Matomo 能用它，请更新 PHP 和 MySQL，并确认数据库账号有 %2$s 权限。",
         "NfsFilesystemWarning": "您的服务器使用 NFS 文件系统。",
         "NfsFilesystemWarningSuffixAdmin": "这意味着当 Matomo 使用基于文件的会话时将会极慢。",
@@ -42,6 +45,7 @@
         "PasswordRepeat": "密码（再输一遍）",
         "PercentDone": "%s %% 已完成",
         "ProfessionalServicesAdTitle": "高级分析和服务",
+        "ProfessionalServicesfessionalServicesAdText": "我们的专家网络可以帮助您的组织释放Matomo分析的全部功能。",
         "ProfessionalServicesfessionalDiscoverHow": "了解 Matomo %1$s附加产品和服务%2$s，以及如何增加您的转化和收入。",
         "PleaseFixTheFollowingErrors": "请修复以下错误",
         "DefaultSettings": "默认 Matomo 设置",
@@ -68,6 +72,12 @@
         "SystemCheckCreateFunctionHelp": "Matomo 使用匿名函数用作回调。",
         "SystemCheckDatabaseExtensions": "MySQL 扩展",
         "SystemCheckDatabaseHelp": "Matomo 正常工作要么需要 mysqli 扩展，要么需要 PDO 及 pdo_mysql 两个扩展。",
+        "SystemCheckDatabaseSSL": "数据库SSL连接",
+        "SystemCheckDatabaseSSLCipher": "正在使用SSL密码",
+        "SystemCheckDatabaseSSLDisabled": "您的数据库服务器中的SSL支持已禁用",
+        "SystemCheckDatabaseSSLNo": "数据库服务器未使用SSL支持进行编译",
+        "SystemCheckDatabaseSSLNotWorking": "%s设置为“1”但SSL连接不起作用",
+        "SystemCheckDatabaseSSLOn": "您的数据库支持SSL连接，但未使用SSL连接。 检查您的Matomo配置文件中的您的数据库SSL设置",
         "SystemCheckDebugBacktraceHelp": "View::factory 无法为调用的模块创建视图。",
         "SystemCheckError": "发生错误——必须先修正，才能再继续",
         "SystemCheckEvalHelp": "被 HTML QuickForm 及 Smarty 模板系统所依赖。",
@@ -85,6 +95,7 @@
         "SystemCheckJsonHelp": "Matomo 需要 php5-json 扩展来读写 JSON 数据。",
         "SystemCheckMailHelp": "若沒有 mail()，意见反馈及忘记密码的信息将无法寄出。",
         "SystemCheckMbstring": "mbstring",
+        "SystemCheckMbstringHelp": "需要mbstring扩展来处理用户界面和API响应中的多字节字符。 另外，请检查php.ini中的mbstring.func_overload是否设置为“0”。",
         "SystemCheckMemoryLimit": "内存限制",
         "SystemCheckMemoryLimitHelp": "在一个高流量的网站，归档过程中使用的内存可能超过当前系统的允许值。如果有需要，可以调整 php.ini 文件中的 memory_limit 值。",
         "SystemCheckNoErrorsOrWarnings": "没有错误或者警告",
@@ -94,6 +105,7 @@
         "SystemCheckOtherExtensions": "其它扩展",
         "SystemCheckOtherFunctions": "其它功能",
         "SystemCheckPageSpeedDisabled": "PageSpeed 已停用",
+        "SystemCheckPageSpeedWarning": "我们建议在您的Web服务器%s中禁用PageSpeed模块：报告PageSpeed会导致Matomo出现多个问题，例如：损坏的页面报告，损坏的行演变以及其他难以排除故障的问题。 请在此服务器上禁用mod_pagespeed。",
         "SystemCheckPackHelp": "Matomo 必须使用 pack() 功能才能追踪访客。",
         "SystemCheckParseIniFileHelp": "您主机上这个内置功能已停用。Matomo 将会尝试模拟这个功能，但可能会遇到其它的安全限制。追踪的性能也会受到很大影响。",
         "SystemCheckPdoAndMysqliHelp": "在 GNU\/Linux 服务器上，您可以使用以下选项编译 PHP: %1$s在您的 php.ini 中 , 加入以下几行: %2$s",
@@ -106,6 +118,7 @@
         "SystemCheckSummaryThereWereWarnings": "您的系统有些问题。Matomo 可以运作，但您也许会碰到一些小问题。",
         "SystemCheckTimeLimitHelp": "在一个高流量的网站，执行归档过程可能会超过目前系统所允许的时间。如果需要，可以调整 php.ini 文件中的 max_execution_time。",
         "SystemCheckTracker": "追踪器状态",
+        "SystemCheckTrackerHelp": "对matomo.php的GET请求失败。 尝试从HTTP身份验证中将此URL列入白名单并禁用mod_security（您可能需要询问您的webhost）。 有关错误的详细信息，请检查您的Web服务器错误日志文件。",
         "SystemCheckWarnDomHelp": "必须启用“dom”扩展（例如安装“php-dom”或“php-xml”包）。",
         "SystemCheckWarning": "Matomo 将正常运作，但某些功能可能失效",
         "SystemCheckWarnJsonHelp": "为了更好的性能，您应该启用“json”扩展（例如安装“php-json”包）。",
@@ -119,6 +132,7 @@
         "SystemCheckCronArchiveProcessCLI": "通过 CLI 管理进程",
         "SystemCheckPhpSetting": "为预防某些严重问题，您必须在 php.ini 文件中加入如下几行：%s",
         "SystemCheckUpdateHttps": "通过 HTTPS 更新",
+        "SystemCheckUpdateHttpsNotSupported": "MatomoMatomo无法使用HTTPS进行更新，它将回退到不安全的HTTP更新。 检查是否支持CURL或allow_url_fopen并且安装了openssl PHP扩展：https:\/\/matomo.org\/faq\/troubleshooting\/faq_177\/.。",
         "NotSupported": "不支持",
         "Tables": "建立数据表中",
         "TablesCreatedSuccess": "数据表已成功建立！",
@@ -132,8 +146,10 @@
         "Timezone": "网站时区",
         "WeHopeYouWillEnjoyPiwik": "希望您能像我们享受创建 Matomo 一样享受使用 Matomo。",
         "Welcome": "欢迎！",
+        "WelcomeHelp": "<p>Matomo是一款免费\/自由的网络分析软件，可以让您轻松地从访问者那里获得您想要的信息。<\/p><p>此过程分为%s简单步骤，大约需要5分钟。<\/p>",
         "WelcomeToCommunity": "欢迎来到 Matomo 社区！",
         "CannotConnectToDb": "无法连接数据库",
-        "CannotConnectToDbResolvingExplanation": "这可能是暂时的问题，试试%1$s刷新页面%2$s。如果问题仍然存在，请联系您的 Matomo 管理员。"
+        "CannotConnectToDbResolvingExplanation": "这可能是暂时的问题，试试%1$s刷新页面%2$s。如果问题仍然存在，请联系您的 Matomo 管理员。",
+        "EmailPrivacyNotice": "您的电子邮件地址仅用于向您发送Matomo新闻通讯。 您可以随时点击取消订阅链接取消订阅。 我们不会与其他任何人分享您的电子邮件，也不会将您的电子邮件用于向您发送Matomo简报以外的任何其他目的。 有关更多信息，请参阅我们的%1$sprivacy政策%2$s。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Installation/stylesheets/installation.css b/app/plugins/Installation/stylesheets/installation.css
index 1c8aa7dc4..ee7b985c4 100644
--- a/app/plugins/Installation/stylesheets/installation.css
+++ b/app/plugins/Installation/stylesheets/installation.css
@@ -132,4 +132,12 @@ p.next-step:first-child {
 
 .email-privacy-notice {
     margin-top: -4rem;
-}
\ No newline at end of file
+}
+
+.trackingHelpHeader h2 {
+    display: inline-block;
+}
+.trackingHelpHeader a.btn {
+    float: right;
+    margin-top: -10px;
+}
diff --git a/app/plugins/Intl/Intl.php b/app/plugins/Intl/Intl.php
index b8e003024..8f44e8d06 100644
--- a/app/plugins/Intl/Intl.php
+++ b/app/plugins/Intl/Intl.php
@@ -10,5 +10,19 @@
 
 class Intl extends \Piwik\Plugin
 {
+    public function getListHooksRegistered()
+    {
+        return [
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+        ];
+    }
 
+    public function getClientSideTranslationKeys(&$translationKeys)
+    {
+        $translationKeys[] = 'Intl_PeriodDay';
+        $translationKeys[] = 'Intl_PeriodMonth';
+        $translationKeys[] = 'Intl_PeriodWeek';
+        $translationKeys[] = 'Intl_PeriodYear';
+        $translationKeys[] = 'CoreHome_PeriodRange';
+    }
 }
diff --git a/app/plugins/Intl/config/tracker.php b/app/plugins/Intl/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Intl/config/tracker.php
+++ b/app/plugins/Intl/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/IntranetMeasurable/config/config.php b/app/plugins/IntranetMeasurable/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/IntranetMeasurable/config/config.php
+++ b/app/plugins/IntranetMeasurable/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/IntranetMeasurable/config/tracker.php b/app/plugins/IntranetMeasurable/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/IntranetMeasurable/config/tracker.php
+++ b/app/plugins/IntranetMeasurable/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/IntranetMeasurable/lang/da.json b/app/plugins/IntranetMeasurable/lang/da.json
new file mode 100644
index 000000000..8ea05e03b
--- /dev/null
+++ b/app/plugins/IntranetMeasurable/lang/da.json
@@ -0,0 +1,7 @@
+{
+    "IntranetMeasurable": {
+        "Intranet": "Intranet hjemmeside",
+        "Intranets": "Intranet hjemmeside",
+        "IntranetDescription": "En intranet webstatistik er det samme som for Internet-hjemmesider, blot hostet på et internt netværk."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/IntranetMeasurable/lang/pt-br.json b/app/plugins/IntranetMeasurable/lang/pt-br.json
index d1587fe38..f9483df63 100644
--- a/app/plugins/IntranetMeasurable/lang/pt-br.json
+++ b/app/plugins/IntranetMeasurable/lang/pt-br.json
@@ -2,6 +2,6 @@
     "IntranetMeasurable": {
         "Intranet": "Site de intranet",
         "Intranets": "Sites de intranet",
-        "IntranetDescription": "Uma intranet mensurável é como um site, mas hospedado em uma rede interna."
+        "IntranetDescription": "Um mensurável de intranet é como um site, mas hospedado em uma rede interna."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/IntranetMeasurable/lang/zh-cn.json b/app/plugins/IntranetMeasurable/lang/zh-cn.json
new file mode 100644
index 000000000..e6203fec4
--- /dev/null
+++ b/app/plugins/IntranetMeasurable/lang/zh-cn.json
@@ -0,0 +1,7 @@
+{
+    "IntranetMeasurable": {
+        "Intranet": "内联网网站",
+        "Intranets": "内联网网站",
+        "IntranetDescription": "内联网是可测量的，就像一个网站，但托管在一个内部网络。"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/LanguagesManager/config/config.php b/app/plugins/LanguagesManager/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/LanguagesManager/config/config.php
+++ b/app/plugins/LanguagesManager/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/LanguagesManager/config/tracker.php b/app/plugins/LanguagesManager/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/LanguagesManager/config/tracker.php
+++ b/app/plugins/LanguagesManager/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/LanguagesManager/lang/es-ar.json b/app/plugins/LanguagesManager/lang/es-ar.json
index 6bc2460f4..b8ee533d2 100644
--- a/app/plugins/LanguagesManager/lang/es-ar.json
+++ b/app/plugins/LanguagesManager/lang/es-ar.json
@@ -1,5 +1,6 @@
 {
     "LanguagesManager": {
+        "AboutPiwikTranslations": "Acerca de las localizaciones de Matomo",
         "TranslationSearch": "Búsqueda de localización"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/LanguagesManager/lang/pt-br.json b/app/plugins/LanguagesManager/lang/pt-br.json
index 4db57b2c8..c1efd6f7c 100644
--- a/app/plugins/LanguagesManager/lang/pt-br.json
+++ b/app/plugins/LanguagesManager/lang/pt-br.json
@@ -1,6 +1,6 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Sobre traduções do Matomo.",
+        "AboutPiwikTranslations": "Sobre traduções do Matomo",
         "TranslationSearch": "Pesquisa de tradução"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Live/Controller.php b/app/plugins/Live/Controller.php
index 41829626f..a7af05e8d 100644
--- a/app/plugins/Live/Controller.php
+++ b/app/plugins/Live/Controller.php
@@ -88,8 +88,14 @@ public function getLastVisitsStart()
 
         $view = new View('@Live/getLastVisitsStart');
         $view->idSite = (int) $this->idSite;
-        $api = new Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=original&serialize=0&disable_generic_filters=1");
-        $visitors = $api->process();
+        $error = '';
+        try {
+            $api = new Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=original&serialize=0&disable_generic_filters=1");
+            $visitors = $api->process();
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+        }
+        $view->error = $error;
         $view->visitors = $visitors;
 
         return $this->render($view);
diff --git a/app/plugins/Live/Exception/MaxExecutionTimeExceededException.php b/app/plugins/Live/Exception/MaxExecutionTimeExceededException.php
new file mode 100644
index 000000000..26555dc31
--- /dev/null
+++ b/app/plugins/Live/Exception/MaxExecutionTimeExceededException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Live\Exception;
+
+class MaxExecutionTimeExceededException extends \Exception
+{
+}
diff --git a/app/plugins/Live/Live.php b/app/plugins/Live/Live.php
index 29be21290..e1bf4f828 100644
--- a/app/plugins/Live/Live.php
+++ b/app/plugins/Live/Live.php
@@ -34,9 +34,16 @@ public function registerEvents()
             'Live.renderVisitorDetails'              => 'renderVisitorDetails',
             'Live.renderVisitorIcons'                => 'renderVisitorIcons',
             'Template.jsGlobalVariables'             => 'addJsGlobalVariables',
+            'API.getPagesComparisonsDisabledFor'     => 'getPagesComparisonsDisabledFor',
         );
     }
 
+    public function getPagesComparisonsDisabledFor(&$pages)
+    {
+        $pages[] = 'General_Visitors.Live_VisitorLog';
+        $pages[] = 'General_Visitors.General_RealTime';
+    }
+
     public function addJsGlobalVariables(&$out)
     {
         $actionsToDisplayCollapsed = (int)StaticContainer::get('Live.pageViewActionsToDisplayCollapsed');
diff --git a/app/plugins/Live/Model.php b/app/plugins/Live/Model.php
index 790935819..89c32d2b1 100644
--- a/app/plugins/Live/Model.php
+++ b/app/plugins/Live/Model.php
@@ -12,14 +12,17 @@
 use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Piwik;
+use Piwik\Plugins\Live\Exception\MaxExecutionTimeExceededException;
 use Piwik\Segment;
 use Piwik\Site;
+use Piwik\Updater\Migration\Db as DbMigration;
 
 class Model
 {
@@ -43,22 +46,222 @@ public function queryLogVisits($idSite, $period, $date, $segment, $offset, $limi
             $limit++;
         }
 
-        list($sql, $bind) = $this->makeLogVisitsQueryString($idSite, $period, $date, $segment, $offset, $limit, $visitorId, $minTimestamp, $filterSortOrder);
+        // If no other filter, only look at the last 24 hours of stats
+        if (empty($visitorId)
+            && empty($limit)
+            && empty($offset)
+            && empty($period)
+            && empty($date)
+        ) {
+            $period = 'day';
+            $date = 'yesterdaySameTime';
+        }
+
+        list($dateStart, $dateEnd) = $this->getStartAndEndDate($idSite, $period, $date);
+
+        $queries = $this->splitDatesIntoMultipleQueries($dateStart, $dateEnd, $limit, $offset);
+
+        $foundVisits = array();
+
+        foreach ($queries as $queryRange) {
+            $updatedLimit = $limit;
+            if (!empty($limit)) {
+                $updatedLimit = $limit - count($foundVisits);
+            }
+
+            $updatedOffset = $offset;
+            if (!empty($offset) && !empty($foundVisits)) {
+                $updatedOffset = 0; // we've already skipped enough rows
+            }
+
+            list($sql, $bind) = $this->makeLogVisitsQueryString($idSite, $queryRange[0], $queryRange[1], $segment, $updatedOffset, $updatedLimit, $visitorId, $minTimestamp, $filterSortOrder);
+
+            $visits = $this->executeLogVisitsQuery($sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit);
+
+            if (!empty($offset) && empty($visits)) {
+                // find out if there are any matches
+                $updatedOffset = 0;
+                list($sql, $bind) = $this->makeLogVisitsQueryString($idSite, $queryRange[0], $queryRange[1], $segment, $updatedOffset, $updatedLimit, $visitorId, $minTimestamp, $filterSortOrder);
 
-        $visits = Db::getReader()->fetchAll($sql, $bind);
+                $visits = $this->executeLogVisitsQuery($sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit);
+                if (!empty($visits)) {
+                    // found out the number of visits that we skipped in this query
+                    $offset = $offset - count($visits);
+                }
+                continue;
+            }
+
+            if (!empty($visits)) {
+                $foundVisits = array_merge($foundVisits, $visits);
+            }
+
+            if ($limit && count($foundVisits) >= $limit) {
+                if (count($foundVisits) > $limit) {
+                    $foundVisits = array_slice($foundVisits, 0, $limit);
+                }
+                break;
+            }
+        }
 
         if ($checkforMoreEntries) {
-            if (count($visits) == $limit) {
-                array_pop($visits);
-                return [$visits, true];
+            if (count($foundVisits) == $limit) {
+                array_pop($foundVisits);
+                return [$foundVisits, true];
             }
 
-            return [$visits, false];
+            return [$foundVisits, false];
         }
 
+        return $foundVisits;
+    }
+
+    private function executeLogVisitsQuery($sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit)
+    {
+        $readerDb = Db::getReader();
+        try {
+            $visits = $readerDb->fetchAll($sql, $bind);
+        } catch (Exception $e) {
+            $this->handleMaxExecutionTimeError($readerDb, $e, $sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit);
+	        throw $e;
+        }
         return $visits;
     }
 
+	/**
+	 * @param \Piwik\Tracker\Db|\Piwik\Db\AdapterInterface|\Piwik\Db $readerDb
+	 * @param Exception $e
+	 * @param $sql
+	 * @param array $bind
+	 * @param $segment
+	 * @param $dateStart
+	 * @param $dateEnd
+	 * @param $minTimestamp
+	 * @param $limit
+	 *
+	 * @throws MaxExecutionTimeExceededException
+	 */
+    public function handleMaxExecutionTimeError($readerDb, $e, $sql, $bind, $segment, $dateStart, $dateEnd, $minTimestamp, $limit)
+    {
+	    // we also need to check for the 'maximum statement execution time exceeded' text as the query might be
+	    // aborted at different stages and we can't really know all the possible codes at which it may be aborted etc
+	    $isMaxExecutionTimeError = $readerDb->isErrNo($e, DbMigration::ERROR_CODE_MAX_EXECUTION_TIME_EXCEEDED_QUERY_INTERRUPTED)
+	                               || $readerDb->isErrNo($e, DbMigration::ERROR_CODE_MAX_EXECUTION_TIME_EXCEEDED_SORT_ABORTED)
+	                               || strpos($e->getMessage(), 'maximum statement execution time exceeded') !== false;
+
+	    if ($isMaxExecutionTimeError) {
+		    $message = '';
+
+		    if ($this->isLookingAtMoreThanOneDay($dateStart, $dateEnd, $minTimestamp)) {
+			    $message .= ' ' . Piwik::translate('Live_QueryMaxExecutionTimeExceededReasonDateRange');
+		    }
+
+		    if (!empty($segment)) {
+			    $message .= ' ' . Piwik::translate('Live_QueryMaxExecutionTimeExceededReasonSegment');
+		    }
+
+		    $limitThatCannotBeSelectedInUiButOnlyApi = 550;
+		    if ($limit > $limitThatCannotBeSelectedInUiButOnlyApi) {
+			    $message .= ' ' . Piwik::translate('Live_QueryMaxExecutionTimeExceededLimit');
+		    }
+
+		    if (empty($message)) {
+			    $message .= ' ' . Piwik::translate('Live_QueryMaxExecutionTimeExceededReasonUnknown');
+		    }
+
+		    $message = Piwik::translate('Live_QueryMaxExecutionTimeExceeded') . ' ' . $message;
+
+		    $params = array(
+			    'sql' => $sql, 'bind' => $bind, 'segment' => $segment, 'limit' => $limit
+		    );
+
+		    /**
+		     * @ignore
+		     * @internal
+		     */
+		    Piwik::postEvent('Live.queryMaxExecutionTimeExceeded', array($params));
+		    throw new MaxExecutionTimeExceededException($message);
+	    }
+    }
+
+    /**
+     * @param Date|null $dateStart
+     * @param Date|null $dateEnd
+     * @param int|null $minTimestamp
+     * @return bool
+     * @throws Exception
+     */
+    public function isLookingAtMoreThanOneDay($dateStart, $dateEnd, $minTimestamp)
+    {
+        if (!$dateStart) {
+            if (!$minTimestamp) {
+                return true;
+            } else {
+                $dateStart = Date::factory($minTimestamp);
+            }
+        }
+
+        if (!$dateEnd) {
+            $dateEnd = Date::now();
+        }
+
+        if ($dateEnd->subHour(36)->isEarlier($dateStart)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function splitDatesIntoMultipleQueries($dateStart, $dateEnd, $limit, $offset)
+    {
+        $virtualDateEnd = $dateEnd;
+        if (empty($dateEnd)) {
+            $virtualDateEnd = Date::now()->addDay(1); // matomo always adds one day for some reason
+        }
+
+        $virtualDateStart = $dateStart;
+        if (empty($virtualDateStart)) {
+            $virtualDateStart = Date::factory(Date::FIRST_WEBSITE_TIMESTAMP);
+        }
+
+        $queries = [];
+        $hasStartEndDateMoreThanOneDayInBetween = $virtualDateStart && $virtualDateStart->addDay(1)->isEarlier($virtualDateEnd);
+        if ($limit
+            && $hasStartEndDateMoreThanOneDayInBetween
+        ) {
+            $virtualDateEnd = $virtualDateEnd->subDay(1);
+            $queries[] = array($virtualDateEnd, $dateEnd); // need to use ",endDate" in case endDate is not set
+
+            if ($virtualDateStart->addDay(7)->isEarlier($virtualDateEnd)) {
+                $queries[] = array($virtualDateEnd->subDay(7), $virtualDateEnd->subSeconds(1));
+                $virtualDateEnd = $virtualDateEnd->subDay(7);
+            }
+
+            if (!$offset) {
+                // only when no offset
+                // we would in worst case - if not enough visits are found to bypass the offset - execute below queries too often.
+                // like we would need to execute each of the queries twice just to find out if there are some visits that
+                // need to be skipped...
+
+                if ($virtualDateStart->addDay(30)->isEarlier($virtualDateEnd)) {
+                    $queries[] = array($virtualDateEnd->subDay(30), $virtualDateEnd->subSeconds(1));
+                    $virtualDateEnd = $virtualDateEnd->subDay(30);
+                }
+                if ($virtualDateStart->addPeriod(1, 'year')->isEarlier($virtualDateEnd)) {
+                    $queries[] = array($virtualDateEnd->subYear(1), $virtualDateEnd->subSeconds(1));
+                    $virtualDateEnd = $virtualDateEnd->subYear(1);
+                }
+            }
+
+            if ($virtualDateStart->isEarlier($virtualDateEnd)) {
+                // need to use ",endDate" in case startDate is not set in which case we do not want to have any limit
+                $queries[] = array($dateStart, $virtualDateEnd->subSeconds(1));
+            }
+        } else {
+            $queries[] = array($dateStart, $dateEnd);
+        }
+        return $queries;
+    }
+
     /**
      * @param $idSite
      * @param $lastMinutes
@@ -240,8 +443,8 @@ public function queryAdjacentVisitorId($idSite, $visitorId, $visitLastActionTime
 
     /**
      * @param $idSite
-     * @param $period
-     * @param $date
+     * @param Date $startDate
+     * @param Date $endDate
      * @param $segment
      * @param int $offset
      * @param int $limit
@@ -251,23 +454,11 @@ public function queryAdjacentVisitorId($idSite, $visitorId, $visitLastActionTime
      * @return array
      * @throws Exception
      */
-    public function makeLogVisitsQueryString($idSite, $period, $date, $segment, $offset, $limit, $visitorId, $minTimestamp, $filterSortOrder)
+    public function makeLogVisitsQueryString($idSite, $startDate, $endDate, $segment, $offset, $limit, $visitorId, $minTimestamp, $filterSortOrder)
     {
-        // If no other filter, only look at the last 24 hours of stats
-        if (empty($visitorId)
-            && empty($limit)
-            && empty($offset)
-            && empty($period)
-            && empty($date)
-        ) {
-            $period = 'day';
-            $date = 'yesterdaySameTime';
-        }
-
-
         list($whereClause, $bindIdSites) = $this->getIdSitesWhereClause($idSite);
 
-        list($whereBind, $where) = $this->getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $period, $date, $visitorId, $minTimestamp);
+        list($whereBind, $where) = $this->getWhereClauseAndBind($whereClause, $bindIdSites, $startDate, $endDate, $visitorId, $minTimestamp);
 
         if (strtolower($filterSortOrder) !== 'asc') {
             $filterSortOrder = 'DESC';
@@ -278,41 +469,57 @@ public function makeLogVisitsQueryString($idSite, $period, $date, $segment, $off
         // Subquery to use the indexes for ORDER BY
         $select = "log_visit.*";
         $from = "log_visit";
-        $groupBy = false;
+
         $limit = $limit >= 1 ? (int)$limit : 0;
         $offset = $offset >= 1 ? (int)$offset : 0;
 
         $orderBy = '';
         if (count($bindIdSites) <= 1) {
-            $orderBy = 'idsite ' . $filterSortOrder . ', ';
+            $orderBy = 'log_visit.idsite ' . $filterSortOrder . ', ';
         }
 
-        $orderBy .= "visit_last_action_time " . $filterSortOrder;
-        $orderByParent = "sub.visit_last_action_time " . $filterSortOrder;
+        $orderBy .= "log_visit.visit_last_action_time " . $filterSortOrder;
 
-        // this $innerLimit is a workaround (see https://github.com/piwik/piwik/issues/9200#issuecomment-183641293)
-        $innerLimit = $limit;
-        if (!$segment->isEmpty()) {
-            $innerLimit = $limit * 10;
+        if ($segment->isEmpty()) {
+            $groupBy = false;
+        } else {
+            // see https://github.com/matomo-org/matomo/issues/13861
+            $groupBy = 'log_visit.idvisit';
         }
 
-        $innerQuery = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy, $innerLimit, $offset);
+        $innerLimit = $limit;
+
+        $innerQuery = $segment->getSelectQuery($select, $from, $where, $whereBind, $orderBy, $groupBy, $innerLimit, $offset, $forceGroupBy = true);
 
         $bind = $innerQuery['bind'];
-        // Group by idvisit so that a given visit appears only once, useful when for example:
-        // 1) when a visitor converts 2 goals
-        // 2) when an Action Segment is used, the inner query will return one row per action, but we want one row per visit
-        $sql = "
-			SELECT sub.* FROM (
-				" . $innerQuery['sql'] . "
-			) AS sub
-			GROUP BY sub.idvisit
-			ORDER BY $orderByParent
-		";
-        if($limit) {
-            $sql .= sprintf("LIMIT %d \n", $limit);
+
+        $maxExecutionTimeHint = $this->getMaxExecutionTimeMySQLHint();
+        if ($visitorId) {
+            // for now let's not apply when looking for a specific visitor
+            $maxExecutionTimeHint = '';
         }
-        return array($sql, $bind);
+        if ($maxExecutionTimeHint) {
+            $innerQuery['sql'] = trim($innerQuery['sql']);
+            $pos = stripos($innerQuery['sql'], 'SELECT');
+            if ($pos !== false) {
+                $innerQuery['sql'] = substr_replace($innerQuery['sql'], 'SELECT ' . $maxExecutionTimeHint, $pos, strlen('SELECT'));
+            }
+        }
+
+        return array($innerQuery['sql'], $bind);
+    }
+
+    private function getMaxExecutionTimeMySQLHint()
+    {
+        $general = Config::getInstance()->General;
+        $maxExecutionTime = $general['live_query_max_execution_time'];
+        $maxExecutionTimeHint = '';
+        if (is_numeric($maxExecutionTime) && $maxExecutionTime > 0) {
+            $timeInMs = $maxExecutionTime * 1000;
+            $timeInMs = (int) $timeInMs;
+            $maxExecutionTimeHint = ' /*+ MAX_EXECUTION_TIME('.$timeInMs.') */ ';
+        }
+        return $maxExecutionTimeHint;
     }
 
     /**
@@ -325,35 +532,19 @@ protected function makeSite($idSite)
     }
 
     /**
-     * @param string $whereClause
-     * @param array $bindIdSites
+     * for tests only
      * @param $idSite
      * @param $period
      * @param $date
-     * @param $visitorId
-     * @param $minTimestamp
-     * @return array
+     * @return Date[]
      * @throws Exception
+     * @internal
      */
-    private function getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $period, $date, $visitorId, $minTimestamp)
+    public function getStartAndEndDate($idSite, $period, $date)
     {
-        $where = array();
-        if (!empty($whereClause)) {
-            $where[] = $whereClause;
-        }
-        $whereBind = $bindIdSites;
+        $dateStart = null;
+        $dateEnd = null;
 
-        if (!empty($visitorId)) {
-            $where[] = "log_visit.idvisitor = ? ";
-            $whereBind[] = @Common::hex2bin($visitorId);
-        }
-
-        if (!empty($minTimestamp)) {
-            $where[] = "log_visit.visit_last_action_time > ? ";
-            $whereBind[] = date("Y-m-d H:i:s", $minTimestamp);
-        }
-
-        // SQL Filter with provided period
         if (!empty($period) && !empty($date)) {
             if ($idSite === 'all' || is_array($idSite)) {
                 $currentTimezone = Request::processRequest('SitesManager.getDefaultTimezone');
@@ -378,9 +569,13 @@ private function getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $per
                 }
                 $processedPeriod = Period\Factory::build($period, $processedDate);
             }
+
             $dateStart = $processedPeriod->getDateStart()->setTimezone($currentTimezone);
-            $where[] = "log_visit.visit_last_action_time >= ?";
-            $whereBind[] = $dateStart->toString('Y-m-d H:i:s');
+
+            $now = Date::now();
+            if ($dateStart->isLater($now)) {
+                $dateStart = $now;
+            }
 
             if (!in_array($date, array('now', 'today', 'yesterdaySameTime'))
                 && strpos($date, 'last') === false
@@ -388,12 +583,58 @@ private function getWhereClauseAndBind($whereClause, $bindIdSites, $idSite, $per
                 && Date::factory($dateString)->toString('Y-m-d') != Date::factory('now', $currentTimezone)->toString()
             ) {
                 $dateEnd = $processedPeriod->getDateEnd()->setTimezone($currentTimezone);
-                $where[] = " log_visit.visit_last_action_time <= ?";
-                $dateEndString = $dateEnd->addDay(1)->toString('Y-m-d H:i:s');
-                $whereBind[] = $dateEndString;
+                $dateEnd = $dateEnd->addDay(1);
+
+                if ($dateEnd->isLater(Date::now())) {
+                    // making sure dateEnd is bit higher than start date plus in case a second past by now ...
+                    $dateEnd = $now->addPeriod(1, 'second');
+                }
             }
         }
 
+        return [$dateStart, $dateEnd];
+    }
+
+    /**
+     * @param string $whereClause
+     * @param array $bindIdSites
+     * @param Date $startDate
+     * @param Date $endDate
+     * @param $visitorId
+     * @param $minTimestamp
+     * @return array
+     * @throws Exception
+     */
+    private function getWhereClauseAndBind($whereClause, $bindIdSites, $startDate, $endDate, $visitorId, $minTimestamp)
+    {
+        $where = array();
+        if (!empty($whereClause)) {
+            $where[] = $whereClause;
+        }
+        $whereBind = $bindIdSites;
+
+        if (!empty($visitorId)) {
+            $where[] = "log_visit.idvisitor = ? ";
+            $whereBind[] = @Common::hex2bin($visitorId);
+        }
+
+        if (!empty($minTimestamp)) {
+            $where[] = "log_visit.visit_last_action_time > ? ";
+            $whereBind[] = date("Y-m-d H:i:s", $minTimestamp);
+        }
+
+        // SQL Filter with provided period
+        if (!empty($startDate)) {
+            $where[] = "log_visit.visit_last_action_time >= ?";
+            $whereBind[] = $startDate->toString('Y-m-d H:i:s');
+
+        }
+
+        if (!empty($endDate)) {
+            $where[] = " log_visit.visit_last_action_time <= ?";
+            $whereBind[] = $endDate->toString('Y-m-d H:i:s');
+        }
+
         if (count($where) > 0) {
             $where = join("
 				AND ", $where);
diff --git a/app/plugins/Live/Visualizations/VisitorLog.php b/app/plugins/Live/Visualizations/VisitorLog.php
index 822c1e04c..31c0efcd9 100644
--- a/app/plugins/Live/Visualizations/VisitorLog.php
+++ b/app/plugins/Live/Visualizations/VisitorLog.php
@@ -54,6 +54,10 @@ public function beforeLoadDataTable()
             $this->requestConfig->filter_limit = $defaultLimit;
         }
 
+        if ($this->isInPopover()) {
+            $this->requestConfig->filter_limit = 10;
+        }
+
         $this->requestConfig->request_parameters_to_modify['filter_limit'] = $this->requestConfig->filter_limit+1; // request one more record, to check if a next page is available
         $this->requestConfig->disable_generic_filters = true;
         $this->requestConfig->filter_sort_column      = false;
@@ -78,6 +82,11 @@ public function afterGenericFiltersAreAppliedToLoadedDataTable()
         $this->requestConfig->filter_sort_column = false;
     }
 
+    private function isInPopover()
+    {
+        return Common::getRequestVar('inPopover', '0') !== '0';
+    }
+
     /**
      * Configure visualization.
      */
@@ -108,23 +117,30 @@ public function beforeRender()
             $this->config->custom_parameters['totalRows'] = 10000000;
         }
 
-        $this->config->custom_parameters['smallWidth'] = (1 == Common::getRequestVar('small', 0, 'int'));
-        $this->config->custom_parameters['hideProfileLink'] = (1 == Common::getRequestVar('hideProfileLink', 0, 'int'));
+        $this->config->custom_parameters['smallWidth'] = (int)(1 == Common::getRequestVar('small', 0, 'int'));
+        $this->config->custom_parameters['hideProfileLink'] = (int)(1 == Common::getRequestVar('hideProfileLink', 0, 'int'));
         $this->config->custom_parameters['pageUrlNotDefined'] = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL'));
 
-        $this->config->footer_icons = array(
-            array(
-                'class'   => 'tableAllColumnsSwitch',
-                'buttons' => array(
-                    array(
-                        'id'    => static::ID,
-                        'title' => Piwik::translate('Live_LinkVisitorLog'),
-                        'icon'  => 'plugins/Morpheus/images/table.png'
+        if (!$this->isInPopover()) {
+            $this->config->footer_icons = array(
+                array(
+                    'class'   => 'tableAllColumnsSwitch',
+                    'buttons' => array(
+                        array(
+                            'id'    => static::ID,
+                            'title' => Piwik::translate('Live_LinkVisitorLog'),
+                            'icon'  => 'plugins/Morpheus/images/table.png'
+                        )
                     )
                 )
-            )
-        );
-
+            );
+        } else {
+            // It's opening in a popover, just show a few records and don't give the user any actions to play with
+            $this->config->footer_icons = array();
+            $this->config->show_export = false;
+            $this->config->show_pagination_control = false;
+            $this->config->show_limit_control = false;
+        }
         $this->assignTemplateVar('actionsToDisplayCollapsed', StaticContainer::get('Live.pageViewActionsToDisplayCollapsed'));
 
         $enableAddNewSegment = Common::getRequestVar('enableAddNewSegment', false);
diff --git a/app/plugins/Live/config/tracker.php b/app/plugins/Live/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Live/config/tracker.php
+++ b/app/plugins/Live/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Live/lang/de.json b/app/plugins/Live/lang/de.json
index 7dff39c59..443572b06 100644
--- a/app/plugins/Live/lang/de.json
+++ b/app/plugins/Live/lang/de.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Sichtbarkeit aller Aktionen umschalten",
         "TopVisitedPages": "Meistbesuchte Seiten",
         "VisitsLog": "Besucher-Log",
+        "QueryMaxExecutionTimeExceeded": "Die Ausführung der Abfrage dauerte zu lange.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Dies kann vorkommen, wenn der ausgewählte Zeitraum zu groß ist. Bitte wählen Sie einen kleineren Zeitraum.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Dies kann vorkommen, wenn das ausgewählte Segment keinem Besuch entspricht. Bitte überprüfen Sie das von Ihnen ausgewählte Segment.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Bitte erneut versuchen. Wenn dies wiederholt vorkommt, wenden Sie sich bitte an den Administrator oder den Support.",
         "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. %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.",
         "VisitorLogNoDataMessagePurged": "Wahrscheinlich wurden die Daten bereinigt, weil das reguläre Löschen alter Daten aktiviert ist und das Datum für diesen Bericht älter als %s Tage alt ist. Ein Hauptadministrator kann diese Einstellung im Menü Administration => Privatsphäre ändern.",
diff --git a/app/plugins/Live/lang/el.json b/app/plugins/Live/lang/el.json
index 31ab70bc1..1d61a1b1d 100644
--- a/app/plugins/Live/lang/el.json
+++ b/app/plugins/Live/lang/el.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Εναλλαγή της ορατότητας όλων των ενεργειών",
         "TopVisitedPages": "Κορυφαίες σε επισκεψιμότητα σελίδες",
         "VisitsLog": "Ημερολόγιο Επισκέψεων",
+        "QueryMaxExecutionTimeExceeded": "Το ερώτημα πήρε υπερβολικά πολύ χρόνο να εκτελεστεί.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Αυτό ενδέχεται να συμβεί αν το επιλεγμένο εύρος ημερομηνιών είναι πολύ μεγάλο. Παρακαλούμε επιλέξτε ένα μικρότερο εύρος ημερομηνιών.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Αυτό ενδέχεται να συμβεί αν το επιλεγμένο τμήμα δεν βρίσκει κάποια επίσκεψη. Παρακαλούμε ελέγξτε το επιλεγμένο τμήμα.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Παρακαλούμε δοκιμάστε πάλι. Αν αυτό συμβαίνει συνεχώς, ελάτε σε επαφή με τον διαχειριστή ή την υποστήριξη.",
         "VisitorLog": "Ημερολόγιο Επισκέψεων",
         "VisitorLogDocumentation": "Ο πίνακας εμφανίζει τις τελευταίες επισκέψεις στο επιλεγμένο εύρος ημερομηνιών. Μπορείτε να δείτε την τελευταία ημερομηνία επίσκεψης ενός επισκέπτη πηγαίνοντας με το ποντίκι πάνω από την ημερομηνία μιας επίσκεψης. %1$s Αν το εύρος ημερομηνιών περιλαμβάνει και τη σημερινή μέρα, μπορείτε να δείτε τους επισκέπτες σε πραγματικό χρόνο! %2$s Τα δεδομένα που εμφανίζονται είναι πάντα σε πραγματικό χρόνο, ανεξάρτητα από το αν και πόσο συχνά χρησιμοποιείτε την αυτοματοποιημένη εργασία αρχειοθέτησης του cron.",
         "VisitorLogNoDataMessagePurged": "Είναι πιθανό τα δεδομένα να έχουν εκκαθαριστεί λόγω της ενεργοποίησης τακτικής διαγραφής των εγγραφών που δεν έχουν επεξεργαστεί και η ημερομηνία για την αναφορά είναι παλιότερη από %s ημέρες. Ένας υπερ-χρήστης μπορεί να αλλάξει τη ρύθμιση πηγαίνοντας στη Διαχείριση => Ιδιωτικότητα.",
diff --git a/app/plugins/Live/lang/en.json b/app/plugins/Live/lang/en.json
index 62d85f3a0..f346c7557 100644
--- a/app/plugins/Live/lang/en.json
+++ b/app/plugins/Live/lang/en.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Toggle visibility of all actions",
         "TopVisitedPages": "Top visited pages",
         "VisitsLog": "Visits Log",
+        "QueryMaxExecutionTimeExceeded": "The query took too long to execute.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "This can happen if the selected date range is too large. Please try to select a smaller date range.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "This can happen if the selected segment doesn't match any visit. Please try to check your selected segment.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Please try again. If it happens repeatedly, please get in touch with the administrator or support.",
         "VisitorLog": "Visits 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. %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.",
         "VisitorLogNoDataMessagePurged": "Likely the data has been purged because the regular deletion of old raw data is enabled and the date for this report is more than %s days old. A super user can change this setting by going to Administration => Privacy.",
diff --git a/app/plugins/Live/lang/es-ar.json b/app/plugins/Live/lang/es-ar.json
index 6a3bda5e2..fd4b6fea1 100644
--- a/app/plugins/Live/lang/es-ar.json
+++ b/app/plugins/Live/lang/es-ar.json
@@ -3,6 +3,7 @@
         "AveragePageGenerationTime": "Cada página tomó en promedio %1$s para cargarse para 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",
+        "ClickToViewAllActions": "Hacé clic para ver todas las acciones de este grupo en detalle",
         "ConvertedNGoals": "%s objetivos convertidos",
         "FirstVisit": "Primer visita",
         "GoalType": "Tipo",
@@ -11,7 +12,10 @@
         "LastHours": "Últimas %s horas",
         "LastMinutes": "Últimos %s minutos",
         "LastVisit": "Última visita",
+        "LinkVisitorLog": "Ver registro detallado de visitas",
         "LoadMoreVisits": "Cargar más visitas",
+        "LimitedSummary": "La información en este perfil resume las últimas %1$s visitas. Este usuario tuvo más visitas en total.",
+        "LimitedVisitsShown": "Sólo se muestran las últimas %1$s visitas. Este usuario tuvo más visitas en total.",
         "MorePagesNotDisplayed": "más páginas de este visitante no son mostradas",
         "NbVisitor": "1 visitante",
         "NbVisitors": "%s visitantes",
@@ -20,20 +24,37 @@
         "PageRefreshed": "Número de veces que esta página fue vista \/ refrescada consecutivamente.",
         "PluginDescription": "Ofrece el registro de visitante en vivo y te permite ver tus visitantes en el widget del panel en tiempo real. El plugin también te permite ver el perfil de un visitante para un usuario determinado.",
         "PreviousVisitor": "Visitante anterior",
+        "RealTimeVisitors": "Visitas en tiempo real",
         "RealTimeVisitorCount": "Conteo de visitante en tiempo real",
         "Referrer_URL": "Dirección web de origen del visitante",
         "ShowMap": "mostrar mapa",
+        "ActionsAndDuration": "%1$s acciones en %2$s",
         "SimpleRealTimeWidget_Message": "%1$s y %2$s en los últimos %3$s",
         "ViewVisitorProfile": "Ver perfil de visitante",
         "VisitedPages": "Páginas visitadas",
         "RevisitedPages": "Páginas vistas más de una vez",
+        "ToggleActions": "Activar la visibilidad de todas las acciones",
+        "TopVisitedPages": "Páginas principales visitadas",
+        "VisitsLog": "Registro de visitas",
+        "QueryMaxExecutionTimeExceeded": "La consulta tomó demasiado tiempo para ejecutarse.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Esto puede pasar si el rango de fecha seleccionado es demasiado grande. Por favor, intentá seleccionar un rango de fecha más chico.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Esto puede pasar si el segmento seleccionado no coincide con ninguna visita. Por favor, intentá revisar tu segmento seleccionado.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Por favor, intentá de nuevo. Si esto pasa repetidamente, por favor, ponete en contacto con el administrador de soporte.",
+        "VisitorLog": "Registro de visitas",
         "VisitorLogDocumentation": "Esta tabla muestra las últimas visitas en el rango de fecha seleccionado. Podés ver cuándo fue la última visita del visitante pasando el cursor sobre la fecha de una visita. %1$s Si el rango de fecha incluye hoy, ¡podés ver tus visitantes en tiempo real! %2$s La información mostrada aquí es siempre en tiempo real, sin tener en cuenta cuándo y cuán seguido estás usando el trabajo de cron para archivar.",
+        "VisitorLogNoDataMessagePurged": "Seguramente los datos fueron purgados porque la eliminación regular de datos viejos en crudo está activada y la fecha para este informe es mayor que %s días. Un súperusuario puede cambiar esta configuración yendo a \"Administración\" > \"Privacidad\".",
         "VisitorProfile": "Perfil de visitante",
+        "VisitorsInRealTime": "Visitas 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 web%3$s y vio %4$s páginas%5$s en %6$s visitas%7$s.",
         "VisitSummaryWithActionDetails": "Pasó un total de %1$s%2$s en el sitio web%3$s y ejecutó %4$s acciones%5$s (%6$s) en %7$s visitas%8$s.",
+        "RowActionTooltipDefault": "Mostrar registro de visitas segmentado por esta fila",
+        "RowActionTooltipWithDimension": "Mostrar registro de visitas segmentado por este %s",
+        "RowActionTooltipTitle": "Abrir registro de visitas segmentado",
+        "SegmentedVisitorLogTitle": "Registro de visitas mostrando visitas en donde %1$s es \"%2$s\"",
         "OnClickPause": "%s está iniciado. Hacé clic para pausar.",
-        "OnClickStart": "%s está detenido. Hacé clic para iniciar."
+        "OnClickStart": "%s está detenido. Hacé clic para iniciar.",
+        "ClickToSeeAllContents": "Hacé clic para ver cada interacción\/impresión de contenido"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Live/lang/fi.json b/app/plugins/Live/lang/fi.json
index ae89209d2..cef03acd2 100644
--- a/app/plugins/Live/lang/fi.json
+++ b/app/plugins/Live/lang/fi.json
@@ -36,6 +36,8 @@
         "ToggleActions": "Vaihda kaikkien toimintojen näkyvyys",
         "TopVisitedPages": "Suosituimmat sivut",
         "VisitsLog": "Käyntiloki",
+        "QueryMaxExecutionTimeExceeded": "Tämän kyselyn suorittaminen kesti liian kauan.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Näin saattaa tapahtua, jos aikaväli on liian suuri. Yritä uudelleen käyttäen lyhyempää aikaväliä.",
         "VisitorLog": "Käyntiloki",
         "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.",
         "VisitorLogNoDataMessagePurged": "Tiedot on luultavasti poistettu, koska säännöllinen vanhan raakadatan poisto on käytössä, ja tämän raportin päivämäärä on yli %s päivää sitten. Pääkäyttäjä voi muuttaa tätä asetusta kohdassa Ylläpitö => Yksityisyys.",
diff --git a/app/plugins/Live/lang/fr.json b/app/plugins/Live/lang/fr.json
index 8635289d4..4b87e57d9 100644
--- a/app/plugins/Live/lang/fr.json
+++ b/app/plugins/Live/lang/fr.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Activer l'affichage de toutes les actions",
         "TopVisitedPages": "Pages les plus visitées",
         "VisitsLog": "Journal des Visites",
+        "QueryMaxExecutionTimeExceeded": "La requête a mis trop de temps à s’exécuter.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Cela peut se produire si la plage de dates sélectionnée est trop large. Veuillez essayer avec une plage de dates plus petite.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Cela peut se produire si le segment sélectionné ne correspond à aucune visite. Veuillez vérifier le segment que vous avez sélectionné.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Veuillez réessayer. Si cela se reproduit, veuillez contacter l'administrateur ou l'assistance.",
         "VisitorLog": "Journal des Visites",
         "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.",
         "VisitorLogNoDataMessagePurged": "Il est probable que les données ait été supprimées par la suppression régulière des anciennes données brutes et ce rapport a plus de %s jours. Un super utilisateur peut modifier ce paramètre en allant dans Administration => Vie privée.",
diff --git a/app/plugins/Live/lang/it.json b/app/plugins/Live/lang/it.json
index ed95f87e5..ba46a70d2 100644
--- a/app/plugins/Live/lang/it.json
+++ b/app/plugins/Live/lang/it.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Cambia la visibilità di tutte le azioni",
         "TopVisitedPages": "Le pagine più visitate",
         "VisitsLog": "Log Visite",
+        "QueryMaxExecutionTimeExceeded": "L'esecuzione della query ha richiesto troppo tempo.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Ciò può accadere se l'intervallo di date selezionato è troppo ampio. Si prega di provare a selezionarne uno più ristretto.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Ciò può accadere se ilo segmento selezionato non corrisponde ad alcuna visita. Si prega di verificare il segmento selezionato.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Prova di nuovo. Se questo accade ripetutamente, mettiti in contatto con l'amministratore o con l'assistenza.",
         "VisitorLog": "Log Visite",
         "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.",
         "VisitorLogNoDataMessagePurged": "Probabilmente i dati sono stati eliminati perché è abilitata la cancellazione regolare dei vecchi dati grezzi e la data di questo report è più vecchia di %s giorni. Un super user può modificare questa impostazione andando su Amministrazione => Privacy.",
diff --git a/app/plugins/Live/lang/pt-br.json b/app/plugins/Live/lang/pt-br.json
index 17607d229..83551ef35 100644
--- a/app/plugins/Live/lang/pt-br.json
+++ b/app/plugins/Live/lang/pt-br.json
@@ -3,41 +3,58 @@
         "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",
-        "ClickToViewAllActions": "Clicar para ver todas as ações deste grupo em detalhes",
-        "ConvertedNGoals": "%s Metas convertidas",
+        "ClickToViewAllActions": "Clique para ver todas as ações deste grupo em detalhes",
+        "ConvertedNGoals": "%s metas convertidas",
         "FirstVisit": "Primeiro visitante",
         "GoalType": "Tipo",
         "HideMap": "esconder mapa",
         "KeywordRankedOnSearchResultForThisVisitor": "A palavra-chave %1$s foi classificada %2$s em %3$s páginas de resultados de pesquisa para este visitante",
         "LastHours": "Últimas %s horas",
-        "LastMinutes": "Últimos %s minuto(s)",
+        "LastMinutes": "Últimos %s minutos",
         "LastVisit": "Última visita",
+        "LinkVisitorLog": "Ver log detalhado de visitas",
         "LoadMoreVisits": "Carregar mais visitas",
-        "MorePagesNotDisplayed": "mais páginas por este visitante não são exibidos",
+        "LimitedSummary": "A informação neste perfil resume as últimas %1$s visitas. Este usuário teve mais visitas no total.",
+        "LimitedVisitsShown": "Apenas as últimas %1$s visitas são mostradas. Este usuário teve mais visitas no total.",
+        "MorePagesNotDisplayed": "mais páginas por este visitante não são exibidas",
         "NbVisitor": "1 visitante",
         "NbVisitors": "%s visitantes",
         "NextVisitor": "Próximo visitante",
-        "NoMoreVisits": "Não existem mais visitas para este visitante.",
+        "NoMoreVisits": "Não há mais visitas para este visitante.",
         "PageRefreshed": "Número de vezes que esta página foi vista \/ recarregada em uma linha.",
         "PluginDescription": "Fornece o Registro de Visitantes em tempo real e permite que você assista seus visitantes ao vivo no widget do painel. O plugin também permite que você veja o perfil de Visitante de qualquer usuário.",
         "PreviousVisitor": "Visitante anterior",
+        "RealTimeVisitors": "Visitas em tempo real",
         "RealTimeVisitorCount": "Contagem de visitantes em tempo real",
-        "Referrer_URL": "URL do Referenciador",
+        "Referrer_URL": "URL do referenciador",
         "ShowMap": "mostrar mapa",
         "ActionsAndDuration": "%1$s ações em %2$s",
-        "SimpleRealTimeWidget_Message": "%1$s e %2$s na última %3$s.",
+        "SimpleRealTimeWidget_Message": "%1$s e %2$s na última %3$s",
         "ViewVisitorProfile": "Ver o perfil do visitante",
         "VisitedPages": "Páginas visitadas",
         "RevisitedPages": "Páginas visualizadas mais de uma vez",
         "ToggleActions": "Alternar visibilidade de todas as ações",
         "TopVisitedPages": "Principais páginas visitadas",
-        "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",
-        "VisitorsLastVisit": "A última visita deste visitante foi a %s dias atrás.",
+        "VisitsLog": "Log de visitas",
+        "QueryMaxExecutionTimeExceeded": "A consulta levou muito tempo para executar.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Isto pode ocorrer se o intervalo de datas é muito grande. Por favor tente selecionar um intervalo de datas menor.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Isto pode ocorrer se o segmento selecionado não coincide com nenhuma visita. Por favor tente verificar o seu segmento selecionado.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Por favor tente de novo. Se isso ocorrer repetidamente, por favor entre em contato com o administrador ou o suporte.",
+        "VisitorLog": "Log de visitas",
+        "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.",
+        "VisitorLogNoDataMessagePurged": "Provavelmente os dados foram excluídos pois a exclusão regular de dados brutos antigos está habilitada e a data deste relatório é de mais de %s dias atrás. Um super usuário pode modificar esta configuração em Administração => Privacidade.",
+        "VisitorProfile": "Perfil do visitante",
+        "VisitorsInRealTime": "Visitas em tempo real",
+        "VisitorsLastVisit": "A última visita deste visitante foi %s dias atrás.",
         "VisitsFrom": "%1$s%2$s visitas%3$s de",
-        "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.",
+        "VisitSummary": "Passou um total de %1$s%2$s no site %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 site %3$s, e realizou %4$s ações%5$s (%6$s) em %7$s visitas%8$s.",
+        "RowActionTooltipDefault": "Mostrar log de visitas segmentado por esta linha",
+        "RowActionTooltipWithDimension": "Mostrar log de visitas segmentado por este %s",
+        "RowActionTooltipTitle": "Abrir log segmentado de visitas",
+        "SegmentedVisitorLogTitle": "Log de visitas mostrando visitas onde %1$s é \"%2$s\"",
         "OnClickPause": "%s iniciou. Clique para pausar.",
-        "OnClickStart": "%s parou. Clique para iniciar."
+        "OnClickStart": "%s parou. Clique para iniciar.",
+        "ClickToSeeAllContents": "Clique para ver cada interação"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Live/lang/pt.json b/app/plugins/Live/lang/pt.json
index ae8220dd2..66af3b5e9 100644
--- a/app/plugins/Live/lang/pt.json
+++ b/app/plugins/Live/lang/pt.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Ativar visibilidade para todas as ações",
         "TopVisitedPages": "Principais páginas visitadas",
         "VisitsLog": "Registo de visitas",
+        "QueryMaxExecutionTimeExceeded": "A consulta demorou demasiado tempo a ser executada.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Isto pode acontecer se o intervalo selecionado for demasiado grande. Por favor, tente selecionar um intervalo mais curto.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Isto pode acontecer se o segmento selecionado não coincidir com qualquer visita. Por favor, confirme o segmento selecionado.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Por favor, tente novamente. Se isto acontece repetidamente, por favor entre em contacto com o administrador ou apoio técnico.",
         "VisitorLog": "Registo de visitas",
         "VisitorLogDocumentation": "Esta tabela mostra as últimas visitas dentro do período selecionado. Pode ver quando ocorreu a última visita de um visitante passando o cursor sobre os dados de uma visita. %1$s Se o intervalo de datas incluir hoje, pode ver os seus visitantes em tempo real! %2$s Os dados apresentados aqui são sempre em tempo real, independentemente de quantas vezes está a utilizar a tarefa cron de arquivamento.",
         "VisitorLogNoDataMessagePurged": "É provável que os dados tenham sido limpos visto que a eliminação periódica de dados em bruto antigos está ativa e a data para este relatório ultrapassa os %s dias. Um super-utilizador pode alterar esta configuração ao aceder a Administração => Privacidade.",
@@ -50,6 +54,7 @@
         "RowActionTooltipTitle": "Abrir o registo segmentado de visitas",
         "SegmentedVisitorLogTitle": "O registo de visitas mostrando as visitas onde %1$s é \"%2$s\"",
         "OnClickPause": "%s está iniciado. Clique para pausar.",
-        "OnClickStart": "%s está parado. Clique para iniciar."
+        "OnClickStart": "%s está parado. Clique para iniciar.",
+        "ClickToSeeAllContents": "Clique para ver cada interação\/impressão do conteúdo"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Live/lang/sq.json b/app/plugins/Live/lang/sq.json
index 99fc6551a..9e8dc947d 100644
--- a/app/plugins/Live/lang/sq.json
+++ b/app/plugins/Live/lang/sq.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Aktivizo\/çaktivizo dukshmërinë e krejt veprimeve",
         "TopVisitedPages": "Faqet kryesuese të vizituara",
         "VisitsLog": "Regjistër Vizitash",
+        "QueryMaxExecutionTimeExceeded": "Ekzekutimi i kërkesës zgjati shumë.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Kjo mund të ndodhë nëse intervali i përzgjedhur i datave është shumë i madh. Ju lutemi, provoni të përzgjidhni një interval më të vogël të dhënash.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Kjo mund të ndodhë nëse me intervalin e përzgjedhur s’ka përputhje ndonjë vizitë. Ju lutemi, provoni të kontrolloni intervalin tuaj të përzgjedhur.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Ju lutemi, riprovoni. Nëse ndodh në mënyrë të përsëritur, ju lutemi, lidhuni me përgjegjësin ose me ata të asistencës.",
         "VisitorLog": "Regjistër Vizitash",
         "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 apo jo, dhe se sa shpesh, funksionin cron për arkivim.",
         "VisitorLogNoDataMessagePurged": "Ka mundësi që të dhënat të jenë spastruar ngaqë fshirja e rregullt është aktive dhe data për këtë raport është më e vjetër se %s ditë. Këtë rregullim mund ta ndryshojë një superpërdorues, duke shkuar te Administrim => Privatësi.",
diff --git a/app/plugins/Live/lang/sv.json b/app/plugins/Live/lang/sv.json
index 794af3100..284b51029 100644
--- a/app/plugins/Live/lang/sv.json
+++ b/app/plugins/Live/lang/sv.json
@@ -23,6 +23,7 @@
         "PageRefreshed": "Antal gånger denna sida har besökts \/ uppdateras i rad.",
         "PluginDescription": "Ger tillgång till Besöksloggen i realtid och låter dig hålla koll på dina besökare live i realtids instrumentpanelen. Tillägget låter dig också se en Besöksprofil för valfri användare.",
         "PreviousVisitor": "Förgående besökare",
+        "RealTimeVisitors": "Besök i realtid",
         "RealTimeVisitorCount": "Besöksräknare i realtid",
         "Referrer_URL": "Hänvisningsadress",
         "ShowMap": "Visa mapp",
@@ -33,12 +34,16 @@
         "RevisitedPages": "Sidor visade fler än en gång",
         "ToggleActions": "Växla synlighet för alla åtgärder",
         "TopVisitedPages": "Mest besökta sidorna",
+        "VisitsLog": "Besöks logg",
+        "VisitorLog": "Besöks logg",
         "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ök 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å webbplatsen%3$s och kollade på %4$s sidor%5$s under %6$s besök%7$s.",
         "VisitSummaryWithActionDetails": "Spenderade totalt %1$s%2$s på webbplatsen%3$s och genomförde %4$s händelser%5$s (%6$s) under %7$s besök%8$s.",
+        "RowActionTooltipTitle": "Öppna segmenterad besökslogg",
         "OnClickPause": "%s är startad. Klicka för att pausa.",
         "OnClickStart": "%s är stoppad. Klicka för att starta."
     }
diff --git a/app/plugins/Live/lang/tr.json b/app/plugins/Live/lang/tr.json
index 5651670b4..d5f876fbf 100644
--- a/app/plugins/Live/lang/tr.json
+++ b/app/plugins/Live/lang/tr.json
@@ -36,6 +36,10 @@
         "ToggleActions": "Tüm işlemlerin görünürlüğünü değiştir",
         "TopVisitedPages": "En çok ziyaret edilen sayfalar",
         "VisitsLog": "Ziyaret Kayıtları",
+        "QueryMaxExecutionTimeExceeded": "Sorgu işleminin tamamlanması çok uzun sürdü.",
+        "QueryMaxExecutionTimeExceededReasonDateRange": "Bu sorun seçilmiş tarih aralığı çok büyük olduğunda çıkabilir. Lütfen daha küçük bir tarih aralığı seçmeyi deneyin.",
+        "QueryMaxExecutionTimeExceededReasonSegment": "Bu sorun seçilmiş dilimde herhangi bir ziyaret yoksa çıkabilir. Lütfen seçtiğiniz dilimi denetlemeyi deneyin.",
+        "QueryMaxExecutionTimeExceededReasonUnknown": "Lütfen yeniden deneyin. Bu sorun yineleniyorsa sistem yöneticisi ya da destek ekibi ile görüşün.",
         "VisitorLog": "Ziyaret Kayıtları",
         "VisitorLogDocumentation": "Bu tabloda seçilmiş tarih aralığındaki son ziyaretler görüntülenir. Bir ziyaretçinin son ziyaretinin zamanını ziyaretin tarihi üzerine gelerek görebilirsiniz. %1$sBugünü de kapsayan tarih aralıklarında ziyaretçileri gerçek zamanlı olarak görebilirsiniz! %2$s. Burada görüntülenen veriler arşivleme zamanlanmış görevinin çalışma sıklığından bağımsız olarak her zaman canlıdır.",
         "VisitorLogNoDataMessagePurged": "Veriler tamamen silinmiş görünüyor, çünkü eski ham verilerin düzenli olarak silinmesi seçeneği etkinleştirilmiş ve bu raporun tarihi %s günden eski. Bir Süper Kullanıcı Yönetim => Gizlilik bölümünden bu ayarı değiştirebilir.",
diff --git a/app/plugins/Live/stylesheets/live.less b/app/plugins/Live/stylesheets/live.less
index 56adfd2b1..9a0e4730a 100644
--- a/app/plugins/Live/stylesheets/live.less
+++ b/app/plugins/Live/stylesheets/live.less
@@ -89,6 +89,17 @@
   }
 }
 
+.theWidgetContent .card .card-content #visitsTotal {
+  margin-left: -20px;
+  width: ~"calc(100% + 40px)";
+}
+
+#visitsTotal table.dataTable {
+  td:first-child, th:first-child {
+    padding-left: 14px;
+  }
+}
+
 .visitsLiveFooter img {
     vertical-align: middle;
 }
@@ -595,6 +606,11 @@ a.visitor-log-visitor-profile-link {
   }
 }
 
+.reporting-page #widgetLivewidget .theWidgetContent .visitsLiveFooter {
+  margin-left: -9px;
+  margin-right: -2px;
+}
+
 .refresh-divider {
   display: none;
 }
diff --git a/app/plugins/Live/templates/getLastVisitsStart.twig b/app/plugins/Live/templates/getLastVisitsStart.twig
index 04969679f..c0a380a50 100644
--- a/app/plugins/Live/templates/getLastVisitsStart.twig
+++ b/app/plugins/Live/templates/getLastVisitsStart.twig
@@ -1,6 +1,9 @@
 {# some users view thousands of pages which can crash the browser viewing Live! #}
 {% set maxPagesDisplayedByVisitor=100 %}
 
+{% if error is not empty %}
+<div piwik-alert="danger">{{ error }}</div>
+{% else %}
 <ul id="visitsLive">
     {% for visitor in visitors.getRows() %}
         <li id="{{ visitor.getColumn('idVisit') }}" class="visit">
@@ -128,3 +131,4 @@ $(function () {
     });
 });
 </script>
+{% endif %}
\ No newline at end of file
diff --git a/app/plugins/Login/Controller.php b/app/plugins/Login/Controller.php
index a1c81f680..b5ce90908 100644
--- a/app/plugins/Login/Controller.php
+++ b/app/plugins/Login/Controller.php
@@ -143,6 +143,10 @@ function login($messageNoAccess = null, $infoMessage = false)
                 $messageNoAccess = $this->getMessageExceptionNoAccess();
             }
         }
+        
+        if ($messageNoAccess) {
+            http_response_code(403);
+        }
 
         $view = new View('@Login/login');
         $view->AccessErrorString = $messageNoAccess;
diff --git a/app/plugins/Login/config/tracker.php b/app/plugins/Login/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Login/config/tracker.php
+++ b/app/plugins/Login/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Login/lang/de.json b/app/plugins/Login/lang/de.json
index a5d472dca..087c74731 100644
--- a/app/plugins/Login/lang/de.json
+++ b/app/plugins/Login/lang/de.json
@@ -36,6 +36,7 @@
         "PasswordChanged": "Das Passwort wurde geändert.",
         "PasswordRepeat": "Passwort (wiederholen)",
         "PasswordsDoNotMatch": "Die Passwörter stimmen nicht überein.",
+        "PasswordResetAlreadySent": "Sie haben in der letzten Zeit zu viele Anfragen für Passwortzurücksetzungen erstellt. Eine neue Anfrage kann frühestens in einer Stunde erfolgen. Falls Sie Probleme beim Zurücksetzen Ihres Passworts haben, kontaktieren Sie bitte Ihren Administrator.",
         "WrongPasswordEntered": "Bitte geben Sie das korrekte Passwort ein.",
         "ConfirmPasswordToContinue": "Bitte bestätigen Sie Ihr Passwort um fortzufahren",
         "PluginDescription": "Unterstützt Authentifizierung via Benutzername und Passwort sowie Password Reset Funktionalität. Die Authentifizierungsmethode kann durch ein anderes Login Plugin wie LoginLdap (verfügbar im Marketplace) geändert werden.",
diff --git a/app/plugins/Login/lang/el.json b/app/plugins/Login/lang/el.json
index 370c35e42..7eb7441ee 100644
--- a/app/plugins/Login/lang/el.json
+++ b/app/plugins/Login/lang/el.json
@@ -36,7 +36,7 @@
         "PasswordChanged": "Ο κωδικός σας έχει αλλάξει.",
         "PasswordRepeat": "Κωδικός (επανάληψη)",
         "PasswordsDoNotMatch": "Οι κωδικοί δεν ταιριάζουν.",
-        "PasswordResetAlreadySent": "Έχετε ζητήσει πολλές επαναφορές συνθηματικού πρόσφατα. Μια νέα αίτηση μπορεί να γίνει σε μία ώρα. Αν έχετε προβλήματα με την επαναφορά του συνθηματικού σας, επικοινωνήστε με τον διαχειριστή σας για βοήθεια.",
+        "PasswordResetAlreadySent": "Έχετε ζητήσει πολλές επαναφορές συνθηματικού πρόσφατα. Νέα αίτηση επαναφοράς συνθηματικού μπορεί να γίνει μετά από μία ώρα. Αν έχετε προβλήματα με την επαναφορά του συνθηματικού σας, επικοινωνήστε με τον διαχειριστή σας για βοήθεια.",
         "WrongPasswordEntered": "Παρακαλώ εισάγετε το σωστό συνθηματικό σας.",
         "ConfirmPasswordToContinue": "Επιβεβαιώστε το συνθηματικό σας για να συνεχίσετε",
         "PluginDescription": "Παρέχει αυθεντικοποίηση μέσω ονόματος χρήστη και συνθηματικού όπως επίσης και λειτουργικότητα επαναφοράς συνθηματικού. Η μέθοδος αυθεντικοποίησης μπορεί να αλλαχθεί χρησιμοποιώντας άλλο πρόσθετο, όπως το LoginLdap που υπάρχει διαθέσιμο στην Αγορά.",
diff --git a/app/plugins/Login/lang/es-ar.json b/app/plugins/Login/lang/es-ar.json
index 3b7eb5aff..565af2f95 100644
--- a/app/plugins/Login/lang/es-ar.json
+++ b/app/plugins/Login/lang/es-ar.json
@@ -1,20 +1,44 @@
 {
     "Login": {
+        "BruteForceLog": "Registro de fuerza bruta",
         "ConfirmationLinkSent": "Se envió un enlace de confirmación a tu cuenta de correo. Revisá tu email y visitá ese enlace para autorizar tu solicitud de cambio de contraseña.",
+        "ContactAdmin": "Posible razón: tu servidor puede tener deshabilitado la función mail(). <br \/>Por favor, contactá a tu administrador de Matomo.",
         "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un usuario con acceso a súperusuario no puede ser autenticado usando el mecanismo \"%s\".",
         "ExceptionPasswordMD5HashExpected": "Se espera que el parámetro contraseña sea un chequeo de integridad MD5 de la contraseña.",
+        "InvalidNonceOrHeadersOrReferrer": "Falló la seguridad del formulario. Por favor, recargá el formulario y comprobá que tus cookies estén habilitadas. Si usás un proxy, tenés que %1$s configurar Matomo para aceptar la cabecera \"Proxy\"%2$s que precede la cabecera \"Host\". También revisá que tu cabecera \"Referer\" se envíe correctamente.",
+        "InvalidNonceSSLMisconfigured": "También podés %1$s forzar Matomo a usar una conexión segura%2$s: en tu archivo de configuración %3$s establecé %4$s debajo de la sección %5$s",
         "InvalidOrExpiredToken": "El indicio no es válido o venció.",
         "InvalidUsernameEmail": "Nombre de usuario y\/o dirección de correo electrónico no válidos.",
         "LogIn": "Iniciar sesión",
+        "LoginOrEmail": "Usuario o correo electrónico",
+        "HelpIpRange": "Introducí una dirección IP o un rango IP por línea. Podés usar notación CIDR, por ejemplo %1$s o podés usar comodines, por ejemplo: %2$s o %3$s.",
+        "SettingBruteForceEnable": "Habilitar detección de fuerza bruta",
+        "SettingBruteForceEnableHelp": "La detección de fuerza bruta es una importante función de seguridad usada para proteger tus datos de accesos no autorizados. En lugar de permitirle a cualquier usuario probar miles o millones de combinaciones posibles en un muy corto período de tiempo, sólo se le permitirá una cantidad específica de inicios de sesión fallidos dentro de un corto período de tiempo. Si se dan muchos intentos fallidos de inicio de sesión en ese margen de tiempo, el usuario no podrá iniciar sesión pasado un tiempo. Por favor, tené en cuenta que si se bloquea una dirección IP, cada usuario que use esa misma dirección IP será también impedido de iniciar sesión.",
+        "SettingBruteForceWhitelistIp": "Nunca bloquear estas direcciones IP para iniciar sesión",
+        "SettingBruteForceBlacklistIp": "Siempre bloquear estas direcciones IP para iniciar sesión",
+        "SettingBruteForceMaxFailedLogins": "Número de intentos de inicio de sesión permitidos dentro del margen de tiempo",
+        "SettingBruteForceMaxFailedLoginsHelp": "Si se registan más cantidades de inicios fallidos de sesión que estos, dentro del margen de tiempo configurado abajo, bloquear la dirección IP.",
+        "SettingBruteForceTimeRange": "Número de intentos de inicio de sesión dentro del margen de tiempo en minutos",
+        "SettingBruteForceTimeRangeHelp": "Ingresá los minútos en números",
+        "LoginNotAllowedBecauseBlocked": "Actualmente no se te permite iniciar sesión debido a demasiados intentos fallidos. Por favor, intentá más tarde.",
+        "CurrentlyBlockedIPs": "Direcciones IP bloqueadas actualmente",
+        "IPsAlwaysBlocked": "Estas direcciones IP están siempre bloqueadas",
+        "UnblockAllIPs": "Desbloquear todas las direcciones IP bloqueadas actualmente",
+        "CurrentlyBlockedIPsUnblockInfo": "Podés desbloquear direcciones IP que están actualmente bloqueadas, así se puede iniciar sesión de nuevo, en caso de una falsa alarma y ante la necesidad de ingresar nuevamente.",
+        "CurrentlyBlockedIPsUnblockConfirm": "¿Estás seguro que querés desbloquear todas las direcciones IP bloqueadas actualmente?",
         "LoginPasswordNotCorrect": "Combinación no válida de usuario y contraseña.",
         "LostYourPassword": "¿Te olvidaste la contraseña?",
         "ChangeYourPassword": "Cambiá tu contraseña",
+        "MailPasswordChangeBody2": "Hola, %1$s.\n\nSe recibió una solicitud de restablecimiento de contraseña desde %2$s. Para confirmar este cambio de contraseña e iniciar con tus nuevas credenciales, por favor, copiá y pegá el siguiente enlace en tu navegador web:\n\n%3$s\n\nNota: este enlace vencerá en 24 horas.\n\n¡Gracias por usar Matomo!",
         "MailTopicPasswordChange": "Confirmar el cambio de contraseña",
         "NewPassword": "Nueva contraseña",
         "NewPasswordRepeat": "Nueva contraseña (repetirla)",
         "PasswordChanged": "Se cambió tu contraseña.",
         "PasswordRepeat": "Contraseña (repetirla)",
         "PasswordsDoNotMatch": "Las contraseñas no coinciden.",
+        "PasswordResetAlreadySent": "Solicitaste demasiadas solicitudes de restablecimientos de contraseña recientemente. Una nueva solicitud se podrá hacer dentro de una hora. Si tenés problemas para restablecer tu contraseña, por favor, solicitale ayuda a tu administrador.",
+        "WrongPasswordEntered": "Por favor, ingresá tu contraseña correcta.",
+        "ConfirmPasswordToContinue": "Confirmá tu contraseña para seguir",
         "PluginDescription": "Ofrece autenticación vía nombre de usuario y contraseña, así como función de restablecimiento de contraseña. El método de autenticación se puede cambiar al usar otro plugin de inicio de sesión, como LoginLdap, disponible en el mercado.",
         "RememberMe": "Recordarme"
     }
diff --git a/app/plugins/Login/lang/es.json b/app/plugins/Login/lang/es.json
index 718ebcd10..f1204c983 100644
--- a/app/plugins/Login/lang/es.json
+++ b/app/plugins/Login/lang/es.json
@@ -36,7 +36,7 @@
         "PasswordChanged": "Su contraseña ha sido modificada.",
         "PasswordRepeat": "Contraseña (repetir)",
         "PasswordsDoNotMatch": "Las contraseñas no coinciden.",
-        "PasswordResetAlreadySent": "Ha solicitado demasiados restablecimientos de contraseña en un breve período. Podrá realizar una nueva petición en una hora. Si tiene problemas para restablecer su contraseña, comuníquese con su administrador para obtener ayuda.",
+        "PasswordResetAlreadySent": "Ha solicitado demasiados restablecimientos de contraseña recientemente. Podrá realizar una nueva petición en una hora. Si tiene problemas para restablecer su contraseña, comuníquese con su administrador para obtener ayuda.",
         "WrongPasswordEntered": "Por favor ingrese correctamente su contraseña.",
         "ConfirmPasswordToContinue": "Confirme su contraseña a continuación",
         "PluginDescription": "Proporciona autentificación vía un nombre de usuario y contraseña así como también la funcionalidad de reestablecimiento de contraseña. El método de autentificación puede ser modificado usando otro complemento de inicio de sesión, tal como LoginLdap que se encuentra disponible en el Mercado.",
diff --git a/app/plugins/Login/lang/fr.json b/app/plugins/Login/lang/fr.json
index 31b0b6ca6..6b8e2b381 100644
--- a/app/plugins/Login/lang/fr.json
+++ b/app/plugins/Login/lang/fr.json
@@ -36,6 +36,7 @@
         "PasswordChanged": "Votre mot de passe a été modifié",
         "PasswordRepeat": "Mot de passe (répétez)",
         "PasswordsDoNotMatch": "Les mots de passe ne correspondent pas.",
+        "PasswordResetAlreadySent": "Vous avez demandé trop de changements de mot de passe récemment. Une nouvelle demande pourra être faite dans une heure. Si vous rencontrez des problèmes pour changer votre mot de passe, merci de contacter votre administrateur pour obtenir de l'aide.",
         "WrongPasswordEntered": "Veuillez entrer votre mot de passe correctement.",
         "ConfirmPasswordToContinue": "Confirmez votre mot de passe pour continuer",
         "PluginDescription": "Fournit une authentification via nom d'utilisateur et mot de passe ainsi qu'une fonctionnalité de réinitialisation. La méthode d'authentification peut être changée en utilisant un autre composant d'identification comme LoginLdap disponible depuis le Marché.",
diff --git a/app/plugins/Login/lang/it.json b/app/plugins/Login/lang/it.json
index 2eda582f6..19551b9f6 100644
--- a/app/plugins/Login/lang/it.json
+++ b/app/plugins/Login/lang/it.json
@@ -36,6 +36,7 @@
         "PasswordChanged": "La tua password è stata cambiata.",
         "PasswordRepeat": "Password (ripeti)",
         "PasswordsDoNotMatch": "La password non corrisponde.",
+        "PasswordResetAlreadySent": "Di recente hai richiesto troppi ripristini di password. Una nuova richiesta può essere effettuata tra un'ora. In caso di problemi con la reimpostazione della password, contatta l'amministratore per avere assistenza.",
         "WrongPasswordEntered": "Si prega di inserire la tua password corretta.",
         "ConfirmPasswordToContinue": "Conferma la tua password per continuare",
         "PluginDescription": "Fornisce l'autenticazione tramite user name e password, e anche la funzione di reset della password. Il metodo di autenticazione può essere cambiato utilizzando un altro plugin di accesso, come LoginLdap disponibile nel Marketplace.",
diff --git a/app/plugins/Login/lang/ja.json b/app/plugins/Login/lang/ja.json
index a8be360e1..e3da4d2ae 100644
--- a/app/plugins/Login/lang/ja.json
+++ b/app/plugins/Login/lang/ja.json
@@ -36,6 +36,7 @@
         "PasswordChanged": "パスワードが変更されました。",
         "PasswordRepeat": "パスワード（再入力）",
         "PasswordsDoNotMatch": "パスワードが一致しません。",
+        "PasswordResetAlreadySent": "最近リクエストしたパスワードのリセットが多すぎます。 新しいリクエストは1時間で作成できます。 パスワードのリセットに問題がある場合は、管理者に連絡してください。",
         "WrongPasswordEntered": "正しいパスワードを入力してください。",
         "ConfirmPasswordToContinue": "続行するにはパスワードを確認してください",
         "PluginDescription": "パスワードリセットの機能と同様にユーザ名とパスワードで認証を提供します。 Marketplace で利用可能な LoginLdap など別の Login プラグインを使用することによって、認証方法を変えることができます。",
diff --git a/app/plugins/Login/lang/pt-br.json b/app/plugins/Login/lang/pt-br.json
index d0115cb25..1d009e4e6 100644
--- a/app/plugins/Login/lang/pt-br.json
+++ b/app/plugins/Login/lang/pt-br.json
@@ -1,23 +1,45 @@
 {
     "Login": {
+        "BruteForceLog": "Log de força bruta",
         "ConfirmationLinkSent": "Um link de confirmação foi enviado para a sua caixa de entrada. Verifique seu e-mail e acesse o link para autorizar seu pedido de alteração de senha.",
+        "ContactAdmin": "Possível motivo: seu host pode ter desabilitado a função mail(). <br \/>Por favor entre em contato com o seu administrador do Matomo.",
         "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 %1$s Matomo 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 Matomo 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",
+        "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 %1$s configurar o Matomo para aceitar o cabeçalho do proxy%2$s que encaminha o cabeçalho do host. Além disso, verifique se o cabeçalho do Referenciador está sendo enviado corretamente.",
+        "InvalidNonceSSLMisconfigured": "Além disso, você pode %1$s forçar o Matomo a usar uma conexão segura%2$s: em seu arquivo de configuração %3$s configure %4$s abaixo da seção %5$s",
+        "InvalidOrExpiredToken": "O token é inválido ou expirou.",
+        "InvalidUsernameEmail": "Nome de usuário ou e-mail inválido.",
         "LogIn": "Entrar",
-        "LoginPasswordNotCorrect": "Combinação errada de Nome de Usuário e senha.",
-        "LostYourPassword": "Esqueceu a sua senha?",
+        "LoginOrEmail": "Nome de usuário ou Email",
+        "HelpIpRange": "Digite um endereço IP ou um intervalo de IPs por linha. Você pode usar notação CIDR ex. %1$s ou você pode usar caracteres curinga, ex. %2$s ou %3$s",
+        "SettingBruteForceEnable": "Habilitar detecção de força bruta",
+        "SettingBruteForceEnableHelp": "A detecção de força bruta é um importante recurso de segurança usado para proteger seus dados de acessos não autorizados. Ao invés de permitir a qualquer usuário tentar milhares ou milhões de combinações de senhas em pouco tempo, ela irá permitir apenas uma quantidade específica de logins com falha em um curto período de tempo. Se muitas falhas de login ocorrerem nesse período, o usuário não será capaz de fazer login por um certo tempo. Por favor note que se um IP estiver bloqueado, todos os usuários que usam aquele IP estarão bloqueados de fazer login também.",
+        "SettingBruteForceWhitelistIp": "Nunca bloquear estes IPs de fazer login",
+        "SettingBruteForceBlacklistIp": "Sempre bloquear estes IPs de fazer login",
+        "SettingBruteForceMaxFailedLogins": "Número de tentativas de login no período de tempo",
+        "SettingBruteForceMaxFailedLoginsHelp": "Se mais que esse número de logins com falha forem registrados dentro do período de tempo configurado abaixo, bloqueie o IP.",
+        "SettingBruteForceTimeRange": "Contar tentativas de login dentro deste período de tempo em minutos",
+        "SettingBruteForceTimeRangeHelp": "Digite um número em minutos.",
+        "LoginNotAllowedBecauseBlocked": "Você não tem permissão de fazer login atualmente porque você realizou muitas tentativas, tente novamente mais tarde.",
+        "CurrentlyBlockedIPs": "IPs atualmente bloqueados",
+        "IPsAlwaysBlocked": "Estes IPs estão sempre bloqueados",
+        "UnblockAllIPs": "Desbloquear todos os IPs atualmente bloqueados",
+        "CurrentlyBlockedIPsUnblockInfo": "Você pode desbloquear IPs que estão atualmente bloqueados para que eles possam voltar a fazer login caso eles tenham sido reportados erroneamente e precisem ser capazes de voltar a fazer login.",
+        "CurrentlyBlockedIPsUnblockConfirm": "Você tem certeza que deseja desbloquear todos os IPs atualmente bloqueados?",
+        "LoginPasswordNotCorrect": "Combinação errada de nome de usuário e senha.",
+        "LostYourPassword": "Esqueceu sua senha?",
         "ChangeYourPassword": "Trocar sua senha",
-        "MailTopicPasswordChange": "Confirme Alteração de Senha",
+        "MailPasswordChangeBody2": "Olá, %1$s,\n\nUm pedido de redefinição de senha foi recebido de %2$s. Para confirmar esta alteração de senha para que você possa fazer login com suas novas credenciais, por favor copie e cole o seguinte link no seu navegador:\n\n%3$s\n\nObs: este link irá expirar em 24 horas.\n\nE obrigado por usar o Matomo!",
+        "MailTopicPasswordChange": "Confirmar alteração de senha",
         "NewPassword": "Nova senha",
         "NewPasswordRepeat": "Nova senha (repetir)",
         "PasswordChanged": "Sua senha foi alterada.",
         "PasswordRepeat": "Senha (repetir)",
         "PasswordsDoNotMatch": "Senhas não conferem.",
-        "PluginDescription": "Fornece autenticação através do nome de usuário e senha, bem como a funcionalidade de redefinição de senha. O método de autenticação pode ser alterado utilizando outro plug-in, como, por exemplo, o LoginLdap disponível no Mercado.",
-        "RememberMe": "Lembrar-me"
+        "PasswordResetAlreadySent": "Você solicitou muitas redefinições de senha recentemente. Uma nova solicitação pode ser feita em uma hora. Se você tiver problemas ao redefinir sua senha, por favor entre em contato com o seu administrador para obter ajuda.",
+        "WrongPasswordEntered": "Por favor digite sua senha correta.",
+        "ConfirmPasswordToContinue": "Confirme sua senha para continuar",
+        "PluginDescription": "Fornece autenticação através do nome de usuário e senha, bem como a funcionalidade de redefinição de senha. O método de autenticação pode ser alterado utilizando outro plugin de login, como o LoginLdap disponível no Mercado.",
+        "RememberMe": "Lembrar de mim"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Login/lang/pt.json b/app/plugins/Login/lang/pt.json
index bb7a73ca9..575203c08 100644
--- a/app/plugins/Login/lang/pt.json
+++ b/app/plugins/Login/lang/pt.json
@@ -24,6 +24,7 @@
         "CurrentlyBlockedIPs": "IPs atualmente bloqueados",
         "IPsAlwaysBlocked": "Estes IPs são sempre bloqueados",
         "UnblockAllIPs": "Desbloquear todos os endereços de IP atualmente bloqueados",
+        "CurrentlyBlockedIPsUnblockInfo": "Pode desbloquear IPs que estejam atualmente bloqueados, para que possam iniciar sessão novamente caso tenham sido erroneamente selecionados e necessitem de iniciar sessão novamente.",
         "CurrentlyBlockedIPsUnblockConfirm": "Tem a certeza que pretende desbloquear todos os IPs atualmente bloqueados?",
         "LoginPasswordNotCorrect": "Combinação de nome de utilizador e palavra-passe incorreta.",
         "LostYourPassword": "Perdeu a sua palavra-passe?",
@@ -35,6 +36,7 @@
         "PasswordChanged": "A sua palavra-passe foi alterada.",
         "PasswordRepeat": "Palavra-passe (repetir)",
         "PasswordsDoNotMatch": "As palavras-passe não coincidem.",
+        "PasswordResetAlreadySent": "Procedeu a demasiados pedidos de alteração de palavra-passe recentemente. Pode realizar um novo pedido dentro de uma hora. Caso se depare com algum problema no processo de alteração de palavra-passe, por favor entre em contacto com o administrador para apoio.",
         "WrongPasswordEntered": "Por favor, introduza a sua palavra-passe correta.",
         "ConfirmPasswordToContinue": "Confirme a sua palavra-passe para prosseguir",
         "PluginDescription": "Fornece autenticação via nome de utilizador e palavra-passe bem como a funcionalidade de reposição de palavra-passe. O método de autenticação pode ser alterado utilizando outra extensão de autenticação, como o LoginLdap disponível na loja.",
diff --git a/app/plugins/Login/lang/ru.json b/app/plugins/Login/lang/ru.json
index ef81e7614..b5408f6c2 100644
--- a/app/plugins/Login/lang/ru.json
+++ b/app/plugins/Login/lang/ru.json
@@ -22,6 +22,7 @@
         "CurrentlyBlockedIPs": "Заблокированные IP",
         "IPsAlwaysBlocked": "Эти IP всегда заблокированы",
         "UnblockAllIPs": "Разблокировать все заблокированные IP",
+        "CurrentlyBlockedIPsUnblockInfo": "Вы можете разблокировать IP-адреса, которые в настоящее время заблокированы, чтобы они могли войти снова, если они были ложно помечены и должны иметь возможность войти снова.",
         "CurrentlyBlockedIPsUnblockConfirm": "Вы уверены, что хотите разблокировать все заблокированные сейчас IP?",
         "LoginPasswordNotCorrect": "Логин или пароль неверны",
         "LostYourPassword": "Потеряли пароль?",
@@ -32,6 +33,7 @@
         "PasswordChanged": "Ваш пароль был изменен.",
         "PasswordRepeat": "Пароль еще раз",
         "PasswordsDoNotMatch": "Пароли не совпадают.",
+        "PasswordResetAlreadySent": "Вы недавно запросили слишком много сбросов пароля. Новый запрос может быть сделан через один час. Если у вас возникли проблемы со сбросом пароля, обратитесь за помощью к администратору.",
         "WrongPasswordEntered": "Пожалуйста, введите ваш правильный пароль.",
         "ConfirmPasswordToContinue": "Подтвердите пароль для продолжения",
         "PluginDescription": "Предоставляет авторизацию через имя пользователя и пароль, а также функцию сброса пароля. Способ авторизации может быть изменён если использовать другой Login плагин, такой как LoginLdap, доступный через Marketplace.",
diff --git a/app/plugins/Login/lang/sq.json b/app/plugins/Login/lang/sq.json
index 3ee239eff..96d3038db 100644
--- a/app/plugins/Login/lang/sq.json
+++ b/app/plugins/Login/lang/sq.json
@@ -36,6 +36,7 @@
         "PasswordChanged": "Fjalëkalimi juaj u ndryshua.",
         "PasswordRepeat": "Fjalëkalim (sërish)",
         "PasswordsDoNotMatch": "Fjalëkalimet nuk përputhen.",
+        "PasswordResetAlreadySent": "Tani së fundi keni kërkuar shumë ricaktime fjalëkalimi. Një kërkesë e re mund të bëhet pas një ore. Nëse keni probleme me ricaktimin e fjalëkalimit tuaj, ju lutemi, për ndihmë, lidhuni me përgjegjësin tuaj.",
         "WrongPasswordEntered": "Ju lutemi, jepni fjalëkalimin tuaj të saktë.",
         "ConfirmPasswordToContinue": "Që të vazhdohet, ripohoni fjalëkalimin tuaj",
         "PluginDescription": "Ofron mirëfilltësim përmes emri përdoruesi dhe fjalëkalimi, si dhe funksionin e ricaktimit të fjalëkalimeve. Metoda e mirëfilltësimit mund të ndryshohet duke përdorur një tjetër shtojcë Hyrjesh, të tillë si LoginLdap, të cilën e gjeni te Marketplace-i.",
diff --git a/app/plugins/Login/stylesheets/login.less b/app/plugins/Login/stylesheets/login.less
index 54cf9acdc..c9ed140a8 100644
--- a/app/plugins/Login/stylesheets/login.less
+++ b/app/plugins/Login/stylesheets/login.less
@@ -3,14 +3,14 @@
 #loginPage {
 
     #logo {
-        padding-top: 5px;
+        padding-top: 6px;
 
         img.default-piwik-logo {
             width: 171px;
         }
 
         img {
-            max-height: 30px;
+            max-height: 32px;
         }
     }
 
diff --git a/app/plugins/Marketplace/Categories/BrowseSubcategory.php b/app/plugins/Marketplace/Categories/BrowseSubcategory.php
new file mode 100644
index 000000000..3a49ba31d
--- /dev/null
+++ b/app/plugins/Marketplace/Categories/BrowseSubcategory.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Marketplace\Categories;
+
+use Piwik\Category\Subcategory;
+
+class BrowseSubcategory extends Subcategory
+{
+    protected $categoryId = 'Marketplace_Marketplace';
+    protected $id = 'Marketplace_Browse';
+    protected $order = 5;
+
+}
diff --git a/app/plugins/Marketplace/Categories/MarketplaceCategory.php b/app/plugins/Marketplace/Categories/MarketplaceCategory.php
new file mode 100644
index 000000000..3da7a155b
--- /dev/null
+++ b/app/plugins/Marketplace/Categories/MarketplaceCategory.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Marketplace\Categories;
+
+use Piwik\Category\Category;
+use Piwik\Piwik;
+
+class MarketplaceCategory extends Category
+{
+    protected $id = 'Marketplace_Marketplace';
+    protected $order = 200;
+    protected $icon = ' icon-open-source';
+
+    public function getDisplayName()
+    {
+        return Piwik::translate('Marketplace_Marketplace');
+    }
+}
diff --git a/app/plugins/Marketplace/Categories/PremiumFeaturesSubcategory.php b/app/plugins/Marketplace/Categories/PremiumFeaturesSubcategory.php
new file mode 100644
index 000000000..73858af82
--- /dev/null
+++ b/app/plugins/Marketplace/Categories/PremiumFeaturesSubcategory.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Marketplace\Categories;
+
+use Piwik\Category\Subcategory;
+
+class PremiumFeaturesSubcategory extends Subcategory
+{
+    protected $categoryId = 'Marketplace_Marketplace';
+    protected $id = 'Marketplace_PaidPlugins';
+    protected $order = 10;
+
+}
diff --git a/app/plugins/Marketplace/Controller.php b/app/plugins/Marketplace/Controller.php
index 8bd5d4e1c..af3d23e22 100644
--- a/app/plugins/Marketplace/Controller.php
+++ b/app/plugins/Marketplace/Controller.php
@@ -287,6 +287,7 @@ public function overview()
         $view->isAutoUpdatePossible = SettingsPiwik::isAutoUpdatePossible();
         $view->isAutoUpdateEnabled = SettingsPiwik::isAutoUpdateEnabled();
         $view->isPluginUploadEnabled = CorePluginsAdmin::isPluginUploadEnabled();
+        $view->inReportingMenu = (bool) Common::getRequestVar('embed', 0, 'int');
 
         return $view->render();
     }
diff --git a/app/plugins/Marketplace/Marketplace.php b/app/plugins/Marketplace/Marketplace.php
index 28f0b156b..825f75860 100644
--- a/app/plugins/Marketplace/Marketplace.php
+++ b/app/plugins/Marketplace/Marketplace.php
@@ -77,8 +77,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
     public function filterWidgets($list)
     {
         if (!SettingsPiwik::isInternetEnabled()) {
-            $list->remove(GetPremiumFeatures::getCategory(), GetPremiumFeatures::getName());
-            $list->remove(GetNewPlugins::getCategory(), GetNewPlugins::getName());
+            $list->remove('Marketplace_Marketplace');
         }
     }
 
diff --git a/app/plugins/Marketplace/Widgets/GetNewPlugins.php b/app/plugins/Marketplace/Widgets/GetNewPlugins.php
index 2b1c7270d..9de478eae 100644
--- a/app/plugins/Marketplace/Widgets/GetNewPlugins.php
+++ b/app/plugins/Marketplace/Widgets/GetNewPlugins.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Marketplace\Widgets;
 
 use Piwik\Common;
+use Piwik\Piwik;
 use Piwik\Plugins\Marketplace\Api\Client;
 use Piwik\Plugins\Marketplace\Input\PurchaseType;
 use Piwik\Plugins\Marketplace\Input\Sort;
@@ -27,25 +28,18 @@ public function __construct(Client $marketplaceApiClient)
         $this->marketplaceApiClient = $marketplaceApiClient;
     }
 
-    public static function getCategory()
-    {
-        return 'About Matomo';
-    }
-
-    public static function getName()
-    {
-        return 'Latest Marketplace Updates';
-    }
-
     public static function configure(WidgetConfig $config)
     {
-        $config->setCategoryId(self::getCategory());
-        $config->setName(self::getName());
+        $config->setCategoryId('Marketplace_Marketplace');
+        $config->setName('Marketplace_LatestMarketplaceUpdates');
         $config->setOrder(19);
+        $config->setIsEnabled(!Piwik::isUserIsAnonymous());
     }
 
     public function render()
     {
+        Piwik::checkUserIsNotAnonymous();
+
         $isAdminPage = Common::getRequestVar('isAdminPage', 0, 'int');
 
         if (!empty($isAdminPage)) {
diff --git a/app/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/app/plugins/Marketplace/Widgets/GetPremiumFeatures.php
index fa0909f7f..32ba683cc 100644
--- a/app/plugins/Marketplace/Widgets/GetPremiumFeatures.php
+++ b/app/plugins/Marketplace/Widgets/GetPremiumFeatures.php
@@ -29,25 +29,18 @@ public function __construct(Client $marketplaceApiClient)
         $this->marketplaceApiClient = $marketplaceApiClient;
     }
 
-    public static function getCategory()
-    {
-        return 'About Matomo';
-    }
-
-    public static function getName()
-    {
-        return Piwik::translate('Marketplace_PaidPlugins');
-    }
-
     public static function configure(WidgetConfig $config)
     {
-        $config->setCategoryId(self::getCategory());
-        $config->setName(self::getName());
+        $config->setCategoryId('Marketplace_Marketplace');
+        $config->setSubcategoryId('Marketplace_PaidPlugins');
+        $config->setName('Marketplace_PaidPlugins');
         $config->setOrder(20);
+        $config->setIsEnabled(!Piwik::isUserIsAnonymous());
     }
 
     public function render()
     {
+        Piwik::checkUserIsNotAnonymous();
         $template = 'getPremiumFeatures';
 
         $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_PAID);
diff --git a/app/plugins/Marketplace/Widgets/Marketplace.php b/app/plugins/Marketplace/Widgets/Marketplace.php
new file mode 100644
index 000000000..2b09c2d5b
--- /dev/null
+++ b/app/plugins/Marketplace/Widgets/Marketplace.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Marketplace\Widgets;
+
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\Plugins\Marketplace\Api\Client;
+use Piwik\Plugins\Marketplace\Input\PurchaseType;
+use Piwik\Plugins\Marketplace\Input\Sort;
+use Piwik\Widget\Widget;
+use Piwik\Widget\WidgetConfig;
+
+class Marketplace extends Widget
+{
+    public static function configure(WidgetConfig $config)
+    {
+        $config->setCategoryId('Marketplace_Marketplace');
+        $config->setSubcategoryId('Marketplace_Browse');
+        $config->setName(Piwik::translate('Marketplace_Marketplace'));
+        $config->setModule('Marketplace');
+        $config->setAction('overview');
+        $config->setParameters(array('embed' => '1'));
+        $config->setIsNotWidgetizable();
+        $config->setOrder(19);
+        $config->setIsEnabled(!Piwik::isUserIsAnonymous());
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/plugins/Marketplace/config/tracker.php b/app/plugins/Marketplace/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Marketplace/config/tracker.php
+++ b/app/plugins/Marketplace/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Marketplace/lang/da.json b/app/plugins/Marketplace/lang/da.json
index 398c8c1c3..5678e617c 100644
--- a/app/plugins/Marketplace/lang/da.json
+++ b/app/plugins/Marketplace/lang/da.json
@@ -7,6 +7,7 @@
         "AllowedUploadFormats": "Du kan via denne side overføre en programudvidelse eller tema i .zip-format.",
         "Authors": "Forfattere",
         "BackToMarketplace": "Tilbage til markedspladsen",
+        "BrowseMarketplace": "Browse Markedsplads",
         "ByXDevelopers": "af %s udviklere",
         "CannotInstall": "Kan ikke installere",
         "CannotUpdate": "Kan ikke opdatere",
diff --git a/app/plugins/Marketplace/lang/de.json b/app/plugins/Marketplace/lang/de.json
index b50e8e1b4..d7479fbf5 100644
--- a/app/plugins/Marketplace/lang/de.json
+++ b/app/plugins/Marketplace/lang/de.json
@@ -7,6 +7,8 @@
         "AddToCart": "Zum Warenkorb hinzufügen",
         "AllowedUploadFormats": "Sie können über diese Seite ein Plugin oder Theme im .zip-Format hochladen.",
         "Authors": "Autoren",
+        "Browse": "Durchsuchen",
+        "LatestMarketplaceUpdates": "Neueste Marketplace Updates",
         "BackToMarketplace": "Zurück zum Marketplace",
         "BrowseMarketplace": "Marketplace durchsuchen",
         "ByXDevelopers": "von %s Entwicklern",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Siend Sie sicher, dass Sie diesen Lizenzschlüssel entfernen wollen? Sie werden für keines Ihrer gekauften Plugins mehr Updates erhalten.",
         "Developer": "Entwickler",
         "DevelopersLearnHowToDevelopPlugins": "Für Entwickler: Lernen Sie wie Sie Matomo erweitern und personalisieren können, in dem Sie %1$sPlugins oder Themes entwickeln%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Sie können den Marketplace aus dem Berichtsmenü entfernen, indem Sie das %1$sWhite Label%2$s Plugin installieren.",
         "Marketplace": "Marketplace",
         "PaidPlugins": "Premium Funktionen",
         "FeaturedPlugin": "Top-Plugin",
@@ -42,8 +45,8 @@
         "UpgradeSubscription": "Abonnement erneuern",
         "ViewSubscriptionsSummary": "%1$sIhre Plugin Abonnements anzeigen.%2$s",
         "ViewSubscriptions": "Abonnements anzeigen",
-        "ExceptionLinceseKeyIsExpired": "Der Lizenzschlüssel ist abgelaufen.",
-        "ExceptionLinceseKeyIsNotValid": "Der Lizenzschlüssel ist nicht gültig.",
+        "ExceptionLinceseKeyIsExpired": "Dieser Lizenzschlüssel ist abgelaufen.",
+        "ExceptionLinceseKeyIsNotValid": "Dieser Lizenzschlüssel ist ungültig.",
         "LicenseKeyIsValidShort": "Lizenzschlüssel ist gültig!",
         "RemoveLicenseKey": "Lizenzschlüssel entfernen",
         "InstallAllPurchasedPlugins": "Installiere alle erworbenen Plugins auf einmal",
diff --git a/app/plugins/Marketplace/lang/el.json b/app/plugins/Marketplace/lang/el.json
index 1daeb18d4..9c37fb77c 100644
--- a/app/plugins/Marketplace/lang/el.json
+++ b/app/plugins/Marketplace/lang/el.json
@@ -7,6 +7,8 @@
         "AddToCart": "Προσθήκη στο καλάθι",
         "AllowedUploadFormats": "Μπορείτε να ανεβάσετε ένα πρόσθετο ή θέμα σε μορφή .zip από αυτή τη σελίδα.",
         "Authors": "Συγγραφείς",
+        "Browse": "Περιήγηση",
+        "LatestMarketplaceUpdates": "Τελευταίες Ενημερώσεις στην Αγορά",
         "BackToMarketplace": "Πίσω στην Αγορά",
         "BrowseMarketplace": "Περιήγηση στην Αγορά",
         "ByXDevelopers": "από %s προγραμματιστές",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Είστε σίγουροι ότι επιθυμείτε να αφαιρέσετε την άδειά σας; Δε θα λαμβάνετε πλέον ενημερώσεις για οποιοδήποτε από τα αγορασμένα πρόσθετα.",
         "Developer": "Προγραμματιστής",
         "DevelopersLearnHowToDevelopPlugins": "Προγραμματιστές: Μάθετε πώς να επεκτείνετε και να προσαρμόζετε το Matomo %1$sδημιουργώντας πρόσθετα ή θέματα%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Μπορείτε να αφαιρέσετε την Αγορά από το μενού αναφορών με εγκατάσταση του πρόσθετου %1$sWhite Label%2$s.",
         "Marketplace": "Αγορά",
         "PaidPlugins": "Χαρακτηριστικά επί πληρωμή",
         "FeaturedPlugin": "Προβαλλόμενο πρόσθετο",
diff --git a/app/plugins/Marketplace/lang/en.json b/app/plugins/Marketplace/lang/en.json
index 53a38401a..a84b87924 100644
--- a/app/plugins/Marketplace/lang/en.json
+++ b/app/plugins/Marketplace/lang/en.json
@@ -7,6 +7,8 @@
     "AddToCart": "Add to cart",
     "AllowedUploadFormats": "You may upload a plugin or theme in .zip format via this page.",
     "Authors": "Authors",
+    "Browse": "Browse",
+    "LatestMarketplaceUpdates": "Latest Marketplace Updates",
     "BackToMarketplace": "Back to Marketplace",
     "BrowseMarketplace": "Browse Marketplace",
     "ByXDevelopers": "by %s developers",
@@ -17,6 +19,7 @@
     "ConfirmRemoveLicense": "Are you sure you want to remove your license key? You will no longer receive any updates for any of your purchased plugins.",
     "Developer": "Developer",
     "DevelopersLearnHowToDevelopPlugins": "Developers: Learn how you can extend and customize Matomo by %1$sdeveloping plugins or themes%2$s.",
+    "NoticeRemoveMarketplaceFromReportingMenu": "You can remove the Marketplace from the reporting menu by installing the %1$sWhite Label%2$s plugin.",
     "Marketplace": "Marketplace",
     "PaidPlugins": "Premium Features",
     "FeaturedPlugin": "Featured plugin",
diff --git a/app/plugins/Marketplace/lang/fa.json b/app/plugins/Marketplace/lang/fa.json
index 0df0e993f..8b0dc2fa8 100644
--- a/app/plugins/Marketplace/lang/fa.json
+++ b/app/plugins/Marketplace/lang/fa.json
@@ -7,6 +7,7 @@
         "AllowedUploadFormats": "شما می توانید یک پلاگین یا زیمنه (تم) را در قالب فایل زیپ در این صفحه آپلود نمایید.",
         "Authors": "نویسنده ها",
         "BackToMarketplace": "بازگشت به بازار",
+        "BrowseMarketplace": "باز کردن بازار",
         "ByXDevelopers": "توسط %s برنامه نویس",
         "Developer": "توسعه دهنده ها",
         "Marketplace": "بازار",
diff --git a/app/plugins/Marketplace/lang/fi.json b/app/plugins/Marketplace/lang/fi.json
index 0e397042d..1cfeeabe2 100644
--- a/app/plugins/Marketplace/lang/fi.json
+++ b/app/plugins/Marketplace/lang/fi.json
@@ -7,6 +7,8 @@
         "AddToCart": "Lisää koriin",
         "AllowedUploadFormats": "Tällä sivulla voit lisätä liitännäisen tai teeman .zip-formaatissa.",
         "Authors": "Tekijät",
+        "Browse": "Selaa",
+        "LatestMarketplaceUpdates": "Viimeisimmät kaupan päivitykset",
         "BackToMarketplace": "Takaisin kauppaan",
         "BrowseMarketplace": "Selaa kauppaa",
         "ByXDevelopers": "%s kehittäjältä",
diff --git a/app/plugins/Marketplace/lang/fr.json b/app/plugins/Marketplace/lang/fr.json
index eccd25636..a9f6dbc3d 100644
--- a/app/plugins/Marketplace/lang/fr.json
+++ b/app/plugins/Marketplace/lang/fr.json
@@ -7,6 +7,8 @@
         "AddToCart": "Ajoutier au panier",
         "AllowedUploadFormats": "Vous pouvez téléverser un composant additionnel ou un thème au format zip via cette page.",
         "Authors": "Auteurs",
+        "Browse": "Parcourir",
+        "LatestMarketplaceUpdates": "Dernières mises à jour du Marketplace.",
         "BackToMarketplace": "Retour au Marché",
         "BrowseMarketplace": "Parcourir le marché",
         "ByXDevelopers": "par %s développeurs",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Êtes-vous sûr(e) de vouloir supprimer votre clé de licence ? Vous ne recevrez plus aucune mise à jour des composants achetés.",
         "Developer": "Développeur",
         "DevelopersLearnHowToDevelopPlugins": "Développeurs : Apprenez comment vous pouvez étendre et personaliser Matomo en %1$sdévelopant des composants ou themes%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Vous pouvez supprimer le Marketplace depuis le menu de rapports en installant le plug-in %1$sWhite Label%2$s.",
         "Marketplace": "Marché",
         "PaidPlugins": "Fonctionnalités Premium",
         "FeaturedPlugin": "Composant mis en avant",
diff --git a/app/plugins/Marketplace/lang/it.json b/app/plugins/Marketplace/lang/it.json
index d7ac751dc..3a6da4f5c 100644
--- a/app/plugins/Marketplace/lang/it.json
+++ b/app/plugins/Marketplace/lang/it.json
@@ -7,6 +7,8 @@
         "AddToCart": "Aggiungi al carrello",
         "AllowedUploadFormats": "Tramite questa pagina puoi caricare un plugin o un tema nel formato .zip.",
         "Authors": "Autori",
+        "Browse": "Naviga",
+        "LatestMarketplaceUpdates": "Ultimi Aggiornamenti nel Marketplace",
         "BackToMarketplace": "Torna al Marketplace",
         "BrowseMarketplace": "Guarda nel Marketplace",
         "ByXDevelopers": "da %s sviluppatori",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Sei sicuro di voler rimuovere la tua chiave di licenza? Non potrai più ricevere gli aggiornamenti per nessuno dei plugin acquistati.",
         "Developer": "Sviluppatore",
         "DevelopersLearnHowToDevelopPlugins": "Per gli sviluppatori: Imparate come ampliare e personalizzare Matomo %1$ssviluppando plugin e temi%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Puoi rimuovere il Marketplace dal menu dei report installando il plug-in %1$sWhite Label%2$s.",
         "Marketplace": "Marketplace",
         "PaidPlugins": "Funzionalità Premium",
         "FeaturedPlugin": "Plugin in evidenza",
diff --git a/app/plugins/Marketplace/lang/ja.json b/app/plugins/Marketplace/lang/ja.json
index bfff25b56..3e52505f5 100644
--- a/app/plugins/Marketplace/lang/ja.json
+++ b/app/plugins/Marketplace/lang/ja.json
@@ -7,6 +7,8 @@
         "AddToCart": "カートに追加",
         "AllowedUploadFormats": "このページから ZIP 形式のプラグインやテーマをアップロードをすることができます",
         "Authors": "著者",
+        "Browse": "ブラウズ",
+        "LatestMarketplaceUpdates": "マーケットプレイスの最新情報",
         "BackToMarketplace": "マーケットプレイスへ戻る",
         "BrowseMarketplace": "ブラウズ・マーケットプレイス",
         "ByXDevelopers": "%s の開発者",
diff --git a/app/plugins/Marketplace/lang/pt-br.json b/app/plugins/Marketplace/lang/pt-br.json
index 39db5ce18..d0e208087 100644
--- a/app/plugins/Marketplace/lang/pt-br.json
+++ b/app/plugins/Marketplace/lang/pt-br.json
@@ -5,41 +5,49 @@
         "ActionActivateTheme": "Ativar tema",
         "ActionInstall": "Instalar",
         "AddToCart": "Adicionar ao carrinho",
-        "AllowedUploadFormats": "Você pode carregar um plugin ou tema em formato zip através desta página.",
+        "AllowedUploadFormats": "Você pode carregar um plugin ou tema em formato .zip através desta página.",
         "Authors": "Autores",
+        "Browse": "Navegar",
+        "LatestMarketplaceUpdates": "Atualizações mais recentes do Marketplace",
         "BackToMarketplace": "Voltar ao Marketplace",
-        "BrowseMarketplace": "Navegue no Marketplace",
+        "BrowseMarketplace": "Navegar no Marketplace",
         "ByXDevelopers": "por %s desenvolvedores",
-        "CannotInstall": "Não pode instalar",
-        "CannotUpdate": "Não pode atualizar",
-        "ClickToCompletePurchase": "Clicar para completar a compra",
-        "CurrentNumPiwikUsers": "Seu Matomo atualmente possui %1$s usuários registrados",
-        "ConfirmRemoveLicense": "Tem certeza que deseja remover sua chave de licença? Você não receberá mais atualizações para nenhum de seus plugins comprados.",
+        "CannotInstall": "Não foi possível instalar",
+        "CannotUpdate": "Não foi possível atualizar",
+        "ClickToCompletePurchase": "Clique para completar a compra.",
+        "CurrentNumPiwikUsers": "Seu Matomo atualmente possui %1$s usuários registrados.",
+        "ConfirmRemoveLicense": "Você tem certeza que deseja remover sua chave de licença? Você não receberá mais atualizações para nenhum de seus plugins comprados.",
         "Developer": "Desenvolvedor",
         "DevelopersLearnHowToDevelopPlugins": "Desenvolvedores: Saibam como estender e personalizar o Matomo %1$sdesenvolvendo plugins ou temas%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Você pode remover o Marketplace do menu de relatórios instalando o plugin %1$sWhite Label%2$s.",
         "Marketplace": "Marketplace",
-        "PaidPlugins": "Características Premium",
+        "PaidPlugins": "Funcionalidades Premium",
         "FeaturedPlugin": "Plugin destaque",
         "InstallingNewPluginViaMarketplaceOrUpload": "Você pode instalar automaticamente %1$sdo Marketplace ou %2$s carregar um %3$s %4$s no formato .zip.",
         "InstallingPlugin": "Instalando %s",
         "InstallPurchasedPlugins": "Instalar plugins comprados",
         "LastCommitTime": "(último commit %s)",
-        "LastUpdated": "Última Atualização",
+        "LastUpdated": "Última atualização",
         "License": "Licença",
         "LicenseKey": "Chave de licença",
-        "LicenseKeyActivatedSuccess": "Chave de licença ativada com sucesso",
-        "LicenseKeyDeletedSuccess": "Chave de licença removida com sucesso",
+        "LicenseKeyActivatedSuccess": "Chave de licença ativada com sucesso!",
+        "LicenseKeyDeletedSuccess": "Chave de licença excluída com sucesso.",
         "Exceeded": "Excedido",
         "LicenseMissing": "Licença ausente",
+        "LicenseMissingDeactivatedDescription": "Os seguintes plugins foram desativados porque você está usando-os sem uma licença: %1$s. %2$sPara resolver isto, atualize sua chave de licença, ou %3$s obtenha agora uma inscrição%4$s ou desative o plugin.",
+        "PluginLicenseMissingDescription": "Você não tem permissão de baixar este plugin porque não há uma licença para este plugin. Pare resolver isto, atualize sua chave de licença, obtenha uma inscrição ou desinstale o plugin.",
         "LicenseExceeded": "Licença excedida",
+        "LicenseExceededDescription": "As licenças para os seguintes plugins não estão mais válidas pois o número de usuários autorizados para a licença foi excedido: %1$s. %2$sVocê não poderá baixar atualizações para estes plugins. Para resolver isto, exclua alguns usuários, ou %3$satualize agora sua inscrição%4$s.",
+        "PluginLicenseExceededDescription": "Você não tem permissão para baixar este plugin. A licença para este plugin não está mais válida pois o número de usuários autorizados para a licença foi excedido. Para resolver isto, exclua alguns usuários, ou atualize agora sua inscrição.",
         "LicenseExpired": "Licença expirada",
-        "LicenseRenewsNextPaymentDate": "Renova no próxima vencimento",
-        "UpgradeSubscription": "Assinatura de atualização",
-        "ViewSubscriptionsSummary": "%1$sVeja suas assinaturas de plugins.%2$s",
-        "ViewSubscriptions": "Visualizar inscrições",
-        "ExceptionLinceseKeyIsExpired": "A chave de licença está expirada",
-        "ExceptionLinceseKeyIsNotValid": "A chave de licença não é válida",
-        "LicenseKeyIsValidShort": "Chave de licença é válida",
+        "LicenseExpiredDescription": "As licenças para os seguintes plugins estão expiradas: %1$s. %2$sVocê não receberá mais atualizações para estes plugins. Para resolver isto, %3$srenove agora sua inscrição%4$s, ou desative o plugin se você não o utiliza mais.",
+        "LicenseRenewsNextPaymentDate": "Renova na próxima data de pagamento",
+        "UpgradeSubscription": "Atualizar inscrição",
+        "ViewSubscriptionsSummary": "%1$sVeja suas inscrições de plugins.%2$s",
+        "ViewSubscriptions": "Ver inscrições",
+        "ExceptionLinceseKeyIsExpired": "Esta chave de licença está expirada.",
+        "ExceptionLinceseKeyIsNotValid": "Esta chave de licença não é válida.",
+        "LicenseKeyIsValidShort": "A chave de licença é válida!",
         "RemoveLicenseKey": "Remover chave de licença",
         "InstallAllPurchasedPlugins": "Instalar todos os plugins comprados de uma só vez",
         "InstallAllPurchasedPluginsAction": "Instalar e ativar %d plugins comprados",
@@ -51,9 +59,18 @@
         "NotAllowedToBrowseMarketplaceThemes": "Você pode navegar na lista de temas que podem ser instalados para personalizar a aparência da plataforma Matomo. Por favor, contate seu administrador para solicitar a instalação de qualquer um destes para você.",
         "NoPluginsFound": "Nenhum plugin encontrado",
         "NoThemesFound": "Nenhum tema encontrado",
-        "NoSubscriptionsFound": "Nenhuma inscrição foi encontrada",
+        "NoSubscriptionsFound": "Nenhuma inscrição encontrada",
         "NumDownloadsLatestVersion": "Última versão: %s Downloads",
         "OverviewPluginSubscriptions": "Visão geral de suas inscrições de plugins",
+        "OverviewPluginSubscriptionsMissingLicense": "Você não possui um conjunto de chaves de licença. Se você comprou uma inscrição de plugin, vá ao %1$sMarketplace%2$s e digite sua chave de licença.",
+        "OverviewPluginSubscriptionsAllDetails": "Para ver todos os detalhes, ou para alterar uma inscrição, faça login em sua conta.",
+        "OverviewPluginSubscriptionsMissingInfo": "Pode ser possível que uma inscrição esteja faltando, por exemplo se um pagamento ainda não foi completado. Neste caso tente novamente em algumas horas, ou entre em contato com o time Matomo.",
+        "NoValidSubscriptionNoUpdates": "Quando uma inscrição estiver expirada você não receberá mais nenhuma atualização para este plugin.",
+        "PluginSubscriptionsList": "Esta é uma lista de inscrições associadas à sua chave de licença.",
+        "PaidPluginsNoLicenseKeyIntro": "Se você comprou um %1$splugin premium pago%2$s, por favor insira abaixo a chave de licença recebida.",
+        "PaidPluginsWithLicenseKeyIntro": "Uma chave de licença válida foi configurada. Por questões de segurança nós não exibimos aqui a chave de licença. Se você perdeu sua chave de licença, por favor entre em contato com o time Matomo.",
+        "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "Caso você tenha comprado um %1$splugin premium pago%2$s no Marketplace, por favor solicite a um usuário com acesso de Super Usuário que adicione a chave de licença.",
+        "PluginDescription": "Estenda e expanda a funcionalidade do Matomo através do Marketplace baixando plugins e temas.",
         "PluginKeywords": "Palavras-Chave",
         "PluginUpdateAvailable": "Você está usando a versão %1$s e uma nova versão %2$s está disponível.",
         "PluginVersionInfo": "%1$s de %2$s",
@@ -64,6 +81,7 @@
         "ShownPriceIsExclTax": "O preço mostrado é excl. tax.",
         "Screenshots": "Screenshots",
         "SortByNewest": "Mais recente",
+        "SortByAlpha": "Por ordem alfabética",
         "SortByLastUpdated": "Última atualização",
         "SortByPopular": "Popular",
         "StepDownloadingPluginFromMarketplace": "Transferindo plugin do Marketplace",
@@ -80,15 +98,19 @@
         "SubscriptionStartDate": "Data de início",
         "SubscriptionEndDate": "Data final",
         "SubscriptionNextPaymentDate": "Próximo vencimento",
-        "SubscriptionInvalid": "Esta assinatura é inválida ou expirou",
-        "SubscriptionExpiresSoon": "Esta assinatura expira em breve",
+        "SubscriptionInvalid": "Esta inscrição é inválida ou expirou",
+        "SubscriptionExpiresSoon": "Esta inscrição expira em breve",
         "Support": "Suporte",
         "TeaserExtendPiwikByUpload": "Estenda o Matomo carregando um arquivo ZIP",
+        "LicenseExceededPossibleCause": "A licença está excedida. Possivelmente há mais usuários nesta instalação do Matomo do que a inscrição permite.",
         "Updated": "Atualizado(a)",
         "UpdatingPlugin": "Atualizando %1$s",
         "UploadZipFile": "Carregar arquivo ZIP",
+        "PluginUploadDisabled": "O carregamento de plugins está desabilitado no arquivo de configuração. Para habilitar esta funcionalidade por favor atualize sua configuração ou entre em contato com o seu administrador.",
         "LicenseKeyExpiresSoon": "Sua chave de licença expira em breve, entre em contato %1$s.",
         "LicenseKeyIsExpired": "Sua chave de licença está expirada, entre em contato %1$s.",
+        "MultiServerEnvironmentWarning": "Você não pode instalar ou atualizar o plugin diretamente pois você está usando o Matomo em múltiplos servidores. O plugin seria instalado apenas em um servidor. Ao invés disso, baixe o plugin e implante-o manualmente em todos os servidores.",
+        "AutoUpdateDisabledWarning": "Você não pode instalar ou atualizar o plugin diretamente pois as atualizações automáticas estão desabilitadas na configuração. Para habilitar atualizações automáticas defina %1$s em %2$s.",
         "ViewRepositoryChangelog": "Ver as mudanças"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Marketplace/lang/pt.json b/app/plugins/Marketplace/lang/pt.json
index 661bbb16a..9a558ab96 100644
--- a/app/plugins/Marketplace/lang/pt.json
+++ b/app/plugins/Marketplace/lang/pt.json
@@ -7,6 +7,8 @@
         "AddToCart": "Adicionar ao carrinho",
         "AllowedUploadFormats": "Pode enviar uma extensão ou um tema no formato .zip através desta página.",
         "Authors": "Autores",
+        "Browse": "Explorar",
+        "LatestMarketplaceUpdates": "Últimas atualizações na Loja",
         "BackToMarketplace": "Voltar à loja",
         "BrowseMarketplace": "Explorar a loja",
         "ByXDevelopers": "por %s programadores",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Tem a certeza que pretende remover a sua chave da licença? Não irá receber mais quaisquer atualizações para as extensões adquiridas.",
         "Developer": "Programador",
         "DevelopersLearnHowToDevelopPlugins": "Programadores: aprendam a estender e a personalizar o Matomo %1$sdesenvolvendo extensões ou temas%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Pode remover a Loja do menu de relatórios instalando a extensão %1$sWhite Label%2$s.",
         "Marketplace": "Loja",
         "PaidPlugins": "Funcionalidades exclusivas",
         "FeaturedPlugin": "Extensão destacada",
@@ -65,6 +68,7 @@
         "NoValidSubscriptionNoUpdates": "Depois de uma subscrição ter expirado, não irá mais receber quaisquer atualizações para esta extensão.",
         "PluginSubscriptionsList": "Esta é uma lista de subscrições associadas à sua chave da licença.",
         "PaidPluginsNoLicenseKeyIntro": "Se adquiriu uma %1$sextensão exclusiva paga%2$s, por favor insira a chave da licença recebida abaixo.",
+        "PaidPluginsWithLicenseKeyIntro": "Foi definida uma chave de licença válida. Por razões de segurança, não podemos mostrar a chave de licença aqui. No caso de ter perdido a sua chave de licença, por favor, entre em contacto com a equipa do Matomo.",
         "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "No caso de ter adquirido uma %1$sextensão exclusiva paga%2$s na loja, por favor peça a um utilizador com acesso de super-utilizador para adicionar a chave da licença.",
         "PluginDescription": "Estenda ou expanda a funcionalidade do Matomo através da loja, transferindo extensões e temas.",
         "PluginKeywords": "Palavras-chave",
@@ -105,6 +109,7 @@
         "PluginUploadDisabled": "O envio de extensões está desativo no ficheiro de configuração. Para ativar esta funcionalidade, por favor, atualize a sua configuração ou contacte o seu administrador",
         "LicenseKeyExpiresSoon": "A sua chave de licença expira em breve, por favor, contacte %1$s.",
         "LicenseKeyIsExpired": "A sua chave de licença expirou, por favor, contacte %1$s.",
+        "MultiServerEnvironmentWarning": "Não é possível instalar ou atualizar a extensão diretamente, dado que está a utilizar o Matomo em múltiplos servidores. A extensão seria somente instalada num só servidor. Em vez disso, transfira a extensão e proceda à instalação da mesma manualmente em todos os seus servidores.",
         "AutoUpdateDisabledWarning": "Não pode instalar ou atualizar a extensão diretamente dados que as atualizações automáticas estão desativadas na configuração. Para ativar as atualizações automáticas, defina %1$s em %2$s.",
         "ViewRepositoryChangelog": "Ver as alterações"
     }
diff --git a/app/plugins/Marketplace/lang/ru.json b/app/plugins/Marketplace/lang/ru.json
index eb866cda1..c9049e2f9 100644
--- a/app/plugins/Marketplace/lang/ru.json
+++ b/app/plugins/Marketplace/lang/ru.json
@@ -7,6 +7,8 @@
         "AddToCart": "Добавить в корзину",
         "AllowedUploadFormats": "Вы можете загрузить плагин или тему в формате .zip на этой странице.",
         "Authors": "Авторы",
+        "Browse": "Просмотреть",
+        "LatestMarketplaceUpdates": "Последние обновления Marketplace",
         "BackToMarketplace": "Вернуться к Marketplace",
         "BrowseMarketplace": "Обзор Marketplace",
         "ByXDevelopers": "разработчиками %s",
@@ -60,12 +62,24 @@
         "NumDownloadsLatestVersion": "Последняя версия скачена: %s раз",
         "OverviewPluginSubscriptions": "Обзор подписок ваших плагинов",
         "OverviewPluginSubscriptionsMissingLicense": "У вас не установлен лицензионный ключ. Если вы приобрели подписку на плагин, перейдите в %1$sMarketplace%2$s и введите свой лицензионный ключ.",
+        "OverviewPluginSubscriptionsAllDetails": "Чтобы увидеть все детали или изменить подписку, войдите в свою учетную запись.",
+        "OverviewPluginSubscriptionsMissingInfo": "Возможно, подписка отсутствует, например, если платеж еще не завершен. В таком случае повторите попытку через несколько часов или свяжитесь с командой Matomo.",
+        "NoValidSubscriptionNoUpdates": "После истечения срока подписки вы больше не будете получать обновления для этого плагина.",
+        "PluginSubscriptionsList": "Это список подписок, связанных с вашим лицензионным ключом.",
+        "PaidPluginsNoLicenseKeyIntro": "Если вы приобрели %1$s платный подключаемый модуль %2$s премиум-класса, вставьте полученный лицензионный ключ ниже.",
+        "PaidPluginsWithLicenseKeyIntro": "Действительный лицензионный ключ был установлен. В целях безопасности мы не показываем здесь лицензионный ключ. Если вы потеряли свой лицензионный ключ, пожалуйста, свяжитесь с командой Matomo.",
         "PluginKeywords": "Ключевые слова",
         "PluginUpdateAvailable": "Вы используете версию %1$s последняя доступная %2$s",
         "PluginVersionInfo": "%1$s – %2$s",
         "PluginWebsite": "Сайт плагина",
+        "PriceExclTax": "%1$s%2$s без налога",
+        "PriceFromPerPeriod": "С %1$s\/%2$s\/",
+        "Reviews": "Отзывы",
+        "ShownPriceIsExclTax": "Указанная цена не включает налог.",
         "Screenshots": "Скриншоты",
         "SortByNewest": "Новейшие",
+        "SortByAlpha": "В алфавитном порядке",
+        "SortByLastUpdated": "Последнее обновление",
         "SortByPopular": "Популярные",
         "StepDownloadingPluginFromMarketplace": "Скачать плагин из Marketplace",
         "StepDownloadingThemeFromMarketplace": "Скачать тему из Marketplace",
@@ -78,11 +92,20 @@
         "StepReplaceExistingTheme": "Замена существующей темы",
         "StepThemeSuccessfullyUpdated": "Вы успешно обновили тему %1$s %2$s.",
         "SubscriptionType": "Тип",
+        "SubscriptionStartDate": "Дата начала",
+        "SubscriptionEndDate": "Дата окончания",
+        "SubscriptionNextPaymentDate": "Дата следующего платежа",
+        "SubscriptionInvalid": "Эта подписка недействительна или просрочена",
+        "SubscriptionExpiresSoon": "Срок действия этой подписки скоро истекает",
         "Support": "Поддержка",
         "TeaserExtendPiwikByUpload": "Улучшение Matomo закачкой ZIP файла",
+        "LicenseExceededPossibleCause": "Лицензия превышена. Возможно, в этой установке Matomo больше пользователей, чем разрешает подписка.",
         "Updated": "Обновлено",
         "UpdatingPlugin": "Обновление %1$s",
         "UploadZipFile": "Закачать ZIP файл",
+        "PluginUploadDisabled": "Загрузка плагина отключена в конфигурационном файле. Чтобы включить эту функцию, обновите конфигурацию или обратитесь к администратору.",
+        "LicenseKeyExpiresSoon": "Срок действия вашего лицензионного ключа скоро истекает, пожалуйста, свяжитесь с %1$s.",
+        "LicenseKeyIsExpired": "Срок действия вашего лицензионного ключа истек, пожалуйста, свяжитесь с %1$s.",
         "ViewRepositoryChangelog": "Посмотреть изменения"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Marketplace/lang/sq.json b/app/plugins/Marketplace/lang/sq.json
index 8b47b0625..f4f77cf2c 100644
--- a/app/plugins/Marketplace/lang/sq.json
+++ b/app/plugins/Marketplace/lang/sq.json
@@ -7,6 +7,8 @@
         "AddToCart": "Shtoje në shportë",
         "AllowedUploadFormats": "Një shtojcë apo një temë mund ta ngarkoni në formatin .zip përmes kësaj faqeje.",
         "Authors": "Autorë",
+        "Browse": "Shfletoni",
+        "LatestMarketplaceUpdates": "Përditësimet Më të Reja Nga Marketplace-i",
         "BackToMarketplace": "Mbrapsht te Marketplace",
         "BrowseMarketplace": "Shfletoni në Marketplace",
         "ByXDevelopers": "nga zhvilluesit %s",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Jeni i sigurt se doni të hiqe kyçi juaj i licencës? Nuk do të merrni më përditësime për cilëndo nga shtojcat që keni blerë.",
         "Developer": "Zhvillues",
         "DevelopersLearnHowToDevelopPlugins": "Zhvillues: Mësoni se si ta thelloni dhe përshtatni Matomo-n përmes %1$shartimit të shtojcave ose temave%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "Marketplace-in mund ta hiqni nga menuja e raporteve duke instaluar shtojcën %1$sWhite Label%2$s.",
         "Marketplace": "Marketplace",
         "PaidPlugins": "Veçori Me Pagesë",
         "FeaturedPlugin": "Shtojcë e zgjedhur",
diff --git a/app/plugins/Marketplace/lang/sv.json b/app/plugins/Marketplace/lang/sv.json
index 4baebfe11..b29c81ad7 100644
--- a/app/plugins/Marketplace/lang/sv.json
+++ b/app/plugins/Marketplace/lang/sv.json
@@ -77,6 +77,7 @@
         "ShownPriceIsExclTax": "Priserna är ex. moms.",
         "Screenshots": "Skärmdumpar",
         "SortByNewest": "Nyast",
+        "SortByAlpha": "Alfabetiskt",
         "SortByLastUpdated": "Senast uppdaterad",
         "SortByPopular": "Populära",
         "StepDownloadingPluginFromMarketplace": "Ladda ner plugin från Butiken.",
diff --git a/app/plugins/Marketplace/lang/tr.json b/app/plugins/Marketplace/lang/tr.json
index af30cf924..b631ddad5 100644
--- a/app/plugins/Marketplace/lang/tr.json
+++ b/app/plugins/Marketplace/lang/tr.json
@@ -7,6 +7,8 @@
         "AddToCart": "Sepete ekle",
         "AllowedUploadFormats": "Buradan .zip biçiminde bir uygulama eki ya da tema dosyası yükleyebilirsiniz.",
         "Authors": "Geliştiriciler",
+        "Browse": "Gözat",
+        "LatestMarketplaceUpdates": "Son Mağaza Güncellemeleri",
         "BackToMarketplace": "Mağazaya geri dön",
         "BrowseMarketplace": "Mağazaya Gözat",
         "ByXDevelopers": "%s geliştirici tarafından",
@@ -17,6 +19,7 @@
         "ConfirmRemoveLicense": "Lisans anahtarınızı kaldırmak istediğinizden emin misiniz? Anahtarı kaldırdığınızda satın aldığınız uygulama ekleri için güncellemeleri alamazsınız.",
         "Developer": "Geliştirici",
         "DevelopersLearnHowToDevelopPlugins": "Geliştiriciler: Matomo uygulamasını geliştirmek ve gereksinimlerinize göre özelleştirmek için %1$suygulama eki ya da tema geliştirmeyi öğrenin%2$s.",
+        "NoticeRemoveMarketplaceFromReportingMenu": "%1$sWhite Label%2$s uygulama ekini kurarak rapor menüsünden Mağaza seçeneğini kaldırabilirsiniz.",
         "Marketplace": "Mağaza",
         "PaidPlugins": "Premium Özellikler",
         "FeaturedPlugin": "Öne çıkarılmış uygulama eki",
diff --git a/app/plugins/Marketplace/templates/overview.twig b/app/plugins/Marketplace/templates/overview.twig
index 55091e9e9..1eccd5d40 100644
--- a/app/plugins/Marketplace/templates/overview.twig
+++ b/app/plugins/Marketplace/templates/overview.twig
@@ -1,4 +1,4 @@
-{% extends "admin.twig" %}
+{% extends inReportingMenu ? "empty.twig" : "admin.twig" %}
 {% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
 
 {% set title %}{{ 'Marketplace_Marketplace'|translate }}{% endset %}
@@ -10,6 +10,7 @@
         <div piwik-content-intro>
             <h2 piwik-enriched-headline feature-name="{{ 'CorePluginsAdmin_Marketplace'|translate }}"
             >{{ title|e('html_attr') }}</h2>
+
             <p>
                 {% if not isSuperUser %}
                     {% if showThemes %}
@@ -24,6 +25,9 @@
                     {{ 'CorePluginsAdmin_PluginsExtendPiwik'|translate }}
                     {{ 'Marketplace_InstallingNewPluginViaMarketplaceOrUpload'|translate(('General_Plugins'|translate), '<a href="#" class="uploadPlugin">', ('General_Plugin'|translate), '</a>')|raw }}
                 {% endif %}
+                {% if isSuperUser and inReportingMenu %}
+                    {{ 'Marketplace_NoticeRemoveMarketplaceFromReportingMenu'|translate('<a href="#" piwik-plugin-name="WhiteLabel">', '</a>')|raw }}
+                {% endif %}
             </p>
 
             {% include '@Marketplace/licenseform.twig' %}
diff --git a/app/plugins/MobileAppMeasurable/config/config.php b/app/plugins/MobileAppMeasurable/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/MobileAppMeasurable/config/config.php
+++ b/app/plugins/MobileAppMeasurable/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/MobileAppMeasurable/config/tracker.php b/app/plugins/MobileAppMeasurable/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/MobileAppMeasurable/config/tracker.php
+++ b/app/plugins/MobileAppMeasurable/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/MobileAppMeasurable/lang/de.json b/app/plugins/MobileAppMeasurable/lang/de.json
index 58507abd7..f4ee887ac 100644
--- a/app/plugins/MobileAppMeasurable/lang/de.json
+++ b/app/plugins/MobileAppMeasurable/lang/de.json
@@ -2,6 +2,6 @@
     "MobileAppMeasurable": {
         "MobileApp": "Mobile App",
         "MobileApps": "Mobile Apps",
-        "MobileAppDescription": "Eine native mobile App für iOS, Android oder ein anderes mobiles Betriebssystem."
+        "MobileAppDescription": "Eine native Mobile App für iOS, Android oder ein anderes mobiles Betriebssystem."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/MobileAppMeasurable/lang/pt-br.json b/app/plugins/MobileAppMeasurable/lang/pt-br.json
index 606ad5206..7ea0b9aca 100644
--- a/app/plugins/MobileAppMeasurable/lang/pt-br.json
+++ b/app/plugins/MobileAppMeasurable/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "MobileAppMeasurable": {
-        "MobileApp": "Aplicativo Móvel",
-        "MobileApps": "Aplicativos Móveis",
+        "MobileApp": "Aplicativo móvel",
+        "MobileApps": "Aplicativos móveis",
         "MobileAppDescription": "Um aplicativo móvel nativo para iOS, Android ou qualquer outro sistema operacional móvel."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/MobileAppMeasurable/lang/zh-cn.json b/app/plugins/MobileAppMeasurable/lang/zh-cn.json
new file mode 100644
index 000000000..7dae2df53
--- /dev/null
+++ b/app/plugins/MobileAppMeasurable/lang/zh-cn.json
@@ -0,0 +1,7 @@
+{
+    "MobileAppMeasurable": {
+        "MobileApp": "移动应用程序",
+        "MobileApps": "移动应用",
+        "MobileAppDescription": "iOS、Android或任何其他移动操作系统的本地移动应用程序。"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/MobileMessaging/config/config.php b/app/plugins/MobileMessaging/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/MobileMessaging/config/config.php
+++ b/app/plugins/MobileMessaging/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/MobileMessaging/config/tracker.php b/app/plugins/MobileMessaging/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/MobileMessaging/config/tracker.php
+++ b/app/plugins/MobileMessaging/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/MobileMessaging/lang/pt-br.json b/app/plugins/MobileMessaging/lang/pt-br.json
index 9965fc9e2..673bc369e 100644
--- a/app/plugins/MobileMessaging/lang/pt-br.json
+++ b/app/plugins/MobileMessaging/lang/pt-br.json
@@ -1,48 +1,48 @@
 {
     "MobileMessaging": {
-        "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",
+        "Exception_UnknownProvider": "Nome do provedor '%1$s' desconhecido. No lugar, tente um dos seguintes: %2$s.",
+        "MobileReport_AdditionalPhoneNumbers": "Você pode adicionar mais números de telefone acessando",
+        "MobileReport_MobileMessagingSettingsLink": "a página de configurações de mensagens móveis",
         "MobileReport_NoPhoneNumbers": "Por favor ative pelo menos um número de telefone acessando",
-        "MultiSites_Must_Be_Activated": "Para gerar textos SMS de estatísticas do seu site, por favor, ative o plugin multisites no Matomo.",
+        "MultiSites_Must_Be_Activated": "Para gerar textos SMS de estatísticas do seu site, por favor ative o plugin MultiSites no Matomo.",
         "PhoneNumbers": "Números de telefone",
-        "PluginDescription": "Criar e baixar relatórios SMS personalizados e tê-los enviado para o seu celular diária, semanal ou mensalmente.",
-        "Settings_APIKey": "API Key",
+        "PluginDescription": "Crie e baixe relatórios SMS personalizados, e tenha-os enviados para o seu celular diária, semanal ou mensalmente.",
+        "Settings_APIKey": "Chave da API",
         "Settings_CountryCode": "Código do país",
         "Settings_SelectCountry": "Selecionar país",
-        "Settings_CredentialNotProvided": "Antes que você possa criar e gerenciar números de telefone, ligue Matomo na sua Conta SMS acima.",
-        "Settings_CredentialNotProvidedByAdmin": "Antes que você possa criar e gerenciar números de telefone, por favor, solicite ao seu administrador para conectar o Matomo a uma conta SMS.",
+        "Settings_CredentialNotProvided": "Antes que você possa criar e gerenciar números de telefone, por favor conecte o Matomo à sua conta SMS acima.",
+        "Settings_CredentialNotProvidedByAdmin": "Antes que você possa criar e gerenciar números de telefone, por favor solicite ao seu administrador para conectar o Matomo a uma conta SMS.",
         "Settings_CredentialProvided": "Sua conta API SMS %s está configurada corretamente!",
-        "Settings_CredentialInvalid": "Sua conta SMS API %1$s foi configurada, mas um erro ocorreu ao tentar receber os créditos disponíveis.",
+        "Settings_CredentialInvalid": "Sua conta API SMS %1$s está configurada, mas um erro ocorreu ao tentar receber os créditos disponíveis.",
         "Settings_DeleteAccountConfirm": "Tem certeza de que deseja apagar esta conta SMS?",
         "Settings_DelegatedSmsProviderOnlyAppliesToYou": "O provedor de SMS configurado será usado somente por você e não pelos outros usuários.",
-        "Settings_DelegatedPhoneNumbersOnlyUsedByYou": "Os números de telefone configurados serão visualizados e usados somente por você e não pelos outros usuários.",
+        "Settings_DelegatedPhoneNumbersOnlyUsedByYou": "Os números de telefone configurados somente podem ser visualizados e usados por você e não pelos outros usuários.",
         "Settings_EnterActivationCode": "Informe o código de ativação",
-        "Settings_InvalidActivationCode": "O Código informado não é válido, por favor tente novamente.",
-        "Settings_LetUsersManageAPICredential": "Permite aos usuários gerenciar seus próprios provedores SMS API",
+        "Settings_InvalidActivationCode": "O código informado não é válido, por favor tente novamente.",
+        "Settings_LetUsersManageAPICredential": "Permite aos usuários gerenciarem seu próprio provedor SMS",
         "Settings_LetUsersManageAPICredential_No_Help": "Todos os usuários são capazes de receber relatórios de SMS e utilizarão créditos da sua conta.",
-        "Settings_LetUsersManageAPICredential_Yes_Help": "Cada usuário será capaz de configurar sua própria conta SMS API e não utilizar o seu crédito.",
+        "Settings_LetUsersManageAPICredential_Yes_Help": "Cada usuário será capaz de configurar sua própria conta API SMS e não utilizará o seu crédito.",
         "Settings_ManagePhoneNumbers": "Gerenciar números de telefone",
-        "Settings_PhoneActivated": "Telefone validado! Agora você pode receber SMS com suas estatísticas.",
+        "Settings_PhoneActivated": "Número de telefone validado! Agora você pode receber SMS com suas estatísticas.",
         "Settings_PhoneNumber": "Número de telefone",
         "Settings_PhoneNumbers_Add": "Adicionar novo número de telefone",
-        "Settings_PhoneNumbers_CountryCode_Help": "Se você não souber o código de país do seu telefone, procure aqui.",
-        "Settings_PhoneNumbers_Help": "Antes de receber relatórios SMS (mensagens de texto) em um telefone o número do telefone deve ser informado abaixo.",
+        "Settings_PhoneNumbers_CountryCode_Help": "Se você não souber o código de país do seu telefone, procure seu país aqui.",
+        "Settings_PhoneNumbers_Help": "Antes de receber relatórios SMS (mensagens de texto) em um telefone, o número do telefone deve ser informado abaixo.",
         "Settings_PhoneNumbers_HelpAdd": "Quando você clicar em \"Adicionar\", um SMS contendo um código será enviado para o telefone. O usuário que recebe o código deve então fazer o login no Matomo, clicar em Configurações e, em seguida, clicar em Mensagens Móveis. Depois de inserir o código, o usuário poderá receber relatórios de texto em seu telefone.",
-        "Settings_PleaseSignUp": "Para criar relatórios de SMS e receber mensagens curtas de texto com as suas estatísticas de website em seu telefone móvel, inscreva-se com a API SMS e insira as informações abaixo.",
+        "Settings_PleaseSignUp": "Para criar relatórios de SMS e receber mensagens curtas de texto com as estatísticas do seu site em seu telefone móvel, inscreva-se com a API SMS e insira suas informações abaixo.",
         "Settings_SMSAPIAccount": "Gerenciar conta de API SMS",
         "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 inicial. Ex.: %s",
-        "Settings_UpdateOrDeleteAccount": "Você também pode %1$satualizar%2$s ou %3$sapagar%4$s esta conta.",
+        "Settings_UpdateOrDeleteAccount": "Você também pode %1$satualizar%2$s ou %3$sexcluir%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",
+        "Settings_VerificationCodeJustSent": "Acabamos de enviar um SMS para este número com um código: por favor digite acima o código e clique em \"Validar\".",
+        "SettingsMenu": "Mensagens móveis",
         "SMS_Content_Too_Long": "[muito longo]",
         "Available_Credits": "Créditos disponíveis: %1$s",
-        "TopLinkTooltip": "Obter relatórios analíticos da Web em seu e-mail ou telefone móvel!",
+        "TopLinkTooltip": "Receba relatórios de web analytics em seu email ou telefone móvel.",
         "TopMenu": "Relatórios de e-mail e SMS",
         "UserKey": "Chave do usuário",
-        "VerificationText": "O código é %1$s. Para validar o seu número de telefone e receber relatórios Matomo de SMS, copie este código no formulário disponível no Matomo em > %2$s > %3$s."
+        "VerificationText": "O código é %1$s. Para validar o seu número de telefone e receber relatórios Matomo de SMS, por favor copie este código no formulário disponível em Matomo > %2$s > %3$s."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/MobileMessaging/lang/pt.json b/app/plugins/MobileMessaging/lang/pt.json
index de9033f45..18a1c65a5 100644
--- a/app/plugins/MobileMessaging/lang/pt.json
+++ b/app/plugins/MobileMessaging/lang/pt.json
@@ -21,12 +21,14 @@
         "Settings_InvalidActivationCode": "O código introduzido não é válido, por favor, tente novamente.",
         "Settings_LetUsersManageAPICredential": "Permitir que os utilizadores façam a gestão do seu próprio fornecedor de SMS",
         "Settings_LetUsersManageAPICredential_No_Help": "Todos os utilizadores poderão receber relatórios por SMS e irão utilizar os créditos da sua conta.",
+        "Settings_LetUsersManageAPICredential_Yes_Help": "Cada utilizador poderá configurar a sua própria conta de API SMS e não utilizarão o seu crédito.",
         "Settings_ManagePhoneNumbers": "Gerir números de telefone",
         "Settings_PhoneActivated": "Número de telefone validado! Já pode receber SMS com as suas estatísticas.",
         "Settings_PhoneNumber": "Número de telefone",
         "Settings_PhoneNumbers_Add": "Adicionar um novo número de telefone",
         "Settings_PhoneNumbers_CountryCode_Help": "Se não sabe o código telefónico do país, procure pelo seu país aqui.",
         "Settings_PhoneNumbers_Help": "Antes de receber relatórios por SMS (mensagens de texto) num telefone, o número de telefone deve ser introduzido abaixo.",
+        "Settings_PhoneNumbers_HelpAdd": "Ao clicar em \"Adicionar\", uma mensagem SMS contendo um código será enviada para o telemóvel. O utilizador que a receba deverá então autenticar-se no Matomo, clicar em \"Definições\" e depois em \"Mensagens móveis\". Após a introdução do código, o utilizador poderá receber relatórios de texto no respetivo telemóvel.",
         "Settings_PleaseSignUp": "Para criar relatórios SMS e receber pequenas mensagens de texto com as estatísticas dos seus sites no seu telemóvel, por favor, subscreva à API SMS e introduza a sua informação em baixo.",
         "Settings_SMSAPIAccount": "Gerir conta da API SMS",
         "Settings_SMSProvider": "Fornecedor de SMS",
@@ -34,6 +36,7 @@
         "Settings_SuspiciousPhoneNumber": "Se não recebe a mensagem de texto, pode tentar sem o zero no início, por exemplo %s",
         "Settings_UpdateOrDeleteAccount": "Pode também %1$satualizar%2$s ou %3$seliminar%4$s esta conta.",
         "Settings_ValidatePhoneNumber": "Validar",
+        "Settings_VerificationCodeJustSent": "Acabámos de enviar uma mensagem SMS para este número contendo um código: por favor introduza o código em cima e clique em \"Validar\".",
         "SettingsMenu": "Mensagens móveis",
         "SMS_Content_Too_Long": "[demasiado comprido]",
         "Available_Credits": "Créditos disponíveis: %1$s",
diff --git a/app/plugins/Monolog/Formatter/LineMessageFormatter.php b/app/plugins/Monolog/Formatter/LineMessageFormatter.php
index 306838d34..5a64002c9 100644
--- a/app/plugins/Monolog/Formatter/LineMessageFormatter.php
+++ b/app/plugins/Monolog/Formatter/LineMessageFormatter.php
@@ -61,16 +61,36 @@ public function format(array $record)
 
     private function formatMessage($class, $message, $date, $record)
     {
+        $trace = isset($record['context']['trace']) ? self::formatTrace($record['context']['trace']) : '';
         $message = str_replace(
-            array('%tag%', '%message%', '%datetime%', '%level%'),
-            array($class, $message, $date, $record['level_name']),
+            array('%tag%', '%message%', '%datetime%', '%level%', '%trace%'),
+            array($class, $message, $date, $record['level_name'], $trace),
             $this->logMessageFormat
         );
 
-        $message .= "\n";
+        $message = trim($message) . "\n";
         return $message;
     }
 
+    private static function formatTrace(array $trace, $numLevels = 10)
+    {
+        $strTrace = '';
+        for ($i = 0; $i < $numLevels; $i++) {
+	        if (!isset($trace[$i])) {
+		        continue;
+	        }
+
+            $level = $trace[$i];
+            if (isset($level['file'], $level['line'])) {
+                $levelTrace = '#' . $i . (str_replace(PIWIK_DOCUMENT_ROOT, '', $level['file'])) . '(' . $level['line'] . ')';
+            } else {
+                $levelTrace = '[internal function]: ' . $level['class'] . $level['type'] . $level['function'] . '()';
+            }
+            $strTrace .= $levelTrace . ",";
+        }
+        return trim($strTrace, ",");
+    }
+
     public function formatBatch(array $records)
     {
         foreach ($records as $key => $record) {
diff --git a/app/plugins/Monolog/Handler/WebNotificationHandler.php b/app/plugins/Monolog/Handler/WebNotificationHandler.php
index a71b0ff28..c56e2d54e 100644
--- a/app/plugins/Monolog/Handler/WebNotificationHandler.php
+++ b/app/plugins/Monolog/Handler/WebNotificationHandler.php
@@ -47,6 +47,7 @@ protected function write(array $record)
         }
 
         $message = $record['level_name'] . ': ' . htmlentities($record['message'], ENT_COMPAT | ENT_HTML401, 'UTF-8');
+        $message .= $this->getLiteDebuggingInfo();
 
         $notification = new Notification($message);
         $notification->context = $context;
@@ -58,4 +59,30 @@ protected function write(array $record)
             // Silently ignore the error.
         }
     }
+
+    private function getLiteDebuggingInfo()
+    {
+        $info = [
+            'Module' => Common::getRequestVar('module', false),
+            'Action' => Common::getRequestVar('action', false),
+            'Method' => Common::getRequestVar('method', false),
+            'Trigger' => Common::getRequestVar('trigger', false),
+            'In CLI mode' => Common::isPhpCliMode() ? 'true' : 'false',
+        ];
+
+        $parts = [];
+        foreach ($info as $title => $value) {
+            if (empty($value)) {
+                continue;
+            }
+
+            $parts[] = "$title: $value";
+        }
+
+        if (empty($parts)) {
+            return "";
+        }
+
+        return "\n(" . implode(', ', $parts) . ")";
+    }
 }
diff --git a/app/plugins/Monolog/Processor/ExceptionToTextProcessor.php b/app/plugins/Monolog/Processor/ExceptionToTextProcessor.php
index 98958fa82..ab828dc82 100644
--- a/app/plugins/Monolog/Processor/ExceptionToTextProcessor.php
+++ b/app/plugins/Monolog/Processor/ExceptionToTextProcessor.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Monolog\Processor;
 
 use Piwik\ErrorHandler;
+use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Log;
 
 /**
@@ -25,6 +26,10 @@ public function __invoke(array $record)
         /** @var \Exception $exception */
         $exception = $record['context']['exception'];
 
+        if ($exception instanceof InvalidRequestParameterException) {
+            return $record;
+        }
+
         $exceptionStr = sprintf(
             "%s(%d): %s\n%s",
             $exception instanceof \Exception ? $exception->getFile() : $exception['file'],
diff --git a/app/plugins/Monolog/config/config.php b/app/plugins/Monolog/config/config.php
index ff60f7c5b..b81fb089c 100644
--- a/app/plugins/Monolog/config/config.php
+++ b/app/plugins/Monolog/config/config.php
@@ -40,7 +40,10 @@
 
         $writers = [];
         foreach ($writerNames as $writerName) {
-            if ($writerName === 'screen' && \Piwik\Common::isPhpCliMode()) {
+            if ($writerName === 'screen'
+                && \Piwik\Common::isPhpCliMode()
+                && !defined('PIWIK_TEST_MODE')
+            ) {
                 continue; // screen writer is only valid for web requests
             }
 
@@ -94,16 +97,13 @@
         ->constructor(DI\get('log.file.filename'), DI\get('log.level.file'))
         ->method('setFormatter', DI\get('log.lineMessageFormatter.file')),
 
-    'log.lineMessageFormatter.file' => DI\object('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')
-        ->constructorParameter('allowInlineLineBreaks', false),
-
     'Piwik\Plugins\Monolog\Handler\DatabaseHandler' => DI\object()
         ->constructor(DI\get('log.level.database'))
-        ->method('setFormatter', DI\get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')),
+        ->method('setFormatter', DI\get('log.lineMessageFormatter')),
 
     'Piwik\Plugins\Monolog\Handler\WebNotificationHandler' => DI\object()
         ->constructor(DI\get('log.level.screen'))
-        ->method('setFormatter', DI\get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')),
+        ->method('setFormatter', DI\get('log.lineMessageFormatter')),
 
     'log.level' => DI\factory(function (ContainerInterface $c) {
         if ($c->has('ini.log.log_level')) {
@@ -112,6 +112,7 @@
                 return Log::getMonologLevel(constant('Piwik\Log::'.strtoupper($level)));
             }
         }
+
         return Logger::WARNING;
     }),
 
@@ -171,16 +172,29 @@
         return $logPath;
     }),
 
-    'Piwik\Plugins\Monolog\Formatter\LineMessageFormatter' => DI\object()
-        ->constructor(DI\get('log.format')),
+    'Piwik\Plugins\Monolog\Formatter\LineMessageFormatter' => DI\object('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')
+                                                                ->constructor(DI\get('log.short.format')),
+    'log.lineMessageFormatter' => DI\object('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')
+        ->constructor(DI\get('log.short.format')),
+
+    'log.lineMessageFormatter.file' => DI\object('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')
+        ->constructor(DI\get('log.trace.format'))
+        ->constructorParameter('allowInlineLineBreaks', false),
 
-    'log.format' => DI\factory(function (ContainerInterface $c) {
+    'log.short.format' => DI\factory(function (ContainerInterface $c) {
         if ($c->has('ini.log.string_message_format')) {
             return $c->get('ini.log.string_message_format');
         }
         return '%level% %tag%[%datetime%] %message%';
     }),
 
+    'log.trace.format' => DI\factory(function (ContainerInterface $c) {
+        if ($c->has('ini.log.string_message_format_trace')) {
+            return $c->get('ini.log.string_message_format_trace');
+        }
+        return '%level% %tag%[%datetime%] %message% %trace%';
+    }),
+
     'archiving.performance.handlers' => function (ContainerInterface $c) {
         $logFile = trim($c->get('ini.Debug.archive_profiling_log'));
         if (empty($logFile)) {
diff --git a/app/plugins/Monolog/config/tracker.php b/app/plugins/Monolog/config/tracker.php
index 620101ff7..bb7820f9f 100644
--- a/app/plugins/Monolog/config/tracker.php
+++ b/app/plugins/Monolog/config/tracker.php
@@ -10,17 +10,13 @@ function isTrackerDebugEnabled(ContainerInterface $c)
 
 return array(
 
-    'Psr\Log\LoggerInterface' => \DI\decorate(function ($previous, ContainerInterface $c) {
-        if (isTrackerDebugEnabled($c)) {
-            return $previous;
-        } else {
-            return new \Psr\Log\NullLogger();
-        }
-    }),
-
-    'log.handler.classes' => DI\decorate(function ($previous) {
-        if (isset($previous['screen'])) {
+    'log.handler.classes' => DI\decorate(function ($previous, ContainerInterface $c) {
+        if (isset($previous['screen'])
+            && isTrackerDebugEnabled($c)
+        ) {
             $previous['screen'] = 'Piwik\Plugins\Monolog\Handler\EchoHandler';
+        } else {
+            unset($previous['screen']);
         }
 
         return $previous;
diff --git a/app/plugins/Morpheus/config/config.php b/app/plugins/Morpheus/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Morpheus/config/config.php
+++ b/app/plugins/Morpheus/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Morpheus/config/tracker.php b/app/plugins/Morpheus/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Morpheus/config/tracker.php
+++ b/app/plugins/Morpheus/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Morpheus/icons/dist/brand/AGM.png b/app/plugins/Morpheus/icons/dist/brand/AGM.png
new file mode 100644
index 000000000..c11fb65eb
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/AGM.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/AMGOO.png b/app/plugins/Morpheus/icons/dist/brand/AMGOO.png
new file mode 100644
index 000000000..59c2a5a65
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/AMGOO.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Advan.png b/app/plugins/Morpheus/icons/dist/brand/Advan.png
new file mode 100644
index 000000000..f9d8247fe
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Advan.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/AllCall.png b/app/plugins/Morpheus/icons/dist/brand/AllCall.png
new file mode 100644
index 000000000..bd8f8380a
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/AllCall.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Beeline.png b/app/plugins/Morpheus/icons/dist/brand/Beeline.png
new file mode 100644
index 000000000..dc280e7e5
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Beeline.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Digi.png b/app/plugins/Morpheus/icons/dist/brand/Digi.png
new file mode 100644
index 000000000..48c5b0ddc
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Digi.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Digicel.png b/app/plugins/Morpheus/icons/dist/brand/Digicel.png
new file mode 100644
index 000000000..7f37a96d6
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Digicel.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/EE.png b/app/plugins/Morpheus/icons/dist/brand/EE.png
new file mode 100644
index 000000000..a406825ab
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/EE.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Echo_Mobiles.png b/app/plugins/Morpheus/icons/dist/brand/Echo_Mobiles.png
new file mode 100644
index 000000000..a665f0286
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Echo_Mobiles.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Eks_Mobility.png b/app/plugins/Morpheus/icons/dist/brand/Eks_Mobility.png
new file mode 100644
index 000000000..8b47a4bdf
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Eks_Mobility.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Energizer.png b/app/plugins/Morpheus/icons/dist/brand/Energizer.png
new file mode 100644
index 000000000..2b933c639
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Energizer.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Ergo.png b/app/plugins/Morpheus/icons/dist/brand/Ergo.png
new file mode 100644
index 000000000..3467b1afb
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Ergo.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Evercoss.png b/app/plugins/Morpheus/icons/dist/brand/Evercoss.png
new file mode 100644
index 000000000..9d1231715
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Evercoss.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/EvroMedia.png b/app/plugins/Morpheus/icons/dist/brand/EvroMedia.png
new file mode 100644
index 000000000..4c3babdc8
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/EvroMedia.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Extrem.png b/app/plugins/Morpheus/icons/dist/brand/Extrem.png
new file mode 100644
index 000000000..26eddafa3
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Extrem.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/FiGO.png b/app/plugins/Morpheus/icons/dist/brand/FiGO.png
new file mode 100644
index 000000000..6c27924d6
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/FiGO.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Fondi.png b/app/plugins/Morpheus/icons/dist/brand/Fondi.png
new file mode 100644
index 000000000..0e29fd10c
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Fondi.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Ginzzu.png b/app/plugins/Morpheus/icons/dist/brand/Ginzzu.png
new file mode 100644
index 000000000..4fa045a6f
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Ginzzu.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Hafury.png b/app/plugins/Morpheus/icons/dist/brand/Hafury.png
new file mode 100644
index 000000000..4031f25d8
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Hafury.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Hoozo.png b/app/plugins/Morpheus/icons/dist/brand/Hoozo.png
new file mode 100644
index 000000000..85f95b143
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Hoozo.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/IMO_Mobile.png b/app/plugins/Morpheus/icons/dist/brand/IMO_Mobile.png
new file mode 100644
index 000000000..fe42395ae
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/IMO_Mobile.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/InFocus.png b/app/plugins/Morpheus/icons/dist/brand/InFocus.png
new file mode 100644
index 000000000..2047a7ef2
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/InFocus.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/InnJoo.png b/app/plugins/Morpheus/icons/dist/brand/InnJoo.png
new file mode 100644
index 000000000..ba3bcf475
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/InnJoo.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Inoi.png b/app/plugins/Morpheus/icons/dist/brand/Inoi.png
new file mode 100644
index 000000000..6ea4a28c0
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Inoi.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Just5.png b/app/plugins/Morpheus/icons/dist/brand/Just5.png
new file mode 100644
index 000000000..d0f91c9e4
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Just5.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Kalley.png b/app/plugins/Morpheus/icons/dist/brand/Kalley.png
new file mode 100644
index 000000000..ceb2b519c
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Kalley.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Kempler_&_Strauss.png b/app/plugins/Morpheus/icons/dist/brand/Kempler_Strauss.png
similarity index 100%
rename from app/plugins/Morpheus/icons/dist/brand/Kempler_&_Strauss.png
rename to app/plugins/Morpheus/icons/dist/brand/Kempler_Strauss.png
diff --git a/app/plugins/Morpheus/icons/dist/brand/Keneksi.png b/app/plugins/Morpheus/icons/dist/brand/Keneksi.png
new file mode 100644
index 000000000..5cdda3f56
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Keneksi.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Kocaso.png b/app/plugins/Morpheus/icons/dist/brand/Kocaso.png
new file mode 100644
index 000000000..8140aa1f2
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Kocaso.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Kodak.png b/app/plugins/Morpheus/icons/dist/brand/Kodak.png
new file mode 100644
index 000000000..b0044614d
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Kodak.png differ
diff --git "a/app/plugins/Morpheus/icons/dist/brand/Kr\303\274ger_Matz.png" "b/app/plugins/Morpheus/icons/dist/brand/Kr\303\274ger_Matz.png"
new file mode 100644
index 000000000..de95ac8b0
Binary files /dev/null and "b/app/plugins/Morpheus/icons/dist/brand/Kr\303\274ger_Matz.png" differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/LAIQ.png b/app/plugins/Morpheus/icons/dist/brand/LAIQ.png
new file mode 100644
index 000000000..7f09f1bf0
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/LAIQ.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Land_Rover.png b/app/plugins/Morpheus/icons/dist/brand/Land_Rover.png
new file mode 100644
index 000000000..d27f96ce3
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Land_Rover.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Leagoo.png b/app/plugins/Morpheus/icons/dist/brand/Leagoo.png
new file mode 100644
index 000000000..631315b2a
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Leagoo.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/M4tel.png b/app/plugins/Morpheus/icons/dist/brand/M4tel.png
new file mode 100644
index 000000000..fdd847b9b
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/M4tel.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Maxwest.png b/app/plugins/Morpheus/icons/dist/brand/Maxwest.png
new file mode 100644
index 000000000..f264f2991
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Maxwest.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Mobiola.png b/app/plugins/Morpheus/icons/dist/brand/Mobiola.png
new file mode 100644
index 000000000..01b72d714
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Mobiola.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Movic.png b/app/plugins/Morpheus/icons/dist/brand/Movic.png
new file mode 100644
index 000000000..6d5cd814f
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Movic.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/MyWigo.png b/app/plugins/Morpheus/icons/dist/brand/MyWigo.png
new file mode 100644
index 000000000..afc75b79b
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/MyWigo.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/NOA.png b/app/plugins/Morpheus/icons/dist/brand/NOA.png
new file mode 100644
index 000000000..6b5ada701
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/NOA.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/NUU_Mobile.png b/app/plugins/Morpheus/icons/dist/brand/NUU_Mobile.png
new file mode 100644
index 000000000..2dd4d6850
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/NUU_Mobile.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/NYX_Mobile.png b/app/plugins/Morpheus/icons/dist/brand/NYX_Mobile.png
new file mode 100644
index 000000000..81e0f752f
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/NYX_Mobile.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/PCD.png b/app/plugins/Morpheus/icons/dist/brand/PCD.png
new file mode 100644
index 000000000..074ec6935
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/PCD.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/PCD_Argentina.png b/app/plugins/Morpheus/icons/dist/brand/PCD_Argentina.png
new file mode 100644
index 000000000..2f6eec9a7
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/PCD_Argentina.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Panacom.png b/app/plugins/Morpheus/icons/dist/brand/Panacom.png
new file mode 100644
index 000000000..d00f282ab
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Panacom.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Plum.png b/app/plugins/Morpheus/icons/dist/brand/Plum.png
new file mode 100644
index 000000000..2d9f4b0ff
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Plum.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Quantum.png b/app/plugins/Morpheus/icons/dist/brand/Quantum.png
new file mode 100644
index 000000000..577ba7328
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Quantum.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/RIM.png b/app/plugins/Morpheus/icons/dist/brand/RIM.png
index ac3311345..8006dc3f3 100644
Binary files a/app/plugins/Morpheus/icons/dist/brand/RIM.png and b/app/plugins/Morpheus/icons/dist/brand/RIM.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/RT_Project.png b/app/plugins/Morpheus/icons/dist/brand/RT_Project.png
new file mode 100644
index 000000000..d54424627
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/RT_Project.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Riviera.png b/app/plugins/Morpheus/icons/dist/brand/Riviera.png
new file mode 100644
index 000000000..13c2b709b
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Riviera.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Rokit.png b/app/plugins/Morpheus/icons/dist/brand/Rokit.png
new file mode 100644
index 000000000..c603f2616
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Rokit.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Rombica.png b/app/plugins/Morpheus/icons/dist/brand/Rombica.png
new file mode 100644
index 000000000..5af3f90b1
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Rombica.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Safaricom.png b/app/plugins/Morpheus/icons/dist/brand/Safaricom.png
new file mode 100644
index 000000000..a3c1b9b43
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Safaricom.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Selfix.png b/app/plugins/Morpheus/icons/dist/brand/Selfix.png
new file mode 100644
index 000000000..d71182d69
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Selfix.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Senwa.png b/app/plugins/Morpheus/icons/dist/brand/Senwa.png
new file mode 100644
index 000000000..252cb42bf
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Senwa.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Silent_Circle.png b/app/plugins/Morpheus/icons/dist/brand/Silent_Circle.png
new file mode 100644
index 000000000..22edd1b5c
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Silent_Circle.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Simbans.png b/app/plugins/Morpheus/icons/dist/brand/Simbans.png
new file mode 100644
index 000000000..9f4200bd1
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Simbans.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Sonim.png b/app/plugins/Morpheus/icons/dist/brand/Sonim.png
new file mode 100644
index 000000000..3f2684fa8
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Sonim.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Timovi.png b/app/plugins/Morpheus/icons/dist/brand/Timovi.png
new file mode 100644
index 000000000..711c67755
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Timovi.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/True.png b/app/plugins/Morpheus/icons/dist/brand/True.png
new file mode 100644
index 000000000..455d29b17
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/True.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/U_S_Cellular.png b/app/plugins/Morpheus/icons/dist/brand/U_S_Cellular.png
new file mode 100644
index 000000000..e0a5a74d2
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/U_S_Cellular.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Verizon.png b/app/plugins/Morpheus/icons/dist/brand/Verizon.png
new file mode 100644
index 000000000..4e96b990b
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Verizon.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Vorago.png b/app/plugins/Morpheus/icons/dist/brand/Vorago.png
new file mode 100644
index 000000000..abc87c872
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Vorago.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/X-TIGI.png b/app/plugins/Morpheus/icons/dist/brand/X-TIGI.png
new file mode 100644
index 000000000..139fbeaaf
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/X-TIGI.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Yandex.png b/app/plugins/Morpheus/icons/dist/brand/Yandex.png
new file mode 100644
index 000000000..8b59dbd43
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Yandex.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/Yezz.png b/app/plugins/Morpheus/icons/dist/brand/Yezz.png
new file mode 100644
index 000000000..839272d76
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/Yezz.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/iHunt.png b/app/plugins/Morpheus/icons/dist/brand/iHunt.png
new file mode 100644
index 000000000..120d8e566
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/iHunt.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/iPro.png b/app/plugins/Morpheus/icons/dist/brand/iPro.png
new file mode 100644
index 000000000..4e5f09f95
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/iPro.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/iRola.png b/app/plugins/Morpheus/icons/dist/brand/iRola.png
new file mode 100644
index 000000000..38791b1d4
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/iRola.png differ
diff --git a/app/plugins/Morpheus/icons/dist/brand/iView.png b/app/plugins/Morpheus/icons/dist/brand/iView.png
new file mode 100644
index 000000000..cdcce7830
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/brand/iView.png differ
diff --git "a/app/plugins/Morpheus/icons/dist/brand/\303\266wn.png" "b/app/plugins/Morpheus/icons/dist/brand/\303\266wn.png"
new file mode 100644
index 000000000..463f15b17
Binary files /dev/null and "b/app/plugins/Morpheus/icons/dist/brand/\303\266wn.png" differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/2B.png b/app/plugins/Morpheus/icons/dist/browsers/2B.png
new file mode 100644
index 000000000..e3d8dcb35
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/2B.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/AD.png b/app/plugins/Morpheus/icons/dist/browsers/AD.png
new file mode 100644
index 000000000..5334a0d7a
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/AD.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/BA.png b/app/plugins/Morpheus/icons/dist/browsers/BA.png
new file mode 100644
index 000000000..0b31c1d63
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/BA.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/CE.png b/app/plugins/Morpheus/icons/dist/browsers/CE.png
new file mode 100644
index 000000000..dd5b0c973
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/CE.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/CV.png b/app/plugins/Morpheus/icons/dist/browsers/CV.png
new file mode 100644
index 000000000..fbf7b62d0
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/CV.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/DD.png b/app/plugins/Morpheus/icons/dist/browsers/DD.png
new file mode 100644
index 000000000..9e64e4223
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/DD.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/EC.png b/app/plugins/Morpheus/icons/dist/browsers/EC.png
new file mode 100644
index 000000000..1875baeeb
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/EC.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/EP.png b/app/plugins/Morpheus/icons/dist/browsers/EP.png
index 93dd95af6..dfdbecd04 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/EP.png and b/app/plugins/Morpheus/icons/dist/browsers/EP.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/F1.png b/app/plugins/Morpheus/icons/dist/browsers/F1.png
new file mode 100644
index 000000000..11fd80083
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/F1.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/FF.png b/app/plugins/Morpheus/icons/dist/browsers/FF.png
index 397fd9399..11fd80083 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/FF.png and b/app/plugins/Morpheus/icons/dist/browsers/FF.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/FM.png b/app/plugins/Morpheus/icons/dist/browsers/FM.png
index 397fd9399..11fd80083 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/FM.png and b/app/plugins/Morpheus/icons/dist/browsers/FM.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/FR.png b/app/plugins/Morpheus/icons/dist/browsers/FR.png
new file mode 100644
index 000000000..c8f3391b5
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/FR.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/HC.png b/app/plugins/Morpheus/icons/dist/browsers/HC.png
index d7dd68592..a9e49cc76 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/HC.png and b/app/plugins/Morpheus/icons/dist/browsers/HC.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/I3.png b/app/plugins/Morpheus/icons/dist/browsers/I3.png
new file mode 100644
index 000000000..e1726d12e
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/I3.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/I4.png b/app/plugins/Morpheus/icons/dist/browsers/I4.png
new file mode 100644
index 000000000..f34bd3cf2
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/I4.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/KW.png b/app/plugins/Morpheus/icons/dist/browsers/KW.png
new file mode 100644
index 000000000..e03a18da6
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/KW.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/KY.png b/app/plugins/Morpheus/icons/dist/browsers/KY.png
index 741356b0c..649ca81af 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/KY.png and b/app/plugins/Morpheus/icons/dist/browsers/KY.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/MO.png b/app/plugins/Morpheus/icons/dist/browsers/MO.png
new file mode 100644
index 000000000..c13075370
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/MO.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/MS.png b/app/plugins/Morpheus/icons/dist/browsers/MS.png
index b541966a6..2e8d191c0 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/MS.png and b/app/plugins/Morpheus/icons/dist/browsers/MS.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/MT.png b/app/plugins/Morpheus/icons/dist/browsers/MT.png
new file mode 100644
index 000000000..889c6f674
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/MT.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/O1.png b/app/plugins/Morpheus/icons/dist/browsers/O1.png
new file mode 100644
index 000000000..2cd3c5927
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/O1.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/OG.png b/app/plugins/Morpheus/icons/dist/browsers/OG.png
new file mode 100644
index 000000000..ed5363abd
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/OG.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/OH.png b/app/plugins/Morpheus/icons/dist/browsers/OH.png
new file mode 100644
index 000000000..15fe636cb
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/OH.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/Q1.png b/app/plugins/Morpheus/icons/dist/browsers/Q1.png
new file mode 100644
index 000000000..533f5b222
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/Q1.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/QM.png b/app/plugins/Morpheus/icons/dist/browsers/QM.png
new file mode 100644
index 000000000..d49a146aa
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/QM.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/QT.png b/app/plugins/Morpheus/icons/dist/browsers/QT.png
index af34b3c77..beee6838c 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/QT.png and b/app/plugins/Morpheus/icons/dist/browsers/QT.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/QW.png b/app/plugins/Morpheus/icons/dist/browsers/QW.png
new file mode 100644
index 000000000..51d68b8da
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/QW.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/SB.png b/app/plugins/Morpheus/icons/dist/browsers/SB.png
index 2968b3ce0..1e4df1c1d 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/SB.png and b/app/plugins/Morpheus/icons/dist/browsers/SB.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/SO.png b/app/plugins/Morpheus/icons/dist/browsers/SO.png
new file mode 100644
index 000000000..6688d1d49
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/SO.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/ST.png b/app/plugins/Morpheus/icons/dist/browsers/ST.png
index c54614138..78622138f 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/ST.png and b/app/plugins/Morpheus/icons/dist/browsers/ST.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/SZ.png b/app/plugins/Morpheus/icons/dist/browsers/SZ.png
new file mode 100644
index 000000000..fcd304dda
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/SZ.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/TB.png b/app/plugins/Morpheus/icons/dist/browsers/TB.png
new file mode 100644
index 000000000..aa695173c
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/TB.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/TF.png b/app/plugins/Morpheus/icons/dist/browsers/TF.png
new file mode 100644
index 000000000..b8e1281fb
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/TF.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/UM.png b/app/plugins/Morpheus/icons/dist/browsers/UM.png
new file mode 100644
index 000000000..870a650ed
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/UM.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/WF.png b/app/plugins/Morpheus/icons/dist/browsers/WF.png
index c3cb0243c..b083f5c9e 100644
Binary files a/app/plugins/Morpheus/icons/dist/browsers/WF.png and b/app/plugins/Morpheus/icons/dist/browsers/WF.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/WH.png b/app/plugins/Morpheus/icons/dist/browsers/WH.png
new file mode 100644
index 000000000..7e510b229
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/WH.png differ
diff --git a/app/plugins/Morpheus/icons/dist/browsers/WP.png b/app/plugins/Morpheus/icons/dist/browsers/WP.png
new file mode 100644
index 000000000..96400a75e
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/browsers/WP.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/ai.png b/app/plugins/Morpheus/icons/dist/flags/ai.png
index 75737a511..5b2c2392f 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/ai.png and b/app/plugins/Morpheus/icons/dist/flags/ai.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/aq.png b/app/plugins/Morpheus/icons/dist/flags/aq.png
index 130cff584..5ad7fcdb6 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/aq.png and b/app/plugins/Morpheus/icons/dist/flags/aq.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/at.png b/app/plugins/Morpheus/icons/dist/flags/at.png
index e15fdc507..f544e41eb 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/at.png and b/app/plugins/Morpheus/icons/dist/flags/at.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/ca.png b/app/plugins/Morpheus/icons/dist/flags/ca.png
index bc8769036..f06557799 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/ca.png and b/app/plugins/Morpheus/icons/dist/flags/ca.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/gb.png b/app/plugins/Morpheus/icons/dist/flags/gb.png
index 88b128d3c..a05572c35 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/gb.png and b/app/plugins/Morpheus/icons/dist/flags/gb.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/gf.png b/app/plugins/Morpheus/icons/dist/flags/gf.png
index bda5b92f6..537b14fc5 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/gf.png and b/app/plugins/Morpheus/icons/dist/flags/gf.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/gr.png b/app/plugins/Morpheus/icons/dist/flags/gr.png
index 94fd21129..20f6b7a10 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/gr.png and b/app/plugins/Morpheus/icons/dist/flags/gr.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/gu.png b/app/plugins/Morpheus/icons/dist/flags/gu.png
index 21822af69..e119db8b1 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/gu.png and b/app/plugins/Morpheus/icons/dist/flags/gu.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/nc.png b/app/plugins/Morpheus/icons/dist/flags/nc.png
index 537b14fc5..44bd5f3f6 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/nc.png and b/app/plugins/Morpheus/icons/dist/flags/nc.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/nl.png b/app/plugins/Morpheus/icons/dist/flags/nl.png
index 97ebad3f0..370d624ec 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/nl.png and b/app/plugins/Morpheus/icons/dist/flags/nl.png differ
diff --git a/app/plugins/Morpheus/icons/dist/flags/si.png b/app/plugins/Morpheus/icons/dist/flags/si.png
index 99574c437..430c59ec8 100644
Binary files a/app/plugins/Morpheus/icons/dist/flags/si.png and b/app/plugins/Morpheus/icons/dist/flags/si.png differ
diff --git a/app/plugins/Morpheus/icons/dist/os/FOS.png b/app/plugins/Morpheus/icons/dist/os/FOS.png
index 397fd9399..11fd80083 100644
Binary files a/app/plugins/Morpheus/icons/dist/os/FOS.png and b/app/plugins/Morpheus/icons/dist/os/FOS.png differ
diff --git a/app/plugins/Morpheus/icons/dist/socials/peepeth.com.png b/app/plugins/Morpheus/icons/dist/socials/peepeth.com.png
new file mode 100644
index 000000000..4ecf919e7
Binary files /dev/null and b/app/plugins/Morpheus/icons/dist/socials/peepeth.com.png differ
diff --git a/app/plugins/Morpheus/images/compare.svg b/app/plugins/Morpheus/images/compare.svg
new file mode 100644
index 000000000..efefc4367
--- /dev/null
+++ b/app/plugins/Morpheus/images/compare.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <!--
+    Source: https://fonts.gstatic.com/s/i/materialicons/compare/v1/24px.svg?download=true (Apache license version 2.0.)
+    -->
+    <path d="M0 0h24v24H0z" fill="none"/><path d="M10 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h5v2h2V1h-2v2zm0 15H5l5-6v6zm9-15h-5v2h5v13l-5-6v9h5c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+</svg>
\ No newline at end of file
diff --git a/app/plugins/Morpheus/images/logo-email.png b/app/plugins/Morpheus/images/logo-email.png
old mode 100644
new mode 100755
index 8d4581f27..2a80c3cc2
Binary files a/app/plugins/Morpheus/images/logo-email.png and b/app/plugins/Morpheus/images/logo-email.png differ
diff --git a/app/plugins/Morpheus/images/logo-header.png b/app/plugins/Morpheus/images/logo-header.png
old mode 100644
new mode 100755
index 234d96a75..2a80c3cc2
Binary files a/app/plugins/Morpheus/images/logo-header.png and b/app/plugins/Morpheus/images/logo-header.png differ
diff --git a/app/plugins/Morpheus/images/logo.png b/app/plugins/Morpheus/images/logo.png
old mode 100644
new mode 100755
index 24e59ee09..0ce182d9e
Binary files a/app/plugins/Morpheus/images/logo.png and b/app/plugins/Morpheus/images/logo.png differ
diff --git a/app/plugins/Morpheus/images/logo.svg b/app/plugins/Morpheus/images/logo.svg
index 809c79a91..2efc5caec 100644
--- a/app/plugins/Morpheus/images/logo.svg
+++ b/app/plugins/Morpheus/images/logo.svg
@@ -1,6 +1,174 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-	width="590" height="98.995" viewBox="0 0 590 98.995"
-	 enable-background="new 0 0 590 98.995" xml:space="preserve" version="1.1" id="Layer_1">
-<path transform="translate(-250 -73) scale(2.4 2.4)" fill="#fff" d="M349.338 54.142c0 9.062-7.347 16.408-16.408 16.408-9.063 0-16.409-7.347-16.409-16.408 0-9.063 7.347-16.409 16.409-16.409 9.061-.001 16.408 7.346 16.408 16.409m-16.408-8.223a8.223 8.223 0 1 0 0 16.445 8.223 8.223 0 0 0 0-16.445M262.479 54.151c0 9.062-7.346 16.406-16.406 16.406-9.062 0-16.406-7.345-16.406-16.406s7.345-16.407 16.406-16.407c9.061.001 16.406 7.347 16.406 16.407m-16.406-8.22a8.22 8.22 0 1 0 0 16.442 8.221 8.221 0 0 0 0-16.442M184.184 37.733c-1.686 0-3.132.85-3.767 2.413a16.309 16.309 0 0 0-8.535-2.413c-9.066 0-16.416 7.35-16.416 16.416 0 9.067 7.35 16.417 16.416 16.417 3.129 0 6.043-.892 8.532-2.41.633 1.563 2.081 2.41 3.77 2.41 2.272 0 4.114-1.526 4.114-4.281v-24.26c0-2.755-1.842-4.292-4.114-4.292m-12.302 24.642a8.227 8.227 0 0 1 0-16.452c4.29 0 7.81 3.286 8.188 7.478v1.495c-.378 4.193-3.898 7.479-8.188 7.479M226.841 56.421a4.081 4.081 0 0 0-4.084-4.08 4.081 4.081 0 0 0-4.082 4.08 5.981 5.981 0 0 1-5.973 5.973 5.98 5.98 0 0 1-5.972-5.973l-.002-.01V45.933h9.644c2.255 0 4.081-1.851 4.081-4.104 0-2.254-1.826-4.095-4.081-4.095h-9.665v-2.79a4.084 4.084 0 0 0-8.166 0v2.814h-3.307a4.084 4.084 0 0 0-4.083 4.082 4.083 4.083 0 0 0 4.083 4.082h3.307l-.033 10.499c0 7.762 6.562 14.137 14.194 14.137 7.796 0 14.139-6.342 14.139-14.137M313.694 66.45V51.697h-.009c-.095-7.715-6.392-13.963-14.128-13.963a14.084 14.084 0 0 0-10.069 4.23c-2.563-2.602-6.11-4.23-10.047-4.23-7.735 0-14.032 6.248-14.128 13.963h-.009V66.45a4.081 4.081 0 0 0 8.162 0V51.869h.002a5.98 5.98 0 0 1 5.973-5.97c3.295 0 5.976 2.68 5.976 5.97h.003l-.001 14.437c0 2.252 1.871 4.244 4.125 4.244s4.031-1.992 4.031-4.244l.008-14.437h.002a5.98 5.98 0 0 1 5.973-5.97 5.98 5.98 0 0 1 5.972 5.97h.003V66.45a4.08 4.08 0 1 0 8.161 0M152.64 66.438V51.685h-.009c-.095-7.715-6.392-13.963-14.128-13.963-3.94 0-7.505 1.622-10.07 4.23-2.562-2.602-6.11-4.23-10.046-4.23-7.736 0-14.033 6.248-14.128 13.963h-.009v14.753a4.081 4.081 0 0 0 8.162 0V51.856h.002a5.98 5.98 0 0 1 5.973-5.97c3.295 0 5.975 2.68 5.975 5.97h.003l-.001 14.436c0 2.252 1.871 4.245 4.125 4.245s4.031-1.993 4.031-4.245l.008-14.436h.002a5.98 5.98 0 0 1 5.973-5.97 5.98 5.98 0 0 1 5.972 5.97h.002v14.581a4.082 4.082 0 0 0 8.163.001"/></svg>
\ No newline at end of file
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px"
+	 viewBox="41.380001068115234,56.2400016784668,528.8699951171875,113.31999206542969"  xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#95C748;}
+	.st2{fill:#35BFC0;}
+	.st3{clip-path:url(#SVGID_2_);}
+	.st4{fill:#3252A0;}
+	.st5{fill:#F38334;}
+	.st6{fill:#3152A0;}
+</style>
+	<circle class="st0" cx="98.04" cy="112.9" r="56.66"/>
+	<path class="st0" d="M570.25,109.66c0,14.38-11.66,26.05-26.05,26.05c-14.38,0-26.05-11.66-26.05-26.05s11.66-26.05,26.05-26.05
+	C558.59,83.62,570.25,95.28,570.25,109.66z M544.21,96.61c-7.21,0-13.05,5.84-13.05,13.05s5.84,13.05,13.05,13.05
+	c7.21,0,13.05-5.84,13.05-13.05S551.42,96.61,544.21,96.61z"/>
+	<path class="st0" d="M432.38,109.68c0,14.38-11.66,26.04-26.04,26.04s-26.04-11.66-26.04-26.04s11.66-26.04,26.04-26.04
+	S432.38,95.3,432.38,109.68z M406.34,96.63c-7.21,0-13.05,5.84-13.05,13.05s5.84,13.05,13.05,13.05s13.05-5.84,13.05-13.05
+	S413.54,96.63,406.34,96.63z"/>
+	<path class="st0" d="M308.1,83.62c-2.68,0-4.97,1.35-5.98,3.83c-3.95-2.41-8.58-3.83-13.55-3.83c-14.39,0-26.06,11.67-26.06,26.06
+	s11.67,26.06,26.06,26.06c4.97,0,9.59-1.41,13.54-3.83c1.01,2.48,3.3,3.83,5.98,3.83c3.61,0,6.53-2.42,6.53-6.8V90.43
+	C314.63,86.06,311.71,83.62,308.1,83.62z M288.57,122.73c-7.21,0-13.06-5.85-13.06-13.06c0-7.21,5.85-13.06,13.06-13.06
+	c6.81,0,12.4,5.22,13,11.87v2.37C300.97,117.52,295.38,122.73,288.57,122.73z"/>
+	<path class="st0" d="M375.81,113.28c0-3.58-2.9-6.48-6.48-6.48c-3.58,0-6.48,2.9-6.48,6.48c0,5.22-4.25,9.48-9.48,9.48
+	c-5.23,0-9.48-4.26-9.48-9.48c0,0,0-0.01,0-0.02V96.63h15.31c3.58,0,6.48-2.94,6.48-6.51c0-3.58-2.9-6.5-6.48-6.5h-15.34v-4.43
+	c0-3.58-2.9-6.48-6.48-6.48c-3.59,0-6.48,2.9-6.48,6.48v4.47h-5.25c-3.58,0-6.48,2.9-6.48,6.48c0,3.58,2.9,6.48,6.48,6.48h5.25
+	l-0.05,16.67c0,12.32,10.41,22.44,22.53,22.44C365.74,135.72,375.81,125.66,375.81,113.28"/>
+	<path class="st0" d="M513.68,129.2v-23.42h-0.01c-0.15-12.25-10.15-22.16-22.43-22.16c-6.25,0-11.91,2.58-15.98,6.71
+	c-4.07-4.13-9.7-6.71-15.95-6.71c-12.28,0-22.28,9.92-22.43,22.16h-0.01v23.42c0,3.58,2.9,6.48,6.48,6.48c3.58,0,6.48-2.9,6.48-6.48
+	v-23.15h0c0-5.22,4.25-9.48,9.48-9.48c5.23,0,9.48,4.25,9.48,9.48h0l0,22.91c0,3.58,2.97,6.74,6.55,6.74s6.4-3.16,6.4-6.74
+	l0.01-22.91h0c0-5.22,4.25-9.48,9.48-9.48c5.23,0,9.48,4.25,9.48,9.48h0v23.15c0,3.58,2.9,6.48,6.48,6.48
+	C510.77,135.68,513.68,132.78,513.68,129.2"/>
+	<path class="st0" d="M258.03,129.18v-23.42h-0.01c-0.15-12.25-10.15-22.16-22.43-22.16c-6.25,0-11.91,2.58-15.98,6.71
+	c-4.07-4.13-9.7-6.71-15.95-6.71c-12.28,0-22.28,9.92-22.43,22.16h-0.01v23.42c0,3.58,2.9,6.48,6.48,6.48c3.58,0,6.48-2.9,6.48-6.48
+	v-23.15h0c0-5.22,4.25-9.48,9.48-9.48c5.23,0,9.48,4.25,9.48,9.48h0l0,22.91c0,3.58,2.97,6.74,6.55,6.74s6.4-3.16,6.4-6.74
+	l0.01-22.91h0c0-5.22,4.25-9.48,9.48-9.48c5.23,0,9.48,4.25,9.48,9.48h0v23.15c0,3.58,2.9,6.48,6.48,6.48
+	C255.12,135.66,258.03,132.76,258.03,129.18"/>
+	<g>
+	<path class="st1" d="M141.71,115.52l0.01-0.01l-0.24-0.36c-0.04-0.06-0.07-0.11-0.11-0.17l-16.24-24.74l-21.01,15.65l15.36,23.64
+		c0.07,0.1,0.13,0.2,0.2,0.3l0.08,0.13l0.01-0.01c2.38,3.38,6.3,5.59,10.75,5.59c7.26,0,13.15-5.89,13.15-13.15
+		C143.66,119.88,142.94,117.53,141.71,115.52z"/>
+		<circle class="st2" cx="65.56" cy="122.4" r="13.15"/>
+		<g>
+		<defs>
+			<path id="SVGID_1_" d="M141.71,115.52l0.01-0.01l-0.24-0.36c-0.04-0.06-0.07-0.11-0.11-0.17l-16.24-24.74l-0.01,0.01
+				c-2.32-3.76-6.45-6.27-11.19-6.27c-7.26,0-13.15,5.89-13.15,13.15c0,3.37,1.28,6.43,3.36,8.75l-0.01,0.01l15.36,23.64
+				c0.07,0.1,0.13,0.2,0.2,0.3l0.08,0.13l0.01-0.01c2.38,3.38,6.3,5.59,10.75,5.59c7.26,0,13.15-5.89,13.15-13.15
+				C143.66,119.88,142.94,117.53,141.71,115.52z"/>
+		</defs>
+			<clipPath id="SVGID_2_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+			<g class="st3">
+
+				<image style="overflow:visible;opacity:0.5;" width="86" height="65" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABCCAYAAAAi00pEAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEc5JREFUeNrsXFl72ziyRQEktduS
+7ezp6en0zPN9uP//J9zv63nrh8k2SZx4k7WLG1D3FEDZsuMkXiRbmRnmY0RTFAEcFk6dKgBU6r/b
+2jbakPKX68HfOP7pyqcHApR2d3fp1atXNBwOKc9zcs7JeY7jWDUaDRdFEf/xxx+81ED+2cqn+7TQ
+nZ0d/eTJE52NRjphNq5eN1SWpogiI43DpgyRM2Vp2ZhSz2Y2azZdrVZzf/75p7tDQx+k/PsAl7rd
+rkbDDCzEoKKxsiqhwiWsbY3IJEwcsdNaEbMmtuyoUGwzreLM1VTBzHmapiUsyr5+/XrRSN708tcJ
+Lj2T7tdq6eHODnpbnLC1da1Uk0k3teMmrmkxKflMiMmgtmgdF+RUiopN8d0MrZ2RtTOr9RyWlZbT
+afH48ND+n1LuB1b00OWvDVza29uj59vbkZukcRbXGsrYDmqzhe+2Feue/yT5m7dQvQbDhFAZGBHn
+OJ7i+yHOD3HNEO0Y4LshABhRoadNnmVpt1sudVXesPLXBq5v2LNuNyrm8xr4rI3+1lWa9pjVI3bq
+MUp9BBvp4bOL6zvY60J3Yjn4l+PvWdW4gSI6wfEhaXWEhh/CXvpOuVHD2nnZ6RRXNPChy18fuGiY
+loY5aZjWHUu0R9o8RdEvUfMXLL2V+BGxb1gbexOVSFAzLRXEcYnjDMcT1G6E4z7OHpDifXTLj7jk
+E7r3YU2pgXZudqmBagHsPZdvrwI3WiWwv+Fh1bPMDNM0iUzcQQMeoSEv4BB+xVe/ofRfiPgxqrFT
+NayOvYbzEZ8/aKlogT3FdTOc3MM9dpgJ3Rl8CbVEQCtjrZyxbAcD/h9c/w/84DH23Qco/38BbMXB
+FwA2q6QDardN1O4lEcVtbdQeutpLVO4Vvvobqv47KfoLrnuKv3cC36mW75KKat6p+J1iabBvOEnj
+qYHjRriGI81eMcEgVYnunpONy7IRu7/PZqrWbOpZpxNHqImODCxWvVhb+Rrsy3B+1pbjZtOOptOv
+LHdl4PZ6PbPV68XoXE2DJw2on6MLwpjV37D/jpL/ggqKcUl3bC0aVPUeqYde2uVcFBrKcbiOpOvG
+aDAw0GJoBawwZ2UhsLRN220u8HApihpG6x6s6zm6s1jr39dQvkQcBY4yrXXOtVqJ9sOIB7xyWvgF
+pXXQxCLLaghtOsqYPZx+gf2v1S4WDEfCHXQc6Yrohqy/wflnIWl1jfaNJ5Gg/jt0Py5xH/AipxTp
+PCZjERQI2gQehLzSO3BYz9DSX/GTX/EjsWChiK07li+nLT7E6c2VqAqiWWRtNimKUl2SZ6uwXNJC
+B71eouK4jcIekdYv4Zl/l66I78F36omXPoHjoqrCP3KmtLTrJevyv0PvLNE9xfGkOJnDyTh8xo4B
+IGnp+qHXUCifQvmNu5YvXQbG6wB8jm9maOsMsd0cnzmcqT09PeWVWS66g97a2kKE4xpwHNswnkcs
+npnoF9QKnlntQsJ0+GbALm+6+pQuLIIfGhVcq3guepTFgoT7jJGGizMS7QpaUFKPPWhTkVzoMbyK
+8lueDhSLoxvgnseyo30DaLnZZD7P1ZJji1ZIB208PaGD5+ErfoFnDM/M23wzi/lRA9E7VKAFVnN0
+VURTlMNsgTdnKBNdn6RMcCsJ0C1cV8M136OCa5VfcTAUA5SD4j38LQ9QnOOh6GJEgXN8llUZbFZJ
+B8rTAb3C8e8eYGhM7B3sSdWt7qqrtfRKWgaJlDiXEg21OEYZ1CF5qEEZPMHlPZKQV5zR+UO66ybW
+mXupphG5EYkVT2LmdGt3t1g4tltbrmSYuhDrEq8rz3MAV5wY0Usvd4jEqbQra1sFsNXvWSKpWsXh
+C8ci1CDW3FeShGGxbqrDUhNYdsSrAdVzb9UDaiEvQUI3WzjZxHFio8ho+NRKK98aXCqKQkMExVDU
+LSdAKnqKhkAV8HMPtAB+zrOrigQXzkUemFhsF43KwPWp6N6gWZV4c4S0LMfRJcd05/KFWnAjPGBQ
+BHgcIV0d5SeQZNDArGdluagn3wpcSeHtdjoRflx3Wm/5KEbxM3CdODDPswA48Czfmud+yL8sQQCz
+RFvCv6AFlmgrFckFekJYC40aLGmluZOqJxjQgUg0A2sOks05xBSWbq0WvBMrClM4l9g47uCp7aIB
+ErvDYtUT9t4cXhVPc0V08C0LRsN8INAGwHvCvSL0q6SLJGJw3kddhldbB6YgB9B0rkSt5IFJYjeG
+Bd86iKBxG5FltxtrY5qQX10oBIl6nlVhJTwoiyWj0ZIf5bWlNL2lsO95Qj1bvqUAW3KwwrMkkszz
+7plKWVHBMBs8SBQnIXjBkkXTVOIEhLYWhXA7nXtB0zrnNS0aCOlFL0KgwBJaNoJnXjkdfI9/2YsI
+PFQAm1WW2lwKGlZVD/Y9RJynBC4KwQPx3OeAcc44Z5N6nW+sc7/StCHEFWBfsnwS7VbqoLZGOria
+HkKZEkQIDRR0roljb90B+FXURzqIKIGMPP3wBLcdSaQGY8tzInu0v39jy71AByDuHp7aE3SJ56g3
+rJYfh8z+2pzYj0ZSTPWHqUD158TRoAuvqi4sWhr/FWhfirZPfJSm1AimPAW42RzebDKZ3Mxyvwpx
+tV5oWonE1qFpbwuwWR6R4HC4KquVfIINCSOfSBdgT4mdBBEzOPfcBH17fcu9Roi7Lk17U4DXWa5D
+O22QfJ4KAKzkFdSxgAyDk+RNfnp66m4C7kU6YO5Bbzxmp148MB3c58YeXOaiigaHOD4CRRygbxwp
+Ge4BuDmiqtlsdn1wrwpxuQpxOaTxejjfrBLLxFePgv7sYLsqnE2FX30mTKnPMqYGmjjC32OrdVqv
+1+1SPveH4J6FuIjtmjD7HvB7Aqn8/AzYEG5KKCh8VF4KNSVLRZc89c8GtDRAkvOQXWqK6vdx/AUt
++oi2fQYdnCitJ1lZ5nBk9toDlBLidhDisghxrTuAb4clxaZ4l8LgnjgP8Z6SNBFpQnw5uUwUXRpG
++dms2RsNV1YLazkGBp8FYPx9JBRh0nTeGo3Kj5co4ZvgnoW4RZFwkrRgfF1HagdPqksizAOEEgmV
+kCR6adBe7BSRk79v7WygL+jP+FK0RBtPB8GJ5QgSxvg8QbtgtbyP4wM04hRcO7XG5OPZ7NpD696J
+xa1WbLRuEOk2HNi2JJ5xYxkBxZOkAYAdB7XDYIwzrqHqnonMYvEjAAoSjUkS3M0F0BIaVxHcpoK8
+7MRmKuRrDzlw7RfYs4w+jKZ5ng2mUzv5xoyb6ConJiO5ztoEiDVNiNsBEknGCQKajmGe6BIQ0opF
+8xU+UR0SGKRCUlrUQwew7aiQqd9lmfWiWB5SCxWs8TldbKoTK8/VAShA0T6M65NYLYAeyNyxqNEo
+JgcHTl0TXO/E8jxPYmMaEhgAtXZIxCgZEOxXCWqhhAkeLfiWEPVx6BZCEaxigCfj/TJNSPK8j0NS
+h5/i94/xoPYk30o+ByHObuPk27mmlWCBz3j2oya17xyfIPQXJ5aNx2OrvjMRL7pCehkA4BPB2Bvw
+hjEAczIJTQpk4olDl8BFYxSWsqaCbCmTW32tcL0h5+RhyFhTl2WelfCVH9CTeJxKH6L70ZoLwNIG
+0sGp8vXnT6CBT/7Y2qHJ8286sW+B6xO9sFyDG8Wx1gluHleZoJkfSmYaK4R7OD9B2Dd1GsWUhTUV
+Vk6kF0J6SLcIN6s5B64ifYrfyWzBCQdJ4y+q0oVmiac3kA58kPAR4H5A3b+w476D9EKFv+nEvguu
+ePMoijTLsdYyFwAyhGZOrE7LxDQ90lrjWOe1RqM8/PCBjTEBXOdkyjtt7e7q2Wg0t2U5T0w0hZST
+yubOkzJH1TB7jcLDM1Vu9qHp4So6gDLgD6jUPgvQxoxgfGl/PC5H15j8fMFigt6HbTJbhLsiQaYs
+Ex7YlQBoSpqmRV7MAGA+GAzKFkoE7/DlewzHYxqBjyKty+12W8b5reaz8hoUpm36eVqKeQFw/ID0
+8D062Jehc1DdENp0HoMOPv2ADq4CF5I2cQCuVNbmLivAj5EVe7JkC8cuRRAoYV7R7/ftycmJOzo6
++qoAgK6qoWWWtQQmjrnZaChnZWCPYji/pkzZY1ENrOS4hgYsRmijqtL0AHSwHOIKHXwCuB/R2T7D
+2k5uQgdqOQ96lqLjkNBvxLHSReFKE5Va6dSUUQp1mrVarQKgCrDXWhMAmlFlCaMHbUQAWQu8wgza
+R241CvRQP0tsn0+Eu09wfZ6WAh2gt5NM8PgXavAan29ZHJkx/dza2el4XPSz7NqLXS7oTAChsixT
+MYBodTq2JC6TWlIYbYrjwbFPTHz+/Pkmiz08wIj2lIxksg5zOgiKQjqKTOetwF1M4YxUGEmlewRY
+rLbgMLDZ9/yq6C1s7A3+/oD6HkVZNqkNh/l+yB/cDlxpEJwSl9YiDGNO09RmeeZy/Ds8PHTD4fBW
+a8ESAEy1mtKNBju1mDYDgFmFubBUhcrewfF9hsjBiRFJbkTWPXxBnd6TWC2p96jElwgBA+qcjvr9
+cnrDJVrRFcSu5vM5Y6flc3fZJJU0yzK3lWVFM26E7FIEHR3ywGGSMfs9vkd5tpIQ9yaWu7ZNKGe7
+KLgJj5ZFEcvaGQrywisF9hTBdZK5CJJNC+fXSQ8LTRvUASvIrjM6eO+B1npMcZyh19rbGNl9indG
+WK3mLWfjRpIxpA0aIHO5YL3U9kuWFusU1i/PVhbiboTlKhU8RgGnJhJNZqY4CenY5xfEUhOx3pDS
+JFES8aU8MK2UDkKOZIKyjoPsUm80syiEj/DCx9C0k2QwyD/d0Ik9GLiyIcJRYsEAl6MoZrp/eXaJ
+DhgWq96gDq+had/Djx84hL6yWvI2TuxBwV3w7wPJs4U6SLFLsPAFveU9zv8TN353F027MeA+kDz7
+Hh28URToIAId3EbTbhS4Mr89k6UbUaRinbDGP6X9gKZMwI8qcOvVzMXojvy7ALakC+pAvV2igy+r
+ooMHB/ea8qxGYRb3AmB9C4D5QipR1vRKsAC5hS9eA8y3UC77q6SDjQBXtprQQ6Ou4q2250QKSQ5d
+ObNaNQoSnBtdWIx3HYDPgQ3LqmSg0edoxYlpxW8W6mCVdLAx4C7LM2NAudaGxC48nJJ3IJBk0vzI
+cUx+YPNsZc1lB3c5oqzmHHiLlZy0LJI+kjkHPneg6DUJHTh3aFdMBxsD7rI8k5nZMcVOy2i9Dqvp
+KtAMhZU6lWogPwf5HFVaznBxlT4Ua80l0V9lu47Ijyqot0F6qffQ2PtszWmuypXSwUaB+xX/xl7/
+Iu7H7kEM8018ojcM43+1ywI/CqDmarHKR1SBjN2ROoS1fgrAeip4p1jvW+J+meeT7niYf5hMnFrx
+26A2ZezqLDzO2mwbiUlVXgzBE9oJtlrL1E1ZNTljGSglP+tH1vG2Kk0c0/n7Emz1voR5GLdTogwO
+/fsSoGlxwb+UdZ+NcseRLSfcaRQnh/srB3bTwFXHkj1LU/e03S5acSQzB5WNIgcmLmS4CdY3JJm2
+yTJczzJXbZGPSAJtyLBy9a4EP6IgaUT/po8DdIgvAF6isUN4zX5syzE0dvZ5MCiP1/T+sk2c7ULN
+ZpOe7u3ppjFxkds666jN2spsduxqF+DuKll+Gl6jIktQG2EWz9k7aiaqeo0KGtjHyROAf6plEaDV
+I6PyaVSv5x7Y42NW/0HgngH8vF7XTaXNpNWuATpZTNeG5bb9xEDmDqyyzYqrTJqsCfMrmDzfwlmN
+ZY4FToyJ3ZhlDEyWk+Y23Z4Mive1ml0nsJsMrt/2JDxLErK9nmm323FZFHFkjCzDqlMps3pcA56v
+Dg6OVfVeMCWzf5gyADoH3ikC5xQ6Ni1h0XEcF/2DA9uFln27/lcZ/hRTOb0VA1woX623t7cjm2bG
+lC4uDcXo6pGLtHEuODQjC62tK2VhSGS5KOqxxc/Ko6MjK1r64OBgrda6kVLsBzqYp9Opn3wiGnY2
+lsncqmj3ujmzyx0CAAdLhXybQ2DMkjhKo1qSnp4cFfOyFAdnZQxwesV7aP7TLffKene7XZnbRmma
+koxYhxlVYXloo9Hwn+/evbs3K/13Avd77WD13+3ff/t/AQYA66g1MCu4TR8AAAAASUVORK5CYII=" transform="matrix(1 0 0 1 48.7815 78.2357)">
+			</image>
+				<g>
+				<g>
+					<path class="st4" d="M127.14,97.15c0-7.26-5.89-13.15-13.15-13.15s-13.15,5.89-13.15,13.15c0,2.67,0.8,5.15,2.17,7.22
+						c0,0,0,0,0,0l-0.01,0l-9.98-14.11H93C90.68,86.51,86.55,84,81.81,84s-8.87,2.51-11.18,6.26h-0.01l-15.9,24.78
+						c2.36-3.49,6.36-5.79,10.9-5.79c4.77,0,8.94,2.55,11.24,6.36l0.02,0l10.39,14.59h0.02c2.39,3.24,6.23,5.36,10.57,5.36
+						c4.34,0,8.18-2.11,10.57-5.36h0.02l0.11-0.17c0.27-0.38,0.52-0.77,0.76-1.18l15.57-24.33c0,0,0,0,0,0
+						C126.3,102.42,127.14,99.88,127.14,97.15z M104,105.69c-0.01-0.02-0.03-0.03-0.05-0.05C103.97,105.65,103.98,105.67,104,105.69
+						z M104.97,106.7c0.08,0.07,0.16,0.14,0.23,0.21C105.13,106.85,105.05,106.78,104.97,106.7z M106.14,107.68
+						c0.09,0.06,0.17,0.13,0.26,0.19C106.31,107.81,106.23,107.75,106.14,107.68z M107.63,108.66c0.01,0,0.02,0.01,0.03,0.02
+						C107.65,108.67,107.64,108.66,107.63,108.66z M109.03,109.32c0.11,0.04,0.22,0.08,0.34,0.12
+						C109.25,109.4,109.14,109.37,109.03,109.32z M110.44,109.8c0.16,0.04,0.31,0.08,0.47,0.12
+						C110.76,109.88,110.6,109.84,110.44,109.8z M111.98,110.13c0.15,0.02,0.3,0.05,0.46,0.07
+						C112.28,110.18,112.13,110.15,111.98,110.13z M122.63,107.04c0.12-0.1,0.23-0.21,0.35-0.31
+						C122.87,106.83,122.75,106.93,122.63,107.04z M115.52,110.2c0.16-0.02,0.31-0.05,0.46-0.07
+						C115.83,110.15,115.68,110.18,115.52,110.2z M117.01,109.93c0.17-0.04,0.33-0.08,0.5-0.13
+						C117.35,109.85,117.18,109.89,117.01,109.93z M118.5,109.48c0.14-0.05,0.28-0.1,0.42-0.15
+						C118.78,109.39,118.64,109.43,118.5,109.48z M120.24,108.72C120.24,108.72,120.24,108.72,120.24,108.72
+						C120.24,108.72,120.24,108.72,120.24,108.72z M121.48,107.94c0.11-0.08,0.22-0.16,0.33-0.24
+						C121.7,107.78,121.6,107.86,121.48,107.94z M123.71,105.97c0.09-0.1,0.19-0.2,0.28-0.31
+						C123.9,105.77,123.81,105.87,123.71,105.97z"/>
+					<path class="st4" d="M54.4,115.56c0.1-0.16,0.19-0.32,0.29-0.48l-0.31,0.48L54.4,115.56z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+		<circle class="st5" cx="113.96" cy="97.17" r="13.18"/>
+		<g>
+		<path class="st6" d="M113.93,110.3c-4.59,0-8.63-2.36-10.98-5.93l-0.01,0l-9.98-14.11h-0.01C90.63,86.51,86.49,84,81.76,84
+			c-4.73,0-8.87,2.51-11.18,6.26h-0.01l-15.9,24.78c2.36-3.49,6.36-5.79,10.9-5.79c4.77,0,8.94,2.55,11.24,6.36l0.02,0l10.39,14.59
+			h0.02c2.39,3.24,6.23,5.36,10.57,5.36c4.34,0,8.18-2.11,10.57-5.36h0.02l0.11-0.17c0.27-0.38,0.52-0.77,0.76-1.18l15.62-24.33
+			C122.51,108.01,118.46,110.3,113.93,110.3z"/>
+			<path class="st6" d="M54.33,115.56l0.02,0c0.1-0.16,0.19-0.32,0.29-0.48L54.33,115.56z"/>
+			<path class="st6" d="M124.88,104.43"/>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/app/plugins/Morpheus/stylesheets/base/colors.less b/app/plugins/Morpheus/stylesheets/base/colors.less
index 8c82888f0..9a8150c33 100644
--- a/app/plugins/Morpheus/stylesheets/base/colors.less
+++ b/app/plugins/Morpheus/stylesheets/base/colors.less
@@ -31,14 +31,46 @@
 @color-blue-brandSocialVeryLight: #00aced;
 @color-orange-brand:              #ff9600;
 
-@graph-colors-data-series1: #3450A3;
-@graph-colors-data-series2: #43a047;
-@graph-colors-data-series3: #ff7f00;
-@graph-colors-data-series4: #d4291f;
-@graph-colors-data-series5: #6a3d9a;
-@graph-colors-data-series6: #b15928;
-@graph-colors-data-series7: #fdbf6f;
-@graph-colors-data-series8: #cab2d6;
+// see https://material.io/design/color/#tools-for-picking-colors for source for colors
+@graph-colors-data-series0: #0277BD; // light blue 50 series (800)
+@graph-series0-shade1-color: #40C4FF; // (A200)
+@graph-series0-shade2-color: #00B0FF; // (A400)
+@graph-series0-shade3-color: #0091EA; // (A700)
+
+@graph-colors-data-series1: #FF8F00; // amber 50 series (800)
+@graph-series1-shade1-color: #FFD740; // (A200)
+@graph-series1-shade2-color: #FFC400; // (A400)
+@graph-series1-shade3-color: #FFAB00; // (A700)
+
+@graph-colors-data-series2: #AD1457; // pink 50 series (800)
+@graph-series2-shade1-color: #FF4081; // (A200)
+@graph-series2-shade2-color: #F50057; // (A400)
+@graph-series2-shade3-color: #C51162; // (A700)
+
+@graph-colors-data-series3: #6A1B9A; // purple 50 series (800)
+@graph-series3-shade1-color: #E040FB; // (A200)
+@graph-series3-shade2-color: #D500F9; // (A400)
+@graph-series3-shade3-color: #AA00FF; // (A700)
+
+@graph-colors-data-series4: #558B2F; // light green 50 series (800)
+@graph-series4-shade1-color: #B2FF59; // (A200)
+@graph-series4-shade2-color: #76FF03; // (A400)
+@graph-series4-shade3-color: #64DD17; // (A700)
+
+@graph-colors-data-series5: #00838F; // cyan 50 series (800)
+@graph-series5-shade1-color: #18FFFF; // (A200)
+@graph-series5-shade2-color: #00E5FF; // (A400)
+@graph-series5-shade3-color: #00B8D4; // (A700)
+
+@graph-colors-data-series6: #283593; // indigo 50 series (800)
+@graph-series6-shade1-color: #536DFE; // (A200)
+@graph-series6-shade2-color: #3D5AFE; // (A400)
+@graph-series6-shade3-color: #304FFE; // (A700)
+
+@graph-colors-data-series7: #D84315; // deep orange 50 series (800)
+@graph-series7-shade1-color: #FF6E40; // (A200)
+@graph-series7-shade2-color: #FF3D00; // (A400)
+@graph-series7-shade3-color: #DD2C00; // (A700)
 
 @default-box-shade: 0 2px 3px 0 rgba(0,0,0,0.16), 0 0px 3px 0 rgba(0,0,0,0.12);
 
diff --git a/app/plugins/Morpheus/stylesheets/main.less b/app/plugins/Morpheus/stylesheets/main.less
index 950e06de4..659a5af4a 100644
--- a/app/plugins/Morpheus/stylesheets/main.less
+++ b/app/plugins/Morpheus/stylesheets/main.less
@@ -382,7 +382,7 @@ table.dataTable {
     }
   }
 
-  tr {
+  tr:not(.subDataTableContainer) {
     td {
       border-bottom: 1px solid @color-silver-l95 !important;
       border-color: @color-silver-l95 !important;
@@ -405,6 +405,12 @@ table.dataTable {
         border-left: 0;
       }
 
+      &:hover {
+        td:not(.cellSubDataTable):not(.parentComparisonRow) {
+          background-color: @color-silver-l95;
+        }
+      }
+
       &.label + td.column {
         // first column after label should have a bit less padding
         padding-left: 10px;
@@ -481,23 +487,23 @@ table.dataTable {
 div.dataTableVizHtmlTable:not(.dataTableActions),
  div.dataTableVizAllColumns,
  div.dataTableVizGoals {
-  tr.subDataTable > td:first-child::before {
+  tr.subDataTable > td > span.label::before {
     display: inline-block;
     float: left;
     top: 0;
     width: 12px;
     height: 12px;
-    margin-left: -1px;
+    margin-left: -2px;
     margin-top: 3px;
     margin-right: 8px;
     content: '';
   }
 
-  tr.subDataTable:not(.expanded) > td:first-child::before {
+  tr.subDataTable:not(.expanded) > td > span.label::before {
     background-image: url(plugins/Morpheus/images/plus.png);
   }
 
-  tr.subDataTable.expanded > td:first-child::before {
+  tr.subDataTable.expanded > td > span.label::before {
     background-image: url(plugins/Morpheus/images/minus.png);
   }
 }
@@ -520,10 +526,25 @@ div.dataTableVizHtmlTable:not(.dataTableActions),
   }
 }
 
+
 .UserCountryMap-btn-zoom {
   padding-left: 0;
 }
 
+h6.sparkline-title {
+  margin-left: 2px;
+  text-transform: uppercase;
+  font-size: .8em;
+  font-weight: bold;
+  color: #999;
+  margin-bottom: 4px;
+
+  max-width: 95px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow-x: hidden;
+}
+
 div.sparkline {
   display: -ms-flexbox;
   -ms-box-orient: horizontal;
@@ -532,10 +553,11 @@ div.sparkline {
   display: -moz-flex;
   display: -ms-flex;
   display: flex;
-  -webkit-justify-content: space-around;
-  -moz-justify-content: space-around;
-  -ms-justify-content: space-around;
-  justify-content: space-around;
+  -webkit-justify-content: flex-start;
+  -moz-justify-content: flex-start;
+  -ms-justify-content: flex-start;
+  justify-content: flex-start;
+  align-items: center;
   border-bottom: 0;
   margin-bottom: 10px;
 
@@ -547,8 +569,20 @@ div.sparkline {
       border-bottom: 1px dashed #c3c3c3;
     }
   }
+
+  .metric-group-title {
+    display: block;
+    font-size: .7em;
+    text-transform: uppercase;
+    color: #999;
+  }
+
+  .sparkline-metrics {
+    margin-bottom: 4px;
+  }
 }
 
+
 div.sparkline img {
   -webkit-flex-shrink: 0;
   -moz-flex-shrink: 0;
@@ -561,7 +595,6 @@ div.sparkline script + div {
   margin: 1px 0 0 1px;
 }
 
-
 .widgetpreview-base li.widgetpreview-choosen {
   background: @color-silver-l95;
   position: relative;
diff --git a/app/plugins/Morpheus/stylesheets/simple_structure.css b/app/plugins/Morpheus/stylesheets/simple_structure.css
index 3a37b7c8e..f43676d55 100644
--- a/app/plugins/Morpheus/stylesheets/simple_structure.css
+++ b/app/plugins/Morpheus/stylesheets/simple_structure.css
@@ -12,7 +12,7 @@ body#simple {
 #simple .logo {
   color: #888;
   text-align: center;
-  font-size: 12px;
+  font-size: 6px;
   background-color: #3450a3 !important;
   padding: 15px 0;
 }
diff --git a/app/plugins/Morpheus/stylesheets/ui/_charts.less b/app/plugins/Morpheus/stylesheets/ui/_charts.less
index f85008d8d..917fe9bd1 100644
--- a/app/plugins/Morpheus/stylesheets/ui/_charts.less
+++ b/app/plugins/Morpheus/stylesheets/ui/_charts.less
@@ -1,3 +1,132 @@
+// comparison series colors & shades
+.comparison-series-color[data-name=series0] { // series0
+  color: @graph-colors-data-series0;
+}
+
+.comparison-series-color[data-name=series0-shade1] {
+  color: @graph-series0-shade1-color;
+}
+
+.comparison-series-color[data-name=series0-shade2] {
+  color: @graph-series0-shade2-color;
+}
+
+.comparison-series-color[data-name=series0-shade3] {
+  color: @graph-series0-shade3-color;
+}
+
+.comparison-series-color[data-name=series1] { // series1
+  color: @graph-colors-data-series1;
+}
+
+.comparison-series-color[data-name=series1-shade1] {
+  color: @graph-series1-shade1-color;
+}
+
+.comparison-series-color[data-name=series1-shade2] {
+  color: @graph-series1-shade2-color;
+}
+
+.comparison-series-color[data-name=series1-shade3] {
+  color: @graph-series1-shade3-color;
+}
+
+.comparison-series-color[data-name=series2] { // series2
+  color: @graph-colors-data-series2;
+}
+
+.comparison-series-color[data-name=series2-shade1] {
+  color: @graph-series2-shade1-color;
+}
+
+.comparison-series-color[data-name=series2-shade2] {
+  color: @graph-series2-shade2-color;
+}
+
+.comparison-series-color[data-name=series2-shade3] {
+  color: @graph-series2-shade3-color;
+}
+
+.comparison-series-color[data-name=series3] { // series3
+  color: @graph-colors-data-series3;
+}
+
+.comparison-series-color[data-name=series3-shade1] {
+  color: @graph-series3-shade1-color;
+}
+
+.comparison-series-color[data-name=series3-shade2] {
+  color: @graph-series3-shade2-color;
+}
+
+.comparison-series-color[data-name=series3-shade3] {
+  color: @graph-series3-shade3-color;
+}
+
+.comparison-series-color[data-name=series4] { // series4
+  color: @graph-colors-data-series4;
+}
+
+.comparison-series-color[data-name=series4-shade1] {
+  color: @graph-series4-shade1-color;
+}
+
+.comparison-series-color[data-name=series4-shade2] {
+  color: @graph-series4-shade2-color;
+}
+
+.comparison-series-color[data-name=series4-shade3] {
+  color: @graph-series4-shade3-color;
+}
+
+.comparison-series-color[data-name=series5] { // series5
+  color: @graph-colors-data-series5;
+}
+
+.comparison-series-color[data-name=series5-shade1] {
+  color: @graph-series5-shade1-color;
+}
+
+.comparison-series-color[data-name=series5-shade2] {
+  color: @graph-series5-shade2-color;
+}
+
+.comparison-series-color[data-name=series5-shade3] {
+  color: @graph-series5-shade3-color;
+}
+
+.comparison-series-color[data-name=series6] { // series6
+  color: @graph-colors-data-series6;
+}
+
+.comparison-series-color[data-name=series6-shade1] {
+  color: @graph-series6-shade1-color;
+}
+
+.comparison-series-color[data-name=series6-shade2] {
+  color: @graph-series6-shade2-color;
+}
+
+.comparison-series-color[data-name=series6-shade3] {
+  color: @graph-series6-shade3-color;
+}
+
+.comparison-series-color[data-name=series7] { // series7
+  color: @graph-colors-data-series7;
+}
+
+.comparison-series-color[data-name=series7-shade1] {
+  color: @graph-series7-shade1-color;
+}
+
+.comparison-series-color[data-name=series7-shade2] {
+  color: @graph-series7-shade2-color;
+}
+
+.comparison-series-color[data-name=series7-shade3] {
+  color: @graph-series7-shade3-color;
+}
+
 // bar graph colors
 .bar-graph-colors[data-name=grid-background] {
   color: @theme-color-background-contrast;
@@ -12,35 +141,35 @@
 }
 
 .bar-graph-colors[data-name=series1] {
-  color: @graph-colors-data-series1;
+  color: @graph-colors-data-series0;
 }
 
 .bar-graph-colors[data-name=series2] {
-  color: @graph-colors-data-series2;
+  color: @graph-colors-data-series1;
 }
 
 .bar-graph-colors[data-name=series3] {
-  color: @graph-colors-data-series3;
+  color: @graph-colors-data-series2;
 }
 
 .bar-graph-colors[data-name=series4] {
-  color: @graph-colors-data-series4;
+  color: @graph-colors-data-series3;
 }
 
 .bar-graph-colors[data-name=series5] {
-  color: @graph-colors-data-series5;
+  color: @graph-colors-data-series4;
 }
 
-.bar-graph-colors[data-name=series6] {
-  color: @graph-colors-data-series6;
+.bar-graph-colors[data-name=series5] {
+  color: @graph-colors-data-series5;
 }
 
 .bar-graph-colors[data-name=series7] {
-  color: @graph-colors-data-series7;
+  color: @graph-colors-data-series6;
 }
 
 .bar-graph-colors[data-name=series8] {
-  color: @graph-colors-data-series8;
+  color: @graph-colors-data-series7;
 }
 
 .bar-graph-colors[data-name=ticks] {
@@ -61,35 +190,35 @@
 }
 
 .pie-graph-colors[data-name=series1] {
-  color: @graph-colors-data-series1;
+  color: @graph-colors-data-series0;
 }
 
 .pie-graph-colors[data-name=series2] {
-  color: @graph-colors-data-series2;
+  color: @graph-colors-data-series1;
 }
 
 .pie-graph-colors[data-name=series3] {
-  color: @graph-colors-data-series3;
+  color: @graph-colors-data-series2;
 }
 
 .pie-graph-colors[data-name=series4] {
-  color: @graph-colors-data-series4;
+  color: @graph-colors-data-series3;
 }
 
 .pie-graph-colors[data-name=series5] {
-  color: @graph-colors-data-series5;
+  color: @graph-colors-data-series4;
 }
 
 .pie-graph-colors[data-name=series6] {
-  color: @graph-colors-data-series6;
+  color: @graph-colors-data-series5;
 }
 
 .pie-graph-colors[data-name=series7] {
-  color: @graph-colors-data-series7;
+  color: @graph-colors-data-series6;
 }
 
 .pie-graph-colors[data-name=series8] {
-  color: @graph-colors-data-series8;
+  color: @graph-colors-data-series7;
 }
 
 .pie-graph-colors[data-name=ticks] {
@@ -105,35 +234,35 @@
 // evolution graph colors
 
 .evolution-graph-colors[data-name=series1] {
-  color: @graph-colors-data-series1;
+  color: @graph-colors-data-series0;
 }
 
 .evolution-graph-colors[data-name=series2] {
-  color: @graph-colors-data-series2;
+  color: @graph-colors-data-series1;
 }
 
 .evolution-graph-colors[data-name=series3] {
-  color: @graph-colors-data-series3;
+  color: @graph-colors-data-series2;
 }
 
 .evolution-graph-colors[data-name=series4] {
-  color: @graph-colors-data-series4;
+  color: @graph-colors-data-series3;
 }
 
 .evolution-graph-colors[data-name=series5] {
-  color: @graph-colors-data-series5;
+  color: @graph-colors-data-series4;
 }
 
 .evolution-graph-colors[data-name=series6] {
-  color: @graph-colors-data-series6;
+  color: @graph-colors-data-series5;
 }
 
 .evolution-graph-colors[data-name=series7] {
-  color: @graph-colors-data-series7;
+  color: @graph-colors-data-series6;
 }
 
 .evolution-graph-colors[data-name=series8] {
-  color: @graph-colors-data-series8;
+  color: @graph-colors-data-series7;
 }
 
 .evolution-graph-colors[data-name=ticks] {
diff --git a/app/plugins/Morpheus/stylesheets/uibase/_header.less b/app/plugins/Morpheus/stylesheets/uibase/_header.less
index e31cf081d..f9d8d2d19 100644
--- a/app/plugins/Morpheus/stylesheets/uibase/_header.less
+++ b/app/plugins/Morpheus/stylesheets/uibase/_header.less
@@ -2,13 +2,13 @@
 #root {
   #logo {
     padding-left: 16px;
-    padding-top: 4px;
+    padding-top: 6px;
 
     img {
-      max-height: 28px;
+      max-height: 32px;
 
       &.default-piwik-logo {
-        width: 144px;
+        width: 150px;
       }
     }
   }
diff --git a/app/plugins/Morpheus/stylesheets/uibase/_periodSelect.less b/app/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
index 023f27844..f14fc64fd 100644
--- a/app/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
+++ b/app/plugins/Morpheus/stylesheets/uibase/_periodSelect.less
@@ -56,10 +56,6 @@
   padding: 0 0 4px 0;
 }
 
-#periodMore {
-  overflow: hidden;
-}
-
 #periodString .period-date,
 #periodString .period-range {
   padding: 0 16px 0 0;
@@ -77,3 +73,16 @@
 #periodString label.selected-period-label {
   text-decoration: underline;
 }
+
+#periodString .compareCheckbox {
+  transform: scale(.8);
+  margin-left: -29px;
+
+  .form-group {
+    margin: 15px 0 0;
+  }
+
+  label {
+    padding-left: 25px;
+  }
+}
diff --git a/app/plugins/Morpheus/templates/_jsGlobalVariables.twig b/app/plugins/Morpheus/templates/_jsGlobalVariables.twig
index d49738c8f..7f127d5b2 100644
--- a/app/plugins/Morpheus/templates/_jsGlobalVariables.twig
+++ b/app/plugins/Morpheus/templates/_jsGlobalVariables.twig
@@ -22,7 +22,12 @@
 
     {% if idSite is defined %}piwik.idSite = "{{ idSite }}";{% endif %}
 
-    {% if siteName is defined %}piwik.siteName = "{{ siteName|e('js') }}";{% endif %}
+    {% if siteName is defined %}
+    // NOTE: siteName is currently considered deprecated, use piwik.currentSiteName instead, which will not contain HTML entities
+    piwik.siteName = "{{ siteName|e('js') }}";
+    {% if siteNameDecoded is defined %} // just to be safe
+    piwik.currentSiteName = {{ siteNameDecoded|json_encode|raw }};{% endif %}
+    {% endif %}
 
     {% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}";{% endif %}
 
@@ -54,3 +59,4 @@
     piwik.shouldPropagateTokenAuth = {{ shouldPropagateTokenAuth|json_encode|raw }};
     {{ postEvent("Template.jsGlobalVariables") }}
 </script>
+
diff --git a/app/plugins/Morpheus/templates/ajaxMacros.twig b/app/plugins/Morpheus/templates/ajaxMacros.twig
index 4546e4a0a..da40e5bf9 100644
--- a/app/plugins/Morpheus/templates/ajaxMacros.twig
+++ b/app/plugins/Morpheus/templates/ajaxMacros.twig
@@ -31,7 +31,7 @@
 
             {%- if areAdsForProfessionalServicesEnabled %}
                 –
-                {% set supportUrl = 'https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %}
+                {% set supportUrl = 'https://matomo.org/support-plans/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Matomo_App' %}
                 <a rel="noreferrer noopener" target="_blank" href="{{ supportUrl|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
             {%- endif %}.
         </div>
diff --git a/app/plugins/Morpheus/templates/dashboard.twig b/app/plugins/Morpheus/templates/dashboard.twig
index 36b357d3a..1ce02012f 100644
--- a/app/plugins/Morpheus/templates/dashboard.twig
+++ b/app/plugins/Morpheus/templates/dashboard.twig
@@ -51,6 +51,8 @@
 
             <div piwik-popover></div>
 
+            <piwik-comparisons></piwik-comparisons>
+
             {% block content %}
             {% endblock %}
 
diff --git a/app/plugins/MultiSites/MultiSites.php b/app/plugins/MultiSites/MultiSites.php
index 4b7f614e6..c4fbd355f 100644
--- a/app/plugins/MultiSites/MultiSites.php
+++ b/app/plugins/MultiSites/MultiSites.php
@@ -21,10 +21,16 @@ public function registerEvents()
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
-            'Metrics.getDefaultMetricTranslations'  => 'addMetricTranslations'
+            'Metrics.getDefaultMetricTranslations'  => 'addMetricTranslations',
+            'API.getPagesComparisonsDisabledFor'     => 'getPagesComparisonsDisabledFor',
         );
     }
 
+    public function getPagesComparisonsDisabledFor(&$pages)
+    {
+        $pages[] = 'MultiSites.index';
+    }
+
     public function addMetricTranslations(&$translations)
     {
         $appendix = " " . Piwik::translate('MultiSites_Evolution');
diff --git a/app/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/app/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index 2be78996d..5a8eac3aa 100644
--- a/app/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/app/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -67,7 +67,7 @@
                         –
                         <a rel="noreferrer noopener" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
                         <span ng-show="areAdsForProfessionalServicesEnabled"> – </span>
-                        <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer noopener" target="_blank" href="https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
+                        <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer noopener" target="_blank" href="https://matomo.org/support-plans/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Matomo_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
                     </div>
                 </td>
             </tr>
diff --git a/app/plugins/MultiSites/config/config.php b/app/plugins/MultiSites/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/MultiSites/config/config.php
+++ b/app/plugins/MultiSites/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/MultiSites/config/tracker.php b/app/plugins/MultiSites/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/MultiSites/config/tracker.php
+++ b/app/plugins/MultiSites/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/MultiSites/lang/pt-br.json b/app/plugins/MultiSites/lang/pt-br.json
index a38450106..71a861df0 100644
--- a/app/plugins/MultiSites/lang/pt-br.json
+++ b/app/plugins/MultiSites/lang/pt-br.json
@@ -2,7 +2,7 @@
     "MultiSites": {
         "Evolution": "Evolução",
         "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."
+        "PluginDescription": "Veja e compare todos os seus sites e aplicativos neste útil painel 'Todos os sites'.",
+        "TopLinkTooltip": "Comparar estatísticas de Web Analytics de todos os seus sites."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Overlay/Controller.php b/app/plugins/Overlay/Controller.php
index 670819652..98ff9937d 100644
--- a/app/plugins/Overlay/Controller.php
+++ b/app/plugins/Overlay/Controller.php
@@ -177,6 +177,7 @@ public function startOverlaySession()
         $view->mainUrl   = $site['main_url'];
 
         $this->outputCORSHeaders();
+        $view->setUseStrictReferrerPolicy(false);
         Common::sendHeader('Content-Type: text/html; charset=UTF-8');
 
         return $view->render();
diff --git a/app/plugins/Overlay/config/config.php b/app/plugins/Overlay/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Overlay/config/config.php
+++ b/app/plugins/Overlay/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Overlay/config/tracker.php b/app/plugins/Overlay/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Overlay/config/tracker.php
+++ b/app/plugins/Overlay/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Overlay/lang/cs.json b/app/plugins/Overlay/lang/cs.json
index 9f6308fe4..20f5c1e2b 100644
--- a/app/plugins/Overlay/lang/cs.json
+++ b/app/plugins/Overlay/lang/cs.json
@@ -14,6 +14,7 @@
         "OpenFullScreen": "Přejít na celou obrazovku (bez postranní lišty)",
         "Overlay": "Překryv stránky",
         "PluginDescription": "Podívejte se na analytická data jako na překryv na svých stránkách. Zjistěte, kolik uživatelů kliklo na jaký odkaz. Poznámka: vyžaduje povolený zásuvný modul přechodů.",
+        "RedirectUrlError": "Pokoušíte se otevřít překryvnou stránku pro URL \"%1$s\". %2$s Odkaz neodpovídá žádnému z domén v nastavení Matomo.",
         "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:."
     }
diff --git a/app/plugins/Overlay/lang/da.json b/app/plugins/Overlay/lang/da.json
index 31971b96c..3dc68db6c 100644
--- a/app/plugins/Overlay/lang/da.json
+++ b/app/plugins/Overlay/lang/da.json
@@ -14,6 +14,7 @@
         "OpenFullScreen": "Vis fuldskærm (ingen sidebjælke)",
         "Overlay": "Side overlejring",
         "PluginDescription": "Se dine analytiske data som et lag over din aktuelle webside. Se hvor mange gange brugere har klikket på de enkelte links. Note: Kræver at Transitions programtilføjelsen er aktiveret.",
+        "RedirectUrlError": "Du forsøger at åbne sideoverlejring for URL \"%1$s\". %2$s Ingen af ​​domæner fra Matomos 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."
     }
diff --git a/app/plugins/Overlay/lang/es-ar.json b/app/plugins/Overlay/lang/es-ar.json
index f8d56b85c..feff16580 100644
--- a/app/plugins/Overlay/lang/es-ar.json
+++ b/app/plugins/Overlay/lang/es-ar.json
@@ -1,17 +1,21 @@
 {
     "Overlay": {
-        "Clicks": "%s clicks",
-        "ClicksFromXLinks": "%1$s clics desde uno de %2$s links",
+        "Clicks": "%s clics",
+        "ClicksFromXLinks": "%1$s clics desde uno de %2$s enlaces",
         "Domain": "Dominio",
-        "ErrorNotLoading": "La sesión de superposición de página no puede ser aun iniciada.",
-        "ErrorNotLoadingLink": "Clic aquí para obtener más ayuda acerca de soluciones de problemas.",
+        "ErrorNotLoading": "Aún no se pudo lanzar la sesión de superposición de página.",
+        "ErrorNotLoadingDetails": "Quizá la página cargada en la derecha no tiene el código de seguimiento de Matomo. De ser así, intentá lanzando la superposición para una página diferente desde el informe de páginas.",
+        "ErrorNotLoadingDetailsSSL": "Debido a que estás usando Matomo sobre HTTPS, lo más probable es que tu sitio web no soporte SSL. Intentá usar Matomo sobre HTTP.",
+        "ErrorNotLoadingLink": "Hacé clic acá para obtener más ayuda acerca de soluciones de problema.",
         "Link": "Enlace",
         "Location": "Ubicación",
         "NoData": "No hay información para esta página en el período seleccionado.",
         "OneClick": "1 clic",
-        "OpenFullScreen": "Ir a pantalla completa",
+        "OpenFullScreen": "Ir a pantalla completa (sin barra lateral)",
         "Overlay": "Vísta general de página",
-        "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."
+        "PluginDescription": "Mirá tus datos analíticos sobre una superposición en tu sitio web real. Mirá cuántas veces tus usuarios hicieron clic en cada enlace. Nota: requiere que el plugin Transitions esté habilitado.",
+        "RedirectUrlError": "Estás intentando abrir la superposición de página para la dirección web \"%1$s\". %2$s Ninguno de los dominios en la configuración de Matomo coincide con el enlace.",
+        "RedirectUrlErrorAdmin": "Podés agregar el dominio como una dirección web %1$sen la configuración%2$s.",
+        "RedirectUrlErrorUser": "Pedile a tu administrador que agregue el dominio como una dirección web adicional."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Overlay/lang/it.json b/app/plugins/Overlay/lang/it.json
index b1b2012c4..6834fc24a 100644
--- a/app/plugins/Overlay/lang/it.json
+++ b/app/plugins/Overlay/lang/it.json
@@ -4,7 +4,7 @@
         "ClicksFromXLinks": "%1$s clicks per uno di %2$s links",
         "Domain": "Dominio",
         "ErrorNotLoading": "La sessione di Overlay Pagina non può ancora essere lanciata.",
-        "ErrorNotLoadingDetails": "Forse la pagina caricata sulla destra non ha il codice di tracking di Matomo. In questo caso prova ad avviare Overlay per una pagina diversa dal report pagine.",
+        "ErrorNotLoadingDetails": "Forse la pagina caricata sulla destra non ha il codice di tracking di Matomo. In questo caso prova a lanciare Overlay per una pagina diversa dal report pagine.",
         "ErrorNotLoadingDetailsSSL": "Dal momento che si sta utilizzando Matomo su HTTPS, la causa più probabile è che il vostro sito web non supporti SSL. Prova a utilizzare Matomo su HTTP.",
         "ErrorNotLoadingLink": "Ottieni altri suggerimenti sui problemi",
         "Link": "Link",
diff --git a/app/plugins/Overlay/lang/zh-cn.json b/app/plugins/Overlay/lang/zh-cn.json
index 04c9c0d48..26fc5f447 100644
--- a/app/plugins/Overlay/lang/zh-cn.json
+++ b/app/plugins/Overlay/lang/zh-cn.json
@@ -14,6 +14,7 @@
         "OpenFullScreen": "全屏(无边框)",
         "Overlay": "页面叠加",
         "PluginDescription": "请参阅您的分析数据为您的实际网站的叠加。查看有多少次你的用户点击每一个环节上。注：需要在转换插件启用。",
+        "RedirectUrlError": "您正在尝试打开URL“ %1$s”的页面覆盖。 %2$s Matomo设置中的所有域都不匹配该链接。",
         "RedirectUrlErrorAdmin": "您可以在 %1$s管理设置%2$s 中以附加网址添加域名。",
         "RedirectUrlErrorUser": "请管理员以附加网址来添加域名。"
     }
diff --git a/app/plugins/PrivacyManager/PrivacyManager.php b/app/plugins/PrivacyManager/PrivacyManager.php
index d073dd0cd..99deb31fc 100644
--- a/app/plugins/PrivacyManager/PrivacyManager.php
+++ b/app/plugins/PrivacyManager/PrivacyManager.php
@@ -203,6 +203,11 @@ public function setTrackerCacheGeneral(&$cacheContent)
         $config       = new Config();
         $cacheContent = $config->setTrackerCacheGeneral($cacheContent);
         $cacheContent[self::OPTION_USERID_SALT] = self::getUserIdSalt();
+
+        $purgeSettings = PrivacyManager::getPurgeDataSettings();
+        $cacheContent['delete_logs_enable'] = $purgeSettings['delete_logs_enable'];
+        $cacheContent['delete_logs_schedule_lowest_interval'] = $purgeSettings['delete_logs_schedule_lowest_interval'];
+        $cacheContent['delete_logs_older_than'] = $purgeSettings['delete_logs_older_than'];
     }
 
     public function getJsFiles(&$jsFiles)
diff --git a/app/plugins/PrivacyManager/config/config.php b/app/plugins/PrivacyManager/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/PrivacyManager/config/config.php
+++ b/app/plugins/PrivacyManager/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/PrivacyManager/config/tracker.php b/app/plugins/PrivacyManager/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/PrivacyManager/config/tracker.php
+++ b/app/plugins/PrivacyManager/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/PrivacyManager/lang/de.json b/app/plugins/PrivacyManager/lang/de.json
index f02bcc586..c52fc82b2 100644
--- a/app/plugins/PrivacyManager/lang/de.json
+++ b/app/plugins/PrivacyManager/lang/de.json
@@ -3,7 +3,7 @@
         "AnonymizeData": "Daten anonymisieren",
         "AnonymizeIpDescription": "Wählen Sie \"Ja\", wenn Matomo 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 Matomo 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.",
+        "AnonymizeIpExtendedHelp": "Wenn Benutzer Ihre Webseite besuchen, wird Matomo nicht die komplette IP-Adresse (so wie %1$s) benützen, sondern sie stattdessen zuerst anonymisieren (zu %2$s). Die Anonymisierung der IP-Adresse ist in einigen Ländern eine gesetzliche Pflicht, zum Beispiel in Deutschland vorgegeben durch das Datenschutzrecht.",
         "AnonymizeIpMaskLengtDescription": "Wählen Sie aus, wieviele Bytes der Besucher-IP maskiert werden sollen.",
         "AnonymizeIpMaskLength": "%1$s byte(s) - z.B. %2$s",
         "AskingForConsent": "Um Erlaubnis bitten",
@@ -30,7 +30,7 @@
         "DeleteReportsOlderThan": "Lösche Berichte, die älter sind als",
         "DeleteSchedulingSettings": "Löschung alter Daten planen",
         "DeleteDataSettings": "Alte Besucher-Logs und Berichte löschen",
-        "DoNotTrack_Description": "Do-not-Track ist eine Technologie und ein Richtlinienvorschlag, der es Benutzern ermöglichen soll, selbständig zu entscheiden, ob ihr Verhalten von Websites, Werbenetzwerken und Sozialen Netzwerken verfolgt wird.",
+        "DoNotTrack_Description": "Do-not-Track ist eine Technologie und ein Richtlinienvorschlag, der es Benutzern ermöglichen soll, selbständig zu entscheiden, ob ihr Verhalten von Webseiten, Werbenetzwerken und Sozialen Netzwerken verfolgt wird.",
         "DoNotTrack_Disable": "Do-not-Track Unterstützung deaktivieren",
         "DoNotTrack_Disabled": "Matomo verfolgt derzeit das Verhalten aller Besucher, auch derjenigen, die explizit in ihrem Browser \"Ich möchte nicht getrackt werden\" eingestellt haben.",
         "DoNotTrack_DisabledMoreInfo": "Wir empfehlen, die DoNotTrack Unterstützung zu aktivieren, damit die Privatsphäre Ihrer Besucher respektiert wird.",
diff --git a/app/plugins/PrivacyManager/lang/es-ar.json b/app/plugins/PrivacyManager/lang/es-ar.json
index 990340147..cf7b12329 100644
--- a/app/plugins/PrivacyManager/lang/es-ar.json
+++ b/app/plugins/PrivacyManager/lang/es-ar.json
@@ -1,44 +1,90 @@
 {
     "PrivacyManager": {
-        "AnonymizeIpInlineHelp": "Ocultar la dirección IP del visitante para cumplir las leyes\/directrices de privacidad de su localidad.",
-        "AnonymizeIpMaskLengtDescription": "Seleccione cuantos bytes de las direcciones IP de los visitantes deben ser ocultados.",
-        "AnonymizeIpMaskLength": "%1$s byte(s) - ej. %2$s",
-        "ClickHereSettings": "Haga clic aquí para acceder a la configuración de %s",
-        "CurrentDBSize": "Tamaño actual de la base de datso",
-        "DBPurged": "DB purgado.",
-        "DeleteDataInterval": "Borrar antigua información cada",
-        "DeleteLogDescription2": "Cuando habilite la eliminación automática de registros, debe comprobar que todos los reportes diarios previos han sido procesados, de modo que ningún dato es perdido.",
+        "AnonymizeData": "Anonimizar datos",
+        "AnonymizeIpDescription": "Seleccioná \"Sí\" si querés que Matomo no rastre direcciones IP totalmente calificadas.",
+        "AnonymizeIpInlineHelp": "Anonimizá la última parte de las direcciones IP de tus visitantes para cumplir con las guías\/leyes de privacidad local.",
+        "AnonymizeIpExtendedHelp": "Cuando los usuarios visiten tu sitio web, Matomo no usará la dirección IP completa (como %1$s) sino que Matomo la anonimizará primero (a %2$s). La anonimización de dirección IP es uno de los requerimientos establecidos por leyes sobre la privacidad en algunos países como Alemania.",
+        "AnonymizeIpMaskLengtDescription": "Seleccioná cuántos bytes de las direcciones IP de los visitantes deben ser ocultados.",
+        "AnonymizeIpMaskLength": "%1$s byte\/s - ej. %2$s",
+        "AskingForConsent": "Pedir consentimiento",
+        "ClickHereSettings": "Hacé clic acá para acceder a la configuración de %s.",
+        "CurrentDBSize": "Tamaño actual de la base de datos",
+        "DBPurged": "Base da datos purgada.",
+        "DeleteBothConfirm": "Estás a punto de habilitar tanto la eliminación de datos en crudo como la eliminación de datos de informes. Esto quitará permanentemente tu habilidad de ver datos analíticos antiguos. ¿Estás seguro que querés hacer esto?",
+        "DeleteDataDescription": "Podés configurar a Matomo para que regularmente elimine datos crudos antiguos y\/o informes agregados, para mantener chica tu base de datos o para cumplir con regulaciones de privacidad como el GDPR (Reglamento General de Protección de Datos).",
+        "DeleteDataInterval": "Eliminar datos antiguos cada",
+        "DeleteOldVisitorLogs": "Eliminar registros antiguos de visitantes",
+        "DeleteOldRawData": "Eliminar datos crudos antiguos regularmente",
+        "DeleteOldAggregatedReports": "Eliminar datos antiguos de informes agregados",
+        "DeleteLogDescription2": "Cuando habilitás la eliminación automática de registros, tenés que asegurarte que todos los informes diarios previos fueron procesados, de modo que ningún dato se pierde.",
+        "DeleteRawDataInfo": "Los datos en crudo contienen todos los detalles sobre cada visita individual y cada acción que tus visitantes tomaron. Cuando elimines los datos en crudo, la información eliminada no estará más disponible en el registro de visitas. Además, si luego querés crear un segmento, los informes segmentados no estarán disponibles para el marco de tiempo que fue eliminado, ya que todos los informes agregados son generados desde estos datos en crudo.",
+        "DeleteLogsConfirm": "Estás a punto de habilitar la eliminación de datos en crudo. Si se quitan los datos en crudo antiguos y los informes no fueron generados aún, no vas a poder ver los datos analíticos históricos. ¿Estás seguro que querés hacer esto?",
         "DeleteLogsOlderThan": "Eliminar registros más antiguos que",
-        "DeleteMaxRows": "Número máximo de filas que serán eliminadas por cada ejecución",
+        "DeleteMaxRows": "Número máximo de filas para eliminar en una ejecución:",
         "DeleteMaxRowsNoLimit": "sin límites",
-        "DeleteReportsConfirm": "Está disponiendo el borrado de datos de informes. Si un informe antiguo es borrado, tendrá que reprocesarlos nuevamente para visualizarlos. Está seguro que quiere hacer esto?",
-        "DeleteReportsOlderThan": "Borrar informes mayores que",
-        "DeleteDataSettings": "Borrar los registros y reportes de los visitantes antiguos",
-        "DoNotTrack_Description": "Do Not Track es una tecnología y una propuesta política que permite a los usuarios decidir no ser rastreados por sitios de internet que no visitan, tales como servicios analíticos, redes de publicidad y plataformas sociales.",
-        "DoNotTrack_Disable": "Deshabilitado, no da soporte al seguimiento",
-        "DoNotTrack_Enable": "Habilitar soporte a Do Not Track",
-        "DoNotTrack_Enabled": "Actualmente está respetando la privacidad de sus visitantes, ¡Bravo!",
-        "DoNotTrack_SupportDNTPreference": "Soporte a la preferencia Do Not Track",
-        "EstimatedDBSizeAfterPurge": "Tamaño aproximado de la base de datos después de la purga",
-        "EstimatedSpaceSaved": "Espacio estimado guardado",
-        "GeolocationAnonymizeIpNote": "Nota: Geolocalización tendrá aproximadamente los mismos resultados con 1 byte anónimo. Con 2 bytes o más, Geolocalización será imprecisa.",
+        "DeleteReportsConfirm": "Estás a punto de habilitar la eliminación de datos de informes. Si un informe antiguo es borrado, tendrás que reprocesarlos nuevamente para visualizarlos. ¿Estás seguro que querés seguir?",
+        "DeleteAggregateReportsDetailedInfo": "Cuando habilités esta configuración, todos los informes agregados serán eliminados. Los informes agregados son generados desde los datos en crudo y representan datos agregados de varias visitas individuales. Por ejemplo: el informe \"País\" enlista números agregados para saber cuántas visitas tuviste desde cada país.",
+        "KeepBasicMetricsReportsDetailedInfo": "Cuando habilités esta configuración, algunos indicadores numéricos clave no serán eliminados.",
+        "DeleteReportsInfo2": "Si eliminás informes viejos, podrían ser reprocesados de nuevo desde tus datos en crudo cuando los solicités.",
+        "DeleteReportsInfo3": "Si también habilitaste \"%s\", entonces los datos de informes que eliminés se perderán permanentemente.",
+        "DeleteReportsOlderThan": "Eliminar informes más antiguos que",
+        "DeleteSchedulingSettings": "Programar eliminación de datos viejos",
+        "DeleteDataSettings": "Eliminar los registros e informes de los visitantes antiguos",
+        "DoNotTrack_Description": "Do Not Track es una tecnología y una propuesta política que permite a los usuarios decidir no ser rastreados por sitios web que visitan, tales como servicios analíticos, redes de publicidad y plataformas sociales.",
+        "DoNotTrack_Disable": "Deshabilitar el soporte de Do Not Track",
+        "DoNotTrack_Disabled": "Matomo actualmente está rastreando todos los visitantes, incluso cuando especificaron \"No quiero que me persigan\" en sus navegadores web.",
+        "DoNotTrack_DisabledMoreInfo": "Recomendamos habilitar el soporte para \"DoNotTrack\", para así respetar la privacidad de tus visitantes",
+        "DoNotTrack_Enable": "Habilitar el soporte de Do Not Track",
+        "DoNotTrack_Enabled": "Actualmente estás respetando la privacidad de tus visitantes, ¡Bravo!",
+        "DoNotTrack_EnabledMoreInfo": "Cuando los usuarios establecen en sus navegadores web la opción \"No quiero que me persigan\" (esto es, cuando la función \"DoNotTrack\" está habilitada), Matomo no rastreará estas visitas.",
+        "DoNotTrack_SupportDNTPreference": "Soporte de Do Not Track",
+        "EstimatedDBSizeAfterPurge": "Tamaño estimado de la base de datos después de la purga",
+        "EstimatedSpaceSaved": "Espacio ahorrado estimado",
+        "GeolocationAnonymizeIpNote": "Nota: la geolocalización tendrá aproximadamente los mismos resultados con 1 byte anónimo. Con 2 bytes o más, la geolocalización será imprecisa.",
+        "GDPR": "GDPR (Reglamento General de Protección de Datos)",
+        "GdprManager": "Administrador GDPR",
+        "GdprOverview": "Vista general de GDPR",
+        "GdprTools": "Herramientas de GDPR",
         "GetPurgeEstimate": "Obtener estimación de purga",
         "KeepBasicMetrics": "Mantener métricas básicas (visitantes, vistas de páginas, tasa de rebote, conversiones de meta, conversiones de comercio electrónico, etc.)",
-        "KeepReportSegments": "Para mantener la información superior, también mantenga informes segmentados",
+        "KeepDataFor": "Conservar todos los datos de",
+        "KeepReportSegments": "Para mantener la información superior, también mantené informes segmentados",
         "LastDelete": "La última eliminación fue en",
-        "LeastDaysInput": "Por favor, especifique un número de días más grande que %s.",
-        "LeastMonthsInput": "Por favor, especifique un número de meses mayor que %s.",
+        "LeastDaysInput": "Por favor, especificá un número de días mayor que %s.",
+        "LeastMonthsInput": "Por favor, especificá un número de meses mayor que %s.",
         "MenuPrivacySettings": "Privacidad",
         "NextDelete": "La próxima eliminación programada es en",
-        "PurgeNow": "Purgar DB ahora",
-        "PurgeNowConfirm": "Está a punto de borrar información permanentemente de su base de datos. Está seguro que quiere continuar?",
-        "PurgingData": "Purgando información...",
+        "PluginDescription": "Aumentá la privacidad de todos tus usuarios y hacé que tu instancia de Matomo sea compatible con las normas de privacidad de tu legislación local.",
+        "PurgeNow": "Purgar base de datos ahora",
+        "PurgeNowConfirm": "Estás a punto de eliminar datos permanentemente de tu base de datos. ¿Estás seguro que querés continuar?",
+        "PurgingData": "Purgando datos…",
+        "RecommendedForPrivacy": "Recomendado para la 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": "See also our official guide: %1$sWeb Analytics Privacy%2$s",
-        "TeaserHeadline": "Configuración de Privacidad",
-        "UseAnonymizedIpForVisitEnrichment": "Also use the Anonymized IP addresses when enriching visits.",
-        "UseAnonymizeIp": "Hacer anónimas las direcciones IP de los visitantes",
-        "UseDeleteReports": "Regularmente borre los reportes antiguos de la base de datos"
+        "SaveSettingsBeforePurge": "Cambiaste la configuración de eliminación de datos. Por favor, guardalas antes de iniciar la purga.",
+        "SeeAlsoOurOfficialGuidePrivacy": "También lee nuestra guía oficial: %1$sPrivacidad de los análisis web%2$s",
+        "TeaserHeader": "En esta página, podés personalizar Matomo para que sea compatible con las legislaciones existentes, al: %1$sanonimizar la dirección IP del visitante%2$s, %3$sautomáticamente eliminar registros antiguos de visitas de la base de datos%4$s y %5$sanonimizar los datos crudos de usuarios previamente rastreados%6$s.",
+        "TeaserHeadline": "Configuración de privacidad",
+        "UseAnonymizedIpForVisitEnrichment": "También usá las direcciones IP anonimizadas al enriquecer visitas.",
+        "UseAnonymizedIpForVisitEnrichmentNote": "Plugins como Geo Location vía dirección IP y proveedor mejoran los metadatos del visitante. Predeterminadamente, estos plugins usan las direcciones IP anonimizadas. Si seleccionás \"No\", entonces se usará la dirección IP completa, sin anonimizar, resultando en menos privacidad, pero con datos más precisos.",
+        "PseudonymizeUserIdNote": "Cuando habilités esta opción, la identificación del usuario será reemplazada por un pseudónimo para evitar almacenamiento directo y visualización personalmente identificable como una dirección de correo electrónico. En términos técnicos: dado tu identificación de usuario, Matomo procesará el pseudónimo de identificación de usuario usando una función hash salteada.",
+        "PseudonymizeUserIdNote2": "Nota: reemplazar con un pseudónimo no es lo mismo que la anonimización. En términos del Reglamento General de Protección de Datos: el pseudónimo de identificación de usuario todavía cuenta como datos personales. La identificación original de usuario todavía podría ser identificable si hay cierta información adicional disponible (la cual sólo Matomo y tu procesador de datos tienen acceso).",
+        "AnonymizeOrderIdNote": "Debido a que una identificación de orden puede ser consultado con otro sistema —normalmente, un local de comercio electrónico—, la identificación de orden puede contar como información personal bajo el GDPR. Cuando habilités esta opción, una identificación de orden se anonimizará automáticamente así no se rastrea ninguna información personal.",
+        "UseAnonymizeIp": "Anonimizar las direcciones IP de los visitantes",
+        "UseAnonymizeTrackingData": "Anonimizar datos de rastreo",
+        "UseAnonymizeUserId": "Anonimizar identificación del usuario",
+        "PseudonymizeUserId": "Reemplazar identificación del usuario con un pseudónimo",
+        "UseAnonymizeOrderId": "Anonimizar identificación de orden",
+        "UseDeleteLog": "Eliminar los datos crudos antiguos de la base de datos regularmente",
+        "UseDeleteReports": "Eliminar los informes antiguos de la base de datos regularmente",
+        "UsersOptOut": "Excepción de los usuarios",
+        "PrivacyPolicyUrl": "Dirección web de la política de privacidad",
+        "PrivacyPolicyUrlDescription": "Un enlace a tu página de política de privacidad.",
+        "TermsAndConditionUrl": "Dirección web de los términos y condiciones.",
+        "TermsAndConditionUrlDescription": "Un enlace a tu página de los términos y condiciones del servicio.",
+        "PrivacyPolicyUrlDescriptionSuffix": "Si establecés esto, se mostrará en la parte inferior de la página de inicio de sesión y en las páginas en las que el usuario \"%1$s\" pueda acceder.",
+        "ShowInEmbeddedWidgets": "Mostrar en widgets insertados",
+        "ShowInEmbeddedWidgetsDescription": "Si está seleccionado, se mostrará un enlace a tu política de privacidad y términos y condiciones en la parte inferior de los widgets insertados.",
+        "PrivacyPolicy": "Política de privacidad",
+        "TermsAndConditions": "Términos y condiciones"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/PrivacyManager/lang/fr.json b/app/plugins/PrivacyManager/lang/fr.json
index ecee270c2..fabaa59e3 100644
--- a/app/plugins/PrivacyManager/lang/fr.json
+++ b/app/plugins/PrivacyManager/lang/fr.json
@@ -70,7 +70,7 @@
         "PseudonymizeUserIdNote2": "Note : remplacer par un pseudonyme n'est pas identique à une anonymisation des données. Dans les termes énoncés par RGPD : un pseudonyme identifiant l'utilisateur compte toujours comme une données personnelle. L'identifiant utilisateur originel pourrait toujours être identifié si certaines informations complémentaires étaient disponibles (auxquelles uniquement Matomo et votre traitement de données ont accès).",
         "AnonymizeOrderIdNote": "Parce qu'un identifiant de commande peut être référencé au travers de plusieurs systèmes, typiquement un magasin de commerce électronique, l'identifiant de commande pourrait compter comme donnée personnelle pour RGPD. En sélectionnant cette option, un identifiant de commande va être automatiquement anonymisé de sorte qu'aucune information personnelle ne sera enregistrée.",
         "UseAnonymizeIp": "Rendre anonymes les adresses IP des visiteurs",
-        "UseAnonymizeTrackingData": "Anonymiser les données de suivit",
+        "UseAnonymizeTrackingData": "Anonymiser les données de suivi",
         "UseAnonymizeUserId": "Anonymiser l'identifiant utilisateur",
         "PseudonymizeUserId": "Remplacer l'identifiant utilisateur par un pseudonyme",
         "UseAnonymizeOrderId": "Anonymiser l'identifiant de la commande",
diff --git a/app/plugins/PrivacyManager/lang/pt-br.json b/app/plugins/PrivacyManager/lang/pt-br.json
index 418458b49..1b96386ad 100644
--- a/app/plugins/PrivacyManager/lang/pt-br.json
+++ b/app/plugins/PrivacyManager/lang/pt-br.json
@@ -1,51 +1,90 @@
 {
     "PrivacyManager": {
-        "AnonymizeIpDescription": "Selecione \"Sim\" se você quer que o Matomo não rastreie 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.",
-        "AnonymizeIpMaskLengtDescription": "Selecione quantos bytes de IPs dos visitantes deve ser mascarado.",
+        "AnonymizeData": "Anonimizar dados",
+        "AnonymizeIpDescription": "Selecione \"Sim\" se você quer que o Matomo não rastreie endereços IP totalmente qualificados.",
+        "AnonymizeIpInlineHelp": "Anonimizar o(s) último(s) byte(s) do endereço IP dos visitantes para obedecer suas leis\/guias locais de privacidade.",
+        "AnonymizeIpExtendedHelp": "Quando usuários visitam o seu site, o Matomo não usará o endereço IP completo (como %1$s) e no lugar o Matomo irá primeiro anonimizá-lo (para %2$s). A anonimização de endereço IP é um dos requisitos definidos pelas leis de privacidade em alguns países como Alemanha.",
+        "AnonymizeIpMaskLengtDescription": "Selecione quantos bytes dos IPs dos visitantes devem ser mascarados.",
         "AnonymizeIpMaskLength": "%1$s byte(s) - e.g. %2$s",
+        "AskingForConsent": "Pedir consentimento",
         "ClickHereSettings": "Clique aqui para acessar as configurações do %s.",
-        "CurrentDBSize": "Tamanho atual do banco de dados",
-        "DBPurged": "DB purgado.",
-        "DeleteDataInterval": "Excluir dados antigoa a cada",
-        "DeleteOldVisitorLogs": "Apagar logs de antigos visitantes",
-        "DeleteLogDescription2": "Quando você habilitar a exclusão automática de log, você deve garantir que todos os relatórios anteriores diários tenham sido processados​​, de modo que nenhum dado seja perdido.",
-        "DeleteLogsOlderThan": "Excluir logs mais velhos que",
-        "DeleteMaxRows": "O número máximo de linhas a serem excluídos em uma execução:",
+        "CurrentDBSize": "Tamanho atual da base de dados",
+        "DBPurged": "BD purgada.",
+        "DeleteBothConfirm": "Você está prestes a habilitar tanto a exclusão de dados brutos como a exclusão de dados de relatórios. Isto irá remover permanentemente sua capacidade de visualizar dados antigos de análises. Você tem certeza de que deseja fazer isto?",
+        "DeleteDataDescription": "Você pode configurar o Matomo para excluir regularmente dados brutos antigos e\/ou relatórios agregados para manter sua base de dados pequena ou para atender regulamentações de privacidade como a GDPR.",
+        "DeleteDataInterval": "Excluir dados antigos a cada",
+        "DeleteOldVisitorLogs": "Excluir logs antigos de visitantes",
+        "DeleteOldRawData": "Excluir regularmente dados brutos antigos",
+        "DeleteOldAggregatedReports": "Excluir dados de relatórios agregados antigos",
+        "DeleteLogDescription2": "Quando você habilita a exclusão automática de logs, você deve garantir que todos os relatórios diários anteriores tenham sido processados​​, para que nenhum dado seja perdido.",
+        "DeleteRawDataInfo": "Os dados brutos contêm todos os detalhes sobre cada visita individual e cada ação tomada por seus visitantes. Quando você exclui dados brutos, as informações excluídas não estarão mais disponíveis no log de visitantes. Além disso, se depois você decidir criar um segmento, os relatórios segmentados não estarão disponíveis para o período que foi excluído já que todos os relatórios agregados são gerados a partir de dados brutos.",
+        "DeleteLogsConfirm": "Você está prestes a habilitar a exclusão de dados brutos. Se dados brutos antigos forem excluídos e relatórios ainda não tiverem sido criados, você não conseguirá ver dados de análises históricas passadas. Você tem certeza que deseja fazer isto?",
+        "DeleteLogsOlderThan": "Excluir logs mais antigos que",
+        "DeleteMaxRows": "Número máximo de linhas a serem excluídas 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?",
-        "DeleteReportsOlderThan": "Apagar relatórios com mais de",
-        "DeleteSchedulingSettings": "Agendar eliminação de dados antigos",
+        "DeleteAggregateReportsDetailedInfo": "Quando você habilitar esta configuração, todos os relatórios agregados serão excluídos. Relatórios agregados são gerados a partir dos dados brutos e representam dados agregados de diversas visitas individuais. Por exemplo, o relatório \"País\" lista números agregados para ver quantas visitas você teve de cada país.",
+        "KeepBasicMetricsReportsDetailedInfo": "Quando você habilitar esta configuração, alguns indicadores-chave de desempenho numéricos não serão excluídos.",
+        "DeleteReportsInfo2": "Se você excluir relatórios antigos, eles podem ser reprocessados novamente a partir dos dados brutos quando você solicitá-los.",
+        "DeleteReportsInfo3": "Se você também tiver habilitado \"%s\", então os dados de relatórios que você excluir serão permanentemente perdidos.",
+        "DeleteReportsOlderThan": "Excluir relatórios mais antigos que",
+        "DeleteSchedulingSettings": "Agendar exclusão de dados antigos",
         "DeleteDataSettings": "Excluir logs de visitantes e relatórios antigos",
-        "DoNotTrack_Description": "Do Not Track é uma tecnologia e proposta de política que permite aos usuários optar por não ser rastreado por sites que não visitam, incluindo serviços de análise, redes de publicidade e plataformas sociais.",
-        "DoNotTrack_Disable": "Desabilitar o suporte Do Not Track",
-        "DoNotTrack_Enable": "Ativar suporte para 'Não rastrear'",
-        "DoNotTrack_Enabled": "Você está respeitando a sua privacidade usuários, Bravo!",
-        "DoNotTrack_SupportDNTPreference": "Preferencias do suporte Do Not Track",
-        "EstimatedDBSizeAfterPurge": "Tamanho do banco estimado após purge",
+        "DoNotTrack_Description": "Não Rastrear é uma tecnologia e proposta de política que permite aos usuários optarem por não serem rastreados por sites que visitam, incluindo serviços de análise, redes de publicidade e plataformas sociais.",
+        "DoNotTrack_Disable": "Desabilitar o suporte a Não Rastrear",
+        "DoNotTrack_Disabled": "O Matomo atualmente está rastreando todos os visitantes, mesmo quando eles especificam \"Eu não quero ser rastreado\" em seus navegadores web.",
+        "DoNotTrack_DisabledMoreInfo": "Nós recomendamos habilitar o suporte a Não Rastrear para respeitar a privacidade dos seus visitantes.",
+        "DoNotTrack_Enable": "Habilitar suporte a Não Rastrear",
+        "DoNotTrack_Enabled": "Você atualmente está respeitando a privacidade dos seus usuários, parabéns!",
+        "DoNotTrack_EnabledMoreInfo": "Quando os usuários definirem \"Eu não quero ser rastreado\" em seus navegadores web (Não Rastrear está habilitado) então o Matomo não irá rastrear estas visitas.",
+        "DoNotTrack_SupportDNTPreference": "Preferências do suporte a Não Rastrear",
+        "EstimatedDBSizeAfterPurge": "Tamanho estimado da base de dados após expurgação",
         "EstimatedSpaceSaved": "Espaço estimado salvo",
-        "GeolocationAnonymizeIpNote": "Nota: Geolocation terá aproximadamente os mesmos resultados com um byte anónimos. Com dois bytes ou mais, Geolocation será impreciso.",
+        "GeolocationAnonymizeIpNote": "Obs: A geolocalização terá aproximadamente os mesmos resultados com 1 byte anonimizado. Com 2 bytes ou mais, a geolocalização será imprecisa.",
         "GDPR": "GDPR",
-        "GdprManager": "Gerenciar GDPR",
-        "GetPurgeEstimate": "Obter estimativa de purge",
-        "KeepBasicMetrics": "Mantenha métricas básicas (visitas, exibições de página, taxa de rejeição, conversões de meta, conversões de comércio eletrônico, etc)",
-        "KeepDataFor": "Manter todos os dados para",
-        "KeepReportSegments": "Para dados mantidos acima, também manter relatórios segmentados",
+        "GdprManager": "Gerenciador GDPR",
+        "GdprOverview": "Visão geral da GDPR",
+        "GdprTools": "Ferramentas GDPR",
+        "GetPurgeEstimate": "Obter estimativa de expurgação",
+        "KeepBasicMetrics": "Manter métricas básicas (visitas, exibições de página, taxa de rejeição, conversões de meta, conversões de comércio eletrônico, etc.)",
+        "KeepDataFor": "Manter todos os dados por",
+        "KeepReportSegments": "Para os dados mantidos acima, também manter relatórios segmentados",
         "LastDelete": "Última deleção foi em",
         "LeastDaysInput": "Por favor, especifique um número de dias maior do que %s.",
         "LeastMonthsInput": "Por favor, especifique um número de meses maior que %s.",
         "MenuPrivacySettings": "Privacidade",
         "NextDelete": "Próxima exclusão agendada em",
+        "PluginDescription": "Aumente a privacidade para seus usuários e deixe a sua instância Matomo em conformidade de privacidade com a sua legislação local.",
         "PurgeNow": "Purge DB Agora",
         "PurgeNowConfirm": "Você está prestes a excluir permanentemente os dados de seu banco de dados. Tem certeza de que quer continuar?",
         "PurgingData": "Purgando dados...",
         "RecommendedForPrivacy": "Recomendado para privacidade",
-        "ReportsDataSavedEstimate": "Tamanho do banco de dados",
+        "ReportsDataSavedEstimate": "Tamanho da base 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: %1$sWeb Analytics Privacy%2$s",
+        "SeeAlsoOurOfficialGuidePrivacy": "Veja também nosso guia oficial: %1$sPrivacidade de Web Analytics%2$s",
+        "TeaserHeader": "Nesta página você pode personalizar o Matomo para deixá-lo em conformidade com legislações existentes: %1$s anonimizando o IP do visitante%2$s,%3$s removendo automaticamente da base de dados logs antigos de visitantes%4$s, e %5$s anonimizando dados brutos de usuários anteriormente rastreados%6$s.",
         "TeaserHeadline": "Configurações de privacidade",
         "UseAnonymizedIpForVisitEnrichment": "Utilize também o endereço de IP Anonimizado ao enriquecer visitas.",
+        "UseAnonymizedIpForVisitEnrichmentNote": "Plugins como Geolocalização via IP e Provedor melhoram os metadados de visitantes. Por padrão, estes plugins usam os endereços IP anonimizados. Se você selecionar 'Não', então o endereço IP completo não-anonimizado será usado nesse caso, resultando em menos privacidade mas melhor precisão dos dados.",
+        "PseudonymizeUserIdNote": "Quando você habilita esta opção, o ID de usuário será substituído por um pseudônimo para evitar armazenar e exibir diretamente informações de identificação pessoal como um endereço de e-mail. Em termos técnicos: dado o seu ID de usuário, o Matomo irá processar o pseudônimo do ID de usuário usando uma função de hash com sal.",
+        "PseudonymizeUserIdNote2": "Obs: substituir por um pseudônimo não é o mesmo que anonimização. Em termos da GDPR: o pseudônimo do ID de usuário ainda conta como dado pessoal. O ID de usuário original ainda pode ser identificado se certas informações adicionais estiverem disponíveis (às quais apenas o Matomo e o seu processador de dados têm acesso).",
+        "AnonymizeOrderIdNote": "Como um ID de pedido pode ser cruzado com outro sistema, tipicamente uma loja de comércio eletrônico, o ID de pedido pode contar como informação pessoal sob a GDPR. Quando você habilita esta opção, um ID de pedido será automaticamente anonimizado para que nenhuma informação pessoal seja rastreada.",
         "UseAnonymizeIp": "Anonimizar endereços IP dos visitantes",
-        "UseDeleteReports": "Exclua regularmente relatórios antigos do banco de dados"
+        "UseAnonymizeTrackingData": "Anonimizar dados de rastreamento",
+        "UseAnonymizeUserId": "Anonimizar ID de usuário",
+        "PseudonymizeUserId": "Substituir ID de usuário por um pseudônimo",
+        "UseAnonymizeOrderId": "Anonimizar ID do pedido",
+        "UseDeleteLog": "Excluir regularmente dados brutos antigos da base de dados",
+        "UseDeleteReports": "Excluir regularmente relatórios antigos da base de dados",
+        "UsersOptOut": "Usuários não participarem",
+        "PrivacyPolicyUrl": "URL da Política de Privacidade",
+        "PrivacyPolicyUrlDescription": "Um link para a sua página de Política de Privacidade.",
+        "TermsAndConditionUrl": "URL dos Termos & Condições",
+        "TermsAndConditionUrlDescription": "Um link para a sua página de Termos & Condições.",
+        "PrivacyPolicyUrlDescriptionSuffix": "Se você definir isto, será exibido no rodapé da página de login e nas páginas que o usuário '%1$s' pode acessar.",
+        "ShowInEmbeddedWidgets": "Mostrar em widgets embutidos",
+        "ShowInEmbeddedWidgetsDescription": "Se marcado, um link para sua Política de Privacidade e para seus Termos & Condições serão exibidos no rodapé dos widgets embutidos.",
+        "PrivacyPolicy": "Política de Privacidade",
+        "TermsAndConditions": "Termos & Condições"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/PrivacyManager/lang/pt.json b/app/plugins/PrivacyManager/lang/pt.json
index f84be32c8..e26ac8a77 100644
--- a/app/plugins/PrivacyManager/lang/pt.json
+++ b/app/plugins/PrivacyManager/lang/pt.json
@@ -3,6 +3,7 @@
         "AnonymizeData": "Anonimizar dados",
         "AnonymizeIpDescription": "Selecione \"Sim\" se pretende que o Matomo não acompanhe os endereços de IP totalmente qualificados.",
         "AnonymizeIpInlineHelp": "Torna o(s) último(s) byte(s) dos endereços IP dos visitantes anónimo(s) para obedecer às suas leis\/regulamentos de privacidade locais.",
+        "AnonymizeIpExtendedHelp": "Quando os utilizadores visitarem o seu site, ao invés de utilizar o endereço de IP completo (por exemplo %1$s), o Matomo irá primeiro anonimizar o endereço de IP (para %2$s). A anonimização de IP é um dos requisitos definidos nas leis de privacidade em determinados países, como a Alemanha.",
         "AnonymizeIpMaskLengtDescription": "Selecione quantos bytes dos IPs dos visitantes devem ser mascarados.",
         "AnonymizeIpMaskLength": "%1$s byte(s) - por exemplo %2$s",
         "AskingForConsent": "Solicitando consentimento",
@@ -32,6 +33,7 @@
         "DoNotTrack_Description": "Do Not Track é uma proposta de tecnologia e de política que permite que os utilizadores optem por não serem acompanhados pelos sites que visitam, incluindo serviços de analytics, redes de publicidade e plataformas sociais.",
         "DoNotTrack_Disable": "Desativar o suporte ao Do Not Track",
         "DoNotTrack_Disabled": "O Matomo está atualmente a acompanhar todos os visitantes, mesmo quando estes especificaram \"Eu não pretendo ser acompanhado\" nos seus navegadores.",
+        "DoNotTrack_DisabledMoreInfo": "Recomendamos que ative o suporte ao DoNotTrack de modo a respeitar a privacidade dos seus visitantes",
         "DoNotTrack_Enable": "Ativar o suporte ao Do Not Track",
         "DoNotTrack_Enabled": "Atualmente está a respeitar a privacidade dos seus utilizadores. Excelente!",
         "DoNotTrack_EnabledMoreInfo": "Quando os utilizadores têm o seu navegador configurado para \"Eu não quero ser acompanhado\" (o DoNotTrack está ativo), então o Matomo não irá acompanhar estas visitas.",
@@ -60,10 +62,13 @@
         "ReportsDataSavedEstimate": "Tamanho da base de dados",
         "SaveSettingsBeforePurge": "Alterou as definições de eliminação de dados. Por favor, guarde estas definições antes de iniciar uma limpeza.",
         "SeeAlsoOurOfficialGuidePrivacy": "Consulte também o nosso guia oficial: %1$sPrivacidade em Web Analytics%2$s",
+        "TeaserHeader": "Nesta página, pode configurar o Matomo de forma a que este esteja em conformidade com a legislação vigente, através: %1$sda anonimização do IP do visitante %2$s, %3$sremoção automática de registos antigos dos visitantes da base de dados %4$s, e %5$s da anonimização dos dados em bruto previamente acompanhados dos utilizadores %6$s.",
         "TeaserHeadline": "Definições de privacidade",
         "UseAnonymizedIpForVisitEnrichment": "Também utilizamos os endereços de IP anonimizados ao enriquecer as visitas.",
+        "UseAnonymizedIpForVisitEnrichmentNote": "As extensões como a Geolocalização via IP e Fornecedor enriquecem os meta-dados dos visitantes. Por defeito, estas extensões utilizam os endereços de IP anonimizados. Ao selecionar \"Não\", o endereço de IP completo e não-anonimizado passará a ser utilizado, resultando assim numa menor privacidade mas numa melhor fiabilidade dos dados.",
         "PseudonymizeUserIdNote": "Quando ativa esta opção, o ID de utilizador será substituído por um pseudónimo para evitar o armazenamento e a apresentação direta de informação pessoal identificável, tal como o endereço de e-mail. Em termos técnicos: com base no seu ID de utilizador, o Matomo irá processar o pseudónimo do ID de utilizador utilizando uma função hash com salt.",
         "PseudonymizeUserIdNote2": "Nota: a substituição com um pseudónimo não é o mesmo que anonimização. Nos termos do RGPD: o pseudónimo do ID de utilizador ainda é considerado dado pessoal. O ID de utilizador ainda pode ser identificado se determinadas informações adicionais estiverem disponíveis (a que apenas o Matomo e o seu processador de dados têm acesso).",
+        "AnonymizeOrderIdNote": "Dado que um ID de um pedido pode ser cruzado com outro sistema, habitualmente uma loja de comércio eletrónico, o ID de um pedido pode ser considerado como informação pessoal segundo o RGPD. Ao ativar esta opção, o ID de um pedido será automaticamente anonimizado, impedindo assim o registo de qualquer informação pessoal.",
         "UseAnonymizeIp": "Anonimizar os endereços IP dos visitantes",
         "UseAnonymizeTrackingData": "Anonimizar as informações de acompanhamento",
         "UseAnonymizeUserId": "Anonimizar ID de utilizador",
diff --git a/app/plugins/PrivacyManager/lang/ru.json b/app/plugins/PrivacyManager/lang/ru.json
index 321c7893f..4e85d1e6d 100644
--- a/app/plugins/PrivacyManager/lang/ru.json
+++ b/app/plugins/PrivacyManager/lang/ru.json
@@ -1,6 +1,7 @@
 {
     "PrivacyManager": {
         "AnonymizeData": "Анонимизировать данные",
+        "AnonymizeIpDescription": "Выберите «Да», если вы хотите, чтобы Matomo не отслеживал полностью определенные IP-адреса.",
         "AnonymizeIpInlineHelp": "Скрыть последний байт IP-адресов ваших посетителей согласно вашим принципам конфиденциальности или законодательству.",
         "AnonymizeIpMaskLengtDescription": "Выберите, как много байтов IP-адреса посетителей должно быть скрыто.",
         "AnonymizeIpMaskLength": "%1$s байт(ов), например, %2$s",
@@ -8,6 +9,9 @@
         "CurrentDBSize": "Текущий размер базы данных",
         "DBPurged": "База данных очищена.",
         "DeleteDataInterval": "Удалять старые данные каждые",
+        "DeleteOldVisitorLogs": "Удалить старые журналы посетителей",
+        "DeleteOldRawData": "Регулярно удаляйте старые необработанные данные",
+        "DeleteOldAggregatedReports": "Удалить старые агрегированные данные отчета",
         "DeleteLogDescription2": "Если вы используете автоматическое удаление логов, убедитесь, что все предыдущие отчеты за день были обработаны, чтобы не потерять ни каких данных.",
         "DeleteLogsOlderThan": "Удалить логи, старше чем",
         "DeleteMaxRows": "Максимальное число строк для удаления за один раз:",
@@ -23,6 +27,7 @@
         "EstimatedDBSizeAfterPurge": "Ожидаемый размер базы данных после чистки",
         "EstimatedSpaceSaved": "Ожидаемый сохраненный размер space saved",
         "GeolocationAnonymizeIpNote": "Подсказка: Геолоакция будет иметь практически те же результаты с 1 скрытым байтом IP адреса. Если скрыто два или более байтов, геолокация будет определять местонахождене пользователя неточно.",
+        "GDPR": "GDPR",
         "GetPurgeEstimate": "Оценить очистку базы по времени",
         "KeepBasicMetrics": "Сохранить основные показатели (посещения, просмотры страниц, процент отскоков, конверсию целей, конверсию эл. заказов и др.)",
         "KeepDataFor": "Сохранить данные для",
@@ -44,6 +49,9 @@
         "UseAnonymizeTrackingData": "Анонимизировать данные отслеживания",
         "PseudonymizeUserId": "Заменить ID пользователя всевдонимом",
         "UseAnonymizeOrderId": "Анонимизировать ID заказа",
-        "UseDeleteReports": "Всегда удалять старые отчеты из баз данных"
+        "UseDeleteReports": "Всегда удалять старые отчеты из баз данных",
+        "ShowInEmbeddedWidgets": "Показать во встроенных виджетах",
+        "PrivacyPolicy": "Политика конфиденциальности",
+        "TermsAndConditions": "Условия использования"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ProfessionalServices/config/config.php b/app/plugins/ProfessionalServices/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/ProfessionalServices/config/config.php
+++ b/app/plugins/ProfessionalServices/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/ProfessionalServices/config/tracker.php b/app/plugins/ProfessionalServices/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/ProfessionalServices/config/tracker.php
+++ b/app/plugins/ProfessionalServices/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Provider/config/config.php b/app/plugins/Provider/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Provider/config/config.php
+++ b/app/plugins/Provider/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Provider/config/tracker.php b/app/plugins/Provider/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Provider/config/tracker.php
+++ b/app/plugins/Provider/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Provider/lang/es-ar.json b/app/plugins/Provider/lang/es-ar.json
index 05caa3f39..99b3c2dcf 100644
--- a/app/plugins/Provider/lang/es-ar.json
+++ b/app/plugins/Provider/lang/es-ar.json
@@ -2,6 +2,7 @@
     "Provider": {
         "ColumnProvider": "Proveedor",
         "PluginDescription": "Informa el proveedor de Internet de los visitantes.",
+        "ProviderReportDocumentation": "Este informe muestra qué proveedores de Internet (ISPs) usan tus visitantes para acceder al sitio web. Podés hacer clic en el nombre de un proveedor para más detalles. %s Si Matomo no puede determinar el proveedor de un visitante, se mostrará la IP.",
         "WidgetProviders": "Proveedores",
         "ProviderReportFooter": "Un proveedor desconocido significa que la dirección IP no pudo ser resuelta."
     }
diff --git a/app/plugins/Provider/lang/zh-cn.json b/app/plugins/Provider/lang/zh-cn.json
index 87f207c3e..864aca4ab 100644
--- a/app/plugins/Provider/lang/zh-cn.json
+++ b/app/plugins/Provider/lang/zh-cn.json
@@ -1,7 +1,9 @@
 {
     "Provider": {
         "ColumnProvider": "网络服务商",
+        "PluginDescription": "报告访问者的Internet服务提供商。",
         "ProviderReportDocumentation": "本报表显示访客的网络服务商。点击服务商名字查看详细资料。%s 如果 Matomo 无法判断访客的网络服务商，就列出IP地址。",
-        "WidgetProviders": "网络服务商"
+        "WidgetProviders": "网络服务商",
+        "ProviderReportFooter": "未知的提供程序意味着无法查找IP地址。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Proxy/config/config.php b/app/plugins/Proxy/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Proxy/config/config.php
+++ b/app/plugins/Proxy/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Proxy/config/tracker.php b/app/plugins/Proxy/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Proxy/config/tracker.php
+++ b/app/plugins/Proxy/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Referrers/API.php b/app/plugins/Referrers/API.php
index dadd58945..dd5d223c8 100644
--- a/app/plugins/Referrers/API.php
+++ b/app/plugins/Referrers/API.php
@@ -14,9 +14,13 @@
 use Piwik\Archive;
 use Piwik\Common;
 use Piwik\DataTable;
+use Piwik\DataTable\Filter\ColumnCallbackAddColumnPercentage;
 use Piwik\Date;
+use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\Plugin\ReportsProvider;
 use Piwik\Plugins\Referrers\DataTable\Filter\GroupDifferentSocialWritings;
+use Piwik\Plugins\Referrers\Reports\Get;
 use Piwik\Site;
 
 /**
@@ -30,6 +34,50 @@
  */
 class API extends \Piwik\Plugin\API
 {
+    public function get($idSite, $period, $date, $segment = false, $columns = false)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+
+        $dataTableReferrersType = $this->getReferrerType($idSite, $period, $date, $segment);
+        $dataTable = $this->createReferrerTypeTable($dataTableReferrersType);
+
+        $archive = Archive::build($idSite, $period, $date, $segment);
+
+        $numericArchives = $archive->getDataTableFromNumeric([
+            Archiver::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_SOCIAL_NETWORK_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_KEYWORD_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_WEBSITE_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_URLS_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME,
+        ]);
+        $this->mergeNumericArchives($dataTable, $numericArchives);
+
+        $totalVisits = array_sum($dataTableReferrersType->getColumn(Metrics::INDEX_NB_VISITS));
+
+        $percentColumns = [
+            'Referrers_visitorsFromDirectEntry',
+            'Referrers_visitorsFromSearchEngines',
+            'Referrers_visitorsFromCampaigns',
+            'Referrers_visitorsFromSocialNetworks',
+            'Referrers_visitorsFromWebsites',
+        ];
+        foreach ($percentColumns as $column) {
+            $dataTable->filter(ColumnCallbackAddColumnPercentage::class, [
+                $column . '_percent',
+                $column,
+                $totalVisits
+            ]);
+        }
+
+        if (!empty($requestedColumns)) {
+            $requestedColumns = Piwik::getArrayFromApiParameter($columns);
+            $dataTable->filter(DataTable\Filter\ColumnDelete::class, [[], $requestedColumns]);
+        }
+
+        return $dataTable;
+    }
+
     /**
      * @param string $name
      * @param int $idSite
@@ -352,7 +400,9 @@ public function getUrlsFromWebsiteId($idSite, $period, $date, $idSubtable, $segm
         Piwik::checkUserHasViewAccess($idSite);
         $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'));
+        $dataTable->filter('MetadataCallbackAddMetadata', array('url', 'segment', function($url) {
+            return 'referrerUrl==' . urlencode($url);
+        }));
 
         return $dataTable;
     }
@@ -669,4 +719,72 @@ private function buildExpandedTableForFlattenGetSocials($idSite, $period, $date,
         $urlsTable = null;
     }
 
+    private function createReferrerTypeTable(DataTable\DataTableInterface $table)
+    {
+        if ($table instanceof DataTable) {
+            $nameToColumnId = array(
+                'Referrers_visitorsFromSearchEngines'  => Common::REFERRER_TYPE_SEARCH_ENGINE,
+                'Referrers_visitorsFromSocialNetworks' => Common::REFERRER_TYPE_SOCIAL_NETWORK,
+                'Referrers_visitorsFromDirectEntry'    => Common::REFERRER_TYPE_DIRECT_ENTRY,
+                'Referrers_visitorsFromWebsites'       => Common::REFERRER_TYPE_WEBSITE,
+                'Referrers_visitorsFromCampaigns'      => Common::REFERRER_TYPE_CAMPAIGN,
+            );
+
+            $newRow = array();
+            foreach ($nameToColumnId as $nameVar => $columnId) {
+                $value = 0;
+                $row = $table->getRowFromLabel($columnId);
+                if ($row !== false) {
+                    $value = $row->getColumn(Metrics::INDEX_NB_VISITS);
+                }
+                $newRow[$nameVar] = $value;
+            }
+
+            $result = new DataTable\Simple();
+            $result->addRowFromSimpleArray($newRow);
+            return $result;
+        } else if ($table instanceof DataTable\Map) {
+            $result = new DataTable\Map();
+            $result->setKeyName($table->getKeyName());
+            foreach ($table->getDataTables() as $label => $childTable) {
+                $referrerTypeTable = $this->createReferrerTypeTable($childTable);
+                $result->addTable($referrerTypeTable, $label);
+            }
+        } else {
+            throw new \Exception("Unexpected DataTable type: " . get_class($table)); // sanity check
+        }
+        return $result;
+    }
+
+    private function mergeNumericArchives(DataTable\DataTableInterface $table, DataTable\DataTableInterface $numericArchives = null)
+    {
+        if ($table instanceof DataTable) {
+            /** @var DataTable $numericArchives */
+            if (empty($numericArchives)) {
+                return;
+            }
+
+            $table->setAllTableMetadata($numericArchives->getAllTableMetadata());
+
+            if ($table->getRows() == 0) {
+                $table->addRow(new DataTable\Row());
+            }
+
+            if ($numericArchives->getRowsCount() == 0) {
+                return;
+            }
+
+            $row = $table->getFirstRow();
+            foreach ($numericArchives->getFirstRow() as $name => $value) {
+                $row->setColumn($name, $value);
+            }
+        } else if ($table instanceof DataTable\Map) {
+            foreach ($table->getDataTables() as $label => $childTable) {
+                $numericArchiveChildTable = $numericArchives->getTable($label);
+                $this->mergeNumericArchives($childTable, $numericArchiveChildTable);
+            }
+        } else {
+            throw new \Exception("Unexpected DataTable type: " . get_class($table)); // sanity check
+        }
+    }
 }
diff --git a/app/plugins/Referrers/Controller.php b/app/plugins/Referrers/Controller.php
index bc2d25fb7..66184b881 100644
--- a/app/plugins/Referrers/Controller.php
+++ b/app/plugins/Referrers/Controller.php
@@ -12,6 +12,7 @@
 use Piwik\Common;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable\Map;
+use Piwik\FrontController;
 use Piwik\Metrics;
 use Piwik\NumberFormatter;
 use Piwik\Period\Range;
@@ -41,213 +42,12 @@ public function __construct(Translator $translator)
 
     public function getSparklines()
     {
-        $metrics = $this->getReferrersVisitorsByType();
-        $distinctMetrics = $this->getDistinctReferrersMetrics();
+        $_GET['forceView'] = '1';
+        $_GET['viewDataTable'] = Sparklines::ID;
 
-        $numberFormatter = NumberFormatter::getInstance();
-
-        $totalVisits = array_sum($metrics);
-        foreach ($metrics as $name => $value) {
-
-            // calculate percent of total, if there were any visits
-            if ($value != 0 && $totalVisits != 0) {
-                $percentName = $name . 'Percent';
-                $metrics[$percentName] = round(($value / $totalVisits) * 100, 0);
-            }
-        }
-
-        // calculate evolution for visit metrics & distinct metrics
-        list($lastPeriodDate, $ignore) = Range::getLastDate();
-        if ($lastPeriodDate !== false) {
-            $date = Common::getRequestVar('date');
-            $period = Common::getRequestVar('period');
-
-            $prettyDate = self::getPrettyDate($date, $period);
-            $prettyLastPeriodDate = self::getPrettyDate($lastPeriodDate, $period);
-
-            // visit metrics
-            $previousValues = $this->getReferrersVisitorsByType($lastPeriodDate);
-            $metrics = $this->addEvolutionPropertiesToView($prettyDate, $metrics, $prettyLastPeriodDate, $previousValues);
-
-            // distinct metrics
-            $previousValues = $this->getDistinctReferrersMetrics($lastPeriodDate);
-            $distinctMetrics = $this->addEvolutionPropertiesToView($prettyDate, $distinctMetrics, $prettyLastPeriodDate, $previousValues);
-        }
-
-        /** @var Sparklines $view */
-        $view = ViewDataTable\Factory::build(Sparklines::ID, $api = '', $controller = '', $force = true, $loadUserParams = false);
-
-        // DIRECT ENTRY
-        $metrics['visitorsFromDirectEntry'] = $numberFormatter->formatNumber($metrics['visitorsFromDirectEntry']);
-        $values = array($metrics['visitorsFromDirectEntry']);
-        $descriptions = array(Piwik::translate('Referrers_TypeDirectEntries'));
-
-        if (!empty($metrics['visitorsFromDirectEntryPercent'])) {
-            $metrics['visitorsFromDirectEntryPercent'] = $numberFormatter->formatPercent($metrics['visitorsFromDirectEntryPercent'], $precision = 1);
-            $values[] = $metrics['visitorsFromDirectEntryPercent'];
-            $descriptions[] = Piwik::translate('Referrers_XPercentOfVisits');
-        }
-
-        $directEntryParams = $this->getReferrerSparklineParams(Common::REFERRER_TYPE_DIRECT_ENTRY);
-
-        $view->config->addSparkline($directEntryParams, $values, $descriptions, @$metrics['visitorsFromDirectEntryEvolution']);
-
-
-        // WEBSITES
-        $metrics['visitorsFromWebsites'] = $numberFormatter->formatNumber($metrics['visitorsFromWebsites']);
-        $values = array($metrics['visitorsFromWebsites']);
-        $descriptions = array(Piwik::translate('Referrers_TypeWebsites'));
-
-        if (!empty($metrics['visitorsFromWebsitesPercent'])) {
-            $metrics['visitorsFromWebsitesPercent'] = $numberFormatter->formatPercent($metrics['visitorsFromWebsitesPercent'], $precision = 1);
-            $values[] = $metrics['visitorsFromWebsitesPercent'];
-            $descriptions[] = Piwik::translate('Referrers_XPercentOfVisits');
-        }
-
-        $searchEngineParams = $this->getReferrerSparklineParams(Common::REFERRER_TYPE_WEBSITE);
-
-        $view->config->addSparkline($searchEngineParams, $values, $descriptions, @$metrics['visitorsFromWebsitesEvolution']);
-
-
-        // SEARCH ENGINES
-        $metrics['visitorsFromSearchEngines'] = $numberFormatter->formatNumber($metrics['visitorsFromSearchEngines']);
-        $values = array($metrics['visitorsFromSearchEngines']);
-        $descriptions = array(Piwik::translate('Referrers_TypeSearchEngines'));
-
-        if (!empty($metrics['visitorsFromSearchEnginesPercent'])) {
-            $metrics['visitorsFromSearchEnginesPercent'] = $numberFormatter->formatPercent($metrics['visitorsFromSearchEnginesPercent'], $precision = 1);
-            $values[] = $metrics['visitorsFromSearchEnginesPercent'];
-            $descriptions[] = Piwik::translate('Referrers_XPercentOfVisits');
-        }
-        $searchEngineParams = $this->getReferrerSparklineParams(Common::REFERRER_TYPE_SEARCH_ENGINE);
-
-        $view->config->addSparkline($searchEngineParams, $values, $descriptions, @$metrics['visitorsFromSearchEnginesEvolution']);
-
-        // SOCIAL NETWORKS
-        $metrics['visitorsFromSocialNetworks'] = $numberFormatter->formatNumber($metrics['visitorsFromSocialNetworks']);
-        $values = array($metrics['visitorsFromSocialNetworks']);
-        $descriptions = array(Piwik::translate('Referrers_TypeSocialNetworks'));
-
-        if (!empty($metrics['visitorsFromSocialNetworksPercent'])) {
-            $metrics['visitorsFromSocialNetworksPercent'] = $numberFormatter->formatPercent($metrics['visitorsFromSocialNetworksPercent'], $precision = 1);
-            $values[] = $metrics['visitorsFromSocialNetworksPercent'];
-            $descriptions[] = Piwik::translate('Referrers_XPercentOfVisits');
-        }
-        $socialNetworkParams = $this->getReferrerSparklineParams(Common::REFERRER_TYPE_SOCIAL_NETWORK);
-
-        $view->config->addSparkline($socialNetworkParams, $values, $descriptions, @$metrics['visitorsFromSocialNetworksEvolution']);
-
-
-        // CAMPAIGNS
-        $metrics['visitorsFromCampaigns'] = $numberFormatter->formatNumber($metrics['visitorsFromCampaigns']);
-        $values = array($metrics['visitorsFromCampaigns']);
-        $descriptions = array(Piwik::translate('Referrers_TypeCampaigns'));
-
-        if (!empty($metrics['visitorsFromCampaignsPercent'])) {
-            $metrics['visitorsFromCampaignsPercent'] = $numberFormatter->formatPercent($metrics['visitorsFromCampaignsPercent'], $precision = 1);
-            $values[] = $metrics['visitorsFromCampaignsPercent'];
-            $descriptions[] = Piwik::translate('Referrers_XPercentOfVisits');
-        }
-
-        $searchEngineParams = $this->getReferrerSparklineParams(Common::REFERRER_TYPE_CAMPAIGN);
-
-        $view->config->addSparkline($searchEngineParams, $values, $descriptions, @$metrics['visitorsFromCampaignsEvolution']);
-
-
-        // DISTINCT SEARCH ENGINES
-        $sparklineParams = $this->getDistinctSparklineUrlParams('getLastDistinctSearchEnginesGraph');
-        $value = $distinctMetrics['numberDistinctSearchEngines'];
-        $value = $numberFormatter->formatNumber($value);
-        $description = Piwik::translate('Referrers_DistinctSearchEngines');
-
-        $view->config->addSparkline($sparklineParams, $value, $description, @$distinctMetrics['numberDistinctSearchEnginesEvolution']);
-
-
-        // DISTINCT SOCIAL NETWORKS
-        $sparklineParams = $this->getDistinctSparklineUrlParams('getLastDistinctSocialNetworksGraph');
-        $value = $distinctMetrics['numberDistinctSocialNetworks'];
-        $value = $numberFormatter->formatNumber($value);
-        $description = Piwik::translate('Referrers_DistinctSocialNetworks');
-
-        $view->config->addSparkline($sparklineParams, $value, $description, @$distinctMetrics['numberDistinctSocialNetworksEvolution']);
-
-
-        // DISTINCT WEBSITES
-        $sparklineParams = $this->getDistinctSparklineUrlParams('getLastDistinctWebsitesGraph');
-
-        $distinctMetrics['numberDistinctWebsites'] = $numberFormatter->formatNumber($distinctMetrics['numberDistinctWebsites']);
-        $distinctMetrics['numberDistinctWebsitesUrls'] = $numberFormatter->formatNumber($distinctMetrics['numberDistinctWebsitesUrls']);
-
-        $values = array($distinctMetrics['numberDistinctWebsites'], $distinctMetrics['numberDistinctWebsitesUrls']);
-        $descriptions = array(Piwik::translate('Referrers_DistinctWebsites'), Piwik::translate('Referrers_UsingNDistinctUrls'));
-
-        $view->config->addSparkline($sparklineParams, $values, $descriptions, @$distinctMetrics['numberDistinctWebsitesEvolution']);
-
-
-        // DISTINCT KEYWORDS
-        $sparklineParams = $this->getDistinctSparklineUrlParams('getLastDistinctKeywordsGraph');
-        $value = $distinctMetrics['numberDistinctKeywords'];
-        $value = $numberFormatter->formatNumber($value);
-        $description = Piwik::translate('Referrers_DistinctKeywords');
-
-        $view->config->addSparkline($sparklineParams, $value, $description, @$distinctMetrics['numberDistinctKeywordsEvolution']);
-
-
-        // DISTINCT CAMPAIGNS
-        $sparklineParams = $this->getDistinctSparklineUrlParams('getLastDistinctCampaignsGraph');
-        $value = $distinctMetrics['numberDistinctCampaigns'];
-        $value = $numberFormatter->formatNumber($value);
-        $description = Piwik::translate('Referrers_DistinctCampaigns');
-
-        $view->config->addSparkline($sparklineParams, $value, $description, @$distinctMetrics['numberDistinctCampaignsEvolution']);
-
-        return $view->render();
-    }
-
-    private function getDistinctSparklineUrlParams($action)
-    {
-        return array('module' => $this->pluginName, 'action' => $action);
+        return FrontController::getInstance()->fetchDispatch('Referrers', 'get');
     }
 
-    protected function getReferrersVisitorsByType($date = false)
-    {
-        if ($date === false) {
-            $date = Common::getRequestVar('date', false);
-        }
-
-        // we disable the queued filters because here we want to get the visits coming from search engines
-        // if the filters were applied we would have to look up for a label looking like "Search Engines"
-        // which is not good when we have translations
-        $dataTableReferrersType = Request::processRequest(
-            "Referrers.getReferrerType", array('disable_queued_filters' => '1', 'date' => $date));
-
-        $nameToColumnId = array(
-            'visitorsFromSearchEngines'  => Common::REFERRER_TYPE_SEARCH_ENGINE,
-            'visitorsFromSocialNetworks' => Common::REFERRER_TYPE_SOCIAL_NETWORK,
-            'visitorsFromDirectEntry'    => Common::REFERRER_TYPE_DIRECT_ENTRY,
-            'visitorsFromWebsites'       => Common::REFERRER_TYPE_WEBSITE,
-            'visitorsFromCampaigns'      => Common::REFERRER_TYPE_CAMPAIGN,
-        );
-        $return = array();
-        foreach ($nameToColumnId as $nameVar => $columnId) {
-            $value = 0;
-            $row = $dataTableReferrersType->getRowFromLabel($columnId);
-            if ($row !== false) {
-                $value = $row->getColumn(Metrics::INDEX_NB_VISITS);
-            }
-            $return[$nameVar] = $value;
-        }
-        return $return;
-    }
-
-    protected $referrerTypeToLabel = array(
-        Common::REFERRER_TYPE_DIRECT_ENTRY   => 'Referrers_DirectEntry',
-        Common::REFERRER_TYPE_SEARCH_ENGINE  => 'Referrers_SearchEngines',
-        Common::REFERRER_TYPE_SOCIAL_NETWORK => 'Referrers_Socials',
-        Common::REFERRER_TYPE_WEBSITE        => 'Referrers_Websites',
-        Common::REFERRER_TYPE_CAMPAIGN       => 'Referrers_Campaigns',
-    );
-
     public function getEvolutionGraph($typeReferrer = false, array $columns = array(), array $defaultColumns = array())
     {
         $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Referrers.getReferrerType');
@@ -369,84 +169,4 @@ public static function getTranslatedReferrerTypeLabel($typeReferrer)
         return Piwik::translate($label);
     }
 
-    /**
-     * Returns the URL for the sparkline of visits with a specific referrer type.
-     *
-     * @param int $referrerType The referrer type. Referrer types are defined in Common class.
-     * @return string The URL that can be used to get a sparkline image.
-     */
-    private function getReferrerSparklineParams($referrerType)
-    {
-        $totalRow = $this->translator->translate('General_Total');
-
-        return array(
-            'columns'      => array('nb_visits'),
-            'rows'         => array(self::getTranslatedReferrerTypeLabel($referrerType), $totalRow),
-            'typeReferrer' => $referrerType,
-            'module'       => $this->pluginName,
-            'action'       => 'getReferrerType'
-        );
-    }
-
-    /**
-     * Returns an array containing the number of distinct referrers for each
-     * referrer type.
-     *
-     * @param bool|string $date The date to use when getting metrics. If false, the
-     *                           date query param is used.
-     * @return array The metrics.
-     */
-    private function getDistinctReferrersMetrics($date = false)
-    {
-        $propertyToAccessorMapping = array(
-            'numberDistinctSearchEngines'  => 'getNumberOfDistinctSearchEngines',
-            'numberDistinctSocialNetworks' => 'getNumberOfDistinctSocialNetworks',
-            'numberDistinctKeywords'       => 'getNumberOfDistinctKeywords',
-            'numberDistinctWebsites'       => 'getNumberOfDistinctWebsites',
-            'numberDistinctWebsitesUrls'   => 'getNumberOfDistinctWebsitesUrls',
-            'numberDistinctCampaigns'      => 'getNumberOfDistinctCampaigns',
-        );
-
-        $result = array();
-        foreach ($propertyToAccessorMapping as $property => $method) {
-            $result[$property] = $this->getNumericValue('Referrers.' . $method, $date);
-        }
-        return $result;
-    }
-
-    /**
-     * Utility method that calculates evolution values for a set of current & past values
-     * and sets properties on a View w/ HTML that displays the evolution percents.
-     *
-     * @param string $date The date of the current values.
-     * @param array $currentValues Array mapping view property names w/ present values.
-     * @param string $lastPeriodDate The date of the period in the past.
-     * @param array $previousValues Array mapping view property names w/ past values. Keys
-     *                              in this array should be the same as keys in $currentValues.
-     * @return array Added current values
-     */
-    private function addEvolutionPropertiesToView($date, $currentValues, $lastPeriodDate, $previousValues)
-    {
-        foreach ($previousValues as $name => $pastValue) {
-            $currentValue = $currentValues[$name];
-            $evolutionName = $name . 'Evolution';
-
-            $currentValueFormatted = NumberFormatter::getInstance()->format($currentValue);
-            $pastValueFormatted    = NumberFormatter::getInstance()->format($pastValue);
-
-            $currentValues[$evolutionName] = array(
-                'currentValue' => $currentValue,
-                'pastValue' => $pastValue,
-                'tooltip' => Piwik::translate('General_EvolutionSummaryGeneric', array(
-                    Piwik::translate('General_NVisits', $currentValueFormatted),
-                    $date,
-                    Piwik::translate('General_NVisits', $pastValueFormatted),
-                    $lastPeriodDate,
-                    CalculateEvolutionFilter::calculate($currentValue, $pastValue, $precision = 1)
-                ))
-            );
-        }
-
-        return $currentValues;
-    }
 }
diff --git a/app/plugins/Referrers/Referrers.php b/app/plugins/Referrers/Referrers.php
index 479323eeb..5558d0891 100644
--- a/app/plugins/Referrers/Referrers.php
+++ b/app/plugins/Referrers/Referrers.php
@@ -10,6 +10,7 @@
 
 use Piwik\Common;
 use Piwik\Piwik;
+use Piwik\Plugins\Referrers\Reports\Get;
 use Piwik\Plugins\SitesManager\SiteUrls;
 
 /**
@@ -33,9 +34,40 @@ public function registerEvents()
             'Tracker.setTrackerCacheGeneral'    => 'setTrackerCacheGeneral',
             'AssetManager.getJavaScriptFiles'   => 'getJsFiles',
             'AssetManager.getStylesheetFiles'   => 'getStylesheetFiles',
+            'API.getPagesComparisonsDisabledFor'     => 'getPagesComparisonsDisabledFor',
+            'Metrics.getDefaultMetricTranslations' => 'getDefaultMetricTranslations',
         );
     }
 
+    public function getDefaultMetricTranslations(&$translations)
+    {
+        $translations['Referrers_visitorsFromSearchEngines'] = Piwik::translate('Referrers_VisitorsFromSearchEngines');
+        $translations['Referrers_visitorsFromSearchEngines_percent'] = Piwik::translate('Referrers_PercentOfX', $translations['Referrers_visitorsFromSearchEngines']);
+
+        $translations['Referrers_visitorsFromSocialNetworks'] = Piwik::translate('Referrers_VisitorsFromSocialNetworks');
+        $translations['Referrers_visitorsFromSocialNetworks_percent'] = Piwik::translate('Referrers_PercentOfX', $translations['Referrers_visitorsFromSocialNetworks']);
+
+        $translations['Referrers_visitorsFromDirectEntry'] = Piwik::translate('Referrers_VisitorsFromDirectEntry');
+        $translations['Referrers_visitorsFromDirectEntry_percent'] = Piwik::translate('Referrers_PercentOfX', $translations['Referrers_visitorsFromDirectEntry']);
+
+        $translations['Referrers_visitorsFromWebsites'] = Piwik::translate('Referrers_VisitorsFromWebsites');
+        $translations['Referrers_visitorsFromWebsites_percent'] = Piwik::translate('Referrers_PercentOfX', $translations['Referrers_visitorsFromWebsites']);
+
+        $translations['Referrers_visitorsFromCampaigns'] = Piwik::translate('Referrers_VisitorsFromCampaigns');
+        $translations['Referrers_visitorsFromCampaigns_percent'] = Piwik::translate('Referrers_PercentOfX', $translations['Referrers_visitorsFromCampaigns']);
+
+        $translations[Archiver::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME] = ucfirst(Piwik::translate('Referrers_DistinctSearchEngines'));
+        $translations[Archiver::METRIC_DISTINCT_SOCIAL_NETWORK_RECORD_NAME] = ucfirst(Piwik::translate('Referrers_DistinctSocialNetworks'));
+        $translations[Archiver::METRIC_DISTINCT_WEBSITE_RECORD_NAME] = ucfirst(Piwik::translate('Referrers_DistinctWebsites'));
+        $translations[Archiver::METRIC_DISTINCT_KEYWORD_RECORD_NAME] = ucfirst(Piwik::translate('Referrers_DistinctKeywords'));
+        $translations[Archiver::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME] = ucfirst(Piwik::translate('Referrers_DistinctCampaigns'));
+    }
+
+    public function getPagesComparisonsDisabledFor(&$pages)
+    {
+        $pages[] = 'Referrers_Referrers.Referrers_URLCampaignBuilder';
+    }
+
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = 'plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.less';
diff --git a/app/plugins/Referrers/Reports/Get.php b/app/plugins/Referrers/Reports/Get.php
new file mode 100644
index 000000000..07c429cc6
--- /dev/null
+++ b/app/plugins/Referrers/Reports/Get.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\Referrers\Reports;
+
+
+use Piwik\API\Request;
+use Piwik\Common;
+use Piwik\DataTable;
+use Piwik\DataTable\Filter\CalculateEvolutionFilter;
+use Piwik\DataTable\Filter\ColumnCallbackAddColumnPercentage;
+use Piwik\Date;
+use Piwik\NumberFormatter;
+use Piwik\Period;
+use Piwik\Period\Factory;
+use Piwik\Period\Month;
+use Piwik\Period\Range;
+use Piwik\Piwik;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines;
+use Piwik\Plugins\Referrers\Archiver;
+use Piwik\Plugins\Referrers\Controller;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
+
+class Get extends Base
+{
+    const TOTAL_DIRECT_ENTRIES_METRIC_NAME = 'Referrers_directEntries';
+
+    protected function init()
+    {
+        parent::init();
+
+        $this->name = Piwik::translate('Referrers_ReferrersOverview');
+        $this->documentation = '';
+        $this->processedMetrics = [
+            // none
+        ];
+        $this->metrics = [
+            'Referrers_visitorsFromSearchEngines',
+            'Referrers_visitorsFromSearchEngines_percent',
+            'Referrers_visitorsFromSocialNetworks',
+            'Referrers_visitorsFromSocialNetworks_percent',
+            'Referrers_visitorsFromDirectEntry',
+            'Referrers_visitorsFromDirectEntry_percent',
+            'Referrers_visitorsFromWebsites',
+            'Referrers_visitorsFromWebsites_percent',
+            'Referrers_visitorsFromCampaigns',
+            'Referrers_visitorsFromCampaigns_percent',
+            Archiver::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_SOCIAL_NETWORK_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_WEBSITE_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_KEYWORD_RECORD_NAME,
+            Archiver::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME,
+        ];
+    }
+
+    public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)
+    {
+        // empty
+    }
+
+    public function configureView(ViewDataTable $view)
+    {
+        if ($view->isViewDataTableId(Sparklines::ID)
+            && $view instanceof Sparklines
+        ) {
+            $this->addSparklineColumns($view);
+            $view->config->addTranslations($this->getSparklineTranslations());
+
+            // add evolution values
+            list($lastPeriodDate, $ignore) = Range::getLastDate();
+            if ($lastPeriodDate !== false) {
+                $date = Common::getRequestVar('date');
+
+                /** @var DataTable $previousData */
+                $previousData = Request::processRequest('Referrers.get', ['date' => $lastPeriodDate]);
+                $previousDataRow = $previousData->getFirstRow();
+
+                $view->config->compute_evolution = function ($columns) use ($date, $lastPeriodDate, $previousDataRow) {
+                    $value = reset($columns);
+                    $columnName = key($columns);
+
+                    if (!in_array($columnName, $this->metrics)) {
+                        return;
+                    }
+
+                    $pastValue = $previousDataRow->getColumn($columnName);
+
+                    $currentValueFormatted = NumberFormatter::getInstance()->format($value);
+                    $pastValueFormatted    = NumberFormatter::getInstance()->format($pastValue);
+
+                    return [
+                        'currentValue' => $value,
+                        'pastValue' => $pastValue,
+                        'tooltip' => Piwik::translate('General_EvolutionSummaryGeneric', array(
+                            Piwik::translate('General_NVisits', $currentValueFormatted),
+                            $date,
+                            Piwik::translate('General_NVisits', $pastValueFormatted),
+                            $lastPeriodDate,
+                            CalculateEvolutionFilter::calculate($value, $pastValue, $precision = 1)
+                        )),
+                    ];
+                };
+            }
+        }
+    }
+
+    /**
+     * Returns the pretty date representation
+     *
+     * @param $date string
+     * @param $period string
+     * @return string Pretty date
+     */
+    public static function getPrettyDate($date, $period)
+    {
+        return self::getCalendarPrettyDate(Factory::build($period, Date::factory($date)));
+    }
+
+    /**
+     * Returns a prettified date string for use in period selector widget.
+     *
+     * @param Period $period The period to return a pretty string for.
+     * @return string
+     * @api
+     */
+    public static function getCalendarPrettyDate($period)
+    {
+        if ($period instanceof Month) {
+            // show month name when period is for a month
+
+            return $period->getLocalizedLongString();
+        } else {
+            return $period->getPrettyString();
+        }
+    }
+
+    private function addSparklineColumns(Sparklines $view)
+    {
+        $directEntry = Controller::getTranslatedReferrerTypeLabel(Common::REFERRER_TYPE_DIRECT_ENTRY);
+        $directEntry = urlencode($directEntry);
+
+        $website = Controller::getTranslatedReferrerTypeLabel(Common::REFERRER_TYPE_WEBSITE);
+        $website = urlencode($website);
+
+        $searchEngine = Controller::getTranslatedReferrerTypeLabel(Common::REFERRER_TYPE_SEARCH_ENGINE);
+        $searchEngine = urlencode($searchEngine);
+
+        $campaigns = Controller::getTranslatedReferrerTypeLabel(Common::REFERRER_TYPE_CAMPAIGN);
+        $campaigns = urlencode($campaigns);
+
+        $socialNetworks = Controller::getTranslatedReferrerTypeLabel(Common::REFERRER_TYPE_SOCIAL_NETWORK);
+        $socialNetworks = urlencode($socialNetworks);
+
+        $total = Piwik::translate('General_Total');
+
+        $view->config->addSparklineMetric(['Referrers_visitorsFromDirectEntry', 'Referrers_visitorsFromDirectEntry_percent'], 10, ['rows' => $directEntry . ',' . $total]);
+        $view->config->addSparklineMetric(['Referrers_visitorsFromWebsites', 'Referrers_visitorsFromWebsites_percent'], 20, ['rows' => $website . ',' . $total]);
+        $view->config->addSparklineMetric(['Referrers_visitorsFromSearchEngines', 'Referrers_visitorsFromSearchEngines_percent'], 30, ['rows' => $searchEngine . ',' . $total]);
+        $view->config->addSparklineMetric(['Referrers_visitorsFromSocialNetworks', 'Referrers_visitorsFromSocialNetworks_percent'], 40, ['rows' => $socialNetworks . ',' . $total]);
+        $view->config->addSparklineMetric(['Referrers_visitorsFromCampaigns', 'Referrers_visitorsFromCampaigns_percent'], 50, ['rows' => $campaigns . ',' . $total]);
+        $view->config->addSparklineMetric([Archiver::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME], 50);
+        $view->config->addSparklineMetric([Archiver::METRIC_DISTINCT_SOCIAL_NETWORK_RECORD_NAME], 60);
+        $view->config->addSparklineMetric([Archiver::METRIC_DISTINCT_WEBSITE_RECORD_NAME], 70);
+        $view->config->addSparklineMetric([Archiver::METRIC_DISTINCT_KEYWORD_RECORD_NAME], 80);
+        $view->config->addSparklineMetric([Archiver::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME], 90);
+    }
+
+    private function getSparklineTranslations()
+    {
+        $translations = [
+            'Referrers_visitorsFromDirectEntry' => Piwik::translate('Referrers_TypeDirectEntries'),
+            'Referrers_visitorsFromWebsites' => Piwik::translate('Referrers_TypeWebsites'),
+            'Referrers_visitorsFromSearchEngines' => Piwik::translate('Referrers_TypeSearchEngines'),
+            'Referrers_visitorsFromSocialNetworks' => Piwik::translate('Referrers_TypeSocialNetworks'),
+            'Referrers_visitorsFromCampaigns' => Piwik::translate('Referrers_TypeCampaigns'),
+        ];
+
+        foreach ($translations as $name => $label) {
+            $translations[$name . '_percent'] = Piwik::translate('Referrers_XPercentOfVisits');
+        }
+
+        $translations = array_merge($translations, [
+            Archiver::METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME => Piwik::translate('Referrers_DistinctSearchEngines'),
+            Archiver::METRIC_DISTINCT_SOCIAL_NETWORK_RECORD_NAME => Piwik::translate('Referrers_DistinctSocialNetworks'),
+            Archiver::METRIC_DISTINCT_WEBSITE_RECORD_NAME => Piwik::translate('Referrers_DistinctWebsites'),
+            Archiver::METRIC_DISTINCT_KEYWORD_RECORD_NAME => Piwik::translate('Referrers_DistinctKeywords'),
+            Archiver::METRIC_DISTINCT_CAMPAIGN_RECORD_NAME => Piwik::translate('Referrers_DistinctCampaigns'),
+        ]);
+
+        return $translations;
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Referrers/Tasks.php b/app/plugins/Referrers/Tasks.php
index 8f1264d2c..1d895e99f 100644
--- a/app/plugins/Referrers/Tasks.php
+++ b/app/plugins/Referrers/Tasks.php
@@ -17,6 +17,41 @@ class Tasks extends \Piwik\Plugin\Tasks
 {
     public function schedule()
     {
+        if(SettingsPiwik::isInternetEnabled() === true){
+            $this->weekly('updateSearchEngines');
+            $this->weekly('updateSocials');
+        }
     }
 
+    /**
+     * Update the search engine definitions
+     *
+     * @see https://github.com/matomo-org/searchengine-and-social-list
+     */
+    public function updateSearchEngines()
+    {
+        $url = 'https://raw.githubusercontent.com/matomo-org/searchengine-and-social-list/master/SearchEngines.yml';
+        $list = Http::sendHttpRequest($url, 30);
+        $searchEngines = SearchEngine::getInstance()->loadYmlData($list);
+        if (count($searchEngines) < 200) {
+            return;
+        }
+        Option::set(SearchEngine::OPTION_STORAGE_NAME, base64_encode(serialize($searchEngines)));
+    }
+
+    /**
+     * Update the social definitions
+     *
+     * @see https://github.com/matomo-org/searchengine-and-social-list
+     */
+    public function updateSocials()
+    {
+        $url = 'https://raw.githubusercontent.com/matomo-org/searchengine-and-social-list/master/Socials.yml';
+        $list = Http::sendHttpRequest($url, 30);
+        $socials = Social::getInstance()->loadYmlData($list);
+        if (count($socials) < 50) {
+            return;
+        }
+        Option::set(Social::OPTION_STORAGE_NAME, base64_encode(serialize($socials)));
+    }
 }
diff --git a/app/plugins/Referrers/config/config.php b/app/plugins/Referrers/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Referrers/config/config.php
+++ b/app/plugins/Referrers/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Referrers/config/tracker.php b/app/plugins/Referrers/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Referrers/config/tracker.php
+++ b/app/plugins/Referrers/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/cs.json b/app/plugins/Referrers/lang/cs.json
index 548c0b6da..3b1a4b966 100644
--- a/app/plugins/Referrers/lang/cs.json
+++ b/app/plugins/Referrers/lang/cs.json
@@ -43,6 +43,7 @@
         "WidgetExternalWebsites": "Odkazující weby",
         "WidgetSocials": "Seznam sociálních sítí",
         "WidgetTopKeywordsForPages": "Nejčastější klíčová slova pro URL stránky",
-        "XPercentOfVisits": "%s návštěv"
+        "XPercentOfVisits": "%s návštěv",
+        "Acquisition": "Akvizice"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/da.json b/app/plugins/Referrers/lang/da.json
index 806420e99..9a58fc618 100644
--- a/app/plugins/Referrers/lang/da.json
+++ b/app/plugins/Referrers/lang/da.json
@@ -33,6 +33,7 @@
         "SocialsReportDocumentation": "Rapporten viser, hvilke sociale netværk der førte besøgende til hjemmesiden.<br\/> Ved at klikke på en række i tabellen, kan du se, fra hvilke sociale netværkssider besøgende kom til hjemmesiden.",
         "SubmenuSearchEngines": "Søgemaskine og søgeord",
         "SubmenuWebsitesOnly": "Hjemmesider",
+        "Type": "Kanaltype",
         "TypeCampaigns": "%s fra kampagner",
         "TypeDirectEntries": "%s direkte besøg",
         "TypeSearchEngines": "%s fra søgemaskine",
diff --git a/app/plugins/Referrers/lang/de.json b/app/plugins/Referrers/lang/de.json
index 89c2466a2..cad50642b 100644
--- a/app/plugins/Referrers/lang/de.json
+++ b/app/plugins/Referrers/lang/de.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "verschiedene Suchmaschinen",
         "DistinctSocialNetworks": "ausgeprägt soziale Netzwerke",
         "DistinctWebsites": "verschiedene Websites",
+        "DistinctWebsiteUrls": "verschiedene Webseiten URLs",
         "EvolutionDocumentation": "Dies ist eine Übersicht der Verweise, die Besucher auf Ihre Website geführt haben.",
         "EvolutionDocumentationMoreInfo": "Für mehr Informationen über die verschiedenen Kanaltypen, lesen Sie die Dokumentation der %s Tabelle.",
         "Keywords": "Suchbegriffe",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Liste Sozialer Netzwerke",
         "WidgetTopKeywordsForPages": "Top-Suchbegriffe für Seiten-URL",
         "XPercentOfVisits": "%s aller Besuche",
-        "Acquisition": "Akquisition"
+        "Acquisition": "Akquisition",
+        "VisitorsFromSearchEngines": "Besucher von Suchmaschinen",
+        "PercentOfX": "Prozent von %s",
+        "VisitorsFromSocialNetworks": "Besucher von sozialen Netzwerken",
+        "VisitorsFromDirectEntry": "Besucher von Direktzugriffen",
+        "VisitorsFromWebsites": "Besucher von Webseiten",
+        "VisitorsFromCampaigns": "Besucher von Kampagnen"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/el.json b/app/plugins/Referrers/lang/el.json
index a1c8f3641..dc5ee37b4 100644
--- a/app/plugins/Referrers/lang/el.json
+++ b/app/plugins/Referrers/lang/el.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "διαχωρισμός μηχανών αναζήτησης",
         "DistinctSocialNetworks": "διακριτά κοινωνικά δίκτυα",
         "DistinctWebsites": "διαχωρισμός σελίδων",
+        "DistinctWebsiteUrls": "ξεχωριστές διευθύνσεις URL",
         "EvolutionDocumentation": "Αυτή είναι μια επισκόπηση των αναφορέων που έστειλαν επισκέπτες στην ιστοσελίδα.",
         "EvolutionDocumentationMoreInfo": "Για περισσότερες πληροφορίες σχετικά με τους διαφορετικούς τύπους καναλιών, δείτε την τεκμηρίωση για τον πίνακα %s.",
         "Keywords": "Λέξεις κλειδιά",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Λίστα κοινωνικών δικτύων",
         "WidgetTopKeywordsForPages": "Δημοφιλέστερες Λέξεις-Κλειδιά για τη Διεύθυνση URL της σελίδας",
         "XPercentOfVisits": "%s επισκέψεων",
-        "Acquisition": "Εκμάθηση"
+        "Acquisition": "Εκμάθηση",
+        "VisitorsFromSearchEngines": "Επισκέπτες από Μηχανές Αναζήτησης",
+        "PercentOfX": "Τοις εκατό του %s",
+        "VisitorsFromSocialNetworks": "Επισκέπτες από Κοινωνικά Δίκτυα",
+        "VisitorsFromDirectEntry": "Επισκέπτες από Απευθείας Είσοδο",
+        "VisitorsFromWebsites": "Επισκέπτες από Ιστοσελίδες",
+        "VisitorsFromCampaigns": "Επισκέπτες από Καμπάνιες"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/en.json b/app/plugins/Referrers/lang/en.json
index 53019f50e..0c4d88992 100644
--- a/app/plugins/Referrers/lang/en.json
+++ b/app/plugins/Referrers/lang/en.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "distinct search engines",
         "DistinctSocialNetworks": "distinct social networks",
         "DistinctWebsites": "distinct websites",
+        "DistinctWebsiteUrls": "distinct website URLs",
         "EvolutionDocumentation": "This is an overview of the referrers that led visitors to your website.",
         "EvolutionDocumentationMoreInfo": "For more information about the different channel types, see the documentation of the %s table.",
         "Keywords": "Keywords",
@@ -68,6 +69,12 @@
         "WidgetSocials": "List of social networks",
         "WidgetTopKeywordsForPages": "Top Keywords for Page URL",
         "XPercentOfVisits": "%s of visits",
-        "Acquisition": "Acquisition"
+        "Acquisition": "Acquisition",
+        "VisitorsFromSearchEngines": "Visitors from Search Engines",
+        "PercentOfX": "Percent of %s",
+        "VisitorsFromSocialNetworks": "Visitors from Social Networks",
+        "VisitorsFromDirectEntry": "Visitors from Direct Entry",
+        "VisitorsFromWebsites": "Visitors from Websites",
+        "VisitorsFromCampaigns": "Visitors from Campaigns"
     }
 }
diff --git a/app/plugins/Referrers/lang/es-ar.json b/app/plugins/Referrers/lang/es-ar.json
index 69b3898b7..43399d38a 100644
--- a/app/plugins/Referrers/lang/es-ar.json
+++ b/app/plugins/Referrers/lang/es-ar.json
@@ -1,46 +1,80 @@
 {
     "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.",
+        "AllReferrersReportDocumentation": "Este informe muestra todos tus orígenes de visitantes en un informe unificado, listando todos los sitios web, palabras claves en la búsqueda y campañas usadas por tus visitantes para encontrar tu sitio web.",
         "Campaigns": "Campañas",
-        "CampaignsDocumentation": "Visitantes que visitan su sitio de internet como resultado de una campaña. %1$s Vea el %2$s informe para mayores detalles.",
-        "CampaignsReportDocumentation": "Este reporte muestra qué 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 matomo.org%3$s",
+        "CampaignsDocumentation": "Visitantes que visitan tu sitio web como resultado de una campaña. %1$s Leé el %2$s informe para más detalles.",
+        "CampaignsReportDocumentation": "Este informee muestra qué campaña llevó visitantes a tu sitio web. %1$s Para una mayor información acerca del rastreo de las campañas, leé la %2$sdocumentación de campañas en matomo.org%3$s",
         "ColumnCampaign": "Campaña",
-        "ColumnSearchEngine": "Motores de búsqueda",
+        "CampaignPageUrlHelp": "La dirección web de la página para la cual va dirigida esta campaña, por ejemplo: \"http:\/\/ejemplo.org\/oferta_diciembre_2019.html\".",
+        "CampaignNameHelp": "Elegí un nombre que describa para qué fue creada la campaña y que la diferencie de otras. Por ejemplo: \"ofertasverano-porcorreoelectronico\" o \"ofertasverano-publicidadpaga\".",
+        "CampaignKeywordHelp": "Si tenés varias campañas con el mismo nombre, podés diferenciarlas especificando una palabra clave o subcategoría.",
+        "CampaignSource": "Fuente de campaña",
+        "CampaignSourceHelp": "Usado para rastrear la fuente de la campaña, como \"boletin\" para tu márketing por correo electrónico, \"afiliado\", o el nombre del sitio web que muestra tus publicidades.",
+        "CampaignContent": "Contenido de la campaña",
+        "CampaignContentHelp": "Este parámetro es a menudo usando cuando estás probando varias publicidades e incluís el nombre de cada publicidad para saber cuál fue el más efectivo a la hora de generar tráfico.",
+        "CampaignMedium": "Medio de campaña",
+        "CampaignMediumHelp": "Usado para describir la actividad de márketing. Por ejemplo: \"PPC\" para una campaña en la que se paga por clic, o \"PAG\" para publicidad paga, o \"analisis\" para rastrear el análisis de un producto en un sitio afiliado.",
+        "ColumnSearchEngine": "Motor de búsqueda",
         "ColumnSocial": "Red social",
         "ColumnWebsite": "Sitio web",
         "ColumnWebsitePage": "Página web",
         "DirectEntry": "Entrada directa",
+        "DirectEntryDocumentation": "Un visitante ingresó la dirección web en su navegador y comenzó a navegar tu sitio web. Es decir, se ingresó la dirección manualmente o desde un marcador.",
+        "Distinct": "Distinguir orígenes de visita por tipo de canal",
         "DistinctCampaigns": "campañas distintas",
         "DistinctKeywords": "palabras clave distintas",
         "DistinctSearchEngines": "motores de búsqueda distintos",
+        "DistinctSocialNetworks": "distintas redes sociales",
         "DistinctWebsites": "páginas web distintas",
-        "EvolutionDocumentation": "Esta es una viste general de las páginas web externas que condujeron visitantes a su web.",
+        "DistinctWebsiteUrls": "distintas direcciones web",
+        "EvolutionDocumentation": "Esta es una vista general de las páginas web externas que condujeron visitantes a tu sitio web.",
+        "EvolutionDocumentationMoreInfo": "Para más información sobre los diferentes tipos de canales, leé la documentación de la tabla %s.",
         "Keywords": "Palabras clave",
-        "KeywordsReportDocumentation": "Este informe revela que palabras claves estuvieron buscando antes de ingresar en su sitio de internet. %s Cliqueando en la tabla, puede observar la distribución de los motores de búsqueda en la búsqueda de dichas palabras claves.",
-        "Referrer": "Referrer",
-        "ReferrerName": "Nombre de la referencia",
-        "Referrers": "Referencias",
-        "ReferrersOverview": "Referencias Visión",
+        "KeywordsReportDocumentation": "Este informe muestra qué palabras claves los usuarios estuvieron buscando antes de ingresar en tu sitio web. %s Haciendo clic en la tabla, podés ver la distribución de los motores de búsqueda en la búsqueda de dichas palabras claves.",
+        "KeywordsReportDocumentationNote": "Nota: este informe enlista las principales palabras claves como no definidas, porque la mayoría de los motores de búsqueda no envía la palabra clave exacta usada.",
+        "PluginDescription": "Informa los datos de los orígenes de visita: motores de búsqueda, palabras claves, sitios web, campañas, medios sociales, visitas directas.",
+        "Referrer": "Origen de visita",
+        "ReferrerName": "Nombre del origen de la visita",
+        "ReferrerNames": "Nombres de los orígenes de visita",
+        "Referrers": "Orígenes de visita",
+        "ReferrersOverview": "Vista general de los orígenes de las visitas",
+        "ReferrerTypes": "Tipos de canal",
+        "ReferrerURLs": "Direcciones web de los orígenes de visita",
         "SearchEngines": "Motores de búsqueda",
-        "SearchEnginesDocumentation": "Un visitante fue remitido a su sitio de internet por un motor de búsqueda. %1$s Vea el %2$s reporte para mayores detalles.",
-        "SearchEnginesReportDocumentation": "Este reporte muestra que motores de búsqueda enviaron users a su web. %s Haciendo clic en una fila en la tabla, usted puede ver que usuarios estaban buscando en un motor de búsqueda específico.",
+        "SearchEnginesDocumentation": "Un visitante fue enviado a tu sitio web por un motor de búsqueda. %1$s Leé el %2$s informe para más detalles.",
+        "SearchEnginesReportDocumentation": "Este informe muestra qué motores de búsqueda enviaron usuarios a tu sitio web. %s Haciendo clic en una fila en la tabla, podés ver qué estaban buscando los usuarios en un motor de búsqueda específico.",
         "Socials": "Redes sociales",
-        "SocialsReportDocumentation": "Este informe muestra que red social redirige visitantes a su sitio de internet.<br \/>Simplemente cliqueando en una fila de la tabla, puede observar desde que páginas de determinada red social provienen sus visitantes.",
+        "SocialsReportDocumentation": "Este informe muestra qué red social envió visitantes a tu sitio web.<br \/>Haciendo clic en una fila de la tabla, podés ver desde qué páginas de determinada red social provienen tus visitantes.",
         "SubmenuSearchEngines": "Motores de búsqueda y palabras clave",
         "SubmenuWebsitesOnly": "Sitios web",
+        "Type": "Tipo de canal",
         "TypeCampaigns": "%s desde campañas",
         "TypeDirectEntries": "%s entradas directas",
+        "TypeReportDocumentation": "Esta tabla contiene información sobre la distribución de los tipos de canales.",
         "TypeSearchEngines": "%s desde motores de búsqueda",
+        "TypeSocialNetworks": "%s desde redes sociales",
         "TypeWebsites": "%s desde sitios web",
-        "UsingNDistinctUrls": "(usando %s urls distintas)",
-        "ViewAllReferrers": "Ver todas las Referencias",
-        "ViewReferrersBy": "View Referrers by %s",
-        "Websites": "Sitios",
-        "WebsitesDocumentation": "El visitante siguió un enlace en otro sitio de internet que lo dirigió 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": "Lista de páginas web externas",
+        "UsingNDistinctUrls": "(usando %s direcciones web distintas)",
+        "GenerateUrl": "Generar dirección web",
+        "URLCampaignBuilder": "Constructor de dirección web de campaña",
+        "URLCampaignBuilderIntro": "La %1$sherramienta constructora de dirección web%2$s te permite generar direcciones web lista para usar en el rastreo de campañas en Matomo. Leé la documentación sobre %3$srastreo de campañas%4$s para más información.",
+        "URLCampaignBuilderResult": "Generá una dirección web que podés pegar en tus campañas, boletines informativos por correo electrónicos, publicidad en Facebook o tweets:",
+        "ViewAllReferrers": "Ver todos los orígenes de visita",
+        "ViewReferrersBy": "Ver orígenes de visita por %s",
+        "Websites": "Sitios web",
+        "WebsitesDocumentation": "El visitante siguió un enlace en otro sitio web que lo llevó a tu sitio. %1$s Leé el %2$s informe para más detalles.",
+        "WebsitesReportDocumentation": "En esta tabla, podés ver qué sitio web envió visitantes a tu sitio. %s Haciendo clic en una fila de la tabla, podés ver qué dirección web enlaza a tu sitio.",
+        "WidgetExternalWebsites": "Sitios web de origen",
+        "WidgetGetAll": "Todos los canales",
         "WidgetSocials": "Lista de redes sociales",
-        "WidgetTopKeywordsForPages": "Principales Palabras clave para la Página URL",
-        "XPercentOfVisits": "%s of visits"
+        "WidgetTopKeywordsForPages": "Principales palabras clave para la dirección web de la página",
+        "XPercentOfVisits": "%s de visitas",
+        "Acquisition": "Adquisición",
+        "VisitorsFromSearchEngines": "Visitantes desde motores de búsqueda",
+        "PercentOfX": "Porcentaje de %s",
+        "VisitorsFromSocialNetworks": "Visitantes desde redes sociales",
+        "VisitorsFromDirectEntry": "Visitantes directos",
+        "VisitorsFromWebsites": "Visitantes desde sitios web",
+        "VisitorsFromCampaigns": "Visitantes desde campañas"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/fi.json b/app/plugins/Referrers/lang/fi.json
index 693f2729d..b36eb271a 100644
--- a/app/plugins/Referrers/lang/fi.json
+++ b/app/plugins/Referrers/lang/fi.json
@@ -63,6 +63,11 @@
         "WidgetSocials": "Sosiaalisten verkostojen lista",
         "WidgetTopKeywordsForPages": "Käytetyimmät avainsanat sivun URL:lle",
         "XPercentOfVisits": "%s käynneistä",
-        "Acquisition": "Saapumiset"
+        "Acquisition": "Saapumiset",
+        "VisitorsFromSearchEngines": "Kävijöitä hakukoneista",
+        "VisitorsFromSocialNetworks": "Kävijöitä sosiaalisista verkostoista",
+        "VisitorsFromDirectEntry": "Kävijöitä suoraan",
+        "VisitorsFromWebsites": "Kävijöitä verkkosivustoilta",
+        "VisitorsFromCampaigns": "Kävijöitä kamppanjoista"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/fr.json b/app/plugins/Referrers/lang/fr.json
index 297c662e0..1db64f14e 100644
--- a/app/plugins/Referrers/lang/fr.json
+++ b/app/plugins/Referrers/lang/fr.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "Moteurs de recherche distincts",
         "DistinctSocialNetworks": "réseaux sociaux uniques",
         "DistinctWebsites": "sites web distincts",
+        "DistinctWebsiteUrls": "URL distinctes de sites Internet",
         "EvolutionDocumentation": "Ceci est un aperçu des référents qui ont conduit des visiteurs sur votre site web.",
         "EvolutionDocumentationMoreInfo": "Pour plus d'information à propos des différents types de canaux, consultez la documentation de la table %s.",
         "Keywords": "Mots-clés",
@@ -56,7 +57,7 @@
         "UsingNDistinctUrls": "(utilisant %s urls distinctes)",
         "GenerateUrl": "Générer l'URL",
         "URLCampaignBuilder": "Bâtisseur d'URL de campagne",
-        "URLCampaignBuilderIntro": "L'outil %1$s bâtisseur d'URL%2$s vous permet de générer des URLs prêtes à être utilisées pour suivre des campagnes Matomo. Reportez-vous à la documentation à propos %3$sdu suivit de Campagne%4$s pour plus d'information.",
+        "URLCampaignBuilderIntro": "L'outil %1$s bâtisseur d'URL%2$s vous permet de générer des URLs prêtes à être utilisées pour suivre des campagnes Matomo. Reportez-vous à la documentation à propos %3$sdu suivi de Campagne%4$s pour plus d'information.",
         "URLCampaignBuilderResult": "URL générée que vous pouvez copier\/coller dans vos Campagnes, Info courriel, Publicité Facebook ou Tweets:",
         "ViewAllReferrers": "Afficher tous les référents",
         "ViewReferrersBy": "Afficher les référents par %s",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Liste des réseaux sociaux",
         "WidgetTopKeywordsForPages": "Meilleurs mots-clés pour l'URL",
         "XPercentOfVisits": "%s des visites",
-        "Acquisition": "Acquisition"
+        "Acquisition": "Acquisition",
+        "VisitorsFromSearchEngines": "Visiteurs de moteurs de recherche",
+        "PercentOfX": "Pourcentage de %s",
+        "VisitorsFromSocialNetworks": "Visiteurs de réseaux sociaux",
+        "VisitorsFromDirectEntry": "Visiteurs entrés directement",
+        "VisitorsFromWebsites": "Visiteurs de sites web",
+        "VisitorsFromCampaigns": "Visiteurs de campagnes"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/pt-br.json b/app/plugins/Referrers/lang/pt-br.json
index 5039768a2..3d0dc4483 100644
--- a/app/plugins/Referrers/lang/pt-br.json
+++ b/app/plugins/Referrers/lang/pt-br.json
@@ -2,46 +2,79 @@
     "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. %1$s Ver relatório %2$s para mais detalhes.",
+        "CampaignsDocumentation": "Visitantes que vieram para o seu site como resultado de uma campanha. %1$s Veja o 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 matomo.org %3$s",
-        "ColumnCampaign": "campanha",
-        "ColumnSearchEngine": "Motor de Busca",
+        "ColumnCampaign": "Campanha",
+        "CampaignPageUrlHelp": "A URL da página para a qual essa campanha direciona, por exemplo 'http:\/\/exemplo.org.br\/oferta.html'.",
+        "CampaignNameHelp": "Escolha um nome que descreva para que a campanha será criada e que distingua essa campanha de outras campanhas suas. Por exemplo 'Email-OfertasVerao' ou 'AdsPagos-OfertasVerao'.",
+        "CampaignKeywordHelp": "Se você tem diversas campanhas com o mesmo nome, você pode distinguir essas campanhas especificando uma palavra-chave ou uma subcategoria.",
+        "CampaignSource": "Origem da campanha",
+        "CampaignSourceHelp": "Usada para rastrear a origem da campanha, como 'boletim informativo' para seu marketing de e-mail, 'subsidiária', ou o nome do site exibindo seus anúncios.",
+        "CampaignContent": "Conteúdo da campanha",
+        "CampaignContentHelp": "Este parâmetro é usado frequentemente quando você está testando diversos anúncios, e inclui o nome de cada anúncio para ver qual foi mais efetivo para direcionar tráfego.",
+        "CampaignMedium": "Ambiente da campanha",
+        "CampaignMediumHelp": "Usado para descrever a atividade de marketing, por exemplo 'PPC' para uma campanha pay-per-click, ou 'SEM' para anúncios de busca pagos, ou 'avaliação' para rastrear uma avaliação de produto em um site associado.",
+        "ColumnSearchEngine": "Motor de busca",
         "ColumnSocial": "Rede social",
-        "ColumnWebsite": "Website",
-        "ColumnWebsitePage": "Página da Web",
-        "DirectEntry": "Entrada Direta",
-        "DistinctCampaigns": "Campanhas distintas",
-        "DistinctKeywords": "Palavras-chave distintas",
-        "DistinctSearchEngines": "Motores de busca distintos",
-        "DistinctWebsites": "Websites distintos",
+        "ColumnWebsite": "Site",
+        "ColumnWebsitePage": "Página do site",
+        "DirectEntry": "Entrada direta",
+        "DirectEntryDocumentation": "Um visitante digitou a URL em seu navegador e começou a navegar em seu site - ele entraram no site diretamente.",
+        "Distinct": "Referenciadores distintos por tipo de canal",
+        "DistinctCampaigns": "campanhas distintas",
+        "DistinctKeywords": "palavras-chave distintas",
+        "DistinctSearchEngines": "motores de busca distintos",
+        "DistinctSocialNetworks": "redes sociais distintas",
+        "DistinctWebsites": "sites distintos",
+        "DistinctWebsiteUrls": "URLs distintas de sites",
         "EvolutionDocumentation": "Esta é uma visão geral dos referenciadores que levaram visitantes ao seu site.",
+        "EvolutionDocumentationMoreInfo": "Para mais informações sobre os diferentes tipos de canal, veja a documentação da tabela %s.",
         "Keywords": "Palavras-chave",
         "KeywordsReportDocumentation": "Este relatório mostra quais palavras-chave os usuários estavam procurando antes de eles serem encaminhados para o seu site. %s Ao clicar em uma linha na tabela, você pode ver a distribuição dos motores de busca, que foram consultados para a palavra-chave.",
+        "KeywordsReportDocumentationNote": "Obs: Este relatório lista a maioria das palavras-chave como não definidas pois a maioria dos motores de busca não enviam a palavra-chave exata usada no motor de busca.",
         "PluginDescription": "Relatórios de Dados de Referenciadores: Motores de Busca, Palavras-Chave, Websites, Campanhas, Mídias Sociais e Entrada Direta.",
         "Referrer": "Referenciador",
         "ReferrerName": "Nome do referenciador",
+        "ReferrerNames": "Nomes dos referenciadores",
         "Referrers": "Referenciadores",
-        "ReferrersOverview": "Visão Geral dos Referenciadores",
-        "SearchEngines": "Motores de Busca",
+        "ReferrersOverview": "Visão geral dos referenciadores",
+        "ReferrerTypes": "Tipos de canal",
+        "ReferrerURLs": "URLs de referenciadores",
+        "SearchEngines": "Motores de busca",
         "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.",
-        "Socials": "Redes Sociais",
+        "Socials": "Redes sociais",
         "SocialsReportDocumentation": "Este relatório mostra quais as redes sociais levaram visitantes ao seu site. <br \/> Ao clicar em uma linha na tabela, você pode ver de quais páginas os visitantes de redes sociais vieram para o seu site.",
         "SubmenuSearchEngines": "Motores de Busca & Palavras-Chave",
-        "SubmenuWebsitesOnly": "Websites",
+        "SubmenuWebsitesOnly": "Sites",
+        "Type": "Tipo de canal",
         "TypeCampaigns": "%s de campanhas",
         "TypeDirectEntries": "%s entradas diretas",
-        "TypeSearchEngines": "%s de motores de buscas",
-        "TypeWebsites": "%s de websites",
-        "UsingNDistinctUrls": "(usando urls %s distintas)",
+        "TypeReportDocumentation": "Esta tabela contém informações sobre a distribuição dos tipos de canal.",
+        "TypeSearchEngines": "%s de motores de busca",
+        "TypeSocialNetworks": "%s de redes sociais",
+        "TypeWebsites": "%s de sites",
+        "UsingNDistinctUrls": "(usando %s urls distintas)",
+        "GenerateUrl": "Gerar URL",
+        "URLCampaignBuilder": "Construtor de URL de campanha",
+        "URLCampaignBuilderIntro": "A %1$sferramenta Construtor de URL%2$s permite gerar URLs prontas para uso no rastreamento de campanhas no Matomo. Veja a documentação sobre %3$sRastreamento de Campanha%4$s para mais informações.",
+        "URLCampaignBuilderResult": "URL gerada que você pode copiar e colar em suas Campanhas, Boletim informativo por e-mail, Anúncios no Facebook ou tweets:",
         "ViewAllReferrers": "Ver todos os Referenciadores",
         "ViewReferrersBy": "Ver Referenciadores por %s",
-        "Websites": "Websites",
+        "Websites": "Sites",
         "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",
+        "WebsitesReportDocumentation": "Nesta tabela, você pode ver quais sites 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": "Sites referenciadores",
+        "WidgetGetAll": "Todos os canais",
         "WidgetSocials": "Lista de redes sociais",
         "WidgetTopKeywordsForPages": "Principais Palavras-chave para a URL da página",
-        "XPercentOfVisits": "%s de visitas"
+        "XPercentOfVisits": "%s de visitas",
+        "Acquisition": "Aquisição",
+        "VisitorsFromSearchEngines": "Visitantes de motores de busca",
+        "PercentOfX": "Percentual de %s",
+        "VisitorsFromSocialNetworks": "Visitantes de redes sociais",
+        "VisitorsFromDirectEntry": "Visitantes de entrada direta",
+        "VisitorsFromWebsites": "Visitantes de sites",
+        "VisitorsFromCampaigns": "Visitantes de campanhas"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/pt.json b/app/plugins/Referrers/lang/pt.json
index 312b28b41..3ad2dd416 100644
--- a/app/plugins/Referrers/lang/pt.json
+++ b/app/plugins/Referrers/lang/pt.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "motores de pesquisa distintos",
         "DistinctSocialNetworks": "redes sociais distintas",
         "DistinctWebsites": "sites distintos",
+        "DistinctWebsiteUrls": "endereços distintos do site",
         "EvolutionDocumentation": "Isto é uma visão global dos referenciadores que trouxeram visitantes ao seu site.",
         "EvolutionDocumentationMoreInfo": "Para mais informações sobre os diferentes tipos de canais, consulte a documentação da tabela %s.",
         "Keywords": "Palavras-chave",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Lista de redes sociais",
         "WidgetTopKeywordsForPages": "Principais palavras-chave por endereço de página",
         "XPercentOfVisits": "%s de visitas",
-        "Acquisition": "Aquisição"
+        "Acquisition": "Aquisição",
+        "VisitorsFromSearchEngines": "Visitantes de motores de pesquisa",
+        "PercentOfX": "Percentagem de %s",
+        "VisitorsFromSocialNetworks": "Visitantes de redes sociais",
+        "VisitorsFromDirectEntry": "Visitantes de entrada direta",
+        "VisitorsFromWebsites": "Visitantes de sites",
+        "VisitorsFromCampaigns": "Visitantes de campanhas"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/sq.json b/app/plugins/Referrers/lang/sq.json
index 5f7c3f533..efc0c5464 100644
--- a/app/plugins/Referrers/lang/sq.json
+++ b/app/plugins/Referrers/lang/sq.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "motorë kërkimesh të dallueshëm",
         "DistinctSocialNetworks": "rrjete shoqërorë të dalluar",
         "DistinctWebsites": "sajte të dallueshëm",
+        "DistinctWebsiteUrls": "URL-ra sajtesh të dallueshëm",
         "EvolutionDocumentation": "Kjo është një përmbledhje e sjellësve që prunë vizitorë te sajti juaj.",
         "EvolutionDocumentationMoreInfo": "Për më tepër të dhëna rreth llojeve të ndryshme të kanaleve, shihni dokumentimin për tabelën %s.",
         "Keywords": "Fjalëkyçe",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Listë rrjetesh shoqërore",
         "WidgetTopKeywordsForPages": "Fjalëkyçe Kryesuese për URL Faqesh",
         "XPercentOfVisits": "%s e vizitave",
-        "Acquisition": "Blerje"
+        "Acquisition": "Blerje",
+        "VisitorsFromSearchEngines": "Vizitorë prej Motorë Kërkimesh",
+        "PercentOfX": "Përqindje e %s",
+        "VisitorsFromSocialNetworks": "Vizitorë prej Rrjetesh Shoqërore",
+        "VisitorsFromDirectEntry": "Vizitorë prej Hyrjesh të Drejtpërdrejta",
+        "VisitorsFromWebsites": "Vizitorë prej Sajtesh",
+        "VisitorsFromCampaigns": "Vizitorë prej Fushatash"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/sv.json b/app/plugins/Referrers/lang/sv.json
index d56825cb0..be8b605c7 100644
--- a/app/plugins/Referrers/lang/sv.json
+++ b/app/plugins/Referrers/lang/sv.json
@@ -5,6 +5,8 @@
         "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å matomo.org%3$s",
         "ColumnCampaign": "Kampanj",
+        "CampaignSource": "Kampanjkälla",
+        "CampaignContent": "Kampanjinnehåll",
         "ColumnSearchEngine": "Sökmotor",
         "ColumnSocial": "Sociala nätverk",
         "ColumnWebsite": "Webbplats",
@@ -40,6 +42,7 @@
         "TypeSocialNetworks": "%s från sociala nätverk",
         "TypeWebsites": "%s från webbplatser",
         "UsingNDistinctUrls": "(använder %s distinkta urler)",
+        "GenerateUrl": "Skapa URL",
         "URLCampaignBuilderResult": "Genererad URL som du kan kopiera och klistra in i dina kampanjer, nyhetsbrev, Facebook annonser eller tweets:",
         "ViewAllReferrers": "Visa alla hänvisningar",
         "ViewReferrersBy": "Visa hänvisningar efter %s",
@@ -50,6 +53,9 @@
         "WidgetSocials": "Lista över sociala nätverk",
         "WidgetTopKeywordsForPages": "Toppnyckelord för sid-URL",
         "XPercentOfVisits": "%s av besökare",
-        "Acquisition": "Förvärv"
+        "Acquisition": "Förvärv",
+        "VisitorsFromSocialNetworks": "Besökare från sociala nätverk",
+        "VisitorsFromWebsites": "Besökare från webbplatser",
+        "VisitorsFromCampaigns": "Besökare från kampanjer"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Referrers/lang/tr.json b/app/plugins/Referrers/lang/tr.json
index bb9a08461..e5148623e 100644
--- a/app/plugins/Referrers/lang/tr.json
+++ b/app/plugins/Referrers/lang/tr.json
@@ -26,6 +26,7 @@
         "DistinctSearchEngines": "ayrı arama motoru",
         "DistinctSocialNetworks": "ayrı sosyal ağlar",
         "DistinctWebsites": "ayrı web siteleri",
+        "DistinctWebsiteUrls": "ayrı web sitesi adresleri",
         "EvolutionDocumentation": "Web sitenize ziyaretçi yönlendirenlerin özeti.",
         "EvolutionDocumentationMoreInfo": "Farklı kanal türleri hakkında ayrıntılı bilgi almak için %s tablosunun belgelerine bakın.",
         "Keywords": "Anahtar Sözcükler",
@@ -68,6 +69,12 @@
         "WidgetSocials": "Tüm sosyal ağlar",
         "WidgetTopKeywordsForPages": "Sayfa Adresi için Çok Kullanılan Anahtar Sözcükler",
         "XPercentOfVisits": "ziyaretlerde %s",
-        "Acquisition": "Veri Toplama"
+        "Acquisition": "Veri Toplama",
+        "VisitorsFromSearchEngines": "Arama Motorlarından Gelen Ziyaretçiler",
+        "PercentOfX": "%s yüzdesi",
+        "VisitorsFromSocialNetworks": "Sosyal Ağlardan Gelen Ziyaretçiler",
+        "VisitorsFromDirectEntry": "Doğrudan Giriş Yapan Ziyaretçiler",
+        "VisitorsFromWebsites": "Web Sitelerinden Gelen Ziyaretçiler",
+        "VisitorsFromCampaigns": "Kampanyalardan Gelen Ziyaretçiler"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Resolution/config/config.php b/app/plugins/Resolution/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Resolution/config/config.php
+++ b/app/plugins/Resolution/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Resolution/config/tracker.php b/app/plugins/Resolution/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Resolution/config/tracker.php
+++ b/app/plugins/Resolution/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Resolution/lang/zh-cn.json b/app/plugins/Resolution/lang/zh-cn.json
index ad8ae4895..efc25325f 100644
--- a/app/plugins/Resolution/lang/zh-cn.json
+++ b/app/plugins/Resolution/lang/zh-cn.json
@@ -3,6 +3,7 @@
         "ColumnConfiguration": "客户端配置",
         "ColumnResolution": "分辨率",
         "Configurations": "客户端配置",
+        "PluginDescription": "报告访客的屏幕分辨率。",
         "Resolutions": "分辨率",
         "WidgetGlobalVisitors": "访客设置",
         "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。",
diff --git a/app/plugins/RssWidget/RssRenderer.php b/app/plugins/RssWidget/RssRenderer.php
index ca00fb773..ed3dcd13c 100644
--- a/app/plugins/RssWidget/RssRenderer.php
+++ b/app/plugins/RssWidget/RssRenderer.php
@@ -55,8 +55,12 @@ public function get()
 
         if (!$output) {
             try {
-                $content = Http::fetchRemoteFile($this->url);
-                $rss = simplexml_load_string($content);
+                $content = Http::fetchRemoteFile($this->url, null, 0, 15);
+
+                $rss = @simplexml_load_string($content);
+                if ($rss === false) {
+                    throw new \Exception("Failed to parse XML.");
+                }
             } catch (\Exception $e) {
                 throw new \Exception("Error while importing feed: {$e->getMessage()}\n");
             }
diff --git a/app/plugins/RssWidget/Widgets/RssChangelog.php b/app/plugins/RssWidget/Widgets/RssChangelog.php
index 3a12f22ce..f93ce51ec 100644
--- a/app/plugins/RssWidget/Widgets/RssChangelog.php
+++ b/app/plugins/RssWidget/Widgets/RssChangelog.php
@@ -41,7 +41,7 @@ private function getFeed($URL) {
     public function render()
     {   
         try {
-            return $this->getFeed('https://matomo.org/changelog/feed');
+            return $this->getFeed('https://matomo.org/changelog/feed/');
         } catch (\Exception $e) {
             return $this->error($e);
         }  
diff --git a/app/plugins/RssWidget/config/config.php b/app/plugins/RssWidget/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/RssWidget/config/config.php
+++ b/app/plugins/RssWidget/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/RssWidget/config/tracker.php b/app/plugins/RssWidget/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/RssWidget/config/tracker.php
+++ b/app/plugins/RssWidget/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/SEO/API.php b/app/plugins/SEO/API.php
index 3d6ad91b0..59f07af93 100644
--- a/app/plugins/SEO/API.php
+++ b/app/plugins/SEO/API.php
@@ -43,7 +43,17 @@ public function getRank($url)
         $domain = Url::getHostFromUrl($url);
         $metrics = $metricProvider->getMetrics($domain);
 
-        return $this->toDataTable($metrics);
+	    $dataTable = $this->toDataTable($metrics);
+	    $dataTable->setMetadata(DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME, [
+		    'id'           => 'skip',
+		    'rank'         => 'skip',
+		    'logo'         => 'skip',
+		    'logo_link'    => 'skip',
+		    'logo_tooltip' => 'skip',
+		    'rank_suffix'  => 'skip',
+	    ]);
+	    $dataTable->disableFilter('Limit');
+	    return $dataTable;
     }
 
     /**
diff --git a/app/plugins/SEO/SEO.php b/app/plugins/SEO/SEO.php
index 9fbdb51de..e0f7416c4 100644
--- a/app/plugins/SEO/SEO.php
+++ b/app/plugins/SEO/SEO.php
@@ -18,10 +18,16 @@ class SEO extends \Piwik\Plugin
     public function registerEvents()
     {
         return [
-            'Widget.filterWidgets' => 'filterWidgets'
+            'Widget.filterWidgets' => 'filterWidgets',
+            'AssetManager.getJavaScriptFiles' => 'getJsFiles',
         ];
     }
 
+    public function getJsFiles(&$jsFiles)
+    {
+        $jsFiles[] = "plugins/SEO/javascripts/rank.js";
+    }
+
     /**
      * @param WidgetsList $list
      */
diff --git a/app/plugins/SEO/config/config.php b/app/plugins/SEO/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/SEO/config/config.php
+++ b/app/plugins/SEO/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/SEO/config/tracker.php b/app/plugins/SEO/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/SEO/config/tracker.php
+++ b/app/plugins/SEO/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/SEO/templates/getRank.twig b/app/plugins/SEO/templates/getRank.twig
index 9ecd2131e..4c504d0ab 100644
--- a/app/plugins/SEO/templates/getRank.twig
+++ b/app/plugins/SEO/templates/getRank.twig
@@ -1,43 +1,17 @@
 <div id='SeoRanks'>
-    <form method="post" style="padding: 8px;">
+    <div style="padding:8px;">
         <div align="left" class="row">
             <div class="col s8 input-field">
                 <label for="seoUrl" class="active">{{ 'Installation_SetupWebSiteURL'|translate|capitalize }}</label>
                 <input type="text" id="seoUrl" size="15" value="{{ urlToRank }}" class="textbox "/>
             </div>
             <div class="col s4">
-                <input type="submit" class="btn btn-small" style='margin-top: 2em' id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
+                <input type="button"
+                       onclick="SEOWidget.getRank()"
+                       class="btn btn-small" style='margin-top: 2em' id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
             </div>
         </div>
 
-        <script type="text/javascript">
-
-            $(document).ready(function () {
-                function getRank() {
-                    var ajaxRequest = new ajaxHelper();
-                    ajaxRequest.setLoadingElement('#ajaxLoadingSEO');
-                    ajaxRequest.addParams({
-                        module: 'SEO',
-                        action: 'getRank',
-                        url: encodeURIComponent($('#seoUrl').val())
-                    }, 'get');
-                    ajaxRequest.setCallback(
-                        function (response) {
-                            $('#SeoRanks').html(response);
-                        }
-                    );
-                    ajaxRequest.setFormat('html');
-                    ajaxRequest.send();
-                }
-
-                // click on Rank button
-                $('#rankbutton').on('click', function () {
-                    getRank();
-                    return false;
-                });
-            });
-        </script>
-
         {% import "ajaxMacros.twig" as ajax %}
         {{ ajax.LoadingDiv('ajaxLoadingSEO') }}
 
@@ -74,5 +48,5 @@
                 </table>
             {% endif %}
         </div>
-    </form>
-</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/SubscriptionModel.php b/app/plugins/ScheduledReports/SubscriptionModel.php
index b548b80c8..fcdfa0c10 100644
--- a/app/plugins/ScheduledReports/SubscriptionModel.php
+++ b/app/plugins/ScheduledReports/SubscriptionModel.php
@@ -14,6 +14,7 @@
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Piwik;
+use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 
 class SubscriptionModel
 {
@@ -80,20 +81,12 @@ public function unsubscribe($token)
         }
 
         if ($emailFound) {
-            Access::doAsSuperUser(function() use ($report) {
-                Request::processRequest('ScheduledReports.updateReport', [
-                    'idReport'     => $report['idreport'],
-                    'idSite'       => $report['idsite'],
-                    'description'  => $report['description'],
-                    'period'       => $report['period'],
-                    'hour'         => $report['hour'],
-                    'reportType'   => $report['type'],
-                    'reportFormat' => $report['format'],
-                    'reports'      => $report['reports'],
-                    'parameters'   => $report['parameters'],
-                    'idSegment'    => $report['idsegment'],
-                ]);
-            });
+            $reportModel = new Model();
+            $reportModel->updateReport($report['idreport'], array(
+                'parameters' => json_encode($report['parameters'])
+            ));
+            // Reset the cache manually since we didn't call the API method which would do it for us
+            APIScheduledReports::$cache = array();
 
             Piwik::postEvent('Report.unsubscribe', [$report['idreport'], $email]);
 
diff --git a/app/plugins/ScheduledReports/config/tracker.php b/app/plugins/ScheduledReports/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/ScheduledReports/config/tracker.php
+++ b/app/plugins/ScheduledReports/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/lang/da.json b/app/plugins/ScheduledReports/lang/da.json
index eb75df973..02b39ef27 100644
--- a/app/plugins/ScheduledReports/lang/da.json
+++ b/app/plugins/ScheduledReports/lang/da.json
@@ -1,5 +1,6 @@
 {
     "ScheduledReports": {
+        "AggregateReportsFormat": "Vis valgmuligheder",
         "AggregateReportsFormat_GraphsOnly": "Vis kun diagrammer (ingen tabeller)",
         "AggregateReportsFormat_TablesAndGraphs": "Vis tabeller og diagrammer for alle rapporter",
         "AggregateReportsFormat_TablesOnly": "(standard) Vis tabeller (diagrammer kun for nøglemålinger)",
@@ -22,10 +23,13 @@
         "NoRecipients": "Denne rapport har ingen modtagere",
         "Pagination": "Side %1$s af %2$s",
         "PiwikReports": "Matomo rapporter",
+        "PleaseFindAttachedFile": "Se venligst %1$s rapport for %2$s i den vedhæftede fil.",
         "SentFromX": "Sendt fra %s.",
-        "PleaseFindBelow": "Find rapporten nedenfor %1$s for %2$s.",
+        "PleaseFindBelow": "Se venligst %1$s rapport for %2$s i den vedhæftede fil.",
+        "PluginDescription": "Opret tilpassede rapporter og planlæg den udsendt pr. e-mail dagligt, ugentligt eller månedsvis til en eller flere modtagere. Adskillige rapport-formater understøttes (html, pdf, csv, billeder).",
         "ReportFormat": "Rapportformat",
         "ReportHour": "Send rapport kl. %s",
+        "ReportHourWithUTC": "Klokken %s UTC",
         "ReportIncludeNWebsites": "Rapporten indeholder de vigtigste nøgletal for alle hjemmesider, der har mindst ét ​​besøg (fra %s hjemmesider der pt er tilgængelige).",
         "ReportSent": "Rapport afsent",
         "ReportsIncluded": "Statikker inkluderet",
@@ -47,6 +51,13 @@
         "ReportUnsubscribe": "Afmeld en rapport",
         "UnsubscribeReportConfirmation": "Er du sikker på, at du vil afmelde rapporten %1$s?",
         "SuccessfullyUnsubscribed": "Du er blevet afmeldt rapporten %1$s.",
-        "UnsubscribeFooter": "Klik her for at afmelde denne rapport: %1$s"
+        "UnsubscribeFooter": "Klik her for at afmelde denne rapport: %1$s",
+        "NoTokenProvided": "Der blev ikke leveret nogen token til URLen",
+        "NoSubscriptionFound": "Ingen tilmelding fundet. Måske var rapporten allerede afmeldt eller fjernet.",
+        "EvolutionGraphsShowForEachInPeriod": "Graf der viser udviklingen for %1$s hver dag %2$s de sidste %3$s",
+        "EvolutionGraphsShowForPreviousN": "Graf der viser udviklingen over den sidste N %s",
+        "ReportPeriod": "Rapport-periode",
+        "ReportPeriodHelp": "Perioden over data som er dækket i denne rapport. Som standard er det samme periode som i e-mail planen, så hvis rapporten er sendt ugentligt, vil den indeholde information for den sidste uge.",
+        "ReportPeriodHelp2": "Du kan imidlertid ændre dette, hvis du ønsker at se anden information og fortsat vil modtage den planlagte e-mail udsendelse. Hvis for eksempel e-mailen er planlagt udsendt ugentlig, og rapport-perioden er 'dag', vil du modtage information om den sidste dag, hver uge."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/lang/es-ar.json b/app/plugins/ScheduledReports/lang/es-ar.json
index c94c89263..00e4e4ec1 100644
--- a/app/plugins/ScheduledReports/lang/es-ar.json
+++ b/app/plugins/ScheduledReports/lang/es-ar.json
@@ -1,42 +1,63 @@
 {
     "ScheduledReports": {
-        "AggregateReportsFormat_GraphsOnly": "Mostrar sólo gráficas (no reportes de tablas)",
-        "AggregateReportsFormat_TablesAndGraphs": "Mostrar Reporte de tablas y Gráficas para todos los reportes",
-        "AggregateReportsFormat_TablesOnly": "(por defecto) Mostrar Reporte de tablas (Gráficas sólo para mediciones clave)",
-        "AlsoSendReportToTheseEmails": "También envíe el reporte a estos correos (un correo por linea):",
-        "AreYouSureDeleteReport": "¿Está seguro de que desea eliminar este reporte y su envío programado?",
-        "CancelAndReturnToReports": "Cancelar y %1$svolver a la lista de reportes%2$s",
-        "CreateAndScheduleReport": "Crear y Programar un reporte",
-        "CreateReport": "Crear Reporte",
-        "CustomVisitorSegment": "Segmento de Visitante Personalizado:",
-        "DescriptionOnFirstPage": "La descripción del reporte será mostrada en la primera página del reporte.",
-        "DisplayFormat_TablesOnly": "Mostrar sólo Tablas (no gráficas)",
-        "EmailHello": "Hola,",
+        "AggregateReportsFormat": "Configuración de visualización",
+        "AggregateReportsFormat_GraphsOnly": "Mostrar sólo gráficos (sin tablas de informes)",
+        "AggregateReportsFormat_TablesAndGraphs": "Mostrar tablas de informes y gráficos para todos los informes",
+        "AggregateReportsFormat_TablesOnly": "(Predeterminado) Mostrar tablas de informes (gráficos sólo para mediciones clave)",
+        "AlsoSendReportToTheseEmails": "También enviar el informe a estas direcciones de correos electrónicos (una dirección por linea):",
+        "AreYouSureDeleteReport": "¿Estás seguro que querés eliminar este informe y su programación?",
+        "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:",
+        "DescriptionOnFirstPage": "La descripción del informe será mostrada en la primera página del mismo.",
+        "DisplayFormat_TablesOnly": "Mostrar sólo tablas (no gráficos)",
+        "EmailHello": "Hola:",
         "EmailReports": "Informes por correo electrónico",
-        "EmailSchedule": "Programe el envío del Email",
-        "EvolutionGraph": "Mostrar Gráficas Históricas para los %s valores más altos",
-        "FrontPage": "Página Incial",
-        "MonthlyScheduleHelp": "Envío mensual: los reportes serán enviados el primer día de cada mes.",
-        "MustBeLoggedIn": "Usted debe haber iniciado sesión para crear y programar reportes personalizados.",
-        "NoRecipients": "Este reporte no tiene destinatarios",
+        "EmailSchedule": "Programar el envío del correo electrónico",
+        "EvolutionGraph": "Mostrar gráficos históricos para los %s valores más altos",
+        "FrontPage": "Página principal",
+        "PersonalEmailReports": "Informes a correo electrónico personal",
+        "MonthlyScheduleHelp": "Envío mensual: los informes serán enviados el primer día de cada mes.",
+        "MustBeLoggedIn": "Tenés que haber iniciado sesión para crear y programar informes personalizados.",
+        "NoRecipients": "Este informe no tiene destinatarios",
         "Pagination": "Página %1$s de %2$s",
-        "PleaseFindBelow": "Por favor encuentre debajo su reporte %1$s para %2$s.",
-        "ReportFormat": "Formato del Reporte",
-        "ReportIncludeNWebsites": "El reporte incluirá las principales métricas para todos los sitios de internet con al menos una visita (de todo %s los sitios de internet disponibles).",
-        "ReportSent": "Reporte enviado",
+        "PiwikReports": "Informes de Matomo",
+        "PleaseFindAttachedFile": "Por favor, entontrá tu informe %1$s de %2$s en el archivo adjunto.",
+        "SentFromX": "Enviado desde %s.",
+        "PleaseFindBelow": "Por favor, encontrá abajo tu %1$s informe para %2$s.",
+        "PluginDescription": "Creá informes personalizados y programalos para que se envíen por correo electrónico diariamente, semanalmente o mensualmente, a una persona o a varias. Se soportan varios formatos de informe (HTML, PDF, CDV, imágenes).",
+        "ReportFormat": "Formato del informe",
+        "ReportHour": "Enviar informe a las %s",
+        "ReportHourWithUTC": "%s UTC",
+        "ReportIncludeNWebsites": "El informe incluirá las principales métricas para todos los sitios web con al menos una visita (de todos los %s sitios web disponibles).",
+        "ReportSent": "Informe enviado",
         "ReportsIncluded": "Estadísticas incluidas",
-        "ReportType": "Enviar reporte vía",
-        "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 %1$s(click here to open)%2$s, then click on the \"%3$s\" box, then \"%4$s\".",
-        "SegmentAppliedToReports": "El segmento '%s' está siendo aplicado a los informes.",
-        "SendReportNow": "Enviar Reporte ahora",
-        "SendReportTo": "Enviar reporte a",
+        "ReportType": "Enviar informe vía",
+        "ReportUpdated": "Informe actualizado",
+        "Segment_Deletion_Error": "Este segmento no se puede eliminar o hacer invisible para otros usuarios porque es usado para generar informes por correo electrónico %s. Por favor, intentá de nuevo después de quitar este segmento de el\/los informe\/s.",
+        "Segment_Help": "Podés seleccionar un segmento personalizado existente para aplicar a datos en este informe de correo electrónico. Podés crear y editar segmentos personalizados en tu panel. %1$s(hacé clic para abrir)%2$s, luego hacé clic en la caja \"%3$s\", luego \"%4$s\".",
+        "SegmentAppliedToReports": "El segmento \"%s\" está siendo aplicado a los informes.",
+        "SendReportNow": "Enviar informe ahora",
+        "SendReportTo": "Enviar informe a",
         "SentToMe": "Enviarme una copia",
-        "TableOfContent": "Lista de reportes",
-        "ThereIsNoReportToManage": "No hay reportes que administrar para el sitio web %s",
+        "TableOfContent": "Lista de informes",
+        "ThereIsNoReportToManage": "No hay informess que administrar para el sitio web %s",
+        "TopLinkTooltip": "Creá informes de correo electrónico para que se envíen las estadísticas de Matomo a tu dirección de correo o a la de tus clientes, ¡automáticamente!",
         "TopOfReport": "Volver arriba",
-        "UpdateReport": "Actualizar Reporte",
-        "WeeklyScheduleHelp": "Envío semanal: los reportes serán enviados el primer Lunes de cada semana."
+        "UpdateReport": "Actualizar informe",
+        "WeeklyScheduleHelp": "Envío semanal: los informes serán enviados el primer lunes de cada semana.",
+        "Unsubscribe": "Desuscribirse",
+        "ReportUnsubscribe": "Desuscribirse de un informe",
+        "UnsubscribeReportConfirmation": "¿Estás seguro que querés desuscribirte del informe \"%1$s\"?",
+        "SuccessfullyUnsubscribed": "Te desuscribiste exitosamente del informe \"%1$s\".",
+        "UnsubscribeFooter": "Para desuscribirte de este informe, por favor, seguí este enlace: %1$s",
+        "NoTokenProvided": "No hay código en la dirección web",
+        "NoSubscriptionFound": "No se encontró ninguna suscripción. Quizá el informe ya fue desuscripto o quitado.",
+        "EvolutionGraphsShowForEachInPeriod": "Los gráficos evolutivos muestran la evolución de %1$s cada día %2$s en los últimos %3$s",
+        "EvolutionGraphsShowForPreviousN": "Los gráficos evolutivos muestran la evolución sobre los anteriores \"N\" %s",
+        "ReportPeriod": "Período del informe",
+        "ReportPeriodHelp": "El período de datos cubierto por este informe. De forma predeterminada, esto es lo mismo a la programación de correo electrónico, por lo tanto el informe se envía semanalmente, conteniendo información de la última semana.",
+        "ReportPeriodHelp2": "Podés cambiar esto si querés ver diferente información y aún así retener la programación del correo electrónico. Por ejemplo: si la programación del correo electrónico es semanal, y el período del informe es diaria, vas a obtener información del último día, todas las semanas."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/lang/pt-br.json b/app/plugins/ScheduledReports/lang/pt-br.json
index eeb80f561..e913e1306 100644
--- a/app/plugins/ScheduledReports/lang/pt-br.json
+++ b/app/plugins/ScheduledReports/lang/pt-br.json
@@ -23,11 +23,13 @@
         "NoRecipients": "Este relatório não tem destinatários",
         "Pagination": "Página %1$s de %2$s",
         "PiwikReports": "Relatórios Matomo",
+        "PleaseFindAttachedFile": "Favor verificar seu relatório %1$s de %2$s no arquivo anexado.",
         "SentFromX": "Enviado de %s.",
         "PleaseFindBelow": "Veja abaixo o seu relatório %1$s para %2$s.",
         "PluginDescription": "Crie relatórios personalizados e programe-os para serem enviado por dia, semana ou mês para uma ou várias pessoas. Vários formatos de relatório são suportados (imagens html, pdf, csv).",
         "ReportFormat": "Formato do relatório",
         "ReportHour": "Enviar relatório no horário: %s",
+        "ReportHourWithUTC": "%s horas UTC",
         "ReportIncludeNWebsites": "O relatório incluirá as principais métricas para todos os sites que têm pelo menos uma visita (a partir de sites %s atualmente disponível).",
         "ReportSent": "Relatório enviado",
         "ReportsIncluded": "Estatísticas incluídas",
@@ -44,6 +46,18 @@
         "TopLinkTooltip": "Criar relatórios de e-mail com estatísticas para enviar para seu e-mail ou o e-mail de clientes automaticamente!",
         "TopOfReport": "Voltar ao topo",
         "UpdateReport": "Atualizar relatório",
-        "WeeklyScheduleHelp": "Programação semanal: relatório será enviado na segunda-feira de cada semana."
+        "WeeklyScheduleHelp": "Programação semanal: relatório será enviado na segunda-feira de cada semana.",
+        "Unsubscribe": "Cancelar inscrição",
+        "ReportUnsubscribe": "Cancelar a inscrição de um relatório",
+        "UnsubscribeReportConfirmation": "Tem certeza que deseja cancelar a inscrição ao relatório %1$s?",
+        "SuccessfullyUnsubscribed": "Sua inscrição ao relatório %1$s foi cancelada com sucesso.",
+        "UnsubscribeFooter": "Para cancelar a inscrição a este relatório favor ir em: %1$s",
+        "NoTokenProvided": "Nenhum token foi fornecido na URL",
+        "NoSubscriptionFound": "Nenhuma inscrição encontrada. Talvez o relatório tenha sido removido ou a inscrição a ele já tenha sido cancelada.",
+        "EvolutionGraphsShowForEachInPeriod": "Gráficos de evolução mostram a evolução %1$spor dia%2$s nos últimos %3$s",
+        "EvolutionGraphsShowForPreviousN": "Gráficos de evolução mostram a evolução nos últimos N %s",
+        "ReportPeriod": "Período do relatório",
+        "ReportPeriodHelp": "O período dos dados cobertos neste relatório. Por padrão este é o mesmo do agendamento do email, então se o relatório é enviado semanalmente, ele irá conter informação sobre a última semana.",
+        "ReportPeriodHelp2": "Você pode alterar isto, entretanto, se você quiser ver informações diferentes e ainda manter o agendamento do email. Por exemplo, se o agendamento do email for semanal, e o período do relatório for 'dia', você receberá informações do sobre o último dia, toda semana."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/lang/pt.json b/app/plugins/ScheduledReports/lang/pt.json
index a0f741804..f563affe8 100644
--- a/app/plugins/ScheduledReports/lang/pt.json
+++ b/app/plugins/ScheduledReports/lang/pt.json
@@ -55,6 +55,9 @@
         "NoTokenProvided": "Não foi fornecido nenhum código neste endereço",
         "NoSubscriptionFound": "Não foi encontrada nenhuma subscrição. Talvez a subscrição neste relatório já tenha sido anulada ou removida.",
         "EvolutionGraphsShowForEachInPeriod": "Os gráficos de evolução mostram a evolução para %1$scada dia%2$s nós últimos %3$s",
-        "EvolutionGraphsShowForPreviousN": "Os gráficos de evolução mostram a evolução durante os últimos N %s"
+        "EvolutionGraphsShowForPreviousN": "Os gráficos de evolução mostram a evolução durante os últimos N %s",
+        "ReportPeriod": "Período do relatório",
+        "ReportPeriodHelp": "O período de dados coberto por este relatório. Por predefinição, isto é o mesmo que o agendamento do e-mail, pelo que se o relatório é enviado semanalmente, irá conter informação relativa à última semana.",
+        "ReportPeriodHelp2": "No entanto, pode alterar isto, se quiser ver informação diferente e ainda assim manter o agendamento do e-mail. Por exemplo, se o agendamento do e-mail é semanal, e o relatório do período é diário, irá obter informação para o último dia, cada semana."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/ScheduledReports/lang/zh-cn.json b/app/plugins/ScheduledReports/lang/zh-cn.json
index 6a9f0baa2..773a610da 100644
--- a/app/plugins/ScheduledReports/lang/zh-cn.json
+++ b/app/plugins/ScheduledReports/lang/zh-cn.json
@@ -22,7 +22,7 @@
         "MustBeLoggedIn": "登录后才能创建和自定义报表。",
         "NoRecipients": "这个报表没有收件人",
         "Pagination": "第 %1$s 页，共 %2$s 页",
-        "PiwikReports": "Matomo 报表",
+        "PiwikReports": "Matomo仓库",
         "PleaseFindAttachedFile": "请在附件中查找%2$s的报告%1$s。",
         "SentFromX": "来自%s发送。",
         "PleaseFindBelow": "下面是您的 %2$s 的 %1$s 报表。",
@@ -46,6 +46,18 @@
         "TopLinkTooltip": "创建报表邮件让 Matomo 自动将统计资料发到您或者客户的邮箱中！",
         "TopOfReport": "回到顶部",
         "UpdateReport": "更新报表",
-        "WeeklyScheduleHelp": "每周计划: 报表将会在每周的星期一寄出。"
+        "WeeklyScheduleHelp": "每周计划: 报表将会在每周的星期一寄出。",
+        "Unsubscribe": "退订",
+        "ReportUnsubscribe": "退订报告",
+        "UnsubscribeReportConfirmation": "您确定要退订报告%1$s吗？",
+        "SuccessfullyUnsubscribed": "您已成功取消订阅报告%1$s。",
+        "UnsubscribeFooter": "要退订该报告，请点击以下链接：%1$s",
+        "NoTokenProvided": "URL中未提供令牌",
+        "NoSubscriptionFound": "找不到订阅。 该报告可能已被取消订阅或删除。",
+        "EvolutionGraphsShowForEachInPeriod": "演化图显示了最近%3$s天中每个%1$s天%2$s的演化",
+        "EvolutionGraphsShowForPreviousN": "演化图显示了先前N %s的演化",
+        "ReportPeriod": "报告期间",
+        "ReportPeriodHelp": "本报告涵盖的数据周期。 默认情况下，这与电子邮件时间表相同，因此，如果报告是每周发送一次，它将包含有关上周的信息。",
+        "ReportPeriodHelp2": "但是，如果您想查看其他信息并仍然保留电子邮件时间表，则可以更改此设置。 例如，如果电子邮件计划是每周一次，而报告期限是“天”，则您将获得每周最后一天的信息。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/Model.php b/app/plugins/SegmentEditor/Model.php
index da30fe535..c505f7a4f 100644
--- a/app/plugins/SegmentEditor/Model.php
+++ b/app/plugins/SegmentEditor/Model.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\SegmentEditor;
 
 use Piwik\Common;
+use Piwik\Date;
 use Piwik\Db;
 use Piwik\DbHelper;
 
@@ -121,17 +122,103 @@ public function getAllSegmentsForAllUsers($idSite = false)
 
     public function getSegmentByDefinition($definition)
     {
-        $sql = $this->buildQuerySortedByName("definition = ?");
+        $sql = $this->buildQuerySortedByName("definition = ? AND deleted = 0");
         $bind = [$definition];
 
         $segment = $this->getDb()->fetchRow($sql, $bind);
         return $segment;
     }
 
+    /**
+     * Gets a list of segments that have been deleted in the last week and therefore may have orphaned archives.
+     * @param Date $date Segments deleted on or after this date will be returned.
+     * @return array of segments. The segments are only populated with the fields needed for archive invalidation
+     * (e.g. definition, enable_only_idsite).
+     * @throws \Exception
+     */
+    public function getSegmentsDeletedSince(Date $date)
+    {
+        $dateStr = $date->getDatetime();
+        $sql = "SELECT DISTINCT definition, enable_only_idsite FROM " . Common::prefixTable('segment')
+            . " WHERE deleted = 1 AND ts_last_edit >= ?";
+        $deletedSegments = Db::fetchAll($sql, array($dateStr));
+
+        if (empty($deletedSegments)) {
+            return array();
+        }
+
+        $existingSegments = $this->getExistingSegmentsLike($deletedSegments);
+
+        foreach ($deletedSegments as $i => $deleted) {
+            $deletedSegments[$i]['idsites_to_preserve'] = array();
+            foreach ($existingSegments as $existing) {
+                if ($existing['definition'] != $deleted['definition'] &&
+                    $existing['definition'] != urlencode($deleted['definition']) &&
+                    $existing['definition'] != urldecode($deleted['definition'])
+                ) {
+                    continue;
+                }
+
+                if (
+                    $existing['enable_only_idsite'] == $deleted['enable_only_idsite']
+                    || $existing['enable_only_idsite'] == 0
+                ) {
+                    // There is an identical segment (for either the specific site or for all sites) that is active
+                    // The archives for this segment will therefore still be needed
+                    unset($deletedSegments[$i]);
+                    break;
+                } elseif ($deleted['enable_only_idsite'] == 0) {
+                    // It is an all-sites segment that got deleted, but there is a single-site segment that is active
+                    // Need to make sure we don't erase the segment's archives for that particular site
+                    $deletedSegments[$i]['idsites_to_preserve'][] = $existing['enable_only_idsite'];
+                }
+            }
+        }
+
+        return $deletedSegments;
+    }
+
+    private function getExistingSegmentsLike(array $segments)
+    {
+        if (empty($segments)) {
+            return array();
+        }
+
+        $whereClauses = array();
+        $bind = array();
+        $definitionWhereClauseTemplate = '(definition = ? OR definition = ? OR definition = ?)';
+        foreach ($segments as $segment) {
+            // Sometimes they are stored encoded and sometimes they aren't
+            $bind[] = $segment['definition'];
+            $bind[] = urlencode($segment['definition']);
+            $bind[] = urldecode($segment['definition']);
+
+            if ($segment['enable_only_idsite'] == 0) {
+                // They deleted an all-sites segment, but there is a single-site segment with same definition?
+                // Need to handle this carefully so that the archives for the single-site segment are preserved
+                $whereClauses[] = "$definitionWhereClauseTemplate";
+            } else {
+                $whereClauses[] = "($definitionWhereClauseTemplate AND (enable_only_idsite = ? OR enable_only_idsite = 0))";
+                $bind[] = $segment['enable_only_idsite'];
+            }
+        }
+        $whereClauses = implode(' OR ', $whereClauses);
+
+        // Check for any non-deleted segments with the same definition
+        $sql = "SELECT DISTINCT definition, enable_only_idsite FROM " . Common::prefixTable('segment')
+            . " WHERE deleted = 0 AND (" . $whereClauses . ")";
+        return Db::fetchAll($sql, $bind);
+    }
+
     public function deleteSegment($idSegment)
     {
+        $fieldsToSet = array(
+            'deleted' => 1,
+            'ts_last_edit' => Date::factory('now')->toString('Y-m-d H:i:s')
+        );
+
         $db = $this->getDb();
-        $db->delete($this->getTable(), 'idsegment = ' . (int) $idSegment);
+        $db->update($this->getTable(), $fieldsToSet, 'idsegment = ' . (int) $idSegment);
     }
 
     public function updateSegment($idSegment, $segment)
diff --git a/app/plugins/SegmentEditor/SegmentEditor.php b/app/plugins/SegmentEditor/SegmentEditor.php
index c00e980c8..b60861427 100644
--- a/app/plugins/SegmentEditor/SegmentEditor.php
+++ b/app/plugins/SegmentEditor/SegmentEditor.php
@@ -11,6 +11,8 @@
 use Piwik\API\Request;
 use Piwik\ArchiveProcessor\PluginsArchiver;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\Cache;
+use Piwik\CacheId;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
@@ -267,6 +269,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'SegmentEditor_OperatorAND';
         $translationKeys[] = 'SegmentEditor_OperatorOR';
         $translationKeys[] = 'SegmentEditor_AddANDorORCondition';
+        $translationKeys[] = 'SegmentEditor_DefaultAllVisits';
         $translationKeys[] = 'General_OperationEquals';
         $translationKeys[] = 'General_OperationNotEquals';
         $translationKeys[] = 'General_OperationAtMost';
@@ -279,5 +282,26 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'General_OperationDoesNotContain';
         $translationKeys[] = 'General_OperationStartsWith';
         $translationKeys[] = 'General_OperationEndsWith';
+        $translationKeys[] = 'General_Unknown';
+        $translationKeys[] = 'SegmentEditor_ThisSegmentIsCompared';
+        $translationKeys[] = 'SegmentEditor_ThisSegmentIsSelectedAndCannotBeCompared';
+        $translationKeys[] = 'SegmentEditor_CompareThisSegment';
+        $translationKeys[] = 'Live_VisitsLog';
+    }
+
+    public static function getAllSegmentsForSite($idSite)
+    {
+        $cache = Cache::getTransientCache();
+        $cacheKey = CacheId::siteAware('SegmentEditor_getAll', [$idSite]);
+
+        $segments = $cache->fetch($cacheKey);
+        if (!is_array($segments)) {
+            $segments = Request::processRequest('SegmentEditor.getAll', ['idSite' => $idSite], $default = []);
+            usort($segments, function ($lhs, $rhs) {
+                return strcmp($lhs['name'], $rhs['name']);
+            });
+            $cache->save($cacheKey, $segments);
+        }
+        return $segments;
     }
 }
diff --git a/app/plugins/SegmentEditor/config/tracker.php b/app/plugins/SegmentEditor/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/SegmentEditor/config/tracker.php
+++ b/app/plugins/SegmentEditor/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ar.json b/app/plugins/SegmentEditor/lang/ar.json
new file mode 100644
index 000000000..946d3e502
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/ar.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "اختبار"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/be.json b/app/plugins/SegmentEditor/lang/be.json
new file mode 100644
index 000000000..1909cb810
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/be.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Тэст"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/bg.json b/app/plugins/SegmentEditor/lang/bg.json
index faf7f322f..44c1fc8d3 100644
--- a/app/plugins/SegmentEditor/lang/bg.json
+++ b/app/plugins/SegmentEditor/lang/bg.json
@@ -18,6 +18,7 @@
         "ThisSegmentIsVisibleTo": "Този сегмент е видим за:",
         "VisibleToAllUsers": "всички потребители",
         "VisibleToMe": "аз",
-        "YouMustBeLoggedInToCreateSegments": "Трябва да сте вписани, за да създавате и редактирате персонализираните посетителски сегменти."
+        "YouMustBeLoggedInToCreateSegments": "Трябва да сте вписани, за да създавате и редактирате персонализираните посетителски сегменти.",
+        "Test": "Тест"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ca.json b/app/plugins/SegmentEditor/lang/ca.json
new file mode 100644
index 000000000..26470300a
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/ca.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Prova"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/cs.json b/app/plugins/SegmentEditor/lang/cs.json
index 1123ee450..80163290f 100644
--- a/app/plugins/SegmentEditor/lang/cs.json
+++ b/app/plugins/SegmentEditor/lang/cs.json
@@ -34,6 +34,7 @@
         "SegmentXIsAUnionOf": "%s je propojení těchto segmentů:",
         "CustomSegment": "Vlastní segment",
         "SegmentOperatorIsNullOrEmpty": "je nulový nebo prázdný",
-        "SegmentOperatorIsNotNullNorEmpty": "není nulový nebo prázdný"
+        "SegmentOperatorIsNotNullNorEmpty": "není nulový nebo prázdný",
+        "Test": "Vyzkoušet"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/da.json b/app/plugins/SegmentEditor/lang/da.json
index b3be3846a..9442b9b81 100644
--- a/app/plugins/SegmentEditor/lang/da.json
+++ b/app/plugins/SegmentEditor/lang/da.json
@@ -23,6 +23,7 @@
         "VisibleToSuperUser": "Synlig for dig, fordi du har superbrugeradgang",
         "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."
+        "AddingSegmentForAllWebsitesDisabled": "Tilføjelse af segmenter for alle websteder er blevet deaktiveret.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/de.json b/app/plugins/SegmentEditor/lang/de.json
index b0749c3a2..c9f746a8d 100644
--- a/app/plugins/SegmentEditor/lang/de.json
+++ b/app/plugins/SegmentEditor/lang/de.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Bitte beachten Sie dass Sie testen können ob Ihr Segment funktioniert ohne dass Sie auf die Verarbeitung warten müssen, in dem Sie die Live.getLastVisitsDetails API verwenden.",
         "CustomUnprocessedSegmentApiError6": "Wenn sie diese API Methode verwenden, werden Sie sehen welche Benutzer und Aktionen vom Ihrem &segment= Parameter betroffen sind.",
         "CustomUnprocessedSegmentNoData": "Um Daten für dieses Segment zu sehen, müssen Sie das Segment manuell im Segment Editor erstellen, dann ein paar Stunden auf die Verarbeitung warten.",
-        "AddThisToMatomo": "Dieses Segment zu Matomo hinzufügen"
+        "AddThisToMatomo": "Dieses Segment zu Matomo hinzufügen",
+        "ThisSegmentIsCompared": "Dieses Segment wird gerade verglichen.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Dieses Segment ist aktuell ausgewählt und kann deshalb nicht für einen Vergleich ausgewählt werden.",
+        "CompareThisSegment": "Vergleiche dieses Segment mit ausgewähltem Segment und Zeitraum.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/el.json b/app/plugins/SegmentEditor/lang/el.json
index 172409cb9..888dc19ae 100644
--- a/app/plugins/SegmentEditor/lang/el.json
+++ b/app/plugins/SegmentEditor/lang/el.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Πρέπει να σημειωθεί ότι μπορείτε να δοκιμάσετε αν θα δουλεύει το τμήμα σας χωρίς να περιμένετε να γίνει επεξεργασία του με χρήση της μεθόδου Live.getLastVisitsDetails του API.",
         "CustomUnprocessedSegmentApiError6": "Όταν χρησιμοποιείτε αυτή τη μέθοδο του API, θα δείτε ποιοι χρήστες και ενέργειες βρέθηκαν από την παράμετρο &segment=.",
         "CustomUnprocessedSegmentNoData": "Για να δείτε δεδομένα για το τμήμα, θα πρέπει πρώτα να δημιουργήσετε ένα τμήμα χειροκίνητα στον Επεξεργαστή Τμημάτων και να περιμένετε λίγες ώρες για να ολοκληρωθεί η προ-επεξεργασία.",
-        "AddThisToMatomo": "Προσθήκη του τμήματος στο Matomo"
+        "AddThisToMatomo": "Προσθήκη του τμήματος στο Matomo",
+        "ThisSegmentIsCompared": "Αυτή τη στιγμή γίνεται σύγκριση του τμήματος.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Το τμήμα αυτό είναι αυτή τη στιγμή επιλεγμένο και δεν μπορεί να επιλεγεί για σύγκριση.",
+        "CompareThisSegment": "Σύγκριση του τμήματος με το επιλεγμένο τμήμα και περίοδο.",
+        "Test": "Δοκιμή"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/en.json b/app/plugins/SegmentEditor/lang/en.json
index 19446db9a..5713dfbd7 100644
--- a/app/plugins/SegmentEditor/lang/en.json
+++ b/app/plugins/SegmentEditor/lang/en.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Please note that you can test whether your segment will work without having to wait for it to be processed by using the Live.getLastVisitsDetails API.",
         "CustomUnprocessedSegmentApiError6": "When using this API method, you will see which users and actions were matched by your &segment= parameter.",
         "CustomUnprocessedSegmentNoData": "To see data for this segment, you must create this segment manually in the Segment Editor, then wait a couple hours for preprocessing to complete.",
-        "AddThisToMatomo": "Add this segment to Matomo"
+        "AddThisToMatomo": "Add this segment to Matomo",
+        "ThisSegmentIsCompared": "This segment is currently compared.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "This segment is currently selected so cannot be selected to compare.",
+        "CompareThisSegment": "Compare this segment with the selected segment and period.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/es-ar.json b/app/plugins/SegmentEditor/lang/es-ar.json
index f4d647baf..e7d86d4d4 100644
--- a/app/plugins/SegmentEditor/lang/es-ar.json
+++ b/app/plugins/SegmentEditor/lang/es-ar.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
+        "PluginDescription": "Un segmento es un conjunto de criterios usados para seleccionar sólo una parte del conjunto entero de visitas. Al usar segmentos, podés inyectar un contexto arbitrario a tus informes.",
         "AddANDorORCondition": "Agregar condición %s",
         "AddNewSegment": "Agregar nuevo segmento",
         "AreYouSureDeleteSegment": "¿Estás seguro que querés eliminar este segmento?",
@@ -21,6 +22,7 @@
         "SegmentDisplayedThisWebsiteOnly": "sólo este sitio web",
         "SegmentIsDisplayedForWebsite": "y procesado para",
         "SegmentNotApplied": "Segmento \"%s'\" no aplicado",
+        "SegmentNotAppliedMessage": "Estás solicitando datos para el segmento personalizado \"%s\". Esta configuración de Matomo actualmente evita procesamiento en tiempo real de informes por razones de rendimiento.",
         "SelectSegmentOfVisits": "Seleccionar un segmento de visitas:",
         "ThisSegmentIsVisibleTo": "Este segmento es visible para:",
         "VisibleToAllUsers": "todos los usuarios",
@@ -34,6 +36,26 @@
         "SegmentXIsAUnionOf": "%s es una unión de estos fragmentos:",
         "CustomSegment": "El segmento personalizado",
         "SegmentOperatorIsNullOrEmpty": "es nulo o vacío",
-        "SegmentOperatorIsNotNullNorEmpty": "no es nulo ni vacío"
+        "SegmentOperatorIsNotNullNorEmpty": "no es nulo ni vacío",
+        "UnprocessedSegmentNoData1": "Estos informes no tienen datos, porque el segmento que solicitaste %1$s todavía no fue procesado por el sistema.",
+        "UnprocessedSegmentNoData2": "Los datos para este segmento deberían estar disponibles en algunas horas, cuando el procesamiento se complete (si no lo hace, puede haber algún problema).",
+        "UnprocessedSegmentInVisitorLog1": "%1$sMientras tanto, podés usar el registro de visitas%2$s para probar si tu segmento coincidirá con tus usuarios correctamente al aplicarlo allí.",
+        "UnprocessedSegmentInVisitorLog2": "Al aplicarlo, podés ver inmediatamente qué visitas y acciones coincidieron con tu segmento.",
+        "UnprocessedSegmentInVisitorLog3": "Esto puede ayudarte a confirmar si tu segmento coincide con los usuarios y acciones que esperás.",
+        "UnprocessedSegmentApiError1": "El segmento \"%1$s\" está establecido a \"%2$s\" pero Matomo no está configurado actualmente para procesar informes segmentados en las solicitudes de API.",
+        "UnprocessedSegmentApiError2": "Para ver datos de este informe en el futuro, vas a necesitar editar tu segmento y elegir la opción etiquetada como \"%s\".",
+        "UnprocessedSegmentApiError3": "Luego de unas horas, los datos de tu segmento deberían estar disponibles a través de la API (si no lo está, puede haber algún problema).",
+        "CustomUnprocessedSegmentApiError1": "El segmento que solicitaste no fue creado en el editor de segmento y por lo tanto los datos del informe no fueron preprocesados.",
+        "CustomUnprocessedSegmentApiError2": "Para ver datos de este segmento, tenés que ir a Matomo y crear este segmento manualmente en el Editor de segmento.",
+        "CustomUnprocessedSegmentApiError3": "(Alternativamente, podés crear un nuevo segmento de forma programada usando el método de la API \"SegmentEditor.add\".)",
+        "CustomUnprocessedSegmentApiError4": "Una vez creado el segmento en el editor (o vía API), este mensaje de error desaparecerá y a las pocas horas vas a ver tus datos de informe segmentado, luego de que los datos de segmento hayan sido preprocesados (si no lo son, puede haber un problema).",
+        "CustomUnprocessedSegmentApiError5": "Por favor, tené en cuenta que podés probar si tu segmento funcionará sin tener que esperar a que sea procesado, usando la API \"Live.getLastVisitsDetails\".",
+        "CustomUnprocessedSegmentApiError6": "Al usar este método de API, vas a ver cuáles usuarios y acciones coincidieron con tu parámetro \"&segment=\".",
+        "CustomUnprocessedSegmentNoData": "Para ver datos para este segmento, tenér que crear este segmento manualmente en el Editor de segmento, luego esperar unas horas hasta que el proceso se complete.",
+        "AddThisToMatomo": "Agregar este segmento a Matomo",
+        "ThisSegmentIsCompared": "Actualmente se está comparando este segmento.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Actualmente se está comparando este segmento, por lo que no es necesario seleccionarlo para compararlo.",
+        "CompareThisSegment": "Comparar este segmento con el segmento y período seleccionados.",
+        "Test": "Prueba"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/es.json b/app/plugins/SegmentEditor/lang/es.json
index c482e8458..d10312d34 100644
--- a/app/plugins/SegmentEditor/lang/es.json
+++ b/app/plugins/SegmentEditor/lang/es.json
@@ -52,6 +52,7 @@
         "CustomUnprocessedSegmentApiError5": "Tenga en cuenta que puede comprobar si su segmento funcionará sin tener que esperar a que se procese, simplemente utilizando la API Live.getLastVisitsDetails.",
         "CustomUnprocessedSegmentApiError6": "Cuando utilice este método API, verá qué usuarios y acciones coincidieron con su parámetro &segment=.",
         "CustomUnprocessedSegmentNoData": "Para ver los datos de este segmento, debe crear este segmento manualmente en el Editor de segmentos y luego esperar un par de horas para que se complete el preprocesamiento.",
-        "AddThisToMatomo": "Agregar este segmento a Matomo"
+        "AddThisToMatomo": "Agregar este segmento a Matomo",
+        "Test": "Prueba"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/et.json b/app/plugins/SegmentEditor/lang/et.json
index cbde4ae07..ee65b5bde 100644
--- a/app/plugins/SegmentEditor/lang/et.json
+++ b/app/plugins/SegmentEditor/lang/et.json
@@ -14,6 +14,7 @@
         "SegmentDisplayedThisWebsiteOnly": "ainult see veebileht",
         "ThisSegmentIsVisibleTo": "Antud segment on nähtav:",
         "VisibleToAllUsers": "kõik kasutajad",
-        "VisibleToMe": "mina"
+        "VisibleToMe": "mina",
+        "Test": "Testi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/eu.json b/app/plugins/SegmentEditor/lang/eu.json
new file mode 100644
index 000000000..366673fa3
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/eu.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Probatu"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/fa.json b/app/plugins/SegmentEditor/lang/fa.json
index 08c8a77a9..6c90d5242 100644
--- a/app/plugins/SegmentEditor/lang/fa.json
+++ b/app/plugins/SegmentEditor/lang/fa.json
@@ -17,6 +17,7 @@
         "ThisSegmentIsVisibleTo": "این بخش قابل رؤیت است:",
         "VisibleToAllUsers": "تمام کاربران",
         "VisibleToMe": "من",
-        "YouMustBeLoggedInToCreateSegments": "شما باید برای ایجاد و ویرایش بخش های بازدید کننده سفارشی، وارد سیستم شوید."
+        "YouMustBeLoggedInToCreateSegments": "شما باید برای ایجاد و ویرایش بخش های بازدید کننده سفارشی، وارد سیستم شوید.",
+        "Test": "آزمایش"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/fi.json b/app/plugins/SegmentEditor/lang/fi.json
index 7b9b41176..0488c71ab 100644
--- a/app/plugins/SegmentEditor/lang/fi.json
+++ b/app/plugins/SegmentEditor/lang/fi.json
@@ -30,6 +30,7 @@
         "CustomSegment": "Kustomoidut segmentit",
         "SegmentOperatorIsNullOrEmpty": "on tyhjä",
         "SegmentOperatorIsNotNullNorEmpty": "ei ole tyhjä",
-        "AddThisToMatomo": "Lisää tämä segmentti Matomoon"
+        "AddThisToMatomo": "Lisää tämä segmentti Matomoon",
+        "Test": "Testi"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/fr.json b/app/plugins/SegmentEditor/lang/fr.json
index ec5bab46f..845f2afee 100644
--- a/app/plugins/SegmentEditor/lang/fr.json
+++ b/app/plugins/SegmentEditor/lang/fr.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Veuillez noter que vous pouvez tester le fonctionnement de votre segment sans avoir à attendre qu'il soit analysé en utilisant l'API Live.GetLastVisitsDetails.",
         "CustomUnprocessedSegmentApiError6": "Lorsque vous utilisez la méthode de l'API, vous verrez quels utilisateurs et actions ont été identifiées par votre paramètres &segment=.",
         "CustomUnprocessedSegmentNoData": "Afin de voir des données pour ce segment, vous devez le créer manuellement dans l'éditeur de segment, puis attendre quelques heures afin que la pré-analyse se termine.",
-        "AddThisToMatomo": "Ajouter ce segment à Matomo"
+        "AddThisToMatomo": "Ajouter ce segment à Matomo",
+        "ThisSegmentIsCompared": "Ce segment est actuellement comparé.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Ce segment est actuellement sélectionné et ne peut pas être sélectionné pour être comparé.",
+        "CompareThisSegment": "Comparer ce segment avec le segment et la période sélectionnés.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/he.json b/app/plugins/SegmentEditor/lang/he.json
index 0ff47c462..10ab76c68 100644
--- a/app/plugins/SegmentEditor/lang/he.json
+++ b/app/plugins/SegmentEditor/lang/he.json
@@ -1,6 +1,7 @@
 {
     "SegmentEditor": {
         "DefaultAllVisits": "כל הביקורים",
-        "VisibleToAllUsers": "כל המשתמשים"
+        "VisibleToAllUsers": "כל המשתמשים",
+        "Test": "בדיקה"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/hi.json b/app/plugins/SegmentEditor/lang/hi.json
index 2941b8a12..474c80835 100644
--- a/app/plugins/SegmentEditor/lang/hi.json
+++ b/app/plugins/SegmentEditor/lang/hi.json
@@ -19,6 +19,7 @@
         "ThisSegmentIsVisibleTo": "इस खंड के लिए दिख रहा है:",
         "VisibleToAllUsers": "सभी उपयोगकर्ताओं",
         "VisibleToMe": "मुझे",
-        "YouMustBeLoggedInToCreateSegments": "आपको कस्टम आगंतुक खंड बनाने और संपादित करने के लिए लॉग इन करना होगा."
+        "YouMustBeLoggedInToCreateSegments": "आपको कस्टम आगंतुक खंड बनाने और संपादित करने के लिए लॉग इन करना होगा.",
+        "Test": "परीक्षण"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/hu.json b/app/plugins/SegmentEditor/lang/hu.json
new file mode 100644
index 000000000..76a62c270
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/hu.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Teszt"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/id.json b/app/plugins/SegmentEditor/lang/id.json
index 149ec43bb..5dd93f954 100644
--- a/app/plugins/SegmentEditor/lang/id.json
+++ b/app/plugins/SegmentEditor/lang/id.json
@@ -21,6 +21,7 @@
         "VisibleToMe": "saya",
         "SharedWithYou": "Berbagi dengan Anda",
         "YouMustBeLoggedInToCreateSegments": "Anda harus masuk-log untuk membuat dan menyunting pecahan pengunjung kustom.",
-        "SegmentOperatorIsNotNullNorEmpty": "tidak boleh null atau kosong"
+        "SegmentOperatorIsNotNullNorEmpty": "tidak boleh null atau kosong",
+        "Test": "Percobaan"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/it.json b/app/plugins/SegmentEditor/lang/it.json
index 1cca38486..78de221de 100644
--- a/app/plugins/SegmentEditor/lang/it.json
+++ b/app/plugins/SegmentEditor/lang/it.json
@@ -52,6 +52,7 @@
         "CustomUnprocessedSegmentApiError5": "Tieni presente che puoi verificare se il tuo segmento funzionerà, senza dover attendere che venga elaborato, utilizzando l'API Live.getLastVisitsDetails.",
         "CustomUnprocessedSegmentApiError6": "Quando utilizzi questo metodo API, vedrai quali utenti e azioni hanno avuto corrispondenza dal tuo parametro &segment.",
         "CustomUnprocessedSegmentNoData": "Per visualizzare i dati di questo segmento, è necessario creare manualmente questo segmento nell'Editor dei Segmenti, quindi attendere un paio d'ore per il completamento della pre-elaborazione.",
-        "AddThisToMatomo": "Aggiungi a Matomo questo segmento"
+        "AddThisToMatomo": "Aggiungi a Matomo questo segmento",
+        "Test": "Testa"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ja.json b/app/plugins/SegmentEditor/lang/ja.json
index 246b7e469..05ae21a37 100644
--- a/app/plugins/SegmentEditor/lang/ja.json
+++ b/app/plugins/SegmentEditor/lang/ja.json
@@ -52,6 +52,7 @@
         "CustomUnprocessedSegmentApiError5": "あなたのセグメントが Live.getLastVisitsDetails API を使用して処理されるのを待たずに動作するかどうかテストできます。",
         "CustomUnprocessedSegmentApiError6": "この API メソッドを使用すると、&segment= parameter で一致したユーザーとアクションが表示されます。",
         "CustomUnprocessedSegmentNoData": "このセグメントのデータを表示するには、セグメントエディタでこのセグメントを手動で作成し、前処理が完了するまで数時間待つ必要があります。",
-        "AddThisToMatomo": "このセグメントを Matomo に追加する"
+        "AddThisToMatomo": "このセグメントを Matomo に追加する",
+        "Test": "テスト"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ka.json b/app/plugins/SegmentEditor/lang/ka.json
new file mode 100644
index 000000000..1dcf5321a
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/ka.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "ტესტი"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ko.json b/app/plugins/SegmentEditor/lang/ko.json
new file mode 100644
index 000000000..4661e1ee8
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/ko.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "테스트"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/lt.json b/app/plugins/SegmentEditor/lang/lt.json
index bd373755e..e4436eeea 100644
--- a/app/plugins/SegmentEditor/lang/lt.json
+++ b/app/plugins/SegmentEditor/lang/lt.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
-        "OperatorAND": "IR"
+        "OperatorAND": "IR",
+        "Test": "Testas"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/lv.json b/app/plugins/SegmentEditor/lang/lv.json
new file mode 100644
index 000000000..e3aec0d25
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/lv.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Testēt"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/nb.json b/app/plugins/SegmentEditor/lang/nb.json
index 51e6751a1..f851f839f 100644
--- a/app/plugins/SegmentEditor/lang/nb.json
+++ b/app/plugins/SegmentEditor/lang/nb.json
@@ -11,6 +11,7 @@
         "ThisSegmentIsVisibleTo": "Dette segmentet er synlig for:",
         "VisibleToAllUsers": "alle brukere",
         "VisibleToMe": "meg",
-        "SharedWithYou": "Delt med deg"
+        "SharedWithYou": "Delt med deg",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/nl.json b/app/plugins/SegmentEditor/lang/nl.json
index 5995aa774..28f38a9d0 100644
--- a/app/plugins/SegmentEditor/lang/nl.json
+++ b/app/plugins/SegmentEditor/lang/nl.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
+        "PluginDescription": "Een segment is een set criteria die wordt gebruikt om slechts een deel van de hele set bezoeken te selecteren. Met behulp van segmenten kan je willekeurige context terug in uw rapporten injecteren.",
         "AddANDorORCondition": "%s-voorwaarde toevoegen",
         "AddNewSegment": "Nieuw segment toevoegen",
         "AreYouSureDeleteSegment": "Weet u zeker dat u dit segment wilt verwijderen?",
@@ -35,6 +36,14 @@
         "CustomSegment": "Aangepast segment",
         "SegmentOperatorIsNullOrEmpty": "is null of leeg",
         "SegmentOperatorIsNotNullNorEmpty": "is niet null of leeg",
-        "UnprocessedSegmentNoData1": "Deze rapporten hebben geen data omdat het opgevraagde segment %1$s nog niet is verwerkt door het systeem."
+        "UnprocessedSegmentNoData1": "Deze rapporten hebben geen data omdat het opgevraagde segment %1$s nog niet is verwerkt door het systeem.",
+        "UnprocessedSegmentNoData2": "Gegevens voor dit segment zouden binnen enkele uren beschikbaar moeten zijn wanneer de verwerking is voltooid. (Als dit niet het geval is, is er mogelijk een probleem.)",
+        "UnprocessedSegmentInVisitorLog2": "Wanneer toegepast, kan je direct zien welke bezoeken en acties zijn gekoppeld aan uw segment.",
+        "UnprocessedSegmentInVisitorLog3": "Dit kan helpen te bevestigen dat het segment overeenkomt met de gebruikers en acties die ervan verwacht worden.",
+        "CustomUnprocessedSegmentApiError6": "Wanneer deze API-methode wordt gebruikt, zie je welke gebruikers en acties zijn gekoppeld aan uw & segment = parameter.",
+        "AddThisToMatomo": "Voeg dit segment toe aan Matomo",
+        "ThisSegmentIsCompared": "Dit segment wordt momenteel vergeleken.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Dit segment is momenteel geselecteerd en kan niet geselecteerd worden om te vergelijken.",
+        "Test": "Testen"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/nn.json b/app/plugins/SegmentEditor/lang/nn.json
new file mode 100644
index 000000000..9d76db713
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/nn.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "Test"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/pl.json b/app/plugins/SegmentEditor/lang/pl.json
index 555ba43d3..58e19ac76 100644
--- a/app/plugins/SegmentEditor/lang/pl.json
+++ b/app/plugins/SegmentEditor/lang/pl.json
@@ -34,6 +34,7 @@
         "SegmentXIsAUnionOf": "%s jest złączeniem tych grup:",
         "CustomSegment": "Grupa użytkownika",
         "SegmentOperatorIsNullOrEmpty": "nie istnieje lub puste",
-        "SegmentOperatorIsNotNullNorEmpty": "istnieje lub nie jest puste"
+        "SegmentOperatorIsNotNullNorEmpty": "istnieje lub nie jest puste",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/pt-br.json b/app/plugins/SegmentEditor/lang/pt-br.json
index 43bf67a62..1ebfbf5e1 100644
--- a/app/plugins/SegmentEditor/lang/pt-br.json
+++ b/app/plugins/SegmentEditor/lang/pt-br.json
@@ -1,10 +1,11 @@
 {
     "SegmentEditor": {
+        "PluginDescription": "Um segmento é um conjunto de critérios usados para selecionar apenas uma parte de todo o conjunto de visitas. Ao usar segmentos você pode inserir contexto de volta aos seus relatórios.",
         "AddANDorORCondition": "Adicionar a condição %s",
         "AddNewSegment": "Adicionar novo segmento",
-        "AreYouSureDeleteSegment": "Confirma a exclusão deste segmento?",
-        "AutoArchivePreProcessed": "Relatórios segmentados são pré-processados ​​(Para agilizar, é necessário usar o cron em: archive.php)",
-        "AutoArchiveRealTime": "Relatórios segmentados são processados em tempo real",
+        "AreYouSureDeleteSegment": "Você tem certeza de que deseja excluir este segmento?",
+        "AutoArchivePreProcessed": "relatórios segmentados são pré-processados ​​(mais rápido, requer usar cron)",
+        "AutoArchiveRealTime": "relatórios segmentados são processados em tempo real",
         "ChangingSegmentDefinitionConfirmationNotProcessedOnRequest": "Você está prestes a mudar a definição do segmento. Os relatórios analíticos para este novo segmento não estarão disponíveis até que os relatórios sejam reprocessados. Pode levar algumas horas para que os dados de relatórios mostrem para esse segmento. Continuar mesmo assim?",
         "ChangingSegmentDefinitionConfirmationProcessedOnRequest": "Você está prestes a mudar a definição do segmento. Os relatórios analíticos para este novo segmento serão reprocessados sob demanda na próxima vez que solicitá-los. Seus relatórios pode demorar alguns minutos para aparecer. Continuar mesmo assim?",
         "ChooseASegment": "Escolha um segmento",
@@ -13,27 +14,48 @@
         "DefaultAllVisits": "Todas as visitas",
         "DragDropCondition": "Condição Drag & Drop",
         "HideMessageInFuture": "Ocultar esta mensagem no futuro",
-        "LoadingSegmentedDataMayTakeSomeTime": "O processamento segmentado de dados de visitantes pode demorar alguns mitutos...",
-        "OperatorAND": "e",
-        "OperatorOR": "ou",
+        "LoadingSegmentedDataMayTakeSomeTime": "O processamento segmentado de dados de visitantes pode demorar alguns minutos...",
+        "OperatorAND": "E",
+        "OperatorOR": "OU",
         "SaveAndApply": "Salvar e Aplicar",
-        "SegmentDisplayedAllWebsites": "Todos os Sites",
-        "SegmentDisplayedThisWebsiteOnly": "Somente neste website",
+        "SegmentDisplayedAllWebsites": "todos os sites",
+        "SegmentDisplayedThisWebsiteOnly": "somente neste website",
         "SegmentIsDisplayedForWebsite": "e processado ​​para",
         "SegmentNotApplied": "Segmento '%s' não aplicado",
+        "SegmentNotAppliedMessage": "Você está solicitando dados para o Segmento Customizado '%s', esta configuração do Matomo atualmente não permite o processamento de relatórios em tempo real por questão de performance.",
         "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 (%1$s), ou editar este Segmento e escolher %2$s.",
+        "VisibleToAllUsers": "todos os usuários",
+        "VisibleToMe": "eu",
+        "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.",
         "SegmentXIsAUnionOf": "%s é uma união destes segmentos:",
-        "CustomSegment": "Segmento Personalizado",
+        "CustomSegment": "Segmento personalizado",
         "SegmentOperatorIsNullOrEmpty": "está nulo ou vazio",
-        "SegmentOperatorIsNotNullNorEmpty": "não está nulo nem vazio"
+        "SegmentOperatorIsNotNullNorEmpty": "não está nulo nem vazio",
+        "UnprocessedSegmentNoData1": "Estes relatórios não possuem dados pois o Segmento que você solicitou %1$s ainda não foi processado pelo sistema.",
+        "UnprocessedSegmentNoData2": "Dados para este Segmento devem estar disponíveis em algumas horas quando o processamento terminar. (Se não ficarem disponíveis, pode haver um problema.)",
+        "UnprocessedSegmentInVisitorLog1": "%1$sEnquanto isso você pode usar o Log de Visitantes%2$s para testar se o seu segmento irá coincidir corretamente com seus usuários ao aplicá-lo lá.",
+        "UnprocessedSegmentInVisitorLog2": "Quando aplicado, você pode ver imediatamente quais visitas e ações coincidiram com o seu segmento.",
+        "UnprocessedSegmentInVisitorLog3": "Isto pode te ajudar a confirmar que seu Segmento coincide com os usuários e ações que você espera.",
+        "UnprocessedSegmentApiError1": "O Segmento '%1$s' está definido como '%2$s' mas o Matomo atualmente não está configurado para processar relatórios segmentados em solicitações de API.",
+        "UnprocessedSegmentApiError2": "Para ver dados deste relatório no futuro, você precisará editar o seu segmento e escolher a opção '%s'.",
+        "UnprocessedSegmentApiError3": "Então depois de algumas horas os dados do seu segmento devem estar disponíveis através da API. (Se não estiverem, deve ter ocorrido um problema.)",
+        "CustomUnprocessedSegmentApiError1": "O segmento que você solicitou ainda não foi criado no Editor de Segmento e portanto os dados do relatório não foram processados.",
+        "CustomUnprocessedSegmentApiError2": "Para ver dados para este segmento você deve ir ao Matomo e criar manualmente este segmento no Editor de Segmento.",
+        "CustomUnprocessedSegmentApiError3": "(Como alternativa, você pode criar um novo segmento programaticamente usando o método SegmentEditor.add da API).",
+        "CustomUnprocessedSegmentApiError4": "Uma vez criado o segmento no editor (ou via API), esta mensagem de erro irá desaparecer e dentro de algumas horas você verá os dados segmentados do seu relatório, após os dados segmentados terem sido pré-processados. (Se não acontecer, deve ter ocorrido um problema.)",
+        "CustomUnprocessedSegmentApiError5": "Por favor, note que você pode testar se o seu segmento irá funcionar, sem ter que esperar que ele seja processado, usando o método Live.getLastVisitsDetails da API.",
+        "CustomUnprocessedSegmentApiError6": "Ao usar este método da API, você verá quais usuários e ações coincidiram com o seu parâmetro &segment=.",
+        "CustomUnprocessedSegmentNoData": "Para ver dados para este segmento, você deve criar este segmento manualmente no Editor de Segmento, então esperar algumas horas para que o pré-processamento finalize.",
+        "AddThisToMatomo": "Adicionar este segmento ao Matomo",
+        "ThisSegmentIsCompared": "Este segmento está atualmente comparado.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Este segmento está atualmente selecionado e então não pode ser escolhido para comparação.",
+        "CompareThisSegment": "Comparar este segmento com o segmento e período selecionados.",
+        "Test": "Teste"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/pt.json b/app/plugins/SegmentEditor/lang/pt.json
index edc29b2af..089961c6c 100644
--- a/app/plugins/SegmentEditor/lang/pt.json
+++ b/app/plugins/SegmentEditor/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
+        "PluginDescription": "Um segmento é um conjunto de critérios utilizados para selecionar apenas uma parte do conjunto completo de visitas. Ao utilizar segmentos, pode injetar contextos arbitrários nos seus relatórios.",
         "AddANDorORCondition": "Adicionar condição %s",
         "AddNewSegment": "Adicionar novo segmento",
         "AreYouSureDeleteSegment": "Tem a certeza de que pretende eliminar este segmento?",
@@ -50,6 +51,11 @@
         "CustomUnprocessedSegmentApiError4": "Depois de criar o segmento no editor (ou via a API), esta mensagem de erro irá desaparecer e, no espaço de algumas horas, irá ver o relatório de dados segmentados depois do segmento de dados ser pré-processado. (Se isto não acontecer, pode existir um problema.)",
         "CustomUnprocessedSegmentApiError5": "Por favor, note que, pode testar se o seu segmento vai funcionar sem ter de aguardar que o mesmo seja processado, utilizando a API Live.getLastVisitsDetails.",
         "CustomUnprocessedSegmentApiError6": "Quando utiliza este método da API, irá ver que utilizadores e ações coincidiram com o seu parâmetro &segment=.",
-        "CustomUnprocessedSegmentNoData": "Para ver dados para este segmento, deve criar este segmento manualmente no editor de segmentos, depois aguardar algumas horas até o pré-processamento terminar."
+        "CustomUnprocessedSegmentNoData": "Para ver dados para este segmento, deve criar este segmento manualmente no editor de segmentos, depois aguardar algumas horas até o pré-processamento terminar.",
+        "AddThisToMatomo": "Adicionar este segmento ao Matomo",
+        "ThisSegmentIsCompared": "Este segmentos está atualmente a ser comparado.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Este segmento está atualmente selecionado pelo que não pode ser selecionado para a comparação.",
+        "CompareThisSegment": "Comparar este segmento com o segmento e período selecionado.",
+        "Test": "Teste"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ro.json b/app/plugins/SegmentEditor/lang/ro.json
index a948c7d0c..ba7943d1d 100644
--- a/app/plugins/SegmentEditor/lang/ro.json
+++ b/app/plugins/SegmentEditor/lang/ro.json
@@ -21,6 +21,7 @@
         "VisibleToMe": "mie",
         "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."
+        "YouDontHaveAccessToCreateSegments": "Nu ai nivelul de acces necesar pentru a crea și edita segmente.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/ru.json b/app/plugins/SegmentEditor/lang/ru.json
index 584c06682..77991bfbd 100644
--- a/app/plugins/SegmentEditor/lang/ru.json
+++ b/app/plugins/SegmentEditor/lang/ru.json
@@ -15,6 +15,7 @@
         "ThisSegmentIsVisibleTo": "Этот сегмент видим для:",
         "VisibleToAllUsers": "все пользователи",
         "VisibleToMe": "меня",
-        "AddingSegmentForAllWebsitesDisabled": "Добавление сегментов для всех веб-сайтов было отключено."
+        "AddingSegmentForAllWebsitesDisabled": "Добавление сегментов для всех веб-сайтов было отключено.",
+        "Test": "Тест"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/sk.json b/app/plugins/SegmentEditor/lang/sk.json
index fd149516e..24a8780c1 100644
--- a/app/plugins/SegmentEditor/lang/sk.json
+++ b/app/plugins/SegmentEditor/lang/sk.json
@@ -1,6 +1,7 @@
 {
     "SegmentEditor": {
         "AddNewSegment": "Pridať nový segment",
-        "DefaultAllVisits": "Všetky návštevy"
+        "DefaultAllVisits": "Všetky návštevy",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/sl.json b/app/plugins/SegmentEditor/lang/sl.json
index 0be062058..8c5969b98 100644
--- a/app/plugins/SegmentEditor/lang/sl.json
+++ b/app/plugins/SegmentEditor/lang/sl.json
@@ -1,5 +1,6 @@
 {
     "SegmentEditor": {
-        "DefaultAllVisits": "Vsi obiski"
+        "DefaultAllVisits": "Vsi obiski",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/sq.json b/app/plugins/SegmentEditor/lang/sq.json
index 4e5f6cd5c..099fefc3c 100644
--- a/app/plugins/SegmentEditor/lang/sq.json
+++ b/app/plugins/SegmentEditor/lang/sq.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Ju lutemi, mbani parasysh që mund të testoni nëse segmenti juaj do të funksionojë apo jo, pa u dashur të pritni që ai të përpunohet, duke përdorur API-n Live.getLastVisitsDetails.",
         "CustomUnprocessedSegmentApiError6": "Kur përdoret kjo metodë API, do të shihni se cilët përdorues dhe veprime patën përputhje me &segment= parameter tuaj.",
         "CustomUnprocessedSegmentNoData": "Që të shihni të dhëna për këtë segment, duhet ta krijoni këtë segment dorazi te Përpunues Segmentesh, dhe mandej të pritni dy-tre orë që të plotësohet parapërpunimi.",
-        "AddThisToMatomo": "Shtoje këtë segment te Matomo"
+        "AddThisToMatomo": "Shtoje këtë segment te Matomo",
+        "ThisSegmentIsCompared": "Ky segment po krahasohet tani.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Ky segment është aktualisht i përzgjedhur, ndaj s’mund të përzgjidhet për krahasim.",
+        "CompareThisSegment": "Krahasojeni këtë segment me segmentin dhe periudhën e përzgjedhur.",
+        "Test": "Provë"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/sr.json b/app/plugins/SegmentEditor/lang/sr.json
index bb85a1b65..dcec54142 100644
--- a/app/plugins/SegmentEditor/lang/sr.json
+++ b/app/plugins/SegmentEditor/lang/sr.json
@@ -34,6 +34,7 @@
         "SegmentXIsAUnionOf": "%s je unija ovih segmenata:",
         "CustomSegment": "Korisnički definisan segment",
         "SegmentOperatorIsNullOrEmpty": "je prazan ili nije definisan",
-        "SegmentOperatorIsNotNullNorEmpty": "niti je prazan niti je nedefinisan"
+        "SegmentOperatorIsNotNullNorEmpty": "niti je prazan niti je nedefinisan",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/sv.json b/app/plugins/SegmentEditor/lang/sv.json
index 4c5da0ca8..5376bc41f 100644
--- a/app/plugins/SegmentEditor/lang/sv.json
+++ b/app/plugins/SegmentEditor/lang/sv.json
@@ -50,6 +50,7 @@
         "CustomUnprocessedSegmentApiError4": "När du skapat segmentet i redigeraren (eller via API), kommer detta felmeddelande att försvinna och inom några timmar ser du din segmenterade rapportdata efter segmentdata har bearbetats. (Om det inte gör det kan ett fel ha uppstått.)",
         "CustomUnprocessedSegmentApiError5": "Observera att du kan testa om ditt segment kommer fungera utan att behöva vänta på att det ska behandlas med hjälp av Live.getLastVisitsDetails API.",
         "CustomUnprocessedSegmentApiError6": "När du använder den här API-metoden ser du vilka användare och åtgärder som matchades av din &segment=parameter.",
-        "CustomUnprocessedSegmentNoData": "Om du vill se data för det här segmentet måste du skapa det här segmentet manuellt i Segmentredigeraren och därefter vänta ett par timmar innan bearbetningen har slutförts."
+        "CustomUnprocessedSegmentNoData": "Om du vill se data för det här segmentet måste du skapa det här segmentet manuellt i Segmentredigeraren och därefter vänta ett par timmar innan bearbetningen har slutförts.",
+        "Test": "Test"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/th.json b/app/plugins/SegmentEditor/lang/th.json
new file mode 100644
index 000000000..bb2442e25
--- /dev/null
+++ b/app/plugins/SegmentEditor/lang/th.json
@@ -0,0 +1,5 @@
+{
+    "SegmentEditor": {
+        "Test": "คำสั่ง"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/tl.json b/app/plugins/SegmentEditor/lang/tl.json
index 7933c0fe3..728d4fc5c 100644
--- a/app/plugins/SegmentEditor/lang/tl.json
+++ b/app/plugins/SegmentEditor/lang/tl.json
@@ -21,6 +21,7 @@
         "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."
+        "AddingSegmentForAllWebsitesDisabled": "Ang pagdagdag ng bahagi para sa lahat ng website ay hindi na pinagana.",
+        "Test": "Pagsusulit"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/tr.json b/app/plugins/SegmentEditor/lang/tr.json
index 30ee40c19..7c66b2072 100644
--- a/app/plugins/SegmentEditor/lang/tr.json
+++ b/app/plugins/SegmentEditor/lang/tr.json
@@ -52,6 +52,10 @@
         "CustomUnprocessedSegmentApiError5": "Live.getLastVisitsDetails API yöntemini kullanarak verilerin ön hazırlığının tamamlanmasını beklemeden dilimin çalışıp çalışmadığını sınayabileceğinizi unutmayın.",
         "CustomUnprocessedSegmentApiError6": "Bu API yöntemini kullanarak, &segment= parametre ölçütünüze uyan kullanıcı ve işlemleri görebilirsiniz.",
         "CustomUnprocessedSegmentNoData": "Bu dilimin verilerini görüntülemek için, Dilim Düzenleyici üzerinden bu dilimi el ile ekledikten sonra verilerin hazırlanması için bir kaç saat beklemelisiniz.",
-        "AddThisToMatomo": "Bu parçayı Matomo üzerine ekle"
+        "AddThisToMatomo": "Bu parçayı Matomo üzerine ekle",
+        "ThisSegmentIsCompared": "Bu dilim şu anda karşılaştırılıyor.",
+        "ThisSegmentIsSelectedAndCannotBeCompared": "Bu dilim şu anda seçilmiş olduğundan karşılaştırmak için seçilemez.",
+        "CompareThisSegment": "Bu dilimi seçilmiş dilim ve aralık ile karşılaştır.",
+        "Test": "Sına"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/uk.json b/app/plugins/SegmentEditor/lang/uk.json
index 39763abd2..b01a5cea8 100644
--- a/app/plugins/SegmentEditor/lang/uk.json
+++ b/app/plugins/SegmentEditor/lang/uk.json
@@ -34,6 +34,7 @@
         "SegmentXIsAUnionOf": "%s є об'єднанням цих сегментів:",
         "CustomSegment": "Користувальницький Сегмент",
         "SegmentOperatorIsNullOrEmpty": "є нульовим або порожнім",
-        "SegmentOperatorIsNotNullNorEmpty": "не нульовий або порожній"
+        "SegmentOperatorIsNotNullNorEmpty": "не нульовий або порожній",
+        "Test": "Тест"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/vi.json b/app/plugins/SegmentEditor/lang/vi.json
index d94eb8f35..33d46dc23 100644
--- a/app/plugins/SegmentEditor/lang/vi.json
+++ b/app/plugins/SegmentEditor/lang/vi.json
@@ -17,6 +17,7 @@
         "ThisSegmentIsVisibleTo": "Phân đoạn này có thể nhìn thấy:",
         "VisibleToAllUsers": "Tất cả người dùng",
         "VisibleToMe": "Tôi",
-        "YouMustBeLoggedInToCreateSegments": "Bạn phải đăng nhập để tạo và chỉnh sửa các phân đoạn khách hàng."
+        "YouMustBeLoggedInToCreateSegments": "Bạn phải đăng nhập để tạo và chỉnh sửa các phân đoạn khách hàng.",
+        "Test": "Thử nghiệm"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/zh-cn.json b/app/plugins/SegmentEditor/lang/zh-cn.json
index bcba0173e..28aad1515 100644
--- a/app/plugins/SegmentEditor/lang/zh-cn.json
+++ b/app/plugins/SegmentEditor/lang/zh-cn.json
@@ -18,6 +18,7 @@
         "ThisSegmentIsVisibleTo": "这个分段对其可见:",
         "VisibleToAllUsers": "所有用户",
         "VisibleToMe": "我",
-        "YouMustBeLoggedInToCreateSegments": "您必须登录后创建和修改自定义访客分段"
+        "YouMustBeLoggedInToCreateSegments": "您必须登录后创建和修改自定义访客分段",
+        "Test": "测试"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/lang/zh-tw.json b/app/plugins/SegmentEditor/lang/zh-tw.json
index 238e74fc7..83ae81561 100644
--- a/app/plugins/SegmentEditor/lang/zh-tw.json
+++ b/app/plugins/SegmentEditor/lang/zh-tw.json
@@ -34,6 +34,7 @@
         "SegmentXIsAUnionOf": "%s 是這些區隔的聯合：",
         "CustomSegment": "自訂區隔",
         "SegmentOperatorIsNullOrEmpty": "是無效或空值",
-        "SegmentOperatorIsNotNullNorEmpty": "不是無效或空值"
+        "SegmentOperatorIsNotNullNorEmpty": "不是無效或空值",
+        "Test": "測試"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SegmentEditor/stylesheets/segmentation.less b/app/plugins/SegmentEditor/stylesheets/segmentation.less
index 8f3d973f9..a27e24fb0 100644
--- a/app/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/app/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -206,9 +206,16 @@ div.scrollable {
     cursor: pointer;
 }
 
-.segmentationContainer .submenu ul li:hover {
+.segmentationContainer .submenu ul li:hover,
+.segmentationContainer .submenu ul li:focus,
+.segmentationContainer .submenu ul li:focus-within {
     color: #255792;
     background: @color-silver-l95;
+    outline: none;
+
+    > * {
+        outline: none;
+    }
 }
 
 .segmentationContainer ul.submenu {
@@ -217,19 +224,46 @@ div.scrollable {
     margin-bottom: 5px;
 }
 
-.segmentationContainer ul.submenu > li span.editSegment {
-    display: block;
-    float: right;
-    text-align: center;
-    margin-right: 4px;
-    font-weight: normal;
-    background: url(plugins/SegmentEditor/images/edit_segment.png) no-repeat;
-    width: 16px;
-    height: 16px;
-    .opacity(0.5);
+.segmentationContainer ul.submenu > li {
+    span.editSegment, span.compareSegment {
+        display: block;
+        float: right;
+        text-align: center;
+        margin-right: 4px;
+        font-weight: normal;
+        width: 16px;
+        height: 16px;
+        .opacity(0.5);
+
+        &:hover {
+            .opacity(1);
+        }
+    }
+
+    span.editSegment {
+        background: url(plugins/SegmentEditor/images/edit_segment.png) no-repeat;
+    }
+
+    span.compareSegment {
+        background: url(plugins/Morpheus/images/compare.svg) no-repeat;
+        background-size: cover;
+
+        &.allVisitsCompareSegment {
+            margin-right: 24px;
+        }
+    }
+    
+    li.segmentSelected, li.comparedSegment {
+        span.compareSegment {
+            pointer-events: none;
+            opacity: 0.2;
+        }
+    }
+}
 
-    &:hover {
-        .opacity(1);
+html.comparisonsDisabled .segmentationContainer ul.submenu {
+    span.compareSegment {
+        display: none;
     }
 }
 
@@ -384,7 +418,11 @@ a.metric_category {
     margin: 8px;
 }
 
-.segmentSelected, .segmentSelected:hover, .segmentEditorPanel .segmentationContainer .submenu li .segmentSelected {
+.segmentSelected,
+.segmentSelected:hover,
+.segmentEditorPanel .segmentationContainer .submenu li .segmentSelected,
+.segmentEditorPanel .segmentationContainer .submenu li:focus,
+.segmentEditorPanel .segmentationContainer .submenu li:focus-within {
     font-weight: bold;
 }
 
diff --git a/app/plugins/SegmentEditor/templates/_segmentSelector.twig b/app/plugins/SegmentEditor/templates/_segmentSelector.twig
index befd058c1..f4cbfc837 100644
--- a/app/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/app/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -70,6 +70,7 @@
             <div piwik-rate-feature title="Segment Editor" style="display:inline-block;float: left;margin-top: 2px;margin-right: 10px;"></div>
             <a class="btn-flat delete" href="#">{{ 'General_Delete'|translate }}</a>
             <a class="btn-flat close" href="#">{{ 'General_Close'|translate }}</a>
+            <a class="btn-flat testSegment">{{ 'SegmentEditor_Test'|translate }}</a>
             <button class="btn saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button>
         </div>
     </div>
@@ -99,10 +100,10 @@
     <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
 </div>
 <div class="ui-confirm pleaseChangeBrowserAchivingDisabledSetting">
-    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|raw }}</h2>
+    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|rawSafeDecoded|raw }}</h2>
     {% set segmentSetting %}{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }}{% endset %}
     <p class="description">
-        {{ 'SegmentEditor_SegmentNotAppliedMessage'|translate(nameOfCurrentSegment)|raw }}
+        {{ 'SegmentEditor_SegmentNotAppliedMessage'|translate(nameOfCurrentSegment)|rawSafeDecoded|raw }}
         <br/>
         {{ 'SegmentEditor_DataAvailableAtLaterDate'|translate }}
         {% if isSuperUser %}
diff --git a/app/plugins/SitesManager/API.php b/app/plugins/SitesManager/API.php
index b8da10cf3..909d694f2 100644
--- a/app/plugins/SitesManager/API.php
+++ b/app/plugins/SitesManager/API.php
@@ -615,6 +615,7 @@ public function addSite($siteName,
                             $excludeUnknownUrls = null)
     {
         Piwik::checkUserHasSuperUserAccess();
+        SitesManager::dieIfSitesAdminIsDisabled();
 
         $this->checkName($siteName);
 
@@ -795,6 +796,7 @@ private function postUpdateWebsite($idSite)
     public function deleteSite($idSite)
     {
         Piwik::checkUserHasSuperUserAccess();
+        SitesManager::dieIfSitesAdminIsDisabled();
 
         $idSites = $this->getSitesId();
         if (!in_array($idSite, $idSites)) {
@@ -1255,6 +1257,7 @@ public function updateSite($idSite,
                                $excludeUnknownUrls = null)
     {
         Piwik::checkUserHasAdminAccess($idSite);
+        SitesManager::dieIfSitesAdminIsDisabled();
 
         $idSites = $this->getSitesId();
 
diff --git a/app/plugins/SitesManager/Controller.php b/app/plugins/SitesManager/Controller.php
index f30a53eb0..6d651e932 100644
--- a/app/plugins/SitesManager/Controller.php
+++ b/app/plugins/SitesManager/Controller.php
@@ -14,6 +14,7 @@
 use Piwik\Common;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Piwik;
+use Piwik\Plugin\Manager;
 use Piwik\Session;
 use Piwik\Settings\Measurable\MeasurableSettings;
 use Piwik\SettingsPiwik;
@@ -33,6 +34,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     public function index()
     {
         Piwik::checkUserHasSomeAdminAccess();
+        SitesManager::dieIfSitesAdminIsDisabled();
 
         return $this->renderTemplate('index');
     }
@@ -138,11 +140,46 @@ public function siteWithoutData()
             Piwik::checkUserHasViewAccess($this->idSite);
         }
 
+        $jsTag = Request::processRequest('SitesManager.getJavascriptTag', array('idSite' => $this->idSite, 'piwikUrl' => $piwikUrl));
+
+        // Strip off open and close <script> tag and comments so that JS will be displayed in ALL mail clients
+        $rawJsTag = TrackerCodeGenerator::stripTags($jsTag);
+
+        $showMatomoLinks = true;
+        /**
+         * @ignore
+         */
+        Piwik::postEvent('SitesManager.showMatomoLinksInTrackingCodeEmail', array(&$showMatomoLinks));
+
+        $trackerCodeGenerator = new TrackerCodeGenerator();
+        $trackingUrl = trim(SettingsPiwik::getPiwikUrl(), '/') . '/' . $trackerCodeGenerator->getPhpTrackerEndpoint();
+
+        $emailContent = $this->renderTemplateAs('@SitesManager/_trackingCodeEmail', array(
+            'jsTag' => $rawJsTag,
+            'showMatomoLinks' => $showMatomoLinks,
+            'trackingUrl' => $trackingUrl,
+            'idSite' => $this->idSite
+        ), $viewType = 'basic');
+
+        $googleAnalyticsImporterMessage = '';
+        if (Manager::getInstance()->isPluginLoaded('GoogleAnalyticsImporter')) {
+            $googleAnalyticsImporterMessage = '<h3>' . Piwik::translate('CoreAdminHome_ImportFromGoogleAnalytics') . '</h3>'
+                . '<p>' . Piwik::translate('CoreAdminHome_ImportFromGoogleAnalyticsDescription', ['<a href="https://plugins.matomo.org/GoogleAnalyticsImporter" rel="noopener noreferrer" target="_blank">', '</a>']) . '</p>'
+                . '<p></p>';
+
+            /**
+             * @ignore
+             */
+            Piwik::postEvent('SitesManager.siteWithoutData.customizeImporterMessage', [&$googleAnalyticsImporterMessage]);
+        }
+
         return $this->renderTemplateAs('siteWithoutData', array(
-            'siteName'     => $this->site->getName(),
-            'idSite' => $this->idSite,
-            'jsTag'           => Request::processRequest('SitesManager.getJavascriptTag', array('idSite' => $this->idSite, 'piwikUrl' => $piwikUrl)),
-            'piwikUrl'        => $piwikUrl,
+            'siteName'      => $this->site->getName(),
+            'idSite'        => $this->idSite,
+            'jsTag'         => $jsTag,
+            'piwikUrl'      => $piwikUrl,
+            'emailBody'     => $emailContent,
+            'googleAnalyticsImporterMessage' => $googleAnalyticsImporterMessage,
         ), $viewType = 'basic');
     }
 }
diff --git a/app/plugins/SitesManager/Menu.php b/app/plugins/SitesManager/Menu.php
index d37353cad..f8b94dc97 100644
--- a/app/plugins/SitesManager/Menu.php
+++ b/app/plugins/SitesManager/Menu.php
@@ -28,7 +28,7 @@ public function configureAdminMenu(MenuAdmin $menu)
             $menu->addMeasurableItem('General_Settings', $this->urlForAction('globalSettings'), $order = 11);
         }
         
-        if (Piwik::isUserHasSomeAdminAccess()) {
+        if (Piwik::isUserHasSomeAdminAccess() && SitesManager::isSitesAdminEnabled()) {
             $menu->addMeasurableItem('SitesManager_MenuManage', $this->urlForAction('index'), $order = 10);
 
             $type = $this->getFirstTypeIfOnlyOneIsInUse();
diff --git a/app/plugins/SitesManager/SitesManager.php b/app/plugins/SitesManager/SitesManager.php
index fca307d5d..e6a62262b 100644
--- a/app/plugins/SitesManager/SitesManager.php
+++ b/app/plugins/SitesManager/SitesManager.php
@@ -11,6 +11,7 @@
 use Piwik\Access;
 use Piwik\API\Request;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Option;
@@ -47,11 +48,26 @@ public function registerEvents()
         );
     }
 
+    public static function isSitesAdminEnabled()
+    {
+        return (bool) Config::getInstance()->General['enable_sites_admin'];
+    }
+
+    public static function dieIfSitesAdminIsDisabled()
+    {
+        Piwik::checkUserIsNotAnonymous();
+        if (!self::isSitesAdminEnabled()) {
+            throw new \Exception('Creating, updating, and deleting sites has been disabled.');
+        }
+    }
+
     public function addSystemSummaryItems(&$systemSummary)
     {
-        $websites = Request::processRequest('SitesManager.getAllSites', array('filter_limit' => '-1'));
-        $numWebsites = count($websites);
-        $systemSummary[] = new SystemSummary\Item($key = 'websites', Piwik::translate('CoreHome_SystemSummaryNWebsites', $numWebsites), $value = null, $url = array('module' => 'SitesManager', 'action' => 'index'), $icon = '', $order = 10);
+        if (self::isSitesAdminEnabled()) {
+            $websites = Request::processRequest('SitesManager.getAllSites', array('filter_limit' => '-1'));
+            $numWebsites = count($websites);
+            $systemSummary[] = new SystemSummary\Item($key = 'websites', Piwik::translate('CoreHome_SystemSummaryNWebsites', $numWebsites), $value = null, $url = array('module' => 'SitesManager', 'action' => 'index'), $icon = '', $order = 10);
+        }
     }
 
     public function redirectDashboardToWelcomePage(&$module, &$action)
@@ -409,5 +425,8 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = "Goals_Ecommerce";
         $translationKeys[] = "SitesManager_NotFound";
         $translationKeys[] = "SitesManager_DeleteSiteExplanation";
+        $translationKeys[] = "SitesManager_EmailInstructionsButton";
+        $translationKeys[] = "SitesManager_EmailInstructionsSubject";
+        $translationKeys[] = "SitesManager_JsTrackingTagHelp";
     }
 }
diff --git a/app/plugins/SitesManager/config/config.php b/app/plugins/SitesManager/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/SitesManager/config/config.php
+++ b/app/plugins/SitesManager/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/SitesManager/config/tracker.php b/app/plugins/SitesManager/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/SitesManager/config/tracker.php
+++ b/app/plugins/SitesManager/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/ar.json b/app/plugins/SitesManager/lang/ar.json
index 7e582bd91..fbcf68caf 100644
--- a/app/plugins/SitesManager/lang/ar.json
+++ b/app/plugins/SitesManager/lang/ar.json
@@ -34,7 +34,6 @@
         "SelectDefaultTimezone": "يمكنك تحديد منطقة زمنية افتراضية للمواقع الجديدة",
         "ShowTrackingTag": "عرض وسم التتبع",
         "Sites": "المواقع",
-        "SiteWithoutDataTitle": "لم يتم تسجيل بيانات حتى الآن",
         "SiteWithoutDataDescription": "لم يتم تتبُّع بيانات إحصاء لموقع الوب هذا حتى الآن.",
         "Timezone": "المنطقة الزمنية",
         "TrackingSiteSearch": "تتبُّع البحث الداخلي للموقع",
diff --git a/app/plugins/SitesManager/lang/cs.json b/app/plugins/SitesManager/lang/cs.json
index 26b0d3004..34692f153 100644
--- a/app/plugins/SitesManager/lang/cs.json
+++ b/app/plugins/SitesManager/lang/cs.json
@@ -69,7 +69,6 @@
         "ShowTrackingTag": "zobrazit zaznamenávací tagy",
         "Sites": "Stránky",
         "SiteSearchUse": "Matomo 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í kód%2$s uvedený níže na vašich stránkách nebo v mobilní aplikaci, pokud jste to ješště neudělali.",
         "SiteWithoutDataMessageDisappears": "Tato zpráva zmizí jakmile dojde k nahrání nějakých dat pro tento web.",
diff --git a/app/plugins/SitesManager/lang/da.json b/app/plugins/SitesManager/lang/da.json
index 82e1644be..603e2bc6b 100644
--- a/app/plugins/SitesManager/lang/da.json
+++ b/app/plugins/SitesManager/lang/da.json
@@ -1,11 +1,13 @@
 {
     "SitesManager": {
         "AddSite": "Tilføj en ny hjemmeside",
+        "AddMeasurable": "Tilføj en ny målbar",
         "AdvancedTimezoneSupportNotFound": "PHP understøtter ikke avancerede tidszoner (understøttes i PHP> = 5.2). Du kan stadig vælge en manuel UTC offset.",
         "AliasUrlHelp": "Det anbefales, men er ikke nødvendigt at angive de forskellige netadresser, en på hver linje, som besøgende kan komme ind på hjemmesiden. Alias netadresser for et netsted, vises ikke i Henvisning> Hjemmesider rapport. Bemærk, at det ikke er nødvendigt at specificere netadresser med og uden 'www' da Matomo automatisk finder begge.",
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Ændring af tidszonen har kun virkning fremadrettet og vil ikke blive anvendt med tilbagevirkende kraft.",
         "Currency": "Valuta",
         "CurrencySymbolWillBeUsedForGoals": "Valutasymbolet vises i forbindelse med indtægter fra mål.",
+        "CustomizeJavaScriptTracker": "Tilpas JavaScript tracking",
         "DefaultCurrencyForNewWebsites": "Standardvaluta for nye hjemmesider",
         "DefaultTimezoneForNewWebsites": "Standardtidszone for nye hjemmesider",
         "DeleteConfirm": "Bekræft sletning af følgende hjemmeside? %s",
@@ -25,12 +27,14 @@
         "ExcludedIps": "Udeluk IP-adresser",
         "ExcludedParameters": "Udeluk parametre",
         "ExcludedUserAgents": "Ekskluderede User Agents",
+        "Format_Utc": "UTC %s",
         "GlobalExcludedUserAgentHelp1": "Angiv listen over brugeragenter der ikke skal spores af Matomo.",
         "GlobalExcludedUserAgentHelp2": "Brug dette til at udelukke nogle bots fra at blive sporet.",
         "GlobalListExcludedIps": "Liste over udelukkede IP-adresser",
         "GlobalListExcludedQueryParameters": "Global liste over udelukkede URL-søgeparametre",
         "GlobalListExcludedUserAgents": "Global liste af User Agents som skal udelukkes",
         "GlobalListExcludedUserAgents_Desc": "Hvis besøgende brugeragent streng indeholder nogen af de ​​strenge, du angiver, vil besøgende blive udelukket fra Matomo.",
+        "GlobalSettings": "Globale instillinger",
         "GlobalWebsitesSettings": "Globale hjemmeside indstillinger",
         "HelpExcludedIpAddresses": "Angiv listen af IP-adresser (én pr. linje), du ønsker at udelukke fra at blive sporet af Matomo. Du kan benytte CIDR-notatoin, fx %1$s, eller du kan bruge jokertegn, fx %2$s eller %3$s",
         "JsTrackingTagHelp": "JavaScript-sporingskoden som skal tilføjes til alle sider",
@@ -41,9 +45,12 @@
         "ListOfIpsToBeExcludedOnAllWebsites": "Indtast IP-adresser, som skal udelukkes fra at blive sporet på alle hjemmesider.",
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "URL-søgeparameterne nedenfor vil blive udelukket fra URL'er på alle hjemmesider.",
         "ListOfQueryParametersToExclude": "Angiv listen af URL-parametre (én pr. linje), der skal ekskluderes fra side-URL-rapporter. Du kan bruge regulære udtryk, såsom %s.",
+        "LogAnalytics": "Log-analyser",
+        "LogAnalyticsDescription": "Hvis JavaScript tracking metode ikke er mulig, kan du %1$s bruge serverlog analyser %2$s som en alternativ metode til at tracke dine website-brugere.",
         "MainDescription": "Din hjemmesideanalyse kræver hjemmesider! Tilføj, opdater, slet hjemmesider og vis JavaScript-koden, som skal indsættes på dine sider.",
         "MenuManage": "Administrer",
         "MobileAppsAndSDKs": "Mobileapps and SDK’er",
+        "MobileAppsAndSDKsDescription": "Du tracker ikke et website? Du kan alternativt tracke en mobil App eller enhver anden type applikation, ved at benytte et af de %1$stilgængelige SDKer%2$s.",
         "NotAnEcommerceSite": "Ikke en e-handelshjemmeside",
         "NotFound": "Ingen hjemmesider for",
         "NoWebsites": "Du har ingen hjemmesider at administrere.",
@@ -65,6 +72,8 @@
         "ShowTrackingTag": "Vis sporingskode",
         "Sites": "Hjemmesider",
         "SiteSearchUse": "Du kan bruge Matomo til at spore og rapportere hvad besøgende søger efter i hjemmesidens interne søgemaskine.",
+        "SiteWithoutDataTitle": "Ingen data er registreret endnu. Sæt tingene op herunder",
+        "SiteWithoutDataDescription": "Ingen analysedata er blevet tracket endnu på dette website.",
         "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",
diff --git a/app/plugins/SitesManager/lang/de.json b/app/plugins/SitesManager/lang/de.json
index 828aff963..eac001b33 100644
--- a/app/plugins/SitesManager/lang/de.json
+++ b/app/plugins/SitesManager/lang/de.json
@@ -46,11 +46,11 @@
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "Die untenstehenden GET-Parameter werden von allen URLs aller Websites ignoriert.",
         "ListOfQueryParametersToExclude": "Geben Sie die Liste der URL Query Parameter an, einen pro Zeile, um sie von der URL Berichtsseite auszuschließen. Reguläre Ausdrücke so wie %s werden unterstützt.",
         "LogAnalytics": "Log-Analyse",
-        "LogAnalyticsDescription": "Wenn das Tracking per Javascript nicht möglich ist, können Sie %1$sServer Log Anayltics %2$s als Alternative Method einsetzen, um die Besucher Ihrer Webseite zu analysieren.",
+        "LogAnalyticsDescription": "Wenn das Tracking per Javascript nicht möglich ist, können Sie %1$sServer Log Analytics %2$s als alternative Methode einsetzen, um die Besucher Ihrer Webseite zu analysieren.",
         "MainDescription": "Ihre Webanalyse benötigt Websites! Websites können hinzugefügt, aktualisiert und gelöscht werden. Hier wird auch der JavaScript-Code gezeigt, der in Ihre Websites eingefügt werden muss.",
         "MenuManage": "Verwalten",
         "MobileAppsAndSDKs": "Mobile Anwendungen und SDKs",
-        "MobileAppsAndSDKsDescription": "Nicht am tracken einer Webseite? Sie können alternativ eine der %1$sverfügbaren SDKs%2$s nützen, um eine mobile App oder eine andere Art Applikation überwachen.",
+        "MobileAppsAndSDKsDescription": "Nicht am Tracken einer Webseite? Sie können alternativ eine der %1$sverfügbaren SDKs%2$s verwenden, um eine mobile App oder eine andere Art Applikation zu überwachen.",
         "NotAnEcommerceSite": "Dies ist keine Ecommerce Seite",
         "NotFound": "Keine Websites gefunden für",
         "NoWebsites": "Es ist noch keine Website zum administrieren vorhanden.",
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "Tracking-Code anzeigen",
         "Sites": "Websites",
         "SiteSearchUse": "Matomo kann auswerten, wonach Besucher in der internen Suche der Website suchen.",
-        "SiteWithoutDataTitle": "Bisher wurden keine Daten aufgezeichnet",
+        "SiteWithoutDataTitle": "Es wurden bisher noch keine Daten gesammelt, untenstehendes Setup beachten",
         "SiteWithoutDataDescription": "Für diese Website wurden bisher noch keine Analysedaten aufgezeichnet.",
         "SiteWithoutDataSetupTracking": "Bitte fügen Sie den folgenden %1$sTracking 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.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Was möchten Sie messen?",
         "YouCurrentlyHaveAccessToNWebsites": "Sie haben derzeit Zugriff auf %s Websites.",
         "YourCurrentIpAddressIs": "Ihre aktuelle IP-Adresse ist %s",
-        "DeleteSiteExplanation": "Eine Website zu löschen führt dazu, dass alle dafür gesammelten Logdaten gelöscht werden. Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
+        "DeleteSiteExplanation": "Eine Website zu löschen führt dazu, dass alle dafür gesammelten Logdaten gelöscht werden. Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.",
+        "EmailInstructionsButton": "Anleitung per E-Mail versenden",
+        "EmailInstructionsSubject": "Matomo Analytics Tracking Code",
+        "EmailInstructionsDocsPlainText": "Wenn Sie mehr möchten als nur Seitenansichten zu verfolgen, sehen Sie sich die Matomo-Dokumentation %1$s an.",
+        "EmailInstructionsGenerateTrackingCode": "Sie können einen benutzerdefinerten Tracking-Code unter %1$s erstellen.",
+        "EmailInstructionsSiteDetailsHeading": "Einzelheiten Ihrer Seite",
+        "EmailInstructionsSiteDetails": "Sie benötigen diese Angaben, um die API oder SDKs zum Verfolgen von Matomo-Besuchen zu verwenden.",
+        "EmailInstructionsYourSiteId": "Ihre Seiten-ID: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Ihre Tracking-URL: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/el.json b/app/plugins/SitesManager/lang/el.json
index bfe537322..9fb986082 100644
--- a/app/plugins/SitesManager/lang/el.json
+++ b/app/plugins/SitesManager/lang/el.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "προβολή ετικέτας παρακολούθησης",
         "Sites": "Ιστοτόποι",
         "SiteSearchUse": "Μπορείτε να χρησιμοποιήσετε το Matomo για να παρακολουθείτε και να έχετε αναφορές για το τι ψάχνουν οι επισκέπτες στην εσωτερική μηχανή αναζήτησης της ιστοσελίδας σας.",
-        "SiteWithoutDataTitle": "Δεν έχουν καταγραφεί ακόμη δεδομένα",
+        "SiteWithoutDataTitle": "Δεν έχουν καταγραφεί ακόμη δεδομένα, ξεκινήστε παρακάτω την παραμετροποίηση",
         "SiteWithoutDataDescription": "Δεν έχουν ακόμη καταγραφεί δεδομένα αναλυτικών για τον ιστοτόπο αυτόν ακόμη.",
         "SiteWithoutDataSetupTracking": "Κάντε ορισμό του %1$sκώδικα παρακολούθησης%2$s στον ιστοτόπο σας ή στην εφαρμογή για κινητά αν δεν το έχετε ήδη κάνει.",
         "SiteWithoutDataMessageDisappears": "Το μήνυμα θα εξαφανιστεί με το που θα καταχωρηθούν δεδομένα παρακολούθησης για τον ιστοτόπο αυτό.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Τι θέλετε να μετρήσετε;",
         "YouCurrentlyHaveAccessToNWebsites": "Έχετε πρόσβαση σε %s ιστοσελίδες.",
         "YourCurrentIpAddressIs": "Η τρέχουσα διεύθυνση IP είναι %s",
-        "DeleteSiteExplanation": "Η διαγραφή ενός ιστοτόπου θα διαγράψει όλα τα δεδομένα που έχουν συλλεχθεί για αυτόν. Η ενέργεια είναι μόνιμη και δεν είναι αναστρέψιμη."
+        "DeleteSiteExplanation": "Η διαγραφή ενός ιστοτόπου θα διαγράψει όλα τα δεδομένα που έχουν συλλεχθεί για αυτόν. Η ενέργεια είναι μόνιμη και δεν είναι αναστρέψιμη.",
+        "EmailInstructionsButton": "Να σταλούν με e-mail οι οδηγίες αυτές",
+        "EmailInstructionsSubject": "Κώδικας Ιχνηλάτησης του Matomo Analytics",
+        "EmailInstructionsDocsPlainText": "Αν θέλετε να κάνετε περισσότερα από μια ιχνηλάτηση των αναγνώσεων σελίδων, δείτε την τεκμηρίωση του Matomo στο %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Μπορείτε επιπλέον να παράγετε τον προσαρμοσμένο κώδικα ιχνηλάτησης στο %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Οι πληροφορίες του ιστοτόπου σας",
+        "EmailInstructionsSiteDetails": "Θα χρειαστείτε αυτές τις λεπτομέρειες για χρήση στο API ή SDK για την ιχνηλάτηση των επισκέψεων του Matomo.",
+        "EmailInstructionsYourSiteId": "Το αναγνωριστικό του ιστοτόπου σας: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Η διεύθυνση URL ιχνηλάτησης: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/en.json b/app/plugins/SitesManager/lang/en.json
index 592d9718f..53a13acb3 100644
--- a/app/plugins/SitesManager/lang/en.json
+++ b/app/plugins/SitesManager/lang/en.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "View Tracking code",
         "Sites": "Websites",
         "SiteSearchUse": "You can use Matomo to track and report what visitors are searching in your website's internal search engine.",
-        "SiteWithoutDataTitle": "No data has been recorded yet",
+        "SiteWithoutDataTitle": "No data has been recorded yet, get set up below",
         "SiteWithoutDataDescription": "No analytics data has been tracked for this website yet.",
         "SiteWithoutDataSetupTracking": "Please set up the %1$stracking code%2$s below into your website or mobile app if you haven't done already.",
         "SiteWithoutDataMessageDisappears": "This message will disappear as soon as some data was tracked for this website.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "What would you like to measure?",
         "YouCurrentlyHaveAccessToNWebsites": "You currently have access to %s websites.",
         "YourCurrentIpAddressIs": "Your current IP address is %s",
-        "DeleteSiteExplanation": "Deleting a website will delete all log data that has been collected for it. This action is permanent and cannot be undone."
+        "DeleteSiteExplanation": "Deleting a website will delete all log data that has been collected for it. This action is permanent and cannot be undone.",
+        "EmailInstructionsButton": "Email these instructions",
+        "EmailInstructionsSubject": "Matomo Analytics Tracking Code",
+        "EmailInstructionsDocsPlainText": "If you want to do more than track page views, please check out the Matomo documentation at %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "You can also generate a customized tracking code at %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Your Site Details",
+        "EmailInstructionsSiteDetails": "You will need these details to use the API or SDKs to track Matomo visits.",
+        "EmailInstructionsYourSiteId": "Your site ID: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Your tracking URL: %1$s"
     }
 }
diff --git a/app/plugins/SitesManager/lang/es-ar.json b/app/plugins/SitesManager/lang/es-ar.json
index ad3b46673..4b83bf236 100644
--- a/app/plugins/SitesManager/lang/es-ar.json
+++ b/app/plugins/SitesManager/lang/es-ar.json
@@ -3,9 +3,11 @@
         "AddSite": "Agregar un nuevo sitio web",
         "AddMeasurable": "Agregar un nuevo medible",
         "AdvancedTimezoneSupportNotFound": "No se encontró el soporte avanzado para zonas horarias en tu PHP (soportado en PHP>=5.2). Todavía podés elegir un corrimiento UTC manual.",
+        "AliasUrlHelp": "Se recomienda, pero no es obligatorio, especificar las diferentes direcciones web que tus visitantes usan para acceder a este sitio web. Los alias de las direcciones web para un sitio web no aparecerán en el informe Origen de visitante > Sitios web. Tené en cuenta que no es necesario especificar las direcciones web con y sin \"www\" ya que Matomo considera automáticamente ambas.",
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Cambiar tu zona horaria sólo afectará a los datos en adelante, y no se aplicará retroactivamente.",
         "Currency": "Moneda",
         "CurrencySymbolWillBeUsedForGoals": "El símbolo de moneda se muestra al lado de los ingresos objetivos.",
+        "CustomizeJavaScriptTracker": "Personalizar el seguimiento vía JavaScript",
         "DefaultCurrencyForNewWebsites": "Moneda predeterminada para los nuevos sitios web",
         "DefaultTimezoneForNewWebsites": "Zona horaria predeterminada para los nuevos sitios web",
         "DeleteConfirm": "¿Estás seguro que querés eliminar el sitio web %s?",
@@ -25,12 +27,16 @@
         "ExcludedIps": "IPs excluidas",
         "ExcludedParameters": "Parámetros de exclusión",
         "ExcludedUserAgents": "Agentes de usuario excluidos",
+        "Format_Utc": "UTC%s",
+        "GlobalExcludedUserAgentHelp1": "Introducí la lista de agentes de usuario a excluir de ser rastreados por Matomo.",
         "GlobalExcludedUserAgentHelp2": "Puede utilizar esto para excluir algunos bots de ser seguidos.",
         "GlobalListExcludedIps": "Lista global de IPs excluidas",
         "GlobalListExcludedQueryParameters": "Lista global de parámetros de direcciones web a excluir",
         "GlobalListExcludedUserAgents": "Lista global de los agentes de usuario a excluir",
+        "GlobalListExcludedUserAgents_Desc": "Si la cadena de agente de usuario del visitante contiene alguna de las cadenas que especificaste, el visitante será excluido de Matomo.",
         "GlobalSettings": "Configuración global",
         "GlobalWebsitesSettings": "Configuración global de los sitios web",
+        "HelpExcludedIpAddresses": "Introducí la lista de direcciones IP, una por línea, que deseás excluir de ser rastreadas por Matomo. Podés usar notación CIDR (por ejemplo %1$s) o comodines (por ejemplo: %2$s o %3$s).",
         "JsTrackingTagHelp": "Acá está el código de seguimiento JavaScript para incluir en todas tus páginas",
         "KeepURLFragments": "Seguimiento de fragmentos de la dirección web de la página",
         "KeepURLFragmentsHelp": "Si la casilla de abajo no está seleccionada, los fragmentos de la dirección web de la página (todo después de %1$s) serán quitados al seguir: %2$s será seguido como %3$s",
@@ -39,13 +45,20 @@
         "ListOfIpsToBeExcludedOnAllWebsites": "Las IPs a continuación quedarán excluidas de ser rastreadas en todos los sitios web.",
         "ListOfQueryParametersToBeExcludedOnAllWebsites": "Los parámetros de consulta de direcciones web a continuación serán excluidos de las direcciones web de los sitios.",
         "ListOfQueryParametersToExclude": "Ingresá la lista de parámetros de direcciones web de consulta, uno por línea, para excluirlas de los informes de direcciones web de páginas. Expresiones regulares como %s son soportadas.",
+        "LogAnalytics": "Análisis de registros",
+        "LogAnalyticsDescription": "Si el método de rastreo de JavaScript no es posible, podés usar el %1$sanálisis de registro%2$s como un método alternativo de rastreo de los usuarios de tu sitio web.",
         "MainDescription": "¡Tus informes de análisis Web necesitan Sitios web! Agregá, actualizá, eliminá sitios web, y mostrá el código JavaScript para insertar en tus páginas.",
         "MenuManage": "Administrar",
+        "MobileAppsAndSDKs": "Aplicaciones web y kits de desarrollo de software",
+        "MobileAppsAndSDKsDescription": "¿No estás rastreando un sitio web? Alternativamente podés rastrear una aplicación móvil u otro cualquier tipo de aplicación usando uno de nuestros %1$skits de desarrollo de software disponibles%2$s.",
         "NotAnEcommerceSite": "No es un sitio de Ecommerce",
         "NotFound": "No se encontró ningún sitio web para",
         "NoWebsites": "No tenés ningún sitio web para administrar.",
         "OnlyOneSiteAtTime": "Sólo podés editar un sitio web a la vez. Por favor, guardá o cancelá tus modificaciones actuales para el sitio web %s.",
+        "PiwikOffersEcommerceAnalytics": "Matomo permite el rastreo avanzado de análisis Ecommerce y su posterior generación de informes. Aprendé más acerca de %1$s análisis Ecommerce%2$s.",
+        "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Matomo excluirá automáticamente los parámetros comunes de sesión (%s).",
         "PluginDescription": "La administración de sitios web te permite agregar un nuevo sitio y editar los existentes.",
+        "SearchCategoryDesc": "Matomo puede seguir la categoría \"Buscar\" para cada palabra clave del buscador interno del sitio.",
         "SearchCategoryLabel": "Parámetro de categoría",
         "SearchCategoryParametersDesc": "Podés ingresar una lista de parámetros de consulta, separados por comas, especificando la categoría de búsqueda.",
         "SearchKeywordLabel": "Parámetro de consulta",
@@ -58,9 +71,13 @@
         "SelectDefaultTimezone": "Podés seleccionar la zona horaria predeterminada para los nuevos sitios web.",
         "ShowTrackingTag": "Ver código de seguimiento",
         "Sites": "Sitios web",
-        "SiteWithoutDataTitle": "No se registró ningún dato aún",
+        "SiteSearchUse": "Podés usar Matomo para rastrear y obtener un informe sobre qué visitantes están buscando en el motor de búsqueda interno de tu sitio web.",
+        "SiteWithoutDataTitle": "No se registró ningún dato aún, hacé la configuración abajo",
         "SiteWithoutDataDescription": "No hay datos de análisis rastreados para este sitio web aún.",
+        "SiteWithoutDataSetupTracking": "Por favor, establecé el %1$scódigo de seguimiento%2$s en tu sitio web o aplicación móvil, si todavía no lo hiciste.",
         "SiteWithoutDataMessageDisappears": "Este mensaje desaparecerá tan pronto como se rastree algún dato para este sitio web.",
+        "SiteWithoutDataSetupGoals": "Mientras tanto, quizá quieras %1$sestablecer algunas metas%2$s o aprender más sobre las %3$sfunciones%4$s de Matomo en una de nuestras %5$sguías%6$s o %7$spreguntas frecuentes%8$s.",
+        "SiteWithoutDataIgnoreMessage": "No mostrar este mensaje durante la próxima hora",
         "SuperUserAccessCan": "Un usuario con acceso de súperusuario también puede %1$sespecificar configuraciones globales%2$s para nuevos sitios web.",
         "Timezone": "Zona horaria",
         "TrackingSiteSearch": "Rastreo de la búsqueda interna del sitio",
@@ -69,10 +86,21 @@
         "Type": "Tipo",
         "UTCTimeIs": "La hora UTC es %s.",
         "OnlyMatchedUrlsAllowed": "Sólo rastrear visitas y acciones cuando la dirección web de acción comienza con una de las direcciones web de arriba.",
+        "OnlyMatchedUrlsAllowedHelp": "Al estar habilitado, Matomo sólo rastreará acciones internas cuando la dirección web de la página es una de las ya conocidas para tu sitio web. Esto previene que la gente haga spam en tus análisis con direcciones web de otros sitios.",
+        "OnlyMatchedUrlsAllowedHelpExamples": "El dominio y la ruta tienen que ser una coincidencia exacta y cada subdominio válido tienen que ser especificados separadamente. Por ejemplo, cuando las direcciones web conocidas son \"http:\/\/ejemplo.com\/ruta\" y \"http:\/\/buen.ejemplo.com\", las solicitudes para \"http:\/\/ejemplo.com\/otraruta\" o \"http:\/\/mal.ejemplo.com\" son ignoradas.",
         "WebsitesManagement": "Administración de sitios web",
         "XManagement": "Administrar %s",
         "ChooseMeasurableTypeHeadline": "¿Qué te gustaría medir?",
         "YouCurrentlyHaveAccessToNWebsites": "Actualmente tenés acceso a %s sitios web.",
-        "YourCurrentIpAddressIs": "Tu dirección IP actual es %s"
+        "YourCurrentIpAddressIs": "Tu dirección IP actual es %s",
+        "DeleteSiteExplanation": "Al eliminar un sitio web, se eliminarán todos los datos registrados que se colectaron del mismo. Esta acción es permanente y no se puede deshacer.",
+        "EmailInstructionsButton": "Enviar estas instrucciones por correo electrónico",
+        "EmailInstructionsSubject": "Código de rastreo de Matomo Analytics",
+        "EmailInstructionsDocsPlainText": "Si querés hacer más que rastreo de páginas visitadas, por favor, revisá nuestra documentación de Matomo en %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "También podés generar un código de rastreo personalizado en %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Detalles de tu sitio",
+        "EmailInstructionsSiteDetails": "Vas a necesitar esos detalles para usar la API o SDK para rastrear visitas de Matomo.",
+        "EmailInstructionsYourSiteId": "Identificación de tu sitio: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Dirección web de tu rastreo: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/es.json b/app/plugins/SitesManager/lang/es.json
index 8c71bab6e..3cc25f448 100644
--- a/app/plugins/SitesManager/lang/es.json
+++ b/app/plugins/SitesManager/lang/es.json
@@ -72,7 +72,6 @@
         "ShowTrackingTag": "Ver código de rastreo",
         "Sites": "Sitios de internet",
         "SiteSearchUse": "Puede utilizar Matomo 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": "Si no lo has hecho ya, por favor, configura el %1$scódigo de seguimiento%2$s de abajo en tu sitio web o app para móvil.",
         "SiteWithoutDataMessageDisappears": "Este mensaje desaparecerá tan pronto como algún dato sea monitoreado en este sitio web.",
diff --git a/app/plugins/SitesManager/lang/fi.json b/app/plugins/SitesManager/lang/fi.json
index 522807853..8ed4d5fa5 100644
--- a/app/plugins/SitesManager/lang/fi.json
+++ b/app/plugins/SitesManager/lang/fi.json
@@ -7,6 +7,7 @@
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Aikavyöhykkeen vaihtaminen vaikuttaa vain uusiin tietoihin, eikä vanhoja muutetaan.",
         "Currency": "Valuutta",
         "CurrencySymbolWillBeUsedForGoals": "Valuutan symboli näytetään tavoitteiden tuloissa.",
+        "CustomizeJavaScriptTracker": "Mukauta JavaScript-seurantaa",
         "DefaultCurrencyForNewWebsites": "Oletusvaluutta uusille sivustoille",
         "DefaultTimezoneForNewWebsites": "Oletusaikavyöhyke uusille sivustoille",
         "DeleteConfirm": "Haluatko varmasti poistaa sivun %s?",
@@ -68,7 +69,6 @@
         "ShowTrackingTag": "näytä seurantakoodi",
         "Sites": "Sivustot",
         "SiteSearchUse": "Voit käyttää Matomoa seurataksesi ja raportoidaksesi, mitä kävijät etsivät sivustosi sisäisellä hakukoneella.",
-        "SiteWithoutDataTitle": "Tietoja ei ole vielä kerätty",
         "SiteWithoutDataDescription": "Tämän sivuston analytiikkatietoja ei ole vielä kerätty.",
         "SiteWithoutDataSetupTracking": "Aseta alapuolella oleva %1$sseurantakoodi%2$s sivustollesi tai mobiilisovellukseen, jos et ole sitä vielä tehnyt.",
         "SiteWithoutDataMessageDisappears": "Tämä viesti poistuu näkyvistä, kun tämän sivuston kävijöistä voidaan näyttää kerättyjä tietoja.",
@@ -86,6 +86,11 @@
         "ChooseMeasurableTypeHeadline": "Mitä haluat mitata?",
         "YouCurrentlyHaveAccessToNWebsites": "Sinulla on pääsy %s sivuston tietoihin",
         "YourCurrentIpAddressIs": "Nykyinen IP-osoitteesi on %s",
-        "DeleteSiteExplanation": "Verkkosivuston poistaminen poistaa kaiken sivustolta kerätyn lokitiedon. Tätä toimenpidettä ei voi perua."
+        "DeleteSiteExplanation": "Verkkosivuston poistaminen poistaa kaiken sivustolta kerätyn lokitiedon. Tätä toimenpidettä ei voi perua.",
+        "EmailInstructionsButton": "Lähetä nämä ohjeet sähköpostitse",
+        "EmailInstructionsSubject": "Matomo-analytiikan seurantakoodi",
+        "EmailInstructionsSiteDetailsHeading": "Sivustosi tiedot",
+        "EmailInstructionsYourSiteId": "Sivustosi ID-tunniste: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Seurantaosoite: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/fr.json b/app/plugins/SitesManager/lang/fr.json
index 229db4d17..56f3738d3 100644
--- a/app/plugins/SitesManager/lang/fr.json
+++ b/app/plugins/SitesManager/lang/fr.json
@@ -7,7 +7,7 @@
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Le fait de modifier votre fuseau horaire affectera uniquement les nouvelles données, ce n'est pas rétroactif.",
         "Currency": "Devise",
         "CurrencySymbolWillBeUsedForGoals": "Le symbole de la devise sera affiché à côté des revenus des Objectifs",
-        "CustomizeJavaScriptTracker": "Personnaliser le suivit JavaScript",
+        "CustomizeJavaScriptTracker": "Personnaliser le suivi JavaScript",
         "DefaultCurrencyForNewWebsites": "Devise par défaut pour les nouveaux sites web",
         "DefaultTimezoneForNewWebsites": "Fuseau horaire par défaut pour les nouveaux sites web",
         "DeleteConfirm": "Êtes-vous sûr(e) de vouloir supprimer le site %s ?",
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "Afficher le code",
         "Sites": "Sites web",
         "SiteSearchUse": "Vous pouvez utiliser Matomo 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",
+        "SiteWithoutDataTitle": "Aucune donnée enregistrée pour le moment, complétez la configuration ci-dessous",
         "SiteWithoutDataDescription": "Aucune donnée d'analyse n'a été enregistrée pour ce site pour le moment.",
         "SiteWithoutDataSetupTracking": "Veuillez configurer le %1$scode de suivi%2$s ci-dessous sur votre site web ou application 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.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Que voudriez-vous mesurer ?",
         "YouCurrentlyHaveAccessToNWebsites": "Vous avez actuellement accès à %s sites web.",
         "YourCurrentIpAddressIs": "Votre adresse IP actuelle est %s",
-        "DeleteSiteExplanation": "Supprimer un site web va supprimer tous les journaux et données qui ont été collectés pour ce dernier. Cette action est permanente et ne peut pas être annulée."
+        "DeleteSiteExplanation": "Supprimer un site web va supprimer tous les journaux et données qui ont été collectés pour ce dernier. Cette action est permanente et ne peut pas être annulée.",
+        "EmailInstructionsButton": "Envoyer ces instructions par courriel",
+        "EmailInstructionsSubject": "Code de suivi des statistiques Matomo",
+        "EmailInstructionsDocsPlainText": "Si vous souhaitez aller plus loin que le suivi des pages vues, merci de consulter la documentation Matomo sur %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Vous pouvez également générer un code de suivi personnalisé sur %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Les détails de votre site",
+        "EmailInstructionsSiteDetails": "Vous aurez besoin de ces informations afin d'utiliser l'API ou les SDK pour suivre les visites Matomo.",
+        "EmailInstructionsYourSiteId": "ID de votre site : %1$s",
+        "EmailInstructionsYourTrackingUrl": "Votre URL de suivi : %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/it.json b/app/plugins/SitesManager/lang/it.json
index 9dd31d89e..dbd894375 100644
--- a/app/plugins/SitesManager/lang/it.json
+++ b/app/plugins/SitesManager/lang/it.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "Vedi codice Tracking",
         "Sites": "Siti web",
         "SiteSearchUse": "È possibile utilizzare Matomo 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",
+        "SiteWithoutDataTitle": "Nessun dato è stato ancora registrato, imposta qui sotto",
         "SiteWithoutDataDescription": "Per questo sito non sono ancora stati tracciati dati statistici.",
         "SiteWithoutDataSetupTracking": "Si prega di impostare in fondo al tuo sito web o all'app mobile il %1$scodice di traccimento%2$s, se non lo hai già fatto.",
         "SiteWithoutDataMessageDisappears": "Questo messaggio scomparirà non appena dei dati di questo sito saranno raccolti.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Cosa intendi misurare",
         "YouCurrentlyHaveAccessToNWebsites": "Al momento hai accesso a %s siti.",
         "YourCurrentIpAddressIs": "Il tuo indirizzo IP è %s",
-        "DeleteSiteExplanation": "L'eliminazione di un sito web comporta la cancellazione di tutti i dati di registro che sono stati raccolti per esso. Questa azione è permanente e non può essere annullata."
+        "DeleteSiteExplanation": "L'eliminazione di un sito web comporta la cancellazione di tutti i dati di registro che sono stati raccolti per esso. Questa azione è permanente e non può essere annullata.",
+        "EmailInstructionsButton": "Invia queste istruzioni per email",
+        "EmailInstructionsSubject": "Codice Tracking di Matomo Analytics",
+        "EmailInstructionsDocsPlainText": "Se vuoi fare altro oltre che monitorare le pagine viste, guardati la documentazione di Matomo su %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Puoi anche generare un codice tracking personalizzato su %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Dettagli del tuo sito",
+        "EmailInstructionsSiteDetails": "Avrai bisogno di questi dettagli per utilizzare API o SDK per tracciare le visite di Matomo.",
+        "EmailInstructionsYourSiteId": "ID del tuo sito: %1$s",
+        "EmailInstructionsYourTrackingUrl": "La tua tracking URL: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/ja.json b/app/plugins/SitesManager/lang/ja.json
index 0ded2634a..f398f4a27 100644
--- a/app/plugins/SitesManager/lang/ja.json
+++ b/app/plugins/SitesManager/lang/ja.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "トラッキングコードを表示",
         "Sites": "ウェブサイト",
         "SiteSearchUse": "Matomo を利用して、ビジターがウェブサイトの内部検索エンジンで検索しているものを追跡およびレポートすることができます。",
-        "SiteWithoutDataTitle": "まだデータは記録されていません",
+        "SiteWithoutDataTitle": "データはまだ記録されていません。以下に設定してください",
         "SiteWithoutDataDescription": "まだこのウエブサイトの分析データは追跡されていません。",
         "SiteWithoutDataSetupTracking": "ウェブサイトあるいはモバイルアプリでトラッキングコードが未設定の場合は、下記の%1$sトラッキングコード%2$sを設定してください。",
         "SiteWithoutDataMessageDisappears": "このメッセージは、このウェブサイトの一部のデータが追跡されるとすぐに消えます。",
diff --git a/app/plugins/SitesManager/lang/ko.json b/app/plugins/SitesManager/lang/ko.json
index 7550919d8..d80b0f6f2 100644
--- a/app/plugins/SitesManager/lang/ko.json
+++ b/app/plugins/SitesManager/lang/ko.json
@@ -64,7 +64,6 @@
         "ShowTrackingTag": "트래킹 태그 보기",
         "Sites": "웹사이트",
         "SiteSearchUse": "당신은 Matomo를 사용하여 웹사이트의 내부검색 엔진에서 방문자가 어떤 검색을 했는지 추적하고 보고받을 수 있습니다.",
-        "SiteWithoutDataTitle": "아직 아무런 데이터가 기록되지 않았습니다.",
         "SiteWithoutDataDescription": "아직 해당 사이트를 추적하여 분석한 데이터가 없습니다.",
         "SiteWithoutDataMessageDisappears": "이 글귀는 해당 웹사이트에서 데이터가 추적되어지는 즉시 사라질 것이다.",
         "SuperUserAccessCan": "슈퍼 유저는 새로운 사이트에 대해서 %1$s일반 웹사이트 설정%2$s을 통해 관리할 수 있습니다.",
diff --git a/app/plugins/SitesManager/lang/nb.json b/app/plugins/SitesManager/lang/nb.json
index aee383bfc..ac2502b60 100644
--- a/app/plugins/SitesManager/lang/nb.json
+++ b/app/plugins/SitesManager/lang/nb.json
@@ -63,7 +63,6 @@
         "ShowTrackingTag": "Vis sporingskoden",
         "Sites": "Nettsteder",
         "SiteSearchUse": "Du kan bruke Matomo 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å.",
         "SiteWithoutDataMessageDisappears": "Denne meldingen vil forsvinne så snart noe data har blitt registrert for dette nettstedet.",
         "SuperUserAccessCan": "En bruker med superbrukertilgang kan også %1$s spesifisere globale innstillinger%2$s for nye nettsteder.",
diff --git a/app/plugins/SitesManager/lang/nl.json b/app/plugins/SitesManager/lang/nl.json
index 8f343514d..6d785e480 100644
--- a/app/plugins/SitesManager/lang/nl.json
+++ b/app/plugins/SitesManager/lang/nl.json
@@ -64,7 +64,6 @@
         "ShowTrackingTag": "Trackingcode bekijken",
         "Sites": "Websites",
         "SiteSearchUse": "Je kan Matomo gebruiken om te volgen en te rapporteren wat bezoekers via de interne zoekmachine op je website zoeken.",
-        "SiteWithoutDataTitle": "Er zijn nog geen gegevens geregistreerd",
         "SiteWithoutDataDescription": "Er is nog geen analytics data voor deze website bijgehouden.",
         "SiteWithoutDataSetupTracking": "Stel de %1$strackingcode%2$s hieronder in op uw website of mobiele app, als u dit nog niet gedaan heeft.",
         "SiteWithoutDataMessageDisappears": "Deze melding zal verdwijnen wanneer er wat data voor deze website is ontvangen.",
diff --git a/app/plugins/SitesManager/lang/pl.json b/app/plugins/SitesManager/lang/pl.json
index a49a84e58..7677b9fa9 100644
--- a/app/plugins/SitesManager/lang/pl.json
+++ b/app/plugins/SitesManager/lang/pl.json
@@ -71,7 +71,6 @@
         "ShowTrackingTag": "Zobacz kod śledzący",
         "Sites": "Serwisy internetowe",
         "SiteSearchUse": "Możesz używać Matomo'a do śledzenia i raportowania czego odwiedzający poszukują w wewnętrznej wyszukiwarce Twojego serwisu WWW.",
-        "SiteWithoutDataTitle": "Nie zapisano jeszcze żadnych danych",
         "SiteWithoutDataDescription": "Nie przechwycono jeszcze żadnych danych analitycznych dla tego serwisu.",
         "SiteWithoutDataSetupTracking": "Proszę dodaj %1$skod śledzący%2$s widoczny poniżej do Twojego serwisu WWW lub aplikacji mobilnej, jeśli jeszcze tego nie zrobiłeś\/aś.",
         "SiteWithoutDataMessageDisappears": "Ta wiadomość zniknie zaraz po zarejestrowaniu danych z pierwszych odwiedzin serwisu.",
diff --git a/app/plugins/SitesManager/lang/pt-br.json b/app/plugins/SitesManager/lang/pt-br.json
index 78f58b23c..c90436cf1 100644
--- a/app/plugins/SitesManager/lang/pt-br.json
+++ b/app/plugins/SitesManager/lang/pt-br.json
@@ -16,83 +16,91 @@
         "EnableEcommerce": "Ecommerce ativado",
         "EnableSiteSearch": "Ativado o rastreamento de pesquisas no site.",
         "EnableSiteSpecificUserAgentExclude": "Ativar exclusão de User Agent específico no website.",
-        "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.",
+        "EnableSiteSpecificUserAgentExclude_Help": "Se você precisa excluir diferentes user agents para sites distintos, marque esta caixa, clique em salvar e %1$sadicione os user agents acima%2$s.",
+        "ExceptionDeleteSite": "Não é possível excluir este site já que ele é o único site registrado. Adicione um novo site primeiro, depois exclua este.",
         "ExceptionEmptyName": "O nome do site não pode ficar vazio.",
         "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.",
-        "ExcludedIps": "IPs excluidos",
+        "ExcludedIps": "IPs excluídos",
         "ExcludedParameters": "Parâmetros Excluídos",
         "ExcludedUserAgents": "User Agents excluídos",
         "Format_Utc": "UTC%s",
         "GlobalExcludedUserAgentHelp1": "Insira a lista de user agents para exclusão de rastreamento pelo Matomo.",
         "GlobalExcludedUserAgentHelp2": "Você pode usar isso para excluir alguns bots de serem rastreados.",
-        "GlobalListExcludedIps": "Lista global de IPs excluidos",
+        "GlobalListExcludedIps": "Lista global de IPs excluídos",
         "GlobalListExcludedQueryParameters": "Lista global de parâmetros Query URL para excluir",
         "GlobalListExcludedUserAgents": "Lista global de user agents para excluir",
-        "GlobalListExcludedUserAgents_Desc": "Se a seqüência de user agent do visitante tiver qualquer uma das seqüências que você especificar, o visitante será excluído do Matomo.",
+        "GlobalListExcludedUserAgents_Desc": "Se a seqüência de user agent do visitante tiver qualquer uma das sequências que você especificar, o visitante será excluído do Matomo.",
         "GlobalSettings": "Configurações globais",
-        "GlobalWebsitesSettings": "Configurações globais de websites",
+        "GlobalWebsitesSettings": "Configurações globais de sites",
         "HelpExcludedIpAddresses": "Entre com a lista de IPs, um por linha, que você deseja excluir por ter sido rastreado pelo Matomo. Você pode usar notação CIDR, ex: %1$s ou você pode usar wildcards, ex: %2$s ou %3$s",
         "JsTrackingTagHelp": "Aqui está a tag de rastreamento JavaScript a ser incluída em todas as suas páginas",
         "KeepURLFragments": "Rastreamento de fragmentos de URL",
         "KeepURLFragmentsHelp": "Se a caixa abaixo estiver desmarcada, fragmentos de URL da página (tudo após o %1$s) será removido ao rastrear:%2$s serão rastreadas como %3$s",
         "KeepURLFragmentsHelp2": "Você também pode substituir essa configuração para sites individuais acima.",
         "KeepURLFragmentsLong": "Mantenha fragmentos de URL da página quando estiver rastreando URLs de páginas",
-        "ListOfIpsToBeExcludedOnAllWebsites": "Os IPs abaixo serão excluidos por terem sido rastreados em todos os websites.",
-        "ListOfQueryParametersToBeExcludedOnAllWebsites": "Os parâmetros Query URL abaixo serão excluidos das URLs em todos os websites",
-        "ListOfQueryParametersToExclude": "Entre com a lista de parâmetros URL Query, uma por linha, para excluir os relatórios das páginas URL. Expressões regulares tais como %s são suportados.",
+        "ListOfIpsToBeExcludedOnAllWebsites": "Os IPs abaixo serão excluídos por terem sido rastreados em todos os sites.",
+        "ListOfQueryParametersToBeExcludedOnAllWebsites": "Os parâmetros Query URL abaixo serão excluídos das URLs em todos os sites.",
+        "ListOfQueryParametersToExclude": "Entre com a lista de parâmetros URL Query, um por linha, para excluir os relatórios das páginas URL. Expressões regulares tais como %s são suportadas.",
         "LogAnalytics": "Análise de registro",
-        "LogAnalyticsDescription": "Se o método de rastreamento Javascript não for viável, você pode %1$susar análise de registro do servidor%2$s como uma método alternativo para rastrear os usuários do seu site.",
-        "MainDescription": "Seus relatórios de Web Analytics precisam de websites! Adiciona, atualiza, elimina websites, e mostra o JavaScript necessário para inserir em suas páginas.",
+        "LogAnalyticsDescription": "Se o método de rastreamento Javascript não for viável, você pode %1$susar análise de registro do servidor%2$s como um método alternativo para rastrear os usuários do seu site.",
+        "MainDescription": "Seus relatórios de Web Analytics precisam de sites! Adicione, atualize, exclua sites, e mostre o JavaScript a ser inserido em suas páginas.",
         "MenuManage": "Gerenciar",
         "MobileAppsAndSDKs": "Aplicativos móveis e SDKs",
         "MobileAppsAndSDKsDescription": "Não está rastreando um site? Você pode alternativamente rastrear um aplicativo móvel ou qualquer outro tipo de aplicativo usando um dos %1$sSDKs disponíveis%2$s.",
         "NotAnEcommerceSite": "Não é um site de Ecommerce",
         "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": "Matomo 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": "Matomo 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": "Matomo também pode acompanhar a categoria de Busca para cada Palavra-chave de busca interna no site.",
-        "SearchCategoryLabel": "Parâmetro categoria",
+        "OnlyOneSiteAtTime": "Você pode editar um site por vez. Por favor salve ou cancele as modificações ao site atual %s.",
+        "PiwikOffersEcommerceAnalytics": "O Matomo permite análises avançadas de rastreamento e relatórios de comércio eletrônico. Saiba mais sobre %1$s Análise de Ecommerce%2$s.",
+        "PiwikWillAutomaticallyExcludeCommonSessionParameters": "O Matomo excluirá automaticamente os parâmetros de sessão comuns (%s).",
+        "PluginDescription": "O gerenciamento de sites permite que você adicione um novo site e edite sites existentes.",
+        "SearchCategoryDesc": "O Matomo também pode acompanhar a categoria de Busca para cada palavra-chave de busca interna no site.",
+        "SearchCategoryLabel": "Parâmetro de categoria",
         "SearchCategoryParametersDesc": "Você pode inserir uma lista separada por vírgulas de parâmetros de consulta especificando a categoria de pesquisa.",
         "SearchKeywordLabel": "Parâmetro de consulta",
         "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.",
+        "SearchParametersNote": "Nota: os parâmetros de consulta e parâmetros de categoria serão usados apenas para sites que possuem Site Search ativado mas deixaram esses parâmetros vazios.",
         "SearchParametersNote2": "Para desativar Site Search para novos sites, deixe esses dois campos vazios.",
-        "SearchUseDefault": "Usar parâmetros de pesquisa %1$spadrão%2$s",
+        "SearchUseDefault": "Usar parâmetros Site Search %1$spadrões%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.",
-        "ShowTrackingTag": "mostra tag de rastreamento",
-        "Sites": "Websites",
+        "SelectDefaultCurrency": "Você pode selecionar a moeda corrente a ser definida como padrão para novos sites.",
+        "SelectDefaultTimezone": "Você pode selecionar o fuso-horário para ser selecionado como padrão para novos sites.",
+        "ShowTrackingTag": "Ver código de rastreamento",
+        "Sites": "Sites",
         "SiteSearchUse": "Você pode utilizar o Matomo 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",
+        "SiteWithoutDataTitle": "Nenhum dado foi gravado ainda, configure abaixo",
+        "SiteWithoutDataDescription": "Ainda não há dados de análise de rastreamento para este site",
         "SiteWithoutDataSetupTracking": "Por favor, configure o %1$scódigo de rastreamento%2$s abaixo em seu site ou aplicativo móvel, caso ainda não tenha feito.",
-        "SiteWithoutDataMessageDisappears": "Esta mensagem vai desaparecer assim que alguns dados foram rastreados para este site.",
+        "SiteWithoutDataMessageDisappears": "Esta mensagem vai desaparecer assim que alguns dados forem rastreados para este site.",
         "SiteWithoutDataSetupGoals": "Enquanto isso, talvez você queira %1$sconfigurar algumas metas %2$s ou aprender mais sobre os %3$s recursos %4$s do Matomo em um dos nossos %5$s guias %6$s ou %7$s FAQs %8$s.",
         "SiteWithoutDataIgnoreMessage": "Não mostrar esta mensagem pela próxima hora",
         "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",
+        "TrackingTags": "Código de rastreamento para %s",
         "Urls": "URLs",
         "Type": "Tipo",
-        "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, Matomo 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 deve corresponder exatamente e cada subdomínio válido deve 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.",
+        "UTCTimeIs": "Hora UTC é %s.",
+        "OnlyMatchedUrlsAllowed": "Apenas rastrear visitas e ações quando a URL da ação começar com uma das URLs acima.",
+        "OnlyMatchedUrlsAllowedHelp": "Quando ativado, o Matomo só irá rastrear ações internas quando a URL da página for uma das URLs reconhecidas para o seu site. Isso impede que pessoas enviem spams para a sua análise com URLs de outros sites.",
+        "OnlyMatchedUrlsAllowedHelpExamples": "O domínio e o caminho devem corresponder exatamente e cada subdomínio válido deve 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?",
-        "YouCurrentlyHaveAccessToNWebsites": "Você possui atualmente acessos a Websites %s",
-        "YourCurrentIpAddressIs": "Seu endereço de IP atual é %s",
-        "DeleteSiteExplanation": "A remoção de um site excluirá todos os dados que foram coletados para ele. Essa ação é permanente e não pode ser desfeita."
+        "YouCurrentlyHaveAccessToNWebsites": "Você possui atualmente acesso a %s sites.",
+        "YourCurrentIpAddressIs": "Seu endereço IP atual é %s",
+        "DeleteSiteExplanation": "A remoção de um site excluirá todos os dados que foram coletados para ele. Essa ação é permanente e não pode ser desfeita.",
+        "EmailInstructionsButton": "Enviar por email estas instruções",
+        "EmailInstructionsSubject": "Código de rastreamento do Matomo Analytics",
+        "EmailInstructionsDocsPlainText": "Se você quer fazer mais do que rastrear visualizações de páginas, confira a documentação do Matomo em %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Você também pode gerar um código de rastreamento personalizado em %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Detalhes do seu site",
+        "EmailInstructionsSiteDetails": "Você irá precisar destes detalhes para usar a API ou SDK para rastrear visitas ao Matomo.",
+        "EmailInstructionsYourSiteId": "ID do seu site: %1$s",
+        "EmailInstructionsYourTrackingUrl": "Sua URL de rastreamento: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/pt.json b/app/plugins/SitesManager/lang/pt.json
index 7745eb7bf..6ded4e7f1 100644
--- a/app/plugins/SitesManager/lang/pt.json
+++ b/app/plugins/SitesManager/lang/pt.json
@@ -7,6 +7,7 @@
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Alterar o seu fuso horário apenas afeta os dados futuros e não será aplicado retroativamente.",
         "Currency": "Moeda",
         "CurrencySymbolWillBeUsedForGoals": "O símbolo da Moeda será mostrado ao lado dos rendimentos dos Objetivos.",
+        "CustomizeJavaScriptTracker": "Personalizar o acompanhamento por JavaScript",
         "DefaultCurrencyForNewWebsites": "Moeda predefinida para novos sites",
         "DefaultTimezoneForNewWebsites": "Fuso horário predefinido para novos sites",
         "DeleteConfirm": "Tem a certeza que pretende eliminar o site %s?",
@@ -71,7 +72,7 @@
         "ShowTrackingTag": "Ver código de acompanhamento",
         "Sites": "Sites",
         "SiteSearchUse": "Pode utilizar o Matomo para acompanhar e analisar o que os visitantes estão a pesquisar no motor de pesquisa interno do seu site.",
-        "SiteWithoutDataTitle": "Ainda não foram registados dados",
+        "SiteWithoutDataTitle": "Ainda não foram registados dados. Configure abaixo",
         "SiteWithoutDataDescription": "Ainda não foram registados dados de análise para este site.",
         "SiteWithoutDataSetupTracking": "Por favor, configure o %1$scódigo de acompanhamento%2$s abaixo no seu site ou aplicação móvel, caso ainda não o tenha feito.",
         "SiteWithoutDataMessageDisappears": "Esta mensagem irá desaparecer assim que forem registados alguns dados para este site.",
@@ -86,11 +87,20 @@
         "UTCTimeIs": "A hora UTC é %s.",
         "OnlyMatchedUrlsAllowed": "Acompanhar apenas as visitas e ações quando o endereço de ação começar com um dos endereços acima.",
         "OnlyMatchedUrlsAllowedHelp": "Quando ativo, o Matomo apenas irá acompanhar ações internas quando o endereço da página for igual a um dos endereços conhecidos para o seu site. Isto impede que pessoas introduzam spam nos seus dados de análise com endereços para outros sites.",
+        "OnlyMatchedUrlsAllowedHelpExamples": "O domínio e caminho devem coincidir e cada um dos subdomínios válidos devem ser especificados separamente. Por exemplo, quando os endereços conhecidos são 'http:\/\/example.com\/caminho' and 'http:\/\/subdominio.example.com', pedidos de acompanhamento para 'http:\/\/example.com\/outrocaminho' ou 'http:\/\/outrosubdomínio.example.com' são ignorados.",
         "WebsitesManagement": "Gestão de sites",
         "XManagement": "Gerir %s",
         "ChooseMeasurableTypeHeadline": "O que quer medir?",
         "YouCurrentlyHaveAccessToNWebsites": "Atualmente tem acesso a %s sites.",
         "YourCurrentIpAddressIs": "O seu endereço IP atual é %s",
-        "DeleteSiteExplanation": "A eliminação de um site irá remover todos os registos de dados que foram recolhidos para o mesmo. Esta ação é permanente e não pode ser anulada."
+        "DeleteSiteExplanation": "A eliminação de um site irá remover todos os registos de dados que foram recolhidos para o mesmo. Esta ação é permanente e não pode ser anulada.",
+        "EmailInstructionsButton": "Enviar estas instruções por e-mail",
+        "EmailInstructionsSubject": "Código de acompanhamento do Matomo Analytics",
+        "EmailInstructionsDocsPlainText": "Se quiser fazer mais do que acompanhar visualizações de páginas, por favor consulte a nossa documentação do Matomo em %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Pode também gerar um código de acompanhamento específico em %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Detalhes sobre o seu site",
+        "EmailInstructionsSiteDetails": "Irá necessitar destes detalhes para utilizar a API ou SDKs para acompanhar as suas visitas do Matomo.",
+        "EmailInstructionsYourSiteId": "O ID do seu site: %1$s",
+        "EmailInstructionsYourTrackingUrl": "O seu endereço de acompanhamento: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/ru.json b/app/plugins/SitesManager/lang/ru.json
index 5dc9626be..91c70d3b3 100644
--- a/app/plugins/SitesManager/lang/ru.json
+++ b/app/plugins/SitesManager/lang/ru.json
@@ -71,7 +71,6 @@
         "ShowTrackingTag": "Показать код для отслеживания",
         "Sites": "Сайты",
         "SiteSearchUse": "Вы можете использовать Matomo для отслеживания и отображения аналитики по тому, что ищут посетители на вашем сайте используя функционал для внутреннего поиска по сайту.",
-        "SiteWithoutDataTitle": "Ещё ни какие данные не были записаны",
         "SiteWithoutDataDescription": "На данном веб-сайте пока нет данных аналитики.",
         "SiteWithoutDataSetupTracking": "Установите %1$sкод отслеживания%2$s на свой веб-сайт или мобильное приложение, если вы ещё не сделали этого.",
         "SiteWithoutDataMessageDisappears": "Это сообщение исчезнет, как только данные начнут отслеживаться для этого веб-сайта.",
diff --git a/app/plugins/SitesManager/lang/sq.json b/app/plugins/SitesManager/lang/sq.json
index b78fe03c0..8166219bd 100644
--- a/app/plugins/SitesManager/lang/sq.json
+++ b/app/plugins/SitesManager/lang/sq.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "Shihni kodin e Ndjekjes",
         "Sites": "Sajte",
         "SiteSearchUse": "Mund ta përdorni Matomo-n për të ndjekur dhe raportuar se çfarë kërkojnë vizitorët me motorin e kërkimeve të brendshme në sajtin tuaj .",
-        "SiteWithoutDataTitle": "Ende s’ka të dhëna të regjistruara",
+        "SiteWithoutDataTitle": "Ende s’ka të dhëna të regjistruara, sistemohuni më poshtë",
         "SiteWithoutDataDescription": "Për këtë sajt s’janë ndjekur ende të dhëna analitike.",
         "SiteWithoutDataSetupTracking": "Ju lutemi, rregulloni më poshtë %1$skodin e ndjekjes%2$s për sajtin apo aplikacionin tuaj për celular, po qe se s’e keni bërë ende.",
         "SiteWithoutDataMessageDisappears": "Ky mesazh do të zhduket sapo të ketë ndoca të dhëna të ndjekura për këtë sajt.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Ç’do të donit të matnit?",
         "YouCurrentlyHaveAccessToNWebsites": "Deri tani keni hyrje te %s sajte.",
         "YourCurrentIpAddressIs": "Adresa juaj IP e tanishme është %s",
-        "DeleteSiteExplanation": "Fshirja e një sajti do të shkaktojë fshirjen e krejt të dhënave regjistër që janë grumbulluar për të. Ky veprim është pakthyeshëm dhe s’mund të zhbëhet."
+        "DeleteSiteExplanation": "Fshirja e një sajti do të shkaktojë fshirjen e krejt të dhënave regjistër që janë grumbulluar për të. Ky veprim është pakthyeshëm dhe s’mund të zhbëhet.",
+        "EmailInstructionsButton": "Dërgoni me email këto udhëzime",
+        "EmailInstructionsSubject": "Kod Gjurmimi Analizash Matomo",
+        "EmailInstructionsDocsPlainText": "Nëse doni të bëni më tepër se ndjekja e parjes së faqeve, ju lutemi, shihni te dokumentimi i Matomo-s në %1$s.",
+        "EmailInstructionsGenerateTrackingCode": "Mund të prodhoni edhe një kod vetjak gjurmimi, te %1$s.",
+        "EmailInstructionsSiteDetailsHeading": "Hollësitë e Sajtit Tuaj",
+        "EmailInstructionsSiteDetails": "Këto hollësi do t’ju duhen për të përdorur API-n ose SDK-ra për ndjekje vizitash nga Matomo.",
+        "EmailInstructionsYourSiteId": "ID-ja e sajtit tuaj: %1$s",
+        "EmailInstructionsYourTrackingUrl": "URL-ja juaj e gjurmimit: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/sr.json b/app/plugins/SitesManager/lang/sr.json
index 0ba9311b7..4041ea94e 100644
--- a/app/plugins/SitesManager/lang/sr.json
+++ b/app/plugins/SitesManager/lang/sr.json
@@ -69,7 +69,6 @@
         "ShowTrackingTag": "prikaži kod",
         "Sites": "Sajtovi",
         "SiteSearchUse": "Možete koristiti Matomo 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 postavite sledeći %1$skod za praćenje%2$s na vaš sajt ili mobilnu aplikaciju ukoliko to već niste učinili.",
         "SiteWithoutDataMessageDisappears": "Ova poruka će nestati čim se zabeleži neki saobraćaj na sajtu.",
diff --git a/app/plugins/SitesManager/lang/sv.json b/app/plugins/SitesManager/lang/sv.json
index f9742e4a7..cac2fc8c2 100644
--- a/app/plugins/SitesManager/lang/sv.json
+++ b/app/plugins/SitesManager/lang/sv.json
@@ -71,7 +71,6 @@
         "ShowTrackingTag": "Visa spårningskod",
         "Sites": "Webbsidor",
         "SiteSearchUse": "Du kan använda Matomo 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": "Vänligen lägg till %1$sspårningskoden%2$s nedan i din webbplats eller mobilapp om du inte redan har gjort det.",
         "SiteWithoutDataMessageDisappears": "Detta meddelande kommer visas tills data samlats in för denna webbsida.",
@@ -91,6 +90,7 @@
         "ChooseMeasurableTypeHeadline": "Vad vill du mäta?",
         "YouCurrentlyHaveAccessToNWebsites": "Du har tillgång till %s webbplats(er).",
         "YourCurrentIpAddressIs": "Din aktuella IP-adress är %s",
-        "DeleteSiteExplanation": "Genom att ta bort en webbplats så kommer all data som har sparats för den tas bort. Denna åtgärd är permanent och kan inte ångras."
+        "DeleteSiteExplanation": "Genom att ta bort en webbplats så kommer all data som har sparats för den tas bort. Denna åtgärd är permanent och kan inte ångras.",
+        "EmailInstructionsSubject": "Matomo Analytics spårningskod"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/tr.json b/app/plugins/SitesManager/lang/tr.json
index 95f37ba29..83712ce9b 100644
--- a/app/plugins/SitesManager/lang/tr.json
+++ b/app/plugins/SitesManager/lang/tr.json
@@ -72,7 +72,7 @@
         "ShowTrackingTag": "İzleme Kodunu Görüntüle",
         "Sites": "Web Siteleri",
         "SiteSearchUse": "Matomo ile ziyaretçilerin web sitenizin iç arama motorunda yaptığı aramaları izleyip raporlayabilirsiniz.",
-        "SiteWithoutDataTitle": "Henüz bir veri kaydedilmemiş",
+        "SiteWithoutDataTitle": "Henüz bir veri kaydedilmemiş, aşağıdaki ayarları yapın",
         "SiteWithoutDataDescription": "Bu web sitesi için henüz bir izleme istatistiği verisi oluşturulmamış.",
         "SiteWithoutDataSetupTracking": "Henüz yapmadıysanız lütfen aşağıdaki %1$sizleme kodunu%2$s web sitenize ya da mobil uygulamanıza kurun.",
         "SiteWithoutDataMessageDisappears": "Web siteniz ile ilgili bir veri toplandığında bu ileti görüntülenmez.",
@@ -93,6 +93,14 @@
         "ChooseMeasurableTypeHeadline": "Neyi ölçmek istiyorsunuz?",
         "YouCurrentlyHaveAccessToNWebsites": "%s web sitesine erişme izniniz var.",
         "YourCurrentIpAddressIs": "Geçerli IP adresiniz: %s",
-        "DeleteSiteExplanation": "Bir web sitesi silindiğinde ilgili tüm günlük verileri silinir. Bu işlem geri alınamaz."
+        "DeleteSiteExplanation": "Bir web sitesi silindiğinde ilgili tüm günlük verileri silinir. Bu işlem geri alınamaz.",
+        "EmailInstructionsButton": "Bu yönergeleri e-posta ile gönder",
+        "EmailInstructionsSubject": "Matomo İstatistikler İzleme Kodu",
+        "EmailInstructionsDocsPlainText": "Sayfa görüntülemelerinden fazlasını izlemek istiyorsanız, %1$s üzerindeki Matomo belgelerine bakabilirsiniz.",
+        "EmailInstructionsGenerateTrackingCode": "Ayrıca %1$s üzerinden özel bir izleme kodu oluşturabilirsiniz.",
+        "EmailInstructionsSiteDetailsHeading": "Sitenizin Ayrıntıları",
+        "EmailInstructionsSiteDetails": "Matomo ziyaretlerini izlerken API ya da SDK kullanabilmek için bu bilgilere gerek duyacaksınız.",
+        "EmailInstructionsYourSiteId": "Sitenizin kodu: %1$s",
+        "EmailInstructionsYourTrackingUrl": "İzleme adresiniz: %1$s"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/SitesManager/lang/uk.json b/app/plugins/SitesManager/lang/uk.json
index e1e6b5fb9..eea898002 100644
--- a/app/plugins/SitesManager/lang/uk.json
+++ b/app/plugins/SitesManager/lang/uk.json
@@ -66,7 +66,6 @@
         "ShowTrackingTag": "Показати код",
         "Sites": "Сайти",
         "SiteSearchUse": "Ви можете використовувати Matomo для відстеження та відображення аналітики по тому, що шукають відвідувачі на вашому сайті використовуючи функціонал для внутрішнього пошуку по сайту.",
-        "SiteWithoutDataTitle": "Ще ніякі дані не були записані",
         "SiteWithoutDataDescription": "Немає даних аналітики що відстежувалися на цьому сайті.",
         "SiteWithoutDataMessageDisappears": "Це повідомлення зникне, як тільки перші дані отримаються на цей сайт.",
         "SuperUserAccessCan": "Користувач з правами суперкористувача може також %1$sвказати загальні налаштування%2$s для нових веб-сайтів.",
diff --git a/app/plugins/SitesManager/lang/zh-cn.json b/app/plugins/SitesManager/lang/zh-cn.json
index e97809b05..d5ac93ce6 100644
--- a/app/plugins/SitesManager/lang/zh-cn.json
+++ b/app/plugins/SitesManager/lang/zh-cn.json
@@ -68,7 +68,6 @@
         "ShowTrackingTag": "显示跟踪代码",
         "Sites": "网站",
         "SiteSearchUse": "可以用 Matomo 跟踪统计访客站内搜索的内容。",
-        "SiteWithoutDataTitle": "尚未有记录数据。",
         "SiteWithoutDataDescription": "这个站点没有跟踪到分析数据。",
         "Timezone": "时区",
         "TrackingSiteSearch": "跟踪站内搜索",
diff --git a/app/plugins/SitesManager/lang/zh-tw.json b/app/plugins/SitesManager/lang/zh-tw.json
index 764198182..511689879 100644
--- a/app/plugins/SitesManager/lang/zh-tw.json
+++ b/app/plugins/SitesManager/lang/zh-tw.json
@@ -71,7 +71,6 @@
         "ShowTrackingTag": "查看追蹤程式碼",
         "Sites": "網站",
         "SiteSearchUse": "你可以使用 Matomo 來追蹤並報告訪客在你網站內的搜尋引擎中搜尋了什麼。",
-        "SiteWithoutDataTitle": "還沒有紀錄到資料",
         "SiteWithoutDataDescription": "這個網站還沒有追蹤分析資料。",
         "SiteWithoutDataSetupTracking": "請在你的網站或行動應用程式中設定%1$s追蹤程式碼%2$s（如果你還沒完成的話）。",
         "SiteWithoutDataMessageDisappears": "此訊息將會在這個網站開始收集到追蹤資料時隱藏。",
diff --git a/app/plugins/SitesManager/stylesheets/SitesManager.less b/app/plugins/SitesManager/stylesheets/SitesManager.less
index 65290e38f..898f80175 100644
--- a/app/plugins/SitesManager/stylesheets/SitesManager.less
+++ b/app/plugins/SitesManager/stylesheets/SitesManager.less
@@ -14,6 +14,24 @@
     }
 }
 
+.trackingHelpHeader {
+    margin-top: 32px;
+    margin-bottom: 16px;
+    width: 100%;
+    &.matchWidth {
+        max-width: 995px;
+    }
+    h3 {
+        margin-top: 0;
+    }
+    p {
+        margin-right: 20px !important;
+    }
+    .btn {
+        margin-left: auto;
+    }
+}
+
 .SitesManager {
 
     .sitesManagerList {
diff --git a/app/plugins/SitesManager/templates/_displayJavascriptCode.twig b/app/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 030dcf9bc..52cced16a 100644
--- a/app/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/app/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -1,9 +1,15 @@
-<h2>{{ 'SitesManager_TrackingTags'|translate(displaySiteName) }}</h2>
+<div class="trackingHelpHeader">
+    <h2>{{ 'SitesManager_TrackingTags'|translate(displaySiteName) }}</h2>
+    <a class="btn" 
+        href="mailto:?subject={{ 'SitesManager_EmailInstructionsSubject'|translate|url_encode|e('html_attr') }}&body={{ emailBody|url_encode|e('html_attr') }}">
+        {{ 'SitesManager_EmailInstructionsButton'|translate }}
+    </a>
+</div>
 
 <div class='trackingHelp'>
     <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
 
-    <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+    <p>{{ 'CoreAdminHome_JSTrackingIntro3a'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate|raw }}</p>
 
     <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
 
@@ -32,5 +38,4 @@
     <p></p>
 
     {{ postEvent('Template.endTrackingHelpPage') }}
-
 </div>
diff --git a/app/plugins/SitesManager/templates/_trackingCodeEmail.twig b/app/plugins/SitesManager/templates/_trackingCodeEmail.twig
new file mode 100644
index 000000000..fa746daab
--- /dev/null
+++ b/app/plugins/SitesManager/templates/_trackingCodeEmail.twig
@@ -0,0 +1,32 @@
+{% if showMatomoLinks %}** {{ 'General_JsTrackingTag'|translate }}{% endif %}
+
+{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHeadEmail'|translate("'head'") }}
+
+{{ jsTag|raw }}
+
+{% if showMatomoLinks %}{{ 'SitesManager_EmailInstructionsDocsPlainText'|translate('https://developer.matomo.org/guides/tracking-javascript-guide')|raw }}{% endif %}
+
+{{ 'SitesManager_EmailInstructionsGenerateTrackingCode'|translate(piwikUrl ~ linkTo({'module': 'CoreAdminHome', 'action': 'trackingCodeGenerator'}))|raw }}
+
+{% if showMatomoLinks %}
+** Integrations
+{{ 'CoreAdminHome_JSTrackingIntro3a'|translate('', '') }}
+https://matomo.org/integrate/
+
+** {{ 'SitesManager_LogAnalytics'|translate }}
+{{ 'SitesManager_LogAnalyticsDescription'|translate('', '') }}
+https://matomo.org/log-analytics/
+
+** {{ 'SitesManager_MobileAppsAndSDKs'|translate }}
+{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('', '') }}
+https://matomo.org/integrate/#programming-language-platforms-and-frameworks
+
+** {{ 'CoreAdminHome_HttpTrackingApi'|translate }}
+{{ 'CoreAdminHome_HttpTrackingApiDescription'|translate('', '') }}
+https://developer.matomo.org/api-reference/tracking-api
+    
+** {{ 'SitesManager_EmailInstructionsSiteDetailsHeading'|translate }}
+{{ 'SitesManager_EmailInstructionsSiteDetails'|translate }}
+* {{ 'SitesManager_EmailInstructionsYourSiteId'|translate(idSite) }}
+* {{ 'SitesManager_EmailInstructionsYourTrackingUrl'|translate(trackingUrl) }}
+{% endif %}
\ No newline at end of file
diff --git a/app/plugins/SitesManager/templates/siteWithoutData.twig b/app/plugins/SitesManager/templates/siteWithoutData.twig
index dc7ac2b40..fa48a0c39 100644
--- a/app/plugins/SitesManager/templates/siteWithoutData.twig
+++ b/app/plugins/SitesManager/templates/siteWithoutData.twig
@@ -52,11 +52,20 @@
                 <h3>Integrations</h3>
                 <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
 
-                <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+                <p>{{ 'CoreAdminHome_JSTrackingIntro3a'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate|raw }}</p>
 
-                <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
+                <div class="valign-wrapper trackingHelpHeader">
+                    <div>
 
-                <p>{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead'|translate("&lt;/head&gt;")|raw }}</p>
+                        <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
+
+                        <p>{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead'|translate("&lt;/head&gt;")|raw }}</p>
+                    </div>
+                    <a class="btn" id="emailTrackingCodeBtn"
+                       href="mailto:?subject={{ 'SitesManager_EmailInstructionsSubject'|translate|url_encode|e('html_attr') }}&body={{ emailBody|url_encode|e('html_attr') }}">
+                        {{ 'SitesManager_EmailInstructionsButton'|translate }}
+                    </a>
+                </div>
 
                 <pre piwik-select-on-focus>{{ jsTag|raw }}</pre>
 
@@ -77,7 +86,10 @@
 
                 <h3>{{ 'CoreAdminHome_HttpTrackingApi'|translate }}</h3>
                 <p>{{ 'CoreAdminHome_HttpTrackingApiDescription'|translate('<a href="https://developer.matomo.org/api-reference/tracking-api" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
-                <p></p>
+
+                {% if googleAnalyticsImporterMessage is defined %}
+                {{ googleAnalyticsImporterMessage|raw }}
+                {% endif %}
 
                 {{ postEvent('Template.endTrackingHelpPage') }}
 
diff --git a/app/plugins/TagManager/API.php b/app/plugins/TagManager/API.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/BaseReference.php b/app/plugins/TagManager/API/BaseReference.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/Export.php b/app/plugins/TagManager/API/Export.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/Import.php b/app/plugins/TagManager/API/Import.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/PreviewCookie.php b/app/plugins/TagManager/API/PreviewCookie.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/TagReference.php b/app/plugins/TagManager/API/TagReference.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/TemplateMetadata.php b/app/plugins/TagManager/API/TemplateMetadata.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/TriggerReference.php b/app/plugins/TagManager/API/TriggerReference.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/API/VariableReference.php b/app/plugins/TagManager/API/VariableReference.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Access/Capability/PublishLiveContainer.php b/app/plugins/TagManager/Access/Capability/PublishLiveContainer.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Access/Capability/TagManagerWrite.php b/app/plugins/TagManager/Access/Capability/TagManagerWrite.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Access/Capability/UseCustomTemplates.php b/app/plugins/TagManager/Access/Capability/UseCustomTemplates.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/BaseActivity.php b/app/plugins/TagManager/Activity/BaseActivity.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/ContainerAdded.php b/app/plugins/TagManager/Activity/ContainerAdded.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/ContainerDeleted.php b/app/plugins/TagManager/Activity/ContainerDeleted.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/ContainerUpdated.php b/app/plugins/TagManager/Activity/ContainerUpdated.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TagAdded.php b/app/plugins/TagManager/Activity/TagAdded.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TagBaseActivity.php b/app/plugins/TagManager/Activity/TagBaseActivity.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TagDeleted.php b/app/plugins/TagManager/Activity/TagDeleted.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TagUpdated.php b/app/plugins/TagManager/Activity/TagUpdated.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TriggerAdded.php b/app/plugins/TagManager/Activity/TriggerAdded.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TriggerBaseActivity.php b/app/plugins/TagManager/Activity/TriggerBaseActivity.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TriggerDeleted.php b/app/plugins/TagManager/Activity/TriggerDeleted.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/TriggerUpdated.php b/app/plugins/TagManager/Activity/TriggerUpdated.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VariableAdded.php b/app/plugins/TagManager/Activity/VariableAdded.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VariableBaseActivity.php b/app/plugins/TagManager/Activity/VariableBaseActivity.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VariableDeleted.php b/app/plugins/TagManager/Activity/VariableDeleted.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VariableUpdated.php b/app/plugins/TagManager/Activity/VariableUpdated.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VersionBaseActivity.php b/app/plugins/TagManager/Activity/VersionBaseActivity.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VersionDeleted.php b/app/plugins/TagManager/Activity/VersionDeleted.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VersionImported.php b/app/plugins/TagManager/Activity/VersionImported.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Activity/VersionPublished.php b/app/plugins/TagManager/Activity/VersionPublished.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/CHANGELOG.md b/app/plugins/TagManager/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/GenerateDataLayerVariable.php b/app/plugins/TagManager/Commands/GenerateDataLayerVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/GeneratePreconfiguredVariable.php b/app/plugins/TagManager/Commands/GeneratePreconfiguredVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/GenerateTag.php b/app/plugins/TagManager/Commands/GenerateTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/GenerateTrigger.php b/app/plugins/TagManager/Commands/GenerateTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/GenerateVariable.php b/app/plugins/TagManager/Commands/GenerateVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Commands/RegenerateContainers.php b/app/plugins/TagManager/Commands/RegenerateContainers.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Configuration.php b/app/plugins/TagManager/Configuration.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/AndroidContext.php b/app/plugins/TagManager/Context/AndroidContext.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/BaseContext.php b/app/plugins/TagManager/Context/BaseContext.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/BaseContext/TemplateLocator.php b/app/plugins/TagManager/Context/BaseContext/TemplateLocator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/ContextProvider.php b/app/plugins/TagManager/Context/ContextProvider.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/Storage/Filesystem.php b/app/plugins/TagManager/Context/Storage/Filesystem.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/Storage/Memory.php b/app/plugins/TagManager/Context/Storage/Memory.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/Storage/StorageInterface.php b/app/plugins/TagManager/Context/Storage/StorageInterface.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/WebContext.php b/app/plugins/TagManager/Context/WebContext.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/WebContext/JavaScriptTagManagerLoader.php b/app/plugins/TagManager/Context/WebContext/JavaScriptTagManagerLoader.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Context/iOSContext.php b/app/plugins/TagManager/Context/iOSContext.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Controller.php b/app/plugins/TagManager/Controller.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/BaseDao.php b/app/plugins/TagManager/Dao/BaseDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/ContainerReleaseDao.php b/app/plugins/TagManager/Dao/ContainerReleaseDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/ContainerVersionsDao.php b/app/plugins/TagManager/Dao/ContainerVersionsDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/ContainersDao.php b/app/plugins/TagManager/Dao/ContainersDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/TagManagerDao.php b/app/plugins/TagManager/Dao/TagManagerDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/TagsDao.php b/app/plugins/TagManager/Dao/TagsDao.php
index 50b40accf..3bb66469b 100755
--- a/app/plugins/TagManager/Dao/TagsDao.php
+++ b/app/plugins/TagManager/Dao/TagsDao.php
@@ -224,13 +224,12 @@ private function enrichTag($tag)
         $tag['fire_delay'] = (int)$tag['fire_delay'];
         $tag['priority'] = (int)$tag['priority'];
 
-        if ($tag['start_date'] === '0000-00-00 00:00:00') {
-	        $tag['start_date'] = null;
-        }
-
-        if ($tag['end_date'] === '0000-00-00 00:00:00') {
-	        $tag['end_date'] = null;
-        }
+	    if ($tag['start_date'] === '0000-00-00 00:00:00') {
+		    $tag['start_date'] = null;
+	    }
+	    if ($tag['end_date'] === '0000-00-00 00:00:00') {
+		    $tag['end_date'] = null;
+	    }
 
         if (!empty($tag['parameters'])) {
             $tag['parameters'] = json_decode($tag['parameters'], true);
diff --git a/app/plugins/TagManager/Dao/TriggersDao.php b/app/plugins/TagManager/Dao/TriggersDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Dao/VariablesDao.php b/app/plugins/TagManager/Dao/VariablesDao.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Diagnostic/ContainerWriteAccess.php b/app/plugins/TagManager/Diagnostic/ContainerWriteAccess.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Input/AccessValidator.php b/app/plugins/TagManager/Input/AccessValidator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Input/Description.php b/app/plugins/TagManager/Input/Description.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Input/IdSite.php b/app/plugins/TagManager/Input/IdSite.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Input/Name.php b/app/plugins/TagManager/Input/Name.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/LEGALNOTICE b/app/plugins/TagManager/LEGALNOTICE
old mode 100755
new mode 100644
index caa4cffb7..4995bc008
--- a/app/plugins/TagManager/LEGALNOTICE
+++ b/app/plugins/TagManager/LEGALNOTICE
@@ -14,7 +14,7 @@ SOFTWARE LICENSE
 
 	The free software license of Matomo is GNU General Public License v3
 	or later.  A copy of GNU GPL v3 should have been included in this
-	software package in misc/gpl-3.0.txt.
+	software package in LICENSE.
 
 TRADEMARK
 
diff --git a/app/plugins/TagManager/LICENSE b/app/plugins/TagManager/LICENSE
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Menu.php b/app/plugins/TagManager/Menu.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/MenuTagManager.php b/app/plugins/TagManager/MenuTagManager.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/BaseModel.php b/app/plugins/TagManager/Model/BaseModel.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Comparison.php b/app/plugins/TagManager/Model/Comparison.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Container.php b/app/plugins/TagManager/Model/Container.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Container/ContainerIdGenerator.php b/app/plugins/TagManager/Model/Container/ContainerIdGenerator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Container/FixedIdGenerator.php b/app/plugins/TagManager/Model/Container/FixedIdGenerator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Container/RandomContainerIdGenerator.php b/app/plugins/TagManager/Model/Container/RandomContainerIdGenerator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Container/StaticContainerIdGenerator.php b/app/plugins/TagManager/Model/Container/StaticContainerIdGenerator.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Environment.php b/app/plugins/TagManager/Model/Environment.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Salt.php b/app/plugins/TagManager/Model/Salt.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Tag.php b/app/plugins/TagManager/Model/Tag.php
old mode 100755
new mode 100644
index a30b47ae8..c848acc16
--- a/app/plugins/TagManager/Model/Tag.php
+++ b/app/plugins/TagManager/Model/Tag.php
@@ -145,8 +145,8 @@ public function updateContainerTag($idSite, $idContainerVersion, $idTag, $name,
                 'fire_limit' => $fireLimit,
                 'fire_delay' => $fireDelay,
                 'priority' => $priority,
-                'start_date' => $startDate,
-                'end_date' => $endDate
+                'start_date' => empty($startDate) ? null : $startDate,
+                'end_date' => empty($endDate) ? null : $endDate,
             );
             $this->updateTagColumns($idSite, $idContainerVersion, $idTag, $columns);
         }
diff --git a/app/plugins/TagManager/Model/Trigger.php b/app/plugins/TagManager/Model/Trigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Model/Variable.php b/app/plugins/TagManager/Model/Variable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/README.md b/app/plugins/TagManager/README.md
old mode 100755
new mode 100644
index 844457be7..9d388a78b
--- a/app/plugins/TagManager/README.md
+++ b/app/plugins/TagManager/README.md
@@ -116,7 +116,7 @@ Are you a developer? If you use features regulary which are not available yet, o
 
 ## License
 
-Matomo Tag Manager is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
+Matomo Tag Manager is released under the GPL v3 (or later) license, see [LICENSE](LICENSE)
 
 ## Installation & Requirements
 
diff --git a/app/plugins/TagManager/Settings/Storage/Backend/TransientBackend.php b/app/plugins/TagManager/Settings/Storage/Backend/TransientBackend.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/SystemSettings.php b/app/plugins/TagManager/SystemSettings.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/TagManager.php b/app/plugins/TagManager/TagManager.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Tasks.php b/app/plugins/TagManager/Tasks.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/BaseTemplate.php b/app/plugins/TagManager/Template/BaseTemplate.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/AddThisTag.php b/app/plugins/TagManager/Template/Tag/AddThisTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/AddThisTag.web.js b/app/plugins/TagManager/Template/Tag/AddThisTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/BaseTag.php b/app/plugins/TagManager/Template/Tag/BaseTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/BingUETTag.php b/app/plugins/TagManager/Template/Tag/BingUETTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/BingUETTag.web.js b/app/plugins/TagManager/Template/Tag/BingUETTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/BugsnagTag.php b/app/plugins/TagManager/Template/Tag/BugsnagTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/BugsnagTag.web.js b/app/plugins/TagManager/Template/Tag/BugsnagTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/CustomHtmlTag.php b/app/plugins/TagManager/Template/Tag/CustomHtmlTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/CustomHtmlTag.web.js b/app/plugins/TagManager/Template/Tag/CustomHtmlTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/CustomImageTag.php b/app/plugins/TagManager/Template/Tag/CustomImageTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/CustomImageTag.web.js b/app/plugins/TagManager/Template/Tag/CustomImageTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/DriftTag.php b/app/plugins/TagManager/Template/Tag/DriftTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/DriftTag.web.js b/app/plugins/TagManager/Template/Tag/DriftTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/EmarsysTag.php b/app/plugins/TagManager/Template/Tag/EmarsysTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/EmarsysTag.web.js b/app/plugins/TagManager/Template/Tag/EmarsysTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/EtrackerTag.php b/app/plugins/TagManager/Template/Tag/EtrackerTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/EtrackerTag.web.js b/app/plugins/TagManager/Template/Tag/EtrackerTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/FacebookPixelTag.php b/app/plugins/TagManager/Template/Tag/FacebookPixelTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/FacebookPixelTag.web.js b/app/plugins/TagManager/Template/Tag/FacebookPixelTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/GoogleAnalyticsUniversalTag.php b/app/plugins/TagManager/Template/Tag/GoogleAnalyticsUniversalTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/GoogleAnalyticsUniversalTag.web.js b/app/plugins/TagManager/Template/Tag/GoogleAnalyticsUniversalTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/HoneybadgerTag.php b/app/plugins/TagManager/Template/Tag/HoneybadgerTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/HoneybadgerTag.web.js b/app/plugins/TagManager/Template/Tag/HoneybadgerTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/LinkedinInsightTag.php b/app/plugins/TagManager/Template/Tag/LinkedinInsightTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/LinkedinInsightTag.web.js b/app/plugins/TagManager/Template/Tag/LinkedinInsightTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/LivezillaDynamicTag.php b/app/plugins/TagManager/Template/Tag/LivezillaDynamicTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/LivezillaDynamicTag.web.js b/app/plugins/TagManager/Template/Tag/LivezillaDynamicTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/MatomoTag.php b/app/plugins/TagManager/Template/Tag/MatomoTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/MatomoTag.web.js b/app/plugins/TagManager/Template/Tag/MatomoTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/PingdomRUMTag.php b/app/plugins/TagManager/Template/Tag/PingdomRUMTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/PingdomRUMTag.web.js b/app/plugins/TagManager/Template/Tag/PingdomRUMTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/RaygunTag.php b/app/plugins/TagManager/Template/Tag/RaygunTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/RaygunTag.web.js b/app/plugins/TagManager/Template/Tag/RaygunTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/SentryRavenTag.php b/app/plugins/TagManager/Template/Tag/SentryRavenTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/SentryRavenTag.web.js b/app/plugins/TagManager/Template/Tag/SentryRavenTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ShareaholicTag.php b/app/plugins/TagManager/Template/Tag/ShareaholicTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ShareaholicTag.web.js b/app/plugins/TagManager/Template/Tag/ShareaholicTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/TagsProvider.php b/app/plugins/TagManager/Template/Tag/TagsProvider.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/TawkToTag.php b/app/plugins/TagManager/Template/Tag/TawkToTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/TawkToTag.web.js b/app/plugins/TagManager/Template/Tag/TawkToTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ThemeColorTag.php b/app/plugins/TagManager/Template/Tag/ThemeColorTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ThemeColorTag.web.js b/app/plugins/TagManager/Template/Tag/ThemeColorTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/VisualWebsiteOptimizerTag.php b/app/plugins/TagManager/Template/Tag/VisualWebsiteOptimizerTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/VisualWebsiteOptimizerTag.web.js b/app/plugins/TagManager/Template/Tag/VisualWebsiteOptimizerTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ZendeskChatTag.php b/app/plugins/TagManager/Template/Tag/ZendeskChatTag.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Tag/ZendeskChatTag.web.js b/app/plugins/TagManager/Template/Tag/ZendeskChatTag.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllDownloadsClickTrigger.php b/app/plugins/TagManager/Template/Trigger/AllDownloadsClickTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllDownloadsClickTrigger.web.js b/app/plugins/TagManager/Template/Trigger/AllDownloadsClickTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllElementsClickTrigger.php b/app/plugins/TagManager/Template/Trigger/AllElementsClickTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllElementsClickTrigger.web.js b/app/plugins/TagManager/Template/Trigger/AllElementsClickTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllLinksClickTrigger.php b/app/plugins/TagManager/Template/Trigger/AllLinksClickTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/AllLinksClickTrigger.web.js b/app/plugins/TagManager/Template/Trigger/AllLinksClickTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/BaseTrigger.php b/app/plugins/TagManager/Template/Trigger/BaseTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/CustomEventTrigger.php b/app/plugins/TagManager/Template/Trigger/CustomEventTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/CustomEventTrigger.web.js b/app/plugins/TagManager/Template/Trigger/CustomEventTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/DomReadyTrigger.php b/app/plugins/TagManager/Template/Trigger/DomReadyTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/DomReadyTrigger.web.js b/app/plugins/TagManager/Template/Trigger/DomReadyTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/ElementVisibilityTrigger.php b/app/plugins/TagManager/Template/Trigger/ElementVisibilityTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/ElementVisibilityTrigger.web.js b/app/plugins/TagManager/Template/Trigger/ElementVisibilityTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/FormSubmitTrigger.php b/app/plugins/TagManager/Template/Trigger/FormSubmitTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/FormSubmitTrigger.web.js b/app/plugins/TagManager/Template/Trigger/FormSubmitTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/FullscreenTrigger.php b/app/plugins/TagManager/Template/Trigger/FullscreenTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/FullscreenTrigger.web.js b/app/plugins/TagManager/Template/Trigger/FullscreenTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/HistoryChangeTrigger.php b/app/plugins/TagManager/Template/Trigger/HistoryChangeTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/HistoryChangeTrigger.web.js b/app/plugins/TagManager/Template/Trigger/HistoryChangeTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/JavaScriptErrorTrigger.php b/app/plugins/TagManager/Template/Trigger/JavaScriptErrorTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/JavaScriptErrorTrigger.web.js b/app/plugins/TagManager/Template/Trigger/JavaScriptErrorTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/PageViewTrigger.php b/app/plugins/TagManager/Template/Trigger/PageViewTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/PageViewTrigger.web.js b/app/plugins/TagManager/Template/Trigger/PageViewTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/ScrollReachTrigger.php b/app/plugins/TagManager/Template/Trigger/ScrollReachTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/ScrollReachTrigger.web.js b/app/plugins/TagManager/Template/Trigger/ScrollReachTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/TimerTrigger.php b/app/plugins/TagManager/Template/Trigger/TimerTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/TimerTrigger.web.js b/app/plugins/TagManager/Template/Trigger/TimerTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/TriggersProvider.php b/app/plugins/TagManager/Template/Trigger/TriggersProvider.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowLeaveTrigger.php b/app/plugins/TagManager/Template/Trigger/WindowLeaveTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowLeaveTrigger.web.js b/app/plugins/TagManager/Template/Trigger/WindowLeaveTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowLoadedTrigger.php b/app/plugins/TagManager/Template/Trigger/WindowLoadedTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowLoadedTrigger.web.js b/app/plugins/TagManager/Template/Trigger/WindowLoadedTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowUnloadTrigger.php b/app/plugins/TagManager/Template/Trigger/WindowUnloadTrigger.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Trigger/WindowUnloadTrigger.web.js b/app/plugins/TagManager/Template/Trigger/WindowUnloadTrigger.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/BaseVariable.php b/app/plugins/TagManager/Template/Variable/BaseVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/ConstantVariable.php b/app/plugins/TagManager/Template/Variable/ConstantVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/ConstantVariable.web.js b/app/plugins/TagManager/Template/Variable/ConstantVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/CookieVariable.php b/app/plugins/TagManager/Template/Variable/CookieVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/CookieVariable.web.js b/app/plugins/TagManager/Template/Variable/CookieVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/CustomJsFunctionVariable.php b/app/plugins/TagManager/Template/Variable/CustomJsFunctionVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/DataLayerVariable.php b/app/plugins/TagManager/Template/Variable/DataLayerVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/DataLayerVariable.web.js b/app/plugins/TagManager/Template/Variable/DataLayerVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/DomElementVariable.php b/app/plugins/TagManager/Template/Variable/DomElementVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/DomElementVariable.web.js b/app/plugins/TagManager/Template/Variable/DomElementVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/EtrackerConfigurationVariable.php b/app/plugins/TagManager/Template/Variable/EtrackerConfigurationVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/EtrackerConfigurationVariable.web.js b/app/plugins/TagManager/Template/Variable/EtrackerConfigurationVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/JavaScriptVariable.php b/app/plugins/TagManager/Template/Variable/JavaScriptVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/JavaScriptVariable.web.js b/app/plugins/TagManager/Template/Variable/JavaScriptVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.php b/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.php
index b344748d7..f36aa5b3b 100755
--- a/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.php
+++ b/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.php
@@ -59,9 +59,9 @@ public function getParameters()
             $field->validators[] = new UrlLike();
         });
 
-        $trackerCodeGenerator = new TrackerCodeGenerator();
-        $jsEndpoint = $trackerCodeGenerator->getJsTrackerEndpoint();
-        $phpEndpoint = $trackerCodeGenerator->getPhpTrackerEndpoint();
+	    $trackerCodeGenerator = new TrackerCodeGenerator();
+	    $jsEndpoint = $trackerCodeGenerator->getJsTrackerEndpoint();
+	    $phpEndpoint = $trackerCodeGenerator->getPhpTrackerEndpoint();
 
         return array(
             $matomoUrl,
diff --git a/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.web.js b/app/plugins/TagManager/Template/Variable/MatomoConfigurationVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/MetaContentVariable.php b/app/plugins/TagManager/Template/Variable/MetaContentVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/MetaContentVariable.web.js b/app/plugins/TagManager/Template/Variable/MetaContentVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/BaseDataLayerVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/BaseDataLayerVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/BasePreConfiguredVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/BasePreConfiguredVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/BrowserLanguageVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/BrowserLanguageVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickClassesVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickClassesVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickDestinationUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickDestinationUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickElement.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickElement.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickIdVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickIdVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickNodeNameVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickNodeNameVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ClickTextVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ClickTextVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerIdVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerIdVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerRevisionVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerRevisionVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerVersionVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ContainerVersionVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/DnsLookupTimeVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/DnsLookupTimeVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/EnvironmentVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/EnvironmentVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorLineVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorLineVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorMessageVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorMessageVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ErrorUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FirstDirectoryVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FirstDirectoryVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FirstDirectoryVariable.web.js b/app/plugins/TagManager/Template/Variable/PreConfigured/FirstDirectoryVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FormClassesVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FormClassesVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FormDestionationVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FormDestionationVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FormElement.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FormElement.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FormIdVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FormIdVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/FormNameVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/FormNameVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewPathVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewPathVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewSearchVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewSearchVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashNewVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldPathVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldPathVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldSearchVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldSearchVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistoryHashOldVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/HistorySourceVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/HistorySourceVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/IsoDateVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/IsoDateVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/LocalDateVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/LocalDateVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/LocalHourVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/LocalHourVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/LocalTimeVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/LocalTimeVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageHashVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageHashVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageHostnameVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageHostnameVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageLoadTimeTotal.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageLoadTimeTotal.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageOriginVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageOriginVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PagePathVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PagePathVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageRenderTimeVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageRenderTimeVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageTitleVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageTitleVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PageUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PageUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/PreviewModeVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/PreviewModeVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/RandomNumberVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/RandomNumberVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ReferrerVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ReferrerVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenHeight.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenHeight.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenHeightAvailable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenHeightAvailable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenWidth.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenWidth.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenWidthAvailable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScreenWidthAvailable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollHorizontalPercentageVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollHorizontalPercentageVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollLeftPixelVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollLeftPixelVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollSourceVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollSourceVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollTopPixelVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollTopPixelVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollVerticalPercentageVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/ScrollVerticalPercentageVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/SeoCanonicalUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/SeoCanonicalUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/SeoCanonicalUrlVariable.web.js b/app/plugins/TagManager/Template/Variable/PreConfigured/SeoCanonicalUrlVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/SeoNumH1.php b/app/plugins/TagManager/Template/Variable/PreConfigured/SeoNumH1.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/SeoNumH2.php b/app/plugins/TagManager/Template/Variable/PreConfigured/SeoNumH2.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/UserAgentVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/UserAgentVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/UtcDateVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/UtcDateVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementClassesVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementClassesVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementIdVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementIdVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementNodeNameVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementNodeNameVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementTextVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementTextVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementUrlVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/VisibleElementUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/WeekdayVariable.php b/app/plugins/TagManager/Template/Variable/PreConfigured/WeekdayVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/PreConfigured/WeekdayVariable.web.js b/app/plugins/TagManager/Template/Variable/PreConfigured/WeekdayVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/ReferrerUrlVariable.php b/app/plugins/TagManager/Template/Variable/ReferrerUrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/ReferrerUrlVariable.web.js b/app/plugins/TagManager/Template/Variable/ReferrerUrlVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/TimeSinceLoadVariable.php b/app/plugins/TagManager/Template/Variable/TimeSinceLoadVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/TimeSinceLoadVariable.web.js b/app/plugins/TagManager/Template/Variable/TimeSinceLoadVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/UrlParameterVariable.php b/app/plugins/TagManager/Template/Variable/UrlParameterVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/UrlParameterVariable.web.js b/app/plugins/TagManager/Template/Variable/UrlParameterVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/UrlVariable.php b/app/plugins/TagManager/Template/Variable/UrlVariable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/UrlVariable.web.js b/app/plugins/TagManager/Template/Variable/UrlVariable.web.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Template/Variable/VariablesProvider.php b/app/plugins/TagManager/Template/Variable/VariablesProvider.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Validators/LookupTable.php b/app/plugins/TagManager/Validators/LookupTable.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Validators/TriggerConditions.php b/app/plugins/TagManager/Validators/TriggerConditions.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/Validators/TriggerIds.php b/app/plugins/TagManager/Validators/TriggerIds.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.controller.js b/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.controller.js
deleted file mode 100755
index 7ffa1de2c..000000000
--- a/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.controller.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    angular.module('piwikApp').controller('ContainerDashboardController', ContainerDashboardController);
-
-    ContainerDashboardController.$inject = ['$scope', 'piwikApi', '$q', 'piwik', '$filter'];
-
-    function ContainerDashboardController($scope, piwikApi, $q, piwik, $filter) {
-
-        var self = this;
-        var translate = $filter('translate');
-        this.availableContexts = {};
-        this.idContainer = $scope.idContainer;
-        this.container = null;
-        this.containerVersion = null;
-        this.isLoading = true;
-
-        var containerPromise = piwikApi.fetch({method: 'TagManager.getContainer', idContainer: this.idContainer}).then(function (container) {
-            self.container = container;
-            if (container && container.versions) {
-                self.container.lastVersions = self.container.versions.slice(-5);
-            }
-
-            if (container && container.releases) {
-                angular.forEach(container.releases, function (release) {
-                    if (release.version_name) {
-                        release.versionName = translate('TagManager_ReleaseVersionInfo', release.version_name);
-                    } else {
-                        release.versionName = '';
-                    }
-                });
-            }
-        });
-
-        var versionPromise = piwikApi.fetch({method: 'TagManager.exportContainerVersion', idContainer: this.idContainer}).then(function (containerVersion) {
-            self.containerVersion = containerVersion;
-        });
-
-        $q.all([containerPromise, versionPromise]).then(function () {
-            self.isLoading = false;
-        }, function () {
-            self.isLoading = false;
-        });
-
-        piwikApi.fetch({method: 'TagManager.getAvailableContexts'}).then(function (contexts) {
-            angular.forEach(contexts, function (context) {
-                self.availableContexts[context.id] = context.name;
-            });
-        });
-
-        this.linkTo = function (action, hash){
-            var currentUrl = window.location.pathname + window.location.search;
-            var newUrl = piwik.broadcast.updateParamValue('module=TagManager', currentUrl);
-            newUrl = piwik.broadcast.updateParamValue('action=' + action, newUrl);
-            if ('undefined' !== typeof hash && hash) {
-                newUrl += '#?' + hash;
-            }
-            return newUrl;
-        }
-        this.createNewVersion = function () {
-            $('.tagVersionManager .title').click();
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.html b/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.js b/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.js
deleted file mode 100755
index 9977ec5fb..000000000
--- a/app/plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-container-dashboard>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikContainerDashboard', piwikContainerDashboard);
-
-    piwikContainerDashboard.$inject = ['piwik'];
-
-    function piwikContainerDashboard(piwik){
-
-
-        return {
-            restrict: 'A',
-            scope: {
-               idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/containerDashboard/container-dashboard.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ContainerDashboardController',
-            controllerAs: 'containerDashboard',
-            compile: function (element, attrs) {
-
-                return function (scope, element, attrs) {
-
-                };
-            }
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/containerSelector/container-selector.controller.js b/app/plugins/TagManager/angularjs/containerSelector/container-selector.controller.js
deleted file mode 100755
index ab1df824a..000000000
--- a/app/plugins/TagManager/angularjs/containerSelector/container-selector.controller.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    angular.module('piwikApp').controller('ContainerSelectorController', ContainerSelectorController);
-
-    ContainerSelectorController.$inject = ['$scope', 'piwikApi', 'piwik', '$filter'];
-
-    function ContainerSelectorController($scope, piwikApi, piwik, $filter) {
-
-        var self = this;
-        this.containers = [];
-        this.isLoading = false;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-        var translate = $filter('translate');
-
-        if ($scope.containerName) {
-            this.containerName = translate('TagManager_ContainerX', $scope.containerName);
-        } else {
-            this.containerName = 'Choose container';
-        }
-
-        this.fetchContainers = function () {
-            this.isLoading = true;
-            this.containers = [];
-            piwikApi.fetch({method: 'TagManager.getContainers'}).then(function (containers) {
-                self.isLoading = false;
-                self.containers = containers;
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        this.linkTo = function (idContainer){
-            var currentUrl = window.location.pathname + window.location.search;
-            currentUrl = piwik.broadcast.updateParamValue('idContainer=' + idContainer, currentUrl);
-            var action = piwik.broadcast.getValueFromUrl('idContainer')
-            if (!action || action === 'manageContainers') {
-                if (this.hasWriteAccess) {
-                    currentUrl = piwik.broadcast.updateParamValue('action=dashboard', currentUrl);
-                } else {
-                    currentUrl = piwik.broadcast.updateParamValue('action=manageTags', currentUrl);
-                }
-            }
-            return currentUrl;
-        };
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/containerSelector/container-selector.directive.html b/app/plugins/TagManager/angularjs/containerSelector/container-selector.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/containerSelector/container-selector.directive.js b/app/plugins/TagManager/angularjs/containerSelector/container-selector.directive.js
deleted file mode 100755
index 1e0153321..000000000
--- a/app/plugins/TagManager/angularjs/containerSelector/container-selector.directive.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-container-selector>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikContainerSelector', piwikContainerSelector);
-
-    piwikContainerSelector.$inject = ['piwik'];
-
-    function piwikContainerSelector(piwik){
-
-
-        return {
-            restrict: 'A',
-            scope: {
-                containerName: '@?'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/containerSelector/container-selector.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ContainerSelectorController',
-            controllerAs: 'containerSelector',
-            compile: function (element, attrs) {
-
-                return function (scope, element, attrs) {
-
-                };
-            }
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/containerSelector/container-selector.less b/app/plugins/TagManager/angularjs/containerSelector/container-selector.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/debugging/debugging.controller.js b/app/plugins/TagManager/angularjs/debugging/debugging.controller.js
deleted file mode 100755
index 37c565119..000000000
--- a/app/plugins/TagManager/angularjs/debugging/debugging.controller.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Controller for javascript tracking code generator
- */
-(function () {
-
-    angular.module('piwikApp').controller('MtmDebugController', MtmDebugController);
-
-    MtmDebugController.$inject = ['$scope', '$window'];
-
-    function MtmDebugController($scope, $window) {
-        var self = this;
-        this.mtmEvents = [];
-        this.mtmLogs = [];
-        this.selectedEventIndex = 0;
-        this.contentTab = 'tags';
-        this.selectedEvent = null;
-
-        this.selectEvent = function (eventIndex) {
-            if (this.mtmEvents[eventIndex]) {
-                this.selectedEventIndex = eventIndex;
-                this.selectedEvent = this.mtmEvents[eventIndex];
-
-                var tagsFired = [];
-                angular.forEach(this.mtmEvents, function (event, index) {
-                    if (index <= eventIndex) {
-                        angular.forEach(event.tags, function (tag) {
-                            tagsFired.push(tag.name);
-                        });
-                    }
-                });
-
-                var tagsNotFired = [];
-                angular.forEach(this.selectedEvent.container.tags, function (tag) {
-                    if (tagsFired.indexOf && tagsFired.indexOf(tag.name) === -1) {
-                        tagsNotFired.push(tag);
-                    }
-                });
-                this.selectedEvent.notFiredTags = tagsNotFired;
-            }
-        };
-
-        if ($window.mtmEvents && $window.mtmEvents.events) {
-            this.mtmEvents = $window.mtmEvents.events;
-            this.selectEvent(this.selectedEventIndex);
-        }
-        if ($window.mtmLogs && $window.mtmLogs.logs) {
-            this.mtmLogs = $window.mtmLogs.logs;
-        }
-
-        $(function () {
-            self.mtmEvents = $window.mtmEvents.events || [];
-            self.mtmLogs = $window.mtmLogs.logs || [];
-            self.selectEvent(self.selectedEventIndex);
-        });
-
-        $scope.$watch(function () {
-            return $window.mtmEvents;
-        }, function(n,o){
-            if (n !== o) {
-                self.mtmEvents = $window.mtmEvents;
-                if (!self.selectedEvent) {
-                    self.selectEvent(self.selectedEventIndex);
-                }
-            }
-        });
-        $scope.$watch(function () {
-            return $window.mtmLogs;
-        }, function(n,o){
-            if (n !== o) {
-                self.mtmLogs = $window.mtmLogs;
-            }
-        });
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/form-field/field-textarea-variable-template.html b/app/plugins/TagManager/angularjs/form-field/field-textarea-variable-template.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/form-field/field-variable-template.html b/app/plugins/TagManager/angularjs/form-field/field-variable-template.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/form-field/field-variable-template.less b/app/plugins/TagManager/angularjs/form-field/field-variable-template.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/form-field/field-variabletype-template.html b/app/plugins/TagManager/angularjs/form-field/field-variabletype-template.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/importVersion/import-version.controller.js b/app/plugins/TagManager/angularjs/importVersion/import-version.controller.js
deleted file mode 100755
index cafa2655c..000000000
--- a/app/plugins/TagManager/angularjs/importVersion/import-version.controller.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ImportVersionController', ImportVersionController);
-
-    ImportVersionController.$inject = ['$scope', 'piwikApi', 'piwik', '$timeout', '$filter'];
-
-    function ImportVersionController($scope, piwikApi, piwik, $timeout, $filter) {
-        var self = this;
-        this.isUpdating = false;
-        this.idContainer = $scope.idContainer;
-        this.backupName = '';
-
-        var notificationId = 'importContainerVersion';
-        var translate = $filter('translate');
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyTagNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        this.importVersion = function (backupName, version) {
-            if (!version) {
-                return;
-            }
-
-            var parsed;
-            try {
-                parsed = JSON.parse(version);
-            } catch (e) {
-                showNotification(translate('TagManager_ErrorInvalidContainerImportFormat'), 'error');
-                return;
-            }
-
-            if ('tags' in parsed && 'triggers' in parsed && 'variables' in parsed && 'idcontainer' in parsed && 'context' in parsed) {
-                piwik.helper.modalConfirm('#confirmImportContainerVersion', {yes: function () {
-                        self.isUpdating = true;
-                        var params = {
-                            method: 'TagManager.importContainerVersion',
-                            idContainer: self.idContainer,
-                            backupName: backupName
-                        };
-
-                        var post = {exportedContainerVersion: version};
-                        piwikApi.post(params, post).then(function () {
-                            showNotification(translate('TagManager_VersionImportSuccess'), 'success');
-                            self.isUpdating = false;
-                            window.location.reload();
-                        }, function () {
-                            self.isUpdating = false;
-                        });
-                    }});
-            } else {
-                showNotification(translate('TagManager_ErrorContainerVersionImportIncomplete'), 'error');
-            }
-
-        };
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/importVersion/import-version.directive.html b/app/plugins/TagManager/angularjs/importVersion/import-version.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/importVersion/import-version.directive.js b/app/plugins/TagManager/angularjs/importVersion/import-version.directive.js
deleted file mode 100755
index fe6973871..000000000
--- a/app/plugins/TagManager/angularjs/importVersion/import-version.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-import-version>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikImportVersion', piwikImportVersion);
-
-    piwikImportVersion.$inject = ['piwik'];
-
-    function piwikImportVersion(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/importVersion/import-version.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ImportVersionController',
-            controllerAs: 'importVersion'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/edit.controller.js b/app/plugins/TagManager/angularjs/manageContainer/edit.controller.js
deleted file mode 100755
index 124a72800..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/edit.controller.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ContainerEditController', ContainerEditController);
-
-    ContainerEditController.$inject = ['$scope', 'tagManagerContainerModel', 'piwik', '$location', '$filter', '$timeout', '$rootScope'];
-
-    function ContainerEditController($scope, tagManagerContainerModel, piwik, $location, $filter, $timeout, $rootScope) {
-
-        var self = this;
-        var currentId = null;
-        var notificationId = 'containertagmanagement';
-
-        var translate = $filter('translate');
-
-        this.isDirty = false;
-        this.model = tagManagerContainerModel;
-        this.contexts = [];
-
-        tagManagerContainerModel.fetchAvailableContexts().then(function (contexts) {
-            self.contexts = [];
-            angular.forEach(contexts, function (context) {
-                self.contexts.push({key: context.id, value: context.name});
-            });
-        });
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyContainerNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        function showErrorFieldNotProvidedNotification(title)
-        {
-            var message = _pk_translate('TagManager_ErrorXNotProvided', [title]);
-            showNotification(message, 'error');
-        }
-
-        function init(idContainer)
-        {
-            self.create = idContainer == '0';
-            self.edit   = !self.create;
-            self.container = {};
-
-            piwik.helper.lazyScrollToContent();
-
-            if (self.edit && idContainer) {
-                self.editTitle = translate('TagManager_EditContainer');
-                self.model.findContainer(idContainer).then(function (container) {
-                    if (!container) {
-                        return;
-                    }
-                    self.container = angular.copy(container);
-                    self.isDirty = false;
-                });
-            } else if (self.create) {
-                self.editTitle = translate('TagManager_CreateNewContainer');
-                self.container = {
-                    idSite: piwik.idSite,
-                    name: '',
-                    context: 'web',
-                    description: ''
-                };
-                self.isDirty = false;
-            }
-        }
-
-        this.cancel = function () {
-            $scope.idContainer = null;
-            currentId = null;
-
-            var $search = $location.search();
-            delete $search.idContainer;
-            $location.search($search);
-        };
-
-        $scope.$on('$destroy', function() {
-            $scope.idContainer = null;
-            currentId = null;
-        });
-
-        function checkRequiredFieldsAreSet()
-        {
-            var title;
-
-            if (!self.container.name) {
-                title = _pk_translate('General_Name');
-                showErrorFieldNotProvidedNotification(title);
-                return false;
-            }
-
-            return true;
-        }
-
-        this.createContainer = function () {
-            removeAnyContainerNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerContainerModel.createOrUpdateContainer(this.container, 'TagManager.addContainer').then(function (response) {
-                self.isUpdating = false;
-
-                if (!response || response.type === 'error' || !response.response) {
-                    return;
-                }
-
-                self.isDirty = false;
-
-                var idContainer = response.response.value;
-
-                showNotification(translate('TagManager_CreatedX', translate('TagManager_Container')), response.type);
-
-                var currentUrl = window.location.pathname + window.location.search;
-                var newUrl = piwik.broadcast.updateParamValue('module=TagManager', currentUrl);
-                newUrl = piwik.broadcast.updateParamValue('action=dashboard', newUrl);
-                newUrl = piwik.broadcast.updateParamValue('idContainer=' + idContainer, newUrl);
-                window.location.href = newUrl;
-
-            }, function () {
-                self.isUpdating = false;
-            });
-        };
-
-        this.setValueHasChanged = function () {
-            this.isDirty = true;
-        };
-
-        this.updateContainer = function () {
-
-            removeAnyContainerNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerContainerModel.createOrUpdateContainer(this.container, 'TagManager.updateContainer').then(function (response) {
-                if (response.type === 'error') {
-                    return;
-                }
-
-                var idContainer = self.container.idcontainer;
-
-                self.isDirty = false;
-                self.container = {};
-
-                tagManagerContainerModel.reload().then(function () {
-                    init(idContainer);
-                });
-                showNotification(translate('TagManager_UpdatedX', translate('TagManager_Container')), response.type);
-            });
-        };
-
-        $scope.$watch('idContainer', function (newValue, oldValue) {
-            if (newValue === null) {
-                return;
-            }
-            if (newValue != oldValue || currentId === null) {
-                currentId = newValue;
-                init(newValue);
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/edit.directive.html b/app/plugins/TagManager/angularjs/manageContainer/edit.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageContainer/edit.directive.js b/app/plugins/TagManager/angularjs/manageContainer/edit.directive.js
deleted file mode 100755
index 5d3e498a5..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/edit.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-container-edit>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikContainerEdit', piwikContainerEdit);
-
-    piwikContainerEdit.$inject = ['piwik'];
-
-    function piwikContainerEdit(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageContainer/edit.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ContainerEditController',
-            controllerAs: 'editContainer'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/list.controller.js b/app/plugins/TagManager/angularjs/manageContainer/list.controller.js
deleted file mode 100755
index aebe0262b..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/list.controller.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ContainerListController', ContainerListController);
-
-    ContainerListController.$inject = ['$scope', 'tagManagerContainerModel', 'piwik', 'piwikApi', '$location'];
-
-    function ContainerListController($scope, tagManagerContainerModel, piwik, piwikApi, $location) {
-
-        this.model = tagManagerContainerModel;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-
-        if (this.hasWriteAccess) {
-            this.containerDefaultAction = 'dashboard';
-        } else {
-            this.containerDefaultAction = 'manageTags';
-        }
-
-        var self = this;
-        this.contexts = {};
-
-        this.createContainer = function () {
-            this.editContainer(0);
-        };
-
-        this.editContainer = function (idContainer) {
-            var $search = $location.search();
-            $search.idContainer = idContainer;
-            $location.search($search);
-        };
-
-        this.installCode = function (idContainer) {
-            tagManagerHelper.showInstallCode(idContainer);
-        };
-
-        this.deleteContainer = function (container) {
-            function doDelete() {
-                tagManagerContainerModel.deleteContainer(container.idcontainer).then(function () {
-                    tagManagerContainerModel.reload();
-                });
-            }
-
-            piwik.helper.modalConfirm('#confirmDeleteContainer', {yes: doDelete});
-        };
-
-        this.truncateText = function(text, length) {
-            if (text && (text + '').length > length) {
-                return String(text).substr(0, length - 3) + '...';
-            }
-            return text;
-        };
-
-        this.model.fetchContainers();
-        this.model.fetchAvailableContexts().then(function (contexts) {
-            self.contexts = {};
-            angular.forEach(contexts, function (context) {
-                self.contexts[context.id] = context.name;
-            });
-        });
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/list.directive.html b/app/plugins/TagManager/angularjs/manageContainer/list.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageContainer/list.directive.js b/app/plugins/TagManager/angularjs/manageContainer/list.directive.js
deleted file mode 100755
index a03338fe0..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/list.directive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-container-list>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikContainerList', piwikContainerList);
-
-    piwikContainerList.$inject = ['piwik'];
-
-    function piwikContainerList(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {},
-            templateUrl: 'plugins/TagManager/angularjs/manageContainer/list.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ContainerListController',
-            controllerAs: 'containerList'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/manage.controller.js b/app/plugins/TagManager/angularjs/manageContainer/manage.controller.js
deleted file mode 100755
index 84797eab4..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/manage.controller.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ManageContainerController', ManageContainerController);
-
-    ManageContainerController.$inject = ['$scope', '$rootScope', '$location'];
-
-    function ManageContainerController($scope, $rootScope, $location) {
-
-        this.editMode = false;
-
-        var self = this;
-
-        function removeAnyContainerNotification()
-        {
-            var UI = require('piwik/UI');
-            new UI.Notification().remove('containertagmanagement');
-        }
-
-        function initState() {
-            var $search = $location.search();
-            if ('idContainer' in $search) {
-                if ($search.idContainer === 0 || $search.idContainer === '0') {
-
-                    var parameters = {isAllowed: true};
-                    $rootScope.$emit('TagManager.initAddContainer', parameters);
-                    if (parameters && !parameters.isAllowed) {
-
-                        self.editMode = false;
-                        self.idContainer = null;
-
-                        return;
-                    }
-                }
-                self.editMode = true;
-                self.idContainer = $search.idContainer;
-            } else {
-                self.editMode = false;
-                self.idContainer = null;
-            }
-
-            removeAnyContainerNotification();
-        }
-
-        initState();
-
-        var onChangeSuccess = $rootScope.$on('$locationChangeSuccess', initState);
-
-        $scope.$on('$destroy', function() {
-            if (onChangeSuccess) {
-                onChangeSuccess();
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/manage.directive.html b/app/plugins/TagManager/angularjs/manageContainer/manage.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageContainer/manage.directive.js b/app/plugins/TagManager/angularjs/manageContainer/manage.directive.js
deleted file mode 100755
index 3fb5b248c..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/manage.directive.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-container-manage>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikContainerManage', piwikContainerManage);
-
-    piwikContainerManage.$inject = ['piwik'];
-
-    function piwikContainerManage(piwik){
-
-        return {
-            restrict: 'A',
-            templateUrl: 'plugins/TagManager/angularjs/manageContainer/manage.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageContainerController',
-            controllerAs: 'manageContainer'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageContainer/model.js b/app/plugins/TagManager/angularjs/manageContainer/model.js
deleted file mode 100755
index 632919fb9..000000000
--- a/app/plugins/TagManager/angularjs/manageContainer/model.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerContainerModel', tagManagerContainerModel);
-
-    tagManagerContainerModel.$inject = ['piwikApi', '$q', '$filter'];
-
-    function tagManagerContainerModel(piwikApi, $q, $filter) {
-        var fetchPromise = null;
-        var contextPromise = null;
-        var translate = $filter('translate');
-
-        var model = {
-            containers : [],
-            isLoading: false,
-            isUpdating: false,
-            findContainer: findContainer,
-            createOrUpdateContainer: createOrUpdateContainer,
-            deleteContainer: deleteContainer,
-            fetchAvailableContexts: fetchAvailableContexts,
-            reload: reload,
-            fetchContainers: fetchContainers
-        };
-
-        return model;
-
-        function reload()
-        {
-            model.containers = [];
-            fetchPromise = null;
-            return fetchContainers();
-        }
-
-        function fetchContainers() {
-            var params = {method: 'TagManager.getContainers', filter_limit: '-1'};
-
-            if (!fetchPromise) {
-                fetchPromise = piwikApi.fetch(params);
-            }
-
-            model.isLoading = true;
-            model.containers = [];
-
-            return fetchPromise.then(function (containers) {
-                model.containers = containers;
-
-                model.isLoading = false;
-                return containers;
-            }, function () {
-                model.isLoading = false;
-            });
-        }
-
-        function fetchAvailableContexts() {
-            if (!contextPromise) {
-                var params = {method: 'TagManager.getAvailableContexts', filter_limit: '-1'};
-                contextPromise = piwikApi.fetch(params);
-            }
-
-            return contextPromise;
-        }
-
-        function findContainer(idContainer) {
-
-            // before going through an API request we first try to find it in loaded containers
-            var found;
-            angular.forEach(model.containers, function (container) {
-                if (!found && container.idcontainer === idContainer) {
-                    found = container;
-                }
-            });
-
-            if (found) {
-                var deferred = $q.defer();
-                deferred.resolve(found);
-                return deferred.promise;
-            }
-
-            // otherwise we fetch it via API
-            model.isLoading = true;
-
-            return piwikApi.fetch({
-                idContainer: idContainer,
-                method: 'TagManager.getContainer', filter_limit: '-1'
-            }).then(function (record) {
-                model.isLoading = false;
-                return record;
-
-            }, function (error) {
-                model.isLoading = false;
-            });
-        }
-
-        function deleteContainer(idContainer) {
-
-            model.isUpdating = true;
-            model.containers = [];
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.fetch({idContainer: idContainer, method: 'TagManager.deleteContainer'}).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function createOrUpdateContainer(container, method) {
-            container = angular.copy(container);
-            container.method = method;
-
-            var map = {
-                idContainer: 'idcontainer',
-            };
-
-            angular.forEach(map, function (value, key) {
-                if (typeof container[value] !== 'undefined') {
-                    container[key] = container[value];
-                    delete container[value];
-                }
-            });
-
-            var postParams = [];
-            var post = {};
-            for (var i = 0; i < postParams.length; i++) {
-                var postParam = postParams[i];
-                if (typeof container[postParam] !== 'undefined') {
-                    post[postParam] = container[postParam];
-                    delete container[postParam];
-                }
-            }
-
-            model.isUpdating = true;
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.post(container, post).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success', response: response};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.controller.js b/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.controller.js
deleted file mode 100755
index f1d6c90d3..000000000
--- a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.controller.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    angular.module('piwikApp').controller('ManageInstallTagCodeController', ManageInstallTagCodeController);
-
-    ManageInstallTagCodeController.$inject = ['$scope', 'piwikApi', '$q', '$filter', '$timeout'];
-
-    function ManageInstallTagCodeController($scope, piwikApi, $q, $filter, $timeout) {
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.environments = [];
-        this.environment = 'live';
-        this.installInstructions = '';
-        this.releases = [];
-        this.isLoading = false;
-
-        var environmentsPromise = piwikApi.fetch({method: 'TagManager.getAvailableEnvironments', filter_limit: '-1'});
-
-        this.fetchInstallInstructions = function (environment) {
-            this.installInstructions = {};
-            this.isLoading = true;
-
-            piwikApi.fetch({
-                method: 'TagManager.getContainerInstallInstructions', filter_limit: '-1',
-                idContainer: this.idContainer, environment: environment
-            }).then(function (instructions) {
-                self.installInstructions = instructions;
-                self.isLoading = false;
-                $timeout(function () {
-                    var codeBlock = $('.manageInstallTagCode .codeblock');
-                    codeBlock.each(function (i, element) {
-                        $(element).effect("highlight", {}, 1500);
-                    });
-                });
-
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        this.fetchReleases = function () {
-            this.environments = [];
-            this.isLoading = true;
-            var containerPromise = piwikApi.fetch({method: 'TagManager.getContainer', idContainer: this.idContainer, filter_limit: '-1'})
-
-            $q.all([containerPromise, environmentsPromise]).then(function (response) {
-                var container = response[0];
-                var environments = response[1];
-                self.releases = container.releases;
-
-                self.environments = [];
-                self.isLoading = false;
-                var hasLive = false;
-
-                angular.forEach(environments, function (environment) {
-                    self.environments.push({key: environment.id, value: environment.name});
-                })
-
-                angular.forEach(self.releases, function (release) {
-                    angular.forEach(container.versions, function (version) {
-                        if (version.idcontainerversion === release.idcontainerversion) {
-                            release.version = version;
-                        }
-                    });
-
-                    if (release.environment === 'live') {
-                        hasLive = true;
-                    }
-                });
-
-                if (!hasLive && self.environments && self.environments[0] && self.environments[0].key) {
-                    self.environment = self.environments[0].key;
-                } else if (!hasLive) {
-                    // no release available yet
-                    self.environment = '';
-                }
-
-                if (self.environment) {
-                    self.fetchInstallInstructions(self.environment);
-                }
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        this.fetchReleases();
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.html b/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.html
index ce80373ac..8883c0295 100755
--- a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.html
+++ b/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.html
@@ -18,7 +18,7 @@
             <a href="{{ installInstruction.helpUrl }}" target="_blank" ng-show="installInstruction.helpUrl">{{ 'TagManager_LearnMore'|translate }}</a>
         </p>
 
-        <pre piwik-select-on-focus class="codeblock" ng-show="installInstruction.embedCode"
+        <pre piwik-select-on-focus class="codeblock"  ng-show="installInstruction.embedCode"
              ng-bind="installInstruction.embedCode">
         </pre>
     </div>
diff --git a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.js b/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.js
deleted file mode 100755
index e88b1d19a..000000000
--- a/app/plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-manage-install-tag-code>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikManageInstallTagCode', piwikManageInstallTagCode);
-
-    piwikManageInstallTagCode.$inject = ['piwik'];
-
-    function piwikManageInstallTagCode(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-               idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageInstallCode/manage-install-tag-code.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageInstallTagCodeController',
-            controllerAs: 'manageInstallTagCode',
-            compile: function (element, attrs) {
-
-                return function (scope, element, attrs) {
-
-                };
-            }
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/edit.controller.js b/app/plugins/TagManager/angularjs/manageTag/edit.controller.js
deleted file mode 100755
index 275ff8cdc..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/edit.controller.js
+++ /dev/null
@@ -1,567 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('TagEditController', TagEditController);
-
-    TagEditController.$inject = ['$scope', 'tagManagerTagModel', 'piwik', '$location', '$filter', '$timeout', '$rootScope'];
-
-    function TagEditController($scope, tagManagerTagModel, piwik, $location, $filter, $timeout, $rootScope) {
-
-        var self = this;
-        var currentId = null;
-        var notificationId = 'tagtagmanagement';
-
-        var translate = $filter('translate');
-
-        this.isDirty = false;
-        this.model = tagManagerTagModel;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.showAdvanced = false;
-        this.chooseTagType = false;
-        this.canUseCustomTemplates = piwik.hasUserCapability('tagmanager_use_custom_templates');
-
-        this.availableTags = [];
-        this.availableFireLimits = [];
-        this.containerTriggers = [];
-        this.currentTime = null;
-
-        function prefixDateZeroIfNeeded(number) {
-            var datePart = String(number);
-
-            if (datePart.length === 1) {
-                datePart = '0' + datePart;
-            }
-
-            return datePart;
-        }
-
-        function convertLocalDateToUtc(dateTime)
-        {
-            if (dateTime) {
-                dateTime = dateTime.replace(/-/g, '/');
-            }
-            try {
-                var localDate = new Date(dateTime)
-
-                var formatted = '';
-                formatted += localDate.getUTCFullYear() + '-' + prefixDateZeroIfNeeded(localDate.getUTCMonth()+1)+ '-' + prefixDateZeroIfNeeded(localDate.getUTCDate());
-                formatted += ' ';
-                formatted += prefixDateZeroIfNeeded(localDate.getUTCHours()) + ':' + prefixDateZeroIfNeeded(localDate.getUTCMinutes())+ ':' + prefixDateZeroIfNeeded(localDate.getUTCSeconds());
-
-                return formatted;
-            } catch (e) {
-                return dateTime;
-            }
-        }
-
-        function convertUtcToLocalDate(dateTime) {
-            if (!dateTime) {
-                return;
-            }
-
-            var isoDate = dateTime;
-            var result, datePart, timePart, dateParts, timeParts, newTime;
-
-            if (isoDate) {
-                isoDate = (isoDate + '').replace(/-/g, '/');
-
-                try {
-                    result = new Date(isoDate + ' UTC');
-
-                    return result;
-                } catch (e) {
-                    try {
-                        result = Date.parse(isoDate + ' UTC');
-                        result = new Date(result);
-
-                        return result;
-                    } catch (ex) {
-
-                        // eg phantomjs etc
-                        datePart = isoDate.substr(0, 10);
-                        timePart = isoDate.substr(11);
-
-                        dateParts = datePart.split('/');
-                        timeParts = timePart.split(':');
-                        if (dateParts.length === 3 && timeParts.length === 3) {
-                            result = new Date(dateParts[0], dateParts[1] - 1, dateParts[2], timeParts[0], timeParts[1], timeParts[2]);
-                            newTime = result.getTime() + (result.getTimezoneOffset() * 60000);
-                            result = new Date(newTime);
-
-                            return result;
-                        }
-                    }
-                }
-            }
-        };
-
-        function convertUtcDateToLocalDatePart(isoDateTime)
-        {
-            var localStartDate = convertUtcToLocalDate(isoDateTime);
-            if (localStartDate) {
-                return localStartDate.getFullYear() + '-' + prefixDateZeroIfNeeded(localStartDate.getMonth()+1)+ '-' + prefixDateZeroIfNeeded(localStartDate.getDate());
-            }
-
-            var parts = isoDateTime.split(' ');
-            return parts[0];
-        }
-
-        function convertUtcDateToLocalTimePart(isoDateTime)
-        {
-            var localStartDate = convertUtcToLocalDate(isoDateTime);
-            if (localStartDate) {
-                return prefixDateZeroIfNeeded(localStartDate.getHours()) + ':' + prefixDateZeroIfNeeded(localStartDate.getMinutes())+ ':' + prefixDateZeroIfNeeded(localStartDate.getSeconds());
-            }
-
-            var parts = isoDateTime.split(' ');
-            return parts[1];
-        }
-
-        function enrichTemplateType(template)
-        {
-            template.isDisabled = !self.canUseCustomTemplates && template && template.isCustomTemplate;
-            return template;
-        }
-
-        function updateAvailableTriggers()
-        {
-            self.model.fetchContainerTriggers(self.idContainer, self.idContainerVersion).then(function (triggers) {
-                self.containerTriggers = [];
-                angular.forEach(triggers, function (trigger) {
-                    self.containerTriggers.push({key: trigger.idtrigger, value:  trigger.name});
-                });
-            });
-        }
-        updateAvailableTriggers();
-
-        function getCurrentTime() {
-            var date = new Date();
-            if (date && date.toString) {
-                return date.toString();
-            }
-        }
-
-        function setCurrentTime() {
-            self.currentTime = getCurrentTime();
-            $timeout(setCurrentTime, 10000);
-        }
-
-        setCurrentTime();
-
-        this.model.fetchAvailableFireLimits().then(function (fireLimits) {
-            self.availableFireLimits = [];
-            angular.forEach(fireLimits, function (fireLimit) {
-                self.availableFireLimits.push({key: fireLimit.id, value: fireLimit.name});
-            });
-        });
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyTagNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        function showErrorFieldNotProvidedNotification(title)
-        {
-            var message = _pk_translate('TagManager_ErrorXNotProvided', [title]);
-            showNotification(message, 'error');
-        }
-
-        var deregisterWatches = [];
-
-        function init(idTag)
-        {
-            self.create = idTag == '0';
-            self.edit   = !self.create;
-            self.tag = {};
-            self.chooseTagType = false;
-            self.editTitle = '';
-
-            var dereg;
-            for (dereg = 0; dereg < deregisterWatches.length; dereg++) {
-                if ('function' === typeof deregisterWatches[dereg]) {
-                    deregisterWatches[dereg]();
-                }
-            }
-
-            piwik.helper.lazyScrollToContent();
-
-            self.availableTags = [];
-            self.model.fetchContainer(self.idContainer).then(function (container){
-                return self.model.fetchAvailableTags(container.context);
-            }).then(function (tags) {
-                angular.forEach(tags, function (tagsGroup) {
-                    angular.forEach(tagsGroup.types, function (tag) {
-                        enrichTemplateType(tag);
-                    });
-                });
-
-                self.availableTags = tags;
-            }).then(function () {
-                if (self.edit && idTag) {
-                    self.editTitle = translate('TagManager_EditTag');
-
-                    self.model.findTag(self.idContainer, self.idContainerVersion, idTag).then(function (tag) {
-                        if (!tag) {
-                            return;
-                        }
-                        self.tag = angular.copy(tag);
-                        self.tag.idcontainer = self.idContainer;
-                        self.tag.block_triggers = [];
-                        self.tag.fire_triggers = [];
-
-                        if (self.tag.typeMetadata) {
-                            enrichTemplateType(self.tag.typeMetadata);
-                        }
-
-                        if (angular.isArray(self.tag.block_trigger_ids)) {
-                            angular.forEach(self.tag.block_trigger_ids, function (id) {
-                                self.tag.block_triggers.push({idtrigger: id});
-                            });
-                        }
-                        if (!self.tag.block_triggers.length) {
-                            self.tag.block_triggers.push({idtrigger: ''});
-                        }
-
-                        if (angular.isArray(self.tag.fire_trigger_ids)) {
-                            angular.forEach(self.tag.fire_trigger_ids, function (id) {
-                                self.tag.fire_triggers.push({idtrigger: id});
-                            });
-                        }
-                        if (!self.tag.fire_triggers.length) {
-                            self.tag.fire_triggers.push({idtrigger: ''});
-                        }
-
-                        if (self.tag.start_date) {
-                            self.tag.start_date_date = convertUtcDateToLocalDatePart(self.tag.start_date);
-                            self.tag.start_date_time = convertUtcDateToLocalTimePart(self.tag.start_date)
-                        }
-
-                        if (self.tag.end_date) {
-                            self.tag.end_date_date = convertUtcDateToLocalDatePart(self.tag.end_date);
-                            self.tag.end_date_time = convertUtcDateToLocalTimePart(self.tag.end_date)
-                        }
-
-                        self.addParameterWatch();
-                        self.onFireTriggerChange();
-                        self.onBlockTriggerChange();
-                        self.isDirty = false;
-
-                    });
-                } else if (self.create) {
-                    self.editTitle = translate('TagManager_ChooseTagToContinue');
-                    self.chooseTagType = true;
-                }
-            });
-        };
-
-        this.addParameterWatch = function () {
-            var index;
-            if (this.tag.typeMetadata && this.tag.typeMetadata.parameters) {
-                for (index = 0; index < this.tag.typeMetadata.parameters.length; index++) {
-                    deregisterWatches.push($scope.$watch('editTag.tag.typeMetadata.parameters[' + index + '].value', function (val, oldVal) {
-                        if (val !== oldVal) {
-                            self.isDirty = true;
-                        }
-                    }));
-                }
-            }
-        };
-
-        this.onCreateNewBlockTrigger = function (callback) {
-            this.openEditTrigger(function (trigger) {
-                var indexLastEntry = self.tag.block_triggers.length - 1;
-                if (!self.tag.block_triggers[indexLastEntry] ||
-                    !self.tag.block_triggers[indexLastEntry].idtrigger) {
-                    self.tag.block_triggers[indexLastEntry] = {idtrigger:trigger.idtrigger};
-                } else {
-                    self.tag.block_triggers.push({idtrigger:trigger.idtrigger});
-                }
-                self.onBlockTriggerChange();
-            }, 0);
-        };
-
-        this.onCreateNewFireTrigger = function() {
-            this.openEditTrigger(function (trigger) {
-                var indexLastEntry = self.tag.fire_triggers.length - 1;
-                if (!self.tag.fire_triggers[indexLastEntry] ||
-                    !self.tag.fire_triggers[indexLastEntry].idtrigger) {
-                    self.tag.fire_triggers[indexLastEntry] = {idtrigger:trigger.idtrigger};
-                } else {
-                    self.tag.fire_triggers.push({idtrigger:trigger.idtrigger});
-                }
-                self.onFireTriggerChange();
-            }, 0);
-        };
-
-        this.editTrigger = function(idTrigger) {
-            this.openEditTrigger(function (trigger) {
-                //
-            }, idTrigger);
-        };
-
-        this.openEditTrigger = function(callback, idTag) {
-            tagManagerHelper.editTrigger($scope, this.idContainer, this.idContainerVersion, idTag, function (trigger) {
-                updateAvailableTriggers();
-                callback(trigger);
-            });
-        };
-
-        this.onBlockTriggerChange = function () {
-            var hasAll = true;
-            angular.forEach(this.tag.block_triggers, function (trigger) {
-                if (!trigger || !trigger.idtrigger) {
-                    hasAll = false;
-                }
-            });
-            if (hasAll) {
-                this.addBlockTrigger();
-            }
-        };
-
-        this.addBlockTrigger = function () {
-            this.tag.block_triggers.push({idtrigger: ''});
-            this.isDirty = true;
-        };
-
-        this.removeBlockTrigger = function (index) {
-            if (index > -1) {
-                var lastIndex = this.tag.block_triggers.length - 1;
-                if (lastIndex === index) {
-                    this.tag.block_triggers[index] = {idtrigger: ''};
-                } else {
-                    this.tag.block_triggers.splice(index, 1);
-                }
-                
-                this.isDirty = true;
-            }
-        };
-
-        this.onFireTriggerChange = function () {
-            var hasAll = true;
-            angular.forEach(this.tag.fire_triggers, function (trigger) {
-                if (!trigger || !trigger.idtrigger) {
-                    hasAll = false;
-                }
-            });
-            if (hasAll) {
-                this.addFireTrigger();
-            }
-        };
-
-        this.addFireTrigger = function () {
-            this.tag.fire_triggers.push({idtrigger:''});
-            this.isDirty = true;
-        };
-
-        this.removeFireTrigger = function (index) {
-            if (index > -1) {
-                var lastIndex = this.tag.fire_triggers.length - 1;
-                if (lastIndex === index) {
-                    this.tag.block_triggers[index] = {idtrigger: ''};
-                } else {
-                    this.tag.fire_triggers.splice(index, 1);
-                }
-
-                this.isDirty = true;
-            }
-        };
-
-        this.createTagType = function (tagTemplate) {
-            if (tagTemplate && tagTemplate.isDisabled) {
-                return;
-            }
-            this.chooseTagType = false;
-            this.editTitle = translate('TagManager_CreateNewTag');
-            this.tag = {
-                idSite: piwik.idSite,
-                name: this.model.suggestNameForType(tagTemplate.name),
-                type: tagTemplate.id,
-                idcontainer: self.idContainer,
-                idcontainerversion: self.idContainerVersion,
-                parameters: {},
-                fire_limit: 'unlimited',
-                priority: 999,
-                fire_delay: 0,
-                block_triggers: [{idtrigger: ''}],
-                fire_triggers: [{idtrigger: ''}],
-                typeMetadata: tagTemplate
-            };
-            this.addParameterWatch();
-
-            this.isDirty = false;
-
-            $timeout(function () {
-                var editTag = $('.editTag');
-                if (editTag.length && editTag[0]) {
-                    editTag[0].scrollIntoView()
-                }
-                $('.editTag #name').focus();
-            }, 1);
-        };
-
-        this.cancel = function () {
-            $scope.idTag = null;
-            currentId = null;
-
-            var $search = $location.search();
-            delete $search.idTag;
-            $location.search($search);
-        };
-
-        $scope.$on('$destroy', function() {
-            $scope.idTag = null;
-            currentId = null;
-        });
-
-        function checkRequiredFieldsAreSet()
-        {
-            var title;
-
-            if (!self.tag.name) {
-                title = translate('General_Name');
-                showErrorFieldNotProvidedNotification(title);
-                return false;
-            }
-
-            if (!self.tag.fire_triggers || !self.tag.fire_triggers.length) {
-                showNotification(translate('TagManager_TagFireTriggerRequirement'), 'error');
-                return false;
-            }
-
-            return true;
-        }
-
-        this.onAnyDateChange = function () {
-            if (this.tag.start_date_date) {
-                if (!this.tag.start_date_time) {
-                    this.tag.start_date_time = '00:00:00';
-                }
-
-                this.tag.start_date = convertLocalDateToUtc(this.tag.start_date_date + ' ' + this.tag.start_date_time);
-
-            } else {
-                this.tag.start_date = null;
-            }
-
-            if (this.tag.end_date_date) {
-                if (!this.tag.end_date_time) {
-                    this.tag.end_date_time = '23:59:59';
-                }
-
-                this.tag.end_date = convertLocalDateToUtc(this.tag.end_date_date + ' ' + this.tag.end_date_time);
-            } else {
-                this.tag.end_date = null;
-            }
-        };
-
-        this.createTag = function () {
-            removeAnyTagNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerTagModel.createOrUpdateTag(this.tag, 'TagManager.addContainerTag').then(function (response) {
-                self.isUpdating = false;
-
-                if (!response || response.type === 'error' || !response.response) {
-                    return;
-                }
-
-                self.isDirty = false;
-
-                var idTag = response.response.value;
-
-                tagManagerTagModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    var $search = $location.search();
-                    $search.idTag = idTag;
-                    $location.search($search);
-
-                    $timeout(function () {
-                        showNotification(translate('TagManager_CreatedX', translate('TagManager_Tag')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-                    }, 200);
-                });
-            }, function () {
-                self.isUpdating = false;
-            });
-        };
-
-        this.setValueHasChanged = function () {
-            this.isDirty = true;
-        };
-
-        this.updateTag = function () {
-
-            removeAnyTagNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerTagModel.createOrUpdateTag(this.tag, 'TagManager.updateContainerTag').then(function (response) {
-                if (response.type === 'error') {
-                    return;
-                }
-
-                var idTag = self.tag.idtag;
-
-                self.isDirty = false;
-                self.tag = {};
-
-                tagManagerTagModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    init(idTag);
-                });
-                showNotification(translate('TagManager_UpdatedX', translate('TagManager_Tag')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-            });
-        };
-
-        var options1 = piwik.getBaseDatePickerOptions(null);
-        delete options1.maxDate;
-        options1.minDate = new Date();
-        var options2 = angular.copy(options1);
-
-        $timeout(function () {
-            $(".tagStartDateInput").datepicker(options1);
-            $(".tagEndDateInput").datepicker(options2);
-            $('.tagStartTimeInput').timepicker({timeFormat: 'H:i:s'});
-            $('.tagEndTimeInput').timepicker({timeFormat: 'H:i:s'});
-        });
-
-        $scope.$watch('idTag', function (newValue, oldValue) {
-            if (newValue === null) {
-                return;
-            }
-            if (newValue != oldValue || currentId === null) {
-                currentId = newValue;
-                init(newValue);
-            }
-        });
-    }
-})();
diff --git a/app/plugins/TagManager/angularjs/manageTag/edit.directive.html b/app/plugins/TagManager/angularjs/manageTag/edit.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTag/edit.directive.js b/app/plugins/TagManager/angularjs/manageTag/edit.directive.js
deleted file mode 100755
index bbdc24412..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/edit.directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-tag-edit>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTagEdit', piwikTagEdit);
-
-    piwikTagEdit.$inject = ['piwik'];
-
-    function piwikTagEdit(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idTag: '=',
-                idContainer: '=',
-                idContainerVersion: '=',
-                newTagType: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTag/edit.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'TagEditController',
-            controllerAs: 'editTag'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/edit.directive.less b/app/plugins/TagManager/angularjs/manageTag/edit.directive.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTag/list.controller.js b/app/plugins/TagManager/angularjs/manageTag/list.controller.js
deleted file mode 100755
index ebdf8c5b7..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/list.controller.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('TagListController', TagListController);
-
-    TagListController.$inject = ['$scope', 'tagManagerTagModel', 'tagManagerTriggerModel', 'piwik', 'piwikApi', '$location'];
-
-    function TagListController($scope, tagManagerTagModel, tagManagerTriggerModel, piwik, piwikApi, $location) {
-
-        this.model = tagManagerTagModel;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.triggers = {};
-
-        function updateTriggers() {
-            tagManagerTriggerModel.reload(self.idContainer, self.idContainerVersion).then(function (triggers) {
-                self.triggers = {};
-                angular.forEach(triggers, function (trigger) {
-                    self.triggers[trigger.idtrigger] = trigger.name;
-                });
-            });
-        }
-
-        this.model.onReload = function () {
-            updateTriggers();
-        };
-
-        this.createTag = function () {
-            this.editTag(0);
-        };
-
-        this.editTrigger = function (idTrigger) {
-            tagManagerHelper.editTrigger($scope, this.idContainer, this.idContainerVersion, idTrigger, function () {
-                updateTriggers();
-            });
-        };
-
-        this.editTag = function (idTag) {
-            var $search = $location.search();
-            $search.idTag = idTag;
-            $location.search($search);
-        };
-
-        this.deleteTag = function (tag) {
-            function doDelete() {
-                tagManagerTagModel.deleteTag(self.idContainer, self.idContainerVersion, tag.idtag).then(function () {
-                    tagManagerTagModel.reload(self.idContainer, self.idContainerVersion);
-                });
-            }
-
-            piwik.helper.modalConfirm('#confirmDeleteTag', {yes: doDelete});
-        };
-
-        this.model.fetchTags(this.idContainer, this.idContainerVersion);
-        updateTriggers();
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/list.directive.html b/app/plugins/TagManager/angularjs/manageTag/list.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTag/list.directive.js b/app/plugins/TagManager/angularjs/manageTag/list.directive.js
deleted file mode 100755
index bf7d8ef3c..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/list.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-tag-list>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTagList', piwikTagList);
-
-    piwikTagList.$inject = ['piwik'];
-
-    function piwikTagList(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '=',
-                idContainerVersion: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTag/list.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'TagListController',
-            controllerAs: 'tagList'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/manage.controller.js b/app/plugins/TagManager/angularjs/manageTag/manage.controller.js
deleted file mode 100755
index 6a83b2d82..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/manage.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ManageTagController', ManageTagController);
-
-    ManageTagController.$inject = ['$scope', '$rootScope', '$location'];
-
-    function ManageTagController($scope, $rootScope, $location) {
-
-        this.editMode = false;
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-
-        function removeAnyTagNotification()
-        {
-            var UI = require('piwik/UI');
-            new UI.Notification().remove('tagtagmanagement');
-        }
-
-        function initState() {
-            var $search = $location.search();
-            if ('idTag' in $search) {
-                if ($search.idTag === 0 || $search.idTag === '0') {
-
-                    var parameters = {isAllowed: true};
-                    $rootScope.$emit('TagManager.initAddTag', parameters);
-                    if (parameters && !parameters.isAllowed) {
-
-                        self.editMode = false;
-                        self.idTag = null;
-
-                        return;
-                    }
-                }
-                self.editMode = true;
-                self.idTag = parseInt($search.idTag, 10);
-            } else {
-                self.editMode = false;
-                self.idTag = null;
-            }
-
-            removeAnyTagNotification();
-        }
-
-        initState();
-
-        var onChangeSuccess = $rootScope.$on('$locationChangeSuccess', initState);
-
-        $scope.$on('$destroy', function() {
-            if (onChangeSuccess) {
-                onChangeSuccess();
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/manage.directive.html b/app/plugins/TagManager/angularjs/manageTag/manage.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTag/manage.directive.js b/app/plugins/TagManager/angularjs/manageTag/manage.directive.js
deleted file mode 100755
index f7c1f12cc..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/manage.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-tag-manage>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTagManage', piwikTagManage);
-
-    piwikTagManage.$inject = ['piwik'];
-
-    function piwikTagManage(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainerVersion: '@',
-                idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTag/manage.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageTagController',
-            controllerAs: 'manageTag'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTag/model.js b/app/plugins/TagManager/angularjs/manageTag/model.js
deleted file mode 100755
index 14a54100b..000000000
--- a/app/plugins/TagManager/angularjs/manageTag/model.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerTagModel', tagManagerTagModel);
-
-    tagManagerTagModel.$inject = ['piwikApi', '$q', '$filter'];
-
-    function tagManagerTagModel(piwikApi, $q, $filter) {
-        var fetchPromise = null;
-        var tagsPromise = {};
-        var fireLimitsPromise = null;
-        var translate = $filter('translate');
-
-        var model = {
-            tags : [],
-            isLoading: false,
-            isUpdating: false,
-            findTag: findTag,
-            createOrUpdateTag: createOrUpdateTag,
-            fetchAvailableTags: fetchAvailableTags,
-            fetchContainerTriggers: fetchContainerTriggers,
-            fetchContainer: fetchContainer,
-            fetchAvailableFireLimits: fetchAvailableFireLimits,
-            suggestNameForType: suggestNameForType,
-            deleteTag: deleteTag,
-            reload: reload,
-            onReload: null,
-            fetchTags: fetchTags
-        };
-
-        return model;
-
-        function reload(idContainer, idContainerVersion)
-        {
-            model.tags = [];
-            fetchPromise = null;
-            tagsPromise = {};
-            fireLimitsPromise = null;
-
-            if (model.onReload) {
-                model.onReload();
-            }
-
-            return fetchTags(idContainer, idContainerVersion);
-        }
-
-        function fetchAvailableTags(idContext) {
-            if (!tagsPromise[idContext]) {
-                var params = {method: 'TagManager.getAvailableTagTypesInContext', idContext: idContext, filter_limit: '-1'};
-                tagsPromise[idContext] = piwikApi.fetch(params);
-            }
-
-            return tagsPromise[idContext];
-        }
-
-        function fetchContainerTriggers(idContainer, idContainerVersion) {
-            var params = {method: 'TagManager.getContainerTriggers', idContainer: idContainer, idContainerVersion: idContainerVersion, filter_limit: '-1'};
-            return piwikApi.fetch(params);
-        }
-
-        function fetchContainer(idContainer) {
-            var params = {method: 'TagManager.getContainer', idContainer: idContainer, filter_limit: '-1'};
-            return piwikApi.fetch(params);
-        }
-
-        function fetchAvailableFireLimits() {
-            if (!fireLimitsPromise) {
-                var params = {method: 'TagManager.getAvailableTagFireLimits', filter_limit: '-1'};
-                fireLimitsPromise = piwikApi.fetch(params);
-            }
-
-            return fireLimitsPromise;
-        }
-
-        function fetchTags(idContainer, idContainerVersion) {
-            var params = {method: 'TagManager.getContainerTags', idContainer: idContainer,
-                          idContainerVersion: idContainerVersion,filter_limit: '-1'};
-
-            if (!fetchPromise) {
-                fetchPromise = piwikApi.fetch(params);
-            }
-
-            model.isLoading = true;
-            model.tags = [];
-
-            return fetchPromise.then(function (tags) {
-                model.tags = tags;
-
-                model.isLoading = false;
-                return tags;
-            }, function () {
-                model.isLoading = false;
-            });
-        }
-
-        function findTag(idContainer, idContainerVersion, idTag) {
-
-            // before going through an API request we first try to find it in loaded tags
-            var found;
-            angular.forEach(model.tags, function (tag) {
-                if (!found && parseInt(tag.idtag, 10) === idTag) {
-                    found = tag;
-                }
-            });
-
-            if (found) {
-                var deferred = $q.defer();
-                deferred.resolve(found);
-                return deferred.promise;
-            }
-
-            // otherwise we fetch it via API
-            model.isLoading = true;
-
-            return piwikApi.fetch({
-                idTag: idTag,
-                idContainer: idContainer,
-                idContainerVersion: idContainerVersion,
-                method: 'TagManager.getContainerTag', filter_limit: '-1'
-            }).then(function (record) {
-                model.isLoading = false;
-                return record;
-
-            }, function (error) {
-                model.isLoading = false;
-            });
-        }
-
-        function deleteTag(idContainer, idContainerVersion, idTag) {
-
-            model.isUpdating = true;
-            model.tags = [];
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.fetch({idTag: idTag, idContainerVersion: idContainerVersion, idContainer: idContainer, method: 'TagManager.deleteContainerTag'}).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function suggestNameForType(templateId) {
-
-            var counter;
-            for (counter = 0; counter < 100; counter++) {
-                var name = templateId;
-                if (counter) {
-                    name = name + ' (' + counter + ')';
-                }
-                var isFree = true;
-                angular.forEach(model.tags, function (tag) {
-                    if (tag && tag.name === name) {
-                        isFree = false;
-                    }
-                });
-                if (isFree) {
-                    return name;
-                }
-            }
-        }
-
-        function createOrUpdateTag(tag, method) {
-            tag = angular.copy(tag);
-            tag.method = method;
-
-            tag.parameters = {};
-
-            angular.forEach(tag.typeMetadata.parameters, function (setting) {
-                var value = setting.value;
-                if (value === false) {
-                    value = '0';
-                } else if (value === true) {
-                    value = '1';
-                }
-                tag.parameters[setting.name] = value;
-            });
-
-            delete tag.typeMetadata;
-
-            var map = {
-                idTag: 'idtag',
-                idContainer: 'idcontainer',
-                idContainerVersion: 'idcontainerversion',
-                startDate: 'start_date',
-                endDate: 'end_date',
-                fireLimit: 'fire_limit',
-                fireDelay: 'fire_delay'
-            };
-
-            tag.fireTriggerIds = [];
-            angular.forEach(tag.fire_triggers, function (trigger) {
-                if (trigger && trigger.idtrigger) {
-                    tag.fireTriggerIds.push(trigger.idtrigger);
-                }
-            });
-
-            tag.blockTriggerIds = [];
-            angular.forEach(tag.block_triggers, function (trigger) {
-                if (trigger && trigger.idtrigger) {
-                    tag.blockTriggerIds.push(trigger.idtrigger);
-                }
-            });
-
-            delete tag.block_triggers;
-            delete tag.block_trigger_ids;
-            delete tag.fire_triggers;
-            delete tag.fire_trigger_ids;
-
-            angular.forEach(map, function (value, key) {
-                if (typeof tag[value] !== 'undefined') {
-                    tag[key] = tag[value];
-                    delete tag[value];
-                }
-            });
-
-            var postParams = ['parameters', 'fireTriggerIds', 'blockTriggerIds'];
-            var post = {};
-            for (var i = 0; i < postParams.length; i++) {
-                var postParam = postParams[i];
-                if (typeof tag[postParam] !== 'undefined') {
-                    post[postParam] = tag[postParam];
-                    delete tag[postParam];
-                }
-            }
-
-            model.isUpdating = true;
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.post(tag, post).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success', response: response};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/edit.controller.js b/app/plugins/TagManager/angularjs/manageTrigger/edit.controller.js
deleted file mode 100755
index 1fd05cf1d..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/edit.controller.js
+++ /dev/null
@@ -1,360 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('TriggerEditController', TriggerEditController);
-
-    TriggerEditController.$inject = ['$scope', 'tagManagerTriggerModel', 'piwik', '$location', '$filter', '$timeout', '$rootScope'];
-
-    function TriggerEditController($scope, tagManagerTriggerModel, piwik, $location, $filter, $timeout, $rootScope) {
-
-        var self = this;
-        var currentId = null;
-        var notificationId = 'tagtriggermanagement';
-
-        var translate = $filter('translate');
-
-        this.isDirty = false;
-        this.model = tagManagerTriggerModel;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.chooseTriggerType = false;
-        this.isEmbedded = !!$scope.onChangeTrigger;
-        this.canUseCustomTemplates = piwik.hasUserCapability('tagmanager_use_custom_templates');
-
-        this.availableTriggers = [];
-        this.availableComparisons = [];
-        this.availableVariables = [];
-        this.variableIdToName = {};
-
-        this.model.fetchAvailableComparisons().then(function (comparisons) {
-            self.availableComparisons = [];
-            angular.forEach(comparisons, function (comparison) {
-                self.availableComparisons.push({key: comparison.id, value: comparison.name});
-            });
-        });
-
-        this.model.fetchAvailableContainerVariables(this.idContainer, this.idContainerVersion).then(function (variables) {
-            self.availableVariables = [];
-            angular.forEach(variables, function (category) {
-                angular.forEach(category.types, function (variable) {
-                    self.variableIdToName[variable.id] = variable.name;
-                    self.availableVariables.push({key: variable.id, value: variable.name, group: category.name});
-                });
-            });
-        });
-
-        // needed for suggestNameForType() to make sure it is aware of all names
-        this.model.fetchTriggersIfNotLoaded();
-
-        function enrichTemplateType(template)
-        {
-            template.isDisabled = !self.canUseCustomTemplates && template && template.isCustomTemplate;
-            return template;
-        }
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyTriggerNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        function showErrorFieldNotProvidedNotification(title)
-        {
-            var message = translate('TagManager_ErrorXNotProvided', [title]);
-            showNotification(message, 'error');
-        }
-
-        var deregisterWatches = [];
-
-        function init(idTrigger)
-        {
-            self.create = idTrigger == '0';
-            self.edit   = !self.create;
-            self.trigger = {};
-            self.chooseTriggerType = false;
-            self.editTitle = '';
-
-            var dereg;
-            for (dereg = 0; dereg < deregisterWatches.length; dereg++) {
-                if ('function' === typeof deregisterWatches[dereg]) {
-                    deregisterWatches[dereg]();
-                }
-            }
-
-            piwik.helper.lazyScrollToContent();
-
-            self.availableTriggers = [];
-            self.model.fetchContainer(self.idContainer).then(function (container){
-                return self.model.fetchAvailableTriggers(container.context);
-            }).then(function (triggers) {
-                angular.forEach(triggers, function (triggersGroup) {
-                    angular.forEach(triggersGroup.types, function (trigger) {
-                        enrichTemplateType(trigger);
-                    });
-                });
-
-                self.availableTriggers = triggers;
-            }).then(function () {
-                if (self.edit && idTrigger) {
-                    self.editTitle = translate('TagManager_EditTrigger');
-
-                    self.model.findTrigger(self.idContainer, self.idContainerVersion, idTrigger).then(function (trigger) {
-                        if (!trigger) {
-                            return;
-                        }
-                        self.trigger = angular.copy(trigger);
-                        self.trigger.idcontainer = self.idContainer;
-                        if (self.trigger.typeMetadata) {
-                            enrichTemplateType(self.trigger.typeMetadata);
-                        }
-                        self.addConditionEntryIfNoneExists();
-                        self.onConditionChange();
-                        self.addParameterWatch();
-                        self.isDirty = false;
-                    });
-                } else if (self.create) {
-                    self.editTitle = translate('TagManager_ChooseTriggerToContinue');
-                    self.chooseTriggerType = true;
-                }
-            });
-        };
-
-        this.addParameterWatch = function () {
-            var index;
-            if (this.trigger.typeMetadata && this.trigger.typeMetadata.parameters) {
-                for (index = 0; index < this.trigger.typeMetadata.parameters.length; index++) {
-                    deregisterWatches.push($scope.$watch('editTrigger.trigger.typeMetadata.parameters[' + index + '].value', function (val, oldVal) {
-                        if (val !== oldVal) {
-                            self.isDirty = true;
-                        }
-                    }));
-                }
-            }
-        };
-
-        this.onConditionChange = function () {
-            var hasAll = true;
-            angular.forEach(this.trigger.conditions, function (condition) {
-                if (!condition || !condition.expected) {
-                    hasAll = false;
-                }
-            });
-            if (hasAll) {
-                this.addConditionEntry();
-            }
-        };
-
-        this.getDefaultCondition = function()
-        {
-            var defaultActual = 'PageUrl';
-            if (this.trigger && this.trigger.typeMetadata) {
-                var types = {
-                    'AllElementsClick': 'ClickId',
-                    'AllLinksClick': 'ClickId',
-                    'DownloadClick': 'ClickId',
-                    'ElementVisibility': 'VisibleElementClasses',
-                    'FormSubmit': 'FormId',
-                    'JavaScriptError': 'ErrorMessage'
-                };
-                var type = this.trigger.typeMetadata.id;
-                if (type in types) {
-                    defaultActual = types[type];
-                }
-
-            }
-            return {comparison: 'equals', actual: defaultActual, expected: ''};
-        }
-
-        this.addConditionEntryIfNoneExists = function () {
-            if (!this.trigger.conditions || !angular.isArray(this.trigger.conditions)) {
-                this.trigger.conditions = [];
-            }
-            if (!this.trigger.conditions.length) {
-                this.trigger.conditions.push(this.getDefaultCondition());
-            }
-        };
-
-        this.addConditionEntry = function () {
-            this.trigger.conditions.push(this.getDefaultCondition());
-            this.isDirty = true;
-        };
-
-        this.removeConditionEntry = function (index) {
-            if (index > -1) {
-                var lastIndex = this.trigger.conditions.length - 1;
-                if (lastIndex === index) {
-                    this.trigger.conditions[index] = this.getDefaultCondition();
-                } else {
-                    this.trigger.conditions.splice(index, 1);
-                }
-                this.isDirty = true;
-            }
-        };
-
-        this.createTriggerType = function (triggerTemplate) {
-            if (triggerTemplate && triggerTemplate.isDisabled) {
-                return;
-            }
-
-            this.chooseTriggerType = false;
-            this.editTitle = translate('TagManager_CreateNewTrigger');
-            this.trigger = {
-                idSite: piwik.idSite,
-                name: this.model.suggestNameForType(triggerTemplate.name),
-                type: triggerTemplate.id,
-                idcontainer: self.idContainer,
-                idcontainerversion: self.idContainerVersion,
-                parameters: {},
-                conditions: [],
-                typeMetadata: triggerTemplate
-            };
-            this.addConditionEntry();
-            this.addParameterWatch();
-
-            this.isDirty = true; // we directly make the create button visible as sometimes some triggers do not have any settings
-
-            $timeout(function () {
-                var $editTrigger = $('.editTrigger');
-                if ($editTrigger.length && $editTrigger[0]) {
-                    $editTrigger[0].scrollIntoView()
-                }
-                $('.editTrigger #name').focus();
-            }, 1);
-        };
-
-        this.cancel = function () {
-            $scope.idTrigger = null;
-            currentId = null;
-
-            var $search = $location.search();
-            delete $search.idTrigger;
-            $location.search($search);
-        };
-
-        $scope.$on('$destroy', function() {
-            $scope.idTrigger = null;
-            currentId = null;
-        });
-
-        function checkRequiredFieldsAreSet()
-        {
-            var title;
-
-            if (!self.trigger.name) {
-                title = _pk_translate('General_Name');
-                showErrorFieldNotProvidedNotification(title);
-                return false;
-            }
-
-            return true;
-        }
-
-        this.createTrigger = function () {
-            removeAnyTriggerNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerTriggerModel.createOrUpdateTrigger(this.trigger, 'TagManager.addContainerTrigger').then(function (response) {
-                self.isUpdating = false;
-
-                if (!response || response.type === 'error' || !response.response) {
-                    return;
-                }
-                var idTrigger = response.response.value;
-
-                if ('function' === typeof $scope.onChangeTrigger) {
-                    self.model.reload(self.idContainer, self.idContainerVersion);
-                    self.trigger.idtrigger = idTrigger;
-                    $scope.onChangeTrigger({trigger: self.trigger});
-                    return;
-                }
-
-                self.isDirty = false;
-
-                tagManagerTriggerModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    var $search = $location.search();
-                    $search.idTrigger = idTrigger;
-                    $location.search($search);
-
-                    $timeout(function () {
-                        showNotification(translate('TagManager_CreatedX', translate('TagManager_Trigger')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-                    }, 200);
-                });
-            }, function () {
-                self.isUpdating = false;
-            });
-        };
-
-        this.setValueHasChanged = function () {
-            this.isDirty = true;
-        };
-
-        this.updateTrigger = function () {
-
-            removeAnyTriggerNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerTriggerModel.createOrUpdateTrigger(this.trigger, 'TagManager.updateContainerTrigger').then(function (response) {
-                if (response.type === 'error') {
-                    return;
-                }
-
-                if ('function' === typeof $scope.onChangeTrigger) {
-                    self.trigger.idtrigger = idTrigger;
-                    $scope.onChangeTrigger({trigger: self.trigger});
-                    return;
-                }
-
-                var idTrigger = self.trigger.idtrigger;
-
-                self.isDirty = false;
-                self.trigger = {};
-
-                tagManagerTriggerModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    init(idTrigger);
-                });
-                showNotification(translate('TagManager_UpdatedX', translate('TagManager_Trigger')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-            });
-        };
-
-        $scope.$watch('idTrigger', function (newValue, oldValue) {
-            if (newValue === null) {
-                return;
-            }
-            if (newValue != oldValue || currentId === null) {
-                currentId = newValue;
-                init(newValue);
-            }
-        });
-    }
-})();
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/edit.directive.html b/app/plugins/TagManager/angularjs/manageTrigger/edit.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/edit.directive.js b/app/plugins/TagManager/angularjs/manageTrigger/edit.directive.js
deleted file mode 100755
index 3b54f0c7a..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/edit.directive.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-trigger-edit>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTriggerEdit', piwikTriggerEdit);
-
-    piwikTriggerEdit.$inject = ['piwik'];
-
-    function piwikTriggerEdit(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idTrigger: '=',
-                idContainer: '=',
-                idContainerVersion: '=',
-                newTriggerType: '=',
-                onChangeTrigger: '&?'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTrigger/edit.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'TriggerEditController',
-            controllerAs: 'editTrigger'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/list.controller.js b/app/plugins/TagManager/angularjs/manageTrigger/list.controller.js
deleted file mode 100755
index d58ad68dd..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/list.controller.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('TriggerListController', TriggerListController);
-
-    TriggerListController.$inject = ['$scope', 'tagManagerTriggerModel', 'piwik', 'piwikApi', '$location'];
-
-    function TriggerListController($scope, tagManagerTriggerModel, piwik, piwikApi, $location) {
-
-        this.model = tagManagerTriggerModel;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.triggerReferences = [];
-
-        this.createTrigger = function () {
-            this.editTrigger(0);
-        };
-
-        this.editTrigger = function (idTrigger) {
-            var $search = $location.search();
-            $search.idTrigger = idTrigger;
-            $location.search($search);
-        };
-
-        this.deleteTrigger = function (trigger) {
-
-            piwikApi.fetch({method: 'TagManager.getContainerTriggerReferences', idContainer: this.idContainer,
-                            idContainerVersion: this.idContainerVersion, idTrigger: trigger.idtrigger}).then(function (references) {
-                if (!references || !references.length) {
-                    self.triggerReferences = [];
-                    function doDelete() {
-                        tagManagerTriggerModel.deleteTrigger(self.idContainer, self.idContainerVersion, trigger.idtrigger).then(function () {
-                            tagManagerTriggerModel.reload(self.idContainer, self.idContainerVersion);
-                        });
-                    }
-
-                    piwik.helper.modalConfirm('#confirmDeleteTrigger', {yes: doDelete});
-                } else {
-                    self.triggerReferences = references;
-                    piwik.helper.modalConfirm('#confirmDeleteTriggerNotPossible', {});
-                }
-            });
-
-        };
-
-        this.model.fetchTriggers(this.idContainer, this.idContainerVersion);
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/list.directive.html b/app/plugins/TagManager/angularjs/manageTrigger/list.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/list.directive.js b/app/plugins/TagManager/angularjs/manageTrigger/list.directive.js
deleted file mode 100755
index 06a432cfc..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/list.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-trigger-list>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTriggerList', piwikTriggerList);
-
-    piwikTriggerList.$inject = ['piwik'];
-
-    function piwikTriggerList(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '=',
-                idContainerVersion: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTrigger/list.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'TriggerListController',
-            controllerAs: 'triggerList'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/manage.controller.js b/app/plugins/TagManager/angularjs/manageTrigger/manage.controller.js
deleted file mode 100755
index 2fc1b4b88..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/manage.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ManageTriggerController', ManageTriggerController);
-
-    ManageTriggerController.$inject = ['$scope', '$rootScope', '$location'];
-
-    function ManageTriggerController($scope, $rootScope, $location) {
-
-        this.editMode = false;
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-
-        function removeAnyTriggerNotification()
-        {
-            var UI = require('piwik/UI');
-            new UI.Notification().remove('triggertriggermanagement');
-        }
-
-        function initState() {
-            var $search = $location.search();
-            if ('idTrigger' in $search) {
-                if ($search.idTrigger === 0 || $search.idTrigger === '0') {
-
-                    var parameters = {isAllowed: true};
-                    $rootScope.$emit('TagManager.initAddTrigger', parameters);
-                    if (parameters && !parameters.isAllowed) {
-
-                        self.editMode = false;
-                        self.idTrigger = null;
-
-                        return;
-                    }
-                }
-                self.editMode = true;
-                self.idTrigger = parseInt($search.idTrigger, 10);
-            } else {
-                self.editMode = false;
-                self.idTrigger = null;
-            }
-
-            removeAnyTriggerNotification();
-        }
-
-        initState();
-
-        var onChangeSuccess = $rootScope.$on('$locationChangeSuccess', initState);
-
-        $scope.$on('$destroy', function() {
-            if (onChangeSuccess) {
-                onChangeSuccess();
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/manage.directive.html b/app/plugins/TagManager/angularjs/manageTrigger/manage.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/manage.directive.js b/app/plugins/TagManager/angularjs/manageTrigger/manage.directive.js
deleted file mode 100755
index ccc8765d5..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/manage.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-trigger-manage>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikTriggerManage', piwikTriggerManage);
-
-    piwikTriggerManage.$inject = ['piwik'];
-
-    function piwikTriggerManage(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainerVersion: '@',
-                idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageTrigger/manage.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageTriggerController',
-            controllerAs: 'manageTrigger'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageTrigger/model.js b/app/plugins/TagManager/angularjs/manageTrigger/model.js
deleted file mode 100755
index 9545c2c46..000000000
--- a/app/plugins/TagManager/angularjs/manageTrigger/model.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerTriggerModel', tagManagerTriggerModel);
-
-    tagManagerTriggerModel.$inject = ['piwikApi', '$q', '$filter'];
-
-    function tagManagerTriggerModel(piwikApi, $q, $filter) {
-        var fetchPromise = null;
-        var triggersPromise = {};
-        var lookUpPromise = null;
-        var translate = $filter('translate');
-
-        var model = {
-            triggers : [],
-            isLoading: false,
-            isUpdating: false,
-            findTrigger: findTrigger,
-            createOrUpdateTrigger: createOrUpdateTrigger,
-            fetchAvailableTriggers: fetchAvailableTriggers,
-            fetchContainer: fetchContainer,
-            suggestNameForType: suggestNameForType,
-            fetchAvailableComparisons: fetchAvailableComparisons,
-            fetchAvailableContainerVariables: fetchAvailableContainerVariables,
-            deleteTrigger: deleteTrigger,
-            reload: reload,
-            fetchTriggersIfNotLoaded: fetchTriggersIfNotLoaded,
-            fetchTriggers: fetchTriggers
-        };
-
-        return model;
-
-        function arrayFilter(array, filter)
-        {
-            var entries = [];
-
-            angular.forEach(array, function (value) {
-                if (filter(value)) {
-                    entries.push(value);
-                }
-            });
-
-            return entries;
-        }
-
-        function filterTriggerConditions(conditions)
-        {
-            return arrayFilter(conditions, function (condition) {
-                return !!condition && condition.actual && condition.expected && condition.comparison;
-            });
-        }
-
-        function fetchTriggersIfNotLoaded()
-        {
-            if (!fetchPromise) {
-                // needed for suggestNameForType() to make sure it is aware of all names
-                model.fetchTriggers();
-            }
-        }
-
-        function fetchAvailableContainerVariables(idContainer, idContainerVersion) {
-            var params = {
-                method: 'TagManager.getAvailableContainerVariables', filter_limit: '-1',
-                idContainer: idContainer, idContainerVersion: idContainerVersion
-            };
-            return piwikApi.fetch(params);
-        }
-
-        function reload(idContainer, idContainerVersion)
-        {
-            model.triggers = [];
-            fetchPromise = null;
-            triggersPromise = {};
-            lookUpPromise = null;
-
-            return fetchTriggers(idContainer, idContainerVersion);
-        }
-
-        function fetchAvailableTriggers(idContext) {
-            if (!triggersPromise[idContext]) {
-                var params = {method: 'TagManager.getAvailableTriggerTypesInContext', idContext: idContext, filter_limit: '-1'};
-                triggersPromise[idContext] = piwikApi.fetch(params);
-            }
-
-            return triggersPromise[idContext];
-        }
-
-        function fetchContainer(idContainer) {
-            var params = {method: 'TagManager.getContainer', idContainer: idContainer, filter_limit: '-1'};
-            return piwikApi.fetch(params);
-        }
-
-        function fetchAvailableComparisons() {
-            if (!lookUpPromise) {
-                var params = {method: 'TagManager.getAvailableComparisons', filter_limit: '-1'};
-                lookUpPromise = piwikApi.fetch(params);
-            }
-
-            return lookUpPromise;
-        }
-
-        function suggestNameForType(templateId) {
-            var counter;
-            for (counter = 0; counter < 100; counter++) {
-                var name = templateId;
-                if (counter) {
-                    name = name + ' (' + counter + ')';
-                }
-                var isFree = true;
-                angular.forEach(model.triggers, function (trigger) {
-                    if (trigger && trigger.name === name) {
-                        isFree = false;
-                    }
-                });
-                if (isFree) {
-                    return name;
-                }
-            }
-        }
-
-        function fetchTriggers(idContainer, idContainerVersion) {
-            var params = {method: 'TagManager.getContainerTriggers', idContainer: idContainer,
-                          idContainerVersion: idContainerVersion,filter_limit: '-1'};
-
-            if (!fetchPromise) {
-                fetchPromise = piwikApi.fetch(params);
-            }
-
-            model.isLoading = true;
-            model.triggers = [];
-
-            return fetchPromise.then(function (triggers) {
-                model.triggers = triggers;
-
-                model.isLoading = false;
-                return triggers;
-            }, function () {
-                model.isLoading = false;
-            });
-        }
-
-        function findTrigger(idContainer, idContainerVersion, idTrigger) {
-
-            // before going through an API request we first try to find it in loaded triggers
-            var found;
-            angular.forEach(model.triggers, function (trigger) {
-                if (!found && parseInt(trigger.idtrigger, 10) === idTrigger) {
-                    found = trigger;
-                }
-            });
-
-            if (found) {
-                var deferred = $q.defer();
-                deferred.resolve(found);
-                return deferred.promise;
-            }
-
-            // otherwise we fetch it via API
-            model.isLoading = true;
-
-            return piwikApi.fetch({
-                idTrigger: idTrigger,
-                idContainer: idContainer,
-                idContainerVersion: idContainerVersion,
-                method: 'TagManager.getContainerTrigger', filter_limit: '-1'
-            }).then(function (record) {
-                model.isLoading = false;
-                return record;
-
-            }, function (error) {
-                model.isLoading = false;
-            });
-        }
-
-        function deleteTrigger(idContainer, idContainerVersion, idTrigger) {
-
-            model.isUpdating = true;
-            model.triggers = [];
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.fetch({idTrigger: idTrigger, idContainerVersion: idContainerVersion, idContainer: idContainer, method: 'TagManager.deleteContainerTrigger'}).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function createOrUpdateTrigger(trigger, method) {
-            trigger = angular.copy(trigger);
-            trigger.method = method;
-
-            trigger.parameters = {};
-
-            angular.forEach(trigger.typeMetadata.parameters, function (setting) {
-                var value = setting.value;
-                if (value === false) {
-                    value = '0';
-                } else if (value === true) {
-                    value = '1';
-                }
-                trigger.parameters[setting.name] = value;
-            });
-
-            delete trigger.typeMetadata;
-
-            var map = {
-                idTrigger: 'idtrigger',
-                idContainer: 'idcontainer',
-                idContainerVersion: 'idcontainerversion'
-            };
-
-            angular.forEach(map, function (value, key) {
-                if (typeof trigger[value] !== 'undefined') {
-                    trigger[key] = trigger[value];
-                    delete trigger[value];
-                }
-            });
-
-            trigger.conditions = filterTriggerConditions(trigger.conditions);
-
-            var postParams = ['parameters', 'conditions'];
-            var post = {};
-            for (var i = 0; i < postParams.length; i++) {
-                var postParam = postParams[i];
-                if (typeof trigger[postParam] !== 'undefined') {
-                    post[postParam] = trigger[postParam];
-                    delete trigger[postParam];
-                }
-            }
-
-            model.isUpdating = true;
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.post(trigger, post).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success', response: response};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/edit.controller.js b/app/plugins/TagManager/angularjs/manageVariable/edit.controller.js
deleted file mode 100755
index 6deb09757..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/edit.controller.js
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VariableEditController', VariableEditController);
-
-    VariableEditController.$inject = ['$scope', 'tagManagerVariableModel', 'piwik', '$location', '$filter', '$timeout', '$rootScope'];
-
-    function VariableEditController($scope, tagManagerVariableModel, piwik, $location, $filter, $timeout, $rootScope) {
-
-        var self = this;
-        var currentId = null;
-        var notificationId = 'tagvariablemanagement';
-
-        var translate = $filter('translate');
-
-        this.isDirty = false;
-        this.model = tagManagerVariableModel;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.showAdvanced = false;
-        this.chooseVariableType = false;
-        this.isEmbedded = !!$scope.onChangeVariable;
-        this.canUseCustomTemplates = piwik.hasUserCapability('tagmanager_use_custom_templates');
-
-        this.availableVariables = [];
-        this.availableLookUpComparisons = [];
-
-        this.model.fetchAvailableComparisons().then(function (lookUpComparisons) {
-            self.availableLookUpComparisons = [];
-            angular.forEach(lookUpComparisons, function (lookupComparison) {
-                self.availableLookUpComparisons.push({key: lookupComparison.id, value: lookupComparison.name});
-            });
-        });
-
-        // needed for suggestNameForType() to make sure it is aware of all names
-        this.model.fetchVariablesIfNotLoaded(this.idContainer, this.idContainerVersion);
-
-        function enrichTemplateType(template)
-        {
-            template.isDisabled = !self.canUseCustomTemplates && template && template.isCustomTemplate;
-            return template;
-        }
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyVariableNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        function showErrorFieldNotProvidedNotification(title)
-        {
-            var message = translate('TagManager_ErrorXNotProvided', [title]);
-            showNotification(message, 'error');
-        }
-
-        var deregisterWatches = [];
-
-        function init(idVariable)
-        {
-            self.create = idVariable == '0';
-            self.edit   = !self.create;
-            self.variable = {};
-            self.chooseVariableType = false;
-            self.editTitle = '';
-
-            var dereg;
-            for (dereg = 0; dereg < deregisterWatches.length; dereg++) {
-                if ('function' === typeof deregisterWatches[dereg]) {
-                    deregisterWatches[dereg]();
-                }
-            }
-
-            piwik.helper.lazyScrollToContent();
-
-            self.availableVariables = [];
-            self.model.fetchContainer(self.idContainer).then(function (container){
-                return self.model.fetchAvailableVariables(container.context);
-            }).then(function (variables) {
-                angular.forEach(variables, function (variablesGroup) {
-                    angular.forEach(variablesGroup.types, function (variable) {
-                        enrichTemplateType(variable);
-                    });
-                });
-
-                self.availableVariables = variables;
-            }).then(function () {
-                if (self.edit && idVariable) {
-                    self.editTitle = translate('TagManager_EditVariable');
-
-                    self.model.findVariable(self.idContainer, self.idContainerVersion, idVariable).then(function (variable) {
-                        if (!variable) {
-                            return;
-                        }
-                        self.variable = angular.copy(variable);
-                        self.variable.idcontainer = self.idContainer;
-
-                        if (self.variable.typeMetadata) {
-                            enrichTemplateType(self.variable.typeMetadata);
-                        }
-
-                        if (self.variable.lookup_table && self.variable.lookup_table.length) {
-                            self.showAdvanced = true; // make sure lookup_table is visible directly if configured
-                        } else if (self.variable.default_value) {
-                            self.showAdvanced = true; // make sure default_value is visible directly if configured
-                        }
-
-                        self.addLookUpEntryIfNoneExists();
-                        self.onLookupChange();
-                        self.addParameterWatch();
-                        self.isDirty = false;
-                    });
-                } else if (self.create) {
-
-                    var found = false;
-                    if ($scope.variableType) {
-                        angular.forEach(self.availableVariables, function (variablesCategory) {
-
-                            angular.forEach(variablesCategory.types, function (variable) {
-                                if (!found && variable && variable.id === $scope.variableType) {
-                                    self.createVariableType(variable);
-                                    found = true;
-                                }
-                            })
-                        });
-                    }
-
-                    if (!found) {
-                        self.editTitle = translate('TagManager_ChooseVariableToContinue');
-                        self.chooseVariableType = true;
-                    }
-                }
-            });
-        };
-
-        this.addParameterWatch = function () {
-            var index;
-            if (this.variable.typeMetadata && this.variable.typeMetadata.parameters) {
-                for (index = 0; index < this.variable.typeMetadata.parameters.length; index++) {
-                    deregisterWatches.push($scope.$watch('editVariable.variable.typeMetadata.parameters[' + index + '].value', function (val, oldVal) {
-                        if (val !== oldVal) {
-                            self.isDirty = true;
-                        }
-                    }, true));
-                }
-            }
-        }
-
-        this.addLookUpEntryIfNoneExists = function () {
-            if (!this.variable.lookup_table || !angular.isArray(this.variable.lookup_table)) {
-                this.variable.lookup_table = [];
-            }
-            if (!this.variable.lookup_table.length) {
-                this.variable.lookup_table.push({comparison: 'equals', match_value: '', out_value: ''});
-            }
-        };
-
-        this.onLookupChange = function () {
-            var hasAll = true;
-            angular.forEach(this.variable.lookup_table, function (table) {
-                if (!table || !table.out_value) {
-                    hasAll = false;
-                }
-            });
-            if (hasAll) {
-                this.addLookUpEntry();
-            }
-        };
-
-        this.addLookUpEntry = function () {
-            this.variable.lookup_table.push({comparison: 'equals', match_value: '', out_value: ''});
-            this.isDirty = true;
-        };
-
-        this.removeLookUpEntry = function (index) {
-            if (index > -1) {
-                this.variable.lookup_table.splice(index, 1);
-                this.isDirty = true;
-            }
-        };
-
-        this.createVariableType = function (variableTemplate) {
-            if (variableTemplate && variableTemplate.isDisabled) {
-                return;
-            }
-
-            this.chooseVariableType = false;
-            this.editTitle = translate('TagManager_CreateNewVariable');
-            this.variable = {
-                idSite: piwik.idSite,
-                name: this.model.suggestNameForType(variableTemplate.name),
-                type: variableTemplate.id,
-                idcontainer: self.idContainer,
-                idcontainerversion: self.idContainerVersion,
-                parameters: {},
-                default_value: '',
-                lookup_table: [],
-                typeMetadata: variableTemplate
-            };
-            this.addLookUpEntry();
-            this.addParameterWatch();
-
-            this.isDirty = true; // we directly make the create button visible as sometimes some variables do not have any settings
-
-            $timeout(function () {
-                var editVariable = $('.editVariable');
-                if (editVariable.length && editVariable[0]) {
-                    editVariable[0].scrollIntoView()
-                }
-                $('.editVariable #name').focus();
-            }, 1);
-        };
-
-        this.cancel = function () {
-            $scope.idVariable = null;
-            currentId = null;
-
-            var $search = $location.search();
-            delete $search.idVariable;
-            $location.search($search);
-        };
-
-        $scope.$on('$destroy', function() {
-            $scope.idVariable = null;
-            currentId = null;
-        });
-
-        function checkRequiredFieldsAreSet()
-        {
-            var title;
-
-            if (!self.variable.name) {
-                title = _pk_translate('General_Name');
-                showErrorFieldNotProvidedNotification(title);
-                return false;
-            }
-
-            return true;
-        }
-
-        this.createVariable = function () {
-            removeAnyVariableNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerVariableModel.createOrUpdateVariable(this.variable, 'TagManager.addContainerVariable').then(function (response) {
-                self.isUpdating = false;
-
-                if (!response || response.type === 'error' || !response.response) {
-                    return;
-                }
-
-                self.isDirty = false;
-
-                var idVariable = response.response.value;
-
-                if ('function' === typeof $scope.onChangeVariable) {
-                    self.model.reload(self.idContainer, self.idContainerVersion);
-                    self.variable.idvariable = idVariable;
-                    $scope.onChangeVariable({variable: self.variable});
-                    return;
-                }
-
-                tagManagerVariableModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    if (piwik.helper.isAngularRenderingThePage()) {
-                        var $search = $location.search();
-                        $search.idVariable = idVariable;
-                        $location.search($search);
-                    } else {
-                        $location.url('/?idVariable=' + idVariable);
-                    }
-
-                    $timeout(function () {
-                        showNotification(translate('TagManager_CreatedX', translate('TagManager_Variable')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-                    }, 200);
-                });
-            }, function () {
-                self.isUpdating = false;
-            });
-        };
-
-        this.setValueHasChanged = function () {
-            this.isDirty = true;
-        };
-
-        this.updateVariable = function () {
-
-            removeAnyVariableNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerVariableModel.createOrUpdateVariable(this.variable, 'TagManager.updateContainerVariable').then(function (response) {
-                if (response.type === 'error') {
-                    return;
-                }
-
-                var idVariable = self.variable.idvariable;
-
-                if ('function' === typeof $scope.onChangeVariable) {
-                    $scope.onChangeVariable({variable: self.variable});
-                    return;
-                }
-
-                self.isDirty = false;
-                self.variable = {};
-
-                tagManagerVariableModel.reload(self.idContainer, self.idContainerVersion).then(function () {
-                    init(idVariable);
-                });
-                showNotification(translate('TagManager_UpdatedX', translate('TagManager_Variable')) + ' ' + translate('TagManager_WantToDeployThisChangeCreateVersion', '<a onclick="tagManagerHelper.createNewVersion()">', '</a>'), response.type);
-            });
-        };
-
-        $scope.$watch('idVariable', function (newValue, oldValue) {
-            if (newValue === null) {
-                return;
-            }
-            if (newValue != oldValue || currentId === null) {
-                currentId = newValue;
-                init(newValue);
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/edit.directive.html b/app/plugins/TagManager/angularjs/manageVariable/edit.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVariable/edit.directive.js b/app/plugins/TagManager/angularjs/manageVariable/edit.directive.js
deleted file mode 100755
index b20c4580a..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/edit.directive.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-variable-edit>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVariableEdit', piwikVariableEdit);
-
-    piwikVariableEdit.$inject = ['piwik'];
-
-    function piwikVariableEdit(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idVariable: '=',
-                idContainer: '=',
-                idContainerVersion: '=',
-                variableType: '=?',
-                onChangeVariable: '&?'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageVariable/edit.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VariableEditController',
-            controllerAs: 'editVariable'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/list.controller.js b/app/plugins/TagManager/angularjs/manageVariable/list.controller.js
deleted file mode 100755
index f379d9243..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/list.controller.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VariableListController', VariableListController);
-
-    VariableListController.$inject = ['$scope', 'tagManagerVariableModel', 'piwik', 'piwikApi', '$location'];
-
-    function VariableListController($scope, tagManagerVariableModel, piwik, piwikApi, $location) {
-
-        this.model = tagManagerVariableModel;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-        this.variableReferences = [];
-
-        this.createVariable = function () {
-            this.editVariable(0);
-        };
-
-        this.editVariable = function (idVariable) {
-            var $search = $location.search();
-            $search.idVariable = idVariable;
-            $location.search($search);
-        };
-
-        this.deleteVariable = function (variable) {
-
-            piwikApi.fetch({method: 'TagManager.getContainerVariableReferences', idContainer: this.idContainer,
-                idContainerVersion: this.idContainerVersion, idVariable: variable.idvariable}).then(function (references) {
-                if (!references || !references.length) {
-                    self.variableReferences = [];
-                    function doDelete() {
-                        tagManagerVariableModel.deleteVariable(self.idContainer, self.idContainerVersion, variable.idvariable).then(function () {
-                            tagManagerVariableModel.reload(self.idContainer, self.idContainerVersion);
-                        });
-                    }
-
-                    piwik.helper.modalConfirm('#confirmDeleteVariable', {yes: doDelete});
-                } else {
-                    self.variableReferences = references;
-                    piwik.helper.modalConfirm('#confirmDeleteVariableNotPossible', {});
-                }
-            });
-
-        };
-
-        this.model.fetchVariables(this.idContainer, this.idContainerVersion);
-        this.model.fetchAvailableContainerVariables(this.idContainer, this.idContainerVersion).then(function (variables) {
-            self.containerVariables = variables;
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/list.directive.html b/app/plugins/TagManager/angularjs/manageVariable/list.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVariable/list.directive.js b/app/plugins/TagManager/angularjs/manageVariable/list.directive.js
deleted file mode 100755
index 42d7e4bbd..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/list.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-variable-list>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVariableList', piwikVariableList);
-
-    piwikVariableList.$inject = ['piwik'];
-
-    function piwikVariableList(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '=',
-                idContainerVersion: '='
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageVariable/list.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VariableListController',
-            controllerAs: 'variableList'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/manage.controller.js b/app/plugins/TagManager/angularjs/manageVariable/manage.controller.js
deleted file mode 100755
index a16a733af..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/manage.controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ManageVariableController', ManageVariableController);
-
-    ManageVariableController.$inject = ['$scope', '$rootScope', '$location'];
-
-    function ManageVariableController($scope, $rootScope, $location) {
-
-        this.editMode = false;
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = $scope.idContainerVersion;
-
-        function removeAnyVariableNotification()
-        {
-            var UI = require('piwik/UI');
-            new UI.Notification().remove('variablevariablemanagement');
-        }
-
-        function initState() {
-            var $search = $location.search();
-            if ('idVariable' in $search) {
-                if ($search.idVariable === 0 || $search.idVariable === '0') {
-
-                    var parameters = {isAllowed: true};
-                    $rootScope.$emit('TagManager.initAddVariable', parameters);
-                    if (parameters && !parameters.isAllowed) {
-
-                        self.editMode = false;
-                        self.idVariable = null;
-
-                        return;
-                    }
-                }
-                self.editMode = true;
-                self.idVariable = parseInt($search.idVariable, 10);
-            } else {
-                self.editMode = false;
-                self.idVariable = null;
-            }
-
-            removeAnyVariableNotification();
-        }
-
-        initState();
-
-        var onChangeSuccess = $rootScope.$on('$locationChangeSuccess', initState);
-
-        $scope.$on('$destroy', function() {
-            if (onChangeSuccess) {
-                onChangeSuccess();
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/manage.directive.html b/app/plugins/TagManager/angularjs/manageVariable/manage.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVariable/manage.directive.js b/app/plugins/TagManager/angularjs/manageVariable/manage.directive.js
deleted file mode 100755
index 15214141e..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/manage.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-variable-manage>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVariableManage', piwikVariableManage);
-
-    piwikVariableManage.$inject = ['piwik'];
-
-    function piwikVariableManage(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainerVersion: '@',
-                idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageVariable/manage.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageVariableController',
-            controllerAs: 'manageVariable'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVariable/model.js b/app/plugins/TagManager/angularjs/manageVariable/model.js
deleted file mode 100755
index 9b4ce29fc..000000000
--- a/app/plugins/TagManager/angularjs/manageVariable/model.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerVariableModel', tagManagerVariableModel);
-
-    tagManagerVariableModel.$inject = ['piwikApi', '$q', '$filter'];
-
-    function tagManagerVariableModel(piwikApi, $q, $filter) {
-        var fetchPromise = null;
-        var variablesPromise = {};
-        var comparisonPromise = null;
-        var preconfiguredVarsPromise = null;
-        var translate = $filter('translate');
-
-        var model = {
-            variables : [],
-            isLoading: false,
-            isUpdating: false,
-            findVariable: findVariable,
-            createOrUpdateVariable: createOrUpdateVariable,
-            fetchAvailableVariables: fetchAvailableVariables,
-            fetchContainer: fetchContainer,
-            fetchAvailableComparisons: fetchAvailableComparisons,
-            suggestNameForType: suggestNameForType,
-            deleteVariable: deleteVariable,
-            reload: reload,
-            fetchVariables: fetchVariables,
-            fetchVariablesIfNotLoaded: fetchVariablesIfNotLoaded,
-            fetchAvailableContainerVariables: fetchAvailableContainerVariables
-        };
-
-        return model;
-
-        function arrayFilter(array, filter)
-        {
-            var entries = [];
-
-            angular.forEach(array, function (value) {
-                if (filter(value)) {
-                    entries.push(value);
-                }
-            });
-
-            return entries;
-        }
-
-        function filterLookupTable(lookups)
-        {
-            return arrayFilter(lookups, function (lookup) {
-                return !!lookup && lookup.out_value && lookup.comparison;
-            });
-        }
-
-        function reload(idContainer, idContainerVersion)
-        {
-            model.variables = [];
-            fetchPromise = null;
-            variablesPromise = {};
-            comparisonPromise = null;
-
-            return fetchVariables(idContainer, idContainerVersion);
-        }
-
-        function fetchVariablesIfNotLoaded(idContainer, idContainerVersion)
-        {
-            if (!fetchPromise) {
-                // needed for suggestNameForType() to make sure it is aware of all names
-                model.fetchVariables(idContainer, idContainerVersion);
-            }
-        }
-
-        function fetchAvailableVariables(idContext) {
-            if (!variablesPromise[idContext]) {
-                var params = {method: 'TagManager.getAvailableVariableTypesInContext', idContext: idContext, filter_limit: '-1'};
-                variablesPromise[idContext] = piwikApi.fetch(params);
-            }
-
-            return variablesPromise[idContext];
-        }
-
-        function fetchAvailableContainerVariables(idContainer, idContainerVersion) {
-            if (!preconfiguredVarsPromise) {
-                var params = {method: 'TagManager.getAvailableContainerVariables', idContainer: idContainer, idContainerVersion: idContainerVersion, filter_limit: '-1'};
-                preconfiguredVarsPromise = piwikApi.fetch(params);
-            }
-
-            return preconfiguredVarsPromise;
-        }
-
-        function fetchContainer(idContainer) {
-            var params = {method: 'TagManager.getContainer', idContainer: idContainer, filter_limit: '-1'};
-            return piwikApi.fetch(params);
-        }
-
-        function fetchAvailableComparisons() {
-            if (!comparisonPromise) {
-                var params = {method: 'TagManager.getAvailableComparisons', filter_limit: '-1'};
-                comparisonPromise = piwikApi.fetch(params);
-            }
-
-            return comparisonPromise;
-        }
-
-        function suggestNameForType(templateId) {
-
-            var counter;
-            for (counter = 0; counter < 100; counter++) {
-                var name = templateId;
-                if (counter) {
-                    name = name + ' (' + counter + ')';
-                }
-                var isFree = true;
-                angular.forEach(model.variables, function (variable) {
-                    if (variable && variable.name === name) {
-                        isFree = false;
-                    }
-                });
-                if (isFree) {
-                    return name;
-                }
-            }
-        }
-
-        function fetchVariables(idContainer, idContainerVersion) {
-            var params = {method: 'TagManager.getContainerVariables', idContainer: idContainer,
-                          idContainerVersion: idContainerVersion,filter_limit: '-1'};
-
-            if (!fetchPromise) {
-                fetchPromise = piwikApi.fetch(params);
-            }
-
-            model.isLoading = true;
-            model.variables = [];
-
-            return fetchPromise.then(function (variables) {
-                model.variables = variables;
-
-                model.isLoading = false;
-                return variables;
-            }, function () {
-                model.isLoading = false;
-            });
-        }
-
-        function findVariable(idContainer, idContainerVersion, idVariable) {
-
-            // before going through an API request we first try to find it in loaded variables
-            var found;
-            angular.forEach(model.variables, function (variable) {
-                if (!found && parseInt(variable.idvariable, 10) === idVariable) {
-                    found = variable;
-                }
-            });
-
-            if (found) {
-                var deferred = $q.defer();
-                deferred.resolve(found);
-                return deferred.promise;
-            }
-
-            // otherwise we fetch it via API
-            model.isLoading = true;
-
-            return piwikApi.fetch({
-                idVariable: idVariable,
-                idContainer: idContainer,
-                idContainerVersion: idContainerVersion,
-                method: 'TagManager.getContainerVariable', filter_limit: '-1'
-            }).then(function (record) {
-                model.isLoading = false;
-                return record;
-
-            }, function (error) {
-                model.isLoading = false;
-            });
-        }
-
-        function deleteVariable(idContainer, idContainerVersion, idVariable) {
-
-            model.isUpdating = true;
-            model.variables = [];
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.fetch({idVariable: idVariable, idContainerVersion: idContainerVersion, idContainer: idContainer, method: 'TagManager.deleteContainerVariable'}).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function createOrUpdateVariable(variable, method) {
-            variable = angular.copy(variable);
-            variable.method = method;
-
-            variable.parameters = {};
-
-            angular.forEach(variable.typeMetadata.parameters, function (setting) {
-                var value = setting.value;
-                if (value === false) {
-                    value = '0';
-                } else if (value === true) {
-                    value = '1';
-                }
-                variable.parameters[setting.name] = value;
-            });
-
-            delete variable.typeMetadata;
-
-            var map = {
-                idVariable: 'idvariable',
-                idContainer: 'idcontainer',
-                idContainerVersion: 'idcontainerversion',
-                lookupTable: 'lookup_table',
-                defaultValue: 'default_value'
-            };
-
-            angular.forEach(map, function (value, key) {
-                if (typeof variable[value] !== 'undefined') {
-                    variable[key] = variable[value];
-                    delete variable[value];
-                }
-            });
-
-            variable.lookupTable = filterLookupTable(variable.lookupTable);
-
-            var postParams = ['parameters', 'lookupTable'];
-            var post = {};
-            for (var i = 0; i < postParams.length; i++) {
-                var postParam = postParams[i];
-                if (typeof variable[postParam] !== 'undefined') {
-                    post[postParam] = variable[postParam];
-                    delete variable[postParam];
-                }
-            }
-
-            model.isUpdating = true;
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.post(variable, post).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success', response: response};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/diff.js b/app/plugins/TagManager/angularjs/manageVersion/diff.js
deleted file mode 100755
index f71ed9af1..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/diff.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerVersionDiff', tagManagerVersionDiff);
-
-    tagManagerVersionDiff.$inject = ['piwikApi', '$q'];
-
-    function tagManagerVersionDiff(piwikApi, $q) {
-        var model = {
-            diffDraftVersion : diffDraftVersion
-        };
-
-        return model;
-
-        function diffDraftVersion(idContainer, idContainerVersionNew, idContainerVersionPrevious) {
-
-            function findEntryInArray(array, name)
-            {
-                for (var j = 0; j < array.length; j++) {
-                    if (name === array[j].name) {
-                        return array[j];
-                    }
-                }
-            }
-
-            function getDifference(entityType, array1, array2, keysToCheck)
-            {
-                var diff = [];
-
-                var i;
-                for (i = 0; i < array1.length; i++) {
-                    var matchingEntry = findEntryInArray(array2, array1[i].name);
-                    var found = false;
-                    if (!!matchingEntry) {
-                        found = true;
-                        var j;
-                        for (j = 0; j < keysToCheck.length; j++) {
-                            if (JSON.stringify(array1[i][keysToCheck[j]]) !== JSON.stringify(matchingEntry[keysToCheck[j]])) {
-                                // matching, check if different
-                                diff.push({entityType: entityType, type: 'TagManager_DiffModified', name: array1[i].name, lastChanged: array1[i].updated_date_pretty});
-                                break;
-                            }
-                        }
-                    }
-
-                    if (!found) {
-                        diff.push({entityType: entityType, type: 'TagManager_DiffAdded', name: array1[i].name, lastChanged: array1[i].updated_date_pretty});
-                    }
-                }
-                for (i = 0; i < array2.length; i++) {
-                    if (!findEntryInArray(array1, array2[i].name)) {
-                        diff.push({entityType: entityType, type: 'TagManager_DiffDeleted', name: array2[i].name, lastChanged: array2[i].updated_date_pretty});
-                    }
-                }
-
-                return diff;
-            }
-
-            function mixinTagTriggers(tags, triggers)
-            {
-                angular.forEach(tags, function (tag) {
-                    tag.fire_triggers = [];
-                    tag.block_triggers = [];
-                    angular.forEach(tag.fire_trigger_ids, function (idtrigger) {
-                        angular.forEach(triggers, function (trigger) {
-                            if (trigger.idtrigger === idtrigger) {
-                                tag.fire_triggers.push(trigger.name);
-                            }
-                        });
-                    });
-                    angular.forEach(tag.block_trigger_ids, function (idtrigger) {
-                        angular.forEach(triggers, function (trigger) {
-                            if (trigger.idtrigger === idtrigger) {
-                                tag.block_triggers.push(trigger.name);
-                            }
-                        });
-                    });
-                });
-            }
-
-            var draftVersion = {
-                module: 'API',
-                method: 'TagManager.exportContainerVersion',
-                format: 'json',
-                idContainer: idContainer,
-                filter_limit: -1,
-            };
-            if (idContainerVersionNew) {
-                draftVersion.idContainerVersion = idContainerVersionNew;
-            }
-            var lastVersion = {
-                module: 'API',
-                method: 'TagManager.exportContainerVersion',
-                format: 'json',
-                idContainer: idContainer,
-                idContainerVersion: idContainerVersionPrevious,
-                filter_limit: -1,
-            };
-
-            var deferred = $q.defer();
-
-            piwikApi.bulkFetch([draftVersion, lastVersion]).then(function (response) {
-                mixinTagTriggers(response[0].tags, response[0].triggers);
-                mixinTagTriggers(response[1].tags, response[1].triggers);
-
-                var diff1 = getDifference('TagManager_Tag', response[0].tags, response[1].tags, ['name', 'type', 'fire_limit', 'priority', 'fire_delay', 'fire_triggers', 'block_triggers', 'parameters']);
-                var diff2 = getDifference('TagManager_Trigger', response[0].triggers, response[1].triggers, ['name', 'type', 'conditions', 'parameters']);
-                var diff3 = getDifference('TagManager_Variable', response[0].variables, response[1].variables, ['name', 'type', 'lookup_table', 'default_value', 'parameters']);
-                var diff = [];
-                diff = diff.concat(diff1, diff2, diff3);
-                deferred.resolve(diff);
-            });
-
-            return deferred.promise;
-        }
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/edit.controller.js b/app/plugins/TagManager/angularjs/manageVersion/edit.controller.js
deleted file mode 100755
index d1e8270d6..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/edit.controller.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VersionEditController', VersionEditController);
-
-    VersionEditController.$inject = ['$scope', 'tagManagerVersionModel', 'tagManagerContainerModel', 'tagManagerVersionDiff', 'piwik', '$location', '$filter', '$timeout', '$rootScope'];
-
-    function VersionEditController($scope, tagManagerVersionModel, tagManagerContainerModel, tagManagerVersionDiff, piwik, $location, $filter, $timeout, $rootScope) {
-
-        var self = this;
-        var currentId = null;
-        var notificationId = 'versiontagmanagement';
-
-        var translate = $filter('translate');
-
-        this.isDirty = false;
-        this.model = tagManagerVersionModel;
-        this.environments = [];
-        this.idContainer = $scope.idContainer;
-        this.isEmbedded = !!$scope.onChangeVersion;
-        this.lastVersion = null;
-        this.versionChanges = [];
-        this.isLoadingVersionChanges = false;
-        this.canPublishToLive = piwik.hasUserCapability('tagmanager_publish_live_container');
-
-        tagManagerVersionModel.fetchAvailableEnvironmentsWithPublishPermission().then(function (environments) {
-            self.environments = [];
-            angular.forEach(environments, function (environment) {
-                self.environments.push({key: environment.id, value: environment.name});
-            });
-        });
-
-        function getNotification()
-        {
-            var UI = require('piwik/UI');
-            return new UI.Notification();
-        }
-
-        function removeAnyVersionNotification()
-        {
-            var notification = getNotification();
-            notification.remove(notificationId);
-            notification.remove('ajaxHelper');
-        }
-
-        function showNotification(message, context)
-        {
-            var notification = getNotification();
-            notification.show(message, {context: context, id: notificationId});
-            $timeout(function () {
-                notification.scrollToNotification();
-            }, 200);
-        }
-
-        function showErrorFieldNotProvidedNotification(title)
-        {
-            var message = translate('TagManager_ErrorXNotProvided', [title]);
-            showNotification(message, 'error');
-        }
-
-        function init(idContainerVersion)
-        {
-            self.create = idContainerVersion == '0';
-            self.edit   = !self.create;
-            self.version = {};
-            self.lastVersion = null;
-            self.versionChanges = [];
-
-            self.isLoadingVersionChanges = true;
-            tagManagerContainerModel.findContainer(self.idContainer).then(function (container) {
-                self.isLoadingVersionChanges = false;
-                self.lastVersion = null;
-
-                if (!container || !container.versions || !angular.isArray(container.versions) || !container.versions.length) {
-                    return;
-                }
-                container = angular.copy(container); // we copy to not change original versions array
-
-                var versions = container.versions;
-                versions.sort(function (a, b) {
-                    return a.revision < b.revision;
-                });
-
-                var lastContainerVersion = null;
-                if (self.create && versions[0] && versions[0].name) {
-                    self.lastVersion = versions[0].name;
-                    lastContainerVersion = versions[0].idcontainerversion;
-                } else if (self.edit) {
-                    for (var i = 0; i < (versions.length-1); i++) {
-                        // we stop before the last one because it cannot have an entry
-                        if (versions[i].idcontainerversion === parseInt(idContainerVersion, 10) && versions[i+1]) {
-                            self.lastVersion = versions[i + 1].name;
-                            lastContainerVersion = versions[i + 1].idcontainerversion;
-                        }
-                    }
-                }
-
-                if (self.lastVersion) {
-                    self.isLoadingVersionChanges = true;
-                    tagManagerVersionDiff.diffDraftVersion(self.idContainer, idContainerVersion, lastContainerVersion).then(function (diff) {
-                        self.versionChanges = diff;
-                        self.isLoadingVersionChanges = false;
-                    });
-
-                    if (self.create && !self.version.name && /^\d+$/.test(self.lastVersion)) {
-                        self.version.name = parseInt(self.lastVersion, 10) + 1;
-                    }
-                }
-            });
-
-            piwik.helper.lazyScrollToContent();
-
-            if (self.edit && idContainerVersion) {
-                self.editTitle = translate('TagManager_EditVersion');
-                self.model.findVersion(self.idContainer, idContainerVersion).then(function (version) {
-                    if (!version) {
-                        return;
-                    }
-                    self.version = angular.copy(version);
-                    self.isDirty = false;
-                });
-            } else if (self.create) {
-                self.editTitle = translate('TagManager_CreateNewVersion');
-
-                self.version = {
-                    idSite: piwik.idSite,
-                    idcontainer: self.idContainer,
-                    name: '',
-                    environment: '',
-                    description: ''
-                };
-                if (self.canPublishToLive) {
-                    self.version.environment = 'live';
-                } else if (angular.isArray(self.environments) && self.environments.length && self.environments[0]) {
-                    self.version.environment = self.environments[0].key;
-                }
-                self.isDirty = false;
-            }
-        }
-
-        this.cancel = function () {
-            $scope.idContainerVersion = null;
-            currentId = null;
-
-            var $search = $location.search();
-            delete $search.idContainerVersion;
-            $location.search($search);
-        };
-
-        $scope.$on('$destroy', function() {
-            $scope.idContainerVersion = null;
-            currentId = null;
-        });
-
-        function checkRequiredFieldsAreSet()
-        {
-            var title;
-
-            if (!self.version.name) {
-                title = _pk_translate('General_Name');
-                showErrorFieldNotProvidedNotification(title);
-                return false;
-            }
-
-            return true;
-        }
-
-        this.createVersion = function () {
-            removeAnyVersionNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerVersionModel.createOrUpdateVersion(this.version, 'TagManager.createContainerVersion').then(function (response) {
-                self.isUpdating = false;
-
-                if (!response || response.type === 'error' || !response.response) {
-                    return;
-                }
-
-                self.isDirty = false;
-
-                var idContainerVersion = response.response.value;
-
-                if ('function' === typeof $scope.onChangeVersion) {
-                    self.version.idcontainerversion = idContainerVersion;
-                    $scope.onChangeVersion({version: self.version});
-                    return;
-                }
-
-                tagManagerVersionModel.reload(self.idContainer).then(function () {
-                    var $search = $location.search();
-                    $search.idContainerVersion = idContainerVersion;
-                    $location.search($search);
-
-                    $timeout(function () {
-                        showNotification(translate('TagManager_CreatedX', translate('TagManager_Version')), response.type);
-                    }, 200);
-                });
-            }, function () {
-                self.isUpdating = false;
-            });
-        };
-
-        this.createVersionAndPublish = function () {
-            removeAnyVersionNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerVersionModel.createOrUpdateVersion(this.version, 'TagManager.createContainerVersion').then(function (response) {
-
-                if (!response || response.type === 'error' || !response.response || !response.response.value) {
-                    self.isUpdating = false;
-                    return;
-                }
-
-                var idContainerVersion = response.response.value;
-
-                self.version.idcontainerversion = idContainerVersion;
-
-                tagManagerVersionModel.publishVersion(self.idContainer, idContainerVersion, self.version.environment).then(function (response) {
-
-                    self.isUpdating = false;
-
-                    if (!response || response.type === 'error') {
-                        return;
-                    }
-
-                    self.isDirty = false;
-
-                    if ('function' === typeof $scope.onChangeVersion) {
-                        $scope.onChangeVersion({version: self.version});
-                        return;
-                    }
-
-                    tagManagerVersionModel.reload(self.idContainer).then(function () {
-                        var $search = $location.search();
-                        $search.idContainerVersion = idContainerVersion;
-                        $location.search($search);
-
-                        $timeout(function () {
-                            showNotification(translate('TagManager_VersionPublishSuccess'), response.type);
-                        }, 200);
-                    });
-                });
-
-            }, function () {
-                self.isUpdating = false;
-            });
-        }
-
-        this.setValueHasChanged = function () {
-            this.isDirty = true;
-        };
-
-        this.updateVersion = function () {
-
-            removeAnyVersionNotification();
-
-            if (!checkRequiredFieldsAreSet()) {
-                return;
-            }
-
-            this.isUpdating = true;
-
-            tagManagerVersionModel.createOrUpdateVersion(this.version, 'TagManager.updateContainerVersion').then(function (response) {
-                if (response.type === 'error') {
-                    return;
-                }
-
-                var idContainerVersion = self.version.idcontainerversion;
-
-                if ('function' === typeof $scope.onChangeVersion) {
-                    $scope.onChangeVersion({version: self.version});
-                    return;
-                }
-
-                self.isDirty = false;
-                self.version = {};
-
-                tagManagerVersionModel.reload(self.idContainer).then(function () {
-                    init(idContainerVersion);
-                });
-                showNotification(translate('TagManager_UpdatedX', translate('TagManager_Version')), response.type);
-            });
-        };
-
-        $scope.$watch('idContainerVersion', function (newValue, oldValue) {
-            if (newValue === null) {
-                return;
-            }
-            if (newValue != oldValue || currentId === null) {
-                currentId = newValue;
-                init(newValue);
-            }
-        });
-    }
-})();
diff --git a/app/plugins/TagManager/angularjs/manageVersion/edit.directive.html b/app/plugins/TagManager/angularjs/manageVersion/edit.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVersion/edit.directive.js b/app/plugins/TagManager/angularjs/manageVersion/edit.directive.js
deleted file mode 100755
index f4260c05e..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/edit.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-version-edit>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVersionEdit', piwikVersionEdit);
-
-    piwikVersionEdit.$inject = ['piwik'];
-
-    function piwikVersionEdit(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainerVersion: '=',
-                idContainer: '=',
-                onChangeVersion: '&?'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageVersion/edit.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VersionEditController',
-            controllerAs: 'editVersion'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/list.controller.js b/app/plugins/TagManager/angularjs/manageVersion/list.controller.js
deleted file mode 100755
index b65188db2..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/list.controller.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VersionListController', VersionListController);
-
-    VersionListController.$inject = ['$scope', 'tagManagerVersionModel', 'piwik', 'piwikApi', '$location'];
-
-    function VersionListController($scope, tagManagerVersionModel, piwik, piwikApi, $location) {
-
-        this.model = tagManagerVersionModel;
-        this.hasWriteAccess = piwik.hasUserCapability('tagmanager_write');
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-        this.token_auth = piwik.token_auth;
-        this.environments = [];
-        this.versionToBePublished = null;
-        this.idSite = piwik.idSite;
-        this.canPublishToLive = piwik.hasUserCapability('tagmanager_publish_live_container');
-
-        tagManagerVersionModel.fetchAvailableEnvironmentsWithPublishPermission().then(function (environments) {
-            self.environments = [];
-            angular.forEach(environments, function (environment) {
-                self.environments.push({key: environment.id, value: environment.name});
-            });
-        });
-
-        this.createVersion = function () {
-            this.editVersion(0);
-        };
-
-        this.truncateText = function(text, length) {
-            if (text && (text + '').length > length) {
-                return String(text).substr(0, length - 3) + '...';
-            }
-            return text;
-        };
-
-        this.publishVersion = function (version) {
-            version.deployEnvironment = '';
-            version.availableEnvironments = [];
-            angular.forEach(this.environments, function (env) {
-                var found = false;
-                if (version.releases) {
-                    angular.forEach(version.releases, function (release) {
-                        if (env && env.key == release.environment) {
-                            found = true;
-                        }
-                    });
-                }
-                if (!found) {
-                    if (!version.deployEnvironment) {
-                        version.deployEnvironment = env.key;
-                    }
-                    version.availableEnvironments.push(env);
-                }
-            });
-            this.versionToBePublished = version;
-            piwik.helper.modalConfirm('#confirmPublishVersion', {yes: function () {
-                if (version.deployEnvironment) {
-                    self.model.publishVersion(version.idcontainer, version.idcontainerversion, version.deployEnvironment).then(function () {
-                        self.model.reload(self.idContainer);
-                    });
-                }
-            }});
-        };
-
-        this.enableDebugMode = function (idContainerVersion) {
-            tagManagerHelper.enablePreviewMode(self.idContainer, idContainerVersion);
-        };
-
-        this.exportVersion = function (idContainerVersion, versionName) {
-            var params = {
-                module: 'API',
-                method: 'TagManager.exportContainerVersion',
-                format: 'json',
-                idContainer: self.idContainer,
-                filter_limit: -1,
-            };
-            if (idContainerVersion) {
-                params.idContainerVersion = idContainerVersion;
-            }
-            var filename = 'container_' + self.idContainer;
-            if (versionName) {
-                filename += '_' + versionName;
-            }
-            piwikApi.fetch(params).then(function (exportedContainer) {
-                piwik.helper.sendContentAsDownload(filename + '.json', JSON.stringify(exportedContainer));
-            });
-        };
-
-        this.editVersion = function (idContainerVersion) {
-            var $search = $location.search();
-            $search.idContainerVersion = idContainerVersion;
-            $location.search($search);
-        };
-
-        this.importVersion = function () {
-            tagManagerHelper.importVersion($scope, self.idContainer);
-        }
-
-        this.deleteVersion = function (version) {
-            function doDelete() {
-                tagManagerVersionModel.deleteVersion(self.idContainer, version.idcontainerversion).then(function () {
-                    tagManagerVersionModel.reload(self.idContainer);
-                });
-            }
-
-            piwik.helper.modalConfirm('#confirmDeleteVersion', {yes: doDelete});
-        };
-
-        this.model.fetchVersions(this.idContainer);
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/list.directive.html b/app/plugins/TagManager/angularjs/manageVersion/list.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVersion/list.directive.js b/app/plugins/TagManager/angularjs/manageVersion/list.directive.js
deleted file mode 100755
index 58cb17dba..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/list.directive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-version-list>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVersionList', piwikVersionList);
-
-    piwikVersionList.$inject = ['piwik'];
-
-    function piwikVersionList(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {idContainer: '='},
-            templateUrl: 'plugins/TagManager/angularjs/manageVersion/list.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VersionListController',
-            controllerAs: 'versionList'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/manage.controller.js b/app/plugins/TagManager/angularjs/manageVersion/manage.controller.js
deleted file mode 100755
index 7a98899e5..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/manage.controller.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('ManageVersionController', ManageVersionController);
-
-    ManageVersionController.$inject = ['$scope', '$rootScope', '$location'];
-
-    function ManageVersionController($scope, $rootScope, $location) {
-
-        this.editMode = false;
-
-        var self = this;
-        this.idContainer = $scope.idContainer;
-
-        function removeAnyVersionNotification()
-        {
-            var UI = require('piwik/UI');
-            new UI.Notification().remove('versiontagmanagement');
-        }
-
-        function initState() {
-            var $search = $location.search();
-            if ('idContainerVersion' in $search) {
-                if ($search.idContainerVersion === 0 || $search.idContainerVersion === '0') {
-
-                    var parameters = {isAllowed: true};
-                    $rootScope.$emit('TagManager.initAddVersion', parameters);
-                    if (parameters && !parameters.isAllowed) {
-
-                        self.editMode = false;
-                        self.idContainerVersion = null;
-
-                        return;
-                    }
-                }
-                self.editMode = true;
-                self.idContainerVersion = parseInt($search.idContainerVersion, 10);
-            } else {
-                self.editMode = false;
-                self.idContainerVersion = null;
-            }
-
-            removeAnyVersionNotification();
-        }
-
-        initState();
-
-        var onChangeSuccess = $rootScope.$on('$locationChangeSuccess', initState);
-
-        $scope.$on('$destroy', function() {
-            if (onChangeSuccess) {
-                onChangeSuccess();
-            }
-        });
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/manage.directive.html b/app/plugins/TagManager/angularjs/manageVersion/manage.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/manageVersion/manage.directive.js b/app/plugins/TagManager/angularjs/manageVersion/manage.directive.js
deleted file mode 100755
index 09eca881b..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/manage.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-version-manage>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVersionManage', piwikVersionManage);
-
-    piwikVersionManage.$inject = ['piwik'];
-
-    function piwikVersionManage(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '@'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/manageVersion/manage.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'ManageVersionController',
-            controllerAs: 'manageVersion'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/manageVersion/model.js b/app/plugins/TagManager/angularjs/manageVersion/model.js
deleted file mode 100755
index a0a3f8daf..000000000
--- a/app/plugins/TagManager/angularjs/manageVersion/model.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').factory('tagManagerVersionModel', tagManagerVersionModel);
-
-    tagManagerVersionModel.$inject = ['piwikApi', '$q', '$filter'];
-
-    function tagManagerVersionModel(piwikApi, $q, $filter) {
-        var fetchPromise = null;
-        var environmentPublishPromise = null;
-        var translate = $filter('translate');
-
-        var model = {
-            versions : [],
-            isLoading: false,
-            isUpdating: false,
-            findVersion: findVersion,
-            createOrUpdateVersion: createOrUpdateVersion,
-            deleteVersion: deleteVersion,
-            publishVersion: publishVersion,
-            fetchAvailableEnvironmentsWithPublishPermission: fetchAvailableEnvironmentsWithPublishPermission,
-            reload: reload,
-            fetchVersions: fetchVersions
-        };
-
-        return model;
-
-        function reload(idContainer)
-        {
-            model.versions = [];
-            fetchPromise = null;
-            return fetchVersions(idContainer);
-        }
-
-        function fetchVersions(idContainer) {
-            var params = {method: 'TagManager.getContainerVersions', idContainer: idContainer, filter_limit: '-1'};
-
-            if (!fetchPromise) {
-                fetchPromise = piwikApi.fetch(params);
-            }
-
-            model.isLoading = true;
-            model.versions = [];
-
-            return fetchPromise.then(function (versions) {
-                model.versions = versions;
-
-                model.isLoading = false;
-                return versions;
-            }, function () {
-                model.isLoading = false;
-            });
-        }
-
-        function fetchAvailableEnvironmentsWithPublishPermission() {
-            if (!environmentPublishPromise) {
-                var params = {method: 'TagManager.getAvailableEnvironmentsWithPublishCapability', filter_limit: '-1'};
-                environmentPublishPromise = piwikApi.fetch(params);
-            }
-
-            return environmentPublishPromise;
-        }
-
-        function findVersion(idContainer, idContainerVersion) {
-
-            // before going through an API request we first try to find it in loaded versions
-            var found;
-            angular.forEach(model.versions, function (version) {
-                if (!found && parseInt(version.idcontainerversion, 10) === idContainerVersion) {
-                    found = version;
-                }
-            });
-
-            if (found) {
-                var deferred = $q.defer();
-                deferred.resolve(found);
-                return deferred.promise;
-            }
-
-            // otherwise we fetch it via API
-            model.isLoading = true;
-
-            return piwikApi.fetch({
-                idContainerVersion: idContainerVersion,
-                idContainer: idContainer,
-                method: 'TagManager.getContainerVersion', filter_limit: '-1'
-            }).then(function (record) {
-                model.isLoading = false;
-                return record;
-
-            }, function (error) {
-                model.isLoading = false;
-            });
-        }
-
-        function deleteVersion(idContainer, idContainerVersion) {
-
-            model.isUpdating = true;
-            model.versions = [];
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.fetch({idContainer: idContainer, idContainerVersion: idContainerVersion, method: 'TagManager.deleteContainerVersion'}).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function publishVersion(idContainer, idContainerVersion, environment)
-        {
-            model.isUpdating = true;
-            var params = {idContainer: idContainer,
-                          idContainerVersion: idContainerVersion,
-                          environment: environment,
-                          method: 'TagManager.publishContainerVersion'};
-            return piwikApi.fetch(params).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success'};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-        function createOrUpdateVersion(version, method) {
-            version = angular.copy(version);
-            version.method = method;
-
-            var map = {
-                idContainerVersion: 'idcontainerversion',
-                idContainer: 'idcontainer',
-            };
-
-            angular.forEach(map, function (value, key) {
-                if (typeof version[value] !== 'undefined') {
-                    version[key] = version[value];
-                    delete version[value];
-                }
-            });
-
-            var postParams = [];
-            var post = {};
-            for (var i = 0; i < postParams.length; i++) {
-                var postParam = postParams[i];
-                if (typeof version[postParam] !== 'undefined') {
-                    post[postParam] = version[postParam];
-                    delete version[postParam];
-                }
-            }
-
-            model.isUpdating = true;
-
-            piwikApi.withTokenInUrl();
-
-            return piwikApi.post(version, post).then(function (response) {
-                model.isUpdating = false;
-
-                return {type: 'success', response: response};
-
-            }, function (error) {
-                model.isUpdating = false;
-                return {type: 'error', message: error};
-            });
-        }
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/selectVariable/select-variable.controller.js b/app/plugins/TagManager/angularjs/selectVariable/select-variable.controller.js
deleted file mode 100755
index cae1b07a6..000000000
--- a/app/plugins/TagManager/angularjs/selectVariable/select-variable.controller.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VariableSelectController', VariableSelectController);
-
-    VariableSelectController.$inject = ['$scope', 'piwikApi'];
-
-    function VariableSelectController($scope, piwikApi) {
-        var self = this;
-        this.preconfiguredVariables = [];
-        this.containerVariables = [];
-        this.isLoading = false;
-        this.idContainer = $scope.idContainer;
-        this.idContainerVersion = null;
-
-        function getContainer()
-        {
-            self.isLoading = true;
-            var params = {
-                method: 'TagManager.getContainer', filter_limit: '-1',
-                idContainer: self.idContainer
-            };
-            return piwikApi.fetch(params);
-        }
-
-        function fetchAvailableVariables() {
-            self.preconfiguredVariables = [];
-            self.containerVariables = [];
-
-            getContainer().then(function (container) {
-                self.isLoading = true;
-                self.idContainerVersion = container.draft.idcontainerversion;
-                var params = {
-                    method: 'TagManager.getAvailableContainerVariables', filter_limit: '-1',
-                    idContainer: self.idContainer, idContainerVersion: self.idContainerVersion
-                };
-                return piwikApi.fetch(params).then(function (variables) {
-                    self.preconfiguredVariables = [];
-                    self.containerVariables = [];
-                    self.isLoading = false;
-
-                    angular.forEach(variables, function (category) {
-                        var preConfig = angular.copy(category);
-                        preConfig.types = [];
-
-                        angular.forEach(category.types, function (variable, index) {
-                            if (variable.is_pre_configured) {
-                                preConfig.types.push(variable);
-                            } else {
-                                self.containerVariables.push(variable);
-                            }
-                        });
-                        if (preConfig && preConfig.types && preConfig.types.length) {
-                            self.preconfiguredVariables.push(preConfig);
-                        }
-                    });
-                }, function () {
-
-                    self.isLoading = false;
-                });
-            });
-
-        }
-
-        fetchAvailableVariables();
-
-        this.editVariable = function (variable) {
-            if (!this.idContainerVersion) {
-                return;
-            }
-
-            tagManagerHelper.editVariable($scope, this.idContainer, this.idContainerVersion, variable.idvariable, function () {
-               fetchAvailableVariables();
-            });
-        };
-
-        this.createVariable = function () {
-            if (!this.idContainerVersion) {
-                return;
-            }
-
-            tagManagerHelper.editVariable($scope, this.idContainer, this.idContainerVersion, 0, function () {
-               fetchAvailableVariables();
-            });
-        };
-
-        this.selectVariable = function (variable) {
-            if ('function' === typeof $scope.onSelectVariable) {
-                $scope.onSelectVariable({variable: variable});
-                return;
-            }
-        }
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/selectVariable/select-variable.directive.html b/app/plugins/TagManager/angularjs/selectVariable/select-variable.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/selectVariable/select-variable.directive.js b/app/plugins/TagManager/angularjs/selectVariable/select-variable.directive.js
deleted file mode 100755
index ba47f6a19..000000000
--- a/app/plugins/TagManager/angularjs/selectVariable/select-variable.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-variable-select>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVariableSelect', piwikVariableSelect);
-
-    piwikVariableSelect.$inject = ['piwik'];
-
-    function piwikVariableSelect(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                idContainer: '=',
-                idContainerVersion: '=',
-                onSelectVariable: '&?'
-            },
-            templateUrl: 'plugins/TagManager/angularjs/selectVariable/select-variable.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VariableSelectController',
-            controllerAs: 'variableSelect'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.controller.js b/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.controller.js
deleted file mode 100755
index 46f173095..000000000
--- a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.controller.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('VariableSelectTypeController', VariableSelectTypeController);
-
-    VariableSelectTypeController.$inject = ['$scope', 'piwikApi', 'piwikUrl'];
-
-    function VariableSelectTypeController($scope, piwikApi, piwikUrl) {
-
-        var self = this;
-        this.containerVariables = [];
-        this.isLoading = false;
-        this.idContainer = piwikUrl.getSearchParam('idContainer');
-        this.idContainerVersion = null;
-        this.variableType = $scope.variableType;
-        this.variable = $scope.variable;
-        this.variableTypeName = $scope.variableTypeName;
-
-        function getContainer()
-        {
-            self.isLoading = true;
-            var params = {
-                method: 'TagManager.getContainer', filter_limit: '-1',
-                idContainer: self.idContainer
-            };
-            return piwikApi.fetch(params);
-        }
-
-        function fetchAvailableVariables() {
-            self.containerVariables = [];
-
-            getContainer().then(function (container) {
-                self.isLoading = true;
-                self.idContainerVersion = container.draft.idcontainerversion;
-                var params = {
-                    method: 'TagManager.getAvailableContainerVariables', filter_limit: '-1',
-                    idContainer: self.idContainer, idContainerVersion: self.idContainerVersion
-                };
-                return piwikApi.fetch(params).then(function (variables) {
-                    self.containerVariables = [];
-                    self.isLoading = false;
-
-                    angular.forEach(variables, function (category) {
-                        angular.forEach(category.types, function (variable, index) {
-                            if (variable.type === $scope.variableType) {
-                                self.containerVariables.push({key: '{{'+variable.id+'}}', value: variable.name});
-                            }
-                        });
-                    });
-
-                    if (!self.variable && self.containerVariables.length === 1) {
-                        // when no value configured and only one selection is available, we preselect that value
-                        self.variable = self.containerVariables[0].key;
-                        self.onChange();
-                    }
-                }, function () {
-                    self.isLoading = false;
-                });
-            });
-
-        }
-
-        fetchAvailableVariables();
-
-        this.onChange = function () {
-            $scope.variable = self.variable;
-        };
-
-        this.createVariable = function () {
-            if (!this.idContainerVersion) {
-                return;
-            }
-
-            tagManagerHelper.editVariable($scope, this.idContainer, this.idContainerVersion, 0, function (variable) {
-               fetchAvailableVariables();
-               if (variable) {
-                   self.variable = '{{'+variable.name+'}}';
-                   $scope.variable = self.variable;
-               }
-            }, $scope.variableType);
-        };
-
-        this.selectVariable = function (variable) {
-            if ('function' === typeof $scope.onSelectVariable) {
-                $scope.onSelectVariable({variable: variable});
-                return;
-            }
-        }
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.html b/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.js b/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.js
deleted file mode 100755
index 3d59011ac..000000000
--- a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div piwik-variable-select-type>
- */
-(function () {
-    angular.module('piwikApp').directive('piwikVariableSelectType', piwikVariableSelectType);
-
-    piwikVariableSelectType.$inject = ['piwik'];
-
-    function piwikVariableSelectType(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {
-                variableTypeName: '@',
-                variable: '=',
-                variableType: '@'
-            },
-            require: "?ngModel",
-            templateUrl: 'plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'VariableSelectTypeController',
-            controllerAs: 'variableSelectType'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.less b/app/plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.controller.js b/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.controller.js
deleted file mode 100755
index 35d4446a7..000000000
--- a/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.controller.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-(function () {
-    angular.module('piwikApp').controller('TagManagerTrackingCodeController', TagManagerTrackingCodeController);
-
-    TagManagerTrackingCodeController.$inject = ['$scope', 'piwikApi', 'piwikUrl', '$timeout', '$filter', 'piwik'];
-
-    function TagManagerTrackingCodeController($scope, piwikApi, piwikUrl, $timeout, $filter, piwik) {
-
-        var self = this;
-        this.containerVariables = [];
-        this.isLoading = false;
-        this.idContainer = 0
-        this.environment = '';
-        this.environmentNameMap = {};
-        this.environments = [];
-        this.containers = [];
-        this.containerMap = {};
-        this.site = null;
-        this.matomoConfigs = [];
-        this.releases = [];
-        this.installInstructions = [];
-        this.noReleaseFound = false;
-        var translate = $filter('translate');
-        var ucfirst = $filter('ucfirst');
-
-        var environmentsPromise = piwikApi.fetch({method: 'TagManager.getAvailableEnvironments', filter_limit: '-1'});
-        environmentsPromise.then(function (environments) {
-            angular.forEach(environments, function (environment) {
-                self.environmentNameMap[environment.id] = environment.name;
-            });
-        });
-
-        this.onSiteChange = function () {
-            this.installInstructions = [];
-            this.containers = [];
-            this.environments = [];
-            this.matomoConfigs = [];
-            this.idContainer = '';
-
-            if (!this.site || !this.site.id) {
-                return;
-            }
-
-            this.isLoading = true;
-
-            piwikApi.fetch({
-                method: 'TagManager.getContainers', filter_limit: '-1',
-                idSite: this.site.id
-            }).then(function (containers) {
-                self.isLoading = false;
-                self.containers = [];
-
-                if (!containers || !containers.length) {
-                    self.idContainer = '';
-                    self.containers.push({key: '', value: translate('TagManager_NoContainersFound')});
-                    return;
-                }
-
-                angular.forEach(containers, function (container) {
-                    if (!self.idContainer) {
-                        self.idContainer = container.idcontainer;
-                    }
-                    self.containerMap[container.idcontainer] = container;
-                    self.containers.push({key: container.idcontainer, value: container.name});
-                });
-
-                self.onContainerChange();
-
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        this.onContainerChange = function () {
-            this.noReleaseFound = false;
-
-            if (!this.idContainer) {
-                return;
-            }
-
-            this.installInstructions = [];
-
-            var container = this.containerMap[this.idContainer];
-            var draftVersion = container.draft.idcontainerversion;
-
-            this.environment = '';
-            this.environments = [];
-
-            angular.forEach(container.releases, function (release) {
-                if (release.environment === 'live') { // we always prefer to pre-select the live environment
-                    self.environment = release.environment;
-                }
-            });
-
-            angular.forEach(container.releases, function (release) {
-                if (release.environment === 'preview') {
-                    return; // there is nothing to embed for this environment
-                }
-
-                if (!self.environment) {
-                    self.environment = release.environment;
-                }
-                var name = ucfirst(release.environment);
-                if (release.environment in self.environmentNameMap) {
-                    name = self.environmentNameMap[release.environment];
-                }
-                self.environments.push({key: release.environment, value: name});
-            });
-
-            if (!this.environments.length) {
-                this.noReleaseFound = true;
-                this.environments.push({key: '', value: translate('TagManager_NoReleasesFound')});
-            }
-
-            this.fetchInstallInstructions();
-            this.fetchVariables(draftVersion);
-        };
-
-        this.linkTo = function (action, idContainer, hash){
-            var currentUrl = window.location.pathname + window.location.search;
-            var newUrl = piwik.broadcast.updateParamValue('module=TagManager', currentUrl);
-            newUrl = piwik.broadcast.updateParamValue('action=' + action, newUrl);
-            newUrl = piwik.broadcast.updateParamValue('idContainer=' + idContainer, newUrl);
-            if ('undefined' !== typeof hash && hash) {
-                newUrl += '#?' + hash;
-            }
-            return newUrl;
-        };
-
-        this.fetchInstallInstructions = function () {
-            this.installInstructions = {};
-
-            if (!this.idContainer || !this.environment || !this.site || !this.site.id) {
-                return;
-            }
-
-            this.isLoading = true;
-
-            piwikApi.fetch({
-                method: 'TagManager.getContainerInstallInstructions', filter_limit: '-1',
-                idContainer: this.idContainer, environment: this.environment,
-                idSite: this.site.id
-            }).then(function (instructions) {
-                self.installInstructions = instructions;
-                self.isLoading = false;
-                $timeout(function () {
-                    var codeBlock = $('.tagManagerTrackingCode .codeblock');
-                    codeBlock.effect("highlight", {}, 1500);
-                });
-
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        this.fetchVariables = function (containerDraftVersion) {
-            this.matomoConfigs = [];
-
-            if (!this.idContainer || !this.site || !this.site.id || !containerDraftVersion) {
-                return;
-            }
-
-            piwikApi.fetch({
-                method: 'TagManager.getContainerVariables', filter_limit: '-1',
-                idContainer: this.idContainer, idContainerVersion: containerDraftVersion,
-                idSite: this.site.id
-            }).then(function (variables) {
-                self.matomoConfigs = [];
-                angular.forEach(variables, function (variable) {
-                    if (variable.type === 'MatomoConfiguration') {
-                        self.matomoConfigs.push(variable);
-                    }
-                });
-
-            }, function () {
-                self.isLoading = false;
-            });
-        };
-
-        $scope.$watch('tagTrackingCode.site.id', function (val, oldVal) {
-            if (val !== oldVal) {
-                self.onSiteChange();
-            }
-        });
-
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.html b/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.html
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.js b/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.js
deleted file mode 100755
index 9c01de961..000000000
--- a/app/plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Matomo - free/libre analytics platform
- *
- * @link https://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * Usage:
- * <div matomo-tagmanager-tracking-code>
- */
-(function () {
-    angular.module('piwikApp').directive('matomoTagmanagerTrackingCode', matomoTagManagerTrackingCode);
-
-    matomoTagManagerTrackingCode.$inject = ['piwik'];
-
-    function matomoTagManagerTrackingCode(piwik){
-
-        return {
-            restrict: 'A',
-            scope: {},
-            templateUrl: 'plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.html?cb=' + piwik.cacheBuster,
-            controller: 'TagManagerTrackingCodeController',
-            controllerAs: 'tagTrackingCode'
-        };
-    }
-})();
\ No newline at end of file
diff --git a/app/plugins/TagManager/config/config.php b/app/plugins/TagManager/config/config.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/config/test.php b/app/plugins/TagManager/config/test.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/config/tracker.php b/app/plugins/TagManager/config/tracker.php
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/docs/index.md b/app/plugins/TagManager/docs/index.md
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/defaultIcon.svg b/app/plugins/TagManager/images/defaultIcon.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/F_icon.svg b/app/plugins/TagManager/images/icons/F_icon.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/addthis.svg b/app/plugins/TagManager/images/icons/addthis.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/bing.svg b/app/plugins/TagManager/images/icons/bing.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/bugsnag.png b/app/plugins/TagManager/images/icons/bugsnag.png
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/chrome.svg b/app/plugins/TagManager/images/icons/chrome.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/code.svg b/app/plugins/TagManager/images/icons/code.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/drift.svg b/app/plugins/TagManager/images/icons/drift.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/emarsys.svg b/app/plugins/TagManager/images/icons/emarsys.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/error.svg b/app/plugins/TagManager/images/icons/error.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/etracker.svg b/app/plugins/TagManager/images/icons/etracker.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/form.svg b/app/plugins/TagManager/images/icons/form.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/fullscreen.svg b/app/plugins/TagManager/images/icons/fullscreen.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/honeybadger.svg b/app/plugins/TagManager/images/icons/honeybadger.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/image.svg b/app/plugins/TagManager/images/icons/image.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/linkedin.svg b/app/plugins/TagManager/images/icons/linkedin.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/livezilla_icon.png b/app/plugins/TagManager/images/icons/livezilla_icon.png
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/pageview.svg b/app/plugins/TagManager/images/icons/pageview.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/pingdom.svg b/app/plugins/TagManager/images/icons/pingdom.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/pointer.svg b/app/plugins/TagManager/images/icons/pointer.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/raygun.svg b/app/plugins/TagManager/images/icons/raygun.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/sentry.svg b/app/plugins/TagManager/images/icons/sentry.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/shareaholic.svg b/app/plugins/TagManager/images/icons/shareaholic.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/show.svg b/app/plugins/TagManager/images/icons/show.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/tawk_to.png b/app/plugins/TagManager/images/icons/tawk_to.png
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/timer.svg b/app/plugins/TagManager/images/icons/timer.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/visualwebsitepptimizer.svg b/app/plugins/TagManager/images/icons/visualwebsitepptimizer.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/images/icons/zendesk_chat.svg b/app/plugins/TagManager/images/icons/zendesk_chat.svg
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/javascripts/previewmode.js b/app/plugins/TagManager/javascripts/previewmode.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/javascripts/previewmodedetection.js b/app/plugins/TagManager/javascripts/previewmodedetection.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/javascripts/tagmanager.js b/app/plugins/TagManager/javascripts/tagmanager.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/javascripts/tagmanager.min.js b/app/plugins/TagManager/javascripts/tagmanager.min.js
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/javascripts/tagmanagerHelper.js b/app/plugins/TagManager/javascripts/tagmanagerHelper.js
deleted file mode 100755
index a37266364..000000000
--- a/app/plugins/TagManager/javascripts/tagmanagerHelper.js
+++ /dev/null
@@ -1,178 +0,0 @@
-(function ($) {
-    var tagManagerHelper = {};
-    tagManagerHelper.editTrigger = function ($scope, idContainer, idContainerVersion, idTag, callback) {
-        if (!$scope) {
-            $scope = piwikHelper.getAngularDependency('$rootScope');
-        }
-
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="tag-ui-confirm"><div piwik-trigger-edit id-container="idContainer" on-change-trigger="onChangeTrigger(trigger)" id-container-version="idContainerVersion" id-trigger="' + parseInt(idTag,10) +'"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/></div>')
-
-        var params = {
-            idContainer: idContainer,
-            idContainerVersion: idContainerVersion,
-            onChangeTrigger: function (trigger) {
-                if ('function' === typeof callback) {
-                    callback(trigger);
-                }
-                template.parents('.modal.open').closeModal();
-            }
-        };
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {extraWide: true, complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-
-    tagManagerHelper.createNewVersion = function () {
-        var piwikUrl = piwikHelper.getAngularDependency('piwikUrl');
-        var containerId = piwikUrl.getSearchParam('idContainer');
-        this.editVersion(null, containerId, 0, function () { window.location.reload(); });
-    };
-    tagManagerHelper.editVersion = function ($scope, idContainer, idContainerVersion, callback) {
-        if (!$scope) {
-            $scope = piwikHelper.getAngularDependency('$rootScope');
-        }
-
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="tag-ui-confirm"><div piwik-version-edit id-container="idContainer" on-change-version="onChangeVersion(version)" id-container-version="idContainerVersion"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/></div>')
-
-        var params = {
-            idContainer: idContainer,
-            idContainerVersion: parseInt(idContainerVersion, 10),
-            onChangeVersion: function (version) {
-                if ('function' === typeof callback) {
-                    callback(version);
-                }
-                template.parents('.modal.open').closeModal();
-            }
-        };
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {extraWide: true, complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-
-    tagManagerHelper.editVariable = function ($scope, idContainer, idContainerVersion, idVariable, callback, variableType) {
-        if (!$scope) {
-            $scope = piwikHelper.getAngularDependency('$rootScope');
-        }
-
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="tag-ui-confirm"><div piwik-variable-edit id-container="idContainer" variable-type="variableType" on-change-variable="onChangeVariable(variable)" id-container-version="idContainerVersion" id-variable="idVariable"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/></div>')
-
-        var params = {
-            idContainer: idContainer,
-            idVariable: idVariable,
-            variableType: variableType,
-            idContainerVersion: parseInt(idContainerVersion, 10),
-            onChangeVariable: function (variable) {
-                if ('function' === typeof callback) {
-                    callback(variable);
-                }
-                template.parents('.modal.open').closeModal();
-            }
-        };
-
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {extraWide: true, complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-
-    tagManagerHelper.selectVariable = function (callback) {
-        var $scope = piwikHelper.getAngularDependency('$rootScope');
-        var piwikUrl = piwikHelper.getAngularDependency('piwikUrl');
-        var containerId = piwikUrl.getSearchParam('idContainer');
-
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="ui-confirm"><h2>Select a variable</h2><div piwik-variable-select id-container="idContainer" on-select-variable="onSelectVariable(variable)"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/></div>')
-
-        var params = {
-            idContainer: containerId,
-            onSelectVariable: function (variable) {
-                if ('function' === typeof callback) {
-                    callback(variable);
-                }
-                template.parents('.modal.open').closeModal();
-            }
-        };
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-    tagManagerHelper.insertTextSnippetAtElement = function(inputField, textToAdd) {
-        if (!inputField || !textToAdd) {
-            return;
-        }
-
-        var scrollPos = inputField.scrollTop;
-        var startPos = inputField.selectionStart;
-        var endPos = inputField.selectionEnd;
-
-        var value = String(inputField.value);
-        var valueBefore = value.substring(0, startPos);
-        var valueAfter = value.substring(endPos, value.length);
-        inputField.value = valueBefore + textToAdd + valueAfter;
-        inputField.selectionStart = startPos + textToAdd.length;
-        inputField.selectionEnd = startPos + textToAdd.length;
-        inputField.focus();
-
-        inputField.scrollTop = scrollPos;
-        $(inputField).change();
-    };
-
-    tagManagerHelper.showInstallCode = function (idContainer) {
-        var $scope = piwikHelper.getAngularDependency('$rootScope');
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="tag-ui-confirm"><div piwik-manage-install-tag-code id-container="{{ idContainer }}"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/>')
-
-        var params = {
-            idContainer: idContainer
-        };
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {extraWide: true, complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-    tagManagerHelper.enablePreviewMode = function (idContainer, idContainerVersion) {
-        if (!idContainerVersion) {
-            idContainerVersion = 0;
-        }
-        var piwikApi = piwikHelper.getAngularDependency('piwikApi');
-        var params = {method: 'TagManager.enablePreviewMode', idContainer: idContainer, idContainerVersion: idContainerVersion};
-        piwikHelper.modalConfirm('<h2>' + _pk_translate('TagManager_EnablingPreviewPleaseWait') + '</h2>', {});
-        piwikApi.fetch(params).then(function () {
-            window.location.reload();
-        });
-    };
-    tagManagerHelper.disablePreviewMode = function (idContainer) {
-        var piwikApi = piwikHelper.getAngularDependency('piwikApi');
-        var params = {method: 'TagManager.disablePreviewMode', idContainer: idContainer};
-        piwikHelper.modalConfirm('<h2>' + _pk_translate('TagManager_DisablingPreviewPleaseWait') + '</h2>', {});
-        piwikApi.fetch(params).then(function () {
-            window.location.reload();
-        });
-    };
-    tagManagerHelper.importVersion = function ($scope, idContainer) {
-        var childScope = $scope.$new(true, $scope);
-        var template = $('<div class="ui-confirm"><div piwik-import-version id-container="idContainer"></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/>')
-
-        var params = {
-            idContainer: idContainer
-        };
-        piwikHelper.compileAngularComponents(template, {scope: childScope, params: params});
-        piwikHelper.modalConfirm(template, {}, {extraWide: true, complete: function () {
-            childScope.$destroy();
-            template.empty();
-        }});
-    };
-
-    window.tagManagerHelper = tagManagerHelper;
-})(jQuery);
\ No newline at end of file
diff --git a/app/plugins/TagManager/lang/am.json b/app/plugins/TagManager/lang/am.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ar.json b/app/plugins/TagManager/lang/ar.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/be.json b/app/plugins/TagManager/lang/be.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/bg.json b/app/plugins/TagManager/lang/bg.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/bn.json b/app/plugins/TagManager/lang/bn.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/bs.json b/app/plugins/TagManager/lang/bs.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ca.json b/app/plugins/TagManager/lang/ca.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/cs.json b/app/plugins/TagManager/lang/cs.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/cy.json b/app/plugins/TagManager/lang/cy.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/da.json b/app/plugins/TagManager/lang/da.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/de.json b/app/plugins/TagManager/lang/de.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/el.json b/app/plugins/TagManager/lang/el.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/en.json b/app/plugins/TagManager/lang/en.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/eo.json b/app/plugins/TagManager/lang/eo.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/es-ar.json b/app/plugins/TagManager/lang/es-ar.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/es.json b/app/plugins/TagManager/lang/es.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/et.json b/app/plugins/TagManager/lang/et.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/eu.json b/app/plugins/TagManager/lang/eu.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/fa.json b/app/plugins/TagManager/lang/fa.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/fi.json b/app/plugins/TagManager/lang/fi.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/fr.json b/app/plugins/TagManager/lang/fr.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/gl.json b/app/plugins/TagManager/lang/gl.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/he.json b/app/plugins/TagManager/lang/he.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/hi.json b/app/plugins/TagManager/lang/hi.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/hr.json b/app/plugins/TagManager/lang/hr.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/hu.json b/app/plugins/TagManager/lang/hu.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/id.json b/app/plugins/TagManager/lang/id.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/is.json b/app/plugins/TagManager/lang/is.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/it.json b/app/plugins/TagManager/lang/it.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ja.json b/app/plugins/TagManager/lang/ja.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ka.json b/app/plugins/TagManager/lang/ka.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ko.json b/app/plugins/TagManager/lang/ko.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/lt.json b/app/plugins/TagManager/lang/lt.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/lv.json b/app/plugins/TagManager/lang/lv.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/nb.json b/app/plugins/TagManager/lang/nb.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/nl.json b/app/plugins/TagManager/lang/nl.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/nn.json b/app/plugins/TagManager/lang/nn.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/pl.json b/app/plugins/TagManager/lang/pl.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/pt-br.json b/app/plugins/TagManager/lang/pt-br.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/pt.json b/app/plugins/TagManager/lang/pt.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ro.json b/app/plugins/TagManager/lang/ro.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ru.json b/app/plugins/TagManager/lang/ru.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/sk.json b/app/plugins/TagManager/lang/sk.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/sl.json b/app/plugins/TagManager/lang/sl.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/sq.json b/app/plugins/TagManager/lang/sq.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/sr.json b/app/plugins/TagManager/lang/sr.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/sv.json b/app/plugins/TagManager/lang/sv.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/ta.json b/app/plugins/TagManager/lang/ta.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/te.json b/app/plugins/TagManager/lang/te.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/th.json b/app/plugins/TagManager/lang/th.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/tl.json b/app/plugins/TagManager/lang/tl.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/tr.json b/app/plugins/TagManager/lang/tr.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/uk.json b/app/plugins/TagManager/lang/uk.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/vi.json b/app/plugins/TagManager/lang/vi.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/zh-cn.json b/app/plugins/TagManager/lang/zh-cn.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/lang/zh-tw.json b/app/plugins/TagManager/lang/zh-tw.json
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/libs/jquery-timepicker/bower.json b/app/plugins/TagManager/libs/jquery-timepicker/bower.json
deleted file mode 100755
index b40de2e3d..000000000
--- a/app/plugins/TagManager/libs/jquery-timepicker/bower.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "name"         : "jt.timepicker",
-    "version"      : "1.11.1",
-    "description"  : "A jQuery timepicker plugin inspired by Google Calendar.",
-    "homepage"     : "http://jonthornton.github.com/jquery-timepicker",
-    "main"         : [ "./jquery.timepicker.js", "./jquery.timepicker.css" ],
-    "dependencies" : {
-        "jquery" : ">= 1.7"
-    },
-    "keywords"     : [ "time", "picker", "google calendar" ],
-    "author" : {
-		"name" : "Jon Thornton",
-		"web"  : "https://github.com/jonthornton"
-    },
-    "license": "http://opensource.org/licenses/MIT"
-}
diff --git a/app/plugins/TagManager/libs/jquery-timepicker/package.json b/app/plugins/TagManager/libs/jquery-timepicker/package.json
deleted file mode 100755
index 708654d7c..000000000
--- a/app/plugins/TagManager/libs/jquery-timepicker/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"name": "timepicker",
-	"version": "1.11.1",
-	"title": "jquery-timepicker",
-	"author": {
-		"name": "Jon Thornton",
-		"url": "https://github.com/jonthornton"
-	},
-	"license": "MIT",
-	"dependencies": {
-		"jquery": ">=1.7"
-	},
-	"devDependencies": {
-		"grunt": "~0.4.1",
-		"grunt-cli": "~0.1.9",
-		"grunt-contrib-uglify": "~0.11.0",
-		"grunt-contrib-jshint": "^0.11.3",
-		"grunt-contrib-cssmin": "~0.4.1"
-	},
-	"main": "jquery.timepicker.min.js",
-	"description": "A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.",
-	"keywords": [ "timepicker", "time", "picker", "ui", "google calendar" ],
-	"homepage": "http://jonthornton.github.com/jquery-timepicker/",
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/jonthornton/jquery-timepicker.git"
-	},
-	"bugs": {
-		"url": "https://github.com/jonthornton/jquery-timepicker/issues"
-	}
-}
diff --git a/app/plugins/TagManager/misc/gpl-3.0.txt b/app/plugins/TagManager/misc/gpl-3.0.txt
deleted file mode 100755
index 94a9ed024..000000000
--- a/app/plugins/TagManager/misc/gpl-3.0.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/app/plugins/TagManager/plugin.json b/app/plugins/TagManager/plugin.json
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/plugins/TagManager/stylesheets/gettingStarted.less b/app/plugins/TagManager/stylesheets/gettingStarted.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/stylesheets/manageEdit.less b/app/plugins/TagManager/stylesheets/manageEdit.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/stylesheets/manageList.less b/app/plugins/TagManager/stylesheets/manageList.less
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/dashboard.twig b/app/plugins/TagManager/templates/dashboard.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/debug.twig b/app/plugins/TagManager/templates/debug.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/manageContainers.twig b/app/plugins/TagManager/templates/manageContainers.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/manageTags.twig b/app/plugins/TagManager/templates/manageTags.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/manageTriggers.twig b/app/plugins/TagManager/templates/manageTriggers.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/manageVariables.twig b/app/plugins/TagManager/templates/manageVariables.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/manageVersions.twig b/app/plugins/TagManager/templates/manageVersions.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/releases.twig b/app/plugins/TagManager/templates/releases.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/tagmanager.twig b/app/plugins/TagManager/templates/tagmanager.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/trackingCode.twig b/app/plugins/TagManager/templates/trackingCode.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/TagManager/templates/trackingHelp.twig b/app/plugins/TagManager/templates/trackingHelp.twig
old mode 100755
new mode 100644
diff --git a/app/plugins/Tour/Engagement/Challenges.php b/app/plugins/Tour/Engagement/Challenges.php
index 061fac7ab..40b9cffec 100644
--- a/app/plugins/Tour/Engagement/Challenges.php
+++ b/app/plugins/Tour/Engagement/Challenges.php
@@ -12,8 +12,10 @@
 use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Plugins\CoreAdminHome\Controller;
+use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Plugins\Tour\Dao\DataFinder;
 use Piwik\Plugins\UserCountry\UserCountry;
+use Piwik\Plugins\UsersManager\UsersManager;
 
 class Challenges
 {
@@ -45,6 +47,13 @@ public function getChallenges()
 
         $challenges[] = StaticContainer::get(ChallengeCustomLogo::class);
 
+        if ($this->isActivePlugin('UsersManager') && UsersManager::isUsersAdminEnabled()) {
+            $challenges[] = StaticContainer::get(ChallengeAddedUser::class);
+        }
+        if ($this->isActivePlugin('SitesManager') && SitesManager::isSitesAdminEnabled()) {
+            $challenges[] = StaticContainer::get(ChallengeAddedWebsite::class);
+        }
+
         $challenges[] = StaticContainer::get(ChallengeFlattenActions::class);
         $challenges[] = StaticContainer::get(ChallengeChangeVisualisation::class);
 
diff --git a/app/plugins/Tour/config/config.php b/app/plugins/Tour/config/config.php
index fcbfc7b71..4bfd70c04 100644
--- a/app/plugins/Tour/config/config.php
+++ b/app/plugins/Tour/config/config.php
@@ -1,3 +1,3 @@
 <?php
 return array();
-?> 
+
diff --git a/app/plugins/Tour/config/tracker.php b/app/plugins/Tour/config/tracker.php
index fcbfc7b71..4bfd70c04 100644
--- a/app/plugins/Tour/config/tracker.php
+++ b/app/plugins/Tour/config/tracker.php
@@ -1,3 +1,3 @@
 <?php
 return array();
-?> 
+
diff --git a/app/plugins/Tour/lang/ar.json b/app/plugins/Tour/lang/ar.json
new file mode 100644
index 000000000..70b77be34
--- /dev/null
+++ b/app/plugins/Tour/lang/ar.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "التفاعل",
+        "CompletionTitle": "أحسنت!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/be.json b/app/plugins/Tour/lang/be.json
new file mode 100644
index 000000000..6b319cdb9
--- /dev/null
+++ b/app/plugins/Tour/lang/be.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "Engagement": "Абавязацельства"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/bg.json b/app/plugins/Tour/lang/bg.json
new file mode 100644
index 000000000..9758ce4a8
--- /dev/null
+++ b/app/plugins/Tour/lang/bg.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Ангажимент",
+        "CompletionTitle": "Браво!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/bs.json b/app/plugins/Tour/lang/bs.json
new file mode 100644
index 000000000..ace14ae58
--- /dev/null
+++ b/app/plugins/Tour/lang/bs.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "CompletionTitle": "Bravo!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ca.json b/app/plugins/Tour/lang/ca.json
new file mode 100644
index 000000000..7a69bd9b8
--- /dev/null
+++ b/app/plugins/Tour/lang/ca.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Compromís",
+        "CompletionTitle": "Ben fet!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/cs.json b/app/plugins/Tour/lang/cs.json
new file mode 100644
index 000000000..8d0425969
--- /dev/null
+++ b/app/plugins/Tour/lang/cs.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "Zapojení",
+        "BrowseMarketplace": "Procházet obchod",
+        "CompletionTitle": "Výborně!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/da.json b/app/plugins/Tour/lang/da.json
new file mode 100644
index 000000000..b163681e1
--- /dev/null
+++ b/app/plugins/Tour/lang/da.json
@@ -0,0 +1,32 @@
+{
+    "Tour": {
+        "PluginDescription": "Bliv Matomo ekspert i løbet af ingen tid ved at gennemføre udfordringer, der gør dig fortrolig med Matomo.",
+        "Tour": "Tour",
+        "Engagement": "Engagement",
+        "UploadLogo": "Upload dit logo",
+        "AddUser": "Tilføj en anden bruger",
+        "AddWebsite": "Tilføj en ny hjemmeside",
+        "AddReport": "Opret en planlagt rapport",
+        "AddSegment": "Tilføj et segment",
+        "AddAnnotation": "Tilføj en anmærkning",
+        "BrowseMarketplace": "Browse Markedsplads",
+        "PreviousChallenges": "Tidligere udfordringer",
+        "NextChallenges": "Næste udfordringer",
+        "RowEvolution": "Rækkeudvikling",
+        "ViewX": "Se %s",
+        "SetupX": "Indstil %s",
+        "SelectDateRange": "Vælg et datointerval",
+        "SelectDateRangeDescription": "Vælg et datointerval i kalenderen.",
+        "ChangeVisualisation": "Skift en visualisering",
+        "ChangeVisualisationDescription": "Se en rapport og vælg visualiseringsikonet i bunden af rapporten for at se den samme rapport i en anden visning.",
+        "FlattenActions": "Listevisning af siderapport",
+        "FlattenActionsDescription": "Gå til Adfærd => Sider og klik på tandshjuls-ikonet for at ændre til listevisning af rapporten. En listevist rapport ændrer hierarkiet fra en grupperet til en liste.",
+        "ViewRowEvolutionDescription": "Rækkeudvikling viser dig de aktuelle og tidligere måldata for alle række i alle rapporter.",
+        "ViewVisitsLogDescription": "Besøgsloggen viser dig de individuelle besøg og handlinger, som hver besøgende gjorde på din side.",
+        "ViewVisitorProfileDescription": "Besøgsloggen hjælper dig med at forstå dine besøgendes individuelle adfærd ved at opsummere og vise dine besøgendes besøg.",
+        "ShareAllChallengesCompleted": "Netop frigjort %1$s fuldførelse ved at gennemføre alle Matomo udfordringer.",
+        "ChallengeCompleted": "Tillykke, du har gennemført alle udfordringer.",
+        "BecomeMatomoExpert": "Bliv Matomo ekspert",
+        "CompletionTitle": "Godt klaret!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/de.json b/app/plugins/Tour/lang/de.json
new file mode 100644
index 000000000..1fba01923
--- /dev/null
+++ b/app/plugins/Tour/lang/de.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Werden Sie in kurzer Zeit ein Matomo Experte, indem Sie Aufgaben meistern, welche Sie mit Matomo vertraut machen.",
+        "Tour": "Tour",
+        "Engagement": "Engagement",
+        "UploadLogo": "Laden Sie Ihr Logo hoch",
+        "AddUser": "Einen weiteren Benutzer hinzufügen",
+        "AddWebsite": "Eine weitere Website hinzufügen",
+        "AddReport": "Einen geplanten Bericht hinzufügen",
+        "AddSegment": "Ein Segment hinzufügen",
+        "AddAnnotation": "Eine Anmerkung hinzufügen",
+        "BrowseMarketplace": "Marketplace durchsuchen",
+        "PreviousChallenges": "Vorherige Aufgaben",
+        "NextChallenges": "Nächste Aufgaben",
+        "RowEvolution": "Zeilenentwicklung",
+        "ViewX": "Zeige %s",
+        "SetupX": "%s installieren",
+        "SelectDateRange": "Einen Datumsbereich wählen",
+        "SelectDateRangeDescription": "Wählen Sie einen Datumsbereich im Kalender.",
+        "ChangeVisualisation": "Eine Visualisierung ändern",
+        "ChangeVisualisationDescription": "Lassen Sie sich einen Bericht anzeigen und wählen Sie das 'Visualisierung ändern' Icon am unteren Ende des Berichts, um den selben Bericht in einer anderen Darstellung anzuzeigen.",
+        "FlattenActions": "Einen Seitenbericht flach anzeigen",
+        "FlattenActionsDescription": "Gehen Sie zu Verhalten => Seiten und klicken Sie auf das Zahnrad-Icon am unteren Ende des Berichts, um den Bericht zu reduzieren. Ein reduzierter Bericht ändert die Hierarchie von einem gruppierten Bericht zu einer Liste.",
+        "ViewRowEvolutionDescription": "Die Reihenentwicklung zeigt Ihnen die aktuellen und die vergangenen Metrikdaten für jede Zeile in jedem Bericht.",
+        "ViewVisitsLogDescription": "Der Besucher-Log zeigt Ihnen von jedem Besucher Ihrer Seite all seine individuellen Besuche und getätigten Aktionen.",
+        "ViewVisitorProfileDescription": "Das Besucher-Log hilft Ihnen dabei, das individuelle Verhalten Ihrer Besucher zu verstehen, indem es die jeweiligen Besuche auflistet und zusammenfasst.",
+        "ShareAllChallengesCompleted": "%1$s wurde durch die Komplettierung aller Matomo Aufgaben freigeschaltet.",
+        "ChallengeCompleted": "Gratulation, Sie haben diese Aufgabe gelöst.",
+        "BecomeMatomoExpert": "Ein Matomo Experte werden",
+        "YouCanCallYourselfExpert": "Sie können sich nun einen wahren %1$sMatomo Experten%2$snennen.",
+        "StatusLevel": "Sie sind aktuell ein %1$s. Lösen Sie %2$s weitere Aufgaben und werden Sie ein %3$s.",
+        "ConfigureGeolocationDescription": "Stellen Sie sicher, dass der Standort Ihrer Besucher korrekt ermittelt wird.",
+        "DisableBrowserArchiving": "Deaktivieren Sie Browser Archivierung für eine Verbesserung der Performance.",
+        "SkipThisChallenge": "Diese Aufgabe überspringen",
+        "ShareYourAchievementOn": "Teilen Sie Ihren Erfolg auf %1$s.",
+        "MatomoBeginner": "Matomo Anfänger",
+        "MatomoIntermediate": "Matomo Fortgeschrittener",
+        "MatomoTalent": "Matomo Talent",
+        "MatomoProfessional": "Matomo Profi",
+        "MatomoExpert": "Matomo Experte",
+        "ConfigureGeolocation": "Geolocation konfigurieren",
+        "CustomiseDashboard": "Dashboard anpassen",
+        "CustomiseDashboardDescription": "Sie können neue Widgets zu Ihrem Dashboard hinzufügen, um sicherzustellen, dass es Sie über all Ihre wichtigsten Metriken informiert.",
+        "DefineGoal": "Ein Ziel hinzufügen",
+        "DefineGoalDescription": "Das Konversionstracking ist ein großartige Hilfe beim Entdecken Ihrer zukünftigen Businessziele, neue Ziele zu identifizieren, Ihre Performance anzuschauen und zu analysieren, und zu lernen wie Sie Ihre Konversionen, Konversionsraten und die Verbleibsdauer pro Besuch steigern können.",
+        "EmbedTrackingCode": "Tracking Code einbetten",
+        "CompletionTitle": "Gut gemacht!",
+        "CompletionMessage": "Sie haben alle Aufgaben gelöst. Klopfen Sie sich auf die Schulter.",
+        "Part1Title": "Willkommen bei Matomo %1$s. Dieses Widget wird Ihnen helfen, in kürzester Zeit ein Matomo Experte zu werden.",
+        "Part2Title": "Weiter so %1$s! Sie sind auf dem besten Weg, ein Matomo Experte zu werden.",
+        "Part3Title": "Toller Fortschritt %1$s! Wenn Sie so weitermachen, sind Sie schon bald ein Experte!",
+        "Part4Title": "Toller Fortschritt %1$s! Nur noch ein paar Aufgaben zu lösen.",
+        "OnlyVisibleToSuperUser": "Nur Sie als %1$sHauptadministrator%2$s können dieses Widget sehen."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/el.json b/app/plugins/Tour/lang/el.json
new file mode 100644
index 000000000..1a146670b
--- /dev/null
+++ b/app/plugins/Tour/lang/el.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Γίνετε ειδικός στο Matomo σε χρόνο μηδέν ολοκληρώνοντας τις δοκιμασίες που θα σας κάνουν γνώριμους με το Matomo.",
+        "Tour": "Περιήγηση",
+        "Engagement": "Συμπλοκή",
+        "UploadLogo": "Ανεβάστε το λογότυπό σας",
+        "AddUser": "Προσθήκη άλλου χρήστη",
+        "AddWebsite": "Προσθήκη ενός ιστοτόπου",
+        "AddReport": "Προσθήκη προγραμματισμένης αναφοράς",
+        "AddSegment": "Προσθήκη ενός τμήματος",
+        "AddAnnotation": "Προσθήκη σχολιασμού",
+        "BrowseMarketplace": "Περιήγηση στην Αγορά",
+        "PreviousChallenges": "Προηγούμενες δοκιμασίες",
+        "NextChallenges": "Επόμενες δοκιμασίες",
+        "RowEvolution": "Γραμμή εξέλιξης",
+        "ViewX": "Προβολή του %s",
+        "SetupX": "Παραμετροποίηση του %s",
+        "SelectDateRange": "Επιλέξτε εύρος ημερομηνιών",
+        "SelectDateRangeDescription": "Επιλέξτε εύρος ημερομηνιών στο ημερολόγιο.",
+        "ChangeVisualisation": "Αλλαγή μιας οπτικοποίησης",
+        "ChangeVisualisationDescription": "Δείτε μια αναφορά και επιλέξτε το εικονίδιο της οπτικοποίησης στο κάτω μέρος της αναφοράς για να τη δείτε με διαφορετική οπτικοποίηση.",
+        "FlattenActions": "Κάντε επίπεδη μια αναφορά σελίδας",
+        "FlattenActionsDescription": "Μεταβείτε στο Συμπεριφορά => Σελίδες και κάντε κλικ στο κάτω μέρος της αναφοράς στο γρανάζι για να κάνετε επίπεδη την αναφορά. Η επίπεδη αναφορά αλλάζει την ιεραρχία από μια ομαδοποιημένη αναφορά σε λίστα.",
+        "ViewRowEvolutionDescription": "Η γραμμή εξέλιξης σας δείχνει τα δεδομένα μετρικών της τρέχουσας και παλιότερης γραμμής σε οποιαδήποτε αναφορά.",
+        "ViewVisitsLogDescription": "Το Ημερολόγιο επισκέψεων σας δείχνει όλες τις ξεχωριστές επισκέψεις και ενέργειες κάθε επισκέπτη που υπήρξαν στον ιστοτόπο σας.",
+        "ViewVisitorProfileDescription": "Το ημερολόγιο επισκέπτη σας βοηθά να κατανοήσετε την συμπεριφορά κάθε επισκέπτη σας συνοψίζοντας και εμφανίζοντας σε λίστα τις επισκέψεις του.",
+        "ShareAllChallengesCompleted": "Μόλις ξεκλειδώθηκε το επίτευγμα %1$s με την ολοκλήρωση όλων των δοκιμασιών του Matomo.",
+        "ChallengeCompleted": "Συγχαρητήρια, έχετε ολοκληρώσει τη δοκιμασία.",
+        "BecomeMatomoExpert": "Γίνετε Ειδικός στο Matomo",
+        "YouCanCallYourselfExpert": "Μπορείτε να ονομάζετε τον εαυτό σας ένα πραγματικό %1$sΕιδικό στο Matomo%2$s.",
+        "StatusLevel": "Αυτή τη στιγμή είστε %1$s. Ολοκληρώστε %2$s ακόμη δοκιμασίες για να γίνετε %3$s.",
+        "ConfigureGeolocationDescription": "Βεβαιωθείτε ότι εντοπίζεται σωστά η τοποθεσία των επισκεπτών σας.",
+        "DisableBrowserArchiving": "Απενεργοποίηση της αρχειοθέτησης από το φυλλομετρητή για καλύτερη απόδοση",
+        "SkipThisChallenge": "Παραλείψτε τη δοκιμασία",
+        "ShareYourAchievementOn": "Μοιραστείτε τα κατορθώματά σας στο %1$s.",
+        "MatomoBeginner": "Αρχάριος στο Matomo",
+        "MatomoIntermediate": "Ενδιάμεσος στο Matomo",
+        "MatomoTalent": "Ταλέντο στο Matomo",
+        "MatomoProfessional": "Επαγγελματίας στο Matomo",
+        "MatomoExpert": "Ειδικός στο Matomo",
+        "ConfigureGeolocation": "Παραμετροποίηση γεωτοποθεσίας",
+        "CustomiseDashboard": "Προσαρμογή του κεντρικού πίνακα",
+        "CustomiseDashboardDescription": "Μπορείτε να προσθέσετε νέα συστατικά στον Κεντρικό σας Πίνακα για να βεβαιωθείτε ότι δείχνει όλες τις σημαντικές μετρικές σας.",
+        "DefineGoal": "Προσθήκη ενός στόχου",
+        "DefineGoalDescription": "Η ιχνηλάτηση μετατροπών είναι ένας καλός τρόπος να αναγνωρίζετε αν πετυχαίνετε τους επιχειρηματικούς σας στόχους, να αναγνωρίζετε νέους στόχους, να βλέπετε και να αναλύετε την απόδοσή σας και να μαθαίνετε πως να αυξάνετε τις μετατροπές σας, τους ρυθμούς μετατροπής και το κέρδος ανά επίσκεψη.",
+        "EmbedTrackingCode": "Προσθήκη κώδικα ιχνηλάτησης",
+        "CompletionTitle": "Συγχαρητήρια!",
+        "CompletionMessage": "Έχετε ολοκληρώσει όλες τις δοκιμασίες. Δώστε στον εαυτό σας συγχαρητήρια.",
+        "Part1Title": "Καλωσήρθατε στο Matomo %1$s. Το συστατικό αυτό θα σας βοηθήσει να γίνετε ειδικός στο Matomo σε χρόνο μηδέν.",
+        "Part2Title": "Συνεχίστε έτσι %1$s! Είστε στο δρόμο για να γίνετε ειδικός στο Matomo.",
+        "Part3Title": "Εξαιρετική πρόοδος %1$s! Αν συνεχίσετε με τον ίδιο τρόπο, θα γίνετε ειδικός σε χρόνο μηδέν!",
+        "Part4Title": "Εξαιρετική πρόοδος %1$s! Απομένουν μόνο λίγες δοκιμασίες για ολοκλήρωση.",
+        "OnlyVisibleToSuperUser": "Μόνο εσείς ως %1$sΥπέρ Χρήστης%2$s μπορείτε να δείτε το συστατικό αυτό."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/en.json b/app/plugins/Tour/lang/en.json
index 64157cecf..09b2e6fa6 100644
--- a/app/plugins/Tour/lang/en.json
+++ b/app/plugins/Tour/lang/en.json
@@ -33,7 +33,6 @@
         "DisableBrowserArchiving": "Disable browser archiving for better performance",
         "SkipThisChallenge": "Skip this challenge",
         "ShareYourAchievementOn": "Share your achievement on %1$s.",
-        "MatomoSenior": "Matomo Talent",
         "MatomoBeginner": "Matomo Beginner",
         "MatomoIntermediate": "Matomo Intermediate",
         "MatomoTalent": "Matomo Talent",
@@ -53,4 +52,4 @@
         "Part4Title": "Great progress %1$s! Only a few more challenges to complete.",
         "OnlyVisibleToSuperUser": "Only you as a %1$sSuper User%2$s can see this widget."
     }
-}
\ No newline at end of file
+}
diff --git a/app/plugins/Tour/lang/eo.json b/app/plugins/Tour/lang/eo.json
new file mode 100644
index 000000000..05a3c8b6c
--- /dev/null
+++ b/app/plugins/Tour/lang/eo.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "CompletionTitle": "Bone!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/es-ar.json b/app/plugins/Tour/lang/es-ar.json
new file mode 100644
index 000000000..fabd2fba6
--- /dev/null
+++ b/app/plugins/Tour/lang/es-ar.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "Compromiso",
+        "BrowseMarketplace": "Explorar el mercado",
+        "CompletionTitle": "¡Bien hecho!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/es.json b/app/plugins/Tour/lang/es.json
new file mode 100644
index 000000000..d0bc18b16
--- /dev/null
+++ b/app/plugins/Tour/lang/es.json
@@ -0,0 +1,26 @@
+{
+    "Tour": {
+        "Engagement": "Compromiso",
+        "UploadLogo": "Suba su logo",
+        "AddUser": "Agregar otro usuario",
+        "AddWebsite": "Agregar otro sitio de internet",
+        "BrowseMarketplace": "Explorar Mercado",
+        "NextChallenges": "Próximos desafíos",
+        "ViewX": "Ver %s",
+        "SetupX": "Configurar %s",
+        "SelectDateRange": "Seleccionar un rango de fecha",
+        "SelectDateRangeDescription": "Seleccione un intervalo de fechas en el calendario.",
+        "ChangeVisualisation": "Cambiar una visualización",
+        "ChallengeCompleted": "Felicitaciones, ha completado este desafío.",
+        "BecomeMatomoExpert": "Convertirse en un experto Matomo",
+        "ConfigureGeolocationDescription": "Asegúrese que la ubicación de sus visistantes son detectadas correctamente.",
+        "SkipThisChallenge": "Omitir este desafío",
+        "MatomoBeginner": "Matomo principiante",
+        "MatomoTalent": "Talento Matomo",
+        "MatomoProfessional": "Matomo Profesional",
+        "ConfigureGeolocation": "Configurar geolocalización",
+        "CustomiseDashboard": "Personalizar tablero",
+        "DefineGoal": "Agregar un objetivo",
+        "CompletionTitle": "¡Bien hecho!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/et.json b/app/plugins/Tour/lang/et.json
new file mode 100644
index 000000000..89c027149
--- /dev/null
+++ b/app/plugins/Tour/lang/et.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Korduvused",
+        "CompletionTitle": "Hästi tehtud!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/fa.json b/app/plugins/Tour/lang/fa.json
new file mode 100644
index 000000000..9d3350070
--- /dev/null
+++ b/app/plugins/Tour/lang/fa.json
@@ -0,0 +1,32 @@
+{
+    "Tour": {
+        "PluginDescription": "در کوتاه‌ترین زمان با کامل کردن چالش‌هایی که شما را با Matomo آشنا می‌کنند، در Matomo حرفه‌ای شوید.",
+        "Tour": "تور",
+        "Engagement": "مشغوليت‌",
+        "UploadLogo": "لوگوی خود را بارگذاری کنید",
+        "AddUser": "افزودن کاربر دیگر",
+        "AddWebsite": "افزودن وبسایت دیگر",
+        "AddReport": "افزودن گزارش زمانبندی شده",
+        "AddSegment": "افزودن یک بخش",
+        "AddAnnotation": "افزودن یک توضیح",
+        "BrowseMarketplace": "باز کردن بازار",
+        "PreviousChallenges": "چالش‌های قبلی",
+        "NextChallenges": "چالش‌های بعدی",
+        "RowEvolution": "تکامل ردیف",
+        "ViewX": "مشاهده %s",
+        "SetupX": "راه‌اندازی %s",
+        "SelectDateRange": "انتخاب بازه زمانی",
+        "SelectDateRangeDescription": "یک بازی زمانی را از تقویم انتخاب کنید.",
+        "ChangeVisualisation": "تغییر تصویرسازی",
+        "ChangeVisualisationDescription": "یک گزارش را مشاهده کنید و آیکون تصویرسازی را در انتهای گزارش انتخاب کنید تا همان گزارش را با تصویرسازی متفاوتی ببینید.",
+        "FlattenActions": "مسطح‌سازی یک گزارش صفحه",
+        "ShareAllChallengesCompleted": "همین الآن %1$s را با کامل کردن همه چالش‌های Matomo، باز کردم.",
+        "ChallengeCompleted": "تبریک! شما این چالش را به پایان رساندید.",
+        "BecomeMatomoExpert": "یک متخصص Matomo شوید",
+        "YouCanCallYourselfExpert": "شما الآن می‌توانید خودتان را یک %1$sمتخصص Matomo%2$s واقعی صدا بزنید.",
+        "StatusLevel": "شما اکنون یک %1$s هستید. %2$s چالش بیشتر را کامل کنید تا %3$s شوید.",
+        "ConfigureGeolocationDescription": "مطمئن شوید که مکان بازدیدکنندگان شما به درستی شناسایی شده.",
+        "SkipThisChallenge": "رد شدن از این چالش",
+        "CompletionTitle": "به خوبی انجام شد!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/fi.json b/app/plugins/Tour/lang/fi.json
new file mode 100644
index 000000000..fb8e2c6c3
--- /dev/null
+++ b/app/plugins/Tour/lang/fi.json
@@ -0,0 +1,36 @@
+{
+    "Tour": {
+        "PluginDescription": "Kehity Matomo-asiantuntijaksi hetkessä suorittamalla Matomoon perehdyttäviä haasteita.",
+        "Tour": "Tutustumismatka",
+        "Engagement": "Sitoutuminen",
+        "UploadLogo": "Lähetä logo",
+        "AddUser": "Lisää toinen käyttäjä",
+        "AddWebsite": "Lisää toinen sivusto",
+        "AddReport": "Lisää ajastettu raportti",
+        "AddSegment": "Lisää segmentti",
+        "BrowseMarketplace": "Selaa kauppaa",
+        "PreviousChallenges": "Aiemmat haasteet",
+        "NextChallenges": "Seuraavat haasteet",
+        "RowEvolution": "Rivin kehitys",
+        "ViewX": "Näytä %s",
+        "SetupX": "Määritä %s",
+        "SelectDateRange": "Valitse päiväalue",
+        "SelectDateRangeDescription": "Valitse päiväalue kalenterista.",
+        "ChallengeCompleted": "Onnittelut, suoritit tämän haasteen.",
+        "BecomeMatomoExpert": "Kehity Matomo-asiantuntijaksi",
+        "YouCanCallYourselfExpert": "Voit kutsua itseäsi nyt todelliseksi %1$sMatomo-asiantuntijaksi%2$s.",
+        "StatusLevel": "Olet %1$s. Suorita %2$s haastetta lisää, niin seuraava kehitysaskel on %3$s.",
+        "ConfigureGeolocationDescription": "Varmista että sivustojen vierailijoiden sijainti havaitaan oikein.",
+        "SkipThisChallenge": "Ohita tämä haaste",
+        "MatomoBeginner": "Matomo-aloittelija",
+        "MatomoIntermediate": "Matomo-osaaja",
+        "MatomoTalent": "Matomo-lahjakkuus",
+        "MatomoProfessional": "Matomo-ammattilainen",
+        "MatomoExpert": "Matomo-asiantuntija",
+        "CustomiseDashboard": "Mukauta kojelautaa",
+        "DefineGoal": "Lisää tavoite",
+        "EmbedTrackingCode": "Upota seurantakoodi",
+        "CompletionTitle": "Hyvä!",
+        "CompletionMessage": "Suoritit kaikki haasteet. Onnittele itseäsi."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/fr.json b/app/plugins/Tour/lang/fr.json
new file mode 100644
index 000000000..54321654a
--- /dev/null
+++ b/app/plugins/Tour/lang/fr.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Devenez un Expert Matomo en un clin d'oeuil en complètant des exercices qui vous habitueront à Matomo.",
+        "Tour": "Visite guidée",
+        "Engagement": "Engagement",
+        "UploadLogo": "Téléverser votre logo",
+        "AddUser": "Ajouter un utilisateur",
+        "AddWebsite": "Ajouter un autre site web",
+        "AddReport": "Ajouter un rapport planifié",
+        "AddSegment": "Ajouter un segment",
+        "AddAnnotation": "Ajouter une annotation",
+        "BrowseMarketplace": "Parcourir le marché",
+        "PreviousChallenges": "Exercices précédents",
+        "NextChallenges": "Prochains exercices",
+        "RowEvolution": "Evolution de la ligne",
+        "ViewX": "Afficher %s",
+        "SetupX": "Paramétrer %s",
+        "SelectDateRange": "Sélectionnez une plage de dates",
+        "SelectDateRangeDescription": "Sélectionnez une plage de date avec le calendrier.",
+        "ChangeVisualisation": "Changer la visualisation",
+        "ChangeVisualisationDescription": "Affichez un rapport et sélectionnez l'icône de visualisation en bas du rapport afin de d'afficher le même rapport avec une visualisation différente.",
+        "FlattenActions": "Aplatir un rapport de page",
+        "FlattenActionsDescription": "Rendez-vous à Comportement => Page et cliquez en bas du rapport sur l'icône de roue dentée afin d'aplatir le rapport. Un rapport aplati change la hiérachie d'un rapport groupé à une liste.",
+        "ViewRowEvolutionDescription": "L'evolution de la ligne vous affiche la donnée courante et passée d'une métrique pour m'importe quelle ligne du rapport.",
+        "ViewVisitsLogDescription": "Le journal des visites vous montre toutes les visites individuelles et les actions que chaque visiteur a effectuées sur votre site.",
+        "ViewVisitorProfileDescription": "Le journal des visiteurs vous permet de comprendre le comportement individuel de vos visiteurs en résummant et en listant les visites de vos visiteurs.",
+        "ShareAllChallengesCompleted": "Vous venez de débloquer la réussite %1$s en complétant l'ensemble des exercices Matomo.",
+        "ChallengeCompleted": "Félicitations, vous avez terminé cet exercice.",
+        "BecomeMatomoExpert": "Devenez un(e) Expert(e) Matomo",
+        "YouCanCallYourselfExpert": "Vous pouvez maintenant dire que vous êtes un(e) vrai(e) %1$sExpert(e) Matomo%2$s.",
+        "StatusLevel": "Vous êtes un(e) %1$s. Complétez %2$s exercices supplémentaires et vous deviendrez un(e) %3$s.",
+        "ConfigureGeolocationDescription": "Assurez vous que l'emplacement de vos visiteurs est détecté correctement.",
+        "DisableBrowserArchiving": "Désactiver l'archivage via le navigateur pour améliorer les performances",
+        "SkipThisChallenge": "Passer l'exercice",
+        "ShareYourAchievementOn": "Partagez vos accomplissements sur %1$s.",
+        "MatomoBeginner": "Débutant(e) Matomo",
+        "MatomoIntermediate": "Intermédiaire Matomo",
+        "MatomoTalent": "Talent Matomo",
+        "MatomoProfessional": "Professionnel Matomo",
+        "MatomoExpert": "Export Matomo",
+        "ConfigureGeolocation": "Configurer la géo-localisation",
+        "CustomiseDashboard": "Personnaliser le tableau de bord",
+        "CustomiseDashboardDescription": "Vous pouvez ajouter de nouveaux gadgets sur votre tableau de bord, cela permettra au rapport de contenir les métriques les plus importantes.",
+        "DefineGoal": "Ajouter un objectif",
+        "DefineGoalDescription": "Le suivit des conversions est une bonne manière d'identifier si vous êtes en train d'atteindre vos objectifs commerciaux ou non, d'identifier de nouveaux objectifs, de voir et analyser votre performance, et d'apprendre comment augmenter vos conversions, taux de conversions et revenu par visite.",
+        "EmbedTrackingCode": "Code de suivi embarqué",
+        "CompletionTitle": "Bravo !",
+        "CompletionMessage": "Vous avez complété tous les exercices. Donnez vous une tape dans le dos.",
+        "Part1Title": "Bienvenue à Matomo %1$s. Ce gadget vous aide à devenir un(e) Expert(e) Matomo en un clin d'oeuil.",
+        "Part2Title": "Continuez comme cela %1$s! Vous êtes en bon chemin pour devenir un(e) expert(e) Matomo.",
+        "Part3Title": "Beau progrès %1$s! Si vous continuez comme cela, vous serez un(e) expert(e) dans peu de temps!",
+        "Part4Title": "Beau progrès %1$s ! Il reste seulement quelques exercices à terminer.",
+        "OnlyVisibleToSuperUser": "Seulement vous en tant que %1$ssuper utilisateur%2$spouvez voir ce gadget."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/he.json b/app/plugins/Tour/lang/he.json
new file mode 100644
index 000000000..ca306ee8f
--- /dev/null
+++ b/app/plugins/Tour/lang/he.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "מעורבות",
+        "CompletionTitle": "כל הכבוד!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/hi.json b/app/plugins/Tour/lang/hi.json
new file mode 100644
index 000000000..e64974c32
--- /dev/null
+++ b/app/plugins/Tour/lang/hi.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "नियम",
+        "CompletionTitle": "बहुत बढ़िया!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/hu.json b/app/plugins/Tour/lang/hu.json
new file mode 100644
index 000000000..5913893ee
--- /dev/null
+++ b/app/plugins/Tour/lang/hu.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Érdeklődés foka",
+        "CompletionTitle": "Szép munka!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/id.json b/app/plugins/Tour/lang/id.json
new file mode 100644
index 000000000..b3283412f
--- /dev/null
+++ b/app/plugins/Tour/lang/id.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "Keterlibatan",
+        "BrowseMarketplace": "Ramban Pasar",
+        "CompletionTitle": "Selamat!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/is.json b/app/plugins/Tour/lang/is.json
new file mode 100644
index 000000000..f8dcd4451
--- /dev/null
+++ b/app/plugins/Tour/lang/is.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "Engagement": "Þáttaka"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/it.json b/app/plugins/Tour/lang/it.json
new file mode 100644
index 000000000..93a2ee803
--- /dev/null
+++ b/app/plugins/Tour/lang/it.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Diventa un esperto Matomo in pochissimo tempo completando delle sfide che ti faranno conoscere Matomo.",
+        "Tour": "Tour",
+        "Engagement": "Impegno",
+        "UploadLogo": "Carica il tuo logo",
+        "AddUser": "Aggiungi un altro utente",
+        "AddWebsite": "Aggiungi un altro sito web",
+        "AddReport": "Aggiungi un report programmato",
+        "AddSegment": "Aggiungi un segmento",
+        "AddAnnotation": "Aggiungi annotazione",
+        "BrowseMarketplace": "Guarda nel Marketplace",
+        "PreviousChallenges": "Sfide precedenti",
+        "NextChallenges": "Sfide successive",
+        "RowEvolution": "Evoluzione righe",
+        "ViewX": "Vista %s",
+        "SetupX": "Impostazioni %s",
+        "SelectDateRange": "Seleziona un intervallo di date",
+        "SelectDateRangeDescription": "Seleziona un intervallo di date dal calendario",
+        "ChangeVisualisation": "Cambia visualizzazioni",
+        "ChangeVisualisationDescription": "Guarda un report e seleziona l'icona visualizzazione in fondo a esso per vedere lo stesso report in una visualizzazione differente.",
+        "FlattenActions": "Appiattisci il report di pagina",
+        "FlattenActionsDescription": "Vai a Comportamento => Pagine e clicca nella parte inferiore del report sull'icona a forma di ingranaggio per appiattire il report. Un report appiattito modifica la gerarchia da un report raggruppato a un elenco.",
+        "ViewRowEvolutionDescription": "L'evoluzione delle righe mostra i dati della metrica corrente e passata per qualsiasi riga in qualsiasi report.",
+        "ViewVisitsLogDescription": "Il registro delle visite mostra tutte le singole visite e le azioni che ciascun visitatore ha compiuto sul tuo sito.",
+        "ViewVisitorProfileDescription": "Il registro dei visitatori ti aiuta a comprendere il comportamento individuale dei tuoi visitatori riassumendo ed elencando le loro visite.",
+        "ShareAllChallengesCompleted": "Ho appena sbloccato l'obiettivo %1$s completando tutte le sfide di Matomo.",
+        "ChallengeCompleted": "Congratulazioni, hai completato questa sfida.",
+        "BecomeMatomoExpert": "Diventa un Esperto Matomo",
+        "YouCanCallYourselfExpert": "Ora puoi considerarti un vero %1$sEsperto di Matomo%2$s.",
+        "StatusLevel": "Al momento sei un %1$s. Completa altre %2$s sfide e diventerai un %3$s.",
+        "ConfigureGeolocationDescription": "Assicura che la località dei tuoi visitatori sia individuata correttamente.",
+        "DisableBrowserArchiving": "Disabilita l'archiviazione browser per le migliori prestazioni",
+        "SkipThisChallenge": "Salta questa sfida",
+        "ShareYourAchievementOn": "Condividi i tuoi risultati su %1$s.",
+        "MatomoBeginner": "Principiante di Matomo",
+        "MatomoIntermediate": "Livello Intermedio di Matomo",
+        "MatomoTalent": "Genio di Matomo",
+        "MatomoProfessional": "Professionista di Matomo",
+        "MatomoExpert": "Esperto di Matomo",
+        "ConfigureGeolocation": "Configura geolocalizzazione",
+        "CustomiseDashboard": "Personalizza dashboard",
+        "CustomiseDashboardDescription": "Puoi aggiungere nuovi widget alla tua Dashboard, per assicurarti che essa riporti tutte le metriche più importanti..",
+        "DefineGoal": "Aggiungi un obiettivo",
+        "DefineGoalDescription": "Tracciare le conversioni è un ottimo modo per capire se stai raggiungendo i tuoi attuali obiettivi di business, identificare nuovi obiettivi, visualizzare e analizzare le tue prestazioni e imparare come aumentare conversioni, tassi di conversione ed entrate per visita.",
+        "EmbedTrackingCode": "Incorpora codice tracking",
+        "CompletionTitle": "Ben fatto!",
+        "CompletionMessage": "Hai completato tutte le sfide. Datti una pacca sulla spalla.",
+        "Part1Title": "Benvenuto in Matomo %1$s. Questo widget ti aiuterà a diventare un esperto di Matomo in pochissimo tempo.",
+        "Part2Title": "Continua così %1$s! Sei sulla buona strada per diventare un esperto di Matomo.",
+        "Part3Title": "Grandi progressi %1$s! Se continui così, sarai un esperto in pochissimo tempo!",
+        "Part4Title": "Grandi progressi %1$s! Solo poche altre sfide da completare.",
+        "OnlyVisibleToSuperUser": "Solo te come %1$sSuper User%2$s puoi vedere questo widget."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ja.json b/app/plugins/Tour/lang/ja.json
new file mode 100644
index 000000000..1d90789f4
--- /dev/null
+++ b/app/plugins/Tour/lang/ja.json
@@ -0,0 +1,23 @@
+{
+    "Tour": {
+        "Tour": "ツアー",
+        "Engagement": "利用状況",
+        "UploadLogo": "ロゴをアップロード",
+        "AddUser": "他のユーザーを追加",
+        "AddWebsite": "他のウェブサイトを追加",
+        "AddSegment": "区分を追加",
+        "AddAnnotation": "注釈を追加",
+        "BrowseMarketplace": "ブラウズ・マーケットプレイス",
+        "PreviousChallenges": "前のチャレンジ",
+        "NextChallenges": "次のチャレンジ",
+        "ViewX": "ビュー %s",
+        "SetupX": "%sを設定する",
+        "SelectDateRange": "データの期間を選択",
+        "SelectDateRangeDescription": "カレンダーでデータの期間を選択",
+        "SkipThisChallenge": "このチャレンジをスキップする",
+        "ConfigureGeolocation": "場所を設定",
+        "CustomiseDashboard": "ダッシュボードをカスタマイズ",
+        "DefineGoal": "ゴールを追加",
+        "CompletionTitle": "よくできました！"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ko.json b/app/plugins/Tour/lang/ko.json
new file mode 100644
index 000000000..c8de9f653
--- /dev/null
+++ b/app/plugins/Tour/lang/ko.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "이용상황",
+        "CompletionTitle": "잘 처리되었습니다!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/lt.json b/app/plugins/Tour/lang/lt.json
new file mode 100644
index 000000000..598ef1359
--- /dev/null
+++ b/app/plugins/Tour/lang/lt.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "Engagement": "Įsipareigojimai"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/nb.json b/app/plugins/Tour/lang/nb.json
new file mode 100644
index 000000000..46433e315
--- /dev/null
+++ b/app/plugins/Tour/lang/nb.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Engasjement",
+        "CompletionTitle": "Bra jobba!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/nl.json b/app/plugins/Tour/lang/nl.json
new file mode 100644
index 000000000..dd913adb0
--- /dev/null
+++ b/app/plugins/Tour/lang/nl.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Word in een mum van tijd een Matomo-expert door uitdagingen aan te gaan die je vertrouwd maken met Matomo.",
+        "Tour": "Tour",
+        "Engagement": "Betrokkenheid",
+        "UploadLogo": "Upload je logo",
+        "AddUser": "Voeg een andere gebruiker toe",
+        "AddWebsite": "Voeg een website toe",
+        "AddReport": "Voeg een gepland rapport toe",
+        "AddSegment": "Voeg een segment toe",
+        "AddAnnotation": "Voeg een annotatie toe",
+        "BrowseMarketplace": "Marktplaats doorzoeken",
+        "PreviousChallenges": "Voorgaande uitdagingen",
+        "NextChallenges": "Volgende uitdagingen",
+        "RowEvolution": "Rij evolutie",
+        "ViewX": "View %s",
+        "SetupX": "Setup %s",
+        "SelectDateRange": "Selecteer een periode",
+        "SelectDateRangeDescription": "Selecteer een periode in de kalender.",
+        "ChangeVisualisation": "Wijzig een visualisatie",
+        "ChangeVisualisationDescription": "Bekijk een rapport en selecteer de visualisatie icoon onderaan het rapport om het rapport in een andere visualisatie te bekijken.",
+        "FlattenActions": "Maak een pagina rapport vlak",
+        "FlattenActionsDescription": "Ga naar Gedrag => Pagina's en klik onderaan het rapport op het tandwiel pictogram om het rapport vlak te maken. Een vlak rapport verandert de hiërarchie van een gegroepeerd rapport in een lijst.",
+        "ViewRowEvolutionDescription": "Rij evolutie toont je de huidige & verleden statistiek gegevens voor elke rij in elk rapport.",
+        "ViewVisitsLogDescription": "Het bezoekers logboek toont je alle individuele bezoeken en acties welke elke bezoeker op je website heeft uitgevoerd.",
+        "ViewVisitorProfileDescription": "Het bezoekers logboek helpt je het individuele gedrag van je bezoekers te begrijpen door de bezoeken van je bezoekers samen te vatten en te vermelden.",
+        "ShareAllChallengesCompleted": "Net ontgrendeld de %1$s prestatie door alle Matomo uitdagingen te voltooien.",
+        "ChallengeCompleted": "Gefeliciteerd, je hebt deze uitdaging voltooid.",
+        "BecomeMatomoExpert": "Wordt een Matomo Expert",
+        "YouCanCallYourselfExpert": "Je kunt jezelf nu een echte %1$s Matomo Expert %2$s noemen.",
+        "StatusLevel": "Je bent momenteel een %1$s. Voltooi nog %2$s meer uitdagingen en wordt een %3$s.",
+        "ConfigureGeolocationDescription": "Zorg ervoor dat de locatie van uw bezoekers correct wordt gedetecteerd.",
+        "DisableBrowserArchiving": "Schakel browser archivering uit voor betere prestaties",
+        "SkipThisChallenge": "Sla deze uitdaging over",
+        "ShareYourAchievementOn": "Deel je prestaties op %1$s.",
+        "MatomoBeginner": "Matomo Beginner",
+        "MatomoIntermediate": "Matomo Intermediate",
+        "MatomoTalent": "Matomo Talent",
+        "MatomoProfessional": "Matomo Professional",
+        "MatomoExpert": "Matomo Expert",
+        "ConfigureGeolocation": "Configureer geolocatie",
+        "CustomiseDashboard": "Pas een dashboard aan",
+        "CustomiseDashboardDescription": "Je kunt nieuwe widgets toevoegen aan je Dashboard om ervoor te zorgen dat het rapporteert over al je belangrijkste statistieken.",
+        "DefineGoal": "Voeg een doel toe",
+        "DefineGoalDescription": "Conversies bijhouden is een geweldige manier om vast te stellen of je de huidige zakelijke doelstellingen haalt, nieuwe doelen te identificeren, je prestaties te bekijken en te analyseren en te leren hoe je conversies, conversiepercentages en inkomsten per bezoek kunt verhogen.",
+        "EmbedTrackingCode": "Integreer trackingcode",
+        "CompletionTitle": "Goed gedaan!",
+        "CompletionMessage": "Je hebt alle uitdagingen voltooid. Geef jezelf een schouderklop.",
+        "Part1Title": "Welkom bij Matomo %1$s. Met dit widget kan je in een mum van tijd een Matomo-expert worden.",
+        "Part2Title": "Hou het vol %1$s! Je bent goed op weg om een Matomo expert te worden.",
+        "Part3Title": "Goede vooruitgang %1$s! Als je zo doorgaat, word je een expert in no time!",
+        "Part4Title": "Goede vooruitgang %1$s! Nog maar een paar uitdagingen te gaan.",
+        "OnlyVisibleToSuperUser": "Allen jij als een %1$s Super User %2$skan dit widget zien."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/nn.json b/app/plugins/Tour/lang/nn.json
new file mode 100644
index 000000000..d0acbaf14
--- /dev/null
+++ b/app/plugins/Tour/lang/nn.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Engasjement",
+        "CompletionTitle": "Goed gedaan!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/pl.json b/app/plugins/Tour/lang/pl.json
new file mode 100644
index 000000000..39978f0ec
--- /dev/null
+++ b/app/plugins/Tour/lang/pl.json
@@ -0,0 +1,8 @@
+{
+    "Tour": {
+        "Engagement": "Zaangażowanie",
+        "BrowseMarketplace": "Przeglądaj Sklep",
+        "ViewX": "Widok %s",
+        "CompletionTitle": "Dobra robota!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/pt-br.json b/app/plugins/Tour/lang/pt-br.json
new file mode 100644
index 000000000..40dd46912
--- /dev/null
+++ b/app/plugins/Tour/lang/pt-br.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Torne-se um Expert Matomo rapidamente completando desafios que te familiarizam com o Matomo.",
+        "Tour": "Tour",
+        "Engagement": "Compromisso",
+        "UploadLogo": "Carregar seu logo",
+        "AddUser": "Adicionar outro usuário",
+        "AddWebsite": "Adicionar outro site",
+        "AddReport": "Adicionar um relatório agendado",
+        "AddSegment": "Adicionar um segmento",
+        "AddAnnotation": "Adicionar uma anotação",
+        "BrowseMarketplace": "Navegue no Marketplace",
+        "PreviousChallenges": "Desafios anteriores",
+        "NextChallenges": "Próximos desafios",
+        "RowEvolution": "Evolução de linha",
+        "ViewX": "Ver %s",
+        "SetupX": "Configurar %s",
+        "SelectDateRange": "Selecione um intervalo de datas",
+        "SelectDateRangeDescription": "Selecione um intervalo de datas no calendário.",
+        "ChangeVisualisation": "Mudar uma visualização",
+        "ChangeVisualisationDescription": "Visualize um relatório e selecione o ícone de visualização no rodapé de um relatório para ver o mesmo relatório em um visualização diferente.",
+        "FlattenActions": "Achatar um relatório de página",
+        "FlattenActionsDescription": "Vá em Comportamento => Páginas e clique no rodapé do relatório no ícone de engrenagem para achatar o relatório. Um relatório achatado altera a hierarquia de um relatório agrupado para uma lista.",
+        "ViewRowEvolutionDescription": "A evolução de linha mostra a você os dados métricos atuais e passados para qualquer linha em qualquer relatório.",
+        "ViewVisitsLogDescription": "O log de visitas mostra a você todas as ações e visitas individuais que cada visitante fez em seu site.",
+        "ViewVisitorProfileDescription": "O log de visitante ajuda você a entender o comportamento individual dos seus visitantes ao resumir e listar as visitas dos seus visitantes.",
+        "ShareAllChallengesCompleted": "Acabou de desbloquear a conquista %1$s ao completar todos os desafios Matomo.",
+        "ChallengeCompleted": "Parabéns, você completou este desafio.",
+        "BecomeMatomoExpert": "Tornar-se um Expert Matomo",
+        "YouCanCallYourselfExpert": "Agora você pode chamar-se de um verdadeiro %1$sExpert Matomo%2$s.",
+        "StatusLevel": "Você atualmente é um %1$s. Complete mais %2$s desafios e você se tornará um %3$s.",
+        "ConfigureGeolocationDescription": "Garantir que a localização de seus visitantes seja detectada corretamente.",
+        "DisableBrowserArchiving": "Desabilitar o arquivamento de navegador para melhorar a performance",
+        "SkipThisChallenge": "Pular este desafio",
+        "ShareYourAchievementOn": "Compartilhe sua conquista em %1$s.",
+        "MatomoBeginner": "Iniciante Matomo",
+        "MatomoIntermediate": "Intermediário Matomo",
+        "MatomoTalent": "Talento Matomo",
+        "MatomoProfessional": "Profissional Matomo",
+        "MatomoExpert": "Expert Matomo",
+        "ConfigureGeolocation": "Configurar geolocalização",
+        "CustomiseDashboard": "Personalizar painel",
+        "CustomiseDashboardDescription": "Você pode adicionar novos widgets ao seu painel para garantir que ele reporte todas as suas métricas mais importantes.",
+        "DefineGoal": "Adicionar uma meta",
+        "DefineGoalDescription": "O rastreamento de conversão é uma ótima maneira de identificar se você está atingindo seus atuais objetivos do negócio, identificar novos objetivos, visualizar e analisar sua performance, e aprender como aumentar suas conversões, taxas de conversão, e receita por visita.",
+        "EmbedTrackingCode": "Embutir código de rastreamento",
+        "CompletionTitle": "Bom trabalho!",
+        "CompletionMessage": "Você completou todos os desafios. Pode dar-se um tapinha nas costas.",
+        "Part1Title": "Bem vindo ao Matomo %1$s. Este widget irá ajudá-lo a tornar-se um expert em Matomo num instante.",
+        "Part2Title": "Continue assim %1$s! Você está no caminho para tornar-se um expert em Matomo.",
+        "Part3Title": "Ótimo progresso %1$s! Se você continuar assim, você será um expert num instante.",
+        "Part4Title": "Ótimo progresso %1$s! Só mais alguns desafios para completar.",
+        "OnlyVisibleToSuperUser": "Somente você como um %1$sSuper Usuário%2$s pode ver este widget."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/pt.json b/app/plugins/Tour/lang/pt.json
new file mode 100644
index 000000000..996bac46d
--- /dev/null
+++ b/app/plugins/Tour/lang/pt.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Torne-se num especialista do Matomo em pouco tempo, concluindo desafios que o vão familiarizar com o Matomo.",
+        "Tour": "Digressão",
+        "Engagement": "Interesse",
+        "UploadLogo": "Carregar o seu logótipo",
+        "AddUser": "Adicionar outro utilizador",
+        "AddWebsite": "Adicionar outro site",
+        "AddReport": "Adicionar um relatório agendado",
+        "AddSegment": "Adicionar um segmento",
+        "AddAnnotation": "Adicionar uma anotação",
+        "BrowseMarketplace": "Explorar a loja",
+        "PreviousChallenges": "Desafios anteriores",
+        "NextChallenges": "Próximos desafios",
+        "RowEvolution": "Evolução da linha",
+        "ViewX": "Ver %s",
+        "SetupX": "Configurar %s",
+        "SelectDateRange": "Escolher um intervalo de datas",
+        "SelectDateRangeDescription": "Selecionar um intervalo de datas no calendário.",
+        "ChangeVisualisation": "Alterar uma visualização",
+        "ChangeVisualisationDescription": "Ver um relatório e selecionar o ícone de visualização no final de um relatório para ver o mesmo relatório com uma visualização diferente.",
+        "FlattenActions": "Nivelar um relatório de página",
+        "FlattenActionsDescription": "Aceda a Comportamento => Páginas e clique no ícone da engrenagem no final de um relatório para o nivelar. Um relatório nivelado altera a hierarquia de um relatório agrupado para uma lista.",
+        "ViewRowEvolutionDescription": "A evolução da linha mostra as métricas atuais e anteriores da informação para qualquer linha em qualquer relatório.",
+        "ViewVisitsLogDescription": "O registo de visitas apresenta-lhe todas as visitas individuais e as ações realizadas por cada visitante no seu site.",
+        "ViewVisitorProfileDescription": "O registo de visitantes ajuda-o a melhor compreender o comportamento individual dos seus visitantes através do resumo e listagem das visitas dos mesmos.",
+        "ShareAllChallengesCompleted": "Acabou de desbloquear a conquista %1$s ao concluir todos os desafios do Matomo.",
+        "ChallengeCompleted": "Parabéns, conseguiu completar este desafio.",
+        "BecomeMatomoExpert": "Torne-se num especialista do Matomo",
+        "YouCanCallYourselfExpert": "Agora pode considerar-se um verdadeiro %1$sEspecialista do Matomo%2$s.",
+        "StatusLevel": "Atualmente é um %1$s. Complete mais %2$sdesafios para se tornar num %3$s.",
+        "ConfigureGeolocationDescription": "Garanta que a localização dos seus visitantes é detetada corretamente.",
+        "DisableBrowserArchiving": "Desative o arquivamento pelo navegador para um melhor desempenho",
+        "SkipThisChallenge": "Saltar este desafio",
+        "ShareYourAchievementOn": "Partilhe as suas conquistas em %1$s.",
+        "MatomoBeginner": "Iniciante do Matomo",
+        "MatomoIntermediate": "Conhecimento intermédio do Matomo",
+        "MatomoTalent": "Semi-profissional do Matomo",
+        "MatomoProfessional": "Profissional do Matomo",
+        "MatomoExpert": "Especialista do Matomo",
+        "ConfigureGeolocation": "Configurar a geolocalização",
+        "CustomiseDashboard": "Personalizar o painel",
+        "CustomiseDashboardDescription": "Pode adicionar novos widgets ao seu Painel, para garantir que este apresenta informações sobre as métricas mais importantes para si.",
+        "DefineGoal": "Adicionar um objetivo",
+        "DefineGoalDescription": "O acompanhamento da conversão é uma excelente forma para identificar se está a atingir os seus objetivos atuais de negócio, identificar novos objetivos, ver ou analisar o seu desempenho e saber como aumentar as suas conversões, taxas de conversão e rendimento por visita.",
+        "EmbedTrackingCode": "Incorporar código de acompanhamento",
+        "CompletionTitle": "Excelente!",
+        "CompletionMessage": "Conseguiu completar todos os desafios. Merece uma palmadinha nas costas.",
+        "Part1Title": "Bem-vindo ao Matomo %1$s. Este widget vai ajudá-lo a tornar-se num especialista do Matomo num instante.",
+        "Part2Title": "Continue assim %1$s! Está no bom caminho para se tornar num especialista do Matomo.",
+        "Part3Title": "Que ótimo progresso %1$s! Se continuar assim, será um especialista do Matomo num instante!",
+        "Part4Title": "Ótimo progresso %1$s! Restam apenas alguns desafios para terminar.",
+        "OnlyVisibleToSuperUser": "Apenas você, como %1$sSuper-utilizador%2$s pode ver esta widget."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ro.json b/app/plugins/Tour/lang/ro.json
new file mode 100644
index 000000000..7228825fb
--- /dev/null
+++ b/app/plugins/Tour/lang/ro.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Vizite repetate",
+        "CompletionTitle": "Bine facut!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ru.json b/app/plugins/Tour/lang/ru.json
new file mode 100644
index 000000000..4e4fe1504
--- /dev/null
+++ b/app/plugins/Tour/lang/ru.json
@@ -0,0 +1,26 @@
+{
+    "Tour": {
+        "PluginDescription": "Станьте экспертом Matomo в кратчайшие сроки, выполняя задания, знакомящие вас с Matomo.",
+        "Tour": "Тур",
+        "Engagement": "Повторные посещения",
+        "UploadLogo": "Загрузите свой логотип",
+        "AddUser": "Добавить другого пользователя",
+        "AddWebsite": "Добавить другой сайт",
+        "AddReport": "Добавить запланированный отчет",
+        "AddSegment": "Добавить сегмент",
+        "AddAnnotation": "Добавить аннотацию",
+        "BrowseMarketplace": "Обзор Marketplace",
+        "SelectDateRange": "Выберите диапазон дат",
+        "SelectDateRangeDescription": "Выберите диапазон дат в календаре.",
+        "ChangeVisualisation": "Изменить визуализацию",
+        "ChangeVisualisationDescription": "Просмотрите отчет и выберите значок визуализации в нижней части отчета, чтобы просмотреть тот же отчет в другой визуализации.",
+        "FlattenActions": "Свести отчет страницы",
+        "ChallengeCompleted": "Поздравляю, вы выполнили эту задачу.",
+        "ConfigureGeolocationDescription": "Убедитесь, что местоположение ваших посетителей правильно определено.",
+        "DisableBrowserArchiving": "Отключите архивирование браузера для лучшей производительности",
+        "SkipThisChallenge": "Пропустить этот вызов",
+        "ShareYourAchievementOn": "Поделитесь своими достижениями на %1$s.",
+        "ConfigureGeolocation": "Настроить геолокацию",
+        "CompletionTitle": "Отлично!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/sk.json b/app/plugins/Tour/lang/sk.json
new file mode 100644
index 000000000..f9df26add
--- /dev/null
+++ b/app/plugins/Tour/lang/sk.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Záujem",
+        "CompletionTitle": "Výborne!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/sl.json b/app/plugins/Tour/lang/sl.json
new file mode 100644
index 000000000..4d8d1f1bc
--- /dev/null
+++ b/app/plugins/Tour/lang/sl.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Interes",
+        "CompletionTitle": "Dobro opravljeno!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/sq.json b/app/plugins/Tour/lang/sq.json
new file mode 100644
index 000000000..11d1d4a72
--- /dev/null
+++ b/app/plugins/Tour/lang/sq.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Bëhuni menjëherë një Ekspert Matomo-je duke plotësuar hapat që ju bëjnë familjar me Matomo-n.",
+        "Tour": "Tur",
+        "Engagement": "Angazhim",
+        "UploadLogo": "Ngarkoni logon tuaj",
+        "AddUser": "Shtoni një përdorues tjetër",
+        "AddWebsite": "Shtoni një sajt tjetër",
+        "AddReport": "Shtoni një raport të planifikuar",
+        "AddSegment": "Shtoni një segment",
+        "AddAnnotation": "Shtoni një shënim",
+        "BrowseMarketplace": "Shfletoni në Marketplace",
+        "PreviousChallenges": "Hapa të mëparshëm",
+        "NextChallenges": "Hapa pasues",
+        "RowEvolution": "Evolucion Rreshtash",
+        "ViewX": "Shihni %s",
+        "SetupX": "Ujdisje e %s",
+        "SelectDateRange": "Përzgjidhni një interval datash",
+        "SelectDateRangeDescription": "Përzgjidhni në kalendar një interval datash",
+        "ChangeVisualisation": "Ndryshoni vizualizim",
+        "ChangeVisualisationDescription": "Shihni një raport dhe përzgjidhni ikonën e vizualizimeve, në fund të një raporti, për ta parë të njëjtin raport nën një vizualizim tjetër.",
+        "FlattenActions": "Sheshojeni raportin e një faqeje",
+        "FlattenActionsDescription": "Shkoni te Sjellje => Faqe dhe klikoni në fund të raportit mbi ikonën ingranazh që të sheshohet raporti. Një raport i sheshuar e ndryshon hierarkinë nga raport i grupuar në listë.",
+        "ViewRowEvolutionDescription": "Evoluimi i rreshtit ju shfaq të dhëna të dikurshme & të tanishme matjesh për çfarëdo rreshti në çfarëdo raport.",
+        "ViewVisitsLogDescription": "Regjistri i vizitave ju shfaq krejt vizitat dhe veprimet individuale që kreu çdo vizitor në sajtin tuaj.",
+        "ViewVisitorProfileDescription": "Regjistri i vizitorëve ju ndihmon të kuptoni sjelljen individuale të vizitorëve tuaj duke përmbledhur dhe shfaqur vizitat e tyre.",
+        "ShareAllChallengesCompleted": "Sapo kapët arritjen %1$s duke plotësuar krejt hapat për Matomo-n.",
+        "ChallengeCompleted": "Përgëzime, e plotësuat këtë hap.",
+        "BecomeMatomoExpert": "Bëhuni Ekspert Matomo-je",
+        "YouCanCallYourselfExpert": "Tani mund ta quani veten një %1$sEkspert Matomo-je%2$s të vërtetë.",
+        "StatusLevel": "Jeni një %1$s. Plotësoni %2$s hapa më tepër dhe bëheni një %3$s.",
+        "ConfigureGeolocationDescription": "Siguroni që vendndodhja e vizitorëve tuaj të pikaset saktë.",
+        "DisableBrowserArchiving": "Për punim më të mirë, çaktivizoni arkivim shfletuesi",
+        "SkipThisChallenge": "Anashkaloje këtë hap",
+        "ShareYourAchievementOn": "Tregojuni arritjen tuaj në %1$s.",
+        "MatomoBeginner": "Fillestar Matomo-je",
+        "MatomoIntermediate": "Mesatar Matomo-je",
+        "MatomoTalent": "Talent Matomo-je",
+        "MatomoProfessional": "Profesionist Matomo-je",
+        "MatomoExpert": "Eskpert Matomo-je",
+        "ConfigureGeolocation": "Formësoni gjeovendëzimin",
+        "CustomiseDashboard": "Përshtatni pultin",
+        "CustomiseDashboardDescription": "Te Pulti juaj mund të shtoni widget-e të rinj, për të siguruar që ju raporton krejt të dhënat tuaja më të rëndësishme.",
+        "DefineGoal": "Shtoni një synim",
+        "DefineGoalDescription": "Ndjekja e shndërrimeve është një mënyrë e fuqishme për të identifikuar nëse po i arrini objektivat tuaj të biznesit, për të identifikuar objektiva të reja, të shihni dhe analizoni si po ecni, dhe të mësoni si të shtoni nivelin e shndërrimeve, shkallë shndërrimesh dhe të ardhura për vizitë.",
+        "EmbedTrackingCode": "Trupëzoni kod gjurmimesh",
+        "CompletionTitle": "Ju lumtë!",
+        "CompletionMessage": "Keni plotësuar krejt hapat. Rrihini shpatullat vetes.",
+        "Part1Title": "Mirë se vini te Matomo %1$s. Këto hapa do t’ju ndihmojnë të bëheni ekspert Matomo-je pa humbur kohë.",
+        "Part2Title": "Vazhdoni kështu, %1$s! Jeni në rrugë të mbarë për t’u bërë një ekspert Matomo-je.",
+        "Part3Title": "Ecuri e bukur, %1$s! Nëse vazhdoni kështu, do të bëheni pa humbur kohë ekspert!",
+        "Part4Title": "Ecuri e bukur, %1$s! Vetëm pak hapa akoma për t’u plotësuar.",
+        "OnlyVisibleToSuperUser": "Këtë mund ta shihni vetëm ju si %1$sSuperpërdorues%2$s."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/sr.json b/app/plugins/Tour/lang/sr.json
new file mode 100644
index 000000000..877e78661
--- /dev/null
+++ b/app/plugins/Tour/lang/sr.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "Zainteresovanost",
+        "BrowseMarketplace": "Pretraži Market",
+        "CompletionTitle": "Odlično!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/sv.json b/app/plugins/Tour/lang/sv.json
new file mode 100644
index 000000000..9b125852b
--- /dev/null
+++ b/app/plugins/Tour/lang/sv.json
@@ -0,0 +1,13 @@
+{
+    "Tour": {
+        "Engagement": "Engagemang",
+        "UploadLogo": "Ladda upp logotyp",
+        "AddUser": "Lägg till användare",
+        "AddWebsite": "Lägg till webbplats",
+        "AddSegment": "Lägg till segment",
+        "AddAnnotation": "Lägg till anteckning",
+        "BrowseMarketplace": "Utforska marknadsplatsen",
+        "SelectDateRange": "Välj datumintervall",
+        "CompletionTitle": "Bra gjort!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/ta.json b/app/plugins/Tour/lang/ta.json
new file mode 100644
index 000000000..37c83ce12
--- /dev/null
+++ b/app/plugins/Tour/lang/ta.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "CompletionTitle": "நன்றாக செய்தீர்கள்!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/th.json b/app/plugins/Tour/lang/th.json
new file mode 100644
index 000000000..c58813ef4
--- /dev/null
+++ b/app/plugins/Tour/lang/th.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "Engagement": "ความมุ่งมั่น"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/tl.json b/app/plugins/Tour/lang/tl.json
new file mode 100644
index 000000000..a73ffbd5e
--- /dev/null
+++ b/app/plugins/Tour/lang/tl.json
@@ -0,0 +1,5 @@
+{
+    "Tour": {
+        "Engagement": "Engagement"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/tr.json b/app/plugins/Tour/lang/tr.json
new file mode 100644
index 000000000..08e8141bc
--- /dev/null
+++ b/app/plugins/Tour/lang/tr.json
@@ -0,0 +1,55 @@
+{
+    "Tour": {
+        "PluginDescription": "Kısa sürede eğitimleri tamamlayarak Matomo uzmanı olabilirsiniz.",
+        "Tour": "Tur",
+        "Engagement": "Bağlılık",
+        "UploadLogo": "Logonuzu yükleyin",
+        "AddUser": "Başka bir kullanıcı ekleyin",
+        "AddWebsite": "Başka bir web sitesi ekleyin",
+        "AddReport": "Zamanlanmış bir rapor ekleyin",
+        "AddSegment": "Yeni bir dilim ekleyin",
+        "AddAnnotation": "Yeni bir not ekleyin",
+        "BrowseMarketplace": "Mağazaya Göz At",
+        "PreviousChallenges": "Önceki eğitimler",
+        "NextChallenges": "Sonraki eğitimler",
+        "RowEvolution": "Satır gelişimi",
+        "ViewX": "%s Görüntüle",
+        "SetupX": "%s Kur",
+        "SelectDateRange": "Bir tarih aralığı seçin",
+        "SelectDateRangeDescription": "Takvimden bir tarih aralığı seçin.",
+        "ChangeVisualisation": "Bir görselleştirme seçin",
+        "ChangeVisualisationDescription": "Bir raporu görüntüledikten sonra raporun atındaki görselleştirme simgesine tıklayarak raoru farklı biçimlerde görüntüleyebilirsiniz.",
+        "FlattenActions": "Bir sayfa raporunu düzleştirin",
+        "FlattenActionsDescription": "Davranış => Sayfalar bölümüne giderek raporu düzleştirmek için raporun altındaki dişli simgesine tıklayın. Düzleştirilmiş bir rapor gruplanmış bir rapordan listeye olan hiyerarşiyi değiştirir.",
+        "ViewRowEvolutionDescription": "Satır gelişimi, herhangi bir rapordaki herhangi bir satırın güncel ve geçmiş ölçüm verilerini görüntüler.",
+        "ViewVisitsLogDescription": "Ziyaret geçmişi günlüğü tüm tekil ziyaretleri ve her bir ziyaretçinin sitede yaptığı işlemleri görüntüler.",
+        "ViewVisitorProfileDescription": "Ziyaretçi günlükleri, ziyaretçilerin bireysel davranışlarını derleyip listeleyerek daha iyi anlamanıza yardımcı olur.",
+        "ShareAllChallengesCompleted": "Tüm Matomo eğitimlerini tamamlayarak %1$s düzeyine ulaştınız.",
+        "ChallengeCompleted": "Tebrikler bu eğitimi tamamladınız.",
+        "BecomeMatomoExpert": "Matomo Uzmanı Olun",
+        "YouCanCallYourselfExpert": "Artık kendinizi gerçek bir %1$sMatomo Uzmanı%2$s olarak adlandırabilirsiniz.",
+        "StatusLevel": "Şu anda %1$s düzeyindesiniz. %2$s eğitim daha tamamlayarak bir %3$s olun.",
+        "ConfigureGeolocationDescription": "Ziyaretçilerinizin konumunun doğru olarak algılandığından emin olun.",
+        "DisableBrowserArchiving": "Daha iyi başarım için web tarayıcı arşivlemesini devre dışı bırakın.",
+        "SkipThisChallenge": "Bu eğitimi atla",
+        "ShareYourAchievementOn": "Başarınızı %1$s üzerinden paylaşın.",
+        "MatomoBeginner": "Matomo Heveslisi",
+        "MatomoIntermediate": "Matomo Kullanıcısı",
+        "MatomoTalent": "Matomo Yeteneği",
+        "MatomoProfessional": "Matomo Profesyoneli",
+        "MatomoExpert": "Matomo Uzmanı",
+        "ConfigureGeolocation": "Coğrafi konum yapılandırması",
+        "CustomiseDashboard": "Panoyu özelleştir",
+        "CustomiseDashboardDescription": "Panoya sizin için önemli ölçümleri görüntüleyecek yeni bileşenler ekleyebilirsiniz.",
+        "DefineGoal": "Bir hedef ekleyin",
+        "DefineGoalDescription": "Dönüşüm izleme özelliği iş hedeflerinize ulaşmak, yeni hedefler belirlemek, başarımı ölçmek ve değerlendirmek ile dönüşümleri, dönüşüm oranları ve ziyaret başına kar değerlerini nasıl arttırabileceğinizi öğrenmenizi sağlar.",
+        "EmbedTrackingCode": "İzleme kodu ekleme",
+        "CompletionTitle": "Tebrikler!",
+        "CompletionMessage": "Tüm eğitimleri tamamladınız. Gurur duyabilirsiniz.",
+        "Part1Title": "%1$s Matomo uygulamasına hoş geldiniz. Bu bileşen zaman kaybetmeden Matomo uzmanı olmanızı sağlar.",
+        "Part2Title": "Ha gayret %1$s! Bir Matomo uzmanı olmaya az kaldı.",
+        "Part3Title": "Harika %1$s! Böyle devam ederseniz yakında uzman olacaksınız!",
+        "Part4Title": "Harika %1$s! Tamamlamanız gereken yalnız bir kaç eğitim daha kaldı.",
+        "OnlyVisibleToSuperUser": "Bir %1$sSüper Kullanıcı%2$s olarak bu bileşeni yalnız siz görebilirsiniz."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/uk.json b/app/plugins/Tour/lang/uk.json
new file mode 100644
index 000000000..8c1a4ffbe
--- /dev/null
+++ b/app/plugins/Tour/lang/uk.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "Повторні відвідування",
+        "BrowseMarketplace": "Перегляд Маркету",
+        "CompletionTitle": "Відмінно!"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/vi.json b/app/plugins/Tour/lang/vi.json
new file mode 100644
index 000000000..6069c1370
--- /dev/null
+++ b/app/plugins/Tour/lang/vi.json
@@ -0,0 +1,6 @@
+{
+    "Tour": {
+        "Engagement": "Tham gia",
+        "CompletionTitle": "Thực hiện tốt"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/zh-cn.json b/app/plugins/Tour/lang/zh-cn.json
new file mode 100644
index 000000000..0db990004
--- /dev/null
+++ b/app/plugins/Tour/lang/zh-cn.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "PluginDescription": "通过完成使您熟悉Matomo的挑战，立即成为Matomo专家。",
+        "Engagement": "忠诚度",
+        "CompletionTitle": "干的不错，加油！"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/lang/zh-tw.json b/app/plugins/Tour/lang/zh-tw.json
new file mode 100644
index 000000000..19a152d14
--- /dev/null
+++ b/app/plugins/Tour/lang/zh-tw.json
@@ -0,0 +1,7 @@
+{
+    "Tour": {
+        "Engagement": "參與度",
+        "BrowseMarketplace": "瀏覽市集",
+        "CompletionTitle": "做的好！"
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/Tour/templates/engagement.twig b/app/plugins/Tour/templates/engagement.twig
index 10ca82296..405e02c0d 100644
--- a/app/plugins/Tour/templates/engagement.twig
+++ b/app/plugins/Tour/templates/engagement.twig
@@ -50,9 +50,11 @@
         <p class="tourSuperUserNote">{{ 'Tour_OnlyVisibleToSuperUser'|translate('<a href="https://matomo.org/faq/general/faq_35/" target="_blank" rel="noreferrer noopener">', '</a>')|raw }}</p>
         <script>
             jQuery(window).off('focus.tourEngagement').on('focus.tourEngagement', function () {
-                tourEngagement.goToPage({{ currentPage|e('js') }});
+                if (jQuery('#widgetTourgetEngagement').size()) {
+                    tourEngagement.goToPage({{ currentPage|e('js') }});
+                }
             });
         </script>
     {% endif %}
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/plugins/Transitions/API.php b/app/plugins/Transitions/API.php
index 4c57d2722..88bca868e 100644
--- a/app/plugins/Transitions/API.php
+++ b/app/plugins/Transitions/API.php
@@ -271,6 +271,7 @@ protected function queryFollowingActions($idaction, $actionType, LogAggregator $
         $types[Action::TYPE_DOWNLOAD] = 'downloads';
 
         $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping);
+        $rankingQuery->setOthersLabel('Others');
         $rankingQuery->addLabelColumn(array('name', 'url_prefix'));
         $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($types));
 
@@ -282,7 +283,15 @@ protected function queryFollowingActions($idaction, $actionType, LogAggregator $
         }
 
         $metrics = array(Metrics::INDEX_NB_ACTIONS);
-        $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionColumn);
+        $data = $logAggregator->queryActionsByDimension(
+            array($dimension),
+            $where,
+            $selects,
+            $metrics,
+            $rankingQuery,
+            $joinLogActionColumn,
+            $secondaryOrderBy = "`name`"
+        );
 
         $dataTables = $this->makeDataTablesFollowingActions($types, $data);
 
@@ -301,6 +310,7 @@ protected function queryFollowingActions($idaction, $actionType, LogAggregator $
     protected function queryExternalReferrers($idaction, $actionType, $logAggregator, $limitBeforeGrouping = false)
     {
         $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping);
+        $rankingQuery->setOthersLabel('Others');
 
         // we generate a single column that contains the interesting data for each referrer.
         // the reason we cannot group by referer_* becomes clear when we look at search engine keywords.
@@ -379,6 +389,7 @@ protected function queryInternalReferrers($idaction, $actionType, $logAggregator
         $keyIsSiteSearchAction = 2;
 
         $rankingQuery = new RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping);
+        $rankingQuery->setOthersLabel('Others');
         $rankingQuery->addLabelColumn(array('name', 'url_prefix'));
         $rankingQuery->setColumnToMarkExcludedRows('is_self');
         $rankingQuery->partitionResultIntoMultipleGroups('action_partition', array($keyIsOther, $keyIsPageUrlAction, $keyIsSiteSearchAction));
@@ -415,7 +426,15 @@ protected function queryInternalReferrers($idaction, $actionType, $logAggregator
             $joinLogActionOn = $dimension;
         }
         $metrics = array(Metrics::INDEX_NB_ACTIONS);
-        $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionOn);
+        $data = $logAggregator->queryActionsByDimension(
+            array($dimension),
+            $where,
+            $selects,
+            $metrics,
+            $rankingQuery,
+            $joinLogActionOn,
+            $secondaryOrderBy = "`name`"
+        );
 
         $loops = 0;
         $nbPageviews = 0;
diff --git a/app/plugins/Transitions/Transitions.php b/app/plugins/Transitions/Transitions.php
index 8649bf110..7d6248fdc 100644
--- a/app/plugins/Transitions/Transitions.php
+++ b/app/plugins/Transitions/Transitions.php
@@ -21,10 +21,16 @@ public function registerEvents()
         return array(
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
-            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+            'API.getPagesComparisonsDisabledFor' => 'getPagesComparisonsDisabledFor',
         );
     }
 
+    public function getPagesComparisonsDisabledFor(&$pages)
+    {
+        $pages[] = "General_Actions.Transitions_Transitions";
+    }
+
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = 'plugins/Transitions/stylesheets/transitions.less';
diff --git a/app/plugins/Transitions/config/config.php b/app/plugins/Transitions/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Transitions/config/config.php
+++ b/app/plugins/Transitions/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Transitions/config/tracker.php b/app/plugins/Transitions/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Transitions/config/tracker.php
+++ b/app/plugins/Transitions/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Transitions/lang/es-ar.json b/app/plugins/Transitions/lang/es-ar.json
index 245689b23..e6569e02c 100644
--- a/app/plugins/Transitions/lang/es-ar.json
+++ b/app/plugins/Transitions/lang/es-ar.json
@@ -1,27 +1,38 @@
 {
     "Transitions": {
         "BouncesInline": "%s rebotes",
-        "DirectEntries": "Ingresos directos",
-        "ErrorBack": "Regrese a la acción anterior",
+        "DirectEntries": "Entradas directas",
+        "Transitions": "Transiciones",
+        "ErrorBack": "Volver a la acción anterior",
         "ExitsInline": "%s salidas",
+        "NumPageviews": "%s vistas",
+        "NumDownloads": "%s descargas",
+        "NumOutlinks": "%s enlaces externos",
+        "TopX": "Principales %s etiquetas",
+        "FeatureDescription": "Las transiciones te dan un informe que muestra las cosas que tus visitantes hicieron directamente antes y después de ver cierta página. Esta página explicará cómo acceder, entender y usar el poderoso informe de Transiciones.",
+        "AvailableInOtherReports": "¿Lo sabías? Las transiciones también están disponibles como una acción de fila en los siguientes informes:",
+        "AvailableInOtherReports2": "Simplemente pasá el mouse sobre una fila de cualquiera de estos informes y hacé clic en el ícono de transición %s para ejecutarlo.",
         "FromCampaigns": "Desde campañas",
         "FromPreviousPages": "Desde páginas internas",
         "FromPreviousPagesInline": "%s desde páginas internas",
         "FromPreviousSiteSearches": "Desde búsquedas internas",
         "FromPreviousSiteSearchesInline": "%s desde búsquedas internas",
         "FromSearchEngines": "Desde motores de búsqueda",
-        "FromWebsites": "Desde sitios de internet",
+        "FromSocialNetworks": "Desde redes sociales",
+        "FromWebsites": "Desde sitios web",
         "IncomingTraffic": "Tráfico entrante",
         "LoopsInline": "%s recargas de página",
-        "NoDataForAction": "No hay información para %s",
-        "NoDataForActionDetails": "O la acción no tuvo vistas de páginas durante el período %s o es inválida.",
+        "NoDataForAction": "No hay datos para %s",
+        "NoDataForActionDetails": "O la acción no tuvo vistas de páginas durante el período %s o no es válida.",
         "OutgoingTraffic": "Tráfico saliente",
+        "PluginDescription": "Acciones siguientes y anteriores del informe para cada dirección web de página en un nuevo informe de Transiciones, disponible en lis informes de Acciones a través de un nuevo ícono.",
         "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": "%1$s (de %2$s)"
+        "XOutOfYVisits": "%1$s (de %2$s)",
+        "PageURLTransitions": "Dirección web de la página de transiciones"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Transitions/lang/pt-br.json b/app/plugins/Transitions/lang/pt-br.json
index a2b952ade..098406100 100644
--- a/app/plugins/Transitions/lang/pt-br.json
+++ b/app/plugins/Transitions/lang/pt-br.json
@@ -2,30 +2,37 @@
     "Transitions": {
         "BouncesInline": "%s rejeições",
         "DirectEntries": "Entradas diretas",
+        "Transitions": "Transições",
         "ErrorBack": "Voltar para a ação anterior",
         "ExitsInline": "%s saídas",
         "NumPageviews": "%s exibições de página",
         "NumDownloads": "%s baixados",
         "NumOutlinks": "%s links externos",
+        "TopX": "%s principais rótulos",
+        "FeatureDescription": "Transições mostra um relatório de o que seus visitantes fizeram imediatamente antes e depois de visualizarem uma página específica. Esta página explicará como acessar, entender e usar o poderoso relatório Transições.",
+        "AvailableInOtherReports": "Você sabia? Transições também está disponível como uma ação de linha nos seguintes relatórios:",
+        "AvailableInOtherReports2": "Passe o mouse sobre qualquer um desses relatórios e clique no ícone de transição %s para abri-lo.",
         "FromCampaigns": "De campanhas",
-        "FromPreviousPages": "De Páginas internas",
+        "FromPreviousPages": "De páginas internas",
         "FromPreviousPagesInline": "%s de páginas internas",
-        "FromPreviousSiteSearches": "de pesquisas internas",
+        "FromPreviousSiteSearches": "De pesquisa interna",
         "FromPreviousSiteSearchesInline": "%s de pesquisas internas",
         "FromSearchEngines": "Dos motores de busca",
-        "FromWebsites": "de Websites",
+        "FromSocialNetworks": "Das redes sociais",
+        "FromWebsites": "De sites web",
         "IncomingTraffic": "Tráfego de entrada",
         "LoopsInline": "%s atualizações de página",
         "NoDataForAction": "Não há dados para %s",
         "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",
+        "OutgoingTraffic": "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 %1$s exibições (%2$s de todos as exibições)",
+        "ShareOfAllPageviews": "Esta página teve %1$s exibições (%2$s de todas 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": "%1$s (fora de %2$s)"
+        "XOutOfYVisits": "%1$s (de %2$s)",
+        "PageURLTransitions": "Transições de URL da página"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Transitions/lang/sv.json b/app/plugins/Transitions/lang/sv.json
index c8f1ea2c2..c88bab2f9 100644
--- a/app/plugins/Transitions/lang/sv.json
+++ b/app/plugins/Transitions/lang/sv.json
@@ -2,11 +2,14 @@
     "Transitions": {
         "BouncesInline": "%s avvisningar",
         "DirectEntries": "Direktträffar",
+        "Transitions": "Övergångar",
         "ErrorBack": "Gå tillbaka till föregående åtgärd",
         "ExitsInline": "%s utgångar",
         "NumPageviews": "%s sidvisningar",
         "NumDownloads": "%s nerladdningar",
         "NumOutlinks": "%s utlänkar",
+        "TopX": "%s främsta etiketterna",
+        "AvailableInOtherReports": "Visste du att övergångar även finns som en radåtgärd i följande rapporter?",
         "FromCampaigns": "Från kampanjer",
         "FromPreviousPages": "Från interna sidor",
         "FromPreviousPagesInline": "%s från interna sidor",
diff --git a/app/plugins/Transitions/lang/zh-cn.json b/app/plugins/Transitions/lang/zh-cn.json
index d2cf543a0..694198754 100644
--- a/app/plugins/Transitions/lang/zh-cn.json
+++ b/app/plugins/Transitions/lang/zh-cn.json
@@ -2,17 +2,23 @@
     "Transitions": {
         "BouncesInline": "%s 次跳出",
         "DirectEntries": "直接输入",
+        "Transitions": "转场",
         "ErrorBack": "返回上次的活动",
         "ExitsInline": "%s 次退出",
         "NumPageviews": "%s PV",
         "NumDownloads": "%s 下载",
         "NumOutlinks": "%s 外链",
+        "TopX": "前%s个标签",
+        "FeatureDescription": "转换提供一个报告，显示访问者在查看某个页面之前和之后直接执行的操作。本页将解释如何访问、理解和使用功能强大的转换报表。",
+        "AvailableInOtherReports": "你知道吗？在以下报表中，转换也可用作行操作：",
+        "AvailableInOtherReports2": "只需将这些报表中的一行悬停，然后单击转换图标%s即可启动它。",
         "FromCampaigns": "来自广告",
         "FromPreviousPages": "来自内部页面",
         "FromPreviousPagesInline": "%s 次来自站内页面",
         "FromPreviousSiteSearches": "来自站内搜索",
         "FromPreviousSiteSearchesInline": "%s 次来自站内搜索",
         "FromSearchEngines": "来自搜索引擎",
+        "FromSocialNetworks": "来自社交网络",
         "FromWebsites": "来自网站",
         "IncomingTraffic": "入口流量",
         "LoopsInline": "%s 次刷新页面",
@@ -26,6 +32,7 @@
         "ToFollowingSiteSearches": "站内搜索",
         "ToFollowingSiteSearchesInline": "%s 次站内搜索",
         "XOfAllPageviews": "%s 的本页浏览量",
-        "XOutOfYVisits": "%1$s (共 %2$s)"
+        "XOutOfYVisits": "%1$s (共 %2$s)",
+        "PageURLTransitions": "页面URL转换"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/TwoFactorAuth/Validator.php b/app/plugins/TwoFactorAuth/Validator.php
index 9840635b5..77b4bb271 100644
--- a/app/plugins/TwoFactorAuth/Validator.php
+++ b/app/plugins/TwoFactorAuth/Validator.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\TwoFactorAuth;
 
 use Piwik\Common;
+use Piwik\Exception\NotYetInstalledException;
 use Piwik\Piwik;
 use Piwik\Session\SessionFingerprint;
 use Exception;
@@ -45,7 +46,7 @@ public function checkCanUseTwoFa()
         Piwik::checkUserIsNotAnonymous();
 
         if (!SettingsPiwik::isPiwikInstalled()) {
-            throw new \Exception('Matomo is not set up yet');
+            throw new NotYetInstalledException('Matomo is not set up yet');
         }
     }
 
diff --git a/app/plugins/TwoFactorAuth/config/config.php b/app/plugins/TwoFactorAuth/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/TwoFactorAuth/config/config.php
+++ b/app/plugins/TwoFactorAuth/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/TwoFactorAuth/config/tracker.php b/app/plugins/TwoFactorAuth/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/TwoFactorAuth/config/tracker.php
+++ b/app/plugins/TwoFactorAuth/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/TwoFactorAuth/lang/da.json b/app/plugins/TwoFactorAuth/lang/da.json
index 50fe66421..772aeda78 100644
--- a/app/plugins/TwoFactorAuth/lang/da.json
+++ b/app/plugins/TwoFactorAuth/lang/da.json
@@ -1,6 +1,7 @@
 {
     "TwoFactorAuth": {
         "TwoFactorAuthentication": "Tofaktorgodkendelse",
+        "TwoFAShort": "2FA",
         "TwoFactorAuthenticationIntro": "%1$sTofaktorgodkendelse%2$s øger sikkerheden for din konto ved at tilføje et ekstra niveau af godkendelse, når du logger ind. Hver gang du logger ind, vil du ikke kun blive spurgt om dit brugernavn og din adgangskode men tillige en godkendelseskode, der skifter løbende og er dannet eksempelvis på din mobiltelefon. Det betyder, at selvom nogen kender din brugernavn og din adgangskode, kan de stadig ikke logge ind, medmindre de også har adgang til din mobiltelefon.",
         "TwoFactorAuthenticationIsEnabled": "Tofaktorgodkendelse er nu aktiveret.",
         "TwoFactorAuthenticationIsDisabled": "Tofaktorgodkendelse er pt. deaktiveret.",
diff --git a/app/plugins/TwoFactorAuth/lang/es-ar.json b/app/plugins/TwoFactorAuth/lang/es-ar.json
new file mode 100644
index 000000000..a153a42b2
--- /dev/null
+++ b/app/plugins/TwoFactorAuth/lang/es-ar.json
@@ -0,0 +1,49 @@
+{
+    "TwoFactorAuth": {
+        "TwoFactorAuthentication": "Autenticación de 2 factores",
+        "TwoFAShort": "2FA",
+        "TwoFactorAuthenticationIntro": "La %1$sautenticación de 2 factores%2$s aumenta la seguridad de tu cuenta al agregar una capa adicional de verificación cuando iniciás sesión. Cada vez que intentés iniciar sesión, no sólo se te pedirá tus credenciales habituales (tu dirección de correo electrónico y tu contraseña), sino un código adicional de autenticación, el cual cambia periódicamente y que es generado, por ejemplo, en tu dispositivo móvil. Esto significa que incluso si alguien sabe tu nombre de usuario y contraseña, esa persona no podrá iniciar sesión, a menos que tenga acceso a tu dispositivo móvil, siguiendo el ejemplo.",
+        "TwoFactorAuthenticationIsEnabled": "La autenticación de 2 factores actualmente está habilitada.",
+        "TwoFactorAuthenticationIsDisabled": "La autenticación de 2 factores actualmente está deshabilitada.",
+        "TwoFactorAuthenticationRequired": "Es obligatorio que la autenticación de 2 factores esté habilitada para todos; no podés deshabilitarla.",
+        "ConfigureDifferentDevice": "Configurar un dispositivo diferente",
+        "SetUpTwoFactorAuthentication": "Configurar la autenticación de 2 factores (2FA)",
+        "RequiredToSetUpTwoFactorAuthentication": "Es obligatorio que configurés la autenticación de 2 factores antes de iniciar sesión",
+        "AuthenticationCode": "Código de autenticación",
+        "Verify": "Verificar",
+        "StepX": "Paso %s",
+        "MissingAuthCodeAPI": "Por favor, especificá el código de autenticación de 2 factores.",
+        "InvalidAuthCode": "El código de autenticación de 2 factores no es correcto.",
+        "RequiredAuthCodeNotConfiguredAPI": "Es obligatorio que configurés la autenticación de 2 factores. Por favor, iniciá sesión.",
+        "VerifyIdentifyExplanation": "Abrí la aplicación de la autenticación de 2 factores en tu dispositivo para ver tu código de autenticación y verificar tu identidad.",
+        "DontHaveYourMobileDevice": "¿No tenés tu dispositivo móvil?",
+        "EnterRecoveryCodeInstead": "Ingresá uno de tus códigos de recuperación",
+        "AskSuperUserResetAuthenticationCode": "Pedile a un súperusuario que restablezca tu código de autenticación",
+        "SetupIntroFollowSteps": "Por favor, seguí estos pasos para configurar la autenticación de 2 factores:",
+        "SetupFinishedTitle": "¡Felicitaciones! Ahora tu cuenta es más segura.",
+        "SetupFinishedSubtitle": "Configuraste tu autenticación de 2 factores exitosamente. La próxima vez que intentés iniciar sesión, vas a tener que ingresar el código de autenticación. Asegurate de tener tu dispositivo móvil al alcance o de tener los códigos de recuperación.",
+        "WarningChangingConfiguredDevice": "Estás a punto de cambiar el dispositivo configurado con la autenticación de 2 factores. Esto invalidará cualquier otro dispositivo configurado.",
+        "ShowRecoveryCodes": "Mostrar códigos de recuperación",
+        "ConfirmSetup": "Confirmar configuración",
+        "NotPossibleToLogIn": "No se pudo iniciar sesión en Matomo Analytics",
+        "LostAuthenticationDevice": "Hola, %1$s. Tengo la autenticación de 2 factores habilitada y perdí mi dispositivo de autenticación. Por favor, ¿podrías restablecer la autenticación de 2 factores para mi nombre de usuario \"%5$s\"? Podés encontrar las instrucciones acá: %6$s. %2$sLa dirección web de Matomo es: %3$s.%4$sGracias.",
+        "WrongAuthCodeTryAgain": "Se ingresó un código de autenticación incorrecto. Por favor, intentá de nuevo.",
+        "DisableTwoFA": "Deshabilitar la autenticación de 2 factores",
+        "EnableTwoFA": "Habilitar la autenticación de 2 factores",
+        "ConfirmDisableTwoFA": "¿Estás seguro que querés deshabilitar la autenticación de 2 factores en tu cuenta? Teniéndola habilitada aumenta la seguridad en la misma.",
+        "VerifyAuthCodeIntro": "Por favor, ingresá abajo el código de 6 dígitos que aparece en tu aplicación de autenticación para confirmar que configuraste tu dispositivo exitosamente.",
+        "VerifyAuthCodeHelp": "Por favor, ingresá el código de 6 dígitos que se generó en tu dispositivo móvil luego de escanear el código de barra.",
+        "Your2FaAuthSecret": "Tu autenticación de 2 factores secreto",
+        "SetupAuthenticatorOnDevice": "Configurar la aplicación de autenticación en tu dispositivo",
+        "SetupAuthenticatorOnDeviceStep1": "Instalá una aplicación de autenticación, por ejemplo:",
+        "SetupAuthenticatorOnDeviceStep2": "A continuación, abrí la aplicación y escaneá el código de barras con la aplicación de autenticación de 2 factores en tu dispositivo móvil. Si no podés escanear el código de barras, %1$singresá este código%2$s.",
+        "SetupBackupRecoveryCodes": "Por favor, resguardá tus códigos de recuperación usando uno de los métodos anteriores antes de continuar con la autenticación de 2 factores.",
+        "RecoveryCodes": "Códigos de recuperación",
+        "RecoveryCodesExplanation": "Podés usar los códigos de recuperación para acceder a tu cuenta cuando no podés usar los códigos de la autenticación de 2 factores, como por ejemplo, cuando no tenés al alcance tu dispositivo móvil.",
+        "RecoveryCodesSecurity": "Por favor, tratá tus códigos de recuperación ¡con el mismo nivel de seguridad que lo harías con tu contraseña!",
+        "RecoveryCodesAllUsed": "Ya se usaron todos los códigos de recuperación. Es altamente recomendable que regenerés tus códigos.",
+        "RecoveryCodesRegenerated": "Se regeneraron los códigos de recuperación. Asegurate de descargar o imprimir los nuevos códigos generados.",
+        "GenerateNewRecoveryCodes": "Generar nuevos códigos de recuperación",
+        "GenerateNewRecoveryCodesInfo": "Cuando generás nuevos códigos de recuperación, los anteriores dejan de funcionar. Asegurate de descargar o imprimir los nuevos códigos generados."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/TwoFactorAuth/lang/pt-br.json b/app/plugins/TwoFactorAuth/lang/pt-br.json
new file mode 100644
index 000000000..c6385443e
--- /dev/null
+++ b/app/plugins/TwoFactorAuth/lang/pt-br.json
@@ -0,0 +1,49 @@
+{
+    "TwoFactorAuth": {
+        "TwoFactorAuthentication": "Autenticação de dois fatores",
+        "TwoFAShort": "A2F",
+        "TwoFactorAuthenticationIntro": "A %1$sautenticação de dois fatores%2$s aumenta a segurança da sua conta ao adicionar uma camada a mais de verificação quando você faz login. Cada vez que você fizer login você não apenas terá que informar seu login e senha, mas tembém um token adicional de autenticação que muda periodicamente e é gerado por exemplo no seu dispositivo móvel. Isto significa que mesmo que alguém saiba seu usuário e senha, ele não conseguirá fazer login a não ser que ele tenha acesso ao seu dispositivo móvel, por exemplo.",
+        "TwoFactorAuthenticationIsEnabled": "A autenticação de dois fatores está atualmente habilitada.",
+        "TwoFactorAuthenticationIsDisabled": "A autenticação de dois fatores está atualmente desabilitada.",
+        "TwoFactorAuthenticationRequired": "A autenticação de dois fatores está configurada como necessária para todos, você não pode desabilitá-la.",
+        "ConfigureDifferentDevice": "Configurar um outro dispositivo",
+        "SetUpTwoFactorAuthentication": "Configurar a autenticação de dois fatores (A2F)",
+        "RequiredToSetUpTwoFactorAuthentication": "Você deve configurar a autenticação de dois fatores antes de poder fazer login",
+        "AuthenticationCode": "Código de autenticação",
+        "Verify": "Verificar",
+        "StepX": "Passo %s",
+        "MissingAuthCodeAPI": "Favor especificar o código da autenticação de dois fatores.",
+        "InvalidAuthCode": "O código da autenticação de dois fatores não está correto.",
+        "RequiredAuthCodeNotConfiguredAPI": "Você deve configurar a autenticação de dois fatores. Favor fazer login em sua conta.",
+        "VerifyIdentifyExplanation": "Abra o aplicativo de autenticação de dois fatores no seu dispositivo para ver seu código de autenticação e verificar sua identidade.",
+        "DontHaveYourMobileDevice": "Não está com seu dispositivo móvel?",
+        "EnterRecoveryCodeInstead": "Digite um dos seus códigos de recuperação",
+        "AskSuperUserResetAuthenticationCode": "Peça a um super usuário para redefinir seu código de autenticação",
+        "SetupIntroFollowSteps": "Por favor siga estes passos para configurar a autenticação de dois fatores:",
+        "SetupFinishedTitle": "Parabéns! Sua conta está mais segura agora.",
+        "SetupFinishedSubtitle": "Você configurou com sucesso a autenticação de dois fatores. Na próxima vez que fizer login, você precisará digitar também o código de autenticação. Assegure-se de ter com você seu dispositivo móvel ou seus códigos de backup.",
+        "WarningChangingConfiguredDevice": "Você está prestes a mudar o dispositivo configurado com autenticação de dois fatores. Isto irá invalidar qualquer dispositivo configurado anteriormente.",
+        "ShowRecoveryCodes": "Mostrar códigos de recuperação",
+        "ConfirmSetup": "Confirmar configuração",
+        "NotPossibleToLogIn": "Não foi possível fazer login no Matomo Analytics",
+        "LostAuthenticationDevice": "Olá, %1$s Eu estou com a autenticação de fois fatores habilitada e perdi meu dispositivo de autenticação. Você poderia por favor redefinir a autenticação de dois fatores para o meu usuário %5$s? Você pode ver as instruções para isto aqui: %6$s.%2$s A URL do Matomo é %3$s.%4$sObrigado",
+        "WrongAuthCodeTryAgain": "Código de autenticação digitado está incorreto. Por favor tente novamente.",
+        "DisableTwoFA": "Desabilitar autenticação de dois fatores",
+        "EnableTwoFA": "Habilitar autenticação de dois fatores",
+        "ConfirmDisableTwoFA": "Tem certeza de que deseja desabilitar a autenticação de dois fatores para sua conta? Ter habilitada a autenticação de dois fatores aumenta a segurança da sua conta.",
+        "VerifyAuthCodeIntro": "Por favor digite abaixo o código de seis dígitos do seu aplicativo autenticador para confirmar que a configuração foi feita com sucesso no seu dispositivo.",
+        "VerifyAuthCodeHelp": "Por favor digite o código de seis dígitos que foi gerado no seu dispositivo móvel após escanear o código de barras.",
+        "Your2FaAuthSecret": "Seu segredo da autenticação de dois fatores",
+        "SetupAuthenticatorOnDevice": "Configurar o autenticador no seu dispositivo",
+        "SetupAuthenticatorOnDeviceStep1": "Instale um aplicativo autenticador, por exemplo:",
+        "SetupAuthenticatorOnDeviceStep2": "Depois, abra o aplicativo e escaneie o código de barras abaixo com o aplicativo de autenticação de dois fatores no seu telefone. Se você não conseguir escanear o código de barras, %1$sdigite este código%2$s no lugar.",
+        "SetupBackupRecoveryCodes": "Por favor faça backup dos seus códigos de recuperação usando um dos métodos acima antes de continuar a configuração da autenticação de dois fatores.",
+        "RecoveryCodes": "Códigos de recuperação",
+        "RecoveryCodesExplanation": "Você pode usar códigos de recuperação para acessar sua conta quando você não puder receber códigos de autenticação de dois fatores, por exemplo quando você não estiver com seu dispositivo móvel.",
+        "RecoveryCodesSecurity": "Por favor trate os seus códigos de recuperação com o mesmo nível de segurança que você trata a sua senha!",
+        "RecoveryCodesAllUsed": "Todos os códigos de segurança foram usados, é altamente recomendado que você gere novamente os seus códigos de recuperação.",
+        "RecoveryCodesRegenerated": "Os códigos de recuperação foram gerados novamente. Não esqueça de baixar ou imprimir os novos códigos gerados.",
+        "GenerateNewRecoveryCodes": "Gerar novos códigos de recuperação",
+        "GenerateNewRecoveryCodesInfo": "Quando você gera novos códigos de recuperação, os antigos códigos não funcionarão mais. Não esqueça de baixar ou imprimir os seus novos códigos."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/TwoFactorAuth/lang/ru.json b/app/plugins/TwoFactorAuth/lang/ru.json
new file mode 100644
index 000000000..3ee46ca11
--- /dev/null
+++ b/app/plugins/TwoFactorAuth/lang/ru.json
@@ -0,0 +1,23 @@
+{
+    "TwoFactorAuth": {
+        "TwoFactorAuthentication": "Двухфакторная аутентификация",
+        "TwoFAShort": "2FA",
+        "TwoFactorAuthenticationIsEnabled": "Двухфакторная аутентификация в настоящее время включена.",
+        "TwoFactorAuthenticationIsDisabled": "Двухфакторная аутентификация в настоящее время отключена.",
+        "TwoFactorAuthenticationRequired": "Двухфакторная аутентификация должна быть включена для всех, ее нельзя отключить.",
+        "ConfigureDifferentDevice": "Настроить другое устройство",
+        "SetUpTwoFactorAuthentication": "Настройка двухфакторной аутентификации (2FA)",
+        "RequiredToSetUpTwoFactorAuthentication": "Вы должны настроить двухфакторную аутентификацию, прежде чем вы сможете войти",
+        "AuthenticationCode": "Код аутентификации",
+        "Verify": "Подтвердить",
+        "MissingAuthCodeAPI": "Пожалуйста, укажите код двухфакторной аутентификации.",
+        "InvalidAuthCode": "Код двухфакторной аутентификации неверен.",
+        "RequiredAuthCodeNotConfiguredAPI": "Вам необходимо настроить двухфакторную аутентификацию. Пожалуйста, войдите в свой аккаунт.",
+        "VerifyIdentifyExplanation": "Откройте приложение двухфакторной аутентификации на своем устройстве, чтобы просмотреть код аутентификации и подтвердить свою личность.",
+        "DontHaveYourMobileDevice": "У вас нет мобильного устройства?",
+        "EnterRecoveryCodeInstead": "Введите один из ваших кодов восстановления",
+        "AskSuperUserResetAuthenticationCode": "Попросите супер пользователя сбросить ваш код аутентификации",
+        "SetupIntroFollowSteps": "Пожалуйста, выполните следующие действия для настройки двухфакторной аутентификации:",
+        "SetupFinishedTitle": "Поздравляем! Ваша учетная запись стала более безопасной."
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/UserCountry/Archiver.php b/app/plugins/UserCountry/Archiver.php
index 1fb9ad68b..16eca3bd2 100644
--- a/app/plugins/UserCountry/Archiver.php
+++ b/app/plugins/UserCountry/Archiver.php
@@ -107,12 +107,13 @@ private function makeRegionCityLabelsUnique(&$row)
             $row[$column] = str_replace(self::LOCATION_SEPARATOR, '', $row[$column]);
         }
 
-        if (!empty($row[self::REGION_FIELD])) {
-            $row[self::REGION_FIELD] = $row[self::REGION_FIELD] . self::LOCATION_SEPARATOR . $row[self::COUNTRY_FIELD];
+        // set city first, as containing region might be manipulated afterwards if not empty
+        if (!empty($row[self::CITY_FIELD])) {
+            $row[self::CITY_FIELD] = $row[self::CITY_FIELD] . self::LOCATION_SEPARATOR . $row[self::REGION_FIELD] . self::LOCATION_SEPARATOR . $row[self::COUNTRY_FIELD];
         }
 
-        if (!empty($row[self::CITY_FIELD])) {
-            $row[self::CITY_FIELD] = $row[self::CITY_FIELD] . self::LOCATION_SEPARATOR . $row[self::REGION_FIELD];
+        if (!empty($row[self::REGION_FIELD])) {
+            $row[self::REGION_FIELD] = $row[self::REGION_FIELD] . self::LOCATION_SEPARATOR . $row[self::COUNTRY_FIELD];
         }
     }
 
diff --git a/app/plugins/UserCountry/Columns/Base.php b/app/plugins/UserCountry/Columns/Base.php
index 1b737bd05..1ee6ea9d1 100644
--- a/app/plugins/UserCountry/Columns/Base.php
+++ b/app/plugins/UserCountry/Columns/Base.php
@@ -25,6 +25,11 @@ abstract class Base extends VisitDimension
     private $visitorGeolocator;
 
     protected function getUrlOverrideValueIfAllowed($urlParamToOverride, Request $request)
+    {
+        return self::getValueFromUrlParamsIfAllowed($urlParamToOverride, $request);
+    }
+
+    public static function getValueFromUrlParamsIfAllowed($urlParamToOverride, Request $request)
     {
         $value = Common::getRequestVar($urlParamToOverride, false, 'string', $request->getParams());
 
diff --git a/app/plugins/UserCountry/VisitorGeolocator.php b/app/plugins/UserCountry/VisitorGeolocator.php
index 3aa52bd3f..5f992af39 100644
--- a/app/plugins/UserCountry/VisitorGeolocator.php
+++ b/app/plugins/UserCountry/VisitorGeolocator.php
@@ -265,7 +265,7 @@ public function reattributeVisitLogs($from, $to, $idSite = null, $iterationStep
                     $onLogProcessed($row, $updatedValues);
                 }
             }
-        });
+        }, $willDelete = false);
     }
 
     /**
diff --git a/app/plugins/UserCountry/config/tracker.php b/app/plugins/UserCountry/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/UserCountry/config/tracker.php
+++ b/app/plugins/UserCountry/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/UserCountry/lang/da.json b/app/plugins/UserCountry/lang/da.json
index a8f8bee6d..3cf9d8ce2 100644
--- a/app/plugins/UserCountry/lang/da.json
+++ b/app/plugins/UserCountry/lang/da.json
@@ -13,10 +13,12 @@
         "Continent": "Kontinent",
         "Continents": "Kontinenter",
         "Country": "Land",
+        "CountryCode": "Landekode",
         "country_a1": "Anonym proxy",
         "country_a2": "Satellit udbyder",
         "country_cat": "Catalansk-talende samfund",
         "country_o1": "Andet land",
+        "VisitLocation": "Brugerlokation",
         "CurrentLocationIntro": "I følge denne tjeneste er din aktuelle lokation",
         "DefaultLocationProviderDesc1": "Standardlokationstjenesten gætter en besøgendes land baseret på det sprog de bruger.",
         "DefaultLocationProviderDesc2": "Dette er ikke særlig nøjagtigt, så %1$svi anbefaler at du installerer og bruger %2$sGeoIP%3$s.%4$s",
@@ -30,10 +32,12 @@
         "GeoIPCannotFindMbstringExtension": "Kan ikke finde %1$s funktionen. Sørg for at %2$s udvidelsen er installeret og indlæst.",
         "GeoIPDatabases": "GeoIP databaser",
         "GeoIPDocumentationSuffix": "For at se data for rapporten, skal du opsætte GeoIP i Geolokaliseringsfanen. Den kommercielle %1$sMaxmind%2$s GeoIP-database er mere præcise end den gratis er. For at se hvor nøjagtig den er, skal du klikke %3$sher%4$s.",
+        "GeoIPNoDatabaseFound": "Denne GeoIP implementering kunne ikke finde nogen database.",
         "GeoIPImplHasAccessTo": "GeoIP implementering har adgang til følgende typer af databaser",
         "GeoIPIncorrectDatabaseFormat": "Din GeoIP-database lader ikke til at have det korrekte format. Måske er den beskadiget. Vær sikker på du bruger den binære udgave og prøv evt. at erstatte den med en anden kopi.",
         "GeoIpLocationProviderDesc_Pecl1": "Lokationstjenesten bruger en GeoIP-database og et PECL-modul til præcist og effektivt at bestemme lokationen på ​​dine besøgende.",
         "GeoIpLocationProviderDesc_Pecl2": "Der er ingen begrænsninger med denne tjeneste, så det er den vi anbefaler du bruger.",
+        "GeoIpLocationProviderDesc_Php1": "Denne lokationsudbyder er simpel at installere, da den ikke kræver nogen serverkonfiguration (ideel for delt hosting!). Den bruger GeoIP database og MasxMinds PHP API til præcist at fastsætte dine besøgendes lokation.",
         "GeoIpLocationProviderDesc_Php2": "Hvis hjemmesiden får en masse trafik, kan du opleve, at denne lokationstjeneste er for langsom. I så fald skal du installere %1$sPECL-udvidelsen%2$s eller et %3$sservermodul%4$s.",
         "GeoIpLocationProviderDesc_ServerBased1": "Lokasationstjenesten bruger det GeoIP-modul, der er installeret i din HTTP-server. Tjenesten er hurtig og præcis, men %1$skan kun bruges med normal browser tracking.%2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "Hvis du skal importere logfiler eller gøre noget andet, der kræver indstilling af IP-adresser, skal du bruge %1$sPECL GeoIP implementering (anbefales)%2$s eller %3$sPHP GeoIP implementering%4$s.",
@@ -67,11 +71,13 @@
         "ISPDatabase": "Internetudbyder (ISP) database",
         "IWantToDownloadFreeGeoIP": "Jeg vil hente den gratis GeoIP database...",
         "Latitude": "Breddegrad",
+        "Latitudes": "Breddegrader",
         "Location": "Sted",
         "LocationDatabase": "Lokationsdatabase",
         "LocationDatabaseHint": "En lokationsdatabase er enten en land-, region- eller by-database.",
         "LocationProvider": "Lokationstjeneste",
         "Longitude": "Længdegrad",
+        "Longitudes": "Længdegrader",
         "NoDataForGeoIPReport1": "Der er ingen data for rapporten, fordi der enten ikke er lokaliseringsdata til rådighed, eller besøgendes IP-adresser ikke kan geografisk placeres.",
         "NoDataForGeoIPReport2": "For at aktivere nøjagtig geolokalisering skal indstillingerne ændres %1$sher%2$s og bruge en %3$sbyniveaudatabase%4$s.",
         "Organization": "Organisation",
diff --git a/app/plugins/UserCountry/lang/es-ar.json b/app/plugins/UserCountry/lang/es-ar.json
index dcdc310fe..2c5d8bd0d 100644
--- a/app/plugins/UserCountry/lang/es-ar.json
+++ b/app/plugins/UserCountry/lang/es-ar.json
@@ -1,83 +1,103 @@
 {
     "UserCountry": {
-        "AssumingNonApache": "No se puede encontrar la función apache_get_modules, asumiendo que se posee un servidor de internet no-Apache.",
-        "CannotFindGeoIPDatabaseInArchive": "No se encuentra el archivo %1$s en el archivo tar %2$s!",
-        "CannotFindGeoIPServerVar": "La variable %s no está especificada. Su servidor puede no estar configurado correctamente.",
-        "CannotFindPeclGeoIPDb": "No se encuentra en la base de datos el país, región o ciudad en el módulo GeoIP PECL. Asegúrese que su base de datos GeoIP esté localizada en %1$s y sea nombrada %2$s o %3$s, de no ser así, el módulo PECL no lo reconocerá.",
+        "AssumingNonApache": "No se puede encontrar la función \"apache_get_modules\", asumiendo que se posee un servidor de internet no-Apache.",
+        "CannotFindGeoIPDatabaseInArchive": "¡No se encuentra el archivo %1$s en el archivo tar %2$s!",
+        "CannotFindGeoIPServerVar": "La variable %s no está especificada. Tu servidor puede no estar configurado correctamente.",
+        "CannotFindPeclGeoIPDb": "No se pudo encontrar una base de datos de país, región o ciudad en el módulo GeoIP PECL. Asegurate de que tu base de datos GeoIP esté ubicada en %1$s y que se llame %2$s o %3$s; de lo contrario, el módulo PECL no la reconocerá.",
         "CannotListContent": "No se pudo enumerar el contenido de %1$s: %2$s",
         "CannotLocalizeLocalIP": "La dirección IP %s es una dirección local y no puede ser geolocalizada.",
-        "CannotUnzipDatFile": "No se puede descomprimir el archivo dat en %1$s: %2$s",
+        "CannotSetupGeoIPAutoUpdating": "Parece que estás guardando tus bases de datos de GeoIP por fuera de Matomo (nos damos cuenta porque no hay base de datos en el subdirectorio \"misc\", pero tu GeoIP está funcionando). Matomo no puede actualizar automáticamente tus bases de datos GeoIP si están ubicadas fuera del directorio \"misc\".",
+        "CannotUnzipDatFile": "No se pudo descomprimir el archivo dat en %1$s: %2$s",
         "City": "Ciudad",
         "CityAndCountry": "%1$s, %2$s",
         "Continent": "Continente",
+        "Continents": "Continentes",
         "Country": "País",
-        "country_a1": "Proxy Anonimo",
-        "country_a2": "Proveedor Satelital",
+        "CountryCode": "Código de país",
+        "country_a1": "Proxy anónimo",
+        "country_a2": "Proveedor satelital",
         "country_cat": "Comunidades de habla catalana",
-        "country_o1": "Otro País",
-        "CurrentLocationIntro": "De acuerdo a este proveedor, su actual ubicación es",
-        "DefaultLocationProviderDesc1": "El proveedor de ubicación por defecto asume que el país del visitante es por el lenguaje que él utiliza.",
-        "DefaultLocationProviderDesc2": "No es muy preciso, por lo tanto %1$srecomendamos instalar y utilizar %2$sGeoIP%3$s.%4$s",
+        "country_o1": "Otro país",
+        "VisitLocation": "Ubicación de la visita",
+        "CurrentLocationIntro": "De acuerdo a este proveedor, tu ubicación actual es",
+        "DefaultLocationProviderDesc1": "El proveedor de ubicación predeterminado asume que el país del visitante es por el lenguaje que él utiliza.",
+        "DefaultLocationProviderDesc2": "Esto no es muy preciso, por lo tanto %1$srecomendamos instalar y utilizar %2$sGeoIP%3$s.%4$s",
+        "DefaultLocationProviderExplanation": "Estás usando el proveedor de ubicación predeterminado, lo que significa que Matomo intentará adivinar la ubicación del visitante basándose en el idioma que usa. %1$sLeé esto%2$s para aprender cómo configurar una geolocalización más precisa.",
         "DistinctCountries": "%s países distintos",
         "DownloadingDb": "Descargando %s",
         "DownloadNewDatabasesEvery": "Actualizar bases de datos cada",
-        "FromDifferentCities": "different cities",
-        "GeoIPCannotFindMbstringExtension": "No encuentro la función %1$s. Por favor, asegúrese que la extensión %2$s esté instalada y cargada.",
+        "FatalErrorDuringDownload": "Ocurrió un error fatal al descargar este archivo. Puede ser que haya algo malo con tu conexión de Internet, con la base de datos de GeoIP que descargaste o con Matomo. Intentá descargarla e instalarla manualmente.",
+        "FoundApacheModules": "Matomo encontró los siguientes módulos Apache",
+        "FromDifferentCities": "ciudades diferentes",
+        "GeoIPCannotFindMbstringExtension": "No se encuentra la función %1$s. Por favor, asegurate que la extensión %2$s esté instalada y cargada.",
         "GeoIPDatabases": "Bases de datos GeoIP",
-        "GeoIPDocumentationSuffix": "Para observar la información de este informe, debe configurar GeoIP en la sección Geolocalización en la lengüeta del administrador. Las bases de datos GeoIP comerciales %1$sMaxmind%2$s son más fiables que las gratuitas. Para ver cuan seguras son, clic %3$saquí%4$s.",
+        "GeoIPDocumentationSuffix": "Para ver la información de este informe, tenés que configurar GeoIP en la sección \"Geolocalización\" en la pestaña del administrador. Las bases de datos GeoIP comerciales %1$sMaxmind%2$s son más fiables que las gratuitas. Para ver cuán precisas son, hacé clic %3$sacá%4$s.",
+        "GeoIPNoDatabaseFound": "Esta implementación GeoIP no pudo encontrar ninguna base de datos.",
         "GeoIPImplHasAccessTo": "Esta implementación GeoIP tiene acceso a los siguientes tipos de bases de datos",
-        "GeoIPIncorrectDatabaseFormat": "Your GeoIP database does not seem to have the correct format. It may be corrupt. Make sure you are using the binary version and try replacing it with another copy.",
-        "GeoIpLocationProviderDesc_Pecl1": "Este proveedor de ubicación utiliza una base de datos GeoIP y un módulo PECL para precisamente y eficientemente determinar la ubicación de sus visitantes.",
+        "GeoIPIncorrectDatabaseFormat": "Tu base de datos GeoIP no parece tener el formato correcto. Podría estar corrompida. Asegurate de estar usando la versión binaria y tratá de reemplazarla con otra copia.",
+        "GeoIpLocationProviderDesc_Pecl1": "Este proveedor de ubicación utiliza una base de datos GeoIP y un módulo PECL para precisamente y eficientemente determinar la ubicación de tus visitantes.",
         "GeoIpLocationProviderDesc_Pecl2": "No existen limitaciones con este proveedor, es el que recomendamos utilizar.",
-        "GeoIpLocationProviderDesc_Php2": "Si su sitio de internet posee un montón de tráfico, puede que su proveedor es demasiado lento. En este caso, debe instalar la extensión%2$s %1$sPECL o el módulo%4$s %3$sservidor.",
-        "GeoIpLocationProviderDesc_ServerBased1": "Este proveedor de ubicación utiliza el módulo GeoIP que se ha instalado en su servidor HTTP. Este proveedor es fiable y rápido, pero %1$solo puede ser utilizado con el rastreo de navegadores de internet normales.%2$s",
-        "GeoIpLocationProviderDesc_ServerBased2": "Si tiene que importar archivos de registro o cualquier otra acción que requiera configurar direcciones IP, utilice la implementación GeoIP %1$sPECL (recomendada)%2$s o la %3$simplementación GeoIP PHP%4$s.",
-        "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Nota: La anonimización de las direcciónes IP no tiene efecto en las ubicaciones informadas por este proveedor. Antes de utilizarlo con anonimización de IP, asegúrese que no viola leyes de privacidad que puede usted estar sujeto.",
-        "GeoIpLocationProviderNotRecomnended": "Geolocation works, but you are not using one of the recommended providers.",
+        "GeoIpLocationProviderDesc_Php1": "El proveedor de ubicación es el más sencillo de instalar ya que no requiere de configuración del servidor (¡es ideal para el hospedaje compartido!). Usa una base de datos GeoIP y la API PHP de MaxMind para determinar con precisión la ubicación de tus visitantes.",
+        "GeoIpLocationProviderDesc_Php2": "Si tu sitio web tiene mucho tráfico, entonces podrías encontrar que este proveedor de ubicación es demasiado lento. En este caso, deberías instalar la %1$sextensión PECL%2$s o un %3$smódulo de servidor%4$s.",
+        "GeoIpLocationProviderDesc_ServerBased1": "Este proveedor de ubicación utiliza el módulo GeoIP que se ha instalado en su servidor HTTP. Este proveedor es fiable y rápido, pero %1$ssólo puede ser usado con el rastreo común de los navegadores web.%2$s",
+        "GeoIpLocationProviderDesc_ServerBased2": "Si tenés que importar archivos de registro o cualquier otra acción que requiera configurar direcciones IP, usá la %1$simplementación GeoIP PECL (recomendada)%2$s o la %3$simplementación GeoIP PHP%4$s.",
+        "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Nota: La anonimización de las direcciónes IP no tiene efecto en las ubicaciones informadas por este proveedor. Antes de utilizarlo con anonimización de IP, asegurate de que no viola leyes de privacidad a las que podés estar sujeto.",
+        "GeoIpLocationProviderNotRecomnended": "La geolocalización funciona, pero no estás usando uno de nuestros proveedores recomendados.",
+        "GeoIPNoServerVars": "Matomo no puede encontrar ninguna variable GeoIP de %s.",
         "GeoIPPeclCustomDirNotSet": "La opción %s PHP ini no se ha establecido.",
-        "GeoIPUpdaterInstructions": "Ingrese abajo los enlaces de descarga de sus base de datos. Si ha comprado bases de datos desde %3$sMaxMind%4$s, puede encontrar dichos enlaces %1$saquí%2$s. Por favor, contáctese con %3$sMaxMind%4$s si tiene problemas para acceder a ellos.",
-        "GeoLiteCityLink": "Si está utilizando la base de datos GEoLite City, utilice este enlace: %1$s%2$s%3$s.",
+        "GeoIPServerVarsFound": "Matomo detecta las siguientes variables GeoIP de %s",
+        "GeoIPUpdaterInstructions": "Ingresá abajo los enlaces de descarga de tus base de datos. Si compraste bases de datos a %3$sMaxMind%4$s, podés encontrar dichos enlaces %1$sacá%2$s. Por favor, contactá con %3$sMaxMind%4$s si tenés problemas para acceder a ellos.",
+        "GeoIPUpdaterIntro": "Matomo actualmente está administrando actualizaciones para las siguientes bases de datos GeoIP",
+        "GeoLiteCityLink": "Si estás usando la base de datos GEoLite City, usá este enlace: %1$s%2$s%3$s.",
         "Geolocation": "Geolocalización",
-        "getCityDocumentation": "Este informe muestra las ciudades desde las cuales sus visitantes accedieron a su sitio de internet.",
-        "getContinentDocumentation": "Este informe muestra en que continente están sus visitantes cuando acceden a su sitio de internet.",
-        "getCountryDocumentation": "Este informe muestra desde que país accedieron a su sitio de internet sus visitantes.",
-        "getRegionDocumentation": "Este informe muestra en que región están sus visitantes en el momento que accedían a su sitio de internet.",
-        "HowToInstallApacheModule": "Cómo instalar el módulo GeoIP en Apache?",
-        "HowToInstallGeoIPDatabases": "Cómo obtengo las bases de datos GeoIP?",
-        "HowToInstallGeoIpPecl": "Cómo instalar la extensión GeoIP PECL?",
-        "HowToInstallNginxModule": "Cómo instalo el módulo GeoIP en Nginx?",
+        "GeolocationPageDesc": "En esta página podés cambiar cómo Matomo determina las ubicaciones de los visitantes.",
+        "getCityDocumentation": "Este informe muestra las ciudades desde las cuales tus visitantes accedieron a tu sitio web.",
+        "getContinentDocumentation": "Este informe muestra en qué continente estaban tus visitantes cuando visitaron tu sitio web.",
+        "getCountryDocumentation": "Este informe muestra en qué país estaban tus visitantes cuando visitaron tu sitio web.",
+        "getRegionDocumentation": "Este informe muestra en qué región estaban tus visitantes cuando visitaron tu sitio web.",
+        "HowToInstallApacheModule": "¿Cómo instalo el módulo GeoIP en Apache?",
+        "HowToInstallGeoIPDatabases": "¿Cómo obtengo las bases de datos GeoIP?",
+        "HowToInstallGeoIpPecl": "¿Cómo instalo la extensión GeoIP PECL?",
+        "HowToInstallNginxModule": "¿Cómo instalo el módulo GeoIP en Nginx?",
         "HowToSetupGeoIP": "Cómo configurar una geolocalización precisa con GeoIP",
-        "HowToSetupGeoIP_Step1": "%1$sDescargue%2$s la base de datos GeoLite City desde %3$sMaxMind%4$s.",
-        "HowToSetupGeoIP_Step3": "Volver a cargar esta pantalla. El proveedor %1$sGeoIP (PHP)%2$s ahora será %3$sinstalado%4$s. Selecciónelo.",
-        "HowToSetupGeoIPIntro": "Parece ser que la configuración de la Geolocalización no es confiable. Esta es una función útil y sin ella no verá una información precisa y completa de la ubicación de sus visitantes. Aquí un rápido vistazo de como utilizarla:",
+        "HowToSetupGeoIP_Step1": "%1$sDescargá%2$s la base de datos GeoLite City desde %3$sMaxMind%4$s.",
+        "HowToSetupGeoIP_Step2": "Extraé este archivo y copia el resultado, %1$s en el subdirectorio %2$smisc%3$s de Matomo (podés hacerlo por FTP o SSH).",
+        "HowToSetupGeoIP_Step3": "Refrescar esta pantalla. El proveedor %1$sGeoIP (PHP)%2$s ahora será %3$sinstalado%4$s. Seleccionalo.",
+        "HowToSetupGeoIP_Step4": "¡Listo! Acabás de configurar Matomo para que use GeoIP, lo que significa que vas a poder ver las regiones y ciudades de tus visitantes con información muy precisa por país.",
+        "HowToSetupGeoIPIntro": "Parece ser que la configuración de la geolocalización no es confiable. Esta es una función útil y sin ella no verás una información precisa y completa de la ubicación de tus visitantes. Aquí un rápido vistazo de cómo utilizarla:",
         "HttpServerModule": "Módulo servidor HTTP",
-        "InvalidGeoIPUpdatePeriod": "Período inválido para el actualizador GeoIP: %1$s. Los valores correctos son %2$s.",
-        "IPurchasedGeoIPDBs": "Adquirí más %1$sbase de datos de MaxMind%2$s y quiero configurar las actualizaciones automáticas.",
-        "ISPDatabase": "Base de dato ISP",
-        "IWantToDownloadFreeGeoIP": "Quiero descargar la base de datos gratuita GeoIP...",
+        "InvalidGeoIPUpdatePeriod": "Período no válido para el actualizador GeoIP: %1$s. Los valores correctos son %2$s.",
+        "IPurchasedGeoIPDBs": "Compré más %1$sbase de datos precisas de MaxMind%2$s y quiero configurar las actualizaciones automáticas.",
+        "ISPDatabase": "Base de datos de ISP",
+        "IWantToDownloadFreeGeoIP": "Quiero descargar la base de datos gratuita GeoIP…",
         "Latitude": "Latitud",
+        "Latitudes": "Latitudes",
         "Location": "Ubicación",
         "LocationDatabase": "Base de datos de ubicaciones",
-        "LocationDatabaseHint": "Una base de datos de ubicación es una base de datos ya sea un país, región o ciudad.",
+        "LocationDatabaseHint": "Una base de datos de ubicación es una base de datos, ya sea de país, región o ciudad.",
         "LocationProvider": "Proveedor de ubicación",
         "Longitude": "Longitud",
-        "NoDataForGeoIPReport1": "No hay datos para este informe debido a que no existe información o las direcciones IP de los visitantes no puede ser geolocalizada.",
-        "NoDataForGeoIPReport2": "Para habilitar una geolocalización precisa, cambie la opción %1$saquí%2$s y utilice una %3$sbase de datos a nivel ciudad%4$s.",
+        "Longitudes": "Longitudes",
+        "NoDataForGeoIPReport1": "No hay datos para este informe debido a que no existe información o las direcciones IP de los visitantes no pueden ser geolocalizadas.",
+        "NoDataForGeoIPReport2": "Para habilitar una geolocalización precisa, cambiá la configuración %1$sacá%2$s y usá una %3$sbase de datos a nivel ciudad%4$s.",
         "Organization": "Organización",
         "OrgDatabase": "Base de datos de la organización",
-        "PeclGeoIPNoDBDir": "El módulo PECL está buscando base de datos en %1$s, pero esta carpeta no existe. Por favor, créela y agreguéle una base de datos GeoIP a la misma. Alternativamente, puede disponer %2$s una determinada carpeta en su archivo php.ini",
-        "PeclGeoLiteError": "Su base de datos GeoIP en %1$s está nombrada %2$s. Desafortunadamente, el módulo PECL no la reconocerá con dicho nombre. Por favor, renómbrela a %3$s.",
+        "PeclGeoIPNoDBDir": "El módulo PECL está buscando base de datos en %1$s, pero esta carpeta no existe. Por favor, creala y agregale una base de datos GeoIP a la misma. Alternativamente, podés establecer %2$s a una determinada carpeta en tu archivo \"php.ini\".",
+        "PeclGeoLiteError": "Tu base de datos GeoIP en %1$s tiene como nombre \"%2$s\". Desafortunadamente, el módulo PECL no la reconocerá con dicho nombre. Por favor, renombrala a \"%3$s\".",
+        "PiwikNotManagingGeoIPDBs": "Matomo actualmente no está administrando ninguna base de datos GeoIP.",
+        "PluginDescription": "Informa la ubicación de tus visitantes: país, región, ciudad y coordenadas geográficas (latitud y longitud).",
         "Region": "Región",
-        "SetupAutomaticUpdatesOfGeoIP": "Configurar actualizaciones automáticas de sus base de datos GeoIP",
-        "SubmenuLocations": "Localizaciones",
-        "ThisUrlIsNotAValidGeoIPDB": "El archivo descargado no es una base de dato GeoIP válida. Por favor, verifique la dirección de internet o descargue el archivo manualmente.",
-        "ToGeolocateOldVisits": "Para obtener información de ubicación de sus antiguos visitantes, utilice esta información descripta %1$saquí%2$s.",
-        "UnsupportedArchiveType": "Se encontró un tipo de archivo %1$s no deseable.",
-        "UpdaterHasNotBeenRun": "El actualizador nunca se ha ejecutado.",
-        "UpdaterIsNotScheduledToRun": "It is not scheduled to run in the future.",
-        "UpdaterScheduledForNextRun": "It is scheduled to run during the next archive.php cron execution.",
-        "UpdaterWasLastRun": "El actualizador se ejecuto por última vez en %s.",
-        "UpdaterWillRunNext": "It is next scheduled to run on %s.",
+        "SetupAutomaticUpdatesOfGeoIP": "Configurar actualizaciones automáticas de tus base de datos GeoIP",
+        "SubmenuLocations": "Ubicaciones",
+        "TestIPLocatorFailed": "Matomo intentó revisar la ubicación de una dirección IP conocida (%1$s), pero el servidor respondió %2$s. Si el proveedor estuviese configurado correctamente, debería responder %3$s.",
+        "ThisUrlIsNotAValidGeoIPDB": "El archivo descargado no es una base de dato GeoIP válida. Por favor, verificá la dirección web o descargá el archivo manualmente.",
+        "ToGeolocateOldVisits": "Para obtener información de ubicación de tus antiguas visitas, usá el script descripto %1$sacá%2$s.",
+        "UnsupportedArchiveType": "Se encontró un tipo de archivo %1$s no soportado.",
+        "UpdaterHasNotBeenRun": "Nunca se ejecutó el actualizador.",
+        "UpdaterIsNotScheduledToRun": "No está programado para ejecutarse en el futuro.",
+        "UpdaterScheduledForNextRun": "Está programado para ejecutarse durante la próxima ejecución de comando cron \"core:archive\".",
+        "UpdaterWasLastRun": "El actualizador se ejecutó por última vez: %s.",
+        "UpdaterWillRunNext": "Está programado para ejecutarse: %s.",
         "WidgetLocation": "Ubicación del visitante"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserCountry/lang/fi.json b/app/plugins/UserCountry/lang/fi.json
index 850dbbeb4..15336a44e 100644
--- a/app/plugins/UserCountry/lang/fi.json
+++ b/app/plugins/UserCountry/lang/fi.json
@@ -34,9 +34,10 @@
         "GeoIPDocumentationSuffix": "Nähdäksesi tietoja tässä raportissa, sinun täytää asettaa GeoIP geopaikannuksen admin-välilehdessä. Kaupalliset %1$sMaxmind%2$s GeoIP tietokannat ovat tarkempia kuin ilmaiset. Klikkaa %3$stästä%4$s nähdäksesi miten tarkkoja ne ovat.",
         "GeoIPNoDatabaseFound": "GeoIP-toteutus ei löytänyt yhtäkään tietokantaa.",
         "GeoIPImplHasAccessTo": "Tällä GeoIP-sovelluksella on pääsy seuraavanlaisiin tietokantoihin",
-        "GeoIPIncorrectDatabaseFormat": "GeoIP tietokantasi ei vaikuta olevan oikeassa formaatissa. Se saattaa olla vioittunut. Varmista, että käytät binääriversiota ja yritä korvata se toisella kopiolla.",
+        "GeoIPIncorrectDatabaseFormat": "GeoIP-tietokantasi ei vaikuta olevan oikeassa formaatissa. Se saattaa olla vioittunut. Varmista, että käytät binääriversiota ja yritä korvata se toisella kopiolla.",
         "GeoIpLocationProviderDesc_Pecl1": "Tämä sijainnintarjoaja käyttää GeoIP-tietokantaa ja PECL-moduulia kävijöiden paikallistamiseen.",
         "GeoIpLocationProviderDesc_Pecl2": "Suosittelemme tätä palvelua, sillä tällä ei ole rajoituksia.",
+        "GeoIpLocationProviderDesc_Php1": "Tämä sijainnintarjoaja on helpoin asennettava, koska se ei vaadi palvelinmäärityksiä, joten se on luonteva valinta jaettuun hosting-ympäristöön. Se käyttää GeoIP-tietokantaa ja MaxMindin PHP-rajapintaa vierailijoiden tarkan sijainnin selvittämiseksi.",
         "GeoIpLocationProviderDesc_Php2": "Jos verkkosivullasi on paljon liikennettä, tämä palvelu saattaa olla mielestäsi liian hidas. Asenna siinä tapauksessa %1$sPECL-laajennus%2$s tai %3$spalvelinmoduuli%4$s.",
         "GeoIpLocationProviderDesc_ServerBased1": "Tämä toteutus käyttää GeoIP-moduulia HTTP-palvelimesta. Tämä toteutus on nopea ja tarkka, mutta %1$stoimii vain normaalin selainseurannan kanssa.%2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "Jos olet ladannut lokitiedostoja, käytä %1$sPECL:n GeoIP-toteutusta (suositeltu)%2$s tai %3$sPHP:n GeoIP-toteutusta%4$s.",
diff --git a/app/plugins/UserCountry/lang/pt-br.json b/app/plugins/UserCountry/lang/pt-br.json
index 6a8fa1f31..9c7d78514 100644
--- a/app/plugins/UserCountry/lang/pt-br.json
+++ b/app/plugins/UserCountry/lang/pt-br.json
@@ -11,28 +11,33 @@
         "City": "Cidade",
         "CityAndCountry": "%1$s, %2$s",
         "Continent": "Continente",
+        "Continents": "Continentes",
         "Country": "País",
+        "CountryCode": "Código do país",
         "country_a1": "Proxy anônimo",
         "country_a2": "Provedor de satélite",
         "country_cat": "Comunidades Catalães",
         "country_o1": "Outro país",
+        "VisitLocation": "Localização da visita",
         "CurrentLocationIntro": "De acordo com este provedor, sua localização é",
         "DefaultLocationProviderDesc1": "Detecta a localização padrão de um visitante baseando-se no idioma que ele usa",
         "DefaultLocationProviderDesc2": "Isso não é muito preciso, então %1$s nós recomendamos a instalação e utilização de %2$s GeoIP %3$s.%4$s",
         "DefaultLocationProviderExplanation": "Você está usando o provedor de localização padrão, que significa que o Matomo irá supor a localização do visitante, baseado no idioma que eles usam. %1$sLeia isso%2$s para aprender como configurar uma geolocalização mais precisa.",
         "DistinctCountries": "%s países distintos",
         "DownloadingDb": "Baixando %s",
-        "DownloadNewDatabasesEvery": "Atualiza o banco de dados a cada",
+        "DownloadNewDatabasesEvery": "Atualizar o banco de dados a cada",
         "FatalErrorDuringDownload": "Um erro fatal ocorreu durante o download deste arquivo. Pode haver algo de errado com sua conexão de internet, com o banco de dados GeoIP que você baixou ou Matomo. Tente fazer o download e instalá-lo manualmente.",
         "FoundApacheModules": "Matomo encontrou os seguintes módulos do Apache",
         "FromDifferentCities": "cidades diferentes",
         "GeoIPCannotFindMbstringExtension": "Não é possível encontrar a função %1$s. Por favor, certifique-se que a extensão %2$s está instalada e carregada.",
-        "GeoIPDatabases": "GeoIP Databases",
+        "GeoIPDatabases": "Bases de dados GeoIP",
         "GeoIPDocumentationSuffix": "Para ver os dados para este relatório, você deve configurar GeoIP na guia de administração de Geolocalização. Os %1$s banco de dados GeoIP Maxmind comerciais %2$s são mais precisos que os livres. Para ver como são precisos, clique %3$saqui%4$s.",
+        "GeoIPNoDatabaseFound": "Esta implementação GeoIP não encontrou nenhuma base de dados.",
         "GeoIPImplHasAccessTo": "Esta implementação GeoIP tem acesso aos seguintes tipos de bancos de dados",
         "GeoIPIncorrectDatabaseFormat": "Seu banco de dados GeoIP não parece ter o formato correto. Ele pode estar corrompido. Certifique-se de que você está usando a versão binária e tente substituí-lo com outra cópia.",
         "GeoIpLocationProviderDesc_Pecl1": "Esse provedor de localização utiliza um banco de dados GeoIP e um módulo PECL para de forma precisa e eficaz determinar a localização seus visitantes.",
         "GeoIpLocationProviderDesc_Pecl2": "Não existem limitações com este fornecedor, por isso é o que nós recomendamos usar.",
+        "GeoIpLocationProviderDesc_Php1": "Este provedor de localização é o mais simples de ser instalado pois não requer configuração de servidor (ideal para hospedagem compartilhada!). Ele usa uma base de dados GeoIP e a API PHP da MaxMind para determinar com precisão a localização dos seus visitantes.",
         "GeoIpLocationProviderDesc_Php2": "Se o seu site recebe uma grande quantidade de tráfego, você pode achar que o provedor de localização está muito lento. Neste caso, você deve instalar a extensão %1$s PECL %2$s ou o %3$s módulo do servidor %4$s.",
         "GeoIpLocationProviderDesc_ServerBased1": "Este provedor de localização utiliza o módulo GeoIP que foi instalado em seu servidor HTTP. Este provedor é rápido e preciso, mas %1$s só pode ser usado com acompanhamento browser normal. %2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "Se você tiver que importar arquivos de log ou fazer outra coisa que requer o estabelecimento de endereços IP, use a %1$s implementação PECL GeoIP (recomendado) %2$s ou %3$s PHP implementação GeoIP %4$s.",
@@ -63,27 +68,29 @@
         "HttpServerModule": "Módulo do servidor HTTP",
         "InvalidGeoIPUpdatePeriod": "Período inválido para o atualizador GeoIP: %1$s. Os valores válidos são %2$s.",
         "IPurchasedGeoIPDBs": "Eu comprei %1$s bases de dados mais precisas de MaxMind %2$s e quero configurar as atualizações automáticas.",
-        "ISPDatabase": "Banco de dados ISP",
-        "IWantToDownloadFreeGeoIP": "Quero baixar o banco de dados GeoIP livre...",
+        "ISPDatabase": "Base de dados de provedores de Internet",
+        "IWantToDownloadFreeGeoIP": "Quero baixar a base de dados GeoIP gratuita...",
         "Latitude": "Latitude",
+        "Latitudes": "Latitudes",
         "Location": "Localização",
-        "LocationDatabase": "Banco de dados de localização",
-        "LocationDatabaseHint": "Um banco de dados de locais, um banco de dados de país, região ou cidade.",
+        "LocationDatabase": "Base de dados de localização",
+        "LocationDatabaseHint": "Uma base de dados de localização é uma base de dados de país, região ou cidade.",
         "LocationProvider": "Provedor de localização",
         "Longitude": "Longitude",
+        "Longitudes": "Longitudes",
         "NoDataForGeoIPReport1": "Não há dados para este relatório porque não há nenhum dado de localização disponível ou o endereço IP do visitante não pode ser geolocalizado.",
-        "NoDataForGeoIPReport2": "Para ativar ageolocalização mais precisa, mudar a configuração %1$s aqui%2$s e usar um %3$s banco de dados no nível de cidade %4$s.",
+        "NoDataForGeoIPReport2": "Para ativar a geolocalização mais precisa, mude a configuração %1$s aqui%2$s e use uma %3$s base de dados no nível de cidade %4$s.",
         "Organization": "Organização",
-        "OrgDatabase": "Banco de dados da organização",
-        "PeclGeoIPNoDBDir": "O módulo PECL está à procura de bancos de dados em %1$s mas este diretório não existe. Por favor, crie-o e adicione as bases de dados GeoIP a ele. Como alternativa, você pode definir %2$s para o diretório correto em seu arquivo php.ini.",
-        "PeclGeoLiteError": "Seu banco de dados GeoIP em %1$s é nomeado %2$s. Infelizmente, o módulo PECL não irá reconhecê-lo com este nome. Por favor, mude o nome para %3$s.",
+        "OrgDatabase": "Base de dados da organização",
+        "PeclGeoIPNoDBDir": "O módulo PECL está à procura de bases de dados em %1$s mas este diretório não existe. Por favor, crie-o e adicione as bases de dados GeoIP a ele. Como alternativa, você pode definir %2$s para o diretório correto em seu arquivo php.ini.",
+        "PeclGeoLiteError": "Sua base de dados GeoIP em %1$s tem o nome %2$s. Infelizmente, o módulo PECL não irá reconhecê-la com este nome. Por favor, mude o nome para %3$s.",
         "PiwikNotManagingGeoIPDBs": "Matomo atualmente não gerencia nenhuma base de dados GeoIP.",
         "PluginDescription": "Informa a localização de seus visitantes: país, região, cidade e coordenadas geográficas (latitude \/ longitude).",
         "Region": "Região",
-        "SetupAutomaticUpdatesOfGeoIP": "Configurar as atualizações automáticas de bancos de dados GeoIP",
+        "SetupAutomaticUpdatesOfGeoIP": "Configurar atualizações automáticas das bases de dados GeoIP",
         "SubmenuLocations": "Locais",
         "TestIPLocatorFailed": "Matomo tentou verificar a localização de um endereço IP conhecido (%1$s), mas o servidor retornou %2$s. Se este provedor estivsse configurado corretamente, ele voltaria %3$s.",
-        "ThisUrlIsNotAValidGeoIPDB": "O arquivo baixado não é um banco de dados GeoIP válido. Por favor, verifique novamente a URL ou baixar o arquivo manualmente.",
+        "ThisUrlIsNotAValidGeoIPDB": "O arquivo baixado não é uma base de dados GeoIP válida. Por favor verifique novamente a URL ou baixe o arquivo manualmente.",
         "ToGeolocateOldVisits": "Para obter os dados de localização para as suas visitas antigas, use o script descrito %1$s aqui %2$s.",
         "UnsupportedArchiveType": "Encontrado tipo de arquivo não suportado %1$s.",
         "UpdaterHasNotBeenRun": "O atualizador nunca foi executado.",
diff --git a/app/plugins/UserCountry/lang/pt.json b/app/plugins/UserCountry/lang/pt.json
index 777aee0a4..99e8d4f93 100644
--- a/app/plugins/UserCountry/lang/pt.json
+++ b/app/plugins/UserCountry/lang/pt.json
@@ -13,6 +13,7 @@
         "Continent": "Continente",
         "Continents": "Continentes",
         "Country": "País",
+        "CountryCode": "Código do país",
         "country_a1": "Proxy anónimo",
         "country_a2": "Fornecedor por satélite",
         "country_cat": "Comunidades língua Catalã",
@@ -36,6 +37,7 @@
         "GeoIPIncorrectDatabaseFormat": "A sua base de dados GeoIP não parece ter o formato correto. Pode estar corrompida. Confirme que está a utilizar a versão binária e tente substituí-la por outra cópia.",
         "GeoIpLocationProviderDesc_Pecl1": "Este fornecedor de localização utiliza uma base de dados GeoIP e um módulo PECL para determinar com precisão e eficiência a localização dos seus visitantes.",
         "GeoIpLocationProviderDesc_Pecl2": "Não existem limitações com este fornecedor, pelo que recomendamos a utilização do mesmo.",
+        "GeoIpLocationProviderDesc_Php1": "Este fornecedor de localização é o mais simples de instalar, dado que não exige configurações no servidor (é ideal para alojamentos partilhados!). Utiliza uma base de dados GeoIP e a API PHP do MaxMind para determinar com precisão a localização dos seus visitantes.",
         "GeoIpLocationProviderDesc_Php2": "Se o seu site tiver muito tráfego, pode descobrir que este fornecedor de localização é demasiado lento. Neste caso, deve instalar a %1$sextensão PECL%2$s ou um %3$smódulo de servidor%4$s.",
         "GeoIpLocationProviderDesc_ServerBased1": "Este fornecedor de localização utiliza o módulo GeoIP que foi instalado no seu servidor HTTP. Este fornecedor é rápido e preciso, mas %1$ssó pode ser utilizado para acompanhamento normal de navegadores.%2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "Se tiver de importar ficheiros de registo ou fazer algo mais que necessite a definição de endereços de IP, utilize a %1$simplementação PECL do GeoIP (recomendado)%2$s ou a %3$simplementação PHP dp GeoIP%4$s.",
diff --git a/app/plugins/UserCountry/lang/sv.json b/app/plugins/UserCountry/lang/sv.json
index fb557e859..da7362d25 100644
--- a/app/plugins/UserCountry/lang/sv.json
+++ b/app/plugins/UserCountry/lang/sv.json
@@ -13,6 +13,7 @@
         "Continent": "Kontinent",
         "Continents": "Kontinenter",
         "Country": "Land",
+        "CountryCode": "Landskod",
         "country_a1": "Anonym proxy",
         "country_a2": "Satellitleverantör",
         "country_cat": "Katalanska språkgemenskaperna",
diff --git a/app/plugins/UserCountry/lang/zh-cn.json b/app/plugins/UserCountry/lang/zh-cn.json
index 4b932acd1..06fa0424b 100644
--- a/app/plugins/UserCountry/lang/zh-cn.json
+++ b/app/plugins/UserCountry/lang/zh-cn.json
@@ -13,10 +13,12 @@
         "Continent": "大洲",
         "Continents": "大洲",
         "Country": "国家",
+        "CountryCode": "国家代码",
         "country_a1": "匿名代理",
         "country_a2": "卫星供应商",
         "country_cat": "加泰罗尼亚语社区",
         "country_o1": "其它国家",
+        "VisitLocation": "参观地点",
         "CurrentLocationIntro": "根据提供商信息，您现在的位置是",
         "DefaultLocationProviderDesc1": "默认的地理位置查询以访客的浏览器猜测国家。",
         "DefaultLocationProviderDesc2": "这不是很准确，所以 %1$s我们建议安装使用 %2$sGeoIP%3$s.%4$s",
@@ -30,10 +32,12 @@
         "GeoIPCannotFindMbstringExtension": "没有找到 %1$s 功能。请确认 %2$s 扩展已安装和加载。",
         "GeoIPDatabases": "GeoIP 数据库",
         "GeoIPDocumentationSuffix": "要看到本报表的数据，您需要在管理页面的地理位置菜单下设置 GeoIP. 商业版 %1$sMaxmind%2$s GeoIP 数据库比免费的更精确。要查看详细内容，请点%3$s这里%4$s.",
+        "GeoIPNoDatabaseFound": "此GeoIP实现无法找到任何数据库。",
         "GeoIPImplHasAccessTo": "这个 GeoIP 方案可以读取以下类型的数据库",
         "GeoIPIncorrectDatabaseFormat": "你的GeoIP数据库似乎不是正确的格式。它可能已损坏。确保您所使用的是二进制版本。",
         "GeoIpLocationProviderDesc_Pecl1": "这个地理位置服务商使用 GeoIP 数据库和 PECL 模块来精确、有效地定位访客的地址。",
         "GeoIpLocationProviderDesc_Pecl2": "这个服务商没有限制，我们推荐使用。",
+        "GeoIpLocationProviderDesc_Php1": "该位置提供程序是最简单的安装，因为它不需要服务器配置（共享主机的理想选择！）。 它使用GeoIP数据库和MaxMind的PHP API来准确确定访问者的位置。",
         "GeoIpLocationProviderDesc_Php2": "如果您的网站流量很大，这个服务速度会很慢。如果这样，您最好安装 %1$sPECL 扩展%2$s 或者 %3$s服务器模块%4$s。",
         "GeoIpLocationProviderDesc_ServerBased1": "本地理位置服务商使用已经安装在 HTTP 服务器上的 GeoIP 模块。本服务商速度快也更精确，但是 %1$s只能使用一般的浏览器跟踪。%2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "如果您需要导入日志文件，或者需要设置 IP 地址的操作，使用 %1$sPECL GeoIP 方案 (推荐)%2$s 或者 %3$sPHP GeoIP 方案%4$s。",
diff --git a/app/plugins/UserCountryMap/Controller.php b/app/plugins/UserCountryMap/Controller.php
index 21b862fad..854362f73 100644
--- a/app/plugins/UserCountryMap/Controller.php
+++ b/app/plugins/UserCountryMap/Controller.php
@@ -16,6 +16,7 @@
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
+use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Translation\Translator;
 use Piwik\View;
@@ -286,10 +287,7 @@ private function getMetrics($idSite, $period, $date, $token_auth)
         $metrics = array();
         if (!empty($metaData[0]['metrics']) && is_array($metaData[0]['metrics'])) {
             foreach ($metaData[0]['metrics'] as $id => $val) {
-                // todo: should use SettingsPiwik::isUniqueVisitorsEnabled ?
-                if (Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') {
-                    $metrics[] = array($id, $val);
-                }
+                $metrics[] = array($id, $val);
             }
         }
         if (!empty($metaData[0]['processedMetrics']) && is_array($metaData[0]['processedMetrics'])) {
diff --git a/app/plugins/UserCountryMap/UserCountryMap.php b/app/plugins/UserCountryMap/UserCountryMap.php
index b2b47e2a7..392df7291 100644
--- a/app/plugins/UserCountryMap/UserCountryMap.php
+++ b/app/plugins/UserCountryMap/UserCountryMap.php
@@ -31,11 +31,17 @@ public function registerEvents()
         $hooks = array(
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
-            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+            'API.getPagesComparisonsDisabledFor'     => 'getPagesComparisonsDisabledFor',
         );
         return $hooks;
     }
 
+    public function getPagesComparisonsDisabledFor(&$pages)
+    {
+        $pages[] = 'General_Visitors.UserCountryMap_RealTimeMap';
+    }
+
     public function getJsFiles(&$jsFiles)
     {
         $jsFiles[] = "libs/bower_components/visibilityjs/lib/visibility.core.js";
diff --git a/app/plugins/UserCountryMap/config/config.php b/app/plugins/UserCountryMap/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/UserCountryMap/config/config.php
+++ b/app/plugins/UserCountryMap/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/UserCountryMap/config/tracker.php b/app/plugins/UserCountryMap/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/UserCountryMap/config/tracker.php
+++ b/app/plugins/UserCountryMap/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/UserCountryMap/lang/es-ar.json b/app/plugins/UserCountryMap/lang/es-ar.json
index b2fa73130..5a3c17ab9 100644
--- a/app/plugins/UserCountryMap/lang/es-ar.json
+++ b/app/plugins/UserCountryMap/lang/es-ar.json
@@ -1,5 +1,6 @@
 {
     "UserCountryMap": {
+        "PluginDescription": "Este plugin ofrece los widgets Visitor Map y Real-time Map. Nota: requiere que el plugin UserCountry esté habilitado.",
         "AndNOthers": "y %s otros",
         "Cities": "Ciudades",
         "Countries": "Países",
@@ -10,13 +11,17 @@
         "MinutesAgo": "Hace %s minutos",
         "None": "Ninguno",
         "NoVisit": "Ninguna visita",
-        "RealTimeMap": "Mapa en Tiempo Real",
+        "RealTimeMap": "Mapa en tiempo real",
         "Regions": "Regiones",
         "Searches": "%s búsquedas",
         "SecondsAgo": "Hace %s segundos",
-        "ShowingVisits": "Geo-ubicadas últimas visitas",
-        "Unlocated": "<b>%s<\/b> %p de las visitas desde %c no pudieron ser geo ubicadas.",
-        "VisitorMap": "Mapa de Visitantes",
-        "WorldWide": "Mundial"
+        "ShowingVisits": "Visitas geolocalizadas de los últimos",
+        "Unlocated": "<b>%s<\/b> %p de las visitas desde %c no pudieron ser geolocalizadas.",
+        "VisitorMap": "Mapa de visitantes",
+        "WorldWide": "Mundial",
+        "WithUnknownRegion": "%s con región desconocida",
+        "WithUnknownCity": "%s con ciudad desconocida",
+        "NoVisitsInfo": "No hay visitas mostradas actualmente, porque ninguna visita en este período tiene información correcta de geolocalización (latitud y longitud).",
+        "NoVisitsInfo2": "Para resolver este problema, asegurate que estás usando un proveedor de geolocalización GeoIP con base de datos de ciudades GeoIP. Si esto no resuelve tu problema, entonces es posible (pero poco probable) que tus visitantes tengan direcciones IP que no puedan ser geolocalizadas."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserCountryMap/lang/zh-cn.json b/app/plugins/UserCountryMap/lang/zh-cn.json
index ff39a730f..03cbf8b5e 100644
--- a/app/plugins/UserCountryMap/lang/zh-cn.json
+++ b/app/plugins/UserCountryMap/lang/zh-cn.json
@@ -20,6 +20,8 @@
         "VisitorMap": "访客地图",
         "WorldWide": "全世界",
         "WithUnknownRegion": "%s未知区域",
-        "WithUnknownCity": "%s未知城市"
+        "WithUnknownCity": "%s未知城市",
+        "NoVisitsInfo": "当前没有显示访问，因为此期间没有访问具有正确的地理位置信息（纬度和经度）。",
+        "NoVisitsInfo2": "要解决此问题，请确保将GeoIP地理位置提供程序与GeoIP城市数据库配合使用。 如果这不能解决您的问题，则您的访问很可能（尽管不太可能）具有无法进行地理位置定位的IP地址。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserId/Archiver.php b/app/plugins/UserId/Archiver.php
index ae7fdcee8..07e6be51d 100644
--- a/app/plugins/UserId/Archiver.php
+++ b/app/plugins/UserId/Archiver.php
@@ -83,7 +83,6 @@ protected function aggregateUsers()
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn($userIdFieldName);
             $rankingQuery->addLabelColumn($visitorIdFieldName);
         }
@@ -119,21 +118,6 @@ protected function insertDayReports()
     {
         /** @var DataTable $dataTable */
         $dataTable = $this->arrays->asDataTable();
-
-        // deal w/ ranking query summary row
-        $rankingQuerySummaryRow = $dataTable->getRowFromLabel(DataTable::LABEL_SUMMARY_ROW);
-        if ($rankingQuerySummaryRow) {
-            $rankingQuerySummaryRowId = $dataTable->getRowIdFromLabel(DataTable::LABEL_SUMMARY_ROW);
-            $dataTable->deleteRow($rankingQuerySummaryRowId);
-
-            $actualSummaryRow = $dataTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
-            if ($actualSummaryRow) {
-                $actualSummaryRow->sumRow($rankingQuerySummaryRow);
-            } else {
-                $dataTable->addSummaryRow($rankingQuerySummaryRow);
-            }
-        }
-
         $this->setVisitorIds($dataTable);
         $report = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, null, PiwikMetrics::INDEX_NB_VISITS);
         $this->getProcessor()->insertBlobRecord(self::USERID_ARCHIVE_RECORD, $report);
diff --git a/app/plugins/UserId/config/config.php b/app/plugins/UserId/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/UserId/config/config.php
+++ b/app/plugins/UserId/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/UserId/config/tracker.php b/app/plugins/UserId/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/UserId/config/tracker.php
+++ b/app/plugins/UserId/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/UserId/lang/id.json b/app/plugins/UserId/lang/id.json
index 28bd2a775..2ec10bf80 100644
--- a/app/plugins/UserId/lang/id.json
+++ b/app/plugins/UserId/lang/id.json
@@ -1,6 +1,7 @@
 {
     "UserId": {
         "UserId": "IdPengguna",
+        "UserReportTitle": "ID pengguna",
         "PluginDescription": "Tampilkan laporan pengguna"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserId/lang/pt-br.json b/app/plugins/UserId/lang/pt-br.json
index ab2513c7a..a4429390f 100644
--- a/app/plugins/UserId/lang/pt-br.json
+++ b/app/plugins/UserId/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "UserId": {
         "UserId": "UserId",
-        "UserReportTitle": "Usuário IDs",
+        "UserReportTitle": "IDs de usuário",
         "PluginDescription": "Mostra relatórios de usuários"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserId/lang/vi.json b/app/plugins/UserId/lang/vi.json
index 20bd27443..b4e3df8d9 100644
--- a/app/plugins/UserId/lang/vi.json
+++ b/app/plugins/UserId/lang/vi.json
@@ -1,6 +1,7 @@
 {
     "UserId": {
         "UserId": "ID người dùng",
+        "UserReportTitle": "ID người dùng",
         "PluginDescription": "Hiển thị báo cáo người dùng"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserLanguage/config/config.php b/app/plugins/UserLanguage/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/UserLanguage/config/config.php
+++ b/app/plugins/UserLanguage/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/UserLanguage/config/tracker.php b/app/plugins/UserLanguage/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/UserLanguage/config/tracker.php
+++ b/app/plugins/UserLanguage/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/UserLanguage/lang/de.json b/app/plugins/UserLanguage/lang/de.json
index b730c1cab..1d6e1bfd8 100644
--- a/app/plugins/UserLanguage/lang/de.json
+++ b/app/plugins/UserLanguage/lang/de.json
@@ -2,6 +2,6 @@
     "UserLanguage": {
         "BrowserLanguage": "Browsersprache",
         "LanguageCode": "Sprach-Code",
-        "PluginDescription": "Bericht darüber, welche Sprache die Besucher im Browser eingestellt haben."
+        "PluginDescription": "Stellt Berichte zur Verfügung, die die Sprachen anzeigen, die von den Browsern Ihrer Besucher verwendet werden."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UserLanguage/lang/pt-br.json b/app/plugins/UserLanguage/lang/pt-br.json
index e7c6a36d3..5c9763e11 100644
--- a/app/plugins/UserLanguage/lang/pt-br.json
+++ b/app/plugins/UserLanguage/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "UserLanguage": {
         "BrowserLanguage": "Idioma do navegador",
-        "LanguageCode": "Código do Idioma",
+        "LanguageCode": "Código do idioma",
         "PluginDescription": "Informa o idioma usado pelos navegadores dos visitantes."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/API.php b/app/plugins/UsersManager/API.php
index b25a1d6f7..d7f6bc33e 100644
--- a/app/plugins/UsersManager/API.php
+++ b/app/plugins/UsersManager/API.php
@@ -323,19 +323,27 @@ public function getUsersPlusRole($idSite, $limit = null, $offset = 0, $filter_se
                 $loginsToLimit = $this->model->getUsersWithAccessToSites($adminIdSites);
             }
 
-            list($users, $totalResults) = $this->model->getUsersWithRole($idSite, $limit, $offset, $filter_search, $filter_access, $loginsToLimit);
-
-            foreach ($users as &$user) {
-                $user['superuser_access'] = $user['superuser_access'] == 1;
-                if ($user['superuser_access']) {
-                    $user['role'] = 'superuser';
-                    $user['capabilities'] = [];
-                } else {
-                    list($user['role'], $user['capabilities']) = $this->getRoleAndCapabilitiesFromAccess($user['access']);
-                    $user['role'] = empty($user['role']) ? 'noaccess' : reset($user['role']);
-                }
+            if ($loginsToLimit !== null && empty($loginsToLimit)) {
+                // if the current user is not the superuser, and getUsersWithAccessToSites() returned an empty result,
+                // access is managed by another plugin, and the current user cannot manage any user with UsersManager
+                Common::sendHeader('X-Matomo-Total-Results: 0');
+                return [];
 
-                unset($user['access']);
+            } else {
+                list($users, $totalResults) = $this->model->getUsersWithRole($idSite, $limit, $offset, $filter_search, $filter_access, $loginsToLimit);
+
+                foreach ($users as &$user) {
+                    $user['superuser_access'] = $user['superuser_access'] == 1;
+                    if ($user['superuser_access']) {
+                        $user['role'] = 'superuser';
+                        $user['capabilities'] = [];
+                    } else {
+                        list($user['role'], $user['capabilities']) = $this->getRoleAndCapabilitiesFromAccess($user['access']);
+                        $user['role'] = empty($user['role']) ? 'noaccess' : reset($user['role']);
+                    }
+
+                    unset($user['access']);
+                }
             }
         }
 
@@ -651,6 +659,7 @@ private function getCleanAlias($alias, $userLogin)
     public function addUser($userLogin, $password, $email, $alias = false, $_isPasswordHashed = false, $initialIdSite = null)
     {
         Piwik::checkUserHasSomeAdminAccess();
+        UsersManager::dieIfUsersAdminIsDisabled();
 
         if (!Piwik::hasUserSuperUserAccess()) {
             if (empty($initialIdSite)) {
@@ -709,6 +718,7 @@ public function setSuperUserAccess($userLogin, $hasSuperUserAccess, $passwordCon
     {
         Piwik::checkUserHasSuperUserAccess();
         $this->checkUserIsNotAnonymous($userLogin);
+        UsersManager::dieIfUsersAdminIsDisabled();
 
         $requirePasswordConfirmation = self::$SET_SUPERUSER_ACCESS_REQUIRE_PASSWORD_CONFIRMATION;
         self::$SET_SUPERUSER_ACCESS_REQUIRE_PASSWORD_CONFIRMATION = true;
@@ -874,6 +884,7 @@ public function updateUser($userLogin, $password = false, $email = false, $alias
         $isEmailNotificationOnInConfig = Config::getInstance()->General['enable_update_users_email'];
 
         Piwik::checkUserHasSuperUserAccessOrIsTheUser($userLogin);
+        UsersManager::dieIfUsersAdminIsDisabled();
         $this->checkUserIsNotAnonymous($userLogin);
         $this->checkUserExists($userLogin);
 
@@ -912,7 +923,9 @@ public function updateUser($userLogin, $password = false, $email = false, $alias
             $email = $userInfo['email'];
         }
 
-        if ($email != $userInfo['email']) {
+        $hasEmailChanged = Common::mb_strtolower($email) !== Common::mb_strtolower($userInfo['email']);
+
+        if ($hasEmailChanged) {
             $this->checkEmail($email);
             $changeShouldRequirePasswordConfirmation = true;
         }
@@ -927,7 +940,7 @@ public function updateUser($userLogin, $password = false, $email = false, $alias
 
         Cache::deleteTrackerCache();
 
-        if ($email != $userInfo['email'] && $isEmailNotificationOnInConfig) {
+        if ($hasEmailChanged && $isEmailNotificationOnInConfig) {
             $this->sendEmailChangedEmail($userInfo, $email);
         }
 
@@ -957,6 +970,7 @@ public function updateUser($userLogin, $password = false, $email = false, $alias
     public function deleteUser($userLogin)
     {
         Piwik::checkUserHasSuperUserAccess();
+        UsersManager::dieIfUsersAdminIsDisabled();
         $this->checkUserIsNotAnonymous($userLogin);
 
         $this->checkUserExist($userLogin);
@@ -969,6 +983,7 @@ public function deleteUser($userLogin)
         }
 
         $this->model->deleteUserOnly($userLogin);
+        $this->model->deleteUserOptions($userLogin);
         $this->model->deleteUserAccess($userLogin);
 
         Cache::deleteTrackerCache();
@@ -1048,6 +1063,8 @@ public function getUserLoginFromUserEmail($userEmail)
      */
     public function setUserAccess($userLogin, $access, $idSites)
     {
+        UsersManager::dieIfUsersAdminIsDisabled();
+
         if ($access != 'noaccess') {
             $this->checkAccessType($access);
         }
@@ -1362,6 +1379,18 @@ public function getTokenAuth($userLogin, $md5Password)
         return $user['token_auth'];
     }
 
+    public function newsletterSignup()
+    {
+        Piwik::checkUserIsNotAnonymous();
+
+        $userLogin = Piwik::getCurrentUserLogin();
+        $email = Piwik::getCurrentUserEmail();
+
+        $success = NewsletterSignup::signupForNewsletter($userLogin, $email, true);
+        $result = $success ? array('success' => true) : array('error' => true);
+        return $result;
+    }
+
     private function isUserHasAdminAccessTo($idSite)
     {
         try {
diff --git a/app/plugins/UsersManager/Controller.php b/app/plugins/UsersManager/Controller.php
index 9b0c9b475..3d6732746 100644
--- a/app/plugins/UsersManager/Controller.php
+++ b/app/plugins/UsersManager/Controller.php
@@ -13,7 +13,9 @@
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
+use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugin;
 use Piwik\Plugin\ControllerAdmin;
 use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
@@ -52,6 +54,7 @@ public function index()
     {
         Piwik::checkUserIsNotAnonymous();
         Piwik::checkUserHasSomeAdminAccess();
+        UsersManager::dieIfUsersAdminIsDisabled();
 
         $view = new View('@UsersManager/index');
 
@@ -182,6 +185,11 @@ public function userSettings()
         $view->userEmail = $user['email'];
         $view->userTokenAuth = Piwik::getCurrentUserTokenAuth();
         $view->ignoreSalt = $this->getIgnoreCookieSalt();
+        $view->isUsersAdminEnabled = UsersManager::isUsersAdminEnabled();
+
+        $newsletterSignupOptionKey = NewsletterSignup::NEWSLETTER_SIGNUP_OPTION . $userLogin;
+        $view->showNewsletterSignup = Option::get($newsletterSignupOptionKey) === false
+                                    && SettingsPiwik::isInternetEnabled();
 
         $userPreferences = new UserPreferences();
         $defaultReport   = $userPreferences->getDefaultReport();
@@ -205,11 +213,14 @@ public function userSettings()
             $view->defaultReportSiteName = Site::getNameFor($defaultReport);
         }
 
-        $view->defaultReportOptions = array(
-            array('key' => 'MultiSites', 'value' => Piwik::translate('General_AllWebsitesDashboard')),
-            array('key' => $reportOptionsValue, 'value' => Piwik::translate('General_DashboardForASpecificWebsite')),
-        );
+        $defaultReportOptions = array();
+        if (Plugin\Manager::getInstance()->isPluginActivated('MultiSites')) {
+            $defaultReportOptions[] = array('key' => 'MultiSites', 'value' => Piwik::translate('General_AllWebsitesDashboard'));
+        }
+
+        $defaultReportOptions[] = array('key' => $reportOptionsValue, 'value' => Piwik::translate('General_DashboardForASpecificWebsite'));
 
+        $view->defaultReportOptions = $defaultReportOptions;
         $view->defaultDate = $this->getDefaultDateForUser($userLogin);
         $view->availableDefaultDates = $this->getDefaultDates();
 
@@ -378,7 +389,9 @@ public function recordUserSettings()
 
             Piwik::checkUserHasSuperUserAccessOrIsTheUser($userLogin);
 
-            $this->processPasswordChange($userLogin);
+            if (UsersManager::isUsersAdminEnabled()) {
+                $this->processPasswordChange($userLogin);
+            }
 
             LanguagesManager::setLanguageForSession($language);
 
diff --git a/app/plugins/UsersManager/Menu.php b/app/plugins/UsersManager/Menu.php
index 77fc8ced0..7945480d4 100644
--- a/app/plugins/UsersManager/Menu.php
+++ b/app/plugins/UsersManager/Menu.php
@@ -15,7 +15,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        if (Piwik::isUserHasSomeAdminAccess()) {
+        if (Piwik::isUserHasSomeAdminAccess() && UsersManager::isUsersAdminEnabled()) {
             $menu->addSystemItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 15);
         }
 
diff --git a/app/plugins/UsersManager/Model.php b/app/plugins/UsersManager/Model.php
index 22d7413cc..839fdbd57 100644
--- a/app/plugins/UsersManager/Model.php
+++ b/app/plugins/UsersManager/Model.php
@@ -12,6 +12,7 @@
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
+use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Plugins\UsersManager\Sql\SiteAccessFilter;
@@ -392,6 +393,11 @@ public function deleteUserOnly($userLogin)
         Piwik::postEvent('UsersManager.deleteUser', array($userLogin));
     }
 
+    public function deleteUserOptions($userLogin)
+    {
+        Option::deleteLike('UsersManager.%.' . $userLogin);
+    }
+
     /**
      * @param string $userLogin
      */
diff --git a/app/plugins/UsersManager/NewsletterSignup.php b/app/plugins/UsersManager/NewsletterSignup.php
new file mode 100644
index 000000000..af489f556
--- /dev/null
+++ b/app/plugins/UsersManager/NewsletterSignup.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Matomo - free/libre analytics platform
+ *
+ * @link http://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UsersManager;
+
+use Exception;
+use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Http;
+use Piwik\Option;
+use Piwik\SettingsPiwik;
+use Piwik\Url;
+
+class NewsletterSignup
+{
+    const NEWSLETTER_SIGNUP_OPTION = 'UsersManager.newsletterSignup.';
+
+    public static function signupForNewsletter($userLogin, $email, $matomoOrg = false, $professionalServices = false)
+    {
+        // Don't bother if they aren't signing up for at least one newsletter, or if we don't have internet access
+        $doSignup = ($matomoOrg || $professionalServices) && SettingsPiwik::isInternetEnabled();
+        if (!$doSignup) {
+            return false;
+        }
+
+        $url = Config::getInstance()->General['api_service_url'];
+        $url .= '/1.0/subscribeNewsletter/';
+
+        $params = array(
+            'email'     => $email,
+            'piwikorg'  => (int)$matomoOrg,
+            'piwikpro'  => (int)$professionalServices,
+            'url'       => Url::getCurrentUrlWithoutQueryString(),
+            'language'  => StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage(),
+        );
+
+        $url .= '?' . Http::buildQuery($params);
+        try {
+            Http::sendHttpRequest($url, $timeout = 2);
+            $optionKey = self::NEWSLETTER_SIGNUP_OPTION . $userLogin;
+            Option::set($optionKey, 1);
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/plugins/UsersManager/UsersManager.php b/app/plugins/UsersManager/UsersManager.php
index a844aee25..0340acda2 100644
--- a/app/plugins/UsersManager/UsersManager.php
+++ b/app/plugins/UsersManager/UsersManager.php
@@ -14,9 +14,11 @@
 use Piwik\API\Request;
 use Piwik\Auth\Password;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\SystemSummary;
+use Piwik\Plugins\CorePluginsAdmin\CorePluginsAdmin;
 use Piwik\SettingsPiwik;
 
 /**
@@ -45,8 +47,25 @@ public function registerEvents()
         );
     }
 
+    public static function isUsersAdminEnabled()
+    {
+        return (bool) Config::getInstance()->General['enable_users_admin'];
+    }
+
+    public static function dieIfUsersAdminIsDisabled()
+    {
+        Piwik::checkUserIsNotAnonymous();
+        if (!self::isUsersAdminEnabled()) {
+            throw new \Exception('Creating, updating, and deleting users has been disabled.');
+        }
+    }
+
     public function addSystemSummaryItems(&$systemSummary)
     {
+        if (!self::isUsersAdminEnabled()) {
+            return;
+        }
+
         $userLogins = Request::processRequest('UsersManager.getUsersLogin', array('filter_limit' => '-1'));
 
         $numUsers = count($userLogins);
@@ -239,6 +258,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = "General_Save";
         $translationKeys[] = "General_Done";
         $translationKeys[] = "General_Pagination";
+        $translationKeys[] = "General_PleaseTryAgain";
         $translationKeys[] = "UsersManager_DeleteConfirm";
         $translationKeys[] = "UsersManager_ConfirmGrantSuperUserAccess";
         $translationKeys[] = "UsersManager_ConfirmProhibitOtherUsersSuperUserAccess";
@@ -314,6 +334,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'General_Warning';
         $translationKeys[] = 'General_Add';
         $translationKeys[] = 'General_Note';
+        $translationKeys[] = 'General_Yes';
         $translationKeys[] = 'UsersManager_FilterByWebsite';
         $translationKeys[] = 'UsersManager_GiveAccessToAll';
         $translationKeys[] = 'UsersManager_OrManageIndividually';
@@ -324,5 +345,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'UsersManager_AreYouSureAddCapability';
         $translationKeys[] = 'UsersManager_AreYouSureRemoveCapability';
         $translationKeys[] = 'UsersManager_IncludedInUsersRole';
+        $translationKeys[] = 'UsersManager_NewsletterSignupFailureMessage';
+        $translationKeys[] = 'UsersManager_NewsletterSignupSuccessMessage';
     }
 }
diff --git a/app/plugins/UsersManager/config/config.php b/app/plugins/UsersManager/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/UsersManager/config/config.php
+++ b/app/plugins/UsersManager/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/UsersManager/config/tracker.php b/app/plugins/UsersManager/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/UsersManager/config/tracker.php
+++ b/app/plugins/UsersManager/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/da.json b/app/plugins/UsersManager/lang/da.json
index b9e43213a..11ce93022 100644
--- a/app/plugins/UsersManager/lang/da.json
+++ b/app/plugins/UsersManager/lang/da.json
@@ -1,10 +1,16 @@
 {
     "UsersManager": {
+        "2FA": "2FA",
         "UsesTwoFactorAuthentication": "Benytter tofaktorgodkendelse",
         "TwoFactorAuthentication": "Tofaktorgodkendelse",
         "ResetTwoFactorAuthentication": "Nulstil tofaktorgodkendelse",
+        "ResetTwoFactorAuthenticationInfo": "Hvis en bruger ikke længere kan logge ind pga. mistede genskabelseskoder eller mistet tofaktorgodkendelsesenhed, kan du nulstille tofaktorgodkendelse for brugeren, så de kan logge ind igen.",
         "AddUser": "Opret ny bruger",
+        "AddExistingUser": "Tilføj en eksisterende bruger",
+        "AddNewUser": "Tilføj ny bruger",
         "EditUser": "Rediger bruger",
+        "CreateUser": "Opret bruger",
+        "SaveBasicInfo": "Gem basisoplysninger",
         "Alias": "Alias",
         "AllWebsites": "Alle hjemmesider",
         "AnonymousUser": "Anonym bruger",
diff --git a/app/plugins/UsersManager/lang/de.json b/app/plugins/UsersManager/lang/de.json
index 169280cee..89355de9a 100644
--- a/app/plugins/UsersManager/lang/de.json
+++ b/app/plugins/UsersManager/lang/de.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Diese Änderung wurde von folgendem Gerät veranlasst: %1$s (IP-Adresse = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Falls Sie dies waren, können Sie diese E-Mail ignonieren. Falls Sie dies nicht waren, loggen Sie sich bitte ein, korrigieren Sie Ihre E-Mail-Adresse, ändern Sie Ihr Passwort und kontaktieren Sie Ihren Matomo-Administrator.",
         "PasswordChangeNotificationSubject": "Das Passwort Ihres Matomo Benutzerkontos wurde soeben geändert",
-        "PasswordChangedEmail": "Ihr Passwort wurde soeben geändert. Diese Änderung wurde von diesem Gerät veranlasst: %1$s (IP-Adresse = %2$s)."
+        "PasswordChangedEmail": "Ihr Passwort wurde soeben geändert. Diese Änderung wurde von diesem Gerät veranlasst: %1$s (IP-Adresse = %2$s).",
+        "NewsletterSignupTitle": "Newsletter-Anmeldung",
+        "NewsletterSignupMessage": "Abonnieren Sie unseren Newsletter, um regelmäßig Informationen über Matomo zu erhalten. Deabonnieren ist jederzeit möglich. Dieser Dienst verwendet MadMimi. Erfahren Sie mehr in unserer %1$sDatenschutzerklärung%2$s.",
+        "NewsletterSignupFailureMessage": "Hoppla, etwas ist schief gelaufen. Wir konnten Sie nicht für unseren Newsletter registrieren.",
+        "NewsletterSignupSuccessMessage": "Super, Sie wurden erfolgreich registriert! Wir werden in Kürze von uns hören lassen."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/el.json b/app/plugins/UsersManager/lang/el.json
index 060b73783..dd0a1bc8e 100644
--- a/app/plugins/UsersManager/lang/el.json
+++ b/app/plugins/UsersManager/lang/el.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Η αλλαγή έγινε από την παρακάτω συσκευή: %1$s (Διεύθυνση IP = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Αν ήσασταν εσείς, αγνοήστε το παρόν μήνυμα. Αν δεν ήσασταν εσείς, παρακαλούμε κάνετε είσοδο, διορθώστε την διεύθυνση email σας, αλλάξτε το συνθηματικό σας και επικοινωνήστε με το διαχειριστή σας του Matomo.",
         "PasswordChangeNotificationSubject": "Μόλις άλλαξε το συνθηματικό του λογαριασμού σας στο Matomo",
-        "PasswordChangedEmail": "Το συνθηματικό σας μόλις άλλαξε. Η αλλαγή έγινε από την παρακάτω συσκευή: %1$s (διεύθυνση IP = %2$s)."
+        "PasswordChangedEmail": "Το συνθηματικό σας μόλις άλλαξε. Η αλλαγή έγινε από την παρακάτω συσκευή: %1$s (διεύθυνση IP = %2$s).",
+        "NewsletterSignupTitle": "Εγγραφή στα Μηνύματα με Νέα",
+        "NewsletterSignupMessage": "Εγγραφείτε στα μηνύματα με τα νέα για να λαμβάνετε συχνές πληροφορίες σχετικά με το Matomo. Μπορείτε να διαγραφείτε από αυτό οποιαδήποτε στιγμή. Η υπηρεσία χρησιμοποιεί το MadMimi. Μάθετε περισσότερα για αυτό στη %1$sΣελίδα Πολιτικής Ιδιωτικότητας%2$s.",
+        "NewsletterSignupFailureMessage": "Ουπς, κάτι λάθος συνέβη. Δεν ήταν δυνατή η εγγραφή σας στα μηνύματα με τα νέα.",
+        "NewsletterSignupSuccessMessage": "Τέλεια, έχετε κάνει εγγραφή! Θα έρθουμε σε επικοινωνία σύντομα."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/en.json b/app/plugins/UsersManager/lang/en.json
index 866b52567..c8f7e4de4 100644
--- a/app/plugins/UsersManager/lang/en.json
+++ b/app/plugins/UsersManager/lang/en.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "This change was initiated from the following device: %1$s (IP address = %2$s).",
         "IfThisWasYouIgnoreIfNot": "If this was you, feel free to ignore this email. If this was not you, please login, correct your email address, change your password and contact your Matomo administrator.",
         "PasswordChangeNotificationSubject": "Your Matomo account's password has just been changed",
-        "PasswordChangedEmail": "Your password has just been changed. The change was initiated from the following device: %1$s (IP address = %2$s)."
+        "PasswordChangedEmail": "Your password has just been changed. The change was initiated from the following device: %1$s (IP address = %2$s).",
+        "NewsletterSignupTitle": "Newsletter Signup",
+        "NewsletterSignupMessage": "Subscribe to our newsletter to receive regular information about Matomo. You can unsubscribe from it any time. This service uses MadMimi. Learn more about it on our %1$sPrivacy Policy page%2$s.",
+        "NewsletterSignupFailureMessage": "Whoops, something went wrong. We weren't able to sign you up for the newsletter.",
+        "NewsletterSignupSuccessMessage": "Super, you're all signed up! We'll be in touch soon."
     }
 }
diff --git a/app/plugins/UsersManager/lang/es-ar.json b/app/plugins/UsersManager/lang/es-ar.json
index a033639e3..274b490c4 100644
--- a/app/plugins/UsersManager/lang/es-ar.json
+++ b/app/plugins/UsersManager/lang/es-ar.json
@@ -1,47 +1,170 @@
 {
     "UsersManager": {
-        "AddUser": "Añadir un nuevo usuario",
+        "2FA": "2FA",
+        "UsesTwoFactorAuthentication": "Usa autenticación de 2 factores",
+        "TwoFactorAuthentication": "Autenticación de 2 factores",
+        "ResetTwoFactorAuthentication": "Restablecer autenticación de 2 factores",
+        "ResetTwoFactorAuthenticationInfo": "Si el usuario no puede iniciar sesión porque perdió los códigos de recuperación o un dispositivo de autenticación, podés restablecer la autenticación de 2 factores para el usuario, así puede iniciar sesión de nuevo.",
+        "AddUser": "Agregar un nuevo usuario",
+        "AddExistingUser": "Agregar un usuario existente",
+        "AddNewUser": "Agregar nuevo usuario",
+        "EditUser": "Editar usuario",
+        "CreateUser": "Crear usuario",
+        "SaveBasicInfo": "Guardar información básica",
         "Alias": "Alias",
         "AllWebsites": "Todos los sitios web",
+        "AnonymousAccessConfirmation": "Estás a punto de garantizar al usuario anónimo el acceso \"de vista\" a este sitio web. Esto significa que tus informes de análisis y la información de tus visitantes será visible públicamente por todos, incluso sin iniciar sesión. ¿Estás seguro que querés continuar?",
+        "AnonymousUser": "Usuario anónimo",
         "AnonymousUserHasViewAccess": "Nota: el usuario %1$s tiene acceso para %2$s para este sitio web.",
         "AnonymousUserHasViewAccess2": "Tus informes de análisis y la información de tus visitantes son vistos públicamente.",
         "ApplyToAllWebsites": "Aplicar a todos los sitios web",
-        "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.",
-        "DeleteConfirm": "¿Está seguro que desea eliminar al usuario %s?",
-        "Email": "Email",
-        "EmailYourAdministrator": "%1$sEnviar un correo electrónico a su administrador acerca de este problema%2$s.",
-        "ExceptionDeleteDoesNotExist": "El usuario '%s' no existe, por lo tanto, no puede ser borrado.",
-        "ExceptionDeleteOnlyUserWithSuperUserAccess": "Deleting user '%s' is not possible.",
-        "ExceptionEmailExists": "Ya existe un usuario con el email '%s'.",
-        "ExceptionInvalidEmail": "El email no tiene un formato válido.",
-        "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth está a la espera de una contraseña con algoritmo hash MD5 (32 caracteres de longitud). Por favor llame a la función md5() en la contraseña antes de llamar a este método.",
-        "ExceptionRemoveSuperUserAccessOnlySuperUser": "Removing the Super User access from user '%s' is not possible.",
-        "ExceptionUserDoesNotExist": "El usuario '%s' no existe.",
-        "ExceptionYouMustGrantSuperUserAccessFirst": "There has to be at least one user with Super User access. Please grant Super User access to another user first.",
-        "ExcludeVisitsViaCookie": "Excluir sus visitas usando una cookie",
-        "ForAnonymousUsersReportDateToLoadByDefault": "Para los usuarios anónimos, fecha del reporte a cargar por defecto",
-        "InjectedHostCannotChangePwd": "Está actualmente visitando con un medio desconocido (%1$s). No puede cambiar su contraseña hasta que el problema esté soluionado.",
-        "ManageAccess": "Administrar el Acceso",
-        "MenuAnonymousUserSettings": "Configuración de usuario Anónimo",
+        "ChangeAllConfirm": "¿Estás seguro que querés darle a \"%s! acceso a todos los sitios web?",
+        "ClickHereToDeleteTheCookie": "Hacé clic acá para eliminar la cookie y dejar que Matomo rastree tus visitas",
+        "ClickHereToSetTheCookieOnDomain": "Hacé clic acá para establecer una cookie que excluya tus visitas en sitios web rastreados por Matomo en %s",
+        "ConfirmGrantSuperUserAccess": "¿Estás seguro que querés garantizarle a \"%s\" acceso de súperusuario? Advertencia: el usuario tendrá acceso a todos los sitios web y podrá ejecutar tareas administrativas.",
+        "ConfirmProhibitMySuperUserAccess": "%s, ¿estás seguro que querés quitar tu propio acceso de súperusuario? Vas a perder todos tus permisos y accesos a todos los sitios web y cerrarás tu sesión de Matomo.",
+        "ConfirmProhibitOtherUsersSuperUserAccess": "¿Estás seguro que querés quitar el acceso de súperusuario de \"%s\"? El usuario va a perder todos sus permisos y accesos a todos los sitios web. Si es necesario, luego asegurate de darle acceso a todos los sitios web necesarios.",
+        "DeleteConfirm": "¿Estás seguro que querés eliminar al usuario %s?",
+        "Email": "Correo electrónico",
+        "EmailYourAdministrator": "%1$sEnviale un correo electrónico a tu administrador sobre este problema%2$s.",
+        "EnterUsernameOrEmail": "Ingresá un nombre de usuario o dirección de correo electrónico",
+        "ExceptionAccessValues": "El acceso de parámetro debe tener uno de los siguientes valores: [%1$s], \"%2$s\" dado.",
+        "ExceptionNoRoleSet": "No hay rol establecido pero uno de estos necesita ser establecido: %s",
+        "ExceptionMultipleRoleSet": "Sólo un rol puede ser establecido pero se establecieron varios. Usá sólo uno de; %s",
+        "ExceptionAnonymousNoCapabilities": "No podés garantizar ninguna capacidad al usuario \"anónimo\".",
+        "ExceptionAnonymousAccessNotPossible": "Sólo podés establecer acceso %1$s o acceso %2$s al usuario \"anónimo\".",
+        "ExceptionDeleteDoesNotExist": "El usuario \"%s\" no existe, por lo tanto, no puede ser eliminado.",
+        "ExceptionDeleteOnlyUserWithSuperUserAccess": "No es posible eliminar al usuario \"%s\".",
+        "ExceptionEditAnonymous": "El usuario anónimo no puede ser borrado o editado. Matomo lo utiliza para definir que usuario que no se ha conectado todavía. Por ejemplo, podés hacer públicas tus 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 nombre de usuario debe tener una longitud de entre %1$s y %2$s caracteres y sólo contener letras sin signos diacríticos, números, o los caracteres subguión (\"_\"), guión (\"-\"), punto (\".\"), arroba (\"@\") o más (\"+\").",
+        "ExceptionInvalidPassword": "La longitud de la contraseña debe ser mayor de %1$s caracteres.",
+        "ExceptionInvalidPasswordTooLong": "La longitud de la contraseña debe ser menor de %1$s caracteres.",
+        "ExceptionLoginExists": "El nombre de 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, invocá la función md5() en la contraseña antes de invocar este método.",
+        "ExceptionRemoveSuperUserAccessOnlySuperUser": "Quitar el acceso de súperusuario a \"%s\" no es posible.",
+        "ExceptionSuperUserAccess": "El usuario tiene acceso de súperusuario y ya tiene permiso para acceder y modificar todos los sitios web en Matomo. Podés quitarle el acceso de súperusuario a este usuario e intentar de nuevo.",
+        "ExceptionUserHasSuperUserAccess": "El usuario \"%s\" tiene acceso de súperusuario y ya tiene permiso para acceder y modificar todos los sitios web en Matomo. Podés quitarle el acceso de súperusuario a este usuario e intentar de nuevo.",
+        "ExceptionUserDoesNotExist": "El usuario \"%s\" no existe.",
+        "ExceptionYouMustGrantSuperUserAccessFirst": "Tiene que haber, al menos, un usuario con acceso de súperusuario. Por favor, primero garantizale el acceso de súperusuario a otro usuario.",
+        "ExceptionUserHasViewAccessAlready": "Este usuario ya tiene acceso a este sitio web.",
+        "ExceptionNoValueForUsernameOrEmail": "Por favor, ingresá un nombre de usuario o direccion de correo electrónico.",
+        "ExcludeVisitsViaCookie": "Excluir tus visitas usando una cookie",
+        "ForAnonymousUsersReportDateToLoadByDefault": "Para los usuarios anónimos, fecha del informe a cargar predeterminadamente",
+        "GiveUserAccess": "Dar a \"%1$s\" acceso %2$s para %3$s.",
+        "GiveViewAccess": "Dar acceso de vista para %1$s",
+        "GiveViewAccessTitle": "Dar a un usuario existente acceso para ver informes de %s",
+        "GiveViewAccessInstructions": "Para dar a un usuario existente acceso para %s, ingresá el nombre de usuario o dirección de correo electrónico de dicho usuario existente",
+        "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Si querés cambiar la contraseña, ingresá una nueva. De lo contrario, dejá este campo en blanco.",
+        "YourCurrentPassword": "Tu contraseña actual",
+        "CurrentPasswordNotCorrect": "La contraseña actual que ingresaste no es correcta.",
+        "ConfirmWithPassword": "Por favor, ingresá tu contraseña para confirmar este cambio.",
+        "InjectedHostCannotChangePwd": "Actualmente estás visitando con un servidor desconocido (%1$s). No podés cambiar tu contraseña hasta que el problema sea solucionado.",
+        "LastSeen": "Última vez visto",
+        "MainDescription": "Decidí qué usuarios tienen acceso a tus sitios web. También podés darles acceso a todos los sitios web de una sola vez, eligiendo \"Aplicar a todos los sitios web\" en el selector de sitios web.",
+        "ManageAccess": "Administrar el acceso",
+        "MenuAnonymousUserSettings": "Configuración de usuario anónimo",
         "MenuUsers": "Usuarios",
         "MenuUserSettings": "Configuración de usuario",
-        "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": "There are no users yet.",
+        "MenuPersonal": "Personal",
+        "PersonalSettings": "Configuración personal",
+        "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Nota: no podés modificar la configuración en esta sección, porque no tenés ningún sitio web que pueda ser accedido por un usuario anónimo.",
+        "NoUsersExist": "Todavía no hay usuarios.",
+        "PluginDescription": "La administración de usuarios te permite agregar nuevos usuarios, editar usuarios existentes y darles acceso para ver o administrar sitios web.",
         "PrivAdmin": "Admin",
+        "PrivAdminDescription": "Los usuarios con este rol pueden administrar un sitio web y dale acceso a otros usuarios al sitio web. También pueden hacer todo lo que el rol de %s puede hacer.",
+        "PrivWrite": "Escribir",
+        "PrivWriteDescription": "Los usuarios con este rol pueden ver todo el contenido, además de crear, administrar y eliminar entidades como Metas, Embudos, Mapas de calor, Registros de sesión y Formularios de este sitio web.",
         "PrivNone": "Sin acceso",
         "PrivView": "Ver",
-        "ReportDateToLoadByDefault": "Fecha del reporte a cargar por defecto",
-        "ReportToLoadByDefault": "Reporte a cargar por defecto",
-        "SuperUserAccessManagement": "Manage Super User access",
-        "SuperUserAccessManagementMainDescription": "Super users have the highest permissions. They can perform all administrative tasks such as adding new websites to monitor, adding users, changing user permissions, activating and deactivating plugins and even installing new plugins from the Marketplace.",
-        "TheLoginScreen": "Pantalla de ingreso",
+        "PrivViewDescription": "Un usuario con este rol puede ver todos los informes.",
+        "RemoveUserAccess": "Quitar acceso a \"%1$s\" de %2$s.",
+        "ReportDateToLoadByDefault": "Fecha del informe a cargar predeterminadamente",
+        "ReportToLoadByDefault": "Informe a cargar predeterminadamente",
+        "SuperUserAccessManagement": "Administrar acceso de súperusuario",
+        "SuperUserAccessManagementGrantMore": "Acá podés garantizar acceso de súperusuario a otros usuarios de Matomo. Por favor, usá esta función con cuidado.",
+        "SuperUserAccessManagementMainDescription": "Los súperusuarios tienen los permisos más altos. Ellos pueden ejecutar todas las tareas administrativas como agregar nuevos sitios web para monitorear, agregar usuarios, cambiar permisos de usuarios, activar y desactivar plugins e incluso instalar nuevos plugins desde el Mercado.",
+        "TheLoginScreen": "Pantalla de inicio de sesión",
         "ThereAreCurrentlyNRegisteredUsers": "Actualmente hay %s usuarios registrados.",
-        "TypeYourPasswordAgain": "Ingrese la contraseña de nuevo",
+        "TokenAuth": "Clave de API de autenticación",
+        "TokenRegenerateConfirmSelf": "Cambiar la clave de API de autenticación invalidará tu propia clave. Si la clave actual está en uso, vas a necesitar actualizar todos los clientes API con la nueva clave generada. ¿Estás seguro que querés cambiar tu clave de autenticación?",
+        "TokenRegenerateTitle": "Regenerar",
+        "TypeYourPasswordAgain": "Ingresá tu nueva contraseña de nuevo.",
         "User": "Usuario",
-        "UsersManagement": "Administración de Usuarios",
-        "UsersManagementMainDescription": "Cree nuevos usuarios o actualice los actuales. Luego puede configurar sus permisos.",
-        "YourUsernameCannotBeChanged": "Su nombre de usuario no puede cambiarse.",
+        "UserHasPermission": "%1$s actualmente tiene acceso %2$s para %3$s.",
+        "UserHasNoPermission": "%1$s actualmente tiene %2$s para %3$s",
+        "UsersManagement": "Administración de usuarios",
+        "UsersManagementMainDescription": "Creá nuevos usuarios o actualizá los actuales. Luego podés configurar sus permisos arriba.",
+        "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Cuando los usuarios que no hayan iniciado sesión visitan Matomo, deberían ver inicialmente",
+        "YourUsernameCannotBeChanged": "No se puede cambiar tu nombre de usuario.",
+        "YourVisitsAreIgnoredOnDomain": "%1$sTus visitas son ignoradas por Matomo en %2$s%3$s (se encontró en tu navegador web la cookie para ignorar a Matomo).",
+        "YourVisitsAreNotIgnored": "%1$sTus visitas no son ignoradas por Matomo%2$s (no se encontró en tu navegador web la cookie para ignorar a Matomo).",
+        "AddUserNoInitialAccessError": "Los nuevos usuarios tienen que darle acceso a tu sitio web. Por favor, establecé el parámetro \"initialIdSite\".",
+        "AtLeastView": "Vista como mínimo",
+        "ManageUsers": "Administrar usuarios",
+        "ManageUsersDesc": "Creá nuevos usuarios o actualizá a los existentes. Luego podés establecerles permisos, también desde acá.",
+        "NoAccessWarning": "A este usuario no se le garantizó acceso a un sitio web. Cuando inicie sesión, verá un mensaje de error. Para prevenir eso, concedele acceso a un sitio web, abajo.",
+        "BulkActions": "Acciones masivas",
+        "SetPermission": "Establecer permiso",
+        "RemovePermissions": "Quitar permisos",
+        "RolesHelp": "Los roles determinan lo que un usuario puede hacer en Matomo con respecto a un sitio web específico. Aprendé más sobre los roles de %1$svista%2$s y de %3$sadministración%4$s.",
+        "Role": "Rol",
+        "TheDisplayedWebsitesAreSelected": "Están seleccionados los %1$s sitios web mostrados.",
+        "ClickToSelectAll": "Hacé clic para seleccionar todos los %1$s.",
+        "AllWebsitesAreSelected": "Están seleccionados todos los %1$s sitios web.",
+        "ClickToSelectDisplayedWebsites": "Hacé clic para seleccionar los %1$s sitios web mostrados.",
+        "DeletePermConfirmSingle": "¿Estás seguro que querés quitarle a %1$s el acceso a %2$s?",
+        "DeletePermConfirmMultiple": "¿Estás seguro que querés quitarle a %1$s el acceso a los %2$s sitios web seleccionados?",
+        "ChangePermToSiteConfirmSingle": "¿Estás seguro que querés cambiar el rol de %1$s, de %2$s a %3$s?",
+        "ChangePermToSiteConfirmMultiple": "¿Estás seguro que querés cambiar el rol de %1$s a los %2$s sitios web seleccionados, a %3$s?",
+        "BasicInformation": "Información básica",
+        "Permissions": "Permisos",
+        "SuperUserAccess": "Acceso de súperusuario",
+        "FirstSiteInlineHelp": "Se requiere dar a un nuevo usuario un rol de vista para un sitio web sobre la creación. Si no se le concede acceso, el usuario verá un mensaje de error al iniciar sesión. Podés darle más permisos luego de que el usuario esté creado en la pestaña \"Permisos\" que aparecerá en la izquierda.",
+        "SuperUsersPermissionsNotice": "Los súperusuarios tienen acceso de administrador a todos los sitios web, por lo que no hay necesidad de administrar sus permisos por cada sitio web.",
+        "SuperUserIntro1": "Los súperusuarios tiene los permisos más altos. Ellos pueden ejecutar todas las tareas administrativas tales como agregar nuevos sitios web para monitorear, agregar usuarios, cambiar los permisos de los usuarios, activar y desactivar plugins e incluso instalar nuevos plugins desde el mercado. Podés garantizarle acceso de súperusuario a otros usuarios de Divezone acá.",
+        "SuperUserIntro2": "Por favor, usá esta función con ciudado.",
+        "HasSuperUserAccess": "Tiene acceso de súperusuario",
+        "AreYouSure": "¿Estás seguro?",
+        "RemoveSuperuserAccessConfirm": "Quitar acceso de súperusuario dejará a este usuario sin permisos (tendrás que agregarlos luego). Ingresá tu contraseña para continuar.",
+        "AddSuperuserAccessConfirm": "Dar acceso de súperusuario a un usuario estándar permitirá que tenga control total sobre Matomo y debería hacerse con moderación. Ingresá tu contraseña para continuar.",
+        "DeleteUsers": "Eliminar usuarios",
+        "UserSearch": "Búsqueda de usuarios",
+        "FilterByAccess": "Filtrar por acceso",
+        "FilterByWebsite": "Filtrar por sitio web",
         "ShowAll": "Mostrar todo",
-        "Username": "Nombre de usuario"
+        "Username": "Nombre de usuario",
+        "RoleFor": "Rol de",
+        "TheDisplayedUsersAreSelected": "Están seleccionados los %1$s usuarios mostrados.",
+        "AllUsersAreSelected": "Están seleccionados todos los %1$s usuarios.",
+        "ClickToSelectDisplayedUsers": "Hacé clic para seleccionar los %1$s usuarios mostrados.",
+        "RemoveAllAccessToThisSite": "Quitar todos los accesos a este sitio web",
+        "DeleteUserConfirmSingle": "¿Estás seguro que querés eliminar %1$s?",
+        "DeleteUserConfirmMultiple": "¿Estás seguro que querés eliminar los %1$s usuarios seleccionados?",
+        "DeleteUserPermConfirmSingle": "¿Estás seguro que querés cambiar el rol de %1$s, de %2$s a %3$s?",
+        "DeleteUserPermConfirmMultiple": "¿Estás seguro que querés cambiar el rol de los %1$s usuarios seleccionados, de %2$s a %3$s?",
+        "AreYouSureChangeDetails": "¿Estás seguro que querés cambiar la información de usuario de %s?",
+        "AnonymousUserRoleChangeWarning": "Dar al usuario %1$s el rol de %2$s hará que los datos de este sitio web sean publicos y que estén disponibles para todos, incluso sin iniciar sesión en Matomo.",
+        "GiveAccessToAll": "Darle a este usuario acceso a todos los sitios web",
+        "OrManageIndividually": "O administrá el acceso de este usuario a cada sitio web individualmente",
+        "ChangePermToAllSitesConfirm": "¿Estás seguro que querés darle al %1$susuario%2$s acceso a cada sitio web en los que actualmente tenés acceso de administrador?",
+        "ChangePermToAllSitesConfirm2": "Nota: esto sólo afectará los sitios web existentes actualmente. Los nuevos sitios web que vayás a crear no serán accesibles automáticamente para este usuario.",
+        "CapabilitiesHelp": "Las capacidades son habilidades individuales que se le pueden garantizar a los usuarios. Los roles pueden, predeterminadamente, garantizar ciertas capacidades. Por ejemplo, el rol de administrador le permitirá automáticamente a los usuarios editar etiquetas en el Administrador de etiquetas. Para usuarios con menos poder, sin embargo, podés darle capacidades explícitamente.",
+        "Capabilities": "Capacidades",
+        "AreYouSureAddCapability": "¿Estás seguro que querés darle a %1$s la capacidad %2$s para %3$s?",
+        "AreYouSureRemoveCapability": "¿Estás seguro que querés quitarle a %2$s la capacidad %1$s para %3$s?",
+        "IncludedInUsersRole": "Incluida en el rol de este usuario.",
+        "Capability": "Capacidad",
+        "EmailChangeNotificationSubject": "Se acaba de cambiar la dirección de correo electrónico de tu cuenta de Matomo",
+        "EmailChangedEmail1": "La dirección de correo electrónico asociada a tu cuenta fue cambiada a %1$s",
+        "EmailChangedEmail2": "Este cambio se produjo desde el siguiente dispositivo: %1$s (dirección IP: %2$s).",
+        "IfThisWasYouIgnoreIfNot": "Si fuiste vos, simplemente ignorá este mensaje. Si no fuiste vos, por favor, iniciá sesión, cambiá tu dirección de correo electrónico y contraseña, y contactá a tu administrador de Matomo.",
+        "PasswordChangeNotificationSubject": "Se acaba de cambiar la contraseña de tu cuenta de Matomo",
+        "PasswordChangedEmail": "Tu contraseña se cambió. El cambio se produjo desde el siguiente dispositivo: %1$s (dirección IP: %2$s).",
+        "NewsletterSignupTitle": "Registro en el boletín informativo",
+        "NewsletterSignupMessage": "Suscribite a nuestro boletín informativo para recibir regularmente información sobre Matomo. Podés desuscribirte cuando quieras. Este servicio usa MadMini. Conocé más al respecto en nuestra %1$spágina de política de privacidad%2$s.",
+        "NewsletterSignupFailureMessage": "Epa, algo salió mal. No pudimos suscribirte al boletín informativo.",
+        "NewsletterSignupSuccessMessage": "¡Joya, ya estás registrado! Nos estaremos contactando pronto."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/fi.json b/app/plugins/UsersManager/lang/fi.json
index 1167d4d74..4abe81905 100644
--- a/app/plugins/UsersManager/lang/fi.json
+++ b/app/plugins/UsersManager/lang/fi.json
@@ -126,6 +126,7 @@
         "EmailChangedEmail2": "Tämä muutos toteutettiin seuraavasta laitteesta: %1$s (IP-osoite = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Jos se olit sinä, tämä viesti ei aiheuta toimenpiteitä. Jos se et ollut sinä, kirjaudu Matomoon, vaihda sähköpostiosoitteesi ja salasanasi, ja ole lopuksi yhteydessä käyttämäsi Matomon ylläpitoon.",
         "PasswordChangeNotificationSubject": "Matomo-tilisi salasana on juuri vaihdettu",
-        "PasswordChangedEmail": "Salasanasi on vaihdettu. Vaihto toteutettiin seuraavasta laitteesta: %1$s (IP-osoite = %2$s)."
+        "PasswordChangedEmail": "Salasanasi on vaihdettu. Vaihto toteutettiin seuraavasta laitteesta: %1$s (IP-osoite = %2$s).",
+        "NewsletterSignupTitle": "Uutiskirjeen tilaus"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/fr.json b/app/plugins/UsersManager/lang/fr.json
index ff01bff58..2ef88a11a 100644
--- a/app/plugins/UsersManager/lang/fr.json
+++ b/app/plugins/UsersManager/lang/fr.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Ce changement a été initié depuis le périphérique suivant : %1$s (Adresse IP = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Si c'était vous, vous pouvez ignorer ce courriel. Si ce n'était pas vous, veuillez vous identifier, corrigez votre adresse de courriel, modifiez votre mot de passe et contactez votre administrateur Matomo.",
         "PasswordChangeNotificationSubject": "Le mot de passe de votre compte Matomo vient d'être modifié",
-        "PasswordChangedEmail": "Votre mot de passe vient d'être modifié. Le changement a été initié depuis le périphérique suivant : %1$s (Adresse IP = %2$s)."
+        "PasswordChangedEmail": "Votre mot de passe vient d'être modifié. Le changement a été initié depuis le périphérique suivant : %1$s (Adresse IP = %2$s).",
+        "NewsletterSignupTitle": "Enregistrement à l'infolettre",
+        "NewsletterSignupMessage": "Abonnez vous à notre infolettre afin de recevoir des informations régulières à propos de Matomo. Vous pouvez vous désinscrire à tout moment. Ce service utilise MadMimi. Apprenez en plus sur notre page de %1$spolitique de respect de la vie privée%2$s.",
+        "NewsletterSignupFailureMessage": "Oops, il y a eu un problème. Nous ne somme pas parvenus à vous enregistrer à l'infolettre.",
+        "NewsletterSignupSuccessMessage": "Super, vous êtes enregistré(e) ! Nous aurez bientôt de nos nouvelles."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/it.json b/app/plugins/UsersManager/lang/it.json
index 20adc4278..03e1bf197 100644
--- a/app/plugins/UsersManager/lang/it.json
+++ b/app/plugins/UsersManager/lang/it.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Questo cambiamento ha avuto origine dal seguente dispositivo: %1$s (Indirizzo IP = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Se sei stato tu, ignora questa email. Altrimenti, accedi, correggi il tuo indirizzo email, cambia la password e contatta il tuo amministratore di Matomo.",
         "PasswordChangeNotificationSubject": "La password del tuo account Matomo è stata cambiata adesso",
-        "PasswordChangedEmail": "La tua password è stata cambiata adesso. Il cambiamento ha avuto origine dal seguente dispositivo: %1$s (Indirizzo IP =%2$s)."
+        "PasswordChangedEmail": "La tua password è stata cambiata adesso. Il cambiamento ha avuto origine dal seguente dispositivo: %1$s (Indirizzo IP =%2$s).",
+        "NewsletterSignupTitle": "Iscrizione alla Newsletter",
+        "NewsletterSignupMessage": "Iscriviti alla nostra newsletter per ricevere regolarmente informazioni su Matomo. Puoi cancellare l'iscrizione in ogni momento. Qeusto servizio utilizza MadMimi. Leggi di più su di esso nella nostra pagina %1$sPolitiche sulla Privacy%2$s.",
+        "NewsletterSignupFailureMessage": "Oooops, qualcosa è andata storta. Non abbiamo potuto iscriverti alla newsletter.",
+        "NewsletterSignupSuccessMessage": "Super, sei iscritto! Ci sentiremo presto."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/ja.json b/app/plugins/UsersManager/lang/ja.json
index dd4229d91..5040ea756 100644
--- a/app/plugins/UsersManager/lang/ja.json
+++ b/app/plugins/UsersManager/lang/ja.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "この変更は次の端末から開始されました：%1$s（ IP アドレス= %2$s）。",
         "IfThisWasYouIgnoreIfNot": "これがあなたなら、この E メールを無視してください。 そうでない場合は、ログインして電子メールアドレスを修正し、パスワードを変更して Matomo 管理者に連絡してください。",
         "PasswordChangeNotificationSubject": "あなたの Matomo アカウントのパスワードは変更されたばかりです",
-        "PasswordChangedEmail": "あなたのパスワードは変更されたばかりです。 変更は次のデバイスから開始されました：%1$s（ IP アドレス= %2$s）。"
+        "PasswordChangedEmail": "あなたのパスワードは変更されたばかりです。 変更は次のデバイスから開始されました：%1$s（ IP アドレス= %2$s）。",
+        "NewsletterSignupTitle": "ニュースレターに登録",
+        "NewsletterSignupMessage": "Matomoの情報を受信するためにニュースレターに登録してください。ニュースレターからいつでも登録を解除することができます。このサービスはMadMimiを使用しています。詳細は%1$sプライバシーポリシーの%2$sページを確認してください。",
+        "NewsletterSignupFailureMessage": "登録に失敗しました。",
+        "NewsletterSignupSuccessMessage": "登録が完了しました。"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/pl.json b/app/plugins/UsersManager/lang/pl.json
index 13b6096d5..a1faabb87 100644
--- a/app/plugins/UsersManager/lang/pl.json
+++ b/app/plugins/UsersManager/lang/pl.json
@@ -1,8 +1,16 @@
 {
     "UsersManager": {
         "2FA": "2SA",
-        "TwoFactorAuthentication": "Autentykacja 2 stopniowa",
+        "UsesTwoFactorAuthentication": "Wykorzystuje 2 składnikowe uwierzytelnianie",
+        "TwoFactorAuthentication": "Uwierzytelnianie 2 składnikowe",
+        "ResetTwoFactorAuthentication": "Resetuj uwierzytelnienie 2 składnikowe",
+        "ResetTwoFactorAuthenticationInfo": "Jeśli użytkownik nie może zalogować się po utracie kodów dostępu lub utracie tokena sprzętowego, możesz zresetować uwierzytelnianie 2 składnikowe dla niego, aby umożliwić ponowne logowanie.",
         "AddUser": "Dodaj nowego użytkownika",
+        "AddExistingUser": "Dodaj istniejącego użytkownika",
+        "AddNewUser": "Dodaj nowego użytkownika",
+        "EditUser": "Edytuj użytkownika",
+        "CreateUser": "Utwórz użytkownika",
+        "SaveBasicInfo": "Zapisz Podstawowe Info",
         "Alias": "Alias",
         "AllWebsites": "Wszystkie strony",
         "AnonymousAccessConfirmation": "Zamierzasz przyznać anonimowemu użytkownikowi dostęp 'podgląd' do tego serwisu. To oznacza, że raporty analityczne i informacje o odwiedzających będą publicznie dostępne dla każdego nawet bez loginu. Czy na pewno chcesz kontynuować?",
@@ -76,6 +84,7 @@
         "YourVisitsAreIgnoredOnDomain": "%1$sTwoje odwiedziny są ignorowane przez Matomo na %2$s %3$s (Matomo zignoruje ciasteczka cookie które znajdzie w twojej przeglądarce).",
         "YourVisitsAreNotIgnored": "%1$sTwoje odwiedziny nie będą ignorowane przez Matomo%2$s (Matomo nie odnalazł właściwego dla wykluczenia ciasteczka cookie w twojej przeglądarce).",
         "ShowAll": "Pokaż wszystko",
-        "Username": "Nazwa użytkownika"
+        "Username": "Nazwa użytkownika",
+        "EmailChangeNotificationSubject": "Adres email powiązany z Twoim kontem Matomo został zmieniony"
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/pt-br.json b/app/plugins/UsersManager/lang/pt-br.json
index 6d978edab..9b029ffa5 100644
--- a/app/plugins/UsersManager/lang/pt-br.json
+++ b/app/plugins/UsersManager/lang/pt-br.json
@@ -1,88 +1,147 @@
 {
     "UsersManager": {
+        "2FA": "A2F",
+        "UsesTwoFactorAuthentication": "Usar autenticação de dois fatores",
+        "TwoFactorAuthentication": "Autenticação de dois fatores",
+        "ResetTwoFactorAuthentication": "Redefinir autenticação de dois fatores",
+        "ResetTwoFactorAuthenticationInfo": "Se o usuário não puder mais fazer login devido à perda dos códigos de recuperação ou à perda de um dispositivo de autenticação, você pode redefinir a autenticação de dois fatores para o usuário para que ele possa fazer login novamente.",
         "AddUser": "Adicionar novo usuário",
         "AddExistingUser": "Adicionar um usuário existente",
         "AddNewUser": "Adicionar novo usuário",
         "EditUser": "Editar usuário",
         "CreateUser": "Criar usuário",
-        "SaveBasicInfo": "Salvar Informação Básica",
+        "SaveBasicInfo": "Salvar informação básica",
         "Alias": "Apelido",
-        "AllWebsites": "Todos os websites",
-        "AnonymousAccessConfirmation": "Você está prestes a conceder para o usuário anônimo o acesso de 'visualização' para este website. Isso significa que seus relatórios e as informações de seus visitantes serão publicamente visíveis por qualquer pessoa, mesmo sem login. Vocês tem certeza que deseja continuar?",
+        "AllWebsites": "Todos os sites",
+        "AnonymousAccessConfirmation": "Você está prestes a conceder para o usuário anônimo o acesso de 'visualização' para este site. Isso significa que seus relatórios de análise e as informações de seus visitantes serão publicamente visíveis por qualquer pessoa, mesmo sem login. Você tem certeza de que deseja continuar?",
         "AnonymousUser": "Usuário anônimo",
-        "AnonymousUserHasViewAccess": "Nota: o usuário %1$s tem acesso %2$s para este site.",
+        "AnonymousUserHasViewAccess": "Obs: 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 quer dar acesso a '%s' para todos os websites?",
-        "ClickHereToDeleteTheCookie": "Clique aqui para deletar o cookie e deixar o Matomo rastrear suas visitas",
-        "ClickHereToSetTheCookieOnDomain": "Clique aqui para setar um cookie que excluirá suas visitas em websites rastrados pelo Matomo em %s",
+        "ApplyToAllWebsites": "Aplicar a todos os sites",
+        "ChangeAllConfirm": "Você tem certeza que quer dar acesso a '%s' para todos os sites?",
+        "ClickHereToDeleteTheCookie": "Clique aqui para excluir o cookie e deixar o Matomo rastrear suas visitas",
+        "ClickHereToSetTheCookieOnDomain": "Clique aqui para definir um cookie que excluirá suas visitas em sites rastreados pelo Matomo 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 Matomo.",
         "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?",
+        "DeleteConfirm": "Tem certeza que deseja excluir o usuário %s?",
         "Email": "E-mail",
-        "EmailYourAdministrator": "%1$s E-mail a seu administrador sobre este problema %2$s.",
+        "EmailYourAdministrator": "%1$sEnviar 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 um dos seguintes valores: [ %1$s ], '%2$s' fornecido.",
+        "ExceptionNoRoleSet": "Nenhum perfil está definido, mas um desses precisa ser definido: %s",
+        "ExceptionMultipleRoleSet": "Apenas um perfil pode ser definido, mas vários foram definidos. Use somente um desses: %s",
         "ExceptionAnonymousNoCapabilities": "Você não pode conceder nenhuma capacidade para o usuário 'anônimo'.",
-        "ExceptionDeleteDoesNotExist": "O usuário '%s' não existe assim não é possível excluí-lo.",
-        "ExceptionDeleteOnlyUserWithSuperUserAccess": "Não é possível excluir o usuário '%s'",
+        "ExceptionAnonymousAccessNotPossible": "Você pode definir somente acesso %1$s ou %2$s acesso para o usuário 'anônimo(a)'.",
+        "ExceptionDeleteDoesNotExist": "O usuário '%s' não existe portanto não é possível excluí-lo.",
+        "ExceptionDeleteOnlyUserWithSuperUserAccess": "Não é possível excluir o usuário '%s'.",
         "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 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": "O comprimento da senha deve ser maior que %1$s caracteres.",
+        "ExceptionInvalidPasswordTooLong": "O tamanho da senha deve ser menor que %1$s caracteres.",
         "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 Matomo. Você pode remover o acesso de Super Usuário deste usuário e tentar novamente.",
+        "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth está esperando por um hash MD5 da senha (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 sites no Matomo. Você pode remover o acesso de Super Usuário deste usuário e tentar novamente.",
+        "ExceptionUserHasSuperUserAccess": "O usuário '%s' tem acesso Super Usuário e já tem permissão para acessar e modificar todos os sites no Matomo. Você pode remover o acesso 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.",
+        "ExceptionUserHasViewAccessAlready": "Esse usuário já tem acesso a este site.",
         "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",
+        "ExcludeVisitsViaCookie": "Excluir suas visitas usando um cookie",
+        "ForAnonymousUsersReportDateToLoadByDefault": "Para usuários anônimos, reportar data a ser carregada por padrão",
         "GiveUserAccess": "Permitir '%1$s' %2$s acesso para %3$s.",
         "GiveViewAccess": "Permitir acesso de visualização para %1$s",
         "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ê deseja alterar sua senha, digite uma nova. Caso contrário, deixe em branco.",
+        "YourCurrentPassword": "Sua senha atual",
+        "CurrentPasswordNotCorrect": "A senha atual informada não está correta.",
+        "ConfirmWithPassword": "Por favor digite sua senha para confirmar esta alteração.",
         "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 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.",
+        "LastSeen": "Visto por último",
+        "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 sites\" no seletor de site.",
         "ManageAccess": "Gerenciar acesso",
         "MenuAnonymousUserSettings": "Configurações de usuário anônimo",
         "MenuUsers": "Usuários",
         "MenuUserSettings": "Configurações de usuário",
         "MenuPersonal": "Pessoal",
         "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": "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.",
+        "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Obs: 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á usuários ainda.",
+        "PluginDescription": "O Gerenciamento de Usuários permite que você adicione novos usuários, edite usuários existentes e dê a eles acesso para visualizar ou administrar sites.",
         "PrivAdmin": "Administrador",
-        "PrivAdminDescription": "Usuários com esse papel podem gerenciar um website a dar acesso a esse website para outros usuários. Eles também podem fazer qualquer coisa que o papel %s pode fazer.",
+        "PrivAdminDescription": "Usuários com este perfil podem gerenciar um site e dar acesso a esse site para outros usuários. Eles também podem fazer qualquer coisa que o perfil %s pode fazer.",
+        "PrivWrite": "Escrever",
+        "PrivWriteDescription": "Usuários com este perfil podem visualizar todo o conteúdo, além de criar, gerenciar e excluir entidades como Metas, Funis, Mapas de Calor, Gravações de Sessão e Formulários para este site.",
         "PrivNone": "Sem acesso",
         "PrivView": "Visualização",
-        "PrivViewDescription": "Um usuário com esse papel pode visualizar todos os relatórios.",
+        "PrivViewDescription": "Um usuário com este perfil pode visualizar todos os relatórios.",
         "RemoveUserAccess": "Remover acesso para '%1$s' para %2$s.",
         "ReportDateToLoadByDefault": "Relate data para carregar por padrão",
         "ReportToLoadByDefault": "Relate para carregar por padrão",
         "SuperUserAccessManagement": "Gerenciar o acesso do Super Usuário",
         "SuperUserAccessManagementGrantMore": "Você pode conceder o acesso de Super Usuário a outros usuários do Matomo aqui. Utilize este recurso com cuidado.",
-        "SuperUserAccessManagementMainDescription": "Super usuários têm as maiores permissões. Eles podem executar todas as tarefas administrativas, tais como adição de novos websites para monitorar, adicionar usuários, alterar permissões de usuários, ativar e desativar plugins e até mesmo instalar novos plugins no Mercado.",
-        "TheLoginScreen": "Tela de login",
-        "ThereAreCurrentlyNRegisteredUsers": "Existem actualmente %s usuários registrados.",
-        "TokenAuth": "Token de autenticação API",
+        "SuperUserAccessManagementMainDescription": "Super usuários têm as maiores permissões. Eles podem executar todas as tarefas administrativas, tais como adição de novos sites para monitorar, adicionar usuários, alterar permissões de usuários, ativar e desativar plugins e até mesmo instalar novos plugins do Mercado.",
+        "TheLoginScreen": "A tela de login",
+        "ThereAreCurrentlyNRegisteredUsers": "Existem atualmente %s usuários registrados.",
+        "TokenAuth": "Token de autenticação da API",
+        "TokenRegenerateConfirmSelf": "Alterar o token de autenticação da API irá invalidar o seu próprio token. Se o token atual estiver em uso, você precisa atualizar todos os clientes da API com o novo token gerado. Você quer mesmo alterar o seu token de autenticação?",
         "TokenRegenerateTitle": "Regenerar",
         "TypeYourPasswordAgain": "Digite sua nova senha novamente.",
-        "User": "Usurário",
-        "UserHasPermission": "%1$s tem atualmente %2$s acesso para %3$s.",
+        "User": "Usuário",
+        "UserHasPermission": "%1$s tem atualmente acesso %2$s para %3$s.",
         "UserHasNoPermission": "%1$s tem atualmente %2$s para %3$s",
         "UsersManagement": "Gerenciamento de usuários",
         "UsersManagementMainDescription": "Crie novos usuários ou atualize os usuários existentes. Você poderá então ajustar as permissões deles acima.",
+        "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quando os usuários não estão conectados e visitam o Matomo, eles devem ver inicialmente.",
         "YourUsernameCannotBeChanged": "Seu nome de usuário não pode ser alterado.",
         "YourVisitsAreIgnoredOnDomain": "%1$s Suas visitas são ignoradas pelo Matomo em %2$s %3$s (o Matomo ignora o cookie encontrado em seu navegador).",
-        "YourVisitsAreNotIgnored": "%1$sSuas visitas não são ignoradas pelo Matomo%2$s (o Matomo ignora o cookie não encotrado em seu navegador)",
+        "YourVisitsAreNotIgnored": "%1$sSuas visitas não são ignoradas pelo Matomo%2$s (o cookie para ignorar o Matomo não foi encontrado em seu navegador).",
+        "AddUserNoInitialAccessError": "Novos usuários devem ter acesso a um site, por favor defina o parâmetro 'initialIdSite'.",
+        "AtLeastView": "Pelo menos visualizar",
         "ManageUsers": "Gerenciar Usuários",
+        "ManageUsersDesc": "Crie novos usuários ou atualize os usuários existentes. Então você pode definir as permissões deles aqui também.",
+        "NoAccessWarning": "Este usuário não tem acesso a um site. Quando ele fizer login, ele verá uma mensagem de erro. Para evitar isto, conceda acesso a um site abaixo.",
+        "BulkActions": "Ações em massa",
+        "SetPermission": "Definir permissão",
+        "RemovePermissions": "Remover permissões",
+        "RolesHelp": "Perfis determinam o que um usuário pode fazer no Matomo em relação a um site específico. Saiba mais sobre os perfis %1$sVisualizar%2$s e %3$sAdministrador%4$s.",
+        "Role": "Perfil",
+        "TheDisplayedWebsitesAreSelected": "Os %1$s sites exibidos estão selecionados.",
+        "ClickToSelectAll": "Clique para selecionar tudo %1$s.",
+        "AllWebsitesAreSelected": "Todos os %1$s sites estão selecionados.",
+        "ClickToSelectDisplayedWebsites": "Clique para selecionar os %1$s sites exibidos.",
+        "DeletePermConfirmSingle": "Você tem certeza de que deseja remover o acesso de %1$s ao %2$s?",
+        "DeletePermConfirmMultiple": "Você tem certeza de que deseja remover o acesso de %1$s aos %2$s sites selecionados?",
+        "ChangePermToSiteConfirmSingle": "Você tem certeza de que deseja alterar o perfil de %1$s em %2$s para %3$s?",
+        "ChangePermToSiteConfirmMultiple": "Você tem certeza de que deseja alterar o perfil de %1$s nos %2$s sites selecionados para %3$s?",
+        "BasicInformation": "Informação básica",
+        "Permissions": "Permissões",
+        "SuperUserAccess": "Acesso super usuário",
+        "FirstSiteInlineHelp": "É necessário dar a um novo usuário, em sua criação, um perfil de visualização para um site. Se nenhum acesso for dado, o usuário verá um erro ao fazer login. Você pode conceder mais permissões após a criação do usuário na aba 'Permissões' que irá aparecer na esquerda.",
+        "SuperUsersPermissionsNotice": "Super usuários têm acesso de administrador em todos os sites, então não há necessidade de gerenciar suas permissões por site.",
+        "SuperUserIntro1": "Super usuários têm as maiores permissões. Eles podem executar todas as tarefas administrativas, tais como adição de novos sites para monitorar, adicionar usuários, alterar permissões de usuários, ativar e desativar plugins e até mesmo instalar novos plugins do Mercado. Você pode conceder acesso de Super Usuário para outros usuários do Divezone aqui.",
+        "SuperUserIntro2": "Por favor, use essa funcionalidade com cuidado.",
+        "HasSuperUserAccess": "Possui Acesso Super Usuário",
+        "AreYouSure": "Você tem certeza?",
+        "DeleteUsers": "Excluir usuários",
+        "UserSearch": "Procurar usuário",
+        "FilterByAccess": "Filtrar por acesso",
+        "FilterByWebsite": "Filtrar por site",
         "ShowAll": "Exibir tudo",
-        "Username": "Nome de Usuário"
+        "Username": "Nome de Usuário",
+        "RoleFor": "Perfil para",
+        "RemoveAllAccessToThisSite": "Remover todo acesso a este site",
+        "DeleteUserPermConfirmSingle": "Você tem certeza de que deseja alterar o perfil de %1$s para %2$s em %3$s?",
+        "DeleteUserPermConfirmMultiple": "Você tem certeza de que deseja alterar os perfis dos %1$s usuários selecionados para %2$s em %3$s?",
+        "AnonymousUserRoleChangeWarning": "Conceder ao usuário %1$s o perfil %2$s irá tornar os dados deste site públicos e disponíveis a todos, mesmo quem não tem um login Matomo.",
+        "GiveAccessToAll": "Dar a este usuário acesso a todos os sites",
+        "OrManageIndividually": "Ou gerencie o acesso deste usuário em cada site individualmente.",
+        "ChangePermToAllSitesConfirm": "Você tem certeza de que deseja dar ao usuário %1$s acesso %2$s a todo site que você atualmente tem acesso de administrador?",
+        "ChangePermToAllSitesConfirm2": "Obs: isto irá afetar apenas os sites existentes atualmente. Novos sites que você criar não estarão acessíveis automaticamente para este usuário.",
+        "IncludedInUsersRole": "Incluído no perfil deste usuário."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/pt.json b/app/plugins/UsersManager/lang/pt.json
index 419190675..b73016a05 100644
--- a/app/plugins/UsersManager/lang/pt.json
+++ b/app/plugins/UsersManager/lang/pt.json
@@ -4,6 +4,7 @@
         "UsesTwoFactorAuthentication": "Utiliza a autenticação de dois fatores",
         "TwoFactorAuthentication": "Autenticação de dois fatores",
         "ResetTwoFactorAuthentication": "Repor a autenticação de dois fatores",
+        "ResetTwoFactorAuthenticationInfo": "Se o utilizador não conseguir iniciar sessão devido à perda de códigos de recuperação ou perda do dispositivo de autenticação, pode repor a a autenticação de dois fatores do utilizador, para que este possa iniciar sessão novamente.",
         "AddUser": "Adicionar um novo utilizador",
         "AddExistingUser": "Adicionar um utilizador existente",
         "AddNewUser": "Adicionar um novo utilizador",
@@ -55,6 +56,7 @@
         "GiveViewAccess": "Dê acesso de visualização a %1$s",
         "GiveViewAccessTitle": "Dê a um utilizador existente acesso para visualizar relatórios para %s",
         "GiveViewAccessInstructions": "Para dar acesso de visualização a um utilizador existente para %s introduza o nome de utilizador ou endereço de e-mail de um utilizador existente",
+        "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Se deseja alterar a sua palavra-passe, introduza uma nova. Caso contrário, deixe este campo em branco.",
         "YourCurrentPassword": "A sua palavra-passe atual",
         "CurrentPasswordNotCorrect": "A palavra-passe atual que introduziu não está correta.",
         "ConfirmWithPassword": "Por favor, introduza a sua palavra-passe para confirmar esta alteração.",
@@ -94,6 +96,7 @@
         "UserHasNoPermission": "%1$s atualmente tem %2$s para %3$s",
         "UsersManagement": "Gestão de utilizadores",
         "UsersManagementMainDescription": "Criar novos utilizadores ou atualizar utilizadores existentes. Depois, pode definir as respetivas permissões acima.",
+        "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "Quando os utilizadores não têm sessão iniciada e visitam o Matomo, devem inicialmente ver",
         "YourUsernameCannotBeChanged": "O seu nome de utilizador não pode ser alterado.",
         "YourVisitsAreIgnoredOnDomain": "%1$sAs suas visitas são ignoradas pelo Matomo em %2$s %3$s (foi encontrado no seu navegador o cookie do Matomo para ignorar).",
         "YourVisitsAreNotIgnored": "%1$sAs suas visitas não são ignoradas pelo Matomo%2$s (não foi encontrado no seu navegador o cookie do Matomo para ignorar).",
@@ -124,6 +127,8 @@
         "SuperUserIntro2": "Por favor, utilize esta funcionalidade com cuidado.",
         "HasSuperUserAccess": "Tem acesso de super-utilizador",
         "AreYouSure": "Tem a certeza?",
+        "RemoveSuperuserAccessConfirm": "Remover o acesso de super-utilizador deixará o utilizador sem permissões (terá, posteriormente, de as adicionar). Introduza a sua palavra-passe para continuar.",
+        "AddSuperuserAccessConfirm": "Atribuir a um utilizador o acesso de super-utilizador confere-lhe um controlo absoluto do Matomo, algo que deve ser feito com moderação. Introduza a sua palavra-passe para continuar.",
         "DeleteUsers": "Eliminar utilizadores",
         "UserSearch": "Pesquisa de utilizadores",
         "FilterByAccess": "Filtrar por acesso",
@@ -150,6 +155,16 @@
         "AreYouSureAddCapability": "Tem a certeza que pretende atribuir o privilégio %2$s a %1$s para %3$s?",
         "AreYouSureRemoveCapability": "Tem a certeza que pretende remover o privilégio %2$s a %1$s para %3$s?",
         "IncludedInUsersRole": "Incluído no papel do utilizador",
-        "Capability": "Privilégio"
+        "Capability": "Privilégio",
+        "EmailChangeNotificationSubject": "O endereço de e-mail da sua conta do Matomo foi alterado",
+        "EmailChangedEmail1": "O endereço de e-mail associado à sua conta foi alterado para %1$s",
+        "EmailChangedEmail2": "Esta alteração foi iniciada a partir do seguinte dispositivo: %1$s (endereço de IP = %2$s).",
+        "IfThisWasYouIgnoreIfNot": "Caso tenha sido iniciada por si, ignore este e-mail. Caso contrário, por favor, inicie sessão, corrija o seu endereço de e-mail, altere a sua palavra-passe e entre em contacto com o seu administrador do Matomo.",
+        "PasswordChangeNotificationSubject": "A palavra-passe da sua conta do Matomo foi alterada",
+        "PasswordChangedEmail": "A sua palavra-passe foi alterada. Esta alteração foi iniciada a partir do seguinte dispositivo: %1$s (endereço de IP = %2$s).",
+        "NewsletterSignupTitle": "Subscrição da Newsletter",
+        "NewsletterSignupMessage": "Subscreva à nossa newsletter para receber regularmente informações sobre o Matomo. Pode cancelar a sua subscrição a qualquer momento. Este serviço utiliza MadMimi. Para mais informações, consulte a nossa %1$spágina da Política de Privacidade %2$s.",
+        "NewsletterSignupFailureMessage": "Parece que algo correu mal. Não conseguimos concluir o seu processo de subscrição à newsletter.",
+        "NewsletterSignupSuccessMessage": "Fantástico, está subscrito. Entraremos em contacto em breve."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/ru.json b/app/plugins/UsersManager/lang/ru.json
index 989f8ee36..1e1d8b70a 100644
--- a/app/plugins/UsersManager/lang/ru.json
+++ b/app/plugins/UsersManager/lang/ru.json
@@ -1,6 +1,16 @@
 {
     "UsersManager": {
+        "2FA": "2FA",
+        "UsesTwoFactorAuthentication": "Использует двухфакторную аутентификацию",
+        "TwoFactorAuthentication": "Двухфакторная аутентификация",
+        "ResetTwoFactorAuthentication": "Сбросить двухфакторную аутентификацию",
+        "ResetTwoFactorAuthenticationInfo": "Если пользователь больше не может войти в систему из-за потерянных кодов восстановления или из-за потерянного устройства аутентификации, вы можете сбросить двухфакторную аутентификацию для пользователя, чтобы он мог снова войти в систему.",
         "AddUser": "Добавить нового пользователя",
+        "AddExistingUser": "Добавить существующего пользователя",
+        "AddNewUser": "Добавить нового пользователя",
+        "EditUser": "Редактировать пользователя",
+        "CreateUser": "Создать пользователя",
+        "SaveBasicInfo": "Сохранить основную информацию",
         "Alias": "Псевдоним",
         "AllWebsites": "Все сайты",
         "AnonymousUser": "Анонимный пользователь",
@@ -14,20 +24,27 @@
         "DeleteConfirm": "Вы уверены, что хотите удалить пользователя %s?",
         "Email": "Email",
         "EmailYourAdministrator": "%1$sНапишите вашему администратору об этой проблеме%2$s.",
+        "EnterUsernameOrEmail": "Введите имя пользователя или адрес электронной почты",
+        "ExceptionAnonymousNoCapabilities": "Вы не можете предоставлять какие-либо возможности «анонимному» пользователю.",
         "ExceptionDeleteDoesNotExist": "Пользователя '%s' не существует, поэтому он не может быть удален.",
         "ExceptionDeleteOnlyUserWithSuperUserAccess": "Невозможно удалить пользователя '%s'",
         "ExceptionEditAnonymous": "Анонимный пользователь не может быть удален. Он необходим системе Веб-аналитики для идентификации пользователей, которые не вошли в систему. Допустим, вы можете сделать статистику публичной, предоставляя право 'Просмотр' анонимному пользователю.",
         "ExceptionEmailExists": "Пользователь с Email '%s' уже существует.",
         "ExceptionInvalidEmail": "Email неправильного формата",
+        "ExceptionInvalidPassword": "Длина пароля должна быть больше %1$s символов.",
+        "ExceptionInvalidPasswordTooLong": "Длина пароля должна быть меньше %1$s символов.",
         "ExceptionLoginExists": "Имя пользователя '%s' уже существует.",
         "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth ожидает MD5-хэшированный пароль (строка в 32 символа). Пожалуйста, вызовите функцию md5() к паролю перед вызовом этого метода.",
         "ExceptionRemoveSuperUserAccessOnlySuperUser": "Удаление прав суперпользователя у пользователя «%s» не представляется возможным.",
         "ExceptionSuperUserAccess": "Этот пользователь уже имеет статус суперпользователя и разрешение на изменение всех веб-сайты в Matomo. Вы можете удалить права суперпользователя у этого пользователя, и попробовать снова.",
         "ExceptionUserDoesNotExist": "Пользователь '%s' не существует.",
         "ExceptionYouMustGrantSuperUserAccessFirst": "Должен быть по крайней мере один суперпользователь. Пожалуйста, сделайте сначала другого суперпользователя.",
+        "ExceptionUserHasViewAccessAlready": "Этот пользователь уже имеет доступ к этому сайту.",
         "ExceptionNoValueForUsernameOrEmail": "Пожалуйста, введите имя пользователя или E-mail адрес.",
         "ExcludeVisitsViaCookie": "Cookie исключения из статистики",
         "ForAnonymousUsersReportDateToLoadByDefault": "Отчет для анонимных пользователей отображается за",
+        "GiveViewAccess": "Предоставить доступ для просмотра %1$s",
+        "YourCurrentPassword": "Ваш текущий пароль",
         "InjectedHostCannotChangePwd": "В данный момент вы находитесь в Matomo с неизвестного хоста (%1$s). Вы не можете изменить пароль, пока эта проблема не будет решена.",
         "LastSeen": "Последнее посещение",
         "ManageAccess": "Управление правами доступа",
@@ -55,7 +72,14 @@
         "YourUsernameCannotBeChanged": "Имя вашего пользователя не может быть изменено.",
         "YourVisitsAreIgnoredOnDomain": "%1$sВаші відвідування ігноруються системою Matomo в %2$s %3$s (Matomo знашов cookie у вашому браузері з вказівкою ігнорувати).",
         "YourVisitsAreNotIgnored": "%1$sВаші відвідування відслідковуються системою Matomo %2$s (Matomo не знашов cookie у вашому браузері).",
+        "BulkActions": "Массовые действия",
+        "Role": "Роль",
+        "DeleteUsers": "Удалить пользователей",
         "ShowAll": "Показать все",
-        "Username": "Имя пользователя"
+        "Username": "Имя пользователя",
+        "EmailChangeNotificationSubject": "Адрес электронной почты вашей учетной записи Matomo был только что изменен",
+        "EmailChangedEmail1": "Адрес электронной почты, связанный с вашей учетной записью, был изменен на %1$s",
+        "PasswordChangeNotificationSubject": "Пароль вашей учетной записи Matomo был только что изменен",
+        "NewsletterSignupFailureMessage": "Упс, что-то пошло не так. Мы не смогли подписать Вас на рассылку."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/sq.json b/app/plugins/UsersManager/lang/sq.json
index bc19a4b68..83ddc0170 100644
--- a/app/plugins/UsersManager/lang/sq.json
+++ b/app/plugins/UsersManager/lang/sq.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Ky ndryshim zuri fill prej pajisjes vijuese: %1$s (Adresë IP = %2$s).",
         "IfThisWasYouIgnoreIfNot": "Nëse qetë ju, mos ngurroni ta shpërfillni këtë email. Nëse s’qetë ju, ju lutemi, bëni hyrjen në llogarinë tuaj, ndreqni adresën tuaj email, ndryshoni fjalëkalimin tuaj dhe lidhuni me përgjegjësin e instancës tuaj Matomo.",
         "PasswordChangeNotificationSubject": "Fjalëkalimi i llogarisë tuaj Matomo sapo u ndryshua",
-        "PasswordChangedEmail": "Fjalëkalimi juaj sapo u ndryshua. Ndryshimi zuri fill prej pajisjes vijuese: %1$s (Adresë IP = %2$s)."
+        "PasswordChangedEmail": "Fjalëkalimi juaj sapo u ndryshua. Ndryshimi zuri fill prej pajisjes vijuese: %1$s (Adresë IP = %2$s).",
+        "NewsletterSignupTitle": "Regjistrim Për Buletin",
+        "NewsletterSignupMessage": "Pajtohuni te buletini ynë për të marrë informacione periodike rreth Matomo-s. Mund të shpajtoheni kur të doni. Ky shërbim përdor MadMimi. Mësoni më tepër rreth tij te %1$sfaqja e Rregullave tona të Privatësisë%2$s.",
+        "NewsletterSignupFailureMessage": "Hëm, diç shkoi ters. S’qemë në gjendje t’ju regjistronim për buletinin tonë.",
+        "NewsletterSignupSuccessMessage": "Super, u regjistruat! Do të lidhemi së shpejti."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/lang/tr.json b/app/plugins/UsersManager/lang/tr.json
index 6611d952c..270b7c5dc 100644
--- a/app/plugins/UsersManager/lang/tr.json
+++ b/app/plugins/UsersManager/lang/tr.json
@@ -161,6 +161,10 @@
         "EmailChangedEmail2": "Bu değişiklik şu aygıt üzerinden yapıldı: %1$s (IP adresi: %2$s).",
         "IfThisWasYouIgnoreIfNot": "Bu değişikliği siz yaptıysanız bu bildirimi yok sayabilirsiniz. Değişikliği siz yapmadıysanız lütfen oturum açarak e-posta adresinizi düzeltin, parolanızı değiştirin ve Matomo yöneticiniz ile görüşün.",
         "PasswordChangeNotificationSubject": "Matomo hesabınızın parolası değiştirildi",
-        "PasswordChangedEmail": "Parolanız değiştirildi. Bu değişiklik şu aygıt üzerinden yapıldı: %1$s (IP adresi: %2$s)."
+        "PasswordChangedEmail": "Parolanız değiştirildi. Bu değişiklik şu aygıt üzerinden yapıldı: %1$s (IP adresi: %2$s).",
+        "NewsletterSignupTitle": "Bülten Aboneliği",
+        "NewsletterSignupMessage": "Matomo hakkında düzenli bilgi almak için haber bültenimize abone olabilirsiniz. Bülten aboneliğinden istediğiniz zaman çıkabilirsiniz. Bu hizmet için MadMimi kullanılır. Ayrıntılı bilgi almak için %1$sKişisel Gizlilik%2$s bölümüne bakabilirsiniz.",
+        "NewsletterSignupFailureMessage": "Maalesef bir şeyler ters gitti. Bülten aboneliğiniz yapılamadı.",
+        "NewsletterSignupSuccessMessage": "Harika, abone oldunuz! Yakında görüşürüz."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/UsersManager/templates/userSettings.twig b/app/plugins/UsersManager/templates/userSettings.twig
index 72ac592a2..22c9a58cc 100644
--- a/app/plugins/UsersManager/templates/userSettings.twig
+++ b/app/plugins/UsersManager/templates/userSettings.twig
@@ -20,6 +20,7 @@
              inline-help="{{ 'UsersManager_YourUsernameCannotBeChanged'|translate|e('html_attr') }}">
         </div>
 
+        {% if isUsersAdminEnabled %}
         <div piwik-field uicontrol="text" name="email"
              ng-model="personalSettings.email"
              ng-change="personalSettings.requirePasswordConfirmation()"
@@ -27,6 +28,7 @@
              data-title="{{ 'UsersManager_Email'|translate|e('html_attr') }}"
              value="{{ userEmail }}">
         </div>
+        {% endif %}
 
         <div id="languageHelp" class="inline-help-node">
             <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/translations/">
@@ -72,7 +74,7 @@
              value="{{ defaultDate }}" options="{{ availableDefaultDates|json_encode }}">
         </div>
 
-        {% if isValidHost is defined and isValidHost %}
+        {% if isValidHost is defined and isValidHost and isUsersAdminEnabled %}
 
             <div piwik-field uicontrol="password" name="password" autocomplete="off"
                  ng-model="personalSettings.password"
@@ -120,6 +122,29 @@
     </form>
 </div>
 
+{% if showNewsletterSignup %}
+<div ng-controller="PersonalSettingsController as personalSettings">
+    <div piwik-content-block id="newsletterSignup"
+         ng-show="personalSettings.showNewsletterSignup"
+         content-title="{{ 'UsersManager_NewsletterSignupTitle'|translate|e('html_attr') }}">
+
+        <div piwik-field uicontrol="checkbox" name="newsletterSignupCheckbox"
+             ng-model="personalSettings.newsletterSignupCheckbox"
+             full-width="true"
+             data-title="{{ 'UsersManager_NewsletterSignupMessage'|translate('<a href="https://matomo.org/privacy-policy/" target="_blank">', '</a>')|e('html_attr') }}"
+             >
+        </div>
+
+        <div piwik-save-button id="newsletterSignupBtn"
+             onconfirm="personalSettings.signupForNewsletter()"
+             data-disabled="!personalSettings.newsletterSignupCheckbox"
+             value="{{ '{{ personalSettings.newsletterSignupButtonTitle }}'|raw }}"
+             saving="personalSettings.isProcessingNewsletterSignup">
+        </div>
+    </div>
+</div>
+{% endif %}
+
 <div piwik-content-block
      content-title="{{ 'UsersManager_TokenAuth'|translate|e('html_attr') }}">
     <pre piwik-select-on-focus id="token_auth_user" piwik-show-sensitive-data="{{ userTokenAuth }}"></pre>
diff --git a/app/plugins/VisitFrequency/Controller.php b/app/plugins/VisitFrequency/Controller.php
index 48860fe42..479a91da5 100644
--- a/app/plugins/VisitFrequency/Controller.php
+++ b/app/plugins/VisitFrequency/Controller.php
@@ -12,6 +12,7 @@
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines;
+use Piwik\SettingsPiwik;
 use Piwik\Translation\Translator;
 use Piwik\View;
 
@@ -69,7 +70,7 @@ public function getEvolutionGraph()
 
         $period = Common::getRequestVar('period', false);
 
-        if ($period == 'day') {
+        if (SettingsPiwik::isUniqueVisitorsEnabled($period)) {
             // add number of unique (returning) visitors for period=day
             $selectableColumns = array_merge(
                 array($selectableColumns[0]),
diff --git a/app/plugins/VisitFrequency/config/config.php b/app/plugins/VisitFrequency/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/VisitFrequency/config/config.php
+++ b/app/plugins/VisitFrequency/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitFrequency/config/tracker.php b/app/plugins/VisitFrequency/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/VisitFrequency/config/tracker.php
+++ b/app/plugins/VisitFrequency/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitFrequency/lang/zh-cn.json b/app/plugins/VisitFrequency/lang/zh-cn.json
index 488efc6da..b0969237b 100644
--- a/app/plugins/VisitFrequency/lang/zh-cn.json
+++ b/app/plugins/VisitFrequency/lang/zh-cn.json
@@ -11,8 +11,14 @@
         "ColumnSumVisitLengthReturning": "老访客总的停留时间 (秒)",
         "ColumnUniqueReturningVisitors": "独立老访客数",
         "ColumnReturningUsers": "老访客",
+        "PluginDescription": "报告有关您的首次访问者和回访者的指标。",
+        "ReturnActions": "回访行动",
+        "ReturnAverageVisitDuration": "回访者的平均参观时间",
+        "ReturnAvgActions": "每次回访的操作",
+        "ReturnBounceRate": "回访次数反弹（访问一页后离开网站）",
         "ReturningVisitDocumentation": "老访客 (相对于新访客) 指至少访问过这个网站一次的访客。",
         "ReturningVisitsDocumentation": "这是老访客的概览。",
+        "ReturnVisits": "回访",
         "SubmenuFrequency": "频率",
         "WidgetGraphReturning": "老访客趋势",
         "WidgetOverview": "频率概览"
diff --git a/app/plugins/VisitTime/config/config.php b/app/plugins/VisitTime/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/VisitTime/config/config.php
+++ b/app/plugins/VisitTime/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitTime/config/tracker.php b/app/plugins/VisitTime/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/VisitTime/config/tracker.php
+++ b/app/plugins/VisitTime/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitTime/lang/es-ar.json b/app/plugins/VisitTime/lang/es-ar.json
index c6a93692b..066943efd 100644
--- a/app/plugins/VisitTime/lang/es-ar.json
+++ b/app/plugins/VisitTime/lang/es-ar.json
@@ -1,17 +1,35 @@
 {
     "VisitTime": {
         "ColumnLocalTime": "Hora local",
+        "ColumnLocalHour": "Hora local: hora (inicio de la visita)",
+        "ColumnLocalMinute": "Hora local: minuto (inicio de la visita)",
         "ColumnServerTime": "Hora del servidor",
+        "ColumnServerHour": "Hora del servidor: hora",
+        "ColumnVisitEndServerHour": "Hora del servidor: hour (fin de la visita)",
+        "ColumnVisitEndServerMinute": "Hora del servidor: minuto (fin de la visita)",
+        "ColumnVisitStartServerHour": "Hora del servidor: hora (inicio de la visita)",
+        "ColumnVisitStartServerMinute": "Hora del servidor: minuto (inicio de la visita)",
+        "ColumnVisitEndServerDate": "Hora del servidor: fecha (fin de la visita)",
+        "ColumnVisitEndServerDayOfMonth": "Hora del servidor: día del mes (fin de la visita)",
+        "ColumnVisitEndServerDayOfWeek": "Hora del servidor: día de la semana (fin de la visita)",
+        "ColumnVisitEndServerDayOfYear": "Hora del servidor: día del año (fin de la visita)",
+        "ColumnVisitEndServerQuarter": "Hora del servidor: trimestre (fin de la visita)",
+        "ColumnVisitEndServerSecond": "Hora del servidor: segundo (fin de la visita)",
+        "ColumnVisitEndServerWeekOfYear": "Hora del servidor: semana del año (fin de la visita)",
+        "ColumnVisitEndServerMonth": "Hora del servidor: mes (fin de la visita)",
+        "ColumnVisitEndServerYear": "Hora del servidor: año (fin de la visita)",
+        "ColumnServerMinute": "Hora del servidor: minuto",
         "DayOfWeek": "Día de la semana",
         "LocalTime": "Visitas por hora local",
         "NHour": "%sh",
+        "PluginDescription": "Informa la hora local y la hora del servidor cuando tus visitantes visualizaron el sitio web o la aplicación.",
         "ServerTime": "Visitas por hora del servidor",
-        "SubmenuTimes": "Tiempos",
+        "SubmenuTimes": "Veces",
         "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.",
+        "WidgetByDayOfWeekDocumentation": "Este gráfico muestra el número de visitas que tu sitio web recibió en cada día de la semana.",
         "WidgetLocalTime": "Visitas por hora local",
-        "WidgetLocalTimeDocumentation": "Este gráfico muestra que horario fue %1$sen las zonas horarias de los visitantes %2$s durante sus visitas.",
+        "WidgetLocalTimeDocumentation": "Este gráfico muestra qué hora era %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 %1$s zona horaria del servidor %2$s durante las visitas."
+        "WidgetServerTimeDocumentation": "Este gráfico muestra qué hora era en la %1$s zona horaria del servidor %2$s durante las visitas."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/VisitTime/lang/zh-cn.json b/app/plugins/VisitTime/lang/zh-cn.json
index cb14c8315..db6beef3d 100644
--- a/app/plugins/VisitTime/lang/zh-cn.json
+++ b/app/plugins/VisitTime/lang/zh-cn.json
@@ -1,7 +1,24 @@
 {
     "VisitTime": {
         "ColumnLocalTime": "客户端时间",
+        "ColumnLocalHour": "当地时间-小时（访问开始）",
+        "ColumnLocalMinute": "当地时间-分钟（访问开始）",
         "ColumnServerTime": "服务器时间",
+        "ColumnServerHour": "服务器时间-小时",
+        "ColumnVisitEndServerHour": "服务器时间-小时（访问结束）",
+        "ColumnVisitEndServerMinute": "服务器时间-分钟（访问结束）",
+        "ColumnVisitStartServerHour": "服务器时间-小时（访问开始）",
+        "ColumnVisitStartServerMinute": "服务器时间-分钟（访问开始）",
+        "ColumnVisitEndServerDate": "服务器时间-日期（访问结束）",
+        "ColumnVisitEndServerDayOfMonth": "服务器时间-月中的一天（访问结束）",
+        "ColumnVisitEndServerDayOfWeek": "服务器时间-星期几（访问结束）",
+        "ColumnVisitEndServerDayOfYear": "服务器时间-一年中的一天（访问结束）",
+        "ColumnVisitEndServerQuarter": "服务器时间-季度（访问结束）",
+        "ColumnVisitEndServerSecond": "服务器时间-秒（访问结束）",
+        "ColumnVisitEndServerWeekOfYear": "服务器时间-一年中的第几周（访问结束）",
+        "ColumnVisitEndServerMonth": "服务器时间-月（访问结束）",
+        "ColumnVisitEndServerYear": "服务器时间-年（访问结束）",
+        "ColumnServerMinute": "服务器时间-分钟",
         "DayOfWeek": "星期几的",
         "LocalTime": "日报表",
         "NHour": "%s 点",
diff --git a/app/plugins/VisitorInterest/Archiver.php b/app/plugins/VisitorInterest/Archiver.php
index 09a77e2e4..2aa6d6908 100644
--- a/app/plugins/VisitorInterest/Archiver.php
+++ b/app/plugins/VisitorInterest/Archiver.php
@@ -21,7 +21,7 @@ class Archiver extends \Piwik\Plugin\Archiver
     const VISITS_COUNT_RECORD_NAME = 'VisitorInterest_visitsByVisitCount';
     const DAYS_SINCE_LAST_RECORD_NAME = 'VisitorInterest_daysSinceLastVisit';
 
-    protected static $timeGap = array(
+    public static $timeGap = array(
         array(0, 10, 's'),
         array(11, 30, 's'),
         array(31, 60, 's'),
@@ -33,7 +33,7 @@ class Archiver extends \Piwik\Plugin\Archiver
         array(15, 30),
         array(30)
     );
-    protected static $pageGap = array(
+    public static $pageGap = array(
         array(1, 1),
         array(2, 2),
         array(3, 3),
diff --git a/app/plugins/VisitorInterest/config/config.php b/app/plugins/VisitorInterest/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/VisitorInterest/config/config.php
+++ b/app/plugins/VisitorInterest/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitorInterest/config/tracker.php b/app/plugins/VisitorInterest/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/VisitorInterest/config/tracker.php
+++ b/app/plugins/VisitorInterest/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitorInterest/lang/es-ar.json b/app/plugins/VisitorInterest/lang/es-ar.json
index f9227a66d..7fe7bc841 100644
--- a/app/plugins/VisitorInterest/lang/es-ar.json
+++ b/app/plugins/VisitorInterest/lang/es-ar.json
@@ -1,23 +1,24 @@
 {
     "VisitorInterest": {
         "BetweenXYMinutes": "%1$s-%2$s min",
-        "BetweenXYSeconds": "%1$s-%2$ss",
+        "BetweenXYSeconds": "%1$s-%2$sseg",
         "ColumnPagesPerVisit": "Páginas por visita",
-        "ColumnVisitDuration": "Duración de las visitas",
+        "ColumnVisitDuration": "Duración de la visita",
         "Engagement": "Compromiso",
         "NPages": "%s páginas",
         "OnePage": "1 página",
+        "PluginDescription": "Informes acerca de los intereses de los visitantes: número de páginas visitadas, tiempo navegando el sitio, cantidad de días desde la última visita, y más.",
         "VisitNum": "Número de visita",
         "VisitsByDaysSinceLast": "Visitas por días desde la última visita",
         "visitsByVisitCount": "Visitas por número de visita",
         "VisitsPerDuration": "Visitas por duración de visita",
         "VisitsPerNbOfPages": "Visitas por número de páginas",
         "WidgetLengths": "Duración de las visitas",
-        "WidgetLengthsDocumentation": "En este informe, puede ver cuantas visitas tuvieron una cierta duración total. Inicialmente, el mismo es mostraedo como una nube de etiquetas, las duraciones más comunes en una fuente más notoria.",
+        "WidgetLengthsDocumentation": "En este informe, podés ver cuántas visitas tuvieron una cierta duración total. Inicialmente, el informe es mostrado como una nube de etiquetas, las duraciones más comunes son mostradas en una tipografía más grande.",
         "WidgetPages": "Páginas por visita",
-        "WidgetPagesDocumentation": "En este informe, puede observar cuantos visitantes están involucrados con un cierto número de vistas de páginas. Inicialmente, el informe se muestra como una nube de etiquetas, los números de páginas más usuales en una fuente mayor.",
+        "WidgetPagesDocumentation": "En este informe, podés ver cuántos visitantes están involucrados con un cierto número de vistas de páginas. Inicialmente, el informe se muestra como una nube de etiquetas, los números de páginas más comunes son mostrados en una tipografía más grande.",
         "WidgetVisitsByDaysSinceLast": "Visitas por días desde la última visita",
-        "WidgetVisitsByDaysSinceLastDocumentation": "En este informe, puede observar cuantas visitas cuya última visita fue un cierto número de días atrás.",
-        "WidgetVisitsByNumDocumentation": "En este informe, puede ver el número de visitas que fueron la N visita, por ejemplo: visitantes que visitaron su sitio de internet al menos N veces"
+        "WidgetVisitsByDaysSinceLastDocumentation": "En este informe, podés ver cuántas visitas cuya última visita fue un cierto número de días atrás.",
+        "WidgetVisitsByNumDocumentation": "En este informe, podés ver el número de visitas que fueron la \"N\" visita, por ejemplo: visitantes que visitaron tu sitio web al menos \"N\" veces."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/VisitsSummary/Controller.php b/app/plugins/VisitsSummary/Controller.php
index 91928bd91..51b808767 100644
--- a/app/plugins/VisitsSummary/Controller.php
+++ b/app/plugins/VisitsSummary/Controller.php
@@ -15,6 +15,7 @@
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines;
+use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Translation\Translator;
 use Piwik\View;
@@ -103,6 +104,12 @@ public function getEvolutionGraph()
             'avg_time_generation'
         );
 
+        $currentPeriod = Common::getRequestVar('period', false);
+
+        if (!SettingsPiwik::isUniqueVisitorsEnabled($currentPeriod)) {
+            $selectableColumns = array_diff($selectableColumns, ['nb_uniq_visitors', 'nb_users']);
+        }
+
         $displaySiteSearch = Site::isSiteSearchEnabledFor($this->idSite);
 
         if ($displaySiteSearch) {
diff --git a/app/plugins/VisitsSummary/config/config.php b/app/plugins/VisitsSummary/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/VisitsSummary/config/config.php
+++ b/app/plugins/VisitsSummary/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitsSummary/config/tracker.php b/app/plugins/VisitsSummary/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/VisitsSummary/config/tracker.php
+++ b/app/plugins/VisitsSummary/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/VisitsSummary/lang/ru.json b/app/plugins/VisitsSummary/lang/ru.json
index 56c10e9f2..3860bf693 100644
--- a/app/plugins/VisitsSummary/lang/ru.json
+++ b/app/plugins/VisitsSummary/lang/ru.json
@@ -15,6 +15,8 @@
         "NbUniqueOutlinksDescription": "уникальные внешние переходы",
         "NbUniquePageviewsDescription": "уникальные показы страниц",
         "NbUniqueVisitors": "уникальные посетители",
+        "NbUsersDescription": "пользователи",
+        "NbVisitsDescription": "посещения",
         "NbVisitsBounced": "посетителей \"отскочило\" (ушло после одной станицы)",
         "VisitsSummary": "Посещения",
         "VisitsSummaryDocumentation": "Это обзор динамики посещений.",
diff --git a/app/plugins/WebsiteMeasurable/config/config.php b/app/plugins/WebsiteMeasurable/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/WebsiteMeasurable/config/config.php
+++ b/app/plugins/WebsiteMeasurable/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/WebsiteMeasurable/config/tracker.php b/app/plugins/WebsiteMeasurable/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/WebsiteMeasurable/config/tracker.php
+++ b/app/plugins/WebsiteMeasurable/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/WebsiteMeasurable/lang/pt-br.json b/app/plugins/WebsiteMeasurable/lang/pt-br.json
index 46ea12aa3..162f3ab23 100644
--- a/app/plugins/WebsiteMeasurable/lang/pt-br.json
+++ b/app/plugins/WebsiteMeasurable/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "WebsiteMeasurable": {
-        "Website": "Website",
-        "Websites": "Websites",
-        "WebsiteDescription": "Um site é composto de páginas normalmente funcionando a partir de um único domínio."
+        "Website": "Site",
+        "Websites": "Sites",
+        "WebsiteDescription": "Um site é composto de páginas web normalmente servidas a partir de um único domínio web."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Widgetize/Controller.php b/app/plugins/Widgetize/Controller.php
index ceb40c176..8481f0a60 100644
--- a/app/plugins/Widgetize/Controller.php
+++ b/app/plugins/Widgetize/Controller.php
@@ -36,6 +36,18 @@ public function iframe()
             throw new \Exception("Widgetizing API requests is not supported for security reasons. Please change query parameter 'moduleToWidgetize'.");
         }
 
+        if ($controllerName == 'Widgetize') {
+            throw new \Exception("Please set 'moduleToWidgetize' to a valid value.");
+        }
+
+        if ($controllerName == 'CoreHome' && $actionName == 'index') {
+            $message = 'CoreHome cannot be widgetized. '  . 
+                'You can enable it to be embedded directly into an iframe (passing module=CoreHme instead of module=Widgetize) ' .
+                'instead by enabling the \'enable_framed_pages\' setting in your config. ' .
+                'See https://matomo.org/faq/how-to/faq_193/ for more info.';
+            throw new \Exception($message);
+        }
+
         $shouldEmbedEmpty = false;
 
         /**
diff --git a/app/plugins/Widgetize/config/config.php b/app/plugins/Widgetize/config/config.php
index 4932533ad..d266508bc 100644
--- a/app/plugins/Widgetize/config/config.php
+++ b/app/plugins/Widgetize/config/config.php
@@ -1,3 +1,2 @@
 <?php
 return array();
-?>
\ No newline at end of file
diff --git a/app/plugins/Widgetize/config/tracker.php b/app/plugins/Widgetize/config/tracker.php
index febb40801..ca2affec3 100644
--- a/app/plugins/Widgetize/config/tracker.php
+++ b/app/plugins/Widgetize/config/tracker.php
@@ -1,3 +1,2 @@
 <?php 
 return array(); 
-?>
\ No newline at end of file
diff --git a/app/plugins/Widgetize/lang/es-ar.json b/app/plugins/Widgetize/lang/es-ar.json
index cdc9727f7..efb994372 100644
--- a/app/plugins/Widgetize/lang/es-ar.json
+++ b/app/plugins/Widgetize/lang/es-ar.json
@@ -1,5 +1,7 @@
 {
     "Widgetize": {
-        "OpenInNewWindow": "Abrir en una nueva ventana"
+        "OpenInNewWindow": "Abrir en una nueva ventana",
+        "PluginDescription": "Muestra cualquier informe de Matomo en tu sitio web o aplicación con una simple etiqueta HTML insertada.",
+        "TopLinkTooltip": "Exportar los informes de Matomo como widgets e insertar el panel en tu aplicación como un iFrame."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Widgetize/lang/pl.json b/app/plugins/Widgetize/lang/pl.json
index 04eaa4b31..36275d22b 100644
--- a/app/plugins/Widgetize/lang/pl.json
+++ b/app/plugins/Widgetize/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Otwórz w nowym oknie",
-        "PluginDescription": "Wyświetl dowolny raport Matomo na swojej stronie lub w aplikacji przy pomocy prostego Zagnieżdżonego HTML'a.",
+        "PluginDescription": "Wyświetl dowolny raport Matomo na swojej stronie lub w aplikacji przy pomocy zagnieżdżonego HTML'a.",
         "TopLinkTooltip": "Eksportuj raporty Matomo jako widżety i zagnieżdżaj Pulpit w swoich aplikacjach jako iframe."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Widgetize/lang/pt-br.json b/app/plugins/Widgetize/lang/pt-br.json
index 297156054..f06837e77 100644
--- a/app/plugins/Widgetize/lang/pt-br.json
+++ b/app/plugins/Widgetize/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "Widgetize": {
         "OpenInNewWindow": "Abrir em uma nova janela",
-        "PluginDescription": "Exibe qualquer relatório Matomo no seu site ou aplicativo com uma simples tag HTML Embed.",
-        "TopLinkTooltip": "Exportar relatórios Matomo como widgets do Dashboard e incorporar em seu aplicativo como um iframe."
+        "PluginDescription": "Exiba qualquer relatório Matomo no seu site ou aplicativo com uma simples tag HTML Embed.",
+        "TopLinkTooltip": "Exporte relatórios Matomo como widgets e incorpore o Painel em seu aplicativo como um iframe."
     }
 }
\ No newline at end of file
diff --git a/app/plugins/Widgetize/stylesheets/widgetize.less b/app/plugins/Widgetize/stylesheets/widgetize.less
index d4bc1d43a..447c7dc7f 100644
--- a/app/plugins/Widgetize/stylesheets/widgetize.less
+++ b/app/plugins/Widgetize/stylesheets/widgetize.less
@@ -47,4 +47,10 @@ body.widgetized {
   #pageFooter {
     margin-bottom: 0;
   }
+
+  table.dataTable {
+    table-layout: fixed;
+    width: auto;
+    min-width: 100%;
+  }
 }
\ No newline at end of file
diff --git a/app/plugins/Widgetize/templates/iframe.twig b/app/plugins/Widgetize/templates/iframe.twig
index 9a8c5ec16..e4ac11f1a 100644
--- a/app/plugins/Widgetize/templates/iframe.twig
+++ b/app/plugins/Widgetize/templates/iframe.twig
@@ -5,7 +5,6 @@
         <meta name="robots" content="noindex,nofollow">
         <meta name="google" content="notranslate">
         {% include "_jsGlobalVariables.twig" %}
-
         {% include "_jsCssIncludes.twig" %}
     </head>
     <body ng-app="app" class="widgetized">
diff --git a/app/vendor/autoload.php b/app/vendor/autoload.php
index 1ae10a8a0..4981eed82 100644
--- a/app/vendor/autoload.php
+++ b/app/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit20965b5e193daae3814e448b2561c788::getLoader();
+return ComposerAutoloaderInita8ac692f43bf07ab29c010fd95958205::getLoader();
diff --git a/app/vendor/composer/autoload_classmap.php b/app/vendor/composer/autoload_classmap.php
index d8d3192bb..9c568285a 100644
--- a/app/vendor/composer/autoload_classmap.php
+++ b/app/vendor/composer/autoload_classmap.php
@@ -501,7 +501,11 @@
     'Piwik\\Common' => $baseDir . '/core/Common.php',
     'Piwik\\Composer\\ScriptHandler' => $baseDir . '/core/Composer/ScriptHandler.php',
     'Piwik\\Concurrency\\DistributedList' => $baseDir . '/core/Concurrency/DistributedList.php',
+    'Piwik\\Concurrency\\Lock' => $baseDir . '/core/Concurrency/Lock.php',
+    'Piwik\\Concurrency\\LockBackend' => $baseDir . '/core/Concurrency/LockBackend.php',
+    'Piwik\\Concurrency\\LockBackend\\MySqlLockBackend' => $baseDir . '/core/Concurrency/LockBackend/MySqlLockBackend.php',
     'Piwik\\Config' => $baseDir . '/core/Config.php',
+    'Piwik\\Config\\Cache' => $baseDir . '/core/Config/Cache.php',
     'Piwik\\Config\\ConfigNotFoundException' => $baseDir . '/core/Config/ConfigNotFoundException.php',
     'Piwik\\Config\\IniFileChain' => $baseDir . '/core/Config/IniFileChain.php',
     'Piwik\\Console' => $baseDir . '/core/Console.php',
@@ -527,6 +531,7 @@
     'Piwik\\DataAccess\\LogQueryBuilder' => $baseDir . '/core/DataAccess/LogQueryBuilder.php',
     'Piwik\\DataAccess\\LogQueryBuilder\\JoinGenerator' => $baseDir . '/core/DataAccess/LogQueryBuilder/JoinGenerator.php',
     'Piwik\\DataAccess\\LogQueryBuilder\\JoinTables' => $baseDir . '/core/DataAccess/LogQueryBuilder/JoinTables.php',
+    'Piwik\\DataAccess\\LogTableTemporary' => $baseDir . '/core/DataAccess/LogTableTemporary.php',
     'Piwik\\DataAccess\\Model' => $baseDir . '/core/DataAccess/Model.php',
     'Piwik\\DataAccess\\RawLogDao' => $baseDir . '/core/DataAccess/RawLogDao.php',
     'Piwik\\DataAccess\\TableMetadata' => $baseDir . '/core/DataAccess/TableMetadata.php',
@@ -599,14 +604,16 @@
     'Piwik\\Db\\SchemaInterface' => $baseDir . '/core/Db/SchemaInterface.php',
     'Piwik\\Db\\Schema\\Mysql' => $baseDir . '/core/Db/Schema/Mysql.php',
     'Piwik\\Db\\Settings' => $baseDir . '/core/Db/Settings.php',
+    'Piwik\\Db\\TransactionLevel' => $baseDir . '/core/Db/TransactionLevel.php',
     'Piwik\\Decompress\\DecompressInterface' => $vendorDir . '/piwik/decompress/src/DecompressInterface.php',
     'Piwik\\Decompress\\Gzip' => $vendorDir . '/piwik/decompress/src/Gzip.php',
     'Piwik\\Decompress\\PclZip' => $vendorDir . '/piwik/decompress/src/PclZip.php',
     'Piwik\\Decompress\\Tar' => $vendorDir . '/piwik/decompress/src/Tar.php',
     'Piwik\\Decompress\\ZipArchive' => $vendorDir . '/piwik/decompress/src/ZipArchive.php',
     'Piwik\\Development' => $baseDir . '/core/Development.php',
-    'Piwik\\DeviceDetectorCache' => $baseDir . '/core/DeviceDetectorCache.php',
     'Piwik\\DeviceDetectorFactory' => $baseDir . '/core/DeviceDetectorFactory.php',
+    'Piwik\\DeviceDetector\\DeviceDetectorCache' => $baseDir . '/core/DeviceDetector/DeviceDetectorCache.php',
+    'Piwik\\DeviceDetector\\DeviceDetectorFactory' => $baseDir . '/core/DeviceDetector/DeviceDetectorFactory.php',
     'Piwik\\Email\\ContentGenerator' => $baseDir . '/core/Email/ContentGenerator.php',
     'Piwik\\ErrorHandler' => $baseDir . '/core/ErrorHandler.php',
     'Piwik\\EventDispatcher' => $baseDir . '/core/EventDispatcher.php',
@@ -718,6 +725,8 @@
     'Piwik\\Plugins\\API\\API' => $baseDir . '/plugins/API/API.php',
     'Piwik\\Plugins\\API\\Controller' => $baseDir . '/plugins/API/Controller.php',
     'Piwik\\Plugins\\API\\DataTable\\MergeDataTables' => $baseDir . '/plugins/API/DataTable/MergeDataTables.php',
+    'Piwik\\Plugins\\API\\Filter\\DataComparisonFilter' => $baseDir . '/plugins/API/Filter/DataComparisonFilter.php',
+    'Piwik\\Plugins\\API\\Filter\\DataComparisonFilter\\ComparisonRowGenerator' => $baseDir . '/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php',
     'Piwik\\Plugins\\API\\Glossary' => $baseDir . '/plugins/API/Glossary.php',
     'Piwik\\Plugins\\API\\Menu' => $baseDir . '/plugins/API/Menu.php',
     'Piwik\\Plugins\\API\\Plugin' => $baseDir . '/plugins/API/API.php',
@@ -738,6 +747,7 @@
     'Piwik\\Plugins\\API\\WidgetMetadata' => $baseDir . '/plugins/API/WidgetMetadata.php',
     'Piwik\\Plugins\\API\\test\\Unit\\CsvRendererTest' => $baseDir . '/plugins/API/tests/Unit/CsvRendererTest.php',
     'Piwik\\Plugins\\API\\tests\\Integration\\APITest' => $baseDir . '/plugins/API/tests/Integration/APITest.php',
+    'Piwik\\Plugins\\API\\tests\\Integration\\Filter\\DataComparisonFilter\\ComparisonRowGeneratorTest' => $baseDir . '/plugins/API/tests/Integration/Filter/DataComparisonFilter/ComparisonRowGeneratorTest.php',
     'Piwik\\Plugins\\API\\tests\\Integration\\RowEvolutionTest' => $baseDir . '/plugins/API/tests/Integration/RowEvolutionTest.php',
     'Piwik\\Plugins\\API\\tests\\Integration\\RssRendererTest' => $baseDir . '/plugins/API/tests/Integration/RssRendererTest.php',
     'Piwik\\Plugins\\API\\tests\\System\\AutoSuggestAPITest' => $baseDir . '/plugins/API/tests/System/AutoSuggestAPITest.php',
@@ -812,6 +822,7 @@
     'Piwik\\Plugins\\Actions\\Segment' => $baseDir . '/plugins/Actions/Segment.php',
     'Piwik\\Plugins\\Actions\\Tracker\\ActionsRequestProcessor' => $baseDir . '/plugins/Actions/Tracker/ActionsRequestProcessor.php',
     'Piwik\\Plugins\\Actions\\VisitorDetails' => $baseDir . '/plugins/Actions/VisitorDetails.php',
+    'Piwik\\Plugins\\Actions\\tests\\System\\ApiTest' => $baseDir . '/plugins/Actions/tests/System/ApiTest.php',
     'Piwik\\Plugins\\Actions\\tests\\Unit\\ActionSiteSearchTest' => $baseDir . '/plugins/Actions/tests/Integration/ActionSiteSearchTest.php',
     'Piwik\\Plugins\\Actions\\tests\\Unit\\ArchiverTests' => $baseDir . '/plugins/Actions/tests/Unit/ArchiverTest.php',
     'Piwik\\Plugins\\Annotations\\API' => $baseDir . '/plugins/Annotations/API.php',
@@ -986,6 +997,7 @@
     'Piwik\\Plugins\\CoreHome\\Widgets\\GetDonateForm' => $baseDir . '/plugins/CoreHome/Widgets/GetDonateForm.php',
     'Piwik\\Plugins\\CoreHome\\Widgets\\GetPromoVideo' => $baseDir . '/plugins/CoreHome/Widgets/GetPromoVideo.php',
     'Piwik\\Plugins\\CoreHome\\Widgets\\GetSystemSummary' => $baseDir . '/plugins/CoreHome/Widgets/GetSystemSummary.php',
+    'Piwik\\Plugins\\CoreHome\\Widgets\\QuickLinks' => $baseDir . '/plugins/CoreHome/Widgets/QuickLinks.php',
     'Piwik\\Plugins\\CoreHome\\tests\\Integration\\Column\\UserIdTest' => $baseDir . '/plugins/CoreHome/tests/Integration/Column/UserIdTest.php',
     'Piwik\\Plugins\\CoreHome\\tests\\Integration\\CoreHomeTest' => $baseDir . '/plugins/CoreHome/tests/Integration/CoreHomeTest.php',
     'Piwik\\Plugins\\CoreHome\\tests\\Integration\\CustomLoginWhitelist' => $baseDir . '/plugins/CoreHome/tests/Integration/LoginWhitelistTest.php',
@@ -1346,6 +1358,7 @@
     'Piwik\\Plugins\\Feedback\\tests\\Unit\\FeedbackTest' => $baseDir . '/plugins/Feedback/tests/Integration/FeedbackTest.php',
     'Piwik\\Plugins\\GeoIp2\\Columns\\Region' => $baseDir . '/plugins/GeoIp2/Columns/Region.php',
     'Piwik\\Plugins\\GeoIp2\\Commands\\ConvertRegionCodesToIso' => $baseDir . '/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php',
+    'Piwik\\Plugins\\GeoIp2\\Commands\\UpdateRegionCodes' => $baseDir . '/plugins/GeoIp2/Commands/UpdateRegionCodes.php',
     'Piwik\\Plugins\\GeoIp2\\GeoIP2AutoUpdater' => $baseDir . '/plugins/GeoIp2/GeoIP2AutoUpdater.php',
     'Piwik\\Plugins\\GeoIp2\\GeoIp2' => $baseDir . '/plugins/GeoIp2/GeoIp2.php',
     'Piwik\\Plugins\\GeoIp2\\LocationProvider\\GeoIp2' => $baseDir . '/plugins/GeoIp2/LocationProvider/GeoIp2.php',
@@ -1508,6 +1521,7 @@
     'Piwik\\Plugins\\Live\\Categories\\RealTimeVisitorsSubcategory' => $baseDir . '/plugins/Live/Categories/RealTimeVisitorsSubcategory.php',
     'Piwik\\Plugins\\Live\\Categories\\VisitorLogSubcategory' => $baseDir . '/plugins/Live/Categories/VisitorLogSubcategory.php',
     'Piwik\\Plugins\\Live\\Controller' => $baseDir . '/plugins/Live/Controller.php',
+    'Piwik\\Plugins\\Live\\Exception\\MaxExecutionTimeExceededException' => $baseDir . '/plugins/Live/Exception/MaxExecutionTimeExceededException.php',
     'Piwik\\Plugins\\Live\\Live' => $baseDir . '/plugins/Live/Live.php',
     'Piwik\\Plugins\\Live\\Model' => $baseDir . '/plugins/Live/Model.php',
     'Piwik\\Plugins\\Live\\ProfileSummaryProvider' => $baseDir . '/plugins/Live/ProfileSummaryProvider.php',
@@ -1563,6 +1577,9 @@
     'Piwik\\Plugins\\Marketplace\\Api\\Exception' => $baseDir . '/plugins/Marketplace/Api/Exception.php',
     'Piwik\\Plugins\\Marketplace\\Api\\Service' => $baseDir . '/plugins/Marketplace/Api/Service.php',
     'Piwik\\Plugins\\Marketplace\\Api\\Service\\Exception' => $baseDir . '/plugins/Marketplace/Api/Service/Exception.php',
+    'Piwik\\Plugins\\Marketplace\\Categories\\BrowseSubcategory' => $baseDir . '/plugins/Marketplace/Categories/BrowseSubcategory.php',
+    'Piwik\\Plugins\\Marketplace\\Categories\\MarketplaceCategory' => $baseDir . '/plugins/Marketplace/Categories/MarketplaceCategory.php',
+    'Piwik\\Plugins\\Marketplace\\Categories\\PremiumFeaturesSubcategory' => $baseDir . '/plugins/Marketplace/Categories/PremiumFeaturesSubcategory.php',
     'Piwik\\Plugins\\Marketplace\\Consumer' => $baseDir . '/plugins/Marketplace/Consumer.php',
     'Piwik\\Plugins\\Marketplace\\Controller' => $baseDir . '/plugins/Marketplace/Controller.php',
     'Piwik\\Plugins\\Marketplace\\Environment' => $baseDir . '/plugins/Marketplace/Environment.php',
@@ -1579,6 +1596,7 @@
     'Piwik\\Plugins\\Marketplace\\UpdateCommunication' => $baseDir . '/plugins/Marketplace/UpdateCommunication.php',
     'Piwik\\Plugins\\Marketplace\\Widgets\\GetNewPlugins' => $baseDir . '/plugins/Marketplace/Widgets/GetNewPlugins.php',
     'Piwik\\Plugins\\Marketplace\\Widgets\\GetPremiumFeatures' => $baseDir . '/plugins/Marketplace/Widgets/GetPremiumFeatures.php',
+    'Piwik\\Plugins\\Marketplace\\Widgets\\Marketplace' => $baseDir . '/plugins/Marketplace/Widgets/Marketplace.php',
     'Piwik\\Plugins\\Marketplace\\tests\\Fixtures\\SimpleFixtureTrackFewVisits' => $baseDir . '/plugins/Marketplace/tests/Fixtures/SimpleFixtureTrackFewVisits.php',
     'Piwik\\Plugins\\Marketplace\\tests\\Framework\\Mock\\Client' => $baseDir . '/plugins/Marketplace/tests/Framework/Mock/Client.php',
     'Piwik\\Plugins\\Marketplace\\tests\\Framework\\Mock\\Consumer' => $baseDir . '/plugins/Marketplace/tests/Framework/Mock/Consumer.php',
@@ -1742,6 +1760,7 @@
     'Piwik\\Plugins\\Referrers\\DataTable\\Filter\\UrlsFromWebsiteId' => $baseDir . '/plugins/Referrers/DataTable/Filter/UrlsFromWebsiteId.php',
     'Piwik\\Plugins\\Referrers\\Referrers' => $baseDir . '/plugins/Referrers/Referrers.php',
     'Piwik\\Plugins\\Referrers\\Reports\\Base' => $baseDir . '/plugins/Referrers/Reports/Base.php',
+    'Piwik\\Plugins\\Referrers\\Reports\\Get' => $baseDir . '/plugins/Referrers/Reports/Get.php',
     'Piwik\\Plugins\\Referrers\\Reports\\GetAll' => $baseDir . '/plugins/Referrers/Reports/GetAll.php',
     'Piwik\\Plugins\\Referrers\\Reports\\GetCampaigns' => $baseDir . '/plugins/Referrers/Reports/GetCampaigns.php',
     'Piwik\\Plugins\\Referrers\\Reports\\GetKeywords' => $baseDir . '/plugins/Referrers/Reports/GetKeywords.php',
@@ -1767,6 +1786,7 @@
     'Piwik\\Plugins\\Referrers\\tests\\SearchEngineTest' => $baseDir . '/plugins/Referrers/tests/Unit/SearchEngineTest.php',
     'Piwik\\Plugins\\Referrers\\tests\\SocialTest' => $baseDir . '/plugins/Referrers/tests/Unit/SocialTest.php',
     'Piwik\\Plugins\\Referrers\\tests\\System\\ApiTest' => $baseDir . '/plugins/Referrers/tests/System/ApiTest.php',
+    'Piwik\\Plugins\\Referrers\\tests\\Unit\\DataTable\\Filter\\UrlsFromWebsiteIdTest' => $baseDir . '/plugins/Referrers/tests/Unit/DataTable/Filter/UrlsFromWebsiteIdTest.php',
     'Piwik\\Plugins\\Resolution\\API' => $baseDir . '/plugins/Resolution/API.php',
     'Piwik\\Plugins\\Resolution\\Archiver' => $baseDir . '/plugins/Resolution/Archiver.php',
     'Piwik\\Plugins\\Resolution\\Columns\\Configuration' => $baseDir . '/plugins/Resolution/Columns/Configuration.php',
@@ -1821,6 +1841,7 @@
     'Piwik\\Plugins\\SegmentEditor\\Services\\StoredSegmentService' => $baseDir . '/plugins/SegmentEditor/Services/StoredSegmentService.php',
     'Piwik\\Plugins\\SegmentEditor\\UnprocessedSegmentException' => $baseDir . '/plugins/SegmentEditor/UnprocessedSegmentException.php',
     'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\ApiTest' => $baseDir . '/plugins/SegmentEditor/tests/Integration/ApiTest.php',
+    'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\ModelTest' => $baseDir . '/plugins/SegmentEditor/tests/Integration/ModelTest.php',
     'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentEditorTest' => $baseDir . '/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php',
     'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentFormatterTest' => $baseDir . '/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php',
     'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentListTest' => $baseDir . '/plugins/SegmentEditor/tests/Integration/SegmentListTest.php',
@@ -2245,6 +2266,7 @@
     'Piwik\\Plugins\\UsersManager\\LastSeenTimeLogger' => $baseDir . '/plugins/UsersManager/LastSeenTimeLogger.php',
     'Piwik\\Plugins\\UsersManager\\Menu' => $baseDir . '/plugins/UsersManager/Menu.php',
     'Piwik\\Plugins\\UsersManager\\Model' => $baseDir . '/plugins/UsersManager/Model.php',
+    'Piwik\\Plugins\\UsersManager\\NewsletterSignup' => $baseDir . '/plugins/UsersManager/NewsletterSignup.php',
     'Piwik\\Plugins\\UsersManager\\Sql\\SiteAccessFilter' => $baseDir . '/plugins/UsersManager/Sql/SiteAccessFilter.php',
     'Piwik\\Plugins\\UsersManager\\Sql\\UserTableFilter' => $baseDir . '/plugins/UsersManager/Sql/UserTableFilter.php',
     'Piwik\\Plugins\\UsersManager\\Tasks' => $baseDir . '/plugins/UsersManager/Tasks.php',
@@ -2567,6 +2589,8 @@
     'Piwik\\Updates\\Updates_3_10_0_b2' => $baseDir . '/core/Updates/3.10.0-b2.php',
     'Piwik\\Updates\\Updates_3_10_0_rc5' => $baseDir . '/core/Updates/3.10.0-rc5.php',
     'Piwik\\Updates\\Updates_3_11_0_b1' => $baseDir . '/core/Updates/3.11.0-b1.php',
+    'Piwik\\Updates\\Updates_3_12_0_b1' => $baseDir . '/core/Updates/3.12.0-b1.php',
+    'Piwik\\Updates\\Updates_3_12_0_b7' => $baseDir . '/core/Updates/3.12.0-b7.php',
     'Piwik\\Updates\\Updates_3_5_0_b2' => $baseDir . '/core/Updates/3.5.0-b2.php',
     'Piwik\\Updates\\Updates_3_5_0_b4' => $baseDir . '/core/Updates/3.5.0-b4.php',
     'Piwik\\Updates\\Updates_3_5_0_rc2' => $baseDir . '/core/Updates/3.5.0-rc2.php',
@@ -2579,6 +2603,7 @@
     'Piwik\\Updates\\Updates_3_7_0_b1' => $baseDir . '/core/Updates/3.7.0-b1.php',
     'Piwik\\Updates\\Updates_3_8_0_b3' => $baseDir . '/core/Updates/3.8.0-b3.php',
     'Piwik\\Updates\\Updates_3_8_0_b4' => $baseDir . '/core/Updates/3.8.0-b4.php',
+    'Piwik\\Updates\\Updates_4_0_0_b1' => $baseDir . '/core/Updates/4.0.0-b1.php',
     'Piwik\\Url' => $baseDir . '/core/Url.php',
     'Piwik\\UrlHelper' => $baseDir . '/core/UrlHelper.php',
     'Piwik\\Validators\\BaseValidator' => $baseDir . '/core/Validators/BaseValidator.php',
@@ -2835,6 +2860,7 @@
     'Twig\\Node\\EmbedNode' => $vendorDir . '/twig/twig/src/Node/EmbedNode.php',
     'Twig\\Node\\Expression\\AbstractExpression' => $vendorDir . '/twig/twig/src/Node/Expression/AbstractExpression.php',
     'Twig\\Node\\Expression\\ArrayExpression' => $vendorDir . '/twig/twig/src/Node/Expression/ArrayExpression.php',
+    'Twig\\Node\\Expression\\ArrowFunctionExpression' => $vendorDir . '/twig/twig/src/Node/Expression/ArrowFunctionExpression.php',
     'Twig\\Node\\Expression\\AssignNameExpression' => $vendorDir . '/twig/twig/src/Node/Expression/AssignNameExpression.php',
     'Twig\\Node\\Expression\\Binary\\AbstractBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/AbstractBinary.php',
     'Twig\\Node\\Expression\\Binary\\AddBinary' => $vendorDir . '/twig/twig/src/Node/Expression/Binary/AddBinary.php',
@@ -2870,6 +2896,7 @@
     'Twig\\Node\\Expression\\Filter\\DefaultFilter' => $vendorDir . '/twig/twig/src/Node/Expression/Filter/DefaultFilter.php',
     'Twig\\Node\\Expression\\FunctionExpression' => $vendorDir . '/twig/twig/src/Node/Expression/FunctionExpression.php',
     'Twig\\Node\\Expression\\GetAttrExpression' => $vendorDir . '/twig/twig/src/Node/Expression/GetAttrExpression.php',
+    'Twig\\Node\\Expression\\InlinePrint' => $vendorDir . '/twig/twig/src/Node/Expression/InlinePrint.php',
     'Twig\\Node\\Expression\\MethodCallExpression' => $vendorDir . '/twig/twig/src/Node/Expression/MethodCallExpression.php',
     'Twig\\Node\\Expression\\NameExpression' => $vendorDir . '/twig/twig/src/Node/Expression/NameExpression.php',
     'Twig\\Node\\Expression\\NullCoalesceExpression' => $vendorDir . '/twig/twig/src/Node/Expression/NullCoalesceExpression.php',
@@ -2933,6 +2960,7 @@
     'Twig\\Test\\NodeTestCase' => $vendorDir . '/twig/twig/src/Test/NodeTestCase.php',
     'Twig\\Token' => $vendorDir . '/twig/twig/src/Token.php',
     'Twig\\TokenParser\\AbstractTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
+    'Twig\\TokenParser\\ApplyTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
     'Twig\\TokenParser\\AutoEscapeTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/AutoEscapeTokenParser.php',
     'Twig\\TokenParser\\BlockTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/BlockTokenParser.php',
     'Twig\\TokenParser\\DeprecatedTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/DeprecatedTokenParser.php',
@@ -3160,18 +3188,6 @@
     'Twig_Util_DeprecationCollector' => $vendorDir . '/twig/twig/lib/Twig/Util/DeprecationCollector.php',
     'Twig_Util_TemplateDirIterator' => $vendorDir . '/twig/twig/lib/Twig/Util/TemplateDirIterator.php',
     'Zend_Config' => $baseDir . '/libs/Zend/Config.php',
-    'Zend_Config_Exception' => $baseDir . '/libs/Zend/Config/Exception.php',
-    'Zend_Config_Ini' => $baseDir . '/libs/Zend/Config/Ini.php',
-    'Zend_Config_Json' => $baseDir . '/libs/Zend/Config/Json.php',
-    'Zend_Config_Writer' => $baseDir . '/libs/Zend/Config/Writer.php',
-    'Zend_Config_Writer_Array' => $baseDir . '/libs/Zend/Config/Writer/Array.php',
-    'Zend_Config_Writer_FileAbstract' => $baseDir . '/libs/Zend/Config/Writer/FileAbstract.php',
-    'Zend_Config_Writer_Ini' => $baseDir . '/libs/Zend/Config/Writer/Ini.php',
-    'Zend_Config_Writer_Json' => $baseDir . '/libs/Zend/Config/Writer/Json.php',
-    'Zend_Config_Writer_Xml' => $baseDir . '/libs/Zend/Config/Writer/Xml.php',
-    'Zend_Config_Writer_Yaml' => $baseDir . '/libs/Zend/Config/Writer/Yaml.php',
-    'Zend_Config_Xml' => $baseDir . '/libs/Zend/Config/Xml.php',
-    'Zend_Config_Yaml' => $baseDir . '/libs/Zend/Config/Yaml.php',
     'Zend_Db' => $baseDir . '/libs/Zend/Db.php',
     'Zend_Db_Adapter_Abstract' => $baseDir . '/libs/Zend/Db/Adapter/Abstract.php',
     'Zend_Db_Adapter_Db2' => $baseDir . '/libs/Zend/Db/Adapter/Db2.php',
diff --git a/app/vendor/composer/autoload_real.php b/app/vendor/composer/autoload_real.php
index daa448092..c40687869 100644
--- a/app/vendor/composer/autoload_real.php
+++ b/app/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit20965b5e193daae3814e448b2561c788
+class ComposerAutoloaderInita8ac692f43bf07ab29c010fd95958205
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit20965b5e193daae3814e448b2561c788', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInita8ac692f43bf07ab29c010fd95958205', 'loadClassLoader'), true, false);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit20965b5e193daae3814e448b2561c788', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInita8ac692f43bf07ab29c010fd95958205', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ public static function getLoader()
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit20965b5e193daae3814e448b2561c788::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInita8ac692f43bf07ab29c010fd95958205::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ public static function getLoader()
         $loader->register(false);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit20965b5e193daae3814e448b2561c788::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire20965b5e193daae3814e448b2561c788($fileIdentifier, $file);
+            composerRequirea8ac692f43bf07ab29c010fd95958205($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire20965b5e193daae3814e448b2561c788($fileIdentifier, $file)
+function composerRequirea8ac692f43bf07ab29c010fd95958205($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/app/vendor/composer/autoload_static.php b/app/vendor/composer/autoload_static.php
index 76c0eb6d9..7e42403e1 100644
--- a/app/vendor/composer/autoload_static.php
+++ b/app/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit20965b5e193daae3814e448b2561c788
+class ComposerStaticInita8ac692f43bf07ab29c010fd95958205
 {
     public static $files = array (
         '04c6c5c2f7095ccf6c481d3e53e1776f' => __DIR__ . '/..' . '/mustangostang/spyc/Spyc.php',
@@ -743,7 +743,11 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Common' => __DIR__ . '/../..' . '/core/Common.php',
         'Piwik\\Composer\\ScriptHandler' => __DIR__ . '/../..' . '/core/Composer/ScriptHandler.php',
         'Piwik\\Concurrency\\DistributedList' => __DIR__ . '/../..' . '/core/Concurrency/DistributedList.php',
+        'Piwik\\Concurrency\\Lock' => __DIR__ . '/../..' . '/core/Concurrency/Lock.php',
+        'Piwik\\Concurrency\\LockBackend' => __DIR__ . '/../..' . '/core/Concurrency/LockBackend.php',
+        'Piwik\\Concurrency\\LockBackend\\MySqlLockBackend' => __DIR__ . '/../..' . '/core/Concurrency/LockBackend/MySqlLockBackend.php',
         'Piwik\\Config' => __DIR__ . '/../..' . '/core/Config.php',
+        'Piwik\\Config\\Cache' => __DIR__ . '/../..' . '/core/Config/Cache.php',
         'Piwik\\Config\\ConfigNotFoundException' => __DIR__ . '/../..' . '/core/Config/ConfigNotFoundException.php',
         'Piwik\\Config\\IniFileChain' => __DIR__ . '/../..' . '/core/Config/IniFileChain.php',
         'Piwik\\Console' => __DIR__ . '/../..' . '/core/Console.php',
@@ -769,6 +773,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\DataAccess\\LogQueryBuilder' => __DIR__ . '/../..' . '/core/DataAccess/LogQueryBuilder.php',
         'Piwik\\DataAccess\\LogQueryBuilder\\JoinGenerator' => __DIR__ . '/../..' . '/core/DataAccess/LogQueryBuilder/JoinGenerator.php',
         'Piwik\\DataAccess\\LogQueryBuilder\\JoinTables' => __DIR__ . '/../..' . '/core/DataAccess/LogQueryBuilder/JoinTables.php',
+        'Piwik\\DataAccess\\LogTableTemporary' => __DIR__ . '/../..' . '/core/DataAccess/LogTableTemporary.php',
         'Piwik\\DataAccess\\Model' => __DIR__ . '/../..' . '/core/DataAccess/Model.php',
         'Piwik\\DataAccess\\RawLogDao' => __DIR__ . '/../..' . '/core/DataAccess/RawLogDao.php',
         'Piwik\\DataAccess\\TableMetadata' => __DIR__ . '/../..' . '/core/DataAccess/TableMetadata.php',
@@ -841,14 +846,16 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Db\\SchemaInterface' => __DIR__ . '/../..' . '/core/Db/SchemaInterface.php',
         'Piwik\\Db\\Schema\\Mysql' => __DIR__ . '/../..' . '/core/Db/Schema/Mysql.php',
         'Piwik\\Db\\Settings' => __DIR__ . '/../..' . '/core/Db/Settings.php',
+        'Piwik\\Db\\TransactionLevel' => __DIR__ . '/../..' . '/core/Db/TransactionLevel.php',
         'Piwik\\Decompress\\DecompressInterface' => __DIR__ . '/..' . '/piwik/decompress/src/DecompressInterface.php',
         'Piwik\\Decompress\\Gzip' => __DIR__ . '/..' . '/piwik/decompress/src/Gzip.php',
         'Piwik\\Decompress\\PclZip' => __DIR__ . '/..' . '/piwik/decompress/src/PclZip.php',
         'Piwik\\Decompress\\Tar' => __DIR__ . '/..' . '/piwik/decompress/src/Tar.php',
         'Piwik\\Decompress\\ZipArchive' => __DIR__ . '/..' . '/piwik/decompress/src/ZipArchive.php',
         'Piwik\\Development' => __DIR__ . '/../..' . '/core/Development.php',
-        'Piwik\\DeviceDetectorCache' => __DIR__ . '/../..' . '/core/DeviceDetectorCache.php',
         'Piwik\\DeviceDetectorFactory' => __DIR__ . '/../..' . '/core/DeviceDetectorFactory.php',
+        'Piwik\\DeviceDetector\\DeviceDetectorCache' => __DIR__ . '/../..' . '/core/DeviceDetector/DeviceDetectorCache.php',
+        'Piwik\\DeviceDetector\\DeviceDetectorFactory' => __DIR__ . '/../..' . '/core/DeviceDetector/DeviceDetectorFactory.php',
         'Piwik\\Email\\ContentGenerator' => __DIR__ . '/../..' . '/core/Email/ContentGenerator.php',
         'Piwik\\ErrorHandler' => __DIR__ . '/../..' . '/core/ErrorHandler.php',
         'Piwik\\EventDispatcher' => __DIR__ . '/../..' . '/core/EventDispatcher.php',
@@ -960,6 +967,8 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\API\\API' => __DIR__ . '/../..' . '/plugins/API/API.php',
         'Piwik\\Plugins\\API\\Controller' => __DIR__ . '/../..' . '/plugins/API/Controller.php',
         'Piwik\\Plugins\\API\\DataTable\\MergeDataTables' => __DIR__ . '/../..' . '/plugins/API/DataTable/MergeDataTables.php',
+        'Piwik\\Plugins\\API\\Filter\\DataComparisonFilter' => __DIR__ . '/../..' . '/plugins/API/Filter/DataComparisonFilter.php',
+        'Piwik\\Plugins\\API\\Filter\\DataComparisonFilter\\ComparisonRowGenerator' => __DIR__ . '/../..' . '/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php',
         'Piwik\\Plugins\\API\\Glossary' => __DIR__ . '/../..' . '/plugins/API/Glossary.php',
         'Piwik\\Plugins\\API\\Menu' => __DIR__ . '/../..' . '/plugins/API/Menu.php',
         'Piwik\\Plugins\\API\\Plugin' => __DIR__ . '/../..' . '/plugins/API/API.php',
@@ -980,6 +989,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\API\\WidgetMetadata' => __DIR__ . '/../..' . '/plugins/API/WidgetMetadata.php',
         'Piwik\\Plugins\\API\\test\\Unit\\CsvRendererTest' => __DIR__ . '/../..' . '/plugins/API/tests/Unit/CsvRendererTest.php',
         'Piwik\\Plugins\\API\\tests\\Integration\\APITest' => __DIR__ . '/../..' . '/plugins/API/tests/Integration/APITest.php',
+        'Piwik\\Plugins\\API\\tests\\Integration\\Filter\\DataComparisonFilter\\ComparisonRowGeneratorTest' => __DIR__ . '/../..' . '/plugins/API/tests/Integration/Filter/DataComparisonFilter/ComparisonRowGeneratorTest.php',
         'Piwik\\Plugins\\API\\tests\\Integration\\RowEvolutionTest' => __DIR__ . '/../..' . '/plugins/API/tests/Integration/RowEvolutionTest.php',
         'Piwik\\Plugins\\API\\tests\\Integration\\RssRendererTest' => __DIR__ . '/../..' . '/plugins/API/tests/Integration/RssRendererTest.php',
         'Piwik\\Plugins\\API\\tests\\System\\AutoSuggestAPITest' => __DIR__ . '/../..' . '/plugins/API/tests/System/AutoSuggestAPITest.php',
@@ -1054,6 +1064,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Actions\\Segment' => __DIR__ . '/../..' . '/plugins/Actions/Segment.php',
         'Piwik\\Plugins\\Actions\\Tracker\\ActionsRequestProcessor' => __DIR__ . '/../..' . '/plugins/Actions/Tracker/ActionsRequestProcessor.php',
         'Piwik\\Plugins\\Actions\\VisitorDetails' => __DIR__ . '/../..' . '/plugins/Actions/VisitorDetails.php',
+        'Piwik\\Plugins\\Actions\\tests\\System\\ApiTest' => __DIR__ . '/../..' . '/plugins/Actions/tests/System/ApiTest.php',
         'Piwik\\Plugins\\Actions\\tests\\Unit\\ActionSiteSearchTest' => __DIR__ . '/../..' . '/plugins/Actions/tests/Integration/ActionSiteSearchTest.php',
         'Piwik\\Plugins\\Actions\\tests\\Unit\\ArchiverTests' => __DIR__ . '/../..' . '/plugins/Actions/tests/Unit/ArchiverTest.php',
         'Piwik\\Plugins\\Annotations\\API' => __DIR__ . '/../..' . '/plugins/Annotations/API.php',
@@ -1228,6 +1239,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\CoreHome\\Widgets\\GetDonateForm' => __DIR__ . '/../..' . '/plugins/CoreHome/Widgets/GetDonateForm.php',
         'Piwik\\Plugins\\CoreHome\\Widgets\\GetPromoVideo' => __DIR__ . '/../..' . '/plugins/CoreHome/Widgets/GetPromoVideo.php',
         'Piwik\\Plugins\\CoreHome\\Widgets\\GetSystemSummary' => __DIR__ . '/../..' . '/plugins/CoreHome/Widgets/GetSystemSummary.php',
+        'Piwik\\Plugins\\CoreHome\\Widgets\\QuickLinks' => __DIR__ . '/../..' . '/plugins/CoreHome/Widgets/QuickLinks.php',
         'Piwik\\Plugins\\CoreHome\\tests\\Integration\\Column\\UserIdTest' => __DIR__ . '/../..' . '/plugins/CoreHome/tests/Integration/Column/UserIdTest.php',
         'Piwik\\Plugins\\CoreHome\\tests\\Integration\\CoreHomeTest' => __DIR__ . '/../..' . '/plugins/CoreHome/tests/Integration/CoreHomeTest.php',
         'Piwik\\Plugins\\CoreHome\\tests\\Integration\\CustomLoginWhitelist' => __DIR__ . '/../..' . '/plugins/CoreHome/tests/Integration/LoginWhitelistTest.php',
@@ -1588,6 +1600,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Feedback\\tests\\Unit\\FeedbackTest' => __DIR__ . '/../..' . '/plugins/Feedback/tests/Integration/FeedbackTest.php',
         'Piwik\\Plugins\\GeoIp2\\Columns\\Region' => __DIR__ . '/../..' . '/plugins/GeoIp2/Columns/Region.php',
         'Piwik\\Plugins\\GeoIp2\\Commands\\ConvertRegionCodesToIso' => __DIR__ . '/../..' . '/plugins/GeoIp2/Commands/ConvertRegionCodesToIso.php',
+        'Piwik\\Plugins\\GeoIp2\\Commands\\UpdateRegionCodes' => __DIR__ . '/../..' . '/plugins/GeoIp2/Commands/UpdateRegionCodes.php',
         'Piwik\\Plugins\\GeoIp2\\GeoIP2AutoUpdater' => __DIR__ . '/../..' . '/plugins/GeoIp2/GeoIP2AutoUpdater.php',
         'Piwik\\Plugins\\GeoIp2\\GeoIp2' => __DIR__ . '/../..' . '/plugins/GeoIp2/GeoIp2.php',
         'Piwik\\Plugins\\GeoIp2\\LocationProvider\\GeoIp2' => __DIR__ . '/../..' . '/plugins/GeoIp2/LocationProvider/GeoIp2.php',
@@ -1750,6 +1763,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Live\\Categories\\RealTimeVisitorsSubcategory' => __DIR__ . '/../..' . '/plugins/Live/Categories/RealTimeVisitorsSubcategory.php',
         'Piwik\\Plugins\\Live\\Categories\\VisitorLogSubcategory' => __DIR__ . '/../..' . '/plugins/Live/Categories/VisitorLogSubcategory.php',
         'Piwik\\Plugins\\Live\\Controller' => __DIR__ . '/../..' . '/plugins/Live/Controller.php',
+        'Piwik\\Plugins\\Live\\Exception\\MaxExecutionTimeExceededException' => __DIR__ . '/../..' . '/plugins/Live/Exception/MaxExecutionTimeExceededException.php',
         'Piwik\\Plugins\\Live\\Live' => __DIR__ . '/../..' . '/plugins/Live/Live.php',
         'Piwik\\Plugins\\Live\\Model' => __DIR__ . '/../..' . '/plugins/Live/Model.php',
         'Piwik\\Plugins\\Live\\ProfileSummaryProvider' => __DIR__ . '/../..' . '/plugins/Live/ProfileSummaryProvider.php',
@@ -1805,6 +1819,9 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Marketplace\\Api\\Exception' => __DIR__ . '/../..' . '/plugins/Marketplace/Api/Exception.php',
         'Piwik\\Plugins\\Marketplace\\Api\\Service' => __DIR__ . '/../..' . '/plugins/Marketplace/Api/Service.php',
         'Piwik\\Plugins\\Marketplace\\Api\\Service\\Exception' => __DIR__ . '/../..' . '/plugins/Marketplace/Api/Service/Exception.php',
+        'Piwik\\Plugins\\Marketplace\\Categories\\BrowseSubcategory' => __DIR__ . '/../..' . '/plugins/Marketplace/Categories/BrowseSubcategory.php',
+        'Piwik\\Plugins\\Marketplace\\Categories\\MarketplaceCategory' => __DIR__ . '/../..' . '/plugins/Marketplace/Categories/MarketplaceCategory.php',
+        'Piwik\\Plugins\\Marketplace\\Categories\\PremiumFeaturesSubcategory' => __DIR__ . '/../..' . '/plugins/Marketplace/Categories/PremiumFeaturesSubcategory.php',
         'Piwik\\Plugins\\Marketplace\\Consumer' => __DIR__ . '/../..' . '/plugins/Marketplace/Consumer.php',
         'Piwik\\Plugins\\Marketplace\\Controller' => __DIR__ . '/../..' . '/plugins/Marketplace/Controller.php',
         'Piwik\\Plugins\\Marketplace\\Environment' => __DIR__ . '/../..' . '/plugins/Marketplace/Environment.php',
@@ -1821,6 +1838,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Marketplace\\UpdateCommunication' => __DIR__ . '/../..' . '/plugins/Marketplace/UpdateCommunication.php',
         'Piwik\\Plugins\\Marketplace\\Widgets\\GetNewPlugins' => __DIR__ . '/../..' . '/plugins/Marketplace/Widgets/GetNewPlugins.php',
         'Piwik\\Plugins\\Marketplace\\Widgets\\GetPremiumFeatures' => __DIR__ . '/../..' . '/plugins/Marketplace/Widgets/GetPremiumFeatures.php',
+        'Piwik\\Plugins\\Marketplace\\Widgets\\Marketplace' => __DIR__ . '/../..' . '/plugins/Marketplace/Widgets/Marketplace.php',
         'Piwik\\Plugins\\Marketplace\\tests\\Fixtures\\SimpleFixtureTrackFewVisits' => __DIR__ . '/../..' . '/plugins/Marketplace/tests/Fixtures/SimpleFixtureTrackFewVisits.php',
         'Piwik\\Plugins\\Marketplace\\tests\\Framework\\Mock\\Client' => __DIR__ . '/../..' . '/plugins/Marketplace/tests/Framework/Mock/Client.php',
         'Piwik\\Plugins\\Marketplace\\tests\\Framework\\Mock\\Consumer' => __DIR__ . '/../..' . '/plugins/Marketplace/tests/Framework/Mock/Consumer.php',
@@ -1984,6 +2002,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Referrers\\DataTable\\Filter\\UrlsFromWebsiteId' => __DIR__ . '/../..' . '/plugins/Referrers/DataTable/Filter/UrlsFromWebsiteId.php',
         'Piwik\\Plugins\\Referrers\\Referrers' => __DIR__ . '/../..' . '/plugins/Referrers/Referrers.php',
         'Piwik\\Plugins\\Referrers\\Reports\\Base' => __DIR__ . '/../..' . '/plugins/Referrers/Reports/Base.php',
+        'Piwik\\Plugins\\Referrers\\Reports\\Get' => __DIR__ . '/../..' . '/plugins/Referrers/Reports/Get.php',
         'Piwik\\Plugins\\Referrers\\Reports\\GetAll' => __DIR__ . '/../..' . '/plugins/Referrers/Reports/GetAll.php',
         'Piwik\\Plugins\\Referrers\\Reports\\GetCampaigns' => __DIR__ . '/../..' . '/plugins/Referrers/Reports/GetCampaigns.php',
         'Piwik\\Plugins\\Referrers\\Reports\\GetKeywords' => __DIR__ . '/../..' . '/plugins/Referrers/Reports/GetKeywords.php',
@@ -2009,6 +2028,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\Referrers\\tests\\SearchEngineTest' => __DIR__ . '/../..' . '/plugins/Referrers/tests/Unit/SearchEngineTest.php',
         'Piwik\\Plugins\\Referrers\\tests\\SocialTest' => __DIR__ . '/../..' . '/plugins/Referrers/tests/Unit/SocialTest.php',
         'Piwik\\Plugins\\Referrers\\tests\\System\\ApiTest' => __DIR__ . '/../..' . '/plugins/Referrers/tests/System/ApiTest.php',
+        'Piwik\\Plugins\\Referrers\\tests\\Unit\\DataTable\\Filter\\UrlsFromWebsiteIdTest' => __DIR__ . '/../..' . '/plugins/Referrers/tests/Unit/DataTable/Filter/UrlsFromWebsiteIdTest.php',
         'Piwik\\Plugins\\Resolution\\API' => __DIR__ . '/../..' . '/plugins/Resolution/API.php',
         'Piwik\\Plugins\\Resolution\\Archiver' => __DIR__ . '/../..' . '/plugins/Resolution/Archiver.php',
         'Piwik\\Plugins\\Resolution\\Columns\\Configuration' => __DIR__ . '/../..' . '/plugins/Resolution/Columns/Configuration.php',
@@ -2063,6 +2083,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\SegmentEditor\\Services\\StoredSegmentService' => __DIR__ . '/../..' . '/plugins/SegmentEditor/Services/StoredSegmentService.php',
         'Piwik\\Plugins\\SegmentEditor\\UnprocessedSegmentException' => __DIR__ . '/../..' . '/plugins/SegmentEditor/UnprocessedSegmentException.php',
         'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\ApiTest' => __DIR__ . '/../..' . '/plugins/SegmentEditor/tests/Integration/ApiTest.php',
+        'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\ModelTest' => __DIR__ . '/../..' . '/plugins/SegmentEditor/tests/Integration/ModelTest.php',
         'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentEditorTest' => __DIR__ . '/../..' . '/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php',
         'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentFormatterTest' => __DIR__ . '/../..' . '/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php',
         'Piwik\\Plugins\\SegmentEditor\\tests\\Integration\\SegmentListTest' => __DIR__ . '/../..' . '/plugins/SegmentEditor/tests/Integration/SegmentListTest.php',
@@ -2487,6 +2508,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Plugins\\UsersManager\\LastSeenTimeLogger' => __DIR__ . '/../..' . '/plugins/UsersManager/LastSeenTimeLogger.php',
         'Piwik\\Plugins\\UsersManager\\Menu' => __DIR__ . '/../..' . '/plugins/UsersManager/Menu.php',
         'Piwik\\Plugins\\UsersManager\\Model' => __DIR__ . '/../..' . '/plugins/UsersManager/Model.php',
+        'Piwik\\Plugins\\UsersManager\\NewsletterSignup' => __DIR__ . '/../..' . '/plugins/UsersManager/NewsletterSignup.php',
         'Piwik\\Plugins\\UsersManager\\Sql\\SiteAccessFilter' => __DIR__ . '/../..' . '/plugins/UsersManager/Sql/SiteAccessFilter.php',
         'Piwik\\Plugins\\UsersManager\\Sql\\UserTableFilter' => __DIR__ . '/../..' . '/plugins/UsersManager/Sql/UserTableFilter.php',
         'Piwik\\Plugins\\UsersManager\\Tasks' => __DIR__ . '/../..' . '/plugins/UsersManager/Tasks.php',
@@ -2809,6 +2831,8 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Updates\\Updates_3_10_0_b2' => __DIR__ . '/../..' . '/core/Updates/3.10.0-b2.php',
         'Piwik\\Updates\\Updates_3_10_0_rc5' => __DIR__ . '/../..' . '/core/Updates/3.10.0-rc5.php',
         'Piwik\\Updates\\Updates_3_11_0_b1' => __DIR__ . '/../..' . '/core/Updates/3.11.0-b1.php',
+        'Piwik\\Updates\\Updates_3_12_0_b1' => __DIR__ . '/../..' . '/core/Updates/3.12.0-b1.php',
+        'Piwik\\Updates\\Updates_3_12_0_b7' => __DIR__ . '/../..' . '/core/Updates/3.12.0-b7.php',
         'Piwik\\Updates\\Updates_3_5_0_b2' => __DIR__ . '/../..' . '/core/Updates/3.5.0-b2.php',
         'Piwik\\Updates\\Updates_3_5_0_b4' => __DIR__ . '/../..' . '/core/Updates/3.5.0-b4.php',
         'Piwik\\Updates\\Updates_3_5_0_rc2' => __DIR__ . '/../..' . '/core/Updates/3.5.0-rc2.php',
@@ -2821,6 +2845,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Piwik\\Updates\\Updates_3_7_0_b1' => __DIR__ . '/../..' . '/core/Updates/3.7.0-b1.php',
         'Piwik\\Updates\\Updates_3_8_0_b3' => __DIR__ . '/../..' . '/core/Updates/3.8.0-b3.php',
         'Piwik\\Updates\\Updates_3_8_0_b4' => __DIR__ . '/../..' . '/core/Updates/3.8.0-b4.php',
+        'Piwik\\Updates\\Updates_4_0_0_b1' => __DIR__ . '/../..' . '/core/Updates/4.0.0-b1.php',
         'Piwik\\Url' => __DIR__ . '/../..' . '/core/Url.php',
         'Piwik\\UrlHelper' => __DIR__ . '/../..' . '/core/UrlHelper.php',
         'Piwik\\Validators\\BaseValidator' => __DIR__ . '/../..' . '/core/Validators/BaseValidator.php',
@@ -3077,6 +3102,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Twig\\Node\\EmbedNode' => __DIR__ . '/..' . '/twig/twig/src/Node/EmbedNode.php',
         'Twig\\Node\\Expression\\AbstractExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/AbstractExpression.php',
         'Twig\\Node\\Expression\\ArrayExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/ArrayExpression.php',
+        'Twig\\Node\\Expression\\ArrowFunctionExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/ArrowFunctionExpression.php',
         'Twig\\Node\\Expression\\AssignNameExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/AssignNameExpression.php',
         'Twig\\Node\\Expression\\Binary\\AbstractBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/AbstractBinary.php',
         'Twig\\Node\\Expression\\Binary\\AddBinary' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Binary/AddBinary.php',
@@ -3112,6 +3138,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Twig\\Node\\Expression\\Filter\\DefaultFilter' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/Filter/DefaultFilter.php',
         'Twig\\Node\\Expression\\FunctionExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/FunctionExpression.php',
         'Twig\\Node\\Expression\\GetAttrExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/GetAttrExpression.php',
+        'Twig\\Node\\Expression\\InlinePrint' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/InlinePrint.php',
         'Twig\\Node\\Expression\\MethodCallExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/MethodCallExpression.php',
         'Twig\\Node\\Expression\\NameExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/NameExpression.php',
         'Twig\\Node\\Expression\\NullCoalesceExpression' => __DIR__ . '/..' . '/twig/twig/src/Node/Expression/NullCoalesceExpression.php',
@@ -3175,6 +3202,7 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Twig\\Test\\NodeTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/NodeTestCase.php',
         'Twig\\Token' => __DIR__ . '/..' . '/twig/twig/src/Token.php',
         'Twig\\TokenParser\\AbstractTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
+        'Twig\\TokenParser\\ApplyTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
         'Twig\\TokenParser\\AutoEscapeTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/AutoEscapeTokenParser.php',
         'Twig\\TokenParser\\BlockTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/BlockTokenParser.php',
         'Twig\\TokenParser\\DeprecatedTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/DeprecatedTokenParser.php',
@@ -3402,18 +3430,6 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
         'Twig_Util_DeprecationCollector' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Util/DeprecationCollector.php',
         'Twig_Util_TemplateDirIterator' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Util/TemplateDirIterator.php',
         'Zend_Config' => __DIR__ . '/../..' . '/libs/Zend/Config.php',
-        'Zend_Config_Exception' => __DIR__ . '/../..' . '/libs/Zend/Config/Exception.php',
-        'Zend_Config_Ini' => __DIR__ . '/../..' . '/libs/Zend/Config/Ini.php',
-        'Zend_Config_Json' => __DIR__ . '/../..' . '/libs/Zend/Config/Json.php',
-        'Zend_Config_Writer' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer.php',
-        'Zend_Config_Writer_Array' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/Array.php',
-        'Zend_Config_Writer_FileAbstract' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/FileAbstract.php',
-        'Zend_Config_Writer_Ini' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/Ini.php',
-        'Zend_Config_Writer_Json' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/Json.php',
-        'Zend_Config_Writer_Xml' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/Xml.php',
-        'Zend_Config_Writer_Yaml' => __DIR__ . '/../..' . '/libs/Zend/Config/Writer/Yaml.php',
-        'Zend_Config_Xml' => __DIR__ . '/../..' . '/libs/Zend/Config/Xml.php',
-        'Zend_Config_Yaml' => __DIR__ . '/../..' . '/libs/Zend/Config/Yaml.php',
         'Zend_Db' => __DIR__ . '/../..' . '/libs/Zend/Db.php',
         'Zend_Db_Adapter_Abstract' => __DIR__ . '/../..' . '/libs/Zend/Db/Adapter/Abstract.php',
         'Zend_Db_Adapter_Db2' => __DIR__ . '/../..' . '/libs/Zend/Db/Adapter/Db2.php',
@@ -3575,11 +3591,11 @@ class ComposerStaticInit20965b5e193daae3814e448b2561c788
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit20965b5e193daae3814e448b2561c788::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit20965b5e193daae3814e448b2561c788::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit20965b5e193daae3814e448b2561c788::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit20965b5e193daae3814e448b2561c788::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit20965b5e193daae3814e448b2561c788::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInita8ac692f43bf07ab29c010fd95958205::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/app/vendor/composer/ca-bundle/composer.json b/app/vendor/composer/ca-bundle/composer.json
deleted file mode 100644
index ca2a0d34d..000000000
--- a/app/vendor/composer/ca-bundle/composer.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "name": "composer/ca-bundle",
-    "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-    "type": "library",
-    "license": "MIT",
-    "keywords": [
-        "cabundle",
-        "cacert",
-        "certificate",
-        "ssl",
-        "tls"
-    ],
-    "authors": [
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "http://seld.be"
-        }
-    ],
-    "support": {
-        "irc": "irc://irc.freenode.org/composer",
-        "issues": "https://github.com/composer/ca-bundle/issues"
-    },
-    "require": {
-        "ext-openssl": "*",
-        "ext-pcre": "*",
-        "php": "^5.3.2 || ^7.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-        "psr/log": "^1.0",
-        "symfony/process": "^2.5 || ^3.0 || ^4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Composer\\CaBundle\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Composer\\CaBundle\\": "tests"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    },
-    "config": {
-        "platform": {
-            "php": "5.3.9"
-        }
-    }
-}
diff --git a/app/vendor/composer/installed.json b/app/vendor/composer/installed.json
index 68e162e59..9d2b6db92 100644
--- a/app/vendor/composer/installed.json
+++ b/app/vendor/composer/installed.json
@@ -156,18 +156,12 @@
     },
     {
         "name": "davaxi/sparkline",
-        "version": "1.1.2",
-        "version_normalized": "1.1.2.0",
+        "version": "dev-multiple-series",
+        "version_normalized": "dev-multiple-series",
         "source": {
             "type": "git",
-            "url": "https://github.com/davaxi/Sparkline.git",
-            "reference": "d563481f0960bac1acb4e24743ab884f4ce251e2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/davaxi/Sparkline/zipball/d563481f0960bac1acb4e24743ab884f4ce251e2",
-            "reference": "d563481f0960bac1acb4e24743ab884f4ce251e2",
-            "shasum": ""
+            "url": "https://github.com/matomo-org/Sparkline.git",
+            "reference": "d5840d8bd753eab9cadf7589af76b51dfd92e098"
         },
         "require": {
             "ext-gd": "*",
@@ -186,15 +180,14 @@
             "squizlabs/php_codesniffer": "^3.1",
             "wearejust/grumphp-extra-tasks": "^2.1"
         },
-        "time": "2017-12-15T15:45:18+00:00",
+        "time": "2019-08-26T06:43:23+00:00",
         "type": "library",
-        "installation-source": "dist",
+        "installation-source": "source",
         "autoload": {
             "psr-4": {
                 "Davaxi\\": "src/"
             }
         },
-        "notification-url": "https://packagist.org/downloads/",
         "license": [
             "MIT"
         ],
@@ -211,7 +204,11 @@
             "php",
             "picture",
             "sparkline"
-        ]
+        ],
+        "support": {
+            "issues": "https://github.com/davaxi/Sparkline/issues",
+            "source": "https://github.com/davaxi/Sparkline/releases"
+        }
     },
     {
         "name": "doctrine/cache",
@@ -807,18 +804,18 @@
         "authors": [
             {
                 "name": "Greg Beaver",
-                "email": "cellog@php.net",
-                "role": "Helper"
+                "role": "Helper",
+                "email": "cellog@php.net"
             },
             {
                 "name": "Andrei Zmievski",
-                "email": "andrei@php.net",
-                "role": "Lead"
+                "role": "Lead",
+                "email": "andrei@php.net"
             },
             {
                 "name": "Stig Bakken",
-                "email": "stig@php.net",
-                "role": "Developer"
+                "role": "Developer",
+                "email": "stig@php.net"
             }
         ],
         "description": "More info available on: http://pear.php.net/package/Console_Getopt"
@@ -863,8 +860,8 @@
         "authors": [
             {
                 "name": "Christian Weiske",
-                "email": "cweiske@php.net",
-                "role": "Lead"
+                "role": "Lead",
+                "email": "cweiske@php.net"
             }
         ],
         "description": "Minimal set of PEAR core files to be used as composer dependency"
@@ -1663,7 +1660,7 @@
             },
             {
                 "name": "Gert de Pagter",
-                "email": "backendtea@gmail.com"
+                "email": "BackEndTea@gmail.com"
             }
         ],
         "description": "Symfony polyfill for ctype functions",
@@ -1807,33 +1804,33 @@
     },
     {
         "name": "twig/twig",
-        "version": "v1.38.4",
-        "version_normalized": "1.38.4.0",
+        "version": "v1.42.3",
+        "version_normalized": "1.42.3.0",
         "source": {
             "type": "git",
             "url": "https://github.com/twigphp/Twig.git",
-            "reference": "7732e9e7017d751313811bd118de61302e9c8b35"
+            "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35",
-            "reference": "7732e9e7017d751313811bd118de61302e9c8b35",
+            "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+            "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.4.0",
+            "php": ">=5.5.0",
             "symfony/polyfill-ctype": "^1.8"
         },
         "require-dev": {
             "psr/container": "^1.0",
-            "symfony/debug": "^2.7",
-            "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
+            "symfony/debug": "^3.4|^4.2",
+            "symfony/phpunit-bridge": "^4.4@dev|^5.0"
         },
-        "time": "2019-03-23T14:27:19+00:00",
+        "time": "2019-08-24T12:51:03+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.38-dev"
+                "dev-master": "1.42-dev"
             }
         },
         "installation-source": "dist",
@@ -1856,15 +1853,15 @@
                 "homepage": "http://fabien.potencier.org",
                 "role": "Lead Developer"
             },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com",
-                "role": "Project Founder"
-            },
             {
                 "name": "Twig Team",
                 "homepage": "https://twig.symfony.com/contributors",
                 "role": "Contributors"
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com",
+                "role": "Project Founder"
             }
         ],
         "description": "Twig, the flexible, fast, and secure template language for PHP",
diff --git a/app/vendor/composer/semver/composer.json b/app/vendor/composer/semver/composer.json
deleted file mode 100644
index b0400cd7b..000000000
--- a/app/vendor/composer/semver/composer.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "name": "composer/semver",
-    "description": "Semver library that offers utilities, version constraint parsing and validation.",
-    "type": "library",
-    "license": "MIT",
-    "keywords": [
-        "semver",
-        "semantic",
-        "versioning",
-        "validation"
-    ],
-    "authors": [
-        {
-            "name": "Nils Adermann",
-            "email": "naderman@naderman.de",
-            "homepage": "http://www.naderman.de"
-        },
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "http://seld.be"
-        },
-        {
-            "name": "Rob Bast",
-            "email": "rob.bast@gmail.com",
-            "homepage": "http://robbast.nl"
-        }
-    ],
-    "support": {
-        "irc": "irc://irc.freenode.org/composer",
-        "issues": "https://github.com/composer/semver/issues"
-    },
-    "require": {
-        "php": "^5.3.2 || ^7.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.5 || ^5.0.5",
-        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Composer\\Semver\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Composer\\Semver\\": "tests"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    },
-    "scripts": {
-        "test": "phpunit"
-    }
-}
diff --git a/app/vendor/container-interop/container-interop/composer.json b/app/vendor/container-interop/container-interop/composer.json
deleted file mode 100644
index 855f76672..000000000
--- a/app/vendor/container-interop/container-interop/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "container-interop/container-interop",
-    "type": "library",
-    "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-    "homepage": "https://github.com/container-interop/container-interop",
-    "license": "MIT",
-    "autoload": {
-        "psr-4": {
-            "Interop\\Container\\": "src/Interop/Container/"
-        }
-    },
-    "require": {
-        "psr/container": "^1.0"
-    }
-}
diff --git a/app/vendor/davaxi/sparkline/README.md b/app/vendor/davaxi/sparkline/README.md
index 57ce74fc5..ced173a50 100644
--- a/app/vendor/davaxi/sparkline/README.md
+++ b/app/vendor/davaxi/sparkline/README.md
@@ -27,7 +27,7 @@ There are two options for obtaining the files for the client library.
 
 You can install the library by adding it as a dependency to your composer.json.
 
-```
+```json
   "require": {
     "davaxi/sparkline": "^1.1"
   }
@@ -37,7 +37,7 @@ You can install the library by adding it as a dependency to your composer.json.
 
 The library is available on [GitHub](https://github.com/davaxi/Sparkline). You can clone it into a local repository with the git clone command.
 
-```
+```sh
 git clone https://github.com/davaxi/Sparkline.git
 ```
 
@@ -45,17 +45,17 @@ git clone https://github.com/davaxi/Sparkline.git
 
 After obtaining the files, ensure they are available to your code. If you're using Composer, this is handled for you automatically. If not, you will need to add the `autoload.php` file inside the client library.
 
-```
+```php
 require '/path/to/sparkline/folder/autoload.php';
 ```
 
 ## Usage
 
-Exemple: 
+Example: 
 
 ![Sparkline](https://raw.githubusercontent.com/davaxi/Sparkline/master/tests/data/testGenerate2-mockup.png)
 
-```
+```php
 <?php
 
 require '/path/to/sparkline/folder/autoload.php';
@@ -69,7 +69,7 @@ $sparkline->display();
 
 ## Documentation
 
-```
+```php
 $sparkline = new Davaxi\Sparkline();
 
 // Change format (Default value 80x20)
diff --git a/app/vendor/davaxi/sparkline/composer.json b/app/vendor/davaxi/sparkline/composer.json
deleted file mode 100644
index dbca75168..000000000
--- a/app/vendor/davaxi/sparkline/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "davaxi/sparkline",
-    "description": "PHP Class (using GD) to generate sparklines",
-    "version": "1.1.2",
-    "type": "library",
-    "keywords": [
-        "sparkline",
-        "php",
-        "picture"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "David Patiashvili",
-            "email": "stratagem.david@gmail.com",
-            "homepage": "https://www.patiashvili.fr/",
-            "role": "Developer"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/davaxi/Sparkline/issues",
-        "source": "https://github.com/davaxi/Sparkline/releases"
-    },
-    "minimum-stability": "stable",
-    "require": {
-        "php": ">=5.3.0",
-        "ext-gd": "*"
-    },
-    "require-dev": {
-        "php": ">=5.3.0",
-        "codeclimate/php-test-reporter": "dev-master",
-        "ext-gd": "*",
-        "phpro/grumphp": "^0.12.0",
-        "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "sensiolabs/security-checker": "^4.1",
-        "povils/phpmnd": "^1.1",
-        "sebastian/phpcpd": "^3.0",
-        "squizlabs/php_codesniffer": "^3.1",
-        "friendsofphp/php-cs-fixer": "^2.8",
-        "wearejust/grumphp-extra-tasks": "^2.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "Davaxi\\": "src/"
-        }
-    }
-}
diff --git a/app/vendor/davaxi/sparkline/phpunit.xml b/app/vendor/davaxi/sparkline/phpunit.xml
deleted file mode 100644
index 4920a3579..000000000
--- a/app/vendor/davaxi/sparkline/phpunit.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-    >
-    <testsuites>
-        <testsuite name="General tests">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
\ No newline at end of file
diff --git a/app/vendor/davaxi/sparkline/src/Sparkline.php b/app/vendor/davaxi/sparkline/src/Sparkline.php
index 90fc2bf3f..485fe46f3 100644
--- a/app/vendor/davaxi/sparkline/src/Sparkline.php
+++ b/app/vendor/davaxi/sparkline/src/Sparkline.php
@@ -110,23 +110,34 @@ public function generate()
         list($width, $height) = $this->getNormalizedSize();
 
         $count = $this->getCount();
-        list($polygon, $line) = $this->getChartElements($this->data);
 
         $picture = new Picture($width, $height);
         $picture->applyBackground($this->backgroundColor);
         $picture->applyThickness($this->lineThickness * $this->ratioComputing);
-        $picture->applyPolygon($polygon, $this->fillColor, $count);
-        $picture->applyLine($line, $this->lineColor);
-
-        foreach ($this->points as $point) {
-            $isFirst = $point['index'] === 0;
-            $lineIndex = $isFirst ? 0 : $point['index'] - 1;
-            $picture->applyDot(
-                $line[$lineIndex][$isFirst ? 0 : 2],
-                $line[$lineIndex][$isFirst ? 1 : 3],
-                $point['radius'] * $this->ratioComputing,
-                $point['color']
-            );
+
+        $stepCount = $this->getMaxNumberOfDataPointsAcrossSerieses();
+
+        foreach ($this->data as $seriesIndex => $series) {
+            list($polygon, $line) = $this->getChartElements($series, $stepCount);
+            $picture->applyPolygon($polygon, $this->fillColor, $count);
+
+            $lineColor = isset($this->lineColor[$seriesIndex]) ? $this->lineColor[$seriesIndex] : $this->lineColor[0];
+            $picture->applyLine($line, $lineColor);
+
+            foreach ($this->points as $point) {
+                if ($point['series'] != $seriesIndex) {
+                    continue;
+                }
+
+                $isFirst = $point['index'] === 0;
+                $lineIndex = $isFirst ? 0 : $point['index'] - 1;
+                $picture->applyDot(
+                    $line[$lineIndex][$isFirst ? 0 : 2],
+                    $line[$lineIndex][$isFirst ? 1 : 3],
+                    $point['radius'] * $this->ratioComputing,
+                    $point['color']
+                );
+            }
         }
 
         $this->file = $picture->generate($this->width, $this->height);
diff --git a/app/vendor/davaxi/sparkline/src/Sparkline/DataTrait.php b/app/vendor/davaxi/sparkline/src/Sparkline/DataTrait.php
index e944c3644..ecafdf6c4 100644
--- a/app/vendor/davaxi/sparkline/src/Sparkline/DataTrait.php
+++ b/app/vendor/davaxi/sparkline/src/Sparkline/DataTrait.php
@@ -22,7 +22,9 @@ trait DataTrait
     /**
      * @var array
      */
-    protected $data = [0, 0];
+    protected $data = [
+        [0, 0],
+    ];
 
     /**
      * @param $base
@@ -42,32 +44,53 @@ public function setOriginValue($originValue)
         $this->originValue = $originValue;
     }
 
+    /**
+     * @param array $data,...
+     */
+    public function setData()
+    {
+        $allSeries = func_get_args();
+
+        $this->data = [];
+        foreach ($allSeries as $data) {
+            $this->addSeries($data);
+        }
+    }
+
     /**
      * @param array $data
      */
-    public function setData(array $data)
+    public function addSeries($data)
     {
         $data = array_values($data);
         $count = count($data);
         if (!$count) {
-            $this->data = [0, 0];
+            $this->data[] = [0, 0];
 
             return;
         }
         if ($count < static::MIN_DATA_LENGTH) {
-            $this->data = array_fill(0, 2, $data[0]);
+            $this->data[] = array_fill(0, 2, $data[0]);
 
             return;
         }
-        $this->data = $data;
+        $this->data[] = $data;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSeriesCount()
+    {
+        return count($this->data);
     }
 
     /**
      * @return array
      */
-    public function getNormalizedData()
+    public function getNormalizedData($seriesIndex = 0)
     {
-        $data = $this->data;
+        $data = $this->data[$seriesIndex];
         foreach ($data as $i => $value) {
             $data[$i] = max(0, $value - $this->originValue);
         }
@@ -78,26 +101,26 @@ public function getNormalizedData()
     /**
      * @return array
      */
-    public function getData()
+    public function getData($seriesIndex = 0)
     {
-        return $this->data;
+        return $this->data[$seriesIndex];
     }
 
     /**
      * @return int
      */
-    public function getCount()
+    public function getCount($seriesIndex = 0)
     {
-        return count($this->data);
+        return count($this->data[$seriesIndex]);
     }
 
     /**
      * @return array
      */
-    protected function getMaxValueWithIndex()
+    protected function getMaxValueWithIndex($seriesIndex = 0)
     {
-        $max = max($this->data);
-        $maxKeys = array_keys($this->data, $max);
+        $max = max($this->data[$seriesIndex]);
+        $maxKeys = array_keys($this->data[$seriesIndex], $max);
         $maxIndex = end($maxKeys);
         if ($this->base) {
             $max = $this->base;
@@ -109,22 +132,42 @@ protected function getMaxValueWithIndex()
     /**
      * @return float
      */
-    protected function getMaxValue()
+    protected function getMaxValue($seriesIndex = 0)
+    {
+        if ($this->base) {
+            return $this->base;
+        }
+
+        return max($this->data[$seriesIndex]);
+    }
+
+    /**
+     * TODO: this could be cached somehow
+     * @return float
+     */
+    protected function getMaxValueAcrossSeries()
     {
         if ($this->base) {
             return $this->base;
         }
 
-        return max($this->data);
+        $maxes = array_map('max', $this->data);
+        return max($maxes);
+    }
+
+    protected function getMaxNumberOfDataPointsAcrossSerieses()
+    {
+        $counts = array_map('count', $this->data);
+        return max($counts);
     }
 
     /**
      * @return array
      */
-    protected function getMinValueWithIndex()
+    protected function getMinValueWithIndex($seriesIndex = 0)
     {
-        $min = min($this->data);
-        $minKey = array_keys($this->data, $min);
+        $min = min($this->data[$seriesIndex]);
+        $minKey = array_keys($this->data[$seriesIndex], $min);
         $minIndex = end($minKey);
 
         return [$minIndex, $min];
@@ -133,10 +176,10 @@ protected function getMinValueWithIndex()
     /**
      * @return array
      */
-    protected function getExtremeValues()
+    protected function getExtremeValues($seriesIndex = 0)
     {
-        list($minIndex, $min) = $this->getMinValueWithIndex();
-        list($maxIndex, $max) = $this->getMaxValueWithIndex();
+        list($minIndex, $min) = $this->getMinValueWithIndex($seriesIndex);
+        list($maxIndex, $max) = $this->getMaxValueWithIndex($seriesIndex);
 
         return [$minIndex, $min, $maxIndex, $max];
     }
diff --git a/app/vendor/davaxi/sparkline/src/Sparkline/FormatTrait.php b/app/vendor/davaxi/sparkline/src/Sparkline/FormatTrait.php
index 72b6c4b83..997318799 100644
--- a/app/vendor/davaxi/sparkline/src/Sparkline/FormatTrait.php
+++ b/app/vendor/davaxi/sparkline/src/Sparkline/FormatTrait.php
@@ -181,7 +181,7 @@ protected function getStepWidth($count)
      */
     protected function getDataForChartElements(array $data, $height)
     {
-        $max = $this->getMaxValue();
+        $max = $this->getMaxValueAcrossSeries();
         $minHeight = 1 * $this->ratioComputing;
         $maxHeight = $height - $minHeight;
         foreach ($data as $i => $value) {
@@ -200,12 +200,11 @@ protected function getDataForChartElements(array $data, $height)
 
     /**
      * @param array $data
-     *
+     * @param int $count count of steps in sparkline image (does not have to == count($data))
      * @return array
      */
-    protected function getChartElements(array $data)
+    protected function getChartElements(array $data, $count)
     {
-        $count = count($data);
         $step = $this->getStepWidth($count);
         $height = $this->getInnerNormalizedHeight();
         $normalizedPadding = $this->getNormalizedPadding();
@@ -223,7 +222,7 @@ protected function getChartElements(array $data)
         // First element
         $polygon[] = $pictureX1;
         $polygon[] = $pictureY1;
-        for ($i = 1; $i < $count; ++$i) {
+        for ($i = 1; $i < count($data); ++$i) {
             $pictureX2 = $pictureX1 + $step;
             $pictureY2 = $normalizedPadding['top'] + $height - $data[$i];
 
diff --git a/app/vendor/davaxi/sparkline/src/Sparkline/PointTrait.php b/app/vendor/davaxi/sparkline/src/Sparkline/PointTrait.php
index de5077d9b..5fb3d1ade 100644
--- a/app/vendor/davaxi/sparkline/src/Sparkline/PointTrait.php
+++ b/app/vendor/davaxi/sparkline/src/Sparkline/PointTrait.php
@@ -17,17 +17,18 @@ trait PointTrait
      * @param $dotRadius
      * @param $colorHex
      */
-    public function addPoint($index, $dotRadius, $colorHex)
+    public function addPoint($index, $dotRadius, $colorHex, $seriesIndex = 0)
     {
-        $mapping = $this->getPointIndexMapping();
+        $mapping = $this->getPointIndexMapping($seriesIndex);
         if (array_key_exists($index, $mapping)) {
             $index = $mapping[$index];
             if ($index < 0) {
                 return;
             }
         }
-        $this->checkPointIndex($index);
+        $this->checkPointIndex($index, $seriesIndex);
         $this->points[] = [
+            'series' => $seriesIndex,
             'index' => $index,
             'radius' => $dotRadius,
             'color' => $this->colorHexToRGB($colorHex),
@@ -37,10 +38,10 @@ public function addPoint($index, $dotRadius, $colorHex)
     /**
      * @return array
      */
-    protected function getPointIndexMapping()
+    protected function getPointIndexMapping($seriesIndex = 0)
     {
-        $count = $this->getCount();
-        list($minIndex, $min, $maxIndex, $max) = $this->getExtremeValues();
+        $count = $this->getCount($seriesIndex);
+        list($minIndex, $min, $maxIndex, $max) = $this->getExtremeValues($seriesIndex);
 
         $mapping = [];
         $mapping['first'] = $count > 1 ? 0 : -1;
@@ -54,9 +55,9 @@ protected function getPointIndexMapping()
     /**
      * @param $index
      */
-    protected function checkPointIndex($index)
+    protected function checkPointIndex($index, $seriesIndex)
     {
-        $count = $this->getCount();
+        $count = $this->getCount($seriesIndex);
         if (!is_numeric($index)) {
             throw new \InvalidArgumentException('Invalid index : ' . $index);
         }
diff --git a/app/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php b/app/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php
index 5feccbcb1..f7818a8cc 100644
--- a/app/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php
+++ b/app/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php
@@ -17,7 +17,9 @@ trait StyleTrait
      * @var array (rgb)
      *            Default: #1388db
      */
-    protected $lineColor = [19, 136, 219];
+    protected $lineColor = [
+        [19, 136, 219],
+    ];
 
     /**
      * @var array (rgb)
@@ -61,10 +63,10 @@ public function setBackgroundColorRGB($red, $green, $blue)
     /**
      * @param string $color (hexadecimal)
      */
-    public function setLineColorHex($color)
+    public function setLineColorHex($color, $seriesIndex = 0)
     {
         list($red, $green, $blue) = $this->colorHexToRGB($color);
-        $this->setLineColorRGB($red, $green, $blue);
+        $this->setLineColorRGB($red, $green, $blue, $seriesIndex);
     }
 
     /**
@@ -72,9 +74,9 @@ public function setLineColorHex($color)
      * @param int $green
      * @param int $blue
      */
-    public function setLineColorRGB($red, $green, $blue)
+    public function setLineColorRGB($red, $green, $blue, $seriesIndex = 0)
     {
-        $this->lineColor = [$red, $green, $blue];
+        $this->lineColor[$seriesIndex] = [$red, $green, $blue];
     }
 
     /**
diff --git a/app/vendor/doctrine/cache/composer.json b/app/vendor/doctrine/cache/composer.json
deleted file mode 100644
index 7ef1727a1..000000000
--- a/app/vendor/doctrine/cache/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "doctrine/cache",
-    "type": "library",
-    "description": "Caching library offering an object-oriented API for many cache backends",
-    "keywords": ["cache", "caching"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": "~5.5|~7.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit":         "~4.8|~5.0",
-        "satooshi/php-coveralls":  "~0.6",
-        "predis/predis":           "~1.0"
-    },
-    "conflict": {
-        "doctrine/common": ">2.2,<2.4"
-    },
-    "autoload": {
-        "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" }
-    },
-    "autoload-dev": {
-        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.6.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/doctrine/cache/phpunit.xml.dist b/app/vendor/doctrine/cache/phpunit.xml.dist
deleted file mode 100644
index 40cc24dee..000000000
--- a/app/vendor/doctrine/cache/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-    backupGlobals="false"
-    colors="true"
-    bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Doctrine Cache Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/app/vendor/geoip2/geoip2/composer.json b/app/vendor/geoip2/geoip2/composer.json
deleted file mode 100644
index 53ae0b8fc..000000000
--- a/app/vendor/geoip2/geoip2/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "geoip2/geoip2",
-    "description": "MaxMind GeoIP2 PHP API",
-    "keywords": ["geoip", "geoip2", "geolocation", "ip", "maxmind"],
-    "homepage": "https://github.com/maxmind/GeoIP2-php",
-    "type": "library",
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "Gregory J. Oschwald",
-            "email": "goschwald@maxmind.com",
-            "homepage": "http://www.maxmind.com/"
-        }
-    ],
-    "require": {
-        "maxmind-db/reader": "~1.0",
-        "maxmind/web-service-common": "~0.5",
-        "php": ">=5.4"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.*",
-        "phpunit/phpunit": "4.*",
-        "squizlabs/php_codesniffer": "3.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "GeoIp2\\": "src"
-        }
-    }
-}
diff --git a/app/vendor/leafo/lessphp/composer.json b/app/vendor/leafo/lessphp/composer.json
deleted file mode 100644
index 0f06ba090..000000000
--- a/app/vendor/leafo/lessphp/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "leafo/lessphp",
-    "type": "library",
-    "description": "lessphp is a compiler for LESS written in PHP.",
-    "homepage": "http://leafo.net/lessphp/",
-    "license": [
-      "MIT",
-      "GPL-3.0"
-    ],
-    "authors": [
-        {
-            "name": "Leaf Corcoran",
-            "email": "leafot@gmail.com",
-            "homepage": "http://leafo.net"
-        }
-    ],
-    "autoload": {
-        "classmap": ["lessc.inc.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.4.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/leafo/lessphp/lessify b/app/vendor/leafo/lessphp/lessify
old mode 100644
new mode 100755
diff --git a/app/vendor/leafo/lessphp/package.sh b/app/vendor/leafo/lessphp/package.sh
old mode 100644
new mode 100755
diff --git a/app/vendor/leafo/lessphp/plessc b/app/vendor/leafo/lessphp/plessc
old mode 100644
new mode 100755
diff --git a/app/vendor/matomo-org/jshrink/composer.json b/app/vendor/matomo-org/jshrink/composer.json
deleted file mode 100644
index 9483d5e0e..000000000
--- a/app/vendor/matomo-org/jshrink/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "tedivm/jshrink",
-  "description": "Javascript Minifier built in PHP",
-  "keywords": ["minifier","javascript"],
-  "homepage": "http://github.com/tedious/JShrink",
-  "type": "library",
-  "license": "BSD-3-Clause",
-  "authors": [
-    {
-      "name": "Robert Hafner",
-      "email": "tedivm@tedivm.com"
-    }
-  ],
-  "require": {
-    "php": "^5.6|^7.0"
-  },
-  "require-dev": {
-      "phpunit/phpunit": "^6",
-      "friendsofphp/php-cs-fixer": "^2.8",
-      "php-coveralls/php-coveralls": "^1.1.0"
-  },
-  "autoload": {
-    "psr-0": {"JShrink": "src/"}
-  }
-}
diff --git a/app/vendor/matomo-org/jshrink/phpunit.xml.dist b/app/vendor/matomo-org/jshrink/phpunit.xml.dist
deleted file mode 100644
index 72c6470ed..000000000
--- a/app/vendor/matomo-org/jshrink/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="JShrink Test Suite">
-            <directory suffix="Test.php">./tests/JShrink/</directory>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>requests</group>
-            <group>development</group>
-        </exclude>
-    </groups>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/JShrink/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
-    </logging>
-</phpunit>
diff --git a/app/vendor/matomo/referrer-spam-blacklist/composer.json b/app/vendor/matomo/referrer-spam-blacklist/composer.json
deleted file mode 100644
index 51a5bf932..000000000
--- a/app/vendor/matomo/referrer-spam-blacklist/composer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "matomo/referrer-spam-blacklist",
-    "description": "Community-contributed list of referrer spammers",
-    "license": "CC0-1.0",
-    "replace": {
-        "piwik/referrer-spam-blacklist":"*"
-    }
-}
diff --git a/app/vendor/matomo/searchengine-and-social-list/composer.json b/app/vendor/matomo/searchengine-and-social-list/composer.json
deleted file mode 100644
index b81ecc362..000000000
--- a/app/vendor/matomo/searchengine-and-social-list/composer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "matomo/searchengine-and-social-list",
-  "description": "Search engine and social network definitions used by Matomo (formerly Piwik)",
-  "license": "CC0-1.0",
-  "replace": {
-    "piwik/searchengine-and-social-list":"*"
-  }
-}
diff --git a/app/vendor/matomo/searchengine-and-social-list/package.json b/app/vendor/matomo/searchengine-and-social-list/package.json
deleted file mode 100644
index 1bab14aab..000000000
--- a/app/vendor/matomo/searchengine-and-social-list/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "searchengine-and-social-list",
-  "version": "1.4.1",
-  "description": "Search engine and social network definitions used by Matomo (formerly Piwik)",
-  "keywords": [
-    "searchengine",
-    "social network"
-  ],
-  "main": "SearchEngines.yml",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/matomo-org/searchengine-and-social-list.git"
-  },
-  "homepage": "https://github.com/matomo-org/searchengine-and-social-list#readme",
-  "bugs": {
-    "url": "https://github.com/matomo-org/searchengine-and-social-list/issues"
-  },
-  "author": "Matomo Team",
-  "license": "CC0-1.0"
-}
diff --git a/app/vendor/maxmind-db/reader/composer.json b/app/vendor/maxmind-db/reader/composer.json
deleted file mode 100644
index dce4428e7..000000000
--- a/app/vendor/maxmind-db/reader/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "maxmind-db/reader",
-    "description": "MaxMind DB Reader API",
-    "keywords": ["database", "geoip", "geoip2", "geolocation", "maxmind"],
-    "homepage": "https://github.com/maxmind/MaxMind-DB-Reader-php",
-    "type": "library",
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "Gregory J. Oschwald",
-            "email": "goschwald@maxmind.com",
-            "homepage": "http://www.maxmind.com/"
-        }
-    ],
-    "require": {
-        "php": ">=5.4"
-    },
-    "suggest": {
-        "ext-bcmath": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder",
-        "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder",
-        "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.*",
-        "phpunit/phpunit": "4.* || 5.*",
-        "satooshi/php-coveralls": "1.0.*",
-        "squizlabs/php_codesniffer": "3.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "MaxMind\\Db\\": "src/MaxMind/Db"
-        }
-    }
-}
diff --git a/app/vendor/maxmind/web-service-common/composer.json b/app/vendor/maxmind/web-service-common/composer.json
deleted file mode 100644
index 1d224ae82..000000000
--- a/app/vendor/maxmind/web-service-common/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "maxmind/web-service-common",
-  "description": "Internal MaxMind Web Service API",
-  "minimum-stability": "stable",
-  "homepage": "https://github.com/maxmind/web-service-common-php",
-  "type": "library",
-  "license": "Apache-2.0",
-  "authors": [
-    {
-      "name": "Gregory Oschwald",
-      "email": "goschwald@maxmind.com"
-    }
-  ],
-  "require": {
-    "php": ">=5.4",
-    "composer/ca-bundle": "^1.0.3",
-    "ext-curl": "*",
-    "ext-json": "*"
-  },
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "2.*",
-    "phpunit/phpunit": "4.*",
-    "squizlabs/php_codesniffer": "3.*"
-  },
-  "autoload": {
-    "psr-4": {
-      "MaxMind\\Exception\\": "src/Exception",
-      "MaxMind\\WebService\\": "src/WebService"
-    }
-  }
-}
diff --git a/app/vendor/monolog/monolog/composer.json b/app/vendor/monolog/monolog/composer.json
deleted file mode 100644
index 3b0c88055..000000000
--- a/app/vendor/monolog/monolog/composer.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "name": "monolog/monolog",
-    "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-    "keywords": ["log", "logging", "psr-3"],
-    "homepage": "http://github.com/Seldaek/monolog",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "http://seld.be"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "psr/log": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "graylog2/gelf-php": "~1.0",
-        "sentry/sentry": "^0.13",
-        "ruflin/elastica": ">=0.90 <3.0",
-        "doctrine/couchdb": "~1.0@dev",
-        "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-        "php-amqplib/php-amqplib": "~2.4",
-        "swiftmailer/swiftmailer": "^5.3|^6.0",
-        "php-console/php-console": "^3.1.3",
-        "phpunit/phpunit-mock-objects": "2.3.0",
-        "jakub-onderka/php-parallel-lint": "0.9"
-    },
-    "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis",
-    "suggest": {
-        "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-        "sentry/sentry": "Allow sending log messages to a Sentry server",
-        "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-        "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-        "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-        "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-        "ext-mongo": "Allow sending log messages to a MongoDB server",
-        "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-        "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-        "rollbar/rollbar": "Allow sending log messages to Rollbar",
-        "php-console/php-console": "Allow sending log messages to Google Chrome"
-    },
-    "autoload": {
-        "psr-4": {"Monolog\\": "src/Monolog"}
-    },
-    "autoload-dev": {
-        "psr-4": {"Monolog\\": "tests/Monolog"}
-    },
-    "provide": {
-        "psr/log-implementation": "1.0.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
-    },
-    "scripts": {
-        "test": [
-            "parallel-lint . --exclude vendor",
-            "phpunit"
-        ]
-    }
-}
diff --git a/app/vendor/monolog/monolog/phpunit.xml.dist b/app/vendor/monolog/monolog/phpunit.xml.dist
deleted file mode 100644
index 20d82b631..000000000
--- a/app/vendor/monolog/monolog/phpunit.xml.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="Monolog Test Suite">
-            <directory>tests/Monolog/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/Monolog/</directory>
-        </whitelist>
-    </filter>
-
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-    </php>
-</phpunit>
diff --git a/app/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php b/app/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
old mode 100644
new mode 100755
diff --git a/app/vendor/mustangostang/spyc/composer.json b/app/vendor/mustangostang/spyc/composer.json
deleted file mode 100644
index 5d2a50716..000000000
--- a/app/vendor/mustangostang/spyc/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "mustangostang/spyc",
-    "description": "A simple YAML loader/dumper class for PHP",
-    "type": "library",
-    "keywords": [
-        "spyc",
-        "yaml",
-        "yml"
-    ],
-    "homepage": "https://github.com/mustangostang/spyc/",
-    "authors" : [{
-        "name": "mustangostang",
-        "email": "vlad.andersen@gmail.com"
-    }],
-    "license": "MIT License",
-    "require": {
-        "php": ">=5.3.1"
-    },
-    "autoload": {
-        "files": [ "Spyc.php" ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.5.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/pear/archive_tar/composer.json b/app/vendor/pear/archive_tar/composer.json
deleted file mode 100644
index e464d9d7b..000000000
--- a/app/vendor/pear/archive_tar/composer.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "name": "pear/archive_tar",
-    "description": "Tar file management class with compression support (gzip, bzip2, lzma2)",
-    "type": "library",
-    "keywords": [
-        "archive",
-        "tar"
-    ],
-    "homepage": "https://github.com/pear/Archive_Tar",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Vincent Blavet",
-            "email": "vincent@phpconcept.net"
-        },
-        {
-            "name": "Greg Beaver",
-            "email": "greg@chiaraquartet.net"
-        },
-        {
-            "name": "Michiel Rook",
-            "email": "mrook@php.net"
-        }
-    ],
-    "require": {
-        "php": ">=5.2.0",
-        "pear/pear-core-minimal": "^1.10.0alpha2"
-    },
-    "suggest": {
-        "ext-zlib": "Gzip compression support.",
-        "ext-bz2": "Bz2 compression support.",
-        "ext-xz": "Lzma2 compression support."
-    },
-    "autoload": {
-        "psr-0": {
-            "Archive_Tar": ""
-        }
-    },
-    "include-path": [
-        "./"
-    ],
-    "support": {
-        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar",
-        "source": "https://github.com/pear/Archive_Tar"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "*"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/pear/archive_tar/scripts/phptar.in b/app/vendor/pear/archive_tar/scripts/phptar.in
old mode 100644
new mode 100755
diff --git a/app/vendor/pear/archive_tar/sync-php4 b/app/vendor/pear/archive_tar/sync-php4
old mode 100644
new mode 100755
diff --git a/app/vendor/pear/console_getopt/composer.json b/app/vendor/pear/console_getopt/composer.json
deleted file mode 100644
index 4dc7e7cca..000000000
--- a/app/vendor/pear/console_getopt/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "authors": [
-        {
-            "email": "andrei@php.net",
-            "name": "Andrei Zmievski",
-            "role": "Lead"
-        },
-        {
-            "email": "stig@php.net",
-            "name": "Stig Bakken",
-            "role": "Developer"
-        },
-        {
-            "email": "cellog@php.net",
-            "name": "Greg Beaver",
-            "role": "Helper"
-        }
-    ],
-    "autoload": {
-        "psr-0": {
-            "Console": "./"
-        }
-    },
-    "description": "More info available on: http://pear.php.net/package/Console_Getopt",
-    "include-path": [
-        "./"
-    ],
-    "license": "BSD-2-Clause",
-    "name": "pear/console_getopt",
-    "support": {
-        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt",
-        "source": "https://github.com/pear/Console_Getopt"
-    },
-    "type": "library"
-}
diff --git a/app/vendor/pear/pear-core-minimal/composer.json b/app/vendor/pear/pear-core-minimal/composer.json
deleted file mode 100644
index d805f56ae..000000000
--- a/app/vendor/pear/pear-core-minimal/composer.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "name": "pear/pear-core-minimal",
-    "description": "Minimal set of PEAR core files to be used as composer dependency",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "email": "cweiske@php.net",
-            "name": "Christian Weiske",
-            "role": "Lead"
-        }
-    ],
-    "autoload": {
-        "psr-0": {
-            "": "src/"
-        }
-    },
-    "include-path": [
-        "src/"
-    ],
-    "support": {
-        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
-        "source": "https://github.com/pear/pear-core-minimal"
-    },
-    "type": "library",
-    "require": {
-        "pear/console_getopt": "~1.4",
-        "pear/pear_exception": "~1.0"
-    },
-    "replace": {
-        "rsky/pear-core-min": "self.version"
-    }
-}
diff --git a/app/vendor/pear/pear_exception/composer.json b/app/vendor/pear/pear_exception/composer.json
deleted file mode 100644
index ce33ed1c8..000000000
--- a/app/vendor/pear/pear_exception/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "pear/pear_exception",
-    "description": "The PEAR Exception base class.",
-    "type": "class",
-    "keywords": [
-        "exception"
-    ],
-    "homepage": "https://github.com/pear/PEAR_Exception",
-    "license": "BSD-2-Clause",
-    "authors": [
-        {
-            "name": "Helgi Thormar",
-            "email": "dufuz@php.net"
-        },
-        {
-            "name": "Greg Beaver",
-            "email": "cellog@php.net"
-        }
-    ],
-    "require": {
-        "php": ">=4.4.0"
-    },
-    "autoload": {
-        "psr-0": {
-            "PEAR": ""
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    },
-    "include-path": [
-        "."
-    ],
-    "support": {
-        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception",
-        "source": "https://github.com/pear/PEAR_Exception"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "*"
-    }
-}
diff --git a/app/vendor/php-di/invoker/composer.json b/app/vendor/php-di/invoker/composer.json
deleted file mode 100644
index 3f0c04169..000000000
--- a/app/vendor/php-di/invoker/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "php-di/invoker",
-    "description": "Generic and extensible callable invoker",
-    "keywords": ["invoker", "dependency-injection", "dependency", "injection", "callable", "invoke"],
-    "homepage": "https://github.com/PHP-DI/Invoker",
-    "license": "MIT",
-    "type": "library",
-    "autoload": {
-        "psr-4": {
-            "Invoker\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Invoker\\Test\\": "tests/"
-        }
-    },
-    "require": {
-        "container-interop/container-interop": "~1.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "athletic/athletic": "~0.1.8"
-    }
-}
diff --git a/app/vendor/php-di/php-di/composer.json b/app/vendor/php-di/php-di/composer.json
deleted file mode 100644
index 0f22f9c4d..000000000
--- a/app/vendor/php-di/php-di/composer.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "name": "php-di/php-di",
-    "type": "library",
-    "description": "The dependency injection container for humans",
-    "keywords": ["di", "dependency injection", "container"],
-    "homepage": "http://php-di.org/",
-    "license": "MIT",
-    "autoload": {
-        "psr-4": {
-            "DI\\": "src/DI/"
-        },
-        "files": [
-            "src/DI/functions.php"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "DI\\Test\\IntegrationTest\\": "tests/IntegrationTest/",
-            "DI\\Test\\UnitTest\\": "tests/UnitTest/"
-        }
-    },
-    "scripts": {
-        "test": "phpunit"
-    },
-    "require": {
-        "php": ">=5.5.0",
-        "container-interop/container-interop": "~1.2",
-        "psr/container": "~1.0",
-        "php-di/invoker": "^1.3.2",
-        "php-di/phpdoc-reader": "^2.0.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "mnapoli/phpunit-easymock": "~0.2.0",
-        "doctrine/cache": "~1.4",
-        "doctrine/annotations": "~1.2",
-        "phpbench/phpbench": "@dev",
-        "ocramius/proxy-manager": "~1.0|~2.0"
-    },
-    "replace": {
-        "mnapoli/php-di": "*"
-    },
-    "provide": {
-        "container-interop/container-interop-implementation": "^1.0",
-        "psr/container-implementation": "^1.0"
-    },
-    "suggest": {
-        "doctrine/cache": "Install it if you want to use the cache (version ~1.4)",
-        "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
-        "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~1.0 or ~2.0)"
-    }
-}
diff --git a/app/vendor/php-di/php-di/phpunit.xml.dist b/app/vendor/php-di/php-di/phpunit.xml.dist
deleted file mode 100644
index 81c7f7386..000000000
--- a/app/vendor/php-di/php-di/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    phpunit -c phpunit.xml
--->
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         syntaxCheck="true"
-         forceCoversAnnotation="true"
-         bootstrap="./vendor/autoload.php">
-
-    <testsuites>
-        <testsuite name="unit">
-            <directory>./tests/UnitTest/</directory>
-        </testsuite>
-        <testsuite name="integration">
-            <directory>./tests/IntegrationTest/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/app/vendor/php-di/phpdoc-reader/composer.json b/app/vendor/php-di/phpdoc-reader/composer.json
deleted file mode 100644
index 67713071c..000000000
--- a/app/vendor/php-di/phpdoc-reader/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "php-di/phpdoc-reader",
-    "type": "library",
-    "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
-    "keywords": ["phpdoc", "reflection"],
-    "license": "MIT",
-    "autoload": {
-        "psr-4": {
-            "PhpDocReader\\": "src/PhpDocReader"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "UnitTest\\PhpDocReader\\": "tests/"
-        }
-    },
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.6"
-    }
-}
diff --git a/app/vendor/piwik/cache/composer.json b/app/vendor/piwik/cache/composer.json
deleted file mode 100644
index a3b1d6c38..000000000
--- a/app/vendor/piwik/cache/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "piwik/cache",
-    "type": "library",
-    "license": "LGPL-3.0",
-    "description": "PHP caching library based on Doctrine cache",
-    "keywords": ["cache","array","file","redis"],
-    "authors": [
-        {
-            "name": "The Piwik Team",
-            "email": "hello@piwik.org",
-            "homepage": "http://piwik.org/the-piwik-team/"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Piwik\\Cache\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Piwik\\Cache\\": "tests/"
-        }
-    },
-    "require": {
-        "php": ">=5.5.9",
-        "doctrine/cache": "~1.4"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "config":{
-        "platform": {
-            "php": "5.5.9"
-        }
-    }
-}
diff --git a/app/vendor/piwik/cache/composer.lock b/app/vendor/piwik/cache/composer.lock
deleted file mode 100644
index e558ace69..000000000
--- a/app/vendor/piwik/cache/composer.lock
+++ /dev/null
@@ -1,1199 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "dd87ddbff7af729d560ebcbe752d5c04",
-    "content-hash": "ac8cdd23aeb659cc5679ee3f40dac33d",
-    "packages": [
-        {
-            "name": "doctrine/cache",
-            "version": "v1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
-                "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~5.5|~7.0"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8|~5.0",
-                "predis/predis": "~1.0",
-                "satooshi/php-coveralls": "~0.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "cache",
-                "caching"
-            ],
-            "time": "2015-12-31 16:37:02"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2015-12-27 11:43:31"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-06-10 09:48:41"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2016-06-10 07:14:17"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2016-06-07 08:13:47"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06 15:47:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2015-06-21 13:08:43"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2016-05-12 18:03:57"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-09-15 10:49:45"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.27",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
-                "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2016-07-21 06:48:14"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02 06:51:40"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-12-08 07:14:41"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-08-18 05:49:44"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17 09:04:28"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12 03:26:01"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/f291ed25eb1435bddbe8a96caaef16469c2a092d",
-                "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-09-02 02:12:52"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
-                "reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3|^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2016-08-09 15:02:57"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.5.9"
-    },
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "5.5.9"
-    }
-}
diff --git a/app/vendor/piwik/cache/phpunit.xml b/app/vendor/piwik/cache/phpunit.xml
deleted file mode 100644
index cda26b984..000000000
--- a/app/vendor/piwik/cache/phpunit.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php">
-
-    <testsuites>
-        <testsuite name="Test suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
\ No newline at end of file
diff --git a/app/vendor/piwik/decompress/composer.json b/app/vendor/piwik/decompress/composer.json
deleted file mode 100644
index 10cfa7bb2..000000000
--- a/app/vendor/piwik/decompress/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "piwik/decompress",
-    "type": "library",
-    "license": "LGPL-3.0",
-    "autoload": {
-        "psr-4": {
-            "Piwik\\Decompress\\": "src/"
-        },
-        "classmap": ["libs/PclZip"]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Piwik\\Decompress\\": "tests/"
-        }
-    },
-    "require": {
-        "php": ">=5.3.2",
-        "pear/archive_tar": "~1.3,>=1.3.15"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.4"
-    }
-}
diff --git a/app/vendor/piwik/decompress/composer.lock b/app/vendor/piwik/decompress/composer.lock
deleted file mode 100644
index c708a01ff..000000000
--- a/app/vendor/piwik/decompress/composer.lock
+++ /dev/null
@@ -1,1077 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "5b6d0d5a291b49ad770e2c21eec0828b",
-    "content-hash": "794ee0553135983edb75892c591fd8f8",
-    "packages": [
-        {
-            "name": "pear/archive_tar",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Archive_Tar.git",
-                "reference": "bdd47347df76dbaa89227c5e1afd6f6809985b4c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bdd47347df76dbaa89227c5e1afd6f6809985b4c",
-                "reference": "bdd47347df76dbaa89227c5e1afd6f6809985b4c",
-                "shasum": ""
-            },
-            "require": {
-                "pear/pear-core-minimal": "^1.10.0alpha2",
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "*"
-            },
-            "suggest": {
-                "ext-bz2": "bz2 compression support.",
-                "ext-xz": "lzma2 compression support.",
-                "ext-zlib": "Gzip compression support."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Archive_Tar": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "./"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Vincent Blavet",
-                    "email": "vincent@phpconcept.net"
-                },
-                {
-                    "name": "Greg Beaver",
-                    "email": "greg@chiaraquartet.net"
-                },
-                {
-                    "name": "Michiel Rook",
-                    "email": "mrook@php.net"
-                }
-            ],
-            "description": "Tar file management class",
-            "homepage": "https://github.com/pear/Archive_Tar",
-            "keywords": [
-                "archive",
-                "tar"
-            ],
-            "time": "2016-02-25 10:30:39"
-        },
-        {
-            "name": "pear/console_getopt",
-            "version": "v1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Console_Getopt.git",
-                "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Console": "./"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "./"
-            ],
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Beaver",
-                    "email": "cellog@php.net",
-                    "role": "Helper"
-                },
-                {
-                    "name": "Andrei Zmievski",
-                    "email": "andrei@php.net",
-                    "role": "Lead"
-                },
-                {
-                    "name": "Stig Bakken",
-                    "email": "stig@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "More info available on: http://pear.php.net/package/Console_Getopt",
-            "time": "2015-07-20 20:28:12"
-        },
-        {
-            "name": "pear/pear-core-minimal",
-            "version": "v1.10.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/cae0f1ce0cb5bddb611b0a652d322905a65a5896",
-                "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896",
-                "shasum": ""
-            },
-            "require": {
-                "pear/console_getopt": "~1.3",
-                "pear/pear_exception": "~1.0"
-            },
-            "replace": {
-                "rsky/pear-core-min": "self.version"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "src/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@php.net",
-                    "role": "Lead"
-                }
-            ],
-            "description": "Minimal set of PEAR core files to be used as composer dependency",
-            "time": "2015-10-17 11:41:19"
-        },
-        {
-            "name": "pear/pear_exception",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/PEAR_Exception.git",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=4.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "*"
-            },
-            "type": "class",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PEAR": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "."
-            ],
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Helgi Thormar",
-                    "email": "dufuz@php.net"
-                },
-                {
-                    "name": "Greg Beaver",
-                    "email": "cellog@php.net"
-                }
-            ],
-            "description": "The PEAR Exception base class.",
-            "homepage": "https://github.com/pear/PEAR_Exception",
-            "keywords": [
-                "exception"
-            ],
-            "time": "2015-02-10 20:07:52"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06 15:47:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2013-10-10 15:34:57"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2016-05-12 18:03:57"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-09-15 10:49:45"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
-                "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpunit/php-code-coverage": "~2.0",
-                "phpunit/php-file-iterator": "~1.3.2",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.0",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.1",
-                "sebastian/exporter": "~1.0",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2014-12-05 06:49:03"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02 06:51:40"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-12-08 07:14:41"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-05-17 03:18:57"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17 09:04:28"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12 03:26:01"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
-                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-06-29 05:29:29"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.3.2"
-    },
-    "platform-dev": []
-}
diff --git a/app/vendor/piwik/decompress/libs/PclZip/gnu-lgpl.txt b/app/vendor/piwik/decompress/libs/PclZip/gnu-lgpl.txt
new file mode 100644
index 000000000..b1e3f5a26
--- /dev/null
+++ b/app/vendor/piwik/decompress/libs/PclZip/gnu-lgpl.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/app/vendor/piwik/decompress/libs/PclZip/pclzip.lib.php b/app/vendor/piwik/decompress/libs/PclZip/pclzip.lib.php
new file mode 100644
index 000000000..0e4e2ffdd
--- /dev/null
+++ b/app/vendor/piwik/decompress/libs/PclZip/pclzip.lib.php
@@ -0,0 +1,5414 @@
+<?php
+// --------------------------------------------------------------------------------
+// PhpConcept Library - Zip Module 2.8.2
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - Vincent Blavet - August 2009
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+//
+// Presentation :
+//   PclZip is a PHP library that manage ZIP archives.
+//   So far tests show that archives generated by PclZip are readable by
+//   WinZip application and other tools.
+//
+// Description :
+//   See readme.txt and http://www.phpconcept.net
+//
+// Warning :
+//   This library and the associated files are non commercial, non professional
+//   work.
+//   It should not have unexpected results. However if any damage is caused by
+//   this software the author can not be responsible.
+//   The use of this software is at the risk of the user.
+//
+// --------------------------------------------------------------------------------
+// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+  define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
+
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define( 'PCLZIP_SEPARATOR', ' ' );
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+  define('PCLZIP_SEPARATOR', ',');
+}
+
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//     you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+  define('PCLZIP_ERROR_EXTERNAL', 0);
+}
+
+// ----- Optional static temporary directory
+//       By default temporary files are generated in the script current
+//       path.
+//       If defined :
+//       - MUST BE terminated by a '/'.
+//       - MUST be a valid, already created directory
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+  define('PCLZIP_TEMPORARY_DIR', '');
+}
+
+// ----- Optional threshold ratio for use of temporary files
+//       Pclzip sense the size of the file to add/extract and decide to
+//       use or not temporary file. The algorythm is looking for
+//       memory_limit of PHP and apply a ratio.
+//       threshold = memory_limit * ratio.
+//       Recommended values are under 0.5. Default 0.47.
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+  define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
+// --------------------------------------------------------------------------------
+
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
+
+// ----- Error codes
+//   -1 : Unable to open file in binary write mode
+//   -2 : Unable to open file in binary read mode
+//   -3 : Invalid parameters
+//   -4 : File does not exist
+//   -5 : Filename is too long (max. 255)
+//   -6 : Not a valid zip file
+//   -7 : Invalid extracted file size
+//   -8 : Unable to create directory
+//   -9 : Invalid archive extension
+//  -10 : Invalid archive format
+//  -11 : Unable to delete file (unlink)
+//  -12 : Unable to rename file (rename)
+//  -13 : Invalid header checksum
+//  -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
+
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define( 'PCLZIP_OPT_CRYPT', 77018 );
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
+
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
+
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define( 'PCLZIP_CB_PRE_LIST', 78005 );
+define( 'PCLZIP_CB_POST_LIST', 78006 );
+define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+define( 'PCLZIP_CB_POST_DELETE', 78008 );
+*/
+
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//   PclZip is the class that represent a Zip archive.
+//   The public methods allow the manipulation of the archive.
+// Attributes :
+//   Attributes must not be accessed directly.
+// Methods :
+//   PclZip() : Object creator
+//   create() : Creates the Zip archive
+//   listContent() : List the content of the Zip archive
+//   extract() : Extract the content of the archive
+//   properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
+  // ----- Filename of the zip file
+  public $zipname = '';
+
+  // ----- File descriptor of the zip file
+  public $zip_fd = 0;
+
+  // ----- Internal error handling
+  public $error_code = 1;
+  public $error_string = '';
+
+  // ----- Current status of the magic_quotes_runtime
+  // This value store the php configuration for magic_quotes
+  // The class can then disable the magic_quotes and reset it after
+  public $magic_quotes_status;
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZip()
+  // Description :
+  //   Creates a PclZip object and set the name of the associated Zip archive
+  //   filename.
+  //   Note that no real action is taken, if the archive does not exist it is not
+  //   created. Use create() for that.
+  // --------------------------------------------------------------------------------
+  public function __construct($p_zipname)
+  {
+
+    // ----- Tests the zlib
+    if (!function_exists('gzopen')) {
+      die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
+    }
+
+    // ----- Set the attributes
+    $this->zipname             = $p_zipname;
+    $this->zip_fd              = 0;
+    $this->magic_quotes_status = -1;
+
+    // ----- Return
+    return;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   create($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two different synopsis. The first one is historical.
+  //   This method creates a Zip Archive. The Zip file is created in the
+  //   filesystem. The files and directories indicated in $p_filelist
+  //   are added in the archive. See the parameters description for the
+  //   supported format of $p_filelist.
+  //   When a directory is in the list, the directory and its content is added
+  //   in the archive.
+  //   In this synopsis, the function takes an optional variable list of
+  //   options. See bellow the supported options.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  public function create($p_filelist)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options                            = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove from the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+            PCLZIP_OPT_REMOVE_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+            PCLZIP_OPT_ADD_PATH => 'optional',
+            PCLZIP_CB_PRE_ADD => 'optional',
+            PCLZIP_CB_POST_ADD => 'optional',
+            PCLZIP_OPT_NO_COMPRESSION => 'optional',
+            PCLZIP_OPT_COMMENT => 'optional',
+            PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+            PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+            PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+          //, PCLZIP_OPT_CRYPT => 'optional'
+        ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Look for 2 args
+        // Here we need to support the first historic synopsis of the
+        // method.
+      } else {
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        } elseif ($v_size > 2) {
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          return 0;
+        }
+      }
+    }
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Init
+    $v_string_list    = array();
+    $v_att_list       = array();
+    $v_filedescr_list = array();
+    $p_result_list    = array();
+
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+
+        // ----- The list is a list of string names
+      } else {
+        $v_string_list = $p_filelist;
+      }
+
+      // ----- Look if the $p_filelist is a string
+    } elseif (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+      // ----- Invalid variable type for $p_filelist
+    } else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+
+      return 0;
+    }
+
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        if ($v_string != '') {
+          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+        } else {
+        }
+      }
+    }
+
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes = array(
+        PCLZIP_ATT_FILE_NAME => 'mandatory',
+        PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+        PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+        PCLZIP_ATT_FILE_MTIME => 'optional',
+        PCLZIP_ATT_FILE_CONTENT => 'optional',
+        PCLZIP_ATT_FILE_COMMENT => 'optional'
+    );
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+      if ($v_result != 1) {
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Return
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   add($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This methods add the list of files in an existing archive.
+  //   If a file with the same name already exists, it is added at the end of the
+  //   archive, the first one is still present.
+  //   If the archive does not exist, it is created.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_OPT_ADD_COMMENT :
+  //   PCLZIP_OPT_PREPEND_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  public function add($p_filelist)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options                            = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+            PCLZIP_OPT_REMOVE_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+            PCLZIP_OPT_ADD_PATH => 'optional',
+            PCLZIP_CB_PRE_ADD => 'optional',
+            PCLZIP_CB_POST_ADD => 'optional',
+            PCLZIP_OPT_NO_COMPRESSION => 'optional',
+            PCLZIP_OPT_COMMENT => 'optional',
+            PCLZIP_OPT_ADD_COMMENT => 'optional',
+            PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+            PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+            PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+            PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+          //, PCLZIP_OPT_CRYPT => 'optional'
+        ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Look for 2 args
+        // Here we need to support the first historic synopsis of the
+        // method.
+      } else {
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        } elseif ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Init
+    $v_string_list    = array();
+    $v_att_list       = array();
+    $v_filedescr_list = array();
+    $p_result_list    = array();
+
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+
+        // ----- The list is a list of string names
+      } else {
+        $v_string_list = $p_filelist;
+      }
+
+      // ----- Look if the $p_filelist is a string
+    } elseif (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+      // ----- Invalid variable type for $p_filelist
+    } else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
+
+      return 0;
+    }
+
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+      }
+    }
+
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes = array(
+        PCLZIP_ATT_FILE_NAME => 'mandatory',
+        PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+        PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+        PCLZIP_ATT_FILE_MTIME => 'optional',
+        PCLZIP_ATT_FILE_CONTENT => 'optional',
+        PCLZIP_ATT_FILE_COMMENT => 'optional'
+    );
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+      if ($v_result != 1) {
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Return
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : listContent()
+  // Description :
+  //   This public method, gives the list of the files and directories, with their
+  //   properties.
+  //   The properties of each entries in the list are (used also in other functions) :
+  //     filename : Name of the file. For a create or add action it is the filename
+  //                given by the user. For an extract function it is the filename
+  //                of the extracted file.
+  //     stored_filename : Name of the file / directory stored in the archive.
+  //     size : Size of the stored file.
+  //     compressed_size : Size of the file's data compressed in the archive
+  //                       (without the headers overhead)
+  //     mtime : Last known modification date of the file (UNIX timestamp)
+  //     comment : Comment associated with the file
+  //     folder : true | false
+  //     index : index of the file in the archive
+  //     status : status of the action (depending of the action) :
+  //              Values are :
+  //                ok : OK !
+  //                filtered : the file / dir is not extracted (filtered by user)
+  //                already_a_directory : the file can not be extracted because a
+  //                                      directory with the same name already exists
+  //                write_protected : the file can not be extracted because a file
+  //                                  with the same name already exists and is
+  //                                  write protected
+  //                newer_exist : the file was not extracted because a newer file exists
+  //                path_creation_fail : the file is not extracted because the folder
+  //                                     does not exist and can not be created
+  //                write_error : the file was not extracted because there was a
+  //                              error while writing the file
+  //                read_error : the file was not extracted because there was a error
+  //                             while reading the file
+  //                invalid_header : the file was not extracted because of an archive
+  //                                 format error (bad file header)
+  //   Note that each time a method can continue operating when there
+  //   is an action error on a file, the error is only logged in the file status.
+  // Return Values :
+  //   0 on an unrecoverable failure,
+  //   The list of the files in the archive.
+  // --------------------------------------------------------------------------------
+  public function listContent()
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return (0);
+    }
+
+    // ----- Call the extracting fct
+    $p_list = array();
+    if (($v_result = $this->privList($p_list)) != 1) {
+      unset($p_list);
+
+      return (0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extract($p_path="./", $p_remove_path="")
+  //   extract([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method extract all the files / directories from the archive to the
+  //   folder indicated in $p_path.
+  //   If you want to ignore the 'root' part of path of the memorized files
+  //   you can indicate this in the optional $p_remove_path parameter.
+  //   By default, if a newer file with the same name already exists, the
+  //   file is not extracted.
+  //
+  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+  //   at the end of the path value of PCLZIP_OPT_PATH.
+  // Parameters :
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 or a negative value on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  public function extract()
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return (0);
+    }
+
+    // ----- Set default values
+    $v_options         = array();
+    //    $v_path = "./";
+    $v_path            = '';
+    $v_remove_path     = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+            PCLZIP_OPT_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+            PCLZIP_OPT_ADD_PATH => 'optional',
+            PCLZIP_CB_PRE_EXTRACT => 'optional',
+            PCLZIP_CB_POST_EXTRACT => 'optional',
+            PCLZIP_OPT_SET_CHMOD => 'optional',
+            PCLZIP_OPT_BY_NAME => 'optional',
+            PCLZIP_OPT_BY_EREG => 'optional',
+            PCLZIP_OPT_BY_PREG => 'optional',
+            PCLZIP_OPT_BY_INDEX => 'optional',
+            PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+            PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+            PCLZIP_OPT_REPLACE_NEWER => 'optional',
+            PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+            PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+            PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+            PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+            PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+        ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+
+        // ----- Look for 2 args
+        // Here we need to support the first historic synopsis of the
+        // method.
+      } else {
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        } elseif ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Trace
+
+    // ----- Call the extracting fct
+    $p_list   = array();
+    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+    if ($v_result < 1) {
+      unset($p_list);
+
+      return (0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method is doing a partial extract of the archive.
+  //   The extracted files or folders are identified by their index in the
+  //   archive (from 0 to n).
+  //   Note that if the index identify a folder, only the folder entry is
+  //   extracted, not all the files included in the archive.
+  // Parameters :
+  //   $p_index : A single index (integer) or a string of indexes of files to
+  //              extract. The form of the string is "0,4-6,8-12" with only numbers
+  //              and '-' for range or ',' to separate ranges. No spaces or ';'
+  //              are allowed.
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+  //     not as files.
+  //     The resulting content is in a new field 'content' in the file
+  //     structure.
+  //     This option must be used alone (any other options are ignored).
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  //function extractByIndex($p_index, options...)
+  public function extractByIndex($p_index)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return (0);
+    }
+
+    // ----- Set default values
+    $v_options         = array();
+    //    $v_path = "./";
+    $v_path            = '';
+    $v_remove_path     = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+            PCLZIP_OPT_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_PATH => 'optional',
+            PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+            PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+            PCLZIP_OPT_ADD_PATH => 'optional',
+            PCLZIP_CB_PRE_EXTRACT => 'optional',
+            PCLZIP_CB_POST_EXTRACT => 'optional',
+            PCLZIP_OPT_SET_CHMOD => 'optional',
+            PCLZIP_OPT_REPLACE_NEWER => 'optional',
+            PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+            PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+            PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+            PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+            PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+        ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+        } else {
+        }
+
+        // ----- Look for 2 args
+        // Here we need to support the first historic synopsis of the
+        // method.
+      } else {
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        } elseif ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Trace
+
+    // ----- Trick
+    // Here I want to reuse extractByRule(), so I need to parse the $p_index
+    // with privParseOptions()
+    $v_arg_trick     = array(
+        PCLZIP_OPT_BY_INDEX,
+        $p_index
+    );
+    $v_options_trick = array();
+    $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
+        PCLZIP_OPT_BY_INDEX => 'optional'
+    ));
+    if ($v_result != 1) {
+      return 0;
+    }
+    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Call the extracting fct
+    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+      return (0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   delete([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method removes files from the archive.
+  //   If no parameters are given, then all the archive is emptied.
+  // Parameters :
+  //   None or optional arguments.
+  // Options :
+  //   PCLZIP_OPT_BY_INDEX :
+  //   PCLZIP_OPT_BY_NAME :
+  //   PCLZIP_OPT_BY_EREG :
+  //   PCLZIP_OPT_BY_PREG :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the files which are still present in the archive.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  public function delete()
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return (0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Parse the options
+      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+          PCLZIP_OPT_BY_NAME => 'optional',
+          PCLZIP_OPT_BY_EREG => 'optional',
+          PCLZIP_OPT_BY_PREG => 'optional',
+          PCLZIP_OPT_BY_INDEX => 'optional'
+      ));
+      if ($v_result != 1) {
+        return 0;
+      }
+    }
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Call the delete fct
+    $v_list = array();
+    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+      $this->privSwapBackMagicQuotes();
+      unset($v_list);
+
+      return (0);
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : deleteByIndex()
+  // Description :
+  //   ***** Deprecated *****
+  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+  // --------------------------------------------------------------------------------
+  public function deleteByIndex($p_index)
+  {
+
+    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : properties()
+  // Description :
+  //   This method gives the properties of the archive.
+  //   The properties are :
+  //     nb : Number of files in the archive
+  //     comment : Comment associated with the archive file
+  //     status : not_exist, ok
+  // Parameters :
+  //   None
+  // Return Values :
+  //   0 on failure,
+  //   An array with the archive properties.
+  // --------------------------------------------------------------------------------
+  public function properties()
+  {
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      $this->privSwapBackMagicQuotes();
+
+      return (0);
+    }
+
+    // ----- Default properties
+    $v_prop            = array();
+    $v_prop['comment'] = '';
+    $v_prop['nb']      = 0;
+    $v_prop['status']  = 'not_exist';
+
+    // ----- Look if file exists
+    if (@is_file($this->zipname)) {
+      // ----- Open the zip file
+      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+        // ----- Return
+        return 0;
+      }
+
+      // ----- Read the central directory informations
+      $v_central_dir = array();
+      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+        $this->privSwapBackMagicQuotes();
+
+        return 0;
+      }
+
+      // ----- Close the zip file
+      $this->privCloseFd();
+
+      // ----- Set the user attributes
+      $v_prop['comment'] = $v_central_dir['comment'];
+      $v_prop['nb']      = $v_central_dir['entries'];
+      $v_prop['status']  = 'ok';
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_prop;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : duplicate()
+  // Description :
+  //   This method creates an archive by copying the content of an other one. If
+  //   the archive already exist, it is replaced by the new one without any warning.
+  // Parameters :
+  //   $p_archive : The filename of a valid archive, or
+  //                a valid PclZip object.
+  // Return Values :
+  //   1 on success.
+  //   0 or a negative value on error (error code).
+  // --------------------------------------------------------------------------------
+  public function duplicate($p_archive)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the $p_archive is a PclZip object
+    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+
+      // ----- Duplicate the archive
+      $v_result = $this->privDuplicate($p_archive->zipname);
+
+      // ----- Look if the $p_archive is a string (so a filename)
+    } elseif (is_string($p_archive)) {
+
+      // ----- Check that $p_archive is a valid zip file
+      // TBC : Should also check the archive format
+      if (!is_file($p_archive)) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+        $v_result = PCLZIP_ERR_MISSING_FILE;
+      } else {
+        // ----- Duplicate the archive
+        $v_result = $this->privDuplicate($p_archive);
+      }
+
+      // ----- Invalid variable
+    } else {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : merge()
+  // Description :
+  //   This method merge the $p_archive_to_add archive at the end of the current
+  //   one ($this).
+  //   If the archive ($this) does not exist, the merge becomes a duplicate.
+  //   If the $p_archive_to_add archive does not exist, the merge is a success.
+  // Parameters :
+  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+  //                       or a PclZip object archive.
+  // Return Values :
+  //   1 on success,
+  //   0 or negative values on error (see below).
+  // --------------------------------------------------------------------------------
+  public function merge($p_archive_to_add)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return (0);
+    }
+
+    // ----- Look if the $p_archive_to_add is a PclZip object
+    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($p_archive_to_add);
+
+      // ----- Look if the $p_archive_to_add is a string (so a filename)
+    } elseif (is_string($p_archive_to_add)) {
+
+      // ----- Create a temporary archive
+      $v_object_archive = new PclZip($p_archive_to_add);
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($v_object_archive);
+
+      // ----- Invalid variable
+    } else {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorCode()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function errorCode()
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return (PclErrorCode());
+    } else {
+      return ($this->error_code);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorName()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function errorName($p_with_code = false)
+  {
+    $v_name = array(
+        PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+        PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+        PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+        PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+        PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+        PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+        PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+        PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+        PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+        PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+        PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+        PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+        PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+        PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+        PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+        PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+        PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+        PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+        PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+        PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+        PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+    );
+
+    if (isset($v_name[$this->error_code])) {
+      $v_value = $v_name[$this->error_code];
+    } else {
+      $v_value = 'NoName';
+    }
+
+    if ($p_with_code) {
+      return ($v_value . ' (' . $this->error_code . ')');
+    } else {
+      return ($v_value);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorInfo()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function errorInfo($p_full = false)
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return (PclErrorString());
+    } else {
+      if ($p_full) {
+        return ($this->errorName(true) . " : " . $this->error_string);
+      } else {
+        return ($this->error_string . " [code " . $this->error_code . "]");
+      }
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+  // *****                                                        *****
+  // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFormat()
+  // Description :
+  //   This method check that the archive exists and is a valid zip archive.
+  //   Several level of check exists. (futur)
+  // Parameters :
+  //   $p_level : Level of check. Default 0.
+  //              0 : Check the first bytes (magic codes) (default value))
+  //              1 : 0 + Check the central directory (futur)
+  //              2 : 1 + Check each file header (futur)
+  // Return Values :
+  //   true on success,
+  //   false on error, the error code is set.
+  // --------------------------------------------------------------------------------
+  public function privCheckFormat($p_level = 0)
+  {
+    $v_result = true;
+
+    // ----- Reset the file system cache
+    clearstatcache();
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the file exits
+    if (!is_file($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
+
+      return (false);
+    }
+
+    // ----- Check that the file is readeable
+    if (!is_readable($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
+
+      return (false);
+    }
+
+    // ----- Check the magic code
+    // TBC
+
+    // ----- Check the central header
+    // TBC
+
+    // ----- Check each file header
+    // TBC
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privParseOptions()
+  // Description :
+  //   This internal methods reads the variable list of arguments ($p_options_list,
+  //   $p_size) and generate an array with the options and values ($v_result_list).
+  //   $v_requested_options contains the options that can be present and those that
+  //   must be present.
+  //   $v_requested_options is an array, with the option value as key, and 'optional',
+  //   or 'mandatory' as value.
+  // Parameters :
+  //   See above.
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+  {
+    $v_result = 1;
+
+    // ----- Read the options
+    $i = 0;
+    while ($i < $p_size) {
+
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$p_options_list[$i]])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for next option
+      switch ($p_options_list[$i]) {
+        // ----- Look for options that request a path value
+        case PCLZIP_OPT_PATH:
+        case PCLZIP_OPT_REMOVE_PATH:
+        case PCLZIP_OPT_ADD_PATH:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+          $i++;
+          break;
+
+        case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Check the value
+          $v_value = $p_options_list[$i + 1];
+          if ((!is_integer($v_value)) || ($v_value < 0)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value (and convert it in bytes)
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
+          $i++;
+          break;
+
+        case PCLZIP_OPT_TEMP_FILE_ON:
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+            return PclZip::errorCode();
+          }
+
+          $v_result_list[$p_options_list[$i]] = true;
+          break;
+
+        case PCLZIP_OPT_TEMP_FILE_OFF:
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+
+            return PclZip::errorCode();
+          }
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+
+            return PclZip::errorCode();
+          }
+
+          $v_result_list[$p_options_list[$i]] = true;
+          break;
+
+        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+            $i++;
+          } else {
+          }
+          break;
+
+        // ----- Look for options that request an array of string for value
+        case PCLZIP_OPT_BY_NAME:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i + 1])) {
+            $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+          } elseif (is_array($p_options_list[$i + 1])) {
+            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+          } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+          break;
+
+        // ----- Look for options that request an EREG or PREG expression
+        case PCLZIP_OPT_BY_EREG:
+          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+        // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+        // to PCLZIP_OPT_BY_PREG
+        case PCLZIP_OPT_BY_PREG:
+          //case PCLZIP_OPT_CRYPT :
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i + 1])) {
+            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+          } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+          break;
+
+        // ----- Look for options that takes a string
+        case PCLZIP_OPT_COMMENT:
+        case PCLZIP_OPT_ADD_COMMENT:
+        case PCLZIP_OPT_PREPEND_COMMENT:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i + 1])) {
+            $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+          } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+          break;
+
+        // ----- Look for options that request an array of index
+        case PCLZIP_OPT_BY_INDEX:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_work_list = array();
+          if (is_string($p_options_list[$i + 1])) {
+
+            // ----- Remove spaces
+            $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+
+            // ----- Parse items
+            $v_work_list = explode(",", $p_options_list[$i + 1]);
+          } elseif (is_integer($p_options_list[$i + 1])) {
+            $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
+          } elseif (is_array($p_options_list[$i + 1])) {
+            $v_work_list = $p_options_list[$i + 1];
+          } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Reduce the index list
+          // each index item in the list must be a couple with a start and
+          // an end value : [0,3], [5-5], [8-10], ...
+          // ----- Check the format of each item
+          $v_sort_flag  = false;
+          $v_sort_value = 0;
+          for ($j = 0; $j < sizeof($v_work_list); $j++) {
+            // ----- Explode the item
+            $v_item_list      = explode("-", $v_work_list[$j]);
+            $v_size_item_list = sizeof($v_item_list);
+
+            // ----- TBC : Here we might check that each item is a
+            // real integer ...
+
+            // ----- Look for single value
+            if ($v_size_item_list == 1) {
+              // ----- Set the option value
+              $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+              $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
+            } elseif ($v_size_item_list == 2) {
+              // ----- Set the option value
+              $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+              $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
+            } else {
+              // ----- Error log
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+              // ----- Return
+              return PclZip::errorCode();
+            }
+
+            // ----- Look for list sort
+            if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+              $v_sort_flag = true;
+
+              // ----- TBC : An automatic sort should be writen ...
+              // ----- Error log
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+              // ----- Return
+              return PclZip::errorCode();
+            }
+            $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+          }
+
+          // ----- Sort the items
+          if ($v_sort_flag) {
+            // TBC : To Be Completed
+          }
+
+          // ----- Next option
+          $i++;
+          break;
+
+        // ----- Look for options that request no value
+        case PCLZIP_OPT_REMOVE_ALL_PATH:
+        case PCLZIP_OPT_EXTRACT_AS_STRING:
+        case PCLZIP_OPT_NO_COMPRESSION:
+        case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+        case PCLZIP_OPT_REPLACE_NEWER:
+        case PCLZIP_OPT_STOP_ON_ERROR:
+          $v_result_list[$p_options_list[$i]] = true;
+          break;
+
+        // ----- Look for options that request an octal value
+        case PCLZIP_OPT_SET_CHMOD:
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+          $i++;
+          break;
+
+        // ----- Look for options that request a call-back
+        case PCLZIP_CB_PRE_EXTRACT:
+        case PCLZIP_CB_POST_EXTRACT:
+        case PCLZIP_CB_PRE_ADD:
+        case PCLZIP_CB_POST_ADD:
+          /* for futur use
+                    case PCLZIP_CB_PRE_DELETE :
+                    case PCLZIP_CB_POST_DELETE :
+                    case PCLZIP_CB_PRE_LIST :
+                    case PCLZIP_CB_POST_LIST :
+                    */
+          // ----- Check the number of parameters
+          if (($i + 1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_function_name = $p_options_list[$i + 1];
+
+          // ----- Check that the value is a valid existing function
+          if ((is_string($v_function_name) && !function_exists($v_function_name)) && !is_callable($v_function_name)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Set the attribute
+          $v_result_list[$p_options_list[$i]] = $v_function_name;
+          $i++;
+          break;
+
+        default:
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
+
+          // ----- Return
+          return PclZip::errorCode();
+      }
+
+      // ----- Next options
+      $i++;
+    }
+
+    // ----- Look for mandatory options
+    if ($v_requested_options !== false) {
+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+        // ----- Look for mandatory option
+        if ($v_requested_options[$key] == 'mandatory') {
+          // ----- Look if present
+          if (!isset($v_result_list[$key])) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+        }
+      }
+    }
+
+    // ----- Look for default values
+    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privOptionDefaultThreshold()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privOptionDefaultThreshold(&$p_options)
+  {
+    $v_result = 1;
+
+    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+      return $v_result;
+    }
+
+    // ----- Get 'memory_limit' configuration value
+    $v_memory_limit = trim(ini_get('memory_limit'));
+    $last           = strtolower(substr($v_memory_limit, -1));
+    $v_memory_limit = intval($v_memory_limit);
+
+    if ($last == 'g') {
+      //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+      $v_memory_limit = $v_memory_limit * 1073741824;
+    }
+    if ($last == 'm') {
+      //$v_memory_limit = $v_memory_limit*1024*1024;
+      $v_memory_limit = $v_memory_limit * 1048576;
+    }
+    if ($last == 'k') {
+      $v_memory_limit = $v_memory_limit * 1024;
+    }
+
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
+
+    // ----- Sanity check : No threshold if value lower than 1M
+    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrParseAtt()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+  {
+    $v_result = 1;
+
+    // ----- For each file in the list check the attributes
+    foreach ($p_file_list as $v_key => $v_value) {
+
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$v_key])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for attribute
+      switch ($v_key) {
+        case PCLZIP_ATT_FILE_NAME:
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+          if ($p_filedescr['filename'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          break;
+
+        case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+          if ($p_filedescr['new_short_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+          break;
+
+        case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+          if ($p_filedescr['new_full_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+          break;
+
+        // ----- Look for options that takes a string
+        case PCLZIP_ATT_FILE_COMMENT:
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['comment'] = $v_value;
+          break;
+
+        case PCLZIP_ATT_FILE_MTIME:
+          if (!is_integer($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['mtime'] = $v_value;
+          break;
+
+        case PCLZIP_ATT_FILE_CONTENT:
+          $p_filedescr['content'] = $v_value;
+          break;
+
+        default:
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
+
+          // ----- Return
+          return PclZip::errorCode();
+      }
+
+      // ----- Look for mandatory options
+      if ($v_requested_options !== false) {
+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+          // ----- Look for mandatory option
+          if ($v_requested_options[$key] == 'mandatory') {
+            // ----- Look if present
+            if (!isset($p_file_list[$key])) {
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+              return PclZip::errorCode();
+            }
+          }
+        }
+      }
+
+      // end foreach
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrExpand()
+  // Description :
+  //   This method look for each item of the list to see if its a file, a folder
+  //   or a string to be added as file. For any other type of files (link, other)
+  //   just ignore the item.
+  //   Then prepare the information that will be stored for that file.
+  //   When its a folder, expand the folder with all the files that are in that
+  //   folder (recursively).
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Create a result list
+    $v_result_list = array();
+
+    // ----- Look each entry
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
+
+      // ----- Get filedescr
+      $v_descr = $p_filedescr_list[$i];
+
+      // ----- Reduce the filename
+      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+      // ----- Look for real file or folder
+      if (file_exists($v_descr['filename'])) {
+        if (@is_file($v_descr['filename'])) {
+          $v_descr['type'] = 'file';
+        } elseif (@is_dir($v_descr['filename'])) {
+          $v_descr['type'] = 'folder';
+        } elseif (@is_link($v_descr['filename'])) {
+          // skip
+          continue;
+        } else {
+          // skip
+          continue;
+        }
+
+        // ----- Look for string added as file
+      } elseif (isset($v_descr['content'])) {
+        $v_descr['type'] = 'virtual_file';
+
+        // ----- Missing file
+      } else {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Calculate the stored filename
+      $this->privCalculateStoredFilename($v_descr, $p_options);
+
+      // ----- Add the descriptor in result list
+      $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+      // ----- Look for folder
+      if ($v_descr['type'] == 'folder') {
+        // ----- List of items in folder
+        $v_dirlist_descr = array();
+        $v_dirlist_nb    = 0;
+        if ($v_folder_handler = @opendir($v_descr['filename'])) {
+          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+            // ----- Skip '.' and '..'
+            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+              continue;
+            }
+
+            // ----- Compose the full filename
+            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
+
+            // ----- Look for different stored filename
+            // Because the name of the folder was changed, the name of the
+            // files/sub-folders also change
+            if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+              if ($v_descr['stored_filename'] != '') {
+                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
+              } else {
+                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+              }
+            }
+
+            $v_dirlist_nb++;
+          }
+
+          @closedir($v_folder_handler);
+        } else {
+          // TBC : unable to open folder in read mode
+        }
+
+        // ----- Expand each element of the list
+        if ($v_dirlist_nb != 0) {
+          // ----- Expand
+          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+            return $v_result;
+          }
+
+          // ----- Concat the resulting list
+          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+        } else {
+        }
+
+        // ----- Free local array
+        unset($v_dirlist_descr);
+      }
+    }
+
+    // ----- Get the result list
+    $p_filedescr_list = $v_result_list;
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCreate()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result      = 1;
+    $v_list_detail = array();
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the file in write mode
+    if (($v_result = $this->privOpenFd('wb')) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Add the list of files
+    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAdd()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result      = 1;
+    $v_list_detail = array();
+
+    // ----- Look if the archive exists or is empty
+    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+
+      // ----- Do a create
+      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+      // ----- Return
+      return $v_result;
+    }
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('rb')) != 1) {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Creates a temporay file
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = $v_central_dir['offset'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Swap the file descriptor
+    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+    // the following methods on the temporary fil and not the real archive
+    $v_swap        = $this->zip_fd;
+    $this->zip_fd  = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+      fclose($v_zip_temp_fd);
+      $this->privCloseFd();
+      @unlink($v_zip_temp_name);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+
+    // ----- Copy the block of file headers from the old archive
+    $v_size = $v_central_dir['size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Create the Central Dir files header
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          fclose($v_zip_temp_fd);
+          $this->privCloseFd();
+          @unlink($v_zip_temp_name);
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Return
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = $v_central_dir['comment'];
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+      $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd) - $v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+      // ----- Reset the file list
+      unset($v_header_list);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Swap back the file descriptor
+    $v_swap        = $this->zip_fd;
+    $this->zip_fd  = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Delete the zip file
+    // TBC : I should test the result ...
+    @unlink($this->zipname);
+
+    // ----- Rename the temporary file
+    // TBC : I should test the result ...
+    //@rename($v_zip_temp_name, $this->zipname);
+    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privOpenFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function privOpenFd($p_mode)
+  {
+    $v_result = 1;
+
+    // ----- Look if already open
+    if ($this->zip_fd != 0) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Open the zip file
+    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCloseFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function privCloseFd()
+  {
+    $v_result = 1;
+
+    if ($this->zip_fd != 0) {
+      @fclose($this->zip_fd);
+    }
+    $this->zip_fd = 0;
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddList()
+  // Description :
+  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+  //   different from the real path of the file. This is usefull if you want to have PclTar
+  //   running in any directory, and memorize relative path from an other directory.
+  // Parameters :
+  //   $p_list : An array containing the file or directory names to add in the tar
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  //   $p_add_dir : Path to add in the filename path archived
+  //   $p_remove_dir : Path to remove in the filename path archived
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+  public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+
+    // ----- Create the Central Dir files header
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          // ----- Return
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = '';
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd) - $v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+      // ----- Reset the file list
+      unset($v_header_list);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFileList()
+  // Description :
+  // Parameters :
+  //   $p_filedescr_list : An array containing the file description
+  //                      or directory names to add in the zip
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result = 1;
+    $v_header = array();
+
+    // ----- Recuperate the current number of elt in list
+    $v_nb = sizeof($p_result_list);
+
+    // ----- Loop on the files
+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
+      // ----- Format the filename
+      $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+      // ----- Skip empty file names
+      // TBC : Can this be possible ? not checked in DescrParseAtt ?
+      if ($p_filedescr_list[$j]['filename'] == "") {
+        continue;
+      }
+
+      // ----- Check the filename
+      if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
+
+        return PclZip::errorCode();
+      }
+
+      // ----- Look if it is a file or a dir with no all path remove option
+      // or a dir with all its path removed
+      //      if (   (is_file($p_filedescr_list[$j]['filename']))
+      //          || (   is_dir($p_filedescr_list[$j]['filename'])
+      if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+        // ----- Add the file
+        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+        if ($v_result != 1) {
+          return $v_result;
+        }
+
+        // ----- Store the file infos
+        $p_result_list[$v_nb++] = $v_header;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privAddFile($p_filedescr, &$p_header, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Working variable
+    $p_filename = $p_filedescr['filename'];
+
+    // TBC : Already done in the fileAtt check ... ?
+    if ($p_filename == "") {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Look for a stored different filename
+    /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        } else {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+    // ----- Set the file properties
+    clearstatcache();
+    $p_header['version']           = 20;
+    $p_header['version_extracted'] = 10;
+    $p_header['flag']              = 0;
+    $p_header['compression']       = 0;
+    $p_header['crc']               = 0;
+    $p_header['compressed_size']   = 0;
+    $p_header['filename_len']      = strlen($p_filename);
+    $p_header['extra_len']         = 0;
+    $p_header['disk']              = 0;
+    $p_header['internal']          = 0;
+    $p_header['offset']            = 0;
+    $p_header['filename']          = $p_filename;
+    // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+    $p_header['stored_filename']   = $p_filedescr['stored_filename'];
+    $p_header['extra']             = '';
+    $p_header['status']            = 'ok';
+    $p_header['index']             = -1;
+
+    // ----- Look for regular file
+    if ($p_filedescr['type'] == 'file') {
+      $p_header['external'] = 0x00000000;
+      $p_header['size']     = filesize($p_filename);
+
+      // ----- Look for regular folder
+    } elseif ($p_filedescr['type'] == 'folder') {
+      $p_header['external'] = 0x00000010;
+      $p_header['mtime']    = filemtime($p_filename);
+      $p_header['size']     = filesize($p_filename);
+
+      // ----- Look for virtual file
+    } elseif ($p_filedescr['type'] == 'virtual_file') {
+      $p_header['external'] = 0x00000000;
+      $p_header['size']     = strlen($p_filedescr['content']);
+    }
+
+    // ----- Look for filetime
+    if (isset($p_filedescr['mtime'])) {
+      $p_header['mtime'] = $p_filedescr['mtime'];
+    } elseif ($p_filedescr['type'] == 'virtual_file') {
+      $p_header['mtime'] = time();
+    } else {
+      $p_header['mtime'] = filemtime($p_filename);
+    }
+
+    // ------ Look for file comment
+    if (isset($p_filedescr['comment'])) {
+      $p_header['comment_len'] = strlen($p_filedescr['comment']);
+      $p_header['comment']     = $p_filedescr['comment'];
+    } else {
+      $p_header['comment_len'] = 0;
+      $p_header['comment']     = '';
+    }
+
+    // ----- Look for pre-add callback
+    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_header['status'] = "skipped";
+        $v_result           = 1;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+      }
+    }
+
+    // ----- Look for empty stored filename
+    if ($p_header['stored_filename'] == "") {
+      $p_header['status'] = "filtered";
+    }
+
+    // ----- Check the path length
+    if (strlen($p_header['stored_filename']) > 0xFF) {
+      $p_header['status'] = 'filename_too_long';
+    }
+
+    // ----- Look if no error, or file not skipped
+    if ($p_header['status'] == 'ok') {
+
+      // ----- Look for a file
+      if ($p_filedescr['type'] == 'file') {
+        // ----- Look for using temporary file to zip
+        if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+          if ($v_result < PCLZIP_ERR_NO_ERROR) {
+            return $v_result;
+          }
+
+          // ----- Use "in memory" zip algo
+        } else {
+
+          // ----- Open the source file
+          if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Read the file content
+          $v_content = @fread($v_file, $p_header['size']);
+
+          // ----- Close the file
+          @fclose($v_file);
+
+          // ----- Calculate the CRC
+          $p_header['crc'] = @crc32($v_content);
+
+          // ----- Look for no compression
+          if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+            // ----- Set header parameters
+            $p_header['compressed_size'] = $p_header['size'];
+            $p_header['compression']     = 0;
+
+            // ----- Look for normal compression
+          } else {
+            // ----- Compress the content
+            $v_content = @gzdeflate($v_content);
+
+            // ----- Set header parameters
+            $p_header['compressed_size'] = strlen($v_content);
+            $p_header['compression']     = 8;
+          }
+
+          // ----- Call the header generation
+          if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            @fclose($v_file);
+
+            return $v_result;
+          }
+
+          // ----- Write the compressed (or not) content
+          @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+        }
+
+        // ----- Look for a virtual file (a file from string)
+      } elseif ($p_filedescr['type'] == 'virtual_file') {
+
+        $v_content = $p_filedescr['content'];
+
+        // ----- Calculate the CRC
+        $p_header['crc'] = @crc32($v_content);
+
+        // ----- Look for no compression
+        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+          // ----- Set header parameters
+          $p_header['compressed_size'] = $p_header['size'];
+          $p_header['compression']     = 0;
+
+          // ----- Look for normal compression
+        } else {
+          // ----- Compress the content
+          $v_content = @gzdeflate($v_content);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = strlen($v_content);
+          $p_header['compression']     = 8;
+        }
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          @fclose($v_file);
+
+          return $v_result;
+        }
+
+        // ----- Write the compressed (or not) content
+        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+        // ----- Look for a directory
+      } elseif ($p_filedescr['type'] == 'folder') {
+        // ----- Look for directory last '/'
+        if (@substr($p_header['stored_filename'], -1) != '/') {
+          $p_header['stored_filename'] .= '/';
+        }
+
+        // ----- Set the file properties
+        $p_header['size']     = 0;
+        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          return $v_result;
+        }
+      }
+    }
+
+    // ----- Look for post-add callback
+    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Ignored
+        $v_result = 1;
+      }
+
+      // ----- Update the informations
+      // Nothing can be modified
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+  {
+    $v_result = PCLZIP_ERR_NO_ERROR;
+
+    // ----- Working variable
+    $p_filename = $p_filedescr['filename'];
+
+    // ----- Open the source file
+    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Creates a compressed temporary file
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+      fclose($v_file);
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = filesize($p_filename);
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($v_file, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close the file
+    @fclose($v_file);
+    @gzclose($v_file_compressed);
+
+    // ----- Check the minimum file size
+    if (filesize($v_gzip_temp_name) < 18) {
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the compressed attributes
+    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the gzip file header
+    $v_binary_data = @fread($v_file_compressed, 10);
+    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+    // ----- Check some parameters
+    $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+    // ----- Read the gzip file footer
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
+    $v_binary_data = @fread($v_file_compressed, 8);
+    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+    // ----- Set the attributes
+    $p_header['compression']     = ord($v_data_header['cm']);
+    //$p_header['mtime'] = $v_data_header['mtime'];
+    $p_header['crc']             = $v_data_footer['crc'];
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
+
+    // ----- Close the file
+    @fclose($v_file_compressed);
+
+    // ----- Call the header generation
+    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+      return $v_result;
+    }
+
+    // ----- Add the compressed data
+    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    fseek($v_file_compressed, 10);
+    $v_size = $p_header['compressed_size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($v_file_compressed, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close the file
+    @fclose($v_file_compressed);
+
+    // ----- Unlink the temporary file
+    @unlink($v_gzip_temp_name);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCalculateStoredFilename()
+  // Description :
+  //   Based on file descriptor properties and global options, this method
+  //   calculate the filename that will be stored in the archive.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Working variables
+    $p_filename = $p_filedescr['filename'];
+    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+    } else {
+      $p_add_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+    } else {
+      $p_remove_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+    } else {
+      $p_remove_all_dir = 0;
+    }
+
+    // ----- Look for full name change
+    if (isset($p_filedescr['new_full_name'])) {
+      // ----- Remove drive letter if any
+      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+
+      // ----- Look for path and/or short name change
+    } else {
+
+      // ----- Look for short name change
+      // Its when we cahnge just the filename but not the path
+      if (isset($p_filedescr['new_short_name'])) {
+        $v_path_info = pathinfo($p_filename);
+        $v_dir       = '';
+        if ($v_path_info['dirname'] != '') {
+          $v_dir = $v_path_info['dirname'] . '/';
+        }
+        $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
+      } else {
+        // ----- Calculate the stored filename
+        $v_stored_filename = $p_filename;
+      }
+
+      // ----- Look for all path to remove
+      if ($p_remove_all_dir) {
+        $v_stored_filename = basename($p_filename);
+
+        // ----- Look for partial path remove
+      } elseif ($p_remove_dir != "") {
+        if (substr($p_remove_dir, -1) != '/') {
+          $p_remove_dir .= "/";
+        }
+
+        if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+
+          if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+            $p_remove_dir = "./" . $p_remove_dir;
+          }
+          if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+            $p_remove_dir = substr($p_remove_dir, 2);
+          }
+        }
+
+        $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+        if ($v_compare > 0) {
+          if ($v_compare == 2) {
+            $v_stored_filename = "";
+          } else {
+            $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+          }
+        }
+      }
+
+      // ----- Remove drive letter if any
+      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+      // ----- Look for path to add
+      if ($p_add_dir != "") {
+        if (substr($p_add_dir, -1) == "/") {
+          $v_stored_filename = $p_add_dir . $v_stored_filename;
+        } else {
+          $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
+        }
+      }
+    }
+
+    // ----- Filename (reduce the path of stored name)
+    $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
+    $p_filedescr['stored_filename'] = $v_stored_filename;
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privWriteFileHeader(&$p_header)
+  {
+    $v_result = 1;
+
+    // ----- Store the offset position of the file
+    $p_header['offset'] = ftell($this->zip_fd);
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    $v_date  = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+    // ----- Write the first 148 bytes of the header in the archive
+    fputs($this->zip_fd, $v_binary_data, 30);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0) {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0) {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privWriteCentralFileHeader(&$p_header)
+  {
+    $v_result = 1;
+
+    // TBC
+    //for (reset($p_header); $key = key($p_header); next($p_header)) {
+    //}
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    $v_date  = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+    // ----- Write the 42 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 46);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0) {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0) {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+    if ($p_header['comment_len'] != 0) {
+      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+  {
+    $v_result = 1;
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+    // ----- Write the 22 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 22);
+
+    // ----- Write the variable fields
+    if (strlen($p_comment) != 0) {
+      fputs($this->zip_fd, $p_comment, strlen($p_comment));
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privList()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privList(&$p_list)
+  {
+    $v_result = 1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+      $this->privSwapBackMagicQuotes();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of Central Dir
+    @rewind($this->zip_fd);
+    if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read each entry
+    for ($i = 0; $i < $v_central_dir['entries']; $i++) {
+      // ----- Read the file header
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+        $this->privSwapBackMagicQuotes();
+
+        return $v_result;
+      }
+      $v_header['index'] = $i;
+
+      // ----- Get the only interesting attributes
+      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+      unset($v_header);
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privConvertHeader2FileInfo()
+  // Description :
+  //   This function takes the file informations from the central directory
+  //   entries and extract the interesting parameters that will be given back.
+  //   The resulting file infos are set in the array $p_info
+  //     $p_info['filename'] : Filename with full path. Given by user (add),
+  //                           extracted in the filesystem (extract).
+  //     $p_info['stored_filename'] : Stored filename in the archive.
+  //     $p_info['size'] = Size of the file.
+  //     $p_info['compressed_size'] = Compressed size of the file.
+  //     $p_info['mtime'] = Last modification date of the file.
+  //     $p_info['comment'] = Comment associated with the file.
+  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+  //     $p_info['status'] = status of the action on the file.
+  //     $p_info['crc'] = CRC of the file content.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privConvertHeader2FileInfo($p_header, &$p_info)
+  {
+    $v_result = 1;
+
+    // ----- Get the interesting attributes
+    $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
+    $p_info['filename']        = $v_temp_path;
+    $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
+    $p_info['stored_filename'] = $v_temp_path;
+    $p_info['size']            = $p_header['size'];
+    $p_info['compressed_size'] = $p_header['compressed_size'];
+    $p_info['mtime']           = $p_header['mtime'];
+    $p_info['comment']         = $p_header['comment'];
+    $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
+    $p_info['index']           = $p_header['index'];
+    $p_info['status']          = $p_header['status'];
+    $p_info['crc']             = $p_header['crc'];
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractByRule()
+  // Description :
+  //   Extract a file or directory depending of rules (by index, by name, ...)
+  // Parameters :
+  //   $p_file_list : An array where will be placed the properties of each
+  //                  extracted file
+  //   $p_path : Path to add while writing the extracted files
+  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+  //                    extracted files. If the path does not match the file path,
+  //                    the file is extracted with its memorized path.
+  //                    $p_remove_path does not apply to 'list' mode.
+  //                    $p_path and $p_remove_path are commulative.
+  // Return Values :
+  //   1 on success,0 or less on error (see error code list)
+  // --------------------------------------------------------------------------------
+  public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check the path
+    if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+      $p_path = "./" . $p_path;
+    }
+
+    // ----- Reduce the path last (and duplicated) '/'
+    if (($p_path != "./") && ($p_path != "/")) {
+      // ----- Look for the path end '/'
+      while (substr($p_path, -1) == "/") {
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
+      }
+    }
+
+    // ----- Look for path to remove format (should end by /)
+    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+      $p_remove_path .= '/';
+    }
+    $p_remove_path_size = strlen($p_remove_path);
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('rb')) != 1) {
+      $this->privSwapBackMagicQuotes();
+
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+      // ----- Close the zip file
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      return $v_result;
+    }
+
+    // ----- Start at beginning of Central Dir
+    $v_pos_entry = $v_central_dir['offset'];
+
+    // ----- Read each entry
+    $j_start = 0;
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+      // ----- Read next Central dir entry
+      @rewind($this->zip_fd);
+      if (@fseek($this->zip_fd, $v_pos_entry)) {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read the file header
+      $v_header = array();
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        return $v_result;
+      }
+
+      // ----- Store the index
+      $v_header['index'] = $i;
+
+      // ----- Store the file position
+      $v_pos_entry = ftell($this->zip_fd);
+
+      // ----- Look for the specific extract rules
+      $v_extract = false;
+
+      // ----- Look for extract by name rule
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+        // ----- Look if the filename is in the list
+        for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+          // ----- Look for a directory
+          if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+            // ----- Look if the directory is in the filename path
+            if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+              $v_extract = true;
+            }
+
+            // ----- Look for a filename
+          } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+            $v_extract = true;
+          }
+        }
+        // ----- Look for extract by ereg rule
+        // ereg() is deprecated with PHP 5.3
+        /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+            $v_extract = true;
+            }
+            }
+            */
+
+        // ----- Look for extract by preg rule
+      } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+        if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+          $v_extract = true;
+        }
+
+        // ----- Look for extract by index rule
+      } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+        // ----- Look if the index is in the list
+        for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+          if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+            $v_extract = true;
+          }
+          if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+            $j_start = $j + 1;
+          }
+
+          if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+            break;
+          }
+        }
+
+        // ----- Look for no rule, which means extract all the archive
+      } else {
+        $v_extract = true;
+      }
+
+      // ----- Check compression method
+      if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+        $v_header['status'] = 'unsupported_compression';
+
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+          $this->privSwapBackMagicQuotes();
+
+          PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
+
+          return PclZip::errorCode();
+        }
+      }
+
+      // ----- Check encrypted files
+      if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+        $v_header['status'] = 'unsupported_encryption';
+
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+          $this->privSwapBackMagicQuotes();
+
+          PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
+
+          return PclZip::errorCode();
+        }
+      }
+
+      // ----- Look for real extraction
+      if (($v_extract) && ($v_header['status'] != 'ok')) {
+        $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+        if ($v_result != 1) {
+          $this->privCloseFd();
+          $this->privSwapBackMagicQuotes();
+
+          return $v_result;
+        }
+
+        $v_extract = false;
+      }
+
+      // ----- Look for real extraction
+      if ($v_extract) {
+
+        // ----- Go to the file position
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_header['offset'])) {
+          // ----- Close the zip file
+          $this->privCloseFd();
+
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+          // ----- Return
+          return PclZip::errorCode();
+        }
+
+        // ----- Look for extraction as string
+        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+          $v_string = '';
+
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+          }
+
+          // ----- Set the file content
+          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+          // ----- Next extracted file
+          $v_nb_extracted++;
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+            break;
+          }
+
+          // ----- Look for extraction in standard output
+        } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+          // ----- Extracting the file in standard output
+          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+            break;
+          }
+
+          // ----- Look for normal extraction
+        } else {
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+            break;
+          }
+        }
+      }
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //
+  // 1 : ... ?
+  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+  // --------------------------------------------------------------------------------
+  public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+      // TBC
+    }
+
+    // ----- Look for all path to remove
+    if ($p_remove_all_path == true) {
+      // ----- Look for folder entry that not need to be extracted
+      if (($p_entry['external'] & 0x00000010) == 0x00000010) {
+
+        $p_entry['status'] = "filtered";
+
+        return $v_result;
+      }
+
+      // ----- Get the basename of the path
+      $p_entry['filename'] = basename($p_entry['filename']);
+
+      // ----- Look for path to remove
+    } elseif ($p_remove_path != "") {
+      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+
+        // ----- Change the file status
+        $p_entry['status'] = "filtered";
+
+        // ----- Return
+        return $v_result;
+      }
+
+      $p_remove_path_size = strlen($p_remove_path);
+      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+
+        // ----- Remove the path
+        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+      }
+    }
+
+    // ----- Add the path
+    if ($p_path != '') {
+      $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
+    }
+
+    // ----- Check a base_dir_restriction
+    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+      $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+      if ($v_inclusion == 0) {
+
+        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result          = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+        $v_result          = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Look for specific actions while the file exist
+      if (file_exists($p_entry['filename'])) {
+
+        // ----- Look if file is a directory
+        if (is_dir($p_entry['filename'])) {
+
+          // ----- Change the file status
+          $p_entry['status'] = "already_a_directory";
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          // For historical reason first PclZip implementation does not stop
+          // when this kind of error occurs.
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Look if file is write protected
+        } elseif (!is_writeable($p_entry['filename'])) {
+
+          // ----- Change the file status
+          $p_entry['status'] = "write_protected";
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          // For historical reason first PclZip implementation does not stop
+          // when this kind of error occurs.
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Look if the extracted file is older
+        } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+          // ----- Change the file status
+          if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+          } else {
+            $p_entry['status'] = "newer_exist";
+
+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+            // For historical reason first PclZip implementation does not stop
+            // when this kind of error occurs.
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+              PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+              return PclZip::errorCode();
+            }
+          }
+        } else {
+        }
+
+        // ----- Check the directory availability and create it if necessary
+      } else {
+        if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+          $v_dir_to_check = $p_entry['filename'];
+        } elseif (!strstr($p_entry['filename'], "/")) {
+          $v_dir_to_check = "";
+        } else {
+          $v_dir_to_check = dirname($p_entry['filename']);
+        }
+
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
+
+          // ----- Change the file status
+          $p_entry['status'] = "path_creation_fail";
+
+          // ----- Return
+          //return $v_result;
+          $v_result = 1;
+        }
+      }
+    }
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+        // ----- Look for not compressed file
+        if ($p_entry['compression'] == 0) {
+
+          // ----- Opening destination file
+          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+            // ----- Change the file status
+            $p_entry['status'] = "write_error";
+
+            // ----- Return
+            return $v_result;
+          }
+
+          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+          $v_size = $p_entry['compressed_size'];
+          while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+          }
+
+          // ----- Closing the destination file
+          fclose($v_dest_file);
+
+          // ----- Change the file mtime
+          @touch($p_entry['filename'], $p_entry['mtime']);
+
+        } else {
+          // ----- TBC
+          // Need to be finished
+          if (($p_entry['flag'] & 1) == 1) {
+            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
+
+            return PclZip::errorCode();
+          }
+
+          // ----- Look for using temporary file to unzip
+          if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+            if ($v_result < PCLZIP_ERR_NO_ERROR) {
+              return $v_result;
+            }
+
+            // ----- Look for extract in memory
+          } else {
+
+            // ----- Read the compressed file in a buffer (one shot)
+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+            // ----- Decompress the file
+            $v_file_content = @gzinflate($v_buffer);
+            unset($v_buffer);
+            if ($v_file_content === false) {
+
+              // ----- Change the file status
+              // TBC
+              $p_entry['status'] = "error";
+
+              return $v_result;
+            }
+
+            // ----- Opening destination file
+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+              // ----- Change the file status
+              $p_entry['status'] = "write_error";
+
+              return $v_result;
+            }
+
+            // ----- Write the uncompressed data
+            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+            unset($v_file_content);
+
+            // ----- Closing the destination file
+            @fclose($v_dest_file);
+
+          }
+
+          // ----- Change the file mtime
+          @touch($p_entry['filename'], $p_entry['mtime']);
+        }
+
+        // ----- Look for chmod option
+        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+          // ----- Change the mode of the file
+          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+        }
+
+      }
+    }
+
+    // ----- Change abort status
+    if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+
+      // ----- Look for post-extract callback
+    } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        $v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Creates a temporary file
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+      fclose($v_file);
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Write gz file format header
+    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+    @fwrite($v_dest_file, $v_binary_data, 10);
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = $p_entry['compressed_size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($this->zip_fd, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($v_dest_file, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Write gz file format footer
+    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+    @fwrite($v_dest_file, $v_binary_data, 8);
+
+    // ----- Close the temporary file
+    @fclose($v_dest_file);
+
+    // ----- Opening destination file
+    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+      $p_entry['status'] = "write_error";
+
+      return $v_result;
+    }
+
+    // ----- Open the temporary gz file
+    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+      @fclose($v_dest_file);
+      $p_entry['status'] = "read_error";
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = $p_entry['size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @gzread($v_src_file, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($v_dest_file, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+    @fclose($v_dest_file);
+    @gzclose($v_src_file);
+
+    // ----- Delete the temporary file
+    @unlink($v_gzip_temp_name);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileInOutput()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privExtractFileInOutput(&$p_entry, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+      return $v_result;
+    }
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+      // TBC
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result          = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+        $v_result          = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+    // ----- Trace
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+        // ----- Look for not compressed file
+        if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+          // ----- Read the file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Send the file to the output
+          echo $v_buffer;
+          unset($v_buffer);
+        } else {
+
+          // ----- Read the compressed file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Decompress the file
+          $v_file_content = gzinflate($v_buffer);
+          unset($v_buffer);
+
+          // ----- Send the file to the output
+          echo $v_file_content;
+          unset($v_file_content);
+        }
+      }
+    }
+
+    // ----- Change abort status
+    if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+
+      // ----- Look for post-extract callback
+    } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        $v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileAsString()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+  {
+    $v_result = 1;
+
+    // ----- Read the file header
+    $v_header = array();
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+      // TBC
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result          = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+        $v_result          = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+        // ----- Look for not compressed file
+        //      if ($p_entry['compressed_size'] == $p_entry['size'])
+        if ($p_entry['compression'] == 0) {
+
+          // ----- Reading the file
+          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        } else {
+
+          // ----- Reading the file
+          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Decompress the file
+          if (($p_string = @gzinflate($v_data)) === false) {
+            // TBC
+          }
+        }
+
+        // ----- Trace
+      } else {
+        // TBC : error : can not extract a folder in a string
+      }
+
+    }
+
+    // ----- Change abort status
+    if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+
+      // ----- Look for post-extract callback
+    } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Swap the content to header
+      $v_local_header['content'] = $p_string;
+      $p_string                  = '';
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+      //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Swap back the content to header
+      $p_string = $v_local_header['content'];
+      unset($v_local_header['content']);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        $v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privReadFileHeader(&$p_header)
+  {
+    $v_result = 1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    $v_data        = unpack('Vid', $v_binary_data);
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x04034b50) {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 26);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 26) {
+      $p_header['filename'] = "";
+      $p_header['status']   = "invalid_header";
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+    // ----- Get filename
+    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+    // ----- Get extra_fields
+    if ($v_data['extra_len'] != 0) {
+      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+    } else {
+      $p_header['extra'] = '';
+    }
+
+    // ----- Extract properties
+    $p_header['version_extracted'] = $v_data['version'];
+    $p_header['compression']       = $v_data['compression'];
+    $p_header['size']              = $v_data['size'];
+    $p_header['compressed_size']   = $v_data['compressed_size'];
+    $p_header['crc']               = $v_data['crc'];
+    $p_header['flag']              = $v_data['flag'];
+    $p_header['filename_len']      = $v_data['filename_len'];
+
+    // ----- Recuperate date in UNIX format
+    $p_header['mdate'] = $v_data['mdate'];
+    $p_header['mtime'] = $v_data['mtime'];
+    if ($p_header['mdate'] && $p_header['mtime']) {
+      // ----- Extract time
+      $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+      // ----- Extract date
+      $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day   = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+    } else {
+      $p_header['mtime'] = time();
+    }
+
+    // TBC
+    //for (reset($v_data); $key = key($v_data); next($v_data)) {
+    //}
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set the status field
+    $p_header['status'] = "ok";
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privReadCentralFileHeader(&$p_header)
+  {
+    $v_result = 1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    $v_data        = unpack('Vid', $v_binary_data);
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x02014b50) {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 42);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 42) {
+      $p_header['filename'] = "";
+      $p_header['status']   = "invalid_header";
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+    // ----- Get filename
+    if ($p_header['filename_len'] != 0) {
+      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    } else {
+      $p_header['filename'] = '';
+    }
+
+    // ----- Get extra
+    if ($p_header['extra_len'] != 0) {
+      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+      $p_header['extra'] = '';
+    }
+
+    // ----- Get comment
+    if ($p_header['comment_len'] != 0) {
+      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+      $p_header['comment'] = '';
+    }
+
+    // ----- Extract properties
+
+    // ----- Recuperate date in UNIX format
+    //if ($p_header['mdate'] && $p_header['mtime'])
+    // TBC : bug : this was ignoring time with 0/0/0
+    if (1) {
+      // ----- Extract time
+      $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+      // ----- Extract date
+      $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day   = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+    } else {
+      $p_header['mtime'] = time();
+    }
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set default status to ok
+    $p_header['status'] = 'ok';
+
+    // ----- Look if it is a directory
+    if (substr($p_header['filename'], -1) == '/') {
+      //$p_header['external'] = 0x41FF0010;
+      $p_header['external'] = 0x00000010;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFileHeaders()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success,
+  //   0 on error;
+  // --------------------------------------------------------------------------------
+  public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+  {
+    $v_result = 1;
+
+    // ----- Check the static values
+    // TBC
+    if ($p_local_header['filename'] != $p_central_header['filename']) {
+    }
+    if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+    }
+    if ($p_local_header['flag'] != $p_central_header['flag']) {
+    }
+    if ($p_local_header['compression'] != $p_central_header['compression']) {
+    }
+    if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+    }
+    if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+    }
+
+    // ----- Look for flag bit 3
+    if (($p_local_header['flag'] & 8) == 8) {
+      $p_local_header['size']            = $p_central_header['size'];
+      $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+      $p_local_header['crc']             = $p_central_header['crc'];
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadEndCentralDir()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privReadEndCentralDir(&$p_central_dir)
+  {
+    $v_result = 1;
+
+    // ----- Go to the end of the zip file
+    $v_size = filesize($this->zipname);
+    @fseek($this->zip_fd, $v_size);
+    if (@ftell($this->zip_fd) != $v_size) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- First try : look if this is an archive with no commentaries (most of the time)
+    // in this case the end of central dir is at 22 bytes of the file end
+    $v_found = 0;
+    if ($v_size > 26) {
+      @fseek($this->zip_fd, $v_size - 22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read for bytes
+      $v_binary_data = @fread($this->zip_fd, 4);
+      $v_data        = @unpack('Vid', $v_binary_data);
+
+      // ----- Check signature
+      if ($v_data['id'] == 0x06054b50) {
+        $v_found = 1;
+      }
+
+      $v_pos = ftell($this->zip_fd);
+    }
+
+    // ----- Go back to the maximum possible size of the Central Dir End Record
+    if (!$v_found) {
+      $v_maximum_size = 65557; // 0xFFFF + 22;
+      if ($v_maximum_size > $v_size) {
+        $v_maximum_size = $v_size;
+      }
+      @fseek($this->zip_fd, $v_size - $v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read byte per byte in order to find the signature
+      $v_pos   = ftell($this->zip_fd);
+      $v_bytes = 0x00000000;
+      while ($v_pos < $v_size) {
+        // ----- Read a byte
+        $v_byte = @fread($this->zip_fd, 1);
+
+        // -----  Add the byte
+        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+        // ----- Compare the bytes
+        if ($v_bytes == 0x504b0506) {
+          $v_pos++;
+          break;
+        }
+
+        $v_pos++;
+      }
+
+      // ----- Look if not found end of central dir
+      if ($v_pos == $v_size) {
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Read the first 18 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 18);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 18) {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+    // ----- Check the global size
+    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+      // ----- Removed in release 2.2 see readme file
+      // The check of the file size is a little too strict.
+      // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+      // While decrypted, zip has training 0 bytes
+      if (0) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Get comment
+    if ($v_data['comment_size'] != 0) {
+      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    } else {
+      $p_central_dir['comment'] = '';
+    }
+
+    $p_central_dir['entries']      = $v_data['entries'];
+    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+    $p_central_dir['offset']       = $v_data['offset'];
+    $p_central_dir['size']         = $v_data['size'];
+    $p_central_dir['disk']         = $v_data['disk'];
+    $p_central_dir['disk_start']   = $v_data['disk_start'];
+
+    // TBC
+    //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+    //}
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDeleteByRule()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privDeleteByRule(&$p_result_list, &$p_options)
+  {
+    $v_result      = 1;
+    $v_list_detail = array();
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('rb')) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+      $this->privCloseFd();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Scan all the files
+    // ----- Start at beginning of Central Dir
+    $v_pos_entry = $v_central_dir['offset'];
+    @rewind($this->zip_fd);
+    if (@fseek($this->zip_fd, $v_pos_entry)) {
+      // ----- Close the zip file
+      $this->privCloseFd();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read each entry
+    $v_header_list = array();
+    $j_start       = 0;
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+      // ----- Read the file header
+      $v_header_list[$v_nb_extracted] = array();
+      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+        // ----- Close the zip file
+        $this->privCloseFd();
+
+        return $v_result;
+      }
+
+      // ----- Store the index
+      $v_header_list[$v_nb_extracted]['index'] = $i;
+
+      // ----- Look for the specific extract rules
+      $v_found = false;
+
+      // ----- Look for extract by name rule
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+        // ----- Look if the filename is in the list
+        for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+          // ----- Look for a directory
+          if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+            // ----- Look if the directory is in the filename path
+            if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+              $v_found = true;
+            } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+              $v_found = true;
+            }
+
+            // ----- Look for a filename
+          } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+            $v_found = true;
+          }
+        }
+
+        // ----- Look for extract by ereg rule
+        // ereg() is deprecated with PHP 5.3
+        /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+            $v_found = true;
+            }
+            }
+            */
+
+        // ----- Look for extract by preg rule
+      } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+        if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+          $v_found = true;
+        }
+
+        // ----- Look for extract by index rule
+      } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+        // ----- Look if the index is in the list
+        for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+          if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+            $v_found = true;
+          }
+          if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+            $j_start = $j + 1;
+          }
+
+          if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+            break;
+          }
+        }
+      } else {
+        $v_found = true;
+      }
+
+      // ----- Look for deletion
+      if ($v_found) {
+        unset($v_header_list[$v_nb_extracted]);
+      } else {
+        $v_nb_extracted++;
+      }
+    }
+
+    // ----- Look if something need to be deleted
+    if ($v_nb_extracted > 0) {
+
+      // ----- Creates a temporay file
+      $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+      // ----- Creates a temporary zip archive
+      $v_temp_zip = new PclZip($v_zip_temp_name);
+
+      // ----- Open the temporary zip file in write mode
+      if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+        $this->privCloseFd();
+
+        // ----- Return
+        return $v_result;
+      }
+
+      // ----- Look which file need to be kept
+      for ($i = 0; $i < sizeof($v_header_list); $i++) {
+
+        // ----- Calculate the position of the header
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+          // ----- Close the zip file
+          $this->privCloseFd();
+          $v_temp_zip->privCloseFd();
+          @unlink($v_zip_temp_name);
+
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+          // ----- Return
+          return PclZip::errorCode();
+        }
+
+        // ----- Read the file header
+        $v_local_header = array();
+        if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+          // ----- Close the zip file
+          $this->privCloseFd();
+          $v_temp_zip->privCloseFd();
+          @unlink($v_zip_temp_name);
+
+          // ----- Return
+          return $v_result;
+        }
+
+        // ----- Check that local file header is same as central file header
+        if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+          // TBC
+        }
+        unset($v_local_header);
+
+        // ----- Write the file header
+        if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+          // ----- Close the zip file
+          $this->privCloseFd();
+          $v_temp_zip->privCloseFd();
+          @unlink($v_zip_temp_name);
+
+          // ----- Return
+          return $v_result;
+        }
+
+        // ----- Read/write the data block
+        if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+          // ----- Close the zip file
+          $this->privCloseFd();
+          $v_temp_zip->privCloseFd();
+          @unlink($v_zip_temp_name);
+
+          // ----- Return
+          return $v_result;
+        }
+      }
+
+      // ----- Store the offset of the central dir
+      $v_offset = @ftell($v_temp_zip->zip_fd);
+
+      // ----- Re-Create the Central Dir files header
+      for ($i = 0; $i < sizeof($v_header_list); $i++) {
+        // ----- Create the file header
+        if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          $v_temp_zip->privCloseFd();
+          $this->privCloseFd();
+          @unlink($v_zip_temp_name);
+
+          // ----- Return
+          return $v_result;
+        }
+
+        // ----- Transform the header to a 'usable' info
+        $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+      }
+
+      // ----- Zip file comment
+      $v_comment = '';
+      if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+        $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+      }
+
+      // ----- Calculate the size of the central header
+      $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
+
+      // ----- Create the central dir footer
+      if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+        // ----- Reset the file list
+        unset($v_header_list);
+        $v_temp_zip->privCloseFd();
+        $this->privCloseFd();
+        @unlink($v_zip_temp_name);
+
+        // ----- Return
+        return $v_result;
+      }
+
+      // ----- Close
+      $v_temp_zip->privCloseFd();
+      $this->privCloseFd();
+
+      // ----- Delete the zip file
+      // TBC : I should test the result ...
+      @unlink($this->zipname);
+
+      // ----- Rename the temporary file
+      // TBC : I should test the result ...
+      //@rename($v_zip_temp_name, $this->zipname);
+      PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+      // ----- Destroy the temporary archive
+      unset($v_temp_zip);
+
+      // ----- Remove every files : reset the file
+    } elseif ($v_central_dir['entries'] != 0) {
+      $this->privCloseFd();
+
+      if (($v_result = $this->privOpenFd('wb')) != 1) {
+        return $v_result;
+      }
+
+      if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+        return $v_result;
+      }
+
+      $this->privCloseFd();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDirCheck()
+  // Description :
+  //   Check if a directory exists, if not it creates it and all the parents directory
+  //   which may be useful.
+  // Parameters :
+  //   $p_dir : Directory path to check.
+  // Return Values :
+  //    1 : OK
+  //   -1 : Unable to create directory
+  // --------------------------------------------------------------------------------
+  public function privDirCheck($p_dir, $p_is_dir = false)
+  {
+    $v_result = 1;
+
+    // ----- Remove the final '/'
+    if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+      $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
+    }
+
+    // ----- Check the directory availability
+    if ((is_dir($p_dir)) || ($p_dir == "")) {
+      return 1;
+    }
+
+    // ----- Extract parent directory
+    $p_parent_dir = dirname($p_dir);
+
+    // ----- Just a check
+    if ($p_parent_dir != $p_dir) {
+      // ----- Look for parent directory
+      if ($p_parent_dir != "") {
+        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+          return $v_result;
+        }
+      }
+    }
+
+    // ----- Create the directory
+    if (!@mkdir($p_dir, 0777)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privMerge()
+  // Description :
+  //   If $p_archive_to_add does not exist, the function exit with a success result.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privMerge(&$p_archive_to_add)
+  {
+    $v_result = 1;
+
+    // ----- Look if the archive_to_add exists
+    if (!is_file($p_archive_to_add->zipname)) {
+
+      // ----- Nothing to merge, so merge is a success
+      $v_result = 1;
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Look if the archive exists
+    if (!is_file($this->zipname)) {
+
+      // ----- Do a duplicate
+      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('rb')) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+      $this->privCloseFd();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Open the archive_to_add file
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
+      $this->privCloseFd();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir_to_add = array();
+    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($p_archive_to_add->zip_fd);
+
+    // ----- Creates a temporay file
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = $v_central_dir['offset'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Copy the files from the archive_to_add into the temporary file
+    $v_size = $v_central_dir_to_add['offset'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($v_zip_temp_fd);
+
+    // ----- Copy the block of file headers from the old archive
+    $v_size = $v_central_dir['size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Copy the block of file headers from the archive_to_add
+    $v_size = $v_central_dir_to_add['size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Merge the file comments
+    $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
+
+    // ----- Calculate the size of the (new) central header
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
+
+    // ----- Swap the file descriptor
+    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+    // the following methods on the temporary fil and not the real archive fd
+    $v_swap        = $this->zip_fd;
+    $this->zip_fd  = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+      @fclose($v_zip_temp_fd);
+      $this->zip_fd = null;
+
+      // ----- Reset the file list
+      unset($v_header_list);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Swap back the file descriptor
+    $v_swap        = $this->zip_fd;
+    $this->zip_fd  = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Close
+    $this->privCloseFd();
+    $p_archive_to_add->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Delete the zip file
+    // TBC : I should test the result ...
+    @unlink($this->zipname);
+
+    // ----- Rename the temporary file
+    // TBC : I should test the result ...
+    //@rename($v_zip_temp_name, $this->zipname);
+    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDuplicate()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privDuplicate($p_archive_filename)
+  {
+    $v_result = 1;
+
+    // ----- Look if the $p_archive_filename exists
+    if (!is_file($p_archive_filename)) {
+
+      // ----- Nothing to duplicate, so duplicate is a success.
+      $v_result = 1;
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('wb')) != 1) {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+      $this->privCloseFd();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = filesize($p_archive_filename);
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privErrorLog()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function privErrorLog($p_error_code = 0, $p_error_string = '')
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      PclError($p_error_code, $p_error_string);
+    } else {
+      $this->error_code   = $p_error_code;
+      $this->error_string = $p_error_string;
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privErrorReset()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  public function privErrorReset()
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      PclErrorReset();
+    } else {
+      $this->error_code   = 0;
+      $this->error_string = '';
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDisableMagicQuotes()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privDisableMagicQuotes()
+  {
+    $v_result = 1;
+
+    // ----- Look if function exists
+    if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+      return $v_result;
+    }
+
+    // ----- Look if already done
+    if ($this->magic_quotes_status != -1) {
+      return $v_result;
+    }
+
+    // ----- Get and memorize the magic_quote value
+    $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+    // ----- Disable magic_quotes
+    if ($this->magic_quotes_status == 1) {
+      @set_magic_quotes_runtime(0);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privSwapBackMagicQuotes()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  public function privSwapBackMagicQuotes()
+  {
+    $v_result = 1;
+
+    // ----- Look if function exists
+    if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+      return $v_result;
+    }
+
+    // ----- Look if something to do
+    if ($this->magic_quotes_status != -1) {
+      return $v_result;
+    }
+
+    // ----- Swap back magic_quotes
+    if ($this->magic_quotes_status == 1) {
+      @set_magic_quotes_runtime($this->magic_quotes_status);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+}
+
+// End of class
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
+  $v_result = "";
+
+  // ----- Look for not empty path
+  if ($p_dir != "") {
+    // ----- Explode path by directory names
+    $v_list = explode("/", $p_dir);
+
+    // ----- Study directories from last to first
+    $v_skip = 0;
+    for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+      // ----- Look for current path
+      if ($v_list[$i] == ".") {
+        // ----- Ignore this directory
+        // Should be the first $i=0, but no check is done
+      } elseif ($v_list[$i] == "..") {
+        $v_skip++;
+      } elseif ($v_list[$i] == "") {
+        // ----- First '/' i.e. root slash
+        if ($i == 0) {
+          $v_result = "/" . $v_result;
+          if ($v_skip > 0) {
+            // ----- It is an invalid path, so the path is not modified
+            // TBC
+            $v_result = $p_dir;
+            $v_skip   = 0;
+          }
+
+          // ----- Last '/' i.e. indicates a directory
+        } elseif ($i == (sizeof($v_list) - 1)) {
+          $v_result = $v_list[$i];
+
+          // ----- Double '/' inside the path
+        } else {
+          // ----- Ignore only the double '//' in path,
+          // but not the first and last '/'
+        }
+      } else {
+        // ----- Look for item to skip
+        if ($v_skip > 0) {
+          $v_skip--;
+        } else {
+          $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
+        }
+      }
+    }
+
+    // ----- Look for skip
+    if ($v_skip > 0) {
+      while ($v_skip > 0) {
+        $v_result = '../' . $v_result;
+        $v_skip--;
+      }
+    }
+  }
+
+  // ----- Return
+  return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//   This function indicates if the path $p_path is under the $p_dir tree. Or,
+//   said in an other way, if the file or sub-dir $p_path is inside the dir
+//   $p_dir.
+//   The function indicates also if the path is exactly the same as the dir.
+//   This function supports path with duplicated '/' like '//', but does not
+//   support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//   0 if $p_path is not inside directory $p_dir
+//   1 if $p_path is inside directory $p_dir
+//   2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
+  $v_result = 1;
+
+  // ----- Look for path beginning by ./
+  if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+    $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
+  }
+  if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+    $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
+  }
+
+  // ----- Explode dir and path by directory separator
+  $v_list_dir       = explode("/", $p_dir);
+  $v_list_dir_size  = sizeof($v_list_dir);
+  $v_list_path      = explode("/", $p_path);
+  $v_list_path_size = sizeof($v_list_path);
+
+  // ----- Study directories paths
+  $i = 0;
+  $j = 0;
+  while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+
+    // ----- Look for empty dir (path reduction)
+    if ($v_list_dir[$i] == '') {
+      $i++;
+      continue;
+    }
+    if ($v_list_path[$j] == '') {
+      $j++;
+      continue;
+    }
+
+    // ----- Compare the items
+    if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+      $v_result = 0;
+    }
+
+    // ----- Next items
+    $i++;
+    $j++;
+  }
+
+  // ----- Look if everything seems to be the same
+  if ($v_result) {
+    // ----- Skip all the empty items
+    while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+      $j++;
+    }
+    while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+      $i++;
+    }
+
+    if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+      // ----- There are exactly the same
+      $v_result = 2;
+    } elseif ($i < $v_list_dir_size) {
+      // ----- The path is shorter than the dir
+      $v_result = 0;
+    }
+  }
+
+  // ----- Return
+  return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//   $p_mode : read/write compression mode
+//             0 : src & dest normal
+//             1 : src gzip, dest normal
+//             2 : src normal, dest gzip
+//             3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
+  $v_result = 1;
+
+  if ($p_mode == 0) {
+    while ($p_size != 0) {
+      $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($p_src, $v_read_size);
+      @fwrite($p_dest, $v_buffer, $v_read_size);
+      $p_size -= $v_read_size;
+    }
+  } elseif ($p_mode == 1) {
+    while ($p_size != 0) {
+      $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @gzread($p_src, $v_read_size);
+      @fwrite($p_dest, $v_buffer, $v_read_size);
+      $p_size -= $v_read_size;
+    }
+  } elseif ($p_mode == 2) {
+    while ($p_size != 0) {
+      $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @fread($p_src, $v_read_size);
+      @gzwrite($p_dest, $v_buffer, $v_read_size);
+      $p_size -= $v_read_size;
+    }
+  } elseif ($p_mode == 3) {
+    while ($p_size != 0) {
+      $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer    = @gzread($p_src, $v_read_size);
+      @gzwrite($p_dest, $v_buffer, $v_read_size);
+      $p_size -= $v_read_size;
+    }
+  }
+
+  // ----- Return
+  return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//   This function tries to do a simple rename() function. If it fails, it
+//   tries to copy the $p_src file in a new $p_dest file and then unlink the
+//   first one.
+// Parameters :
+//   $p_src : Old filename
+//   $p_dest : New filename
+// Return Values :
+//   1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
+  $v_result = 1;
+
+  // ----- Try to rename the files
+  if (!@rename($p_src, $p_dest)) {
+
+    // ----- Try to copy & unlink the src
+    if (!@copy($p_src, $p_dest)) {
+      $v_result = 0;
+    } elseif (!@unlink($p_src)) {
+      $v_result = 0;
+    }
+  }
+
+  // ----- Return
+  return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//   Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//   $p_option : the option value.
+// Return Values :
+//   The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
+
+  $v_list = get_defined_constants();
+  for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+    $v_prefix = substr($v_key, 0, 10);
+    if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+      return $v_key;
+    }
+  }
+
+  $v_result = 'Unknown';
+
+  return $v_result;
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//   Translate windows path by replacing '\' by '/' and optionally removing
+//   drive letter.
+// Parameters :
+//   $p_path : path to translate.
+//   $p_remove_disk_letter : true | false
+// Return Values :
+//   The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
+  if (stristr(PHP_OS, 'windows')) {
+    // ----- Look for potential disk letter
+    if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+      $p_path = substr($p_path, $v_position + 1);
+    }
+    // ----- Change potential windows directory separator
+    if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+      $p_path = strtr($p_path, '\\', '/');
+    }
+  }
+
+  return $p_path;
+}
+// --------------------------------------------------------------------------------
diff --git a/app/vendor/piwik/decompress/libs/PclZip/readme.txt b/app/vendor/piwik/decompress/libs/PclZip/readme.txt
new file mode 100644
index 000000000..d1b11e258
--- /dev/null
+++ b/app/vendor/piwik/decompress/libs/PclZip/readme.txt
@@ -0,0 +1,421 @@
+// --------------------------------------------------------------------------------
+// PclZip 2.8.2 - readme.txt
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - August 2009
+// Vincent Blavet - vincent@phpconcept.net
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+
+
+0 - Sommaire
+============
+    1 - Introduction
+    2 - What's new
+    3 - Corrected bugs
+    4 - Known bugs or limitations
+    5 - License
+    6 - Warning
+    7 - Documentation
+    8 - Author
+    9 - Contribute
+
+1 - Introduction
+================
+
+  PclZip is a library that allow you to manage a Zip archive.
+
+  Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip
+
+2 - What's new
+==============
+
+  Version 2.8.2 :
+    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
+      extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
+      can also be modified in the post-extract call back.
+    **Bugs correction :
+    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
+    - Remove use of eval() and do direct call to callback functions
+    - Correct support of 64bits systems (Thanks to WordPress team)
+
+  Version 2.8.1 :
+    - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
+      deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
+      automatically replace it by PCLZIP_OPT_BY_PREG.
+  
+  Version 2.8 :
+    - Improve extraction of zip archive for large files by using temporary files
+      This feature is working like the one defined in r2.7.
+      Options are renamed : PCLZIP_OPT_TEMP_FILE_ON, PCLZIP_OPT_TEMP_FILE_OFF,
+      PCLZIP_OPT_TEMP_FILE_THRESHOLD
+    - Add a ratio constant PCLZIP_TEMPORARY_FILE_RATIO to configure the auto
+      sense of temporary file use.
+    - Bug correction : Reduce filepath in returned file list to remove ennoying
+      './/' preambule in file path.
+
+  Version 2.7 :
+    - Improve creation of zip archive for large files :
+      PclZip will now autosense the configured memory and use temporary files
+      when large file is suspected.
+      This feature can also ne triggered by manual options in create() and add()
+      methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
+      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
+      'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
+      threshold to use temporary files.
+      Using "temporary files" rather than "memory" might take more time, but
+      might give the ability to zip very large files :
+      Tested on my win laptop with a 88Mo file :
+        Zip "in-memory" : 18sec (max_execution_time=30, memory_limit=180Mo)
+        Zip "tmporary-files" : 23sec (max_execution_time=30, memory_limit=30Mo)
+    - Replace use of mktime() by time() to limit the E_STRICT error messages.
+    - Bug correction : When adding files with full windows path (drive letter)
+      PclZip is now working. Before, if the drive letter is not the default
+      path, PclZip was not able to add the file.
+
+  Version 2.6 :
+    - Code optimisation
+    - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
+      add a comment for a specific file. (Don't really know if this is usefull)
+    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
+      as a file.
+    - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
+      a file.
+    - Correct a bug. Files archived with a timestamp with 0h0m0s were extracted
+      with current time
+    - Add CRC value in the informations returned back for each file after an
+      action.
+    - Add missing closedir() statement.
+    - When adding a folder, and removing the path of this folder, files were
+      incorrectly added with a '/' at the beginning. Which means files are 
+      related to root in unix systems. Corrected.
+    - Add conditional if before constant definition. This will allow users
+      to redefine constants without changing the file, and then improve
+      upgrade of pclzip code for new versions.
+  
+  Version 2.5 :
+    - Introduce the ability to add file/folder with individual properties (file descriptor).
+      This gives for example the ability to change the filename of a zipped file.
+      . Able to add files individually
+      . Able to change full name
+      . Able to change short name
+      . Compatible with global options
+    - New attributes : PCLZIP_ATT_FILE_NAME, PCLZIP_ATT_FILE_NEW_SHORT_NAME, PCLZIP_ATT_FILE_NEW_FULL_NAME
+    - New error code : PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE
+    - Add a security control feature. PclZip can extract any file in any folder
+      of a system. People may use this to upload a zip file and try to override
+      a system file. The PCLZIP_OPT_EXTRACT_DIR_RESTRICTION will give the
+      ability to forgive any directory transversal behavior.
+    - New PCLZIP_OPT_EXTRACT_DIR_RESTRICTION : check extraction path
+    - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
+    - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
+      by current path (getcwd())
+  
+  Version 2.4 :
+    - Code improvment : try to speed up the code by removing unusefull call to pack()
+    - Correct bug in delete() : delete() should be called with no argument. This was not
+      the case in 2.3. This is corrected in 2.4.
+    - Correct a bug in path_inclusion function. When the path has several '../../', the
+      result was bad.
+    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
+      disable it while working and det it back to its original value.
+      This resolve a lots of bad formated archive errors.
+    - Bug correction : PclZip now correctly unzip file in some specific situation,
+      when compressed content has same size as uncompressed content.
+    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
+      directories are not any more created.
+    - Code improvment : correct unclosed opendir(), better handling of . and .. in
+      loops.
+
+
+  Version 2.3 :
+    - Correct a bug with PHP5 : affecting the value 0xFE49FFE0 to a variable does not
+      give the same result in PHP4 and PHP5 ....
+
+  Version 2.2 :
+    - Try development of PCLZIP_OPT_CRYPT .....
+      However this becomes to a stop. To crypt/decrypt I need to multiply 2 long integers,
+      the result (greater than a long) is not supported by PHP. Even the use of bcmath
+      functions does not help. I did not find yet a solution ...;
+    - Add missing '/' at end of directory entries
+    - Check is a file is encrypted or not. Returns status 'unsupported_encryption' and/or
+      error code PCLZIP_ERR_UNSUPPORTED_ENCRYPTION.
+    - Corrected : Bad "version need to extract" field in local file header
+    - Add private method privCheckFileHeaders() in order to check local and central
+      file headers. PclZip is now supporting purpose bit flag bit 3. Purpose bit flag bit 3 gives
+      the ability to have a local file header without size, compressed size and crc filled.
+    - Add a generic status 'error' for file status
+    - Add control of compression type. PclZip only support deflate compression method.
+      Before v2.2, PclZip does not check the compression method used in an archive while
+      extracting. With v2.2 PclZip returns a new error status for a file using an unsupported
+      compression method. New status is "unsupported_compression". New error code is
+      PCLZIP_ERR_UNSUPPORTED_COMPRESSION.
+    - Add optional attribute PCLZIP_OPT_STOP_ON_ERROR. This will stop the extract of files
+      when errors like 'a folder with same name exists' or 'a newer file exists' or
+      'a write protected file' exists, rather than set a status for the concerning file
+      and resume the extract of the zip.
+    - Add optional attribute PCLZIP_OPT_REPLACE_NEWER. This will force, during an extract' the
+      replacement of the file, even if a  newer version of the file exists.
+      Note that today if a file with the same name already exists but is older it will be
+      replaced by the extracted one.
+    - Improve PclZipUtilOption()
+    - Support of zip archive with trailing bytes. Before 2.2, PclZip checks that the central
+      directory structure is the last data in the archive. Crypt encryption/decryption of
+      zip archive put trailing 0 bytes after decryption. PclZip is now supporting this.
+
+  Version 2.1 :
+    - Add the ability to abort the extraction by using a user callback function.
+      The user can now return the value '2' in its callback which indicates to stop the
+      extraction. For a pre call-back extract is stopped before the extration of the current
+      file. For a post call back, the extraction is stopped after.
+    - Add the ability to extract a file (or several files) directly in the standard output.
+      This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract().
+    - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
+      PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
+      in the zip archive.
+    - When merging two archives, the comments are not any more lost, but merged, with a 
+      blank space separator.
+    - Corrected bug : Files are not deleted when all files are asked to be deleted.
+    - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
+
+
+  Version 2.0 :
+    ***** Warning : Some new features may break the backward compatibility for your scripts.
+                    Please carefully read the readme file.
+    - Add the ability to delete by Index, name and regular expression. This feature is 
+      performed by the method delete(), which uses the optional parameters
+      PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
+    - Add the ability to extract by regular expression. To extract by regexp you must use the method
+      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
+      (depending if you want to use ereg() or preg_match() syntax) followed by the 
+      regular expression pattern.
+    - Add the ability to extract by index, directly with the extract() method. This is a
+      code improvment of the extractByIndex() method.
+    - Add the ability to extract by name. To extract by name you must use the method
+      extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to
+      extract or an array of filenames to extract. To extract all a folder, use the folder
+      name rather than the filename with a '/' at the end.
+    - Add the ability to add files without compression. This is done with a new attribute
+      which is PCLZIP_OPT_NO_COMPRESSION.
+    - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly
+      in a string without using any file (or temporary file).
+    - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string.
+      The default separator is now a comma (,) and not any more a blank space.
+      THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
+      your script.
+    - Improve algorythm performance by removing the use of temporary files when adding or 
+      extracting files in an archive.
+    - Add (correct) detection of empty filename zipping. This can occurs when the removed
+      path is the same
+      as a zipped dir. The dir is not zipped (['status'] = filtered), only its content.
+    - Add better support for windows paths (thanks for help from manus@manusfreedom.com).
+    - Corrected bug : When the archive file already exists with size=0, the add() method
+      fails. Corrected in 2.0.
+    - Remove the use of OS_WINDOWS constant. Use php_uname() function rather.
+    - Control the order of index ranges in extract by index feature.
+    - Change the internal management of folders (better handling of internal flag).
+
+
+  Version 1.3 :
+    - Removing the double include check. This is now done by include_once() and require_once()
+      PHP directives.
+    - Changing the error handling mecanism : Remove the use of an external error library.
+      The former PclError...() functions are replaced by internal equivalent methods.
+      By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library.
+      Introducing the use of constants for error codes rather than integer values. This will help
+      in futur improvment.
+      Introduction of error handling functions like errorCode(), errorName() and errorInfo().
+    - Remove the deprecated use of calling function with arguments passed by reference.
+    - Add the calling of extract(), extractByIndex(), create() and add() functions
+      with variable options rather than fixed arguments.
+    - Add the ability to remove all the file path while extracting or adding,
+      without any need to specify the path to remove.
+      This is available for extract(), extractByIndex(), create() and add() functionS by using
+      the new variable options parameters :
+      - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct.
+    - Ability to change the mode of a file after the extraction (chmod()).
+      This is available for extract() and extractByIndex() functionS by using
+      the new variable options parameters.
+      - PCLZIP_OPT_SET_CHMOD : by setting the value of this option.
+    - Ability to definition call-back options. These call-back will be called during the adding,
+      or the extracting of file (extract(), extractByIndex(), create() and add() functions) :
+      - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user
+        can trigerred the change the filename of the extracted file. The user can triggered the
+        skip of the extraction. This is adding a 'skipped' status in the file list result value.
+      - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file.
+        Nothing can be triggered from that point.
+      - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user
+        can trigerred the change the stored filename of the added file. The user can triggered the
+        skip of the add. This is adding a 'skipped' status in the file list result value.
+      - PCLZIP_CB_POST_ADD : will be called after each add of a file.
+        Nothing can be triggered from that point.
+    - Two status are added in the file list returned as function result : skipped & filename_too_long
+      'skipped' is used when a call-back function ask for skipping the file.
+      'filename_too_long' is used while adding a file with a too long filename to archive (the file is
+      not added)
+    - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into
+      a directory.
+    - Add a check of the presence of the archive file before some actions (like list, ...)
+    - Add the initialisation of field "index" in header array. This means that by
+      default index will be -1 when not explicitly set by the methods.
+
+  Version 1.2 :
+    - Adding a duplicate function.
+    - Adding a merge function. The merge function is a "quick merge" function,
+      it just append the content of an archive at the end of the first one. There
+      is no check for duplicate files or more recent files.
+    - Improve the search of the central directory end.
+
+  Version 1.1.2 :
+
+    - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license
+      (see License section).
+    - Adding the optional support of a static temporary directory. You will need to configure
+      the constant PCLZIP_TEMPORARY_DIR if you want to use this feature.
+    - Improving the rename() function. In some cases rename() does not work (different
+      Filesystems), so it will be replaced by a copy() + unlink() functions.
+
+  Version 1.1.1 :
+
+    - Maintenance release, no new feature.
+
+  Version 1.1 :
+
+    - New method Add() : adding files in the archive
+    - New method ExtractByIndex() : partial extract of the archive, files are identified by
+      their index in the archive
+    - New method DeleteByIndex() : delete some files/folder entries from the archive,
+      files are identified by their index in the archive.
+    - Adding a test of the zlib extension presence. If not present abort the script.
+
+  Version 1.0.1 :
+
+    - No new feature
+
+
+3 - Corrected bugs
+==================
+
+  Corrected in Version 2.0 :
+    - Corrected : During an extraction, if a call-back fucntion is used and try to skip
+                  a file, all the extraction process is stopped. 
+
+  Corrected in Version 1.3 :
+    - Corrected : Support of static synopsis for method extract() is broken.
+    - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF).
+    - Corrected : When an extract is done with a remove_path parameter, the entry for
+      the directory with exactly the same path is not skipped/filtered.
+    - Corrected : extractByIndex() and deleteByIndex() were not managing index in the
+      right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This
+      is due to a sort of the index resulting table that puts 11 before 3-5 (sort on
+      string and not interger). The sort is temporarilly removed, this means that
+      you must provide a sorted list of index ranges.
+
+  Corrected in Version 1.2 :
+
+    - Nothing.
+
+  Corrected in Version 1.1.2 :
+
+    - Corrected : Winzip is unable to delete or add new files in a PclZip created archives.
+
+  Corrected in Version 1.1.1 :
+
+    - Corrected : When archived file is not compressed (0% compression), the
+      extract method fails.
+
+  Corrected in Version 1.1 :
+
+    - Corrected : Adding a complete tree of folder may result in a bad archive
+      creation.
+
+  Corrected in Version 1.0.1 :
+
+    - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
+
+
+4 - Known bugs or limitations
+=============================
+
+  Please publish bugs reports in SourceForge :
+    http://sourceforge.net/tracker/?group_id=40254&atid=427564
+
+  In Version 2.x :
+    - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
+    - PclZip does not support password protected zip archive
+    - Some concern were seen when changing mtime of a file while archiving. 
+      Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
+
+  In Version 1.2 :
+
+    - merge() methods does not check for duplicate files or last date of modifications.
+
+  In Version 1.1 :
+
+    - Limitation : Using 'extract' fields in the file header in the zip archive is not supported.
+    - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to
+      add a file in a PclZip created archive. (Corrected in v.1.2)
+
+  In Version 1.0.1 :
+
+    - Adding a complete tree of folder may result in a bad archive
+      creation. (Corrected in V.1.1).
+    - Path given to methods must be in the unix format (/) and not the Windows format (\).
+      Workaround : Use only / directory separators.
+    - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz
+      added suffix. Files with these names may already exist and may be overwritten.
+      Workaround : none.
+    - PclZip does not check if the zlib extension is present. If it is absent, the zip
+      file is not created and the lib abort without warning.
+      Workaround : enable the zlib extension on the php install
+
+  In Version 1.0 :
+
+    - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
+      (Corrected in v.1.0.1)
+    - Limitation : Multi-disk zip archive are not supported.
+
+
+5 - License
+===========
+
+  Since version 1.1.2, PclZip Library is released under GNU/LGPL license.
+  This library is free, so you can use it at no cost.
+
+  HOWEVER, if you release a script, an application, a library or any kind of
+  code using PclZip library (or a part of it), YOU MUST :
+  - Indicate in the documentation (or a readme file), that your work
+    uses PclZip Library, and make a reference to the author and the web site
+    http://www.phpconcept.net
+  - Gives the ability to the final user to update the PclZip libary.
+
+  I will also appreciate that you send me a mail (vincent@phpconcept.net), just to
+  be aware that someone is using PclZip.
+
+  For more information about GNU/LGPL license : http://www.gnu.org
+
+6 - Warning
+=================
+
+  This library and the associated files are non commercial, non professional work.
+  It should not have unexpected results. However if any damage is caused by this software
+  the author can not be responsible.
+  The use of this software is at the risk of the user.
+
+7 - Documentation
+=================
+  PclZip User Manuel is available in English on PhpConcept : http://www.phpconcept.net/pclzip/man/en/index.php
+  A Russian translation was done by Feskov Kuzma : http://php.russofile.ru/ru/authors/unsort/zip/
+
+8 - Author
+==========
+
+  This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time.
+
+9 - Contribute
+==============
+  If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net.
+  If you can help in financing PhpConcept hosting service, please go to
+  http://www.phpconcept.net/soutien.php
diff --git a/app/vendor/piwik/decompress/phpunit.xml b/app/vendor/piwik/decompress/phpunit.xml
deleted file mode 100644
index b9aa39406..000000000
--- a/app/vendor/piwik/decompress/phpunit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    phpunit -c phpunit.xml
--->
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php">
-
-    <testsuites>
-        <testsuite name="Test suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
-
-</phpunit>
diff --git a/app/vendor/piwik/decompress/src/Gzip.php b/app/vendor/piwik/decompress/src/Gzip.php
old mode 100644
new mode 100755
diff --git a/app/vendor/piwik/decompress/src/Tar.php b/app/vendor/piwik/decompress/src/Tar.php
old mode 100644
new mode 100755
diff --git a/app/vendor/piwik/device-detector/composer.json b/app/vendor/piwik/device-detector/composer.json
deleted file mode 100644
index 533e0f5c1..000000000
--- a/app/vendor/piwik/device-detector/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "piwik/device-detector",
-    "type": "library",
-    "description": "The Universal Device Detection library, that parses User Agents and detects devices (desktop, tablet, mobile, tv, cars, console, etc.), clients (browsers, media players, mobile apps, feed readers, libraries, etc), operating systems, devices, brands and models.",
-    "keywords": ["useragent","parser","devicedetection"],
-    "homepage": "https://matomo.org",
-    "license": "LGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "The Matomo Team",
-            "email": "hello@matomo.org",
-            "homepage": "https://matomo.org/team/"
-        }
-    ],
-    "support": {
-        "forum": "http://forum.matomo.org/",
-        "issues": "https://github.com/matomo-org/device-detector/issues",
-        "wiki": "https://dev.matomo.org/",
-        "source": "https://github.com/matomo-org/piwik"
-    },
-    "autoload": {
-        "psr-4": { "DeviceDetector\\": "" }
-    },
-    "require": {
-        "php": ">=5.5",
-        "mustangostang/spyc": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
-        "fabpot/php-cs-fixer": "~1.7",
-        "psr/cache": "^1.0",
-        "psr/simple-cache": "^1.0",
-        "matthiasmullie/scrapbook": "@stable"
-    },
-    "suggest": {
-        "doctrine/cache": "Can directly be used for caching purpose",
-        "ext-yaml": "Necessary for using the Pecl YAML parser"
-    },
-    "archive": {
-        "exclude": ["/autoload.php"]
-    }
-}
diff --git a/app/vendor/piwik/ini/composer.json b/app/vendor/piwik/ini/composer.json
deleted file mode 100644
index 7d486b409..000000000
--- a/app/vendor/piwik/ini/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "piwik/ini",
-    "type": "library",
-    "license": "LGPL-3.0",
-    "autoload": {
-        "psr-4": {
-            "Piwik\\Ini\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Piwik\\Tests\\Ini\\": "tests/"
-        }
-    },
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "athletic/athletic": "0.1.*"
-    }
-}
diff --git a/app/vendor/piwik/ini/phpunit.xml b/app/vendor/piwik/ini/phpunit.xml
deleted file mode 100644
index cda26b984..000000000
--- a/app/vendor/piwik/ini/phpunit.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php">
-
-    <testsuites>
-        <testsuite name="Test suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
\ No newline at end of file
diff --git a/app/vendor/piwik/network/composer.json b/app/vendor/piwik/network/composer.json
deleted file mode 100644
index 74fd79b11..000000000
--- a/app/vendor/piwik/network/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "piwik/network",
-    "type": "library",
-    "license": "LGPL-3.0",
-    "autoload": {
-        "psr-4": {
-            "Piwik\\Network\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Piwik\\Network\\": "tests/"
-        }
-    },
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    }
-}
diff --git a/app/vendor/piwik/network/phpunit.xml b/app/vendor/piwik/network/phpunit.xml
deleted file mode 100644
index 00124c92c..000000000
--- a/app/vendor/piwik/network/phpunit.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    phpunit -c phpunit.xml
--->
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php">
-
-    <testsuites>
-        <testsuite name="Test suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/app/vendor/piwik/piwik-php-tracker/PiwikTracker.php b/app/vendor/piwik/piwik-php-tracker/PiwikTracker.php
index 1737f603e..72bdc2a5b 100644
--- a/app/vendor/piwik/piwik-php-tracker/PiwikTracker.php
+++ b/app/vendor/piwik/piwik-php-tracker/PiwikTracker.php
@@ -516,7 +516,7 @@ protected static function domainFixup($domain)
         if (strlen($domain) > 0) {
             $dl = strlen($domain) - 1;
             // remove trailing '.'
-            if ($domain{$dl} === '.') {
+	        if ($domain[$dl] === '.') {
                 $domain = substr($domain, 0, $dl);
             }
             // remove leading '*'
@@ -1674,14 +1674,13 @@ protected function getRequest($idSite)
         if (!empty($this->customParameters)) {
             $customFields = '&' . http_build_query($this->customParameters, '', '&');
         }
-        $baseUrl = $this->getBaseUrl();
-        $start = '?';
-        if (strpos($baseUrl, '?') !== false) {
-        	$start = '&';
-        }
-
-        $url = $baseUrl . $start .
-            '&idsite=' . $idSite .
+	    $baseUrl = $this->getBaseUrl();
+	    $start = '?';
+	    if (strpos($baseUrl, '?') !== false) {
+		    $start = '&';
+	    }
+	    $url = $baseUrl . $start .
+            'idsite=' . $idSite .
             '&rec=1' .
             '&apiv=' . self::VERSION .
             '&r=' . substr(strval(mt_rand()), 2, 6) .
diff --git a/app/vendor/piwik/piwik-php-tracker/composer.json b/app/vendor/piwik/piwik-php-tracker/composer.json
deleted file mode 100644
index 4b7babd14..000000000
--- a/app/vendor/piwik/piwik-php-tracker/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "piwik/piwik-php-tracker",
-    "description": "PHP Client for Piwik Analytics Tracking API",
-    "keywords": ["piwik","tracker","analytics"],
-    "homepage": "http://piwik.org",
-    "license": "BSD-2-Clause",
-    "authors": [
-        {
-            "name": "The Piwik Team",
-            "email": "hello@piwik.org",
-            "homepage": "http://piwik.org/the-piwik-team/"
-        }
-    ],
-    "support": {
-        "forum": "http://forum.piwik.org/",
-        "issues": "https://github.com/piwik/piwik-php-tracker/issues",
-        "source": "https://github.com/piwik/piwik-php-tracker"
-    },
-    "autoload": {
-        "classmap": ["."]
-    }
-}
diff --git a/app/vendor/psr/container/composer.json b/app/vendor/psr/container/composer.json
deleted file mode 100644
index b8ee01265..000000000
--- a/app/vendor/psr/container/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "psr/container",
-    "type": "library",
-    "description": "Common Container Interface (PHP FIG PSR-11)",
-    "keywords": ["psr", "psr-11", "container", "container-interop", "container-interface"],
-    "homepage": "https://github.com/php-fig/container",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Container\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/psr/log/composer.json b/app/vendor/psr/log/composer.json
deleted file mode 100644
index 87934d707..000000000
--- a/app/vendor/psr/log/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "psr/log",
-    "description": "Common interface for logging libraries",
-    "keywords": ["psr", "psr-3", "log"],
-    "homepage": "https://github.com/php-fig/log",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Log\\": "Psr/Log/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/symfony/console/Symfony/Component/Console/composer.json b/app/vendor/symfony/console/Symfony/Component/Console/composer.json
deleted file mode 100644
index 2efbd2cbb..000000000
--- a/app/vendor/symfony/console/Symfony/Component/Console/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "symfony/console",
-    "type": "library",
-    "description": "Symfony Console Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/event-dispatcher": "~2.1",
-        "symfony/process": "~2.1",
-        "psr/log": "~1.0"
-    },
-    "suggest": {
-        "symfony/event-dispatcher": "",
-        "symfony/process": "",
-        "psr/log": "For using the console logger"
-    },
-    "autoload": {
-        "psr-0": { "Symfony\\Component\\Console\\": "" }
-    },
-    "target-dir": "Symfony/Component/Console",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev"
-        }
-    }
-}
diff --git a/app/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist b/app/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist
deleted file mode 100644
index 729c433aa..000000000
--- a/app/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="Symfony Console Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json b/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
deleted file mode 100644
index 1b1bd39ac..000000000
--- a/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "symfony/event-dispatcher",
-    "type": "library",
-    "description": "Symfony EventDispatcher Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/dependency-injection": "~2.6",
-        "symfony/expression-language": "~2.6",
-        "symfony/config": "~2.0,>=2.0.5",
-        "symfony/stopwatch": "~2.3",
-        "psr/log": "~1.0"
-    },
-    "suggest": {
-        "symfony/dependency-injection": "",
-        "symfony/http-kernel": ""
-    },
-    "autoload": {
-        "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" }
-    },
-    "target-dir": "Symfony/Component/EventDispatcher",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev"
-        }
-    }
-}
diff --git a/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist b/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist
deleted file mode 100644
index b14fde575..000000000
--- a/app/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="Symfony EventDispatcher Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/composer.json b/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/composer.json
deleted file mode 100644
index d4457d8a3..000000000
--- a/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "symfony/monolog-bridge",
-    "type": "symfony-bridge",
-    "description": "Symfony Monolog Bridge",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "monolog/monolog": "~1.11"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/http-kernel": "~2.4",
-        "symfony/console": "~2.4",
-        "symfony/event-dispatcher": "~2.2"
-    },
-    "suggest": {
-        "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
-        "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
-        "symfony/event-dispatcher": "Needed when using log messages in console commands"
-     },
-    "autoload": {
-        "psr-0": { "Symfony\\Bridge\\Monolog\\": "" }
-    },
-    "target-dir": "Symfony/Bridge/Monolog",
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev"
-        }
-    }
-}
diff --git a/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/phpunit.xml.dist b/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/phpunit.xml.dist
deleted file mode 100644
index efd48709d..000000000
--- a/app/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/phpunit.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="Symfony Monolog Bridge Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/app/vendor/symfony/polyfill-ctype/composer.json b/app/vendor/symfony/polyfill-ctype/composer.json
deleted file mode 100644
index c24e20ca7..000000000
--- a/app/vendor/symfony/polyfill-ctype/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "symfony/polyfill-ctype",
-    "type": "library",
-    "description": "Symfony polyfill for ctype functions",
-    "keywords": ["polyfill", "compatibility", "portable", "ctype"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Gert de Pagter",
-            "email": "BackEndTea@gmail.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" },
-        "files": [ "bootstrap.php" ]
-    },
-    "suggest": {
-        "ext-ctype": "For best performance"
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.11-dev"
-        }
-    }
-}
diff --git a/app/vendor/szymach/c-pchart/composer.json b/app/vendor/szymach/c-pchart/composer.json
deleted file mode 100644
index 7d571ee3c..000000000
--- a/app/vendor/szymach/c-pchart/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "szymach/c-pchart",
-    "license": "GPL-3.0",
-    "type": "project",
-    "description": "Port of \"pChart\" library into PHP 5",
-    "keywords": ["pchart", "pChart", "statistics", "charts", "CpChart", "c-pChart"],
-    "homepage": "https://github.com/szymach/c-pchart",
-    "authors": [
-        {
-            "name": "Jean-Damien Pogolotti",
-            "homepage": "http://www.pchart.net",
-            "role": "Creator of the original pChart library"
-        },
-        {
-            "name": "Piotr Szymaszek",
-            "homepage": "https://github.com/szymach",
-            "role": "Developer of the CpChart wrapper package"
-        }
-    ],
-    "autoload": {
-        "psr-4": { "CpChart\\": "src/" },
-        "files": ["src/Resources/data/constants.php"]
-    },
-    "autoload-dev": {
-        "psr-4": { "Test\\CpChart\\": "tests/" }
-    },
-    "require": {
-        "php": ">=5.4",
-        "ext-gd": "*"
-    },
-    "require-dev" : {
-        "codeception/codeception": "^2.3",
-        "phpunit/phpunit": "^4.8|6.1",
-        "squizlabs/php_codesniffer": "^2.8|3.0"
-    },
-    "config": {
-        "bin-dir": "bin"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
-    }
-}
diff --git a/app/vendor/szymach/c-pchart/coverage.sh b/app/vendor/szymach/c-pchart/coverage.sh
old mode 100644
new mode 100755
diff --git a/app/vendor/tecnickcom/tcpdf/composer.json b/app/vendor/tecnickcom/tcpdf/composer.json
deleted file mode 100644
index 1f19dfd86..000000000
--- a/app/vendor/tecnickcom/tcpdf/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "tecnickcom/tcpdf",
-  "version": "6.2.26",
-  "homepage": "http://www.tcpdf.org/",
-  "type": "library",
-  "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
-  "keywords": [
-    "PDF",
-    "tcpdf",
-    "PDFD32000-2008",
-    "qrcode",
-    "datamatrix",
-    "pdf417",
-    "barcodes"
-  ],
-  "license": "LGPL-3.0",
-  "authors": [
-    {
-      "name": "Nicola Asuni",
-      "email": "info@tecnick.com",
-      "role": "lead"
-    }
-  ],
-  "require": {
-    "php": ">=5.3.0"
-  },
-  "autoload": {
-    "classmap": [
-      "config",
-      "include",
-      "tcpdf.php",
-      "tcpdf_parser.php",
-      "tcpdf_import.php",
-      "tcpdf_barcodes_1d.php",
-      "tcpdf_barcodes_2d.php",
-      "include/tcpdf_colors.php",
-      "include/tcpdf_filters.php",
-      "include/tcpdf_font_data.php",
-      "include/tcpdf_fonts.php",
-      "include/tcpdf_images.php",
-      "include/tcpdf_static.php",
-      "include/barcodes/datamatrix.php",
-      "include/barcodes/pdf417.php",
-      "include/barcodes/qrcode.php"
-    ]
-  }
-}
diff --git a/app/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php b/app/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
old mode 100644
new mode 100755
diff --git a/app/vendor/twig/twig/.php_cs.dist b/app/vendor/twig/twig/.php_cs.dist
index 1b31c0a3d..b81882fbf 100644
--- a/app/vendor/twig/twig/.php_cs.dist
+++ b/app/vendor/twig/twig/.php_cs.dist
@@ -4,6 +4,8 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
         'array_syntax' => ['syntax' => 'short'],
         'php_unit_fqcn_annotation' => true,
         'no_unreachable_default_argument_value' => false,
diff --git a/app/vendor/twig/twig/CHANGELOG b/app/vendor/twig/twig/CHANGELOG
index 86f3617cf..6ca3d45a1 100644
--- a/app/vendor/twig/twig/CHANGELOG
+++ b/app/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,62 @@
+* 1.42.3 (2019-08-24)
+
+ * fixed the "split" filter when the delimiter is "0"
+ * fixed the "empty" test on Traversable instances
+ * fixed cache when opcache is installed but disabled
+ * fixed PHP 7.4 compatibility
+ * bumped the minimal PHP version to 5.5
+
+* 1.42.2 (2019-06-18)
+
+ * Display partial output (PHP buffer) when an error occurs in debug mode
+
+* 1.42.1 (2019-06-04)
+
+ * added support for "Twig\Markup" instances in the "in" test (again)
+ * allowed string operators as variables names in assignments
+
+* 1.42.0 (2019-05-31)
+
+ * fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator (\SimpleXmlElement for instance)
+ * fixed a PHP fatal error when calling a macro imported in a block in a nested block
+ * fixed a PHP fatal error when calling a macro imported in the template in another macro
+ * fixed wrong error message on "import" and "from"
+
+* 1.41.0 (2019-05-14)
+
+ * fixed support for PHP 7.4
+ * added "filter", "map", and "reduce" filters (and support for arrow functions)
+ * fixed partial output leak when a PHP fatal error occurs
+ * optimized context access on PHP 7.4
+
+* 1.40.1 (2019-04-29)
+
+* fixed regression in NodeTraverser
+
+* 1.40.0 (2019-04-28)
+
+ * allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
+ * added the "apply" tag as a replacement for the "filter" tag
+ * allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
+ * added support for "Twig\Markup" instances in the "in" test
+ * fixed Lexer when using custom options containing the # char
+ * fixed "import" when macros are stored in a template string
+
+* 1.39.1 (2019-04-16)
+
+ * fixed EscaperNodeVisitor
+
+* 1.39.0 (2019-04-16)
+
+ * added Traversable support for the length filter
+ * fixed some wrong location in error messages
+ * made exception creation faster
+ * made escaping on ternary expressions (?: and ??) more fine-grained
+ * added the possibility to give a nice name to string templates (template_from_string function)
+ * fixed the "with" behavior to always include the globals (for consistency with the "include" and "embed" tags)
+ * fixed "include" with "ignore missing" when an error loading occurs in the included template
+ * added support for a new whitespace trimming option ({%~ ~%}, {{~ ~}}, {#~ ~#})
+
 * 1.38.4 (2019-03-23)
 
  * fixed CheckToStringNode implementation (broken when a function/filter is variadic)
diff --git a/app/vendor/twig/twig/README.rst b/app/vendor/twig/twig/README.rst
index f33ea336d..d896ff500 100644
--- a/app/vendor/twig/twig/README.rst
+++ b/app/vendor/twig/twig/README.rst
@@ -7,6 +7,15 @@ and documentation).
 Twig uses a syntax similar to the Django and Jinja template languages which
 inspired the Twig runtime environment.
 
+Sponsors
+--------
+
+.. raw:: html
+
+    <a href="https://blackfire.io/docs/introduction?utm_source=twig&utm_medium=github_readme&utm_campaign=logo">
+        <img src="https://static.blackfire.io/assets/intemporals/logo/png/blackfire-io_secondary_horizontal_transparent.png?1" width="255px" alt="Blackfire.io">
+    </a>
+
 More Information
 ----------------
 
diff --git a/app/vendor/twig/twig/composer.json b/app/vendor/twig/twig/composer.json
deleted file mode 100644
index 7eae2f075..000000000
--- a/app/vendor/twig/twig/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "twig/twig",
-    "type": "library",
-    "description": "Twig, the flexible, fast, and secure template language for PHP",
-    "keywords": ["templating"],
-    "homepage": "https://twig.symfony.com",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com",
-            "homepage": "http://fabien.potencier.org",
-            "role": "Lead Developer"
-        },
-        {
-            "name": "Twig Team",
-            "homepage": "https://twig.symfony.com/contributors",
-            "role": "Contributors"
-        },
-        {
-            "name": "Armin Ronacher",
-            "email": "armin.ronacher@active-4.com",
-            "role": "Project Founder"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "symfony/polyfill-ctype": "^1.8"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
-        "symfony/debug": "^2.7",
-        "psr/container": "^1.0"
-    },
-    "autoload": {
-        "psr-0" : {
-            "Twig_" : "lib/"
-        },
-        "psr-4" : {
-            "Twig\\" : "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.38-dev"
-        }
-    }
-}
diff --git a/app/vendor/twig/twig/drupal_test.sh b/app/vendor/twig/twig/drupal_test.sh
new file mode 100755
index 000000000..0374593c2
--- /dev/null
+++ b/app/vendor/twig/twig/drupal_test.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -x
+set -e
+
+REPO=`pwd`
+cd /tmp
+rm -rf drupal-twig-test
+composer create-project --no-interaction drupal-composer/drupal-project:8.x-dev drupal-twig-test
+cd drupal-twig-test
+(cd vendor/twig && rm -rf twig && ln -sf $REPO twig)
+echo '$config["system.logging"]["error_level"] = "verbose";' >> web/sites/default/settings.php
+php ./web/core/scripts/drupal install --no-interaction demo_umami > output
+perl -p -i -e 's/^([A-Za-z]+)\: (.+)$/export DRUPAL_\1=\2/' output
+source output
+
+wget https://get.symfony.com/cli/installer -O - | bash
+export PATH="$HOME/.symfony/bin:$PATH"
+symfony server:start -d --no-tls
+ENDPOINT=`symfony server:status -no-ansi | sed -E 's/^.+ http/http/'`
+
+curl -OLsS https://get.blackfire.io/blackfire-player.phar
+chmod +x blackfire-player.phar
+cat > drupal-tests.bkf <<EOF
+name "Drupal tests"
+
+scenario
+    name "homepage"
+    set name "admin"
+    set pass "pass"
+
+    visit url('/')
+        expect status_code() == 200
+    click link('Articles')
+        expect status_code() == 200
+    click link('Dairy-free and delicious milk chocolate')
+        expect body() matches "/Dairy\-free milk chocolate is made in largely the same way as regular chocolate/"
+        expect status_code() == 200
+    click link('Log in')
+        expect status_code() == 200
+    submit button("Log in")
+        param name name
+        param pass pass
+        expect status_code() == 303
+    follow
+        expect status_code() == 200
+    click link('Structure')
+        expect status_code() == 200
+EOF
+./blackfire-player.phar run drupal-tests.bkf --endpoint=$ENDPOINT --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
+symfony server:stop
diff --git a/app/vendor/twig/twig/ext/twig/php_twig.h b/app/vendor/twig/twig/ext/twig/php_twig.h
index d5b4cbf0d..79ac938df 100644
--- a/app/vendor/twig/twig/ext/twig/php_twig.h
+++ b/app/vendor/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.38.4"
+#define PHP_TWIG_VERSION "1.42.3"
 
 #include "php.h"
 
diff --git a/app/vendor/twig/twig/phpunit.xml.dist b/app/vendor/twig/twig/phpunit.xml.dist
deleted file mode 100644
index c321f2bcb..000000000
--- a/app/vendor/twig/twig/phpunit.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="vendor/autoload.php"
->
-  <testsuites>
-    <testsuite name="Twig Test Suite">
-      <directory>./test/Twig/</directory>
-    </testsuite>
-  </testsuites>
-
-  <php>
-    <ini name="error_reporting" value="-1" />
-  </php>
-
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-  </listeners>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/app/vendor/twig/twig/src/Cache/FilesystemCache.php b/app/vendor/twig/twig/src/Cache/FilesystemCache.php
index 7e228799a..b7c1e438e 100644
--- a/app/vendor/twig/twig/src/Cache/FilesystemCache.php
+++ b/app/vendor/twig/twig/src/Cache/FilesystemCache.php
@@ -67,8 +67,8 @@ public function write($key, $content)
 
             if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
                 // Compile cached file into bytecode cache
-                if (\function_exists('opcache_invalidate')) {
-                    opcache_invalidate($key, true);
+                if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
+                    @opcache_invalidate($key, true);
                 } elseif (\function_exists('apc_compile_file')) {
                     apc_compile_file($key);
                 }
diff --git a/app/vendor/twig/twig/src/Environment.php b/app/vendor/twig/twig/src/Environment.php
index f99e4d37a..acd8233a7 100644
--- a/app/vendor/twig/twig/src/Environment.php
+++ b/app/vendor/twig/twig/src/Environment.php
@@ -41,11 +41,11 @@
  */
 class Environment
 {
-    const VERSION = '1.38.4';
-    const VERSION_ID = 13804;
-    const MAJOR_VERSION = 2;
-    const MINOR_VERSION = 38;
-    const RELEASE_VERSION = 4;
+    const VERSION = '1.42.3';
+    const VERSION_ID = 14203;
+    const MAJOR_VERSION = 1;
+    const MINOR_VERSION = 42;
+    const RELEASE_VERSION = 3;
     const EXTRA_VERSION = '';
 
     protected $charset;
@@ -83,7 +83,6 @@ class Environment
     private $runtimeLoaders = [];
     private $runtimes = [];
     private $optionsHash;
-    private $loading = [];
 
     /**
      * Constructor.
@@ -471,6 +470,7 @@ public function loadClass($cls, $name, $index = null)
                 $this->cache->load($key);
             }
 
+            $source = null;
             if (!class_exists($cls, false)) {
                 $loader = $this->getLoader();
                 if (!$loader instanceof SourceContextLoaderInterface) {
@@ -507,22 +507,7 @@ public function loadClass($cls, $name, $index = null)
             $this->initRuntime();
         }
 
-        if (isset($this->loading[$cls])) {
-            throw new RuntimeError(sprintf('Circular reference detected for Twig template "%s", path: %s.', $name, implode(' -> ', array_merge($this->loading, [$name]))));
-        }
-
-        $this->loading[$cls] = $name;
-
-        try {
-            $this->loadedTemplates[$cls] = new $cls($this);
-            unset($this->loading[$cls]);
-        } catch (\Exception $e) {
-            unset($this->loading[$cls]);
-
-            throw $e;
-        }
-
-        return $this->loadedTemplates[$cls];
+        return $this->loadedTemplates[$cls] = new $cls($this);
     }
 
     /**
@@ -531,15 +516,21 @@ public function loadClass($cls, $name, $index = null)
      * This method should not be used as a generic way to load templates.
      *
      * @param string $template The template name
+     * @param string $name     An optional name of the template to be used in error messages
      *
      * @return TemplateWrapper A template instance representing the given template name
      *
      * @throws LoaderError When the template cannot be found
      * @throws SyntaxError When an error occurred during compilation
      */
-    public function createTemplate($template)
+    public function createTemplate($template, $name = null)
     {
-        $name = sprintf('__string_template__%s', hash('sha256', $template, false));
+        $hash = hash('sha256', $template, false);
+        if (null !== $name) {
+            $name = sprintf('%s (string template %s)', $name, $hash);
+        } else {
+            $name = sprintf('__string_template__%s', $hash);
+        }
 
         $loader = new ChainLoader([
             new ArrayLoader([$name => $template]),
diff --git a/app/vendor/twig/twig/src/Error/Error.php b/app/vendor/twig/twig/src/Error/Error.php
index e43a36374..2aa70f153 100644
--- a/app/vendor/twig/twig/src/Error/Error.php
+++ b/app/vendor/twig/twig/src/Error/Error.php
@@ -49,21 +49,15 @@ class Error extends \Exception
     /**
      * Constructor.
      *
-     * Set both the line number and the name to false to
-     * disable automatic guessing of the original template name
-     * and line number.
-     *
      * Set the line number to -1 to enable its automatic guessing.
      * Set the name to null to enable its automatic guessing.
      *
-     * By default, automatic guessing is enabled.
-     *
      * @param string             $message  The error message
      * @param int                $lineno   The template line where the error occurred
      * @param Source|string|null $source   The source context where the error occurred
      * @param \Exception         $previous The previous exception
      */
-    public function __construct($message, $lineno = -1, $source = null, \Exception $previous = null, $autoGuess = true)
+    public function __construct($message, $lineno = -1, $source = null, \Exception $previous = null)
     {
         if (null === $source) {
             $name = null;
@@ -79,13 +73,7 @@ public function __construct($message, $lineno = -1, $source = null, \Exception $
 
         $this->lineno = $lineno;
         $this->filename = $name;
-
-        if ($autoGuess && (-1 === $lineno || null === $name || null === $this->sourcePath)) {
-            $this->guessTemplateInfo();
-        }
-
         $this->rawMessage = $message;
-
         $this->updateRepr();
     }
 
diff --git a/app/vendor/twig/twig/src/Error/LoaderError.php b/app/vendor/twig/twig/src/Error/LoaderError.php
index 5a1cd1ecc..dc5a9f1af 100644
--- a/app/vendor/twig/twig/src/Error/LoaderError.php
+++ b/app/vendor/twig/twig/src/Error/LoaderError.php
@@ -14,22 +14,10 @@
 /**
  * Exception thrown when an error occurs during template loading.
  *
- * Automatic template information guessing is always turned off as
- * if a template cannot be loaded, there is nothing to guess.
- * However, when a template is loaded from another one, then, we need
- * to find the current context and this is automatically done by
- * Twig\Template::displayWithErrorHandling().
- *
- * This strategy makes Twig\Environment::resolveTemplate() much faster.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class LoaderError extends Error
 {
-    public function __construct($message, $lineno = -1, $source = null, \Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $source, $previous, false);
-    }
 }
 
 class_alias('Twig\Error\LoaderError', 'Twig_Error_Loader');
diff --git a/app/vendor/twig/twig/src/ExpressionParser.php b/app/vendor/twig/twig/src/ExpressionParser.php
index a786e6fb1..9066ade16 100644
--- a/app/vendor/twig/twig/src/ExpressionParser.php
+++ b/app/vendor/twig/twig/src/ExpressionParser.php
@@ -14,6 +14,7 @@
 
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\ArrowFunctionExpression;
 use Twig\Node\Expression\AssignNameExpression;
 use Twig\Node\Expression\Binary\ConcatBinary;
 use Twig\Node\Expression\BlockReferenceExpression;
@@ -68,8 +69,12 @@ public function __construct(Parser $parser, $env = null)
         }
     }
 
-    public function parseExpression($precedence = 0)
+    public function parseExpression($precedence = 0, $allowArrow = false)
     {
+        if ($allowArrow && $arrow = $this->parseArrow()) {
+            return $arrow;
+        }
+
         $expr = $this->getPrimary();
         $token = $this->parser->getCurrentToken();
         while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
@@ -98,6 +103,64 @@ public function parseExpression($precedence = 0)
         return $expr;
     }
 
+    /**
+     * @return ArrowFunctionExpression|null
+     */
+    private function parseArrow()
+    {
+        $stream = $this->parser->getStream();
+
+        // short array syntax (one argument, no parentheses)?
+        if ($stream->look(1)->test(Token::ARROW_TYPE)) {
+            $line = $stream->getCurrent()->getLine();
+            $token = $stream->expect(Token::NAME_TYPE);
+            $names = [new AssignNameExpression($token->getValue(), $token->getLine())];
+            $stream->expect(Token::ARROW_TYPE);
+
+            return new ArrowFunctionExpression($this->parseExpression(0), new Node($names), $line);
+        }
+
+        // first, determine if we are parsing an arrow function by finding => (long form)
+        $i = 0;
+        if (!$stream->look($i)->test(Token::PUNCTUATION_TYPE, '(')) {
+            return null;
+        }
+        ++$i;
+        while (true) {
+            // variable name
+            ++$i;
+            if (!$stream->look($i)->test(Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+            ++$i;
+        }
+        if (!$stream->look($i)->test(Token::PUNCTUATION_TYPE, ')')) {
+            return null;
+        }
+        ++$i;
+        if (!$stream->look($i)->test(Token::ARROW_TYPE)) {
+            return null;
+        }
+
+        // yes, let's parse it properly
+        $token = $stream->expect(Token::PUNCTUATION_TYPE, '(');
+        $line = $token->getLine();
+
+        $names = [];
+        while (true) {
+            $token = $stream->expect(Token::NAME_TYPE);
+            $names[] = new AssignNameExpression($token->getValue(), $token->getLine());
+
+            if (!$stream->nextIf(Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+        }
+        $stream->expect(Token::PUNCTUATION_TYPE, ')');
+        $stream->expect(Token::ARROW_TYPE);
+
+        return new ArrowFunctionExpression($this->parseExpression(0), new Node($names), $line);
+    }
+
     protected function getPrimary()
     {
         $token = $this->parser->getCurrentToken();
@@ -499,7 +562,7 @@ public function parseFilterExpressionRaw($node, $tag = null)
             if (!$this->parser->getStream()->test(Token::PUNCTUATION_TYPE, '(')) {
                 $arguments = new Node();
             } else {
-                $arguments = $this->parseArguments(true);
+                $arguments = $this->parseArguments(true, false, true);
             }
 
             $class = $this->getFilterNodeClass($name->getAttribute('value'), $token->getLine());
@@ -526,7 +589,7 @@ public function parseFilterExpressionRaw($node, $tag = null)
      *
      * @throws SyntaxError
      */
-    public function parseArguments($namedArguments = false, $definition = false)
+    public function parseArguments($namedArguments = false, $definition = false, $allowArrow = false)
     {
         $args = [];
         $stream = $this->parser->getStream();
@@ -541,7 +604,7 @@ public function parseArguments($namedArguments = false, $definition = false)
                 $token = $stream->expect(Token::NAME_TYPE, null, 'An argument must be a name');
                 $value = new NameExpression($token->getValue(), $this->parser->getCurrentToken()->getLine());
             } else {
-                $value = $this->parseExpression();
+                $value = $this->parseExpression(0, $allowArrow);
             }
 
             $name = null;
@@ -558,7 +621,7 @@ public function parseArguments($namedArguments = false, $definition = false)
                         throw new SyntaxError(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext());
                     }
                 } else {
-                    $value = $this->parseExpression();
+                    $value = $this->parseExpression(0, $allowArrow);
                 }
             }
 
@@ -586,7 +649,13 @@ public function parseAssignmentExpression()
         $stream = $this->parser->getStream();
         $targets = [];
         while (true) {
-            $token = $stream->expect(Token::NAME_TYPE, null, 'Only variables can be assigned to');
+            $token = $this->parser->getCurrentToken();
+            if ($stream->test(Token::OPERATOR_TYPE) && preg_match(Lexer::REGEX_NAME, $token->getValue())) {
+                // in this context, string operators are variable names
+                $this->parser->getStream()->next();
+            } else {
+                $stream->expect(Token::NAME_TYPE, null, 'Only variables can be assigned to');
+            }
             $value = $token->getValue();
             if (\in_array(strtolower($value), ['true', 'false', 'none', 'null'])) {
                 throw new SyntaxError(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
@@ -627,7 +696,7 @@ private function parseTestExpression(\Twig_NodeInterface $node)
         $class = $this->getTestNodeClass($test);
         $arguments = null;
         if ($stream->test(Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $this->parser->getExpressionParser()->parseArguments(true);
+            $arguments = $this->parseArguments(true);
         }
 
         return new $class($node, $name, $arguments, $this->parser->getCurrentToken()->getLine());
diff --git a/app/vendor/twig/twig/src/Extension/CoreExtension.php b/app/vendor/twig/twig/src/Extension/CoreExtension.php
index c959e315b..5f3cc24a1 100644
--- a/app/vendor/twig/twig/src/Extension/CoreExtension.php
+++ b/app/vendor/twig/twig/src/Extension/CoreExtension.php
@@ -11,6 +11,7 @@
 
 namespace Twig\Extension {
 use Twig\ExpressionParser;
+use Twig\TokenParser\ApplyTokenParser;
 use Twig\TokenParser\BlockTokenParser;
 use Twig\TokenParser\DeprecatedTokenParser;
 use Twig\TokenParser\DoTokenParser;
@@ -139,6 +140,7 @@ public function getNumberFormat()
     public function getTokenParsers()
     {
         return [
+            new ApplyTokenParser(),
             new ForTokenParser(),
             new IfTokenParser(),
             new ExtendsTokenParser(),
@@ -192,6 +194,9 @@ public function getFilters()
             new TwigFilter('sort', 'twig_sort_filter'),
             new TwigFilter('merge', 'twig_array_merge'),
             new TwigFilter('batch', 'twig_array_batch'),
+            new TwigFilter('filter', 'twig_array_filter'),
+            new TwigFilter('map', 'twig_array_map'),
+            new TwigFilter('reduce', 'twig_array_reduce'),
 
             // string/array filters
             new TwigFilter('reverse', 'twig_reverse_filter', ['needs_environment' => true]),
@@ -514,7 +519,9 @@ function twig_replace_filter($str, $from, $to = null)
         @trigger_error('Using "replace" with character by character replacement is deprecated since version 1.22 and will be removed in Twig 2.0', E_USER_DEPRECATED);
 
         return strtr($str, $from, $to);
-    } elseif (!twig_test_iterable($from)) {
+    }
+
+    if (!twig_test_iterable($from)) {
         throw new RuntimeError(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', \is_object($from) ? \get_class($from) : \gettype($from)));
     }
 
@@ -668,7 +675,7 @@ function twig_slice(Environment $env, $item, $start, $length = null, $preserveKe
         if ($start >= 0 && $length >= 0 && $item instanceof \Iterator) {
             try {
                 return iterator_to_array(new \LimitIterator($item, $start, null === $length ? -1 : $length), $preserveKeys);
-            } catch (\OutOfBoundsException $exception) {
+            } catch (\OutOfBoundsException $e) {
                 return [];
             }
         }
@@ -739,9 +746,13 @@ function twig_last(Environment $env, $item)
  */
 function twig_join_filter($value, $glue = '', $and = null)
 {
+    if (!twig_test_iterable($value)) {
+        $value = (array) $value;
+    }
+
     $value = twig_to_array($value, false);
 
-    if (!\is_array($value) || 0 === \count($value)) {
+    if (0 === \count($value)) {
         return '';
     }
 
@@ -779,7 +790,7 @@ function twig_join_filter($value, $glue = '', $and = null)
  */
 function twig_split_filter(Environment $env, $value, $delimiter, $limit = null)
 {
-    if (!empty($delimiter)) {
+    if (\strlen($delimiter) > 0) {
         return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
     }
 
@@ -929,6 +940,13 @@ function twig_sort_filter($array)
  */
 function twig_in_filter($value, $compare)
 {
+    if ($value instanceof Markup) {
+        $value = (string) $value;
+    }
+    if ($compare instanceof Markup) {
+        $compare = (string) $compare;
+    }
+
     if (\is_array($compare)) {
         return \in_array($value, $compare, \is_object($value) || \is_resource($value));
     } elseif (\is_string($compare) && (\is_string($value) || \is_int($value) || \is_float($value))) {
@@ -1301,20 +1319,16 @@ function twig_length_filter(Environment $env, $thing)
             return mb_strlen($thing, $env->getCharset());
         }
 
-        if ($thing instanceof \SimpleXMLElement) {
+        if ($thing instanceof \Countable || \is_array($thing) || $thing instanceof \SimpleXMLElement) {
             return \count($thing);
         }
 
-        if (\is_object($thing) && method_exists($thing, '__toString') && !$thing instanceof \Countable) {
-            return mb_strlen((string) $thing, $env->getCharset());
-        }
-
-        if ($thing instanceof \Countable || \is_array($thing)) {
-            return \count($thing);
+        if ($thing instanceof \Traversable) {
+            return iterator_count($thing);
         }
 
-        if ($thing instanceof \IteratorAggregate) {
-            return iterator_count($thing);
+        if (\is_object($thing) && method_exists($thing, '__toString')) {
+            return mb_strlen((string) $thing, $env->getCharset());
         }
 
         return 1;
@@ -1468,15 +1482,11 @@ function twig_to_array($seq, $preserveKeys = true)
         return iterator_to_array($seq, $preserveKeys);
     }
 
-    if (!is_array($seq)) {
-        return (array) $seq;
-    }
-
-    if(!$preserveKeys) {
-        return array_values($seq);
+    if (!\is_array($seq)) {
+        return $seq;
     }
 
-    return $seq;
+    return $preserveKeys ? $seq : array_values($seq);
 }
 
 /**
@@ -1497,6 +1507,10 @@ function twig_test_empty($value)
         return 0 == \count($value);
     }
 
+    if ($value instanceof \Traversable) {
+        return !iterator_count($value);
+    }
+
     if (\is_object($value) && method_exists($value, '__toString')) {
         return '' === (string) $value;
     }
@@ -1548,9 +1562,9 @@ function twig_include(Environment $env, $context, $template, $variables = [], $w
         }
     }
 
-    $result = '';
+    $loaded = null;
     try {
-        $result = $env->resolveTemplate($template)->render($variables);
+        $loaded = $env->resolveTemplate($template);
     } catch (LoaderError $e) {
         if (!$ignoreMissing) {
             if ($isSandboxed && !$alreadySandboxed) {
@@ -1573,11 +1587,21 @@ function twig_include(Environment $env, $context, $template, $variables = [], $w
         throw $e;
     }
 
+    try {
+        $ret = $loaded ? $loaded->render($variables) : '';
+    } catch (\Exception $e) {
+        if ($isSandboxed && !$alreadySandboxed) {
+            $sandbox->disableSandbox();
+        }
+
+        throw $e;
+    }
+
     if ($isSandboxed && !$alreadySandboxed) {
         $sandbox->disableSandbox();
     }
 
-    return $result;
+    return $ret;
 }
 
 /**
@@ -1649,6 +1673,10 @@ function twig_constant_is_defined($constant, $object = null)
  */
 function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
 {
+    if (!twig_test_iterable($items)) {
+        throw new RuntimeError(sprintf('The "batch" filter expects an array or "Traversable", got "%s".', \is_object($items) ? \get_class($items) : \gettype($items)));
+    }
+
     $size = ceil($size);
 
     $result = array_chunk(twig_to_array($items, $preserveKeys), $size, $preserveKeys);
@@ -1656,7 +1684,7 @@ function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
     if (null !== $fill && $result) {
         $last = \count($result) - 1;
         if ($fillCount = $size - \count($result[$last])) {
-            for ($i = 0; $i < $fillCount; $i++) {
+            for ($i = 0; $i < $fillCount; ++$i) {
                 $result[$last][] = $fill;
             }
         }
@@ -1664,4 +1692,37 @@ function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
 
     return $result;
 }
+
+function twig_array_filter($array, $arrow)
+{
+    if (\is_array($array)) {
+        if (\PHP_VERSION_ID >= 50600) {
+            return array_filter($array, $arrow, \ARRAY_FILTER_USE_BOTH);
+        }
+
+        return array_filter($array, $arrow);
+    }
+
+    // the IteratorIterator wrapping is needed as some internal PHP classes are \Traversable but do not implement \Iterator
+    return new \CallbackFilterIterator(new \IteratorIterator($array), $arrow);
+}
+
+function twig_array_map($array, $arrow)
+{
+    $r = [];
+    foreach ($array as $k => $v) {
+        $r[$k] = $arrow($v, $k);
+    }
+
+    return $r;
+}
+
+function twig_array_reduce($array, $arrow, $initial = null)
+{
+    if (!\is_array($array)) {
+        $array = iterator_to_array($array);
+    }
+
+    return array_reduce($array, $arrow, $initial);
+}
 }
diff --git a/app/vendor/twig/twig/src/Extension/StringLoaderExtension.php b/app/vendor/twig/twig/src/Extension/StringLoaderExtension.php
index 9d7e2aa53..93ac834ac 100644
--- a/app/vendor/twig/twig/src/Extension/StringLoaderExtension.php
+++ b/app/vendor/twig/twig/src/Extension/StringLoaderExtension.php
@@ -35,7 +35,7 @@ class_alias('Twig\Extension\StringLoaderExtension', 'Twig_Extension_StringLoader
 
 namespace {
 use Twig\Environment;
-use Twig\Template;
+use Twig\TemplateWrapper;
 
 /**
  * Loads a template from a string.
@@ -43,11 +43,12 @@ class_alias('Twig\Extension\StringLoaderExtension', 'Twig_Extension_StringLoader
  *     {{ include(template_from_string("Hello {{ name }}")) }}
  *
  * @param string $template A template as a string or object implementing __toString()
+ * @param string $name     An optional name of the template to be used in error messages
  *
- * @return Template
+ * @return TemplateWrapper
  */
-function twig_template_from_string(Environment $env, $template)
+function twig_template_from_string(Environment $env, $template, $name = null)
 {
-    return $env->createTemplate((string) $template);
+    return $env->createTemplate((string) $template, $name);
 }
 }
diff --git a/app/vendor/twig/twig/src/Lexer.php b/app/vendor/twig/twig/src/Lexer.php
index fcb5d5511..8cae3597f 100644
--- a/app/vendor/twig/twig/src/Lexer.php
+++ b/app/vendor/twig/twig/src/Lexer.php
@@ -62,20 +62,101 @@ public function __construct(Environment $env, array $options = [])
             'tag_block' => ['{%', '%}'],
             'tag_variable' => ['{{', '}}'],
             'whitespace_trim' => '-',
+            'whitespace_line_trim' => '~',
+            'whitespace_line_chars' => ' \t\0\x0B',
             'interpolation' => ['#{', '}'],
         ], $options);
 
+        // when PHP 7.3 is the min version, we will be able to remove the '#' part in preg_quote as it's part of the default
         $this->regexes = [
-            'lex_var' => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
-            'lex_block' => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
-            'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:end%s)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
+            // }}
+            'lex_var' => '{
+                \s*
+                (?:'.
+                    preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '#').'\s*'. // -}}\s*
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'].$this->options['tag_variable'][1], '#').'['.$this->options['whitespace_line_chars'].']*'. // ~}}[ \t\0\x0B]*
+                    '|'.
+                    preg_quote($this->options['tag_variable'][1], '#'). // }}
+                ')
+            }Ax',
+
+            // %}
+            'lex_block' => '{
+                \s*
+                (?:'.
+                    preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '#').'\s*\n?'. // -%}\s*\n?
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'].$this->options['tag_block'][1], '#').'['.$this->options['whitespace_line_chars'].']*'. // ~%}[ \t\0\x0B]*
+                    '|'.
+                    preg_quote($this->options['tag_block'][1], '#').'\n?'. // %}\n?
+                ')
+            }Ax',
+
+            // {% endverbatim %}
+            'lex_raw_data' => '{'.
+                preg_quote($this->options['tag_block'][0], '#'). // {%
+                '('.
+                    $this->options['whitespace_trim']. // -
+                    '|'.
+                    $this->options['whitespace_line_trim']. // ~
+                ')?\s*'.
+                '(?:end%s)'. // endraw or endverbatim
+                '\s*'.
+                '(?:'.
+                    preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '#').'\s*'. // -%}
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'].$this->options['tag_block'][1], '#').'['.$this->options['whitespace_line_chars'].']*'. // ~%}[ \t\0\x0B]*
+                    '|'.
+                    preg_quote($this->options['tag_block'][1], '#'). // %}
+                ')
+            }sx',
+
             'operator' => $this->getOperatorRegex(),
-            'lex_comment' => '/(?:'.preg_quote($this->options['whitespace_trim'], '/').preg_quote($this->options['tag_comment'][1], '/').'\s*|'.preg_quote($this->options['tag_comment'][1], '/').')\n?/s',
-            'lex_block_raw' => '/\s*(raw|verbatim)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
-            'lex_block_line' => '/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As',
-            'lex_tokens_start' => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
-            'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
-            'interpolation_end' => '/\s*'.preg_quote($this->options['interpolation'][1], '/').'/A',
+
+            // #}
+            'lex_comment' => '{
+                (?:'.
+                    preg_quote($this->options['whitespace_trim']).preg_quote($this->options['tag_comment'][1], '#').'\s*\n?'. // -#}\s*\n?
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'].$this->options['tag_comment'][1], '#').'['.$this->options['whitespace_line_chars'].']*'. // ~#}[ \t\0\x0B]*
+                    '|'.
+                    preg_quote($this->options['tag_comment'][1], '#').'\n?'. // #}\n?
+                ')
+            }sx',
+
+            // verbatim %}
+            'lex_block_raw' => '{
+                \s*
+                (raw|verbatim)
+                \s*
+                (?:'.
+                    preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '#').'\s*'. // -%}\s*
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'].$this->options['tag_block'][1], '#').'['.$this->options['whitespace_line_chars'].']*'. // ~%}[ \t\0\x0B]*
+                    '|'.
+                    preg_quote($this->options['tag_block'][1], '#'). // %}
+                ')
+            }Asx',
+
+            'lex_block_line' => '{\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '#').'}As',
+
+            // {{ or {% or {#
+            'lex_tokens_start' => '{
+                ('.
+                    preg_quote($this->options['tag_variable'][0], '#'). // {{
+                    '|'.
+                    preg_quote($this->options['tag_block'][0], '#'). // {%
+                    '|'.
+                    preg_quote($this->options['tag_comment'][0], '#'). // {#
+                ')('.
+                    preg_quote($this->options['whitespace_trim'], '#'). // -
+                    '|'.
+                    preg_quote($this->options['whitespace_line_trim'], '#'). // ~
+                ')?
+            }sx',
+            'interpolation_start' => '{'.preg_quote($this->options['interpolation'][0], '#').'\s*}A',
+            'interpolation_end' => '{\s*'.preg_quote($this->options['interpolation'][1], '#').'}A',
         ];
     }
 
@@ -175,8 +256,17 @@ protected function lexData()
 
         // push the template text first
         $text = $textContent = substr($this->code, $this->cursor, $position[1] - $this->cursor);
+
+        // trim?
         if (isset($this->positions[2][$this->position][0])) {
-            $text = rtrim($text);
+            if ($this->options['whitespace_trim'] === $this->positions[2][$this->position][0]) {
+                // whitespace_trim detected ({%-, {{- or {#-)
+                $text = rtrim($text);
+            } elseif ($this->options['whitespace_line_trim'] === $this->positions[2][$this->position][0]) {
+                // whitespace_line_trim detected ({%~, {{~ or {#~)
+                // don't trim \r and \n
+                $text = rtrim($text, " \t\0\x0B");
+            }
         }
         $this->pushToken(Token::TEXT_TYPE, $text);
         $this->moveCursor($textContent.$position[0]);
@@ -188,11 +278,11 @@ protected function lexData()
 
             case $this->options['tag_block'][0]:
                 // raw data?
-                if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
+                if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, 0, $this->cursor)) {
                     $this->moveCursor($match[0]);
                     $this->lexRawData($match[1]);
                 // {% line \d+ %}
-                } elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
+                } elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, 0, $this->cursor)) {
                     $this->moveCursor($match[0]);
                     $this->lineno = (int) $match[1];
                 } else {
@@ -212,7 +302,7 @@ protected function lexData()
 
     protected function lexBlock()
     {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, null, $this->cursor)) {
+        if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, 0, $this->cursor)) {
             $this->pushToken(Token::BLOCK_END_TYPE);
             $this->moveCursor($match[0]);
             $this->popState();
@@ -223,7 +313,7 @@ protected function lexBlock()
 
     protected function lexVar()
     {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, null, $this->cursor)) {
+        if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, 0, $this->cursor)) {
             $this->pushToken(Token::VAR_END_TYPE);
             $this->moveCursor($match[0]);
             $this->popState();
@@ -235,7 +325,7 @@ protected function lexVar()
     protected function lexExpression()
     {
         // whitespace
-        if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
+        if (preg_match('/\s+/A', $this->code, $match, 0, $this->cursor)) {
             $this->moveCursor($match[0]);
 
             if ($this->cursor >= $this->end) {
@@ -243,18 +333,23 @@ protected function lexExpression()
             }
         }
 
+        // arrow function
+        if ('=' === $this->code[$this->cursor] && '>' === $this->code[$this->cursor + 1]) {
+            $this->pushToken(Token::ARROW_TYPE, '=>');
+            $this->moveCursor('=>');
+        }
         // operators
-        if (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
+        elseif (preg_match($this->regexes['operator'], $this->code, $match, 0, $this->cursor)) {
             $this->pushToken(Token::OPERATOR_TYPE, preg_replace('/\s+/', ' ', $match[0]));
             $this->moveCursor($match[0]);
         }
         // names
-        elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
+        elseif (preg_match(self::REGEX_NAME, $this->code, $match, 0, $this->cursor)) {
             $this->pushToken(Token::NAME_TYPE, $match[0]);
             $this->moveCursor($match[0]);
         }
         // numbers
-        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
+        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, 0, $this->cursor)) {
             $number = (float) $match[0];  // floats
             if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
                 $number = (int) $match[0]; // integers lower than the maximum
@@ -284,12 +379,12 @@ protected function lexExpression()
             ++$this->cursor;
         }
         // strings
-        elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
+        elseif (preg_match(self::REGEX_STRING, $this->code, $match, 0, $this->cursor)) {
             $this->pushToken(Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)));
             $this->moveCursor($match[0]);
         }
         // opening double quoted string
-        elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
+        elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, 0, $this->cursor)) {
             $this->brackets[] = ['"', $this->lineno];
             $this->pushState(self::STATE_STRING);
             $this->moveCursor($match[0]);
@@ -313,8 +408,16 @@ protected function lexRawData($tag)
         $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
         $this->moveCursor($text.$match[0][0]);
 
-        if (false !== strpos($match[1][0], $this->options['whitespace_trim'])) {
-            $text = rtrim($text);
+        // trim?
+        if (isset($match[1][0])) {
+            if ($this->options['whitespace_trim'] === $match[1][0]) {
+                // whitespace_trim detected ({%-, {{- or {#-)
+                $text = rtrim($text);
+            } else {
+                // whitespace_line_trim detected ({%~, {{~ or {#~)
+                // don't trim \r and \n
+                $text = rtrim($text, " \t\0\x0B");
+            }
         }
 
         $this->pushToken(Token::TEXT_TYPE, $text);
@@ -331,15 +434,15 @@ protected function lexComment()
 
     protected function lexString()
     {
-        if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
+        if (preg_match($this->regexes['interpolation_start'], $this->code, $match, 0, $this->cursor)) {
             $this->brackets[] = [$this->options['interpolation'][0], $this->lineno];
             $this->pushToken(Token::INTERPOLATION_START_TYPE);
             $this->moveCursor($match[0]);
             $this->pushState(self::STATE_INTERPOLATION);
-        } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor) && \strlen($match[0]) > 0) {
+        } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, 0, $this->cursor) && \strlen($match[0]) > 0) {
             $this->pushToken(Token::STRING_TYPE, stripcslashes($match[0]));
             $this->moveCursor($match[0]);
-        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
+        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, 0, $this->cursor)) {
             list($expect, $lineno) = array_pop($this->brackets);
             if ('"' != $this->code[$this->cursor]) {
                 throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
@@ -356,7 +459,7 @@ protected function lexString()
     protected function lexInterpolation()
     {
         $bracket = end($this->brackets);
-        if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, null, $this->cursor)) {
+        if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, 0, $this->cursor)) {
             array_pop($this->brackets);
             $this->pushToken(Token::INTERPOLATION_END_TYPE);
             $this->moveCursor($match[0]);
diff --git a/app/vendor/twig/twig/src/Loader/FilesystemLoader.php b/app/vendor/twig/twig/src/Loader/FilesystemLoader.php
index c30b41a1b..19b43a295 100644
--- a/app/vendor/twig/twig/src/Loader/FilesystemLoader.php
+++ b/app/vendor/twig/twig/src/Loader/FilesystemLoader.php
@@ -140,19 +140,27 @@ public function getSource($name)
     {
         @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', \get_class($this)), E_USER_DEPRECATED);
 
-        return file_get_contents($this->findTemplate($name));
+        if (null === ($path = $this->findTemplate($name)) || false === $path) {
+            return '';
+        }
+
+        return file_get_contents($path);
     }
 
     public function getSourceContext($name)
     {
-        $path = $this->findTemplate($name);
+        if (null === ($path = $this->findTemplate($name)) || false === $path) {
+            return new Source('', $name, '');
+        }
 
         return new Source(file_get_contents($path), $name, $path);
     }
 
     public function getCacheKey($name)
     {
-        $path = $this->findTemplate($name);
+        if (null === ($path = $this->findTemplate($name)) || false === $path) {
+            return '';
+        }
         $len = \strlen($this->rootPath);
         if (0 === strncmp($this->rootPath, $path, $len)) {
             return substr($path, $len);
@@ -170,8 +178,8 @@ public function exists($name)
         }
 
         try {
-            return false !== $this->findTemplate($name, false);
-        } catch (LoaderError $exception) {
+            return null !== ($path = $this->findTemplate($name, false)) && false !== $path;
+        } catch (LoaderError $e) {
             @trigger_error(sprintf('In %s::findTemplate(), you must accept a second argument that when set to "false" returns "false" instead of throwing an exception. Not supporting this argument is deprecated since version 1.27.', \get_class($this)), E_USER_DEPRECATED);
 
             return false;
@@ -180,9 +188,21 @@ public function exists($name)
 
     public function isFresh($name, $time)
     {
-        return filemtime($this->findTemplate($name)) < $time;
+        // false support to be removed in 3.0
+        if (null === ($path = $this->findTemplate($name)) || false === $path) {
+            return false;
+        }
+
+        return filemtime($path) < $time;
     }
 
+    /**
+     * Checks if the template can be found.
+     *
+     * @param string $name The template name
+     *
+     * @return string|false|null The template name or false/null
+     */
     protected function findTemplate($name)
     {
         $throw = \func_num_args() > 1 ? func_get_arg(1) : true;
diff --git a/app/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php b/app/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php
new file mode 100644
index 000000000..36b77da86
--- /dev/null
+++ b/app/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression;
+
+use Twig\Compiler;
+use Twig\Node\Node;
+
+/**
+ * Represents an arrow function.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ArrowFunctionExpression extends AbstractExpression
+{
+    public function __construct(AbstractExpression $expr, Node $names, $lineno, $tag = null)
+    {
+        parent::__construct(['expr' => $expr, 'names' => $names], [], $lineno, $tag);
+    }
+
+    public function compile(Compiler $compiler)
+    {
+        $compiler
+            ->addDebugInfo($this)
+            ->raw('function (')
+        ;
+        foreach ($this->getNode('names') as $i => $name) {
+            if ($i) {
+                $compiler->raw(', ');
+            }
+
+            $compiler
+                ->raw('$__')
+                ->raw($name->getAttribute('name'))
+                ->raw('__')
+            ;
+        }
+        $compiler
+            ->raw(') use ($context) { ')
+        ;
+        foreach ($this->getNode('names') as $name) {
+            $compiler
+                ->raw('$context["')
+                ->raw($name->getAttribute('name'))
+                ->raw('"] = $__')
+                ->raw($name->getAttribute('name'))
+                ->raw('__; ')
+            ;
+        }
+        $compiler
+            ->raw('return ')
+            ->subcompile($this->getNode('expr'))
+            ->raw('; }')
+        ;
+    }
+}
diff --git a/app/vendor/twig/twig/src/Node/Expression/CallExpression.php b/app/vendor/twig/twig/src/Node/Expression/CallExpression.php
index 162393bdf..d202a7395 100644
--- a/app/vendor/twig/twig/src/Node/Expression/CallExpression.php
+++ b/app/vendor/twig/twig/src/Node/Expression/CallExpression.php
@@ -121,7 +121,7 @@ protected function getArguments($callable, $arguments)
                 $named = true;
                 $name = $this->normalizeName($name);
             } elseif ($named) {
-                throw new SyntaxError(sprintf('Positional arguments cannot be used after named arguments for %s "%s".', $callType, $callName), $this->getTemplateLine(), null, null, false);
+                throw new SyntaxError(sprintf('Positional arguments cannot be used after named arguments for %s "%s".', $callType, $callName), $this->getTemplateLine(), $this->getSourceContext());
             }
 
             $parameters[$name] = $node;
@@ -153,14 +153,14 @@ protected function getArguments($callable, $arguments)
 
             if (\array_key_exists($name, $parameters)) {
                 if (\array_key_exists($pos, $parameters)) {
-                    throw new SyntaxError(sprintf('Argument "%s" is defined twice for %s "%s".', $name, $callType, $callName), $this->getTemplateLine(), null, null, false);
+                    throw new SyntaxError(sprintf('Argument "%s" is defined twice for %s "%s".', $name, $callType, $callName), $this->getTemplateLine(), $this->getSourceContext());
                 }
 
                 if (\count($missingArguments)) {
                     throw new SyntaxError(sprintf(
                         'Argument "%s" could not be assigned for %s "%s(%s)" because it is mapped to an internal PHP function which cannot determine default value for optional argument%s "%s".',
                         $name, $callType, $callName, implode(', ', $names), \count($missingArguments) > 1 ? 's' : '', implode('", "', $missingArguments)
-                    ), $this->getTemplateLine(), null, null, false);
+                    ), $this->getTemplateLine(), $this->getSourceContext());
                 }
 
                 $arguments = array_merge($arguments, $optionalArguments);
@@ -182,7 +182,7 @@ protected function getArguments($callable, $arguments)
                     $missingArguments[] = $name;
                 }
             } else {
-                throw new SyntaxError(sprintf('Value for argument "%s" is required for %s "%s".', $name, $callType, $callName), $this->getTemplateLine(), null, null, false);
+                throw new SyntaxError(sprintf('Value for argument "%s" is required for %s "%s".', $name, $callType, $callName), $this->getTemplateLine(), $this->getSourceContext());
             }
         }
 
@@ -212,10 +212,14 @@ protected function getArguments($callable, $arguments)
                 }
             }
 
-            throw new SyntaxError(sprintf(
-                'Unknown argument%s "%s" for %s "%s(%s)".',
-                \count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $callType, $callName, implode(', ', $names)
-            ), $unknownParameter ? $unknownParameter->getTemplateLine() : $this->getTemplateLine(), null, null, false);
+            throw new SyntaxError(
+                sprintf(
+                    'Unknown argument%s "%s" for %s "%s(%s)".',
+                    \count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $callType, $callName, implode(', ', $names)
+                ),
+                $unknownParameter ? $unknownParameter->getTemplateLine() : $this->getTemplateLine(),
+                $unknownParameter ? $unknownParameter->getSourceContext() : $this->getSourceContext()
+            );
         }
 
         return $arguments;
diff --git a/app/vendor/twig/twig/src/Node/Expression/InlinePrint.php b/app/vendor/twig/twig/src/Node/Expression/InlinePrint.php
new file mode 100644
index 000000000..469e73675
--- /dev/null
+++ b/app/vendor/twig/twig/src/Node/Expression/InlinePrint.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Node\Expression;
+
+use Twig\Compiler;
+use Twig\Node\Node;
+
+/**
+ * @internal
+ */
+final class InlinePrint extends AbstractExpression
+{
+    public function __construct(Node $node, $lineno)
+    {
+        parent::__construct(['node' => $node], [], $lineno);
+    }
+
+    public function compile(Compiler $compiler)
+    {
+        $compiler
+            ->raw('print (')
+            ->subcompile($this->getNode('node'))
+            ->raw(')')
+        ;
+    }
+}
diff --git a/app/vendor/twig/twig/src/Node/Expression/NameExpression.php b/app/vendor/twig/twig/src/Node/Expression/NameExpression.php
index 516ba285e..d3f7d107f 100644
--- a/app/vendor/twig/twig/src/Node/Expression/NameExpression.php
+++ b/app/vendor/twig/twig/src/Node/Expression/NameExpression.php
@@ -36,13 +36,20 @@ public function compile(Compiler $compiler)
         if ($this->getAttribute('is_defined_test')) {
             if ($this->isSpecial()) {
                 $compiler->repr(true);
+            } elseif (\PHP_VERSION_ID >= 700400) {
+                $compiler
+                    ->raw('array_key_exists(')
+                    ->string($name)
+                    ->raw(', $context)')
+                ;
             } else {
                 $compiler
                     ->raw('(isset($context[')
                     ->string($name)
                     ->raw(']) || array_key_exists(')
                     ->string($name)
-                    ->raw(', $context))');
+                    ->raw(', $context))')
+                ;
             }
         } elseif ($this->isSpecial()) {
             $compiler->raw($this->specialVars[$name]);
diff --git a/app/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php b/app/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php
index 6197fb93c..2222e11cf 100644
--- a/app/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php
+++ b/app/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php
@@ -47,7 +47,7 @@ public function __construct(\Twig_NodeInterface $node, $name, \Twig_NodeInterfac
         } elseif ($node instanceof ConstantExpression || $node instanceof ArrayExpression) {
             $node = new ConstantExpression(true, $node->getTemplateLine());
         } else {
-            throw new SyntaxError('The "defined" test only works with simple variables.', $this->getTemplateLine(), null, null, false);
+            throw new SyntaxError('The "defined" test only works with simple variables.', $lineno);
         }
 
         parent::__construct($node, $name, $arguments, $lineno);
diff --git a/app/vendor/twig/twig/src/Node/ImportNode.php b/app/vendor/twig/twig/src/Node/ImportNode.php
index 309bd1ac7..236db8900 100644
--- a/app/vendor/twig/twig/src/Node/ImportNode.php
+++ b/app/vendor/twig/twig/src/Node/ImportNode.php
@@ -46,7 +46,7 @@ public function compile(Compiler $compiler)
                 ->repr($this->getTemplateName())
                 ->raw(', ')
                 ->repr($this->getTemplateLine())
-                ->raw(')')
+                ->raw(')->unwrap()')
             ;
         }
 
diff --git a/app/vendor/twig/twig/src/Node/IncludeNode.php b/app/vendor/twig/twig/src/Node/IncludeNode.php
index 72b924771..544db81ea 100644
--- a/app/vendor/twig/twig/src/Node/IncludeNode.php
+++ b/app/vendor/twig/twig/src/Node/IncludeNode.php
@@ -37,43 +37,54 @@ public function compile(Compiler $compiler)
         $compiler->addDebugInfo($this);
 
         if ($this->getAttribute('ignore_missing')) {
+            $template = $compiler->getVarName();
+
             $compiler
+                ->write(sprintf("$%s = null;\n", $template))
                 ->write("try {\n")
                 ->indent()
+                ->write(sprintf('$%s = ', $template))
             ;
-        }
-
-        $this->addGetTemplate($compiler);
 
-        $compiler->raw('->display(');
+            $this->addGetTemplate($compiler);
 
-        $this->addTemplateArguments($compiler);
-
-        $compiler->raw(");\n");
-
-        if ($this->getAttribute('ignore_missing')) {
             $compiler
+                ->raw(";\n")
                 ->outdent()
                 ->write("} catch (LoaderError \$e) {\n")
                 ->indent()
                 ->write("// ignore missing template\n")
                 ->outdent()
-                ->write("}\n\n")
+                ->write("}\n")
+                ->write(sprintf("if ($%s) {\n", $template))
+                ->indent()
+                ->write(sprintf('$%s->display(', $template))
             ;
+            $this->addTemplateArguments($compiler);
+            $compiler
+                ->raw(");\n")
+                ->outdent()
+                ->write("}\n")
+            ;
+        } else {
+            $this->addGetTemplate($compiler);
+            $compiler->raw('->display(');
+            $this->addTemplateArguments($compiler);
+            $compiler->raw(");\n");
         }
     }
 
     protected function addGetTemplate(Compiler $compiler)
     {
         $compiler
-             ->write('$this->loadTemplate(')
-             ->subcompile($this->getNode('expr'))
-             ->raw(', ')
-             ->repr($this->getTemplateName())
-             ->raw(', ')
-             ->repr($this->getTemplateLine())
-             ->raw(')')
-         ;
+            ->write('$this->loadTemplate(')
+            ->subcompile($this->getNode('expr'))
+            ->raw(', ')
+            ->repr($this->getTemplateName())
+            ->raw(', ')
+            ->repr($this->getTemplateLine())
+            ->raw(')')
+        ;
     }
 
     protected function addTemplateArguments(Compiler $compiler)
diff --git a/app/vendor/twig/twig/src/Node/MacroNode.php b/app/vendor/twig/twig/src/Node/MacroNode.php
index 31f4baa7a..6eb67955f 100644
--- a/app/vendor/twig/twig/src/Node/MacroNode.php
+++ b/app/vendor/twig/twig/src/Node/MacroNode.php
@@ -27,7 +27,7 @@ public function __construct($name, \Twig_NodeInterface $body, \Twig_NodeInterfac
     {
         foreach ($arguments as $argumentName => $argument) {
             if (self::VARARGS_NAME === $argumentName) {
-                throw new SyntaxError(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine(), null, null, false);
+                throw new SyntaxError(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine(), $argument->getSourceContext());
             }
         }
 
@@ -104,7 +104,13 @@ public function compile(Compiler $compiler)
             ->outdent()
             ->write("]);\n\n")
             ->write("\$blocks = [];\n\n")
-            ->write("ob_start();\n")
+        ;
+        if ($compiler->getEnvironment()->isDebug()) {
+            $compiler->write("ob_start();\n");
+        } else {
+            $compiler->write("ob_start(function () { return ''; });\n");
+        }
+        $compiler
             ->write("try {\n")
             ->indent()
             ->subcompile($this->getNode('body'))
diff --git a/app/vendor/twig/twig/src/Node/ModuleNode.php b/app/vendor/twig/twig/src/Node/ModuleNode.php
index 2eb0d49dc..aab2aa33f 100644
--- a/app/vendor/twig/twig/src/Node/ModuleNode.php
+++ b/app/vendor/twig/twig/src/Node/ModuleNode.php
@@ -28,15 +28,13 @@
  */
 class ModuleNode extends Node
 {
-    private $source;
-
     public function __construct(\Twig_NodeInterface $body, AbstractExpression $parent = null, \Twig_NodeInterface $blocks, \Twig_NodeInterface $macros, \Twig_NodeInterface $traits, $embeddedTemplates, $name, $source = '')
     {
         if (!$name instanceof Source) {
             @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a \Twig\Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            $this->source = new Source($source, $name);
+            $source = new Source($source, $name);
         } else {
-            $this->source = $name;
+            $source = $name;
         }
 
         $nodes = [
@@ -57,15 +55,16 @@ public function __construct(\Twig_NodeInterface $body, AbstractExpression $paren
         // embedded templates are set as attributes so that they are only visited once by the visitors
         parent::__construct($nodes, [
             // source to be remove in 2.0
-            'source' => $this->source->getCode(),
+            'source' => $source->getCode(),
             // filename to be remove in 2.0 (use getTemplateName() instead)
-            'filename' => $this->source->getName(),
+            'filename' => $source->getName(),
             'index' => null,
             'embedded_templates' => $embeddedTemplates,
         ], 1);
 
         // populate the template name of all node children
-        $this->setTemplateName($this->source->getName());
+        $this->setTemplateName($source->getName());
+        $this->setSourceContext($source);
     }
 
     public function setIndex($index)
@@ -143,7 +142,7 @@ protected function compileGetParent(Compiler $compiler)
                 ->raw('$this->loadTemplate(')
                 ->subcompile($parent)
                 ->raw(', ')
-                ->repr($this->source->getName())
+                ->repr($this->getSourceContext()->getName())
                 ->raw(', ')
                 ->repr($parent->getTemplateLine())
                 ->raw(')')
@@ -178,8 +177,8 @@ protected function compileClassHeader(Compiler $compiler)
         }
         $compiler
             // if the template name contains */, add a blank to avoid a PHP parse error
-            ->write('/* '.str_replace('*/', '* /', $this->source->getName())." */\n")
-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->source->getName(), $this->getAttribute('index')))
+            ->write('/* '.str_replace('*/', '* /', $this->getSourceContext()->getName())." */\n")
+            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getSourceContext()->getName(), $this->getAttribute('index')))
             ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
             ->write("{\n")
             ->indent()
@@ -198,17 +197,6 @@ protected function compileConstructor(Compiler $compiler)
         // parent
         if (!$this->hasNode('parent')) {
             $compiler->write("\$this->parent = false;\n\n");
-        } elseif (($parent = $this->getNode('parent')) && $parent instanceof ConstantExpression) {
-            $compiler
-                ->addDebugInfo($parent)
-                ->write('$this->parent = $this->loadTemplate(')
-                ->subcompile($parent)
-                ->raw(', ')
-                ->repr($this->source->getName())
-                ->raw(', ')
-                ->repr($parent->getTemplateLine())
-                ->raw(");\n")
-            ;
         }
 
         $countTraits = \count($this->getNode('traits'));
@@ -217,13 +205,16 @@ protected function compileConstructor(Compiler $compiler)
             foreach ($this->getNode('traits') as $i => $trait) {
                 $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i));
 
+                $node = $trait->getNode('template');
                 $compiler
-                    ->addDebugInfo($trait->getNode('template'))
+                    ->addDebugInfo($node)
                     ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
                     ->indent()
                     ->write("throw new RuntimeError('Template \"'.")
                     ->subcompile($trait->getNode('template'))
-                    ->raw(".'\" cannot be used as a trait.');\n")
+                    ->raw(".'\" cannot be used as a trait.', ")
+                    ->repr($node->getTemplateLine())
+                    ->raw(", \$this->getSourceContext());\n")
                     ->outdent()
                     ->write("}\n")
                     ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
@@ -239,7 +230,9 @@ protected function compileConstructor(Compiler $compiler)
                         ->string($key)
                         ->raw(' is not defined in trait ')
                         ->subcompile($trait->getNode('template'))
-                        ->raw(".'));\n")
+                        ->raw(".'), ")
+                        ->repr($node->getTemplateLine())
+                        ->raw(", \$this->getSourceContext());\n")
                         ->outdent()
                         ->write("}\n\n")
 
@@ -331,8 +324,18 @@ protected function compileDisplay(Compiler $compiler)
 
         if ($this->hasNode('parent')) {
             $parent = $this->getNode('parent');
+
             $compiler->addDebugInfo($parent);
             if ($parent instanceof ConstantExpression) {
+                $compiler
+                    ->write('$this->parent = $this->loadTemplate(')
+                    ->subcompile($parent)
+                    ->raw(', ')
+                    ->repr($this->getSourceContext()->getName())
+                    ->raw(', ')
+                    ->repr($parent->getTemplateLine())
+                    ->raw(");\n")
+                ;
                 $compiler->write('$this->parent');
             } else {
                 $compiler->write('$this->getParent($context)');
@@ -367,7 +370,7 @@ protected function compileGetTemplateName(Compiler $compiler)
             ->write("public function getTemplateName()\n", "{\n")
             ->indent()
             ->write('return ')
-            ->repr($this->source->getName())
+            ->repr($this->getSourceContext()->getName())
             ->raw(";\n")
             ->outdent()
             ->write("}\n\n")
@@ -457,11 +460,11 @@ protected function compileGetSourceContext(Compiler $compiler)
             ->write("public function getSourceContext()\n", "{\n")
             ->indent()
             ->write('return new Source(')
-            ->string($compiler->getEnvironment()->isDebug() ? $this->source->getCode() : '')
+            ->string($compiler->getEnvironment()->isDebug() ? $this->getSourceContext()->getCode() : '')
             ->raw(', ')
-            ->string($this->source->getName())
+            ->string($this->getSourceContext()->getName())
             ->raw(', ')
-            ->string($this->source->getPath())
+            ->string($this->getSourceContext()->getPath())
             ->raw(");\n")
             ->outdent()
             ->write("}\n")
diff --git a/app/vendor/twig/twig/src/Node/Node.php b/app/vendor/twig/twig/src/Node/Node.php
index d60367ff2..c890feb72 100644
--- a/app/vendor/twig/twig/src/Node/Node.php
+++ b/app/vendor/twig/twig/src/Node/Node.php
@@ -13,6 +13,7 @@
 namespace Twig\Node;
 
 use Twig\Compiler;
+use Twig\Source;
 
 /**
  * Represents a node in the AST.
@@ -27,13 +28,9 @@ class Node implements \Twig_NodeInterface
     protected $tag;
 
     private $name;
+    private $sourceContext;
 
     /**
-     * Constructor.
-     *
-     * The nodes are automatically made available as properties ($this->node).
-     * The attributes are automatically made available as array items ($this['name']).
-     *
      * @param array  $nodes      An array of named nodes
      * @param array  $attributes An array of attributes (should not be nodes)
      * @param int    $lineno     The line number
@@ -43,7 +40,7 @@ public function __construct(array $nodes = [], array $attributes = [], $lineno =
     {
         foreach ($nodes as $name => $node) {
             if (!$node instanceof \Twig_NodeInterface) {
-                @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', \is_object($node) ? \get_class($node) : null === $node ? 'null' : \gettype($node), $name, \get_class($this)), E_USER_DEPRECATED);
+                @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', \is_object($node) ? \get_class($node) : (null === $node ? 'null' : \gettype($node)), $name, \get_class($this)), E_USER_DEPRECATED);
             }
         }
         $this->nodes = $nodes;
@@ -199,7 +196,7 @@ public function getNode($name)
     public function setNode($name, $node = null)
     {
         if (!$node instanceof \Twig_NodeInterface) {
-            @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', \is_object($node) ? \get_class($node) : null === $node ? 'null' : \gettype($node), $name, \get_class($this)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', \is_object($node) ? \get_class($node) : (null === $node ? 'null' : \gettype($node)), $name, \get_class($this)), E_USER_DEPRECATED);
         }
 
         $this->nodes[$name] = $node;
@@ -235,6 +232,21 @@ public function getTemplateName()
         return $this->name;
     }
 
+    public function setSourceContext(Source $source)
+    {
+        $this->sourceContext = $source;
+        foreach ($this->nodes as $node) {
+            if ($node instanceof Node) {
+                $node->setSourceContext($source);
+            }
+        }
+    }
+
+    public function getSourceContext()
+    {
+        return $this->sourceContext;
+    }
+
     /**
      * @deprecated since 1.27 (to be removed in 2.0)
      */
diff --git a/app/vendor/twig/twig/src/Node/SetNode.php b/app/vendor/twig/twig/src/Node/SetNode.php
index 2c10a3a92..656103b9f 100644
--- a/app/vendor/twig/twig/src/Node/SetNode.php
+++ b/app/vendor/twig/twig/src/Node/SetNode.php
@@ -57,8 +57,12 @@ public function compile(Compiler $compiler)
             $compiler->raw(')');
         } else {
             if ($this->getAttribute('capture')) {
+                if ($compiler->getEnvironment()->isDebug()) {
+                    $compiler->write("ob_start();\n");
+                } else {
+                    $compiler->write("ob_start(function () { return ''; });\n");
+                }
                 $compiler
-                    ->write("ob_start();\n")
                     ->subcompile($this->getNode('values'))
                 ;
             }
diff --git a/app/vendor/twig/twig/src/Node/SpacelessNode.php b/app/vendor/twig/twig/src/Node/SpacelessNode.php
index 9beebf32c..c8d32daf6 100644
--- a/app/vendor/twig/twig/src/Node/SpacelessNode.php
+++ b/app/vendor/twig/twig/src/Node/SpacelessNode.php
@@ -31,7 +31,13 @@ public function compile(Compiler $compiler)
     {
         $compiler
             ->addDebugInfo($this)
-            ->write("ob_start();\n")
+        ;
+        if ($compiler->getEnvironment()->isDebug()) {
+            $compiler->write("ob_start();\n");
+        } else {
+            $compiler->write("ob_start(function () { return ''; });\n");
+        }
+        $compiler
             ->subcompile($this->getNode('body'))
             ->write("echo trim(preg_replace('/>\s+</', '><', ob_get_clean()));\n")
         ;
diff --git a/app/vendor/twig/twig/src/Node/WithNode.php b/app/vendor/twig/twig/src/Node/WithNode.php
index 665aa4b12..f5ae9246d 100644
--- a/app/vendor/twig/twig/src/Node/WithNode.php
+++ b/app/vendor/twig/twig/src/Node/WithNode.php
@@ -35,21 +35,20 @@ public function compile(Compiler $compiler)
         $compiler->addDebugInfo($this);
 
         if ($this->hasNode('variables')) {
+            $node = $this->getNode('variables');
             $varsName = $compiler->getVarName();
             $compiler
                 ->write(sprintf('$%s = ', $varsName))
-                ->subcompile($this->getNode('variables'))
+                ->subcompile($node)
                 ->raw(";\n")
-                ->write(sprintf("if (\$%s instanceof \\Traversable) {\n", $varsName))
+                ->write(sprintf("if (!twig_test_iterable(\$%s)) {\n", $varsName))
                 ->indent()
-                ->write(sprintf("\$%s = iterator_to_array(\$%s);\n", $varsName, $varsName))
-                ->outdent()
-                ->write("}\n")
-                ->write(sprintf("if (!is_array(\$%s)) {\n", $varsName))
-                ->indent()
-                ->write("throw new RuntimeError('Variables passed to the \"with\" tag must be a hash.');\n")
+                ->write("throw new RuntimeError('Variables passed to the \"with\" tag must be a hash.', ")
+                ->repr($node->getTemplateLine())
+                ->raw(", \$this->getSourceContext());\n")
                 ->outdent()
                 ->write("}\n")
+                ->write(sprintf("\$%s = twig_to_array(\$%s);\n", $varsName, $varsName))
             ;
 
             if ($this->getAttribute('only')) {
@@ -58,7 +57,7 @@ public function compile(Compiler $compiler)
                 $compiler->write("\$context['_parent'] = \$context;\n");
             }
 
-            $compiler->write(sprintf("\$context = array_merge(\$context, \$%s);\n", $varsName));
+            $compiler->write(sprintf("\$context = \$this->env->mergeGlobals(array_merge(\$context, \$%s));\n", $varsName));
         } else {
             $compiler->write("\$context['_parent'] = \$context;\n");
         }
diff --git a/app/vendor/twig/twig/src/NodeTraverser.php b/app/vendor/twig/twig/src/NodeTraverser.php
index 8b0f85c52..bd25d3cc7 100644
--- a/app/vendor/twig/twig/src/NodeTraverser.php
+++ b/app/vendor/twig/twig/src/NodeTraverser.php
@@ -69,7 +69,11 @@ protected function traverseForVisitor(NodeVisitorInterface $visitor, \Twig_NodeI
         $node = $visitor->enterNode($node, $this->env);
 
         foreach ($node as $k => $n) {
-            if (false !== $m = $this->traverseForVisitor($visitor, $n)) {
+            if (null === $n) {
+                continue;
+            }
+
+            if (false !== ($m = $this->traverseForVisitor($visitor, $n)) && null !== $m) {
                 if ($m !== $n) {
                     $node->setNode($k, $m);
                 }
diff --git a/app/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php b/app/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php
index 184be8ecb..b66c3c6f1 100644
--- a/app/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php
+++ b/app/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php
@@ -17,6 +17,8 @@
 /**
  * Used to make node visitors compatible with Twig 1.x and 2.x.
  *
+ * To be removed in Twig 3.1.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 abstract class AbstractNodeVisitor implements NodeVisitorInterface
@@ -49,7 +51,7 @@ abstract protected function doEnterNode(Node $node, Environment $env);
     /**
      * Called after child nodes are visited.
      *
-     * @return Node|false The modified node or false if the node must be removed
+     * @return Node|false|null The modified node or null if the node must be removed
      */
     abstract protected function doLeaveNode(Node $node, Environment $env);
 }
diff --git a/app/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php b/app/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php
index 959108f05..f6e16fa7d 100644
--- a/app/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php
+++ b/app/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php
@@ -15,8 +15,11 @@
 use Twig\Node\AutoEscapeNode;
 use Twig\Node\BlockNode;
 use Twig\Node\BlockReferenceNode;
+use Twig\Node\DoNode;
+use Twig\Node\Expression\ConditionalExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
+use Twig\Node\Expression\InlinePrint;
 use Twig\Node\ImportNode;
 use Twig\Node\ModuleNode;
 use Twig\Node\Node;
@@ -69,8 +72,13 @@ protected function doLeaveNode(Node $node, Environment $env)
             $this->blocks = [];
         } elseif ($node instanceof FilterExpression) {
             return $this->preEscapeFilterNode($node, $env);
-        } elseif ($node instanceof PrintNode) {
-            return $this->escapePrintNode($node, $env, $this->needEscaping($env));
+        } elseif ($node instanceof PrintNode && false !== $type = $this->needEscaping($env)) {
+            $expression = $node->getNode('expr');
+            if ($expression instanceof ConditionalExpression && $this->shouldUnwrapConditional($expression, $env, $type)) {
+                return new DoNode($this->unwrapConditional($expression, $env, $type), $expression->getTemplateLine());
+            }
+
+            return $this->escapePrintNode($node, $env, $type);
         }
 
         if ($node instanceof AutoEscapeNode || $node instanceof BlockNode) {
@@ -82,6 +90,44 @@ protected function doLeaveNode(Node $node, Environment $env)
         return $node;
     }
 
+    private function shouldUnwrapConditional(ConditionalExpression $expression, Environment $env, $type)
+    {
+        $expr2Safe = $this->isSafeFor($type, $expression->getNode('expr2'), $env);
+        $expr3Safe = $this->isSafeFor($type, $expression->getNode('expr3'), $env);
+
+        return $expr2Safe !== $expr3Safe;
+    }
+
+    private function unwrapConditional(ConditionalExpression $expression, Environment $env, $type)
+    {
+        // convert "echo a ? b : c" to "a ? echo b : echo c" recursively
+        $expr2 = $expression->getNode('expr2');
+        if ($expr2 instanceof ConditionalExpression && $this->shouldUnwrapConditional($expr2, $env, $type)) {
+            $expr2 = $this->unwrapConditional($expr2, $env, $type);
+        } else {
+            $expr2 = $this->escapeInlinePrintNode(new InlinePrint($expr2, $expr2->getTemplateLine()), $env, $type);
+        }
+        $expr3 = $expression->getNode('expr3');
+        if ($expr3 instanceof ConditionalExpression && $this->shouldUnwrapConditional($expr3, $env, $type)) {
+            $expr3 = $this->unwrapConditional($expr3, $env, $type);
+        } else {
+            $expr3 = $this->escapeInlinePrintNode(new InlinePrint($expr3, $expr3->getTemplateLine()), $env, $type);
+        }
+
+        return new ConditionalExpression($expression->getNode('expr1'), $expr2, $expr3, $expression->getTemplateLine());
+    }
+
+    private function escapeInlinePrintNode(InlinePrint $node, Environment $env, $type)
+    {
+        $expression = $node->getNode('node');
+
+        if ($this->isSafeFor($type, $expression, $env)) {
+            return $node;
+        }
+
+        return new InlinePrint($this->getEscaperFilter($type, $expression), $node->getTemplateLine());
+    }
+
     protected function escapePrintNode(PrintNode $node, Environment $env, $type)
     {
         if (false === $type) {
@@ -96,10 +142,7 @@ protected function escapePrintNode(PrintNode $node, Environment $env, $type)
 
         $class = \get_class($node);
 
-        return new $class(
-            $this->getEscaperFilter($type, $expression),
-            $node->getTemplateLine()
-        );
+        return new $class($this->getEscaperFilter($type, $expression), $node->getTemplateLine());
     }
 
     protected function preEscapeFilterNode(FilterExpression $filter, Environment $env)
diff --git a/app/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php b/app/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php
index 5e21c4f61..9b8730b48 100644
--- a/app/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php
+++ b/app/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php
@@ -30,7 +30,7 @@ public function enterNode(\Twig_NodeInterface $node, Environment $env);
     /**
      * Called after child nodes are visited.
      *
-     * @return \Twig_NodeInterface|false The modified node or false if the node must be removed
+     * @return \Twig_NodeInterface|false|null The modified node or null if the node must be removed
      */
     public function leaveNode(\Twig_NodeInterface $node, Environment $env);
 
diff --git a/app/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php b/app/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
index c1d302a89..c9403398f 100644
--- a/app/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
+++ b/app/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php
@@ -102,7 +102,7 @@ protected function doLeaveNode(Node $node, Environment $env)
         if ($node instanceof ModuleNode) {
             $this->inAModule = false;
 
-            $node->setNode('constructor_end', new Node([new CheckSecurityNode($this->filters, $this->tags, $this->functions), $node->getNode('display_start')]));
+            $node->getNode('constructor_end')->setNode('_security_check', new Node([new CheckSecurityNode($this->filters, $this->tags, $this->functions), $node->getNode('display_start')]));
         } elseif ($this->inAModule) {
             if ($node instanceof PrintNode || $node instanceof SetNode) {
                 $this->needsToStringWrap = false;
diff --git a/app/vendor/twig/twig/src/Parser.php b/app/vendor/twig/twig/src/Parser.php
index 444d4c5a1..0ea102cc8 100644
--- a/app/vendor/twig/twig/src/Parser.php
+++ b/app/vendor/twig/twig/src/Parser.php
@@ -251,7 +251,7 @@ public function getBlockStack()
 
     public function peekBlockStack()
     {
-        return $this->blockStack[\count($this->blockStack) - 1];
+        return isset($this->blockStack[\count($this->blockStack) - 1]) ? $this->blockStack[\count($this->blockStack) - 1] : null;
     }
 
     public function popBlockStack()
@@ -334,10 +334,18 @@ public function addImportedSymbol($type, $alias, $name = null, AbstractExpressio
 
     public function getImportedSymbol($type, $alias)
     {
-        foreach ($this->importedSymbols as $functions) {
-            if (isset($functions[$type][$alias])) {
-                return $functions[$type][$alias];
+        if (null !== $this->peekBlockStack()) {
+            foreach ($this->importedSymbols as $functions) {
+                if (isset($functions[$type][$alias])) {
+                    if (\count($this->blockStack) > 1) {
+                        return null;
+                    }
+
+                    return $functions[$type][$alias];
+                }
             }
+        } else {
+            return isset($this->importedSymbols[0][$type][$alias]) ? $this->importedSymbols[0][$type][$alias] : null;
         }
     }
 
diff --git a/app/vendor/twig/twig/src/Profiler/Profile.php b/app/vendor/twig/twig/src/Profiler/Profile.php
index f33963b31..d83da40af 100644
--- a/app/vendor/twig/twig/src/Profiler/Profile.php
+++ b/app/vendor/twig/twig/src/Profiler/Profile.php
@@ -86,7 +86,7 @@ public function addProfile(self $profile)
     /**
      * Returns the duration in microseconds.
      *
-     * @return int
+     * @return float
      */
     public function getDuration()
     {
@@ -160,12 +160,28 @@ public function getIterator()
 
     public function serialize()
     {
-        return serialize([$this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles]);
+        return serialize($this->__serialize());
     }
 
     public function unserialize($data)
     {
-        list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = unserialize($data);
+        $this->__unserialize(unserialize($data));
+    }
+
+    /**
+     * @internal
+     */
+    public function __serialize()
+    {
+        return [$this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles];
+    }
+
+    /**
+     * @internal
+     */
+    public function __unserialize(array $data)
+    {
+        list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = $data;
     }
 }
 
diff --git a/app/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php b/app/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php
index d2d783d48..a31863f6c 100644
--- a/app/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php
+++ b/app/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php
@@ -12,7 +12,7 @@
 namespace Twig\Sandbox;
 
 /**
- * Interfaces that all security policy classes must implements.
+ * Interface that all security policy classes must implements.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/app/vendor/twig/twig/src/Template.php b/app/vendor/twig/twig/src/Template.php
index 8889c024d..3f7447c12 100644
--- a/app/vendor/twig/twig/src/Template.php
+++ b/app/vendor/twig/twig/src/Template.php
@@ -227,7 +227,10 @@ public function displayBlock($name, array $context, array $blocks = [], $useBloc
 
                 throw $e;
             } catch (\Exception $e) {
-                throw new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
+                $e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
+                $e->guess();
+
+                throw $e;
             }
         } elseif (false !== $parent = $this->getParent($context)) {
             $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
@@ -250,7 +253,11 @@ public function displayBlock($name, array $context, array $blocks = [], $useBloc
      */
     public function renderParentBlock($name, array $context, array $blocks = [])
     {
-        ob_start();
+        if ($this->env->isDebug()) {
+            ob_start();
+        } else {
+            ob_start(function () { return ''; });
+        }
         $this->displayParentBlock($name, $context, $blocks);
 
         return ob_get_clean();
@@ -271,7 +278,11 @@ public function renderParentBlock($name, array $context, array $blocks = [])
      */
     public function renderBlock($name, array $context, array $blocks = [], $useBlocks = true)
     {
-        ob_start();
+        if ($this->env->isDebug()) {
+            ob_start();
+        } else {
+            ob_start(function () { return ''; });
+        }
         $this->displayBlock($name, $context, $blocks, $useBlocks);
 
         return ob_get_clean();
@@ -340,6 +351,9 @@ public function getBlockNames(array $context = null, array $blocks = [])
         return array_unique($names);
     }
 
+    /**
+     * @return Template|TemplateWrapper
+     */
     protected function loadTemplate($template, $templateName = null, $line = null, $index = null)
     {
         try {
@@ -352,7 +366,7 @@ protected function loadTemplate($template, $templateName = null, $line = null, $
             }
 
             if ($template === $this->getTemplateName()) {
-                $class = get_class($this);
+                $class = \get_class($this);
                 if (false !== $pos = strrpos($class, '___', -1)) {
                     $class = substr($class, 0, $pos);
                 }
@@ -380,6 +394,16 @@ protected function loadTemplate($template, $templateName = null, $line = null, $
         }
     }
 
+    /**
+     * @internal
+     *
+     * @return Template
+     */
+    protected function unwrap()
+    {
+        return $this;
+    }
+
     /**
      * Returns all blocks.
      *
@@ -401,7 +425,11 @@ public function display(array $context, array $blocks = [])
     public function render(array $context)
     {
         $level = ob_get_level();
-        ob_start();
+        if ($this->env->isDebug()) {
+            ob_start();
+        } else {
+            ob_start(function () { return ''; });
+        }
         try {
             $this->display($context);
         } catch (\Exception $e) {
@@ -438,7 +466,10 @@ protected function displayWithErrorHandling(array $context, array $blocks = [])
 
             throw $e;
         } catch (\Exception $e) {
-            throw new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
+            $e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
+            $e->guess();
+
+            throw $e;
         }
     }
 
@@ -506,7 +537,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s
         if (self::METHOD_CALL !== $type) {
             $arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item;
 
-            if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, $object)))
+            if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, (array) $object)))
                 || ($object instanceof \ArrayAccess && isset($object[$arrayItem]))
             ) {
                 if ($isDefinedTest) {
@@ -573,7 +604,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s
 
         // object property
         if (self::METHOD_CALL !== $type && !$object instanceof self) { // \Twig\Template does not have public properties, and we don't want to allow access to internal ones
-            if (isset($object->$item) || \array_key_exists((string) $item, $object)) {
+            if (isset($object->$item) || \array_key_exists((string) $item, (array) $object)) {
                 if ($isDefinedTest) {
                     return true;
                 }
diff --git a/app/vendor/twig/twig/src/TemplateWrapper.php b/app/vendor/twig/twig/src/TemplateWrapper.php
index 5ddee9229..e2654094e 100644
--- a/app/vendor/twig/twig/src/TemplateWrapper.php
+++ b/app/vendor/twig/twig/src/TemplateWrapper.php
@@ -96,7 +96,11 @@ public function renderBlock($name, $context = [])
     {
         $context = $this->env->mergeGlobals($context);
         $level = ob_get_level();
-        ob_start();
+        if ($this->env->isDebug()) {
+            ob_start();
+        } else {
+            ob_start(function () { return ''; });
+        }
         try {
             $this->template->displayBlock($name, $context);
         } catch (\Exception $e) {
@@ -138,10 +142,20 @@ public function getSourceContext()
     /**
      * @return string
      */
-    public function getTemplatename()
+    public function getTemplateName()
     {
         return $this->template->getTemplateName();
     }
+
+    /**
+     * @internal
+     *
+     * @return Template
+     */
+    public function unwrap()
+    {
+        return $this->template;
+    }
 }
 
 class_alias('Twig\TemplateWrapper', 'Twig_TemplateWrapper');
diff --git a/app/vendor/twig/twig/src/Test/IntegrationTestCase.php b/app/vendor/twig/twig/src/Test/IntegrationTestCase.php
index d1b633ab9..36b360758 100644
--- a/app/vendor/twig/twig/src/Test/IntegrationTestCase.php
+++ b/app/vendor/twig/twig/src/Test/IntegrationTestCase.php
@@ -194,7 +194,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
                     $message = $e->getMessage();
                     $this->assertSame(trim($exception), trim(sprintf('%s: %s', \get_class($e), $message)));
                     $last = substr($message, \strlen($message) - 1);
-                    $this->assertTrue('.' === $last || '?' === $last, $message, 'Exception message must end with a dot or a question mark.');
+                    $this->assertTrue('.' === $last || '?' === $last, 'Exception message must end with a dot or a question mark.');
 
                     return;
                 }
diff --git a/app/vendor/twig/twig/src/Test/NodeTestCase.php b/app/vendor/twig/twig/src/Test/NodeTestCase.php
index b35cd2185..f3358cb9a 100644
--- a/app/vendor/twig/twig/src/Test/NodeTestCase.php
+++ b/app/vendor/twig/twig/src/Test/NodeTestCase.php
@@ -56,7 +56,7 @@ protected function getVariableGetter($name, $line = false)
         $line = $line > 0 ? "// line {$line}\n" : '';
 
         if (\PHP_VERSION_ID >= 70000) {
-            return sprintf('%s($context["%s"] ?? null)', $line, $name, $name);
+            return sprintf('%s($context["%s"] ?? null)', $line, $name);
         }
 
         if (\PHP_VERSION_ID >= 50400) {
diff --git a/app/vendor/twig/twig/src/Token.php b/app/vendor/twig/twig/src/Token.php
index 933897299..a0bb11af1 100644
--- a/app/vendor/twig/twig/src/Token.php
+++ b/app/vendor/twig/twig/src/Token.php
@@ -38,6 +38,7 @@ class Token
     const PUNCTUATION_TYPE = 9;
     const INTERPOLATION_START_TYPE = 10;
     const INTERPOLATION_END_TYPE = 11;
+    const ARROW_TYPE = 12;
 
     /**
      * @param int    $type   The type of the token
@@ -157,6 +158,9 @@ public static function typeToString($type, $short = false)
             case self::INTERPOLATION_END_TYPE:
                 $name = 'INTERPOLATION_END_TYPE';
                 break;
+            case self::ARROW_TYPE:
+                $name = 'ARROW_TYPE';
+                break;
             default:
                 throw new \LogicException(sprintf('Token of type "%s" does not exist.', $type));
         }
@@ -200,6 +204,8 @@ public static function typeToEnglish($type)
                 return 'begin of string interpolation';
             case self::INTERPOLATION_END_TYPE:
                 return 'end of string interpolation';
+            case self::ARROW_TYPE:
+                return 'arrow function';
             default:
                 throw new \LogicException(sprintf('Token of type "%s" does not exist.', $type));
         }
diff --git a/app/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php b/app/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php
index fc8c11a23..2c2f90b7f 100644
--- a/app/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php
+++ b/app/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php
@@ -20,6 +20,9 @@
  */
 abstract class AbstractTokenParser implements TokenParserInterface
 {
+    /**
+     * @var Parser
+     */
     protected $parser;
 
     public function setParser(Parser $parser)
diff --git a/app/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php b/app/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php
new file mode 100644
index 000000000..879879a2b
--- /dev/null
+++ b/app/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\TokenParser;
+
+use Twig\Node\Expression\TempNameExpression;
+use Twig\Node\Node;
+use Twig\Node\PrintNode;
+use Twig\Node\SetNode;
+use Twig\Token;
+
+/**
+ * Applies filters on a section of a template.
+ *
+ *   {% apply upper %}
+ *      This text becomes uppercase
+ *   {% endapplys %}
+ */
+final class ApplyTokenParser extends AbstractTokenParser
+{
+    public function parse(Token $token)
+    {
+        $lineno = $token->getLine();
+        $name = $this->parser->getVarName();
+
+        $ref = new TempNameExpression($name, $lineno);
+        $ref->setAttribute('always_defined', true);
+
+        $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
+
+        $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
+        $body = $this->parser->subparse([$this, 'decideApplyEnd'], true);
+        $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
+
+        return new Node([
+            new SetNode(true, $ref, $body, $lineno, $this->getTag()),
+            new PrintNode($filter, $lineno, $this->getTag()),
+        ]);
+    }
+
+    public function decideApplyEnd(Token $token)
+    {
+        return $token->test('endapply');
+    }
+
+    public function getTag()
+    {
+        return 'apply';
+    }
+}
diff --git a/app/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php b/app/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php
index 74f129c56..e66789a7b 100644
--- a/app/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php
+++ b/app/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php
@@ -13,6 +13,7 @@
 namespace Twig\TokenParser;
 
 use Twig\Error\SyntaxError;
+use Twig\Node\Node;
 use Twig\Token;
 
 /**
@@ -28,8 +29,10 @@ public function parse(Token $token)
     {
         $stream = $this->parser->getStream();
 
-        if (!$this->parser->isMainScope()) {
-            throw new SyntaxError('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext());
+        if ($this->parser->peekBlockStack()) {
+            throw new SyntaxError('Cannot use "extend" in a block.', $token->getLine(), $stream->getSourceContext());
+        } elseif (!$this->parser->isMainScope()) {
+            throw new SyntaxError('Cannot use "extend" in a macro.', $token->getLine(), $stream->getSourceContext());
         }
 
         if (null !== $this->parser->getParent()) {
@@ -38,6 +41,8 @@ public function parse(Token $token)
         $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
 
         $stream->expect(Token::BLOCK_END_TYPE);
+
+        return new Node();
     }
 
     public function getTag()
diff --git a/app/vendor/twig/twig/src/TokenParser/FromTokenParser.php b/app/vendor/twig/twig/src/TokenParser/FromTokenParser.php
index a47f197e8..4cce650d6 100644
--- a/app/vendor/twig/twig/src/TokenParser/FromTokenParser.php
+++ b/app/vendor/twig/twig/src/TokenParser/FromTokenParser.php
@@ -29,7 +29,7 @@ public function parse(Token $token)
     {
         $macro = $this->parser->getExpressionParser()->parseExpression();
         $stream = $this->parser->getStream();
-        $stream->expect('import');
+        $stream->expect(Token::NAME_TYPE, 'import');
 
         $targets = [];
         do {
@@ -49,14 +49,15 @@ public function parse(Token $token)
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        $node = new ImportNode($macro, new AssignNameExpression($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
+        $var = new AssignNameExpression($this->parser->getVarName(), $token->getLine());
+        $node = new ImportNode($macro, $var, $token->getLine(), $this->getTag());
 
         foreach ($targets as $name => $alias) {
             if ($this->parser->isReservedMacroName($name)) {
                 throw new SyntaxError(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
             }
 
-            $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
+            $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $var);
         }
 
         return $node;
diff --git a/app/vendor/twig/twig/src/TokenParser/ImportTokenParser.php b/app/vendor/twig/twig/src/TokenParser/ImportTokenParser.php
index 317e0a5ea..88395b924 100644
--- a/app/vendor/twig/twig/src/TokenParser/ImportTokenParser.php
+++ b/app/vendor/twig/twig/src/TokenParser/ImportTokenParser.php
@@ -27,7 +27,7 @@ class ImportTokenParser extends AbstractTokenParser
     public function parse(Token $token)
     {
         $macro = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect('as');
+        $this->parser->getStream()->expect(Token::NAME_TYPE, 'as');
         $var = new AssignNameExpression($this->parser->getStream()->expect(Token::NAME_TYPE)->getValue(), $token->getLine());
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
diff --git a/app/vendor/twig/twig/src/TokenParser/MacroTokenParser.php b/app/vendor/twig/twig/src/TokenParser/MacroTokenParser.php
index 734ebc60f..a0d66e7be 100644
--- a/app/vendor/twig/twig/src/TokenParser/MacroTokenParser.php
+++ b/app/vendor/twig/twig/src/TokenParser/MacroTokenParser.php
@@ -14,6 +14,7 @@
 use Twig\Error\SyntaxError;
 use Twig\Node\BodyNode;
 use Twig\Node\MacroNode;
+use Twig\Node\Node;
 use Twig\Token;
 
 /**
@@ -49,6 +50,8 @@ public function parse(Token $token)
         $stream->expect(Token::BLOCK_END_TYPE);
 
         $this->parser->setMacro($name, new MacroNode($name, new BodyNode([$body]), $arguments, $lineno, $this->getTag()));
+
+        return new Node();
     }
 
     public function decideBlockEnd(Token $token)
diff --git a/app/vendor/twig/twig/src/TokenStream.php b/app/vendor/twig/twig/src/TokenStream.php
index b5b089fd6..459781695 100644
--- a/app/vendor/twig/twig/src/TokenStream.php
+++ b/app/vendor/twig/twig/src/TokenStream.php
@@ -97,9 +97,10 @@ public function expect($type, $value = null, $message = null)
         $token = $this->tokens[$this->current];
         if (!$token->test($type, $value)) {
             $line = $token->getLine();
-            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).',
+            throw new SyntaxError(sprintf('%sUnexpected token "%s"%s ("%s" expected%s).',
                 $message ? $message.'. ' : '',
-                Token::typeToEnglish($token->getType()), $token->getValue(),
+                Token::typeToEnglish($token->getType()),
+                $token->getValue() ? sprintf(' of value "%s"', $token->getValue()) : '',
                 Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
                 $line,
                 $this->source
diff --git a/assets/js/asset_manager_core_js.js b/assets/js/asset_manager_core_js.js
index 42b120d29..1532486fc 100644
--- a/assets/js/asset_manager_core_js.js
+++ b/assets/js/asset_manager_core_js.js
@@ -1,4 +1,4 @@
-/* Matomo Javascript - cb=fec13f34443f4f3df7f8844f4e0912d8*/
+/* Matomo Javascript - cb=dacad556ff7033a37b6357892bdc7f60*/
 
 /*! jQuery Browser - v0.1.0 - 3/23/2012
 * https://github.com/jquery/jquery-browser
@@ -740,7 +740,7 @@ return currentModule;};})(window);
 function _pk_translate(translationStringId,values){if(typeof(piwik_translations[translationStringId])!='undefined'){var translation=piwik_translations[translationStringId];if(typeof values!='undefined'&&values&&values.length){values.unshift(translation);return sprintf.apply(null,values);}
 return translation;}
 return"The string "+translationStringId+" was not loaded in javascript. Make sure it is added in the Translate.getClientSideTranslationKeys hook.";}
-var piwikHelper={getRelativePluginPath:function(pluginName){return'';},htmlDecode:function(value){var textArea=document.createElement('textarea');textArea.innerHTML=value;return textArea.value;},sendContentAsDownload:function(filename,content,mimeType){if(!mimeType){mimeType='text/plain';}
+var piwikHelper={htmlDecode:function(value){var textArea=document.createElement('textarea');textArea.innerHTML=value;return textArea.value;},sendContentAsDownload:function(filename,content,mimeType){if(!mimeType){mimeType='text/plain';}
 function downloadFile(content){var node=document.createElement('a');node.style.display='none';if('string'===typeof content){node.setAttribute('href','data:'+mimeType+';charset=utf-8,'+encodeURIComponent(content));}else{node.href=window.URL.createObjectURL(blob);}
 node.setAttribute('download',filename);document.body.appendChild(node);node.click();document.body.removeChild(node);}
 var node;if('function'===typeof Blob){try{var blob=new Blob([content],{type:mimeType});if(window.navigator.msSaveOrOpenBlob){window.navigator.msSaveBlob(blob,filename);return;}else{downloadFile(blob);return;}}catch(e){downloadFile(content);}}
@@ -786,10 +786,12 @@ eAngle-=0.000001;oldArc.call(this,x,y,r,sAngle,eAngle,clockwise);};jQuery.ui.dia
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 var globalAjaxQueue=[];globalAjaxQueue.active=0;globalAjaxQueue.clean=function(){for(var i=this.length;i--;){if(!this[i]||this[i].readyState==4){this.splice(i,1);}}};globalAjaxQueue.push=function(){this.active+=arguments.length;this.clean();return Array.prototype.push.apply(this,arguments);};globalAjaxQueue.abort=function(){for(var i=this.length;i--;){this[i]&&this[i].abort&&this[i].abort();}
-this.splice(0,this.length);this.active=0;};function ajaxHelper(){this.format='json';this.async=true;this.timeout=null;this.callback=function(){};this.useRegularCallbackInCaseOfError=false;this.errorCallback=this.defaultErrorCallback;this.withToken=false;this.completeCallback=function(){};this.getParams={};this.getUrl='?';this.postParams={};this.loadingElement=null;this.errorElement='#ajaxError';this.requestHandle=null;this.defaultParams=['idSite','period','date','segment'];this.addParams=function(params,type){if(typeof params=='string'){params=broadcast.getValuesFromUrl(params);}
-for(var key in params){if(type.toLowerCase()=='get'){this.getParams[key]=params[key];}else if(type.toLowerCase()=='post'){this.postParams[key]=params[key];}}};this.withTokenInUrl=function(){this.withToken=true;};this.setUrl=function(url){this.addParams(broadcast.getValuesFromUrl(url),'GET');};this.setBulkRequests=function(){var urls=[];for(var i=0;i!=arguments.length;++i){urls.push($.param(arguments[i]));}
+this.splice(0,this.length);this.active=0;};function ajaxHelper(){this.format='json';this.async=true;this.timeout=null;this.callback=function(){};this.useRegularCallbackInCaseOfError=false;this.errorCallback;this.withToken=false;this.completeCallback=function(){};this.getParams={};this.getUrl='?';this.postParams={};this.loadingElement=null;this.errorElement='#ajaxError';this.requestHandle=null;this.defaultParams=['idSite','period','date','segment'];this.addParams=function(params,type){if(typeof params=='string'){params=broadcast.getValuesFromUrl(params);}
+var arrayParams=['compareSegments','comparePeriods','compareDates'];for(var key in params){if(arrayParams.indexOf(key)!==-1&&!params[key]){continue;}
+if(type.toLowerCase()=='get'){this.getParams[key]=params[key];}else if(type.toLowerCase()=='post'){this.postParams[key]=params[key];}}};this.withTokenInUrl=function(){this.withToken=true;};this.setUrl=function(url){this.addParams(broadcast.getValuesFromUrl(url),'GET');};this.setBulkRequests=function(){var urls=[];for(var i=0;i!=arguments.length;++i){urls.push($.param(arguments[i]));}
 this.addParams({module:'API',method:'API.getBulkRequest',urls:urls,format:'json'},'post');};this.setTimeout=function(timeout){this.timeout=timeout;};this.setCallback=function(callback){this.callback=callback;};this.useCallbackInCaseOfError=function(){this.useRegularCallbackInCaseOfError=true;};this.redirectOnSuccess=function(params){this.setCallback(function(){piwikHelper.redirect(params);});};this.setErrorCallback=function(callback){this.errorCallback=callback;};this.setCompleteCallback=function(callback){this.completeCallback=callback;};this.defaultErrorCallback=function(deferred,status){if(status=='abort'){return;}
-$('#loadingError').show();setTimeout(function(){$('#loadingError').fadeOut('slow');},2000);};this.setFormat=function(format){this.format=format;};this.setLoadingElement=function(element){if(!element){element='#ajaxLoadingDiv';}
+var loadingError=$('#loadingError');if(Piwik_Popover.isOpen()&&deferred&&deferred.status===500){if(deferred&&deferred.status===500){$(document.body).html(piwikHelper.escape(deferred.responseText));}}else{loadingError.show();}}
+this.errorCallback=this.defaultErrorCallback;this.setFormat=function(format){this.format=format;};this.setLoadingElement=function(element){if(!element){element='#ajaxLoadingDiv';}
 this.loadingElement=element;};this.setErrorElement=function(element){if(!element){return;}
 this.errorElement=element;};this._useGETDefaultParameter=function(parameter){if(parameter&&this.defaultParams){var i;for(i=0;i<this.defaultParams.length;i++){if(this.defaultParams[i]===parameter){return true;}}}
 return false;}
@@ -806,8 +808,7 @@ if(response.message){var UI=require('piwik/UI');var notification=new UI.Notifica
 --globalAjaxQueue.active;var piwik=window.piwik;if(piwik&&piwik.ajaxRequestFinished){piwik.ajaxRequestFinished();}},data:this._mixinDefaultPostParams(this.postParams)};if(this.timeout!==null){ajaxCall.timeout=this.timeout;}
 return $.ajax(ajaxCall);};this._isRequestToApiMethod=function(){return(this.getParams&&this.getParams['module']==='API'&&this.getParams['method'])||(this.postParams&&this.postParams['module']==='API'&&this.postParams['method']);};this._isWidgetizedRequest=function(){return(broadcast.getValueFromUrl('module')=='Widgetize');};this._getDefaultPostParams=function(){if(this.withToken||this._isRequestToApiMethod()||piwik.shouldPropagateTokenAuth){return{token_auth:piwik.token_auth};}
 return{};};this._mixinDefaultPostParams=function(params){var defaultParams=this._getDefaultPostParams();for(var index in defaultParams){if(!params[index]){params[index]=defaultParams[index];}}
-return params;};this._mixinDefaultGetParams=function(params){if(window.location.hash){var segment=broadcast.getValueFromHash('segment',window.location.href.split('#')[1]);}else{var segment=broadcast.getValueFromUrl('segment');}
-var defaultParams={idSite:piwik.idSite||broadcast.getValueFromUrl('idSite'),period:piwik.period||broadcast.getValueFromUrl('period'),segment:segment};if(params.token_auth){params.token_auth=null;delete params.token_auth;}
+return params;};this._mixinDefaultGetParams=function(params){var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');var segment=piwikUrl.getSearchParam('segment');var defaultParams={idSite:piwik.idSite||broadcast.getValueFromUrl('idSite'),period:piwik.period||broadcast.getValueFromUrl('period'),segment:segment};if(params.token_auth){params.token_auth=null;delete params.token_auth;}
 for(var key in defaultParams){if(this._useGETDefaultParameter(key)&&!params[key]&&!this.postParams[key]&&defaultParams[key]){params[key]=defaultParams[key];}}
 if(this._useGETDefaultParameter('date')&&!params.date&&!this.postParams.date){params.date=piwik.currentDateString;}
 return params;};return this;}
@@ -819,8 +820,8 @@ return params;};return this;}
  */
 $(function(){function adjustSize(content){var width=$('body').width()-content.offset().left-16;content.css('width',width+'px');}
 var contentAdmin=$('#content.admin');if(contentAdmin.length){adjustSize(contentAdmin);$(window).resize(function(){adjustSize(contentAdmin);});}});
-(function($,require){var exports=require('piwik/UI');var UIControl=function(element){if(!element){throw new Error("no element passed to UIControl constructor");}
-this._controlId=UIControl._nextControlId++;UIControl._controls.push(this);var $element=this.$element=$(element);$element.data('uiControlObject',this);var params=JSON.parse($element.attr('data-params')||'{}');for(var key in params){if(params[key]instanceof Array){params[key]=params[key].join(',');}}
+(function($,require){var exports=require('piwik/UI');var ARRAY_PARAM_NAMES=['compareDates','comparePeriods','compareSegments'];var UIControl=function(element){if(!element){throw new Error("no element passed to UIControl constructor");}
+this._controlId=UIControl._nextControlId++;UIControl._controls.push(this);var $element=this.$element=$(element);$element.data('uiControlObject',this);var params=JSON.parse($element.attr('data-params')||'{}');for(var key in params){if(params[key]instanceof Array&&ARRAY_PARAM_NAMES.indexOf(key)===-1){params[key]=params[key].join(',');}}
 this.param=params;this.props=JSON.parse($element.attr('data-props')||'{}');};UIControl._controls=[];UIControl._nextControlId=0;UIControl.cleanupUnusedControls=function(){var controls=UIControl._controls;var activeControls=UIControl._controls=[];for(var i=0;i!=controls.length;++i){var control=controls[i];if(control&&control.$element&&!$.contains(document.documentElement,control.$element[0])){controls[i]=null;control._destroy();if(!control._baseDestroyCalled){throw new Error("Error: "+control.constructor.name+"'s destroy method does not call "+"UIControl.destroy. You may have a memory leak.");}}else{activeControls.push(control);}}};UIControl.initElements=function(klass,selector){$(selector).each(function(){if(!$(this).attr('data-inited')){var control=new klass(this);$(this).attr('data-inited',1);}});};UIControl.prototype={_destroy:function(){this.$element.removeData('uiControlObject');delete this.$element;this._baseDestroyCalled=true;},onWidgetResize:function(handler){var $widget=this.$element.closest('.widgetContent');$widget.on('widget:maximise',handler).on('widget:minimise',handler).on('widget:resize',handler);}};exports.UIControl=UIControl;})(jQuery,require);
 /*!
  * Piwik - free/libre analytics platform
@@ -839,23 +840,23 @@ broadcast.forceReload=false;broadcast.currentHashUrl=hashUrl;broadcast.currentPo
 var action=broadcast.getParamValue('action',currentHashStr);if(action!='goalReport'&&action!='ecommerceReport'&&action!='products'&&action!='sales'&&(''+ajaxUrl).indexOf('&idGoal=')===-1){currentHashStr=broadcast.updateParamValue('idGoal=',currentHashStr);}
 var module=broadcast.getParamValue('module',currentHashStr);if(module!='Dashboard'){currentHashStr=broadcast.updateParamValue('idDashboard=',currentHashStr);}
 if(module!='CustomDimensions'){currentHashStr=broadcast.updateParamValue('idDimension=',currentHashStr);}
-if(disableHistory){var newLocation=window.location.href.split('#')[0]+'#?'+currentHashStr;window.location.replace(newLocation);}
+if(disableHistory){var $window=piwikHelper.getAngularDependency('$window');var newLocation=$window.location.href.split('#')[0]+'#?'+currentHashStr;$window.location.replace(newLocation);}
 else{broadcast.forceReload=true;angular.element(document).injector().invoke(function(historyService){historyService.load(currentHashStr);});}},buildReportingUrl:function(ajaxUrl){var currentHashStr=broadcast.getHash();ajaxUrl=ajaxUrl.replace(/^\?|&#/,'');var params_vals=ajaxUrl.split("&");for(var i=0;i<params_vals.length;i++){currentHashStr=broadcast.updateParamValue(params_vals[i],currentHashStr);}
 var action=broadcast.getParamValue('action',currentHashStr);if(action!='goalReport'&&action!='ecommerceReport'&&action!='products'&&action!='sales'){currentHashStr=broadcast.updateParamValue('idGoal=',currentHashStr);}
 var module=broadcast.getParamValue('module',currentHashStr);if(module!='Dashboard'){currentHashStr=broadcast.updateParamValue('idDashboard=',currentHashStr);}
-return'#'+currentHashStr;},propagateNewPage:function(str,showAjaxLoading,strHash){globalAjaxQueue.abort();if(typeof showAjaxLoading==='undefined'||showAjaxLoading){piwikHelper.showAjaxLoading();}
-var params_vals=str.split("&");var currentSearchStr=window.location.search;var currentHashStr=broadcast.getHashFromUrl();if(!currentSearchStr){currentSearchStr='?';}
-var oldUrl=currentSearchStr+currentHashStr;for(var i=0;i<params_vals.length;i++){if(params_vals[i].length==0){continue;}
-currentSearchStr=broadcast.updateParamValue(params_vals[i],currentSearchStr);if(currentHashStr.length!=0){currentHashStr=broadcast.updateParamValue(params_vals[i],currentHashStr);}}
-var updatedUrl=new RegExp('&updated=([0-9]+)');var updatedCounter=updatedUrl.exec(currentSearchStr);if(!updatedCounter){currentSearchStr+='&updated=1';}else{updatedCounter=1+parseInt(updatedCounter[1]);currentSearchStr=currentSearchStr.replace(new RegExp('(&updated=[0-9]+)'),'&updated='+updatedCounter);}
+return'#'+currentHashStr;},propagateNewPage:function(str,showAjaxLoading,strHash,paramsToRemove){globalAjaxQueue.abort();paramsToRemove=paramsToRemove||[];if(typeof showAjaxLoading==='undefined'||showAjaxLoading){piwikHelper.showAjaxLoading();}
+var params_vals=str.split("&");var $window=piwikHelper.getAngularDependency('$window');var currentSearchStr=$window.location.search;var currentHashStr=broadcast.getHashFromUrl();if(!currentSearchStr){currentSearchStr='?';}
+var oldUrl=currentSearchStr+currentHashStr;params_vals.forEach(function(param){if(/\[]=/.test(decodeURIComponent(param))){var paramName=decodeURIComponent(param).split('[]=')[0];removeParam(paramName);}});paramsToRemove.forEach(function(paramName){removeParam(paramName);});params_vals.forEach(function(param){if(!param.length){return;}
+if(/\[]=/.test(decodeURIComponent(param))){currentSearchStr=broadcast.addArrayParamValue(param,currentSearchStr);if(currentHashStr.length!==0){currentHashStr=broadcast.addArrayParamValue(param,currentHashStr);}}else{currentSearchStr=broadcast.updateParamValue(param,currentSearchStr);if(currentHashStr.length!==0){currentHashStr=broadcast.updateParamValue(param,currentHashStr);}}});var updatedUrl=new RegExp('&updated=([0-9]+)');var updatedCounter=updatedUrl.exec(currentSearchStr);if(!updatedCounter){currentSearchStr+='&updated=1';}else{updatedCounter=1+parseInt(updatedCounter[1]);currentSearchStr=currentSearchStr.replace(new RegExp('(&updated=[0-9]+)'),'&updated='+updatedCounter);}
 if(strHash&&currentHashStr.length!=0){var params_hash_vals=strHash.split("&");for(var i=0;i<params_hash_vals.length;i++){currentHashStr=broadcast.updateParamValue(params_hash_vals[i],currentHashStr);}}
-var newUrl=currentSearchStr+currentHashStr;var $rootScope=piwikHelper.getAngularDependency('$rootScope');if($rootScope){$rootScope.$on('$locationChangeStart',function(event){if(event){event.preventDefault();}})}
-if(oldUrl==newUrl){window.location.reload();}else{this.forceReload=true;window.location.href=newUrl;}
-return false;},updateParamValue:function(newParamValue,urlStr){var p_v=newParamValue.split("=");var paramName=p_v[0];var valFromUrl=broadcast.getParamValue(paramName,urlStr);var paramValue=p_v[1];if(paramValue==''){newParamValue='';}
+var newUrl=currentSearchStr+currentHashStr;var $rootScope=piwikHelper.getAngularDependency('$rootScope');if($rootScope){$rootScope.$on('$locationChangeStart',function(event){if(event){event.preventDefault();}});}
+if(oldUrl==newUrl){$window.location.reload();}else{this.forceReload=true;$window.location.href=newUrl;}
+return false;function removeParam(paramName){var paramRegex=new RegExp(paramName+'(\\[]|%5B%5D)?=[^&?#]*&?','gi');currentSearchStr=currentSearchStr.replace(paramRegex,'');currentHashStr=currentHashStr.replace(paramRegex,'');}},updateParamValue:function(newParamValue,urlStr){var p_v=newParamValue.split("=");var paramName=p_v[0];var valFromUrl=broadcast.getParamValue(paramName,urlStr);var paramValue=p_v[1];if(paramValue==''){newParamValue='';}
 var getQuotedRegex=function(str){return(str+'').replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1");};if(valFromUrl!=''){valFromUrl=getQuotedRegex(valFromUrl);var regToBeReplace=new RegExp(paramName+'='+valFromUrl,'ig');if(newParamValue==''){regToBeReplace=new RegExp('[\&]?'+paramName+'='+valFromUrl,'ig');}
 urlStr=urlStr.replace(regToBeReplace,newParamValue);}else if(newParamValue!=''){urlStr+=(urlStr=='')?newParamValue:'&'+newParamValue;}
-return urlStr;},propagateNewPopoverParameter:function(handlerName,value){var $location=angular.element(document).injector().get('$location');var popover='';if(handlerName&&''!=value&&'undefined'!=typeof value){popover=handlerName+':'+value;popover=encodeURIComponent(popover);popover=popover.replace(/%/g,'\$');broadcast.popoverParamStack.push(popover);}else{broadcast.popoverParamStack.pop();if(broadcast.popoverParamStack.length){popover=broadcast.popoverParamStack[broadcast.popoverParamStack.length-1];}}
-$location.search('popover',popover);setTimeout(function(){angular.element(document).injector().get('$rootScope').$apply();},1);},resetPopoverStack:function(){broadcast.popoverParamStack=[];},addPopoverHandler:function(handlerName,callback){broadcast.popoverHandlers[handlerName]=callback;},loadAjaxContent:function(urlAjax){if(broadcast.getParamValue('module',urlAjax)=='API'){broadcast.lastUrlRequested=null;$('#content').html("Loading content from the API and displaying it within Piwik is not allowed.");piwikHelper.hideAjaxLoading();return false;}
+return urlStr;},addArrayParamValue:function(newParamValue,urlStr){if(urlStr.indexOf('?')===-1){urlStr+='?';}else{urlStr+='&';}
+return urlStr+newParamValue;},propagateNewPopoverParameter:function(handlerName,value){var $location=angular.element(document).injector().get('$location');var popover='';if(handlerName&&''!=value&&'undefined'!=typeof value){popover=handlerName+':'+value;popover=encodeURIComponent(popover);popover=popover.replace(/%/g,'\$');broadcast.popoverParamStack.push(popover);}else{broadcast.popoverParamStack.pop();if(broadcast.popoverParamStack.length){popover=broadcast.popoverParamStack[broadcast.popoverParamStack.length-1];}}
+var $window=piwikHelper.getAngularDependency('$window');var urlStr=$window.location.hash;urlStr=broadcast.updateParamValue('popover='+encodeURIComponent(popover),urlStr);urlStr=urlStr.replace(/^[#?]+/,'');$location.search(urlStr);setTimeout(function(){angular.element(document).injector().get('$rootScope').$apply();},1);},resetPopoverStack:function(){broadcast.popoverParamStack=[];},addPopoverHandler:function(handlerName,callback){broadcast.popoverHandlers[handlerName]=callback;},loadAjaxContent:function(urlAjax){if(broadcast.getParamValue('module',urlAjax)=='API'){broadcast.lastUrlRequested=null;$('#content').html("Loading content from the API and displaying it within Piwik is not allowed.");piwikHelper.hideAjaxLoading();return false;}
 piwikHelper.hideAjaxError('loadingError');piwikHelper.showAjaxLoading();$('#content').empty();$("object").remove();urlAjax=urlAjax.match(/^\?/)?urlAjax:"?"+urlAjax;broadcast.lastUrlRequested=urlAjax;function sectionLoaded(content,status,request){if(request){var responseHeader=request.getResponseHeader('Content-Type');if(responseHeader&&0<=responseHeader.toLowerCase().indexOf('json')){var message='JSON cannot be displayed for';if(this.getParams&&this.getParams['module']){message+=' module='+this.getParams['module'];}
 if(this.getParams&&this.getParams['action']){message+=' action='+this.getParams['action'];}
 $('#content').text(message);piwikHelper.hideAjaxLoading();return;}}
@@ -868,9 +869,11 @@ else{locationSplit=location.href.split('#');if(typeof locationSplit[1]!='undefin
 return hashStr;},getSearchFromUrl:function(url){var searchStr="";if(url&&url.match(/\?/)){searchStr=url.substring(url.indexOf("?"),url.length);}else{searchStr=location.search;}
 return searchStr;},extractKeyValuePairsFromQueryString:function(queryString){var pairs=queryString.split('&');var result={};for(var i=0;i!=pairs.length;++i){var pair=pairs[i].split('=');var key=pair.shift();result[key]=pair.join('=');}
 return result;},getValuesFromUrl:function(url){var searchString=this._removeHashFromUrl(url).split('?')[1]||'';return this.extractKeyValuePairsFromQueryString(searchString);},getValueFromUrl:function(param,url){var searchString=this._removeHashFromUrl(url);return broadcast.getParamValue(param,searchString);},getValueFromHash:function(param,url){var hashStr=broadcast.getHashFromUrl(url);if(hashStr.substr(0,1)=='#'){hashStr=hashStr.substr(1);}
-hashStr=hashStr.split('#')[0];return broadcast.getParamValue(param,hashStr);},getParamValue:function(param,url){var lookFor=param+'=';var startStr=url.indexOf(lookFor);if(startStr>=0){var endStr=url.indexOf("&",startStr);if(endStr==-1){endStr=url.length;}
-var value=url.substring(startStr+param.length+1,endStr);if(param!='segment'){value=value.replace(/[^_%~\*\+\-\<\>!@\$\.()=,;0-9a-zA-Z]/gi,'');}
-return value;}else{return'';}},getHash:function(){return broadcast.getHashFromUrl().replace(/^#/,'').split('#')[0];},_removeHashFromUrl:function(url){var searchString='';if(url){var urlParts=url.split('#');searchString=urlParts[0];}else{searchString=location.search;}
+hashStr=hashStr.split('#')[0];return broadcast.getParamValue(param,hashStr);},getParamValue:function(param,url){var lookFor=param+'=';var startStr=url.indexOf(lookFor);if(startStr>=0){return getSingleValue(startStr,url);}else{url=decodeURIComponent(url);lookFor=param+'[]=';startStr=url.indexOf(lookFor);if(startStr>=0){var result=[getSingleValue(startStr)];while((startStr=url.indexOf(lookFor,startStr+1))!==-1){result.push(getSingleValue(startStr));}
+return result;}else{return'';}}
+function getSingleValue(startPos){var endStr=url.indexOf("&",startPos);if(endStr===-1){endStr=url.length;}
+var value=url.substring(startPos+lookFor.length,endStr);if(param!='segment'){value=value.replace(/[^_%~\*\+\-\<\>!@\$\.()=,;0-9a-zA-Z]/gi,'');}
+return value;}},getHash:function(){return broadcast.getHashFromUrl().replace(/^#/,'').split('#')[0];},_removeHashFromUrl:function(url){var searchString='';if(url){var urlParts=url.split('#');searchString=urlParts[0];}else{searchString=window.location.search;}
 return searchString;}};
 /*!
  * Piwik - free/libre analytics platform
@@ -896,7 +899,7 @@ if(backLabel){var back=$(document.createElement('a')).addClass('Piwik_Popover_Er
 if(!isOpen){openPopover();}
 this.setContent(error);},onClose:function(callback){closeCallback=callback;},close:function(){if(isOpen){isProgrammaticClose=true;container.dialog('close');isProgrammaticClose=false;}},createPopupAndLoadUrl:function(url,loadingName,dialogClass,ajaxRequest){var ensureMinimumTop=function(){var popoverContainer=$('#Piwik_Popover').parent();if(popoverContainer.position().top<106){popoverContainer.css('top','15px');}};var box=Piwik_Popover.showLoading(loadingName,null,null,dialogClass);ensureMinimumTop();var callback=function(html){function setPopoverTitleIfOneFoundInContainer(){var title=$('h1,h2',container);if(title.length==1){Piwik_Popover.setTitle(title.text());$(title).hide();}}
 Piwik_Popover.setContent(html);setPopoverTitleIfOneFoundInContainer();ensureMinimumTop();};if('undefined'===typeof ajaxRequest){ajaxRequest=new ajaxHelper();}
-ajaxRequest.addParams(piwikHelper.getArrayFromQueryString(url),'get');ajaxRequest.setCallback(callback);ajaxRequest.setFormat('html');ajaxRequest.send();}};})();
+ajaxRequest.addParams(piwikHelper.getArrayFromQueryString(url),'get');ajaxRequest.setCallback(callback);ajaxRequest.setFormat('html');ajaxRequest.send();},isOpen:function(){return isOpen;}};})();
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -919,19 +922,20 @@ draggingSlider=false;}});$('body').on('piwik:changePosition','.piwik-donate-slid
 (function($,require){var exports=require('piwik/UI'),UIControl=exports.UIControl;function DataTable(element){UIControl.call(this,element);this.init();}
 DataTable._footerIconHandlers={};DataTable.initNewDataTables=function(){$('div.dataTable').each(function(){if(!$(this).attr('id')){var tableType=$(this).attr('data-table-type')||'DataTable',klass=require('piwik/UI')[tableType]||require(tableType);if(klass&&$.isFunction(klass)){var table=new klass(this);}}});};DataTable.registerFooterIconHandler=function(id,handler){var handlers=DataTable._footerIconHandlers;if(handlers[id]){setTimeout(function(){throw new Exception("DataTable footer icon handler '"+id+"' is already being used.")},1);return;}
 handlers[id]=handler;};DataTable.getDataTableByReport=function(report){var result=undefined;$('div.dataTable').each(function(){if($(this).attr('data-report')==report){result=this;return false;}});return result;};$.extend(DataTable.prototype,UIControl.prototype,{_init:function(domElem){},_destroy:function(){UIControl.prototype._destroy.call(this);if(this.windowResizeTableAttached){$(window).off('resize',this._resizeDataTable);}
-if(this._bodyMouseUp){$('body').off('mouseup',this._bodyMouseUp);}},init:function(){var domElem=this.$element;this.workingDivId=this._createDivId();domElem.attr('id',this.workingDivId);this.maxNumRowsToHandleEvents=255;this.loadedSubDataTable={};this.isEmpty=$('.pk-emptyDataTable',domElem).length>0;this.bindEventsAndApplyStyle(domElem);this._init(domElem);this.initialized=true;},onClickSort:function(domElem){var self=this;var newColumnToSort=$(domElem).attr('id');if(self.param.filter_sort_column==newColumnToSort){if(this.param.filter_sort_order=='asc'){self.param.filter_sort_order='desc';}
+if(this._bodyMouseUp){$('body').off('mouseup',this._bodyMouseUp);}},init:function(){var domElem=this.$element;this.workingDivId=this._createDivId();domElem.attr('id',this.workingDivId);this.loadedSubDataTable={};this.isEmpty=$('.pk-emptyDataTable',domElem).length>0;this.bindEventsAndApplyStyle(domElem);this._init(domElem);this.initialized=true;},onClickSort:function(domElem){var self=this;var newColumnToSort=$(domElem).attr('id');if(self.param.filter_sort_column==newColumnToSort){if(this.param.filter_sort_order=='asc'){self.param.filter_sort_order='desc';}
 else{self.param.filter_sort_order='asc';}}
 self.param.filter_offset=0;self.param.filter_sort_column=newColumnToSort;if(!self.isDashboard()){self.notifyWidgetParametersChange(domElem,{filter_sort_column:newColumnToSort,filter_sort_order:self.param.filter_sort_order});}
 self.reloadAjaxDataTable();},setGraphedColumn:function(columnName){this.param.columns=columnName;},isWithinDialog:function(domElem){return!!$(domElem).parents('.ui-dialog').length;},isDashboard:function(){return!!$('#dashboardWidgetsArea').length;},getReportMetadata:function(){return JSON.parse(this.$element.attr('data-report-metadata')||'{}');},resetAllFilters:function(){var self=this;var FiltersToRestore={};var filters=['filter_column','filter_pattern','filter_column_recursive','filter_pattern_recursive','enable_filter_excludelowpop','filter_offset','filter_limit','filter_sort_column','filter_sort_order','disable_generic_filters','columns','flat','totals','include_aggregate_rows','totalRows','pivotBy','pivotByColumn'];for(var key=0;key<filters.length;key++){var value=filters[key];FiltersToRestore[value]=self.param[value];delete self.param[value];}
-return FiltersToRestore;},restoreAllFilters:function(FiltersToRestore){var self=this;for(var key in FiltersToRestore){self.param[key]=FiltersToRestore[key];}},cleanParams:function(){var self=this;for(var key in self.param){if(self.param[key]=='true')self.param[key]=true;if(self.param[key]=='false')self.param[key]=false;}},reloadAjaxDataTable:function(displayLoading,callbackSuccess){var self=this;if(typeof displayLoading=="undefined"){displayLoading=true;}
+return FiltersToRestore;},restoreAllFilters:function(FiltersToRestore){var self=this;for(var key in FiltersToRestore){self.param[key]=FiltersToRestore[key];}},cleanParams:function(){var self=this;for(var key in self.param){if(self.param[key]=='true')self.param[key]=true;if(self.param[key]=='false')self.param[key]=false;}},reloadAjaxDataTable:function(displayLoading,callbackSuccess,extraParams){var self=this;if(typeof displayLoading=="undefined"){displayLoading=true;}
 if(typeof callbackSuccess=="undefined"){callbackSuccess=function(response){self.dataTableLoaded(response,self.workingDivId);};}
 if(displayLoading){$('#'+self.workingDivId+' .loadingPiwik').last().css('display','block');}
 $('#loadingError').hide();if(self&&self.param&&self.param.viewDataTable&&String(self.param.viewDataTable).indexOf('graph')===0){delete self.param.filter_offset;delete self.param.filter_limit;}
 delete self.param.showtitle;var container=$('#'+self.workingDivId+' .piwik-graph');var ajaxRequest=new ajaxHelper();if(self.param.totalRows){ajaxRequest.addParams({'totalRows':self.param.totalRows},'post');delete self.param.totalRows;}
-var params={};for(var key in self.param){if(typeof self.param[key]!="undefined"&&self.param[key]!=''){if(key=='filter_column'||key=='filter_column_recursive'){if(self.param.flat=="1"&&self.param.show_dimensions=="1"){params[key]='combinedLabel';}else{params[key]='label';}
+var params={};for(var key in self.param){if(typeof self.param[key]!="undefined"&&self.param[key]!==null&&self.param[key]!==''){if(key=='filter_column'||key=='filter_column_recursive'){if(self.param.flat=="1"&&self.param.show_dimensions=="1"){params[key]='combinedLabel';}else{params[key]='label';}
 continue;}
 params[key]=self.param[key];}}
-ajaxRequest.addParams(params,'get');ajaxRequest.withTokenInUrl();ajaxRequest.setCallback(function(response){container.trigger('piwikDestroyPlot');container.off('piwikDestroyPlot');callbackSuccess(response);});ajaxRequest.setErrorCallback(function(deferred,status){if(status=='abort'||!deferred||deferred.status<400||deferred.status>=600){return;}
+ajaxRequest.addParams(params,'get');if(extraParams){ajaxRequest.addParams(extraParams,'post');}
+ajaxRequest.withTokenInUrl();ajaxRequest.setCallback(function(response){container.trigger('piwikDestroyPlot');container.off('piwikDestroyPlot');callbackSuccess(response);});ajaxRequest.setErrorCallback(function(deferred,status){if(status=='abort'||!deferred||deferred.status<400||deferred.status>=600){return;}
 $('#'+self.workingDivId+' .loadingPiwik').last().css('display','none');$('#loadingError').show();});ajaxRequest.setFormat('html');ajaxRequest.send();},dataTableLoaded:function(response,workingDivId,doScroll){var content=$(response);if($.trim($('.dataTableControls',content).html())===''){$('.dataTableControls',content).append('&nbsp;');}
 var idToReplace=workingDivId||$(content).attr('id');var dataTableSel=$('#'+idToReplace);table=$(content).parents('table.dataTable');if(dataTableSel.parents('.dataTable').is('table')){$(content).find('table.dataTable').addClass('subDataTable');$(content).find('.dataTableFeatures').addClass('subDataTable');dataTableSel.replaceWith(content);}
 else{dataTableSel.find('object').remove();dataTableSel.replaceWith(content);}
@@ -939,11 +943,12 @@ content.trigger('piwik:dataTableLoaded');if(doScroll||'undefined'===typeof doScr
 piwikHelper.compileAngularComponents(content);return content;},bindEventsAndApplyStyle:function(domElem){var self=this;self.cleanParams();self.preBindEventsAndApplyStyleHook(domElem);self.handleSort(domElem);self.handleLimit(domElem);self.handlePeriod(domElem);self.handleOffsetInformation(domElem);self.handleAnnotationsButton(domElem);self.handleEvolutionAnnotations(domElem);self.handleExportBox(domElem);self.applyCosmetics(domElem);self.handleSubDataTable(domElem);self.handleConfigurationBox(domElem);self.handleSearchBox(domElem);self.handleColumnDocumentation(domElem);self.handleRowActions(domElem);self.handleCellTooltips(domElem);self.handleRelatedReports(domElem);self.handleTriggeredEvents(domElem);self.handleColumnHighlighting(domElem);self.setFixWidthToMakeEllipsisWork(domElem);self.handleSummaryRow(domElem);self.postBindEventsAndApplyStyleHook(domElem);},preBindEventsAndApplyStyleHook:function(domElem){},postBindEventsAndApplyStyleHook:function(domElem){},isWidgetized:function(){return-1!==location.search.indexOf('module=Widgetize');},setFixWidthToMakeEllipsisWork:function(domElem){var self=this;function getTableWidth(domElem){var totalWidth=$(domElem).width();var totalWidthTable=$('table.dataTable',domElem).width();if(totalWidthTable<totalWidth){totalWidth=totalWidthTable;}
 if(!totalWidth){totalWidth=0;}
 return parseInt(totalWidth,10);}
-function setMaxTableWidthIfNeeded(domElem,maxTableWidth){var $domElem=$(domElem);var dataTableInCard=$domElem.parents('.card').first();var parentDataTable=$domElem.parent('.dataTable');dataTableInCard.width('');$domElem.width('');parentDataTable.width('');var tableWidth=getTableWidth(domElem);if(tableWidth<=maxTableWidth){return;}
+function setMaxTableWidthIfNeeded(domElem,maxTableWidth){var $domElem=$(domElem);var dataTableInCard=$domElem.parents('.card').first();var parentDataTable=$domElem.parent('.dataTable');dataTableInCard.width('');$domElem.width('');parentDataTable.width('');var $table=$('table.dataTable',domElem);if($table.closest('.reportsByDimensionView').length){var requiredTableWidth=$table.width()-40;if(domElem.width()>requiredTableWidth){domElem.css('max-width',requiredTableWidth+'px');}}
+var tableWidth=getTableWidth(domElem);if(tableWidth<=maxTableWidth){return;}
 if(self.isWidgetized()||self.isDashboard()){return;}
 if(dataTableInCard&&dataTableInCard.length){dataTableInCard.width(maxTableWidth);}else{$domElem.width(maxTableWidth);}
 if(parentDataTable&&parentDataTable.length){if(dataTableInCard.length){dataTableInCard.width(maxTableWidth);}else{parentDataTable.width(maxTableWidth);}}}
-function getLabelWidth(domElem,tableWidth,minLabelWidth,maxLabelWidth){var labelWidth=minLabelWidth;var columnsInFirstRow=$('tr:nth-child(1) td:not(.label)',domElem);var widthOfAllColumns=0;columnsInFirstRow.each(function(index,column){widthOfAllColumns+=$(column).outerWidth();});if(tableWidth-widthOfAllColumns>=minLabelWidth){labelWidth=tableWidth-widthOfAllColumns;}else if(widthOfAllColumns>=tableWidth){labelWidth=tableWidth*0.5;}
+function getLabelWidth(domElem,tableWidth,minLabelWidth,maxLabelWidth){var labelWidth=minLabelWidth;var columnsInFirstRow=$('tbody tr:not(.parentComparisonRow):not(.comparePeriod):eq(0) td:not(.label)',domElem);var widthOfAllColumns=0;columnsInFirstRow.each(function(index,column){widthOfAllColumns+=$(column).outerWidth();});if(tableWidth-widthOfAllColumns>=minLabelWidth){labelWidth=tableWidth-widthOfAllColumns;}else if(widthOfAllColumns>=tableWidth){labelWidth=tableWidth*0.5;}
 var innerWidth=0;var innerWrapper=domElem.find('.dataTableWrapper');if(innerWrapper&&innerWrapper.length){innerWidth=innerWrapper.width();}
 if(labelWidth>maxLabelWidth&&!self.isWidgetized()&&innerWidth!==domElem.width()&&!self.isDashboard()){labelWidth=maxLabelWidth;}
 return parseInt(labelWidth / $('tr:nth-child(1) td.label',domElem).length,10);}
@@ -1023,19 +1028,19 @@ if(!iconHighlighted&&!(self.param.viewDataTable=='table'||self.param.viewDataTab
 var $domElement=$(domElement);if($domElement.data('tooltip')=='enabled'){return;}
 $domElement.data('tooltip','enabled');if(!isTextEllipsized($domElement)){return;}
 var customToolTipText=$domElement.attr('title')||$domElement.text();if(customToolTipText){$domElement.attr('title',customToolTipText);}
-$domElement.tooltip({track:true,show:false,hide:false});},applyCosmetics:function(domElem){var self=this;$("th:first-child",domElem).addClass('label');$("td:first-child",domElem).addClass('label');var metadata=this.getReportMetadata();if(self.param.flat=="1"&&self.param.show_dimensions=="1"&&metadata.dimensions&&Object.keys(metadata.dimensions).length>1){for(var i=1;i<Object.keys(metadata.dimensions).length;i++){$("th:nth-child("+(i+1)+")",domElem).addClass('label');$("td:nth-child("+(i+1)+")",domElem).addClass('label');}}
-$("tr td",domElem).addClass('column');},handleColumnHighlighting:function(domElem){if(!this.canHandleRowEvents(domElem)){return;}
-var maxWidth={};var currentNthChild=null;var self=this;$('td',domElem).hover(function(){var $this=$(this);if($this.hasClass('label')){return;}
-var table=$this.closest('table');var nthChild=$this.parent('tr').children().index($(this))+1;var rows=$('> tbody > tr',table);if(!maxWidth[nthChild]){maxWidth[nthChild]=0;rows.find("td:nth-child("+(nthChild)+").column .value").each(function(index,element){var width=$(element).width();if(width>maxWidth[nthChild]){maxWidth[nthChild]=width;}});rows.find("td:nth-child("+(nthChild)+").column .value").each(function(index,element){$(element).css({width:maxWidth[nthChild],display:'inline-block'});});}
-if(currentNthChild===nthChild){return;}
-currentNthChild=nthChild;rows.children("td:nth-child("+(nthChild)+")").addClass('highlight');self.repositionRowActions($this.parent('tr'));},function(event){var $this=$(this);var table=$this.closest('table');var $parentTr=$this.parent('tr');var tr=$parentTr.children();var nthChild=$parentTr.children().index($this);var targetTd=$(event.relatedTarget).closest('td');var nthChildTarget=targetTd.parent('tr').children().index(targetTd);if(nthChild==nthChildTarget){return;}
-currentNthChild=null;var rows=$('tr',table);rows.find("td:nth-child("+(nthChild+1)+")").removeClass('highlight');});},handleSubDataTable:function(domElem){var self=this;self.numberOfSubtables=$('tr.subDataTable',domElem).click(function(){var idSubTable=$(this).attr('id');var divIdToReplaceWithSubTable='subDataTable_'+idSubTable;if(typeof self.loadedSubDataTable[divIdToReplaceWithSubTable]=="undefined"){var numberOfColumns=$(this).children().length;$(this).after('<tr>'+'<td colspan="'+numberOfColumns+'" class="cellSubDataTable">'+'<div id="'+divIdToReplaceWithSubTable+'">'+'<span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" />'+_pk_translate('General_Loading')+'</span>'+'</div>'+'</td>'+'</tr>');var savedActionVariable=self.param.action;var filtersToRestore=self.resetAllFilters();self.param.enable_filter_excludelowpop=filtersToRestore.enable_filter_excludelowpop;self.param.idSubtable=idSubTable;self.param.action=self.props.subtable_controller_action;delete self.param.totalRows;self.reloadAjaxDataTable(false,function(response){self.dataTableLoaded(response,divIdToReplaceWithSubTable);});self.param.action=savedActionVariable;delete self.param.idSubtable;self.restoreAllFilters(filtersToRestore);self.loadedSubDataTable[divIdToReplaceWithSubTable]=true;$(this).next().toggle();$(this).find('div.dataTableRowActions').hide();}
-$(this).next().toggle();$(this).toggleClass('expanded');self.repositionRowActions($(this));}).length;},handleColumnDocumentation:function(domElem){if(this.isDashboard()){return;}
+$domElement.tooltip({track:true,show:false,hide:false});},applyCosmetics:function(domElem){},handleColumnHighlighting:function(domElem){var maxWidth={};var currentNthChild=null;var self=this;$('td',domElem).each(function(){var $this=$(this);if($this.hasClass('label')){return;}
+var table=$this.closest('table');var nthChild=$this.parent('tr').children().index($(this))+1;var rows=$('> tbody > tr',table);if(!maxWidth[nthChild]){maxWidth[nthChild]=0;rows.find("td:nth-child("+(nthChild)+").column .value").add('> thead th:not(.label) .thDIV',table).each(function(index,element){var width=$(element).width();if(width>maxWidth[nthChild]){maxWidth[nthChild]=width;}});rows.find("td:nth-child("+(nthChild)+").column .value").each(function(index,element){$(element).closest('td').css({width:maxWidth[nthChild]});});}});$(domElem).on('mouseenter','td',function(e){e.stopPropagation();var $this=$(e.target);if($this.hasClass('label')){return;}
+var table=$this.closest('table');var nthChild=$this.parent('tr').children().index($(e.target))+1;var rows=$('> tbody > tr',table);if(currentNthChild===nthChild){return;}
+currentNthChild=nthChild;rows.children("td:nth-child("+(nthChild)+")").addClass('highlight');self.repositionRowActions($this.parent('tr'));});$(domElem).on('mouseleave','td',function(event){var $this=$(event.target);var table=$this.closest('table');var $parentTr=$this.parent('tr');var tr=$parentTr.children();var nthChild=$parentTr.children().index($this);var targetTd=$(event.relatedTarget).closest('td');var nthChildTarget=targetTd.parent('tr').children().index(targetTd);if(nthChild==nthChildTarget){return;}
+currentNthChild=null;var rows=$('tr',table);rows.find("td:nth-child("+(nthChild+1)+")").removeClass('highlight');});},getComparisonIdSubtables:function($row){if($row.is('.parentComparisonRow')){var comparisonRows=$row.nextUntil('.parentComparisonRow').filter('.comparisonRow');var comparisonIdSubtables={};comparisonRows.each(function(){var comparisonSeriesIndex=+$(this).data('comparison-series');comparisonIdSubtables[comparisonSeriesIndex]=$(this).data('idsubtable');});return JSON.stringify(comparisonIdSubtables);}
+return undefined;},handleSubDataTable:function(domElem){var self=this;self.numberOfSubtables=$('tr.subDataTable',domElem).click(function(){var idSubTable=$(this).attr('id');var divIdToReplaceWithSubTable='subDataTable_'+idSubTable;if(typeof self.loadedSubDataTable[divIdToReplaceWithSubTable]=="undefined"){var numberOfColumns=$(this).closest('table').find('thead tr').first().children().length;var $insertAfter=$(this).nextUntil(':not(.comparePeriod):not(.comparisonRow)').last();if(!$insertAfter.length){$insertAfter=$(this);}
+var newRow=$insertAfter.after('<tr class="subDataTableContainer">'+'<td colspan="'+numberOfColumns+'" class="cellSubDataTable">'+'<div id="'+divIdToReplaceWithSubTable+'">'+'<span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" />'+_pk_translate('General_Loading')+'</span>'+'</div>'+'</td>'+'</tr>');piwikHelper.lazyScrollTo(newRow);var savedActionVariable=self.param.action;var filtersToRestore=self.resetAllFilters();self.param.enable_filter_excludelowpop=filtersToRestore.enable_filter_excludelowpop;self.param.idSubtable=idSubTable;self.param.action=self.props.subtable_controller_action;delete self.param.totalRows;var extraParams={};extraParams.comparisonIdSubtables=self.getComparisonIdSubtables($(this));self.reloadAjaxDataTable(false,function(response){self.dataTableLoaded(response,divIdToReplaceWithSubTable);},extraParams);self.param.action=savedActionVariable;delete self.param.idSubtable;self.restoreAllFilters(filtersToRestore);self.loadedSubDataTable[divIdToReplaceWithSubTable]=true;$(this).find('div.dataTableRowActions').hide();}else{var $toToggle=$(this).nextUntil('.subDataTableContainer').last();$toToggle=$toToggle.length?$toToggle:$(this);$toToggle.next().toggle();}
+$(this).toggleClass('expanded');self.repositionRowActions($(this));}).length;},handleColumnDocumentation:function(domElem){if(this.isDashboard()){return;}
 $('th:has(.columnDocumentation)',domElem).each(function(){var th=$(this);var tooltip=th.find('.columnDocumentation');tooltip.next().hover(function(){var left=(-1*tooltip.outerWidth()/ 2)+th.width()/ 2;var top=-1*tooltip.outerHeight();var thPos=th.position();var thPosTop=0;if(thPos&&thPos.top){thPosTop=thPos.top;}
 top=top+thPosTop;if(!th.next().length){left=(-1*tooltip.outerWidth())+th.width()+
 parseInt(th.css('padding-right'),10);}
 if(th.offset().top+top<0){top=thPosTop+th.outerHeight();}
-tooltip.css({marginLeft:left,marginTop:top,top:0});tooltip.stop(true,true).fadeIn(250);},function(){$(this).prev().stop(true,true).fadeOut(400);});});},canHandleRowEvents:function(domElem){return domElem.find('table > tbody > tr').length<=this.maxNumRowsToHandleEvents;},handleRowActions:function(domElem){this.doHandleRowActions(domElem.find('table > tbody > tr'));},handleCellTooltips:function(domElem){domElem.find('span.cell-tooltip').tooltip({track:true,items:'span',content:function(){return $(this).parent().data('tooltip');},show:false,hide:false,tooltipClass:'small'});},handleRelatedReports:function(domElem){var self=this,hideShowRelatedReports=function(thisReport){$('span',$(thisReport).parent().parent()).each(function(){if(thisReport==this)
+tooltip.css({marginLeft:left,marginTop:top,top:0});tooltip.stop(true,true).fadeIn(250);},function(){$(this).prev().stop(true,true).fadeOut(400);});});},handleRowActions:function(domElem){this.doHandleRowActions(domElem.find('table > tbody > tr'));},handleCellTooltips:function(domElem){domElem.find('span.cell-tooltip').tooltip({track:true,items:'span',content:function(){return $(this).parent().data('tooltip');},show:false,hide:false,tooltipClass:'small'});domElem.find('span.ratio').tooltip({track:true,content:function(){var title=$(this).attr('title');return piwikHelper.escape(title.replace(/\n/g,'<br />'));},show:{delay:700,duration:200},hide:false})},handleRelatedReports:function(domElem){var self=this,hideShowRelatedReports=function(thisReport){$('span',$(thisReport).parent().parent()).each(function(){if(thisReport==this)
 $(this).hide();else
 $(this).show();});},thisReport=$('.datatableRelatedReports span:hidden',domElem)[0];function replaceReportTitleAndHelp(domElem,relatedReportName){if(!domElem||!domElem.length){return;}
 var $title='';var $headline=domElem.prev('h2');if($headline.length){$title=$headline.find('.title:not(.ng-hide)');}else{var $widget=domElem.parents('.widget');if($widget.length){$title=$widget.find('.widgetName > span');}}
@@ -1044,15 +1049,16 @@ scope.featureName=$.trim(relatedReportName);setTimeout(function(){scope.$apply()
 hideShowRelatedReports(thisReport);var relatedReports=$('.datatableRelatedReports span',domElem);if(!relatedReports.length){$('.datatableRelatedReports',domElem).hide();}
 relatedReports.each(function(){var clicked=this;$(this).unbind('click').click(function(e){var $this=$(this);var url=$this.attr('href');self.resetAllFilters();var newParams=broadcast.getValuesFromUrl(url);for(var key in newParams){self.param[key]=decodeURIComponent(newParams[key]);}
 delete self.param.pivotBy;delete self.param.pivotByColumn;var relatedReportName=$this.text();self.reloadAjaxDataTable(true,(function(relatedReportName){return function(newReport){var newDomElem=self.dataTableLoaded(newReport,self.workingDivId);hideShowRelatedReports(clicked);replaceReportTitleAndHelp(newDomElem,relatedReportName);}})(relatedReportName));});});},handleTriggeredEvents:function(domElem){var self=this;$(domElem).bind('reload',function(e,paramOverride){paramOverride=paramOverride||{};for(var name in paramOverride){self.param[name]=paramOverride[name];}
-self.reloadAjaxDataTable(true);});},handleSummaryRow:function(domElem){var details=_pk_translate('General_LearnMore',[' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer noopener" target="_blank">','</a>)']);domElem.find('tr.summaryRow').each(function(){var labelSpan=$(this).find('.label .value').filter(function(index,elem){return $(elem).text()!='-';}).last();var defaultLabel=labelSpan.text();$(this).hover(function(){labelSpan.html(defaultLabel+details);},function(){labelSpan.text(defaultLabel);});});},doHandleRowActions:function(trs){if(!trs||trs.length>this.maxNumRowsToHandleEvents){return;}
-var self=this;var merged=$.extend({},self.param,self.props);var availableActionsForReport=DataTable_RowActions_Registry.getAvailableActionsForReport(merged);if(availableActionsForReport.length==0){return;}
+self.reloadAjaxDataTable(true);});},handleSummaryRow:function(domElem){var details=_pk_translate('General_LearnMore',[' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer noopener" target="_blank">','</a>)']);domElem.find('tr.summaryRow').each(function(){var labelSpan=$(this).find('.label .value').filter(function(index,elem){return $(elem).text()!='-';}).last();var defaultLabel=labelSpan.text();$(this).hover(function(){labelSpan.html(defaultLabel+details);},function(){labelSpan.text(defaultLabel);});});},doHandleRowActions:function(trs){if(!trs||!trs.length||!trs[0]){return;}
+var parent=$(trs[0]).parents('table');var self=this;var merged=$.extend({},self.param,self.props);var availableActionsForReport=DataTable_RowActions_Registry.getAvailableActionsForReport(merged);if(availableActionsForReport.length==0){return;}
 var actionInstances={};for(var i=0;i<availableActionsForReport.length;i++){var action=availableActionsForReport[i];actionInstances[action.name]=action.createInstance(self);}
-trs.each(function(){var tr=$(this);var td=tr.find('td.label:last');for(var i=0;i<availableActionsForReport.length;i++){var action=availableActionsForReport[i];actionInstances[action.name].initTr(tr);}
-td.css('minWidth','145px');var actionsDom=null;var useTouchEvent=false;var listenEvent='mouseenter';var userAgent=String(navigator.userAgent).toLowerCase();if(userAgent.match(/(iPod|iPhone|iPad|Android|IEMobile|Windows Phone)/i)){useTouchEvent=true;listenEvent='click';}
-tr.on(listenEvent,function(){if(useTouchEvent&&actionsDom&&actionsDom.prop('rowActionsVisible')){actionsDom.prop('rowActionsVisible',false);actionsDom.hide();return;}
-if(actionsDom===null){actionsDom=self.createRowActions(availableActionsForReport,tr,actionInstances);td.prepend(actionsDom);}
-self.repositionRowActions(tr);if($(window).width()>=600||useTouchEvent){actionsDom.show();}
-if(useTouchEvent){actionsDom.prop('rowActionsVisible',true);}});if(!useTouchEvent){tr.on('mouseleave',function(){if(actionsDom!==null){actionsDom.hide();}});}});},createRowActions:function(availableActionsForReport,tr,actionInstances){var container=$(document.createElement('div')).addClass('dataTableRowActions');for(var i=availableActionsForReport.length-1;i>=0;i--){var action=availableActionsForReport[i];if(!action.isAvailableOnRow(this.param,tr)){continue;}
+var useTouchEvent=false;var listenEvent='mouseenter';var userAgent=String(navigator.userAgent).toLowerCase();if(userAgent.match(/(iPod|iPhone|iPad|Android|IEMobile|Windows Phone)/i)){useTouchEvent=true;listenEvent='click';}
+parent.on(listenEvent,'tr:not(.subDataTableContainer)',function(){var tr=this;var $tr=$(tr);var td=$tr.find('td.label:last');for(var i=0;i<availableActionsForReport.length;i++){var action=availableActionsForReport[i];actionInstances[action.name].initTr($tr);}
+td.css('minWidth',$tr.is('.comparisonRow')?'117px':'145px');if($(this).is('.parentComparisonRow,.comparePeriod').length){return;}
+if(useTouchEvent&&tr.actionsDom&&tr.actionsDom.prop('rowActionsVisible')){tr.actionsDom.prop('rowActionsVisible',false);tr.actionsDom.hide();return;}
+if(!tr.actionsDom){tr.actionsDom=self.createRowActions(availableActionsForReport,$tr,actionInstances);td.prepend(tr.actionsDom);}
+self.repositionRowActions($tr);if($(window).width()>=600||useTouchEvent){tr.actionsDom.show();}
+if(useTouchEvent){tr.actionsDom.prop('rowActionsVisible',true);}});if(!useTouchEvent){parent.on('mouseleave','tr',function(){var tr=this;if(tr.actionsDom){tr.actionsDom.hide();}});}},createRowActions:function(availableActionsForReport,tr,actionInstances){var container=$(document.createElement('div')).addClass('dataTableRowActions');for(var i=availableActionsForReport.length-1;i>=0;i--){var action=availableActionsForReport[i];if(!action.isAvailableOnRow(this.param,tr)){continue;}
 var actionEl=$(document.createElement('a')).attr({href:'#'}).addClass('action'+action.name);if(action.dataTableIcon.indexOf('icon-')===0){actionEl.append($(document.createElement('span')).addClass(action.dataTableIcon+' rowActionIcon'));}else{actionEl.append($(document.createElement('img')).attr({src:action.dataTableIcon}));}
 container.append(actionEl);if(i==availableActionsForReport.length-1){actionEl.addClass('leftmost');}
 if(i==0){actionEl.addClass('rightmost');}
@@ -1061,7 +1067,7 @@ actionInstances[action.name].trigger(tr,e);return false;}})(action,actionEl));if
 if(typeof action.dataTableIconTooltip!='undefined'){actionEl.tooltip({track:true,items:'a',content:'<h3>'+action.dataTableIconTooltip[0]+'</h3>'+action.dataTableIconTooltip[1],tooltipClass:'rowActionTooltip',show:false,hide:false});}}
 return container;},repositionRowActions:function(tr){if(!tr){return;}
 var td=tr.find('td.label:last');var actions=tr.find('div.dataTableRowActions');if(!actions){return;}
-actions.height(tr.innerHeight()-6);actions.css('marginLeft',(td.width()+3-actions.outerWidth())+'px');},_findReportHeader:function(domElem){var h2=false;if(domElem.prev().is('h2')){h2=domElem.prev();}
+actions.height(tr.innerHeight()-6);actions.css('marginLeft',(td.width()-3-actions.outerWidth())+'px');},_findReportHeader:function(domElem){var h2=false;if(domElem.prev().is('h2')){h2=domElem.prev();}
 else if(this.param.viewDataTable=='tableGoals'){h2=$('#titleGoalsByDimension');}
 else if($('h2',domElem)){h2=$('h2',domElem);}
 return h2;},_createDivId:function(){return'dataTable_'+this._controlId;}});var switchToHtmlTable=function(dataTable,viewDataTable){dataTable.param.viewDataTable=viewDataTable;delete dataTable.param.enable_filter_excludelowpop;delete dataTable.param.filter_sort_column;delete dataTable.param.filter_sort_order;delete dataTable.param.columns;delete dataTable.param.totals;dataTable.reloadAjaxDataTable();dataTable.notifyWidgetParametersChange(dataTable.$element,{viewDataTable:viewDataTable});};var switchToEcommerceView=function(dataTable,viewDataTable){if(viewDataTable=='ecommerceOrder'){dataTable.param.abandonedCarts='0';}else{dataTable.param.abandonedCarts='1';}
@@ -1074,21 +1080,23 @@ return false;}};DataTable_RowActions_Registry.register({name:'RowEvolution',data
 if(dataTable===null&&param){var report=param.split(':')[0];var div=$(require('piwik/UI').DataTable.getDataTableByReport(report));if(div.length&&div.data('uiControlObject')){dataTable=div.data('uiControlObject');if(typeof dataTable.rowEvolutionActionInstance!='undefined'){return dataTable.rowEvolutionActionInstance;}}}
 var instance=new DataTable_RowActions_RowEvolution(dataTable);if(dataTable!==null){dataTable.rowEvolutionActionInstance=instance;}
 return instance;},isAvailableOnReport:function(dataTableParams){return(typeof dataTableParams.disable_row_evolution=='undefined'||dataTableParams.disable_row_evolution=="0");},isAvailableOnRow:function(dataTableParams,tr){return!tr.hasClass('totalsRow');}});function DataTable_RowAction(dataTable){this.dataTable=dataTable;this.trEventName='piwikTriggerRowAction';this.actionName='RowAction';}
-DataTable_RowAction.prototype.initTr=function(tr){var self=this;tr.bind(self.trEventName,function(e,params){self.trigger($(this),params.originalEvent,params.label);});};DataTable_RowAction.prototype.trigger=function(tr,e,subTableLabel){var label=this.getLabelFromTr(tr);if(subTableLabel){var separator=' > ';label+=separator+subTableLabel;}
-var subtable=tr.closest('table');if(subtable.is('.subDataTable')){subtable.closest('tr').prev().trigger(this.trEventName,{label:label,originalEvent:e});return;}
+DataTable_RowAction.prototype.initTr=function(tr){var self=this;tr.bind(self.trEventName,function(e,params){self.trigger($(this),params.originalEvent,params.label,params.originalRow);});};DataTable_RowAction.prototype.trigger=function(tr,e,subTableLabel,originalRow){var label=this.getLabelFromTr(tr);if(subTableLabel){var separator=' > ';label+=separator+subTableLabel;}
+var subtable=tr.closest('table');if(subtable.is('.subDataTable')){subtable.closest('tr').prev().trigger(this.trEventName,{label:label,originalEvent:e,originalRow:tr});return;}
 if(subtable.closest('div.dataTableActions').length){var allClasses=tr.attr('class');var matches=allClasses.match(/level[0-9]+/);var level=parseInt(matches[0].substring(5,matches[0].length),10);if(level>0){var findLevel='level'+(level-1);var ptr=tr;while((ptr=ptr.prev()).length){if(!ptr.hasClass(findLevel)||ptr.hasClass('nodata')){continue;}
-ptr.trigger(this.trEventName,{label:label,originalEvent:e});return;}}}
-this.performAction(label,tr,e);};DataTable_RowAction.prototype.getLabelFromTr=function(tr){var rowMetadata=this.getRowMetadata(tr);if(rowMetadata.combinedLabel){return'@'+rowMetadata.combinedLabel;}
+ptr.trigger(this.trEventName,{label:label,originalEvent:e,originalRow:tr});return;}}}
+this.performAction(label,tr,e,originalRow);};DataTable_RowAction.prototype.getLabelFromTr=function(tr){if(tr.data('label')){return tr.data('label');}
+var rowMetadata=this.getRowMetadata(tr);if(rowMetadata.combinedLabel){return'@'+rowMetadata.combinedLabel;}
 var label=tr.find('span.label');var value=label.data('originalText');if(!value){value=label.text();}
 value=value.trim();value=encodeURIComponent(value);if(!tr.hasClass('subDataTable')){value='@'+value;}
-return value;};DataTable_RowAction.prototype.getRowMetadata=function(tr){return tr.data('row-metadata')||{};};DataTable_RowAction.prototype.openPopover=function(parameter){broadcast.propagateNewPopoverParameter('RowAction',this.actionName+':'+parameter);};broadcast.addPopoverHandler('RowAction',function(param){var paramParts=param.split(':');var rowActionName=paramParts[0];paramParts.shift();param=paramParts.join(':');var rowAction=DataTable_RowActions_Registry.getActionByName(rowActionName);if(rowAction){rowAction.createInstance(null,param).doOpenPopover(param);}});DataTable_RowAction.prototype.performAction=function(label,tr,e){};DataTable_RowAction.prototype.doOpenPopover=function(parameter){};function DataTable_RowActions_RowEvolution(dataTable){this.dataTable=dataTable;this.trEventName='piwikTriggerRowEvolution';this.multiEvolutionRows=[];}
-DataTable_RowActions_RowEvolution.launch=function(apiMethod,label){var param='RowEvolution:'+apiMethod+':0:'+label;broadcast.propagateNewPopoverParameter('RowAction',param);};DataTable_RowActions_RowEvolution.prototype=new DataTable_RowAction;DataTable_RowActions_RowEvolution.prototype.performAction=function(label,tr,e){if(e.shiftKey){this.addMultiEvolutionRow(label);return;}
-this.addMultiEvolutionRow(label);var extraParams={};if(this.multiEvolutionRows.length>1){extraParams.action='getMultiRowEvolutionPopover';label=this.multiEvolutionRows.join(',');}
+return value;};DataTable_RowAction.prototype.getRowMetadata=function(tr){return tr.data('row-metadata')||{};};DataTable_RowAction.prototype.openPopover=function(parameter){broadcast.propagateNewPopoverParameter('RowAction',this.actionName+':'+parameter);};broadcast.addPopoverHandler('RowAction',function(param){var paramParts=param.split(':');var rowActionName=paramParts[0];paramParts.shift();param=paramParts.join(':');var rowAction=DataTable_RowActions_Registry.getActionByName(rowActionName);if(rowAction){rowAction.createInstance(null,param).doOpenPopover(param);}});DataTable_RowAction.prototype.performAction=function(label,tr,e){};DataTable_RowAction.prototype.doOpenPopover=function(parameter){};function DataTable_RowActions_RowEvolution(dataTable){this.dataTable=dataTable;this.trEventName='piwikTriggerRowEvolution';this.multiEvolutionRows=[];this.multiEvolutionRowsSeries=[];}
+DataTable_RowActions_RowEvolution.launch=function(apiMethod,label){var param='RowEvolution:'+apiMethod+':0:'+label;broadcast.propagateNewPopoverParameter('RowAction',param);};DataTable_RowActions_RowEvolution.prototype=new DataTable_RowAction;DataTable_RowActions_RowEvolution.prototype.performAction=function(label,tr,e,originalRow){if(e.shiftKey){this.addMultiEvolutionRow(label,$(originalRow||tr).data('comparison-series'));return;}
+this.addMultiEvolutionRow(label,$(originalRow||tr).data('comparison-series'));var extraParams=$.extend({},$(originalRow||tr).data('param-override'));if(typeof extraParams!=='object'){extraParams={};}
+if(this.multiEvolutionRows.length>1){extraParams.action='getMultiRowEvolutionPopover';label=this.multiEvolutionRows.join(',');if(this.multiEvolutionRowsSeries.length>1){var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');extraParams.compareDates=piwikUrl.getSearchParam('compareDates');extraParams.comparePeriods=piwikUrl.getSearchParam('comparePeriods');extraParams.compareSegments=piwikUrl.getSearchParam('compareSegments');extraParams.labelSeries=this.multiEvolutionRowsSeries.join(',');delete extraParams.period;delete extraParams.date;delete extraParams.segment;}}
 $.each(this.dataTable.param,function(index,value){if(index!=='idSite'&&index.indexOf('id')===0&&$.isNumeric(value)){extraParams[index]=value;}});if(this.dataTable.param.abandonedCarts!==undefined){extraParams['abandonedCarts']=this.dataTable.param.abandonedCarts;}
 if(this.dataTable.param.flat!==undefined){extraParams['flat']=this.dataTable.param.flat;}
-var apiMethod=this.dataTable.param.module+'.'+this.dataTable.param.action;this.openPopover(apiMethod,extraParams,label);};DataTable_RowActions_RowEvolution.prototype.addMultiEvolutionRow=function(label){if($.inArray(label,this.multiEvolutionRows)==-1){this.multiEvolutionRows.push(label);}};DataTable_RowActions_RowEvolution.prototype.openPopover=function(apiMethod,extraParams,label){var urlParam=apiMethod+':'+encodeURIComponent(JSON.stringify(extraParams))+':'+label;DataTable_RowAction.prototype.openPopover.apply(this,[urlParam]);};DataTable_RowActions_RowEvolution.prototype.doOpenPopover=function(urlParam){var urlParamParts=urlParam.split(':');var apiMethod=urlParamParts.shift();var extraParamsString=urlParamParts.shift(),extraParams={};try{extraParams=JSON.parse(decodeURIComponent(extraParamsString));}catch(e){if(extraParamsString=='1'){extraParams.action='getMultiRowEvolutionPopover';}else if(extraParamsString!='0'){extraParams.action='getMultiRowEvolutionPopover';extraParams.column=extraParamsString;}}
+var apiMethod=this.dataTable.param.module+'.'+this.dataTable.param.action;this.openPopover(apiMethod,extraParams,label);};DataTable_RowActions_RowEvolution.prototype.addMultiEvolutionRow=function(label,seriesIndex){if(typeof seriesIndex!=='undefined'){var self=this;var found=false;this.multiEvolutionRows.forEach(function(rowLabel,index){var rowSeriesIndex=self.multiEvolutionRowsSeries[index];if(label===rowLabel&&seriesIndex===rowSeriesIndex){found=true;return false;}});if(!found){this.multiEvolutionRows.push(label);this.multiEvolutionRowsSeries.push(seriesIndex);}}else if($.inArray(label,this.multiEvolutionRows)===-1){this.multiEvolutionRows.push(label);this.multiEvolutionRowsSeries=[];}};DataTable_RowActions_RowEvolution.prototype.openPopover=function(apiMethod,extraParams,label){var urlParam=apiMethod+':'+encodeURIComponent(JSON.stringify(extraParams))+':'+label;DataTable_RowAction.prototype.openPopover.apply(this,[urlParam]);};DataTable_RowActions_RowEvolution.prototype.doOpenPopover=function(urlParam){var urlParamParts=urlParam.split(':');var apiMethod=urlParamParts.shift();var extraParamsString=urlParamParts.shift(),extraParams={};try{extraParams=JSON.parse(decodeURIComponent(extraParamsString));}catch(e){if(extraParamsString=='1'){extraParams.action='getMultiRowEvolutionPopover';}else if(extraParamsString!='0'){extraParams.action='getMultiRowEvolutionPopover';extraParams.column=extraParamsString;}}
 var label=urlParamParts.join(':');this.showRowEvolution(apiMethod,label,extraParams);};DataTable_RowActions_RowEvolution.prototype.showRowEvolution=function(apiMethod,label,extraParams){var self=this;var box=Piwik_Popover.showLoading('Row Evolution');box.addClass('rowEvolutionPopover');var requestParams={apiMethod:apiMethod,label:label,disableLink:1};var callback=function(html){Piwik_Popover.setContent(html);var title=box.find('div.popover-title');if(title.length){Piwik_Popover.setTitle(title.html());title.remove();}
-Piwik_Popover.onClose(function(){self.multiEvolutionRows=[];});if(self.dataTable!==null){box.find('.rowevolution-startmulti').click(function(){Piwik_Popover.onClose(false);broadcast.propagateNewPopoverParameter(false);return false;});}else{box.find('.compare-container, .rowevolution-startmulti').remove();}
+Piwik_Popover.onClose(function(){self.multiEvolutionRows=[];self.multiEvolutionRowsSeries=[];});if(self.dataTable!==null){box.find('.rowevolution-startmulti').click(function(){Piwik_Popover.onClose(false);broadcast.propagateNewPopoverParameter(false);return false;});}else{box.find('.compare-container, .rowevolution-startmulti').remove();}
 box.find('select.multirowevoltion-metric').change(function(){var metric=$(this).val();Piwik_Popover.onClose(false);var extraParams={action:'getMultiRowEvolutionPopover',column:metric};self.openPopover(apiMethod,extraParams,label);return true;});};requestParams.module='CoreHome';requestParams.action='getRowEvolutionPopover';requestParams.colors=JSON.stringify(piwik.getSparklineColors());var idDimension;if(broadcast.getValueFromUrl('module')==='Widgetize'){idDimension=broadcast.getValueFromUrl('subcategory');}else{idDimension=broadcast.getValueFromHash('subcategory');}
 if(idDimension&&(''+idDimension).indexOf('customdimension')===0){idDimension=(''+idDimension).replace('customdimension','');idDimension=parseInt(idDimension,10);if(idDimension>0){requestParams.idDimension=idDimension;}}
 if(self.dataTable&&self.dataTable.jsViewDataTable==='tableGoals'){if(extraParams['idGoal']){delete(extraParams['idGoal']);}}
@@ -1108,12 +1116,14 @@ $('#periodString .title').trigger('click').focus();});}(jQuery));
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function($){var sparklineColorNames=['backgroundColor','lineColor','minPointColor','maxPointColor','lastPointColor','fillColor'];var sparklineDisplayHeight=25;var sparklineDisplayWidth=100;piwik.getSparklineColors=function(){return piwik.ColorManager.getColors('sparkline-colors',sparklineColorNames);};piwik.initSparklines=function(){$('.sparkline > img').each(function(){var $self=$(this);if($self.attr('src')){return;}
-var colors=JSON.stringify(piwik.getSparklineColors());var appendToSparklineUrl='&colors='+encodeURIComponent(colors);var token_auth=broadcast.getValueFromUrl('token_auth');if(token_auth.length&&piwik.shouldPropagateTokenAuth){appendToSparklineUrl+='&token_auth='+token_auth;}
-$self.attr('width',sparklineDisplayWidth);$self.attr('height',sparklineDisplayHeight);$self.attr('src',$self.attr('data-src')+appendToSparklineUrl);});};window.initializeSparklines=function(){var sparklineUrlParamsToIgnore=['module','action','idSite','period','date','showtitle','viewDataTable','forceView','random'];$('.dataTableVizEvolution[data-report]').each(function(){var graph=$(this);var selectorsToFindParent=['.widget','[piwik-widget-container]','.reporting-page','body'];var index=0,selector,parent;for(index;index<selectorsToFindParent.length;index++){selector=selectorsToFindParent[index];parent=graph.parents(selector).first();if(parent&&parent.length){break;}}
+(function($){var sparklineColorNames=['backgroundColor','lineColor','minPointColor','maxPointColor','lastPointColor','fillColor'];var sparklineDisplayHeight=25;var sparklineDisplayWidth=100;piwik.getSparklineColors=function(){var colors=piwik.ColorManager.getColors('sparkline-colors',sparklineColorNames);var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');if(comparisonService.isComparing()){var comparisons=comparisonService.getAllComparisonSeries();colors.lineColor=comparisons.map(function(comp){return comp.color;});}
+return colors;};piwik.initSparklines=function(){$('.sparkline img').each(function(){var $self=$(this);if($self.attr('src')){return;}
+var seriesIndices=$self.closest('.sparkline').data('series-indices');var sparklineColors=piwik.getSparklineColors();if(seriesIndices&&sparklineColors.lineColor instanceof Array){sparklineColors.lineColor=sparklineColors.lineColor.filter(function(c,index){return seriesIndices.indexOf(index)!==-1;});}
+var colors=JSON.stringify(sparklineColors);var appendToSparklineUrl='&colors='+encodeURIComponent(colors);var token_auth=broadcast.getValueFromUrl('token_auth');if(token_auth.length&&piwik.shouldPropagateTokenAuth){appendToSparklineUrl+='&token_auth='+token_auth;}
+$self.attr('width',sparklineDisplayWidth);$self.attr('height',sparklineDisplayHeight);$self.attr('src',$self.attr('data-src')+appendToSparklineUrl);});};window.initializeSparklines=function(){$('.dataTableVizEvolution[data-report]').each(function(){var graph=$(this);var selectorsToFindParent=['.widget','[piwik-widget-container]','.reporting-page','body'];var index=0,selector,parent;for(index;index<selectorsToFindParent.length;index++){selector=selectorsToFindParent[index];parent=graph.parents(selector).first();if(parent&&parent.length){break;}}
 if(!parent||!parent.length){return;}
-var sparklines=parent.find('div.sparkline:not(.notLinkable)');sparklines.each(function(){var sparklineUrl=$('img',this).attr('data-src');var $this=$(this);if(sparklineUrl!=""){$this.addClass('linked');var params=broadcast.getValuesFromUrl(sparklineUrl);for(var i=0;i!=sparklineUrlParamsToIgnore.length;++i){delete params[sparklineUrlParamsToIgnore[i]];}
-for(var key in params){if(typeof params[key]=='undefined'){delete params[key];}else{params[key]=decodeURIComponent(params[key]);}}
+var sparklines=parent.find('div.sparkline:not(.notLinkable)');sparklines.each(function(){var sparklineUrl=$('img',this).attr('data-src');var $this=$(this);if(sparklineUrl!=""){$this.addClass('linked');var params=$this.data('graph-params')||{};if(!Object.keys(params).length){var urlParams=broadcast.getValuesFromUrl(sparklineUrl);if(urlParams.columns){params.columns=decodeURIComponent(urlParams.columns);}
+if(urlParams.rows){params.rows=decodeURIComponent(urlParams.rows);}}
 $this.off('click.sparkline');$this.on('click.sparkline',function(){var reportId=graph.attr('data-report'),dataTable=graph;if(dataTable.length==0){if($(this).closest('.widget').length){dataTable=$(this).closest('.widget').find('div.dataTableVizEvolution');}else{dataTable=$('div.dataTableVizEvolution');}}
 dataTable.trigger('reload',params);});}});});};}(jQuery));
 /*!
@@ -1197,14 +1207,24 @@ zenMode=!zenMode;$cookies.put('zenMode',zenMode?'1':'0');updateZenMode();});upda
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 $(function(){if($.browser.msie&&parseInt($.browser.version)===10){$(document).on('click','a[rel~="noreferrer"]',function(event){event.preventDefault();var a=event.currentTarget;var w=window.open(a.href,a.target||'_self');if(/\bnoopener\b/.test(a.rel)){w.opener=null;}});}});
-/*! iFrame Resizer (iframeSizer.min.js ) - v3.5.3 - 2016-02-23
+/*! iFrame Resizer (iframeSizer.min.js ) - v4.1.1 - 2019-04-10
  *  Desc: Force cross domain iframes to size to content.
  *  Requires: iframeResizer.contentWindow.min.js to be loaded into the target frame.
- *  Copyright: (c) 2016 David J. Bradshaw - dave@bradshaw.net
+ *  Copyright: (c) 2019 David J. Bradshaw - dave@bradshaw.net
  *  License: MIT
  */
 
-!function(a){"use strict";function b(b,c,d){"addEventListener"in a?b.addEventListener(c,d,!1):"attachEvent"in a&&b.attachEvent("on"+c,d)}function c(b,c,d){"removeEventListener"in a?b.removeEventListener(c,d,!1):"detachEvent"in a&&b.detachEvent("on"+c,d)}function d(){var b,c=["moz","webkit","o","ms"];for(b=0;b<c.length&&!N;b+=1)N=a[c[b]+"RequestAnimationFrame"];N||h("setup","RequestAnimationFrame not supported")}function e(b){var c="Host page: "+b;return a.top!==a.self&&(c=a.parentIFrame&&a.parentIFrame.getId?a.parentIFrame.getId()+": "+b:"Nested host page: "+b),c}function f(a){return K+"["+e(a)+"]"}function g(a){return P[a]?P[a].log:G}function h(a,b){k("log",a,b,g(a))}function i(a,b){k("info",a,b,g(a))}function j(a,b){k("warn",a,b,!0)}function k(b,c,d,e){!0===e&&"object"==typeof a.console&&console[b](f(c),d)}function l(d){function e(){function a(){s(V),p(W)}g("Height"),g("Width"),t(a,V,"init")}function f(){var a=U.substr(L).split(":");return{iframe:P[a[0]].iframe,id:a[0],height:a[1],width:a[2],type:a[3]}}function g(a){var b=Number(P[W]["max"+a]),c=Number(P[W]["min"+a]),d=a.toLowerCase(),e=Number(V[d]);h(W,"Checking "+d+" is in range "+c+"-"+b),c>e&&(e=c,h(W,"Set "+d+" to min value")),e>b&&(e=b,h(W,"Set "+d+" to max value")),V[d]=""+e}function k(){function a(){function a(){var a=0,d=!1;for(h(W,"Checking connection is from allowed list of origins: "+c);a<c.length;a++)if(c[a]===b){d=!0;break}return d}function d(){var a=P[W].remoteHost;return h(W,"Checking connection is from: "+a),b===a}return c.constructor===Array?a():d()}var b=d.origin,c=P[W].checkOrigin;if(c&&""+b!="null"&&!a())throw new Error("Unexpected message received from: "+b+" for "+V.iframe.id+". Message was: "+d.data+". This error can be disabled by setting the checkOrigin: false option or by providing of array of trusted domains.");return!0}function l(){return K===(""+U).substr(0,L)&&U.substr(L).split(":")[0]in P}function w(){var a=V.type in{"true":1,"false":1,undefined:1};return a&&h(W,"Ignoring init message from meta parent page"),a}function y(a){return U.substr(U.indexOf(":")+J+a)}function z(a){h(W,"MessageCallback passed: {iframe: "+V.iframe.id+", message: "+a+"}"),N("messageCallback",{iframe:V.iframe,message:JSON.parse(a)}),h(W,"--")}function A(){var b=document.body.getBoundingClientRect(),c=V.iframe.getBoundingClientRect();return JSON.stringify({iframeHeight:c.height,iframeWidth:c.width,clientHeight:Math.max(document.documentElement.clientHeight,a.innerHeight||0),clientWidth:Math.max(document.documentElement.clientWidth,a.innerWidth||0),offsetTop:parseInt(c.top-b.top,10),offsetLeft:parseInt(c.left-b.left,10),scrollTop:a.pageYOffset,scrollLeft:a.pageXOffset})}function B(a,b){function c(){u("Send Page Info","pageInfo:"+A(),a,b)}x(c,32)}function C(){function d(b,c){function d(){P[g]?B(P[g].iframe,g):e()}["scroll","resize"].forEach(function(e){h(g,b+e+" listener for sendPageInfo"),c(a,e,d)})}function e(){d("Remove ",c)}function f(){d("Add ",b)}var g=W;f(),P[g].stopPageInfo=e}function D(){P[W]&&P[W].stopPageInfo&&(P[W].stopPageInfo(),delete P[W].stopPageInfo)}function E(){var a=!0;return null===V.iframe&&(j(W,"IFrame ("+V.id+") not found"),a=!1),a}function F(a){var b=a.getBoundingClientRect();return o(W),{x:Math.floor(Number(b.left)+Number(M.x)),y:Math.floor(Number(b.top)+Number(M.y))}}function G(b){function c(){M=g,H(),h(W,"--")}function d(){return{x:Number(V.width)+f.x,y:Number(V.height)+f.y}}function e(){a.parentIFrame?a.parentIFrame["scrollTo"+(b?"Offset":"")](g.x,g.y):j(W,"Unable to scroll to requested position, window.parentIFrame not found")}var f=b?F(V.iframe):{x:0,y:0},g=d();h(W,"Reposition requested from iFrame (offset x:"+f.x+" y:"+f.y+")"),a.top!==a.self?e():c()}function H(){!1!==N("scrollCallback",M)?p(W):q()}function I(b){function c(){var a=F(g);h(W,"Moving to in page link (#"+e+") at x: "+a.x+" y: "+a.y),M={x:a.x,y:a.y},H(),h(W,"--")}function d(){a.parentIFrame?a.parentIFrame.moveToAnchor(e):h(W,"In page link #"+e+" not found and window.parentIFrame not found")}var e=b.split("#")[1]||"",f=decodeURIComponent(e),g=document.getElementById(f)||document.getElementsByName(f)[0];g?c():a.top!==a.self?d():h(W,"In page link #"+e+" not found")}function N(a,b){return m(W,a,b)}function O(){switch(P[W].firstRun&&T(),V.type){case"close":n(V.iframe);break;case"message":z(y(6));break;case"scrollTo":G(!1);break;case"scrollToOffset":G(!0);break;case"pageInfo":B(P[W].iframe,W),C();break;case"pageInfoStop":D();break;case"inPageLink":I(y(9));break;case"reset":r(V);break;case"init":e(),N("initCallback",V.iframe),N("resizedCallback",V);break;default:e(),N("resizedCallback",V)}}function Q(a){var b=!0;return P[a]||(b=!1,j(V.type+" No settings for "+a+". Message was: "+U)),b}function S(){for(var a in P)u("iFrame requested init",v(a),document.getElementById(a),a)}function T(){P[W].firstRun=!1}var U=d.data,V={},W=null;"[iFrameResizerChild]Ready"===U?S():l()?(V=f(),W=R=V.id,!w()&&Q(W)&&(h(W,"Received: "+U),E()&&k()&&O())):i(W,"Ignored: "+U)}function m(a,b,c){var d=null,e=null;if(P[a]){if(d=P[a][b],"function"!=typeof d)throw new TypeError(b+" on iFrame["+a+"] is not a function");e=d(c)}return e}function n(a){var b=a.id;h(b,"Removing iFrame: "+b),a.parentNode.removeChild(a),m(b,"closedCallback",b),h(b,"--"),delete P[b]}function o(b){null===M&&(M={x:void 0!==a.pageXOffset?a.pageXOffset:document.documentElement.scrollLeft,y:void 0!==a.pageYOffset?a.pageYOffset:document.documentElement.scrollTop},h(b,"Get page position: "+M.x+","+M.y))}function p(b){null!==M&&(a.scrollTo(M.x,M.y),h(b,"Set page position: "+M.x+","+M.y),q())}function q(){M=null}function r(a){function b(){s(a),u("reset","reset",a.iframe,a.id)}h(a.id,"Size reset requested by "+("init"===a.type?"host page":"iFrame")),o(a.id),t(b,a,"reset")}function s(a){function b(b){a.iframe.style[b]=a[b]+"px",h(a.id,"IFrame ("+e+") "+b+" set to "+a[b]+"px")}function c(b){H||"0"!==a[b]||(H=!0,h(e,"Hidden iFrame detected, creating visibility listener"),y())}function d(a){b(a),c(a)}var e=a.iframe.id;P[e]&&(P[e].sizeHeight&&d("height"),P[e].sizeWidth&&d("width"))}function t(a,b,c){c!==b.type&&N?(h(b.id,"Requesting animation frame"),N(a)):a()}function u(a,b,c,d){function e(){var e=P[d].targetOrigin;h(d,"["+a+"] Sending msg to iframe["+d+"] ("+b+") targetOrigin: "+e),c.contentWindow.postMessage(K+b,e)}function f(){i(d,"["+a+"] IFrame("+d+") not found"),P[d]&&delete P[d]}function g(){c&&"contentWindow"in c&&null!==c.contentWindow?e():f()}d=d||c.id,P[d]&&g()}function v(a){return a+":"+P[a].bodyMarginV1+":"+P[a].sizeWidth+":"+P[a].log+":"+P[a].interval+":"+P[a].enablePublicMethods+":"+P[a].autoResize+":"+P[a].bodyMargin+":"+P[a].heightCalculationMethod+":"+P[a].bodyBackground+":"+P[a].bodyPadding+":"+P[a].tolerance+":"+P[a].inPageLinks+":"+P[a].resizeFrom+":"+P[a].widthCalculationMethod}function w(a,c){function d(){function b(b){1/0!==P[w][b]&&0!==P[w][b]&&(a.style[b]=P[w][b]+"px",h(w,"Set "+b+" = "+P[w][b]+"px"))}function c(a){if(P[w]["min"+a]>P[w]["max"+a])throw new Error("Value for min"+a+" can not be greater than max"+a)}c("Height"),c("Width"),b("maxHeight"),b("minHeight"),b("maxWidth"),b("minWidth")}function e(){var a=c&&c.id||S.id+F++;return null!==document.getElementById(a)&&(a+=F++),a}function f(b){return R=b,""===b&&(a.id=b=e(),G=(c||{}).log,R=b,h(b,"Added missing iframe ID: "+b+" ("+a.src+")")),b}function g(){h(w,"IFrame scrolling "+(P[w].scrolling?"enabled":"disabled")+" for "+w),a.style.overflow=!1===P[w].scrolling?"hidden":"auto",a.scrolling=!1===P[w].scrolling?"no":"yes"}function i(){("number"==typeof P[w].bodyMargin||"0"===P[w].bodyMargin)&&(P[w].bodyMarginV1=P[w].bodyMargin,P[w].bodyMargin=""+P[w].bodyMargin+"px")}function k(){var b=P[w].firstRun,c=P[w].heightCalculationMethod in O;!b&&c&&r({iframe:a,height:0,width:0,type:"init"})}function l(){Function.prototype.bind&&(P[w].iframe.iFrameResizer={close:n.bind(null,P[w].iframe),resize:u.bind(null,"Window resize","resize",P[w].iframe),moveToAnchor:function(a){u("Move to anchor","inPageLink:"+a,P[w].iframe,w)},sendMessage:function(a){a=JSON.stringify(a),u("Send Message","message:"+a,P[w].iframe,w)}})}function m(c){function d(){u("iFrame.onload",c,a),k()}b(a,"load",d),u("init",c,a)}function o(a){if("object"!=typeof a)throw new TypeError("Options is not an object")}function p(a){for(var b in S)S.hasOwnProperty(b)&&(P[w][b]=a.hasOwnProperty(b)?a[b]:S[b])}function q(a){return""===a||"file://"===a?"*":a}function s(b){b=b||{},P[w]={firstRun:!0,iframe:a,remoteHost:a.src.split("/").slice(0,3).join("/")},o(b),p(b),P[w].targetOrigin=!0===P[w].checkOrigin?q(P[w].remoteHost):"*"}function t(){return w in P&&"iFrameResizer"in a}var w=f(a.id);t()?j(w,"Ignored iFrame, already setup."):(s(c),g(),d(),i(),m(v(w)),l())}function x(a,b){null===Q&&(Q=setTimeout(function(){Q=null,a()},b))}function y(){function b(){function a(a){function b(b){return"0px"===P[a].iframe.style[b]}function c(a){return null!==a.offsetParent}c(P[a].iframe)&&(b("height")||b("width"))&&u("Visibility change","resize",P[a].iframe,a)}for(var b in P)a(b)}function c(a){h("window","Mutation observed: "+a[0].target+" "+a[0].type),x(b,16)}function d(){var a=document.querySelector("body"),b={attributes:!0,attributeOldValue:!1,characterData:!0,characterDataOldValue:!1,childList:!0,subtree:!0},d=new e(c);d.observe(a,b)}var e=a.MutationObserver||a.WebKitMutationObserver;e&&d()}function z(a){function b(){B("Window "+a,"resize")}h("window","Trigger event: "+a),x(b,16)}function A(){function a(){B("Tab Visable","resize")}"hidden"!==document.visibilityState&&(h("document","Trigger event: Visiblity change"),x(a,16))}function B(a,b){function c(a){return"parent"===P[a].resizeFrom&&P[a].autoResize&&!P[a].firstRun}for(var d in P)c(d)&&u(a,b,document.getElementById(d),d)}function C(){b(a,"message",l),b(a,"resize",function(){z("resize")}),b(document,"visibilitychange",A),b(document,"-webkit-visibilitychange",A),b(a,"focusin",function(){z("focus")}),b(a,"focus",function(){z("focus")})}function D(){function a(a,c){function d(){if(!c.tagName)throw new TypeError("Object is not a valid DOM element");if("IFRAME"!==c.tagName.toUpperCase())throw new TypeError("Expected <IFRAME> tag, found <"+c.tagName+">")}c&&(d(),w(c,a),b.push(c))}var b;return d(),C(),function(c,d){switch(b=[],typeof d){case"undefined":case"string":Array.prototype.forEach.call(document.querySelectorAll(d||"iframe"),a.bind(void 0,c));break;case"object":a(c,d);break;default:throw new TypeError("Unexpected data type ("+typeof d+")")}return b}}function E(a){a.fn.iFrameResize=function(a){return this.filter("iframe").each(function(b,c){w(c,a)}).end()}}var F=0,G=!1,H=!1,I="message",J=I.length,K="[iFrameSizer]",L=K.length,M=null,N=a.requestAnimationFrame,O={max:1,scroll:1,bodyScroll:1,documentElementScroll:1},P={},Q=null,R="Host Page",S={autoResize:!0,bodyBackground:null,bodyMargin:null,bodyMarginV1:8,bodyPadding:null,checkOrigin:!0,inPageLinks:!1,enablePublicMethods:!0,heightCalculationMethod:"bodyOffset",id:"iFrameResizer",interval:32,log:!1,maxHeight:1/0,maxWidth:1/0,minHeight:0,minWidth:0,resizeFrom:"parent",scrolling:!1,sizeHeight:!0,sizeWidth:!1,tolerance:0,widthCalculationMethod:"scroll",closedCallback:function(){},initCallback:function(){},messageCallback:function(){j("MessageCallback function not defined")},resizedCallback:function(){},scrollCallback:function(){return!0}};a.jQuery&&E(jQuery),"function"==typeof define&&define.amd?define([],D):"object"==typeof module&&"object"==typeof module.exports?module.exports=D():a.iFrameResize=a.iFrameResize||D()}(window||{});
+!function(f){if("undefined"!=typeof window){var e,l=0,m=!1,n=!1,p="message".length,b="[iFrameSizer]",y=b.length,v=null,r=window.requestAnimationFrame,g={max:1,scroll:1,bodyScroll:1,documentElementScroll:1},F={},i=null,h={autoResize:!0,bodyBackground:null,bodyMargin:null,bodyMarginV1:8,bodyPadding:null,checkOrigin:!0,inPageLinks:!1,enablePublicMethods:!0,heightCalculationMethod:"bodyOffset",id:"iFrameResizer",interval:32,log:!1,maxHeight:1/0,maxWidth:1/0,minHeight:0,minWidth:0,resizeFrom:"parent",scrolling:!1,sizeHeight:!0,sizeWidth:!1,warningTimeout:5e3,tolerance:0,widthCalculationMethod:"scroll",onClosed:function(){},onInit:function(){},onMessage:function(){O("onMessage function not defined")},onResized:function(){},onScroll:function(){return!0}},I={};window.jQuery&&((e=window.jQuery).fn?e.fn.iFrameResize||(e.fn.iFrameResize=function(i){return this.filter("iframe").each(function(e,n){d(n,i)}).end()}):z("","Unable to bind to jQuery, it is not fully loaded.")),"function"==typeof define&&define.amd?define([],B):"object"==typeof module&&"object"==typeof module.exports&&(module.exports=B()),window.iFrameResize=window.iFrameResize||B()}function w(){return window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver}function M(e,n,i){e.addEventListener(n,i,!1)}function x(e,n,i){e.removeEventListener(n,i,!1)}function o(e){return b+"["+(i="Host page: "+(n=e),window.top!==window.self&&(i=window.parentIFrame&&window.parentIFrame.getId?window.parentIFrame.getId()+": "+n:"Nested host page: "+n),i)+"]";var n,i}function t(e){return F[e]?F[e].log:m}function k(e,n){a("log",e,n,t(e))}function z(e,n){a("info",e,n,t(e))}function O(e,n){a("warn",e,n,!0)}function a(e,n,i,t){!0===t&&"object"==typeof window.console&&console[e](o(n),i)}function s(n){function a(){e("Height"),e("Width"),j(function(){S(h),N(w),l("onResized",h)},h,"init")}function e(e){var n=Number(F[w]["max"+e]),i=Number(F[w]["min"+e]),t=e.toLowerCase(),o=Number(h[t]);k(w,"Checking "+t+" is in range "+i+"-"+n),o<i&&(o=i,k(w,"Set "+t+" to min value")),n<o&&(o=n,k(w,"Set "+t+" to max value")),h[t]=""+o}function s(e){return g.substr(g.indexOf(":")+p+e)}function d(i,t){var e,n,o;e=function(){var e,n;P("Send Page Info","pageInfo:"+(e=document.body.getBoundingClientRect(),n=h.iframe.getBoundingClientRect(),JSON.stringify({iframeHeight:n.height,iframeWidth:n.width,clientHeight:Math.max(document.documentElement.clientHeight,window.innerHeight||0),clientWidth:Math.max(document.documentElement.clientWidth,window.innerWidth||0),offsetTop:parseInt(n.top-e.top,10),offsetLeft:parseInt(n.left-e.left,10),scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,documentHeight:document.documentElement.clientHeight,documentWidth:document.documentElement.clientWidth,windowHeight:window.innerHeight,windowWidth:window.innerWidth})),i,t)},n=32,I[o=t]||(I[o]=setTimeout(function(){I[o]=null,e()},n))}function c(e){var n=e.getBoundingClientRect();return W(w),{x:Math.floor(Number(n.left)+Number(v.x)),y:Math.floor(Number(n.top)+Number(v.y))}}function u(e){var n=e?c(h.iframe):{x:0,y:0},i={x:Number(h.width)+n.x,y:Number(h.height)+n.y};k(w,"Reposition requested from iFrame (offset x:"+n.x+" y:"+n.y+")"),window.top!==window.self?window.parentIFrame?window.parentIFrame["scrollTo"+(e?"Offset":"")](i.x,i.y):O(w,"Unable to scroll to requested position, window.parentIFrame not found"):(v=i,f(),k(w,"--"))}function f(){!1!==l("onScroll",v)?N(w):C()}function l(e,n){return R(w,e,n)}var i,t,o,r,m,g=n.data,h={},w=null;"[iFrameResizerChild]Ready"===g?function(){for(var e in F)P("iFrame requested init",A(e),document.getElementById(e),e)}():b===(""+g).substr(0,y)&&g.substr(y).split(":")[0]in F?(m=g.substr(y).split(":"),h={iframe:F[m[0]]&&F[m[0]].iframe,id:m[0],height:m[1],width:m[2],type:m[3]},w=h.id,F[w]&&(F[w].loaded=!0),(r=h.type in{true:1,false:1,undefined:1})&&k(w,"Ignoring init message from meta parent page"),!r&&(o=!0,F[t=w]||(o=!1,O(h.type+" No settings for "+t+". Message was: "+g)),o)&&(k(w,"Received: "+g),i=!0,null===h.iframe&&(O(w,"IFrame ("+h.id+") not found"),i=!1),i&&function(){var e,i=n.origin,t=F[w]&&F[w].checkOrigin;if(t&&""+i!="null"&&!(t.constructor===Array?function(){var e=0,n=!1;for(k(w,"Checking connection is from allowed list of origins: "+t);e<t.length;e++)if(t[e]===i){n=!0;break}return n}():(e=F[w]&&F[w].remoteHost,k(w,"Checking connection is from: "+e),i===e)))throw new Error("Unexpected message received from: "+i+" for "+h.iframe.id+". Message was: "+n.data+". This error can be disabled by setting the checkOrigin: false option or by providing of array of trusted domains.");return!0}()&&function(){switch(F[w]&&F[w].firstRun&&F[w]&&(F[w].firstRun=!1),h.type){case"close":F[w].closeRequeston?R(w,"onCloseRequest",F[w].iframe):T(h.iframe);break;case"message":r=s(6),k(w,"onMessage passed: {iframe: "+h.iframe.id+", message: "+r+"}"),l("onMessage",{iframe:h.iframe,message:JSON.parse(r)}),k(w,"--");break;case"scrollTo":u(!1);break;case"scrollToOffset":u(!0);break;case"pageInfo":d(F[w]&&F[w].iframe,w),function(){function e(n,i){function t(){F[r]?d(F[r].iframe,r):o()}["scroll","resize"].forEach(function(e){k(r,n+e+" listener for sendPageInfo"),i(window,e,t)})}function o(){e("Remove ",x)}var r=w;e("Add ",M),F[r]&&(F[r].stopPageInfo=o)}();break;case"pageInfoStop":F[w]&&F[w].stopPageInfo&&(F[w].stopPageInfo(),delete F[w].stopPageInfo);break;case"inPageLink":e=s(9),i=e.split("#")[1]||"",t=decodeURIComponent(i),(o=document.getElementById(t)||document.getElementsByName(t)[0])?(n=c(o),k(w,"Moving to in page link (#"+i+") at x: "+n.x+" y: "+n.y),v={x:n.x,y:n.y},f(),k(w,"--")):window.top!==window.self?window.parentIFrame?window.parentIFrame.moveToAnchor(i):k(w,"In page link #"+i+" not found and window.parentIFrame not found"):k(w,"In page link #"+i+" not found");break;case"reset":H(h);break;case"init":a(),l("onInit",h.iframe);break;default:a()}var e,n,i,t,o,r}())):z(w,"Ignored: "+g)}function R(e,n,i){var t=null,o=null;if(F[e]){if("function"!=typeof(t=F[e][n]))throw new TypeError(n+" on iFrame["+e+"] is not a function");o=t(i)}return o}function E(e){var n=e.id;delete F[n]}function T(e){var n=e.id;k(n,"Removing iFrame: "+n);try{e.parentNode&&e.parentNode.removeChild(e)}catch(e){O(e)}R(n,"onClosed",n),k(n,"--"),E(e)}function W(e){null===v&&k(e,"Get page position: "+(v={x:window.pageXOffset!==f?window.pageXOffset:document.documentElement.scrollLeft,y:window.pageYOffset!==f?window.pageYOffset:document.documentElement.scrollTop}).x+","+v.y)}function N(e){null!==v&&(window.scrollTo(v.x,v.y),k(e,"Set page position: "+v.x+","+v.y),C())}function C(){v=null}function H(e){k(e.id,"Size reset requested by "+("init"===e.type?"host page":"iFrame")),W(e.id),j(function(){S(e),P("reset","reset",e.iframe,e.id)},e,"reset")}function S(i){function t(e){n||"0"!==i[e]||(n=!0,k(o,"Hidden iFrame detected, creating visibility listener"),function(){function n(){Object.keys(F).forEach(function(e){!function(n){function e(e){return"0px"===(F[n]&&F[n].iframe.style[e])}F[n]&&(i=F[n].iframe,null!==i.offsetParent)&&(e("height")||e("width"))&&P("Visibility change","resize",F[n].iframe,n);var i}(F[e])})}function e(e){k("window","Mutation observed: "+e[0].target+" "+e[0].type),c(n,16)}var i=w();i&&(t=document.querySelector("body"),o={attributes:!0,attributeOldValue:!1,characterData:!0,characterDataOldValue:!1,childList:!0,subtree:!0},new i(e).observe(t,o));var t,o}())}function e(e){var n;n=e,i.id?(i.iframe.style[n]=i[n]+"px",k(i.id,"IFrame ("+o+") "+n+" set to "+i[n]+"px")):k("undefined","messageData id not set"),t(e)}var o=i.iframe.id;F[o]&&(F[o].sizeHeight&&e("height"),F[o].sizeWidth&&e("width"))}function j(e,n,i){i!==n.type&&r?(k(n.id,"Requesting animation frame"),r(e)):e()}function P(e,n,i,t,o){var r,a=!1;t=t||i.id,F[t]&&(i&&"contentWindow"in i&&null!==i.contentWindow?(r=F[t]&&F[t].targetOrigin,k(t,"["+e+"] Sending msg to iframe["+t+"] ("+n+") targetOrigin: "+r),i.contentWindow.postMessage(b+n,r)):O(t,"["+e+"] IFrame("+t+") not found"),o&&F[t]&&F[t].warningTimeout&&(F[t].msgTimeout=setTimeout(function(){!F[t]||F[t].loaded||a||(a=!0,O(t,"IFrame has not responded within "+F[t].warningTimeout/1e3+" seconds. Check iFrameResizer.contentWindow.js has been loaded in iFrame. This message can be ignored if everything is working, or you can set the warningTimeout option to a higher value or zero to suppress this warning."))},F[t].warningTimeout)))}function A(e){return e+":"+F[e].bodyMarginV1+":"+F[e].sizeWidth+":"+F[e].log+":"+F[e].interval+":"+F[e].enablePublicMethods+":"+F[e].autoResize+":"+F[e].bodyMargin+":"+F[e].heightCalculationMethod+":"+F[e].bodyBackground+":"+F[e].bodyPadding+":"+F[e].tolerance+":"+F[e].inPageLinks+":"+F[e].resizeFrom+":"+F[e].widthCalculationMethod}function d(i,e){function n(e){var n=e.split("Callback");if(2===n.length){var i="on"+n[0].charAt(0).toUpperCase()+n[0].slice(1);this[i]=this[e],delete this[e],O(u,"Deprecated: '"+e+"' has been renamed '"+i+"'. The old method will be removed in the next major version.")}}var t,o,r,a,s,d,c,u=(""===(t=i.id)&&(i.id=(o=e&&e.id||h.id+l++,null!==document.getElementById(o)&&(o+=l++),t=o),m=(e||{}).log,k(t,"Added missing iframe ID: "+t+" ("+i.src+")")),t);u in F&&"iFrameResizer"in i?O(u,"Ignored iFrame, already setup."):(d=(d=e)||{},F[u]={firstRun:!0,iframe:i,remoteHost:i.src.split("/").slice(0,3).join("/")},function(e){if("object"!=typeof e)throw new TypeError("Options is not an object")}(d),Object.keys(d).forEach(n,d),function(e){for(var n in h)Object.prototype.hasOwnProperty.call(h,n)&&(F[u][n]=Object.prototype.hasOwnProperty.call(e,n)?e[n]:h[n])}(d),F[u]&&(F[u].targetOrigin=!0===F[u].checkOrigin?""===(c=F[u].remoteHost)||"file://"===c?"*":c:"*"),function(){switch(k(u,"IFrame scrolling "+(F[u]&&F[u].scrolling?"enabled":"disabled")+" for "+u),i.style.overflow=!1===(F[u]&&F[u].scrolling)?"hidden":"auto",F[u]&&F[u].scrolling){case"omit":break;case!0:i.scrolling="yes";break;case!1:i.scrolling="no";break;default:i.scrolling=F[u]?F[u].scrolling:"no"}}(),function(){function e(e){1/0!==F[u][e]&&0!==F[u][e]&&(i.style[e]=F[u][e]+"px",k(u,"Set "+e+" = "+F[u][e]+"px"))}function n(e){if(F[u]["min"+e]>F[u]["max"+e])throw new Error("Value for min"+e+" can not be greater than max"+e)}n("Height"),n("Width"),e("maxHeight"),e("minHeight"),e("maxWidth"),e("minWidth")}(),"number"!=typeof(F[u]&&F[u].bodyMargin)&&"0"!==(F[u]&&F[u].bodyMargin)||(F[u].bodyMarginV1=F[u].bodyMargin,F[u].bodyMargin=F[u].bodyMargin+"px"),r=A(u),(s=w())&&(a=s,i.parentNode&&new a(function(e){e.forEach(function(e){Array.prototype.slice.call(e.removedNodes).forEach(function(e){e===i&&T(i)})})}).observe(i.parentNode,{childList:!0})),M(i,"load",function(){var e,n;P("iFrame.onload",r,i,f,!0),e=F[u]&&F[u].firstRun,n=F[u]&&F[u].heightCalculationMethod in g,!e&&n&&H({iframe:i,height:0,width:0,type:"init"})}),P("init",r,i,f,!0),F[u]&&(F[u].iframe.iFrameResizer={close:T.bind(null,F[u].iframe),removeListeners:E.bind(null,F[u].iframe),resize:P.bind(null,"Window resize","resize",F[u].iframe),moveToAnchor:function(e){P("Move to anchor","moveToAnchor:"+e,F[u].iframe,u)},sendMessage:function(e){P("Send Message","message:"+(e=JSON.stringify(e)),F[u].iframe,u)}}))}function c(e,n){null===i&&(i=setTimeout(function(){i=null,e()},n))}function u(){"hidden"!==document.visibilityState&&(k("document","Trigger event: Visiblity change"),c(function(){q("Tab Visable","resize")},16))}function q(i,t){Object.keys(F).forEach(function(e){var n;F[n=e]&&"parent"===F[n].resizeFrom&&F[n].autoResize&&!F[n].firstRun&&P(i,t,document.getElementById(e),e)})}function L(){M(window,"message",s),M(window,"resize",function(){var e;k("window","Trigger event: "+(e="resize")),c(function(){q("Window "+e,"resize")},16)}),M(document,"visibilitychange",u),M(document,"-webkit-visibilitychange",u)}function B(){function t(e,n){n&&(!function(){if(!n.tagName)throw new TypeError("Object is not a valid DOM element");if("IFRAME"!==n.tagName.toUpperCase())throw new TypeError("Expected <IFRAME> tag, found <"+n.tagName+">")}(),d(n,e),o.push(n))}var o;return function(){var e,n=["moz","webkit","o","ms"];for(e=0;e<n.length&&!r;e+=1)r=window[n[e]+"RequestAnimationFrame"];r||k("setup","RequestAnimationFrame not supported")}(),L(),function(e,n){var i;switch(o=[],(i=e)&&i.enablePublicMethods&&O("enablePublicMethods option has been removed, public methods are now always available in the iFrame"),typeof n){case"undefined":case"string":Array.prototype.forEach.call(document.querySelectorAll(n||"iframe"),t.bind(f,e));break;case"object":t(e,n);break;default:throw new TypeError("Unexpected data type ("+typeof n+")")}return o}}}();
+//# 
+/*! iFrame Resizer (iframeSizer.contentWindow.min.js) - v4.1.1 - 2019-04-10
+ *  Desc: Include this file in any page being loaded into an iframe
+ *        to force the iframe to resize to the content size.
+ *  Requires: iframeResizer.min.js on host page.
+ *  Copyright: (c) 2019 David J. Bradshaw - dave@bradshaw.net
+ *  License: MIT
+ */
+
+!function(l){if("undefined"!=typeof window){var n=!0,o=10,i="",r=0,a="",t=null,u="",c=!1,s={resize:1,click:1},d=128,f=!0,m=1,h="bodyOffset",g=h,p=!0,v="",y={},b=32,e=null,w=!1,T="[iFrameSizer]",E=T.length,O="",S={max:1,min:1,bodyScroll:1,documentElementScroll:1},M="child",I=!0,N=window.parent,A="*",C=0,k=!1,z=null,R=16,x=1,L="scroll",F=L,P=window,D=function(){ue("onMessage function not defined")},j=function(){},q=function(){},H={height:function(){return ue("Custom height calculation function not defined"),document.documentElement.offsetHeight},width:function(){return ue("Custom width calculation function not defined"),document.body.scrollWidth}},W={},B=!1;try{var U=Object.create({},{passive:{get:function(){B=!0}}});window.addEventListener("test",te,U),window.removeEventListener("test",te,U)}catch(e){}var J,V,K,Q,X,Y,G,Z=Date.now||function(){return(new Date).getTime()},$={bodyOffset:function(){return document.body.offsetHeight+be("marginTop")+be("marginBottom")},offset:function(){return $.bodyOffset()},bodyScroll:function(){return document.body.scrollHeight},custom:function(){return H.height()},documentElementOffset:function(){return document.documentElement.offsetHeight},documentElementScroll:function(){return document.documentElement.scrollHeight},max:function(){return Math.max.apply(null,Te($))},min:function(){return Math.min.apply(null,Te($))},grow:function(){return $.max()},lowestElement:function(){return Math.max($.bodyOffset()||$.documentElementOffset(),we("bottom",Oe()))},taggedElement:function(){return Ee("bottom","data-iframe-height")}},_={bodyScroll:function(){return document.body.scrollWidth},bodyOffset:function(){return document.body.offsetWidth},custom:function(){return H.width()},documentElementScroll:function(){return document.documentElement.scrollWidth},documentElementOffset:function(){return document.documentElement.offsetWidth},scroll:function(){return Math.max(_.bodyScroll(),_.documentElementScroll())},max:function(){return Math.max.apply(null,Te(_))},min:function(){return Math.min.apply(null,Te(_))},rightMostElement:function(){return we("right",Oe())},taggedElement:function(){return Ee("right","data-iframe-width")}},ee=(J=Se,X=null,Y=0,G=function(){Y=Z(),X=null,Q=J.apply(V,K),X||(V=K=null)},function(){var e=Z();Y||(Y=e);var t=R-(e-Y);return V=this,K=arguments,t<=0||R<t?(X&&(clearTimeout(X),X=null),Y=e,Q=J.apply(V,K),X||(V=K=null)):X||(X=setTimeout(G,t)),Q});ne(window,"message",ke),ne(window,"readystatechange",ze),ze()}function te(){}function ne(e,t,n,o){e.addEventListener(t,n,!!B&&(o||{}))}function oe(e,t,n){e.removeEventListener(t,n,!1)}function ie(e){return e.charAt(0).toUpperCase()+e.slice(1)}function re(e){return T+"["+O+"] "+e}function ae(e){w&&"object"==typeof window.console&&console.log(re(e))}function ue(e){"object"==typeof window.console&&console.warn(re(e))}function ce(){var e;!function(){function e(e){return"true"===e}var t=v.substr(E).split(":");O=t[0],r=l!==t[1]?Number(t[1]):r,c=l!==t[2]?e(t[2]):c,w=l!==t[3]?e(t[3]):w,b=l!==t[4]?Number(t[4]):b,n=l!==t[6]?e(t[6]):n,a=t[7],g=l!==t[8]?t[8]:g,i=t[9],u=t[10],C=l!==t[11]?Number(t[11]):C,y.enable=l!==t[12]&&e(t[12]),M=l!==t[13]?t[13]:M,F=l!==t[14]?t[14]:F}(),ae("Initialising iFrame ("+location.href+")"),function(){function e(e,t){return"function"==typeof e&&(ae("Setup custom "+t+"CalcMethod"),H[t]=e,e="custom"),e}"iFrameResizer"in window&&Object===window.iFrameResizer.constructor&&(t=window.iFrameResizer,ae("Reading data from page: "+JSON.stringify(t)),Object.keys(t).forEach(se,t),D="onMessage"in t?t.onMessage:D,j="onReady"in t?t.onReady:j,A="targetOrigin"in t?t.targetOrigin:A,g="heightCalculationMethod"in t?t.heightCalculationMethod:g,F="widthCalculationMethod"in t?t.widthCalculationMethod:F,g=e(g,"height"),F=e(F,"width"));var t;ae("TargetOrigin for parent set to: "+A)}(),function(){l===a&&(a=r+"px");de("margin",function(e,t){-1!==t.indexOf("-")&&(ue("Negative CSS value ignored for "+e),t="");return t}("margin",a))}(),de("background",i),de("padding",u),(e=document.createElement("div")).style.clear="both",e.style.display="block",e.style.height="0",document.body.appendChild(e),he(),ge(),document.documentElement.style.height="",document.body.style.height="",ae('HTML & body height set to "auto"'),ae("Enable public methods"),P.parentIFrame={autoResize:function(e){return!0===e&&!1===n?(n=!0,pe()):!1===e&&!0===n&&(n=!1,ve()),n},close:function(){Ce(0,0,"close"),ae("Disable outgoing messages"),I=!1,ae("Remove event listener: Message"),oe(window,"message",ke),!0===n&&ve()},getId:function(){return O},getPageInfo:function(e){"function"==typeof e?(q=e,Ce(0,0,"pageInfo")):(q=function(){},Ce(0,0,"pageInfoStop"))},moveToAnchor:function(e){y.findTarget(e)},reset:function(){Ae("parentIFrame.reset")},scrollTo:function(e,t){Ce(t,e,"scrollTo")},scrollToOffset:function(e,t){Ce(t,e,"scrollToOffset")},sendMessage:function(e,t){Ce(0,0,"message",JSON.stringify(e),t)},setHeightCalculationMethod:function(e){g=e,he()},setWidthCalculationMethod:function(e){F=e,ge()},setTargetOrigin:function(e){ae("Set targetOrigin: "+e),A=e},size:function(e,t){var n=(e||"")+(t?","+t:"");Me("size","parentIFrame.size("+n+")",e,t)}},pe(),y=function(){function r(e){var t=e.getBoundingClientRect(),n={x:window.pageXOffset!==l?window.pageXOffset:document.documentElement.scrollLeft,y:window.pageYOffset!==l?window.pageYOffset:document.documentElement.scrollTop};return{x:parseInt(t.left,10)+parseInt(n.x,10),y:parseInt(t.top,10)+parseInt(n.y,10)}}function n(e){var t,n=e.split("#")[1]||e,o=decodeURIComponent(n),i=document.getElementById(o)||document.getElementsByName(o)[0];l!==i?(t=r(i),ae("Moving to in page link (#"+n+") at x: "+t.x+" y: "+t.y),Ce(t.y,t.x,"scrollToOffset")):(ae("In page link (#"+n+") not found in iFrame, so sending to parent"),Ce(0,0,"inPageLink","#"+n))}function e(){""!==location.hash&&"#"!==location.hash&&n(location.href)}function t(){Array.prototype.forEach.call(document.querySelectorAll('a[href^="#"]'),function(e){function t(e){e.preventDefault(),n(this.getAttribute("href"))}"#"!==e.getAttribute("href")&&ne(e,"click",t)})}y.enable?Array.prototype.forEach&&document.querySelectorAll?(ae("Setting up location.hash handlers"),t(),ne(window,"hashchange",e),setTimeout(e,d)):ue("In page linking not fully supported in this browser! (See README.md for IE8 workaround)"):ae("In page linking not enabled");return{findTarget:n}}(),Me("init","Init message from host page"),j()}function se(e){var t=e.split("Callback");if(2===t.length){var n="on"+t[0].charAt(0).toUpperCase()+t[0].slice(1);this[n]=this[e],delete this[e],ue("Deprecated: '"+e+"' has been renamed '"+n+"'. The old method will be removed in the next major version.")}}function de(e,t){l!==t&&""!==t&&"null"!==t&&ae("Body "+e+' set to "'+(document.body.style[e]=t)+'"')}function le(n){var e={add:function(e){function t(){Me(n.eventName,n.eventType)}W[e]=t,ne(window,e,t,{passive:!0})},remove:function(e){var t=W[e];delete W[e],oe(window,e,t)}};n.eventNames&&Array.prototype.map?(n.eventName=n.eventNames[0],n.eventNames.map(e[n.method])):e[n.method](n.eventName),ae(ie(n.method)+" event listener: "+n.eventType)}function fe(e){le({method:e,eventType:"Animation Start",eventNames:["animationstart","webkitAnimationStart"]}),le({method:e,eventType:"Animation Iteration",eventNames:["animationiteration","webkitAnimationIteration"]}),le({method:e,eventType:"Animation End",eventNames:["animationend","webkitAnimationEnd"]}),le({method:e,eventType:"Input",eventName:"input"}),le({method:e,eventType:"Mouse Up",eventName:"mouseup"}),le({method:e,eventType:"Mouse Down",eventName:"mousedown"}),le({method:e,eventType:"Orientation Change",eventName:"orientationchange"}),le({method:e,eventType:"Print",eventName:["afterprint","beforeprint"]}),le({method:e,eventType:"Ready State Change",eventName:"readystatechange"}),le({method:e,eventType:"Touch Start",eventName:"touchstart"}),le({method:e,eventType:"Touch End",eventName:"touchend"}),le({method:e,eventType:"Touch Cancel",eventName:"touchcancel"}),le({method:e,eventType:"Transition Start",eventNames:["transitionstart","webkitTransitionStart","MSTransitionStart","oTransitionStart","otransitionstart"]}),le({method:e,eventType:"Transition Iteration",eventNames:["transitioniteration","webkitTransitionIteration","MSTransitionIteration","oTransitionIteration","otransitioniteration"]}),le({method:e,eventType:"Transition End",eventNames:["transitionend","webkitTransitionEnd","MSTransitionEnd","oTransitionEnd","otransitionend"]}),"child"===M&&le({method:e,eventType:"IFrame Resized",eventName:"resize"})}function me(e,t,n,o){return t!==e&&(e in n||(ue(e+" is not a valid option for "+o+"CalculationMethod."),e=t),ae(o+' calculation method set to "'+e+'"')),e}function he(){g=me(g,h,$,"height")}function ge(){F=me(F,L,_,"width")}function pe(){var e;!0===n?(fe("add"),e=b<0,window.MutationObserver||window.WebKitMutationObserver?e?ye():t=function(){function t(e){function t(e){!1===e.complete&&(ae("Attach listeners to "+e.src),e.addEventListener("load",i,!1),e.addEventListener("error",r,!1),c.push(e))}"attributes"===e.type&&"src"===e.attributeName?t(e.target):"childList"===e.type&&Array.prototype.forEach.call(e.target.querySelectorAll("img"),t)}function o(e){var t;ae("Remove listeners from "+e.src),e.removeEventListener("load",i,!1),e.removeEventListener("error",r,!1),t=e,c.splice(c.indexOf(t),1)}function n(e,t,n){o(e.target),Me(t,n+": "+e.target.src,l,l)}function i(e){n(e,"imageLoad","Image loaded")}function r(e){n(e,"imageLoadFailed","Image load failed")}function e(e){Me("mutationObserver","mutationObserver: "+e[0].target+" "+e[0].type),e.forEach(t)}var a,u,c=[],s=window.MutationObserver||window.WebKitMutationObserver,d=(a=document.querySelector("body"),u={attributes:!0,attributeOldValue:!1,characterData:!0,characterDataOldValue:!1,childList:!0,subtree:!0},d=new s(e),ae("Create body MutationObserver"),d.observe(a,u),d);return{disconnect:function(){"disconnect"in d&&(ae("Disconnect body MutationObserver"),d.disconnect(),c.forEach(o))}}}():(ae("MutationObserver not supported in this browser!"),ye())):ae("Auto Resize disabled")}function ve(){fe("remove"),null!==t&&t.disconnect(),clearInterval(e)}function ye(){0!==b&&(ae("setInterval: "+b+"ms"),e=setInterval(function(){Me("interval","setInterval: "+b)},Math.abs(b)))}function be(e,t){var n=0;return t=t||document.body,n=null!==(n=document.defaultView.getComputedStyle(t,null))?n[e]:0,parseInt(n,o)}function we(e,t){for(var n,o=t.length,i=0,r=0,a=ie(e),u=Z(),c=0;c<o;c++)r<(i=t[c].getBoundingClientRect()[e]+be("margin"+a,t[c]))&&(r=i);return u=Z()-u,ae("Parsed "+o+" HTML elements"),ae("Element position calculated in "+u+"ms"),R/2<(n=u)&&ae("Event throttle increased to "+(R=2*n)+"ms"),r}function Te(e){return[e.bodyOffset(),e.bodyScroll(),e.documentElementOffset(),e.documentElementScroll()]}function Ee(e,t){var n=document.querySelectorAll("["+t+"]");return 0===n.length&&(ue("No tagged elements ("+t+") found on page"),document.querySelectorAll("body *")),we(e,n)}function Oe(){return document.querySelectorAll("body *")}function Se(e,t,n,o){var i,r;!function(){function e(e,t){return!(Math.abs(e-t)<=C)}return i=l!==n?n:$[g](),r=l!==o?o:_[F](),e(m,i)||c&&e(x,r)}()&&"init"!==e?e in{init:1,interval:1,size:1}||!(g in S||c&&F in S)?e in{interval:1}||ae("No change in size detected"):Ae(t):(Ie(),Ce(m=i,x=r,e))}function Me(e,t,n,o){k&&e in s?ae("Trigger event cancelled: "+e):(e in{reset:1,resetPage:1,init:1}||ae("Trigger event: "+t),"init"===e?Se(e,t,n,o):ee(e,t,n,o))}function Ie(){k||(k=!0,ae("Trigger event lock on")),clearTimeout(z),z=setTimeout(function(){k=!1,ae("Trigger event lock off"),ae("--")},d)}function Ne(e){m=$[g](),x=_[F](),Ce(m,x,e)}function Ae(e){var t=g;g=h,ae("Reset trigger event: "+e),Ie(),Ne("reset"),g=t}function Ce(e,t,n,o,i){var r;!0===I&&(l===i?i=A:ae("Message targetOrigin: "+i),ae("Sending message to host page ("+(r=O+":"+e+":"+t+":"+n+(l!==o?":"+o:""))+")"),N.postMessage(T+r,i))}function ke(t){var n={init:function(){v=t.data,N=t.source,ce(),f=!1,setTimeout(function(){p=!1},d)},reset:function(){p?ae("Page reset ignored by init"):(ae("Page size reset by host page"),Ne("resetPage"))},resize:function(){Me("resizeParent","Parent window requested size check")},moveToAnchor:function(){y.findTarget(i())},inPageLink:function(){this.moveToAnchor()},pageInfo:function(){var e=i();ae("PageInfoFromParent called from parent: "+e),q(JSON.parse(e)),ae(" --")},message:function(){var e=i();ae("onMessage called from parent: "+e),D(JSON.parse(e)),ae(" --")}};function o(){return t.data.split("]")[1].split(":")[0]}function i(){return t.data.substr(t.data.indexOf(":")+1)}function r(){return t.data.split(":")[2]in{true:1,false:1}}function e(){var e=o();e in n?n[e]():("undefined"==typeof module||!module.exports)&&"iFrameResize"in window||"jQuery"in window&&"iFrameResize"in window.jQuery.prototype||r()||ue("Unexpected message ("+t.data+")")}T===(""+t.data).substr(0,E)&&(!1===f?e():r()?n.init():ae('Ignored message of type "'+o()+'". Received before initialization.'))}function ze(){"loading"!==document.readyState&&window.parent.postMessage("[iFrameResizerChild]Ready","*")}}();
 //# 
 /*!
  * Piwik - free/libre analytics platform
@@ -1242,7 +1262,7 @@ var piwikAppConfig=angular.module('piwikApp.config');for(var index in piwik.conf
 (function(){angular.module('piwikApp.service').service('piwik',piwikService);piwikService.$inject=['piwikPeriods'];function piwikService(piwikPeriods){var originalTitle;piwik.helper=piwikHelper;piwik.broadcast=broadcast;piwik.updatePeriodParamsFromUrl=updatePeriodParamsFromUrl;piwik.updateDateInTitle=updateDateInTitle;piwik.hasUserCapability=hasUserCapability;return piwik;function hasUserCapability(capability){return angular.isArray(piwik.userCapabilities)&&piwik.userCapabilities.indexOf(capability)!==-1;}
 function updatePeriodParamsFromUrl(){var date=piwik.broadcast.getValueFromHash('date')||piwik.broadcast.getValueFromUrl('date');var period=piwik.broadcast.getValueFromHash('period')||piwik.broadcast.getValueFromUrl('period');if(!isValidPeriod(period,date)){return;}
 if(piwik.period===period&&piwik.currentDateString===date){return;}
-piwik.period=period;var dateRange=piwikPeriods.parse(period,date).getDateRange();piwik.startDateString=$.datepicker.formatDate('yy-mm-dd',dateRange[0]);piwik.endDateString=$.datepicker.formatDate('yy-mm-dd',dateRange[1]);updateDateInTitle(date,period);if(piwik.period==='range'){date=piwik.startDateString+','+piwik.endDateString;}
+piwik.period=period;var dateRange=piwikPeriods.parse(period,date).getDateRange();piwik.startDateString=piwikPeriods.format(dateRange[0]);piwik.endDateString=piwikPeriods.format(dateRange[1]);updateDateInTitle(date,period);if(piwik.period==='range'){date=piwik.startDateString+','+piwik.endDateString;}
 piwik.currentDateString=date;}
 function isValidPeriod(periodStr,dateStr){try{piwikPeriods.get(periodStr).parse(dateStr);return true;}catch(e){return false;}}
 function updateDateInTitle(date,period){if(!$('.top_controls #periodString').length){return;}
@@ -1254,8 +1274,9 @@ angular.module('piwikApp.service').run(initPiwikService);initPiwikService.$injec
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-var hasBlockedContent=false;(function(){angular.module('piwikApp.service').factory('piwikApi',piwikApiService);piwikApiService.$inject=['$http','$q','$rootScope','piwik','$window'];function piwikApiService($http,$q,$rootScope,piwik,$window){var url='index.php';var format='json';var getParams={};var postParams={};var allRequests=[];function addParams(params){if(typeof params=='string'){params=piwik.broadcast.getValuesFromUrl(params);}
-for(var key in params){getParams[key]=params[key];}}
+var hasBlockedContent=false;(function(){angular.module('piwikApp.service').factory('piwikApi',piwikApiService);piwikApiService.$inject=['$http','$q','$rootScope','piwik','$window','piwikUrl'];function piwikApiService($http,$q,$rootScope,piwik,$window,piwikUrl){var url='index.php';var format='json';var getParams={};var postParams={};var allRequests=[];function addParams(params){if(typeof params=='string'){params=piwik.broadcast.getValuesFromUrl(params);}
+var arrayParams=['compareSegments','comparePeriods','compareDates'];for(var key in params){if(arrayParams.indexOf(key)!==-1&&!params[key]){continue;}
+getParams[key]=params[key];}}
 function withTokenInUrl(){postParams['token_auth']=piwik.token_auth;}
 function isRequestToApiMethod(){return getParams&&getParams['module']==='API'&&getParams['method'];}
 function reset(){getParams={};postParams={};}
@@ -1267,10 +1288,11 @@ function onSuccess(response){var headers=response.headers;response=response.data
 function onError(response){var message='Something went wrong';if(response&&(response.status===0||response.status===-1)){message='Request was possibly aborted';}
 return $q.reject(message);}
 var deferred=$q.defer(),requestPromise=deferred.promise;var headers={'Content-Type':'application/x-www-form-urlencoded','cache-control':'no-cache'};var requestFormat=format;if(getParams.format&&getParams.format.toLowerCase()!=='json'&&getParams.format.toLowerCase()!=='json2'){requestFormat=getParams.format;}
-var ajaxCall={method:'POST',url:url,responseType:requestFormat,params:mixinDefaultGetParams(getParams),data:$.param(getPostParams(postParams)),timeout:requestPromise,headers:headers};var promise=$http(ajaxCall).then(onSuccess,onError);var addAbortMethod=function(to,deferred){return{then:function(){return addAbortMethod(to.then.apply(to,arguments),deferred);},'finally':function(){return addAbortMethod(to.finally.apply(to,arguments),deferred);},'catch':function(){return addAbortMethod(to.catch.apply(to,arguments),deferred);},abort:function(){deferred.resolve();return this;}};};var request=addAbortMethod(promise,deferred);allRequests.push(request);return request.finally(function(){var index=allRequests.indexOf(request);if(index!==-1){allRequests.splice(index,1);}});}
+var ajaxCall={method:'POST',url:url+'?'+$.param(mixinDefaultGetParams(getParams)),responseType:requestFormat,data:$.param(getPostParams(postParams)),timeout:requestPromise,headers:headers};var promise=$http(ajaxCall).then(onSuccess,onError);var addAbortMethod=function(to,deferred){return{then:function(){return addAbortMethod(to.then.apply(to,arguments),deferred);},'finally':function(){return addAbortMethod(to.finally.apply(to,arguments),deferred);},'catch':function(){return addAbortMethod(to.catch.apply(to,arguments),deferred);},abort:function(){deferred.resolve();return this;}};};var request=addAbortMethod(promise,deferred);allRequests.push(request);return request.finally(function(){var index=allRequests.indexOf(request);if(index!==-1){allRequests.splice(index,1);}});}
 function getPostParams(params){if(isRequestToApiMethod()||piwik.shouldPropagateTokenAuth){params.token_auth=piwik.token_auth;}
 return params;}
-function mixinDefaultGetParams(getParamsToMixin){var segment=piwik.broadcast.getValueFromHash('segment',$window.location.href.split('#')[1]);segment=decodeURIComponent(segment);var defaultParams={idSite:piwik.idSite||piwik.broadcast.getValueFromUrl('idSite'),period:piwik.period||piwik.broadcast.getValueFromUrl('period'),segment:segment};if(getParamsToMixin.token_auth){getParamsToMixin.token_auth=null;delete getParamsToMixin.token_auth;}
+function mixinDefaultGetParams(getParamsToMixin){var segment=piwikUrl.getSearchParam('segment');if(segment){segment=decodeURIComponent(segment);}
+var defaultParams={idSite:piwik.idSite||piwikUrl.getSearchParam('idSite'),period:piwik.period||piwikUrl.getSearchParam('period'),segment:segment};if(getParamsToMixin.token_auth){getParamsToMixin.token_auth=null;delete getParamsToMixin.token_auth;}
 for(var key in defaultParams){if(!(key in getParamsToMixin)&&!(key in postParams)&&defaultParams[key]){getParamsToMixin[key]=defaultParams[key];}}
 if(!getParamsToMixin.date&&!postParams.date){getParamsToMixin.date=piwik.currentDateString;}
 return getParamsToMixin;}
@@ -1292,11 +1314,8 @@ return{withTokenInUrl:withTokenInUrl,bulkFetch:bulkFetch,post:post,fetch:fetch,a
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp.service').service('piwikUrl',piwikUrl);piwikUrl.$inject=['$location','piwik'];function piwikUrl($location,piwik){var model={getSearchParam:getSearchParam};return model;function getSearchParam(paramName){if(paramName==='segment'){var hash=window.location.href.split('#');if(hash&&hash[1]){return piwik.broadcast.getValueFromHash(paramName,hash[1]);}
-return broadcast.getValueFromUrl(paramName);}
-var search=$location.search();if(!search[paramName]){var paramUrlValue=piwik.broadcast.getValueFromUrl(paramName);if(paramUrlValue!==false&&paramUrlValue!==''&&paramUrlValue!==null&&paramUrlValue!==undefined&&paramName!=='token_auth'){search[paramName]=paramUrlValue;}else{return paramUrlValue;}}
-if(search[paramName]){var value=search[paramName];if(angular.isArray(search[paramName])){return value[value.length-1];}
-return value;}}}})();
+(function(){angular.module('piwikApp.service').service('piwikUrl',piwikUrl);piwikUrl.$inject=['$location','piwik','$window'];function piwikUrl($location,piwik,$window){var model={getSearchParam:getSearchParam};return model;function getSearchParam(paramName){var hash=$window.location.href.split('#');if(hash&&hash[1]&&(new RegExp(paramName+'(\\[]|=)')).test(decodeURIComponent(hash[1]))){return broadcast.getValueFromHash(paramName,$window.location.href);}
+return broadcast.getValueFromUrl(paramName,$window.location.search);}}})();
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -1324,8 +1343,8 @@ return fetchAllPagesPromise;}}})();
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp.service').factory('piwikPeriods',piwikPeriods);var periods={},periodOrder=[];piwik.addCustomPeriod=addCustomPeriod;function DayPeriod(date){this.dateInPeriod=date;}
-DayPeriod.parse=singleDatePeriodFactory(DayPeriod);DayPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodDay');};DayPeriod.prototype={getPrettyString:function(){return $.datepicker.formatDate('yy-mm-dd',this.dateInPeriod);},getDateRange:function(){return[this.dateInPeriod,this.dateInPeriod];}};addCustomPeriod('day',DayPeriod);function WeekPeriod(date){this.dateInPeriod=date;}
-WeekPeriod.parse=singleDatePeriodFactory(WeekPeriod);WeekPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodWeek');};WeekPeriod.prototype={getPrettyString:function(){var weekDates=this.getDateRange(this.dateInPeriod);var startWeek=$.datepicker.formatDate('yy-mm-dd',weekDates[0]);var endWeek=$.datepicker.formatDate('yy-mm-dd',weekDates[1]);return _pk_translate('General_DateRangeFromTo',[startWeek,endWeek]);},getDateRange:function(){var daysToMonday=(this.dateInPeriod.getDay()+6)%7;var startWeek=new Date(this.dateInPeriod.getTime());startWeek.setDate(this.dateInPeriod.getDate()-daysToMonday);var endWeek=new Date(startWeek.getTime());endWeek.setDate(startWeek.getDate()+6);return[startWeek,endWeek];}};addCustomPeriod('week',WeekPeriod);function MonthPeriod(date){this.dateInPeriod=date;}
+DayPeriod.parse=singleDatePeriodFactory(DayPeriod);DayPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodDay');};DayPeriod.prototype={getPrettyString:function(){return format(this.dateInPeriod);},getDateRange:function(){return[this.dateInPeriod,this.dateInPeriod];}};addCustomPeriod('day',DayPeriod);function WeekPeriod(date){this.dateInPeriod=date;}
+WeekPeriod.parse=singleDatePeriodFactory(WeekPeriod);WeekPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodWeek');};WeekPeriod.prototype={getPrettyString:function(){var weekDates=this.getDateRange(this.dateInPeriod);var startWeek=format(weekDates[0]);var endWeek=format(weekDates[1]);return _pk_translate('General_DateRangeFromTo',[startWeek,endWeek]);},getDateRange:function(){var daysToMonday=(this.dateInPeriod.getDay()+6)%7;var startWeek=new Date(this.dateInPeriod.getTime());startWeek.setDate(this.dateInPeriod.getDate()-daysToMonday);var endWeek=new Date(startWeek.getTime());endWeek.setDate(startWeek.getDate()+6);return[startWeek,endWeek];}};addCustomPeriod('week',WeekPeriod);function MonthPeriod(date){this.dateInPeriod=date;}
 MonthPeriod.parse=singleDatePeriodFactory(MonthPeriod);MonthPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodMonth');};MonthPeriod.prototype={getPrettyString:function(){return _pk_translate('Intl_Month_Long_StandAlone_'+(this.dateInPeriod.getMonth()+1))+' '+
 this.dateInPeriod.getFullYear();},getDateRange:function(){var startMonth=new Date(this.dateInPeriod.getTime());startMonth.setDate(1);var endMonth=new Date(this.dateInPeriod.getTime());endMonth.setMonth(endMonth.getMonth()+1);endMonth.setDate(0);return[startMonth,endMonth];}};addCustomPeriod('month',MonthPeriod);function YearPeriod(date){this.dateInPeriod=date;}
 YearPeriod.parse=singleDatePeriodFactory(YearPeriod);YearPeriod.getDisplayText=function(){return _pk_translate('Intl_PeriodYear');};YearPeriod.prototype={getPrettyString:function(){return this.dateInPeriod.getFullYear();},getDateRange:function(){var startYear=new Date(this.dateInPeriod.getTime());startYear.setMonth(0);startYear.setDate(1);var endYear=new Date(this.dateInPeriod.getTime());endYear.setMonth(12);endYear.setDate(0);return[startYear,endYear];}};addCustomPeriod('year',YearPeriod);function RangePeriod(startDate,endDate,childPeriodType){this.startDate=startDate;this.endDate=endDate;this.childPeriodType=childPeriodType;}
@@ -1333,7 +1352,7 @@ RangePeriod.parse=function parseRangePeriod(strDate,childPeriodType){childPeriod
 endDate=endDate?parseDate(endDate):getToday();var startDate=new Date(endDate.getTime());if(childPeriodType==='day'){startDate.setDate(startDate.getDate()-nAmount);}else if(childPeriodType==='week'){startDate.setDate(startDate.getDate()-(nAmount*7));}else if(childPeriodType==='month'){startDate.setMonth(startDate.getMonth()-nAmount);}else if(childPeriodType==='year'){startDate.setFullYear(startDate.getFullYear()-nAmount);}else{throw new Error("Unknown period type '"+childPeriodType+"'.");}
 if(childPeriodType!=='day'){var startPeriod=periods[childPeriodType].parse(startDate);var endPeriod=periods[childPeriodType].parse(endDate);startDate=startPeriod.getDateRange()[0];endDate=endPeriod.getDateRange()[1];}
 var firstWebsiteDate=new Date(1991,7,6);if(startDate-firstWebsiteDate<0){switch(childPeriodType){case'year':startDate=new Date(1992,0,1);break;case'month':startDate=new Date(1991,8,1);break;case'week':startDate=new Date(1991,8,12);break;case'day':default:startDate=firstWebsiteDate;break;}}
-return new RangePeriod(startDate,endDate,childPeriodType);};RangePeriod.getDisplayText=function(){return _pk_translate('General_DateRangeInPeriodList');};RangePeriod.prototype={getPrettyString:function(){var start=$.datepicker.formatDate('yy-mm-dd',this.startDate);var end=$.datepicker.formatDate('yy-mm-dd',this.endDate);return _pk_translate('General_DateRangeFromTo',[start,end]);},getDateRange:function(){return[this.startDate,this.endDate];}};addCustomPeriod('range',RangePeriod);function piwikPeriods(){return{getAllLabels:getAllLabels,isRecognizedPeriod:isRecognizedPeriod,get:get,parse:parse,parseDate:parseDate};function getAllLabels(){return[].concat(periodOrder);}
+return new RangePeriod(startDate,endDate,childPeriodType);};RangePeriod.getDisplayText=function(){return _pk_translate('General_DateRangeInPeriodList');};RangePeriod.prototype={getPrettyString:function(){var start=format(this.startDate);var end=format(this.endDate);return _pk_translate('General_DateRangeFromTo',[start,end]);},getDateRange:function(){return[this.startDate,this.endDate];}};addCustomPeriod('range',RangePeriod);function piwikPeriods(){return{getAllLabels:getAllLabels,isRecognizedPeriod:isRecognizedPeriod,get:get,parse:parse,parseDate:parseDate,format:format,RangePeriod:RangePeriod};function getAllLabels(){return[].concat(periodOrder);}
 function get(strPeriod){var periodClass=periods[strPeriod];if(!periodClass){throw new Error('Invalid period label: '+strPeriod);}
 return periodClass;}
 function parse(strPeriod,strDate){return get(strPeriod).parse(strDate);}
@@ -1341,6 +1360,7 @@ function isRecognizedPeriod(strPeriod){return!!periods[strPeriod];}}
 function addCustomPeriod(name,periodClass){if(periods[name]){throw new Error('The "'+name+'" period already exists! It cannot be overridden.');}
 periods[name]=periodClass;periodOrder.push(name);}
 function singleDatePeriodFactory(periodClass){return function(strDate){return new periodClass(parseDate(strDate));};}
+function format(date){return $.datepicker.formatDate('yy-mm-dd',date);}
 function parseDate(strDate){if(strDate instanceof Date){return strDate;}
 if(strDate==='today'||strDate==='now'){return getToday();}
 if(strDate==='yesterday'||strDate==='yesterdaySameTime'){var yesterday=getToday();yesterday.setDate(yesterday.getDate()-1);return yesterday;}
@@ -1583,10 +1603,11 @@ var hashPos=newUrl.indexOf('#/');if(-1===hashPos){return;}
 if(!isLinkWithinSamePage(this.location,newUrl)){return;}
 var hash=newUrl.substr(hashPos+2);scrollToAnchorIfPossible(hash,event);}}]);}
 handleScrollToAnchorAfterPageLoad();$(handleScrollToAnchorIfPresentOnPageLoad);})();
-(function(){angular.module('piwikApp').factory('http404CheckInterceptor',http404CheckInterceptor);http404CheckInterceptor.$inject=['$q','globalAjaxQueue'];function http404CheckInterceptor($q,globalAjaxQueue){function isClientError(rejection){if(rejection.status===500){return true;}
+(function(){angular.module('piwikApp').factory('http404CheckInterceptor',http404CheckInterceptor);http404CheckInterceptor.$inject=['$q','globalAjaxQueue'];function http404CheckInterceptor($q,globalAjaxQueue){function isClientError(rejection){if(rejection.status===500||rejection.status<=0){return true;}
 return rejection.status>=400&&rejection.status<408;}
-return{'request':function(config){if('object'===typeof piwik.relativePluginWebDirs&&config&&config.url&&config.url.indexOf('plugins/')===0&&config.url.indexOf('.html')>0&&config.url.indexOf('/angularjs/')>0){var urlParts=config.url.split('/');if(urlParts&&urlParts.length>2&&urlParts[1]){var pluginName=urlParts[1];if(pluginName&&pluginName in piwik.relativePluginWebDirs){urlParts[0]=piwik.relativePluginWebDirs[pluginName];config.url=urlParts.join('/');}}}
-return config;},'responseError':function(rejection){if(rejection&&isClientError(rejection)&&rejection.config&&rejection.config.url&&-1!==rejection.config.url.indexOf('.html')&&-1!==rejection.config.url.indexOf('plugins')){var posEndUrl=rejection.config.url.indexOf('.html')+5;var url=rejection.config.url.substr(0,posEndUrl);var message='Please check your server configuration. You may want to whitelist "*.html" files from the "plugins" directory.';message+=' The HTTP status code is '+rejection.status+' for URL "'+url+'"';var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(message,{title:'Failed to load HTML file:',context:'error',id:'Network_HtmlFileLoadingError'});}
+return{'request':function(config){if('object'===typeof piwik.relativePluginWebDirs&&config&&config.url&&config.url.indexOf('plugins/')===0&&config.url.indexOf('.html')>0&&config.url.indexOf('/angularjs/')>0){var urlParts=config.url.split('/');if(urlParts&&urlParts.length>2&&urlParts[1]){var pluginName=urlParts[1];if(pluginName&&pluginName in piwik.relativePluginWebDirs&&piwik.relativePluginWebDirs[pluginName]){urlParts[0]=piwik.relativePluginWebDirs[pluginName];config.url=urlParts.join('/');}}}
+return config;},'responseError':function(rejection){if(rejection&&isClientError(rejection)&&rejection.config&&rejection.config.url&&-1!==rejection.config.url.indexOf('.html')&&-1!==rejection.config.url.indexOf('plugins')){var posEndUrl=rejection.config.url.indexOf('.html')+5;var url=rejection.config.url.substr(0,posEndUrl);var message='Please check your server configuration. You may want to whitelist "*.html" files from the "plugins" directory.';message+=' The HTTP status code is '+rejection.status+' for URL "'+url+'"';if(rejection.status===-1){message='Please check if you have an ad blocker or something similar enabled.';}
+var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(message,{title:'Failed to load HTML file:',context:'error',id:'Network_HtmlFileLoadingError'});}
 return $q.reject(rejection);}};}
 angular.module('piwikApp').config(['$httpProvider',function($httpProvider){$httpProvider.interceptors.push('http404CheckInterceptor');}]);})();
 /*!
@@ -1636,12 +1657,13 @@ return function(scope,element,attrs){scope.$watch('progress',function(val,oldVal
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').component('piwikSparkline',{template:'<img />',bindings:{params:'<'},controller:SparklineController});SparklineController.$inject=['$element','$httpParamSerializer','piwikApi','piwik','piwikPeriods'];function SparklineController($element,$httpParamSerializer,piwikApi,piwik,piwikPeriods){var vm=this;vm.$onChanges=$onChanges;function $onChanges(){$element.find('img').attr('src',getSparklineUrl());}
-function getSparklineUrl(){var defaultParams={forceView:'1',viewDataTable:'sparkline',widget:$element.closest('[widgetId]').length?'1':'0',showtitle:'1',colors:JSON.stringify(piwik.getSparklineColors()),random:Date.now(),date:getDefaultDate()};var urlParams=piwikApi.mixinDefaultGetParams($element.extend(defaultParams,vm.params));var token_auth=piwik.broadcast.getValueFromUrl("token_auth");if(token_auth.length&&piwik.shouldPropagateTokenAuth){urlParams.token_auth=token_auth;}
+(function(){angular.module('piwikApp').component('piwikSparkline',{template:'<img />',bindings:{seriesIndices:'<',params:'<'},controller:SparklineController});SparklineController.$inject=['$element','$httpParamSerializer','piwikApi','piwik','piwikPeriods'];function SparklineController($element,$httpParamSerializer,piwikApi,piwik,piwikPeriods){var vm=this;vm.$onChanges=$onChanges;function $onChanges(){$element.find('img').attr('src',getSparklineUrl());}
+function getSparklineUrl(){var seriesIndices=vm.seriesIndices;var sparklineColors=piwik.getSparklineColors();if(seriesIndices){sparklineColors.lineColor=sparklineColors.lineColor.filter(function(c,index){return seriesIndices.indexOf(index)!==-1;});}
+var colors=JSON.stringify(sparklineColors);var defaultParams={forceView:'1',viewDataTable:'sparkline',widget:$element.closest('[widgetId]').length?'1':'0',showtitle:'1',colors:colors,random:Date.now(),date:getDefaultDate()};var urlParams=piwikApi.mixinDefaultGetParams($element.extend(defaultParams,vm.params));var token_auth=piwik.broadcast.getValueFromUrl("token_auth");if(token_auth.length&&piwik.shouldPropagateTokenAuth){urlParams.token_auth=token_auth;}
 return'?'+$httpParamSerializer(urlParams);}
 function getDefaultDate(){if(piwik.period==='range'){return piwik.startDateString+','+piwik.endDateString;}
 var dateRange=piwikPeriods.get('range').getLastNRange(piwik.period,30,piwik.currentDateString).getDateRange();var piwikMinDate=new Date(piwik.minDateYear,piwik.minDateMonth-1,piwik.minDateDay);if(dateRange[0]<piwikMinDate){dateRange[0]=piwikMinDate;}
-var startDateStr=$.datepicker.formatDate('yy-mm-dd',dateRange[0]);var endDateStr=$.datepicker.formatDate('yy-mm-dd',dateRange[1]);return startDateStr+','+endDateStr;}}})();
+var startDateStr=piwikPeriods.format(dateRange[0]);var endDateStr=piwikPeriods.format(dateRange[1]);return startDateStr+','+endDateStr;}}})();
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -1697,9 +1719,10 @@ scope.$eval('view.showItems = false');setTimeout(function(){scope.$apply();},0);
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').directive('piwikEnrichedHeadline',piwikEnrichedHeadline);piwikEnrichedHeadline.$inject=['$document','piwik','$filter'];function piwikEnrichedHeadline($document,piwik,$filter){var defaults={helpUrl:'',editUrl:''};return{transclude:true,restrict:'A',scope:{helpUrl:'@',editUrl:'@',featureName:'@',inlineHelp:'@?'},templateUrl:'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html?cb='+piwik.cacheBuster,compile:function(element,attrs){for(var index in defaults){if(!attrs[index]){attrs[index]=defaults[index];}}
+(function(){angular.module('piwikApp').directive('piwikEnrichedHeadline',piwikEnrichedHeadline);piwikEnrichedHeadline.$inject=['$document','piwik','$filter','$parse'];function piwikEnrichedHeadline($document,piwik,$filter,$parse){var defaults={helpUrl:'',editUrl:''};return{transclude:true,restrict:'A',scope:{helpUrl:'@',editUrl:'@',featureName:'@',inlineHelp:'@?'},templateUrl:'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html?cb='+piwik.cacheBuster,compile:function(element,attrs){for(var index in defaults){if(!attrs[index]){attrs[index]=defaults[index];}}
 return function(scope,element,attrs){if(!scope.inlineHelp){var helpNode=$('[ng-transclude] .inlineHelp',element);if((!helpNode||!helpNode.length)&&element.next()){helpNode=element.next().find('.reportDocumentation');}
-if(helpNode&&helpNode.length){if($.trim(helpNode.text())){scope.inlineHelp=$.trim(helpNode.html());}
+if(helpNode&&helpNode.length){var helpParagraph=$('p[ng-bind-html]',helpNode);if(helpParagraph.length){helpParagraph.html($parse(helpParagraph.attr('ng-bind-html')));}
+if($.trim(helpNode.text())){scope.inlineHelp=$.trim(helpNode.html());}
 helpNode.remove();}}
 if(!attrs.featureName){attrs.featureName=$.trim(element.find('.title').first().text());}};}};}})();
 /*!
@@ -1805,18 +1828,19 @@ scope.ajaxForm.data[name]=val;if(!skipScopeApply){setTimeout(function(){scope.$a
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').directive('piwikWidgetLoader',piwikWidgetLoader);piwikWidgetLoader.$inject=['piwik','piwikUrl','$http','$compile','$q','$location','notifications'];function piwikWidgetLoader(piwik,piwikUrl,$http,$compile,$q,$location,notifications){return{restrict:'A',transclude:true,scope:{piwikWidgetLoader:'=',widgetName:'@'},templateUrl:'plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.html?cb='+piwik.cacheBuster,compile:function(element,attrs){return function(scope,element,attrs,ngModel){scope.widgetName=attrs.widgetName;if(!attrs.widgetName){scope.loadingMessage=_pk_translate('General_LoadingData');}else{scope.loadingMessage=_pk_translate('General_LoadingPopover',[attrs.widgetName]);}
+(function(){angular.module('piwikApp').directive('piwikWidgetLoader',piwikWidgetLoader);piwikWidgetLoader.$inject=['piwik','piwikUrl','$http','$compile','$q','$location','notifications','$rootScope','$timeout','piwikComparisonsService'];function piwikWidgetLoader(piwik,piwikUrl,$http,$compile,$q,$location,notifications,$rootScope,$timeout,piwikComparisonsService){return{restrict:'A',transclude:true,scope:{piwikWidgetLoader:'=',widgetName:'@'},templateUrl:'plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.html?cb='+piwik.cacheBuster,compile:function(element,attrs){return function(scope,element,attrs,ngModel){scope.widgetName=attrs.widgetName;if(!attrs.widgetName){scope.loadingMessage=_pk_translate('General_LoadingData');}else{scope.loadingMessage=_pk_translate('General_LoadingPopover',[attrs.widgetName]);}
 var changeCounter=0,currentScope,currentElement,httpCanceler,contentNode=element.find('.theWidgetContent');var cleanupLastWidgetContent=function(){if(currentElement){currentElement.remove();currentElement=null;}
 if(currentScope){currentScope.$destroy();currentScope=null;}};var abortHttpRequestIfNeeded=function(){if(httpCanceler){httpCanceler.resolve();httpCanceler=null;}}
-function getFullWidgetUrl(parameters){var url=$.param(parameters);var $urlParams=$location.search();if($.isEmptyObject($urlParams)||!$urlParams||!$urlParams['idSite']){$urlParams={idSite:'idSite',period:'period',date:'date'};if(piwikUrl.getSearchParam('widget')){$urlParams['widget']='widget';}}else{$urlParams=angular.copy($urlParams);delete $urlParams['category'];delete $urlParams['subcategory'];}
+function getFullWidgetUrl(parameters){var url=$.param(parameters);var $urlParams=$location.search();delete $urlParams['comparePeriods[]'];delete $urlParams['compareDates[]'];delete $urlParams['compareSegments[]'];if($.isEmptyObject($urlParams)||!$urlParams||!$urlParams['idSite']){$urlParams={idSite:'idSite',period:'period',date:'date'};if(piwikUrl.getSearchParam('widget')){$urlParams['widget']='widget';}}else{$urlParams=angular.copy($urlParams);delete $urlParams['category'];delete $urlParams['subcategory'];}
 if(piwikUrl.getSearchParam('segment')){$urlParams['segment']='segment';}
-angular.forEach($urlParams,function(value,key){if(!(key in parameters)){url+='&'+key+'='+piwikUrl.getSearchParam(key);}});if(!parameters||!('showtitle'in parameters)){url+='&showtitle=1';}
+angular.forEach($urlParams,function(value,key){if(!(key in parameters)){url+='&'+key+'='+piwikUrl.getSearchParam(key);}});if(piwikComparisonsService.isComparisonEnabled()){['comparePeriods','compareDates','compareSegments'].forEach(function(paramName){var value=piwikUrl.getSearchParam(paramName);if(value){var map={};map[paramName]=value;url+='&'+$.param(map);}});}
+if(!parameters||!('showtitle'in parameters)){url+='&showtitle=1';}
 if(piwik.shouldPropagateTokenAuth&&broadcast.getValueFromUrl('token_auth')){url+='&token_auth='+broadcast.getValueFromUrl('token_auth');}
 url+='&random='+parseInt(Math.random()*10000);return'?'+url;}
-function loadWidgetUrl(parameters,thisChangeId){scope.loading=true;var url=getFullWidgetUrl(parameters);abortHttpRequestIfNeeded();cleanupLastWidgetContent();httpCanceler=$q.defer();$http.get(url,{timeout:httpCanceler.promise}).then(function(response){if(thisChangeId!==changeCounter||!response.data){return;}
+function loadWidgetUrl(parameters,thisChangeId){scope.loading=true;var url=getFullWidgetUrl(parameters);abortHttpRequestIfNeeded();cleanupLastWidgetContent();httpCanceler=$q.defer();$http.get(url,{timeout:httpCanceler.promise,headers:{'X-Requested-With':'XMLHttpRequest'}}).then(function(response){if(thisChangeId!==changeCounter||!response.data){return;}
 httpCanceler=null;var newScope=scope.$new();currentScope=newScope;scope.loading=false;scope.loadingFailed=false;currentElement=contentNode.html(response.data).children();if(scope.widgetName){var $title=currentElement.find('> .card-content .card-title');if(!$title.length){$title=currentElement.find('> h2');}
 if($title.length){$title.html(piwik.helper.htmlEntities(scope.widgetName));}}
-$compile(currentElement)(newScope);notifications.parseNotificationDivs();})['catch'](function(){if(thisChangeId!==changeCounter){return;}
+$compile(currentElement)(newScope);notifications.parseNotificationDivs();$timeout(function(){$rootScope.$emit('widget:loaded',{parameters:parameters,element:currentElement,});});})['catch'](function(){if(thisChangeId!==changeCounter){return;}
 httpCanceler=null;cleanupLastWidgetContent();scope.loading=false;scope.loadingFailed=true;});}
 scope.$watch('piwikWidgetLoader',function(parameters,oldUrl){if(parameters){loadWidgetUrl(parameters,++changeCounter);}});element.on('$destroy',function(){abortHttpRequestIfNeeded();});};}};}})();
 /*!
@@ -1863,14 +1887,17 @@ $rootScope.$on('$locationChangeSuccess',function(){$(function(){openOrClose();})
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').directive('piwikReportExport',piwikReportExport);piwikReportExport.$inject=['$document','piwik','$compile','$timeout','$location','$httpParamSerializerJQLike'];function piwikReportExport($document,piwik,$compile,$timeout,$location,$httpParamSerializerJQLike){return{restrict:'A',scope:{'reportTitle':'@','requestParams':'@','reportFormats':'@','apiMethod':'@'},link:function(scope,element,attr){var popoverParamBackup;scope.showUrl=false;scope.getExportLink=function(){var dataTable=scope.dataTable;var format=scope.reportFormat;if(!format){return;}
+(function(){angular.module('piwikApp').directive('piwikReportExport',piwikReportExport);piwikReportExport.$inject=['$document','piwik','$compile','$timeout','$location','$httpParamSerializerJQLike'];function piwikReportExport($document,piwik,$compile,$timeout,$location,$httpParamSerializerJQLike){return{restrict:'A',scope:{'reportTitle':'@','requestParams':'@','reportFormats':'@','apiMethod':'@','maxFilterLimit':'@',},link:function(scope,element,attr){var popoverParamBackup;scope.showUrl=false;scope.getExportLink=function(){var dataTable=scope.dataTable;var format=scope.reportFormat;if(!format){return;}
 var method=scope.apiMethod;var limit=scope.reportLimitAll=='yes'?-1:scope.reportLimit;var type=scope.reportType;var params=scope.requestParams;if(params&&typeof params=="string"){params=JSON.parse(params);}else{params={};}
 var segment=dataTable.param.segment;var label=dataTable.param.label;var idGoal=dataTable.param.idGoal;var idDimension=dataTable.param.idDimension;var param_date=dataTable.param.date;if(format=='RSS'){param_date='last10';}
 if(typeof dataTable.param.dateUsedInGraph!='undefined'){param_date=dataTable.param.dateUsedInGraph;}
 var period=dataTable.param.period;var formatsUseDayNotRange=piwik.config.datatable_export_range_as_day.toLowerCase();if(formatsUseDayNotRange.indexOf(format.toLowerCase())!=-1&&dataTable.param.period=='range'){period='day';}
 if(dataTable.param.period=='range'&&dataTable.param.viewDataTable=="graphEvolution"){period='day';}
 var exportUrlParams={module:'API'};if(type=='processed'){var apiParams=method.split('.');exportUrlParams.method='API.getProcessedReport';exportUrlParams.apiModule=apiParams[0];exportUrlParams.apiAction=apiParams[1];}else{exportUrlParams.method=method;}
-exportUrlParams.format=format;exportUrlParams.idSite=dataTable.param.idSite;exportUrlParams.period=period;exportUrlParams.date=param_date;if(typeof dataTable.param.filter_pattern!="undefined"){exportUrlParams.filter_pattern=dataTable.param.filter_pattern;}
+exportUrlParams.format=format;exportUrlParams.idSite=dataTable.param.idSite;exportUrlParams.period=period;exportUrlParams.date=param_date;if(dataTable.param.compareDates&&dataTable.param.compareDates.length){exportUrlParams.compareDates=dataTable.param.compareDates;exportUrlParams.compare='1';}
+if(dataTable.param.comparePeriods&&dataTable.param.comparePeriods.length){exportUrlParams.comparePeriods=dataTable.param.comparePeriods;exportUrlParams.compare='1';}
+if(dataTable.param.compareSegments&&dataTable.param.compareSegments.length){exportUrlParams.compareSegments=dataTable.param.compareSegments;exportUrlParams.compare='1';}
+if(typeof dataTable.param.filter_pattern!="undefined"){exportUrlParams.filter_pattern=dataTable.param.filter_pattern;}
 if(typeof dataTable.param.filter_pattern_recursive!="undefined"){exportUrlParams.filter_pattern_recursive=dataTable.param.filter_pattern_recursive;}
 if($.isPlainObject(params)){$.each(params,function(index,param){if(param===true){param=1;}else if(param===false){param=0;}
 exportUrlParams[index]=param;});}
@@ -1883,7 +1910,9 @@ if(typeof segment!='undefined'){exportUrlParams.segment=decodeURIComponent(segme
 if(typeof idGoal!='undefined'&&idGoal!='-1'){exportUrlParams.idGoal=idGoal;}
 if(typeof idDimension!='undefined'&&idDimension!='-1'){exportUrlParams.idDimension=idDimension;}
 if(label){label=label.split(',');if(label.length>1){exportUrlParams.label=label;}else{exportUrlParams.label=label[0];}}
-exportUrlParams.token_auth=piwik.token_auth;exportUrlParams.filter_limit=limit;var currentUrl=$location.absUrl();var urlParts=currentUrl.split('/');urlParts.pop();var url=urlParts.join('/');return url+'/index.php?'+$httpParamSerializerJQLike(exportUrlParams);};element.on('click',function(){popoverParamBackup=broadcast.getValueFromHash('popover');var dataTable=scope.dataTable=element.parents('[data-report]').data('uiControlObject');var popover=Piwik_Popover.showLoading('Export');var formats=JSON.parse(scope.reportFormats);scope.reportType='default';scope.reportLimit=dataTable.param.filter_limit>0?dataTable.param.filter_limit:100;scope.reportLimitAll=dataTable.param.filter_limit==-1?'yes':'no';scope.optionFlat=dataTable.param.flat===true||dataTable.param.flat===1||dataTable.param.flat==="1";scope.optionExpanded=1;scope.optionFormatMetrics=0;scope.hasSubtables=scope.optionFlat||dataTable.numberOfSubtables>0;scope.availableReportFormats={default:formats,processed:{'XML':formats['XML'],'JSON':formats['JSON']}};scope.availableReportTypes={default:_pk_translate('CoreHome_StandardReport'),processed:_pk_translate('CoreHome_ReportWithMetadata')};scope.limitAllOptions={yes:_pk_translate('General_All'),no:_pk_translate('CoreHome_CustomLimit')};scope.$watch('reportType',function(newVal,oldVal){if(!scope.availableReportFormats[newVal].hasOwnProperty(scope.reportFormat)){scope.reportFormat='XML';}},true);var elem=$document.find('#reportExport').eq(0);if(!elem.length){elem=angular.element('<span ng-include="\'plugins/CoreHome/angularjs/report-export/reportexport.popover.html?cb='+piwik.cacheBuster+'\'" id="reportExport"></span>');}
+exportUrlParams.token_auth=piwik.token_auth;exportUrlParams.filter_limit=limit;var currentUrl=$location.absUrl();var urlParts=currentUrl.split('/');urlParts.pop();var url=urlParts.join('/');return url+'/index.php?'+$httpParamSerializerJQLike(exportUrlParams);};element.on('click',function(){popoverParamBackup=broadcast.getValueFromHash('popover');var dataTable=scope.dataTable=element.parents('[data-report]').data('uiControlObject');var popover=Piwik_Popover.showLoading('Export');var formats=JSON.parse(scope.reportFormats);scope.reportType='default';var reportLimit=dataTable.param.filter_limit;if(scope.maxFilterLimit>0){reportLimit=Math.min(reportLimit,scope.maxFilterLimit);}
+scope.reportLimit=reportLimit>0?reportLimit:100;scope.reportLimitAll=reportLimit==-1?'yes':'no';scope.optionFlat=dataTable.param.flat===true||dataTable.param.flat===1||dataTable.param.flat==="1";scope.optionExpanded=1;scope.optionFormatMetrics=0;scope.hasSubtables=scope.optionFlat||dataTable.numberOfSubtables>0;scope.availableReportFormats={default:formats,processed:{'XML':formats['XML'],'JSON':formats['JSON']}};scope.availableReportTypes={default:_pk_translate('CoreHome_StandardReport'),processed:_pk_translate('CoreHome_ReportWithMetadata')};scope.limitAllOptions={yes:_pk_translate('General_All'),no:_pk_translate('CoreHome_CustomLimit')};scope.$watch('reportType',function(newVal,oldVal){if(!scope.availableReportFormats[newVal].hasOwnProperty(scope.reportFormat)){scope.reportFormat='XML';}},true);if(scope.maxFilterLimit>0){scope.$watch('reportLimit',function(newVal,oldVal){if(parseInt(newVal,10)>parseInt(scope.maxFilterLimit,10)){scope.reportLimit=oldVal;}},true);}
+var elem=$document.find('#reportExport').eq(0);if(!elem.length){elem=angular.element('<span ng-include="\'plugins/CoreHome/angularjs/report-export/reportexport.popover.html?cb='+piwik.cacheBuster+'\'" id="reportExport"></span>');}
 $compile(elem)(scope,function(compiled){Piwik_Popover.setTitle(_pk_translate('General_Export')+' '+piwikHelper.htmlEntities(scope.reportTitle));Piwik_Popover.setContent(compiled);if(popoverParamBackup!=''){Piwik_Popover.onClose(function(){$timeout(function(){$location.search('popover',popoverParamBackup);$timeout(function(){angular.element(document).injector().get('$rootScope').$apply();},10);},100);});}
 $timeout(function(){popover.dialog({position:['center','center']});},100);});});}};}})();
 /*!
@@ -1892,13 +1921,12 @@ $timeout(function(){popover.dialog({position:['center','center']});},100);});});
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').controller('ReportingPageController',ReportingPageController);ReportingPageController.$inject=['$scope','piwik','$rootScope','$location','reportingPageModel','reportingPagesModel','notifications'];function ReportingPageController($scope,piwik,$rootScope,$location,pageModel,pagesModel,notifications){pageModel.resetPage();$scope.pageModel=pageModel;var currentCategory=null;var currentSubcategory=null;var currentPeriod=null;var currentDate=null;var currentSegment=null;function renderInitialPage(){var $search=$location.search();currentPeriod=$search.period;currentDate=$search.date;currentSegment=$search.segment;$scope.renderPage($search.category,$search.subcategory);}
+(function(){angular.module('piwikApp').controller('ReportingPageController',ReportingPageController);ReportingPageController.$inject=['$scope','piwik','$rootScope','$location','reportingPageModel','reportingPagesModel','notifications','piwikUrl'];function ReportingPageController($scope,piwik,$rootScope,$location,pageModel,pagesModel,notifications,piwikUrl){pageModel.resetPage();$scope.pageModel=pageModel;var currentCategory=null;var currentSubcategory=null;var currentPeriod=null;var currentDate=null;var currentSegment=null;var currentCompareDates=null;var currentComparePeriods=null;var currentCompareSegments=null;function renderInitialPage(){var $search=$location.search();currentPeriod=$search.period;currentDate=$search.date;currentSegment=$search.segment;currentCompareSegments=piwikUrl.getSearchParam('compareSegments');currentCompareDates=piwikUrl.getSearchParam('compareDates');currentComparePeriods=piwikUrl.getSearchParam('comparePeriods');$scope.renderPage($search.category,$search.subcategory);}
 $scope.renderPage=function(category,subcategory){if(!category||!subcategory){pageModel.resetPage();$scope.loading=false;return;}
 $rootScope.$emit('piwikPageChange',{});currentCategory=category;currentSubcategory=subcategory;notifications.clearTransientNotifications();if(category==='Dashboard_Dashboard'&&$.isNumeric(subcategory)&&$('[piwik-dashboard]').length){$scope.loading=true;var element=$('[piwik-dashboard]');var scope=angular.element(element).scope();scope.fetchDashboard(parseInt(subcategory,10)).then(function(){$scope.loading=false;},function(){$scope.loading=false;});return;}
 pageModel.fetchPage(category,subcategory).then(function(){if(!pageModel.page){var page=pagesModel.findPageInCategory(category);if(page&&page.subcategory){var $search=$location.search();$search.subcategory=page.subcategory.id;$location.search($search);return;}}
-$scope.hasNoPage=!pageModel.page;$scope.loading=false;});}
-$scope.loading=true;renderInitialPage();$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;var period=$search.period;var date=$search.date;var segment=$search.segment;if(category===currentCategory&&subcategory===currentSubcategory&&period===currentPeriod&&date===currentDate&&segment===currentSegment){return;}
-currentPeriod=period;currentDate=date;currentSegment=segment;$scope.renderPage(category,subcategory);});$rootScope.$on('loadPage',function(event,category,subcategory){$scope.renderPage(category,subcategory);});}})();
+$scope.hasNoPage=!pageModel.page;$scope.loading=false;});};$scope.loading=true;renderInitialPage();$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;var period=$search.period;var date=$search.date;var segment=$search.segment;var compareSegments=piwikUrl.getSearchParam('compareSegments');var compareDates=piwikUrl.getSearchParam('compareDates');var comparePeriods=piwikUrl.getSearchParam('comparePeriods');if(category===currentCategory&&subcategory===currentSubcategory&&period===currentPeriod&&date===currentDate&&segment===currentSegment&&JSON.stringify(compareDates)===JSON.stringify(currentCompareDates)&&JSON.stringify(comparePeriods)===JSON.stringify(currentComparePeriods)&&JSON.stringify(compareSegments)===JSON.stringify(currentCompareSegments)){return;}
+currentPeriod=period;currentDate=date;currentSegment=segment;currentCompareDates=compareDates;currentComparePeriods=comparePeriods;currentCompareSegments=compareSegments;$scope.renderPage(category,subcategory);});$rootScope.$on('loadPage',function(event,category,subcategory){$scope.renderPage(category,subcategory);});}})();
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -1936,15 +1964,14 @@ function fetchPage(category,subcategory){resetPage();var pagesPromise=reportingP
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').controller('ReportingMenuController',ReportingMenuController);ReportingMenuController.$inject=['$scope','piwik','$location','$timeout','reportingMenuModel','$rootScope'];function ReportingMenuController($scope,piwik,$location,$timeout,menuModel,$rootScope){var idSite=getUrlParam('idSite');var period=getUrlParam('period');var date=getUrlParam('date');var segment=getUrlParam('segment');function markAllCategoriesAsInactive(){angular.forEach(menuModel.menu,function(cat){cat.active=false;});}
+(function(){angular.module('piwikApp').controller('ReportingMenuController',ReportingMenuController);ReportingMenuController.$inject=['$scope','piwik','$location','$timeout','reportingMenuModel','$rootScope','piwikUrl'];function ReportingMenuController($scope,piwik,$location,$timeout,menuModel,$rootScope,piwikUrl){var idSite=piwikUrl.getSearchParam('idSite');var period=piwikUrl.getSearchParam('period');var date=piwikUrl.getSearchParam('date');var segment=piwikUrl.getSearchParam('segment');var comparePeriods=piwikUrl.getSearchParam('comparePeriods');var compareDates=piwikUrl.getSearchParam('compareDates');var compareSegments=piwikUrl.getSearchParam('compareSegments');function markAllCategoriesAsInactive(){angular.forEach(menuModel.menu,function(cat){cat.active=false;});}
 function markAllCategoriesAndChildrenInactive(){angular.forEach(menuModel.menu,function(cat){cat.active=false;angular.forEach(cat.subcategories,function(subcat){subcat.active=false;if(subcat.isGroup&&subcat.subcategories){angular.forEach(subcat.subcategories,function(sub){sub.active=false;});}});});}
-function getUrlParam(param){var value=piwik.broadcast.getValueFromHash(param);if(!value){value=piwik.broadcast.getValueFromUrl(param);}
-return value;}
 $scope.menuModel=menuModel;function enterSubcategory(category,subcategory,subsubcategory){if(!category||!subcategory){return;}
-markAllCategoriesAndChildrenInactive();category.active=true;subcategory.active=true;if(subsubcategory){subcategory.name=subsubcategory.name;subsubcategory.active=true;}};$scope.makeUrl=function(category,subcategory){var url='idSite='+encodeURIComponent(idSite);url+='&period='+encodeURIComponent(period);url+='&date='+encodeURIComponent(date);url+='&category='+encodeURIComponent(category.id);url+='&subcategory='+encodeURIComponent(subcategory.id);if(segment){url+='&segment='+segment;}
-return url;}
-$scope.loadCategory=function(category){if(category.active){category.active=false;}else{markAllCategoriesAsInactive();category.active=true;}
-if(category.active&&category.subcategories&&category.subcategories.length===1){var subcategory=category.subcategories[0];if(subcategory.active){$scope.loadSubcategory(category,subcategory);}else{var url=$scope.makeUrl(category,subcategory);$location.search(url);}}};$scope.loadSubcategory=function(category,subcategory){if(subcategory&&subcategory.active){$rootScope.$emit('loadPage',category.id,subcategory.id);}};menuModel.fetchMenuItems().then(function(menu){if(!$location.search().subcategory){enterSubcategory(menu[0],menu[0].subcategories[0]);$location.search($scope.makeUrl(menu[0],menu[0].subcategories[0]));}});$rootScope.$on('updateReportingMenu',function(){menuModel.reloadMenuItems().then(function(menu){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;if(category&&subcategory){var found=menuModel.findSubcategory(category,subcategory);if(found){enterSubcategory(found.category,found.subcategory,found.subsubcategory);}}});if('object'===typeof widgetsHelper&&widgetsHelper.availableWidgets){delete widgetsHelper.availableWidgets;widgetsHelper.getAvailableWidgets();}});$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;period=getUrlParam('period');date=getUrlParam('date');segment=getUrlParam('segment');if(!category||!subcategory){return;}
+markAllCategoriesAndChildrenInactive();category.active=true;subcategory.active=true;if(subsubcategory){subcategory.name=subsubcategory.name;subsubcategory.active=true;}};$scope.makeUrl=function(category,subcategory){var params={idSite:idSite,period:period,date:date,segment:decodeURIComponent(segment),category:category.id,subcategory:subcategory.id,};if(compareDates){params.compareDates=compareDates;}
+if(comparePeriods){params.comparePeriods=comparePeriods;}
+if(compareSegments){params.compareSegments=compareSegments;}
+return $.param(params);};$scope.loadCategory=function(category){if(category.active){category.active=false;}else{markAllCategoriesAsInactive();category.active=true;}
+if(category.active&&category.subcategories&&category.subcategories.length===1){var subcategory=category.subcategories[0];if(subcategory.active){$scope.loadSubcategory(category,subcategory);}else{var url=$scope.makeUrl(category,subcategory);$location.search(url);}}};$scope.loadSubcategory=function(category,subcategory){if(subcategory&&subcategory.active){$rootScope.$emit('loadPage',category.id,subcategory.id);}};menuModel.fetchMenuItems().then(function(menu){if(!$location.search().subcategory){enterSubcategory(menu[0],menu[0].subcategories[0]);$location.search($scope.makeUrl(menu[0],menu[0].subcategories[0]));}});$rootScope.$on('updateReportingMenu',function(){menuModel.reloadMenuItems().then(function(menu){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;if(category&&subcategory){var found=menuModel.findSubcategory(category,subcategory);if(found){enterSubcategory(found.category,found.subcategory,found.subsubcategory);}}});if('object'===typeof widgetsHelper&&widgetsHelper.availableWidgets){delete widgetsHelper.availableWidgets;widgetsHelper.getAvailableWidgets();}});$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var category=$search.category;var subcategory=$search.subcategory;period=piwikUrl.getSearchParam('period');date=piwikUrl.getSearchParam('date');segment=piwikUrl.getSearchParam('segment');comparePeriods=piwikUrl.getSearchParam('comparePeriods');compareDates=piwikUrl.getSearchParam('compareDates');compareSegments=piwikUrl.getSearchParam('compareSegments');if(!category||!subcategory){return;}
 var found=menuModel.findSubcategory(category,subcategory);enterSubcategory(found.category,found.subcategory,found.subsubcategory);});}})();
 /*!
  * Piwik - free/libre analytics platform
@@ -2004,7 +2031,7 @@ function makeSureSelectedItemIsInViewport(){var element=getCurrentlySelectedElem
 function scrollFirstElementIntoView(element){if(element&&element[0]&&element[0].scrollIntoView){element[0].scrollIntoView();}}
 scope.highlightPreviousItem=function(){if(0>=(scope.search.index-1)){scope.search.index=0;}else{scope.search.index--;}
 makeSureSelectedItemIsInViewport();};scope.resetSearchIndex=function(){scope.search.index=0;makeSureSelectedItemIsInViewport();};scope.highlightNextItem=function(){var numTotal=element.find('li.result').length;if(numTotal<=(scope.search.index+1)){scope.search.index=numTotal-1;}else{scope.search.index++;}
-makeSureSelectedItemIsInViewport();};scope.clickQuickAccessMenuItem=function(){var selectedMenuElement=getCurrentlySelectedElement();if(selectedMenuElement){$timeout(function(){selectedMenuElement.click();},20);}};scope.selectMenuItem=function(index){var target=$rootElement.find('[quick_access='+index+']');if(target&&target.length&&target[0]){scope.deactivateSearch();var actualTarget=target[0];var href=$(actualTarget).attr('href');if(href&&href.length>10&&actualTarget&&actualTarget.click){try{actualTarget.click();}catch(e){$(actualTarget).click();}}else{$(actualTarget).click();}}};piwikHelper.registerShortcut('f',_pk_translate('CoreHome_ShortcutSearch'),function(event){if(event.altKey){return;}
+makeSureSelectedItemIsInViewport();};scope.clickQuickAccessMenuItem=function(){var selectedMenuElement=getCurrentlySelectedElement();if(selectedMenuElement){$timeout(function(){selectedMenuElement.click();},20);}};scope.selectMenuItem=function(index){var target=$rootElement.find('[quick_access='+index+']');if(target&&target.length&&target[0]){scope.deactivateSearch();var actualTarget=target[0];var href=$(actualTarget).attr('href');if(href&&href.length>10&&actualTarget&&actualTarget.click){try{actualTarget.click();}catch(e){$(actualTarget).click();}}else{$(actualTarget).click();}}};scope.urlEncode=function(term){return encodeURIComponent(term);};piwikHelper.registerShortcut('f',_pk_translate('CoreHome_ShortcutSearch'),function(event){if(event.altKey){return;}
 if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}
 scrollFirstElementIntoView(element);scope.activateSearch();});}};}})();
 /*!
@@ -2072,7 +2099,7 @@ function enableDisableMonthDropdown(){element.find('.ui-datepicker-month').attr(
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').component('piwikDateRangePicker',{templateUrl:'plugins/CoreHome/angularjs/date-range-picker/date-range-picker.component.html?cb='+piwik.cacheBuster,bindings:{startDate:'<',endDate:'<',rangeChange:'&',submit:'&'},controller:DateRangePickerController});DateRangePickerController.$inject=[];function DateRangePickerController(){var vm=this;vm.fromPickerSelectedDates=null;vm.toPickerSelectedDates=null;vm.fromPickerHighlightedDates=null;vm.toPickerHighlightedDates=null;vm.startDateInvalid=false;vm.endDateInvalid=false;vm.$onChanges=$onChanges;vm.setStartRangeDate=setStartRangeDate;vm.setEndRangeDate=setEndRangeDate;vm.onRangeInputChanged=onRangeInputChanged;vm.getNewHighlightedDates=getNewHighlightedDates;vm.handleEnterPress=handleEnterPress;function $onChanges(changes){if(changes.startDate){setStartRangeDateFromStr(vm.startDate);}
+(function(){angular.module('piwikApp').component('piwikDateRangePicker',{templateUrl:'plugins/CoreHome/angularjs/date-range-picker/date-range-picker.component.html?cb='+piwik.cacheBuster,bindings:{startDate:'<',endDate:'<',rangeChange:'&',submit:'&'},controller:DateRangePickerController});DateRangePickerController.$inject=['piwikPeriods'];function DateRangePickerController(piwikPeriods){var vm=this;vm.fromPickerSelectedDates=null;vm.toPickerSelectedDates=null;vm.fromPickerHighlightedDates=null;vm.toPickerHighlightedDates=null;vm.startDateInvalid=false;vm.endDateInvalid=false;vm.$onChanges=$onChanges;vm.setStartRangeDate=setStartRangeDate;vm.setEndRangeDate=setEndRangeDate;vm.onRangeInputChanged=onRangeInputChanged;vm.getNewHighlightedDates=getNewHighlightedDates;vm.handleEnterPress=handleEnterPress;function $onChanges(changes){if(changes.startDate){setStartRangeDateFromStr(vm.startDate);}
 if(changes.endDate){setEndRangeDateFromStr(vm.endDate);}}
 function onRangeInputChanged(source){if(source==='from'){setStartRangeDateFromStr(vm.startDate);}else{setEndRangeDateFromStr(vm.endDate);}}
 function setStartRangeDateFromStr(dateStr){vm.startDateInvalid=true;var startDateParsed;try{startDateParsed=$.datepicker.parseDate('yy-mm-dd',dateStr);}catch(e){}
@@ -2083,8 +2110,8 @@ if(endDateParsed){vm.toPickerSelectedDates=[endDateParsed,endDateParsed];vm.endD
 rangeChanged();}
 function handleEnterPress($event){if($event.keyCode!==13||!vm.submit){return;}
 vm.submit({start:vm.startDate,end:vm.endDate});}
-function setStartRangeDate(date){vm.startDateInvalid=false;vm.startDate=$.datepicker.formatDate('yy-mm-dd',date);vm.fromPickerSelectedDates=[date,date];rangeChanged();}
-function setEndRangeDate(date){vm.endDateInvalid=false;vm.endDate=$.datepicker.formatDate('yy-mm-dd',date);vm.toPickerSelectedDates=[date,date];rangeChanged();}
+function setStartRangeDate(date){vm.startDateInvalid=false;vm.startDate=piwikPeriods.format(date);vm.fromPickerSelectedDates=[date,date];rangeChanged();}
+function setEndRangeDate(date){vm.endDateInvalid=false;vm.endDate=piwikPeriods.format(date);vm.toPickerSelectedDates=[date,date];rangeChanged();}
 function rangeChanged(){if(!vm.rangeChange){return;}
 vm.rangeChange({start:vm.startDateInvalid?null:vm.startDate,end:vm.endDateInvalid?null:vm.endDate});}
 function getNewHighlightedDates(date,$cell){if($cell.hasClass('ui-datepicker-unselectable')){return null;}
@@ -2117,33 +2144,44 @@ function getBoundedDateRange(date){var periodClass=piwikPeriods.get(vm.period);v
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').controller('PeriodSelectorController',PeriodSelectorController);PeriodSelectorController.$inject=['piwik','$location','piwikPeriods'];function PeriodSelectorController(piwik,$location,piwikPeriods){var piwikMinDate=new Date(piwik.minDateYear,piwik.minDateMonth-1,piwik.minDateDay),piwikMaxDate=new Date(piwik.maxDateYear,piwik.maxDateMonth-1,piwik.maxDateDay);var vm=this;vm.periodValue=null;vm.dateValue=null;vm.selectedPeriod=null;vm.startRangeDate=null;vm.endRangeDate=null;vm.isRangeValid=null;vm.isLoadingNewPage=false;vm.getCurrentlyViewingText=getCurrentlyViewingText;vm.changeViewedPeriod=changeViewedPeriod;vm.setPiwikPeriodAndDate=setPiwikPeriodAndDate;vm.onApplyClicked=onApplyClicked;vm.updateSelectedValuesFromHash=updateSelectedValuesFromHash;vm.getPeriodDisplayText=getPeriodDisplayText;vm.$onChanges=$onChanges;vm.onRangeChange=onRangeChange;vm.isApplyEnabled=isApplyEnabled;vm.$onInit=init;function init(){vm.updateSelectedValuesFromHash();initTopControls();}
+(function(){angular.module('piwikApp').controller('PeriodSelectorController',PeriodSelectorController);PeriodSelectorController.$inject=['piwik','$location','piwikPeriods','piwikComparisonsService','$rootScope','piwikUrl','$element','$timeout'];function PeriodSelectorController(piwik,$location,piwikPeriods,piwikComparisonsService,$rootScope,piwikUrl,$element,$timeout){var piwikMinDate=new Date(piwik.minDateYear,piwik.minDateMonth-1,piwik.minDateDay),piwikMaxDate=new Date(piwik.maxDateYear,piwik.maxDateMonth-1,piwik.maxDateDay);var vm=this;vm.periodValue=null;vm.dateValue=null;vm.selectedPeriod=null;vm.startRangeDate=null;vm.endRangeDate=null;vm.isRangeValid=null;vm.isLoadingNewPage=false;vm.isComparing=false;vm.comparePeriodType='previousPeriod';vm.compareStartDate='';vm.compareEndDate='';vm.getCurrentlyViewingText=getCurrentlyViewingText;vm.changeViewedPeriod=changeViewedPeriod;vm.setPiwikPeriodAndDate=setPiwikPeriodAndDate;vm.onApplyClicked=onApplyClicked;vm.updateSelectedValuesFromHash=updateSelectedValuesFromHash;vm.getPeriodDisplayText=getPeriodDisplayText;vm.$onChanges=$onChanges;vm.onRangeChange=onRangeChange;vm.isApplyEnabled=isApplyEnabled;vm.$onInit=init;vm.isComparisonEnabled=isComparisonEnabled;$rootScope.$on('$locationChangeSuccess',setIsComparing);function init(){vm.updateSelectedValuesFromHash();setIsComparing();initTopControls();handleZIndexPositionRelativeCompareDropdownIssue();}
+function handleZIndexPositionRelativeCompareDropdownIssue(){$element.on('focus','#comparePeriodToDropdown .select-dropdown',function(){$element.addClass('compare-dropdown-open');}).on('blur','#comparePeriodToDropdown .select-dropdown',function(){$element.removeClass('compare-dropdown-open');});}
+function setIsComparing(){vm.isComparing=piwikComparisonsService.isComparingPeriods();}
 function $onChanges(changesObj){if(changesObj.periods){removeUnrecognizedPeriods();}}
 function onRangeChange(start,end){if(!start||!end){vm.isRangeValid=false;return;}
 vm.isRangeValid=true;vm.startRangeDate=start;vm.endRangeDate=end;}
 function isApplyEnabled(){if(vm.selectedPeriod==='range'&&!vm.isRangeValid){return false;}
+if(vm.isComparing&&vm.comparePeriodType==='custom'&&!isCompareRangeValid()){return false;}
+return true;}
+function isCompareRangeValid(){try{piwikPeriods.parseDate(vm.compareStartDate);}catch(e){return false;}
+try{piwikPeriods.parseDate(vm.compareEndDate);}catch(e){return false;}
 return true;}
 function removeUnrecognizedPeriods(){vm.periods=vm.periods.filter(function(periodLabel){return piwikPeriods.isRecognizedPeriod(periodLabel);});}
-function updateSelectedValuesFromHash(){var strDate=getQueryParamValue('date');var strPeriod=getQueryParamValue('period');vm.periodValue=strPeriod;vm.selectedPeriod=strPeriod;vm.dateValue=vm.startRangeDate=vm.endRangeDate=null;if(strPeriod==='range'){var period=piwikPeriods.get(strPeriod).parse(strDate);vm.dateValue=period.startDate;vm.startRangeDate=formatDate(period.startDate);vm.endRangeDate=formatDate(period.endDate);}else{vm.dateValue=piwikPeriods.parseDate(strDate);setRangeStartEndFromPeriod(strPeriod,strDate);}}
-function getQueryParamValue(name){var result=$location.search()[name];if(!result){result=broadcast.getValueFromUrl(name);}
-return result;}
+function updateSelectedValuesFromHash(){var strDate=piwikUrl.getSearchParam('date');var strPeriod=piwikUrl.getSearchParam('period');vm.periodValue=strPeriod;vm.selectedPeriod=strPeriod;vm.dateValue=vm.startRangeDate=vm.endRangeDate=null;if(strPeriod==='range'){var period=piwikPeriods.get(strPeriod).parse(strDate);vm.dateValue=period.startDate;vm.startRangeDate=formatDate(period.startDate);vm.endRangeDate=formatDate(period.endDate);}else{vm.dateValue=piwikPeriods.parseDate(strDate);setRangeStartEndFromPeriod(strPeriod,strDate);}}
 function getPeriodDisplayText(periodLabel){return piwikPeriods.get(periodLabel).getDisplayText();}
 function getCurrentlyViewingText(){var date;if(vm.periodValue==='range'){date=vm.startRangeDate+','+vm.endRangeDate;}else{date=formatDate(vm.dateValue);}
 try{return piwikPeriods.parse(vm.periodValue,date).getPrettyString();}catch(e){return _pk_translate('General_Error');}}
 function changeViewedPeriod(period){if(period===vm.periodValue){return;}
 if(period==='range'){return;}
 setPiwikPeriodAndDate(period,vm.dateValue);}
-function onApplyClicked(){if(vm.selectedPeriod==='range'){var dateFrom=vm.startRangeDate,dateTo=vm.endRangeDate,oDateFrom=piwikPeriods.parseDate(dateFrom),oDateTo=piwikPeriods.parseDate(dateTo);if(!isValidDate(oDateFrom)||!isValidDate(oDateTo)||oDateFrom>oDateTo){$('#alert').find('h2').text(_pk_translate('General_InvalidDateRange'));piwik.helper.modalConfirm('#alert',{});return;}
-vm.periodValue='range';propagateNewUrlParams(dateFrom+','+dateTo,'range');return;}
+function onApplyClicked(){if(vm.selectedPeriod==='range'){var dateString=getSelectedDateString();if(!dateString){return;}
+vm.periodValue='range';propagateNewUrlParams(dateString,'range');return;}
 setPiwikPeriodAndDate(vm.selectedPeriod,vm.dateValue);}
+function getSelectedDateString(){if(vm.selectedPeriod==='range'){var dateFrom=vm.startRangeDate,dateTo=vm.endRangeDate,oDateFrom=piwikPeriods.parseDate(dateFrom),oDateTo=piwikPeriods.parseDate(dateTo);if(!isValidDate(oDateFrom)||!isValidDate(oDateTo)||oDateFrom>oDateTo){$('#alert').find('h2').text(_pk_translate('General_InvalidDateRange'));piwik.helper.modalConfirm('#alert',{});return null;}
+return dateFrom+','+dateTo;}else{return formatDate(vm.dateValue);}}
 function setPiwikPeriodAndDate(period,date){vm.periodValue=period;vm.selectedPeriod=period;vm.dateValue=date;var currentDateString=formatDate(date);setRangeStartEndFromPeriod(period,currentDateString);propagateNewUrlParams(currentDateString,vm.selectedPeriod);initTopControls();}
 function setRangeStartEndFromPeriod(period,dateStr){var dateRange=piwikPeriods.parse(period,dateStr).getDateRange();vm.startRangeDate=formatDate(dateRange[0]<piwikMinDate?piwikMinDate:dateRange[0]);vm.endRangeDate=formatDate(dateRange[1]>piwikMaxDate?piwikMaxDate:dateRange[1]);}
-function propagateNewUrlParams(date,period){if(piwik.helper.isAngularRenderingThePage()){vm.closePeriodSelector();var $search=$location.search();if(date!==$search.date||period!==$search.period){$search.date=date;$search.period=period;$location.search($search);}
+function getSelectedComparisonParams(){var previousDate;if(!vm.isComparing){return{};}
+if(vm.comparePeriodType==='custom'){return{comparePeriods:['range'],compareDates:[vm.compareStartDate+','+vm.compareEndDate],};}else if(vm.comparePeriodType==='previousPeriod'){previousDate=getPreviousPeriodDateToSelectedPeriod();return{comparePeriods:[vm.selectedPeriod],compareDates:[previousDate],};}else if(vm.comparePeriodType==='previousYear'){var dateStr=vm.selectedPeriod==='range'?(vm.startRangeDate+','+vm.endRangeDate):vm.dateValue;var currentDateRange=piwikPeriods.parse(vm.selectedPeriod,dateStr).getDateRange();currentDateRange[0].setFullYear(currentDateRange[0].getFullYear()-1);currentDateRange[1].setFullYear(currentDateRange[1].getFullYear()-1);return{comparePeriods:['range'],compareDates:[piwikPeriods.format(currentDateRange[0])+','+piwikPeriods.format(currentDateRange[1])],};}else{console.warn("Unknown compare period type: "+vm.comparePeriodType);return{};}}
+function getPreviousPeriodDateToSelectedPeriod(){if(vm.selectedPeriod==='range'){var currentStartRange=piwikPeriods.parseDate(vm.startRangeDate);var currentEndRange=piwikPeriods.parseDate(vm.endRangeDate);var newEndDate=piwikPeriods.RangePeriod.getLastNRange('day',2,currentStartRange).startDate;var rangeSize=Math.floor((currentEndRange-currentStartRange)/ 86400000);var newRange=piwikPeriods.RangePeriod.getLastNRange('day',1+rangeSize,newEndDate);return piwikPeriods.format(newRange.startDate)+','+piwikPeriods.format(newRange.endDate);}
+var newStartDate=piwikPeriods.RangePeriod.getLastNRange(vm.selectedPeriod,2,vm.dateValue).startDate;return piwikPeriods.format(newStartDate);}
+function propagateNewUrlParams(date,period){var compareParams=getSelectedComparisonParams();if(piwik.helper.isAngularRenderingThePage()){vm.closePeriodSelector();var $search=$location.search();var isCurrentlyComparing=piwikUrl.getSearchParam('compareSegments')||piwikUrl.getSearchParam('comparePeriods');if(date!==$search.date||period!==$search.period||vm.isComparing||isCurrentlyComparing){$search.date=date;$search.period=period;$search.compareSegments=piwikUrl.getSearchParam('compareSegments')||[];$.extend($search,compareParams);delete $search['compareSegments[]'];delete $search['comparePeriods[]'];delete $search['compareDates[]'];$location.search($.param($search));}
 return;}
-vm.isLoadingNewPage=true;broadcast.propagateNewPage('date='+date+'&period='+period);}
+vm.isLoadingNewPage=true;var url=$.param($.extend({date:date,period:period},compareParams));broadcast.propagateNewPage(url);}
 function isValidDate(d){if(Object.prototype.toString.call(d)!=="[object Date]"){return false;}
 return!isNaN(d.getTime());}
-function formatDate(date){return $.datepicker.formatDate('yy-mm-dd',date);}}})();
+function formatDate(date){return piwikPeriods.format(date);}
+function isComparisonEnabled(){return piwikComparisonsService.isComparisonEnabled();}}})();
 /*!
  * Matomo - free/libre analytics platform
  *
@@ -2202,7 +2240,65 @@ var self=this;$scope.$watch('formValue',function(){if(!$scope.formValue||!$scope
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').controller('MailSmtpController',MailSmtpController);MailSmtpController.$inject=['$scope','piwikApi'];function MailSmtpController($scope,piwikApi){var self=this;this.isLoading=false;this.passwordChanged=false;this.save=function(){this.isLoading=true;var mailSettings={mailUseSmtp:this.enabled?'1':'0',mailPort:this.mailPort,mailHost:this.mailHost,mailType:this.mailType,mailUsername:this.mailUsername,mailEncryption:this.mailEncryption};if(this.passwordChanged){mailSettings.mailPassword=this.mailPassword;}
+(function(){angular.module('piwikApp.service').factory('piwikComparisonsService',ComparisonFactory);ComparisonFactory.$inject=['$location','$rootScope','piwikPeriods','piwikApi','piwikUrl'];function ComparisonFactory($location,$rootScope,piwikPeriods,piwikApi,piwikUrl){var segmentComparisons=[];var periodComparisons=[];var comparisonsDisabledFor=[];var isEnabled=null;var SERIES_COLOR_COUNT=8;var SERIES_SHADE_COUNT=3;var colors=getAllSeriesColors();$rootScope.$on('$locationChangeSuccess',updateComparisonsFromQueryParams);$rootScope.$on('piwikSegmentationInited',updateComparisonsFromQueryParams);if(!piwikHelper.isAngularRenderingThePage()){updateComparisonsFromQueryParams();}
+loadComparisonsDisabledFor();return{getComparisons:getComparisons,removeSegmentComparison:removeSegmentComparison,addSegmentComparison:addSegmentComparison,isComparisonEnabled:isComparisonEnabled,getSegmentComparisons:getSegmentComparisons,getPeriodComparisons:getPeriodComparisons,getSeriesColor:getSeriesColor,getAllComparisonSeries:getAllComparisonSeries,isComparing:isComparing,isComparingPeriods:isComparingPeriods,getIndividualComparisonRowIndices:getIndividualComparisonRowIndices,getComparisonSeriesIndex:getComparisonSeriesIndex,getSeriesColorName:getSeriesColorName};function getComparisons(){return getSegmentComparisons().concat(getPeriodComparisons());}
+function isComparing(){return isComparisonEnabled()&&(segmentComparisons.length>1||periodComparisons.length>1);}
+function isComparingPeriods(){return getPeriodComparisons().length>1;}
+function getSegmentComparisons(){if(!isComparisonEnabled()){return[];}
+return segmentComparisons;}
+function getPeriodComparisons(){if(!isComparisonEnabled()){return[];}
+return periodComparisons;}
+function getSeriesColor(segmentComparison,periodComparison,metricIndex){metricIndex=metricIndex||0;var seriesIndex=getComparisonSeriesIndex(periodComparison.index,segmentComparison.index)%SERIES_COLOR_COUNT;if(metricIndex===0){return colors['series'+seriesIndex];}else{var shadeIndex=metricIndex%SERIES_SHADE_COUNT;return colors['series'+seriesIndex+'-shade'+shadeIndex];}}
+function getSeriesColorName(seriesIndex,metricIndex){var colorName='series'+(seriesIndex%SERIES_COLOR_COUNT);if(metricIndex>0){colorName+='-shade'+(metricIndex%SERIES_SHADE_COUNT);}
+return colorName;}
+function isComparisonEnabled(){return isEnabled;}
+function getIndividualComparisonRowIndices(seriesIndex){var segmentCount=getSegmentComparisons().length;var segmentIndex=seriesIndex%segmentCount;var periodIndex=Math.floor(seriesIndex / segmentCount);return{segmentIndex:segmentIndex,periodIndex:periodIndex,};}
+function getComparisonSeriesIndex(periodIndex,segmentIndex){var segmentCount=getSegmentComparisons().length;return periodIndex*segmentCount+segmentIndex;}
+function getAllComparisonSeries(){var seriesInfo=[];var seriesIndex=0;getPeriodComparisons().forEach(function(periodComp){getSegmentComparisons().forEach(function(segmentComp){seriesInfo.push({index:seriesIndex,params:$.extend({},segmentComp.params,periodComp.params),color:colors['series'+seriesIndex],});++seriesIndex;});});return seriesInfo;}
+function removeSegmentComparison(index){if(!isComparisonEnabled()){throw new Error('Comparison disabled.');}
+var newComparisons=[].concat(segmentComparisons);newComparisons.splice(index,1);var extraParams={};if(index===0){extraParams.segment=newComparisons[0].params.segment;}
+updateQueryParamsFromComparisons(newComparisons,periodComparisons,extraParams);}
+function addSegmentComparison(params){if(!isComparisonEnabled()){throw new Error('Comparison disabled.');}
+var newComparisons=segmentComparisons.concat([{params:params}]);updateQueryParamsFromComparisons(newComparisons,periodComparisons);}
+function updateQueryParamsFromComparisons(segmentComparisons,periodComparisons,extraParams){extraParams=extraParams||{};var compareSegments={};var comparePeriodDatePairs={};var firstSegment=false;var firstPeriod=false;segmentComparisons.forEach(function(comparison){if(firstSegment){compareSegments[comparison.params.segment]=true;}else{firstSegment=true;}});periodComparisons.forEach(function(comparison){if(firstPeriod){comparePeriodDatePairs[comparison.params.period+'|'+comparison.params.date]=true;}else{firstPeriod=true;}});var comparePeriods=[];var compareDates=[];Object.keys(comparePeriodDatePairs).forEach(function(pair){var parts=pair.split('|');comparePeriods.push(parts[0]);compareDates.push(parts[1]);});var compareParams={compareSegments:Object.keys(compareSegments),comparePeriods:comparePeriods,compareDates:compareDates,};if(piwik.helper.isAngularRenderingThePage()){var search=$location.search();var newSearch=$.extend({},search,compareParams,extraParams);delete newSearch['compareSegments[]'];delete newSearch['comparePeriods[]'];delete newSearch['compareDates[]'];if(JSON.stringify(newSearch)!==JSON.stringify(search)){$location.search($.param(newSearch));}
+return;}
+var paramsToRemove=[];['compareSegments','comparePeriods','compareDates'].forEach(function(name){if(!compareParams[name].length){paramsToRemove.push(name);}});var url=$.param($.extend({},extraParams));var strHash=$.param($.extend({},compareParams));broadcast.propagateNewPage(url,undefined,strHash,paramsToRemove);}
+function updateComparisonsFromQueryParams(){var title;var availableSegments=[];try{availableSegments=$('.segmentEditorPanel').data('uiControlObject').impl.availableSegments||[];}catch(e){}
+var compareSegments=piwikUrl.getSearchParam('compareSegments')||[];compareSegments=compareSegments instanceof Array?compareSegments:[compareSegments];var comparePeriods=piwikUrl.getSearchParam('comparePeriods')||[];comparePeriods=comparePeriods instanceof Array?comparePeriods:[comparePeriods];var compareDates=piwikUrl.getSearchParam('compareDates')||[];compareDates=compareDates instanceof Array?compareDates:[compareDates];compareSegments.unshift(piwikUrl.getSearchParam('segment'));comparePeriods.unshift(piwikUrl.getSearchParam('period'));compareDates.unshift(piwikUrl.getSearchParam('date'));var newSegmentComparisons=[];compareSegments.forEach(function(segment,idx){var storedSegment=null;availableSegments.forEach(function(s){if(s.definition===segment||s.definition===decodeURIComponent(segment)||decodeURIComponent(s.definition)===segment){storedSegment=s;}});var segmentTitle=storedSegment?storedSegment.name:_pk_translate('General_Unknown');if(segment.trim()===''){segmentTitle=_pk_translate('SegmentEditor_DefaultAllVisits');}
+newSegmentComparisons.push({params:{segment:segment},title:piwikHelper.htmlDecode(segmentTitle),index:idx});});var newPeriodComparisons=[];for(var i=0;i<Math.min(compareDates.length,comparePeriods.length);++i){try{title=piwikPeriods.parse(comparePeriods[i],compareDates[i]).getPrettyString();}catch(e){title=_pk_translate('General_Error');}
+newPeriodComparisons.push({params:{date:compareDates[i],period:comparePeriods[i]},title:title,index:i});}
+checkEnabledForCurrentPage();setComparisons(newSegmentComparisons,newPeriodComparisons);}
+function setComparisons(newSegmentComparisons,newPeriodComparisons){var oldSegmentComparisons=segmentComparisons;var oldPeriodComparisons=periodComparisons;segmentComparisons=newSegmentComparisons;Object.freeze(segmentComparisons);periodComparisons=newPeriodComparisons;Object.freeze(periodComparisons);if(JSON.stringify(oldPeriodComparisons)!==JSON.stringify(periodComparisons)||JSON.stringify(oldSegmentComparisons)!==JSON.stringify(segmentComparisons)){$rootScope.$emit('piwikComparisonsChanged');}}
+function checkEnabledForCurrentPage(){var category=piwikUrl.getSearchParam('category')||piwikUrl.getSearchParam('module');var subcategory=piwikUrl.getSearchParam('subcategory')||piwikUrl.getSearchParam('action');var id=category+"."+subcategory;isEnabled=comparisonsDisabledFor.indexOf(id)===-1&&comparisonsDisabledFor.indexOf(category+".*")===-1;$('html').toggleClass('comparisonsDisabled',!isEnabled);}
+function loadComparisonsDisabledFor(){piwikApi.fetch({module:'API',method:'API.getPagesComparisonsDisabledFor',}).then(function(result){comparisonsDisabledFor=result;checkEnabledForCurrentPage();});}
+function getAllSeriesColors(){var colorManager=piwik.ColorManager,seriesColorNames=[];for(var i=0;i<SERIES_COLOR_COUNT;++i){seriesColorNames.push('series'+i);for(var j=0;j<SERIES_SHADE_COUNT;++j){seriesColorNames.push('series'+i+'-shade'+j);}}
+return colorManager.getColors('comparison-series-color',seriesColorNames);}}})();
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function(){angular.module('piwikApp').component('piwikComparisons',{templateUrl:'plugins/CoreHome/angularjs/comparisons/comparisons.component.html?cb='+piwik.cacheBuster,bindings:{},controller:ComparisonsController});ComparisonsController.$inject=['piwikComparisonsService','$rootScope','piwikApi','$element','piwikUrl'];function ComparisonsController(comparisonsService,$rootScope,piwikApi,$element,piwikUrl){var vm=this;var comparisonTooltips=null;vm.comparisonsService=comparisonsService;vm.$onInit=$onInit;vm.$onDestroy=$onDestroy;vm.comparisonHasSegment=comparisonHasSegment;vm.getComparisonPeriodType=getComparisonPeriodType;vm.getComparisonTooltip=getComparisonTooltip;function $onInit(){$rootScope.$on('piwikComparisonsChanged',onComparisonsChanged);onComparisonsChanged();setUpTooltips();}
+function $onDestroy(){try{$element.tooltip('destroy');}catch(e){}}
+function setUpTooltips(){$element.tooltip({track:true,content:function(){var title=$(this).attr('title');return piwikHelper.escape(title.replace(/\n/g,'<br />'));},show:{delay:200,duration:200},hide:false});}
+function comparisonHasSegment(comparison){return typeof comparison.params.segment!=='undefined';}
+function getComparisonPeriodType(comparison){var period=comparison.params.period;if(period==='range'){return _pk_translate('CoreHome_PeriodRange');}
+var periodStr=_pk_translate('Intl_Period'+period.substring(0,1).toUpperCase()+period.substring(1));return periodStr.substring(0,1).toUpperCase()+periodStr.substring(1);}
+function getComparisonTooltip(segmentComparison,periodComparison){if(!comparisonTooltips||!Object.keys(comparisonTooltips).length){return undefined;}
+return comparisonTooltips[periodComparison.index][segmentComparison.index];}
+function onComparisonsChanged(){comparisonTooltips=null;if(!vm.comparisonsService.isComparing()){return;}
+var periodComparisons=comparisonsService.getPeriodComparisons();var segmentComparisons=comparisonsService.getSegmentComparisons();piwikApi.fetch({method:'API.getProcessedReport',apiModule:'VisitsSummary',apiAction:'get',compare:'1',compareSegments:piwikUrl.getSearchParam('compareSegments'),comparePeriods:piwikUrl.getSearchParam('comparePeriods'),compareDates:piwikUrl.getSearchParam('compareDates'),format_metrics:'1',}).then(function(report){comparisonTooltips={};periodComparisons.forEach(function(periodComp){comparisonTooltips[periodComp.index]={};segmentComparisons.forEach(function(segmentComp){comparisonTooltips[periodComp.index][segmentComp.index]=generateComparisonTooltip(report,periodComp,segmentComp);});});});}
+function generateComparisonTooltip(visitsSummary,periodComp,segmentComp){if(!visitsSummary.reportData.comparisons){return'';}
+var firstRowIndex=comparisonsService.getComparisonSeriesIndex(periodComp.index,0);var firstRow=visitsSummary.reportData.comparisons[firstRowIndex];var comparisonRowIndex=comparisonsService.getComparisonSeriesIndex(periodComp.index,segmentComp.index);var comparisonRow=visitsSummary.reportData.comparisons[comparisonRowIndex];var firstPeriodRow=visitsSummary.reportData.comparisons[segmentComp.index];var tooltip='<div class="comparison-card-tooltip">';var visitsPercent=((comparisonRow.nb_visits / firstRow.nb_visits)*100).toFixed(2)+'%';tooltip+=_pk_translate('General_ComparisonCardTooltip1',["'"+comparisonRow.compareSegmentPretty+"'",comparisonRow.comparePeriodPretty,visitsPercent,comparisonRow.nb_visits,firstRow.nb_visits]);if(periodComp.index>0){tooltip+='<br/><br/>';tooltip+=_pk_translate('General_ComparisonCardTooltip2',[comparisonRow.nb_visits_change,firstPeriodRow.compareSegmentPretty,firstPeriodRow.comparePeriodPretty]);}
+tooltip+='</div>';return tooltip;}}})();
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function(){angular.module('piwikApp').controller('MailSmtpController',MailSmtpController);MailSmtpController.$inject=['$scope','piwikApi'];function MailSmtpController($scope,piwikApi){var self=this;this.isLoading=false;this.passwordChanged=false;this.save=function(){this.isLoading=true;var mailSettings={mailUseSmtp:this.enabled?'1':'0',mailPort:this.mailPort,mailHost:this.mailHost,mailType:this.mailType,mailUsername:this.mailUsername,mailFromAddress:this.mailFromAddress,mailFromName:this.mailFromName,mailEncryption:this.mailEncryption};if(this.passwordChanged){mailSettings.mailPassword=this.mailPassword;}
 piwikApi.withTokenInUrl();piwikApi.post({module:'CoreAdminHome',action:'setMailSettings'},mailSettings).then(function(success){self.isLoading=false;var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(_pk_translate('CoreAdminHome_SettingsSaveSuccess'),{id:'generalSettings',context:'success'});notification.scrollToNotification();},function(){self.isLoading=false;});};}})();
 /*!
  * Piwik - free/libre analytics platform
@@ -2224,11 +2320,13 @@ if('1'===frameContent||'0'===frameContent){uploadFrame.remove();}},1000);});$("b
  */
 (function(){function getCustomVariables(customVars){var result=[];angular.forEach(customVars,function(customVar){result.push([customVar.name,customVar.value]);});return result;}
 function getHostNameFromUrl(url){var element=$('<a></a>')[0];element.href=url;return element.hostname;}
-angular.module('piwikApp').controller('JsTrackingCodeController',JsTrackingCodeController);JsTrackingCodeController.$inject=['$scope','piwikApi'];function JsTrackingCodeController($scope,piwikApi){this.showAdvanced=false;this.isLoading=false;this.customVars=[];this.siteUrls={};this.hasManySiteUrls=false;this.maxCustomVariables=parseInt(angular.element('[name=numMaxCustomVariables]').val(),10);this.canAddMoreCustomVariables=this.maxCustomVariables&&this.maxCustomVariables>0;var piwikHost=window.location.host,piwikPath=location.pathname.substring(0,location.pathname.lastIndexOf('/')),self=this;var getSiteData=function(idSite,sectionSelect,callback){if(self.siteUrls[idSite]){callback();return;}
+angular.module('piwikApp').controller('JsTrackingCodeController',JsTrackingCodeController);JsTrackingCodeController.$inject=['$scope','$filter','piwikApi'];function JsTrackingCodeController($scope,$filter,piwikApi){var translate=$filter('translate');this.showAdvanced=false;this.isLoading=false;this.customVars=[];this.siteUrls={};this.hasManySiteUrls=false;this.maxCustomVariables=parseInt(angular.element('[name=numMaxCustomVariables]').val(),10);this.canAddMoreCustomVariables=this.maxCustomVariables&&this.maxCustomVariables>0;var piwikHost=window.location.host,piwikPath=location.pathname.substring(0,location.pathname.lastIndexOf('/')),self=this;var getSiteData=function(idSite,sectionSelect,callback){if(self.siteUrls[idSite]){callback();return;}
 self.isLoading=true;piwikApi.fetch({module:'API',method:'SitesManager.getSiteUrlsFromId',idSite:idSite,filter_limit:'-1'}).then(function(data){self.siteUrls[idSite]=data||[];self.isLoading=false;callback();});};var generateJsCodeAjax=null;var generateJsCode=function(trackingCodeChangedManually){var params={piwikUrl:piwikHost+piwikPath,groupPageTitlesByDomain:self.groupByDomain?1:0,mergeSubdomains:self.trackAllSubdomains?1:0,mergeAliasUrls:self.trackAllAliases?1:0,visitorCustomVariables:self.trackCustomVars?getCustomVariables(self.customVars):0,customCampaignNameQueryParam:null,customCampaignKeywordParam:null,doNotTrack:self.doNotTrack?1:0,disableCookies:self.disableCookies?1:0,crossDomain:self.crossDomain?1:0,trackNoScript:self.trackNoScript?1:0,forceMatomoEndpoint:1};if(self.useCustomCampaignParams){params.customCampaignNameQueryParam=self.customCampaignName;params.customCampaignKeywordParam=self.customCampaignKeyword;}
 if(generateJsCodeAjax){generateJsCodeAjax.abort();}
 generateJsCodeAjax=piwikApi.post({module:'API',format:'json',method:'SitesManager.getJavascriptTag',idSite:self.site.id},params).then(function(response){generateJsCodeAjax=null;self.trackingCode=response.value;if(trackingCodeChangedManually){var jsCodeTextarea=$('#javascript-text .codeblock');jsCodeTextarea.effect("highlight",{},1500);}});return generateJsCodeAjax;};this.onCrossDomainToggle=function(){if(this.crossDomain){this.trackAllAliases=true;}};this.addCustomVar=function(){if(this.canAddMoreCustomVariables){this.customVars.push({name:'',value:''});}
-this.canAddMoreCustomVariables=this.maxCustomVariables>this.customVars.length;};this.addCustomVar();this.updateTrackingCode=function(){generateJsCode(true);};this.changeSite=function(trackingCodeChangedManually){getSiteData(this.site.id,'#js-code-options',function(){$('.current-site-name').text(self.site.name);self.hasManySiteUrls=self.siteUrls[self.site.id]&&self.siteUrls[self.site.id].length>1;if(!self.hasManySiteUrls){self.crossDomain=false;}
+this.canAddMoreCustomVariables=this.maxCustomVariables>this.customVars.length;};this.addCustomVar();this.updateTrackingCode=function(){generateJsCode(true);};this.sendEmail=function(){var subjectLine=translate('SitesManager_EmailInstructionsSubject');var trackingCode=self.trackingCode;trackingCode=trackingCode.replace(/<[^>]+>/g,'');var bodyText=translate('SitesManager_JsTrackingTagHelp')+'. '
++translate('CoreAdminHome_JSTracking_CodeNoteBeforeClosingHeadEmail',"'head")
++"\n"+trackingCode;var linkText='mailto:?subject='+encodeURIComponent(subjectLine)+'&body='+encodeURIComponent(bodyText);window.location.href=linkText;};this.changeSite=function(trackingCodeChangedManually){getSiteData(this.site.id,'#js-code-options',function(){$('.current-site-name').text(self.site.name);self.hasManySiteUrls=self.siteUrls[self.site.id]&&self.siteUrls[self.site.id].length>1;if(!self.hasManySiteUrls){self.crossDomain=false;}
 var siteHost=getHostNameFromUrl(self.siteUrls[self.site.id][0]);$('.current-site-host').text(siteHost);var defaultAliasUrl='x.'+siteHost;$('.current-site-alias').text(self.siteUrls[self.site.id][1]||defaultAliasUrl);generateJsCode(true);});};if(this.site&&this.site.id){this.changeSite(false);}}})();
 /*!
  * Piwik - free/libre analytics platform
@@ -2427,7 +2525,7 @@ promises.push(piwikApi.fetch($.extend({method:apiModule+'.'+apiAction,format_met
 return $q.all(promises).then(function(responses){vm.responses=responses;vm.isLoading=false;});}
 function recalculateValues(){setWidgetTitle();vm.metricDocumentation=getMetricDocumentation();var currentData=vm.responses[0];vm.metricValue=currentData[vm.metric]||0;if(vm.responses[1]){vm.metricValueUnformatted=vm.responses[1][vm.metric];var pastData=vm.responses[2];vm.pastValueUnformatted=pastData[vm.metric]||0;var evolution=piwik.helper.calculateEvolution(vm.metricValueUnformatted,vm.pastValueUnformatted);vm.metricChangePercent=(evolution*100).toFixed(2)+' %';var pastDataFormatted=vm.responses[3];vm.pastValue=pastDataFormatted[vm.metric]||0;}else{vm.pastValue=null;vm.metricChangePercent=null;}
 vm.metricTranslation=getMetricTranslation();}
-function getLastPeriodDate(){var RangePeriod=piwikPeriods.get('range');var result=RangePeriod.getLastNRange(piwik.period,2,piwik.currentDateString).startDate;return $.datepicker.formatDate('yy-mm-dd',result);}
+function getLastPeriodDate(){var RangePeriod=piwikPeriods.get('range');var result=RangePeriod.getLastNRange(piwik.period,2,piwik.currentDateString).startDate;return piwikPeriods.format(result);}
 function setWidgetTitle(){var title=vm.getMetricTranslation();if(isIdGoalSet()){var goalName=vm.goals[vm.idGoal].name;title=goalName+' - '+title;}
 $element.closest('div.widget').find('.widgetTop > .widgetName > span').text(title);}
 function getCurrentPeriod(){if(piwik.startDateString===piwik.endDateString){return piwik.endDateString;}
@@ -2442,7 +2540,7 @@ function setSelectableColumns(){var result=[];Object.keys(vm.metricTranslations)
 function onMetricChanged(){setSparklineParams();fetchData().then(recalculateValues);$element.closest('[widgetId]').trigger('setParameters',{column:vm.metric,idGoal:vm.idGoal});}
 function setMetric(newColumn){var idGoal;var m=newColumn.match(/^goal([0-9]+)_(.*)/);if(m){idGoal=+m[1];newColumn=m[2];}
 if(vm.metric!==newColumn||idGoal!==vm.idGoal){vm.metric=newColumn;vm.idGoal=idGoal;onMetricChanged();}}
-function getPastPeriodStr(){var startDate=piwikPeriods.get('range').getLastNRange(piwik.period,2,piwik.currentDateString).startDate;var dateRange=piwikPeriods.get(piwik.period).parse(startDate).getDateRange();return $.datepicker.formatDate('yy-mm-dd',dateRange[0])+','+$.datepicker.formatDate('yy-mm-dd',dateRange[1]);}
+function getPastPeriodStr(){var startDate=piwikPeriods.get('range').getLastNRange(piwik.period,2,piwik.currentDateString).startDate;var dateRange=piwikPeriods.get(piwik.period).parse(startDate).getDateRange();return piwikPeriods.format(dateRange[0])+','+piwikPeriods.format(dateRange[1]);}
 function isIdGoalSet(){return vm.idGoal||vm.idGoal===0;}}})();
 (function($,require){var SeriesPicker=function(dataTable){this.domElem=null;this.dataTableId=dataTable.workingDivId;this.selectableColumns=dataTable.props.selectable_columns;this.selectableRows=dataTable.props.selectable_rows;this.show=!!dataTable.props.show_series_picker&&(this.selectableColumns||this.selectableRows);this.multiSelect=!!dataTable.props.allow_multi_select_series_picker;};SeriesPicker.prototype={init:function(){if(!this.show){return;}
 var self=this;var selectedColumns=this.selectableColumns.filter(isItemDisplayed).map(function(columnConfig){return columnConfig.column;});var selectedRows=this.selectableRows.filter(isItemDisplayed).map(function(rowConfig){return rowConfig.matcher;});var seriesPicker='<piwik-series-picker'
@@ -2492,8 +2590,9 @@ var ticks=[];var numberOfTicks=2;var tickDistance=Math.ceil(maxCrossDataSets / n
 axis.ticks=ticks;},formatY:function(value,seriesIndex){var floatVal=parseFloat(value);var intVal=parseInt(value,10);if(Math.abs(floatVal-intVal)>=0.005){value=Math.round(floatVal*100)/ 100;}else if(parseFloat(intVal)==floatVal){value=intVal;}else{value=floatVal;}
 var axisId=this.jqplotParams.series[seriesIndex].yaxis;var formatString=this.jqplotParams.axes[axisId].tickOptions.formatString;return $.jqplot.NumberFormatter(formatString,value);},addExternalSeriesToggle:function(seriesPickerClass,initiallyShowAll){new seriesPickerClass(this.targetDivId,this,initiallyShowAll);if(!initiallyShowAll){var initialMetrics=0;var $rowEvolution=$('#'+this.targetDivId).closest('.rowevolution');var newData=[];var newSeries=[];if($rowEvolution.data('initialMetrics')){initialMetrics=$rowEvolution.data('initialMetrics');if(angular.isArray(initialMetrics)){for(var j=0;j<initialMetrics.length;j++){for(var k=0;k<this.jqplotParams.series.length;k++){if(this.jqplotParams.series[k]&&this.jqplotParams.series[k].label&&this.jqplotParams.series[k].label===initialMetrics[j]){newData.push(this.data[k]);newSeries.push(this.jqplotParams.series[k]);break;}}}}}
 if(newData.length){this.data=newData;this.jqplotParams.series=newSeries;}else{this.data=[this.data[0]];this.jqplotParams.series=[this.jqplotParams.series[0]];}
-this.setYTicks();}},_setColors:function(){var colorManager=piwik.ColorManager,seriesColorNames=['series1','series2','series3','series4','series5','series6','series7','series8','series9','series10'];var viewDataTable=$('#'+this.workingDivId).data('uiControlObject').param['viewDataTable'];var graphType;if(viewDataTable=='graphEvolution'){graphType='evolution';}else if(viewDataTable=='graphPie'){graphType='pie';}else if(viewDataTable=='graphVerticalBar'){graphType='bar';}
-var namespace=graphType+'-graph-colors';this.jqplotParams.seriesColors=colorManager.getColors(namespace,seriesColorNames,true);this.jqplotParams.grid.background=colorManager.getColor(namespace,'grid-background');this.jqplotParams.grid.borderColor=colorManager.getColor(namespace,'grid-border');this.tickColor=colorManager.getColor(namespace,'ticks');this.singleMetricColor=colorManager.getColor(namespace,'single-metric-label')}});DataTable.registerFooterIconHandler('graphPie',DataTable.switchToGraph);DataTable.registerFooterIconHandler('graphVerticalBar',DataTable.switchToGraph);DataTable.registerFooterIconHandler('graphEvolution',DataTable.switchToGraph);})(jQuery,require);function JQPlotExternalSeriesToggle(targetDivId,jqplotObject,initiallyShowAll){this.init(targetDivId,originalConfig,initiallyShowAll);}
+this.setYTicks();}},_setColors:function(){var colorManager=piwik.ColorManager;var viewDataTable=$('#'+this.workingDivId).data('uiControlObject').param['viewDataTable'];var graphType;if(viewDataTable=='graphEvolution'){graphType='evolution';}else if(viewDataTable=='graphPie'){graphType='pie';}else if(viewDataTable=='graphVerticalBar'){graphType='bar';}
+var namespace=graphType+'-graph-colors';this._setSeriesColors(namespace);this.jqplotParams.grid.background=colorManager.getColor(namespace,'grid-background');this.jqplotParams.grid.borderColor=colorManager.getColor(namespace,'grid-border');this.tickColor=colorManager.getColor(namespace,'ticks');this.singleMetricColor=colorManager.getColor(namespace,'single-metric-label')},_setSeriesColors:function(namespace){var colorManager=piwik.ColorManager,seriesColorNames=['series0','series1','series2','series3','series4','series5','series6','series7','series8','series9','series10'];var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');if(comparisonService.isComparing()&&typeof this.jqplotParams.series[0].seriesIndex!=='undefined'){namespace='comparison-series-color';seriesColorNames=[];this.jqplotParams.series.forEach(function(s){var seriesColorName=comparisonService.getSeriesColorName(s.seriesIndex,s.metricIndex);seriesColorNames.push(seriesColorName);});}
+this.jqplotParams.seriesColors=colorManager.getColors(namespace,seriesColorNames,true);}});DataTable.registerFooterIconHandler('graphPie',DataTable.switchToGraph);DataTable.registerFooterIconHandler('graphVerticalBar',DataTable.switchToGraph);DataTable.registerFooterIconHandler('graphEvolution',DataTable.switchToGraph);})(jQuery,require);function JQPlotExternalSeriesToggle(targetDivId,jqplotObject,initiallyShowAll){this.init(targetDivId,originalConfig,initiallyShowAll);}
 JQPlotExternalSeriesToggle.prototype={init:function(targetDivId,jqplotObject,initiallyShowAll){this.targetDivId=targetDivId;this.jqplotObject=jqplotObject;this.originalData=jqplotObject.data;this.originalSeries=jqplotObject.jqplotParams.series;this.originalAxes=jqplotObject.jqplotParams.axes;this.originalParams=jqplotObject.jqplotParams;this.originalSeriesColors=jqplotObject.jqplotParams.seriesColors;this.initiallyShowAll=initiallyShowAll;this.activated=[];this.target=$('#'+targetDivId);this.attachEvents();},attachEvents:function(){},showSeries:function(i){this.activated=[i];this.replot();},toggleSeries:function(i){if(this.activated.indexOf(i)>-1){if(this.activated.length>1){this.activated.splice(this.activated.indexOf(i),1);}}else{this.activated.push(i);}
 this.replot();},replot:function(){this.beforeReplot();var usedAxes=[];var config={data:this.originalData,params:this.originalParams};config.data=[];config.params.series=[];config.params.axes={xaxis:this.originalAxes.xaxis};config.params.seriesColors=[];for(var j=0;j<this.activated.length;j++){for(var k=0;k<this.originalSeries.length;k++){if(this.originalSeries[k]&&this.originalSeries[k].label&&this.originalSeries[k].label===this.activated[j]){config.data.push(this.originalData[k]);config.params.seriesColors.push(this.originalSeriesColors[k]);config.params.series.push($.extend(true,{},this.originalSeries[k]));var axis=this.originalSeries[k].yaxis;if($.inArray(axis,usedAxes)==-1){usedAxes.push(axis);}
 break;}}}
@@ -2515,7 +2614,7 @@ ctx.moveTo(x,top);ctx.lineTo(x,full?ctx.canvas.height:ctx.canvas.height-2);ctx.s
 function handleMouseMove(ev,gridpos,datapos,neighbor,plot){var c=plot.plugins.piwikTicks;var tick=Math.floor(datapos.xaxis+0.5)-1;if(tick!==c.currentXTick){c.currentXTick=tick;plot.target.trigger('jqplotPiwikTickOver',[tick]);highlight(plot,tick);}}
 function handleMouseLeave(ev,gridpos,datapos,neighbor,plot){unHighlight(plot);plot.plugins.piwikTicks.currentXTick=false;}
 function highlight(plot,tick){var c=plot.plugins.piwikTicks;if(!c.showHighlight){return;}
-unHighlight(plot);for(var i=0;i<plot.series.length;i++){var series=plot.series[i];var seriesMarkerRenderer=series.markerRenderer;c.markerRenderer.style=seriesMarkerRenderer.style;c.markerRenderer.size=seriesMarkerRenderer.size+5;var rgba=$.jqplot.getColorComponents(seriesMarkerRenderer.color);var newrgb=[rgba[0],rgba[1],rgba[2]];var alpha=rgba[3]*.4;c.markerRenderer.color='rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+alpha+')';c.markerRenderer.init();var position=series.gridData[tick];c.markerRenderer.draw(position[0],position[1],c.piwikHighlightCanvas._ctx);}}
+unHighlight(plot);for(var i=0;i<plot.series.length;i++){var series=plot.series[i];var seriesMarkerRenderer=series.markerRenderer;c.markerRenderer.style=seriesMarkerRenderer.style;c.markerRenderer.size=seriesMarkerRenderer.size+5;var rgba=$.jqplot.getColorComponents(seriesMarkerRenderer.color);var newrgb=[rgba[0],rgba[1],rgba[2]];var alpha=rgba[3]*.4;c.markerRenderer.color='rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+alpha+')';c.markerRenderer.init();var position=series.gridData[tick];if(typeof position!=='undefined'){c.markerRenderer.draw(position[0],position[1],c.piwikHighlightCanvas._ctx);}}}
 function unHighlight(plot){var canvas=plot.plugins.piwikTicks.piwikHighlightCanvas;if(canvas!==null){var ctx=canvas._ctx;ctx.clearRect(0,0,ctx.canvas.width,ctx.canvas.height);}}})(jQuery);(function($){$.jqplot.CanvasLegendRenderer=function(options){this.legendCanvas=null;this.singleMetric=false;this.show=false;$.extend(true,this,options);};$.jqplot.CanvasLegendRenderer.init=function(target,data,opts){var options=opts||{};this.plugins.canvasLegend=new $.jqplot.CanvasLegendRenderer(options.canvasLegend);if(this.plugins.canvasLegend.show){options.gridPadding={top:21,right:0};}};$.jqplot.CanvasLegendRenderer.postDraw=function(){var plot=this;var legend=plot.plugins.canvasLegend;if(!legend.show){return;}
 var padding={top:0,right:this._gridPadding.right,bottom:0,left:this._gridPadding.left};var dimensions={width:this._plotDimensions.width,height:this._gridPadding.top};var width=this._plotDimensions.width-this._gridPadding.left-this._gridPadding.right;legend.legendCanvas=new $.jqplot.GenericCanvas();this.eventCanvas._elem.before(legend.legendCanvas.createElement(padding,'jqplot-legend-canvas',dimensions,plot));legend.legendCanvas.setContext();var ctx=legend.legendCanvas._ctx;ctx.save();ctx.font='11px '+require('piwik/UI').getLabelFontFamily()
 var x=0;var series=plot.legend._series;for(var i=0;i<series.length;i++){var s=series[i];var label;if(legend.labels&&legend.labels[i]){label=legend.labels[i];}else{label=s.label.toString();}
@@ -2523,7 +2622,7 @@ ctx.fillStyle=s.color;if(legend.singleMetric){ctx.fillStyle=legend.singleMetricC
 ctx.fillRect(x,10,10,2);x+=15;var nextX=x+ctx.measureText(label).width+20;if(nextX+70>width){ctx.fillText("[...]",x,15);x+=ctx.measureText("[...]").width+20;break;}
 ctx.fillText(label,x,15);x=nextX;}
 legend.width=x;ctx.restore();};$.jqplot.preInitHooks.push($.jqplot.CanvasLegendRenderer.init);$.jqplot.postDrawHooks.push($.jqplot.CanvasLegendRenderer.postDraw);})(jQuery);(function($,require){$.jqplot.preInitHooks.push(function(target,data,options){var dataTable=$('#'+target).closest('.dataTable').data('uiControlObject');if(!dataTable){return;}
-var SeriesPicker=require('piwik/DataTableVisualizations/Widgets').SeriesPicker;var seriesPicker=new SeriesPicker(dataTable);var plot=this;$(seriesPicker).bind('placeSeriesPicker',function(){this.domElem.css('margin-left',(plot._gridPadding.left+plot.plugins.canvasLegend.width-1)+'px');plot.baseCanvas._elem.before(this.domElem);});$(seriesPicker).bind('seriesPicked',function(e,columns,rows){dataTable.changeSeries(columns,rows);});this.plugins.seriesPicker=seriesPicker;});$.jqplot.postDrawHooks.push(function(){this.plugins.seriesPicker.init();});})(jQuery,require);(function($){$.jqplot.PieLegend=function(options){this.pieLegendCanvas=null;this.show=false;$.extend(true,this,options);};$.jqplot.PieLegend.init=function(target,data,opts){var options=opts||{};this.plugins.pieLegend=new $.jqplot.PieLegend(options.pieLegend);};$.jqplot.PieLegend.postDraw=function(){var plot=this;var legend=plot.plugins.pieLegend;if(!legend.show){return;}
+var SeriesPicker=require('piwik/DataTableVisualizations/Widgets').SeriesPicker;var seriesPicker=new SeriesPicker(dataTable);var plot=this;$(seriesPicker).bind('placeSeriesPicker',function(){this.domElem.css('margin-left',plot._gridPadding.left+'px');$('.jqplot-legend-canvas').css({paddingLeft:'34px'});plot.baseCanvas._elem.before(this.domElem);});$(seriesPicker).bind('seriesPicked',function(e,columns,rows){dataTable.changeSeries(columns,rows);});this.plugins.seriesPicker=seriesPicker;});$.jqplot.postDrawHooks.push(function(){this.plugins.seriesPicker.init();});})(jQuery,require);(function($){$.jqplot.PieLegend=function(options){this.pieLegendCanvas=null;this.show=false;$.extend(true,this,options);};$.jqplot.PieLegend.init=function(target,data,opts){var options=opts||{};this.plugins.pieLegend=new $.jqplot.PieLegend(options.pieLegend);};$.jqplot.PieLegend.postDraw=function(){var plot=this;var legend=plot.plugins.pieLegend;if(!legend.show){return;}
 var series=plot.series[0];var angles=series._sliceAngles;var radius=series._diameter / 2;var center=series._center;var colors=this.seriesColors;var lineAngles=[];for(var i=0;i<angles.length;i++){lineAngles.push((angles[i][0]+angles[i][1])/ 2+Math.PI / 2);}
 var labels=[];var data=series._plotData;for(i=0;i<data.length;i++){labels.push(data[i][0]);}
 legend.pieLegendCanvas=new $.jqplot.GenericCanvas();plot.series[0].canvas._elem.before(legend.pieLegendCanvas.createElement(plot._gridPadding,'jqplot-pie-legend-canvas',plot._plotDimensions,plot));legend.pieLegendCanvas.setContext();var ctx=legend.pieLegendCanvas._ctx;ctx.save();ctx.font='11px '+require('piwik/UI').getLabelFontFamily()
@@ -2533,13 +2632,18 @@ ctx.beginPath();ctx.moveTo(x1,y1);ctx.lineTo(x2,y2);ctx.closePath();ctx.stroke()
 ctx.closePath();ctx.stroke();lastY2=y2;lastRight=right;if(right){var x=x2+9;}else{var x=x2-9-ctx.measureText(label).width;}
 ctx.fillStyle=legend.labelColor;ctx.fillText(label,x,y2+3);}
 ctx.restore();};$.jqplot.preInitHooks.push($.jqplot.PieLegend.init);$.jqplot.postDrawHooks.push($.jqplot.PieLegend.postDraw);})(jQuery,require);
-(function($,require){var exports=require('piwik/UI'),JqplotGraphDataTable=exports.JqplotGraphDataTable;exports.JqplotBarGraphDataTable=function(element){JqplotGraphDataTable.call(this,element);};$.extend(exports.JqplotBarGraphDataTable.prototype,JqplotGraphDataTable.prototype,{_setJqplotParameters:function(params){JqplotGraphDataTable.prototype._setJqplotParameters.call(this,params);this.jqplotParams.seriesDefaults={renderer:$.jqplot.BarRenderer,rendererOptions:{shadowOffset:1,shadowDepth:2,shadowAlpha:.2,fillToZero:true,barMargin:this.data[0].length>10?2:10}};this.jqplotParams.piwikTicks={showTicks:true,showGrid:false,showHighlight:false,tickColor:this.tickColor};this.jqplotParams.axes.xaxis.renderer=$.jqplot.CategoryAxisRenderer;this.jqplotParams.axes.xaxis.tickOptions={showGridline:false};this.jqplotParams.canvasLegend={show:true};},_bindEvents:function(){this.setYTicks();JqplotGraphDataTable.prototype._bindEvents.call(this);},_showDataPointTooltip:function(element,seriesIndex,valueIndex){var value=this.formatY(this.data[seriesIndex][valueIndex],seriesIndex);var series=this.jqplotParams.series[seriesIndex].label;var percentage='';if(typeof this.tooltip.percentages!='undefined'){percentage=this.tooltip.percentages[seriesIndex][valueIndex];percentage=' ('+NumberFormatter.formatPercent(percentage)+')';}
+(function($,require){var exports=require('piwik/UI'),JqplotGraphDataTable=exports.JqplotGraphDataTable;exports.JqplotBarGraphDataTable=function(element){JqplotGraphDataTable.call(this,element);};$.extend(exports.JqplotBarGraphDataTable.prototype,JqplotGraphDataTable.prototype,{_setJqplotParameters:function(params){JqplotGraphDataTable.prototype._setJqplotParameters.call(this,params);var barMargin=this.data[0].length>10?2:10;var minBarWidth=10;this.jqplotParams.seriesDefaults={renderer:$.jqplot.BarRenderer,rendererOptions:{shadowOffset:1,shadowDepth:2,shadowAlpha:.2,fillToZero:true,barMargin:barMargin}};this.jqplotParams.piwikTicks={showTicks:true,showGrid:false,showHighlight:false,tickColor:this.tickColor};this.jqplotParams.axes.xaxis.renderer=$.jqplot.CategoryAxisRenderer;this.jqplotParams.axes.xaxis.tickOptions={showGridline:false};this.jqplotParams.canvasLegend={show:true};var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');if(comparisonService.isComparing()){var seriesCount=this.jqplotParams.series.length;var dataCount=this.data[0].length;var totalBars=seriesCount*dataCount;var totalMinWidth=(minBarWidth+barMargin)*totalBars+50;this.$element.find('.piwik-graph').css('min-width',totalMinWidth+'px');this.$element.css('overflow-x','scroll');}},_bindEvents:function(){this.setYTicks();JqplotGraphDataTable.prototype._bindEvents.call(this);},_showDataPointTooltip:function(element,seriesIndex,valueIndex){var value=this.formatY(this.data[seriesIndex][valueIndex],seriesIndex);var series=this.jqplotParams.series[seriesIndex].label;var percentage='';if(typeof this.tooltip.percentages!='undefined'){percentage=this.tooltip.percentages[seriesIndex][valueIndex];percentage=' ('+NumberFormatter.formatPercent(percentage)+')';}
 var label=this.jqplotParams.axes.xaxis.labels[valueIndex];var text='<strong>'+value+'</strong> '+series+percentage;$(element).tooltip({track:true,items:'*',content:'<h3>'+label+'</h3>'+text,show:false,hide:false}).trigger('mouseover');}});})(jQuery,require);
 (function($,require){var exports=require('piwik/UI'),JqplotGraphDataTable=exports.JqplotGraphDataTable;exports.JqplotPieGraphDataTable=function(element){JqplotGraphDataTable.call(this,element);};$.extend(exports.JqplotPieGraphDataTable.prototype,JqplotGraphDataTable.prototype,{_setJqplotParameters:function(params){JqplotGraphDataTable.prototype._setJqplotParameters.call(this,params);this.jqplotParams.seriesDefaults={renderer:$.jqplot.PieRenderer,rendererOptions:{shadow:false,showDataLabels:false,sliceMargin:1,startAngle:35}};this.jqplotParams.piwikTicks={showTicks:false,showGrid:false,showHighlight:false,tickColor:this.tickColor};this.jqplotParams.legend={show:false};this.jqplotParams.pieLegend={show:true,labelColor:this.singleMetricColor};this.jqplotParams.canvasLegend={show:true,singleMetric:true,singleMetricColor:this.singleMetricColor};if(!(this.data[0][0]instanceof Array)){for(var i=0;i<this.data[0].length;i++){this.data[0][i]=[this.jqplotParams.axes.xaxis.ticks[i],this.data[0][i]];}}},_showDataPointTooltip:function(element,seriesIndex,valueIndex){var value=this.formatY(this.data[0][valueIndex][1],0);var series=this.jqplotParams.series[0].label;var percentage=this.tooltip.percentages[0][valueIndex];var label=this.data[0][valueIndex][0];var text='<strong>'+NumberFormatter.formatPercent(percentage)+'</strong> ('+value+' '+series+')';$(element).tooltip({track:true,items:'*',content:'<h3>'+label+'</h3>'+text,show:false,hide:false}).trigger('mouseover');}});})(jQuery,require);
 (function($,require){var exports=require('piwik/UI'),JqplotGraphDataTable=exports.JqplotGraphDataTable,JqplotGraphDataTablePrototype=JqplotGraphDataTable.prototype;exports.JqplotEvolutionGraphDataTable=function(element){JqplotGraphDataTable.call(this,element);};$.extend(exports.JqplotEvolutionGraphDataTable.prototype,JqplotGraphDataTablePrototype,{_setJqplotParameters:function(params){JqplotGraphDataTablePrototype._setJqplotParameters.call(this,params);var defaultParams={axes:{xaxis:{pad:1.0,renderer:$.jqplot.CategoryAxisRenderer,tickOptions:{showGridline:false}}},piwikTicks:{showTicks:true,showGrid:true,showHighlight:true,tickColor:this.tickColor}};if(this.props.show_line_graph){defaultParams.seriesDefaults={lineWidth:1,markerOptions:{style:"filledCircle",size:6,shadow:false}};}else{defaultParams.seriesDefaults={renderer:$.jqplot.BarRenderer,rendererOptions:{shadowOffset:1,shadowDepth:2,shadowAlpha:.2,fillToZero:true,barMargin:this.data[0].length>10?2:10}};}
-var overrideParams={legend:{show:false},canvasLegend:{show:true}};this.jqplotParams=$.extend(true,{},defaultParams,this.jqplotParams,overrideParams);},_bindEvents:function(){JqplotGraphDataTablePrototype._bindEvents.call(this);var self=this;var lastTick=false;$('#'+this.targetDivId).on('jqplotMouseLeave',function(e,s,i,d){$(this).css('cursor','default');JqplotGraphDataTablePrototype._destroyDataPointTooltip.call(this,$(this));}).on('jqplotClick',function(e,s,i,d){if(lastTick!==false&&typeof self.jqplotParams.axes.xaxis.onclick!='undefined'&&typeof self.jqplotParams.axes.xaxis.onclick[lastTick]=='string'){var url=self.jqplotParams.axes.xaxis.onclick[lastTick];broadcast.propagateNewPage(url);}}).on('jqplotPiwikTickOver',function(e,tick){lastTick=tick;var label;if(typeof self.jqplotParams.axes.xaxis.labels!='undefined'){label=self.jqplotParams.axes.xaxis.labels[tick];}else{label=self.jqplotParams.axes.xaxis.ticks[tick];}
-var text=[];for(var d=0;d<self.data.length;d++){var value=self.formatY(self.data[d][tick],d);var series=self.jqplotParams.series[d].label;text.push('<strong>'+value+'</strong> '+piwikHelper.htmlEntities(series));}
-var content='<h3>'+piwikHelper.htmlEntities(label)+'</h3>'+text.join('<br />');$(this).tooltip({track:true,items:'div',content:content,show:false,hide:false}).trigger('mouseover');if(typeof self.jqplotParams.axes.xaxis.onclick!='undefined'&&typeof self.jqplotParams.axes.xaxis.onclick[lastTick]=='string'){$(this).css('cursor','pointer');}});this.setYTicks();},_destroyDataPointTooltip:function(){},render:function(){JqplotGraphDataTablePrototype.render.call(this);if(initializeSparklines){initializeSparklines();}}});})(jQuery,require);
+var overrideParams={legend:{show:false},canvasLegend:{show:true}};this.jqplotParams=$.extend(true,{},defaultParams,this.jqplotParams,overrideParams);},_bindEvents:function(){JqplotGraphDataTablePrototype._bindEvents.call(this);var self=this;var lastTick=false;$('#'+this.targetDivId).on('jqplotMouseLeave',function(e,s,i,d){$(this).css('cursor','default');JqplotGraphDataTablePrototype._destroyDataPointTooltip.call(this,$(this));}).on('jqplotClick',function(e,s,i,d){if(lastTick!==false&&typeof self.jqplotParams.axes.xaxis.onclick!='undefined'&&typeof self.jqplotParams.axes.xaxis.onclick[lastTick]=='string'){var url=self.jqplotParams.axes.xaxis.onclick[lastTick];broadcast.propagateNewPage(url);}}).on('jqplotPiwikTickOver',function(e,tick){lastTick=tick;var label;var dataByAxis={};for(var d=0;d<self.data.length;++d){var valueUnformatted=self.data[d][tick];if(typeof valueUnformatted==='undefined'||valueUnformatted===null){continue;}
+var axis=self.jqplotParams.series[d]._xaxis||'xaxis';if(!dataByAxis[axis]){dataByAxis[axis]=[];}
+var value=self.formatY(valueUnformatted,d);var series=self.jqplotParams.series[d].label;var seriesColor=self.jqplotParams.seriesColors[d];dataByAxis[axis].push('<span class="tooltip-series-color" style="background-color: '+seriesColor+';"/>'+'<strong>'+value+'</strong> '+piwikHelper.htmlEntities(series));}
+var xAxisCount=0;Object.keys(self.jqplotParams.axes).forEach(function(axis){if(axis.substring(0,1)==='x'){++xAxisCount;}});var content='';for(var i=0;i<xAxisCount;++i){var axisName=i===0?'xaxis':'x'+(i+1)+'axis';if(!dataByAxis[axisName]||!dataByAxis[axisName].length){continue;}
+if(typeof self.jqplotParams.axes[axisName].labels!='undefined'){label=self.jqplotParams.axes[axisName].labels[tick];}else{label=self.jqplotParams.axes[axisName].ticks[tick];}
+if(typeof label==='undefined'){continue;}
+content+='<h3 class="evolution-tooltip-header">'+piwikHelper.htmlEntities(label)+'</h3>'+dataByAxis[axisName].join('<br />');}
+$(this).tooltip({track:true,items:'div',content:content,show:false,hide:false}).trigger('mouseover');if(typeof self.jqplotParams.axes.xaxis.onclick!='undefined'&&typeof self.jqplotParams.axes.xaxis.onclick[lastTick]=='string'){$(this).css('cursor','pointer');}});this.setYTicks();},_destroyDataPointTooltip:function(){},render:function(){JqplotGraphDataTablePrototype.render.call(this);if(initializeSparklines){initializeSparklines();}}});})(jQuery,require);
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -2552,18 +2656,19 @@ broadcast.propagateNewPopoverParameter('RowAction',value);};DataTable_RowActions
 DataTable_RowActions_Transitions.prototype.trigger=function(tr,e,subTableLabel){var i=0;for(i;i<DataTable_RowActions_Transitions.registeredReports.length;i++){var report=DataTable_RowActions_Transitions.registeredReports[i];if(report&&report.trigger&&report.isAvailableOnReport&&report.isAvailableOnReport(this.dataTable.param)){report.trigger.apply(this,arguments);return;}}
 alert('Transitions can\'t be used on this report.');};DataTable_RowActions_Transitions.prototype.performAction=function(label,tr,e){var separator=' > ';var labelParts=label.split(separator);for(var i=0;i<labelParts.length;i++){var labelPart=labelParts[i].replace('@','');labelParts[i]=$.trim(decodeURIComponent(labelPart));}
 var delimiter=piwik.config.action_url_category_delimiter;if(this.dataTable.param.action.indexOf('PageTitles')!==false){delimiter=piwik.config.action_title_category_delimiter;}
-label=labelParts.join(delimiter);this.openPopover('title:'+label);};DataTable_RowActions_Transitions.prototype.doOpenPopover=function(link){var posSegment=(link+'').indexOf(':segment:');var segment=null;if(posSegment&&posSegment>0){segment=link.substring(posSegment+(':segment:'.length));link=link.substring(0,posSegment);}
-var parts=link.split(':');if(parts.length<2){return;}
-var actionType=parts[0];parts.shift();var actionName=parts.join(':');if(this.transitions===null){this.transitions=new Piwik_Transitions(actionType,actionName,this,segment);}else{this.transitions.reset(actionType,actionName,segment);}
+label=labelParts.join(delimiter);this.openPopover('title:'+label);};DataTable_RowActions_Transitions.prototype.doOpenPopover=function(link){var ALLOWED_OVERRIDE_PARAMS=['segment','date','period','idSite'];var parts=link.split(':');var overrideParams={};var i=0;while(i<parts.length){var paramName=decodeURIComponent(parts[i]);if(ALLOWED_OVERRIDE_PARAMS.indexOf(paramName)===-1){i+=1;continue;}
+overrideParams[paramName]=decodeURIComponent(parts[i+1]);parts.splice(i,2);}
+if(parts.length<2){return;}
+var actionType=parts[0];parts.shift();var actionName=parts.join(':');if(this.transitions===null){this.transitions=new Piwik_Transitions(actionType,actionName,this,overrideParams);}else{this.transitions.reset(actionType,actionName,segment);}
 this.transitions.showPopover();};DataTable_RowActions_Registry.register({name:'Transitions',dataTableIcon:'icon-transition',order:20,dataTableIconTooltip:[_pk_translate('General_TransitionsRowActionTooltipTitle'),_pk_translate('General_TransitionsRowActionTooltip')],createInstance:function(dataTable){return new DataTable_RowActions_Transitions(dataTable);},isAvailableOnReport:function(dataTableParams){var i=0;for(i;i<DataTable_RowActions_Transitions.registeredReports.length;i++){var report=DataTable_RowActions_Transitions.registeredReports[i];if(report&&report.isAvailableOnReport&&report.isAvailableOnReport(dataTableParams)){return true;}}
 return false;},isAvailableOnRow:function(dataTableParams,tr){if(tr.hasClass('subDataTable')||tr.hasClass('totalsRow')){return false;}
 var i=0;for(i;i<DataTable_RowActions_Transitions.registeredReports.length;i++){var report=DataTable_RowActions_Transitions.registeredReports[i];if(report&&report.isAvailableOnRow&&report.isAvailableOnReport&&report.isAvailableOnReport(dataTableParams)){return report.isAvailableOnRow(dataTableParams,tr);}}
-return true;}});function Piwik_Transitions(actionType,actionName,rowAction,segment){this.reset(actionType,actionName,segment);this.rowAction=rowAction;this.ajax=new Piwik_Transitions_Ajax();this.model=new Piwik_Transitions_Model(this.ajax);this.leftGroups=['previousPages','previousSiteSearches','searchEngines','socialNetworks','websites','campaigns'];this.rightGroups=['followingPages','followingSiteSearches','downloads','outlinks'];}
-Piwik_Transitions.prototype.reset=function(actionType,actionName,segment){this.actionType=actionType;this.actionName=actionName;this.segment=segment;this.popover=null;this.canvas=null;this.centerBox=null;this.leftOpenGroup='previousPages';this.rightOpenGroup='followingPages';this.highlightedGroup=false;this.highlightedGroupSide=false;this.highlightedGroupCenterEl=false;};Piwik_Transitions.prototype.showPopover=function(showEmbeddedInReport){var self=this;this.showEmbeddedInReport=showEmbeddedInReport;$('#transitions_report .popoverContainer').hide();if(showEmbeddedInReport){this.popover=$('#transitions_report');$('#Transitions_Error_Container').hide();$('#transitions_inline_loading').show();}else{this.popover=Piwik_Popover.showLoading('Transitions',self.actionName,550);Piwik_Popover.addHelpButton('https://matomo.org/docs/transitions');}
+return true;}});function Piwik_Transitions(actionType,actionName,rowAction,overrideParams){this.reset(actionType,actionName,overrideParams);this.rowAction=rowAction;this.ajax=new Piwik_Transitions_Ajax();this.model=new Piwik_Transitions_Model(this.ajax);this.leftGroups=['previousPages','previousSiteSearches','searchEngines','socialNetworks','websites','campaigns'];this.rightGroups=['followingPages','followingSiteSearches','downloads','outlinks'];}
+Piwik_Transitions.prototype.reset=function(actionType,actionName,overrideParams){this.actionType=actionType;this.actionName=actionName;this.overrideParams=overrideParams;this.popover=null;this.canvas=null;this.centerBox=null;this.leftOpenGroup='previousPages';this.rightOpenGroup='followingPages';this.highlightedGroup=false;this.highlightedGroupSide=false;this.highlightedGroupCenterEl=false;};Piwik_Transitions.prototype.showPopover=function(showEmbeddedInReport){var self=this;this.showEmbeddedInReport=showEmbeddedInReport;$('#transitions_report .popoverContainer').hide();if(showEmbeddedInReport){this.popover=$('#transitions_report');$('#Transitions_Error_Container').hide();$('#transitions_inline_loading').show();}else{this.popover=Piwik_Popover.showLoading('Transitions',self.actionName,550);Piwik_Popover.addHelpButton('https://matomo.org/docs/transitions');}
 var bothLoaded=function(){if(!showEmbeddedInReport){Piwik_Popover.setContent(Piwik_Transitions.popoverHtml);}else{$('#transitions_inline_loading').hide();$('#transitions_report .popoverContainer').html(Piwik_Transitions.popoverHtml);$('#transitions_report .popoverContainer').show();}
 self.preparePopover();self.model.htmlLoaded();if(self.model.searchEnginesNbTransitions>0&&self.model.websitesNbTransitions>0&&self.model.socialNetworksNbTransitions>0&&self.model.campaignsNbTransitions>0){self.canvas.narrowMode();}
 self.render();self.canvas.truncateVisibleBoxTexts();};var callbackForHtml=false;if(typeof Piwik_Transitions.popoverHtml=='undefined'){this.ajax.callTransitionsController('renderPopover',function(html){Piwik_Transitions.popoverHtml=html;if(callbackForHtml!==false){callbackForHtml();}});}
-self.model.loadData(self.actionType,self.actionName,self.segment,function(){if(typeof Piwik_Transitions.popoverHtml=='undefined'){callbackForHtml=bothLoaded;}else{bothLoaded();}});};Piwik_Transitions.prototype.preparePopover=function(){var self=this;var width=900;var height=550;var canvasBgLeft=self.prepareCanvas('Background_Left',width,height);var canvasBgRight=self.prepareCanvas('Background_Right',width,height);var canvasLeft=self.prepareCanvas('Left',width,height);var canvasRight=self.prepareCanvas('Right',width,height);var canvasLoops=self.prepareCanvas('Loops',width,height);self.canvas=new Piwik_Transitions_Canvas(canvasBgLeft,canvasBgRight,canvasLeft,canvasRight,canvasLoops,width,height);self.centerBox=self.popover.find('#Transitions_CenterBox');var title=self.actionName;if(self.actionType=='url'){title=Piwik_Transitions_Util.shortenUrl(title,true);}
+self.model.loadData(self.actionType,self.actionName,self.overrideParams,function(){if(typeof Piwik_Transitions.popoverHtml=='undefined'){callbackForHtml=bothLoaded;}else{bothLoaded();}});};Piwik_Transitions.prototype.preparePopover=function(){var self=this;var width=900;var height=550;var canvasBgLeft=self.prepareCanvas('Background_Left',width,height);var canvasBgRight=self.prepareCanvas('Background_Right',width,height);var canvasLeft=self.prepareCanvas('Left',width,height);var canvasRight=self.prepareCanvas('Right',width,height);var canvasLoops=self.prepareCanvas('Loops',width,height);self.canvas=new Piwik_Transitions_Canvas(canvasBgLeft,canvasBgRight,canvasLeft,canvasRight,canvasLoops,width,height);self.centerBox=self.popover.find('#Transitions_CenterBox');var title=self.actionName;if(self.actionType=='url'){title=Piwik_Transitions_Util.shortenUrl(title,true);}
 var h2=self.centerBox.find('h2');var textContainer=h2;if(self.actionType=='url'){var a=$(document.createElement('a'));a.attr('href',self.actionName);a.attr('rel','noreferrer noopener');a.attr('target','_blank');h2.append(a);textContainer=a;}
 textContainer.addClass('Transitions_ApplyTextAndTruncate').data('text',title).data('maxLines',3);var element=textContainer.add(self.popover.find('p.Transitions_Pageviews'));element.tooltip({track:true,content:function(){var totalNbPageviews=self.model.getTotalNbPageviews();if(totalNbPageviews>0){var share=NumberFormatter.formatPercent(Math.round(self.model.pageviews / totalNbPageviews*1000)/ 10);var text=Piwik_Transitions_Translations.ShareOfAllPageviews;text=sprintf(text,NumberFormatter.formatNumber(self.model.pageviews),share);text+='<br /><em>'+Piwik_Transitions_Translations.DateRange+' '+self.model.date+'</em>';var title='<h3>'+piwikHelper.addBreakpointsToUrl(self.actionName)+'</h3>';return title+text;}
 return false;},items:'*',tooltipClass:'Transitions_Tooltip_Small',show:false,hide:false});};Piwik_Transitions.prototype.prepareCanvas=function(canvasId,width,height){canvasId='Transitions_Canvas_'+canvasId;var div=$('#'+canvasId).width(width).height(height);var canvas;if(typeof Piwik_Transitions.canvasCache=='undefined'||typeof window.G_vmlCanvasManager!="undefined"){Piwik_Transitions.canvasCache={};}
@@ -2614,7 +2719,7 @@ if(params.side=='left'){this.leftBoxPositionY+=boxHeight+this.boxSpacing;this.le
 this.contextLoops.clearRect(0,0,this.width,this.height);if(side=='left'){if(!onlyBg){this.container.find('.Transitions_BoxTextLeft').remove();this.container.find('.Transitions_CurveTextLeft').remove();}
 this.leftBoxPositionY=this.originalBoxPositionY;this.leftCurvePositionY=this.originalCurvePositionY;}else{if(!onlyBg){this.container.find('.Transitions_BoxTextRight').remove();this.container.find('.Transitions_CurveTextRight').remove();}
 this.rightBoxPositionY=this.originalBoxPositionY;this.rightCurvePositionY=this.originalCurvePositionY;}};function Piwik_Transitions_Model(ajax){this.ajax=ajax;this.groupTitles={};}
-Piwik_Transitions_Model.prototype.htmlLoaded=function(){this.groupTitles.previousPages=Piwik_Transitions_Translations.fromPreviousPages;this.groupTitles.previousSiteSearches=Piwik_Transitions_Translations.fromPreviousSiteSearches;this.groupTitles.followingPages=Piwik_Transitions_Translations.toFollowingPages;this.groupTitles.followingSiteSearches=Piwik_Transitions_Translations.toFollowingSiteSearches;this.groupTitles.outlinks=Piwik_Transitions_Translations.outlinks;this.groupTitles.downloads=Piwik_Transitions_Translations.downloads;this.shareInGroupTexts={previousPages:Piwik_Transitions_Translations.fromPreviousPagesInline,previousSiteSearches:Piwik_Transitions_Translations.fromPreviousSiteSearchesInline,followingPages:Piwik_Transitions_Translations.toFollowingPagesInline,followingSiteSearches:Piwik_Transitions_Translations.toFollowingSiteSearchesInline,searchEngines:Piwik_Transitions_Translations.fromSearchEnginesInline,socialNetworks:Piwik_Transitions_Translations.fromSocialNetworksInline,websites:Piwik_Transitions_Translations.fromWebsitesInline,campaigns:Piwik_Transitions_Translations.fromCampaignsInline,outlinks:Piwik_Transitions_Translations.outlinksInline,downloads:Piwik_Transitions_Translations.downloadsInline};};Piwik_Transitions_Model.prototype.loadData=function(actionType,actionName,segment,callback){var self=this;this.pageviews=0;this.exits=0;this.loops=0;this.directEntries=0;this.searchEnginesNbTransitions=0;this.searchEngines=[];this.socialNetworksNbTransitions=0;this.socialNetworks=[];this.websitesNbTransitions=0;this.websites=[];this.campaignsNbTransitions=0;this.campaigns=[];this.previousPagesNbTransitions=0;this.previousPages=[];this.followingPagesNbTransitions=0;this.followingPages=[];this.downloadsNbTransitions=0;this.downloads=[];this.outlinksNbTransitions=0;this.outlinks=[];this.previousSiteSearchesNbTransitions=0;this.previousSiteSearches=[];this.followingSiteSearchesNbTransitions=0;this.followingSiteSearches=[];this.date='';var params={actionType:actionType,actionName:actionName,expanded:1};if(segment){params.segment=segment;}
+Piwik_Transitions_Model.prototype.htmlLoaded=function(){this.groupTitles.previousPages=Piwik_Transitions_Translations.fromPreviousPages;this.groupTitles.previousSiteSearches=Piwik_Transitions_Translations.fromPreviousSiteSearches;this.groupTitles.followingPages=Piwik_Transitions_Translations.toFollowingPages;this.groupTitles.followingSiteSearches=Piwik_Transitions_Translations.toFollowingSiteSearches;this.groupTitles.outlinks=Piwik_Transitions_Translations.outlinks;this.groupTitles.downloads=Piwik_Transitions_Translations.downloads;this.shareInGroupTexts={previousPages:Piwik_Transitions_Translations.fromPreviousPagesInline,previousSiteSearches:Piwik_Transitions_Translations.fromPreviousSiteSearchesInline,followingPages:Piwik_Transitions_Translations.toFollowingPagesInline,followingSiteSearches:Piwik_Transitions_Translations.toFollowingSiteSearchesInline,searchEngines:Piwik_Transitions_Translations.fromSearchEnginesInline,socialNetworks:Piwik_Transitions_Translations.fromSocialNetworksInline,websites:Piwik_Transitions_Translations.fromWebsitesInline,campaigns:Piwik_Transitions_Translations.fromCampaignsInline,outlinks:Piwik_Transitions_Translations.outlinksInline,downloads:Piwik_Transitions_Translations.downloadsInline};};Piwik_Transitions_Model.prototype.loadData=function(actionType,actionName,overrideParams,callback){var self=this;this.pageviews=0;this.exits=0;this.loops=0;this.directEntries=0;this.searchEnginesNbTransitions=0;this.searchEngines=[];this.socialNetworksNbTransitions=0;this.socialNetworks=[];this.websitesNbTransitions=0;this.websites=[];this.campaignsNbTransitions=0;this.campaigns=[];this.previousPagesNbTransitions=0;this.previousPages=[];this.followingPagesNbTransitions=0;this.followingPages=[];this.downloadsNbTransitions=0;this.downloads=[];this.outlinksNbTransitions=0;this.outlinks=[];this.previousSiteSearchesNbTransitions=0;this.previousSiteSearches=[];this.followingSiteSearchesNbTransitions=0;this.followingSiteSearches=[];this.date='';var params={actionType:actionType,actionName:actionName,expanded:1};if(overrideParams){$.extend(params,overrideParams);}
 this.ajax.callApi('Transitions.getTransitionsForAction',params,function(report){self.date=report.date;self.pageviews=report.pageMetrics.pageviews;self.loops=report.pageMetrics.loops;self.exits=report.pageMetrics.exits;for(var i=0;i<report.referrers.length;i++){var referrer=report.referrers[i];if(referrer.shortName=='direct'){self.directEntries=referrer.visits;}else if(referrer.shortName=='search'){self.searchEnginesNbTransitions=referrer.visits;self.searchEngines=referrer.details;self.groupTitles.searchEngines=referrer.label;}else if(referrer.shortName=='social'){self.socialNetworksNbTransitions=referrer.visits;self.socialNetworks=referrer.details;self.groupTitles.socialNetworks=referrer.label;}else if(referrer.shortName=='website'){self.websitesNbTransitions=referrer.visits;self.websites=referrer.details;self.groupTitles.websites=referrer.label;}else if(referrer.shortName=='campaign'){self.campaignsNbTransitions=referrer.visits;self.campaigns=referrer.details;self.groupTitles.campaigns=referrer.label;}}
 self.loadAndSumReport(report,'previousPages');self.loadAndSumReport(report,'previousSiteSearches');self.loadAndSumReport(report,'followingPages');self.loadAndSumReport(report,'followingSiteSearches');self.loadAndSumReport(report,'downloads');self.loadAndSumReport(report,'outlinks');if(typeof Piwik_Transitions_Model.totalNbPageviews=='undefined'){Piwik_Transitions_Model.totalNbPageviews=false;self.ajax.loadTotalNbPageviews(function(nbPageviews){Piwik_Transitions_Model.totalNbPageviews=nbPageviews;});}
 callback();});};Piwik_Transitions_Model.prototype.loadAndSumReport=function(apiData,reportName){var data=this[reportName]=apiData[reportName];var sumVarName=reportName+'NbTransitions';this[sumVarName]=0;for(var i=0;i<data.length;i++){this[sumVarName]+=data[i].referrals;}};Piwik_Transitions_Model.prototype.getTotalNbPageviews=function(){if(typeof Piwik_Transitions_Model.totalNbPageviews=='undefined'){return false;}
@@ -2626,7 +2731,8 @@ return data;};Piwik_Transitions_Model.prototype.roundPercentage=function(value){
 Piwik_Transitions_Ajax.prototype.loadTotalNbPageviews=function(callback){this.callApi('Actions.get',{columns:'nb_pageviews'},function(response){var value=typeof response.value!='undefined'?response.value:false;callback(value);});};Piwik_Transitions_Ajax.prototype.callTransitionsController=function(action,callback){var ajaxRequest=new ajaxHelper();ajaxRequest.addParams({module:'Transitions',action:action},'get');ajaxRequest.setCallback(callback);ajaxRequest.setFormat('html');ajaxRequest.send();};Piwik_Transitions_Ajax.prototype.callApi=function(method,params,callback){var self=this;params.format='JSON';params.module='API';params.method=method;params.filter_limit='-1';var ajaxRequest=new ajaxHelper();ajaxRequest.addParams(params,'get');ajaxRequest.useCallbackInCaseOfError();ajaxRequest.setCallback(function(result){if(typeof result.result!='undefined'&&result.result=='error'){var errorName=result.message;var showError=function(){var errorTitle,errorMessage,errorBack;if(typeof Piwik_Transitions_Translations[errorName]=='undefined'){errorTitle='Exception';errorMessage=errorName;errorBack='<<<';}else{errorTitle=Piwik_Transitions_Translations[errorName];errorMessage=Piwik_Transitions_Translations[errorName+'Details'];errorBack=Piwik_Transitions_Translations[errorName+'Back'];}
 if(typeof params.actionName!='undefined'){var url=params.actionName;url=piwikHelper.addBreakpointsToUrl(url);errorTitle=sprintf(errorTitle,'<span>'+url+'</span>');}
 errorMessage=sprintf(errorMessage,'<br />');var inlineErrorNode=$('#Transitions_Error_Container');if(inlineErrorNode.length){inlineErrorNode.html('');var theContentNode=$(document.createElement('div')).addClass('Piwik_Popover_Error');var p=$(document.createElement('p')).addClass('Piwik_Popover_Error_Title');theContentNode.append(p.html(errorTitle));if(errorMessage){p=$(document.createElement('p')).addClass('Piwik_Popover_Error_Message');theContentNode.append(p.html(errorMessage));}
-inlineErrorNode.append(theContentNode);inlineErrorNode.show();$('#transitions_report .popoverContainer').hide();}else{Piwik_Popover.showError(errorTitle,errorMessage,errorBack);}};if(typeof Piwik_Transitions_Translations=='undefined'){self.callApi('Transitions.getTranslations',{},function(response){if(typeof response[0]=='object'){Piwik_Transitions_Translations=response[0];}else{Piwik_Transitions_Translations={};}
+inlineErrorNode.append(theContentNode);inlineErrorNode.show();$('#transitions_report .popoverContainer').hide();}else{Piwik_Popover.showError(errorTitle,errorMessage,errorBack);}
+$('#transitions_inline_loading').hide();};if(typeof Piwik_Transitions_Translations=='undefined'){self.callApi('Transitions.getTranslations',{},function(response){if(typeof response[0]=='object'){Piwik_Transitions_Translations=response[0];}else{Piwik_Transitions_Translations={};}
 showError();});}else{showError();}}
 else{callback(result);}});ajaxRequest.send();};Piwik_Transitions_Util={shortenUrl:function(url,removeDomain){if(url=='Others'){return url;}
 var urlBackup=url;url=url.replace(/http(s)?:\/\/(www\.)?/,'');if(urlBackup==url){return url;}
@@ -2694,9 +2800,10 @@ function setImagePlus(domElem){$('img.plusMinus',domElem).attr('src','plugins/Mo
 exports.ActionsDataTable=function(element){this.parentAttributeParent='';this.parentId='';this.disabledRowDom={};DataTable.call(this,element);};$.extend(exports.ActionsDataTable.prototype,dataTablePrototype,{bindEventsAndApplyStyle:function(domElem,rows){var self=this;self.cleanParams();self.preBindEventsAndApplyStyleHook(domElem,rows);if(!rows){rows=$('tr',domElem);}
 if(!self.param.filter_pattern_recursive){self.numberOfSubtables=rows.filter('.subDataTable').click(function(){self.onClickActionSubDataTable(this)}).length;}
 self.applyCosmetics(domElem,rows);self.handleColumnHighlighting(domElem);self.handleRowActions(domElem,rows);self.handleLimit(domElem);self.handlePeriod(domElem);self.handleAnnotationsButton(domElem);self.handleExportBox(domElem);self.handleSort(domElem);self.handleOffsetInformation(domElem);if(self.workingDivId!=undefined){var dataTableLoadedProxy=function(response){self.dataTableLoaded(response,self.workingDivId);};self.handleConfigurationBox(domElem,dataTableLoadedProxy);self.handleSearchBox(domElem,dataTableLoadedProxy);}
-self.handleColumnDocumentation(domElem);self.handleRelatedReports(domElem);self.handleTriggeredEvents(domElem);self.handleCellTooltips(domElem);self.setFixWidthToMakeEllipsisWork(domElem);self.handleSummaryRow(domElem);self.openSubtableFromLevel0IfOnlyOneSubtableGiven(domElem);self.postBindEventsAndApplyStyleHook(domElem,rows);},openSubtableFromLevel0IfOnlyOneSubtableGiven:function(domElem){var $subtables=domElem.find('.subDataTable');var hasOnlyOneSubtable=$subtables.length===1;if(hasOnlyOneSubtable){var hasOnlyOneRow=domElem.find('tbody tr.level0').length===1;if(hasOnlyOneRow){var $labels=$subtables.find('.label');if($labels.length){$labels.first().click();}}}},openSubtableFromSubtableIfOnlyOneSubtableGiven:function(domElem){var hasOnlyOneRow=domElem.length===1;var hasOnlyOneSubtable=domElem.hasClass('subDataTable');if(hasOnlyOneRow&&hasOnlyOneSubtable){var $labels=domElem.find('.label');if($labels.length){$labels.first().click();}}},applyCosmetics:function(domElem,rows){var self=this;var rowsWithSubtables=rows.filter('.subDataTable');rowsWithSubtables.css('font-weight','bold');$("th:first-child",domElem).addClass('label');var imagePlusMinusWidth=12;var imagePlusMinusHeight=12;$('td:first-child',rowsWithSubtables).each(function(){$(this).prepend('<img width="'+imagePlusMinusWidth+'" height="'+imagePlusMinusHeight+'" class="plusMinus" src="" />');if(self.param.filter_pattern_recursive){setImageMinus(this);}
+self.handleColumnDocumentation(domElem);self.handleRelatedReports(domElem);self.handleTriggeredEvents(domElem);self.handleCellTooltips(domElem);self.setFixWidthToMakeEllipsisWork(domElem);self.handleSummaryRow(domElem);self.openSubtableFromLevel0IfOnlyOneSubtableGiven(domElem);self.postBindEventsAndApplyStyleHook(domElem,rows);},openSubtableFromLevel0IfOnlyOneSubtableGiven:function(domElem){var $subtables=domElem.find('.subDataTable');var hasOnlyOneSubtable=$subtables.length===1;if(hasOnlyOneSubtable){var hasOnlyOneRow=domElem.find('tbody tr.level0').length===1;if(hasOnlyOneRow){var $labels=$subtables.find('.label');if($labels.length){$labels.first().click();}}}},openSubtableFromSubtableIfOnlyOneSubtableGiven:function(domElem){var hasOnlyOneRow=domElem.length===1;var hasOnlyOneSubtable=domElem.hasClass('subDataTable');if(hasOnlyOneRow&&hasOnlyOneSubtable){var $labels=domElem.find('.label');if($labels.length){$labels.first().click();}}},applyCosmetics:function(domElem,rows){var self=this;var rowsWithSubtables=rows.filter('.subDataTable');rowsWithSubtables.css('font-weight','bold');$("th:first-child",domElem).addClass('label');var imagePlusMinusWidth=12;var imagePlusMinusHeight=12;$('td:first-child',rowsWithSubtables).each(function(){$('<img width="'+imagePlusMinusWidth+'" height="'+imagePlusMinusHeight+'" class="plusMinus" src="" />').insertBefore($(this).children('.label'));if(self.param.filter_pattern_recursive){setImageMinus(this);}
 else{setImagePlus(this);}});var rootRow=rows.first().prev();var level=rootRow.length?getLevelFromClass(rootRow.attr('class'))+1:0;rows.each(function(){var currentStyle=$(this).attr('class')||'';if(currentStyle.indexOf('level')==-1){$(this).addClass('level'+level);}
-$(this).prop('parent',function(){return self.parentAttributeParent+' '+self.parentId;});});self.addOddAndEvenClasses(domElem);},addOddAndEvenClasses:function(domElem){$("tr:not(.hidden) td:first-child",domElem).addClass('label');$("tr:not(.hidden) td",domElem).slice(1).addClass('column');},handleRowActions:function(domElem,rows){this.doHandleRowActions(rows);},onClickActionSubDataTable:function(domElem){var self=this;var idSubTable=$(domElem).attr('id');var divIdToReplaceWithSubTable='subDataTable_'+idSubTable;var NextStyle=$(domElem).next().attr('class');var CurrentStyle=$(domElem).attr('class');var currentRowLevel=getLevelFromClass(CurrentStyle);var nextRowLevel=getLevelFromClass(NextStyle);if(currentRowLevel>=nextRowLevel){$(domElem).off('click');self.disabledRowDom=$(domElem);var numberOfColumns=$(domElem).children().length;$(domElem).after('                <tr id="'+divIdToReplaceWithSubTable+'" class="cellSubDataTable">                    <td colspan="'+numberOfColumns+'">                            <span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" /> Loading...</span>                    </td>                </tr>                ');var savedActionVariable=self.param.action;var filtersToRestore=self.resetAllFilters();this.param['filter_sort_column']=filtersToRestore['filter_sort_column'];this.param['filter_sort_order']=filtersToRestore['filter_sort_order'];this.param['enable_filter_excludelowpop']=filtersToRestore['enable_filter_excludelowpop'];self.param.idSubtable=idSubTable;self.param.action=self.props.subtable_controller_action;self.reloadAjaxDataTable(false,function(resp){self.actionsSubDataTableLoaded(resp,idSubTable);self.repositionRowActions($(domElem));});self.param.action=savedActionVariable;self.restoreAllFilters(filtersToRestore);delete self.param.idSubtable;}
+$(this).prop('parent',function(){return self.parentAttributeParent+' '+self.parentId;});});self.addOddAndEvenClasses(domElem);},addOddAndEvenClasses:function(domElem){},handleRowActions:function(domElem,rows){this.doHandleRowActions(rows);},onClickActionSubDataTable:function(domElem){var self=this;var idSubTable=$(domElem).attr('id');var divIdToReplaceWithSubTable='subDataTable_'+idSubTable;var $insertAfter=$(domElem).nextUntil(':not(.comparePeriod):not(.comparisonRow)').last();if(!$insertAfter.length){$insertAfter=$(domElem);}
+var NextStyle=$insertAfter.next().attr('class');var CurrentStyle=$(domElem).attr('class');var currentRowLevel=getLevelFromClass(CurrentStyle);var nextRowLevel=getLevelFromClass(NextStyle);if(currentRowLevel>=nextRowLevel){$(domElem).off('click');self.disabledRowDom=$(domElem);var numberOfColumns=$(domElem).children().length;$insertAfter.after('                <tr id="'+divIdToReplaceWithSubTable+'" class="cellSubDataTable">                    <td colspan="'+numberOfColumns+'">                            <span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" /> Loading...</span>                    </td>                </tr>                ');var savedActionVariable=self.param.action;var filtersToRestore=self.resetAllFilters();this.param['filter_sort_column']=filtersToRestore['filter_sort_column'];this.param['filter_sort_order']=filtersToRestore['filter_sort_order'];this.param['enable_filter_excludelowpop']=filtersToRestore['enable_filter_excludelowpop'];self.param.idSubtable=idSubTable;self.param.action=self.props.subtable_controller_action;var extraParams={};extraParams.comparisonIdSubtables=self.getComparisonIdSubtables($(domElem));self.reloadAjaxDataTable(false,function(resp){self.actionsSubDataTableLoaded(resp,idSubTable);self.repositionRowActions($(domElem));},extraParams);self.param.action=savedActionVariable;self.restoreAllFilters(filtersToRestore);delete self.param.idSubtable;}
 else{var plusDetected=$('td img.plusMinus',domElem).attr('src').indexOf('plus')>=0;$(domElem).siblings().each(function(){var parents=$(this).prop('parent').split(' ');if(parents){if(parents.indexOf(idSubTable)>=0||parents.indexOf('subDataTable_'+idSubTable)>=0){if(plusDetected){$(this).css('display','').removeClass('hidden');var NextStyle=$(this).next().attr('class');var CurrentStyle=$(this).attr('class');var currentRowLevel=getLevelFromClass(CurrentStyle);var nextRowLevel=getLevelFromClass(NextStyle);if(currentRowLevel<nextRowLevel)
 setImageMinus(this);}
 else{$(this).css('display','none').addClass('hidden');}
@@ -2707,9 +2814,13 @@ else{setImagePlus(domElem);}},dataTableLoaded:function(response,workingDivId){va
 var re=/subDataTable_(\d+)/;var ok=re.exec(self.parentId);if(ok){self.parentId=ok[1];}
 self.bindEventsAndApplyStyle($('#'+self.workingDivId),response);self.$element.trigger('piwik:actionsSubDataTableLoaded');self.disabledRowDom.click(function(){self.onClickActionSubDataTable(this)});self.openSubtableFromSubtableIfOnlyOneSubtableGiven(response);}});})(jQuery,require);
 $(function(){function isActionsModule(params){return params.module=='Actions';}
-function isPageUrlReport(params){var action=params.action;return isActionsModule(params)&&(action=='getPageUrls'||action=='getEntryPageUrls'||action=='getExitPageUrls'||action=='getPageUrlsFollowingSiteSearch');};function isPageTitleReport(params){var action=params.action;return isActionsModule(params)&&(action=='getPageTitles'||action=='getPageTitlesFollowingSiteSearch');};function getLinkForTransitionAndOverlayPopover(tr){var link=tr.find('> td:first > a').attr('href');link=$('<textarea>').html(link).val();return 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]);}});}
-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}}});}});
+function isPageUrlReport(params){var action=params.action;return isActionsModule(params)&&(action=='getPageUrls'||action=='getEntryPageUrls'||action=='getExitPageUrls'||action=='getPageUrlsFollowingSiteSearch');};function isPageTitleReport(params){var action=params.action;return isActionsModule(params)&&(action=='getPageTitles'||action=='getPageTitlesFollowingSiteSearch');};function getLinkForTransitionAndOverlayPopover(tr){tr=getRealRowIfComparisonRow(tr);var link=tr.find('> td:first > a').attr('href');link=$('<textarea>').html(link).val();return link;}
+if(window.DataTable_RowActions_Transitions){DataTable_RowActions_Transitions.registerReport({isAvailableOnReport:function(dataTableParams){return isPageUrlReport(dataTableParams);},isAvailableOnRow:function(dataTableParams,tr){tr=getRealRowIfComparisonRow(tr);return isPageUrlReport(dataTableParams)&&tr.find('> td:first span.label').parent().is('a')},trigger:function(tr,e,subTableLabel,originalRow){var overrideParams=$.extend({},$(originalRow||tr).data('param-override'));if(typeof overrideParams!=='object'){overrideParams={};}
+tr=getRealRowIfComparisonRow(tr);var link=getLinkForTransitionAndOverlayPopover(tr);var popoverUrl='url:'+link;Object.keys(overrideParams).forEach(function(paramName){if(!overrideParams[paramName]){return;}
+popoverUrl+=':'+encodeURIComponent(paramName)+':'+encodeURIComponent(overrideParams[paramName]);});this.openPopover(popoverUrl);}});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]);}});}
+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}}});}
+function getRealRowIfComparisonRow(tr){if(tr.is('.comparisonRow')){var prevUntil=tr.prevUntil('.parentComparisonRow').prev();return prevUntil.length?prevUntil:tr.prev();}
+return tr;}});
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -2751,7 +2862,7 @@ $('.'+settings.categorylistClass,widgetPreview).position().top+
 $('.dashboard-manager .addWidget').outerHeight();if(!$('#content.admin').length){position+=5;}
 $('.'+settings.widgetlistClass,widgetPreview).css('top',position);$('.'+settings.widgetlistClass,widgetPreview).css('marginBottom',position);}
 return $('.'+settings.widgetlistClass,widgetPreview);}
-function showWidgetList(widgets,widgetPreview){var settings=widgetPreview.settings;var widgetList=createWidgetList(widgetPreview),widgetPreviewTimer;for(var j=0;j<widgets.length;j++){var widgetName=widgets[j]["name"];var widgetUniqueId=widgets[j]["uniqueId"];var widgetCategoryId=widgets[j].category?widgets[j].category.id:null;var widgetClass='';if(!settings.isWidgetAvailable(widgetUniqueId)&&widgetCategoryId!=='General_Generic'){widgetClass+=' '+settings.unavailableClass;}
+function showWidgetList(widgets,widgetPreview){var settings=widgetPreview.settings;var widgetList=createWidgetList(widgetPreview),widgetPreviewTimer;for(var j=0;j<widgets.length;j++){var widgetName=widgets[j]["name"];var widgetUniqueId=widgets[j]["uniqueId"];var widgetCategoryId=widgets[j].category?widgets[j].category.id:null;var widgetClass='';if(!settings.isWidgetAvailable(widgetUniqueId)&&widgetCategoryId!=='General_KpiMetric'){widgetClass+=' '+settings.unavailableClass;}
 widgetName=piwikHelper.escape(piwikHelper.htmlEntities(widgetName));widgetList.append('<li class="'+widgetClass+'" uniqueid="'+widgetUniqueId+'">'+widgetName+'</li>');}
 $('li',widgetList).on('mouseenter',function(){var that=this,widgetUniqueId=$(this).attr('uniqueid');clearTimeout(widgetPreview);widgetPreviewTimer=setTimeout(function(){$('li',widgetList).removeClass(settings.choosenClass);$(that).addClass(settings.choosenClass);showPreview(widgetUniqueId,widgetPreview);},400);});$('li:not(.'+settings.unavailableClass+')',widgetList).on('mouseleave',function(){clearTimeout(widgetPreview);});$('li',widgetList).on('click',function(){if(!$('.widgetLoading',widgetPreview).length){settings.onSelect($(this).attr('uniqueid'));$(widgetPreview).closest('.dashboard-manager').removeClass('expanded');if(settings.resetOnSelect){resetWidgetPreview(widgetPreview);}}
 return false;});}
@@ -2795,7 +2906,7 @@ $('.widgetContent').each(function(){$(this).trigger('widget:resize');});}
 function parseLayout(layout){if($.isArray(layout)){layout={config:{layout:'33-33-33'},columns:layout};}
 if(!layout.config.layout){layout.config.layout='33-33-33';}
 return layout;}
-function reloadWidget($widget){if(typeof widget==='string'){$widget=$('[widgetId="'+uniqueId+'"]',dashboardElement);}
+function reloadWidget($widget){if(typeof $widget==='string'){$widget=$('[widgetid="'+$widget+'"]',dashboardElement);}
 $widget.dashboardWidget('reload',false,true);}
 function addWidgetTemplate(uniqueId,columnNumber,widgetParameters,addWidgetOnTop,isHidden){if(!columnNumber){columnNumber=1;}
 if(columnNumber>$('> .col',dashboardElement).length){return;}
@@ -2827,8 +2938,7 @@ $('*',this.element).off('.dashboardWidget');$('.widgetContent',this.element).tri
 $('.widgetContent',this.element).trigger('widget:maximise');return this;},reload:function(hideLoading,notJQueryUI,overrideParams){if(!notJQueryUI){piwikHelper.log('widget.reload() was called by jquery.ui, ignoring',arguments.callee.caller);return;}
 var self=this,currentWidget=this.element;$('.widgetContent',currentWidget).trigger('widget:reload');function onWidgetLoadedReplaceElementWithContent(loadedContent){var $widgetContent=$('.widgetContent',currentWidget);$widgetContent.html(loadedContent);if(currentWidget.parents('body').length){piwikHelper.compileAngularComponents($widgetContent,{forceNewScope:true});}
 $widgetContent.removeClass('loading');$widgetContent.trigger('widget:create',[self]);angular.element(document).injector().invoke(['notifications',function(notifications){notifications.parseNotificationDivs();}]);}
-var segment=broadcast.getValueFromHash('segment')||broadcast.getValueFromUrl('segment');if(segment.length){this.widgetParameters.segment=segment;}
-if(!hideLoading){$('.widgetContent',currentWidget).addClass('loading');}
+['segment'].forEach(function(paramName){var value=broadcast.getValueFromHash(paramName)||broadcast.getValueFromUrl(paramName);if(value.length){self.widgetParameters[paramName]=value;}});['compareSegments','comparePeriods','compareDates'].forEach(function(paramName){var value=broadcast.getValueFromHash(paramName)||broadcast.getValueFromUrl(paramName);if(value.length){self.widgetParameters[paramName]=value;}else{delete self.widgetParameters[paramName];}});if(!hideLoading){$('.widgetContent',currentWidget).addClass('loading');}
 var params=$.extend(this.widgetParameters,overrideParams||{});widgetsHelper.loadWidgetAjax(this.uniqueId,params,onWidgetLoadedReplaceElementWithContent,function(deferred,status){if(status=='abort'||!deferred||deferred.status<400||deferred.status>=600){return;}
 $('.widgetContent',currentWidget).removeClass('loading');var errorMessage=_pk_translate('General_ErrorRequest',['','']);if($('#loadingError').html()){errorMessage=$('#loadingError').html();}
 $('.widgetContent',currentWidget).html('<div class="widgetLoadingError">'+errorMessage+'</div>');});return this;},setParameters:function(parameters){if(!this.isMaximised&&this.options.autoMaximiseVisualizations.indexOf(parameters.viewDataTable)!==-1){this.maximise();}
@@ -2843,7 +2953,7 @@ $('.button#close',widgetElement).on('click.dashboardWidget',function(ev){piwikHe
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-function createDashboard(){$(makeSelectorLastId('createDashboardName')).val('');piwikHelper.modalConfirm(makeSelectorLastId('createDashboardConfirm'),{yes:function(){var dashboardName=$(makeSelectorLastId('createDashboardName')).val();var addDefaultWidgets=($('[id=dashboard_type_empty]:last:checked').length>0)?0:1;var ajaxRequest=new ajaxHelper();ajaxRequest.setLoadingElement();ajaxRequest.withTokenInUrl();ajaxRequest.addParams({module:'API',method:'Dashboard.createNewDashboardForUser',format:'json'},'get');ajaxRequest.addParams({dashboardName:encodeURIComponent(dashboardName),addDefaultWidgets:addDefaultWidgets,login:piwik.userLogin},'post');ajaxRequest.setCallback(function(response){var id=response.value;angular.element(document).injector().invoke(function($location,reportingMenuModel,dashboardsModel){dashboardsModel.reloadAllDashboards().then(function(){$('#dashboardWidgetsArea').dashboard('loadDashboard',id);$('#dashboardWidgetsArea').dashboard('rebuildMenu');});});});ajaxRequest.send();}});}
+function createDashboard(){$(makeSelectorLastId('createDashboardName')).val('');piwikHelper.modalConfirm(makeSelectorLastId('createDashboardConfirm'),{yes:function(){var dashboardName=$(makeSelectorLastId('createDashboardName')).val();var addDefaultWidgets=($('[id=dashboard_type_empty]:last:checked').length>0)?0:1;var ajaxRequest=new ajaxHelper();ajaxRequest.setLoadingElement();ajaxRequest.withTokenInUrl();ajaxRequest.addParams({module:'API',method:'Dashboard.createNewDashboardForUser',format:'json'},'get');ajaxRequest.addParams({dashboardName:dashboardName,addDefaultWidgets:addDefaultWidgets,login:piwik.userLogin},'post');ajaxRequest.setCallback(function(response){var id=response.value;angular.element(document).injector().invoke(function($location,reportingMenuModel,dashboardsModel){dashboardsModel.reloadAllDashboards().then(function(){$('#dashboardWidgetsArea').dashboard('loadDashboard',id);$('#dashboardWidgetsArea').dashboard('rebuildMenu');});});});ajaxRequest.send();}});}
 function makeSelectorLastId(domElementId){return'[id='+domElementId+']:last';}
 function resetDashboard(){piwikHelper.modalConfirm(makeSelectorLastId('resetDashboardConfirm'),{yes:function(){$('#dashboardWidgetsArea').dashboard('resetLayout');}});}
 function renameDashboard(){$(makeSelectorLastId('newDashboardName')).val($('#dashboardWidgetsArea').dashboard('getDashboardName'));piwikHelper.modalConfirm(makeSelectorLastId('renameDashboardConfirm'),{yes:function(){var newDashboardName=$(makeSelectorLastId('newDashboardName')).val();$('#dashboardWidgetsArea').dashboard('setDashboardName',newDashboardName);}});}
@@ -2915,7 +3025,7 @@ parameters.revenue=this.goal.revenue||0;parameters.allowMultipleConversionsPerVi
 if(parameters&&'undefined'!==typeof parameters.cancelRequest&&parameters.cancelRequest){return;}
 this.isLoading=true;piwikApi.fetch(parameters).then(function(){var search=$location.search();if(search&&search.subcategory&&search.subcategory=='Goals_AddNewGoal'&&piwik.helper.isAngularRenderingThePage()){reportingMenuModel.reloadMenuItems().then(function(){$location.search('subcategory','Goals_ManageGoals');self.isLoading=false;});}else{location.reload();}},function(){scrollToTop();self.isLoading=false;});};this.changedTriggerType=function(){if(!this.isManuallyTriggered()&&!this.goal.patternType){this.goal.patternType='contains';}}
 this.showListOfReports=function(shouldScrollToTop){$rootScope.$emit('Goals.cancelForm');this.showGoalList=true;this.showEditGoal=false;scrollToTop();};this.showAddEditForm=function(){this.showGoalList=false;this.showEditGoal=true;};this.createGoal=function(){var parameters={isAllowed:true};$rootScope.$emit('Goals.initAddGoal',parameters);if(parameters&&!parameters.isAllowed){return;}
-this.showAddEditForm();initGoalForm('Goals.addGoal',_pk_translate('Goals_AddGoal'),'','','url','','contains',false,'',false,false,'0');scrollToTop();};this.editGoal=function(goalId){this.showAddEditForm();var goal=piwik.goals[goalId];initGoalForm("Goals.updateGoal",_pk_translate('Goals_UpdateGoal'),goal.name,goal.description,goal.match_attribute,goal.pattern,goal.pattern_type,(goal.case_sensitive!='0'),goal.revenue,goal.allow_multiple,(goal.event_value_as_revenue!='0'),goalId);scrollToTop();};this.deleteGoal=function(goalId){var goal=piwik.goals[goalId];$('#confirm').find('h2').text(sprintf(_pk_translate('Goals_DeleteGoalConfirm'),'"'+goal.name+'"'));piwikHelper.modalConfirm('#confirm',{yes:function(){self.isLoading=true;piwikApi.fetch({idGoal:goalId,method:'Goals.deleteGoal'}).then(function(){location.reload();},function(){self.isLoading=false;});}});};this.isMatchAttributeNumeric=function(){return['visit_duration'].indexOf(this.goal.matchAttribute)>-1;};this.initPatternType=function(){if(this.isMatchAttributeNumeric()){this.goal.patternType='greater_than';}else{this.goal.patternType='contains';}};this.getPatternFieldLabel=function(){return this.goal.matchAttribute==='visit_duration'?_pk_translate('Goals_TimeInMinutes'):_pk_translate('Goals_Patterns');};this.showListOfReports(false);}})();
+this.showAddEditForm();initGoalForm('Goals.addGoal',_pk_translate('Goals_AddGoal'),'','','url','','contains',false,'',false,false,'0');scrollToTop();};this.editGoal=function(goalId){this.showAddEditForm();var goal=piwik.goals[goalId];initGoalForm("Goals.updateGoal",_pk_translate('Goals_UpdateGoal'),goal.name,goal.description,goal.match_attribute,goal.pattern,goal.pattern_type,(goal.case_sensitive!='0'),goal.revenue,goal.allow_multiple,(goal.event_value_as_revenue!='0'),goalId);scrollToTop();};this.deleteGoal=function(goalId){var goal=piwik.goals[goalId];$('#confirm').find('h2').text(sprintf(_pk_translate('Goals_DeleteGoalConfirm'),'"'+goal.name+'"'));piwikHelper.modalConfirm('#confirm',{yes:function(){self.isLoading=true;piwikApi.fetch({idGoal:goalId,method:'Goals.deleteGoal'}).then(function(){location.reload();},function(){self.isLoading=false;});}});};this.isMatchAttributeNumeric=function(){return['visit_duration'].indexOf(this.goal.matchAttribute)>-1;};this.initPatternType=function(){if(this.isMatchAttributeNumeric()){this.goal.patternType='greater_than';}else{this.goal.patternType='contains';}};this.getPatternFieldLabel=function(){return this.goal.matchAttribute==='visit_duration'?_pk_translate('Goals_TimeInMinutes'):_pk_translate('Goals_Pattern');};this.showListOfReports(false);}})();
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -2923,6 +3033,13 @@ this.showAddEditForm();initGoalForm('Goals.addGoal',_pk_translate('Goals_AddGoal
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp').directive('piwikManageGoals',piwikManageGoals);piwikManageGoals.$inject=['piwik'];function piwikManageGoals(piwik){return{restrict:'A',priority:10,controller:'ManageGoalsController',controllerAs:'manageGoals',compile:function(element,attrs){return function(scope,element,attrs,controller){if(attrs.showAddGoal){controller.createGoal();}else if(attrs.showGoal){controller.editGoal(attrs.showGoal);}};}};}})();
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+window.SEOWidget={getRank:function(){var ajaxRequest=new ajaxHelper();ajaxRequest.setLoadingElement('#ajaxLoadingSEO');ajaxRequest.addParams({module:'SEO',action:'getRank',url:encodeURIComponent($('#seoUrl').val())},'get');ajaxRequest.setCallback(function(response){$('#SeoRanks').html(response);});ajaxRequest.setFormat('html');ajaxRequest.send();}};
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -2977,7 +3094,7 @@ $('.resetForm .message_container').html(response).fadeIn(300);piwikHelper.compil
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').component('piwikUsersManager',{templateUrl:'plugins/UsersManager/angularjs/users-manager/users-manager.component.html?cb='+piwik.cacheBuster,bindings:{currentUserRole:'<',initialSiteName:'@',initialSiteId:'@',accessLevels:'<',filterAccessLevels:'<'},controller:UsersManagerController});UsersManagerController.$inject=['$element','piwik','piwikApi','$q','$timeout'];function UsersManagerController($element,piwik,piwikApi,$q,$timeout){var vm=this;vm.isEditing=false;vm.isCurrentUserSuperUser=true;vm.users=[];vm.totalEntries=null;vm.searchParams={};vm.isLoadingUsers=false;vm.$onInit=$onInit;vm.$onChanges=$onChanges;vm.$onDestroy=$onDestroy;vm.onEditUser=onEditUser;vm.onDoneEditing=onDoneEditing;vm.showAddExistingUserModal=showAddExistingUserModal;vm.onChangeUserRole=onChangeUserRole;vm.onDeleteUser=onDeleteUser;vm.fetchUsers=fetchUsers;vm.addExistingUser=addExistingUser;function onChangeUserRole(users,role){vm.isLoadingUsers=true;$q.resolve().then(function(){if(users==='all'){return getAllUsersInSearch();}
+(function(){angular.module('piwikApp').component('piwikUsersManager',{templateUrl:'plugins/UsersManager/angularjs/users-manager/users-manager.component.html?cb='+piwik.cacheBuster,bindings:{currentUserRole:'<',initialSiteName:'@',initialSiteId:'@',accessLevels:'<',filterAccessLevels:'<'},controller:UsersManagerController});UsersManagerController.$inject=['$element','piwik','piwikApi','$q','$timeout'];function UsersManagerController($element,piwik,piwikApi,$q,$timeout){var vm=this;var search=String(window.location.search);vm.isEditing=!!piwik.helper.getArrayFromQueryString(search).showadduser;vm.isCurrentUserSuperUser=true;vm.users=[];vm.totalEntries=null;vm.searchParams={};vm.isLoadingUsers=false;vm.$onInit=$onInit;vm.$onChanges=$onChanges;vm.$onDestroy=$onDestroy;vm.onEditUser=onEditUser;vm.onDoneEditing=onDoneEditing;vm.showAddExistingUserModal=showAddExistingUserModal;vm.onChangeUserRole=onChangeUserRole;vm.onDeleteUser=onDeleteUser;vm.fetchUsers=fetchUsers;vm.addExistingUser=addExistingUser;function onChangeUserRole(users,role){vm.isLoadingUsers=true;$q.resolve().then(function(){if(users==='all'){return getAllUsersInSearch();}
 return users;}).then(function(users){return users.filter(function(user){return user.role!=='superuser';}).map(function(user){return user.login;});}).then(function(userLogins){var requests=userLogins.map(function(login){return{method:'UsersManager.setUserAccess',userLogin:login,access:role,idSites:vm.searchParams.idSite,ignoreSuperusers:1};});return piwikApi.bulkFetch(requests,{createErrorNotification:true});}).catch(function(e){}).then(function(){return fetchUsers();});}
 function onDeleteUser(users){vm.isLoadingUsers=true;$q.resolve().then(function(){if(users==='all'){return getAllUsersInSearch();}
 return users;}).then(function(users){return users.map(function(user){return user.login;});}).then(function(userLogins){var requests=userLogins.map(function(login){return{method:'UsersManager.deleteUser',userLogin:login};});return piwikApi.bulkFetch(requests,{createErrorNotification:true});}).catch(function(){}).then(function(){return fetchUsers();});}
@@ -3085,8 +3202,8 @@ function getRoleDisplay(role){var result=null;vm.accessLevels.forEach(function(e
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-(function(){angular.module('piwikApp').controller('PersonalSettingsController',PersonalSettingsController);PersonalSettingsController.$inject=['piwikApi','$window','piwik'];function PersonalSettingsController(piwikApi,$window,piwik){var self=this;this.doesRequirePasswordConfirmation=false;function updateSettings(postParams){self.loading=true;piwikApi.withTokenInUrl();piwikApi.post({module:'UsersManager',action:'recordUserSettings',format:'json'},postParams).then(function(success){var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(_pk_translate('CoreAdminHome_SettingsSaveSuccess'),{id:'PersonalSettingsSuccess',context:'success'});notification.scrollToNotification();self.doesRequirePasswordConfirmation=!!self.password;self.passwordCurrent='';self.loading=false;},function(errorMessage){self.loading=false;self.passwordCurrent='';});}
-this.requirePasswordConfirmation=function(){this.doesRequirePasswordConfirmation=true;};this.regenerateTokenAuth=function(){var parameters={userLogin:piwik.userLogin};self.loading=true;piwikHelper.modalConfirm('#confirmTokenRegenerate',{yes:function(){piwikApi.withTokenInUrl();piwikApi.post({module:'API',method:'UsersManager.regenerateTokenAuth'},parameters).then(function(success){$window.location.reload();self.loading=false;},function(errorMessage){self.loading=false;});}});};this.cancelSave=function(){this.passwordCurrent='';};this.save=function(){if(this.doesRequirePasswordConfirmation&&!this.passwordCurrent){angular.element('#confirmChangesWithPassword').openModal({dismissible:false,ready:function(){$('.modal.open #currentPassword').focus();}});return;}
+(function(){angular.module('piwikApp').controller('PersonalSettingsController',PersonalSettingsController);PersonalSettingsController.$inject=['piwikApi','$filter','$window','piwik'];function PersonalSettingsController(piwikApi,$filter,$window,piwik){var translate=$filter('translate');var self=this;this.newsletterSignupButtonTitle=translate('General_Save');this.doesRequirePasswordConfirmation=false;this.showNewsletterSignup=true;function updateSettings(postParams){self.loading=true;piwikApi.withTokenInUrl();piwikApi.post({module:'UsersManager',action:'recordUserSettings',format:'json'},postParams).then(function(success){var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(_pk_translate('CoreAdminHome_SettingsSaveSuccess'),{id:'PersonalSettingsSuccess',context:'success'});notification.scrollToNotification();self.doesRequirePasswordConfirmation=!!self.password;self.passwordCurrent='';self.loading=false;},function(errorMessage){self.loading=false;self.passwordCurrent='';});}
+this.requirePasswordConfirmation=function(){this.doesRequirePasswordConfirmation=true;};this.signupForNewsletter=function(){var signupBtn=$('#newsletterSignupBtn');signupBtn.html(translate('General_Loading'));this.isProcessingNewsletterSignup=true;piwikApi.withTokenInUrl();piwikApi.fetch({module:'API',method:'UsersManager.newsletterSignup'}).then(function(){self.isProcessingNewsletterSignup=false;self.showNewsletterSignup=false;var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(translate('UsersManager_NewsletterSignupSuccessMessage'),{id:'newslettersignup',context:'success'});notification.scrollToNotification();},function(){self.isProcessingNewsletterSignup=false;var UI=require('piwik/UI');var notification=new UI.Notification();notification.show(translate('UsersManager_NewsletterSignupFailureMessage'),{id:'newslettersignup',context:'error'});notification.scrollToNotification();self.newsletterSignupButtonTitle=translate('General_PleaseTryAgain');});};this.regenerateTokenAuth=function(){var parameters={userLogin:piwik.userLogin};self.loading=true;piwikHelper.modalConfirm('#confirmTokenRegenerate',{yes:function(){piwikApi.withTokenInUrl();piwikApi.post({module:'API',method:'UsersManager.regenerateTokenAuth'},parameters).then(function(success){$window.location.reload();self.loading=false;},function(errorMessage){self.loading=false;});}});};this.cancelSave=function(){this.passwordCurrent='';};this.save=function(){if(this.doesRequirePasswordConfirmation&&!this.passwordCurrent){angular.element('#confirmChangesWithPassword').openModal({dismissible:false,ready:function(){$('.modal.open #currentPassword').focus();}});return;}
 angular.element('#confirmChangesWithPassword').closeModal();var postParams={email:this.email,defaultReport:this.defaultReport=='MultiSites'?this.defaultReport:this.site.id,defaultDate:this.defaultDate,language:this.language,timeformat:this.timeformat,};if(this.password){postParams.password=this.password;}
 if(this.passwordBis){postParams.passwordBis=this.passwordBis;}
 if(this.passwordCurrent){postParams.passwordConfirmation=this.passwordCurrent;}
@@ -3317,7 +3434,7 @@ for(c=this,g=c.ll(t,r),t=g[0],r=g[1],h=c.rad(c.clon(t)),f=c.rad(r),u=Math.sin(f)
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){window.UserCountryMap=window.UserCountryMap||{};var VisitorMap=window.UserCountryMap.VisitorMap=function(config,theWidget){this.config=config;this.theWidget=theWidget||false;this.run();};$.extend(VisitorMap.prototype,{run:function(){var self=this,config=self.config,colorManager=piwik.ColorManager,colorNames=['no-data-color','one-country-color','color-range-start-choropleth','color-range-start-normal','color-range-end-choropleth','color-range-end-normal','country-highlight-color','unknown-region-fill-color','unknown-region-stroke-color','region-stroke-color','invisible-region-background','city-label-color','city-stroke-color','city-highlight-stroke-color','city-highlight-fill-color','city-highlight-label-color','city-label-fill-color','city-selected-color','city-selected-label-color','region-layer-stroke-color','country-selected-color','region-selected-color','region-highlight-color'],colors=colorManager.getColors('visitor-map',colorNames),noDataColor=colors['no-data-color'],oneCountryColor=colors['one-country-color'],colorRangeStartChoropleth=colors['color-range-start-choropleth'],colorRangeStartNormal=colors['color-range-start-normal'],colorRangeEndChoropleth=colors['color-range-end-choropleth'],colorRangeEndNormal=colors['color-range-end-normal'],specialMetricsColorScale=colorManager.getColors('visitor-map',['special-metrics-color-scale-1','special-metrics-color-scale-2','special-metrics-color-scale-3','special-metrics-color-scale-4'],true),countryHighlightColor=colors['country-highlight-color'],countrySelectedColor=colors['country-selected-color'],unknownRegionFillColor=colors['unknown-region-fill-color'],unknownRegionStrokeColor=colors['unknown-region-stroke-color'],regionStrokeColor=colors['region-stroke-color'],regionSelectedColor=colors['region-selected-color'],regionHighlightColor=colors['region-highlight-color'],invisibleRegionBackgroundColor=colors['invisible-region-background'],cityLabelColor=colors['city-label-color'],cityLabelFillColor=colors['city-label-fill-color'],cityStrokeColor=colors['city-stroke-color'],cityHighlightStrokeColor=colors['city-highlight-stroke-color'],cityHighlightFillColor=colors['city-highlight-fill-color'],cityHighlightLabelColor=colors['city-highlight-label-color'],citySelectedColor=colors['city-selected-color'],citySelectedLabelColor=colors['city-selected-label-color'],regionLayerStrokeColor=colors['region-layer-stroke-color'],hasUserZoomed=false;;function $$(selector){return $(selector,self.theWidget?self.theWidget.element:undefined);}
-var mapContainer=$$('.UserCountryMap_map').get(0),map=self.map=$K.map(mapContainer),main=$$('.UserCountryMap_container'),worldTotalVisits=0,width=main.width(),_=config._;config.noDataColor=noDataColor;self.widget=$$('.widgetUserCountryMapvisitorMap').parent();function _reportParams(module,action,countryFilter){var params=$.extend(config.reqParams,{module:'API',method:'API.getProcessedReport',apiModule:module,apiAction:action,filter_limit:-1,limit:-1,format_metrics:0,showRawMetrics:1});if(countryFilter){$.extend(params,{filter_column:'country',filter_sort_column:'nb_visits',filter_pattern:countryFilter});}
+var mapContainer=$$('.UserCountryMap_map').get(0),map=self.map=$K.map(mapContainer),main=$$('.UserCountryMap_container'),width=main.width(),_=config._;config.noDataColor=noDataColor;self.widget=$$('.widgetUserCountryMapvisitorMap').parent();function _reportParams(module,action,countryFilter){var params=$.extend(config.reqParams,{module:'API',method:'API.getProcessedReport',apiModule:module,apiAction:action,filter_limit:-1,limit:-1,format_metrics:0,showRawMetrics:1});if(countryFilter){$.extend(params,{filter_column:'country',filter_sort_column:'nb_visits',filter_pattern:countryFilter});}
 return params;}
 function ajax(params,dataType){dataType=dataType||'json';params=$.extend({},params);var token_auth=''+params.token_auth;delete params['token_auth'];return $.ajax({url:'index.php?'+$.param(params),dataType:dataType,data:{token_auth:token_auth},type:'POST'});}
 function minmax(values){values=values.sort(function(a,b){return Number(a)-Number(b);});return{min:values[0],max:values[values.length-1],median:values[Math.floor(values.length*0.5)],p33:values[Math.floor(values.length*0.33)],p66:values[Math.floor(values.length*0.66)],p90:values[Math.floor(values.length*0.9)]};}
@@ -3328,7 +3445,7 @@ if(metric=='avg_time_on_site'){v+=first?' sec':'s';}else if(metric=='bounce_rate
 return v.toFixed(1);}
 return v;}
 function formatValueForTooltips(data,metric,id){var val=data[metric]%1===0||Number(data[metric])!=data[metric]?data[metric]:data[metric].toFixed(1);if(metric=='bounce_rate'){val=NumberFormatter.formatPercent(val);}else if(metric=='avg_time_on_site'){val=new Date(0,0,0,val / 3600,val%3600 / 60,val%60).toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/,"$1");}else{val=NumberFormatter.formatNumber(val);}
-var v=_[metric].replace('%s','<strong>'+val+'</strong>');if(val==1&&metric=='nb_visits')v=_.one_visit;if(metric.substr(0,3)=='nb_'&&metric!='nb_actions_per_visit'){var total;if(id.length==3)total=UserCountryMap.countriesByIso[id][metric];else if(id=='world')total=_worldTotal;else{total=0;$.each(UserCountryMap.countriesByIso,function(iso,country){if(UserCountryMap.ISO3toCONT[iso]==id){total+=country[metric];}});}
+var v=_[metric].replace('%s','<strong>'+val+'</strong>');if(val==1&&metric=='nb_visits')v=_.one_visit;if(metric.substr(0,3)=='nb_'&&metric!='nb_actions_per_visit'){var total;if(id.length==3)total=UserCountryMap.countriesByIso[id][metric];else if(id=='world')total=self.config.visitsSummary[metric];else{total=0;$.each(UserCountryMap.countriesByIso,function(iso,country){if(UserCountryMap.ISO3toCONT[iso]==id){total+=country[metric];}});}
 if(total){v+=' ('+formatPercentage(data[metric]/ total)+')';}}else if(metric=='avg_time_on_site'){v+='<br/> ('+_.nb_visits.replace('%s',data.nb_visits)+')';}
 return v;}
 function getColorScale(rows,metric,filter,choropleth){var colscale;function addLegendItem(val,first){var d=$('<div>'),r=$('<div>'),l=$('<div>'),metric=$$('.userCountryMapSelectMetrics').val(),v=formatNumber(Math.round(val),metric,first);d.css({width:17,height:17,float:'left',background:colscale(val)});l.css({'margin-left':20,'line-height':'20px','text-align':'right'}).html(v);r.css({clear:'both',height:19});r.append(d).append(l);$('.UserCountryMap-legend .content').append(r);}
@@ -3398,7 +3515,7 @@ var requestParams=$.extend({},{apiMethod:'UserCountry.'+method,label:multiple?_r
 ajax(requestParams,'html').done(function(html){Piwik_Popover.setContent(html);var title=box.find('div.popover-title');if(title.length){Piwik_Popover.setTitle(title.html());title.remove();}
 box.find('.compare-container').hide();box.find('.rowevolution-startmulti').hide();box.find('.multirowevoltion-metric').off('change').change(function(e){_rowEvolution.labels=oldLabels;showRowEvolution(method,label,box.find('.multirowevoltion-metric').val());});});_rowEvolution.labels=[];}
 ajax(_reportParams('UserCountry','getCountry')).done(function(report){convertBounceRatesToPercents(report);var metrics=$$('.userCountryMapSelectMetrics option');var countryData=[],countrySelect=$$('.userCountryMapSelectCountry'),countriesByIso={};UserCountryMap.lastReportMetricStats={};$.each(report.reportData,function(i,data){var meta=report.reportMetadata[i],country={name:data.label,iso2:meta.code.toUpperCase(),fips:meta.code.toUpperCase(),iso:UserCountryMap.ISO2toISO3[meta.code.toUpperCase()],flag:meta.logo};if(UserCountryMap.differentFIPS[country.iso2]){country.fips=UserCountryMap.differentFIPS[country.iso2];}
-$.each(metrics,function(i,metric){metric=$(metric).val();country[metric]=data[metric];});countryData.push(country);countriesByIso[country.iso]=country;worldTotalVisits+=country['nb_visits'];});_worldTotal=worldTotalVisits;countryData.sort(function(a,b){return a.name>b.name?1:-1;});UserCountryMap.countryData=countryData;UserCountryMap.countriesByIso=countriesByIso;function postCSSLoad(){$$('.UserCountryMap .loadingPiwik').hide();$('.mapWidgetStatus').height(0);var params=self.widget.dashboardWidget('getWidgetObject').parameters;self.mode=params&&params.viewMode?params.viewMode:'region';if(params&&params.lastMetric)$$('.userCountryMapSelectMetrics').val(params.lastMetric);var isoCodes=[];$.each(countryData,function(i,country){if(!!country.iso){isoCodes.push(country.iso);countrySelect.append('<option value="'+country.iso+'">'+country.name+'</option>');}});if(!hasUserZoomed&&isoCodes.length===1&&isoCodes[0]&&isoCodes[0]!=='UNK'){updateState(isoCodes[0]);}else{updateState(params&&params.lastMap?params.lastMap:'world');}
+$.each(metrics,function(i,metric){metric=$(metric).val();country[metric]=data[metric];});countryData.push(country);countriesByIso[country.iso]=country;});countryData.sort(function(a,b){return a.name>b.name?1:-1;});UserCountryMap.countryData=countryData;UserCountryMap.countriesByIso=countriesByIso;function postCSSLoad(){$$('.UserCountryMap .loadingPiwik').hide();$('.mapWidgetStatus').height(0);var params=self.widget.dashboardWidget('getWidgetObject').parameters;self.mode=params&&params.viewMode?params.viewMode:'region';if(params&&params.lastMetric)$$('.userCountryMapSelectMetrics').val(params.lastMetric);var isoCodes=[];$.each(countryData,function(i,country){if(!!country.iso){isoCodes.push(country.iso);countrySelect.append('<option value="'+country.iso+'">'+country.name+'</option>');}});if(!hasUserZoomed&&isoCodes.length===1&&isoCodes[0]&&isoCodes[0]!=='UNK'){updateState(isoCodes[0]);}else{updateState(params&&params.lastMap?params.lastMap:'world');}
 initUserInterface();}
 if(!$("link[href='"+config.mapCssPath+"']").length){map.loadCSS(config.mapCssPath,postCSSLoad);}else{postCSSLoad();}});function hideOverlay(e){var overlay=$('.content',$(e.target).parents('.UserCountryMap-overlay'));if(overlay.data('locked'))return;overlay.data('locked',true);overlay.fadeOut(200);$$('.UserCountryMap').mouseleave(function(){overlay.fadeIn(200);$$('.UserCountryMap').parent().off('mouseleave');setTimeout(function(){overlay.data('locked',false);},1000);});var offset=$$('.UserCountryMap').offset(),dim={x:overlay.offset().left-offset.left,y:overlay.offset().top-offset.top,w:overlay.width(),h:overlay.height()};$$('.UserCountryMap').mousemove(function(e){var mx=e.pageX-offset.left,my=e.pageY-offset.top,pad=20,outside=mx<dim.x-pad||mx>dim.x+dim.w+pad||my<dim.y-pad||my>dim.y+dim.h+pad;if(outside){$$('.UserCountryMap').parent().off('mouseleave');setTimeout(function(){overlay.fadeIn(200);setTimeout(function(){overlay.data('locked',false);},1000);},100);}});}
 $('.UserCountryMap-overlay').off('mouseenter').on('mouseenter',hideOverlay);$$('.widgetUserCountryMapvisitorMap .widgetName span').remove();$$('.widgetUserCountryMapvisitorMap .widgetName').append('<span class="map-title"></span>');function convertBounceRatesToPercents(report){$.each(report.reportData,function(i,row){if(row['bounce_rate']){row['bounce_rate']=parseFloat(row['bounce_rate'])*100;}});}},resize:function(){var ratio,w,h,map=this.map;ratio=map.viewAB.width / map.viewAB.height;w=map.container.width();h=w / ratio;if(!this.theWidget&&map.container.parents('.widget').length){var maxHeight=$(window).height()-($('html').height()-map.container.height());h=Math.min(maxHeight,h);}
@@ -3528,7 +3645,7 @@ $map.slideDown('slow');var newLabel='Live_HideMap';piwikHelper.lazyScrollTo($('.
 newLabel=_pk_translate(newLabel).replace(' ','\xA0');$('.visitor-profile-show-map',$element).text('('+newLabel+')');},_loadMap:function($map){var self=this;var ajax=new ajaxHelper();ajax.setUrl($map.attr('data-href'));ajax.setCallback(function(response){$map.html(response);self.toggleMap();});ajax.setFormat('html');ajax.setLoadingElement($('.visitor-profile-location > p > .loadingPiwik',self.$element));ajax.send();},_loadMoreVisits:function(){var self=this,$element=this.$element;var loading=$('.visitor-profile-more-info > .loadingPiwik',$element);loading.show();var ajax=new ajaxHelper();ajax.removeDefaultParameter('segment');ajax.addParams({module:'Live',action:'getVisitList',period:'',date:'',visitorId:$element.attr('data-visitor-id'),filter_offset:$('.visitor-profile-visits>li',$element).length,start_number:$('.visitor-profile-visits>li:last',$element).data('number')-1},'GET');ajax.setCallback(function(response){if(response==""){self._showNoMoreVisitsSpan();}else{response=$(response);loading.hide();$('.visitor-profile-visits',$element).append(response);if(response.filter('li').length<10){self._showNoMoreVisitsSpan();}
 piwikHelper.lazyScrollTo($(response)[0],400,true);}});ajax.setFormat('html');ajax.send();},_showNoMoreVisitsSpan:function(){var noMoreSpan=$('<span/>').text(_pk_translate('Live_NoMoreVisits')).addClass('visitor-profile-no-visits');$('.visitor-profile-more-info',this.$element).html(noMoreSpan);},_loadPreviousVisitor:function(){this._gotoAdjacentVisitor(this.$element.attr('data-prev-visitor'));},_loadNextVisitor:function(){this._gotoAdjacentVisitor(this.$element.attr('data-next-visitor'));},_gotoAdjacentVisitor:function(idVisitor){if(!idVisitor){return;}
 if(this._inPopover()){broadcast.propagateNewPopoverParameter('visitorProfile',idVisitor);}else if(this._inWidget()){this.$element.closest('[widgetid]').dashboardWidget('reload',false,true,{visitorId:idVisitor});}},_getFirstVisitId:function(){return $('.visitor-profile-visits>li:first-child>h2',this.$element).attr('data-idvisit');},_inPopover:function(){return!!this.$element.closest('#Piwik_Popover').length;},_inWidget:function(){return!!this.$element.closest('.widget').length;}});exports.VisitorProfileControl=VisitorProfileControl;broadcast.addPopoverHandler('visitorProfile',VisitorProfileControl.showPopover);})(jQuery,require);
-(function($,require){var exports=require('piwik/UI'),DataTable=exports.DataTable,dataTablePrototype=DataTable.prototype;exports.VisitorLog=function(element){DataTable.call(this,element);};$.extend(exports.VisitorLog.prototype,dataTablePrototype,{handleColumnHighlighting:function(){},setFixWidthToMakeEllipsisWork:function(){},init:function(){dataTablePrototype.init.call(this);var self=this;initializeVisitorActions(this.$element);this.$element.on('click','.visitor-log-visitor-profile-link',function(e){e.preventDefault();broadcast.propagateNewPopoverParameter('visitorProfile',$(this).attr('data-visitor-id'));return false;});this.$element.on('click','.addSegmentToMatomo.dataTableAction',function(e){e.preventDefault();e.stopPropagation();var url=window.location.href;url=broadcast.updateParamValue('addSegmentAsNew='+decodeURIComponent(self.param.segment),url);url=broadcast.updateParamValue('segment=',url);url=broadcast.updateParamValue('popover=',url);window.open(url,"_blank");});},_destroy:function(){try{this.$element.tooltip('destroy');}catch(e){}
+(function($,require){var exports=require('piwik/UI'),DataTable=exports.DataTable,dataTablePrototype=DataTable.prototype;exports.VisitorLog=function(element){DataTable.call(this,element);};$.extend(exports.VisitorLog.prototype,dataTablePrototype,{handleColumnHighlighting:function(){},setFixWidthToMakeEllipsisWork:function(){},init:function(){dataTablePrototype.init.call(this);var self=this;initializeVisitorActions(this.$element);this.$element.on('click','.visitor-log-visitor-profile-link',function(e){e.preventDefault();broadcast.propagateNewPopoverParameter('visitorProfile',$(this).attr('data-visitor-id'));return false;});this.$element.on('click','.addSegmentToMatomo.dataTableAction',function(e){e.preventDefault();e.stopPropagation();var url=window.location.href;url=broadcast.updateParamValue('addSegmentAsNew='+decodeURIComponent(self.param.segment),url);url=broadcast.updateParamValue('popover=',url);url=broadcast.updateParamValue('category=General_Visitors',url);url=broadcast.updateParamValue('subcategory=Live_VisitorLog',url);url=broadcast.updateParamValue('segment='+self.param.segment,url);window.open(url,"_blank");});},_destroy:function(){try{this.$element.tooltip('destroy');}catch(e){}
 dataTablePrototype._destroy.call(this);}});})(jQuery,require);
 /*!
  * Piwik - free/libre analytics platform
@@ -3544,10 +3661,10 @@ var dataTable=getDataTableFromApiMethod(apiMethod);var metadata=getMetadataFromD
 function DataTable_RowActions_SegmentVisitorLog(dataTable){this.dataTable=dataTable;this.actionName=actionName;this.trEventName='piwikTriggerSegmentVisitorLogAction';}
 DataTable_RowActions_SegmentVisitorLog.prototype=new DataTable_RowAction();DataTable_RowActions_SegmentVisitorLog.prototype.openPopover=function(apiMethod,segment,extraParams){var urlParam=apiMethod+':'+encodeURIComponent(segment)+':'+encodeURIComponent(JSON.stringify(extraParams));broadcast.propagateNewPopoverParameter('RowAction',actionName+':'+urlParam);};DataTable_RowActions_SegmentVisitorLog.prototype.trigger=function(tr,e,subTableLabel){var segment=getRawSegmentValueFromRow(tr);if(this.dataTable.param.segment){segment=decodeURIComponent(this.dataTable.param.segment)+';'+segment;}
 if(this.dataTable.props.segmented_visitor_log_segment_suffix){segment=segment+';'+this.dataTable.props.segmented_visitor_log_segment_suffix;}
-this.performAction(segment,tr,e);};DataTable_RowActions_SegmentVisitorLog.prototype.performAction=function(segment,tr,e){var apiMethod=this.dataTable.param.module+'.'+this.dataTable.param.action;var extraParams={};if(this.dataTable.param.date&&this.dataTable.param.period){extraParams={date:this.dataTable.param.date,period:this.dataTable.param.period};}
-$.each(this.dataTable.param,function(index,value){if(index!=='idSite'&&index.indexOf('id')===0&&$.isNumeric(value)){extraParams[index]=value;}});this.openPopover(apiMethod,segment,extraParams);};DataTable_RowActions_SegmentVisitorLog.prototype.doOpenPopover=function(urlParam){var urlParamParts=urlParam.split(':');var apiMethod=urlParamParts.shift();var segment=decodeURIComponent(urlParamParts.shift());var extraParamsString=urlParamParts.shift(),extraParams={};try{extraParams=JSON.parse(decodeURIComponent(extraParamsString));}catch(e){}
-SegmentedVisitorLog.show(apiMethod,segment,extraParams);};DataTable_RowActions_Registry.register({name:actionName,dataTableIcon:'icon-segmented-visits-log',order:30,dataTableIconTooltip:[_pk_translate('Live_RowActionTooltipTitle'),_pk_translate('Live_RowActionTooltipDefault')],isAvailableOnReport:function(dataTableParams,undefined){return true;},isAvailableOnRow:function(dataTableParams,tr){var value=getRawSegmentValueFromRow(tr)
-if('undefined'===(typeof value)){return false;}
+this.performAction(segment,tr,e);};DataTable_RowActions_SegmentVisitorLog.prototype.performAction=function(segment,tr,e,originalRow){var apiMethod=this.dataTable.param.module+'.'+this.dataTable.param.action;var extraParams={};if(this.dataTable.param.date&&this.dataTable.param.period){extraParams={date:this.dataTable.param.date,period:this.dataTable.param.period};}
+var paramOverride=$(originalRow||tr).data('param-override');if(typeof paramOverride!=='object'){paramOverride={};}
+$.extend(extraParams,paramOverride);$.each(this.dataTable.param,function(index,value){if(index!=='idSite'&&index.indexOf('id')===0&&$.isNumeric(value)){extraParams[index]=value;}});this.openPopover(apiMethod,segment,extraParams);};DataTable_RowActions_SegmentVisitorLog.prototype.doOpenPopover=function(urlParam){var urlParamParts=urlParam.split(':');var apiMethod=urlParamParts.shift();var segment=decodeURIComponent(urlParamParts.shift());var extraParamsString=urlParamParts.shift(),extraParams={};try{extraParams=JSON.parse(decodeURIComponent(extraParamsString));}catch(e){}
+SegmentedVisitorLog.show(apiMethod,segment,extraParams);};DataTable_RowActions_Registry.register({name:actionName,dataTableIcon:'icon-segmented-visits-log',order:30,dataTableIconTooltip:[_pk_translate('Live_RowActionTooltipTitle'),_pk_translate('Live_RowActionTooltipDefault')],isAvailableOnReport:function(dataTableParams,undefined){return true;},isAvailableOnRow:function(dataTableParams,tr){var value=getRawSegmentValueFromRow(tr);if('undefined'===(typeof value)){return false;}
 var reportTitle=null;var apiMethod=$(tr).parents('div.dataTable').last().attr('data-report');var dimension=getDimensionFromApiMethod(apiMethod);if(dimension){reportTitle=_pk_translate('Live_RowActionTooltipWithDimension',[dimension])}else{reportTitle=_pk_translate('Live_RowActionTooltipDefault');}
 this.dataTableIconTooltip[1]=reportTitle;return true;},createInstance:function(dataTable,param){if(dataTable!==null&&typeof dataTable.segmentVisitorLogInstance!='undefined'){return dataTable.segmentVisitorLogInstance;}
 if(dataTable===null&&param){var report=param.split(':')[0];var tempTable=getDataTableFromApiMethod(report);if(tempTable){dataTable=tempTable;if(typeof dataTable.segmentVisitorLogInstance!='undefined'){return dataTable.segmentVisitorLogInstance;}}}
@@ -3771,10 +3888,10 @@ scope.$watch('credentials',function(val,oldVal){ctrl.$setViewValue(JSON.stringif
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 function DataTable_RowActions_Overlay(dataTable){this.dataTable=dataTable;}
-DataTable_RowActions_Overlay.prototype=new DataTable_RowAction;DataTable_RowActions_Overlay.registeredReports=[];DataTable_RowActions_Overlay.registerReport=function(handler){DataTable_RowActions_Overlay.registeredReports.push(handler);}
-DataTable_RowActions_Overlay.prototype.onClick=function(actionA,tr,e){if(!actionA.data('overlay-manipulated')){actionA.data('overlay-manipulated',1);var segment,link;var i=0;for(i;i<DataTable_RowActions_Overlay.registeredReports.length;i++){var report=DataTable_RowActions_Overlay.registeredReports[i];if(report&&report.onClick&&report.isAvailableOnReport&&report.isAvailableOnReport(this.dataTable.param)){var result=report.onClick.apply(this,arguments);if(!result||!result.link){return;}
+DataTable_RowActions_Overlay.prototype=new DataTable_RowAction;DataTable_RowActions_Overlay.registeredReports=[];DataTable_RowActions_Overlay.registerReport=function(handler){DataTable_RowActions_Overlay.registeredReports.push(handler);};DataTable_RowActions_Overlay.prototype.onClick=function(actionA,tr,e,originalRow){if(!actionA.data('overlay-manipulated')){actionA.data('overlay-manipulated',1);var segment,link;var i=0;for(i;i<DataTable_RowActions_Overlay.registeredReports.length;i++){var report=DataTable_RowActions_Overlay.registeredReports[i];if(report&&report.onClick&&report.isAvailableOnReport&&report.isAvailableOnReport(this.dataTable.param)){var result=report.onClick.apply(this,arguments);if(!result||!result.link){return;}
 link=result.link;if(result.segment){segment=result.segment;}
 break;}}
+var paramOverride=$(originalRow||tr).data('param-override');if(typeof paramOverride==='object'&&paramOverride.segment){if(segment){segment+=';'+paramOverride.segment;}else{segment=paramOverride.segment;}}
 if(link){var href=Overlay_Helper.getOverlayLink(this.dataTable.param.idSite,'month','today',segment,link);actionA.attr({target:'_blank',href:href});}}
 return true;};DataTable_RowActions_Registry.register({name:'Overlay',dataTableIcon:'icon-overlay',order:30,dataTableIconTooltip:[_pk_translate('General_OverlayRowActionTooltipTitle'),_pk_translate('General_OverlayRowActionTooltip')],createInstance:function(dataTable){return new DataTable_RowActions_Overlay(dataTable);},isAvailableOnReport:function(dataTableParams){if(!window.DataTable_RowActions_Transitions){return false;}
 var i=0;for(i;i<DataTable_RowActions_Overlay.registeredReports.length;i++){var report=DataTable_RowActions_Overlay.registeredReports[i];if(report&&report.isAvailableOnReport&&report.isAvailableOnReport(dataTableParams)){return true;}}
@@ -3799,22 +3916,24 @@ Segmentation=(function($){piwikHelper.registerShortcut('s',_pk_translate('CoreHo
 if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}
 $('.segmentListContainer .segmentationContainer .title').trigger('click').focus();});var segmentation=function segmentation(config){if(!config.target){throw new Error("target property must be set in config to segment editor control element");}
 var self=this;self.currentSegmentStr="";self.segmentAccess="read";self.availableSegments=[];for(var item in config){self[item]=config[item];}
-self.editorTemplate=self.editorTemplate.detach();self.timer="";self.searchAllowed=true;self.filterTimer="";self.filterAllowed=true;self.availableMatches=[];self.availableMatches["metric"]=[];self.availableMatches["metric"]["=="]=self.translations['General_OperationEquals'];self.availableMatches["metric"]["!="]=self.translations['General_OperationNotEquals'];self.availableMatches["metric"]["<="]=self.translations['General_OperationAtMost'];self.availableMatches["metric"][">="]=self.translations['General_OperationAtLeast'];self.availableMatches["metric"]["<"]=self.translations['General_OperationLessThan'];self.availableMatches["metric"][">"]=self.translations['General_OperationGreaterThan'];self.availableMatches["dimension"]=[];self.availableMatches["dimension"]["=="]=self.translations['General_OperationIs'];self.availableMatches["dimension"]["!="]=self.translations['General_OperationIsNot'];self.availableMatches["dimension"]["=@"]=self.translations['General_OperationContains'];self.availableMatches["dimension"]["!@"]=self.translations['General_OperationDoesNotContain'];self.availableMatches["dimension"]["=^"]=self.translations['General_OperationStartsWith'];self.availableMatches["dimension"]["=$"]=self.translations['General_OperationEndsWith'];segmentation.prototype.setAvailableSegments=function(segments){this.availableSegments=segments;};segmentation.prototype.getSegment=function(){var self=this;return self.currentSegmentStr;};segmentation.prototype.setSegment=function(segmentStr){this.currentSegmentStr=segmentStr;};segmentation.prototype.setTooltip=function(segmentDescription){var title=_pk_translate('SegmentEditor_ChooseASegment')+'.';title+=' '+_pk_translate('SegmentEditor_CurrentlySelectedSegment',[segmentDescription]);$(this.content).attr('title',title);};segmentation.prototype.markCurrentSegment=function(){var current=this.getSegment();var segmentationTitle=$(this.content).find(".segmentationTitle");var title;if(current!=""){var selector='div.segmentList ul li[data-definition="'+current+'"]';var foundItems=$(selector,this.target);if(foundItems.length===0){try{currentDecoded=piwikHelper.htmlDecode(current);selector='div.segmentList ul li[data-definition="'+currentDecoded+'"]';foundItems=$(selector,this.target);}catch(e){}}
+self.editorTemplate=self.editorTemplate.detach();self.timer="";self.searchAllowed=true;self.filterTimer="";self.filterAllowed=true;self.availableMatches=[];self.availableMatches["metric"]=[];self.availableMatches["metric"]["=="]=self.translations['General_OperationEquals'];self.availableMatches["metric"]["!="]=self.translations['General_OperationNotEquals'];self.availableMatches["metric"]["<="]=self.translations['General_OperationAtMost'];self.availableMatches["metric"][">="]=self.translations['General_OperationAtLeast'];self.availableMatches["metric"]["<"]=self.translations['General_OperationLessThan'];self.availableMatches["metric"][">"]=self.translations['General_OperationGreaterThan'];self.availableMatches["dimension"]=[];self.availableMatches["dimension"]["=="]=self.translations['General_OperationIs'];self.availableMatches["dimension"]["!="]=self.translations['General_OperationIsNot'];self.availableMatches["dimension"]["=@"]=self.translations['General_OperationContains'];self.availableMatches["dimension"]["!@"]=self.translations['General_OperationDoesNotContain'];self.availableMatches["dimension"]["=^"]=self.translations['General_OperationStartsWith'];self.availableMatches["dimension"]["=$"]=self.translations['General_OperationEndsWith'];segmentation.prototype.setAvailableSegments=function(segments){this.availableSegments=segments;};segmentation.prototype.getSegment=function(){var self=this;return self.currentSegmentStr;};segmentation.prototype.setSegment=function(segmentStr){this.currentSegmentStr=segmentStr;};segmentation.prototype.setTooltip=function(segmentDescription){var title=_pk_translate('SegmentEditor_ChooseASegment')+'.';title+=' '+_pk_translate('SegmentEditor_CurrentlySelectedSegment',[segmentDescription]);$(this.content).attr('title',title);};segmentation.prototype.markComparedSegments=function(){var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');var comparedSegments=comparisonService.getSegmentComparisons().map(function(comparison){return comparison.params.segment;});$('div.segmentList ul li[data-definition]',this.target).removeClass('comparedSegment').filter(function(){var definition=$(this).attr('data-definition');return comparedSegments.indexOf(definition)!==-1||comparedSegments.indexOf(decodeURIComponent(definition))!==-1;}).each(function(){$(this).addClass('comparedSegment');});};segmentation.prototype.markCurrentSegment=function(){var current=this.getSegment();var segmentationTitle=$(this.content).find(".segmentationTitle");var title;if(current!=""){var selector='div.segmentList ul li[data-definition="'+current+'"]';var foundItems=$(selector,this.target);if(foundItems.length===0){try{currentDecoded=piwikHelper.htmlDecode(current);selector='div.segmentList ul li[data-definition="'+currentDecoded+'"]';foundItems=$(selector,this.target);}catch(e){}}
 if(foundItems.length===0){try{currentDecoded=piwikHelper.htmlDecode(decodeURIComponent(current));selector='div.segmentList ul li[data-definition="'+currentDecoded+'"]';foundItems=$(selector,this.target);}catch(e){}}
 if(foundItems.length>0){var idSegment=$(foundItems).first().attr('data-idsegment');title=getSegmentName(getSegmentFromId(idSegment));}else{title=_pk_translate('SegmentEditor_CustomSegment');}
 segmentationTitle.addClass('segment-clicked').html(title);this.setTooltip(title);}
 else{title=this.translations['SegmentEditor_DefaultAllVisits'];segmentationTitle.text(title);this.setTooltip(title);}};function handleAddNewSegment(){var segmentToAdd=broadcast.getValueFromHash('addSegmentAsNew')||broadcast.getValueFromUrl('addSegmentAsNew');if(segmentToAdd){showAddNewSegmentForm({definition:decodeURIComponent(segmentToAdd)});}}
 var getSegmentFromId=function(id){if(self.availableSegments.length>0){for(var i=0;i<self.availableSegments.length;i++){var segment=self.availableSegments[i];if(segment.idsegment==id){return segment;}}}
 return false;};var getListHtml=function(){var html=self.editorTemplate.find("> .listHtml").clone();var segment,injClass;var listHtml='<li data-idsegment="" '+
-(self.currentSegmentStr==""?" class='segmentSelected' tabindex='4' ":"")
-+' data-definition=""><span class="segname">'+self.translations['SegmentEditor_DefaultAllVisits']
+(self.currentSegmentStr==""?" class='segmentSelected'":"")
++' data-definition=""><span class="segname" tabindex="4">'+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/>';}
++'</span>';var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');if(comparisonService.isComparisonEnabled()||comparisonService.isComparisonEnabled()===null){listHtml+='<span class="compareSegment allVisitsCompareSegment" title="'+_pk_translate('SegmentEditor_CompareThisSegment')+'"></span>';}
+listHtml+='</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){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(checkSelected==self.currentSegmentStr||checkSelected==decodeURIComponent(self.currentSegmentStr)){injClass='class="segmentSelected"';}
 listHtml+='<li data-idsegment="'+segment.idsegment+'" data-definition="'+(segment.definition).replace(/"/g,'&quot;')+'" '
 +injClass+' title="'+getSegmentTooltipEnrichedWithUsername(segment)+'"><span class="segname" tabindex="4">'+getSegmentName(segment)+'</span>';if(self.segmentAccess=="write"){listHtml+='<span class="editSegment" title="'+self.translations['General_Edit'].toLocaleLowerCase()+'"></span>';}
+if(comparisonService.isComparisonEnabled()||comparisonService.isComparisonEnabled()===null){listHtml+='<span class="compareSegment" title="'+_pk_translate('SegmentEditor_CompareThisSegment')+'"></span>';}
 listHtml+='</li>';}
 if(isVisibleToSuperUserNoticeShouldBeClosed){listHtml+='</span>';}
 if(isSharedWithMeBySuperUserNoticeShouldBeClosed){listHtml+='</span>';}
@@ -3833,10 +3952,11 @@ displayFormAddNewSegment(segment);}
 var filterSegmentList=function(keyword){var curTitle;clearFilterSegmentList();$(self.target).find(" .filterNoResults").remove();$(self.target).find(".segmentList li").each(function(){curTitle=$(this).prop('title');$(this).hide();if(curTitle.toLowerCase().indexOf(keyword.toLowerCase())!==-1){$(this).show();}});if($(self.target).find(".segmentList li:visible").length==0){$(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(){$(self.target).find(" .filterNoResults").remove();$(self.target).find(".segmentList li").each(function(){$(this).show();});$(self.target).find(".segmentList .segmentsVisibleToSuperUser").show();$(self.target).find(".segmentList .segmentsSharedWithMeBySuperUser").show();};var bindEvents=function(){self.target.on('click','.segmentationContainer',function(e){if(self.content.closest('.segmentEditorPanel').hasClass("expanded")){if($(e.target).hasClass("jspDrag")===true||$(e.target).hasClass("segmentFilterContainer")===true||$(e.target).parents().hasClass("segmentFilterContainer")===true||$(e.target).hasClass("filterNoResults")){e.stopPropagation();}else{if(self.jscroll){self.jscroll.destroy();}
-self.target.closest('.segmentEditorPanel').removeClass('expanded');}}else{closeAllOpenLists();self.target.closest('.segmentEditorPanel').addClass('expanded');self.target.find('.segmentFilter').val(self.translations['General_Search']).trigger('keyup');self.jscroll=self.target.find(".segmentList").jScrollPane({autoReinitialise:true,showArrows:true}).data().jsp;}});self.target.on('click','.editSegment',function(e){$(this).closest(".segmentationContainer").trigger("click");var target=$(this).parent("li");openEditFormGivenSegment(target);e.stopPropagation();e.preventDefault();});self.target.on("click",".segmentList li",function(e){if($(e.currentTarget).hasClass("grayed")!==true){var idsegment=$(this).attr("data-idsegment");segmentDefinition=$(this).data("definition");if(!piwikHelper.isAngularRenderingThePage()){self.setSegment(segmentDefinition);}
-self.markCurrentSegment();self.segmentSelectMethod(segmentDefinition);toggleLoadingMessage(segmentDefinition.length);}});self.target.on('click','.add_new_segment',function(e){e.stopPropagation();showAddNewSegmentForm();});self.target.on('click',".segmentFilterContainer span",function(e){$(e.target).parent().find(".segmentFilter").val(self.translations['General_Search']).trigger('keyup');});self.target.on('blur',".segmentFilter",function(e){if($(e.target).parent().find(".segmentFilter").val()==""){$(e.target).parent().find(".segmentFilter").val(self.translations['General_Search'])}});self.target.on('click',".segmentFilter",function(e){if($(e.target).val()==self.translations['General_Search']){$(e.target).val("");}});self.target.on('keyup',".segmentFilter",function(e){var search=$(e.currentTarget).val();if(search==self.translations['General_Search']){search="";}
+self.target.closest('.segmentEditorPanel').removeClass('expanded');}}else{closeAllOpenLists();self.target.closest('.segmentEditorPanel').addClass('expanded');self.target.find('.segmentFilter').val(self.translations['General_Search']).trigger('keyup');self.jscroll=self.target.find(".segmentList").jScrollPane({autoReinitialise:true,showArrows:true}).data().jsp;}});self.target.on('click','.editSegment',function(e){$(this).closest(".segmentationContainer").trigger("click");var target=$(this).parent("li");openEditFormGivenSegment(target);e.stopPropagation();e.preventDefault();});self.target.on('click','.compareSegment',function(e){e.stopPropagation();e.preventDefault();var comparisonService=piwikHelper.getAngularDependency('piwikComparisonsService');comparisonService.addSegmentComparison({segment:$(e.target).closest('li').data('definition'),});self.markComparedSegments();closeAllOpenLists();});self.target.on("click",".segmentList li",function(e){if($(e.currentTarget).hasClass("grayed")!==true){var idsegment=$(this).attr("data-idsegment");segmentDefinition=$(this).data("definition");if(!piwikHelper.isAngularRenderingThePage()){self.setSegment(segmentDefinition);}
+self.markCurrentSegment();self.segmentSelectMethod(segmentDefinition);toggleLoadingMessage(segmentDefinition.length);}});self.target.on('click','.add_new_segment',function(e){e.stopPropagation();showAddNewSegmentForm();});self.target.on("keyup",".segmentList li, .add_new_segment",function(event){var keycode=(event.keyCode?event.keyCode:(event.which?event.which:event.key));if(keycode=='13'){$(this).trigger('click');}});self.target.on('click',".segmentFilterContainer span",function(e){$(e.target).parent().find(".segmentFilter").val(self.translations['General_Search']).trigger('keyup');});self.target.on('blur',".segmentFilter",function(e){if($(e.target).parent().find(".segmentFilter").val()==""){$(e.target).parent().find(".segmentFilter").val(self.translations['General_Search'])}});self.target.on('click',".segmentFilter",function(e){if($(e.target).val()==self.translations['General_Search']){$(e.target).val("");}});self.target.on('keyup',".segmentFilter",function(e){var search=$(e.currentTarget).val();if(search==self.translations['General_Search']){search="";}
 if(search.length>=2){clearTimeout(self.filterTimer);self.filterAllowed=true;self.filterTimer=setTimeout(function(){filterSegmentList(search);},500);}
 else{self.filterTimer=false;clearFilterSegmentList();}});self.target.on('click',"a.editSegmentName",function(e){var $h3=$(e.currentTarget).parents("h3");$h3.css({'margin':'0 0 0 6px'});var oldName=$h3.find("span").text();$h3.find("span").hide();$(e.currentTarget).hide();$(e.currentTarget).before('<input class="edit_segment_name" type="text"/>');$(e.currentTarget).siblings(".edit_segment_name").focus().val(oldName);});self.target.on("click",".segmentName",function(e){$(self.form).find("a.editSegmentName").trigger('click');});self.target.on('blur',"input.edit_segment_name",function(e){var newName=$(this).val();var segmentNameNode=$(e.currentTarget).parents("h3").find("span");if(newName.trim()){segmentNameNode.text(newName);}else{$(this).val(segmentNameNode.text());}});self.target.on('click','.segment-element',function(e){e.stopPropagation();e.preventDefault();});self.target.on('change','.available_segments_select',function(e){var option=$(e.currentTarget).find('option:selected');openEditFormGivenSegment(option);});self.target.on('click',".delete",function(){var segmentName=$(self.form).find(".segment-content > h3 > span").text();var segmentId=$(self.form).find(".available_segments_select option:selected").attr("data-idsegment");var params={"idsegment":segmentId};$('#segment-delete-confirm').find('#name').text(segmentName);if(segmentId!=""){piwikHelper.modalConfirm($('#segment-delete-confirm'),{yes:function(){self.deleteMethod(params);}});}});self.target.on("click","a.close",function(e){$(".segmentListContainer",self.target).show();closeForm();});$("body").on("keyup",function(e){if(e.keyCode=="27"||e.which===27){if(self.target.find('[uicontrol="expandable-select"] .expandableList:visible').length){return;}
+if(Piwik_Popover.isOpen()){Piwik_Popover.close();return;}
 $(".segmentListContainer",self.target).show();closeForm();}});};var getAddOrBlockButtonHtml=function(){if(typeof addOrBlockButton==="undefined"){var addOrBlockButton=self.editorTemplate.find("div.segment-add-or").clone();}
 return addOrBlockButton.clone();};function openEditFormGivenSegment(option){var idsegment=option.attr("data-idsegment");if(idsegment.length==0){displayFormAddNewSegment();}else{var segment=getSegmentFromId(idsegment);segment.definition=option.data("definition");openEditForm(segment);}}
 var normalizeSearchString=function(search){search=search.replace(/^\s+|\s+$/g,'');search=search.toLowerCase();var from="àáäâèéëêìíïîòóöôùúüûñç·/_,:;";var to="aaaaeeeeiiiioooouuuunc------";for(var i=0,l=from.length;i<l;i++){search=search.replace(new RegExp(from.charAt(i),'g'),to.charAt(i));}
@@ -3845,22 +3965,22 @@ self.form=getFormHtml();self.target.prepend(self.form);piwikHelper.setMarginLeft
 if(mode=="edit"){$(self.form).find('.enable_all_users_select > option[value="'+segment.enable_all_users+'"]').prop("selected",true);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);}
 if(segment!==undefined&&segment.definition!=""){self.form.find('[piwik-segment-generator]').attr('segment-definition',segment.definition);}
-makeDropList(".enable_all_users",".enable_all_users_select");makeDropList(".visible_to_website",".visible_to_website_select");makeDropList(".auto_archive",".auto_archive_select");makeDropList(".available_segments",".available_segments_select");$(self.form).find(".saveAndApply").bind("click",function(e){e.preventDefault();parseFormAndSave();});if(typeof mode!=="undefined"&&mode=="new"){$(self.form).find(".editSegmentName").trigger('click');}
+makeDropList(".enable_all_users",".enable_all_users_select");makeDropList(".visible_to_website",".visible_to_website_select");makeDropList(".auto_archive",".auto_archive_select");makeDropList(".available_segments",".available_segments_select");$(self.form).find(".saveAndApply").bind("click",function(e){e.preventDefault();parseFormAndSave();});$(self.form).find(".testSegment").bind("click",function(e){e.preventDefault();testSegment();});if(typeof mode!=="undefined"&&mode=="new"){$(self.form).find(".editSegmentName").trigger('click');}
 $(".segmentListContainer",self.target).hide();self.target.closest('.segmentEditorPanel').addClass('editing');piwikHelper.compileAngularComponents(self.target);};var closeForm=function(){$(self.form).unbind().remove();self.target.closest('.segmentEditorPanel').removeClass('editing');};function getSegmentGeneratorController(){return angular.element(self.form.find('.segment-generator')).scope().segmentGenerator;}
 var parseFormAndSave=function(){var segmentName=$(self.form).find(".segment-content > h3 >span").text();var segmentStr=getSegmentGeneratorController().getSegmentString();var segmentId=$(self.form).find('.available_segments_select > option:selected').attr("data-idsegment");var user=$(self.form).find(".enable_all_users_select option:selected").val();var autoArchive=$(self.form).find(".auto_archive_select option:selected").val()||0;var params={"name":segmentName,"definition":segmentStr,"enabledAllUsers":user,"autoArchive":autoArchive,"idSite":$(self.form).find(".visible_to_website_select option:selected").val()};if(segmentId===""){self.addMethod(params);}
 else{jQuery.extend(params,{"idSegment":segmentId});if(segmentStr!=getSegmentFromId(segmentId).definition&&$('.segment-definition-change-confirm').data('hideMessage')!=1){var isBrowserArchivingAvailableForSegments=$('.segment-definition-change-confirm').data('segmentProcessedOnRequest');var isRealTimeSegment=(autoArchive==0);var segmentNotProcessedOnRequest=!isBrowserArchivingAvailableForSegments||!isRealTimeSegment;$('.process-on-request, .no-process-on-request').hide();if(segmentNotProcessedOnRequest){$('.no-process-on-request').show();}else{$('.process-on-request').show();}
-piwikHelper.modalConfirm('.segment-definition-change-confirm',{yes:function(){if($('#hideSegmentMessage:checked').length){var ajaxHandler=new ajaxHelper();ajaxHandler.setLoadingElement();ajaxHandler.addParams({"module":'API',"format":'json',"method":'UsersManager.setUserPreference',"userLogin":piwik.userLogin,"preferenceName":"hideSegmentDefinitionChangeMessage","preferenceValue":"1"},'GET');ajaxHandler.useCallbackInCaseOfError();ajaxHandler.setCallback(function(response){self.updateMethod(params);});ajaxHandler.send();}else{self.updateMethod(params);}}});}else{self.updateMethod(params);}}};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;$(spanId+' option[value="'+ui.item.value+'"]',self.editorTemplate).prop('selected',true);dropList.text(ui.item.label);$(self.form).find(selectId).trigger("change");}}).click(function(){$("a.dropList").autocomplete("close");if($(this).autocomplete("widget").is(":visible")){$(this).autocomplete("close");return;}
+piwikHelper.modalConfirm('.segment-definition-change-confirm',{yes:function(){if($('#hideSegmentMessage:checked').length){var ajaxHandler=new ajaxHelper();ajaxHandler.setLoadingElement();ajaxHandler.addParams({"module":'API',"format":'json',"method":'UsersManager.setUserPreference',"userLogin":piwik.userLogin,"preferenceName":"hideSegmentDefinitionChangeMessage","preferenceValue":"1"},'GET');ajaxHandler.useCallbackInCaseOfError();ajaxHandler.setCallback(function(response){self.updateMethod(params);});ajaxHandler.send();}else{self.updateMethod(params);}}});}else{self.updateMethod(params);}}};var testSegment=function(){var segmentStr=getSegmentGeneratorController().getSegmentString();var encSegment=jQuery(jQuery('.segmentEditorPanel').get(0)).data('uiControlObject').uriEncodeSegmentDefinition(segmentStr);var url=window.location.href;url=url.replace(/\?[\S]*\?/,'?');url=broadcast.updateParamValue('viewDataTable=VisitorLog',url);url=broadcast.updateParamValue('module=Live',url);url=broadcast.updateParamValue('action=getLastVisitsDetails',url);url=broadcast.updateParamValue('segment='+encSegment,url);url=broadcast.updateParamValue('inPopover=1',url);Piwik_Popover.createPopupAndLoadUrl(url,_pk_translate('Live_VisitsLog'));};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;$(spanId+' option[value="'+ui.item.value+'"]',self.editorTemplate).prop('selected',true);dropList.text(ui.item.label);$(self.form).find(selectId).trigger("change");}}).click(function(){$("a.dropList").autocomplete("close");if($(this).autocomplete("widget").is(":visible")){$(this).autocomplete("close");return;}
 $(this).autocomplete("search","");});$('body').on('mouseup',function(e){if(!$(e.target).parents(spanId).length&&!$(e.target).is(spanId)&&!$(e.target).parents(spanId).length&&!$(e.target).parents(".ui-autocomplete").length&&!$(e.target).is(".ui-autocomplete")&&!$(e.target).parents(".ui-autocomplete").length){dropList.autocomplete().autocomplete("close");}});};function toggleLoadingMessage(segmentIsSet){if(segmentIsSet){$('#ajaxLoadingDiv').find('.loadingSegment').show();}else{$('#ajaxLoadingDiv').find('.loadingSegment').hide();}}
-this.initHtml=function(){var html=getListHtml();if(typeof self.content!=="undefined"){this.content.html($(html).html());}else{this.target.append(html);this.content=this.target.find(".segmentationContainer");}
-this.markCurrentSegment();var segmentIsSet=this.getSegment().length;toggleLoadingMessage(segmentIsSet);};if(piwikHelper.isAngularRenderingThePage()){angular.element(document).injector().invoke(function($rootScope,$location){$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var segment='';if('undefined'!==typeof $search.segment&&null!==$search.segment){segment=$search.segment}
-if(self.getSegment()!=segment){self.setSegment(segment);self.initHtml();}});});}
+this.initHtml=function(){var self=this;var html=getListHtml();if(typeof self.content!=="undefined"){this.content.html($(html).html());}else{this.target.append(html);this.content=this.target.find(".segmentationContainer");}
+this.markCurrentSegment();setTimeout(function(){self.markComparedSegments();});var segmentIsSet=this.getSegment().length;toggleLoadingMessage(segmentIsSet);};if(piwikHelper.isAngularRenderingThePage()){angular.element(document).injector().invoke(function($rootScope,$location){$rootScope.$on('$locationChangeSuccess',function(){var $search=$location.search();var segment='';if('undefined'!==typeof $search.segment&&null!==$search.segment){segment=$search.segment}
+if(self.getSegment()!=segment){self.setSegment(segment);self.initHtml();}else{setTimeout(function(){self.markComparedSegments();});}});});}
 this.initHtml();bindEvents();handleAddNewSegment();};return segmentation;})(jQuery);$(document).ready(function(){var exports=require('piwik/UI');var UIControl=exports.UIControl;var SegmentSelectorControl=function(element){UIControl.call(this,element);if((typeof this.props.isSegmentNotAppliedBecauseBrowserArchivingIsDisabled!="undefined")&&this.props.isSegmentNotAppliedBecauseBrowserArchivingIsDisabled){piwikHelper.modalConfirm($('.pleaseChangeBrowserAchivingDisabledSetting',this.$element),{yes:function(){}});}
 var self=this;this.uriEncodeSegmentDefinition=function(segmentDefinition){segmentDefinition=cleanupSegmentDefinition(segmentDefinition);segmentDefinition=encodeURIComponent(segmentDefinition);return segmentDefinition;};this.changeSegment=function(segmentDefinition){if(piwikHelper.isAngularRenderingThePage()){angular.element(document).injector().invoke(function($location,$rootScope){var $search=$location.search();if(segmentDefinition!==$search.segment){$search.segment=segmentDefinition.replace(/%$/,'%25').replace(/%([^\d].)/g,"%25$1");$location.search($search);setTimeout(function(){try{$rootScope.$apply();}catch(e){}},1);}});return false;}else{return this.forceSegmentReload(segmentDefinition);}};this.forceSegmentReload=function(segmentDefinition){segmentDefinition=this.uriEncodeSegmentDefinition(segmentDefinition);if(piwikHelper.isAngularRenderingThePage()){return broadcast.propagateNewPage('',true,'addSegmentAsNew=&segment='+segmentDefinition);}else{return broadcast.propagateNewPage('segment='+segmentDefinition,true,'addSegmentAsNew=&segment='+segmentDefinition);}};this.changeSegmentList=function(){};var cleanupSegmentDefinition=function(definition){definition=definition.replace(/'/g,"%27");definition=definition.replace(/&/g,"%26");return definition;};var addSegment=function(params){var ajaxHandler=new ajaxHelper();ajaxHandler.setLoadingElement();params.definition=cleanupSegmentDefinition(params.definition);ajaxHandler.addParams($.extend({},params,{"module":'API',"format":'json',"method":'SegmentEditor.add'}),'GET');ajaxHandler.useCallbackInCaseOfError();ajaxHandler.setCallback(function(response){if(response&&response.result=='error'){alert(response.message);}else{params.idsegment=response.value;self.props.availableSegments.push(params);self.rebuild();self.impl.markCurrentSegment();self.$element.find('a.close').click();self.forceSegmentReload(params.definition);self.changeSegmentList(self.props.availableSegments);}});ajaxHandler.send();};var updateSegment=function(params){var ajaxHandler=new ajaxHelper();ajaxHandler.setLoadingElement();params.definition=cleanupSegmentDefinition(params.definition);ajaxHandler.addParams($.extend({},params,{"module":'API',"format":'json',"method":'SegmentEditor.update'}),'GET');ajaxHandler.useCallbackInCaseOfError();ajaxHandler.setCallback(function(response){if(response&&response.result=='error'){alert(response.message);}else{params.idsegment=params.idSegment;var idx=null;for(idx in self.props.availableSegments){if(self.props.availableSegments[idx].idsegment==params.idSegment){break;}}
 $.extend(self.props.availableSegments[idx],params);self.rebuild();self.impl.markCurrentSegment();self.$element.find('a.close').click();self.forceSegmentReload(params.definition);self.changeSegmentList(self.props.availableSegments);}});ajaxHandler.send();};var deleteSegment=function(params){var ajaxHandler=new ajaxHelper();ajaxHandler.addParams({module:'API',format:'json',method:'SegmentEditor.delete'},'GET');ajaxHandler.addParams({idSegment:params.idsegment},'POST');ajaxHandler.setLoadingElement();ajaxHandler.useCallbackInCaseOfError();ajaxHandler.setCallback(function(response){if(response&&response.result=='error'){alert(response.message);}else{self.impl.setSegment('');self.impl.markCurrentSegment();var idx=null;for(idx in self.props.availableSegments){if(self.props.availableSegments[idx].idsegment==params.idsegment){break;}}
 self.props.availableSegments.splice(idx,1);self.rebuild();self.$element.find('a.close').click();self.forceSegmentReload('');$('.ui-dialog-content').dialog('close');self.changeSegmentList(self.props.availableSegments);}});ajaxHandler.send();};function getSegmentFromRequest(){var hashStr=broadcast.getHashFromUrl();var segmentFromRequest;if(hashStr&&hashStr.indexOf('segment=')!==-1){segmentFromRequest=broadcast.getValueFromHash('segment');}else{segmentFromRequest=broadcast.getValueFromHash('segment')||encodeURIComponent(self.props.selectedSegment)||broadcast.getValueFromUrl('segment');}
 segmentFromRequest=decodeURIComponent(segmentFromRequest);return segmentFromRequest;}
-var segmentFromRequest=getSegmentFromRequest();var userSegmentAccess=(this.props.authorizedToCreateSegments)?"write":"read";this.impl=new Segmentation({"target":this.$element.find(".segmentListContainer"),"editorTemplate":$('.SegmentEditor',self.$element),"segmentAccess":userSegmentAccess,"availableSegments":this.props.availableSegments,"addMethod":addSegment,"updateMethod":updateSegment,"deleteMethod":deleteSegment,"segmentSelectMethod":function(){self.changeSegment.apply(self,arguments);},"currentSegmentStr":segmentFromRequest,"translations":this.props.segmentTranslations});this.onMouseUp=function(e){if($(e.target).closest('.segment-element').length===0&&!$(e.target).is('.segment-element')&&$(e.target).hasClass("ui-corner-all")==false&&$(e.target).hasClass("ddmetric")==false&&$(".segment-element:visible",self.$element).length==1){$(".segment-element:visible a.close",self.$element).click();}
-if($(e.target).closest('.segmentListContainer').length===0&&self.$element.hasClass("expanded")){$(".segmentationContainer",self.$element).trigger("click");}};$('body').on('mouseup',this.onMouseUp);initTopControls();};SegmentSelectorControl.initElements=function(){UIControl.initElements(this,'.segmentEditorPanel');};$.extend(SegmentSelectorControl.prototype,UIControl.prototype,{getSegment:function(){return this.impl.getSegment();},setSegment:function(segment){return this.impl.setSegment(segment);},rebuild:function(){this.impl.setAvailableSegments(this.props.availableSegments);this.impl.initHtml();},_destroy:function(){UIControl.prototype._destroy.call(this);$('body').off('mouseup',null,this.onMouseUp);}});exports.SegmentSelectorControl=SegmentSelectorControl;});
+var segmentFromRequest=getSegmentFromRequest();var userSegmentAccess=(this.props.authorizedToCreateSegments)?"write":"read";this.impl=new Segmentation({"target":this.$element.find(".segmentListContainer"),"editorTemplate":$('.SegmentEditor',self.$element),"segmentAccess":userSegmentAccess,"availableSegments":this.props.availableSegments,"addMethod":addSegment,"updateMethod":updateSegment,"deleteMethod":deleteSegment,"segmentSelectMethod":function(){self.changeSegment.apply(self,arguments);},"currentSegmentStr":segmentFromRequest,"translations":this.props.segmentTranslations});this.onMouseUp=function(e){if($(e.target).closest('.segment-element').length===0&&!$(e.target).is('.segment-element')&&$(e.target).hasClass("ui-corner-all")==false&&$(e.target).hasClass("ddmetric")==false&&$(e.target).hasClass("ui-icon-closethick")==false&&$(e.target).hasClass("ui-button-text")==false&&$(".segment-element:visible",self.$element).length==1){if(Piwik_Popover.isOpen()){Piwik_Popover.close();}else{$(".segment-element:visible a.close",self.$element).click();}}
+if($(e.target).closest('.segmentListContainer').length===0&&self.$element.hasClass("expanded")){$(".segmentationContainer",self.$element).trigger("click");}};$('body').on('mouseup',this.onMouseUp);initTopControls();piwikHelper.getAngularDependency('$rootScope').$emit('piwikSegmentationInited');};SegmentSelectorControl.initElements=function(){UIControl.initElements(this,'.segmentEditorPanel');};$.extend(SegmentSelectorControl.prototype,UIControl.prototype,{getSegment:function(){return this.impl.getSegment();},setSegment:function(segment){return this.impl.setSegment(segment);},rebuild:function(){this.impl.setAvailableSegments(this.props.availableSegments);this.impl.initHtml();},_destroy:function(){UIControl.prototype._destroy.call(this);$('body').off('mouseup',null,this.onMouseUp);}});exports.SegmentSelectorControl=SegmentSelectorControl;});
 /*!
  * Piwik - free/libre analytics platform
  *
@@ -3882,7 +4002,8 @@ return model.segments;}).finally(function(){model.isLoading=false;});}}})();
 (function(){angular.module('piwikApp').controller('SegmentGeneratorController',SegmentGeneratorController);SegmentGeneratorController.$inject=['$scope','piwik','piwikApi','segmentGeneratorModel','$filter','$timeout'];var findAndExplodeByMatch=function(metric){var matches=["==","!=","<=",">=","=@","!@","<",">","=^","=$"];var newMetric={};var minPos=metric.length;var match,index;var singleChar=false;for(var key=0;key<matches.length;key++){match=matches[key];index=metric.indexOf(match);if(index!==-1){if(index<minPos){minPos=index;if(match.length===1){singleChar=true;}}}}
 if(minPos<metric.length){if(singleChar==true){newMetric.segment=metric.substr(0,minPos);newMetric.matches=metric.substr(minPos,1);newMetric.value=decodeURIComponent(metric.substr(minPos+1));}else{newMetric.segment=metric.substr(0,minPos);newMetric.matches=metric.substr(minPos,2);newMetric.value=decodeURIComponent(metric.substr(minPos+2));}
 if(newMetric.value==='""'){newMetric.value="";}}
-newMetric.value=decodeURIComponent(newMetric.value);return newMetric;};function generateUniqueId(){var id='';var chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';for(var i=1;i<=10;i++){id+=chars.charAt(Math.floor(Math.random()*chars.length));}
+try{newMetric.value=decodeURIComponent(newMetric.value);}catch(e){}
+return newMetric;};function generateUniqueId(){var id='';var chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';for(var i=1;i<=10;i++){id+=chars.charAt(Math.floor(Math.random()*chars.length));}
 return id;}
 function stripTags(text){if(text){text=(''+text).replace(/(<([^>]+)>)/ig,"");}
 return text;}
@@ -3941,9 +4062,6 @@ var instance=new DataTable_RowActions_VisitorDetails(dataTable);if(dataTable!==n
 this.instance=instance;return instance;}});})();
 var tourEngagement={skipChallenge:function(key){var $challenge=$('.tourEngagement .'+key+' ');$challenge.find('.icon-hide').removeClass('icon-hide').addClass('icon-ok');var ajaxRequest=new ajaxHelper();ajaxRequest.addParams({module:'API',method:'Tour.skipChallenge',id:key},'get');ajaxRequest.withTokenInUrl();ajaxRequest.setFormat('json');ajaxRequest.send();},goToPage:function(page){var ajaxRequest=new ajaxHelper();ajaxRequest.addParams({module:'Tour',action:'getEngagement',page:page},'get');ajaxRequest.withTokenInUrl();ajaxRequest.setFormat('html');ajaxRequest.setCallback(function(callback){$('.widgetBody.tourEngagement').parent().html(callback);})
 ajaxRequest.send();}};
-
-/* Matomo Javascript - cb=6e9823065bae689530e226b5377afc7b*/
-
 /*!
  * jquery-timepicker v1.11.1 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
  * Copyright (c) 2016 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
@@ -3952,299 +4070,299 @@ ajaxRequest.send();}};
 
 !function(a){"object"==typeof exports&&exports&&"object"==typeof module&&module&&module.exports===exports?a(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){function b(a){var b=a[0];return b.offsetWidth>0&&b.offsetHeight>0}function c(b){if(b.minTime&&(b.minTime=t(b.minTime)),b.maxTime&&(b.maxTime=t(b.maxTime)),b.durationTime&&"function"!=typeof b.durationTime&&(b.durationTime=t(b.durationTime)),"now"==b.scrollDefault)b.scrollDefault=function(){return b.roundingFunction(t(new Date),b)};else if(b.scrollDefault&&"function"!=typeof b.scrollDefault){var c=b.scrollDefault;b.scrollDefault=function(){return b.roundingFunction(t(c),b)}}else b.minTime&&(b.scrollDefault=function(){return b.roundingFunction(b.minTime,b)});if("string"===a.type(b.timeFormat)&&b.timeFormat.match(/[gh]/)&&(b._twelveHourTime=!0),b.showOnFocus===!1&&-1!=b.showOn.indexOf("focus")&&b.showOn.splice(b.showOn.indexOf("focus"),1),b.disableTimeRanges.length>0){for(var d in b.disableTimeRanges)b.disableTimeRanges[d]=[t(b.disableTimeRanges[d][0]),t(b.disableTimeRanges[d][1])];b.disableTimeRanges=b.disableTimeRanges.sort(function(a,b){return a[0]-b[0]});for(var d=b.disableTimeRanges.length-1;d>0;d--)b.disableTimeRanges[d][0]<=b.disableTimeRanges[d-1][1]&&(b.disableTimeRanges[d-1]=[Math.min(b.disableTimeRanges[d][0],b.disableTimeRanges[d-1][0]),Math.max(b.disableTimeRanges[d][1],b.disableTimeRanges[d-1][1])],b.disableTimeRanges.splice(d,1))}return b}function d(b){var c=b.data("timepicker-settings"),d=b.data("timepicker-list");if(d&&d.length&&(d.remove(),b.data("timepicker-list",!1)),c.useSelect){d=a("<select />",{"class":"ui-timepicker-select"});var g=d}else{d=a("<ul />",{"class":"ui-timepicker-list"});var g=a("<div />",{"class":"ui-timepicker-wrapper",tabindex:-1});g.css({display:"none",position:"absolute"}).append(d)}if(c.noneOption)if(c.noneOption===!0&&(c.noneOption=c.useSelect?"Time...":"None"),a.isArray(c.noneOption)){for(var i in c.noneOption)if(parseInt(i,10)==i){var k=e(c.noneOption[i],c.useSelect);d.append(k)}}else{var k=e(c.noneOption,c.useSelect);d.append(k)}if(c.className&&g.addClass(c.className),(null!==c.minTime||null!==c.durationTime)&&c.showDuration){"function"==typeof c.step?"function":c.step;g.addClass("ui-timepicker-with-duration"),g.addClass("ui-timepicker-step-"+c.step)}var l=c.minTime;"function"==typeof c.durationTime?l=t(c.durationTime()):null!==c.durationTime&&(l=c.durationTime);var n=null!==c.minTime?c.minTime:0,o=null!==c.maxTime?c.maxTime:n+u-1;n>o&&(o+=u),o===u-1&&"string"===a.type(c.timeFormat)&&c.show2400&&(o=u);var p=c.disableTimeRanges,v=0,x=p.length,y=c.step;"function"!=typeof y&&(y=function(){return c.step});for(var i=n,z=0;o>=i;z++,i+=60*y(z)){var A=i,B=s(A,c);if(c.useSelect){var C=a("<option />",{value:B});C.text(B)}else{var C=a("<li />");C.addClass(43200>A%86400?"ui-timepicker-am":"ui-timepicker-pm"),C.data("time",86400>=A?A:A%86400),C.text(B)}if((null!==c.minTime||null!==c.durationTime)&&c.showDuration){var D=r(i-l,c.step);if(c.useSelect)C.text(C.text()+" ("+D+")");else{var E=a("<span />",{"class":"ui-timepicker-duration"});E.text(" ("+D+")"),C.append(E)}}x>v&&(A>=p[v][1]&&(v+=1),p[v]&&A>=p[v][0]&&A<p[v][1]&&(c.useSelect?C.prop("disabled",!0):C.addClass("ui-timepicker-disabled"))),d.append(C)}if(g.data("timepicker-input",b),b.data("timepicker-list",g),c.useSelect)b.val()&&d.val(f(t(b.val()),c)),d.on("focus",function(){a(this).data("timepicker-input").trigger("showTimepicker")}),d.on("blur",function(){a(this).data("timepicker-input").trigger("hideTimepicker")}),d.on("change",function(){m(b,a(this).val(),"select")}),m(b,d.val(),"initial"),b.hide().after(d);else{var F=c.appendTo;"string"==typeof F?F=a(F):"function"==typeof F&&(F=F(b)),F.append(g),j(b,d),d.on("mousedown click","li",function(c){b.off("focus.timepicker"),b.on("focus.timepicker-ie-hack",function(){b.off("focus.timepicker-ie-hack"),b.on("focus.timepicker",w.show)}),h(b)||b[0].focus(),d.find("li").removeClass("ui-timepicker-selected"),a(this).addClass("ui-timepicker-selected"),q(b)&&(b.trigger("hideTimepicker"),d.on("mouseup.timepicker click.timepicker","li",function(a){d.off("mouseup.timepicker click.timepicker"),g.hide()}))})}}function e(b,c){var d,e,f;return"object"==typeof b?(d=b.label,e=b.className,f=b.value):"string"==typeof b?d=b:a.error("Invalid noneOption value"),c?a("<option />",{value:f,"class":e,text:d}):a("<li />",{"class":e,text:d}).data("time",String(f))}function f(a,b){return a=b.roundingFunction(a,b),null!==a?s(a,b):void 0}function g(b){if(b.target!=window){var c=a(b.target);c.closest(".ui-timepicker-input").length||c.closest(".ui-timepicker-wrapper").length||(w.hide(),a(document).unbind(".ui-timepicker"),a(window).unbind(".ui-timepicker"))}}function h(a){var b=a.data("timepicker-settings");return(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&b.disableTouchKeyboard}function i(b,c,d){if(!d&&0!==d)return!1;var e=b.data("timepicker-settings"),f=!1,d=e.roundingFunction(d,e);return c.find("li").each(function(b,c){var e=a(c);if("number"==typeof e.data("time"))return e.data("time")==d?(f=e,!1):void 0}),f}function j(a,b){b.find("li").removeClass("ui-timepicker-selected");var c=t(l(a),a.data("timepicker-settings"));if(null!==c){var d=i(a,b,c);if(d){var e=d.offset().top-b.offset().top;(e+d.outerHeight()>b.outerHeight()||0>e)&&b.scrollTop(b.scrollTop()+d.position().top-d.outerHeight()),d.addClass("ui-timepicker-selected")}}}function k(b,c){if(""!==this.value&&"timepicker"!=c){var d=a(this);if(!d.is(":focus")||b&&"change"==b.type){var e=d.data("timepicker-settings"),f=t(this.value,e);if(null===f)return void d.trigger("timeFormatError");var g=!1;null!==e.minTime&&f<e.minTime&&null!==e.maxTime&&f>e.maxTime&&(g=!0),a.each(e.disableTimeRanges,function(){return f>=this[0]&&f<this[1]?(g=!0,!1):void 0}),e.forceRoundTime&&(f=e.roundingFunction(f,e));var h=s(f,e);g?m(d,h,"error")&&d.trigger("timeRangeError"):m(d,h)}}}function l(a){return a.is("input")?a.val():a.data("ui-timepicker-value")}function m(a,b,c){if(a.is("input")){a.val(b);var d=a.data("timepicker-settings");d.useSelect&&"select"!=c&&"initial"!=c&&a.data("timepicker-list").val(f(t(b),d))}return a.data("ui-timepicker-value")!=b?(a.data("ui-timepicker-value",b),"select"==c?a.trigger("selectTime").trigger("changeTime").trigger("change","timepicker"):"error"!=c&&a.trigger("changeTime"),!0):(a.trigger("selectTime"),!1)}function n(a){switch(a.keyCode){case 13:case 9:return;default:a.preventDefault()}}function o(c){var d=a(this),e=d.data("timepicker-list");if(!e||!b(e)){if(40!=c.keyCode)return!0;w.show.call(d.get(0)),e=d.data("timepicker-list"),h(d)||d.focus()}switch(c.keyCode){case 13:return q(d)&&w.hide.apply(this),c.preventDefault(),!1;case 38:var f=e.find(".ui-timepicker-selected");return f.length?f.is(":first-child")||(f.removeClass("ui-timepicker-selected"),f.prev().addClass("ui-timepicker-selected"),f.prev().position().top<f.outerHeight()&&e.scrollTop(e.scrollTop()-f.outerHeight())):(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")),!1;case 40:return f=e.find(".ui-timepicker-selected"),0===f.length?(e.find("li").each(function(b,c){return a(c).position().top>0?(f=a(c),!1):void 0}),f.addClass("ui-timepicker-selected")):f.is(":last-child")||(f.removeClass("ui-timepicker-selected"),f.next().addClass("ui-timepicker-selected"),f.next().position().top+2*f.outerHeight()>e.outerHeight()&&e.scrollTop(e.scrollTop()+f.outerHeight())),!1;case 27:e.find("li").removeClass("ui-timepicker-selected"),w.hide();break;case 9:w.hide();break;default:return!0}}function p(c){var d=a(this),e=d.data("timepicker-list"),f=d.data("timepicker-settings");if(!e||!b(e)||f.disableTextInput)return!0;switch(c.keyCode){case 96:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:case 65:case 77:case 80:case 186:case 8:case 46:f.typeaheadHighlight?j(d,e):e.hide()}}function q(a){var b=a.data("timepicker-settings"),c=a.data("timepicker-list"),d=null,e=c.find(".ui-timepicker-selected");return e.hasClass("ui-timepicker-disabled")?!1:(e.length&&(d=e.data("time")),null!==d&&("string"!=typeof d&&(d=s(d,b)),m(a,d,"select")),!0)}function r(a,b){a=Math.abs(a);var c,d,e=Math.round(a/60),f=[];return 60>e?f=[e,v.mins]:(c=Math.floor(e/60),d=e%60,30==b&&30==d&&(c+=v.decimal+5),f.push(c),f.push(1==c?v.hr:v.hrs),30!=b&&d&&(f.push(d),f.push(v.mins))),f.join(" ")}function s(b,c){if("number"!=typeof b)return null;var d=parseInt(b%60),e=parseInt(b/60%60),f=parseInt(b/3600%24),g=new Date(1970,0,2,f,e,d,0);if(isNaN(g.getTime()))return null;if("function"===a.type(c.timeFormat))return c.timeFormat(g);for(var h,i,j="",k=0;k<c.timeFormat.length;k++)switch(i=c.timeFormat.charAt(k)){case"a":j+=g.getHours()>11?v.pm:v.am;break;case"A":j+=g.getHours()>11?v.PM:v.AM;break;case"g":h=g.getHours()%12,j+=0===h?"12":h;break;case"G":h=g.getHours(),b===u&&(h=c.show2400?24:0),j+=h;break;case"h":h=g.getHours()%12,0!==h&&10>h&&(h="0"+h),j+=0===h?"12":h;break;case"H":h=g.getHours(),b===u&&(h=c.show2400?24:0),j+=h>9?h:"0"+h;break;case"i":var e=g.getMinutes();j+=e>9?e:"0"+e;break;case"s":d=g.getSeconds(),j+=d>9?d:"0"+d;break;case"\\":k++,j+=c.timeFormat.charAt(k);break;default:j+=i}return j}function t(a,b){if(""===a||null===a)return null;if("object"==typeof a)return 3600*a.getHours()+60*a.getMinutes()+a.getSeconds();if("string"!=typeof a)return a;a=a.toLowerCase().replace(/[\s\.]/g,""),("a"==a.slice(-1)||"p"==a.slice(-1))&&(a+="m");var c="("+v.am.replace(".","")+"|"+v.pm.replace(".","")+"|"+v.AM.replace(".","")+"|"+v.PM.replace(".","")+")?",d=new RegExp("^"+c+"([0-9]?[0-9])\\W?([0-5][0-9])?\\W?([0-5][0-9])?"+c+"$"),e=a.match(d);if(!e)return null;var f=parseInt(1*e[2],10);if(f>24){if(b&&b.wrapHours===!1)return null;f%=24}var g=e[1]||e[5],h=f;if(12>=f&&g){var i=g==v.pm||g==v.PM;h=12==f?i?12:0:f+(i?12:0)}var j=1*e[3]||0,k=1*e[4]||0,l=3600*h+60*j+k;if(12>f&&!g&&b&&b._twelveHourTime&&b.scrollDefault){var m=l-b.scrollDefault();0>m&&m>=u/-2&&(l=(l+u/2)%u)}return l}var u=86400,v={am:"am",pm:"pm",AM:"AM",PM:"PM",decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},w={init:function(b){return this.each(function(){var e=a(this),f=[];for(var g in a.fn.timepicker.defaults)e.data(g)&&(f[g]=e.data(g));var h=a.extend({},a.fn.timepicker.defaults,f,b);if(h.lang&&(v=a.extend(v,h.lang)),h=c(h),e.data("timepicker-settings",h),e.addClass("ui-timepicker-input"),h.useSelect)d(e);else{if(e.prop("autocomplete","off"),h.showOn)for(var i in h.showOn)e.on(h.showOn[i]+".timepicker",w.show);e.on("change.timepicker",k),e.on("keydown.timepicker",o),e.on("keyup.timepicker",p),h.disableTextInput&&e.on("keydown.timepicker",n),k.call(e.get(0))}})},show:function(c){var e=a(this),f=e.data("timepicker-settings");if(c&&c.preventDefault(),f.useSelect)return void e.data("timepicker-list").focus();h(e)&&e.blur();var k=e.data("timepicker-list");if(!e.prop("readonly")&&(k&&0!==k.length&&"function"!=typeof f.durationTime||(d(e),k=e.data("timepicker-list")),!b(k))){e.data("ui-timepicker-value",e.val()),j(e,k),w.hide(),k.show();var m={};f.orientation.match(/r/)?m.left=e.offset().left+e.outerWidth()-k.outerWidth()+parseInt(k.css("marginLeft").replace("px",""),10):m.left=e.offset().left+parseInt(k.css("marginLeft").replace("px",""),10);var n;n=f.orientation.match(/t/)?"t":f.orientation.match(/b/)?"b":e.offset().top+e.outerHeight(!0)+k.outerHeight()>a(window).height()+a(window).scrollTop()?"t":"b","t"==n?(k.addClass("ui-timepicker-positioned-top"),m.top=e.offset().top-k.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)):(k.removeClass("ui-timepicker-positioned-top"),m.top=e.offset().top+e.outerHeight()+parseInt(k.css("marginTop").replace("px",""),10)),k.offset(m);var o=k.find(".ui-timepicker-selected");if(!o.length){var p=t(l(e));null!==p?o=i(e,k,p):f.scrollDefault&&(o=i(e,k,f.scrollDefault()))}if(o&&o.length){var q=k.scrollTop()+o.position().top-o.outerHeight();k.scrollTop(q)}else k.scrollTop(0);return f.stopScrollPropagation&&a(document).on("wheel.ui-timepicker",".ui-timepicker-wrapper",function(b){b.preventDefault();var c=a(this).scrollTop();a(this).scrollTop(c+b.originalEvent.deltaY)}),a(document).on("touchstart.ui-timepicker mousedown.ui-timepicker",g),a(window).on("resize.ui-timepicker",g),f.closeOnWindowScroll&&a(document).on("scroll.ui-timepicker",g),e.trigger("showTimepicker"),this}},hide:function(c){var d=a(this),e=d.data("timepicker-settings");return e&&e.useSelect&&d.blur(),a(".ui-timepicker-wrapper").each(function(){var c=a(this);if(b(c)){var d=c.data("timepicker-input"),e=d.data("timepicker-settings");e&&e.selectOnBlur&&q(d),c.hide(),d.trigger("hideTimepicker")}}),this},option:function(b,e){return"string"==typeof b&&"undefined"==typeof e?a(this).data("timepicker-settings")[b]:this.each(function(){var f=a(this),g=f.data("timepicker-settings"),h=f.data("timepicker-list");"object"==typeof b?g=a.extend(g,b):"string"==typeof b&&(g[b]=e),g=c(g),f.data("timepicker-settings",g),h&&(h.remove(),f.data("timepicker-list",!1)),g.useSelect&&d(f)})},getSecondsFromMidnight:function(){return t(l(this))},getTime:function(a){var b=this,c=l(b);if(!c)return null;var d=t(c);if(null===d)return null;a||(a=new Date);var e=new Date(a);return e.setHours(d/3600),e.setMinutes(d%3600/60),e.setSeconds(d%60),e.setMilliseconds(0),e},isVisible:function(){var a=this,c=a.data("timepicker-list");return!(!c||!b(c))},setTime:function(a){var b=this,c=b.data("timepicker-settings");if(c.forceRoundTime)var d=f(t(a),c);else var d=s(t(a),c);return a&&null===d&&c.noneOption&&(d=a),m(b,d),b.data("timepicker-list")&&j(b,b.data("timepicker-list")),this},remove:function(){var a=this;if(a.hasClass("ui-timepicker-input")){var b=a.data("timepicker-settings");return a.removeAttr("autocomplete","off"),a.removeClass("ui-timepicker-input"),a.removeData("timepicker-settings"),a.off(".timepicker"),a.data("timepicker-list")&&a.data("timepicker-list").remove(),b.useSelect&&a.show(),a.removeData("timepicker-list"),this}}};a.fn.timepicker=function(b){return this.length?w[b]?this.hasClass("ui-timepicker-input")?w[b].apply(this,Array.prototype.slice.call(arguments,1)):this:"object"!=typeof b&&b?void a.error("Method "+b+" does not exist on jQuery.timepicker"):w.init.apply(this,arguments):this},a.fn.timepicker.defaults={appendTo:"body",className:null,closeOnWindowScroll:!1,disableTextInput:!1,disableTimeRanges:[],disableTouchKeyboard:!1,durationTime:null,forceRoundTime:!1,maxTime:null,minTime:null,noneOption:!1,orientation:"l",roundingFunction:function(a,b){if(null===a)return null;if("number"!=typeof b.step)return a;var c=a%(60*b.step);return c>=30*b.step?a+=60*b.step-c:a-=c,a==u&&b.show2400?a:a%u},scrollDefault:null,selectOnBlur:!1,show2400:!1,showDuration:!1,showOn:["click","focus"],showOnFocus:!0,step:30,stopScrollPropagation:!1,timeFormat:"g:ia",typeaheadHighlight:!0,useSelect:!1,wrapHours:!0}});
 (function($){var tagManagerHelper={};tagManagerHelper.editTrigger=function($scope,idContainer,idContainerVersion,idTag,callback){if(!$scope){$scope=piwikHelper.getAngularDependency('$rootScope');}
-    var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-trigger-edit id-container="idContainer" on-change-trigger="onChangeTrigger(trigger)" id-container-version="idContainerVersion" id-trigger="'+parseInt(idTag,10)+'"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
-    var params={idContainer:idContainer,idContainerVersion:idContainerVersion,onChangeTrigger:function(trigger){if('function'===typeof callback){callback(trigger);}
-            template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.createNewVersion=function(){var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');var containerId=piwikUrl.getSearchParam('idContainer');this.editVersion(null,containerId,0,function(){window.location.reload();});};tagManagerHelper.editVersion=function($scope,idContainer,idContainerVersion,callback){if(!$scope){$scope=piwikHelper.getAngularDependency('$rootScope');}
-    var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-version-edit id-container="idContainer" on-change-version="onChangeVersion(version)" id-container-version="idContainerVersion"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
-    var params={idContainer:idContainer,idContainerVersion:parseInt(idContainerVersion,10),onChangeVersion:function(version){if('function'===typeof callback){callback(version);}
-            template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.editVariable=function($scope,idContainer,idContainerVersion,idVariable,callback,variableType){if(!$scope){$scope=piwikHelper.getAngularDependency('$rootScope');}
-    var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-variable-edit id-container="idContainer" variable-type="variableType" on-change-variable="onChangeVariable(variable)" id-container-version="idContainerVersion" id-variable="idVariable"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
-    var params={idContainer:idContainer,idVariable:idVariable,variableType:variableType,idContainerVersion:parseInt(idContainerVersion,10),onChangeVariable:function(variable){if('function'===typeof callback){callback(variable);}
-            template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.selectVariable=function(callback){var $scope=piwikHelper.getAngularDependency('$rootScope');var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');var containerId=piwikUrl.getSearchParam('idContainer');var childScope=$scope.$new(true,$scope);var template=$('<div class="ui-confirm"><h2>Select a variable</h2><div piwik-variable-select id-container="idContainer" on-select-variable="onSelectVariable(variable)"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
-    var params={idContainer:containerId,onSelectVariable:function(variable){if('function'===typeof callback){callback(variable);}
-            template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.insertTextSnippetAtElement=function(inputField,textToAdd){if(!inputField||!textToAdd){return;}
-    var scrollPos=inputField.scrollTop;var startPos=inputField.selectionStart;var endPos=inputField.selectionEnd;var value=String(inputField.value);var valueBefore=value.substring(0,startPos);var valueAfter=value.substring(endPos,value.length);inputField.value=valueBefore+textToAdd+valueAfter;inputField.selectionStart=startPos+textToAdd.length;inputField.selectionEnd=startPos+textToAdd.length;inputField.focus();inputField.scrollTop=scrollPos;$(inputField).change();};tagManagerHelper.showInstallCode=function(idContainer){var $scope=piwikHelper.getAngularDependency('$rootScope');var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-manage-install-tag-code id-container="{{ idContainer }}"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/>')
-    var params={idContainer:idContainer};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.enablePreviewMode=function(idContainer,idContainerVersion){if(!idContainerVersion){idContainerVersion=0;}
-    var piwikApi=piwikHelper.getAngularDependency('piwikApi');var params={method:'TagManager.enablePreviewMode',idContainer:idContainer,idContainerVersion:idContainerVersion};piwikHelper.modalConfirm('<h2>'+_pk_translate('TagManager_EnablingPreviewPleaseWait')+'</h2>',{});piwikApi.fetch(params).then(function(){window.location.reload();});};tagManagerHelper.disablePreviewMode=function(idContainer){var piwikApi=piwikHelper.getAngularDependency('piwikApi');var params={method:'TagManager.disablePreviewMode',idContainer:idContainer};piwikHelper.modalConfirm('<h2>'+_pk_translate('TagManager_DisablingPreviewPleaseWait')+'</h2>',{});piwikApi.fetch(params).then(function(){window.location.reload();});};tagManagerHelper.importVersion=function($scope,idContainer){var childScope=$scope.$new(true,$scope);var template=$('<div class="ui-confirm"><div piwik-import-version id-container="idContainer"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/>')
-    var params={idContainer:idContainer};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};window.tagManagerHelper=tagManagerHelper;})(jQuery);
+var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-trigger-edit id-container="idContainer" on-change-trigger="onChangeTrigger(trigger)" id-container-version="idContainerVersion" id-trigger="'+parseInt(idTag,10)+'"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
+var params={idContainer:idContainer,idContainerVersion:idContainerVersion,onChangeTrigger:function(trigger){if('function'===typeof callback){callback(trigger);}
+template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.createNewVersion=function(){var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');var containerId=piwikUrl.getSearchParam('idContainer');this.editVersion(null,containerId,0,function(){window.location.reload();});};tagManagerHelper.editVersion=function($scope,idContainer,idContainerVersion,callback){if(!$scope){$scope=piwikHelper.getAngularDependency('$rootScope');}
+var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-version-edit id-container="idContainer" on-change-version="onChangeVersion(version)" id-container-version="idContainerVersion"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
+var params={idContainer:idContainer,idContainerVersion:parseInt(idContainerVersion,10),onChangeVersion:function(version){if('function'===typeof callback){callback(version);}
+template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.editVariable=function($scope,idContainer,idContainerVersion,idVariable,callback,variableType){if(!$scope){$scope=piwikHelper.getAngularDependency('$rootScope');}
+var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-variable-edit id-container="idContainer" variable-type="variableType" on-change-variable="onChangeVariable(variable)" id-container-version="idContainerVersion" id-variable="idVariable"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
+var params={idContainer:idContainer,idVariable:idVariable,variableType:variableType,idContainerVersion:parseInt(idContainerVersion,10),onChangeVariable:function(variable){if('function'===typeof callback){callback(variable);}
+template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.selectVariable=function(callback){var $scope=piwikHelper.getAngularDependency('$rootScope');var piwikUrl=piwikHelper.getAngularDependency('piwikUrl');var containerId=piwikUrl.getSearchParam('idContainer');var childScope=$scope.$new(true,$scope);var template=$('<div class="ui-confirm"><h2>Select a variable</h2><div piwik-variable-select id-container="idContainer" on-select-variable="onSelectVariable(variable)"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/></div>')
+var params={idContainer:containerId,onSelectVariable:function(variable){if('function'===typeof callback){callback(variable);}
+template.parents('.modal.open').closeModal();}};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.insertTextSnippetAtElement=function(inputField,textToAdd){if(!inputField||!textToAdd){return;}
+var scrollPos=inputField.scrollTop;var startPos=inputField.selectionStart;var endPos=inputField.selectionEnd;var value=String(inputField.value);var valueBefore=value.substring(0,startPos);var valueAfter=value.substring(endPos,value.length);inputField.value=valueBefore+textToAdd+valueAfter;inputField.selectionStart=startPos+textToAdd.length;inputField.selectionEnd=startPos+textToAdd.length;inputField.focus();inputField.scrollTop=scrollPos;$(inputField).change();};tagManagerHelper.showInstallCode=function(idContainer){var $scope=piwikHelper.getAngularDependency('$rootScope');var childScope=$scope.$new(true,$scope);var template=$('<div class="tag-ui-confirm"><div piwik-manage-install-tag-code id-container="{{ idContainer }}"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/>')
+var params={idContainer:idContainer};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};tagManagerHelper.enablePreviewMode=function(idContainer,idContainerVersion){if(!idContainerVersion){idContainerVersion=0;}
+var piwikApi=piwikHelper.getAngularDependency('piwikApi');var params={method:'TagManager.enablePreviewMode',idContainer:idContainer,idContainerVersion:idContainerVersion};piwikHelper.modalConfirm('<h2>'+_pk_translate('TagManager_EnablingPreviewPleaseWait')+'</h2>',{});piwikApi.fetch(params).then(function(){window.location.reload();});};tagManagerHelper.disablePreviewMode=function(idContainer){var piwikApi=piwikHelper.getAngularDependency('piwikApi');var params={method:'TagManager.disablePreviewMode',idContainer:idContainer};piwikHelper.modalConfirm('<h2>'+_pk_translate('TagManager_DisablingPreviewPleaseWait')+'</h2>',{});piwikApi.fetch(params).then(function(){window.location.reload();});};tagManagerHelper.importVersion=function($scope,idContainer){var childScope=$scope.$new(true,$scope);var template=$('<div class="ui-confirm"><div piwik-import-version id-container="idContainer"></div><input role="no" type="button" value="'+_pk_translate('General_Cancel')+'"/>')
+var params={idContainer:idContainer};piwikHelper.compileAngularComponents(template,{scope:childScope,params:params});piwikHelper.modalConfirm(template,{},{extraWide:true,complete:function(){childScope.$destroy();template.empty();}});};window.tagManagerHelper=tagManagerHelper;})(jQuery);
 (function(){angular.module('piwikApp').factory('tagManagerContainerModel',tagManagerContainerModel);tagManagerContainerModel.$inject=['piwikApi','$q','$filter'];function tagManagerContainerModel(piwikApi,$q,$filter){var fetchPromise=null;var contextPromise=null;var translate=$filter('translate');var model={containers:[],isLoading:false,isUpdating:false,findContainer:findContainer,createOrUpdateContainer:createOrUpdateContainer,deleteContainer:deleteContainer,fetchAvailableContexts:fetchAvailableContexts,reload:reload,fetchContainers:fetchContainers};return model;function reload(){model.containers=[];fetchPromise=null;return fetchContainers();}
-    function fetchContainers(){var params={method:'TagManager.getContainers',filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
-        model.isLoading=true;model.containers=[];return fetchPromise.then(function(containers){model.containers=containers;model.isLoading=false;return containers;},function(){model.isLoading=false;});}
-    function fetchAvailableContexts(){if(!contextPromise){var params={method:'TagManager.getAvailableContexts',filter_limit:'-1'};contextPromise=piwikApi.fetch(params);}
-        return contextPromise;}
-    function findContainer(idContainer){var found;angular.forEach(model.containers,function(container){if(!found&&container.idcontainer===idContainer){found=container;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
-        model.isLoading=true;return piwikApi.fetch({idContainer:idContainer,method:'TagManager.getContainer',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
-    function deleteContainer(idContainer){model.isUpdating=true;model.containers=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idContainer:idContainer,method:'TagManager.deleteContainer'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function createOrUpdateContainer(container,method){container=angular.copy(container);container.method=method;var map={idContainer:'idcontainer',};angular.forEach(map,function(value,key){if(typeof container[value]!=='undefined'){container[key]=container[value];delete container[value];}});var postParams=[];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof container[postParam]!=='undefined'){post[postParam]=container[postParam];delete container[postParam];}}
-        model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(container,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
+function fetchContainers(){var params={method:'TagManager.getContainers',filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
+model.isLoading=true;model.containers=[];return fetchPromise.then(function(containers){model.containers=containers;model.isLoading=false;return containers;},function(){model.isLoading=false;});}
+function fetchAvailableContexts(){if(!contextPromise){var params={method:'TagManager.getAvailableContexts',filter_limit:'-1'};contextPromise=piwikApi.fetch(params);}
+return contextPromise;}
+function findContainer(idContainer){var found;angular.forEach(model.containers,function(container){if(!found&&container.idcontainer===idContainer){found=container;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
+model.isLoading=true;return piwikApi.fetch({idContainer:idContainer,method:'TagManager.getContainer',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
+function deleteContainer(idContainer){model.isUpdating=true;model.containers=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idContainer:idContainer,method:'TagManager.deleteContainer'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function createOrUpdateContainer(container,method){container=angular.copy(container);container.method=method;var map={idContainer:'idcontainer',};angular.forEach(map,function(value,key){if(typeof container[value]!=='undefined'){container[key]=container[value];delete container[value];}});var postParams=[];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof container[postParam]!=='undefined'){post[postParam]=container[postParam];delete container[postParam];}}
+model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(container,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
 (function(){angular.module('piwikApp').controller('ContainerListController',ContainerListController);ContainerListController.$inject=['$scope','tagManagerContainerModel','piwik','piwikApi','$location'];function ContainerListController($scope,tagManagerContainerModel,piwik,piwikApi,$location){this.model=tagManagerContainerModel;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');if(this.hasWriteAccess){this.containerDefaultAction='dashboard';}else{this.containerDefaultAction='manageTags';}
-    var self=this;this.contexts={};this.createContainer=function(){this.editContainer(0);};this.editContainer=function(idContainer){var $search=$location.search();$search.idContainer=idContainer;$location.search($search);};this.installCode=function(idContainer){tagManagerHelper.showInstallCode(idContainer);};this.deleteContainer=function(container){function doDelete(){tagManagerContainerModel.deleteContainer(container.idcontainer).then(function(){tagManagerContainerModel.reload();});}
-        piwik.helper.modalConfirm('#confirmDeleteContainer',{yes:doDelete});};this.truncateText=function(text,length){if(text&&(text+'').length>length){return String(text).substr(0,length-3)+'...';}
-        return text;};this.model.fetchContainers();this.model.fetchAvailableContexts().then(function(contexts){self.contexts={};angular.forEach(contexts,function(context){self.contexts[context.id]=context.name;});});}})();
+var self=this;this.contexts={};this.createContainer=function(){this.editContainer(0);};this.editContainer=function(idContainer){var $search=$location.search();$search.idContainer=idContainer;$location.search($search);};this.installCode=function(idContainer){tagManagerHelper.showInstallCode(idContainer);};this.deleteContainer=function(container){function doDelete(){tagManagerContainerModel.deleteContainer(container.idcontainer).then(function(){tagManagerContainerModel.reload();});}
+piwik.helper.modalConfirm('#confirmDeleteContainer',{yes:doDelete});};this.truncateText=function(text,length){if(text&&(text+'').length>length){return String(text).substr(0,length-3)+'...';}
+return text;};this.model.fetchContainers();this.model.fetchAvailableContexts().then(function(contexts){self.contexts={};angular.forEach(contexts,function(context){self.contexts[context.id]=context.name;});});}})();
 (function(){angular.module('piwikApp').directive('piwikContainerList',piwikContainerList);piwikContainerList.$inject=['piwik'];function piwikContainerList(piwik){return{restrict:'A',scope:{},templateUrl:'plugins/TagManager/angularjs/manageContainer/list.directive.html?cb='+piwik.cacheBuster,controller:'ContainerListController',controllerAs:'containerList'};}})();
 (function(){angular.module('piwikApp').controller('ContainerEditController',ContainerEditController);ContainerEditController.$inject=['$scope','tagManagerContainerModel','piwik','$location','$filter','$timeout','$rootScope'];function ContainerEditController($scope,tagManagerContainerModel,piwik,$location,$filter,$timeout,$rootScope){var self=this;var currentId=null;var notificationId='containertagmanagement';var translate=$filter('translate');this.isDirty=false;this.model=tagManagerContainerModel;this.contexts=[];tagManagerContainerModel.fetchAvailableContexts().then(function(contexts){self.contexts=[];angular.forEach(contexts,function(context){self.contexts.push({key:context.id,value:context.name});});});function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyContainerNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    function showErrorFieldNotProvidedNotification(title){var message=_pk_translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
-    function init(idContainer){self.create=idContainer=='0';self.edit=!self.create;self.container={};piwik.helper.lazyScrollToContent();if(self.edit&&idContainer){self.editTitle=translate('TagManager_EditContainer');self.model.findContainer(idContainer).then(function(container){if(!container){return;}
-        self.container=angular.copy(container);self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_CreateNewContainer');self.container={idSite:piwik.idSite,name:'',context:'web',description:''};self.isDirty=false;}}
-    this.cancel=function(){$scope.idContainer=null;currentId=null;var $search=$location.search();delete $search.idContainer;$location.search($search);};$scope.$on('$destroy',function(){$scope.idContainer=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.container.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
-        return true;}
-    this.createContainer=function(){removeAnyContainerNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerContainerModel.createOrUpdateContainer(this.container,'TagManager.addContainer').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
-            self.isDirty=false;var idContainer=response.response.value;showNotification(translate('TagManager_CreatedX',translate('TagManager_Container')),response.type);var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action=dashboard',newUrl);newUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,newUrl);window.location.href=newUrl;},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateContainer=function(){removeAnyContainerNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerContainerModel.createOrUpdateContainer(this.container,'TagManager.updateContainer').then(function(response){if(response.type==='error'){return;}
-            var idContainer=self.container.idcontainer;self.isDirty=false;self.container={};tagManagerContainerModel.reload().then(function(){init(idContainer);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Container')),response.type);});};$scope.$watch('idContainer',function(newValue,oldValue){if(newValue===null){return;}
-        if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
+function removeAnyContainerNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+function showErrorFieldNotProvidedNotification(title){var message=_pk_translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
+function init(idContainer){self.create=idContainer=='0';self.edit=!self.create;self.container={};piwik.helper.lazyScrollToContent();if(self.edit&&idContainer){self.editTitle=translate('TagManager_EditContainer');self.model.findContainer(idContainer).then(function(container){if(!container){return;}
+self.container=angular.copy(container);self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_CreateNewContainer');self.container={idSite:piwik.idSite,name:'',context:'web',description:''};self.isDirty=false;}}
+this.cancel=function(){$scope.idContainer=null;currentId=null;var $search=$location.search();delete $search.idContainer;$location.search($search);};$scope.$on('$destroy',function(){$scope.idContainer=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.container.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
+return true;}
+this.createContainer=function(){removeAnyContainerNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerContainerModel.createOrUpdateContainer(this.container,'TagManager.addContainer').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
+self.isDirty=false;var idContainer=response.response.value;showNotification(translate('TagManager_CreatedX',translate('TagManager_Container')),response.type);var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action=dashboard',newUrl);newUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,newUrl);window.location.href=newUrl;},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateContainer=function(){removeAnyContainerNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerContainerModel.createOrUpdateContainer(this.container,'TagManager.updateContainer').then(function(response){if(response.type==='error'){return;}
+var idContainer=self.container.idcontainer;self.isDirty=false;self.container={};tagManagerContainerModel.reload().then(function(){init(idContainer);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Container')),response.type);});};$scope.$watch('idContainer',function(newValue,oldValue){if(newValue===null){return;}
+if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
 (function(){angular.module('piwikApp').directive('piwikContainerEdit',piwikContainerEdit);piwikContainerEdit.$inject=['piwik'];function piwikContainerEdit(piwik){return{restrict:'A',scope:{idContainer:'='},templateUrl:'plugins/TagManager/angularjs/manageContainer/edit.directive.html?cb='+piwik.cacheBuster,controller:'ContainerEditController',controllerAs:'editContainer'};}})();
 (function(){angular.module('piwikApp').controller('ManageContainerController',ManageContainerController);ManageContainerController.$inject=['$scope','$rootScope','$location'];function ManageContainerController($scope,$rootScope,$location){this.editMode=false;var self=this;function removeAnyContainerNotification(){var UI=require('piwik/UI');new UI.Notification().remove('containertagmanagement');}
-    function initState(){var $search=$location.search();if('idContainer'in $search){if($search.idContainer===0||$search.idContainer==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddContainer',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idContainer=null;return;}}
-        self.editMode=true;self.idContainer=$search.idContainer;}else{self.editMode=false;self.idContainer=null;}
-        removeAnyContainerNotification();}
-    initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
+function initState(){var $search=$location.search();if('idContainer'in $search){if($search.idContainer===0||$search.idContainer==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddContainer',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idContainer=null;return;}}
+self.editMode=true;self.idContainer=$search.idContainer;}else{self.editMode=false;self.idContainer=null;}
+removeAnyContainerNotification();}
+initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
 (function(){angular.module('piwikApp').directive('piwikContainerManage',piwikContainerManage);piwikContainerManage.$inject=['piwik'];function piwikContainerManage(piwik){return{restrict:'A',templateUrl:'plugins/TagManager/angularjs/manageContainer/manage.directive.html?cb='+piwik.cacheBuster,controller:'ManageContainerController',controllerAs:'manageContainer'};}})();
 (function(){angular.module('piwikApp').factory('tagManagerVersionModel',tagManagerVersionModel);tagManagerVersionModel.$inject=['piwikApi','$q','$filter'];function tagManagerVersionModel(piwikApi,$q,$filter){var fetchPromise=null;var environmentPublishPromise=null;var translate=$filter('translate');var model={versions:[],isLoading:false,isUpdating:false,findVersion:findVersion,createOrUpdateVersion:createOrUpdateVersion,deleteVersion:deleteVersion,publishVersion:publishVersion,fetchAvailableEnvironmentsWithPublishPermission:fetchAvailableEnvironmentsWithPublishPermission,reload:reload,fetchVersions:fetchVersions};return model;function reload(idContainer){model.versions=[];fetchPromise=null;return fetchVersions(idContainer);}
-    function fetchVersions(idContainer){var params={method:'TagManager.getContainerVersions',idContainer:idContainer,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
-        model.isLoading=true;model.versions=[];return fetchPromise.then(function(versions){model.versions=versions;model.isLoading=false;return versions;},function(){model.isLoading=false;});}
-    function fetchAvailableEnvironmentsWithPublishPermission(){if(!environmentPublishPromise){var params={method:'TagManager.getAvailableEnvironmentsWithPublishCapability',filter_limit:'-1'};environmentPublishPromise=piwikApi.fetch(params);}
-        return environmentPublishPromise;}
-    function findVersion(idContainer,idContainerVersion){var found;angular.forEach(model.versions,function(version){if(!found&&parseInt(version.idcontainerversion,10)===idContainerVersion){found=version;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
-        model.isLoading=true;return piwikApi.fetch({idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.getContainerVersion',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
-    function deleteVersion(idContainer,idContainerVersion){model.isUpdating=true;model.versions=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.deleteContainerVersion'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function publishVersion(idContainer,idContainerVersion,environment){model.isUpdating=true;var params={idContainer:idContainer,idContainerVersion:idContainerVersion,environment:environment,method:'TagManager.publishContainerVersion'};return piwikApi.fetch(params).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function createOrUpdateVersion(version,method){version=angular.copy(version);version.method=method;var map={idContainerVersion:'idcontainerversion',idContainer:'idcontainer',};angular.forEach(map,function(value,key){if(typeof version[value]!=='undefined'){version[key]=version[value];delete version[value];}});var postParams=[];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof version[postParam]!=='undefined'){post[postParam]=version[postParam];delete version[postParam];}}
-        model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(version,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
+function fetchVersions(idContainer){var params={method:'TagManager.getContainerVersions',idContainer:idContainer,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
+model.isLoading=true;model.versions=[];return fetchPromise.then(function(versions){model.versions=versions;model.isLoading=false;return versions;},function(){model.isLoading=false;});}
+function fetchAvailableEnvironmentsWithPublishPermission(){if(!environmentPublishPromise){var params={method:'TagManager.getAvailableEnvironmentsWithPublishCapability',filter_limit:'-1'};environmentPublishPromise=piwikApi.fetch(params);}
+return environmentPublishPromise;}
+function findVersion(idContainer,idContainerVersion){var found;angular.forEach(model.versions,function(version){if(!found&&parseInt(version.idcontainerversion,10)===idContainerVersion){found=version;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
+model.isLoading=true;return piwikApi.fetch({idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.getContainerVersion',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
+function deleteVersion(idContainer,idContainerVersion){model.isUpdating=true;model.versions=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.deleteContainerVersion'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function publishVersion(idContainer,idContainerVersion,environment){model.isUpdating=true;var params={idContainer:idContainer,idContainerVersion:idContainerVersion,environment:environment,method:'TagManager.publishContainerVersion'};return piwikApi.fetch(params).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function createOrUpdateVersion(version,method){version=angular.copy(version);version.method=method;var map={idContainerVersion:'idcontainerversion',idContainer:'idcontainer',};angular.forEach(map,function(value,key){if(typeof version[value]!=='undefined'){version[key]=version[value];delete version[value];}});var postParams=[];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof version[postParam]!=='undefined'){post[postParam]=version[postParam];delete version[postParam];}}
+model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(version,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
 (function(){angular.module('piwikApp').factory('tagManagerVersionDiff',tagManagerVersionDiff);tagManagerVersionDiff.$inject=['piwikApi','$q'];function tagManagerVersionDiff(piwikApi,$q){var model={diffDraftVersion:diffDraftVersion};return model;function diffDraftVersion(idContainer,idContainerVersionNew,idContainerVersionPrevious){function findEntryInArray(array,name){for(var j=0;j<array.length;j++){if(name===array[j].name){return array[j];}}}
-    function getDifference(entityType,array1,array2,keysToCheck){var diff=[];var i;for(i=0;i<array1.length;i++){var matchingEntry=findEntryInArray(array2,array1[i].name);var found=false;if(!!matchingEntry){found=true;var j;for(j=0;j<keysToCheck.length;j++){if(JSON.stringify(array1[i][keysToCheck[j]])!==JSON.stringify(matchingEntry[keysToCheck[j]])){diff.push({entityType:entityType,type:'TagManager_DiffModified',name:array1[i].name,lastChanged:array1[i].updated_date_pretty});break;}}}
-        if(!found){diff.push({entityType:entityType,type:'TagManager_DiffAdded',name:array1[i].name,lastChanged:array1[i].updated_date_pretty});}}
-        for(i=0;i<array2.length;i++){if(!findEntryInArray(array1,array2[i].name)){diff.push({entityType:entityType,type:'TagManager_DiffDeleted',name:array2[i].name,lastChanged:array2[i].updated_date_pretty});}}
-        return diff;}
-    function mixinTagTriggers(tags,triggers){angular.forEach(tags,function(tag){tag.fire_triggers=[];tag.block_triggers=[];angular.forEach(tag.fire_trigger_ids,function(idtrigger){angular.forEach(triggers,function(trigger){if(trigger.idtrigger===idtrigger){tag.fire_triggers.push(trigger.name);}});});angular.forEach(tag.block_trigger_ids,function(idtrigger){angular.forEach(triggers,function(trigger){if(trigger.idtrigger===idtrigger){tag.block_triggers.push(trigger.name);}});});});}
-    var draftVersion={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:idContainer,filter_limit:-1,};if(idContainerVersionNew){draftVersion.idContainerVersion=idContainerVersionNew;}
-    var lastVersion={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:idContainer,idContainerVersion:idContainerVersionPrevious,filter_limit:-1,};var deferred=$q.defer();piwikApi.bulkFetch([draftVersion,lastVersion]).then(function(response){mixinTagTriggers(response[0].tags,response[0].triggers);mixinTagTriggers(response[1].tags,response[1].triggers);var diff1=getDifference('TagManager_Tag',response[0].tags,response[1].tags,['name','type','fire_limit','priority','fire_delay','fire_triggers','block_triggers','parameters']);var diff2=getDifference('TagManager_Trigger',response[0].triggers,response[1].triggers,['name','type','conditions','parameters']);var diff3=getDifference('TagManager_Variable',response[0].variables,response[1].variables,['name','type','lookup_table','default_value','parameters']);var diff=[];diff=diff.concat(diff1,diff2,diff3);deferred.resolve(diff);});return deferred.promise;}}})();
+function getDifference(entityType,array1,array2,keysToCheck){var diff=[];var i;for(i=0;i<array1.length;i++){var matchingEntry=findEntryInArray(array2,array1[i].name);var found=false;if(!!matchingEntry){found=true;var j;for(j=0;j<keysToCheck.length;j++){if(JSON.stringify(array1[i][keysToCheck[j]])!==JSON.stringify(matchingEntry[keysToCheck[j]])){diff.push({entityType:entityType,type:'TagManager_DiffModified',name:array1[i].name,lastChanged:array1[i].updated_date_pretty});break;}}}
+if(!found){diff.push({entityType:entityType,type:'TagManager_DiffAdded',name:array1[i].name,lastChanged:array1[i].updated_date_pretty});}}
+for(i=0;i<array2.length;i++){if(!findEntryInArray(array1,array2[i].name)){diff.push({entityType:entityType,type:'TagManager_DiffDeleted',name:array2[i].name,lastChanged:array2[i].updated_date_pretty});}}
+return diff;}
+function mixinTagTriggers(tags,triggers){angular.forEach(tags,function(tag){tag.fire_triggers=[];tag.block_triggers=[];angular.forEach(tag.fire_trigger_ids,function(idtrigger){angular.forEach(triggers,function(trigger){if(trigger.idtrigger===idtrigger){tag.fire_triggers.push(trigger.name);}});});angular.forEach(tag.block_trigger_ids,function(idtrigger){angular.forEach(triggers,function(trigger){if(trigger.idtrigger===idtrigger){tag.block_triggers.push(trigger.name);}});});});}
+var draftVersion={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:idContainer,filter_limit:-1,};if(idContainerVersionNew){draftVersion.idContainerVersion=idContainerVersionNew;}
+var lastVersion={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:idContainer,idContainerVersion:idContainerVersionPrevious,filter_limit:-1,};var deferred=$q.defer();piwikApi.bulkFetch([draftVersion,lastVersion]).then(function(response){mixinTagTriggers(response[0].tags,response[0].triggers);mixinTagTriggers(response[1].tags,response[1].triggers);var diff1=getDifference('TagManager_Tag',response[0].tags,response[1].tags,['name','type','fire_limit','priority','fire_delay','fire_triggers','block_triggers','parameters']);var diff2=getDifference('TagManager_Trigger',response[0].triggers,response[1].triggers,['name','type','conditions','parameters']);var diff3=getDifference('TagManager_Variable',response[0].variables,response[1].variables,['name','type','lookup_table','default_value','parameters']);var diff=[];diff=diff.concat(diff1,diff2,diff3);deferred.resolve(diff);});return deferred.promise;}}})();
 (function(){angular.module('piwikApp').controller('VersionListController',VersionListController);VersionListController.$inject=['$scope','tagManagerVersionModel','piwik','piwikApi','$location'];function VersionListController($scope,tagManagerVersionModel,piwik,piwikApi,$location){this.model=tagManagerVersionModel;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');var self=this;this.idContainer=$scope.idContainer;this.token_auth=piwik.token_auth;this.environments=[];this.versionToBePublished=null;this.idSite=piwik.idSite;this.canPublishToLive=piwik.hasUserCapability('tagmanager_publish_live_container');tagManagerVersionModel.fetchAvailableEnvironmentsWithPublishPermission().then(function(environments){self.environments=[];angular.forEach(environments,function(environment){self.environments.push({key:environment.id,value:environment.name});});});this.createVersion=function(){this.editVersion(0);};this.truncateText=function(text,length){if(text&&(text+'').length>length){return String(text).substr(0,length-3)+'...';}
-    return text;};this.publishVersion=function(version){version.deployEnvironment='';version.availableEnvironments=[];angular.forEach(this.environments,function(env){var found=false;if(version.releases){angular.forEach(version.releases,function(release){if(env&&env.key==release.environment){found=true;}});}
-    if(!found){if(!version.deployEnvironment){version.deployEnvironment=env.key;}
-        version.availableEnvironments.push(env);}});this.versionToBePublished=version;piwik.helper.modalConfirm('#confirmPublishVersion',{yes:function(){if(version.deployEnvironment){self.model.publishVersion(version.idcontainer,version.idcontainerversion,version.deployEnvironment).then(function(){self.model.reload(self.idContainer);});}}});};this.enableDebugMode=function(idContainerVersion){tagManagerHelper.enablePreviewMode(self.idContainer,idContainerVersion);};this.exportVersion=function(idContainerVersion,versionName){var params={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:self.idContainer,filter_limit:-1,};if(idContainerVersion){params.idContainerVersion=idContainerVersion;}
-    var filename='container_'+self.idContainer;if(versionName){filename+='_'+versionName;}
-    piwikApi.fetch(params).then(function(exportedContainer){piwik.helper.sendContentAsDownload(filename+'.json',JSON.stringify(exportedContainer));});};this.editVersion=function(idContainerVersion){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);};this.importVersion=function(){tagManagerHelper.importVersion($scope,self.idContainer);}
-    this.deleteVersion=function(version){function doDelete(){tagManagerVersionModel.deleteVersion(self.idContainer,version.idcontainerversion).then(function(){tagManagerVersionModel.reload(self.idContainer);});}
-        piwik.helper.modalConfirm('#confirmDeleteVersion',{yes:doDelete});};this.model.fetchVersions(this.idContainer);}})();
+return text;};this.publishVersion=function(version){version.deployEnvironment='';version.availableEnvironments=[];angular.forEach(this.environments,function(env){var found=false;if(version.releases){angular.forEach(version.releases,function(release){if(env&&env.key==release.environment){found=true;}});}
+if(!found){if(!version.deployEnvironment){version.deployEnvironment=env.key;}
+version.availableEnvironments.push(env);}});this.versionToBePublished=version;piwik.helper.modalConfirm('#confirmPublishVersion',{yes:function(){if(version.deployEnvironment){self.model.publishVersion(version.idcontainer,version.idcontainerversion,version.deployEnvironment).then(function(){self.model.reload(self.idContainer);});}}});};this.enableDebugMode=function(idContainerVersion){tagManagerHelper.enablePreviewMode(self.idContainer,idContainerVersion);};this.exportVersion=function(idContainerVersion,versionName){var params={module:'API',method:'TagManager.exportContainerVersion',format:'json',idContainer:self.idContainer,filter_limit:-1,};if(idContainerVersion){params.idContainerVersion=idContainerVersion;}
+var filename='container_'+self.idContainer;if(versionName){filename+='_'+versionName;}
+piwikApi.fetch(params).then(function(exportedContainer){piwik.helper.sendContentAsDownload(filename+'.json',JSON.stringify(exportedContainer));});};this.editVersion=function(idContainerVersion){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);};this.importVersion=function(){tagManagerHelper.importVersion($scope,self.idContainer);}
+this.deleteVersion=function(version){function doDelete(){tagManagerVersionModel.deleteVersion(self.idContainer,version.idcontainerversion).then(function(){tagManagerVersionModel.reload(self.idContainer);});}
+piwik.helper.modalConfirm('#confirmDeleteVersion',{yes:doDelete});};this.model.fetchVersions(this.idContainer);}})();
 (function(){angular.module('piwikApp').directive('piwikVersionList',piwikVersionList);piwikVersionList.$inject=['piwik'];function piwikVersionList(piwik){return{restrict:'A',scope:{idContainer:'='},templateUrl:'plugins/TagManager/angularjs/manageVersion/list.directive.html?cb='+piwik.cacheBuster,controller:'VersionListController',controllerAs:'versionList'};}})();
 (function(){angular.module('piwikApp').controller('VersionEditController',VersionEditController);VersionEditController.$inject=['$scope','tagManagerVersionModel','tagManagerContainerModel','tagManagerVersionDiff','piwik','$location','$filter','$timeout','$rootScope'];function VersionEditController($scope,tagManagerVersionModel,tagManagerContainerModel,tagManagerVersionDiff,piwik,$location,$filter,$timeout,$rootScope){var self=this;var currentId=null;var notificationId='versiontagmanagement';var translate=$filter('translate');this.isDirty=false;this.model=tagManagerVersionModel;this.environments=[];this.idContainer=$scope.idContainer;this.isEmbedded=!!$scope.onChangeVersion;this.lastVersion=null;this.versionChanges=[];this.isLoadingVersionChanges=false;this.canPublishToLive=piwik.hasUserCapability('tagmanager_publish_live_container');tagManagerVersionModel.fetchAvailableEnvironmentsWithPublishPermission().then(function(environments){self.environments=[];angular.forEach(environments,function(environment){self.environments.push({key:environment.id,value:environment.name});});});function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyVersionNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
-    function init(idContainerVersion){self.create=idContainerVersion=='0';self.edit=!self.create;self.version={};self.lastVersion=null;self.versionChanges=[];self.isLoadingVersionChanges=true;tagManagerContainerModel.findContainer(self.idContainer).then(function(container){self.isLoadingVersionChanges=false;self.lastVersion=null;if(!container||!container.versions||!angular.isArray(container.versions)||!container.versions.length){return;}
-        container=angular.copy(container);var versions=container.versions;versions.sort(function(a,b){return a.revision<b.revision;});var lastContainerVersion=null;if(self.create&&versions[0]&&versions[0].name){self.lastVersion=versions[0].name;lastContainerVersion=versions[0].idcontainerversion;}else if(self.edit){for(var i=0;i<(versions.length-1);i++){if(versions[i].idcontainerversion===parseInt(idContainerVersion,10)&&versions[i+1]){self.lastVersion=versions[i+1].name;lastContainerVersion=versions[i+1].idcontainerversion;}}}
-        if(self.lastVersion){self.isLoadingVersionChanges=true;tagManagerVersionDiff.diffDraftVersion(self.idContainer,idContainerVersion,lastContainerVersion).then(function(diff){self.versionChanges=diff;self.isLoadingVersionChanges=false;});if(self.create&&!self.version.name&&/^\d+$/.test(self.lastVersion)){self.version.name=parseInt(self.lastVersion,10)+1;}}});piwik.helper.lazyScrollToContent();if(self.edit&&idContainerVersion){self.editTitle=translate('TagManager_EditVersion');self.model.findVersion(self.idContainer,idContainerVersion).then(function(version){if(!version){return;}
-        self.version=angular.copy(version);self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_CreateNewVersion');self.version={idSite:piwik.idSite,idcontainer:self.idContainer,name:'',environment:'',description:''};if(self.canPublishToLive){self.version.environment='live';}else if(angular.isArray(self.environments)&&self.environments.length&&self.environments[0]){self.version.environment=self.environments[0].key;}
-        self.isDirty=false;}}
-    this.cancel=function(){$scope.idContainerVersion=null;currentId=null;var $search=$location.search();delete $search.idContainerVersion;$location.search($search);};$scope.$on('$destroy',function(){$scope.idContainerVersion=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.version.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
-        return true;}
-    this.createVersion=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.createContainerVersion').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
-            self.isDirty=false;var idContainerVersion=response.response.value;if('function'===typeof $scope.onChangeVersion){self.version.idcontainerversion=idContainerVersion;$scope.onChangeVersion({version:self.version});return;}
-            tagManagerVersionModel.reload(self.idContainer).then(function(){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Version')),response.type);},200);});},function(){self.isUpdating=false;});};this.createVersionAndPublish=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.createContainerVersion').then(function(response){if(!response||response.type==='error'||!response.response||!response.response.value){self.isUpdating=false;return;}
-            var idContainerVersion=response.response.value;self.version.idcontainerversion=idContainerVersion;tagManagerVersionModel.publishVersion(self.idContainer,idContainerVersion,self.version.environment).then(function(response){self.isUpdating=false;if(!response||response.type==='error'){return;}
-                self.isDirty=false;if('function'===typeof $scope.onChangeVersion){$scope.onChangeVersion({version:self.version});return;}
-                tagManagerVersionModel.reload(self.idContainer).then(function(){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);$timeout(function(){showNotification(translate('TagManager_VersionPublishSuccess'),response.type);},200);});});},function(){self.isUpdating=false;});}
-    this.setValueHasChanged=function(){this.isDirty=true;};this.updateVersion=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.updateContainerVersion').then(function(response){if(response.type==='error'){return;}
-            var idContainerVersion=self.version.idcontainerversion;if('function'===typeof $scope.onChangeVersion){$scope.onChangeVersion({version:self.version});return;}
-            self.isDirty=false;self.version={};tagManagerVersionModel.reload(self.idContainer).then(function(){init(idContainerVersion);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Version')),response.type);});};$scope.$watch('idContainerVersion',function(newValue,oldValue){if(newValue===null){return;}
-        if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
+function removeAnyVersionNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
+function init(idContainerVersion){self.create=idContainerVersion=='0';self.edit=!self.create;self.version={};self.lastVersion=null;self.versionChanges=[];self.isLoadingVersionChanges=true;tagManagerContainerModel.findContainer(self.idContainer).then(function(container){self.isLoadingVersionChanges=false;self.lastVersion=null;if(!container||!container.versions||!angular.isArray(container.versions)||!container.versions.length){return;}
+container=angular.copy(container);var versions=container.versions;versions.sort(function(a,b){return a.revision<b.revision;});var lastContainerVersion=null;if(self.create&&versions[0]&&versions[0].name){self.lastVersion=versions[0].name;lastContainerVersion=versions[0].idcontainerversion;}else if(self.edit){for(var i=0;i<(versions.length-1);i++){if(versions[i].idcontainerversion===parseInt(idContainerVersion,10)&&versions[i+1]){self.lastVersion=versions[i+1].name;lastContainerVersion=versions[i+1].idcontainerversion;}}}
+if(self.lastVersion){self.isLoadingVersionChanges=true;tagManagerVersionDiff.diffDraftVersion(self.idContainer,idContainerVersion,lastContainerVersion).then(function(diff){self.versionChanges=diff;self.isLoadingVersionChanges=false;});if(self.create&&!self.version.name&&/^\d+$/.test(self.lastVersion)){self.version.name=parseInt(self.lastVersion,10)+1;}}});piwik.helper.lazyScrollToContent();if(self.edit&&idContainerVersion){self.editTitle=translate('TagManager_EditVersion');self.model.findVersion(self.idContainer,idContainerVersion).then(function(version){if(!version){return;}
+self.version=angular.copy(version);self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_CreateNewVersion');self.version={idSite:piwik.idSite,idcontainer:self.idContainer,name:'',environment:'',description:''};if(self.canPublishToLive){self.version.environment='live';}else if(angular.isArray(self.environments)&&self.environments.length&&self.environments[0]){self.version.environment=self.environments[0].key;}
+self.isDirty=false;}}
+this.cancel=function(){$scope.idContainerVersion=null;currentId=null;var $search=$location.search();delete $search.idContainerVersion;$location.search($search);};$scope.$on('$destroy',function(){$scope.idContainerVersion=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.version.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
+return true;}
+this.createVersion=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.createContainerVersion').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
+self.isDirty=false;var idContainerVersion=response.response.value;if('function'===typeof $scope.onChangeVersion){self.version.idcontainerversion=idContainerVersion;$scope.onChangeVersion({version:self.version});return;}
+tagManagerVersionModel.reload(self.idContainer).then(function(){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Version')),response.type);},200);});},function(){self.isUpdating=false;});};this.createVersionAndPublish=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.createContainerVersion').then(function(response){if(!response||response.type==='error'||!response.response||!response.response.value){self.isUpdating=false;return;}
+var idContainerVersion=response.response.value;self.version.idcontainerversion=idContainerVersion;tagManagerVersionModel.publishVersion(self.idContainer,idContainerVersion,self.version.environment).then(function(response){self.isUpdating=false;if(!response||response.type==='error'){return;}
+self.isDirty=false;if('function'===typeof $scope.onChangeVersion){$scope.onChangeVersion({version:self.version});return;}
+tagManagerVersionModel.reload(self.idContainer).then(function(){var $search=$location.search();$search.idContainerVersion=idContainerVersion;$location.search($search);$timeout(function(){showNotification(translate('TagManager_VersionPublishSuccess'),response.type);},200);});});},function(){self.isUpdating=false;});}
+this.setValueHasChanged=function(){this.isDirty=true;};this.updateVersion=function(){removeAnyVersionNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerVersionModel.createOrUpdateVersion(this.version,'TagManager.updateContainerVersion').then(function(response){if(response.type==='error'){return;}
+var idContainerVersion=self.version.idcontainerversion;if('function'===typeof $scope.onChangeVersion){$scope.onChangeVersion({version:self.version});return;}
+self.isDirty=false;self.version={};tagManagerVersionModel.reload(self.idContainer).then(function(){init(idContainerVersion);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Version')),response.type);});};$scope.$watch('idContainerVersion',function(newValue,oldValue){if(newValue===null){return;}
+if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
 (function(){angular.module('piwikApp').directive('piwikVersionEdit',piwikVersionEdit);piwikVersionEdit.$inject=['piwik'];function piwikVersionEdit(piwik){return{restrict:'A',scope:{idContainerVersion:'=',idContainer:'=',onChangeVersion:'&?'},templateUrl:'plugins/TagManager/angularjs/manageVersion/edit.directive.html?cb='+piwik.cacheBuster,controller:'VersionEditController',controllerAs:'editVersion'};}})();
 (function(){angular.module('piwikApp').controller('ManageVersionController',ManageVersionController);ManageVersionController.$inject=['$scope','$rootScope','$location'];function ManageVersionController($scope,$rootScope,$location){this.editMode=false;var self=this;this.idContainer=$scope.idContainer;function removeAnyVersionNotification(){var UI=require('piwik/UI');new UI.Notification().remove('versiontagmanagement');}
-    function initState(){var $search=$location.search();if('idContainerVersion'in $search){if($search.idContainerVersion===0||$search.idContainerVersion==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddVersion',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idContainerVersion=null;return;}}
-        self.editMode=true;self.idContainerVersion=parseInt($search.idContainerVersion,10);}else{self.editMode=false;self.idContainerVersion=null;}
-        removeAnyVersionNotification();}
-    initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
+function initState(){var $search=$location.search();if('idContainerVersion'in $search){if($search.idContainerVersion===0||$search.idContainerVersion==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddVersion',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idContainerVersion=null;return;}}
+self.editMode=true;self.idContainerVersion=parseInt($search.idContainerVersion,10);}else{self.editMode=false;self.idContainerVersion=null;}
+removeAnyVersionNotification();}
+initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
 (function(){angular.module('piwikApp').directive('piwikVersionManage',piwikVersionManage);piwikVersionManage.$inject=['piwik'];function piwikVersionManage(piwik){return{restrict:'A',scope:{idContainer:'@'},templateUrl:'plugins/TagManager/angularjs/manageVersion/manage.directive.html?cb='+piwik.cacheBuster,controller:'ManageVersionController',controllerAs:'manageVersion'};}})();
 (function(){angular.module('piwikApp').factory('tagManagerTriggerModel',tagManagerTriggerModel);tagManagerTriggerModel.$inject=['piwikApi','$q','$filter'];function tagManagerTriggerModel(piwikApi,$q,$filter){var fetchPromise=null;var triggersPromise={};var lookUpPromise=null;var translate=$filter('translate');var model={triggers:[],isLoading:false,isUpdating:false,findTrigger:findTrigger,createOrUpdateTrigger:createOrUpdateTrigger,fetchAvailableTriggers:fetchAvailableTriggers,fetchContainer:fetchContainer,suggestNameForType:suggestNameForType,fetchAvailableComparisons:fetchAvailableComparisons,fetchAvailableContainerVariables:fetchAvailableContainerVariables,deleteTrigger:deleteTrigger,reload:reload,fetchTriggersIfNotLoaded:fetchTriggersIfNotLoaded,fetchTriggers:fetchTriggers};return model;function arrayFilter(array,filter){var entries=[];angular.forEach(array,function(value){if(filter(value)){entries.push(value);}});return entries;}
-    function filterTriggerConditions(conditions){return arrayFilter(conditions,function(condition){return!!condition&&condition.actual&&condition.expected&&condition.comparison;});}
-    function fetchTriggersIfNotLoaded(){if(!fetchPromise){model.fetchTriggers();}}
-    function fetchAvailableContainerVariables(idContainer,idContainerVersion){var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:idContainer,idContainerVersion:idContainerVersion};return piwikApi.fetch(params);}
-    function reload(idContainer,idContainerVersion){model.triggers=[];fetchPromise=null;triggersPromise={};lookUpPromise=null;return fetchTriggers(idContainer,idContainerVersion);}
-    function fetchAvailableTriggers(idContext){if(!triggersPromise[idContext]){var params={method:'TagManager.getAvailableTriggerTypesInContext',idContext:idContext,filter_limit:'-1'};triggersPromise[idContext]=piwikApi.fetch(params);}
-        return triggersPromise[idContext];}
-    function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
-    function fetchAvailableComparisons(){if(!lookUpPromise){var params={method:'TagManager.getAvailableComparisons',filter_limit:'-1'};lookUpPromise=piwikApi.fetch(params);}
-        return lookUpPromise;}
-    function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
-        var isFree=true;angular.forEach(model.triggers,function(trigger){if(trigger&&trigger.name===name){isFree=false;}});if(isFree){return name;}}}
-    function fetchTriggers(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTriggers',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
-        model.isLoading=true;model.triggers=[];return fetchPromise.then(function(triggers){model.triggers=triggers;model.isLoading=false;return triggers;},function(){model.isLoading=false;});}
-    function findTrigger(idContainer,idContainerVersion,idTrigger){var found;angular.forEach(model.triggers,function(trigger){if(!found&&parseInt(trigger.idtrigger,10)===idTrigger){found=trigger;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
-        model.isLoading=true;return piwikApi.fetch({idTrigger:idTrigger,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerTrigger',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
-    function deleteTrigger(idContainer,idContainerVersion,idTrigger){model.isUpdating=true;model.triggers=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idTrigger:idTrigger,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerTrigger'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function createOrUpdateTrigger(trigger,method){trigger=angular.copy(trigger);trigger.method=method;trigger.parameters={};angular.forEach(trigger.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
-        trigger.parameters[setting.name]=value;});delete trigger.typeMetadata;var map={idTrigger:'idtrigger',idContainer:'idcontainer',idContainerVersion:'idcontainerversion'};angular.forEach(map,function(value,key){if(typeof trigger[value]!=='undefined'){trigger[key]=trigger[value];delete trigger[value];}});trigger.conditions=filterTriggerConditions(trigger.conditions);var postParams=['parameters','conditions'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof trigger[postParam]!=='undefined'){post[postParam]=trigger[postParam];delete trigger[postParam];}}
-        model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(trigger,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
+function filterTriggerConditions(conditions){return arrayFilter(conditions,function(condition){return!!condition&&condition.actual&&condition.expected&&condition.comparison;});}
+function fetchTriggersIfNotLoaded(){if(!fetchPromise){model.fetchTriggers();}}
+function fetchAvailableContainerVariables(idContainer,idContainerVersion){var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:idContainer,idContainerVersion:idContainerVersion};return piwikApi.fetch(params);}
+function reload(idContainer,idContainerVersion){model.triggers=[];fetchPromise=null;triggersPromise={};lookUpPromise=null;return fetchTriggers(idContainer,idContainerVersion);}
+function fetchAvailableTriggers(idContext){if(!triggersPromise[idContext]){var params={method:'TagManager.getAvailableTriggerTypesInContext',idContext:idContext,filter_limit:'-1'};triggersPromise[idContext]=piwikApi.fetch(params);}
+return triggersPromise[idContext];}
+function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
+function fetchAvailableComparisons(){if(!lookUpPromise){var params={method:'TagManager.getAvailableComparisons',filter_limit:'-1'};lookUpPromise=piwikApi.fetch(params);}
+return lookUpPromise;}
+function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
+var isFree=true;angular.forEach(model.triggers,function(trigger){if(trigger&&trigger.name===name){isFree=false;}});if(isFree){return name;}}}
+function fetchTriggers(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTriggers',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
+model.isLoading=true;model.triggers=[];return fetchPromise.then(function(triggers){model.triggers=triggers;model.isLoading=false;return triggers;},function(){model.isLoading=false;});}
+function findTrigger(idContainer,idContainerVersion,idTrigger){var found;angular.forEach(model.triggers,function(trigger){if(!found&&parseInt(trigger.idtrigger,10)===idTrigger){found=trigger;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
+model.isLoading=true;return piwikApi.fetch({idTrigger:idTrigger,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerTrigger',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
+function deleteTrigger(idContainer,idContainerVersion,idTrigger){model.isUpdating=true;model.triggers=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idTrigger:idTrigger,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerTrigger'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function createOrUpdateTrigger(trigger,method){trigger=angular.copy(trigger);trigger.method=method;trigger.parameters={};angular.forEach(trigger.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
+trigger.parameters[setting.name]=value;});delete trigger.typeMetadata;var map={idTrigger:'idtrigger',idContainer:'idcontainer',idContainerVersion:'idcontainerversion'};angular.forEach(map,function(value,key){if(typeof trigger[value]!=='undefined'){trigger[key]=trigger[value];delete trigger[value];}});trigger.conditions=filterTriggerConditions(trigger.conditions);var postParams=['parameters','conditions'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof trigger[postParam]!=='undefined'){post[postParam]=trigger[postParam];delete trigger[postParam];}}
+model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(trigger,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
 (function(){angular.module('piwikApp').controller('TriggerListController',TriggerListController);TriggerListController.$inject=['$scope','tagManagerTriggerModel','piwik','piwikApi','$location'];function TriggerListController($scope,tagManagerTriggerModel,piwik,piwikApi,$location){this.model=tagManagerTriggerModel;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.triggerReferences=[];this.createTrigger=function(){this.editTrigger(0);};this.editTrigger=function(idTrigger){var $search=$location.search();$search.idTrigger=idTrigger;$location.search($search);};this.deleteTrigger=function(trigger){piwikApi.fetch({method:'TagManager.getContainerTriggerReferences',idContainer:this.idContainer,idContainerVersion:this.idContainerVersion,idTrigger:trigger.idtrigger}).then(function(references){if(!references||!references.length){self.triggerReferences=[];function doDelete(){tagManagerTriggerModel.deleteTrigger(self.idContainer,self.idContainerVersion,trigger.idtrigger).then(function(){tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion);});}
-    piwik.helper.modalConfirm('#confirmDeleteTrigger',{yes:doDelete});}else{self.triggerReferences=references;piwik.helper.modalConfirm('#confirmDeleteTriggerNotPossible',{});}});};this.model.fetchTriggers(this.idContainer,this.idContainerVersion);}})();
+piwik.helper.modalConfirm('#confirmDeleteTrigger',{yes:doDelete});}else{self.triggerReferences=references;piwik.helper.modalConfirm('#confirmDeleteTriggerNotPossible',{});}});};this.model.fetchTriggers(this.idContainer,this.idContainerVersion);}})();
 (function(){angular.module('piwikApp').directive('piwikTriggerList',piwikTriggerList);piwikTriggerList.$inject=['piwik'];function piwikTriggerList(piwik){return{restrict:'A',scope:{idContainer:'=',idContainerVersion:'='},templateUrl:'plugins/TagManager/angularjs/manageTrigger/list.directive.html?cb='+piwik.cacheBuster,controller:'TriggerListController',controllerAs:'triggerList'};}})();
 (function(){angular.module('piwikApp').controller('TriggerEditController',TriggerEditController);TriggerEditController.$inject=['$scope','tagManagerTriggerModel','piwik','$location','$filter','$timeout','$rootScope'];function TriggerEditController($scope,tagManagerTriggerModel,piwik,$location,$filter,$timeout,$rootScope){var self=this;var currentId=null;var notificationId='tagtriggermanagement';var translate=$filter('translate');this.isDirty=false;this.model=tagManagerTriggerModel;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.chooseTriggerType=false;this.isEmbedded=!!$scope.onChangeTrigger;this.canUseCustomTemplates=piwik.hasUserCapability('tagmanager_use_custom_templates');this.availableTriggers=[];this.availableComparisons=[];this.availableVariables=[];this.variableIdToName={};this.model.fetchAvailableComparisons().then(function(comparisons){self.availableComparisons=[];angular.forEach(comparisons,function(comparison){self.availableComparisons.push({key:comparison.id,value:comparison.name});});});this.model.fetchAvailableContainerVariables(this.idContainer,this.idContainerVersion).then(function(variables){self.availableVariables=[];angular.forEach(variables,function(category){angular.forEach(category.types,function(variable){self.variableIdToName[variable.id]=variable.name;self.availableVariables.push({key:variable.id,value:variable.name,group:category.name});});});});this.model.fetchTriggersIfNotLoaded();function enrichTemplateType(template){template.isDisabled=!self.canUseCustomTemplates&&template&&template.isCustomTemplate;return template;}
-    function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyTriggerNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
-    var deregisterWatches=[];function init(idTrigger){self.create=idTrigger=='0';self.edit=!self.create;self.trigger={};self.chooseTriggerType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
-        piwik.helper.lazyScrollToContent();self.availableTriggers=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableTriggers(container.context);}).then(function(triggers){angular.forEach(triggers,function(triggersGroup){angular.forEach(triggersGroup.types,function(trigger){enrichTemplateType(trigger);});});self.availableTriggers=triggers;}).then(function(){if(self.edit&&idTrigger){self.editTitle=translate('TagManager_EditTrigger');self.model.findTrigger(self.idContainer,self.idContainerVersion,idTrigger).then(function(trigger){if(!trigger){return;}
-            self.trigger=angular.copy(trigger);self.trigger.idcontainer=self.idContainer;if(self.trigger.typeMetadata){enrichTemplateType(self.trigger.typeMetadata);}
-            self.addConditionEntryIfNoneExists();self.onConditionChange();self.addParameterWatch();self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_ChooseTriggerToContinue');self.chooseTriggerType=true;}});};this.addParameterWatch=function(){var index;if(this.trigger.typeMetadata&&this.trigger.typeMetadata.parameters){for(index=0;index<this.trigger.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editTrigger.trigger.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}}));}}};this.onConditionChange=function(){var hasAll=true;angular.forEach(this.trigger.conditions,function(condition){if(!condition||!condition.expected){hasAll=false;}});if(hasAll){this.addConditionEntry();}};this.getDefaultCondition=function(){var defaultActual='PageUrl';if(this.trigger&&this.trigger.typeMetadata){var types={'AllElementsClick':'ClickId','AllLinksClick':'ClickId','DownloadClick':'ClickId','ElementVisibility':'VisibleElementClasses','FormSubmit':'FormId','JavaScriptError':'ErrorMessage'};var type=this.trigger.typeMetadata.id;if(type in types){defaultActual=types[type];}}
-        return{comparison:'equals',actual:defaultActual,expected:''};}
-    this.addConditionEntryIfNoneExists=function(){if(!this.trigger.conditions||!angular.isArray(this.trigger.conditions)){this.trigger.conditions=[];}
-        if(!this.trigger.conditions.length){this.trigger.conditions.push(this.getDefaultCondition());}};this.addConditionEntry=function(){this.trigger.conditions.push(this.getDefaultCondition());this.isDirty=true;};this.removeConditionEntry=function(index){if(index>-1){var lastIndex=this.trigger.conditions.length-1;if(lastIndex===index){this.trigger.conditions[index]=this.getDefaultCondition();}else{this.trigger.conditions.splice(index,1);}
-        this.isDirty=true;}};this.createTriggerType=function(triggerTemplate){if(triggerTemplate&&triggerTemplate.isDisabled){return;}
-        this.chooseTriggerType=false;this.editTitle=translate('TagManager_CreateNewTrigger');this.trigger={idSite:piwik.idSite,name:this.model.suggestNameForType(triggerTemplate.name),type:triggerTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},conditions:[],typeMetadata:triggerTemplate};this.addConditionEntry();this.addParameterWatch();this.isDirty=true;$timeout(function(){var $editTrigger=$('.editTrigger');if($editTrigger.length&&$editTrigger[0]){$editTrigger[0].scrollIntoView()}
-            $('.editTrigger #name').focus();},1);};this.cancel=function(){$scope.idTrigger=null;currentId=null;var $search=$location.search();delete $search.idTrigger;$location.search($search);};$scope.$on('$destroy',function(){$scope.idTrigger=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.trigger.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
-        return true;}
-    this.createTrigger=function(){removeAnyTriggerNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerTriggerModel.createOrUpdateTrigger(this.trigger,'TagManager.addContainerTrigger').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
-            var idTrigger=response.response.value;if('function'===typeof $scope.onChangeTrigger){self.model.reload(self.idContainer,self.idContainerVersion);self.trigger.idtrigger=idTrigger;$scope.onChangeTrigger({trigger:self.trigger});return;}
-            self.isDirty=false;tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion).then(function(){var $search=$location.search();$search.idTrigger=idTrigger;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Trigger'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateTrigger=function(){removeAnyTriggerNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerTriggerModel.createOrUpdateTrigger(this.trigger,'TagManager.updateContainerTrigger').then(function(response){if(response.type==='error'){return;}
-            if('function'===typeof $scope.onChangeTrigger){self.trigger.idtrigger=idTrigger;$scope.onChangeTrigger({trigger:self.trigger});return;}
-            var idTrigger=self.trigger.idtrigger;self.isDirty=false;self.trigger={};tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idTrigger);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Trigger'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};$scope.$watch('idTrigger',function(newValue,oldValue){if(newValue===null){return;}
-        if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
+function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
+function removeAnyTriggerNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
+var deregisterWatches=[];function init(idTrigger){self.create=idTrigger=='0';self.edit=!self.create;self.trigger={};self.chooseTriggerType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
+piwik.helper.lazyScrollToContent();self.availableTriggers=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableTriggers(container.context);}).then(function(triggers){angular.forEach(triggers,function(triggersGroup){angular.forEach(triggersGroup.types,function(trigger){enrichTemplateType(trigger);});});self.availableTriggers=triggers;}).then(function(){if(self.edit&&idTrigger){self.editTitle=translate('TagManager_EditTrigger');self.model.findTrigger(self.idContainer,self.idContainerVersion,idTrigger).then(function(trigger){if(!trigger){return;}
+self.trigger=angular.copy(trigger);self.trigger.idcontainer=self.idContainer;if(self.trigger.typeMetadata){enrichTemplateType(self.trigger.typeMetadata);}
+self.addConditionEntryIfNoneExists();self.onConditionChange();self.addParameterWatch();self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_ChooseTriggerToContinue');self.chooseTriggerType=true;}});};this.addParameterWatch=function(){var index;if(this.trigger.typeMetadata&&this.trigger.typeMetadata.parameters){for(index=0;index<this.trigger.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editTrigger.trigger.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}}));}}};this.onConditionChange=function(){var hasAll=true;angular.forEach(this.trigger.conditions,function(condition){if(!condition||!condition.expected){hasAll=false;}});if(hasAll){this.addConditionEntry();}};this.getDefaultCondition=function(){var defaultActual='PageUrl';if(this.trigger&&this.trigger.typeMetadata){var types={'AllElementsClick':'ClickId','AllLinksClick':'ClickId','DownloadClick':'ClickId','ElementVisibility':'VisibleElementClasses','FormSubmit':'FormId','JavaScriptError':'ErrorMessage'};var type=this.trigger.typeMetadata.id;if(type in types){defaultActual=types[type];}}
+return{comparison:'equals',actual:defaultActual,expected:''};}
+this.addConditionEntryIfNoneExists=function(){if(!this.trigger.conditions||!angular.isArray(this.trigger.conditions)){this.trigger.conditions=[];}
+if(!this.trigger.conditions.length){this.trigger.conditions.push(this.getDefaultCondition());}};this.addConditionEntry=function(){this.trigger.conditions.push(this.getDefaultCondition());this.isDirty=true;};this.removeConditionEntry=function(index){if(index>-1){var lastIndex=this.trigger.conditions.length-1;if(lastIndex===index){this.trigger.conditions[index]=this.getDefaultCondition();}else{this.trigger.conditions.splice(index,1);}
+this.isDirty=true;}};this.createTriggerType=function(triggerTemplate){if(triggerTemplate&&triggerTemplate.isDisabled){return;}
+this.chooseTriggerType=false;this.editTitle=translate('TagManager_CreateNewTrigger');this.trigger={idSite:piwik.idSite,name:this.model.suggestNameForType(triggerTemplate.name),type:triggerTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},conditions:[],typeMetadata:triggerTemplate};this.addConditionEntry();this.addParameterWatch();this.isDirty=true;$timeout(function(){var $editTrigger=$('.editTrigger');if($editTrigger.length&&$editTrigger[0]){$editTrigger[0].scrollIntoView()}
+$('.editTrigger #name').focus();},1);};this.cancel=function(){$scope.idTrigger=null;currentId=null;var $search=$location.search();delete $search.idTrigger;$location.search($search);};$scope.$on('$destroy',function(){$scope.idTrigger=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.trigger.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
+return true;}
+this.createTrigger=function(){removeAnyTriggerNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerTriggerModel.createOrUpdateTrigger(this.trigger,'TagManager.addContainerTrigger').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
+var idTrigger=response.response.value;if('function'===typeof $scope.onChangeTrigger){self.model.reload(self.idContainer,self.idContainerVersion);self.trigger.idtrigger=idTrigger;$scope.onChangeTrigger({trigger:self.trigger});return;}
+self.isDirty=false;tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion).then(function(){var $search=$location.search();$search.idTrigger=idTrigger;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Trigger'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateTrigger=function(){removeAnyTriggerNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerTriggerModel.createOrUpdateTrigger(this.trigger,'TagManager.updateContainerTrigger').then(function(response){if(response.type==='error'){return;}
+if('function'===typeof $scope.onChangeTrigger){self.trigger.idtrigger=idTrigger;$scope.onChangeTrigger({trigger:self.trigger});return;}
+var idTrigger=self.trigger.idtrigger;self.isDirty=false;self.trigger={};tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idTrigger);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Trigger'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};$scope.$watch('idTrigger',function(newValue,oldValue){if(newValue===null){return;}
+if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
 (function(){angular.module('piwikApp').directive('piwikTriggerEdit',piwikTriggerEdit);piwikTriggerEdit.$inject=['piwik'];function piwikTriggerEdit(piwik){return{restrict:'A',scope:{idTrigger:'=',idContainer:'=',idContainerVersion:'=',newTriggerType:'=',onChangeTrigger:'&?'},templateUrl:'plugins/TagManager/angularjs/manageTrigger/edit.directive.html?cb='+piwik.cacheBuster,controller:'TriggerEditController',controllerAs:'editTrigger'};}})();
 (function(){angular.module('piwikApp').controller('ManageTriggerController',ManageTriggerController);ManageTriggerController.$inject=['$scope','$rootScope','$location'];function ManageTriggerController($scope,$rootScope,$location){this.editMode=false;var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;function removeAnyTriggerNotification(){var UI=require('piwik/UI');new UI.Notification().remove('triggertriggermanagement');}
-    function initState(){var $search=$location.search();if('idTrigger'in $search){if($search.idTrigger===0||$search.idTrigger==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddTrigger',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idTrigger=null;return;}}
-        self.editMode=true;self.idTrigger=parseInt($search.idTrigger,10);}else{self.editMode=false;self.idTrigger=null;}
-        removeAnyTriggerNotification();}
-    initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
+function initState(){var $search=$location.search();if('idTrigger'in $search){if($search.idTrigger===0||$search.idTrigger==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddTrigger',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idTrigger=null;return;}}
+self.editMode=true;self.idTrigger=parseInt($search.idTrigger,10);}else{self.editMode=false;self.idTrigger=null;}
+removeAnyTriggerNotification();}
+initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
 (function(){angular.module('piwikApp').directive('piwikTriggerManage',piwikTriggerManage);piwikTriggerManage.$inject=['piwik'];function piwikTriggerManage(piwik){return{restrict:'A',scope:{idContainerVersion:'@',idContainer:'@'},templateUrl:'plugins/TagManager/angularjs/manageTrigger/manage.directive.html?cb='+piwik.cacheBuster,controller:'ManageTriggerController',controllerAs:'manageTrigger'};}})();
 (function(){angular.module('piwikApp').factory('tagManagerTagModel',tagManagerTagModel);tagManagerTagModel.$inject=['piwikApi','$q','$filter'];function tagManagerTagModel(piwikApi,$q,$filter){var fetchPromise=null;var tagsPromise={};var fireLimitsPromise=null;var translate=$filter('translate');var model={tags:[],isLoading:false,isUpdating:false,findTag:findTag,createOrUpdateTag:createOrUpdateTag,fetchAvailableTags:fetchAvailableTags,fetchContainerTriggers:fetchContainerTriggers,fetchContainer:fetchContainer,fetchAvailableFireLimits:fetchAvailableFireLimits,suggestNameForType:suggestNameForType,deleteTag:deleteTag,reload:reload,onReload:null,fetchTags:fetchTags};return model;function reload(idContainer,idContainerVersion){model.tags=[];fetchPromise=null;tagsPromise={};fireLimitsPromise=null;if(model.onReload){model.onReload();}
-    return fetchTags(idContainer,idContainerVersion);}
-    function fetchAvailableTags(idContext){if(!tagsPromise[idContext]){var params={method:'TagManager.getAvailableTagTypesInContext',idContext:idContext,filter_limit:'-1'};tagsPromise[idContext]=piwikApi.fetch(params);}
-        return tagsPromise[idContext];}
-    function fetchContainerTriggers(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTriggers',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};return piwikApi.fetch(params);}
-    function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
-    function fetchAvailableFireLimits(){if(!fireLimitsPromise){var params={method:'TagManager.getAvailableTagFireLimits',filter_limit:'-1'};fireLimitsPromise=piwikApi.fetch(params);}
-        return fireLimitsPromise;}
-    function fetchTags(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTags',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
-        model.isLoading=true;model.tags=[];return fetchPromise.then(function(tags){model.tags=tags;model.isLoading=false;return tags;},function(){model.isLoading=false;});}
-    function findTag(idContainer,idContainerVersion,idTag){var found;angular.forEach(model.tags,function(tag){if(!found&&parseInt(tag.idtag,10)===idTag){found=tag;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
-        model.isLoading=true;return piwikApi.fetch({idTag:idTag,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerTag',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
-    function deleteTag(idContainer,idContainerVersion,idTag){model.isUpdating=true;model.tags=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idTag:idTag,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerTag'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
-        var isFree=true;angular.forEach(model.tags,function(tag){if(tag&&tag.name===name){isFree=false;}});if(isFree){return name;}}}
-    function createOrUpdateTag(tag,method){tag=angular.copy(tag);tag.method=method;tag.parameters={};angular.forEach(tag.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
-        tag.parameters[setting.name]=value;});delete tag.typeMetadata;var map={idTag:'idtag',idContainer:'idcontainer',idContainerVersion:'idcontainerversion',startDate:'start_date',endDate:'end_date',fireLimit:'fire_limit',fireDelay:'fire_delay'};tag.fireTriggerIds=[];angular.forEach(tag.fire_triggers,function(trigger){if(trigger&&trigger.idtrigger){tag.fireTriggerIds.push(trigger.idtrigger);}});tag.blockTriggerIds=[];angular.forEach(tag.block_triggers,function(trigger){if(trigger&&trigger.idtrigger){tag.blockTriggerIds.push(trigger.idtrigger);}});delete tag.block_triggers;delete tag.block_trigger_ids;delete tag.fire_triggers;delete tag.fire_trigger_ids;angular.forEach(map,function(value,key){if(typeof tag[value]!=='undefined'){tag[key]=tag[value];delete tag[value];}});var postParams=['parameters','fireTriggerIds','blockTriggerIds'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof tag[postParam]!=='undefined'){post[postParam]=tag[postParam];delete tag[postParam];}}
-        model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(tag,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
+return fetchTags(idContainer,idContainerVersion);}
+function fetchAvailableTags(idContext){if(!tagsPromise[idContext]){var params={method:'TagManager.getAvailableTagTypesInContext',idContext:idContext,filter_limit:'-1'};tagsPromise[idContext]=piwikApi.fetch(params);}
+return tagsPromise[idContext];}
+function fetchContainerTriggers(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTriggers',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};return piwikApi.fetch(params);}
+function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
+function fetchAvailableFireLimits(){if(!fireLimitsPromise){var params={method:'TagManager.getAvailableTagFireLimits',filter_limit:'-1'};fireLimitsPromise=piwikApi.fetch(params);}
+return fireLimitsPromise;}
+function fetchTags(idContainer,idContainerVersion){var params={method:'TagManager.getContainerTags',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
+model.isLoading=true;model.tags=[];return fetchPromise.then(function(tags){model.tags=tags;model.isLoading=false;return tags;},function(){model.isLoading=false;});}
+function findTag(idContainer,idContainerVersion,idTag){var found;angular.forEach(model.tags,function(tag){if(!found&&parseInt(tag.idtag,10)===idTag){found=tag;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
+model.isLoading=true;return piwikApi.fetch({idTag:idTag,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerTag',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
+function deleteTag(idContainer,idContainerVersion,idTag){model.isUpdating=true;model.tags=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idTag:idTag,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerTag'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
+var isFree=true;angular.forEach(model.tags,function(tag){if(tag&&tag.name===name){isFree=false;}});if(isFree){return name;}}}
+function createOrUpdateTag(tag,method){tag=angular.copy(tag);tag.method=method;tag.parameters={};angular.forEach(tag.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
+tag.parameters[setting.name]=value;});delete tag.typeMetadata;var map={idTag:'idtag',idContainer:'idcontainer',idContainerVersion:'idcontainerversion',startDate:'start_date',endDate:'end_date',fireLimit:'fire_limit',fireDelay:'fire_delay'};tag.fireTriggerIds=[];angular.forEach(tag.fire_triggers,function(trigger){if(trigger&&trigger.idtrigger){tag.fireTriggerIds.push(trigger.idtrigger);}});tag.blockTriggerIds=[];angular.forEach(tag.block_triggers,function(trigger){if(trigger&&trigger.idtrigger){tag.blockTriggerIds.push(trigger.idtrigger);}});delete tag.block_triggers;delete tag.block_trigger_ids;delete tag.fire_triggers;delete tag.fire_trigger_ids;angular.forEach(map,function(value,key){if(typeof tag[value]!=='undefined'){tag[key]=tag[value];delete tag[value];}});var postParams=['parameters','fireTriggerIds','blockTriggerIds'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof tag[postParam]!=='undefined'){post[postParam]=tag[postParam];delete tag[postParam];}}
+model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(tag,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
 (function(){angular.module('piwikApp').controller('TagListController',TagListController);TagListController.$inject=['$scope','tagManagerTagModel','tagManagerTriggerModel','piwik','piwikApi','$location'];function TagListController($scope,tagManagerTagModel,tagManagerTriggerModel,piwik,piwikApi,$location){this.model=tagManagerTagModel;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.triggers={};function updateTriggers(){tagManagerTriggerModel.reload(self.idContainer,self.idContainerVersion).then(function(triggers){self.triggers={};angular.forEach(triggers,function(trigger){self.triggers[trigger.idtrigger]=trigger.name;});});}
-    this.model.onReload=function(){updateTriggers();};this.createTag=function(){this.editTag(0);};this.editTrigger=function(idTrigger){tagManagerHelper.editTrigger($scope,this.idContainer,this.idContainerVersion,idTrigger,function(){updateTriggers();});};this.editTag=function(idTag){var $search=$location.search();$search.idTag=idTag;$location.search($search);};this.deleteTag=function(tag){function doDelete(){tagManagerTagModel.deleteTag(self.idContainer,self.idContainerVersion,tag.idtag).then(function(){tagManagerTagModel.reload(self.idContainer,self.idContainerVersion);});}
-        piwik.helper.modalConfirm('#confirmDeleteTag',{yes:doDelete});};this.model.fetchTags(this.idContainer,this.idContainerVersion);updateTriggers();}})();
+this.model.onReload=function(){updateTriggers();};this.createTag=function(){this.editTag(0);};this.editTrigger=function(idTrigger){tagManagerHelper.editTrigger($scope,this.idContainer,this.idContainerVersion,idTrigger,function(){updateTriggers();});};this.editTag=function(idTag){var $search=$location.search();$search.idTag=idTag;$location.search($search);};this.deleteTag=function(tag){function doDelete(){tagManagerTagModel.deleteTag(self.idContainer,self.idContainerVersion,tag.idtag).then(function(){tagManagerTagModel.reload(self.idContainer,self.idContainerVersion);});}
+piwik.helper.modalConfirm('#confirmDeleteTag',{yes:doDelete});};this.model.fetchTags(this.idContainer,this.idContainerVersion);updateTriggers();}})();
 (function(){angular.module('piwikApp').directive('piwikTagList',piwikTagList);piwikTagList.$inject=['piwik'];function piwikTagList(piwik){return{restrict:'A',scope:{idContainer:'=',idContainerVersion:'='},templateUrl:'plugins/TagManager/angularjs/manageTag/list.directive.html?cb='+piwik.cacheBuster,controller:'TagListController',controllerAs:'tagList'};}})();
 (function(){angular.module('piwikApp').controller('TagEditController',TagEditController);TagEditController.$inject=['$scope','tagManagerTagModel','piwik','$location','$filter','$timeout','$rootScope'];function TagEditController($scope,tagManagerTagModel,piwik,$location,$filter,$timeout,$rootScope){var self=this;var currentId=null;var notificationId='tagtagmanagement';var translate=$filter('translate');this.isDirty=false;this.model=tagManagerTagModel;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.showAdvanced=false;this.chooseTagType=false;this.canUseCustomTemplates=piwik.hasUserCapability('tagmanager_use_custom_templates');this.availableTags=[];this.availableFireLimits=[];this.containerTriggers=[];this.currentTime=null;function prefixDateZeroIfNeeded(number){var datePart=String(number);if(datePart.length===1){datePart='0'+datePart;}
-    return datePart;}
-    function convertLocalDateToUtc(dateTime){if(dateTime){dateTime=dateTime.replace(/-/g,'/');}
-        try{var localDate=new Date(dateTime)
-            var formatted='';formatted+=localDate.getUTCFullYear()+'-'+prefixDateZeroIfNeeded(localDate.getUTCMonth()+1)+'-'+prefixDateZeroIfNeeded(localDate.getUTCDate());formatted+=' ';formatted+=prefixDateZeroIfNeeded(localDate.getUTCHours())+':'+prefixDateZeroIfNeeded(localDate.getUTCMinutes())+':'+prefixDateZeroIfNeeded(localDate.getUTCSeconds());return formatted;}catch(e){return dateTime;}}
-    function convertUtcToLocalDate(dateTime){if(!dateTime){return;}
-        var isoDate=dateTime;var result,datePart,timePart,dateParts,timeParts,newTime;if(isoDate){isoDate=(isoDate+'').replace(/-/g,'/');try{result=new Date(isoDate+' UTC');return result;}catch(e){try{result=Date.parse(isoDate+' UTC');result=new Date(result);return result;}catch(ex){datePart=isoDate.substr(0,10);timePart=isoDate.substr(11);dateParts=datePart.split('/');timeParts=timePart.split(':');if(dateParts.length===3&&timeParts.length===3){result=new Date(dateParts[0],dateParts[1]-1,dateParts[2],timeParts[0],timeParts[1],timeParts[2]);newTime=result.getTime()+(result.getTimezoneOffset()*60000);result=new Date(newTime);return result;}}}}};function convertUtcDateToLocalDatePart(isoDateTime){var localStartDate=convertUtcToLocalDate(isoDateTime);if(localStartDate){return localStartDate.getFullYear()+'-'+prefixDateZeroIfNeeded(localStartDate.getMonth()+1)+'-'+prefixDateZeroIfNeeded(localStartDate.getDate());}
-        var parts=isoDateTime.split(' ');return parts[0];}
-    function convertUtcDateToLocalTimePart(isoDateTime){var localStartDate=convertUtcToLocalDate(isoDateTime);if(localStartDate){return prefixDateZeroIfNeeded(localStartDate.getHours())+':'+prefixDateZeroIfNeeded(localStartDate.getMinutes())+':'+prefixDateZeroIfNeeded(localStartDate.getSeconds());}
-        var parts=isoDateTime.split(' ');return parts[1];}
-    function enrichTemplateType(template){template.isDisabled=!self.canUseCustomTemplates&&template&&template.isCustomTemplate;return template;}
-    function updateAvailableTriggers(){self.model.fetchContainerTriggers(self.idContainer,self.idContainerVersion).then(function(triggers){self.containerTriggers=[];angular.forEach(triggers,function(trigger){self.containerTriggers.push({key:trigger.idtrigger,value:trigger.name});});});}
-    updateAvailableTriggers();function getCurrentTime(){var date=new Date();if(date&&date.toString){return date.toString();}}
-    function setCurrentTime(){self.currentTime=getCurrentTime();$timeout(setCurrentTime,10000);}
-    setCurrentTime();this.model.fetchAvailableFireLimits().then(function(fireLimits){self.availableFireLimits=[];angular.forEach(fireLimits,function(fireLimit){self.availableFireLimits.push({key:fireLimit.id,value:fireLimit.name});});});function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyTagNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    function showErrorFieldNotProvidedNotification(title){var message=_pk_translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
-    var deregisterWatches=[];function init(idTag){self.create=idTag=='0';self.edit=!self.create;self.tag={};self.chooseTagType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
-        piwik.helper.lazyScrollToContent();self.availableTags=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableTags(container.context);}).then(function(tags){angular.forEach(tags,function(tagsGroup){angular.forEach(tagsGroup.types,function(tag){enrichTemplateType(tag);});});self.availableTags=tags;}).then(function(){if(self.edit&&idTag){self.editTitle=translate('TagManager_EditTag');self.model.findTag(self.idContainer,self.idContainerVersion,idTag).then(function(tag){if(!tag){return;}
-            self.tag=angular.copy(tag);self.tag.idcontainer=self.idContainer;self.tag.block_triggers=[];self.tag.fire_triggers=[];if(self.tag.typeMetadata){enrichTemplateType(self.tag.typeMetadata);}
-            if(angular.isArray(self.tag.block_trigger_ids)){angular.forEach(self.tag.block_trigger_ids,function(id){self.tag.block_triggers.push({idtrigger:id});});}
-            if(!self.tag.block_triggers.length){self.tag.block_triggers.push({idtrigger:''});}
-            if(angular.isArray(self.tag.fire_trigger_ids)){angular.forEach(self.tag.fire_trigger_ids,function(id){self.tag.fire_triggers.push({idtrigger:id});});}
-            if(!self.tag.fire_triggers.length){self.tag.fire_triggers.push({idtrigger:''});}
-            if(self.tag.start_date){self.tag.start_date_date=convertUtcDateToLocalDatePart(self.tag.start_date);self.tag.start_date_time=convertUtcDateToLocalTimePart(self.tag.start_date)}
-            if(self.tag.end_date){self.tag.end_date_date=convertUtcDateToLocalDatePart(self.tag.end_date);self.tag.end_date_time=convertUtcDateToLocalTimePart(self.tag.end_date)}
-            self.addParameterWatch();self.onFireTriggerChange();self.onBlockTriggerChange();self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_ChooseTagToContinue');self.chooseTagType=true;}});};this.addParameterWatch=function(){var index;if(this.tag.typeMetadata&&this.tag.typeMetadata.parameters){for(index=0;index<this.tag.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editTag.tag.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}}));}}};this.onCreateNewBlockTrigger=function(callback){this.openEditTrigger(function(trigger){var indexLastEntry=self.tag.block_triggers.length-1;if(!self.tag.block_triggers[indexLastEntry]||!self.tag.block_triggers[indexLastEntry].idtrigger){self.tag.block_triggers[indexLastEntry]={idtrigger:trigger.idtrigger};}else{self.tag.block_triggers.push({idtrigger:trigger.idtrigger});}
-        self.onBlockTriggerChange();},0);};this.onCreateNewFireTrigger=function(){this.openEditTrigger(function(trigger){var indexLastEntry=self.tag.fire_triggers.length-1;if(!self.tag.fire_triggers[indexLastEntry]||!self.tag.fire_triggers[indexLastEntry].idtrigger){self.tag.fire_triggers[indexLastEntry]={idtrigger:trigger.idtrigger};}else{self.tag.fire_triggers.push({idtrigger:trigger.idtrigger});}
-        self.onFireTriggerChange();},0);};this.editTrigger=function(idTrigger){this.openEditTrigger(function(trigger){},idTrigger);};this.openEditTrigger=function(callback,idTag){tagManagerHelper.editTrigger($scope,this.idContainer,this.idContainerVersion,idTag,function(trigger){updateAvailableTriggers();callback(trigger);});};this.onBlockTriggerChange=function(){var hasAll=true;angular.forEach(this.tag.block_triggers,function(trigger){if(!trigger||!trigger.idtrigger){hasAll=false;}});if(hasAll){this.addBlockTrigger();}};this.addBlockTrigger=function(){this.tag.block_triggers.push({idtrigger:''});this.isDirty=true;};this.removeBlockTrigger=function(index){if(index>-1){var lastIndex=this.tag.block_triggers.length-1;if(lastIndex===index){this.tag.block_triggers[index]={idtrigger:''};}else{this.tag.block_triggers.splice(index,1);}
-        this.isDirty=true;}};this.onFireTriggerChange=function(){var hasAll=true;angular.forEach(this.tag.fire_triggers,function(trigger){if(!trigger||!trigger.idtrigger){hasAll=false;}});if(hasAll){this.addFireTrigger();}};this.addFireTrigger=function(){this.tag.fire_triggers.push({idtrigger:''});this.isDirty=true;};this.removeFireTrigger=function(index){if(index>-1){var lastIndex=this.tag.fire_triggers.length-1;if(lastIndex===index){this.tag.block_triggers[index]={idtrigger:''};}else{this.tag.fire_triggers.splice(index,1);}
-        this.isDirty=true;}};this.createTagType=function(tagTemplate){if(tagTemplate&&tagTemplate.isDisabled){return;}
-        this.chooseTagType=false;this.editTitle=translate('TagManager_CreateNewTag');this.tag={idSite:piwik.idSite,name:this.model.suggestNameForType(tagTemplate.name),type:tagTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},fire_limit:'unlimited',priority:999,fire_delay:0,block_triggers:[{idtrigger:''}],fire_triggers:[{idtrigger:''}],typeMetadata:tagTemplate};this.addParameterWatch();this.isDirty=false;$timeout(function(){var editTag=$('.editTag');if(editTag.length&&editTag[0]){editTag[0].scrollIntoView()}
-            $('.editTag #name').focus();},1);};this.cancel=function(){$scope.idTag=null;currentId=null;var $search=$location.search();delete $search.idTag;$location.search($search);};$scope.$on('$destroy',function(){$scope.idTag=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.tag.name){title=translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
-        if(!self.tag.fire_triggers||!self.tag.fire_triggers.length){showNotification(translate('TagManager_TagFireTriggerRequirement'),'error');return false;}
-        return true;}
-    this.onAnyDateChange=function(){if(this.tag.start_date_date){if(!this.tag.start_date_time){this.tag.start_date_time='00:00:00';}
-        this.tag.start_date=convertLocalDateToUtc(this.tag.start_date_date+' '+this.tag.start_date_time);}else{this.tag.start_date=null;}
-        if(this.tag.end_date_date){if(!this.tag.end_date_time){this.tag.end_date_time='23:59:59';}
-            this.tag.end_date=convertLocalDateToUtc(this.tag.end_date_date+' '+this.tag.end_date_time);}else{this.tag.end_date=null;}};this.createTag=function(){removeAnyTagNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerTagModel.createOrUpdateTag(this.tag,'TagManager.addContainerTag').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
-            self.isDirty=false;var idTag=response.response.value;tagManagerTagModel.reload(self.idContainer,self.idContainerVersion).then(function(){var $search=$location.search();$search.idTag=idTag;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Tag'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateTag=function(){removeAnyTagNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerTagModel.createOrUpdateTag(this.tag,'TagManager.updateContainerTag').then(function(response){if(response.type==='error'){return;}
-            var idTag=self.tag.idtag;self.isDirty=false;self.tag={};tagManagerTagModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idTag);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Tag'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};var options1=piwik.getBaseDatePickerOptions(null);delete options1.maxDate;options1.minDate=new Date();var options2=angular.copy(options1);$timeout(function(){$(".tagStartDateInput").datepicker(options1);$(".tagEndDateInput").datepicker(options2);$('.tagStartTimeInput').timepicker({timeFormat:'H:i:s'});$('.tagEndTimeInput').timepicker({timeFormat:'H:i:s'});});$scope.$watch('idTag',function(newValue,oldValue){if(newValue===null){return;}
-        if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
+return datePart;}
+function convertLocalDateToUtc(dateTime){if(dateTime){dateTime=dateTime.replace(/-/g,'/');}
+try{var localDate=new Date(dateTime)
+var formatted='';formatted+=localDate.getUTCFullYear()+'-'+prefixDateZeroIfNeeded(localDate.getUTCMonth()+1)+'-'+prefixDateZeroIfNeeded(localDate.getUTCDate());formatted+=' ';formatted+=prefixDateZeroIfNeeded(localDate.getUTCHours())+':'+prefixDateZeroIfNeeded(localDate.getUTCMinutes())+':'+prefixDateZeroIfNeeded(localDate.getUTCSeconds());return formatted;}catch(e){return dateTime;}}
+function convertUtcToLocalDate(dateTime){if(!dateTime){return;}
+var isoDate=dateTime;var result,datePart,timePart,dateParts,timeParts,newTime;if(isoDate){isoDate=(isoDate+'').replace(/-/g,'/');try{result=new Date(isoDate+' UTC');return result;}catch(e){try{result=Date.parse(isoDate+' UTC');result=new Date(result);return result;}catch(ex){datePart=isoDate.substr(0,10);timePart=isoDate.substr(11);dateParts=datePart.split('/');timeParts=timePart.split(':');if(dateParts.length===3&&timeParts.length===3){result=new Date(dateParts[0],dateParts[1]-1,dateParts[2],timeParts[0],timeParts[1],timeParts[2]);newTime=result.getTime()+(result.getTimezoneOffset()*60000);result=new Date(newTime);return result;}}}}};function convertUtcDateToLocalDatePart(isoDateTime){var localStartDate=convertUtcToLocalDate(isoDateTime);if(localStartDate){return localStartDate.getFullYear()+'-'+prefixDateZeroIfNeeded(localStartDate.getMonth()+1)+'-'+prefixDateZeroIfNeeded(localStartDate.getDate());}
+var parts=isoDateTime.split(' ');return parts[0];}
+function convertUtcDateToLocalTimePart(isoDateTime){var localStartDate=convertUtcToLocalDate(isoDateTime);if(localStartDate){return prefixDateZeroIfNeeded(localStartDate.getHours())+':'+prefixDateZeroIfNeeded(localStartDate.getMinutes())+':'+prefixDateZeroIfNeeded(localStartDate.getSeconds());}
+var parts=isoDateTime.split(' ');return parts[1];}
+function enrichTemplateType(template){template.isDisabled=!self.canUseCustomTemplates&&template&&template.isCustomTemplate;return template;}
+function updateAvailableTriggers(){self.model.fetchContainerTriggers(self.idContainer,self.idContainerVersion).then(function(triggers){self.containerTriggers=[];angular.forEach(triggers,function(trigger){self.containerTriggers.push({key:trigger.idtrigger,value:trigger.name});});});}
+updateAvailableTriggers();function getCurrentTime(){var date=new Date();if(date&&date.toString){return date.toString();}}
+function setCurrentTime(){self.currentTime=getCurrentTime();$timeout(setCurrentTime,10000);}
+setCurrentTime();this.model.fetchAvailableFireLimits().then(function(fireLimits){self.availableFireLimits=[];angular.forEach(fireLimits,function(fireLimit){self.availableFireLimits.push({key:fireLimit.id,value:fireLimit.name});});});function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
+function removeAnyTagNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+function showErrorFieldNotProvidedNotification(title){var message=_pk_translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
+var deregisterWatches=[];function init(idTag){self.create=idTag=='0';self.edit=!self.create;self.tag={};self.chooseTagType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
+piwik.helper.lazyScrollToContent();self.availableTags=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableTags(container.context);}).then(function(tags){angular.forEach(tags,function(tagsGroup){angular.forEach(tagsGroup.types,function(tag){enrichTemplateType(tag);});});self.availableTags=tags;}).then(function(){if(self.edit&&idTag){self.editTitle=translate('TagManager_EditTag');self.model.findTag(self.idContainer,self.idContainerVersion,idTag).then(function(tag){if(!tag){return;}
+self.tag=angular.copy(tag);self.tag.idcontainer=self.idContainer;self.tag.block_triggers=[];self.tag.fire_triggers=[];if(self.tag.typeMetadata){enrichTemplateType(self.tag.typeMetadata);}
+if(angular.isArray(self.tag.block_trigger_ids)){angular.forEach(self.tag.block_trigger_ids,function(id){self.tag.block_triggers.push({idtrigger:id});});}
+if(!self.tag.block_triggers.length){self.tag.block_triggers.push({idtrigger:''});}
+if(angular.isArray(self.tag.fire_trigger_ids)){angular.forEach(self.tag.fire_trigger_ids,function(id){self.tag.fire_triggers.push({idtrigger:id});});}
+if(!self.tag.fire_triggers.length){self.tag.fire_triggers.push({idtrigger:''});}
+if(self.tag.start_date){self.tag.start_date_date=convertUtcDateToLocalDatePart(self.tag.start_date);self.tag.start_date_time=convertUtcDateToLocalTimePart(self.tag.start_date)}
+if(self.tag.end_date){self.tag.end_date_date=convertUtcDateToLocalDatePart(self.tag.end_date);self.tag.end_date_time=convertUtcDateToLocalTimePart(self.tag.end_date)}
+self.addParameterWatch();self.onFireTriggerChange();self.onBlockTriggerChange();self.isDirty=false;});}else if(self.create){self.editTitle=translate('TagManager_ChooseTagToContinue');self.chooseTagType=true;}});};this.addParameterWatch=function(){var index;if(this.tag.typeMetadata&&this.tag.typeMetadata.parameters){for(index=0;index<this.tag.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editTag.tag.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}}));}}};this.onCreateNewBlockTrigger=function(callback){this.openEditTrigger(function(trigger){var indexLastEntry=self.tag.block_triggers.length-1;if(!self.tag.block_triggers[indexLastEntry]||!self.tag.block_triggers[indexLastEntry].idtrigger){self.tag.block_triggers[indexLastEntry]={idtrigger:trigger.idtrigger};}else{self.tag.block_triggers.push({idtrigger:trigger.idtrigger});}
+self.onBlockTriggerChange();},0);};this.onCreateNewFireTrigger=function(){this.openEditTrigger(function(trigger){var indexLastEntry=self.tag.fire_triggers.length-1;if(!self.tag.fire_triggers[indexLastEntry]||!self.tag.fire_triggers[indexLastEntry].idtrigger){self.tag.fire_triggers[indexLastEntry]={idtrigger:trigger.idtrigger};}else{self.tag.fire_triggers.push({idtrigger:trigger.idtrigger});}
+self.onFireTriggerChange();},0);};this.editTrigger=function(idTrigger){this.openEditTrigger(function(trigger){},idTrigger);};this.openEditTrigger=function(callback,idTag){tagManagerHelper.editTrigger($scope,this.idContainer,this.idContainerVersion,idTag,function(trigger){updateAvailableTriggers();callback(trigger);});};this.onBlockTriggerChange=function(){var hasAll=true;angular.forEach(this.tag.block_triggers,function(trigger){if(!trigger||!trigger.idtrigger){hasAll=false;}});if(hasAll){this.addBlockTrigger();}};this.addBlockTrigger=function(){this.tag.block_triggers.push({idtrigger:''});this.isDirty=true;};this.removeBlockTrigger=function(index){if(index>-1){var lastIndex=this.tag.block_triggers.length-1;if(lastIndex===index){this.tag.block_triggers[index]={idtrigger:''};}else{this.tag.block_triggers.splice(index,1);}
+this.isDirty=true;}};this.onFireTriggerChange=function(){var hasAll=true;angular.forEach(this.tag.fire_triggers,function(trigger){if(!trigger||!trigger.idtrigger){hasAll=false;}});if(hasAll){this.addFireTrigger();}};this.addFireTrigger=function(){this.tag.fire_triggers.push({idtrigger:''});this.isDirty=true;};this.removeFireTrigger=function(index){if(index>-1){var lastIndex=this.tag.fire_triggers.length-1;if(lastIndex===index){this.tag.block_triggers[index]={idtrigger:''};}else{this.tag.fire_triggers.splice(index,1);}
+this.isDirty=true;}};this.createTagType=function(tagTemplate){if(tagTemplate&&tagTemplate.isDisabled){return;}
+this.chooseTagType=false;this.editTitle=translate('TagManager_CreateNewTag');this.tag={idSite:piwik.idSite,name:this.model.suggestNameForType(tagTemplate.name),type:tagTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},fire_limit:'unlimited',priority:999,fire_delay:0,block_triggers:[{idtrigger:''}],fire_triggers:[{idtrigger:''}],typeMetadata:tagTemplate};this.addParameterWatch();this.isDirty=false;$timeout(function(){var editTag=$('.editTag');if(editTag.length&&editTag[0]){editTag[0].scrollIntoView()}
+$('.editTag #name').focus();},1);};this.cancel=function(){$scope.idTag=null;currentId=null;var $search=$location.search();delete $search.idTag;$location.search($search);};$scope.$on('$destroy',function(){$scope.idTag=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.tag.name){title=translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
+if(!self.tag.fire_triggers||!self.tag.fire_triggers.length){showNotification(translate('TagManager_TagFireTriggerRequirement'),'error');return false;}
+return true;}
+this.onAnyDateChange=function(){if(this.tag.start_date_date){if(!this.tag.start_date_time){this.tag.start_date_time='00:00:00';}
+this.tag.start_date=convertLocalDateToUtc(this.tag.start_date_date+' '+this.tag.start_date_time);}else{this.tag.start_date=null;}
+if(this.tag.end_date_date){if(!this.tag.end_date_time){this.tag.end_date_time='23:59:59';}
+this.tag.end_date=convertLocalDateToUtc(this.tag.end_date_date+' '+this.tag.end_date_time);}else{this.tag.end_date=null;}};this.createTag=function(){removeAnyTagNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerTagModel.createOrUpdateTag(this.tag,'TagManager.addContainerTag').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
+self.isDirty=false;var idTag=response.response.value;tagManagerTagModel.reload(self.idContainer,self.idContainerVersion).then(function(){var $search=$location.search();$search.idTag=idTag;$location.search($search);$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Tag'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateTag=function(){removeAnyTagNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerTagModel.createOrUpdateTag(this.tag,'TagManager.updateContainerTag').then(function(response){if(response.type==='error'){return;}
+var idTag=self.tag.idtag;self.isDirty=false;self.tag={};tagManagerTagModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idTag);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Tag'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};var options1=piwik.getBaseDatePickerOptions(null);delete options1.maxDate;options1.minDate=new Date();var options2=angular.copy(options1);$timeout(function(){$(".tagStartDateInput").datepicker(options1);$(".tagEndDateInput").datepicker(options2);$('.tagStartTimeInput').timepicker({timeFormat:'H:i:s'});$('.tagEndTimeInput').timepicker({timeFormat:'H:i:s'});});$scope.$watch('idTag',function(newValue,oldValue){if(newValue===null){return;}
+if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
 (function(){angular.module('piwikApp').directive('piwikTagEdit',piwikTagEdit);piwikTagEdit.$inject=['piwik'];function piwikTagEdit(piwik){return{restrict:'A',scope:{idTag:'=',idContainer:'=',idContainerVersion:'=',newTagType:'='},templateUrl:'plugins/TagManager/angularjs/manageTag/edit.directive.html?cb='+piwik.cacheBuster,controller:'TagEditController',controllerAs:'editTag'};}})();
 (function(){angular.module('piwikApp').controller('ManageTagController',ManageTagController);ManageTagController.$inject=['$scope','$rootScope','$location'];function ManageTagController($scope,$rootScope,$location){this.editMode=false;var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;function removeAnyTagNotification(){var UI=require('piwik/UI');new UI.Notification().remove('tagtagmanagement');}
-    function initState(){var $search=$location.search();if('idTag'in $search){if($search.idTag===0||$search.idTag==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddTag',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idTag=null;return;}}
-        self.editMode=true;self.idTag=parseInt($search.idTag,10);}else{self.editMode=false;self.idTag=null;}
-        removeAnyTagNotification();}
-    initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
+function initState(){var $search=$location.search();if('idTag'in $search){if($search.idTag===0||$search.idTag==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddTag',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idTag=null;return;}}
+self.editMode=true;self.idTag=parseInt($search.idTag,10);}else{self.editMode=false;self.idTag=null;}
+removeAnyTagNotification();}
+initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
 (function(){angular.module('piwikApp').directive('piwikTagManage',piwikTagManage);piwikTagManage.$inject=['piwik'];function piwikTagManage(piwik){return{restrict:'A',scope:{idContainerVersion:'@',idContainer:'@'},templateUrl:'plugins/TagManager/angularjs/manageTag/manage.directive.html?cb='+piwik.cacheBuster,controller:'ManageTagController',controllerAs:'manageTag'};}})();
 (function(){angular.module('piwikApp').factory('tagManagerVariableModel',tagManagerVariableModel);tagManagerVariableModel.$inject=['piwikApi','$q','$filter'];function tagManagerVariableModel(piwikApi,$q,$filter){var fetchPromise=null;var variablesPromise={};var comparisonPromise=null;var preconfiguredVarsPromise=null;var translate=$filter('translate');var model={variables:[],isLoading:false,isUpdating:false,findVariable:findVariable,createOrUpdateVariable:createOrUpdateVariable,fetchAvailableVariables:fetchAvailableVariables,fetchContainer:fetchContainer,fetchAvailableComparisons:fetchAvailableComparisons,suggestNameForType:suggestNameForType,deleteVariable:deleteVariable,reload:reload,fetchVariables:fetchVariables,fetchVariablesIfNotLoaded:fetchVariablesIfNotLoaded,fetchAvailableContainerVariables:fetchAvailableContainerVariables};return model;function arrayFilter(array,filter){var entries=[];angular.forEach(array,function(value){if(filter(value)){entries.push(value);}});return entries;}
-    function filterLookupTable(lookups){return arrayFilter(lookups,function(lookup){return!!lookup&&lookup.out_value&&lookup.comparison;});}
-    function reload(idContainer,idContainerVersion){model.variables=[];fetchPromise=null;variablesPromise={};comparisonPromise=null;return fetchVariables(idContainer,idContainerVersion);}
-    function fetchVariablesIfNotLoaded(idContainer,idContainerVersion){if(!fetchPromise){model.fetchVariables(idContainer,idContainerVersion);}}
-    function fetchAvailableVariables(idContext){if(!variablesPromise[idContext]){var params={method:'TagManager.getAvailableVariableTypesInContext',idContext:idContext,filter_limit:'-1'};variablesPromise[idContext]=piwikApi.fetch(params);}
-        return variablesPromise[idContext];}
-    function fetchAvailableContainerVariables(idContainer,idContainerVersion){if(!preconfiguredVarsPromise){var params={method:'TagManager.getAvailableContainerVariables',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};preconfiguredVarsPromise=piwikApi.fetch(params);}
-        return preconfiguredVarsPromise;}
-    function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
-    function fetchAvailableComparisons(){if(!comparisonPromise){var params={method:'TagManager.getAvailableComparisons',filter_limit:'-1'};comparisonPromise=piwikApi.fetch(params);}
-        return comparisonPromise;}
-    function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
-        var isFree=true;angular.forEach(model.variables,function(variable){if(variable&&variable.name===name){isFree=false;}});if(isFree){return name;}}}
-    function fetchVariables(idContainer,idContainerVersion){var params={method:'TagManager.getContainerVariables',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
-        model.isLoading=true;model.variables=[];return fetchPromise.then(function(variables){model.variables=variables;model.isLoading=false;return variables;},function(){model.isLoading=false;});}
-    function findVariable(idContainer,idContainerVersion,idVariable){var found;angular.forEach(model.variables,function(variable){if(!found&&parseInt(variable.idvariable,10)===idVariable){found=variable;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
-        model.isLoading=true;return piwikApi.fetch({idVariable:idVariable,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerVariable',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
-    function deleteVariable(idContainer,idContainerVersion,idVariable){model.isUpdating=true;model.variables=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idVariable:idVariable,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerVariable'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
-    function createOrUpdateVariable(variable,method){variable=angular.copy(variable);variable.method=method;variable.parameters={};angular.forEach(variable.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
-        variable.parameters[setting.name]=value;});delete variable.typeMetadata;var map={idVariable:'idvariable',idContainer:'idcontainer',idContainerVersion:'idcontainerversion',lookupTable:'lookup_table',defaultValue:'default_value'};angular.forEach(map,function(value,key){if(typeof variable[value]!=='undefined'){variable[key]=variable[value];delete variable[value];}});variable.lookupTable=filterLookupTable(variable.lookupTable);var postParams=['parameters','lookupTable'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof variable[postParam]!=='undefined'){post[postParam]=variable[postParam];delete variable[postParam];}}
-        model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(variable,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
+function filterLookupTable(lookups){return arrayFilter(lookups,function(lookup){return!!lookup&&lookup.out_value&&lookup.comparison;});}
+function reload(idContainer,idContainerVersion){model.variables=[];fetchPromise=null;variablesPromise={};comparisonPromise=null;return fetchVariables(idContainer,idContainerVersion);}
+function fetchVariablesIfNotLoaded(idContainer,idContainerVersion){if(!fetchPromise){model.fetchVariables(idContainer,idContainerVersion);}}
+function fetchAvailableVariables(idContext){if(!variablesPromise[idContext]){var params={method:'TagManager.getAvailableVariableTypesInContext',idContext:idContext,filter_limit:'-1'};variablesPromise[idContext]=piwikApi.fetch(params);}
+return variablesPromise[idContext];}
+function fetchAvailableContainerVariables(idContainer,idContainerVersion){if(!preconfiguredVarsPromise){var params={method:'TagManager.getAvailableContainerVariables',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};preconfiguredVarsPromise=piwikApi.fetch(params);}
+return preconfiguredVarsPromise;}
+function fetchContainer(idContainer){var params={method:'TagManager.getContainer',idContainer:idContainer,filter_limit:'-1'};return piwikApi.fetch(params);}
+function fetchAvailableComparisons(){if(!comparisonPromise){var params={method:'TagManager.getAvailableComparisons',filter_limit:'-1'};comparisonPromise=piwikApi.fetch(params);}
+return comparisonPromise;}
+function suggestNameForType(templateId){var counter;for(counter=0;counter<100;counter++){var name=templateId;if(counter){name=name+' ('+counter+')';}
+var isFree=true;angular.forEach(model.variables,function(variable){if(variable&&variable.name===name){isFree=false;}});if(isFree){return name;}}}
+function fetchVariables(idContainer,idContainerVersion){var params={method:'TagManager.getContainerVariables',idContainer:idContainer,idContainerVersion:idContainerVersion,filter_limit:'-1'};if(!fetchPromise){fetchPromise=piwikApi.fetch(params);}
+model.isLoading=true;model.variables=[];return fetchPromise.then(function(variables){model.variables=variables;model.isLoading=false;return variables;},function(){model.isLoading=false;});}
+function findVariable(idContainer,idContainerVersion,idVariable){var found;angular.forEach(model.variables,function(variable){if(!found&&parseInt(variable.idvariable,10)===idVariable){found=variable;}});if(found){var deferred=$q.defer();deferred.resolve(found);return deferred.promise;}
+model.isLoading=true;return piwikApi.fetch({idVariable:idVariable,idContainer:idContainer,idContainerVersion:idContainerVersion,method:'TagManager.getContainerVariable',filter_limit:'-1'}).then(function(record){model.isLoading=false;return record;},function(error){model.isLoading=false;});}
+function deleteVariable(idContainer,idContainerVersion,idVariable){model.isUpdating=true;model.variables=[];piwikApi.withTokenInUrl();return piwikApi.fetch({idVariable:idVariable,idContainerVersion:idContainerVersion,idContainer:idContainer,method:'TagManager.deleteContainerVariable'}).then(function(response){model.isUpdating=false;return{type:'success'};},function(error){model.isUpdating=false;return{type:'error',message:error};});}
+function createOrUpdateVariable(variable,method){variable=angular.copy(variable);variable.method=method;variable.parameters={};angular.forEach(variable.typeMetadata.parameters,function(setting){var value=setting.value;if(value===false){value='0';}else if(value===true){value='1';}
+variable.parameters[setting.name]=value;});delete variable.typeMetadata;var map={idVariable:'idvariable',idContainer:'idcontainer',idContainerVersion:'idcontainerversion',lookupTable:'lookup_table',defaultValue:'default_value'};angular.forEach(map,function(value,key){if(typeof variable[value]!=='undefined'){variable[key]=variable[value];delete variable[value];}});variable.lookupTable=filterLookupTable(variable.lookupTable);var postParams=['parameters','lookupTable'];var post={};for(var i=0;i<postParams.length;i++){var postParam=postParams[i];if(typeof variable[postParam]!=='undefined'){post[postParam]=variable[postParam];delete variable[postParam];}}
+model.isUpdating=true;piwikApi.withTokenInUrl();return piwikApi.post(variable,post).then(function(response){model.isUpdating=false;return{type:'success',response:response};},function(error){model.isUpdating=false;return{type:'error',message:error};});}}})();
 (function(){angular.module('piwikApp').controller('VariableListController',VariableListController);VariableListController.$inject=['$scope','tagManagerVariableModel','piwik','piwikApi','$location'];function VariableListController($scope,tagManagerVariableModel,piwik,piwikApi,$location){this.model=tagManagerVariableModel;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.variableReferences=[];this.createVariable=function(){this.editVariable(0);};this.editVariable=function(idVariable){var $search=$location.search();$search.idVariable=idVariable;$location.search($search);};this.deleteVariable=function(variable){piwikApi.fetch({method:'TagManager.getContainerVariableReferences',idContainer:this.idContainer,idContainerVersion:this.idContainerVersion,idVariable:variable.idvariable}).then(function(references){if(!references||!references.length){self.variableReferences=[];function doDelete(){tagManagerVariableModel.deleteVariable(self.idContainer,self.idContainerVersion,variable.idvariable).then(function(){tagManagerVariableModel.reload(self.idContainer,self.idContainerVersion);});}
-    piwik.helper.modalConfirm('#confirmDeleteVariable',{yes:doDelete});}else{self.variableReferences=references;piwik.helper.modalConfirm('#confirmDeleteVariableNotPossible',{});}});};this.model.fetchVariables(this.idContainer,this.idContainerVersion);this.model.fetchAvailableContainerVariables(this.idContainer,this.idContainerVersion).then(function(variables){self.containerVariables=variables;});}})();
+piwik.helper.modalConfirm('#confirmDeleteVariable',{yes:doDelete});}else{self.variableReferences=references;piwik.helper.modalConfirm('#confirmDeleteVariableNotPossible',{});}});};this.model.fetchVariables(this.idContainer,this.idContainerVersion);this.model.fetchAvailableContainerVariables(this.idContainer,this.idContainerVersion).then(function(variables){self.containerVariables=variables;});}})();
 (function(){angular.module('piwikApp').directive('piwikVariableList',piwikVariableList);piwikVariableList.$inject=['piwik'];function piwikVariableList(piwik){return{restrict:'A',scope:{idContainer:'=',idContainerVersion:'='},templateUrl:'plugins/TagManager/angularjs/manageVariable/list.directive.html?cb='+piwik.cacheBuster,controller:'VariableListController',controllerAs:'variableList'};}})();
 (function(){angular.module('piwikApp').controller('VariableEditController',VariableEditController);VariableEditController.$inject=['$scope','tagManagerVariableModel','piwik','$location','$filter','$timeout','$rootScope'];function VariableEditController($scope,tagManagerVariableModel,piwik,$location,$filter,$timeout,$rootScope){var self=this;var currentId=null;var notificationId='tagvariablemanagement';var translate=$filter('translate');this.isDirty=false;this.model=tagManagerVariableModel;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;this.showAdvanced=false;this.chooseVariableType=false;this.isEmbedded=!!$scope.onChangeVariable;this.canUseCustomTemplates=piwik.hasUserCapability('tagmanager_use_custom_templates');this.availableVariables=[];this.availableLookUpComparisons=[];this.model.fetchAvailableComparisons().then(function(lookUpComparisons){self.availableLookUpComparisons=[];angular.forEach(lookUpComparisons,function(lookupComparison){self.availableLookUpComparisons.push({key:lookupComparison.id,value:lookupComparison.name});});});this.model.fetchVariablesIfNotLoaded(this.idContainer,this.idContainerVersion);function enrichTemplateType(template){template.isDisabled=!self.canUseCustomTemplates&&template&&template.isCustomTemplate;return template;}
-    function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyVariableNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
-    var deregisterWatches=[];function init(idVariable){self.create=idVariable=='0';self.edit=!self.create;self.variable={};self.chooseVariableType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
-        piwik.helper.lazyScrollToContent();self.availableVariables=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableVariables(container.context);}).then(function(variables){angular.forEach(variables,function(variablesGroup){angular.forEach(variablesGroup.types,function(variable){enrichTemplateType(variable);});});self.availableVariables=variables;}).then(function(){if(self.edit&&idVariable){self.editTitle=translate('TagManager_EditVariable');self.model.findVariable(self.idContainer,self.idContainerVersion,idVariable).then(function(variable){if(!variable){return;}
-            self.variable=angular.copy(variable);self.variable.idcontainer=self.idContainer;if(self.variable.typeMetadata){enrichTemplateType(self.variable.typeMetadata);}
-            if(self.variable.lookup_table&&self.variable.lookup_table.length){self.showAdvanced=true;}else if(self.variable.default_value){self.showAdvanced=true;}
-            self.addLookUpEntryIfNoneExists();self.onLookupChange();self.addParameterWatch();self.isDirty=false;});}else if(self.create){var found=false;if($scope.variableType){angular.forEach(self.availableVariables,function(variablesCategory){angular.forEach(variablesCategory.types,function(variable){if(!found&&variable&&variable.id===$scope.variableType){self.createVariableType(variable);found=true;}})});}
-            if(!found){self.editTitle=translate('TagManager_ChooseVariableToContinue');self.chooseVariableType=true;}}});};this.addParameterWatch=function(){var index;if(this.variable.typeMetadata&&this.variable.typeMetadata.parameters){for(index=0;index<this.variable.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editVariable.variable.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}},true));}}}
-    this.addLookUpEntryIfNoneExists=function(){if(!this.variable.lookup_table||!angular.isArray(this.variable.lookup_table)){this.variable.lookup_table=[];}
-        if(!this.variable.lookup_table.length){this.variable.lookup_table.push({comparison:'equals',match_value:'',out_value:''});}};this.onLookupChange=function(){var hasAll=true;angular.forEach(this.variable.lookup_table,function(table){if(!table||!table.out_value){hasAll=false;}});if(hasAll){this.addLookUpEntry();}};this.addLookUpEntry=function(){this.variable.lookup_table.push({comparison:'equals',match_value:'',out_value:''});this.isDirty=true;};this.removeLookUpEntry=function(index){if(index>-1){this.variable.lookup_table.splice(index,1);this.isDirty=true;}};this.createVariableType=function(variableTemplate){if(variableTemplate&&variableTemplate.isDisabled){return;}
-        this.chooseVariableType=false;this.editTitle=translate('TagManager_CreateNewVariable');this.variable={idSite:piwik.idSite,name:this.model.suggestNameForType(variableTemplate.name),type:variableTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},default_value:'',lookup_table:[],typeMetadata:variableTemplate};this.addLookUpEntry();this.addParameterWatch();this.isDirty=true;$timeout(function(){var editVariable=$('.editVariable');if(editVariable.length&&editVariable[0]){editVariable[0].scrollIntoView()}
-            $('.editVariable #name').focus();},1);};this.cancel=function(){$scope.idVariable=null;currentId=null;var $search=$location.search();delete $search.idVariable;$location.search($search);};$scope.$on('$destroy',function(){$scope.idVariable=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.variable.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
-        return true;}
-    this.createVariable=function(){removeAnyVariableNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerVariableModel.createOrUpdateVariable(this.variable,'TagManager.addContainerVariable').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
-            self.isDirty=false;var idVariable=response.response.value;if('function'===typeof $scope.onChangeVariable){self.model.reload(self.idContainer,self.idContainerVersion);self.variable.idvariable=idVariable;$scope.onChangeVariable({variable:self.variable});return;}
-            tagManagerVariableModel.reload(self.idContainer,self.idContainerVersion).then(function(){if(piwik.helper.isAngularRenderingThePage()){var $search=$location.search();$search.idVariable=idVariable;$location.search($search);}else{$location.url('/?idVariable='+idVariable);}
-                $timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Variable'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateVariable=function(){removeAnyVariableNotification();if(!checkRequiredFieldsAreSet()){return;}
-        this.isUpdating=true;tagManagerVariableModel.createOrUpdateVariable(this.variable,'TagManager.updateContainerVariable').then(function(response){if(response.type==='error'){return;}
-            var idVariable=self.variable.idvariable;if('function'===typeof $scope.onChangeVariable){$scope.onChangeVariable({variable:self.variable});return;}
-            self.isDirty=false;self.variable={};tagManagerVariableModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idVariable);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Variable'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};$scope.$watch('idVariable',function(newValue,oldValue){if(newValue===null){return;}
-        if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
+function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
+function removeAnyVariableNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+function showErrorFieldNotProvidedNotification(title){var message=translate('TagManager_ErrorXNotProvided',[title]);showNotification(message,'error');}
+var deregisterWatches=[];function init(idVariable){self.create=idVariable=='0';self.edit=!self.create;self.variable={};self.chooseVariableType=false;self.editTitle='';var dereg;for(dereg=0;dereg<deregisterWatches.length;dereg++){if('function'===typeof deregisterWatches[dereg]){deregisterWatches[dereg]();}}
+piwik.helper.lazyScrollToContent();self.availableVariables=[];self.model.fetchContainer(self.idContainer).then(function(container){return self.model.fetchAvailableVariables(container.context);}).then(function(variables){angular.forEach(variables,function(variablesGroup){angular.forEach(variablesGroup.types,function(variable){enrichTemplateType(variable);});});self.availableVariables=variables;}).then(function(){if(self.edit&&idVariable){self.editTitle=translate('TagManager_EditVariable');self.model.findVariable(self.idContainer,self.idContainerVersion,idVariable).then(function(variable){if(!variable){return;}
+self.variable=angular.copy(variable);self.variable.idcontainer=self.idContainer;if(self.variable.typeMetadata){enrichTemplateType(self.variable.typeMetadata);}
+if(self.variable.lookup_table&&self.variable.lookup_table.length){self.showAdvanced=true;}else if(self.variable.default_value){self.showAdvanced=true;}
+self.addLookUpEntryIfNoneExists();self.onLookupChange();self.addParameterWatch();self.isDirty=false;});}else if(self.create){var found=false;if($scope.variableType){angular.forEach(self.availableVariables,function(variablesCategory){angular.forEach(variablesCategory.types,function(variable){if(!found&&variable&&variable.id===$scope.variableType){self.createVariableType(variable);found=true;}})});}
+if(!found){self.editTitle=translate('TagManager_ChooseVariableToContinue');self.chooseVariableType=true;}}});};this.addParameterWatch=function(){var index;if(this.variable.typeMetadata&&this.variable.typeMetadata.parameters){for(index=0;index<this.variable.typeMetadata.parameters.length;index++){deregisterWatches.push($scope.$watch('editVariable.variable.typeMetadata.parameters['+index+'].value',function(val,oldVal){if(val!==oldVal){self.isDirty=true;}},true));}}}
+this.addLookUpEntryIfNoneExists=function(){if(!this.variable.lookup_table||!angular.isArray(this.variable.lookup_table)){this.variable.lookup_table=[];}
+if(!this.variable.lookup_table.length){this.variable.lookup_table.push({comparison:'equals',match_value:'',out_value:''});}};this.onLookupChange=function(){var hasAll=true;angular.forEach(this.variable.lookup_table,function(table){if(!table||!table.out_value){hasAll=false;}});if(hasAll){this.addLookUpEntry();}};this.addLookUpEntry=function(){this.variable.lookup_table.push({comparison:'equals',match_value:'',out_value:''});this.isDirty=true;};this.removeLookUpEntry=function(index){if(index>-1){this.variable.lookup_table.splice(index,1);this.isDirty=true;}};this.createVariableType=function(variableTemplate){if(variableTemplate&&variableTemplate.isDisabled){return;}
+this.chooseVariableType=false;this.editTitle=translate('TagManager_CreateNewVariable');this.variable={idSite:piwik.idSite,name:this.model.suggestNameForType(variableTemplate.name),type:variableTemplate.id,idcontainer:self.idContainer,idcontainerversion:self.idContainerVersion,parameters:{},default_value:'',lookup_table:[],typeMetadata:variableTemplate};this.addLookUpEntry();this.addParameterWatch();this.isDirty=true;$timeout(function(){var editVariable=$('.editVariable');if(editVariable.length&&editVariable[0]){editVariable[0].scrollIntoView()}
+$('.editVariable #name').focus();},1);};this.cancel=function(){$scope.idVariable=null;currentId=null;var $search=$location.search();delete $search.idVariable;$location.search($search);};$scope.$on('$destroy',function(){$scope.idVariable=null;currentId=null;});function checkRequiredFieldsAreSet(){var title;if(!self.variable.name){title=_pk_translate('General_Name');showErrorFieldNotProvidedNotification(title);return false;}
+return true;}
+this.createVariable=function(){removeAnyVariableNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerVariableModel.createOrUpdateVariable(this.variable,'TagManager.addContainerVariable').then(function(response){self.isUpdating=false;if(!response||response.type==='error'||!response.response){return;}
+self.isDirty=false;var idVariable=response.response.value;if('function'===typeof $scope.onChangeVariable){self.model.reload(self.idContainer,self.idContainerVersion);self.variable.idvariable=idVariable;$scope.onChangeVariable({variable:self.variable});return;}
+tagManagerVariableModel.reload(self.idContainer,self.idContainerVersion).then(function(){if(piwik.helper.isAngularRenderingThePage()){var $search=$location.search();$search.idVariable=idVariable;$location.search($search);}else{$location.url('/?idVariable='+idVariable);}
+$timeout(function(){showNotification(translate('TagManager_CreatedX',translate('TagManager_Variable'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);},200);});},function(){self.isUpdating=false;});};this.setValueHasChanged=function(){this.isDirty=true;};this.updateVariable=function(){removeAnyVariableNotification();if(!checkRequiredFieldsAreSet()){return;}
+this.isUpdating=true;tagManagerVariableModel.createOrUpdateVariable(this.variable,'TagManager.updateContainerVariable').then(function(response){if(response.type==='error'){return;}
+var idVariable=self.variable.idvariable;if('function'===typeof $scope.onChangeVariable){$scope.onChangeVariable({variable:self.variable});return;}
+self.isDirty=false;self.variable={};tagManagerVariableModel.reload(self.idContainer,self.idContainerVersion).then(function(){init(idVariable);});showNotification(translate('TagManager_UpdatedX',translate('TagManager_Variable'))+' '+translate('TagManager_WantToDeployThisChangeCreateVersion','<a onclick="tagManagerHelper.createNewVersion()">','</a>'),response.type);});};$scope.$watch('idVariable',function(newValue,oldValue){if(newValue===null){return;}
+if(newValue!=oldValue||currentId===null){currentId=newValue;init(newValue);}});}})();
 (function(){angular.module('piwikApp').directive('piwikVariableEdit',piwikVariableEdit);piwikVariableEdit.$inject=['piwik'];function piwikVariableEdit(piwik){return{restrict:'A',scope:{idVariable:'=',idContainer:'=',idContainerVersion:'=',variableType:'=?',onChangeVariable:'&?'},templateUrl:'plugins/TagManager/angularjs/manageVariable/edit.directive.html?cb='+piwik.cacheBuster,controller:'VariableEditController',controllerAs:'editVariable'};}})();
 (function(){angular.module('piwikApp').controller('ManageVariableController',ManageVariableController);ManageVariableController.$inject=['$scope','$rootScope','$location'];function ManageVariableController($scope,$rootScope,$location){this.editMode=false;var self=this;this.idContainer=$scope.idContainer;this.idContainerVersion=$scope.idContainerVersion;function removeAnyVariableNotification(){var UI=require('piwik/UI');new UI.Notification().remove('variablevariablemanagement');}
-    function initState(){var $search=$location.search();if('idVariable'in $search){if($search.idVariable===0||$search.idVariable==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddVariable',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idVariable=null;return;}}
-        self.editMode=true;self.idVariable=parseInt($search.idVariable,10);}else{self.editMode=false;self.idVariable=null;}
-        removeAnyVariableNotification();}
-    initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
+function initState(){var $search=$location.search();if('idVariable'in $search){if($search.idVariable===0||$search.idVariable==='0'){var parameters={isAllowed:true};$rootScope.$emit('TagManager.initAddVariable',parameters);if(parameters&&!parameters.isAllowed){self.editMode=false;self.idVariable=null;return;}}
+self.editMode=true;self.idVariable=parseInt($search.idVariable,10);}else{self.editMode=false;self.idVariable=null;}
+removeAnyVariableNotification();}
+initState();var onChangeSuccess=$rootScope.$on('$locationChangeSuccess',initState);$scope.$on('$destroy',function(){if(onChangeSuccess){onChangeSuccess();}});}})();
 (function(){angular.module('piwikApp').directive('piwikVariableManage',piwikVariableManage);piwikVariableManage.$inject=['piwik'];function piwikVariableManage(piwik){return{restrict:'A',scope:{idContainerVersion:'@',idContainer:'@'},templateUrl:'plugins/TagManager/angularjs/manageVariable/manage.directive.html?cb='+piwik.cacheBuster,controller:'ManageVariableController',controllerAs:'manageVariable'};}})();
 /*!
  * Matomo - free/libre analytics platform
@@ -4253,9 +4371,9 @@ ajaxRequest.send();}};
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp').controller('ManageInstallTagCodeController',ManageInstallTagCodeController);ManageInstallTagCodeController.$inject=['$scope','piwikApi','$q','$filter','$timeout'];function ManageInstallTagCodeController($scope,piwikApi,$q,$filter,$timeout){var self=this;this.idContainer=$scope.idContainer;this.environments=[];this.environment='live';this.installInstructions='';this.releases=[];this.isLoading=false;var environmentsPromise=piwikApi.fetch({method:'TagManager.getAvailableEnvironments',filter_limit:'-1'});this.fetchInstallInstructions=function(environment){this.installInstructions={};this.isLoading=true;piwikApi.fetch({method:'TagManager.getContainerInstallInstructions',filter_limit:'-1',idContainer:this.idContainer,environment:environment}).then(function(instructions){self.installInstructions=instructions;self.isLoading=false;$timeout(function(){var codeBlock=$('.manageInstallTagCode .codeblock');codeBlock.effect("highlight",{},1500);});},function(){self.isLoading=false;});};this.fetchReleases=function(){this.environments=[];this.isLoading=true;var containerPromise=piwikApi.fetch({method:'TagManager.getContainer',idContainer:this.idContainer,filter_limit:'-1'})
-    $q.all([containerPromise,environmentsPromise]).then(function(response){var container=response[0];var environments=response[1];self.releases=container.releases;self.environments=[];self.isLoading=false;var hasLive=false;angular.forEach(environments,function(environment){self.environments.push({key:environment.id,value:environment.name});})
-        angular.forEach(self.releases,function(release){angular.forEach(container.versions,function(version){if(version.idcontainerversion===release.idcontainerversion){release.version=version;}});if(release.environment==='live'){hasLive=true;}});if(!hasLive&&self.environments&&self.environments[0]&&self.environments[0].key){self.environment=self.environments[0].key;}else if(!hasLive){self.environment='';}
-        if(self.environment){self.fetchInstallInstructions(self.environment);}},function(){self.isLoading=false;});};this.fetchReleases();}})();
+$q.all([containerPromise,environmentsPromise]).then(function(response){var container=response[0];var environments=response[1];self.releases=container.releases;self.environments=[];self.isLoading=false;var hasLive=false;angular.forEach(environments,function(environment){self.environments.push({key:environment.id,value:environment.name});})
+angular.forEach(self.releases,function(release){angular.forEach(container.versions,function(version){if(version.idcontainerversion===release.idcontainerversion){release.version=version;}});if(release.environment==='live'){hasLive=true;}});if(!hasLive&&self.environments&&self.environments[0]&&self.environments[0].key){self.environment=self.environments[0].key;}else if(!hasLive){self.environment='';}
+if(self.environment){self.fetchInstallInstructions(self.environment);}},function(){self.isLoading=false;});};this.fetchReleases();}})();
 /*!
  * Matomo - free/libre analytics platform
  *
@@ -4270,9 +4388,9 @@ ajaxRequest.send();}};
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp').controller('ContainerDashboardController',ContainerDashboardController);ContainerDashboardController.$inject=['$scope','piwikApi','$q','piwik','$filter'];function ContainerDashboardController($scope,piwikApi,$q,piwik,$filter){var self=this;var translate=$filter('translate');this.availableContexts={};this.idContainer=$scope.idContainer;this.container=null;this.containerVersion=null;this.isLoading=true;var containerPromise=piwikApi.fetch({method:'TagManager.getContainer',idContainer:this.idContainer}).then(function(container){self.container=container;if(container&&container.versions){self.container.lastVersions=self.container.versions.slice(-5);}
-    if(container&&container.releases){angular.forEach(container.releases,function(release){if(release.version_name){release.versionName=translate('TagManager_ReleaseVersionInfo',release.version_name);}else{release.versionName='';}});}});var versionPromise=piwikApi.fetch({method:'TagManager.exportContainerVersion',idContainer:this.idContainer}).then(function(containerVersion){self.containerVersion=containerVersion;});$q.all([containerPromise,versionPromise]).then(function(){self.isLoading=false;},function(){self.isLoading=false;});piwikApi.fetch({method:'TagManager.getAvailableContexts'}).then(function(contexts){angular.forEach(contexts,function(context){self.availableContexts[context.id]=context.name;});});this.linkTo=function(action,hash){var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action='+action,newUrl);if('undefined'!==typeof hash&&hash){newUrl+='#?'+hash;}
-    return newUrl;}
-    this.createNewVersion=function(){$('.tagVersionManager .title').click();};}})();
+if(container&&container.releases){angular.forEach(container.releases,function(release){if(release.version_name){release.versionName=translate('TagManager_ReleaseVersionInfo',release.version_name);}else{release.versionName='';}});}});var versionPromise=piwikApi.fetch({method:'TagManager.exportContainerVersion',idContainer:this.idContainer}).then(function(containerVersion){self.containerVersion=containerVersion;});$q.all([containerPromise,versionPromise]).then(function(){self.isLoading=false;},function(){self.isLoading=false;});piwikApi.fetch({method:'TagManager.getAvailableContexts'}).then(function(contexts){angular.forEach(contexts,function(context){self.availableContexts[context.id]=context.name;});});this.linkTo=function(action,hash){var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action='+action,newUrl);if('undefined'!==typeof hash&&hash){newUrl+='#?'+hash;}
+return newUrl;}
+this.createNewVersion=function(){$('.tagVersionManager .title').click();};}})();
 /*!
  * Matomo - free/libre analytics platform
  *
@@ -4287,9 +4405,9 @@ ajaxRequest.send();}};
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp').controller('ContainerSelectorController',ContainerSelectorController);ContainerSelectorController.$inject=['$scope','piwikApi','piwik','$filter'];function ContainerSelectorController($scope,piwikApi,piwik,$filter){var self=this;this.containers=[];this.isLoading=false;this.hasWriteAccess=piwik.hasUserCapability('tagmanager_write');var translate=$filter('translate');if($scope.containerName){this.containerName=translate('TagManager_ContainerX',$scope.containerName);}else{this.containerName='Choose container';}
-    this.fetchContainers=function(){this.isLoading=true;this.containers=[];piwikApi.fetch({method:'TagManager.getContainers'}).then(function(containers){self.isLoading=false;self.containers=containers;},function(){self.isLoading=false;});};this.linkTo=function(idContainer){var currentUrl=window.location.pathname+window.location.search;currentUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,currentUrl);var action=piwik.broadcast.getValueFromUrl('idContainer')
-        if(!action||action==='manageContainers'){if(this.hasWriteAccess){currentUrl=piwik.broadcast.updateParamValue('action=dashboard',currentUrl);}else{currentUrl=piwik.broadcast.updateParamValue('action=manageTags',currentUrl);}}
-        return currentUrl;};}})();
+this.fetchContainers=function(){this.isLoading=true;this.containers=[];piwikApi.fetch({method:'TagManager.getContainers'}).then(function(containers){self.isLoading=false;self.containers=containers;},function(){self.isLoading=false;});};this.linkTo=function(idContainer){var currentUrl=window.location.pathname+window.location.search;currentUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,currentUrl);var action=piwik.broadcast.getValueFromUrl('idContainer')
+if(!action||action==='manageContainers'){if(this.hasWriteAccess){currentUrl=piwik.broadcast.updateParamValue('action=dashboard',currentUrl);}else{currentUrl=piwik.broadcast.updateParamValue('action=manageTags',currentUrl);}}
+return currentUrl;};}})();
 /*!
  * Matomo - free/libre analytics platform
  *
@@ -4298,36 +4416,36 @@ ajaxRequest.send();}};
  */
 (function(){angular.module('piwikApp').directive('piwikContainerSelector',piwikContainerSelector);piwikContainerSelector.$inject=['piwik'];function piwikContainerSelector(piwik){return{restrict:'A',scope:{containerName:'@?'},templateUrl:'plugins/TagManager/angularjs/containerSelector/container-selector.directive.html?cb='+piwik.cacheBuster,controller:'ContainerSelectorController',controllerAs:'containerSelector',compile:function(element,attrs){return function(scope,element,attrs){};}};}})();
 (function(){angular.module('piwikApp').controller('VariableSelectController',VariableSelectController);VariableSelectController.$inject=['$scope','piwikApi'];function VariableSelectController($scope,piwikApi){var self=this;this.preconfiguredVariables=[];this.containerVariables=[];this.isLoading=false;this.idContainer=$scope.idContainer;this.idContainerVersion=null;function getContainer(){self.isLoading=true;var params={method:'TagManager.getContainer',filter_limit:'-1',idContainer:self.idContainer};return piwikApi.fetch(params);}
-    function fetchAvailableVariables(){self.preconfiguredVariables=[];self.containerVariables=[];getContainer().then(function(container){self.isLoading=true;self.idContainerVersion=container.draft.idcontainerversion;var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:self.idContainer,idContainerVersion:self.idContainerVersion};return piwikApi.fetch(params).then(function(variables){self.preconfiguredVariables=[];self.containerVariables=[];self.isLoading=false;angular.forEach(variables,function(category){var preConfig=angular.copy(category);preConfig.types=[];angular.forEach(category.types,function(variable,index){if(variable.is_pre_configured){preConfig.types.push(variable);}else{self.containerVariables.push(variable);}});if(preConfig&&preConfig.types&&preConfig.types.length){self.preconfiguredVariables.push(preConfig);}});},function(){self.isLoading=false;});});}
-    fetchAvailableVariables();this.editVariable=function(variable){if(!this.idContainerVersion){return;}
-        tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,variable.idvariable,function(){fetchAvailableVariables();});};this.createVariable=function(){if(!this.idContainerVersion){return;}
-        tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,0,function(){fetchAvailableVariables();});};this.selectVariable=function(variable){if('function'===typeof $scope.onSelectVariable){$scope.onSelectVariable({variable:variable});return;}}}})();
+function fetchAvailableVariables(){self.preconfiguredVariables=[];self.containerVariables=[];getContainer().then(function(container){self.isLoading=true;self.idContainerVersion=container.draft.idcontainerversion;var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:self.idContainer,idContainerVersion:self.idContainerVersion};return piwikApi.fetch(params).then(function(variables){self.preconfiguredVariables=[];self.containerVariables=[];self.isLoading=false;angular.forEach(variables,function(category){var preConfig=angular.copy(category);preConfig.types=[];angular.forEach(category.types,function(variable,index){if(variable.is_pre_configured){preConfig.types.push(variable);}else{self.containerVariables.push(variable);}});if(preConfig&&preConfig.types&&preConfig.types.length){self.preconfiguredVariables.push(preConfig);}});},function(){self.isLoading=false;});});}
+fetchAvailableVariables();this.editVariable=function(variable){if(!this.idContainerVersion){return;}
+tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,variable.idvariable,function(){fetchAvailableVariables();});};this.createVariable=function(){if(!this.idContainerVersion){return;}
+tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,0,function(){fetchAvailableVariables();});};this.selectVariable=function(variable){if('function'===typeof $scope.onSelectVariable){$scope.onSelectVariable({variable:variable});return;}}}})();
 (function(){angular.module('piwikApp').directive('piwikVariableSelect',piwikVariableSelect);piwikVariableSelect.$inject=['piwik'];function piwikVariableSelect(piwik){return{restrict:'A',scope:{idContainer:'=',idContainerVersion:'=',onSelectVariable:'&?'},templateUrl:'plugins/TagManager/angularjs/selectVariable/select-variable.directive.html?cb='+piwik.cacheBuster,controller:'VariableSelectController',controllerAs:'variableSelect'};}})();
 (function(){angular.module('piwikApp').controller('VariableSelectTypeController',VariableSelectTypeController);VariableSelectTypeController.$inject=['$scope','piwikApi','piwikUrl'];function VariableSelectTypeController($scope,piwikApi,piwikUrl){var self=this;this.containerVariables=[];this.isLoading=false;this.idContainer=piwikUrl.getSearchParam('idContainer');this.idContainerVersion=null;this.variableType=$scope.variableType;this.variable=$scope.variable;this.variableTypeName=$scope.variableTypeName;function getContainer(){self.isLoading=true;var params={method:'TagManager.getContainer',filter_limit:'-1',idContainer:self.idContainer};return piwikApi.fetch(params);}
-    function fetchAvailableVariables(){self.containerVariables=[];getContainer().then(function(container){self.isLoading=true;self.idContainerVersion=container.draft.idcontainerversion;var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:self.idContainer,idContainerVersion:self.idContainerVersion};return piwikApi.fetch(params).then(function(variables){self.containerVariables=[];self.isLoading=false;angular.forEach(variables,function(category){angular.forEach(category.types,function(variable,index){if(variable.type===$scope.variableType){self.containerVariables.push({key:'{{'+variable.id+'}}',value:variable.name});}});});if(!self.variable&&self.containerVariables.length===1){self.variable=self.containerVariables[0].key;self.onChange();}},function(){self.isLoading=false;});});}
-    fetchAvailableVariables();this.onChange=function(){$scope.variable=self.variable;};this.createVariable=function(){if(!this.idContainerVersion){return;}
-        tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,0,function(variable){fetchAvailableVariables();if(variable){self.variable='{{'+variable.name+'}}';$scope.variable=self.variable;}},$scope.variableType);};this.selectVariable=function(variable){if('function'===typeof $scope.onSelectVariable){$scope.onSelectVariable({variable:variable});return;}}}})();
+function fetchAvailableVariables(){self.containerVariables=[];getContainer().then(function(container){self.isLoading=true;self.idContainerVersion=container.draft.idcontainerversion;var params={method:'TagManager.getAvailableContainerVariables',filter_limit:'-1',idContainer:self.idContainer,idContainerVersion:self.idContainerVersion};return piwikApi.fetch(params).then(function(variables){self.containerVariables=[];self.isLoading=false;angular.forEach(variables,function(category){angular.forEach(category.types,function(variable,index){if(variable.type===$scope.variableType){self.containerVariables.push({key:'{{'+variable.id+'}}',value:variable.name});}});});if(!self.variable&&self.containerVariables.length===1){self.variable=self.containerVariables[0].key;self.onChange();}},function(){self.isLoading=false;});});}
+fetchAvailableVariables();this.onChange=function(){$scope.variable=self.variable;};this.createVariable=function(){if(!this.idContainerVersion){return;}
+tagManagerHelper.editVariable($scope,this.idContainer,this.idContainerVersion,0,function(variable){fetchAvailableVariables();if(variable){self.variable='{{'+variable.name+'}}';$scope.variable=self.variable;}},$scope.variableType);};this.selectVariable=function(variable){if('function'===typeof $scope.onSelectVariable){$scope.onSelectVariable({variable:variable});return;}}}})();
 (function(){angular.module('piwikApp').directive('piwikVariableSelectType',piwikVariableSelectType);piwikVariableSelectType.$inject=['piwik'];function piwikVariableSelectType(piwik){return{restrict:'A',scope:{variableTypeName:'@',variable:'=',variableType:'@'},require:"?ngModel",templateUrl:'plugins/TagManager/angularjs/selectVariableType/select-variable-type.directive.html?cb='+piwik.cacheBuster,controller:'VariableSelectTypeController',controllerAs:'variableSelectType'};}})();
 (function(){angular.module('piwikApp').controller('ImportVersionController',ImportVersionController);ImportVersionController.$inject=['$scope','piwikApi','piwik','$timeout','$filter'];function ImportVersionController($scope,piwikApi,piwik,$timeout,$filter){var self=this;this.isUpdating=false;this.idContainer=$scope.idContainer;this.backupName='';var notificationId='importContainerVersion';var translate=$filter('translate');function getNotification(){var UI=require('piwik/UI');return new UI.Notification();}
-    function removeAnyTagNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
-    function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
-    this.importVersion=function(backupName,version){if(!version){return;}
-        var parsed;try{parsed=JSON.parse(version);}catch(e){showNotification(translate('TagManager_ErrorInvalidContainerImportFormat'),'error');return;}
-        if('tags'in parsed&&'triggers'in parsed&&'variables'in parsed&&'idcontainer'in parsed&&'context'in parsed){piwik.helper.modalConfirm('#confirmImportContainerVersion',{yes:function(){self.isUpdating=true;var params={method:'TagManager.importContainerVersion',idContainer:self.idContainer,backupName:backupName};var post={exportedContainerVersion:version};piwikApi.post(params,post).then(function(){showNotification(translate('TagManager_VersionImportSuccess'),'success');self.isUpdating=false;window.location.reload();},function(){self.isUpdating=false;});}});}else{showNotification(translate('TagManager_ErrorContainerVersionImportIncomplete'),'error');}};}})();
+function removeAnyTagNotification(){var notification=getNotification();notification.remove(notificationId);notification.remove('ajaxHelper');}
+function showNotification(message,context){var notification=getNotification();notification.show(message,{context:context,id:notificationId});$timeout(function(){notification.scrollToNotification();},200);}
+this.importVersion=function(backupName,version){if(!version){return;}
+var parsed;try{parsed=JSON.parse(version);}catch(e){showNotification(translate('TagManager_ErrorInvalidContainerImportFormat'),'error');return;}
+if('tags'in parsed&&'triggers'in parsed&&'variables'in parsed&&'idcontainer'in parsed&&'context'in parsed){piwik.helper.modalConfirm('#confirmImportContainerVersion',{yes:function(){self.isUpdating=true;var params={method:'TagManager.importContainerVersion',idContainer:self.idContainer,backupName:backupName};var post={exportedContainerVersion:version};piwikApi.post(params,post).then(function(){showNotification(translate('TagManager_VersionImportSuccess'),'success');self.isUpdating=false;window.location.reload();},function(){self.isUpdating=false;});}});}else{showNotification(translate('TagManager_ErrorContainerVersionImportIncomplete'),'error');}};}})();
 (function(){angular.module('piwikApp').directive('piwikImportVersion',piwikImportVersion);piwikImportVersion.$inject=['piwik'];function piwikImportVersion(piwik){return{restrict:'A',scope:{idContainer:'='},templateUrl:'plugins/TagManager/angularjs/importVersion/import-version.directive.html?cb='+piwik.cacheBuster,controller:'ImportVersionController',controllerAs:'importVersion'};}})();
 (function(){angular.module('piwikApp').controller('TagManagerTrackingCodeController',TagManagerTrackingCodeController);TagManagerTrackingCodeController.$inject=['$scope','piwikApi','piwikUrl','$timeout','$filter','piwik'];function TagManagerTrackingCodeController($scope,piwikApi,piwikUrl,$timeout,$filter,piwik){var self=this;this.containerVariables=[];this.isLoading=false;this.idContainer=0
-    this.environment='';this.environmentNameMap={};this.environments=[];this.containers=[];this.containerMap={};this.site=null;this.matomoConfigs=[];this.releases=[];this.installInstructions=[];this.noReleaseFound=false;var translate=$filter('translate');var ucfirst=$filter('ucfirst');var environmentsPromise=piwikApi.fetch({method:'TagManager.getAvailableEnvironments',filter_limit:'-1'});environmentsPromise.then(function(environments){angular.forEach(environments,function(environment){self.environmentNameMap[environment.id]=environment.name;});});this.onSiteChange=function(){this.installInstructions=[];this.containers=[];this.environments=[];this.matomoConfigs=[];this.idContainer='';if(!this.site||!this.site.id){return;}
-        this.isLoading=true;piwikApi.fetch({method:'TagManager.getContainers',filter_limit:'-1',idSite:this.site.id}).then(function(containers){self.isLoading=false;self.containers=[];if(!containers||!containers.length){self.idContainer='';self.containers.push({key:'',value:translate('TagManager_NoContainersFound')});return;}
-            angular.forEach(containers,function(container){if(!self.idContainer){self.idContainer=container.idcontainer;}
-                self.containerMap[container.idcontainer]=container;self.containers.push({key:container.idcontainer,value:container.name});});self.onContainerChange();},function(){self.isLoading=false;});};this.onContainerChange=function(){this.noReleaseFound=false;if(!this.idContainer){return;}
-        this.installInstructions=[];var container=this.containerMap[this.idContainer];var draftVersion=container.draft.idcontainerversion;this.environment='';this.environments=[];angular.forEach(container.releases,function(release){if(release.environment==='live'){self.environment=release.environment;}});angular.forEach(container.releases,function(release){if(release.environment==='preview'){return;}
-            if(!self.environment){self.environment=release.environment;}
-            var name=ucfirst(release.environment);if(release.environment in self.environmentNameMap){name=self.environmentNameMap[release.environment];}
-            self.environments.push({key:release.environment,value:name});});if(!this.environments.length){this.noReleaseFound=true;this.environments.push({key:'',value:translate('TagManager_NoReleasesFound')});}
-        this.fetchInstallInstructions();this.fetchVariables(draftVersion);};this.linkTo=function(action,idContainer,hash){var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action='+action,newUrl);newUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,newUrl);if('undefined'!==typeof hash&&hash){newUrl+='#?'+hash;}
-        return newUrl;};this.fetchInstallInstructions=function(){this.installInstructions={};if(!this.idContainer||!this.environment||!this.site||!this.site.id){return;}
-        this.isLoading=true;piwikApi.fetch({method:'TagManager.getContainerInstallInstructions',filter_limit:'-1',idContainer:this.idContainer,environment:this.environment,idSite:this.site.id}).then(function(instructions){self.installInstructions=instructions;self.isLoading=false;$timeout(function(){var codeBlock=$('.tagManagerTrackingCode .codeblock');codeBlock.effect("highlight",{},1500);});},function(){self.isLoading=false;});};this.fetchVariables=function(containerDraftVersion){this.matomoConfigs=[];if(!this.idContainer||!this.site||!this.site.id||!containerDraftVersion){return;}
-        piwikApi.fetch({method:'TagManager.getContainerVariables',filter_limit:'-1',idContainer:this.idContainer,idContainerVersion:containerDraftVersion,idSite:this.site.id}).then(function(variables){self.matomoConfigs=[];angular.forEach(variables,function(variable){if(variable.type==='MatomoConfiguration'){self.matomoConfigs.push(variable);}});},function(){self.isLoading=false;});};$scope.$watch('tagTrackingCode.site.id',function(val,oldVal){if(val!==oldVal){self.onSiteChange();}});}})();
+this.environment='';this.environmentNameMap={};this.environments=[];this.containers=[];this.containerMap={};this.site=null;this.matomoConfigs=[];this.releases=[];this.installInstructions=[];this.noReleaseFound=false;var translate=$filter('translate');var ucfirst=$filter('ucfirst');var environmentsPromise=piwikApi.fetch({method:'TagManager.getAvailableEnvironments',filter_limit:'-1'});environmentsPromise.then(function(environments){angular.forEach(environments,function(environment){self.environmentNameMap[environment.id]=environment.name;});});this.onSiteChange=function(){this.installInstructions=[];this.containers=[];this.environments=[];this.matomoConfigs=[];this.idContainer='';if(!this.site||!this.site.id){return;}
+this.isLoading=true;piwikApi.fetch({method:'TagManager.getContainers',filter_limit:'-1',idSite:this.site.id}).then(function(containers){self.isLoading=false;self.containers=[];if(!containers||!containers.length){self.idContainer='';self.containers.push({key:'',value:translate('TagManager_NoContainersFound')});return;}
+angular.forEach(containers,function(container){if(!self.idContainer){self.idContainer=container.idcontainer;}
+self.containerMap[container.idcontainer]=container;self.containers.push({key:container.idcontainer,value:container.name});});self.onContainerChange();},function(){self.isLoading=false;});};this.onContainerChange=function(){this.noReleaseFound=false;if(!this.idContainer){return;}
+this.installInstructions=[];var container=this.containerMap[this.idContainer];var draftVersion=container.draft.idcontainerversion;this.environment='';this.environments=[];angular.forEach(container.releases,function(release){if(release.environment==='live'){self.environment=release.environment;}});angular.forEach(container.releases,function(release){if(release.environment==='preview'){return;}
+if(!self.environment){self.environment=release.environment;}
+var name=ucfirst(release.environment);if(release.environment in self.environmentNameMap){name=self.environmentNameMap[release.environment];}
+self.environments.push({key:release.environment,value:name});});if(!this.environments.length){this.noReleaseFound=true;this.environments.push({key:'',value:translate('TagManager_NoReleasesFound')});}
+this.fetchInstallInstructions();this.fetchVariables(draftVersion);};this.linkTo=function(action,idContainer,hash){var currentUrl=window.location.pathname+window.location.search;var newUrl=piwik.broadcast.updateParamValue('module=TagManager',currentUrl);newUrl=piwik.broadcast.updateParamValue('action='+action,newUrl);newUrl=piwik.broadcast.updateParamValue('idContainer='+idContainer,newUrl);if('undefined'!==typeof hash&&hash){newUrl+='#?'+hash;}
+return newUrl;};this.fetchInstallInstructions=function(){this.installInstructions={};if(!this.idContainer||!this.environment||!this.site||!this.site.id){return;}
+this.isLoading=true;piwikApi.fetch({method:'TagManager.getContainerInstallInstructions',filter_limit:'-1',idContainer:this.idContainer,environment:this.environment,idSite:this.site.id}).then(function(instructions){self.installInstructions=instructions;self.isLoading=false;$timeout(function(){var codeBlock=$('.tagManagerTrackingCode .codeblock');codeBlock.effect("highlight",{},1500);});},function(){self.isLoading=false;});};this.fetchVariables=function(containerDraftVersion){this.matomoConfigs=[];if(!this.idContainer||!this.site||!this.site.id||!containerDraftVersion){return;}
+piwikApi.fetch({method:'TagManager.getContainerVariables',filter_limit:'-1',idContainer:this.idContainer,idContainerVersion:containerDraftVersion,idSite:this.site.id}).then(function(variables){self.matomoConfigs=[];angular.forEach(variables,function(variable){if(variable.type==='MatomoConfiguration'){self.matomoConfigs.push(variable);}});},function(){self.isLoading=false;});};$scope.$watch('tagTrackingCode.site.id',function(val,oldVal){if(val!==oldVal){self.onSiteChange();}});}})();
 (function(){angular.module('piwikApp').directive('matomoTagmanagerTrackingCode',matomoTagManagerTrackingCode);matomoTagManagerTrackingCode.$inject=['piwik'];function matomoTagManagerTrackingCode(piwik){return{restrict:'A',scope:{},templateUrl:'plugins/TagManager/angularjs/tagmanagerTrackingCode/tagmanager.directive.html?cb='+piwik.cacheBuster,controller:'TagManagerTrackingCodeController',controllerAs:'tagTrackingCode'};}})();
 /*!
  * Matomo - free/libre analytics platform
@@ -4336,5 +4454,5 @@ ajaxRequest.send();}};
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 (function(){angular.module('piwikApp').controller('MtmDebugController',MtmDebugController);MtmDebugController.$inject=['$scope','$window'];function MtmDebugController($scope,$window){var self=this;this.mtmEvents=[];this.mtmLogs=[];this.selectedEventIndex=0;this.contentTab='tags';this.selectedEvent=null;this.selectEvent=function(eventIndex){if(this.mtmEvents[eventIndex]){this.selectedEventIndex=eventIndex;this.selectedEvent=this.mtmEvents[eventIndex];var tagsFired=[];angular.forEach(this.mtmEvents,function(event,index){if(index<=eventIndex){angular.forEach(event.tags,function(tag){tagsFired.push(tag.name);});}});var tagsNotFired=[];angular.forEach(this.selectedEvent.container.tags,function(tag){if(tagsFired.indexOf&&tagsFired.indexOf(tag.name)===-1){tagsNotFired.push(tag);}});this.selectedEvent.notFiredTags=tagsNotFired;}};if($window.mtmEvents&&$window.mtmEvents.events){this.mtmEvents=$window.mtmEvents.events;this.selectEvent(this.selectedEventIndex);}
-    if($window.mtmLogs&&$window.mtmLogs.logs){this.mtmLogs=$window.mtmLogs.logs;}
-    $(function(){self.mtmEvents=$window.mtmEvents.events||[];self.mtmLogs=$window.mtmLogs.logs||[];self.selectEvent(self.selectedEventIndex);});$scope.$watch(function(){return $window.mtmEvents;},function(n,o){if(n!==o){self.mtmEvents=$window.mtmEvents;if(!self.selectedEvent){self.selectEvent(self.selectedEventIndex);}}});$scope.$watch(function(){return $window.mtmLogs;},function(n,o){if(n!==o){self.mtmLogs=$window.mtmLogs;}});}})();
\ No newline at end of file
+if($window.mtmLogs&&$window.mtmLogs.logs){this.mtmLogs=$window.mtmLogs.logs;}
+$(function(){self.mtmEvents=$window.mtmEvents.events||[];self.mtmLogs=$window.mtmLogs.logs||[];self.selectEvent(self.selectedEventIndex);});$scope.$watch(function(){return $window.mtmEvents;},function(n,o){if(n!==o){self.mtmEvents=$window.mtmEvents;if(!self.selectedEvent){self.selectEvent(self.selectedEventIndex);}}});$scope.$watch(function(){return $window.mtmLogs;},function(n,o){if(n!==o){self.mtmLogs=$window.mtmLogs;}});}})();
\ No newline at end of file
diff --git a/classes/WpMatomo/Admin/AccessSettings.php b/classes/WpMatomo/Admin/AccessSettings.php
index 94aff61a3..6f9bbef43 100644
--- a/classes/WpMatomo/Admin/AccessSettings.php
+++ b/classes/WpMatomo/Admin/AccessSettings.php
@@ -62,7 +62,7 @@ public function show_settings() {
 		$access      = $this->access;
 		$roles       = new Roles( $this->settings );
 		$capabilites = new Capabilities( $this->settings );
-		include_once( dirname( __FILE__ ) . '/views/access.php' );
+		include( dirname( __FILE__ ) . '/views/access.php' );
 	}
 
 }
diff --git a/classes/WpMatomo/Admin/AdminSettings.php b/classes/WpMatomo/Admin/AdminSettings.php
index 41f5fb4de..37adeab39 100644
--- a/classes/WpMatomo/Admin/AdminSettings.php
+++ b/classes/WpMatomo/Admin/AdminSettings.php
@@ -59,7 +59,7 @@ public function show() {
 
 		$content_tab = $setting_tabs[ $active_tab ];
 
-		include_once( dirname( __FILE__ ) . '/views/settings.php' );
+		include( dirname( __FILE__ ) . '/views/settings.php' );
 	}
 
 }
diff --git a/classes/WpMatomo/Admin/ExclusionSettings.php b/classes/WpMatomo/Admin/ExclusionSettings.php
index 300531574..f6d122fe2 100644
--- a/classes/WpMatomo/Admin/ExclusionSettings.php
+++ b/classes/WpMatomo/Admin/ExclusionSettings.php
@@ -123,7 +123,7 @@ public function show_settings() {
 		$current_ip            = $this->get_current_ip();
 		$settings              = $this->settings;
 
-		include_once( dirname( __FILE__ ) . '/views/exclusion_settings.php' );
+		include( dirname( __FILE__ ) . '/views/exclusion_settings.php' );
 	}
 
 	private function get_current_ip() {
diff --git a/classes/WpMatomo/Admin/GetStarted.php b/classes/WpMatomo/Admin/GetStarted.php
index 23e82cce9..1cc74c476 100644
--- a/classes/WpMatomo/Admin/GetStarted.php
+++ b/classes/WpMatomo/Admin/GetStarted.php
@@ -69,7 +69,7 @@ public function show() {
 		$can_user_edit  = $this->can_user_manage();
 		$show_this_page = $this->settings->get_global_option( Settings::SHOW_GET_STARTED_PAGE );
 
-		include_once( dirname( __FILE__ ) . '/views/get_started.php' );
+		include( dirname( __FILE__ ) . '/views/get_started.php' );
 	}
 
 
diff --git a/classes/WpMatomo/Admin/Info.php b/classes/WpMatomo/Admin/Info.php
index 23b3d1760..eec5a729e 100644
--- a/classes/WpMatomo/Admin/Info.php
+++ b/classes/WpMatomo/Admin/Info.php
@@ -18,11 +18,11 @@
 class Info {
 
 	public function show() {
-		include_once( dirname( __FILE__ ) . '/views/info.php' );
+		include( dirname( __FILE__ ) . '/views/info.php' );
 	}
 
 	public function show_multisite() {
-		include_once( dirname( __FILE__ ) . '/views/info_multisite.php' );
+		include( dirname( __FILE__ ) . '/views/info_multisite.php' );
 	}
 
 
diff --git a/classes/WpMatomo/Admin/Marketplace.php b/classes/WpMatomo/Admin/Marketplace.php
index 569aa50ef..79377a91f 100644
--- a/classes/WpMatomo/Admin/Marketplace.php
+++ b/classes/WpMatomo/Admin/Marketplace.php
@@ -71,7 +71,7 @@ public function show() {
 		}
 		$settings                  = $this->settings;
 		$can_view_subscription_tab = $this->can_user_manage();
-		include_once( dirname( __FILE__ ) . '/views/marketplace.php' );
+		include( dirname( __FILE__ ) . '/views/marketplace.php' );
 	}
 
 }
diff --git a/classes/WpMatomo/Admin/PrivacySettings.php b/classes/WpMatomo/Admin/PrivacySettings.php
index 865570d51..bf14f2e64 100644
--- a/classes/WpMatomo/Admin/PrivacySettings.php
+++ b/classes/WpMatomo/Admin/PrivacySettings.php
@@ -32,6 +32,6 @@ public function get_title() {
 	}
 
 	public function show_settings() {
-		include_once( dirname( __FILE__ ) . '/views/privacy_gdpr.php' );
+		include( dirname( __FILE__ ) . '/views/privacy_gdpr.php' );
 	}
 }
diff --git a/classes/WpMatomo/Admin/Summary.php b/classes/WpMatomo/Admin/Summary.php
index 01dec8af2..cd75c5ec4 100644
--- a/classes/WpMatomo/Admin/Summary.php
+++ b/classes/WpMatomo/Admin/Summary.php
@@ -53,7 +53,7 @@ public function show() {
 
 		$is_tracking = $this->settings->is_tracking_enabled();
 
-		include_once( dirname( __FILE__ ) . '/views/summary.php' );
+		include( dirname( __FILE__ ) . '/views/summary.php' );
 	}
 
 	private function get_reports_to_show() {
diff --git a/classes/WpMatomo/Admin/SystemReport.php b/classes/WpMatomo/Admin/SystemReport.php
index 797625476..b978d360f 100644
--- a/classes/WpMatomo/Admin/SystemReport.php
+++ b/classes/WpMatomo/Admin/SystemReport.php
@@ -113,7 +113,7 @@ public function show() {
 			);
 		}
 
-		include_once( dirname( __FILE__ ) . '/views/systemreport.php' );
+		include( dirname( __FILE__ ) . '/views/systemreport.php' );
 	}
 
 	private function check_file_exists_and_writable( $rows, $path_to_check, $title ) {
diff --git a/classes/WpMatomo/Admin/TrackingSettings.php b/classes/WpMatomo/Admin/TrackingSettings.php
index 51c57a852..b6d4b93c6 100644
--- a/classes/WpMatomo/Admin/TrackingSettings.php
+++ b/classes/WpMatomo/Admin/TrackingSettings.php
@@ -154,7 +154,7 @@ public function show_settings() {
 			$track_modes[TrackingSettings::TRACK_MODE_TAGMANAGER] = __('Tag Manager', 'matomo');
 		}
 
-		include_once( dirname( __FILE__ ) . '/views/tracking.php' );
+		include( dirname( __FILE__ ) . '/views/tracking.php' );
 	}
 
 	public function get_active_containers()
diff --git a/classes/WpMatomo/Admin/views/systemreport.php b/classes/WpMatomo/Admin/views/systemreport.php
index 721a0ba73..b42653c05 100644
--- a/classes/WpMatomo/Admin/views/systemreport.php
+++ b/classes/WpMatomo/Admin/views/systemreport.php
@@ -20,23 +20,26 @@
 /** @var string $active_tab */
 /** @var \WpMatomo\Settings $settings */
 
-function anonymize_matomo_value($value)
-{
-    if ( is_string($value) && !empty($value) ) {
-        $values_to_anonymize = array(
-            ABSPATH => '$ABSPATH/',
-            str_replace('/', '\/', ABSPATH) => '$ABSPATH\/',
-            WP_CONTENT_DIR => '$WP_CONTENT_DIR/',
-            home_url() => '$home_url',
-            site_url() => '$site_url'
-        );
-        foreach ($values_to_anonymize as $search => $replace) {
-            $value = str_replace($search, $replace, $value);
-        }
-    }
-
-    return $value;
+if (!function_exists('anonymize_matomo_value')) {
+	function anonymize_matomo_value($value)
+	{
+		if ( is_string($value) && !empty($value) ) {
+			$values_to_anonymize = array(
+				ABSPATH => '$ABSPATH/',
+				str_replace('/', '\/', ABSPATH) => '$ABSPATH\/',
+				WP_CONTENT_DIR => '$WP_CONTENT_DIR/',
+				home_url() => '$home_url',
+				site_url() => '$site_url'
+			);
+			foreach ($values_to_anonymize as $search => $replace) {
+				$value = str_replace($search, $replace, $value);
+			}
+		}
+
+		return $value;
+	}
 }
+
 ?>
 
 <div class="wrap matomo-systemreport">
diff --git a/classes/WpMatomo/Bootstrap.php b/classes/WpMatomo/Bootstrap.php
index 03cc18ee3..8965d9625 100644
--- a/classes/WpMatomo/Bootstrap.php
+++ b/classes/WpMatomo/Bootstrap.php
@@ -54,12 +54,10 @@ public function bootstrap() {
 		}
 			
 		if ( ! defined( 'PIWIK_DOCUMENT_ROOT' ) ) {
-			define( 'PIWIK_DOCUMENT_ROOT', dirname( __FILE__ ) == '/' ? '' : dirname( __FILE__ ) . '/../../app' );
+			define( 'PIWIK_DOCUMENT_ROOT', plugin_dir_path(MATOMO_ANALYTICS_FILE) . 'app');
 		}
 
-		if ( file_exists( PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php' ) ) {
-			require_once PIWIK_DOCUMENT_ROOT . '/../matomo_bootstrap.php';
-		}
+		require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 
 		if ( ! defined( 'PIWIK_INCLUDE_PATH' ) ) {
 			define( 'PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT );
diff --git a/classes/WpMatomo/Db/Wordpress.php b/classes/WpMatomo/Db/Wordpress.php
index 52e5fec80..2c8da228a 100644
--- a/classes/WpMatomo/Db/Wordpress.php
+++ b/classes/WpMatomo/Db/Wordpress.php
@@ -9,6 +9,8 @@
 
 namespace Piwik\Db\Adapter;
 
+use WpMatomo\Capabilities;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // if accessed directly
 }
@@ -18,6 +20,8 @@
 
 class Wordpress extends Mysqli {
 
+	private $old_suppress_errors_value = null;
+
 	/**
 	 * Return default port.
 	 *
@@ -155,9 +159,12 @@ public function query( $sql, $bind = array() ) {
 			$result = $this->fetchAll( $sql, $bind );
 		} else {
 			$prepare = $this->prepareWp( $sql, $bind );
-			$result  = $wpdb->query( $prepare );
 
-			$this->throwExceptionIfError($wpdb);
+			$this->before_execute_query( $wpdb, $sql );
+
+			$result = $wpdb->query( $prepare );
+
+			$this->after_execute_query( $wpdb );
 		}
 
 		return new WordPressDbStatement( $this, $sql, $result );
@@ -166,7 +173,12 @@ public function query( $sql, $bind = array() ) {
 	public function exec( $sqlQuery ) {
 		global $wpdb;
 
-		return $wpdb->query( $sqlQuery );
+		$this->before_execute_query( $wpdb, $sqlQuery );
+
+		$exec = $wpdb->query( $sqlQuery );
+		$this->after_execute_query( $wpdb );
+
+		return $exec;
 	}
 
 	public function fetch( $query, $parameters = array() ) {
@@ -177,9 +189,11 @@ public function fetchCol( $sql, $bind = array() ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $sql, $bind );
 
+		$this->before_execute_query( $wpdb, $sql );
+
 		$col = $wpdb->get_col( $prepare );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $col;
 	}
@@ -188,9 +202,11 @@ public function fetchAssoc( $sql, $bind = array() ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $sql, $bind );
 
+		$this->before_execute_query( $wpdb, $sql );
+
 		$assoc = $wpdb->get_results( $prepare, ARRAY_A );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $assoc;
 	}
@@ -200,10 +216,63 @@ public function fetchAssoc( $sql, $bind = array() ) {
 	 *
 	 * @throws \Zend_Db_Statement_Exception
 	 */
-	private function throwExceptionIfError($wpdb)
-	{
-		if ($wpdb->last_error) {
-			throw new \Zend_Db_Statement_Exception('WP DB Error: ' . $wpdb->last_error);
+	private function before_execute_query( $wpdb, $sql ) {
+		if ( ! $wpdb->suppress_errors ) {
+
+			if ( defined( 'MATOMO_SUPPRESS_DB_ERRORS' ) ) {
+				// allow users to always suppress or never suppress
+				if ( MATOMO_SUPPRESS_DB_ERRORS === true ) {
+					$this->old_suppress_errors_value = $wpdb->suppress_errors( true );
+				}
+
+				return;
+			}
+
+			if ( defined( 'WP_DEBUG' )
+			     && WP_DEBUG
+			     && defined( 'WP_DEBUG_DISPLAY' )
+			     && WP_DEBUG_DISPLAY
+			     && ! is_admin() ) {
+				// prevent showing some notices in frontend eg if cronjob runs there
+
+				$is_likely_dedicated_cron = defined( 'DOING_CRON' ) && DOING_CRON && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON;
+				if ( ! $is_likely_dedicated_cron ) {
+					// if cron is triggered through wp-cron.php, then we should maybe not suppress!
+					$this->old_suppress_errors_value = $wpdb->suppress_errors( true );
+
+					return;
+				}
+			}
+
+			if ( ( stripos( $sql, 'SELECT 1 FROM' ) !== false && stripos( $sql, 'matomo_logtmpsegment' ) !== false )
+			     || stripos( $sql, 'SELECT @@TX_ISOLATION' ) !== false
+			     || stripos( $sql, 'SELECT @@transaction_isolation' ) !== false ) {
+				// prevent notices for queries that are expected to fail
+				//  SELECT 1 FROM wp_matomo_logtmpsegment1cc77bce7a13181081e44ea6ffc0a9fd LIMIT 1 => runs to detect if temp table exists or not and regularly the query fails which is expected
+				//  SELECT @@TX_ISOLATION => not available in all mysql versions
+				//  SELECT @@transaction_isolation => not available in all mysql versions
+				// we show notices only in admin...
+				$this->old_suppress_errors_value = $wpdb->suppress_errors( true );
+
+				return;
+			}
+
+		}
+	}
+
+	/**
+	 * @param \wpdb $wpdb
+	 *
+	 * @throws \Zend_Db_Statement_Exception
+	 */
+	private function after_execute_query( $wpdb ) {
+		if ( isset( $this->old_suppress_errors_value ) ) {
+			$wpdb->suppress_errors( $this->old_suppress_errors_value );
+			$this->old_suppress_errors_value = null;
+		}
+
+		if ( $wpdb->last_error ) {
+			throw new \Zend_Db_Statement_Exception( 'WP DB Error: ' . $wpdb->last_error );
 		}
 	}
 
@@ -211,9 +280,11 @@ public function fetchAll( $sql, $bind = array(), $fetchMode = null ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $sql, $bind );
 
+		$this->before_execute_query( $wpdb, $sql );
+
 		$results = $wpdb->get_results( $prepare, ARRAY_A );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $results;
 	}
@@ -221,9 +292,12 @@ public function fetchAll( $sql, $bind = array(), $fetchMode = null ) {
 	public function fetchOne( $sql, $bind = array() ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $sql, $bind );
-		$value   = $wpdb->get_var( $prepare );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->before_execute_query( $wpdb, $sql );
+
+		$value = $wpdb->get_var( $prepare );
+
+		$this->after_execute_query( $wpdb );
 
 		if ( $value === null ) {
 			return false; // make sure to behave same way as matomo
@@ -236,9 +310,11 @@ public function fetchRow( $sql, $bind = array(), $fetchMode = null ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $sql, $bind );
 
+		$this->before_execute_query( $wpdb, $sql );
+
 		$row = $wpdb->get_row( $prepare, ARRAY_A );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $row;
 	}
@@ -246,9 +322,11 @@ public function fetchRow( $sql, $bind = array(), $fetchMode = null ) {
 	public function insert( $table, array $bind ) {
 		global $wpdb;
 
+		$this->before_execute_query( $wpdb, '' );
+
 		$insert = $wpdb->insert( $table, $bind );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $insert;
 	}
@@ -265,9 +343,11 @@ public function update( $table, array $bind, $where = '' ) {
 		$sql      = "UPDATE `$table` SET $fields " . ( ( $where ) ? " WHERE $where" : '' );
 		$prepared = $wpdb->prepare( $sql, $bind );
 
+		$this->before_execute_query( $wpdb, '' );
+
 		$update = $wpdb->query( $prepared );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query( $wpdb );
 
 		return $update;
 	}
diff --git a/classes/WpMatomo/Db/WordpressTracker.php b/classes/WpMatomo/Db/WordpressTracker.php
index a87fa7d11..4abb1a48e 100644
--- a/classes/WpMatomo/Db/WordpressTracker.php
+++ b/classes/WpMatomo/Db/WordpressTracker.php
@@ -17,6 +17,8 @@
 
 class Wordpress extends Mysqli {
 
+	private $old_suppress_errors_value = null;
+
 	public function disconnect() {
 		// we do not want to disconnect wordpress DB ever as it breaks eg the tests where it loses all
 		// temporary tables... also we should leave it up to wordpress whether it wants to close db or not
@@ -41,6 +43,43 @@ public function lastInsertId( $tableName = null, $primaryKey = null ) {
 		return $wpdb->insert_id;
 	}
 
+	/**
+	 * @param \wpdb $wpdb
+	 *
+	 * @throws \Zend_Db_Statement_Exception
+	 */
+	private function after_execute_query($wpdb)
+	{
+		if (isset($this->old_suppress_errors_value)) {
+			$wpdb->suppress_errors($this->old_suppress_errors_value);
+			$this->old_suppress_errors_value = null;
+		}
+
+		if ($wpdb->last_error) {
+			throw new \Zend_Db_Statement_Exception($wpdb->last_error);
+		}
+	}
+
+	private function before_execute_query($wpdb)
+	{
+		if (!$wpdb->suppress_errors
+		    && defined('WP_DEBUG')
+		    && WP_DEBUG
+		    && defined('WP_DEBUG_DISPLAY')
+		    && WP_DEBUG_DISPLAY) {
+			// we want to prevent showing these notices
+			if (defined('MATOMO_SUPPRESS_DB_ERRORS')) {
+				if (MATOMO_SUPPRESS_DB_ERRORS === true) {
+					$this->old_suppress_errors_value = $wpdb->suppress_errors( true );
+				}
+				// any other value than false and we will not supproess
+				return;
+			}
+
+			$this->old_suppress_errors_value = $wpdb->suppress_errors( true );
+		}
+	}
+
 	/**
 	 * Test error number
 	 *
@@ -59,18 +98,6 @@ public function rowCount( $queryResult ) {
 		return $queryResult->rowCount();
 	}
 
-	/**
-	 * @param \wpdb $wpdb
-	 *
-	 * @throws \Zend_Db_Statement_Exception
-	 */
-	private function throwExceptionIfError($wpdb)
-	{
-		if ($wpdb->last_error) {
-			throw new \Zend_Db_Statement_Exception($wpdb->last_error);
-		}
-	}
-
 	private function prepareWp( $sql, $bind = array() ) {
 		global $wpdb;
 
@@ -107,8 +134,9 @@ public function query( $query, $parameters = array() ) {
 			$result = $this->fetchAll( $query, $parameters );
 		} else {
 			$query  = $this->prepareWp( $query, $parameters );
+			$this->before_execute_query($wpdb);
 			$result = $wpdb->query( $query );
-			$this->throwExceptionIfError($wpdb);
+			$this->after_execute_query($wpdb);
 		}
 
 		return new WordPressDbStatement( $this, $query, $result );
@@ -171,9 +199,11 @@ public function fetch( $query, $parameters = array() ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $query, $parameters );
 
+		$this->before_execute_query($wpdb);
+
 		$row = $wpdb->get_row( $prepare, ARRAY_A );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query($wpdb);
 
 		return $row;
 	}
@@ -182,9 +212,11 @@ public function fetchAll( $query, $parameters = array() ) {
 		global $wpdb;
 		$prepare = $this->prepareWp( $query, $parameters );
 
+		$this->before_execute_query($wpdb);
+
 		$results = $wpdb->get_results( $prepare, ARRAY_A );
 
-		$this->throwExceptionIfError($wpdb);
+		$this->after_execute_query($wpdb);
 
 		return $results;
 	}
diff --git a/classes/WpMatomo/Paths.php b/classes/WpMatomo/Paths.php
index 8cc0cbbe0..ca38b68e0 100644
--- a/classes/WpMatomo/Paths.php
+++ b/classes/WpMatomo/Paths.php
@@ -33,13 +33,13 @@ public function get_upload_base_url() {
 		$upload_dir      = wp_upload_dir();
 		$path_upload_url = $upload_dir['baseurl'];
 
-		return $path_upload_url . '/' . MATOMO_UPLOAD_DIR;
+		return rtrim( $path_upload_url, '/' ) . '/' . MATOMO_UPLOAD_DIR;
 	}
 
 	public function get_upload_base_dir() {
 		$upload_dir      = wp_upload_dir();
 		$path_upload_dir = $upload_dir['basedir'];
-		$path_upload_dir = $path_upload_dir . '/' . MATOMO_UPLOAD_DIR;
+		$path_upload_dir = rtrim( $path_upload_dir, '/' ) . '/' . MATOMO_UPLOAD_DIR;
 
 		return $path_upload_dir;
 	}
@@ -109,7 +109,7 @@ public function get_tmp_dir() {
 	}
 
 	public function get_relative_dir_to_matomo( $target_dir ) {
-		$matomo_dir         = plugin_dir_path(MATOMO_ANALYTICS_FILE) . 'app';
+		$matomo_dir         = plugin_dir_path( MATOMO_ANALYTICS_FILE ) . 'app';
 		$matomo_dir_parts   = explode( '/', $matomo_dir );
 		$target_dir_parts   = explode( '/', $target_dir );
 		$relative_directory = '';
@@ -120,7 +120,7 @@ public function get_relative_dir_to_matomo( $target_dir ) {
 			if ( isset( $matomo_dir_parts[ $index ] )
 			     && $part !== 'matomo' // not when matomo is same part cause it's the plugin name but eg also the upload folder name and it would generate wrong path
 			     && $matomo_dir_parts[ $index ] === $part
-				&& !$was_previous_same) {
+			     && ! $was_previous_same ) {
 				continue;
 			}
 
@@ -183,21 +183,19 @@ public function get_gloal_upload_dir_if_possible( $file_to_look_for = '' ) {
 		return $path_upload_dir;
 	}
 
-	public function clear_assets_dir()
-	{
+	public function clear_assets_dir() {
 		$tmp_dir = $this->get_tmp_dir() . '/assets';
-		if ($tmp_dir && is_dir($tmp_dir)) {
+		if ( $tmp_dir && is_dir( $tmp_dir ) ) {
 			$file_system_direct = $this->get_file_system();
 			$file_system_direct->rmdir( $tmp_dir, true );
 		}
 	}
 
-	public function clear_cache_dir()
-	{
+	public function clear_cache_dir() {
 		$tmp_dir = $this->get_tmp_dir();
-		if ($tmp_dir
-		    && is_dir($tmp_dir)
-		    && is_dir($tmp_dir . '/cache')) {
+		if ( $tmp_dir
+		     && is_dir( $tmp_dir )
+		     && is_dir( $tmp_dir . '/cache' ) ) {
 			// we make sure it's a matomo cache dir to not delete something falsely
 			$file_system_direct = $this->get_file_system();
 			$file_system_direct->rmdir( $tmp_dir, true );
diff --git a/classes/WpMatomo/ScheduledTasks.php b/classes/WpMatomo/ScheduledTasks.php
index 490f80bc6..bafc41064 100644
--- a/classes/WpMatomo/ScheduledTasks.php
+++ b/classes/WpMatomo/ScheduledTasks.php
@@ -177,6 +177,7 @@ public function archive( $force = false ) {
 		$archiver                               = new CronArchive();
 		$archiver->concurrentRequestsPerWebsite = 1;
 		$archiver->maxConcurrentArchivers       = 1;
+		$archiver->dateLastForced               = 2;
 
 		if ( $force ) {
 			$archiver->shouldArchiveAllSites        = true;
diff --git a/classes/WpMatomo/Site/Sync.php b/classes/WpMatomo/Site/Sync.php
index c4f3e8767..8e1b344aa 100644
--- a/classes/WpMatomo/Site/Sync.php
+++ b/classes/WpMatomo/Site/Sync.php
@@ -10,6 +10,7 @@
 namespace WpMatomo\Site;
 
 use Piwik\Access;
+use Piwik\Config;
 use Piwik\Plugins\SitesManager\Model;
 use Piwik\Plugins\SitesManager;
 use WpMatomo\Bootstrap;
@@ -119,6 +120,9 @@ public function sync_site( $blog_id, $blog_name, $blog_url ) {
 		/** @var \WP_Site $site */
 		$timezone = $this->detect_timezone();
 		$idsite   = null;
+
+		$this->set_enable_sites_admin(1);
+
 		Access::doAsSuperUser( function () use ( $blog_name, $blog_url, $timezone, &$idsite ) {
 			SitesManager\API::unsetInstance();
 			// we need to unset the instance to make sure it fetches the
@@ -136,6 +140,7 @@ public function sync_site( $blog_id, $blog_name, $blog_url ) {
 				$timezone
 			);
 		} );
+		$this->set_enable_sites_admin(0);
 
 		$this->logger->log( 'Matomo created site with ID ' . $idsite . ' for blog' );
 
@@ -152,6 +157,13 @@ public function sync_site( $blog_id, $blog_name, $blog_url ) {
 		return true;
 	}
 
+	private function set_enable_sites_admin($enabled)
+	{
+		$general = Config::getInstance()->General;
+		$general['enable_sites_admin'] = (int) $enabled;
+		Config::getInstance()->General = $general;
+	}
+
 	private function detect_timezone() {
 		$timezone = get_option( 'timezone_string' );
 
diff --git a/classes/WpMatomo/TrackingCode/TrackingCodeGenerator.php b/classes/WpMatomo/TrackingCode/TrackingCodeGenerator.php
index a80794a71..f083fc602 100644
--- a/classes/WpMatomo/TrackingCode/TrackingCodeGenerator.php
+++ b/classes/WpMatomo/TrackingCode/TrackingCodeGenerator.php
@@ -216,7 +216,7 @@ private function prepare_tracking_code( $idsite, $settings, $logger ) {
 
 		$cookie_domain = $this->settings->get_tracking_cookie_domain();
 		if ( ! empty( $cookie_domain ) ) {
-			$options[] = '  _paq.push(["setCookieDomain", ' . json_encode( $cookie_domain ) . ']);';
+			$options[] = '_paq.push(["setCookieDomain", ' . json_encode( $cookie_domain ) . ']);';
 		}
 
 		$track_across_alias = $settings->get_global_option( 'track_across_alias' );
@@ -229,7 +229,7 @@ private function prepare_tracking_code( $idsite, $settings, $logger ) {
 				return '*.' . $host;
 			}, $hosts );
 			if ( ! empty( $hosts ) ) {
-				$options[] = '  _paq.push(["setDomains", ' . json_encode( $hosts ) . ']);';
+				$options[] = '_paq.push(["setDomains", ' . json_encode( $hosts ) . ']);';
 			}
 		}
 		if ( $settings->get_global_option( 'limit_cookies' ) ) {
@@ -260,7 +260,7 @@ private function prepare_tracking_code( $idsite, $settings, $logger ) {
 		$script .= "_paq.push(['setTrackerUrl', " . json_encode( $tracker_endpoint ) . "]);";
 		$script .= "_paq.push(['setSiteId', '" . intval( $idsite ) . "']);";
 		$script .= "var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=" . json_encode( $js_endpoint ) . "; s.parentNode.insertBefore(g,s);";
+g.type='text/javascript'; g.async=true; g.defer=true; g.src=" . json_encode( $js_endpoint ) . "; s.parentNode.insertBefore(g,s);";
 		$script .= "</script>";
 		$script .= "<!-- End Matomo Code -->";
 
diff --git a/classes/WpMatomo/Uninstaller.php b/classes/WpMatomo/Uninstaller.php
index 002fff701..5dcdf6d7b 100644
--- a/classes/WpMatomo/Uninstaller.php
+++ b/classes/WpMatomo/Uninstaller.php
@@ -133,6 +133,7 @@ public function get_installed_matomo_tables() {
 			'archive_numeric_2010_01',
 			'brute_force_log',
 			'goal',
+			'locks',
 			'log_action',
 			'log_conversion',
 			'log_conversion_item',
diff --git a/matomo.php b/matomo.php
index 62c229211..0e8ed2364 100644
--- a/matomo.php
+++ b/matomo.php
@@ -4,7 +4,7 @@
  * Description: Most powerful web analytics for WordPress giving you 100% data ownership and privacy protection
  * Author: Matomo
  * Author URI: https://matomo.org
- * Version: 0.1.9
+ * Version: 0.2.0
  * Domain Path: /languages
  * WC requires at least: 2.4.0
  * WC tested up to: 3.2.6
@@ -21,37 +21,37 @@
 
 load_plugin_textdomain( 'matomo', false, basename( dirname( __FILE__ ) ) . '/languages' );
 
-define( 'MATOMO_ANALYTICS_FILE', __FILE__ );
+if ( ! defined( 'MATOMO_ANALYTICS_FILE' ) ) {
+	define( 'MATOMO_ANALYTICS_FILE', __FILE__ );
+}
 
 $GLOBALS['MATOMO_PLUGINS_ENABLED'] = array();
 
 /** MATOMO_PLUGIN_FILES => used to check for updates etc */
 $GLOBALS['MATOMO_PLUGIN_FILES'] = array( MATOMO_ANALYTICS_FILE );
 
-function has_matomo_compatible_content_dir()
-{
-	return defined('WP_CONTENT_DIR') && ABSPATH.'wp-content' === rtrim(WP_CONTENT_DIR, '/');
+function has_matomo_compatible_content_dir() {
+	return defined( 'WP_CONTENT_DIR' ) && ABSPATH . 'wp-content' === rtrim( WP_CONTENT_DIR, '/' );
 }
 
-function is_matomo_app_request()
-{
+function is_matomo_app_request() {
 	return ! empty( $_SERVER['SCRIPT_NAME'] )
 	&& ( substr( $_SERVER['SCRIPT_NAME'], - 1 * strlen( 'matomo/app/index.php' ) ) === 'matomo/app/index.php' );
 }
 
-function has_matomo_tag_manager()
-{
-	if (defined('MATOMO_DISABLE_TAG_MANAGER') && MATOMO_DISABLE_TAG_MANAGER) {
+function has_matomo_tag_manager() {
+	if ( defined( 'MATOMO_DISABLE_TAG_MANAGER' ) && MATOMO_DISABLE_TAG_MANAGER ) {
 		return false;
 	}
 
-	$is_multisite = function_exists('is_multisite') && is_multisite();
-	if ($is_multisite) {
+	$is_multisite = function_exists( 'is_multisite' ) && is_multisite();
+	if ( $is_multisite ) {
 		if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
 			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 		}
 
 		$network_enabled = is_plugin_active_for_network( 'matomo/matomo.php' );
+
 		return false;
 	}
 
diff --git a/plugins/WordPress/Commands/GenerateCoreAssets.php b/plugins/WordPress/Commands/GenerateCoreAssets.php
new file mode 100644
index 000000000..54b668ca1
--- /dev/null
+++ b/plugins/WordPress/Commands/GenerateCoreAssets.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\WordPress\Commands;
+
+use Piwik\AssetManager;
+use Piwik\Filesystem;
+use Piwik\FrontController;
+use Piwik\Piwik;
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugins\Installation\ServerFilesGenerator;
+use Piwik\Plugins\WordPress\WpAssetManager;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class GenerateCoreAssets extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('wordpress:generate-core-assets');
+        $this->setDescription('Generate the core JS asset file');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+	    ServerFilesGenerator::createFilesForSecurity();
+
+    	Piwik::addAction('AssetManager.makeNewAssetManagerObject', function (&$assetManager) {
+		    $assetManager = new AssetManager();
+	    });
+
+	    Piwik::addAction('AssetManager.getJavaScriptFiles', function (&$files){
+	    	foreach ($files as $index => $file) {
+	    		$basename = basename($file);
+			    $basename = strtolower($basename);
+	    		if ($basename === 'jquery.js'
+			        || $basename === 'jquery.min.js'
+			        || $basename === 'jquery-ui.js'
+			        || $basename === 'jquery-ui.min.js') {
+				    // we are not allowed to ship matomo with that
+				    $files[$index] = null;
+			    }
+		    }
+		    $files = array_values(array_filter($files));
+	    });
+
+	    FrontController::getInstance()->init();
+
+        // make sure it will regenerate the core asset file
+        Filesystem::deleteAllCacheOnUpdate();
+        $assetManager = AssetManager::getInstance();
+        if ($assetManager instanceof WpAssetManager) {
+        	throw new \Exception('Wrong asset manager is used, it should use the core assets manager');
+        }
+        $content = $assetManager->getMergedCoreJavaScript()->getContent();
+
+        file_put_contents(plugin_dir_path(MATOMO_ANALYTICS_FILE) . 'assets/js/asset_manager_core_js.js', $content);
+    }
+
+}
diff --git a/plugins/WordPress/WordPress.php b/plugins/WordPress/WordPress.php
index 452c3be66..06fb85594 100644
--- a/plugins/WordPress/WordPress.php
+++ b/plugins/WordPress/WordPress.php
@@ -155,6 +155,7 @@ public function filterWidgets(WidgetsList $list)
         $list->remove('About Matomo', 'Installation_SystemCheck');
         $list->remove('About Matomo', 'CoreAdminHome_TrackingFailures');
         $list->remove('About Matomo', 'CoreHome_SystemSummaryWidget');
+        $list->remove('About Matomo', 'CoreHome_QuickLinks');
     }
 
     public function isTrackerPlugin() {
diff --git a/scripts/remove_not_needed_assets.sh b/scripts/remove_not_needed_assets.sh
index ac2d5cb5e..fa7c150d5 100755
--- a/scripts/remove_not_needed_assets.sh
+++ b/scripts/remove_not_needed_assets.sh
@@ -12,6 +12,6 @@ find $MATOMO_ROOT/libs/bower_components -name '*.js' -exec rm -rf {} +
 find $MATOMO_ROOT/libs/bower_components -name '*.map' -exec rm -rf {} +
 find $MATOMO_ROOT/libs/jqplot -name '*.js' -exec rm -rf {} +
 find $MATOMO_ROOT/plugins/*/angularjs -name '*.js' -exec rm -rf {} +
-find $MATOMO_ROOT/plugins/*/javascripts -name '*.js' ! -name 'Piwik_Overlay.js' ! -name 'optOut.js' -exec rm -rf {} +
+find $MATOMO_ROOT/plugins/*/javascripts -name '*.js' ! -name 'Piwik_Overlay.js' ! -name 'optOut.js' ! -name 'previewmode.js' ! -name 'previewmodedetection.js' ! -name 'tagmanager.js' ! -name 'tagmanager.min.js' -exec rm -rf {} +
 
 echo -e "Done!... "
diff --git a/scripts/update-core.sh b/scripts/update-core.sh
index e752cd602..cb07828c6 100755
--- a/scripts/update-core.sh
+++ b/scripts/update-core.sh
@@ -20,20 +20,24 @@ URL="https://builds.matomo.org/matomo-$VERSION.zip"
 echo -e "Downloading $URL..."
 wget $URL -P "$SCRIPTPATH" || die "Got an error while downloading this Matomo version"
 
+cp $MATOMO_ROOT/bootstrap.php bootstrap.php
+rm -rf $MATOMO_ROOT/*
 rm -r matomo/ 2> /dev/null
 unzip -o -q matomo-$VERSION.zip
 cp -R matomo/* $MATOMO_ROOT
 rm -r matomo/
 rm matomo-$VERSION.zip
 rm "How to install Matomo.html"
-find $MATOMO_ROOT/misc/* ! -name 'gpl-3.0.txt' -exec rm -rf {} +
+find $MATOMO_ROOT/misc/* -exec rm -rf {} +
 rm -rf $MATOMO_ROOT/tmp
 rm -rf $MATOMO_ROOT/tests
 rm -rf $MATOMO_ROOT/config/manifest.inc.php
 # important to remove pclzip as it is shipped with WP and would need to use their lib
 rm -rf $MATOMO_ROOT/matomo/app/vendor/piwik/decompress/libs/PclZip
+mv bootstrap.php $MATOMO_ROOT/bootstrap.php
 
 echo -e "Done!... "
 echo -e "We now need to hardcode the path to jquery.js in app/plugins/Overlay/client/client.js until we automated / changed things"
 echo -e "Then need to manually generate the core assets js file and put it into the assets directory"
+echo -e "Then execute 'php ../app/console generate-core-assets'"
 echo -e "Then execute ./remove_not_needed_assets.sh"
diff --git a/tests/phpunit/framework/test-case.php b/tests/phpunit/framework/test-case.php
index f39bd3452..7772157df 100644
--- a/tests/phpunit/framework/test-case.php
+++ b/tests/phpunit/framework/test-case.php
@@ -8,6 +8,15 @@ class MatomoUnit_TestCase extends WP_UnitTestCase {
 
 	public function setUp() {
 		parent::setUp();
+
+		add_filter( 'plugins_url', function ( $url ) {
+			// workaround for https://github.com/wp-cli/wp-cli/issues/1037
+			// WP is installed in tmp dir, but our plugin must be symlinked in actual dir, then plugin_basename
+			// fails to remove the actual plugin path
+			// replaces eg http://example.org/wp-content/plugins/Users/foobar/www/wordpress-tests/src/wp-content/plugins/matomo/app/matomo.js
+			// with http://example.org/wp-content/plugins/matomo/app/matomo.js
+			return str_replace( rtrim( dirname( plugin_dir_path( MATOMO_ANALYTICS_FILE ) ), '/' ), '', $url );
+		} );
 		if ( ! empty( $GLOBALS['wpdb'] ) ) {
 			$GLOBALS['wpdb']->suppress_errors( true );
 		}
diff --git a/tests/phpunit/framework/test-matomo-test-case.php b/tests/phpunit/framework/test-matomo-test-case.php
index fd950dee7..ef9b0d84a 100644
--- a/tests/phpunit/framework/test-matomo-test-case.php
+++ b/tests/phpunit/framework/test-matomo-test-case.php
@@ -28,7 +28,35 @@
 
 class MatomoAnalytics_TestCase extends MatomoUnit_TestCase {
 
+	/**
+	 * Disable creation of temporary tables. This may be needed when you're writing a test that is
+	 * tracking/archiving data. Problem is with temp tables many queries fail like this
+	 *
+	 * can't really use temporary tables as we otherwise get errors like
+	 * : WP DB Error: Can't reopen table: 'log_action' - in plugin Actions at PluginsArchiver.php:186
+	 * because temp tables cannot be joined
+	 *
+	 * @var bool
+	 */
+	protected $disable_temp_tables = false;
+
+	public function _create_temporary_tables( $query ) {
+		if (!$this->disable_temp_tables) {
+			$query = parent::_create_temporary_tables($query);
+		}
+		return $query;
+	}
+
+	public function _drop_temporary_tables( $query ) {
+		if (!$this->disable_temp_tables) {
+			$query = parent::_drop_temporary_tables($query);
+		}
+
+		return $query;
+	}
+
 	public function setUp() {
+
 		parent::setUp();
 
 		$uninstall = new Uninstaller();
diff --git a/tests/phpunit/wpmatomo/admin/test-accesssettings.php b/tests/phpunit/wpmatomo/admin/test-accesssettings.php
index a93e393b6..45a5ba2fe 100644
--- a/tests/phpunit/wpmatomo/admin/test-accesssettings.php
+++ b/tests/phpunit/wpmatomo/admin/test-accesssettings.php
@@ -57,7 +57,9 @@ public function test_show_settings_does_change_any_values_if_nonce() {
 		$_REQUEST['_wpnonce']               = wp_create_nonce( AccessSettings::NONCE_NAME );
 		$_SERVER['REQUEST_URI']             = home_url();
 
+		ob_start();
 		$this->access_settings->show_settings();
+		ob_end_clean();
 
 		$this->assertSame( Capabilities::KEY_VIEW, $this->access->get_permission_for_role( 'editor' ) );
 	}
@@ -69,7 +71,9 @@ public function test_show_settings_does_not_change_any_values_when_not_superuser
 		$_REQUEST['_wpnonce']               = wp_create_nonce( AccessSettings::NONCE_NAME );
 		$_SERVER['REQUEST_URI']             = home_url();
 
+		ob_start();
 		$this->access_settings->show_settings();
+		ob_end_clean();
 
 		$this->assertEmpty( $this->access->get_permission_for_role( 'editor' ) );
 	}
diff --git a/tests/phpunit/wpmatomo/admin/test-getstarted.php b/tests/phpunit/wpmatomo/admin/test-getstarted.php
index 79eded3cf..68f347041 100644
--- a/tests/phpunit/wpmatomo/admin/test-getstarted.php
+++ b/tests/phpunit/wpmatomo/admin/test-getstarted.php
@@ -51,7 +51,9 @@ public function test_show_does_change_value_if_nonce() {
 
 		$this->fake_request( TrackingSettings::TRACK_MODE_DEFAULT );
 
+		ob_start();
 		$this->get_started->show();
+		ob_end_clean();
 
 		$this->assertSame( TrackingSettings::TRACK_MODE_DEFAULT, $this->settings->get_global_option( 'track_mode' ) );
 		// still show the get started page
@@ -63,7 +65,9 @@ public function test_show_settings_does_not_change_any_values_when_not_superuser
 
 		$this->fake_request( TrackingSettings::TRACK_MODE_DEFAULT );
 
+		ob_start();
 		$this->get_started->show();
+		ob_end_clean();
 
 		$this->assertSame( TrackingSettings::TRACK_MODE_DISABLED, $this->settings->get_global_option( 'track_mode' ) );
 	}
@@ -72,7 +76,9 @@ public function test_show_settings_does_not_change_any_values_when_not_correct_v
 
 		$this->fake_request( 'manually' );
 
+		ob_start();
 		$this->get_started->show();
+		ob_end_clean();
 
 		$this->assertSame( TrackingSettings::TRACK_MODE_DISABLED, $this->settings->get_global_option( 'track_mode' ) );
 	}
@@ -82,7 +88,9 @@ public function test_show_settings_get_started_page() {
 		$this->assertNotEmpty( $this->settings->get_global_option( Settings::SHOW_GET_STARTED_PAGE ) );
 		$this->fake_request( 'no', Settings::SHOW_GET_STARTED_PAGE );
 
+		ob_start();
 		$this->get_started->show();
+		ob_end_clean();
 
 		$this->assertEmpty( $this->settings->get_global_option( Settings::SHOW_GET_STARTED_PAGE ) );
 	}
@@ -92,7 +100,9 @@ public function test_show_settings_get_started_page_when_not_correct_value() {
 		$this->assertNotEmpty( $this->settings->get_global_option( Settings::SHOW_GET_STARTED_PAGE ) );
 		$this->fake_request( Settings::SHOW_GET_STARTED_PAGE, '' );
 
+		ob_start();
 		$this->get_started->show();
+		ob_end_clean();
 
 		$this->assertNotEmpty( $this->settings->get_global_option( Settings::SHOW_GET_STARTED_PAGE ) );
 	}
@@ -101,7 +111,6 @@ private function fake_request( $track_mode_value, $post_key = 'track_mode' ) {
 		$_POST[ GetStarted::FORM_NAME ] = array( $post_key => $track_mode_value );
 		$_REQUEST['_wpnonce']     = wp_create_nonce( GetStarted::NONCE_NAME );
 		$_SERVER['REQUEST_URI']   = home_url();
-
 	}
 
 
diff --git a/tests/phpunit/wpmatomo/admin/test-marketplace.php b/tests/phpunit/wpmatomo/admin/test-marketplace.php
index 0becc3941..8ab6d9d17 100644
--- a/tests/phpunit/wpmatomo/admin/test-marketplace.php
+++ b/tests/phpunit/wpmatomo/admin/test-marketplace.php
@@ -65,8 +65,10 @@ public function test_show_does_change_license_key_if_nonce_and_valid() {
 		$license_key = sha1( 1 );
 		$this->fake_request( $license_key );
 
+		ob_start();
 		$marketplace = new Marketplace( $this->settings, new AdminMarketplaceTestValidApiKeyMock( $this->settings ) );
 		$marketplace->show();
+		ob_end_clean();
 
 		$this->assertSame( $license_key, $this->settings->get_license_key() );
 	}
diff --git a/tests/phpunit/wpmatomo/admin/test-systemreport.php b/tests/phpunit/wpmatomo/admin/test-systemreport.php
index 73d664ff1..7f3832c6d 100644
--- a/tests/phpunit/wpmatomo/admin/test-systemreport.php
+++ b/tests/phpunit/wpmatomo/admin/test-systemreport.php
@@ -50,11 +50,14 @@ public function test_show_renders_ui() {
 	/**
 	 * @dataProvider get_trouble_shooting_data
 	 */
-	public function test_show_does_change_license_key_if_nonce_and_valid( $method ) {
+	public function test_show_executes_troubleshooting_with_no_error( $method ) {
 
 		$this->fake_request( $method );
 
-		$this->assertNull( $this->report->show() );
+		ob_start();
+		$show = $this->report->show();
+		ob_end_clean();
+		$this->assertNull( $show );
 	}
 
 	public function get_trouble_shooting_data() {
diff --git a/tests/phpunit/wpmatomo/admin/test-trackingsettings.php b/tests/phpunit/wpmatomo/admin/test-trackingsettings.php
index a13cddb19..a748be50b 100644
--- a/tests/phpunit/wpmatomo/admin/test-trackingsettings.php
+++ b/tests/phpunit/wpmatomo/admin/test-trackingsettings.php
@@ -56,7 +56,9 @@ public function test_show_settings_does_change_any_values_if_nonce() {
 			'track_404'         => true
 		) );
 
+		ob_start();
 		$this->tracking_settings->show_settings();
+		ob_end_clean();
 
 		$this->assertSame( TrackingSettings::TRACK_MODE_MANUALLY, $this->settings->get_global_option( 'track_mode' ) );
 		$this->assertSame( 'restapi', $this->settings->get_global_option( 'track_js_endpoint' ) );
@@ -77,7 +79,9 @@ public function test_show_settings_does_not_change_any_values_when_not_superuser
 			'track_mode' => TrackingSettings::TRACK_MODE_MANUALLY,
 		) );
 
+		ob_start();
 		$this->tracking_settings->show_settings();
+		ob_end_clean();
 
 		$this->assertSame( TrackingSettings::TRACK_MODE_DISABLED, $this->settings->get_global_option( 'track_mode' ) );
 	}
@@ -90,7 +94,9 @@ public function test_show_settings_does_not_set_any_random_value_but_only_whitel
 			Settings::OPTION_KEY_CAPS_ACCESS => array( 'editor' => Capabilities::KEY_VIEW )
 		) );
 
+		ob_start();
 		$this->tracking_settings->show_settings();
+		ob_end_clean();
 
 		$this->assertEmpty( $this->settings->get_global_option( 'foobar' ) );
 		$this->assertEmpty( $this->settings->get_option( 'foobar' ) );
@@ -98,6 +104,10 @@ public function test_show_settings_does_not_set_any_random_value_but_only_whitel
 	}
 
 	public function test_get_active_containers_when_no_container_defined() {
+		if (is_multisite()) {
+			$this->markTestSkipped('skipped in multisite');
+			return;
+		}
 		$containers = $this->tracking_settings->get_active_containers();
 		$this->assertSame(array(), $containers);
 	}
diff --git a/tests/phpunit/wpmatomo/db/test-wordpress.php b/tests/phpunit/wpmatomo/db/test-wordpress.php
index 187ba611f..117379d14 100644
--- a/tests/phpunit/wpmatomo/db/test-wordpress.php
+++ b/tests/phpunit/wpmatomo/db/test-wordpress.php
@@ -26,6 +26,14 @@ public function setUp() {
 		$this->insert_many_values();
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_query_triggers_error_when_wrong_sql() {
+		$this->db->query( 'select * from foobarbaz');
+	}
+
 	public function test_query_can_execute_select_queries() {
 		$table  = Common::prefixTable( 'user' );
 		$result = $this->db->query( ' select * from ' . $table );
@@ -73,6 +81,14 @@ public function test_fetch_all() {
 		$this->assertCount( 3, $result );
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_fetch_all_triggers_error_when_wrong_sql() {
+		$this->db->fetchAll( 'select * from foobarbaz');
+	}
+
 	public function test_fetch_all_works_with_bind_params() {
 		$table  = Common::prefixTable( 'access' );
 		$result = $this->db->fetchAll( 'select * from ' . $table . ' where access = ? and idsite = ?', array(
@@ -82,12 +98,28 @@ public function test_fetch_all_works_with_bind_params() {
 		$this->assertCount( 1, $result );
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_fetch_one_triggers_error_when_wrong_sql() {
+		$this->db->fetchOne( 'select foo from foobarbaz');
+	}
+
 	public function test_fetch_one() {
 		$table  = Common::prefixTable( 'access' );
 		$result = $this->db->fetchOne( 'select access from ' . $table . ' limit 1' );
 		$this->assertEquals( 'view', $result );
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_fetch_row_triggers_error_when_wrong_sql() {
+		$this->db->fetchRow( 'select * from foobarbaz limit 1');
+	}
+
 	public function test_fetch_row() {
 		$table  = Common::prefixTable( 'access' );
 		$result = $this->db->fetchRow( 'select * from ' . $table . ' limit 1' );
@@ -99,6 +131,14 @@ public function test_fetch_row() {
 		), $result );
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_exec_triggers_error_when_wrong_sql() {
+		$this->db->exec( 'select * from foobarbaz');
+	}
+
 	public function test_exec() {
 		$table = Common::prefixTable( 'access' );
 
diff --git a/tests/phpunit/wpmatomo/db/test-wordpresstracker.php b/tests/phpunit/wpmatomo/db/test-wordpresstracker.php
index 228bed59e..8d68e5d04 100644
--- a/tests/phpunit/wpmatomo/db/test-wordpresstracker.php
+++ b/tests/phpunit/wpmatomo/db/test-wordpresstracker.php
@@ -28,6 +28,14 @@ public function setUp() {
 		$this->insert_many_values();
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_query_triggers_error_when_wrong_sql() {
+		$this->db->query( 'select * from foobarbaz');
+	}
+
 	public function test_query_can_execute_select_queries() {
 		$table  = Common::prefixTable( 'user' );
 		$result = $this->db->query( ' select * from ' . $table );
@@ -69,6 +77,14 @@ public function test_query_can_insert() {
 		$this->assertEquals( 4, $this->db->lastInsertId() );
 	}
 
+	/**
+	 * @expectedException \Zend_Db_Statement_Exception
+	 * @expectedExceptionMessage  foobarbaz' doesn't exist
+	 */
+	public function test_fetch_all_triggers_error_when_wrong_sql() {
+		$this->db->fetchAll( 'select * from foobarbaz');
+	}
+
 	public function test_fetch_all() {
 		$table  = Common::prefixTable( 'access' );
 		$result = $this->db->fetchAll( 'select * from ' . $table );
diff --git a/tests/phpunit/wpmatomo/report/test-renderer.php b/tests/phpunit/wpmatomo/report/test-renderer.php
index e96a1a0bf..8e8e14001 100644
--- a/tests/phpunit/wpmatomo/report/test-renderer.php
+++ b/tests/phpunit/wpmatomo/report/test-renderer.php
@@ -7,6 +7,8 @@
 
 class ReportRendererTest extends MatomoAnalytics_TestCase {
 
+	protected $disable_temp_tables = true;
+
 	public function setUp() {
 		parent::setUp();
 
diff --git a/tests/phpunit/wpmatomo/test-api.php b/tests/phpunit/wpmatomo/test-api.php
index b0f733883..4c69a0f23 100644
--- a/tests/phpunit/wpmatomo/test-api.php
+++ b/tests/phpunit/wpmatomo/test-api.php
@@ -39,7 +39,8 @@ public function test_dispatch_matomo_api() {
 
 		$request  = new WP_REST_Request( 'GET', '/' . API::VERSION . '/api/matomo_version' );
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertEquals( '3.11.0', $response->get_data() );
+		$this->assertStringStartsWith( '3.', $response->get_data() );
+		$this->assertTrue( strlen($response->get_data()) < 15 );
 	}
 
 	public function test_dispatch_matomo_api_when_not_authenticated() {
@@ -47,7 +48,7 @@ public function test_dispatch_matomo_api_when_not_authenticated() {
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertEquals( array(
 			'code'    => 'matomo_no_access_exception',
-			'message' => 'You can\'t access this resource as it requires view access for at least one website.',
+			'message' => 'You must be logged in to access this functionality.',
 			'data'    => null
 		), $response->get_data() );
 	}
diff --git a/tests/phpunit/wpmatomo/test-optout.php b/tests/phpunit/wpmatomo/test-optout.php
index b42911b3d..d78461b88 100644
--- a/tests/phpunit/wpmatomo/test-optout.php
+++ b/tests/phpunit/wpmatomo/test-optout.php
@@ -18,7 +18,7 @@ public function test_matomo_opt_out_no_options() {
 
 	public function test_matomo_opt_out_all_options() {
 		$result = do_shortcode( PrivacySettings::EXAMPLE_FULL );
-		$this->assertSame( '<iframe style="border: 0; width:500px;height:100px;" src="http://example.org/wp-content/plugins/matomo/app/index.php?module=CoreAdminHome&action=optOut&language=de&background_color=red&font_color=fff&font_size=34&font_family=Arial"></iframe>', $result );
+		$this->assertSame( '<iframe style="border: 0; width:500px;height:100px;" src="http://example.org/wp-content/plugins/matomo/app/index.php?module=CoreAdminHome&action=optOut&language=de&backgroundColor=red&fontColor=fff&fontSize=34&fontFamily=Arial"></iframe>', $result );
 	}
 
 	public function test_matomo_opt_out_size_percent_px_values() {
diff --git a/tests/phpunit/wpmatomo/test-release.php b/tests/phpunit/wpmatomo/test-release.php
new file mode 100644
index 000000000..c87681cd4
--- /dev/null
+++ b/tests/phpunit/wpmatomo/test-release.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package Matomo_Analytics
+ */
+
+class ReleaseTest extends MatomoUnit_TestCase {
+
+	/**
+	 * @dataProvider get_needed_files
+	 */
+	public function test_assert_needed_files_exist($file) {
+		$this->assertFileExists(plugin_dir_path(MATOMO_ANALYTICS_FILE) . $file);
+	}
+
+	public function get_needed_files()
+	{
+		return array(
+			array('app/bootstrap.php'),
+			array('app/plugins/CoreAdminHome/javascripts/optOut.js'),
+			array('app/plugins/Overlay/javascripts/Piwik_Overlay.js'),
+			array('app/plugins/TagManager/javascripts/previewmode.js'),
+			array('app/plugins/TagManager/javascripts/previewmodedetection.js'),
+			array('app/plugins/TagManager/javascripts/tagmanager.js'),
+			array('app/plugins/TagManager/javascripts/tagmanager.min.js'),
+			array('app/core/.htaccess'),
+			array('app/js/.htaccess'),
+			array('app/lang/.htaccess'),
+			array('app/plugins/.htaccess'),
+			array('app/libs/.htaccess'),
+			array('app/vendor/.htaccess'),
+			array('app/robots.txt'),
+		);
+	}
+
+}
diff --git a/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php b/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php
index 93686726e..b4719dfcf 100644
--- a/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php
+++ b/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php
@@ -48,8 +48,8 @@ public function test_get_tracking_code_when_using_default_tracking_code() {
 			'track_mode' => TrackingSettings::TRACK_MODE_DEFAULT
 		) );
 		$this->assertSame( '<!-- Matomo --><script  type="text/javascript">var _paq = window._paq || [];
-_paq.push([\'trackPageView\']);_paq.push([\'enableLinkTracking\']);_paq.push([\'setTrackerUrl\', "\/\/example.org\/wp-content\/plugins\/wp-matomo\/matomo\/matomo.php"]);_paq.push([\'setSiteId\', \'21\']);var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
-    g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src="\/\/example.org\/wp-content\/uploads\/matomo\/matomo.js"; s.parentNode.insertBefore(g,s);</script><!-- End Matomo Code -->', $this->get_tracking_code() );
+_paq.push([\'trackPageView\']);_paq.push([\'enableLinkTracking\']);_paq.push([\'setTrackerUrl\', "\/\/example.org\/wp-content\/plugins\/matomo\/app\/matomo.php"]);_paq.push([\'setSiteId\', \'21\']);var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
+g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src="\/\/example.org\/wp-content\/plugins\/matomo\/app\/matomo.js"; s.parentNode.insertBefore(g,s);</script><!-- End Matomo Code -->', $this->get_tracking_code() );
 	}
 
 	public function test_get_tracking_code_when_using_default_tracking_code_using_rest_api_and_other_features() {
@@ -71,9 +71,9 @@ public function test_get_tracking_code_when_using_default_tracking_code_using_re
 _paq.push([\'setLinkClasses\', "clickme|foo"]);
 _paq.push([\'disableCookies\']);
 _paq.push([\'enableCrossDomainLinking\']);
-  _paq.push(["setCookieDomain", "*.example.org"]);
-_paq.push([\'trackAllContentImpressions\']);_paq.push([\'trackPageView\']);_paq.push([\'enableLinkTracking\']);_paq.push([\'setTrackerUrl\', "\/\/example.org\/index.php?rest_route=\/ma\/v1\/hit\/"]);_paq.push([\'setSiteId\', \'21\']);var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
-    g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src="\/\/example.org\/index.php?rest_route=\/ma\/v1\/hit\/"; s.parentNode.insertBefore(g,s);</script><!-- End Matomo Code -->', $this->get_tracking_code() );
+_paq.push(["setCookieDomain", "*.example.org"]);
+_paq.push([\'trackAllContentImpressions\']);_paq.push([\'trackPageView\']);_paq.push([\'enableLinkTracking\']);_paq.push([\'setTrackerUrl\', "\/\/example.org\/index.php?rest_route=\/matomo\/v1\/hit\/"]);_paq.push([\'setSiteId\', \'21\']);var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
+g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src="\/\/example.org\/index.php?rest_route=\/matomo\/v1\/hit\/"; s.parentNode.insertBefore(g,s);</script><!-- End Matomo Code -->', $this->get_tracking_code() );
 	}
 
 	public function test_get_tracking_code_test_user_id() {
@@ -100,13 +100,18 @@ public function test_get_tracking_code_when_using_tagmanager_mode() {
 			'track_mode' => TrackingSettings::TRACK_MODE_TAGMANAGER,
 			'tagmanger_container_ids' => array('abcdefgh' => 1, 'cfk3jjw' => 0)
 		) );
-		$this->assertSame( '<!-- Matomo Tag Manager -->
+
+		if (is_multisite()) {
+			$this->assertSame( '<!-- Matomo: no supported track_mode selected -->', $this->get_tracking_code() );
+		} else {
+			$this->assertSame( '<!-- Matomo Tag Manager -->
 <script type="text/javascript" >
 var _mtm = _mtm || [];
 _mtm.push({\'mtm.startTime\': (new Date().getTime()), \'event\': \'mtm.Start\'});
 var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
 g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src="http://example.org/wp-content/uploads/matomo/container_abcdefgh.js"; s.parentNode.insertBefore(g,s);
 </script><!-- End Matomo Tag Manager -->', $this->get_tracking_code() );
+		}
 	}
 
 	public function test_get_tracking_code_when_using_tagmanager_mode_and_no_containers() {
@@ -114,7 +119,12 @@ public function test_get_tracking_code_when_using_tagmanager_mode_and_no_contain
 			'track_mode' => TrackingSettings::TRACK_MODE_TAGMANAGER,
 			'tagmanger_container_ids' => array()
 		) );
-		$this->assertSame( '<!-- Matomo Tag Manager --><!-- End Matomo Tag Manager -->', $this->get_tracking_code() );
+		if (is_multisite()) {
+			$this->assertSame( '<!-- Matomo: no supported track_mode selected -->', $this->get_tracking_code() );
+		} else {
+			$this->assertSame( '<!-- Matomo Tag Manager --><!-- End Matomo Tag Manager -->', $this->get_tracking_code() );
+		}
+
 	}