update GDPR overview page to new copy

plugins/PrivacyManager/PrivacyManager.php

@@ -316,9 +316,22 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'PrivacyManager_BackgroundColor';
         $translationKeys[] = 'PrivacyManager_BuildYourOwn';
         $translationKeys[] = 'PrivacyManager_DBPurged';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreement';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro1';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro1Linked';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro1New';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro2';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro2Linked';
+        $translationKeys[] = 'PrivacyManager_DataProcessingAgreementIntro2New';
         $translationKeys[] = 'PrivacyManager_DataRetention';
         $translationKeys[] = 'PrivacyManager_DataRetentionInMatomo';
         $translationKeys[] = 'PrivacyManager_DataRetentionOverall';
+        $translationKeys[] = 'PrivacyManager_DataRetentionRawDataDeletedAfterBold';
+        $translationKeys[] = 'PrivacyManager_DataRetentionRawDataDeletedAfter';
+        $translationKeys[] = 'PrivacyManager_DataRetentionRawDataNeverDeleted';
+        $translationKeys[] = 'PrivacyManager_DataRetentionReportsDeletedAfter';
+        $translationKeys[] = 'PrivacyManager_DataRetentionReportsNeverDeletedBold';
+        $translationKeys[] = 'PrivacyManager_DataRetentionReportsNeverDeleted';
         $translationKeys[] = 'PrivacyManager_DeleteAggregateReportsDetailedInfo';
         $translationKeys[] = 'PrivacyManager_DeleteBothConfirm';
         $translationKeys[] = 'PrivacyManager_DeleteDataDescription';
@@ -355,11 +368,26 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'PrivacyManager_ForceCookielessTrackingDescription2';
         $translationKeys[] = 'PrivacyManager_ForceCookielessTrackingDescriptionNotWritable';
         $translationKeys[] = 'PrivacyManager_GdprChecklistDesc1';
+        $translationKeys[] = 'PrivacyManager_GdprChecklistDesc1New';
         $translationKeys[] = 'PrivacyManager_GdprChecklistDesc2';
+        $translationKeys[] = 'PrivacyManager_GdprChecklistDesc2New';
         $translationKeys[] = 'PrivacyManager_GdprChecklists';
         $translationKeys[] = 'PrivacyManager_GdprOverview';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition1';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition1New';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition2';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition2Detail1';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition2Detail2';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityCondition2New';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityIntro';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityIntroNew';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewApplicabilityOutro';
         $translationKeys[] = 'PrivacyManager_GdprOverviewIntro1';
         $translationKeys[] = 'PrivacyManager_GdprOverviewIntro2';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewIntro3';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewIntro4';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewKeyPoint1';
+        $translationKeys[] = 'PrivacyManager_GdprOverviewMatomoPersonalData';
         $translationKeys[] = 'PrivacyManager_GdprTools';
         $translationKeys[] = 'PrivacyManager_GdprToolsOverviewHint';
         $translationKeys[] = 'PrivacyManager_GdprToolsPageIntro1';
@@ -377,13 +405,20 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'PrivacyManager_HowToObtainValidConsent';
         $translationKeys[] = 'PrivacyManager_IndividualsRights';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsAccess';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsAccessNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsChildren';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsChildrenNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsErasure';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsErasureNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsInform';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsInformNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsIntro';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsObject';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsObjectNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsPortability';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsPortabilityNew';
         $translationKeys[] = 'PrivacyManager_IndividualsRightsRectification';
+        $translationKeys[] = 'PrivacyManager_IndividualsRightsRectificationNew';
         $translationKeys[] = 'PrivacyManager_KeepBasicMetrics';
         $translationKeys[] = 'PrivacyManager_KeepBasicMetricsReportsDetailedInfo';
         $translationKeys[] = 'PrivacyManager_KeepDataFor';

plugins/PrivacyManager/lang/en.json

@@ -86,9 +86,22 @@
         "AwarenessDocumentationDesc3": "Make your team aware that you are using Matomo Analytics and %1$swhat data is being collected by your analytics platform%2$s.",
         "AwarenessDocumentationDesc4": "Document your use of Matomo within your %1$sinformation asset register%2$s.",
         "CurrentDBSize": "Current database size",
