From a528f8be836b68cb719f9d71ac704b1155c04d38 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Thu, 12 Feb 2015 14:51:28 +1300
Subject: [PATCH] update submodules and revert part of commit
---
plugins/API/lang/en.json | 1 +
plugins/CustomAlerts | 2 +-
plugins/SecurityInfo | 2 +-
plugins/TasksTimetable | 2 +-
plugins/TreemapVisualization | 2 +-
plugins/VisitorGenerator | 2 +-
tests/UI/expected-ui-screenshots | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/plugins/API/lang/en.json b/plugins/API/lang/en.json
index 4291e3ca62..b0780afc3a 100644
--- a/plugins/API/lang/en.json
+++ b/plugins/API/lang/en.json
@@ -4,6 +4,7 @@
"KeepTokenSecret": "This token_auth is as secret as your login and password, %s do not share it%s!",
"LoadedAPIs": "Successfully loaded %s APIs",
"MoreInformation": "For more information about the Piwik APIs, please have a look at the %s Introduction to Piwik API %s and the %s Piwik API Reference %s.",
+ "PluginDescription": "All the data in Piwik is available through simple APIs. This plugin is the web service entry point, that you can call to get your Web Analytics data in xml, json, php, csv, etc.",
"QuickDocumentationTitle": "API quick documentation",
"TopLinkTooltip": "Access your Web Analytics data programmatically through a simple API in json, xml, etc.",
"UserAuthentication": "User authentication",
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index d863cba51b..63967b2b71 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit d863cba51bdcd3c185cb10ebf5478ce764baeb7a
+Subproject commit 63967b2b715c6130cebea75c976c04f1141e7960
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index d0717d1e8b..a7e2d59ac9 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit d0717d1e8becaf2dfd1ff05cc73105083676f7df
+Subproject commit a7e2d59ac96e39e1141808fd944e863dc9588e8b
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index e61b78be97..030b39f841 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit e61b78be9754ac6dae24eb225dfe4f4c0172ee18
+Subproject commit 030b39f8414a306bbc17f8bc4929fb5de49ec367
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 0b1bf195bf..12b5b6e513 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 0b1bf195bffd3d32db0783899349298b94afdf3c
+Subproject commit 12b5b6e513920e3cb9d12821b690a8bfa4f658c4
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index a292a7fe8b..f85a7624f0 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit a292a7fe8b815ffe43ea9fd47940938c6bc2fa6b
+Subproject commit f85a7624f06f8821efa22acb43efb7cfdee05ab7
diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots
index 9e289ee669..810a1bc0bf 160000
--- a/tests/UI/expected-ui-screenshots
+++ b/tests/UI/expected-ui-screenshots
@@ -1 +1 @@
-Subproject commit 9e289ee669ae968a4accfa0d3658cbce9b4d4650
+Subproject commit 810a1bc0bf0aa139b3e5f1c08747bb0ad9688d75
--
GitLab