Merge branch 'master' of https://github.com/xiaomalover/humhub into xiaomalover-master

Removed all non zh_cn message files

# Conflicts:
#	protected/humhub/modules/admin/messages/zh_cn/permissions.php

protected/humhub/messages/zh_cn/base.php

@@ -1,15 +1,15 @@
 <?php
 return array (
-  '<strong>Confirm</strong> Action' => '',
+  '<strong>Confirm</strong> Action' => '<strong>确认</strong> 操作',
   '<strong>Latest</strong> updates' => '<strong>最近</strong> 更新',
-  '<strong>Mail</strong> summary' => '',
+  '<strong>Mail</strong> summary' => '<strong>邮件</strong> 概要',
   'Account settings' => '帐户设置',
   'Administration' => '管理',
   'Allow' => '允许',
-  'An error occured while handling your last action. (Handler not found).' => '',
+  'An error occured while handling your last action. (Handler not found).' => '执行最后一个操作出错。(处理器没有找到)',
-  'An unexpected error occured while loading the search result.' => '',
+  'An unexpected error occured while loading the search result.' => '加载搜索结果时发生意外错误。',
-  'An unexpected error occured. If this keeps happening, please contact a site administrator.' => '',
+  'An unexpected error occured. If this keeps happening, please contact a site administrator.' => '发现了意外错误，如果一直出现该错误，请联系网站管理员',
-  'An unexpected server error occured. If this keeps happening, please contact a site administrator.' => '',
+  'An unexpected server error occured. If this keeps happening, please contact a site administrator.' => '发生意外的服务器错误。如果这种情况不断发生，请联系网站管理员',
   'Back' => '返回',
   'Back to dashboard' => '返回主面板',
   'Cancel' => '取消',
@@ -18,18 +18,18 @@ return array (
   'Collapse' => '折叠',
   'Confirm' => '确认',
   'Content Addon source must be instance of HActiveRecordContent or HActiveRecordContentAddon!' => '内容插件源必须是hactive record content或hactive record contentaddon实例',
-  'Copy to clipboard: Ctrl/Cmd+C' => '',
+  'Copy to clipboard: Ctrl/Cmd+C' => '复制到剪贴板: Ctrl/Cmd+C',
   'Could not determine content container!' => '检测不到内容器！',
   'Could not find content of addon!' => '找不到内容的插件！',
   'Default' => '默认',
   'Deny' => '拒绝',
-  'Do you really want to perform this action?' => '',
+  'Do you really want to perform this action?' => '你真的要执行此操作吗？',
   'Error' => '错误',
-  'Error while running your last action (Invalid request method).' => '',
+  'Error while running your last action (Invalid request method).' => '执行最后一个操作出错。(无效的请求方法)',
   'Expand' => '展开',
   'It looks like you may have taken the wrong turn.' => '看来出错了。',
   'Language' => '语言',
-  'Loading...' => '',
+  'Loading...' => '加载中...',
   'Login' => '登录',
   'Logout' => '退出',
   'Menu' => '菜单',
@@ -37,23 +37,23 @@ return array (
   'My profile' => '我的资料',
   'New profile image' => '新图片',
   'Next' => '下一步',
-  'No error information given.' => '',
+  'No error information given.' => '没有给出错误消息。',
   'Oooops...' => '糟糕...',
-  'Open' => '',
+  'Open' => '打开',
   'Please type at least 3 characters' => '请至少输入3个字符',
   'Save' => '保存',
   'Saved' => '已保存',
   'Search' => '搜索',
-  'Show less' => '',
+  'Show less' => '展示更少',
   'Show more' => '展示更多',
-  'Some files could not be uploaded:' => '',
+  'Some files could not be uploaded:' => '有些文件无法被上传：',
   'Space not found!' => '没找到空间',
   'The date has to be in the past.' => '必须为过去的日期。',
-  'The file has been deleted.' => '',
+  'The file has been deleted.' => '文件已被删除',
-  'The requested resource could not be found.' => '',
+  'The requested resource could not be found.' => '未找到请求的资源',
-  'The space has be archived.' => '',
+  'The space has be archived.' => '空间已归档',
-  'The space has be unarchived.' => '',
+  'The space has be unarchived.' => '空间已解除归档',
   'Unsubscribe' => '退订',
   'User not found!' => '没找到用户',
-  'You are not allowed to run this action.' => '',
+  'You are not allowed to run this action.' => '你不被允许执行此操作。',
 );

protected/humhub/modules/activity/messages/zh_cn/base.php

@@ -1,21 +1,21 @@
 <?php
 return array (
-  '<strong>E-Mail</strong> Summaries' => '',
+  '<strong>E-Mail</strong> Summaries' => '<strong>邮件</strong> 概要',
   'Activities' => '启用',
-  'Daily' => '',
+  'Daily' => '日报',
-  'E-Mail Summaries' => '',
+  'E-Mail Summaries' => '邮件概要',
-  'E-Mail summaries are sent to inform you about recent activities in the network.' => '',
+  'E-Mail summaries are sent to inform you about recent activities in the network.' => '发送电子邮件摘要通知你最近的网络活动。',
-  'E-Mail summaries are sent to users to inform them about recent activities in your network.' => '',
+  'E-Mail summaries are sent to users to inform them about recent activities in your network.' => '发送电子邮件摘要给用户通知他们最近的活动。',
-  'Exclude spaces below from the mail summary' => '',
+  'Exclude spaces below from the mail summary' => '排除以下空间',
-  'Hourly' => '',
+  'Hourly' => '小时任务',
-  'Interval' => '',
+  'Interval' => '间隔',
   'Latest news' => '最新消息',
   'Never' => '从不',
-  'On this page you can configure the contents and the interval of these e-mail updates.' => '',
+  'On this page you can configure the contents and the interval of these e-mail updates.' => '在此页上，你可以配置电子邮件的内容和更新时间间隔',
-  'On this page you can define the default behavior for your users. These settings can be overwritten by users in their account settings page.' => '',
+  'On this page you can define the default behavior for your users. These settings can be overwritten by users in their account settings page.' => '在此页中，您可以为用户定义默认行为。这些设置可以通过他们在自己的帐户设置页面里设置来覆盖。',
-  'Only include spaces below to the mail summary' => '',
+  'Only include spaces below to the mail summary' => '包含以下空间',
-  'Reset to defaults' => '',
+  'Reset to defaults' => '重置为默认',
   'Spaces' => '空间',
-  'You will only receive an e-mail if there is something new.' => '',
+  'You will only receive an e-mail if there is something new.' => '如果有新的动态，你会收到邮件。',
   'Your daily summary' => '你的日常',
 );

protected/humhub/modules/activity/messages/zh_cn/views_activityLayoutMail.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'See online:' => '',
+    'See online:' => '在线看：',
     'see online' => '看在线',
     'via' => '通过',
 ];

protected/humhub/modules/admin/messages/zh_cn/controllers_GroupController.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'User is already a member of this group.' => '',
+    'User is already a member of this group.' => '用户已经是这个组的成员了。',
     'Group not found!' => '组未找到',
     'Group user not found!' => '用户组没有找到！',
     'No value found!' => '没有发现值',

protected/humhub/modules/admin/messages/zh_cn/controllers_UserController.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Add Groups...' => '',
+    'Add Groups...' => '增加组...',
-    'Select Groups' => '',
+    'Select Groups' => '选择组',
     'Become this user' => '成为这个用户',
     'Delete' => '删除',
     'Disabled' => '生效',

protected/humhub/modules/admin/messages/zh_cn/forms_LogsSettingsForm.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  '1 month' => '',
+  '1 month' => '1个月',
-  '1 week' => '',
+  '1 week' => '1周',
-  '1 year' => '',
+  '1 year' => '1年',
-  '2 weeks' => '',
+  '2 weeks' => '两周',
-  '3 months' => '',
+  '3 months' => '3个月',
-  '6 months' => '',
+  '6 months' => '6个月',
   'never' => '从不',
 );

