Merge branch 'install_29_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_29_STABLE

install/lang/es/moodle.php

@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Idioma';
+$string['moodlelogo'] = 'Logo de Moodle';
 $string['next'] = 'Siguiente';
 $string['previous'] = 'Anterior';
 $string['reload'] = 'Recargar';

install/lang/nl/moodle.php

@@ -31,6 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Taal';
+$string['moodlelogo'] = 'Moodle logo';
 $string['next'] = 'Volgende';
 $string['previous'] = 'Vorige';
 $string['reload'] = 'Opnieuw laden';

install/lang/pt_br/moodle.php

@@ -31,7 +31,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['language'] = 'Idioma';
-$string['moodlelogo'] = 'logotipo Moodle';
+$string['moodlelogo'] = 'Logotipo Moodle';
 $string['next'] = 'Próximo';
 $string['previous'] = 'Anterior';
 $string['reload'] = 'Recarregar';

install/lang/zh_cn/error.php

@@ -39,10 +39,11 @@ $string['cannotsavemd5file'] = '无法保存 md5 文件';
 $string['cannotsavezipfile'] = '无法保存 ZIP 文件';
 $string['cannotunzipfile'] = '无法解压文件';
 $string['componentisuptodate'] = '组件已经是最新的了';
+$string['dmlexceptiononinstall'] = '<p>发生了一个数据库错误[{$a->errorcode}].<br />{$a->debuginfo}</p>';
 $string['downloadedfilecheckfailed'] = '下载文件检查失败';
 $string['invalidmd5'] = '无效的 md5';
 $string['missingrequiredfield'] = '缺少了必需的字段';
-$string['remotedownloaderror'] = '下载组件至服务器失败，请校验代理设置，推荐安装 PHP cURL 扩展。<br /><br />您必须手动下载下载<a href="{$a->url}">{$a->url}</a> ，拷贝至服务器上的“{$a->dest}”并解压至此。';
+$string['remotedownloaderror'] = '<p>下载组件至服务器失败，请校验代理设置，推荐安装 PHP cURL 扩展。</p> <p>您必须手动下载下载<a href="{$a->url}">{$a->url}</a> ，拷贝至服务器上的“{$a->dest}”并解压至此。</p>';
 $string['wrongdestpath'] = '错误的目标路径';
 $string['wrongsourcebase'] = '错误的源 URL 基地址。';
 $string['wrongzipfilename'] = '错误的 ZIP 文件名。';