Merge branch 'master' into 3.0-m06

Conflicts:
	.travis.yml
	bower.json
	core/Notification/Manager.php
	core/Updates.php
	core/Updates/2.16.2-b2.php
	core/Version.php
	libs/Zend/Validate/Hostname.php
	libs/bower_components/jScrollPane/ajax.html
	libs/bower_components/jScrollPane/anchors.html
	libs/bower_components/jScrollPane/api.html
	libs/bower_components/jScrollPane/arrow_hover.html
	libs/bower_components/jScrollPane/arrow_positions.html
	libs/bower_components/jScrollPane/arrows.html
	libs/bower_components/jScrollPane/auto_reinitialise.html
	libs/bower_components/jScrollPane/basic.html
	libs/bower_components/jScrollPane/caps.html
	libs/bower_components/jScrollPane/changelog.html
	libs/bower_components/jScrollPane/destroy.html
	libs/bower_components/jScrollPane/drag_size.html
	libs/bower_components/jScrollPane/dynamic_content.html
	libs/bower_components/jScrollPane/dynamic_height.html
	libs/bower_components/jScrollPane/dynamic_width.html
	libs/bower_components/jScrollPane/events.html
	libs/bower_components/jScrollPane/faqs.html
	libs/bower_components/jScrollPane/fixed_width.html
	libs/bower_components/jScrollPane/focus.html
	libs/bower_components/jScrollPane/fullpage_scroll.html
	libs/bower_components/jScrollPane/iframe.html
	libs/bower_components/jScrollPane/iframe2.html
	libs/bower_components/jScrollPane/iframe_content1.html
	libs/bower_components/jScrollPane/iframe_content2.html
	libs/bower_components/jScrollPane/image.html
	libs/bower_components/jScrollPane/image2.html
	libs/bower_components/jScrollPane/index.html
	libs/bower_components/jScrollPane/invisibles.html
	libs/bower_components/jScrollPane/known_issues.html
	libs/bower_components/jScrollPane/less_basic.html
	libs/bower_components/jScrollPane/mwheel_intent.html
	libs/bower_components/jScrollPane/override_animate.html
	libs/bower_components/jScrollPane/runeimp.html
	libs/bower_components/jScrollPane/runeimp2.html
	libs/bower_components/jScrollPane/scroll_on_left.html
	libs/bower_components/jScrollPane/scroll_to.html
	libs/bower_components/jScrollPane/scroll_to_animate.html
	libs/bower_components/jScrollPane/settings.html
	libs/bower_components/jScrollPane/short.html
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/swap.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/accepts.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/wrap.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/javascripts/manifest.json
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js

6 files changed, 27 insertions, 15 deletions