protected/humhub/modules/admin/messages/zh_cn/forms_StatisticSettingsForm.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Maximum allowed age for logs.' => '',
+    'Maximum allowed age for logs.' => '日志允许的最长时间。',
     'HTML tracking code' => 'HTML的跟踪代码',
 ];

protected/humhub/modules/admin/messages/zh_cn/modules.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'Ok' => 'Ok',
+  'Ok' => '好',
   'The HumHub developers provide no support for third-party modules and neighter give any guarantee about the suitability, functionality or security of this module.' => 'humhub开发商不对第三方模块的功能或安全提供任何保障。',
   'Third-party disclaimer' => '第三方申明',
 );

protected/humhub/modules/admin/messages/zh_cn/notifications_AdminNotificationCategory.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Administrative' => '',
+    'Administrative' => '管理',
-    'Receive Notifications for administrative events like available updates.' => '',
+    'Receive Notifications for administrative events like available updates.' => '接收管理事件的通知，例如有可用更新。',
 ];

protected/humhub/modules/admin/messages/zh_cn/permissions.php

@@ -17,16 +17,16 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Access Admin Information' => '',
+    'Access Admin Information' => '访问管理信息',
-    'Can access the \'Administration -> Information\' section.' => '',
+    'Can access the \'Administration -> Information\' section.' => '可以访问 \'管理 -> 信息\'',
-    'Can manage spaces within the \'Administration -> Spaces\' section (create/edit/delete).' => '',
+    'Can manage spaces within the \'Administration -> Spaces\' section (create/edit/delete).' => '可以访问 \'管理 -> 空间\'(增加/编辑/删除)',
-    'Can manage user- space- and general-settings.' => '',
+    'Can manage user- space- and general-settings.' => '可以管理用户 空间 和常规设置。',
-    'Can manage users and groups' => '',
+    'Can manage users and groups' => '可以管理用户和组',
-    'Can manage users and user profiles.' => '',
+    'Can manage users and user profiles.' => '可以管理用户和用户属性。',
-    'Can manage modules within the \'Administration ->  Modules\' section.' => '',
+    'Cann manage modules within the \'Administration ->  Modules\' section.' => '可以访问\'管理 -> 模块管理\'',
-    'Manage Groups' => '',
+    'Manage Groups' => '管理组',
-    'Manage Modules' => '',
+    'Manage Modules' => '管理模块',
-    'Manage Settings' => '',
+    'Manage Settings' => '管理设置',
-    'Manage Spaces' => '',
+    'Manage Spaces' => '管理空间',
-    'Manage Users' => '',
+    'Manage Users' => '管理用户',
 ];