+        "DataProcessingAgreement": "Data Processing Agreement",
+        "DataProcessingAgreementIntro1": "The Matomo Cloud Data Processing Agreement (DPA) is incorporated into the Matomo Cloud Terms and Conditions and applies automatically to Matomo Cloud.",
+        "DataProcessingAgreementIntro1Linked": "The %1$sMatomo Cloud Data Processing Agreement (DPA)%2$s is important for businesses established in the territory of a member state of the European Economic Area, the UK or Switzerland or you are otherwise subject to the territorial scope of the General Data Protection Regulation (GDPR).",
+        "DataProcessingAgreementIntro1New": "The Matomo Cloud Data Processing Agreement (DPA) is important for businesses established in the territory of a member state of the European Economic Area, the UK or Switzerland or you are otherwise subject to the territorial scope of the General Data Protection Regulation (GDPR).",
+        "DataProcessingAgreementIntro2": "We do not act as processors for self-hosted Matomo On-Premise instances and for this reason the DPA does not apply.",
+        "DataProcessingAgreementIntro2Linked": "Our %1$sDPA%2$s is incorporated into our %3$sMatomo Cloud Terms and Conditions%4$s and applies to you automatically. As you have entered into a direct customer contract with us to use the Matomo Analytics Cloud, nothing further needs to be signed or done.",
+        "DataProcessingAgreementIntro2New": "Our DPA is incorporated into our Matomo Cloud Terms and Conditions and applies to you automatically. As you have entered into a direct customer contract with us to use the Matomo Analytics Cloud, nothing further needs to be signed or done.",
         "DataRetention": "Data retention",
         "DataRetentionInMatomo": "Data retention for data stored in Matomo:",
         "DataRetentionOverall": "The overall data retention rate for your privacy policy is the raw data retention rate. Please note that aggregated reports may contain personal data as well. If you are using features like User ID, Custom Variables, Custom Dimension, or track personal data in other ways such as events, page URLs or page titles, etc, then the overall data retention rate for your privacy policy is the higher of the two.",
+        "DataRetentionRawDataDeletedAfterBold": "all visits and actions raw data are deleted after %1$s.",
+        "DataRetentionRawDataDeletedAfter": "All visits and actions raw data are deleted after %1$s.",
+        "DataRetentionRawDataNeverDeleted": "All visits and actions raw data are never deleted.",
+        "DataRetentionReportsDeletedAfter": "Aggregated reports are deleted after %1$s.",
+        "DataRetentionReportsNeverDeletedBold": "aggregated reports are %1$s deleted.",
+        "DataRetentionReportsNeverDeleted": "Aggregated reports are never deleted.",
         "RawDataRemovedAfter": "all visits and actions raw data are deleted after %1$s.",
         "RawDataNeverRemoved": "visits and actions raw data are <strong>never</strong> deleted.",
         "ReportsRemovedAfter": "all aggregated reports are deleted after %1$s.",
@@ -135,21 +148,43 @@
         "GdprManager": "GDPR Manager",
         "GdprChecklists": "GDPR checklists",
         "GdprChecklistDesc1": "If you are processing personal data of European citizens through Matomo, even if your company is located outside Europe, you need to fulfill GDPR obligations and this guide will help you.",
-        "GdprChecklistDesc2": "Find below our tools that let you exercise your users’ rights easily, and the list of actions to take in order to make your use of Matomo compliant with the GDPR and safeguard your data. Visit our %1$sGDPR User guide%2$s to learn even more.",
+        "GdprChecklistDesc1New": "If you are processing personal data of European citizens through Matomo, even if your company is located outside Europe, you need to fulfil GDPR obligations and this guide will help you.",
+        "GdprChecklistDesc2": "Find below our tools that let you exercise your users’ rights easily, and the list of actions to take to make your use of Matomo compliant with the GDPR and safeguard your data. Visit our %1$sGDPR User guide%2$s to learn even more.",
+        "GdprChecklistDesc2New": "Find below our tools that let you exercise your users’ rights easily, and the list of actions to take to make your use of Matomo compliant with the GDPR and safeguard your data. Visit our %1$sGDPR User guide%2$s to learn even more.",
         "GdprOverview": "GDPR Overview",
         "GdprOverviewIntro1": "The General Data Protection Regulation (GDPR) is a regulation which strengthens and unifies data protection for all individuals within the European Union (EU).",
