fixing conflicts

This commit is contained in:
Abhinav Adduri 2017-07-19 12:17:24 -07:00
parent 69055a504b
commit 6670d9ad69
4 changed files with 11 additions and 6 deletions

View file

@ -18,6 +18,7 @@ notifyUploadDone = Your upload has finished.
uploadingPageMessage = Once your file uploads you will be able to set expiry options.
uploadingPageCancel = Cancel upload
.title = {uploadingPageCancel}
uploadCancelNotification = Your upload was cancelled.
uploadingPageLargeFileMessage = This file is large and may take awhile to upload. Sit tight!
uploadingFileNotification = Notify me when the upload is complete.