protected/humhub/modules/admin/messages/zh_cn/setting.php

@@ -18,7 +18,7 @@
  */
 return [
     'LDAP' => '',
-    'Notification Settings' => '',
+    'Notification Settings' => '通知设置',
     'Advanced Settings' => '高级设置',
     'Appearance Settings' => '外观设置',
     'General' => '一般',

protected/humhub/modules/admin/messages/zh_cn/views_setting_index.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '<strong>Confirm</strong> image deletion' => '',
+    '<strong>Confirm</strong> image deletion' => '<strong>确认</strong> 删除图片',
     'Dashboard' => '<strong>主面板</strong>',
     'Delete' => '删除',
     'E.g. http://example.com/humhub' => '例如 http://example.com/humhub',

protected/humhub/modules/admin/messages/zh_cn/views_setting_logs.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'Currently there are {count} records in the database dating from {dating}.' => '',
+  'Currently there are {count} records in the database dating from {dating}.' => '从 {dating} 到目前为止数据库有 {count} 条记录。',
-  'Old logs can significantly increase the size of your database while providing little information.' => '',
+  'Old logs can significantly increase the size of your database while providing little information.' => '旧日志会明显增加您的数据库的大小，同时提供很少的信息。',
   'Save' => '保存',
 );

protected/humhub/modules/admin/messages/zh_cn/widgets_AdminMenuWidget.php

@@ -4,11 +4,11 @@ return array (
   'Advanced' => '高级',
   'Appearance' => '外观',
   'Caching' => '缓存设置',
-  'E-Mail summaries' => '',
+  'E-Mail summaries' => '邮件概览',
   'Files' => '附件设置',
   'General' => '一般',
   'Information' => '信息',
-  'Logs' => '',
+  'Logs' => '日志',
   'Modules' => '模块管理',
   'Notifications' => '通知消息',
   'OEmbed' => '',

protected/humhub/modules/comment/messages/zh_cn/activities.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'Comments' => '评论',
-  'Whenever a new comment was written.' => '',
+  'Whenever a new comment was written.' => '每当一个新的评论被书写',
 );

protected/humhub/modules/comment/messages/zh_cn/notification.php

@@ -17,14 +17,14 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{displayNames} commented {contentTitle}' => '',
+    '{displayNames} commented {contentTitle}' => '{displayNames} 评论了 {contentTitle}',
-    '{displayNames} commented {contentTitle} in space {space}' => '',
+    '{displayNames} commented {contentTitle} in space {space}' => '{displayNames} 在空间 {space} 评论了 {contentTitle}',
-    '{displayNames} just commented your {contentTitle}' => '',
+    '{displayNames} just commented your {contentTitle}' => '{displayNames} 刚评论了你的 {contentTitle}',
-    '{displayNames} just commented your {contentTitle} in space {space}' => '',
+    '{displayNames} just commented your {contentTitle} in space {space}' => '{displayNames} 刚在空间 {space} 评论了你的 {contentTitle}',
-    '{displayName} commented {contentTitle}' => '',
+    '{displayName} commented {contentTitle}' => '{displayName} 评论了 {contentTitle}',
-    '{displayName} commented {contentTitle} in space {space}' => '',
+    '{displayName} commented {contentTitle} in space {space}' => '{displayName} 在空间 {space} 评论了 {contentTitle}',
-    '{displayName} just commented your {contentTitle}' => '',
+    '{displayName} just commented your {contentTitle}' => '{displayName} 刚评论了你的 {contentTitle}',
-    '{displayName} just commented your {contentTitle} in space {space}' => '',
+    '{displayName} just commented your {contentTitle} in space {space}' => '{displayName} 刚在空间 {space} 评论了你的 {contentTitle}',
     '{displayNames} commented {contentTitle}.' => '{displayNames} 评论了 {contentTitle}.',
     '{displayName} commented {contentTitle}.' => '{displayName} 评论了 {contentTitle}.',
 ];

protected/humhub/modules/comment/messages/zh_cn/notifications_NotificationCategory.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'Comments' => '评论',
-  'Receive Notifications when someone comments on my own or a following post.' => '',
+  'Receive Notifications when someone comments on my own or a following post.' => '当有人评论了我的文章或关注我时接收通知。',
 );

