Merge master into "3.0"

Conflicts:
	.travis.yml
	CHANGELOG.md
	core/Plugin/ControllerAdmin.php
	core/Version.php
	core/testMinimumPhpVersion.php
	plugins/API/API.php
	plugins/Actions/Reports/GetPageUrls.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/templates/_menu.twig
	plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
	plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
	plugins/Goals/Controller.php
	tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
	tests/PHPUnit/Integration/Plugin/ManagerTest.php
	tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
	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.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Overlay_spec.js
	tests/UI/specs/UIIntegration_spec.js

10 files changed, 11 insertions, 1 deletions

diff --git a/plugins/Dashboard/lang/cs.json b/plugins/Dashboard/lang/cs.json
index 8db9ceb7cf..1a952809f1 100644
--- a/plugins/Dashboard/lang/cs.json
+++ b/plugins/Dashboard/lang/cs.json
@@ -13,7 +13,7 @@
         "DefaultDashboard": "Výchozí nástěnka - používáte výchozí rozvržení nástěnky",
         "DeleteWidgetConfirm": "Opravdu chcete odstranit tento widget z nástěnky?",
         "EmptyDashboard": "Prázdná nástěnka - vyberte si své oblíbené widgety",
-        "LoadingWidget": "Načítám widget, prosím čekejte...",
+        "LoadingWidget": "Načítání widgetu, chvíli strpení...",
         "ManageDashboard": "Správa nástěnky",
         "Maximise": "Maximalizovat",
         "Minimise": "Minimalizovat",
@@ -21,6 +21,7 @@
         "PluginDescription": "Vaše nástěnka analýzy webu. Přizpůsobte si vaši nástěnku přidáním nových widgetů, jejich přesunutím nebo změnou rozvržení sloupců. Každý uživatel může přizpůsobit svou vlastní nástěnku.",
         "RemoveDashboard": "Odstranit nástěnku",
         "RemoveDashboardConfirm": "Opravdu chcete odstranit nástěnku: %s?",
+        "RemoveDefaultDashboardNotPossible": "Výchozí nástěnka nemůže být odstraněna",
         "RenameDashboard": "Přejmenovat nástěnku",
         "ResetDashboard": "Obnovit nástěnku",
         "ResetDashboardConfirm": "Opravdu chcete obnovit nastavení nástěnky do továrního stavu?",
diff --git a/plugins/Dashboard/lang/de.json b/plugins/Dashboard/lang/de.json
index 6b6a1a6db9..35cc204fec 100644
--- a/plugins/Dashboard/lang/de.json
+++ b/plugins/Dashboard/lang/de.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Ihr Web Analyse Dashboard. Personalisieren Sie Ihr Dashboard, in dem Sie neue Widgets hinzufügen, per Drag und Drop herumschieben, und das Dashboard Spaltenlayout ändern. Jeder Benutzer kann sein eigenes personalisiertes Dashboard verwalten.",
         "RemoveDashboard": "Dashboard entfernen",
         "RemoveDashboardConfirm": "Sind Sie sicher, dass Sie das Dashboard \"%s\" löschen möchten?",
+        "RemoveDefaultDashboardNotPossible": "Das Standard-Dashboard kann nicht entfernt werden.",
         "RenameDashboard": "Dashboard umbenennen",
         "ResetDashboard": "Dashboard zurücksetzen",
         "ResetDashboardConfirm": "Wollen Sie wirklich das Dashboardlayout auf die Standardeinstellungen zurücksetzen?",
diff --git a/plugins/Dashboard/lang/el.json b/plugins/Dashboard/lang/el.json
index 0f03e52550..965d5329d1 100644
--- a/plugins/Dashboard/lang/el.json
+++ b/plugins/Dashboard/lang/el.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Ο κεντρικός πίνακας Αναλυτικών Ιστού. Προσαρμόστε τον πίνακα με την προσθήκη νέων γραφικών συστατικών, σύρτε και αφήστε τα όπου θέλετε και αλλάξτε την διάταξη στήλης του πίνακα. Κάθε χρήστης μπορεί να διαχειρίζεται τον δικό του πίνακα.",
         "RemoveDashboard": "Απομάκρυνση κεντρικού πίνακα",
         "RemoveDashboardConfirm": "Θέλετε, σίγουρα, να απομακρύνετε τον Κεντρικό Πίνακα «%s»;",
