diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-12 10:52:43 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-12 10:52:43 -0400 |
| commit | 954e251188621563b3b10218f4072cc358149e84 (patch) | |
| tree | 0fa41b4ecc7dcd5e9e73062ad6ebc7edd5343da0 /webapp/i18n | |
| parent | ad343a0f4ad175053f7d0da12a0587bcbb396d1c (diff) | |
| parent | c377605906fc7eeb9dcaf75e66732efd3b4fe7fc (diff) | |
| download | chat-954e251188621563b3b10218f4072cc358149e84.tar.gz chat-954e251188621563b3b10218f4072cc358149e84.tar.bz2 chat-954e251188621563b3b10218f4072cc358149e84.zip | |
Merged release-3.2 into master
Diffstat (limited to 'webapp/i18n')
| -rw-r--r-- | webapp/i18n/en.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index eeb1572f8..f000dbf55 100644 --- a/webapp/i18n/en.json +++ b/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:", |