From 690d2c69a32f38c29f7bd86ffc8026450b6ad5e5 Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Fri, 25 Dec 2015 00:04:23 +0800
Subject: [PATCH 1/4] Automatically generated installer lang files

---
 install/lang/zh_cn/error.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/lang/zh_cn/error.php b/install/lang/zh_cn/error.php
index 2e53dac19fd..1663ed5afc4 100644
--- a/install/lang/zh_cn/error.php
+++ b/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 文件名。';

From 012f8507339624b54b7810ec2f857cf45b314b71 Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Mon, 28 Dec 2015 00:04:28 +0800
Subject: [PATCH 2/4] Automatically generated installer lang files

---
 install/lang/nl/moodle.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/lang/nl/moodle.php b/install/lang/nl/moodle.php
index 53cc6ea589e..d73597dac7c 100644
--- a/install/lang/nl/moodle.php
+++ b/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';

From 1d9671821446c231670702e531f868a8a0c80fe1 Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Tue, 29 Dec 2015 00:04:16 +0800
Subject: [PATCH 3/4] Automatically generated installer lang files

---
 install/lang/es/moodle.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/lang/es/moodle.php b/install/lang/es/moodle.php
index 2b6d46e9bc0..815b27eaa75 100644
--- a/install/lang/es/moodle.php
+++ b/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';

From 80ea373e2cf0ec6622626501455d7d46d7dcd71b Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Wed, 30 Dec 2015 00:04:16 +0800
Subject: [PATCH 4/4] Automatically generated installer lang files

---
 install/lang/pt_br/moodle.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/lang/pt_br/moodle.php b/install/lang/pt_br/moodle.php
index e8ec5d9359d..cc92dabbc4a 100644
--- a/install/lang/pt_br/moodle.php
+++ b/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';