| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -327,17 +327,6 @@ |
| 328 | 328 | 'anonnotice', |
| 329 | 329 | 'newsectionheaderdefaultlevel', |
| 330 | 330 | 'red-link-title', |
| 331 | | - 'img-auth-accessdenied', |
| 332 | | - 'img-auth-desc', |
| 333 | | - 'img-auth-nopathinfo', |
| 334 | | - 'img-auth-notindir', |
| 335 | | - 'img-auth-badtitle', |
| 336 | | - 'img-auth-nologinnWL', |
| 337 | | - 'img-auth-nofile', |
| 338 | | - 'img-auth-isdir', |
| 339 | | - 'img-auth-streaming', |
| 340 | | - 'img-auth-public', |
| 341 | | - 'img-auth-noread', |
| 342 | 331 | ), |
| 343 | 332 | 'nstab' => array( |
| 344 | 333 | 'nstab-main', |
| — | — | @@ -1292,6 +1281,19 @@ |
| 1293 | 1282 | 'upload-unknown-size', |
| 1294 | 1283 | 'upload-http-error', |
| 1295 | 1284 | ), |
| | 1285 | + 'img-auth' => array( |
| | 1286 | + 'img-auth-accessdenied', |
| | 1287 | + 'img-auth-desc', |
| | 1288 | + 'img-auth-nopathinfo', |
| | 1289 | + 'img-auth-notindir', |
| | 1290 | + 'img-auth-badtitle', |
| | 1291 | + 'img-auth-nologinnWL', |
| | 1292 | + 'img-auth-nofile', |
| | 1293 | + 'img-auth-isdir', |
| | 1294 | + 'img-auth-streaming', |
| | 1295 | + 'img-auth-public', |
| | 1296 | + 'img-auth-noread', |
| | 1297 | + ), |
| 1296 | 1298 | 'upload-curl-errors' => array( |
| 1297 | 1299 | 'upload-curl-error6', |
| 1298 | 1300 | 'upload-curl-error6-text', |
| — | — | @@ -3180,6 +3182,7 @@ |
| 3181 | 3183 | 'recentchangeslinked' => 'Recent changes linked', |
| 3182 | 3184 | 'upload' => 'Upload', |
| 3183 | 3185 | 'upload-errors' => '', |
| | 3186 | + 'img-auth' => 'img_auth script messages', |
| 3184 | 3187 | 'upload-curl-errors' => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>', |
| 3185 | 3188 | 'licenses' => '', |
| 3186 | 3189 | 'filelist' => 'Special:ListFiles', |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1519,6 +1519,19 @@ |
| 1520 | 1520 | |
| 1521 | 1521 | 'upload-file-error' => '{{Identical|Internal error}}', |
| 1522 | 1522 | |
| | 1523 | +# img_auth script messages |
| | 1524 | +'img-auth-accessdenied' => '[[Manual:Image Authorization]] Access Denied', |
| | 1525 | +'img-auth-desc' => '[[Manual:Image Authorization]] script, see http://www.mediawiki.org/wiki/Manual:Image_Authorization', |
| | 1526 | +'img-auth-nopathinfo' => '[[Manual:Image Authorization]] Missing PATH_INFO - see english description', |
| | 1527 | +'img-auth-notindir' => '[[Manual:Image Authorization]] when the specified path is not in upload directory.', |
| | 1528 | +'img-auth-badtitle' => '[[Manual:Image Authorization]] bad title, $1 is the invalid title', |
| | 1529 | +'img-auth-nologinnWL' => '[[Manual:Image Authorization]] logged in and file not whitelisted. $1 is the file not in whitelist.', |
| | 1530 | +'img-auth-nofile' => '[[Manual:Image Authorization]] non existent file, $1 is the file that does not exist.', |
| | 1531 | +'img-auth-isdir' => '[[Manual:Image Authorization]] trying to access a directory instead of a file, $1 is the directory.', |
| | 1532 | +'img-auth-streaming' => '[[Manual:Image Authorization]] is now streaming file specified by $1.', |
| | 1533 | +'img-auth-public' => '[[Manual:Image Authorization]] an error message when the admin has configured the wiki to be a public wiki, but is using img_auth script - normally this is a configuration error, except when special restriction extensions are used', |
| | 1534 | +'img-auth-noread' => '[[Manual:Image Authorization]] User does not have access to read file, $1 is the file', |
| | 1535 | + |
| 1523 | 1536 | 'license' => 'This appears in the upload form for the license drop-down. The header in the file description page is now at {{msg-mw|License-header}}.', |
| 1524 | 1537 | 'nolicense' => '{{Identical|None selected}}', |
| 1525 | 1538 | 'license-nopreview' => 'Error message when a certain license does not exist', |
| — | — | @@ -2641,19 +2654,6 @@ |
| 2642 | 2655 | * $1 is a date (example: ''19 March 2008'') |
| 2643 | 2656 | * $2 is a time (example: ''12:15'')", |
| 2644 | 2657 | |
| 2645 | | -#img_auth script messages |
| 2646 | | -'img-auth-desc' => '[[Manual:Image Authorization]] script, see http://www.mediawiki.org/wiki/Manual:Image_Authorization', |
| 2647 | | -'img-auth-accessdenied' => "[[Manual:Image Authorization]] Access Denied", |
| 2648 | | -'img-auth-nopathinfo' => "[[Manual:Image Authorization]] Missing PATH_INFO - see english description", |
| 2649 | | -'img-auth-notindir' => "[[Manual:Image Authorization]] when the specified path is not in upload directory.", |
| 2650 | | -'img-auth-badtitle' => "[[Manual:Image Authorization]] bad title, $1 is the invalid title", |
| 2651 | | -'img-auth-nologinnWL' => "[[Manual:Image Authorization]] logged in and file not whitelisted. $1 is the file not in whitelist.", |
| 2652 | | -'img-auth-nofile' => "[[Manual:Image Authorization]] non existent file, $1 is the file that does not exist.", |
| 2653 | | -'img-auth-isdir' => "[[Manual:Image Authorization]] trying to access a directory instead of a file, $1 is the directory.", |
| 2654 | | -'img-auth-streaming' => "[[Manual:Image Authorization]] is now streaming file specified by $1.", |
| 2655 | | -'img-auth-public' => "[[Manual:Image Authorization]] an error message when the admin has configured the wiki to be a public wiki, but is using img_auth script - normally this is a configuration error, except when special restriction extensions are used", |
| 2656 | | -'img-auth-noread' => "[[Manual:Image Authorization]] User does not have access to read file, $1 is the file", |
| 2657 | | - |
| 2658 | 2658 | # Video information, used by Language::formatTimePeriod() to format lengths in the above messages |
| 2659 | 2659 | 'seconds-abbrev' => '{{optional}}', |
| 2660 | 2660 | 'minutes-abbrev' => '{{optional}}', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2144,18 +2144,24 @@ |
| 2145 | 2145 | 'upload-unknown-size' => 'Unknown size', |
| 2146 | 2146 | 'upload-http-error' => 'An HTTP error occured: $1', |
| 2147 | 2147 | |
| 2148 | | -#img_auth script messages |
| 2149 | | -'img-auth-accessdenied' => "Access Denied", |
| 2150 | | -'img-auth-desc' => 'Image authorisation script', |
| 2151 | | -'img-auth-nopathinfo' => "Missing PATH_INFO. Your server is not set up to pass this information - may be CGI-based and can't support img_auth. See http://www.mediawiki.org/wiki/Manual:Image_Authorization.", |
| 2152 | | -'img-auth-notindir' => "Requested path is not in the configured upload directory.", |
| 2153 | | -'img-auth-badtitle' => "Unable to construct a valid title from `$1`.", |
| 2154 | | -'img-auth-nologinnWL' => "You are not logged in and `$1` not in whitelist.", |
| 2155 | | -'img-auth-nofile' => "File `$1` does not exist.", |
| 2156 | | -'img-auth-isdir' => "you are trying to access a directory`$1`. Only file access is allowed.", |
| 2157 | | -'img-auth-streaming' => "Streaming `$1`.", |
| 2158 | | -'img-auth-public' => "The function of img_auth.php is to output files from a private wiki. This wiki is configured as a public wiki. For optimal security, img_auth.php is disabled for this case.", |
| 2159 | | -'img-auth-noread' => "User does not have access to read `$1`.", |
| | 2148 | +# img_auth script messages |
| | 2149 | +'img-auth-accessdenied' => 'Access Denied', |
| | 2150 | +'img-auth-desc' => 'Image authorisation script', |
| | 2151 | +'img-auth-nopathinfo' => 'Missing PATH_INFO. |
| | 2152 | +Your server is not set up to pass this information. |
| | 2153 | +It may be CGI-based and cannot support img_auth. |
| | 2154 | +See http://www.mediawiki.org/wiki/Manual:Image_Authorization.', |
| | 2155 | +'img-auth-notindir' => 'Requested path is not in the configured upload directory.', |
| | 2156 | +'img-auth-badtitle' => 'Unable to construct a valid title from `$1`.', |
| | 2157 | +'img-auth-nologinnWL' => 'You are not logged in and `$1` not in whitelist.', |
| | 2158 | +'img-auth-nofile' => 'File `$1` does not exist.', |
| | 2159 | +'img-auth-isdir' => 'You are trying to access a directory "$1". |
| | 2160 | +Only file access is allowed.', |
| | 2161 | +'img-auth-streaming' => 'Streaming "$1".', |
| | 2162 | +'img-auth-public' => 'The function of img_auth.php is to output files from a private wiki. |
| | 2163 | +This wiki is configured as a public wiki. |
| | 2164 | +For optimal security, img_auth.php is disabled.', |
| | 2165 | +'img-auth-noread' => 'User does not have access to read "$1".', |
| 2160 | 2166 | |
| 2161 | 2167 | # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html> |
| 2162 | 2168 | 'upload-curl-error6' => 'Could not reach URL', |