diff --git a/preferences/setup/phpgw_zh.lang b/preferences/setup/phpgw_zh.lang
index 8153e3156b..77090ff0a9 100644
--- a/preferences/setup/phpgw_zh.lang
+++ b/preferences/setup/phpgw_zh.lang
@@ -2,10 +2,10 @@
%1 hours preferences zh %1小时
12 hour preferences zh 12小时
24 hour preferences zh 24小时
-a template defines the layout of egroupware and it contains icons for each application. preferences zh 模板定义了eGroupWare的布局方式以及每个应用程序的图标.
+a template defines the layout of egroupware and it contains icons for each application. preferences zh 模板定义了EOA的布局方式以及每个应用程序的图标.
a theme defines the colors and fonts used by the template. preferences zh 界面主题定义了模板使用的颜色和字体.
acl grants have been updated preferences zh ACL授权已更新
-any listing in egw will show you this number of entries or lines per page.
to many slow down the page display, to less will cost you the overview. preferences zh 此处定义了eGroupWare每页显示的条目数或行数.
增大该数值可方便用户浏览(减少页面跳转次数), 但将使页面显示变慢.
+any listing in egw will show you this number of entries or lines per page.
to many slow down the page display, to less will cost you the overview. preferences zh 此处定义了EOA每页显示的条目数或行数.
增大该数值可方便用户浏览(减少页面跳转次数), 但将使页面显示变慢.
are you sure you want to delete this category ? preferences zh 确定要删除该类别吗?
change your password preferences zh 更改密码
change your profile preferences zh 更改个人配置文件
@@ -22,6 +22,7 @@ description can not exceed 255 characters in length ! preferences zh 说明的
do you prefer a 24 hour time format, or a 12 hour one with am/pm attached. preferences zh 您要使用24小时时间格式, 还是带有am/pm标注的12小时时间格式?
edit custom fields preferences zh 编辑自定义字段
enter your new password preferences zh 请输入新密码
+enter your old password preferences zn 请输入您的旧密码
error: there was a problem finding the preference file for %1 in %2 preferences zh 错误：%1的个性化配置文件%2不正确.
forced preferences preferences zh 内定个性化配置
help off preferences zh 不显示提示信息
@@ -46,7 +47,7 @@ popup with search preferences zh 查找时弹出窗口
re-enter your password preferences zh 重新输入密码
select different theme preferences zh 选择不同的界面主题
select one preferences zh 选择
-select the language of texts and messages within egroupware.
some languages may not contain all messages, in that case you will see an english message. preferences zh 在eGroupWare中使用何种语言显示文字和信息.
若指定非英语语种, 部分信息可能无法正常显示, 而默认显示为英文.
+select the language of texts and messages within egroupware.
some languages may not contain all messages, in that case you will see an english message. preferences zh 在EOA中使用何种语言显示文字和信息.
若指定非英语语种, 部分信息可能无法正常显示, 而默认显示为英文.
selectbox preferences zh 选择框
set this to your convenience. for security reasons, you might not want to show your loginname in public. preferences zh 该选项视情况而定. 出于安全性考虑, 通常选择不显示登录名.
should the number of active sessions be displayed for you all the time. preferences zh 选择是否总是显示活动会话的数目.
@@ -58,7 +59,7 @@ show number of current users preferences zh 显示当前用户数
show text on navigation icons preferences zh 在工具栏显示图标的文字说明
show_more_apps common zt 更多應用程式
text only preferences zh 只显示文字
-the default application will be started when you enter egroupware or click on the homepage icon.
you can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to be configured in the preferences of each application). preferences zh 登录eGroupWare或点击主页面图标时, 将运行此处指定的默认应用程序.
您也可以不设置该选项, 而分别设置应用程序的个性化配置, 籍此在主页面上运行多个应用程序.
+the default application will be started when you enter egroupware or click on the homepage icon.
you can also have more than one application showing up on the homepage, if you don't choose a specific application here (has to be configured in the preferences of each application). preferences zh 登录EOA或点击主页面图标时, 将运行此处指定的默认应用程序.
您也可以不设置该选项, 而分别设置应用程序的个性化配置, 籍此在主页面上运行多个应用程序.
the selectbox shows all available users (can be very slow on big installs with many users). the popup can search users by name or group. preferences zh 该选择框显示所有有效用户(用户数过多将导致显示时间长), 您可以在弹出窗口中按用户名或组名查找用户.
the two passwords are not the same preferences zh 两次输入的密码不一致
theme (colors/fonts) selection preferences zh 选择界面主题(颜色及字体)
@@ -66,7 +67,7 @@ this server is located in the %1 timezone preferences zh 该服务器所在时
time format preferences zh 时间格式
use default preferences zh 使用默认值
users choice preferences zh 用户的选择
-which currency symbol or name should be used in egroupware. preferences zh 在eGroupWare中使用何种货币符号和名称.
+which currency symbol or name should be used in egroupware. preferences zh 在EOA中使用何种货币符号和名称.
you can show the applications as icons only, icons with app-name or both. preferences zh 您可以指定工具栏上的应用程序只显示图标、文字, 或是两者都显示.
you do not have permission to set acl's in this mode! preferences zh 您无权在该模式下设置ACL!
you must enter a password preferences zh 必须输入密码