From ddc85a987134ddefd9887cd547554422a6d86c7a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 20 Jul 2014 01:54:40 -0400
Subject: [PATCH] [tx-robot] updated from transifex

---
 apps/files/l10n/bn_IN.php            | 20 ++++++++++++-
 apps/files_encryption/l10n/zh_CN.php |  1 +
 apps/files_external/l10n/bn_IN.php   |  1 +
 apps/files_external/l10n/zh_CN.php   | 13 +++++++++
 apps/files_sharing/l10n/bn_IN.php    |  3 +-
 apps/files_versions/l10n/bg_BG.php   |  2 +-
 apps/user_ldap/l10n/zh_CN.php        |  3 ++
 core/l10n/bn_IN.php                  |  1 +
 l10n/bg_BG/core.po                   |  4 +--
 l10n/bg_BG/files.po                  |  4 +--
 l10n/bg_BG/files_external.po         |  4 +--
 l10n/bg_BG/files_sharing.po          |  4 +--
 l10n/bg_BG/files_trashbin.po         |  4 +--
 l10n/bg_BG/files_versions.po         |  9 +++---
 l10n/bg_BG/settings.po               |  4 +--
 l10n/bg_BG/user_ldap.po              |  4 +--
 l10n/bg_BG/user_webdavauth.po        |  4 +--
 l10n/bn_IN/core.po                   |  6 ++--
 l10n/bn_IN/files.po                  | 43 ++++++++++++++--------------
 l10n/bn_IN/files_external.po         |  6 ++--
 l10n/bn_IN/files_sharing.po          |  6 ++--
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    |  2 +-
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               |  2 +-
 l10n/templates/private.pot           |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 l10n/zh_CN/files_encryption.po       | 16 +++++------
 l10n/zh_CN/files_external.po         | 33 ++++++++++-----------
 l10n/zh_CN/settings.po               | 30 +++++++++----------
 l10n/zh_CN/user_ldap.po              | 13 +++++----
 settings/l10n/zh_CN.php              |  1 +
 38 files changed, 153 insertions(+), 110 deletions(-)

diff --git a/apps/files/l10n/bn_IN.php b/apps/files/l10n/bn_IN.php
index 9fc02669d8..ae53a11b8e 100644
--- a/apps/files/l10n/bn_IN.php
+++ b/apps/files/l10n/bn_IN.php
@@ -1,14 +1,32 @@
 <?php
 $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s সরানো যায়নি-এই নামে আগে থেকেই ফাইল আছে",
+"Could not move %s" => "%s সরানো যায়নি",
+"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি।অজানা ত্রুটি",
+"There is no error, the file uploaded with success" => "কোন ত্রুটি নেই,ফাইল সাফল্যের সঙ্গে আপলোড করা হয়েছে",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা ফাইল-php.ini মধ্যে upload_max_filesize নির্দেশ অতিক্রম করে:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইল HTML ফর্মের জন্য  MAX_FILE_SIZE নির্দেশ অতিক্রম করে",
+"The uploaded file was only partially uploaded" => "আপলোড করা ফাইল শুধুমাত্র আংশিকভাবে আপলোড করা হয়েছে",
+"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
+"Missing a temporary folder" => "একটি অস্থায়ী ফোল্ডার পাওয়া যাচ্ছেনা",
+"Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
+"Not enough storage available" => "যথেষ্ট স্টোরেজ পাওয়া যায় না",
+"Invalid directory." => "অবৈধ ডিরেক্টরি।",
 "Files" => "ফাইলস",
 "Share" => "শেয়ার",
 "Delete" => "মুছে ফেলা",
+"Delete permanently" => "স্থায়ীভাবে মুছে দিন",
+"Rename" => "পুনঃনামকরণ",
+"Pending" => "মুলতুবি",
 "Error" => "ভুল",
 "Name" => "নাম",
 "Size" => "আকার",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "সেভ"
