From 975d2ce2d6c66a8f6e10c98cd4151cda6883af46 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 4 Feb 2014 17:51:58 +1300
Subject: Refs #4569 Tweak to message + display as raw for segment names with
 entities to display ok

---
 lang/en.json                                          | 2 +-
 plugins/CustomAlerts                                  | 2 +-
 plugins/Dashboard/stylesheets/dashboard.less          | 4 ++++
 plugins/SecurityInfo                                  | 2 +-
 plugins/SegmentEditor/templates/_segmentSelector.twig | 5 +++--
 plugins/TasksTimetable                                | 2 +-
 plugins/TreemapVisualization                          | 2 +-
 plugins/VisitorGenerator                              | 2 +-
 tests/PHPUnit/UI                                      | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index 68230a1661..1dbcea0f44 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -2413,7 +2413,7 @@
         "AutoArchiveRealTime": "segmented reports are processed in real time",
         "AutoArchivePreProcessed": "segmented reports are pre-processed (faster, requires archive.php cron)",
         "SegmentNotApplied": "Segment '%s' not applied",
-        "SegmentNotAppliedExplanation": "You are requesting data for the Custom Segment '%s', the current Piwik configuration prevents the real time processing of this segment. Please ask your Piwik admin to change the setting in the config file (browser_archiving_disabled_enforce) or edit this Segment to be Processed by the cron archive.php script."
+        "SegmentNotAppliedExplanation": "You are requesting data for the Custom Segment '%s', the current Piwik configuration prevents the real time processing of reports for this segment. Please ask your Piwik admin to change the setting in the config file (%s). You may also edit this Segment and choose '%s'."
     },
     "Events": {
         "Events": "Events",
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 277529fa33..dd693992a4 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 277529fa331cf9ddddc94a6bce0774cabd0201e1
+Subproject commit dd693992a438a51c2bb6e48be740b06f30a6480e
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index d8bb57e4e8..ea67e3137b 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -162,6 +162,10 @@
   min-height: 0 !important;
 }
 
+.ui-confirm p {
+  margin-top:10px;
+
+}
 .ui-confirm h2 {
   text-align: center;
   font-weight: bold;
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
index cd98a60c78..2d1f5e5a70 160000
--- a/plugins/SecurityInfo
+++ b/plugins/SecurityInfo
@@ -1 +1 @@
-Subproject commit cd98a60c785ce56b45e4d142e9af3a470619a60b
+Subproject commit 2d1f5e5a70ddcf5e7a88514c07b9e0ef501051ef
diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig
index f66dbf4e2b..f036a98976 100644
--- a/plugins/SegmentEditor/templates/_segmentSelector.twig
+++ b/plugins/SegmentEditor/templates/_segmentSelector.twig
@@ -146,8 +146,9 @@
 </div>
 
 <div class="ui-confirm" id="pleaseChangeBrowserAchivingDisabledSetting">
-    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment) }}</h2>
-    <p class="description">{{ 'SegmentEditor_SegmentNotAppliedExplanation'|translate(nameOfCurrentSegment) }}</p>
+    <h2>{{ 'SegmentEditor_SegmentNotApplied'|translate(nameOfCurrentSegment)|raw }}</h2>
+    {% set segmentSetting %}{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }}{% endset %}
+    <p class="description">{{ 'SegmentEditor_SegmentNotAppliedExplanation'|translate(nameOfCurrentSegment, 'browser_archiving_disabled_enforce', segmentSetting)|raw }}</p>
     <input role="yes" type="button" value="{{ 'General_Ok'|translate }}"/>
 </div>
 
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index f6e252d5dc..2646ac6b78 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit f6e252d5dc5e3cf004263f7450c2ca55bd2c5a71
+Subproject commit 2646ac6b7856fc46e20a0213a5467cd6cd7c7313
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 2cb15300a8..19978cb7cd 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef09
+Subproject commit 19978cb7cd926ec0fba111ce257b8f0450f34ce8
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 0e0066e535..6cd5e94ca5 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 0e0066e5358aea60026b8f53bd7a33e854dbb67a
+Subproject commit 6cd5e94ca5cca57ed5132b9f929d7a952e41041e
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index ba9eecdcc8..ec7b2f65c0 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit ba9eecdcc8be1a0a3114c99e9810b9b98ff15afb
+Subproject commit ec7b2f65c0ef8c8570c1da0f9b3263dc37f8863d
-- 
cgit v1.2.3