Merge remote-tracking branch 'origin/develop' into develop

src/components/views/elements/AppPermission.js

@@ -52,6 +52,10 @@ export default class AppPermission extends React.Component {
             e2eWarningText =
                 <span className='mx_AppPermissionWarningTextLabel'>{ _t('NOTE: Apps are not end-to-end encrypted') }</span>;
         }
+        const cookieWarning =
+            <span className='mx_AppPermissionWarningTextLabel'>
+                { _t('Warning: This widget might use cookies.') }
+            </span>;
         return (
             <div className='mx_AppPermissionWarning'>
                 <div className='mx_AppPermissionWarningImage'>
@@ -60,6 +64,7 @@ export default class AppPermission extends React.Component {
                 <div className='mx_AppPermissionWarningText'>
                     <span className='mx_AppPermissionWarningTextLabel'>{ _t('Do you want to load widget from URL:') }</span> <span className='mx_AppPermissionWarningTextURL'>{ this.state.curlBase }</span>
                     { e2eWarningText }
+                    { cookieWarning }
                 </div>
                 <input
                     className='mx_AppPermissionButton'

src/i18n/strings/en_EN.json

@@ -653,6 +653,7 @@
     "Warning": "Warning",
     "Unknown Address": "Unknown Address",
     "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
+    "Warning: This widget might use cookies.": "Warning: This widget might use cookies.",
     "Do you want to load widget from URL:": "Do you want to load widget from URL:",
     "Allow": "Allow",
     "Delete Widget": "Delete Widget",