diff --git a/plugins/DBStats/Reports/GetIndividualMetricsSummary.php b/plugins/DBStats/Reports/GetIndividualMetricsSummary.php
index a36f742c66..be0cbb90db 100644
--- a/plugins/DBStats/Reports/GetIndividualMetricsSummary.php
+++ b/plugins/DBStats/Reports/GetIndividualMetricsSummary.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
 
 /**
- * Shows a datatable that displays how many occurances there are of each individual
+ * Shows a datatable that displays how many occurrences there are of each individual
  * metric type stored in the MySQL database.
  *
  * Goal metrics, metrics of the format .*_[0-9]+ and 'done...' metrics are grouped together.
diff --git a/plugins/DBStats/Reports/GetIndividualReportsSummary.php b/plugins/DBStats/Reports/GetIndividualReportsSummary.php
index 7f224c7909..f589cbb094 100644
--- a/plugins/DBStats/Reports/GetIndividualReportsSummary.php
+++ b/plugins/DBStats/Reports/GetIndividualReportsSummary.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
 
 /**
- * Shows a datatable that displays how many occurances there are of each individual
+ * Shows a datatable that displays how many occurrences there are of each individual
  * report type stored in the MySQL database.
  *
  * Goal reports and reports of the format: .*_[0-9]+ are grouped together.
diff --git a/plugins/DBStats/lang/sq.json b/plugins/DBStats/lang/sq.json
index 83d23ab402..0e338133c6 100644
--- a/plugins/DBStats/lang/sq.json
+++ b/plugins/DBStats/lang/sq.json
@@ -10,10 +10,12 @@
         "MetricDataByYear": "Tabela Matjesh Sipas Vitesh",
         "MetricTables": "Tabela Matjesh",
         "OtherTables": "Tabela të Tjera",
+        "PluginDescription": "Furnizon raporte të hollësishëm përdorimi baze të dhënash MySQL. Gjendet nën Diagnostikimet, për Superpërdoruesit.",
         "ReportDataByYear": "Tabela Raportesh Sipas Vitit",
         "ReportTables": "Tabela Raportesh",
         "RowCount": "Numërim rreshtash",
         "Table": "Tabelë",
-        "TotalSize": "Madhësi gjithsej"
+        "TotalSize": "Madhësi gjithsej",
+        "TrackerTables": "Tabela Gjurmuesi"
     }
 }
\ No newline at end of file
diff --git a/plugins/DBStats/lang/sv.json b/plugins/DBStats/lang/sv.json
index 576bbd4d2a..a0ef6b0b02 100644
--- a/plugins/DBStats/lang/sv.json
+++ b/plugins/DBStats/lang/sv.json
@@ -10,6 +10,7 @@
         "MetricDataByYear": "Variabler per år",
         "MetricTables": "Variabeltabeller",
         "OtherTables": "Övriga tabeller",
+        "PluginDescription": "Ger detaljerade rapporter över användning av MySQL databasen. Finns tillgängligt för Administratörer under Diagnostik.",
         "ReportDataByYear": "Raporttabeller per år",
         "ReportTables": "Rapporttabeller",
         "RowCount": "Radantal",
diff --git a/plugins/DBStats/lang/tr.json b/plugins/DBStats/lang/tr.json
index 0f90459844..4d7a35a51a 100644
--- a/plugins/DBStats/lang/tr.json
+++ b/plugins/DBStats/lang/tr.json
@@ -3,14 +3,14 @@
         "DatabaseUsage": "Veritabanı kullanımı",
         "DataSize": "Veri boyutu",
         "DBSize": "Veritabanı boyutu",
-        "EstimatedSize": "Tahmin edilen boyut",
+        "EstimatedSize": "Öngörülen boyut",
         "IndexSize": "Dizin boyutu",
-        "LearnMore": "Piwik'in verileri nasıl işlediğini ve orta ve yüksek trafiğe sahip sitelerde nasıl iyi çalıştığını öğrenmek için şu dokümana bakın: %s.",
-        "MainDescription": "Piwik tüm web istatistiklerinizi MySQL veritabanında saklar. Piwik tabloları %s kullanıyor.",
-        "MetricDataByYear": "Yıla Göre Metrik Tablosu",
-        "MetricTables": "Metrik Tabloları",
+        "LearnMore": "Verilerin Piwik tarafından nasıl işlendiğini ile orta ve yüksek trafiğe sahip sitelerde nasıl iyi çalışacağını öğrenmek için şu belgeye bakın: %s.",
+        "MainDescription": "Piwik tüm web istatistiklerinizi MySQL veritabanında saklar. Şu anda Piwik tabloları %s alan kullanıyor.",
+        "MetricDataByYear": "Yıla Göre Ölçün Tabloları",
+        "MetricTables": "Ölçüm Tabloları",
         "OtherTables": "Diğer Tablolar",
-        "PluginDescription": "Detaylı MySQL veritabanı kullanım raporu sağlar. Super Kullanıcı için Teşhis bölümünün altından ulaşılabilir.",
+        "PluginDescription": "Ayrıntılı MySQL veritabanı kullanım raporu oluşturur. Süper Kullanıcılar Tanılama bölümünün altından ulaşabilir.",
         "ReportDataByYear": "Yıla Göre Rapor Tabloları",
         "ReportTables": "Rapor Tabloları",
         "RowCount": "Satır sayısı",
diff --git a/plugins/DBStats/lang/uk.json b/plugins/DBStats/lang/uk.json
index 08ad26e9e2..541e3cfdc6 100644
--- a/plugins/DBStats/lang/uk.json
+++ b/plugins/DBStats/lang/uk.json
@@ -1,12 +1,21 @@
 {
     "DBStats": {
-        "DatabaseUsage": "Використання бази даних",
+        "DatabaseUsage": "Використання БД",
         "DataSize": "Розмір даних",
-        "IndexSize": "Розмір індексів",
-        "LearnMore": "Щоб зрозуміти більше як Piwik обробляє дані та як покращити роботу Piwik для сайтів з середнім та високим трафіком, перегляньте документацію %s.",
-        "MainDescription": "Piwik зберігає всі дані для веб-аналітики в MySQL базі даних. На даний час, таблиці з даними Piwik займають %s",
-        "RowCount": "Перелік рядків",
+        "DBSize": "Розмір бази даних",
+        "EstimatedSize": "Очікуваний розмір",
+        "IndexSize": "Розмір індексу",
+        "LearnMore": "Щоб дізнатися більше про те, як веб-аналітика обробляє дані і як їх оптимізувати для сайтів з середнім і високим навантаженням, дивіться документацію %s.",
+        "MainDescription": "Веб-аналітику зберігає всю вашу статистику в базі даних MySQL. Розмір таблиць на даний момент становить %s.",
+        "MetricDataByYear": "Таблиці показників за рік",
+        "MetricTables": "Таблиці показників",
+        "OtherTables": "Інші таблиці",
+        "PluginDescription": "Надає докладні звіти про використання бази даних MySQL. Доступно для супер-користувачів з метою діагностики.",
+        "ReportDataByYear": "Таблиці звітів за рік",
+        "ReportTables": "Таблиці звітів",
+        "RowCount": "Кількість записів",
         "Table": "Таблиця",
-        "TotalSize": "Розмір таблиці"
+        "TotalSize": "Загальний розмір",
+        "TrackerTables": "Таблиці трекеру"
     }
 }
\ No newline at end of file