protected/humhub/modules/comment/messages/zh_cn/notifications_mails.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'View Online' => '',
+    'View Online' => '在线看',
 ];

protected/humhub/modules/comment/messages/zh_cn/widgets_views_showComment.php

@@ -17,9 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Cancel Edit' => '',
+    'Cancel Edit' => '取消编辑',
-    'Comment has been deleted' => '',
+    'Comment has been deleted' => '评论已被删除',
-    'Read full comment...' => '',
+    'Read full comment...' => '阅读完整的评论...',
     '<strong>Confirm</strong> comment deleting' => '<strong>确认</strong> 删除评论',
     'Cancel' => '取消',
     'Delete' => '删除',

protected/humhub/modules/content/messages/zh_cn/activities.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Contents' => '',
+    'Contents' => '内容',
-    'Whenever a new content (e.g. post) has been created.' => '',
+    'Whenever a new content (e.g. post) has been created.' => '每当一个新的内容(例如 文章)被创建时。',
 ];

protected/humhub/modules/content/messages/zh_cn/controllers_ContentController.php

@@ -17,12 +17,15 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Could not delete content!' => '',
+    'Could not delete content!' => '不能删除内容',
-    'Could not delete content: Access denied!' => '',
+    'Could not delete content: Access denied!' => '不能删除内容:访问拒绝！',
-    'Invalid request method!' => '',
+    'Invalid request method!' => '无效的请求方法！',
     'Maximum number of pinned items reached!
 
 You can pin to top only two items at once.
-To however pin this item, unpin another before!' => '',
+To however pin this item, unpin another before!' => '到达的置顶的最大条数！
+
+你一次最多能置顶两条。
+你可以在置顶此条之前先取消一个置顶！',
     'Could not load requested object!' => '无法加载请求对象！',
 ];

protected/humhub/modules/content/messages/zh_cn/notifications_ContentCreated.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{originator} just wrote {contentInfo}' => '',
+    '{originator} just wrote {contentInfo}' => '{originator} 刚刚写了 {contentInfo}',
-    '{originator} just wrote {contentInfo} in space {space}' => '',
+    '{originator} just wrote {contentInfo} in space {space}' => '{originator} 刚刚在空间 {space} 写了 {contentInfo}',
-    '{originator} notifies you about {contentInfo}' => '',
+    '{originator} notifies you about {contentInfo}' => '{originator} 提醒你关于 {contentInfo}',
-    '{originator} notifies you about {contentInfo} in {space}' => '',
+    '{originator} notifies you about {contentInfo} in {space}' => '{originator} 在空间 {space} 提醒你关于 {contentInfo} ',
 ];

protected/humhub/modules/content/messages/zh_cn/notifications_ContentCreatedNotificationCategory.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'New Content' => '',
+    'New Content' => '新内容',
-    'Receive Notifications for new content you follow.' => '',
+    'Receive Notifications for new content you follow.' => '你关注的人有了新动态时接受提醒',
 ];

protected/humhub/modules/content/messages/zh_cn/notifications_mails.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'View Online' => '',
+    'View Online' => '在线看',
 ];

protected/humhub/modules/content/messages/zh_cn/widgets_views_contentForm.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'This space is archived.' => '',
+    'This space is archived.' => '这个空间已被归档。',
     'Add a member to notify' => '增加一个通知成员',
     'Make private' => '变成私有',
     'Make public' => '变成公开',

protected/humhub/modules/content/messages/zh_cn/widgets_views_editLink.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Cancel Edit' => '',
+    'Cancel Edit' => '取消编辑',
     'Edit' => '编辑',
 ];

protected/humhub/modules/content/messages/zh_cn/widgets_views_pinLink.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Pin to top' => '',
+    'Pin to top' => '置顶',
-    'Unpin' => '',
+    'Unpin' => '取消置顶',
 ];

protected/humhub/modules/content/messages/zh_cn/widgets_views_stream.php

@@ -17,12 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'The content has been archived.' => '',
+    'The content has been archived.' => '内容已被归档。',
-    'The content has been deleted.' => '',
+    'The content has been deleted.' => '内容已被删除。',
-    'The content has been pinned.' => '',
+    'The content has been pinned.' => '内容已被置顶。',
-    'The content has been unarchived.' => '',
+    'The content has been unarchived.' => '内容已被解除归档。',
-    'The content has been unpinned.' => '',
+    'The content has been unpinned.' => '内容已被取消置顶。',
-    'Your last edit state has been saved!' => '',
+    'Your last edit state has been saved!' => '你的最新修改已被保存！',
     'Back to stream' => '返回动态',
     'Content with attached files' => '内容含有附件',
     'Created by me' => '我创建的',

protected/humhub/modules/file/messages/zh_cn/actions_UploadAction.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'File {fileName} could not be uploaded!' => '',
+    'File {fileName} could not be uploaded!' => '文件 {fileName} 不能被上传!',
 ];

