Merge branch 'dev' of https://github.com/abpframework/abp into dev

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -30,6 +30,8 @@
     "UserNameNotFound": "There is no user with username {0}",
     "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!",
     "MyProfile": "My profile",
-    "EmailNotValid": "Please enter a valid email address."
+    "EmailNotValid": "Please enter a valid email address.",
+    "JoinOurMarketingNewsletter": "Join our marketing newsletter",
+    "WouldLikeToReceiveMarketingMaterials": "I would like to receive marketing materials like product deals & special offers."
    }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@@ -96,9 +96,9 @@
     "NoThanks": "No, thanks",
     "MaybeLater": "Maybe later",
     "JoinOurArticleNewsletter": "Join our article newsletter",
-    "JoinOurMarketingNewsletter": "Join our marketing newsletter",
     "Community": "Community",
     "Marketing": "Marketing",
-    "ArticleAssignMessage": "Want to write this article? Click here to"
+    "ArticleAssignMessage": "Want to write this article? Click here to",
+    "CommunityPrivacyPolicyConfirmation": "I agree to the Terms & Conditions and <a href=\"https://commercial.abp.io/Privacy\">Privacy Policy</a>."
   }
 }