Merge branch 'tippy-prune' into staging

www/common/translations/messages.json

@@ -73,6 +73,7 @@
     "upgrade": "Upgrade",
     "upgradeTitle": "Upgrade your account to increase the storage limit",
     "upgradeAccount": "Upgrade account",
+    "storageStatus": "Storage:<br /><b>{0}</b> used out of <b>{1}</b>",
     "MB": "MB",
     "GB": "GB",
     "KB": "KB",
@@ -380,7 +381,7 @@
     "fm_tags_used": "Number of uses",
     "fm_restoreDrive": "Resetting your drive to an earlier state. For best results, avoid making changes to your drive until this process is complete.",
     "fm_moveNestedSF": "You can't place one shared folder within another. The folder {0} was not moved.",
-    "fm_passwordProtected": "This document is protected with a password",
+    "fm_passwordProtected": "Password protected",
     "fc_newfolder": "New folder",
     "fc_newsharedfolder": "New shared folder",
     "fc_rename": "Rename",
@@ -1027,7 +1028,7 @@
     "crowdfunding_popup_never": "Don't ask me again",
     "survey": "CryptPad survey",
     "markdown_toc": "Contents",
-    "fm_expirablePad": "This pad will expire on {0}",
+    "fm_expirablePad": "Expires: {0}",
     "admin_authError": "Only administrators can access this page",
     "admin_cat_general": "General",
     "admin_cat_stats": "Statistics",