X-Git-Url: http://git.cyclocoop.org/ecrire?a=blobdiff_plain;f=languages%2Fi18n%2Fen.json;h=8f642681b9ef0bac13a71b0be4dac2206437a4ed;hb=f58fa20d9c4cd46a00b17042ba74fb17110b5125;hp=f2cdbe2dad83107f78da841de8f95901a74f8dbd;hpb=26449f8939a9c1b68523f2bd3bd62b3934de0b6d;p=lhc%2Fweb%2Fwiklou.git diff --git a/languages/i18n/en.json b/languages/i18n/en.json index f2cdbe2dad..8f642681b9 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -43,7 +43,7 @@ "tog-ccmeonemails": "Send me copies of emails I send to other users", "tog-diffonly": "Do not show page content below diffs", "tog-showhiddencats": "Show hidden categories", - "tog-norollbackdiff": "Omit diff after performing a rollback", + "tog-norollbackdiff": "Don't show diff after performing a rollback", "tog-useeditwarning": "Warn me when I leave an edit page with unsaved changes", "tog-prefershttps": "Always use a secure connection when logged in", "underline-always": "Always", @@ -641,6 +641,7 @@ "minoredit": "This is a minor edit", "watchthis": "Watch this page", "savearticle": "Save page", + "publishpage": "Publish page", "preview": "Preview", "showpreview": "Show preview", "showdiff": "Show changes", @@ -679,7 +680,7 @@ "userpage-userdoesnotexist": "User account \"$1\" is not registered.\nPlease check if you want to create/edit this page.", "userpage-userdoesnotexist-view": "User account \"$1\" is not registered.", "blocked-notice-logextract": "This user is currently blocked.\nThe latest block log entry is provided below for reference:", - "clearyourcache": "Note: After saving, you may have to bypass your browser's cache to see the changes.\n* Firefox / Safari: Hold Shift while clicking Reload, or press either Ctrl-F5 or Ctrl-R (⌘-R on a Mac)\n* Google Chrome: Press Ctrl-Shift-R (⌘-Shift-R on a Mac)\n* Internet Explorer: Hold Ctrl while clicking Refresh, or press Ctrl-F5\n* Opera: Clear the cache in Tools → Preferences", + "clearyourcache": "Note: After saving, you may have to bypass your browser's cache to see the changes.\n* Firefox / Safari: Hold Shift while clicking Reload, or press either Ctrl-F5 or Ctrl-R (⌘-R on a Mac)\n* Google Chrome: Press Ctrl-Shift-R (⌘-Shift-R on a Mac)\n* Internet Explorer: Hold Ctrl while clicking Refresh, or press Ctrl-F5\n* Opera: Go to Menu → Settings (Opera → Preferences on a Mac) and then to Privacy & security → Clear browsing data → Cached images and files.", "usercssyoucanpreview": "Tip: Use the \"{{int:showpreview}}\" button to test your new CSS before saving.", "userjsyoucanpreview": "Tip: Use the \"{{int:showpreview}}\" button to test your new JavaScript before saving.", "usercsspreview": "Remember that you are only previewing your user CSS.\nIt has not yet been saved!", @@ -2638,6 +2639,7 @@ "accesskey-ca-nstab-category": "c", "accesskey-minoredit": "i", "accesskey-save": "s", + "accesskey-publish": "s", "accesskey-preview": "p", "accesskey-diff": "v", "accesskey-compareselectedversions": "v", @@ -2708,6 +2710,7 @@ "tooltip-ca-nstab-category": "View the category page", "tooltip-minoredit": "Mark this as a minor edit", "tooltip-save": "Save your changes", + "tooltip-publish": "Publish your changes", "tooltip-preview": "Preview your changes. Please use this before saving.", "tooltip-diff": "Show which changes you made to the text", "tooltip-compareselectedversions": "See the differences between the two selected revisions of this page", @@ -3787,7 +3790,7 @@ "logentry-protect-protect-cascade": "$1 {{GENDER:$2|protected}} $3 $4 [cascading]", "logentry-protect-modify": "$1 {{GENDER:$2|changed}} protection level for $3 $4", "logentry-protect-modify-cascade": "$1 {{GENDER:$2|changed}} protection level for $3 $4 [cascading]", - "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for {{GENDER:$3|$3}} from $4 to $5", + "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for {{GENDER:$6|$3}} from $4 to $5", "logentry-rights-rights-legacy": "$1 {{GENDER:$2|changed}} group membership for $3", "logentry-rights-autopromote": "$1 was automatically {{GENDER:$2|promoted}} from $4 to $5", "logentry-upload-upload": "$1 {{GENDER:$2|uploaded}} $3", @@ -3856,8 +3859,10 @@ "feedback-useragent": "User agent:", "searchsuggest-search": "Search", "searchsuggest-containing": "containing...", + "api-error-autoblocked": "Your IP address has been blocked automatically, because it was used by a blocked user.", "api-error-badaccess-groups": "You are not permitted to upload files to this wiki.", "api-error-badtoken": "Internal error: Bad token.", + "api-error-blocked": "You have been blocked from editing.", "api-error-copyuploaddisabled": "Uploading by URL is disabled on this server.", "api-error-duplicate": "There {{PLURAL:$1|is another file|are some other files}} already on the site with the same content.", "api-error-duplicate-archive": "There {{PLURAL:$1|was another file|were some other files}} already on the site with the same content, but {{PLURAL:$1|it was|they were}} deleted.", @@ -3884,6 +3889,7 @@ "api-error-nomodule": "Internal error: No upload module set.", "api-error-ok-but-empty": "Internal error: No response from server.", "api-error-overwrite": "Overwriting an existing file is not allowed.", + "api-error-ratelimited": "You're trying to upload more files in a short space of time than this wiki allows.\nPlease try again in a few minutes.", "api-error-stashfailed": "Internal error: Server failed to store temporary file.", "api-error-publishfailed": "Internal error: Server failed to publish temporary file.", "api-error-stasherror": "There was an error while uploading the file to stash.",