Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 01:34:31 +0000 (09:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 01:34:31 +0000 (09:34 +0800)
Conflicts:
lang/en/moodle.php

1  2 
lang/en/admin.php
mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php

Simple merge
@@@ -86,7 -86,6 +86,7 @@@ $string['test_ok'] = 'The ghostscript p
  $string['toolbarbutton'] = '{$a->tool} {$a->shortcut}';
  $string['tool'] = 'Tool';
  $string['unsavedchanges'] = 'Unsaved changes';
- $string['viewfeedbackonline'] = 'View annotated pdf...';
+ $string['viewfeedbackonline'] = 'View annotated PDF...';
  $string['white'] = 'White';
  $string['yellow'] = 'Yellow';
 +$string['zlibnotavailable'] = 'Php extension "zlib" is not available. The annotate PDF feature relies on this php extension and will be disabled until zlib is installed and enabled.';