Merge branch 'master' into deprecate_usersettings

Conflicts:
	tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv

14 files changed, 99 insertions, 10 deletions

diff --git a/plugins/Contents/lang/cs.json b/plugins/Contents/lang/cs.json
new file mode 100644
index 0000000000..e06fabbf47
--- /dev/null
+++ b/plugins/Contents/lang/cs.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Jméno obsahu",
+        "ContentPiece": "Část obsahu",
+        "Contents": "Obsah",
+        "ContentTarget": "Cíl obsahu",
+        "Impressions": "Dojmy",
+        "Interaction": "Interakce",
+        "InteractionRate": "Rychlost interakcí",
+        "Interactions": "Interakce"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/da.json b/plugins/Contents/lang/da.json
new file mode 100644
index 0000000000..725e9a55f2
--- /dev/null
+++ b/plugins/Contents/lang/da.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Indholdsnavn",
+        "ContentPiece": "Indholdsstykke",
+        "Contents": "Indhold",
+        "ContentTarget": "Indholdsmål",
+        "Impressions": "Indtryk",
+        "Interaction": "Interaktion",
+        "InteractionRate": "Interaktionsfrekvens",
+        "Interactions": "Interaktioner"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/de.json b/plugins/Contents/lang/de.json
new file mode 100644
index 0000000000..11ecd6e985
--- /dev/null
+++ b/plugins/Contents/lang/de.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Inhaltsname",
+        "ContentPiece": "Inhaltsteil",
+        "Contents": "Inhalte",
+        "ContentTarget": "Inhaltsziel",
+        "Impressions": "Impressionen",
+        "Interaction": "Interaktion",
+        "InteractionRate": "Interaktionsrate",
+        "Interactions": "Interaktionen"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/el.json b/plugins/Contents/lang/el.json
new file mode 100644
index 0000000000..00eeeb0578
--- /dev/null
+++ b/plugins/Contents/lang/el.json
@@ -0,0 +1,12 @@
+{
+    "Contents": {
+        "ContentName": "Όνομα Περιεχομένου",
+        "ContentPiece": "Κομμάτι Περιεχομένου",
+        "Contents": "Περιεχόμενα",
+        "ContentTarget": "Στόχος Περιεχομένου",
+        "Impressions": "Αποτυπώσεις",
+        "Interaction": "Αλληλεπίδραση",
+        "InteractionRate": "Ρυθμός αλληλεπίδρασης",
+        "Interactions": "Αλληλεπιδράσεις"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/es.json b/plugins/Contents/lang/es.json
new file mode 100644
index 0000000000..3eb3bec9e7
--- /dev/null
+++ b/plugins/Contents/lang/es.json
@@ -0,0 +1,6 @@
+{
+    "Contents": {
+        "ContentName": "Nombre del contenido",
+        "Interactions": "Interacciones"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/et.json b/plugins/Contents/lang/et.json
new file mode 100644
index 0000000000..9d6a1f3e9d
--- /dev/null
+++ b/plugins/Contents/lang/et.json
@@ -0,0 +1,9 @@
+{
+    "Contents": {
+        "ContentName": "Sisu nimi",
+        "ContentPiece": "Sisu tükk",
+        "Contents": "Sisud",
+        "InteractionRate": "Koostoime mõju",
+        "Interactions": "Koostoime"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/it.json b/plugins/Contents/lang/it.json
new file mode 100644
index 0000000000..f040e21bfe
--- /dev/null
+++ b/plugins/Contents/lang/it.json
@@ -0,0 +1,10 @@
+{
+    "Contents": {
+        "ContentName": "Nome Contenuto",
+        "Contents": "Contenuti",
+        "Impressions": "Impressioni",
+        "Interaction": "Interazione",
+        "InteractionRate": "Rapporto di Interazione",
+        "Interactions": "Interazioni"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/pl.json b/plugins/Contents/lang/pl.json
new file mode 100644
index 0000000000..846b76db09
--- /dev/null
+++ b/plugins/Contents/lang/pl.json
@@ -0,0 +1,7 @@
+{
+    "Contents": {
+        "ContentName": "Nazwa treści",
+        "Contents": "Treści",
+        "Interactions": "Interakcje"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/pt.json b/plugins/Contents/lang/pt.json
new file mode 100644
index 0000000000..4efc05c515
--- /dev/null
+++ b/plugins/Contents/lang/pt.json
@@ -0,0 +1,9 @@
+{
+    "Contents": {
+        "Contents": "Conteúdos",
+        "ContentTarget": "Conteúdo de Destino",
+        "Impressions": "Impressões",
+        "Interaction": "Interação",
+        "Interactions": "Interações"
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 0b60b143f3..857c554b17 100644
--- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -49,7 +49,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -149,7 +149,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 0b60b143f3..857c554b17 100644
--- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -49,7 +49,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -149,7 +149,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 0b60b143f3..857c554b17 100644
--- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -49,7 +49,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -149,7 +149,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 0b60b143f3..857c554b17 100644
--- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -49,7 +49,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -149,7 +149,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 0b60b143f3..857c554b17 100644
--- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -49,7 +49,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -149,7 +149,7 @@
 		<events>0</events>
 		<provider>Unknown</provider>
 		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<providerUrl />
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />