From f0d29d9134193be7fe708b6a2f54f80eeb9e77bf Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 3 May 2016 15:55:16 +0200
Subject: cherry-pick 50 commits from translation

git log --reverse --oneline  translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 | bash
---
 language/zh_CN/admin.lang.php           | 17 ++++++--
 language/zh_CN/help/photos_add_ftp.html | 77 +++++++++++++--------------------
 2 files changed, 42 insertions(+), 52 deletions(-)

(limited to 'language/zh_CN')

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 347c48a49..92a4f66fc 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -669,7 +669,7 @@ $lang['Apply action'] = '执行操作';
 $lang['automatic order'] = '自动排序';
 $lang['Batch Manager'] = '批量管理';
 $lang['Choose an action'] = '选择一项操作';
-$lang['Delete orphan tags'] = '删除未被关联的标签';
+$lang['Delete orphan tags'] = '删除未关联任何图片的标签';
 $lang['delete photo'] = '删除图片';
 $lang['Duplicates'] = '副本';
 $lang['include child albums'] = '包含子相册';
@@ -678,7 +678,7 @@ $lang['No photo in the current set.'] = '当前集合没有图片。';
 $lang['No photo selected, %d photos in current set'] = '没有图片被选中，当前集合中有 %d 张图片';
 $lang['No photo selected, no action possible.'] = '没有图片被选中，不能执行任何操作。';
 $lang['on the %d selected photos'] = '于此 %d 张所选图片';
-$lang['Orphan tags deleted'] = '无关联图片的标签已被删除';
+$lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除';
 $lang['Refresh photo set'] = '刷新图片集';
 $lang['Remove all filters'] = '删除所有过滤器';
 $lang['remove author'] = '删除作者';
@@ -694,7 +694,7 @@ $lang['The whole set'] = '整个集合';
 $lang['Type here the author name'] = '在此输入作者名称';
 $lang['Type here the title'] = '在此输入标题';
 $lang['Week starts on'] = '星期起始于';
-$lang['You have %d orphan tags: %s.'] = '您有 %d 个无关联图片的标签：%s。';
+$lang['You have %d orphan tags: %s.'] = '您有 %d 个未关联任何图片的标签：%s。';
 $lang['Remove from caddie'] = '从标记图片库中移除';
 $lang['Themes which need upgrade'] = '需更新的主题';
 $lang['Languages which need upgrade'] = '需要更新的语言';
@@ -987,4 +987,13 @@ $lang['between %s and %s MB'] = '在 %s 和 %s MB 之间';
 $lang['date & time'] = '日期与时间';
 $lang['file name'] = '文件名';
 $lang['width & height'] = '宽度&高度';
-$lang['Upload in progress'] = '正在上传';
\ No newline at end of file
+$lang['Upload in progress'] = '正在上传';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封发出的email中的链接将包含自动生成的唯一验证密钥，有效期 %s。';
+$lang['For security reason, authentication keys do not work for administrators.'] = '出于安全原因，验证密钥对管理员不起作用。';
+$lang['Edit user'] = '编辑用户';
+$lang['No recipient selected'] = '未选择收件人';
+$lang['No user is permitted to see this private album'] = '没有用户被允许查看该非公开相册';
+$lang['Recipients'] = '收件人';
+$lang['Y Repeat'] = 'Y轴平铺';
+$lang['Delete %d orphan photos'] = '删除 %d 没有任何关联的图片';
+$lang['Orphans'] = '没有任何关联';
\ No newline at end of file
diff --git a/language/zh_CN/help/photos_add_ftp.html b/language/zh_CN/help/photos_add_ftp.html
index eb2231ab7..1702be851 100644
--- a/language/zh_CN/help/photos_add_ftp.html
+++ b/language/zh_CN/help/photos_add_ftp.html
@@ -25,38 +25,33 @@
     <p>相册文件夹均放在 Piwigo 的 "galleries" 文件夹里。以下的文件夹树里有一个很小的相册（但使用了很多功能）：</p>
 
     <pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool</pre>
+galleries
+|-- wedding
+|   |-- celebration
+|   |   |-- arrival
+|   |   |   |-- paul-alone.jpg
+|   |   |   +-- sarah-alone.jpg
+|   |   +-- departure
+|   |       +-- paul-and-sarah.jpg
+|   +-- party
+|       |-- dancers001.jpg
+|       |-- dancers002.jpg
+|       +-- dancers003.jpg
++-- honeymoon
+|   |-- hotel.png
+|   |-- video-from-plane.avi
+|   +-- pwg_representative
+|       +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
+</pre>
 
   </li>
   
@@ -70,6 +65,8 @@
 
   <li>非图片元素 (如视频，声频，文本文件，一切你想到的...) 均以文件扩展名的默认图标显示。或者，你可以用一张缩略图来代表这个文件 (参见 video.avi 的例子)。</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>注意</em>: 文件名和文件夹必须以字母、数字、 "-"、 "_" 或者 "." 组成。没有空格，没有特别的符号。</li>
 
   <li>一旦文件、缩略图都放到其正确的位置后，进入 : <span class="pwgScreen">后台管理 &raquo; 工具 &raquo;
@@ -78,19 +75,3 @@
 </ul>
 
 </fieldset>
-<fieldset>
-  <legend>缩略图</legend>
-<ul>
-
-  <li>每个图片必须要有一张缩略图。</li>
-
-  <li>缩略图保存在相册文件夹里名为 "thumbnail" 的子文件夹。缩略图文件名与图片的文件名一致，将会以 <em>TN-</em> 为前缀</li>
-
-  <li><em>建议</em>: 使用外部工具来创建缩略图。</li>
-
-  <li>你可以使用<span class="pwgScreen">后台管理 &raquo; 图片 &raquo; 缩略图</span> 页面来创建缩略图。即使这是不被推荐的（考虑到图片品质，网络服务器资源读取等问题）。</li>
-
-  <li>分配给所有相册文件夹写权限。</li>
-
-</ul>
-</fieldset>
-- 
cgit v1.2.3