Merge branch 'master' of https://github.com/NodeBB/NodeBB

CHANGELOG.md

@@ -1,3 +1,25 @@
+#### v1.15.0-rc.2 (2020-10-27)
+
+##### Chores
+
+*  incrementing version number - v1.15.0-rc.2 (7c084134)
+*  update changelog for v1.15.0-rc.1 (4f49b3da)
+* **deps:**  update dependency eslint to v7.12.0 (#8791) (3108f628)
+
+##### New Features
+
+*  add filter:category.getFields (88a07e69)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency nodebb-theme-persona to v10.2.62 (#8798) (12c590ad)
+  *  update dependency nodebb-plugin-mentions to v2.13.1 (#8790) (8353857b)
+
+##### Performance Improvements
+
+*  reorder async calls (93bdfe2f)
+
 #### v1.15.0-rc.1 (2020-10-26)
 
 ##### Chores

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.15.0-rc.1",
+    "version": "1.15.0-rc.2",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",

public/language/he/user.json

@@ -8,12 +8,12 @@
     "email": "כתובת אימייל",
     "confirm_email": "אשר מייל",
     "account_info": "פרטי חשבון",
-    "admin_actions_label": "Administrative Actions",
+    "admin_actions_label": "פעולות ניהוליות",
     "ban_account": "הרחק חשבון",
     "ban_account_confirm": "אתה בטוח שברצונך להרחיק את המשתמש הזה?",
     "unban_account": "בטל את הרחקת החשבון",
     "delete_account": "מחק חשבון",
-    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_account_as_admin": "מחק <strong>חשבון</strong>",
     "delete_content": "Delete Account <strong>Content</strong>",
     "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
     "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",