Merge "replacing "images" by "files" in listfiles-show-all for consistency"

[lhc/web/wiklou.git] / languages / i18n / en.json

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5dd8345..75e0c5c 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1063,6 +1063,7 @@
        "timezoneregion-indian": "Indian Ocean",
        "timezoneregion-pacific": "Pacific Ocean",
        "allowemail": "Enable email from other users",
+       "email-blacklist-label": "Prohibit these users from sending emails to me:",
        "prefs-searchoptions": "Search",
        "prefs-namespaces": "Namespaces",
        "default": "default",
@@ -1533,6 +1534,7 @@
        "uploadbtn": "Upload file",
        "reuploaddesc": "Cancel upload and return to the upload form",
        "upload-tryagain": "Submit modified file description",
+       "upload-tryagain-nostash": "Submit re-uploaded file and modified description",
        "uploadnologin": "Not logged in",
        "uploadnologintext": "Please $1 to upload files.",
        "upload_directory_missing": "The upload directory ($1) is missing and could not be created by the webserver.",
@@ -1595,6 +1597,7 @@
        "file-deleted-duplicate-notitle": "A file identical to this file has previously been deleted, and the title has been suppressed.\nYou should ask someone with the ability to view suppressed file data to review the situation before proceeding to re-upload it.",
        "uploadwarning": "Upload warning",
        "uploadwarning-text": "Please modify the file description below and try again.",
+       "uploadwarning-text-nostash": "Please re-upload the file, modify the description below and try again.",
        "savefile": "Save file",
        "uploadedimage": "uploaded \"[[$1]]\"",
        "overwroteimage": "uploaded a new version of \"[[$1]]\"",
@@ -1760,7 +1763,7 @@
        "listfiles_size": "Size",
        "listfiles_description": "Description",
        "listfiles_count": "Versions",
-       "listfiles-show-all": "Include old versions of images",
+       "listfiles-show-all": "Include old versions of files",
        "listfiles-latestversion": "Current version",
        "listfiles-latestversion-yes": "Yes",
        "listfiles-latestversion-no": "No",