Merge remote-tracking branch 'origin/master'

8 files changed, 57 insertions, 2 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..9088a1657
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+; http://editorconfig.org/
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[inc/{geshi,phpseclib}/**]
+; Use editor default (possible autodetection).
+indent_style =
+indent_size =
+trim_trailing_whitespace = false
+insert_final_newline = false
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 756cce4d8..096027f83 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -33,6 +33,7 @@
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Juan De La Cruz <juann.dlc@gmail.com>
  * @author Fernando <fdiezala@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 86c2ac20c..e9e737251 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -22,6 +22,7 @@
  * @author oott123 <ip.192.168.1.1@qq.com>
  * @author Cupen <Cupenoruler@foxmail.com>
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ * @author qinghao <qingxianhao@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -66,6 +67,8 @@ $lang['btn_register']          = '注册';
 $lang['btn_apply']             = '应用';
 $lang['btn_media']             = '媒体管理器';
 $lang['btn_deleteuser']        = '移除我的账户';
+$lang['btn_img_backto']        = '返回到 %s';
+$lang['btn_mediaManager']      = '在媒体管理器中查看';
 $lang['loggedinas']            = '登录为';
 $lang['user']                  = '用户名';
 $lang['pass']                  = '密码';
@@ -197,6 +200,9 @@ $lang['difflink']              = '到此差别页面的链接';
 $lang['diff_type']             = '查看差异：';
 $lang['diff_inline']           = '行内显示';
 $lang['diff_side']             = '并排显示';
+$lang['diffprevrev']           = '前一修订版';
+$lang['diffnextrev']           = '后一修订版';
+$lang['difflastrev']           = '上一修订版';
 $lang['line']                  = '行';
 $lang['breadcrumb']            = '您的足迹';
 $lang['youarehere']            = '您在这里';
@@ -253,7 +259,6 @@ $lang['admin_register']        = '添加新用户';
 $lang['metaedit']              = '编辑元数据';
 $lang['metasaveerr']           = '写入元数据失败';
 $lang['metasaveok']            = '元数据已保存';
-$lang['btn_img_backto']            = '返回到 %s';
 $lang['img_title']             = '标题';
 $lang['img_caption']           = '说明';
 $lang['img_date']              = '日期';
@@ -266,7 +271,6 @@ $lang['img_camera']            = '相机';
 $lang['img_keywords']          = '关键字';
 $lang['img_width']             = '宽度';
 $lang['img_height']            = '高度';
-$lang['btn_mediaManager']           = '在媒体管理器中查看';
 $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
 $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
 $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';
diff --git a/lib/plugins/authad/lang/es/settings.php b/lib/plugins/authad/lang/es/settings.php
index 087402d1c..13c1144c9 100644
--- a/lib/plugins/authad/lang/es/settings.php
+++ b/lib/plugins/authad/lang/es/settings.php
@@ -6,6 +6,7 @@
  * @author monica <may.dorado@gmail.com>
  * @author Antonio Bueno <atnbueno@gmail.com>
  * @author Juan De La Cruz <juann.dlc@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
  */
 $lang['account_suffix']        = 'Su cuenta, sufijo. Ejem. <code> @ my.domain.org </code>';
 $lang['base_dn']               = 'Su base DN. Ejem. <code>DC=my,DC=dominio,DC=org</code>';
@@ -14,4 +15,7 @@ $lang['admin_username']        = 'Un usuario con privilegios de Active Directory
 $lang['admin_password']        = 'La contraseña del usuario anterior.';
 $lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
 $lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
+$lang['use_ssl']               = '¿Usar conexión SSL? Si se usa, no habilitar TLS abajo.';
+$lang['use_tls']               = '¿Usar conexión TLS? Si se usa, no habilitar SSL arriba.';
 $lang['debug']                 = 'Mostrar información adicional de depuración sobre los errores?';
+$lang['expirywarn']            = 'Días por adelantado para avisar al usuario de que contraseña expirará. 0 para deshabilitar.';
diff --git a/lib/plugins/authldap/lang/es/settings.php b/lib/plugins/authldap/lang/es/settings.php
index f8c3ad014..9fdbd041c 100644
--- a/lib/plugins/authldap/lang/es/settings.php
+++ b/lib/plugins/authldap/lang/es/settings.php
@@ -4,8 +4,14 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
  */
+$lang['port']                  = 'Servidor LDAP en caso de que no se diera la URL completa anteriormente.';
+$lang['usertree']              = 'Donde encontrar cuentas de usuario. Ej. <code>ou=People, dc=server, dc=tld</code>';
+$lang['grouptree']             = 'Donde encontrar grupos de usuarios. Ej. <code>ou=Group, dc=server, dc=tld</code>';
+$lang['version']               = 'La versión del protocolo a usar. Puede que necesites poner esto a <code>3</code>';
 $lang['starttls']              = 'Usar conexiones TLS?';
+$lang['bindpw']                = 'Contraseña del usuario de arriba.';
 $lang['debug']                 = 'Mostrar información adicional para depuración de errores';
 $lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
 $lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
diff --git a/lib/plugins/authmysql/lang/es/settings.php b/lib/plugins/authmysql/lang/es/settings.php
index 64d422102..e2ecc305c 100644
--- a/lib/plugins/authmysql/lang/es/settings.php
+++ b/lib/plugins/authmysql/lang/es/settings.php
@@ -4,9 +4,11 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
  * @author Antonio Bueno <atnbueno@gmail.com>
+ * @author Eloy <ej.perezgomez@gmail.com>
  */
 $lang['server']                = 'Tu servidor MySQL';
 $lang['user']                  = 'Nombre de usuario MySQL';
+$lang['password']              = 'Contraseña para el usuario de arriba.';
 $lang['database']              = 'Base de datos a usar';
 $lang['charset']               = 'Codificación usada en la base de datos';
 $lang['debug']                 = 'Mostrar información adicional para depuración de errores';
diff --git a/lib/plugins/extension/lang/zh/intro_plugins.txt b/lib/plugins/extension/lang/zh/intro_plugins.txt
new file mode 100644
index 000000000..69cb343b3
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_plugins.txt
@@ -0,0 +1 @@
+这些是你当前已经安装的插件。你可以在这里启用和禁用甚至卸载它们。插件的更新信息也显示在这，请一定在更新之前阅读插件的文档。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
index b9db01540..4d40acc1d 100644
--- a/lib/plugins/extension/lang/zh/lang.php
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -5,6 +5,7 @@
  * 
  * @author Cupen <Cupenoruler@foxmail.com>
  * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ * @author qinghao <qingxianhao@gmail.com>
  */
 $lang['menu']                  = '扩展管理器';
 $lang['tab_plugins']           = '安装插件';
@@ -41,10 +42,31 @@ $lang['repository']            = '版本库：';
 $lang['unknown']               = '<em>未知的</em>';
 $lang['installed_version']     = '已安装版本：';
 $lang['install_date']          = '您的最后一次升级：';
+$lang['compatible']            = '兼容于：';
+$lang['depends']               = '依赖于：';
+$lang['similar']               = '相似于：';
+$lang['conflicts']             = '冲突于：';
 $lang['donate']                = '喜欢？';
 $lang['donate_action']         = '捐给作者一杯咖啡钱！';
 $lang['repo_retry']            = '重试';
+$lang['provides']              = '提供：';
 $lang['status']                = '现状：';
 $lang['status_installed']      = '已安装的';
+$lang['status_not_installed']  = '未安装';
+$lang['status_protected']      = '受保护';
+$lang['status_enabled']        = '启用';
+$lang['status_disabled']       = '禁用';
+$lang['status_unmodifiable']   = '不可修改';
 $lang['status_plugin']         = '插件';
 $lang['status_template']       = '模板';
+$lang['msg_enabled']           = '插件 %s 已启用';
+$lang['msg_disabled']          = '插件 %s 已禁用';
+$lang['msg_delete_success']    = '插件已经卸载';
+$lang['msg_template_install_success'] = '模板 %s 安装成功';
+$lang['msg_template_update_success'] = '模板 %s 更新成功';
+$lang['msg_plugin_install_success'] = '插件 %s 安装成功';
+$lang['msg_plugin_update_success'] = '插件 %s 更新成功';
+$lang['msg_upload_failed']     = '上传文件失败';
+$lang['missing_dependency']    = '<strong>缺少或者被禁用依赖：</strong> %s';
+$lang['security_issue']        = '<strong>安全问题：</strong> %s';
+$lang['security_warning']      = '<strong>安全警告：</strong> %s';