Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2012-04-27 03:15:51 +02:00
commit 7c0d3f4c1d
2 changed files with 2 additions and 2 deletions

View file

@ -68,7 +68,7 @@ if (!empty($blogs)) {
$table = new html_table();
$table->cellpadding = 4;
$table->attributes['class'] = 'generaltable boxaligncenter';
$table->head = array(get_string('name'), get_string('url'), get_string('timefetched', 'blog'), get_string('valid', 'blog'), get_string('actions'));
$table->head = array(get_string('name'), get_string('url', 'blog'), get_string('timefetched', 'blog'), get_string('valid', 'blog'), get_string('actions'));
foreach ($blogs as $blog) {
if ($blog->failedlastsync) {

View file

@ -154,7 +154,7 @@ $string['tagtext'] = 'Tag text';
$string['timefetched'] = 'Time of last sync';
$string['timewithin'] = 'Display tags used within this many days';
$string['updateentrywithid'] = 'Updating entry';
$string['url'] = 'URL';
$string['url'] = 'RSS feed URL';
$string['url_help'] = 'Enter the RSS feed URL for your external blog.';
$string['useblogassociations'] = 'Enable blog associations';
$string['useexternalblogs'] = 'Enable external blogs';