From: jenkins-bot Date: Thu, 19 Jun 2014 12:16:26 +0000 (+0000) Subject: Merge "Clarify fileexists-extension message" X-Git-Tag: 1.31.0-rc.0~15336 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=2a18dbc731aeeb061a1edcbbc411d1e255b41db4;p=lhc%2Fweb%2Fwiklou.git Merge "Clarify fileexists-extension message" --- 2a18dbc731aeeb061a1edcbbc411d1e255b41db4 diff --cc languages/i18n/en.json index 5d8cd9a990,e4a7afd05a..34c663879e --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -1303,9 -1302,9 +1303,9 @@@ "largefileserver": "This file is bigger than the server is configured to allow.", "emptyfile": "The file you uploaded seems to be empty.\nThis might be due to a typo in the filename.\nPlease check whether you really want to upload this file.", "windows-nonascii-filename": "This wiki does not support filenames with special characters.", - "fileexists": "A file with this name exists already, please check [[:$1]] if you are not sure if you want to change it.\n[[$1|thumb]]", + "fileexists": "A file with this name exists already, please check [[:$1]] if {{GENDER:|you}} are not sure if you want to change it.\n[[$1|thumb]]", "filepageexists": "The description page for this file has already been created at [[:$1]], but no file with this name currently exists.\nThe summary you enter will not appear on the description page.\nTo make your summary appear there, you will need to manually edit it.\n[[$1|thumb]]", - "fileexists-extension": "A file with a similar name exists: [[$2|thumb]]\n* Name of the uploading file: [[:$1]]\n* Name of the existing file: [[:$2]]\nPlease choose a different name.", + "fileexists-extension": "A file with a similar name exists: [[$2|thumb]]\n* Name of the uploading file: [[:$1]]\n* Name of the existing file: [[:$2]]\nDo you perhaps want to use a more distinctive name?", "fileexists-thumbnail-yes": "The file seems to be an image of reduced size (thumbnail).\n[[$1|thumb]]\nPlease check the file [[:$1]].\nIf the checked file is the same image of original size it is not necessary to upload an extra thumbnail.", "file-thumbnail-no": "The filename begins with $1.\nIt seems to be an image of reduced size (thumbnail).\nIf you have this image in full resolution upload this one, otherwise change the filename please.", "fileexists-forbidden": "A file with this name already exists, and cannot be overwritten.\nIf you still want to upload your file, please go back and use a new name.\n[[File:$1|thumb|center|$1]]",