protected/humhub/modules/file/messages/zh_cn/base.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'Could not find requested file variant!' => '',
+  'Could not find requested file variant!' => '找不到请求的文件！',
   'Could not find requested file!' => '找不到请求的文件！',
   'Insufficient permissions!' => '没有足够的权限！',
   'Invalid Mime-Type' => '无效的类型',

protected/humhub/modules/file/messages/zh_cn/widgets_UploadInput.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'This upload field only allows a maximum of {n,plural,=1{# file} other{# files}}.' => '',
+    'This upload field only allows a maximum of {n,plural,=1{# file} other{# files}}.' => '此上传域只允许最大{n,plural,=1{# file} other{# files}}。',
 ];

protected/humhub/modules/like/messages/zh_cn/activities.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Likes' => '',
+    'Likes' => '赞',
-    'Whenever someone likes something (e.g. a post or comment).' => '',
+    'Whenever someone likes something (e.g. a post or comment).' => '每当有人赞了你的文章或者评论。',
 ];

protected/humhub/modules/like/messages/zh_cn/notification.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{displayNames} likes your {contentTitle}.' => '',
+    '{displayNames} likes your {contentTitle}.' => '{displayNames} 赞了你的 {contentTitle}。',
-    '{displayName} likes your {contentTitle}.' => '',
+    '{displayName} likes your {contentTitle}.' => '{displayName} 赞了你的 {contentTitle}。',
     '{displayNames} likes {contentTitle}.' => '{displayNames} 赞了 {contentTitle}。',
     '{displayName} likes {contentTitle}.' => '{displayName} 赞了 {contentTitle}。',
 ];

protected/humhub/modules/like/messages/zh_cn/notifications.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'View Online' => '',
+    'View Online' => '在线看',
 ];

protected/humhub/modules/like/messages/zh_cn/notifications_LikeNotificationCategory.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Likes' => '',
+    'Likes' => '赞',
-    'Receive Notifications when someone likes your content.' => '',
+    'Receive Notifications when someone likes your content.' => '当有人赞了你的内容时接收提醒。',
 ];

protected/humhub/modules/notification/messages/zh_cn/base.php

@@ -17,14 +17,14 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '<strong>Notification</strong> Settings' => '',
+    '<strong>Notification</strong> Settings' => '<strong>提醒</strong> 设置',
-    'In this view, you can define the default behavior for your users. These settings can be overwritten by users in their account settings page.' => '',
+    'In this view, you can define the default behavior for your users. These settings can be overwritten by users in their account settings page.' => '在此视图中，您可以为用户定义默认行为。这些设置可以通过他们在帐户设置页面的设置来覆盖。',
-    'Notifications are sent directly to your users to inform them about new activities in your network.' => '',
+    'Notifications are sent directly to your users to inform them about new activities in your network.' => '直接发送通知给你的用户告知最新动态。',
-    'Notifications are sent instantly to you to inform you about new activities in your network.' => '',
+    'Notifications are sent instantly to you to inform you about new activities in your network.' => '立即发送最新动态通知给你。',
-    'Reset to defaults' => '',
+    'Reset to defaults' => '重置为默认',
-    'There are new updates available at {baseUrl}' => '',
+    'There are new updates available at {baseUrl}' => '在 {baseUrl} 上有新的更新',
-    'There are new updates available at {baseUrl} - ({category})' => '',
+    'There are new updates available at {baseUrl} - ({category})' => '在 {baseUrl} - ({category}) 上有新的更新',
-    'This view allows you to configure your notification settings by selecting the desired targets for the given notification categories.' => '',
+    'This view allows you to configure your notification settings by selecting the desired targets for the given notification categories.' => '此视图允许你通过为给定的通知类别选择所需的目标来配置通知设置。',
     '{displayName} and {displayName2}' => '{displayName} 和 {displayName2}',
     '{displayName} and {number} others' => '{displayName} 和 {number} 其它',
 ];

protected/humhub/modules/notification/messages/zh_cn/components_WebNotificationTarget.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'E-Mail' => '电子邮件',
-  'Web' => '',
+  'Web' => '网页',
 );

protected/humhub/modules/notification/messages/zh_cn/models_forms_NotificationSettings.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'Allow desktop notifications by default.' => '',
+  'Allow desktop notifications by default.' => '默认允许桌面通知。',
-  'Receive \'New Content\' Notifications for the following spaces' => '',
+  'Receive \'New Content\' Notifications for the following spaces' => '接收关注空间的 \'新内容\' 提醒',
   'Receive desktop notifications when you are online.' => '当你在线时接收桌面通知。',
 );

protected/humhub/modules/notification/messages/zh_cn/views_overview_index.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Apply' => '',
+    'Apply' => '应用',
     '<strong>Notification</strong> Overview' => '<strong>通知</strong> 概览',
     'Filter' => '筛选',
     'Mark all as seen' => '标记所有为已读',