+"Save" => "সেভ",
+"New folder" => "নতুন ফোল্ডার",
+"Folder" => "ফোল্ডার",
+"Download" => "ডাউনলোড করুন"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 5ead517634..7621b6fa4f 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Following users are not set up for encryption:" => "以下用户还没有设置加密:",
 "Initial encryption started... This can take some time. Please wait." => "初始加密启动中....这可能会花一些时间,请稍后再试。",
 "Initial encryption running... Please try again later." => "初始加密运行中....请稍后再试。",
+"Go directly to your %spersonal settings%s." => "直接访问您的%s个人设置%s。",
 "Encryption" => "加密",
 "Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥(允许你在密码丢失后恢复文件):",
 "Recovery key password" => "恢复密钥密码",
diff --git a/apps/files_external/l10n/bn_IN.php b/apps/files_external/l10n/bn_IN.php
index f403d887ae..1e8dfdf086 100644
--- a/apps/files_external/l10n/bn_IN.php
+++ b/apps/files_external/l10n/bn_IN.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "Share" => "শেয়ার",
 "URL" => "URL",
 "Name" => "নাম",
+"Folder name" => "ফোল্ডারের নাম",
 "Delete" => "মুছে ফেলা"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index cef995b7d6..031ffd9cb9 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,20 +1,29 @@
 <?php
 $TRANSLATIONS = array(
 "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
+"Step 1 failed. Exception: %s" => "步骤 1 失败。异常:%s",
+"Step 2 failed. Exception: %s" => "步骤 2 失败。异常:%s",
 "External storage" => "外部存储",
 "Local" => "本地",
 "Location" => "地点",
 "Amazon S3" => "Amazon S3",
+"Amazon S3 and compliant" => "Amazon S3 和兼容协议",
 "Access Key" => "访问密钥",
+"Secret Key" => "秘钥",
 "Hostname (optional)" => "域名 (可选)",
 "Port (optional)" => "端口 (可选)",
 "Region (optional)" => "区域 (optional)",
 "Enable SSL" => "启用 SSL",
+"Enable Path Style" => "启用 Path Style",
 "Host" => "主机",
 "Username" => "用户名",
 "Password" => "密码",
 "Root" => "根路径",
 "Secure ftps://" => "安全 ftps://",
+"OpenStack Object Storage" => "OpenStack 对象存储",
+"Username (required)" => "用户名 (必须)",
+"Bucket (required)" => "Bucket (必须)",
+"Timeout of HTTP requests in seconds (optional)" => "HTTP 请求超时(秒) (可选)",
 "Share" => "共享",
 "SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信息",
 "URL" => "URL",
@@ -25,10 +34,14 @@ $TRANSLATIONS = array(
 "Grant access" => "授权",
 "Error configuring Google Drive storage" => "配置Google Drive存储时出错",
 "Personal" => "个人",
+"System" => "系统",
 "Saved" => "已保存",
 "<b>Note:</b> " => "<b>注意:</b>",
 " and " => "和",
+"You don't have any external storages" => "您没有外部存储",
 "Name" => "名称",
+"Storage type" => "存储类型",
+"Scope" => "适用范围",
 "External Storage" => "外部存储",
 "Folder name" => "目录名称",
 "Configuration" => "配置",
diff --git a/apps/files_sharing/l10n/bn_IN.php b/apps/files_sharing/l10n/bn_IN.php
index 2e72439376..99daa51da7 100644
--- a/apps/files_sharing/l10n/bn_IN.php
+++ b/apps/files_sharing/l10n/bn_IN.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Cancel" => "বাতিল করা",
-"Name" => "নাম"
+"Name" => "নাম",
+"Download" => "ডাউনলোড করুন"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index fec4a22342..9dea358d31 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -5,6 +5,6 @@ $TRANSLATIONS = array(
 "Failed to revert {file} to revision {timestamp}." => "Грешка при връщане на {file} към версия {timestamp}.",
 "More versions..." => "Още версии...",
 "No other versions available" => "Няма други налични версии",
-"Restore" => "Възтановяване"
+"Restore" => "Възтановяви"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index fc9c6ec3f9..93d5636aad 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -18,10 +18,12 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "确认删除",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Invalid Host" => "无效的主机",
 "Group Filter" => "组过滤",
 "Save" => "保存",
 "Test Configuration" => "测试配置",
 "Help" => "帮助",
+"groups found" => "找到组",
 "Add Server Configuration" => "增加服务器配置",
 "Host" => "主机",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "可以忽略协议,但如要使用SSL,则需以ldaps://开头",
@@ -32,6 +34,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "启用匿名访问,将DN和密码保留为空",
 "One Base DN per line" => "每行一个基本判别名",
 "You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN",
+"users found" => "找到用户",
 "Back" => "返回",
 "Continue" => "继续",
 "Advanced" => "高级",
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
index 38bd029ce4..6158da85a3 100644
--- a/core/l10n/bn_IN.php
+++ b/core/l10n/bn_IN.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Settings" => "সেটিংস",
+"Folder" => "ফোল্ডার",
 "Saving..." => "সংরক্ষণ করা হচ্ছে ...",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 3b3b5f99ed..1527d927cd 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-19 00:41+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:50+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 55126609c8..cf1332f397 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-19 00:41+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:50+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 00adcf4475..dcf16b337f 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 23:50+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:40+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 2a0ba3157e..bea1e5421a 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 23:30+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:50+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 130f77d313..cee14e921f 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 18:51+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:40+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index b0f8e7ca47..b8762be430 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ivo, 2014
 # Yasen Pramatarov <yasen@lindeas.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-18 01:54-0400\n"
-"PO-Revision-Date: 2014-07-17 23:11+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:40+0000\n"
+"Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,4 +42,4 @@ msgstr "Няма други налични версии"
 
 #: js/versions.js:165
 msgid "Restore"
-msgstr "Възтановяване"
+msgstr "Възтановяви"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 99730f9b9b..496bd439a9 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 23:30+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 11:40+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index e84ef1c8f5..8575c1b9e0 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 23:40+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:40+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 485f1348ae..4a0e42a3bf 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 23:20+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 10:40+0000\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po
index f249cde843..47f850e384 100644
--- a/l10n/bn_IN/core.po
+++ b/l10n/bn_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-18 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 03:19+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 20:20+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -153,7 +153,7 @@ msgstr ""
 
 #: js/js.js:591
 msgid "Folder"
-msgstr ""
+msgstr "ফোল্ডার"
 
 #: js/js.js:592
 msgid "Image"
diff --git a/l10n/bn_IN/files.po b/l10n/bn_IN/files.po
index d9de4aff11..7768981046 100644
--- a/l10n/bn_IN/files.po
+++ b/l10n/bn_IN/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ishita mukherjee <ishitamukh91@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-18 01:54-0400\n"
-"PO-Revision-Date: 2014-07-18 03:19+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 21:20+0000\n"
+"Last-Translator: ishita mukherjee <ishitamukh91@gmail.com>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,12 +33,12 @@ msgstr ""
 #: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s সরানো যায়নি-এই নামে আগে থেকেই ফাইল আছে"
 
 #: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "%s সরানো যায়নি"
 
 #: ajax/newfile.php:58 js/files.js:103
 msgid "File name cannot be empty."
@@ -102,42 +103,42 @@ msgstr ""
 
 #: ajax/upload.php:77
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "কোন ফাইল আপলোড করা হয় নি।অজানা ত্রুটি"
 
 #: ajax/upload.php:84
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "কোন ত্রুটি নেই,ফাইল সাফল্যের সঙ্গে আপলোড করা হয়েছে"
 
 #: ajax/upload.php:85
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "আপলোড করা ফাইল-php.ini মধ্যে upload_max_filesize নির্দেশ অতিক্রম করে:"
 
 #: ajax/upload.php:87
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "আপলোড করা ফাইল HTML ফর্মের জন্য  MAX_FILE_SIZE নির্দেশ অতিক্রম করে"
 
 #: ajax/upload.php:88
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "আপলোড করা ফাইল শুধুমাত্র আংশিকভাবে আপলোড করা হয়েছে"
 
 #: ajax/upload.php:89
 msgid "No file was uploaded"
-msgstr ""
+msgstr "কোন ফাইল আপলোড করা হয় নি"
 
 #: ajax/upload.php:90
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "একটি অস্থায়ী ফোল্ডার পাওয়া যাচ্ছেনা"
 
 #: ajax/upload.php:91
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "ডিস্কে লিখতে ব্যর্থ"
 
 #: ajax/upload.php:111
 msgid "Not enough storage available"
-msgstr ""
+msgstr "যথেষ্ট স্টোরেজ পাওয়া যায় না"
 
 #: ajax/upload.php:173
 msgid "Upload failed. Could not find uploaded file"
@@ -149,7 +150,7 @@ msgstr ""
 
 #: ajax/upload.php:198
 msgid "Invalid directory."
-msgstr ""
+msgstr "অবৈধ ডিরেক্টরি।"
 
 #: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
@@ -223,11 +224,11 @@ msgstr ""
 
 #: js/fileactions.js:301
 msgid "Delete permanently"
-msgstr ""
+msgstr "স্থায়ীভাবে মুছে দিন"
 
 #: js/fileactions.js:342
 msgid "Rename"
-msgstr ""
+msgstr "পুনঃনামকরণ"
 
 #: js/filelist.js:341
 msgid ""
@@ -237,7 +238,7 @@ msgstr ""
 
 #: js/filelist.js:675 js/filelist.js:1783
 msgid "Pending"
-msgstr ""
+msgstr "মুলতুবি"
 
 #: js/filelist.js:1210
 msgid "Error moving file."
@@ -375,11 +376,11 @@ msgstr ""
 
 #: templates/list.php:12
 msgid "New folder"
-msgstr ""
+msgstr "নতুন ফোল্ডার"
 
 #: templates/list.php:13
 msgid "Folder"
-msgstr ""
+msgstr "ফোল্ডার"
 
 #: templates/list.php:16
 msgid "From link"
@@ -395,7 +396,7 @@ msgstr ""
 
 #: templates/list.php:66
 msgid "Download"
-msgstr ""
+msgstr "ডাউনলোড করুন"
 
 #: templates/list.php:91
 msgid "Upload too large"
diff --git a/l10n/bn_IN/files_external.po b/l10n/bn_IN/files_external.po
index 53e28bb672..2462e56b7b 100644
--- a/l10n/bn_IN/files_external.po
+++ b/l10n/bn_IN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-17 01:54-0400\n"
-"PO-Revision-Date: 2014-07-17 05:54+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 20:30+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -286,7 +286,7 @@ msgstr ""
 
 #: templates/settings.php:8 templates/settings.php:27
 msgid "Folder name"
-msgstr ""
+msgstr "ফোল্ডারের নাম"
 
 #: templates/settings.php:10
 msgid "Configuration"
diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po
index b96e6a07a0..476fbbd7ad 100644
--- a/l10n/bn_IN/files_sharing.po
+++ b/l10n/bn_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-17 01:54-0400\n"
-"PO-Revision-Date: 2014-07-16 14:42+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 20:50+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -131,7 +131,7 @@ msgstr ""
 
 #: templates/public.php:30
 msgid "Download"
-msgstr ""
+msgstr "ডাউনলোড করুন"
 
 #: templates/public.php:61
 #, php-format
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ecd6c44396..18dfeda418 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 934ae1d8aa..79d3f33ede 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index fe60520030..81cfdc66a3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0dfddd3b7d..f27ee48ca9 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index a1fdbcad49..07d06f5b00 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 5b830744d3..3f8b5b1d53 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index eebd8b70eb..f97098fc92 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 6748725e4f..e3786fda8d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 3c421cbba6..c030676e62 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 7cd9435983..0213603d0b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 08de204ee4..5e737e2632 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index ac579dc2bd..0214e21823 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-19 01:54-0400\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index e4e72a609f..bcf8c883f9 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:54-0400\n"
-"PO-Revision-Date: 2014-07-05 03:00+0000\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 07:40+0000\n"
 "Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -58,14 +58,14 @@ msgid ""
 "correct."
 msgstr "无法更新私钥密码。可能旧密码不正确。"
 
-#: files/error.php:12
+#: files/error.php:13
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
 msgstr "加密应用还没有初始化!可能加密应用在你会话期间已被重新启用。请注销并重新登录,以初始化加密应用。"
 
-#: files/error.php:16
+#: files/error.php:17
 #, php-format
 msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
@@ -73,13 +73,13 @@ msgid ""
 " in your personal settings to recover access to your encrypted files."
 msgstr ""
 
-#: files/error.php:19
+#: files/error.php:20
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
 msgstr ""
 
-#: files/error.php:22 files/error.php:27
+#: files/error.php:23 files/error.php:28
 msgid ""
 "Unknown error. Please check your system settings or contact your "
 "administrator"
@@ -96,7 +96,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "请确认安装了 PHP 5.3.3 或更新版本,且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。"
 
-#: hooks/hooks.php:300
+#: hooks/hooks.php:286
 msgid "Following users are not set up for encryption:"
 msgstr "以下用户还没有设置加密:"
 
@@ -111,7 +111,7 @@ msgstr "初始加密运行中....请稍后再试。"
 #: templates/invalid_private_key.php:8
 #, php-format
 msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "直接访问您的%s个人设置%s。"
 
 #: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index ae686869a9..08c21ff2b9 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # phy <transifex@phy25.com>, 2014
 # csslayer <wengxt@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-17 01:54-0400\n"
-"PO-Revision-Date: 2014-07-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 08:10+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,12 +39,12 @@ msgstr "请提供有效的Dropbox应用key和secret"
 #: ajax/google.php:27
 #, php-format
 msgid "Step 1 failed. Exception: %s"
-msgstr ""
+msgstr "步骤 1 失败。异常:%s"
 
 #: ajax/google.php:38
 #, php-format
 msgid "Step 2 failed. Exception: %s"
-msgstr ""
+msgstr "步骤 2 失败。异常:%s"
 
 #: appinfo/app.php:35 js/app.js:32 templates/settings.php:9
 msgid "External storage"
@@ -75,7 +76,7 @@ msgstr ""
 
 #: appinfo/app.php:59
 msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 和兼容协议"
 
 #: appinfo/app.php:62
 msgid "Access Key"
@@ -83,7 +84,7 @@ msgstr "访问密钥"
 
 #: appinfo/app.php:63
 msgid "Secret Key"
-msgstr ""
+msgstr "秘钥"
 
 #: appinfo/app.php:65
 msgid "Hostname (optional)"
@@ -103,7 +104,7 @@ msgstr "启用 SSL"
 
 #: appinfo/app.php:69
 msgid "Enable Path Style"
-msgstr ""
+msgstr "启用 Path Style"
 
 #: appinfo/app.php:77
 msgid "App key"
@@ -147,15 +148,15 @@ msgstr ""
 
 #: appinfo/app.php:108
 msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack 对象存储"
 
 #: appinfo/app.php:111
 msgid "Username (required)"
-msgstr ""
+msgstr "用户名 (必须)"
 
 #: appinfo/app.php:112
 msgid "Bucket (required)"
-msgstr ""
+msgstr "Bucket (必须)"
 
 #: appinfo/app.php:113
 msgid "Region (optional for OpenStack Object Storage)"
@@ -183,7 +184,7 @@ msgstr ""
 
 #: appinfo/app.php:119
 msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "HTTP 请求超时(秒) (可选)"
 
 #: appinfo/app.php:132 appinfo/app.php:142
 msgid "Share"
@@ -231,7 +232,7 @@ msgstr "个人"
 
 #: js/mountsfilelist.js:36
 msgid "System"
-msgstr ""
+msgstr "系统"
 
 #: js/settings.js:325 js/settings.js:332
 msgid "Saved"
@@ -268,7 +269,7 @@ msgstr ""
 
 #: templates/list.php:7
 msgid "You don't have any external storages"
-msgstr ""
+msgstr "您没有外部存储"
 
 #: templates/list.php:16
 msgid "Name"
@@ -276,11 +277,11 @@ msgstr "名称"
 
 #: templates/list.php:20
 msgid "Storage type"
-msgstr ""
+msgstr "存储类型"
 
 #: templates/list.php:23
 msgid "Scope"
-msgstr ""
+msgstr "适用范围"
 
 #: templates/settings.php:2
 msgid "External Storage"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9221936d1c..8e6b1f2090 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-10 04:58-0400\n"
-"PO-Revision-Date: 2014-07-10 07:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 07:40+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -314,19 +314,19 @@ msgstr "恢复加密密钥。"
 msgid "Unable to delete {objName}"
 msgstr "无法删除 {objName}"
 
-#: js/users/groups.js:73 js/users/groups.js:178
+#: js/users/groups.js:92 js/users/groups.js:200
 msgid "Error creating group"
 msgstr "创建组时出错"
 
-#: js/users/groups.js:177
+#: js/users/groups.js:199
 msgid "A valid group name must be provided"
 msgstr "请提供一个有效的组名称"
 
-#: js/users/groups.js:205
+#: js/users/groups.js:227
 msgid "deleted {groupName}"
 msgstr "已删除 {groupName}"
 
-#: js/users/groups.js:206 js/users/users.js:265
+#: js/users/groups.js:228 js/users/users.js:296
 msgid "undo"
 msgstr "撤销"
 
@@ -346,31 +346,31 @@ msgstr "组管理员"
 msgid "Delete"
 msgstr "删除"
 
-#: js/users/users.js:85 templates/users/part.userlist.php:98
+#: js/users/users.js:84 templates/users/part.userlist.php:98
 msgid "never"
 msgstr "从不"
 
-#: js/users/users.js:264
+#: js/users/users.js:295
 msgid "deleted {userName}"
 msgstr "已删除 {userName}"
 
-#: js/users/users.js:381
+#: js/users/users.js:431
 msgid "add group"
 msgstr "增加组"
 
-#: js/users/users.js:578
+#: js/users/users.js:631
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
+#: js/users/users.js:632 js/users/users.js:638 js/users/users.js:653
 msgid "Error creating user"
 msgstr "创建用户出错"
 
-#: js/users/users.js:584
+#: js/users/users.js:637
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: js/users/users.js:608
+#: js/users/users.js:667
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告:用户 \"{user}\" 的家目录已存在"
 
@@ -567,7 +567,7 @@ msgstr "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟
 
 #: templates/admin.php:229
 msgid "Use system's cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。"
 
 #: templates/admin.php:234
 msgid "Sharing"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index f129efe958..427ebb9958 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Kaijia Feng <fengkaijia@gmail.com>, 2014
 # Martin Liu <liuzh66@gmail.com>, 2014
 # phy <transifex@phy25.com>, 2014
 # wang <modokwang@gmail.com>, 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:54-0400\n"
-"PO-Revision-Date: 2014-07-04 15:13+0000\n"
-"Last-Translator: phy <transifex@phy25.com>\n"
+"POT-Creation-Date: 2014-07-20 01:54-0400\n"
+"PO-Revision-Date: 2014-07-19 07:40+0000\n"
+"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,7 +164,7 @@ msgstr ""
 
 #: lib/wizard.php:858 lib/wizard.php:870
 msgid "Invalid Host"
-msgstr ""
+msgstr "无效的主机"
 
 #: settings.php:52
 msgid "Server"
@@ -228,7 +229,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "找到组"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
@@ -323,7 +324,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "找到用户"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 403f65533d..da33b075b3 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -120,6 +120,7 @@ $TRANSLATIONS = array(
 "Cron was not executed yet!" => "定时任务还未被执行!",
 "Execute one task with each page loaded" => "每个页面加载后执行一个任务",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
+"Use system's cron service to call the cron.php file every 15 minutes." => "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
 "Sharing" => "共享",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
 "Allow users to share via link" => "允许用户通过链接分享文件",
-- 
GitLab