Merge branch 'MDL-44626-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Dan Poltawski 2016-02-15 10:36:20 +00:00
commit 220f8115d9
4 changed files with 13 additions and 6 deletions

View file

@ -111,7 +111,7 @@ $string['error'] = 'An unknown error occurred!';
$string['errordoublereference'] = 'Unable to overwrite file with a shortcut/alias because shortcuts to this file already exist.';
$string['errornotyourfile'] = 'You cannot pick file which is not added by your';
$string['erroruniquename'] = 'Repository instance name should be unique';
$string['errorpostmaxsize'] = 'The uploaded file may exceed the post_max_size directive in php.ini.';
$string['errorpostmaxsize'] = 'The file you tried to upload is too large for the server to process.';
$string['errorwhilecommunicatingwith'] = 'Error while communicating with the repository \'{$a}\'.';
$string['errorwhiledownload'] = 'An error occurred while downloading the file: {$a}';
$string['existingrepository'] = 'This repository already exists';