protected/humhub/modules/notification/messages/zh_cn/widgets_views_notificationSettingsForm.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Type' => '',
+    'Type' => '类型',
 ];

protected/humhub/modules/post/messages/zh_cn/permissions.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'Allow others to create new posts on your profile page' => '',
+  'Allow others to create new posts on your profile page' => '允许他人在你的属性页上发表新的文章',
   'Allows the user to create posts' => '允许用户发布文章',
   'Create post' => '创建文章',
 );

protected/humhub/modules/post/messages/zh_cn/widgets_views_postForm.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'This space is archived.' => '',
+    'This space is archived.' => '该空间已归档。',
     'What\'s on your mind?' => '你想说些什么？',
 ];

protected/humhub/modules/search/messages/zh_cn/views_search_index.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Specify space' => '',
+    'Specify space' => '指定空间',
     '<strong>Search </strong> results' => '<strong>搜索 </strong> 结果',
     'Advanced search settings' => '高级搜索设置',
     'All' => '所有',

protected/humhub/modules/space/messages/zh_cn/activities.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Space member joined' => '',
+    'Space member joined' => '空间成员加入',
-    'Space member left' => '',
+    'Space member left' => '空间成员离开',
-    'Whenever a member leaves one of your spaces.' => '',
+    'Whenever a member leaves one of your spaces.' => '每当有成员离开你的空间。',
-    'Whenever a new member joined one of your spaces.' => '',
+    'Whenever a new member joined one of your spaces.' => '每当有新成员加入你的空间。',
 ];

protected/humhub/modules/space/messages/zh_cn/controllers_MembershipController.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Access denied - You cannot invite members!' => '',
+    'Access denied - You cannot invite members!' => '访问拒绝- 你不被允许邀请成员！',
     '<strong>Members</strong>' => '<strong>成员</strong>',
 ];

protected/humhub/modules/space/messages/zh_cn/controllers_SpaceController.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'This user is already a member of this space.' => '',
+    'This user is already a member of this space.' => '该用户已是该空间成员。',
-    'This user is not a member of this space.' => '',
+    'This user is not a member of this space.' => '该用户不是该空间成员。',
     'As owner you cannot revoke your membership!' => '作为拥有者，你不能撤消你的会员资格',
     'Could not request membership!' => '无法请求成为成员',
     'Sorry, you are not allowed to leave this space!' => '抱歉，你不允许离开该空间！',

protected/humhub/modules/space/messages/zh_cn/notification.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{displayName} just invited you to the space {spaceName}' => '',
+    '{displayName} just invited you to the space {spaceName}' => '{displayName} 刚邀请你加入空间 {spaceName}',
     '{displayName} accepted your invite for the space {spaceName}' => '{displayName} 接收了你加入空间 {spaceName} 的邀请',
     '{displayName} approved your membership for the space {spaceName}' => '{displayName} 通过了你加入空间 {spaceName} 的请求',
     '{displayName} declined your invite for the space {spaceName}' => '{displayName} 拒绝了你加入空间 {spaceName} 的邀请',

protected/humhub/modules/space/messages/zh_cn/notifications_FriendshipNotificationCategory.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'Friendship' => '好友',
-  'Receive Notifications for Friendship Request and Approval events.' => '',
+  'Receive Notifications for Friendship Request and Approval events.' => '接收友情请求和批准事件的通知。',
 );

protected/humhub/modules/space/messages/zh_cn/notifications_SpaceMemberNotificationCategory.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Receive Notifications for Space Approval and Invite events.' => '',
+    'Receive Notifications for Space Approval and Invite events.' => '接收空间批准和邀请事件的通知。',
-    'Space Membership' => '',
+    'Space Membership' => '空间成员',
 ];

protected/humhub/modules/space/messages/zh_cn/notifications_mails.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'View Online' => '',
+    'View Online' => '在线看',
 ];

protected/humhub/modules/space/messages/zh_cn/widgets_SpaceAdminMenuWidget.php

@@ -18,8 +18,8 @@
  */
 return [
     '<i class="fa fa-cog"></i>' => '',
-    'Don\'t receive notifications for new content' => '',
+    'Don\'t receive notifications for new content' => '不接收新内容通知',
-    'Receive Notifications for new content' => '',
+    'Receive Notifications for new content' => '接收新内容通知',
     'Cancel Membership' => '取消成员',
     'Hide posts on dashboard' => '在控制面板隐藏文章',
     'Members' => '成员',

protected/humhub/modules/space/messages/zh_cn/widgets_SpacePickerField.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Add Space' => '',
+    'Add Space' => '增加空间',
-    'No spaces found for the given query' => '',
+    'No spaces found for the given query' => '没有找到空间',
-    'Select {n,plural,=1{space} other{spaces}}' => '',
+    'Select {n,plural,=1{space} other{spaces}}' => '选择 {n,plural,=1{space} other{spaces}}',
-    'This field only allows a maximum of {n,plural,=1{# space} other{# spaces}}' => '',
+    'This field only allows a maximum of {n,plural,=1{# space} other{# spaces}}' => '此域只允许最大 {n,plural,=1{# space} other{# spaces}}',
 ];

