diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
| commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/i18n/en.json | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
| download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip | |
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index e2a02dd6a..fd3c2ef85 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1327,9 +1327,9 @@ "file_attachment.download": "Download", "file_info_preview.size": "Size ", "file_info_preview.type": "File type ", + "file_upload.disabled": "File attachments are disabled.", "file_upload.fileAbove": "File above {max}MB cannot be uploaded: {filename}", "file_upload.filesAbove": "Files above {max}MB cannot be uploaded: {filenames}", - "file_upload.disabled": "File attachments are disabled.", "file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.", "file_upload.pasted": "Image Pasted at ", "filtered_channels_list.count": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}}", |