Merged release-3.2 into master

webapp/i18n/en.json

@@ -286,13 +286,13 @@
   "admin.image.previewHeightTitle": "Image Preview Height:",
   "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
   "admin.image.previewWidthExample": "Ex \"1024\"",
-  "admin.image.previewWidthTitle": "Profile Picture Width:",
+  "admin.image.previewWidthTitle": "Image Preview Width:",
   "admin.image.profileHeightDescription": "Height of profile picture.",
   "admin.image.profileHeightExample": "Ex \"0\"",
   "admin.image.profileHeightTitle": "Profile Picture Height:",
   "admin.image.profileWidthDescription": "Width of profile picture.",
   "admin.image.profileWidthExample": "Ex \"1024\"",
-  "admin.image.profileWidthTitle": "Image Preview Width:",
+  "admin.image.profileWidthTitle": "Profile Picture Width:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Public Link Salt:",