protected/humhub/modules/space/messages/zh_cn/widgets_spaceChooserItem.php

@@ -1,6 +1,6 @@
 <?php
 return array (
-  'This space is archived' => '',
+  'This space is archived' => '该空间已归档',
   'You are a member of this space' => '你是这个空间成员之一',
-  'You are following this space' => '',
+  'You are following this space' => '你正在关注该空间',
 );

protected/humhub/modules/space/messages/zh_cn/widgets_views_spaceChooser.php

@@ -17,9 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'No member or following spaces found.' => '',
+    'No member or following spaces found.' => '没有找到成员或者关注的空间。',
-    'No result found for the given filter.' => '',
+    'No result found for the given filter.' => '没有找到符合筛选条件的记录。',
-    'To search for other spaces, type at least {count} characters.' => '',
+    'To search for other spaces, type at least {count} characters.' => '搜索其它的空间, 至少输入 {count} 个字符。',
     'Create new space' => '创建新空间',
     'My spaces' => '<strong>我的空间</strong>',
     'Search' => '搜 索',

protected/humhub/modules/space/messages/zh_cn/widgets_views_spaceChooserItem.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{n,plural,=1{# new entry} other{# new entries}} since your last visit' => '',
+    '{n,plural,=1{# new entry} other{# new entries}} since your last visit' => '{n,plural,=1{# new entry} other{# new entries}} 自从你上次访问',
 ];

protected/humhub/modules/stream/messages/zh_cn/base.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Show {i} more.' => '',
+    'Show {i} more.' => '再展示 {i} 条。',
 ];

protected/humhub/modules/tour/messages/zh_cn/widgets_views_tourPanel.php

@@ -24,4 +24,9 @@ return array (
   '<strong>Guide:</strong> Spaces' => '<strong>指南：</strong>空间',
   '<strong>Guide:</strong> User profile' => '<strong>指南：</strong> 用户属性',
   'Get to know your way around the site\'s most important features with the following guides:' => '以下指南带你了解网站的主要功能。',
+  '<strong>Remove</strong> tour panel' => '<strong>移出</strong> 指南',
+  'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.' =>
+  '此操作将会从你的主面板上移出用户指南. 你可以在<br>账户设置 <i class="fa fa-caret-right"></i> 设置 里重新打开。',
+  'Ok' => '确认',
+  'Cancel' => '取消',
 );

protected/humhub/modules/tour/widgets/views/tourPanel.php

@@ -8,10 +8,10 @@ use yii\helpers\Url;
     // Temporary workaround till panel widget rewrite in 0.10 verion
     $removeOptionHtml = "<li>" . \humhub\widgets\ModalConfirm::widget(array(
                 'uniqueID' => 'hide-panel-button',
-                'title' => '<strong>Remove</strong> tour panel',
+                'title' => Yii::t('TourModule.widgets_views_tourPanel', '<strong>Remove</strong> tour panel'),
-                'message' => 'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.',
+                'message' => Yii::t('TourModule.widgets_views_tourPanel', 'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.'),
-                'buttonTrue' => 'Ok',
+                'buttonTrue' => Yii::t('TourModule.widgets_views_tourPanel', 'Ok'),
-                'buttonFalse' => 'Cancel',
+                'buttonFalse' => Yii::t('TourModule.widgets_views_tourPanel', 'Cancel'),
                 'linkContent' => '<i class="fa fa-eye-slash"></i> ' . Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'),
                 'linkHref' => Url::to(["/tour/tour/hide-panel", "ajax" => 1]),
                 'confirmJS' => '$(".panel-tour").slideToggle("slow")'

protected/humhub/modules/user/messages/zh_cn/account.php

@@ -3,10 +3,10 @@ return array (
   '<strong>Security</strong> settings' => '<strong>安全</strong> 设置',
   '<strong>User</strong> settings' => '<strong>用户</strong> 设置',
   '<strong>Your</strong> profile' => '<strong>你的</strong> 属性',
-  'E-Mail Summaries' => '',
+  'E-Mail Summaries' => '邮件概览',
-  'Not registered users' => '',
+  'Not registered users' => '没有已注册用户',
   'Notifications' => '通知消息',
-  'Other users' => '',
+  'Other users' => '其它用户',
   'Users' => '用户',
-  'Your friends' => '',
+  'Your friends' => '你的朋友',
 );

protected/humhub/modules/user/messages/zh_cn/models_Profile.php

@@ -17,19 +17,19 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Custom' => '',
+    'Custom' => '自定义',
-    'Facebook URL' => '',
+    'Facebook URL' => '脸书网 URL',
-    'Female' => '',
+    'Female' => '女',
     'Flickr URL' => '',
-    'Gender' => '',
+    'Gender' => '性别',
     'Google+ URL' => '',
-    'Hide year in profile' => '',
+    'Hide year in profile' => '在属性页隐藏年',
     'LinkedIn URL' => '',
     'MSN' => '',
-    'Male' => '',
+    'Male' => '男',
     'Skype Nickname' => '',
     'Twitter URL' => '',
-    'Url' => '',
+    'Url' => '网址',
     'Vimeo URL' => '',
     'XMPP Jabber Address' => '',
     'Xing URL' => '',

protected/humhub/modules/user/messages/zh_cn/models_ProfileFieldType.php

@@ -26,5 +26,5 @@ return [
     'Select List' => '选择列表',
     'Text' => '文本',
     'Text Area' => '文本域',
-    'Checkbox' => '',
+    'Checkbox' => '复选框',
 ];

protected/humhub/modules/user/messages/zh_cn/models_ProfileFieldTypeCheckbox.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'Checkbox field options' => '',
+  'Checkbox field options' => '复选框字段选项',
   'Default value' => '默认值',
 );

protected/humhub/modules/user/messages/zh_cn/notification.php

@@ -17,8 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    '{displayName} is now following you' => '',
+    '{displayName} is now following you' => '{displayName} 现在关注了你',
-    '{displayName} just mentioned you in {contentTitle} "{preview}"' => '',
+    '{displayName} just mentioned you in {contentTitle} "{preview}"' => '{displayName} 在 {contentTitle} "{preview}" 中提到了你',
     '{displayName} is now following you.' => '{displayName} 现在关注了你。',
     '{displayName} mentioned you in {contentTitle}.' => '{displayName} 在 {contentTitle} 中提到了你。',
 ];

