[trunk] - language - update zh_CN - 简体中文 - Chinese thanks to Ralph.Bai - feature:2320

git-svn-id: http://piwigo.org/svn/trunk@12274 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 16 insertions, 4 deletions

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 744ba4d64..667a89413 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -844,4 +844,18 @@ $lang['Allowed file types: %s.'] = '可上传的文件类型: %s.';
 $lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = '近乎最大的分辨率: %dM 像素 (that\'s %dx%d pixels).';
 $lang['Manage Permissions'] = '管理证书';
 $lang['Learn more'] = '了解更多';
+$lang['Photo %s of %s'] = ' %s中的%s图片';
+$lang['show details'] = '显示详情';
+$lang['hide details'] = '隐藏详情';
+$lang['Merge tags'] = '合并标签';
+$lang['Select the destination tag'] = '选择目的标签';
+$lang['(this tag will be deleted)'] = '（此标签将被删除）';
+$lang['Confirm merge'] = '确认合并';
+$lang['Merge selected tags'] = '合并已选择的标签';
+$lang['No destination tag selected'] = '没有选中的目的标签';
+$lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = '标签 <em>%s</em> 与标签 <em>%s</em>已合并';
+$lang['Select at least two tags for merging'] = '选择2个以上的标签合并';
+$lang['Select an album'] = '选择一个相册';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = '默认选项中，Piwigo将根据你相册中的高清图片（HD）创建一个新的网页尺寸。';
+$lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = '若无高清图片或当前网页尺寸大于重置标准，Piwigo会自动将其作为高清图片进行尺寸重置。';
 ?>
\ No newline at end of file
diff --git a/language/zh_CN/install.lang.php b/language/zh_CN/install.lang.php
index 5a3ace82d..8ddb1cf4d 100644
--- a/language/zh_CN/install.lang.php
+++ b/language/zh_CN/install.lang.php
@@ -28,13 +28,10 @@ $lang['Database configuration'] = '数据库设置';
 $lang['Admin configuration'] = '管理员帐户设置';
 $lang['Start Install'] = '开始安装';
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = '邮箱地址格式 xxx@yyy.eee (例 : jack@altern.org)';
-
 $lang['Webmaster login'] = '管理员';
 $lang['It will be shown to the visitors. It is necessary for website administration'] = '所有用户都能看到此帐户。必须提供此帐户来管理网站';
-
 $lang['Connection to server succeed, but it was impossible to connect to database'] = '服务器连接正常，但是无法连接到数据库';
 $lang['Can\'t connect to server'] = '无法连接到服务器';
-
 $lang['Host'] = 'MySQL主机地址';
 $lang['localhost, sql.multimania.com, toto.freesurf.fr'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['User'] = '用户';
@@ -55,7 +52,6 @@ $lang['verification'] = '核实';
 $lang['Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'] = '需要帮助？ 请到<a href="%s">Piwigo论坛</a>提出你的问题.';
 $lang['Webmaster mail address'] = '管理员Email地址';
 $lang['Visitors will be able to contact site administrator with this mail'] = '游客通过此Email跟你联系';
-
 $lang['PHP 5 is required'] = '必须PHP 5版本';
 $lang['It appears your webhost is currently running PHP %s.'] = '你主机PHP版本好像是PHP %s.';
 $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo试着创建或修改.htaccess文件来转换到PHP 5。';
@@ -70,4 +66,6 @@ $lang['An alternate solution is to copy the text in the box above and paste it i
 $lang['Creation of config file local/config/database.inc.php failed.'] = '创建 local/config/database.inc.php 文件失败.';
 $lang['Download the config file'] = '下载配置文件';
 $lang['You can download the config file and upload it to local/config directory of your installation.'] = '您可以下载配置文件，然后上传到 local/config 目录以完成您的安装.';
+$lang['Welcome to my photo gallery'] = '欢迎来到我的相册';
+$lang['Just another Piwigo gallery'] = '另一个崭新的Piwigo相册';
 ?>
\ No newline at end of file