+        "RemoveDefaultDashboardNotPossible": "Ο προκαθορισμένος πίνακας εργαλείων δεν είναι δυνατό να αφαιρεθεί",
         "RenameDashboard": "Μετονομασία κεντρικού πίνακα",
         "ResetDashboard": "Επαναφορά κεντρικού πίνακα",
         "ResetDashboardConfirm": "Θέλετε σίγουρα να επαναφέρετε τον κεντρικό σας πίνακα στις προεπιλεγμένες Μικροεφαρμογές;",
diff --git a/plugins/Dashboard/lang/fr.json b/plugins/Dashboard/lang/fr.json
index 933c82bf36..1dc3fdb4a1 100644
--- a/plugins/Dashboard/lang/fr.json
+++ b/plugins/Dashboard/lang/fr.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Votre tableau de bord, personnalisez le en ajoutant des widgets, en les déplaçant et en modifiant la disposition des colonnes. Chaque utilisateur possède son propre tableau de bord.",
         "RemoveDashboard": "Supprimer le tableau de bord",
         "RemoveDashboardConfirm": "Êtes vous sûr(e) de vouloir supprimer le tableau de bord \"%s\" ?",
+        "RemoveDefaultDashboardNotPossible": "Le tableau de bord par défaut ne peut pas être supprimé",
         "RenameDashboard": "Renommer le tableau de bord",
         "ResetDashboard": "Restaurer le tableau de bord",
         "ResetDashboardConfirm": "Voulez-vous vraiment restaurer votre tableau de bord avec les widgets par défaut ?",
diff --git a/plugins/Dashboard/lang/it.json b/plugins/Dashboard/lang/it.json
index b97e35430d..8105f3f90f 100644
--- a/plugins/Dashboard/lang/it.json
+++ b/plugins/Dashboard/lang/it.json
@@ -21,6 +21,7 @@
         "PluginDescription": "La tua Dashboard delle Statistiche Web. Personalizzala aggiungendo nuovi widgets, trascinandoli e spostandoli e cambiando l'aspetto delle colonne. Ciascun utente può gestire una propria dashboard.",
         "RemoveDashboard": "Rimuovi la dashboard",
         "RemoveDashboardConfirm": "Sei sicuro di voler rimuovere la dashboard \"%s\"?",
+        "RemoveDefaultDashboardNotPossible": "La dashboard predefinita non può essere eliminata",
         "RenameDashboard": "Rinomina dashboard",
         "ResetDashboard": "Reimposta la dashboard",
         "ResetDashboardConfirm": "Sei sicuro di voler ripristinare il layout della dashboard alla selezione di widget predefinita?",
diff --git a/plugins/Dashboard/lang/ja.json b/plugins/Dashboard/lang/ja.json
index 10c0b763d9..f673fd143f 100644
--- a/plugins/Dashboard/lang/ja.json
+++ b/plugins/Dashboard/lang/ja.json
@@ -21,6 +21,7 @@
         "PluginDescription": "ユーザーの Web Analytics のダッシュ ボード。新しいウィジェットを追加することによって、ダッシュ ボードをカスタマイズ、ドラッグ アンドドロップしでダッシュ ボードのカラムのレイアウトを変更します。各ユーザーは、独自のカスタム ダッシュ ボードを管理できます。",
         "RemoveDashboard": "ダッシュボードの削除",
         "RemoveDashboardConfirm": "本当にダッシュボード \"%s\" を削除しますか？",
+        "RemoveDefaultDashboardNotPossible": "既定のダッシュ ボードを削除できません。",
         "RenameDashboard": "ダッシュボードの名称変更",
         "ResetDashboard": "ダッシュボードのリセット",
         "ResetDashboardConfirm": "ダッシュボードのレイアウトをリセットしてデフォルトのウィジェットに戻しますか？",