protected/humhub/modules/user/messages/zh_cn/notifications_FollowingNotificationCategory.php

@@ -1,7 +1,7 @@
 <?php
 return array (
   'Following' => '关注',
-  'Mentionings' => '',
+  'Mentionings' => '提醒',
-  'Receive Notifications when someone is following you.' => '',
+  'Receive Notifications when someone is following you.' => '当有人关注你时接受提醒。',
-  'Receive Notifications when someone mentioned you in a post.' => '',
+  'Receive Notifications when someone mentioned you in a post.' => '当有人提到你的文章时接收提醒',
 );

protected/humhub/modules/user/messages/zh_cn/notifications_mails.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'View Online' => '',
+    'View Online' => '在线看',
 ];

protected/humhub/modules/user/messages/zh_cn/permissions.php

@@ -17,6 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Allows access to your about page with personal information' => '',
+    'Allows access to your about page with personal information' => '允许访问您的关于页面的个人信息',
-    'View your about page' => '',
+    'View your about page' => '查看你的关于页面',
 ];

protected/humhub/modules/user/messages/zh_cn/widgets_BasePickerField.php

@@ -1,11 +1,11 @@
 <?php
 return array (
-  'Add more...' => '',
+  'Add more...' => '增加更多...',
-  'An unexpected error occured while loading the result.' => '',
+  'An unexpected error occured while loading the result.' => '加载结果时出现了意外错误。',
   'Load more' => '加载更多',
-  'Please enter at least {n} character' => '',
+  'Please enter at least {n} character' => '请至少输入{n} 个字符',
-  'Select {n,plural,=1{item} other{items}}' => '',
+  'Select {n,plural,=1{item} other{items}}' => '选择 {n,plural,=1{item} other{items}}',
-  'This field only allows a maximum of {n,plural,=1{# item} other{# items}}.' => '',
+  'This field only allows a maximum of {n,plural,=1{# item} other{# items}}.' => '此域最大允许 {n,plural,=1{# item} other{# items}}.',
-  'You reached the maximum number of allowed charachters ({n}).' => '',
+  'You reached the maximum number of allowed charachters ({n}).' => '你输入的字符数到了最大限制 ({n})。',
   'Your search returned no matches.' => '没有找到匹配的数据。',
 );

protected/humhub/modules/user/messages/zh_cn/widgets_PermissionGridEditor.php

@@ -17,5 +17,5 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Permission' => '',
+    'Permission' => '权限',
 ];

protected/humhub/modules/user/messages/zh_cn/widgets_UserPickerField.php

@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'No users found for the given query.' => '',
+    'No users found for the given query.' => '没有找到用户。',
-    'Select {n,plural,=1{user} other{users}}' => '',
+    'Select {n,plural,=1{user} other{users}}' => '选择 {n,plural,=1{user} other{users}}',
-    'This field only allows a maximum of {n,plural,=1{# user} other{# users}}.' => '',
+    'This field only allows a maximum of {n,plural,=1{# user} other{# users}}.' => '此域最大允许 {n,plural,=1{# user} other{# users}}。',
 ];

protected/humhub/modules/user/messages/zh_cn/widgets_views_accountTopMenu.php

@@ -17,5 +17,6 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Sign in / up' => '登录 / 注册'
+    'Sign in / up' => '登录 / 注册',
+    'Sign in' => '登 录',
 ];