+        "GdprOverviewApplicabilityCondition1": "Has a presence in the EU.",
+        "GdprOverviewApplicabilityCondition1New": "Has a presence in the EU (that is any stable setup, like an office or local representative, where data processing happens or decisions about data are made).",
+        "GdprOverviewApplicabilityCondition2": "Targets individuals in the EU by offering goods/services or monitoring behaviour.",
+        "GdprOverviewApplicabilityCondition2Detail1": "Offering goods or services (even for free) specifically to EU residents; or",
+        "GdprOverviewApplicabilityCondition2Detail2": "Tracking or monitoring the behaviour of people while they are in the EU.",
+        "GdprOverviewApplicabilityCondition2New": "Does not have a presence in the EU but targets individuals in the EU by:",
+        "GdprOverviewApplicabilityIntro": "If your Matomo configuration processes personal data, GDPR will apply to your organisation if it:",
+        "GdprOverviewApplicabilityIntroNew": "If your Matomo configuration processes personal data, GDPR will apply to your organisation, if it:",
+        "GdprOverviewApplicabilityOutro": "If no personal data is collected in Matomo, GDPR may not apply to Matomo use, but ePrivacy laws still will.",
         "GdprOverviewIntro2": "If you take steps to ensure no personal data is collected in Matomo, then you may not be concerned by the GDPR for Matomo (if you track no IP addresses, no user IDs, no geolocation data, etc.).",
+        "GdprOverviewIntro3": "GDPR defines personal data broadly, covering any information that can directly or indirectly identify a person.",
+        "GdprOverviewIntro4": "GDPR does not apply to anonymised personal data, but anonymisation threshold is high.",
+        "GdprOverviewKeyPoint1": "The GDPR doesn't just apply to businesses in the EU - it can also affect companies outside the EU in some cases.",
+        "GdprOverviewMatomoPersonalData": "If you are using Matomo, you may be processing various personal data, depending on your configuration.",
         "GdprTools": "GDPR Tools",
         "GetPurgeEstimate": "Get purge estimate",
         "IndividualsRights": "Individuals' rights",
-        "IndividualsRightsIntro": "Exercise the rights of your users with our GDPR-friendly procedures:",
-        "IndividualsRightsInform": "The right to be informed: inform your users with a clear privacy notice.",
         "IndividualsRightsAccess": "The right of access: %1$ssearch for a data subject%2$s and export all of their data.",
+        "IndividualsRightsAccessNew": "The right of access",
+        "IndividualsRightsChildren": "If you offer online services to children and rely on consent to collect information about them, then you may need a parent or guardian’s consent in order to process the children’s personal data lawfully.",
+        "IndividualsRightsChildrenNew": "Parental consent for children where applicable",
         "IndividualsRightsErasure": "The right to erasure: %1$ssearch for a data subject%2$s and delete some or all of their data.",
+        "IndividualsRightsErasureNew": "The right to erasure",
+        "IndividualsRightsInformNew": "The right to be informed",
+        "IndividualsRightsInform": "The right to be informed: inform your users with a clear privacy notice.",
+        "IndividualsRightsIntro": "Exercise the rights of your users with our GDPR-friendly procedures:",
+        "IndividualsRightsObject": "The right to object: %1$slet your users easily opt-out%2$s on your privacy policy page.",
         "IndividualsRightsRectification": "The right to rectification: you can %1$ssearch for a data subject%2$s and delete some or all of their data.",
+        "IndividualsRightsObjectNew": "The right to object",
+        "IndividualsRightsRectificationNew": "The right to rectification",
         "IndividualsRightsPortability": "The right to data portability: %1$ssearch for a data subject%2$s and export all of their data.",
-        "IndividualsRightsObject": "The right to object: %1$slet your users easily opt-out%2$s on your privacy policy page.",
-        "IndividualsRightsChildren": "If you offer online services to children and rely on consent to collect information about them, then you may need a parent or guardian’s consent in order to process the children’s personal data lawfully.",
+        "IndividualsRightsPortabilityNew": "The right to data portability",
         "KeepBasicMetrics": "Keep basic metrics (visits, page views, bounce rate, goal conversions, ecommerce conversions, etc.)",
         "KeepDataFor": "Keep all data for",
         "KeepReportSegments": "For kept data above, also keep segmented reports",