Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

i18n/en.json

@@ -3790,10 +3790,6 @@
     "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
     "translation": "Invalid Comment Trigger Notify Prop for user."
   },
-  {
-    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
-    "translation": "Invalid Desktop Duration Notify Prop value for user."
-  },
   {
     "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
     "translation": "Invalid Desktop Notify Prop value for user."