diff --git a/plugins/Dashboard/lang/ko.json b/plugins/Dashboard/lang/ko.json
index 535fe10319..6c4dd23b1c 100644
--- a/plugins/Dashboard/lang/ko.json
+++ b/plugins/Dashboard/lang/ko.json
@@ -21,6 +21,7 @@
         "PluginDescription": "당신의 사이트를 분석한 대시보드입니다. 드래그 앤 드롭으로 새로운 위젯을 추가하거나 대시보드 레이아웃을 바꾸는 기능을 통해 당신만의 대시보드를 꾸며보세요. 모든 사용자들은 자신만의 대시보드를 가질 수 있습니다.",
         "RemoveDashboard": "대시보드 삭제",
         "RemoveDashboardConfirm": "정말 대시보드 \"%s\"를 삭제 하시겠습니까?",
+        "RemoveDefaultDashboardNotPossible": "기본 대시보드는 삭제할 수 없습니다.",
         "RenameDashboard": "대시보드 이름 변경",
         "ResetDashboard": "대시보드 재설정",
         "ResetDashboardConfirm": "대시보드의 레이아웃을 재설정하여 기본 위젯으로 복원하시겠습니까?",
diff --git a/plugins/Dashboard/lang/pt-br.json b/plugins/Dashboard/lang/pt-br.json
index 1ec93d487c..e913ffd254 100644
--- a/plugins/Dashboard/lang/pt-br.json
+++ b/plugins/Dashboard/lang/pt-br.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Seu Painel de Análise da Rede. Personalize seu painel adicionando novos widgets, arrastando para suas posições, e mudando o leiaute das colunas do painel. Cada usuário pode gerenciar seus próprios painéis personalizados.",
         "RemoveDashboard": "Remover painel",
         "RemoveDashboardConfirm": "Tem certeza de que deseja remover o painel \"%s\"?",
+        "RemoveDefaultDashboardNotPossible": "O painel padrão não pode ser removido",
         "RenameDashboard": "Renomear painel",
         "ResetDashboard": "Resetar o painel",
         "ResetDashboardConfirm": "Tem certeza de que deseja redefinir o layout do painel para a seleção Widgets padrão?",
diff --git a/plugins/Dashboard/lang/sk.json b/plugins/Dashboard/lang/sk.json
index ddd7c84c40..9382122bef 100644
--- a/plugins/Dashboard/lang/sk.json
+++ b/plugins/Dashboard/lang/sk.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Vaša nástenka webovej analýzy. Prispôsobte si svoj panel pridaním nových miniaplikácií, popresúvajte ich, a zmeňte rozvrhnutie stĺpcov panela. Každý používateľ môže spravovať svoju vlastnú nástenku.",
         "RemoveDashboard": "Odstrániť nástenku",
         "RemoveDashboardConfirm": "Naozaj chcete odstrániť panel \"%s\"?",
+        "RemoveDefaultDashboardNotPossible": "Štandardnú nástenku nie je možné odstrániť.",
         "RenameDashboard": "Premenovať nástenku",
         "ResetDashboard": "Resetovať nástenku",
         "ResetDashboardConfirm": "Naozaj chcete resetovať rozvrhnutie vašej nástenky na výber prednastavených miniaplikácií?",
diff --git a/plugins/Dashboard/lang/tr.json b/plugins/Dashboard/lang/tr.json
index f8ef152082..645b2c2f13 100644
--- a/plugins/Dashboard/lang/tr.json
+++ b/plugins/Dashboard/lang/tr.json
@@ -19,6 +19,7 @@
         "NotUndo": "Bu eylemi geri alamazsınız.",
         "RemoveDashboard": "Paneli kaldır",
         "RemoveDashboardConfirm": "\"%s\" panelini kaldırmak istediğinize emin misiniz?",
+        "RemoveDefaultDashboardNotPossible": "Varsayılan pano silinemez",
         "RenameDashboard": "Panel yeniden adlandır",
         "ResetDashboard": "Paneli sıfırla",
         "ResetDashboardConfirm": "Kontrol paneli şablonunuzu varsayılan widget seçimlerine sıfırlamak istediğinizden emin misiniz?",