diff options
| author | sgiehl <stefan@matomo.org> | 2022-08-02 12:51:49 +0300 |
|---|---|---|
| committer | sgiehl <stefan@matomo.org> | 2022-08-02 12:51:49 +0300 |
| commit | bf94c3cadc31bcc6718c5f29fd0504b4bd93947a (patch) | |
| tree | e8d12ccf241ab321f1ba5ba8c568ba424389df85 /plugins/SitesManager | |
| parent | a515d92148a1e060c376952c90fd03e694df39f0 (diff) | |
| parent | 11d2db020381ad2bdeedb006e380dae5f56b920f (diff) | |
Merge branch '4.x-dev' into 5.x-dev
Diffstat (limited to 'plugins/SitesManager')
| -rw-r--r-- | plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml | 8 | ||||
| -rw-r--r-- | plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 0c9820dfcb..ec126b4734 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -256,7 +256,7 @@ https://www.example.org/</placeholder> <settings> <row> <name>disable_visitor_log</name> - <title>Disable visits log & visitor profile</title> + <title>Turn off visits log and visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -265,7 +265,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> + <inlineHelp>Also removes features that depend on these, like the e-commerce log, the segmented visits-log, the real-time map or the real-time widget. May be required to comply with local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -273,7 +273,7 @@ https://www.example.org/</placeholder> </row> <row> <name>disable_visitor_profile</name> - <title>Disable visitor profile only</title> + <title>Turn off visitor profiles</title> <value>0</value> <defaultValue>0</defaultValue> <type>boolean</type> @@ -282,7 +282,7 @@ https://www.example.org/</placeholder> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> + <inlineHelp>All visits-log related features always function.</inlineHelp> <templateFile /> <introduction /> <condition>disable_visitor_log==0</condition> diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png index 0cc7ff1efd..411f71682c 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_site_edit_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fda752b4a36129a30d2f31f382f62d0ef65fb8dfb5719c4a626b0299d751dc4 -size 391919 +oid sha256:842fa540739ba6eb056bb155455eb1735ef3554f05d4300fcdcb30944d755fdf +size 380304 |
