I merged the traditional Chinese translation into the simplified Chinese

translation file (only those not translated in simplified Chinese).

This is because
1) most simplified Chinese readers can read traditional
Chinese. If some phrase doesn't have simplified Chinese translation,
egroupware better fall back to traditional Chinese then English.
2) Translation can be easier (just pick up the unfamiliar traditional
translation and change to simplified form)

The change is made by using
> find . -type d -name "setup" -exec /tmp/merge_tradition.sh {} \;

where merge_tradition.sh is:

#!/bin/sh
cd $1
if [ -f phpgw_zh.lang ] && [ -f phpgw_zt.lang ]; then
mv phpgw_zh.lang phpgw_zh.lang.old
join -a 1 -t "	" phpgw_zt.lang phpgw_zh.lang.old | \
        awk -F "	" \
       '{ OFS = FS; if (NF == 7) print $1, $5, $6, $7; else print $0 ;}' \
                > phpgw_zh.lang
fi

Kiang if you like the idea you can merge my translation to your lang
file too. And it's even better if the language engine can be changed in
the way that, as a phrase has no translation for current language,
choose the nearest language before falling back to English. Say, when no
translation in zh, use zt before trying English.

Could it be better that this apply to pt too? (pt-br and pt)

addressbook/setup/phpgw_zh.lang

@@ -75,7 +75,6 @@ full name	addressbook	zh	姓名
 geo	addressbook	zh	GEO
 global categories	addressbook	zh	全局类别
 grant addressbook access	common	zh	授权访问
-home	addressbook	zh	家庭
 home address type	addressbook	zh	地址类型
 home city	addressbook	zh	城市
 home country	addressbook	zh	国家/地区
@@ -93,33 +92,34 @@ import from ldif, csv, or vcard	addressbook	zh	导入其他软件的通讯录
 import from outlook	addressbook	zh	从Outlook导入
 import next set	addressbook	zh	导入下一个集合
 import_instructions	addressbook	zh	请按照下列方法导出其他软件的通讯录, 以便导入eGroupWare中:<p>在Netscape中, 打开通讯录, 选定<b>文件</b>菜单的<b>导出</b>项, 导出的文件将以LDIF格式存放.<p>在Outlook中, 选定将要导出的联系人文件夹, 选定<b>文件菜单</b>的<b>导入和导出</b>项, 导出的文件将以CSV格式存放.<p>在Palm Desktop 4.0或更高版本中, 打开通讯录, 选定<b>文件</b>菜单的<b>导出</b>项, 导出的文件将以VCard格式存放.
-international	addressbook	zh	国际
+<p>Palm Desktop 4.0 或是更新的版本，在瀏覽通訊錄資料時在<b>檔案</b>功能選擇 <b>匯出</b>，匯出的資料是 VCard 格式。
-isdn phone	addressbook	zh	ISDN电话
+international	addressbook	zt	國際
-label	addressbook	zh	附注
+isdn phone	addressbook	zt	ISDN電話
-ldap context for contacts	admin	zh	LDAP服务器上下文
+label	addressbook	zt	概述
-ldap host for contacts	admin	zh	LDAP服务器主机名
+ldap context for contacts	admin	zt	聯絡人之LDAP context
-ldap root dn for contacts	admin	zh	LDAP服务器管理员dn
+ldap host for contacts	admin	zt	聯絡人之LDAP host
-ldap root pw for contacts	admin	zh	LDAP服务器管理员密码
+ldap root dn for contacts	admin	zt	聯絡人之LDAP root dn
-ldif	addressbook	zh	LDIF
+ldap root pw for contacts	admin	zt	聯絡人之LDAP root 密碼
-line 2	addressbook	zh	第2行
+ldif	addressbook	zt	LDIF
-mark records as private	addressbook	zh	将导入的条目设为私有条目
+line 2	addressbook	zt	第2行
-message phone	addressbook	zh	短信电话
+mark records as private	addressbook	zt	標示為私人記錄
-middle name	addressbook	zh	中间名
+message phone	addressbook	zt	留言電話
-mobile	addressbook	zh	移动的
+middle name	addressbook	zt	中間欄位
-mobile phone	addressbook	zh	移动电话
+mobile	addressbook	zt	行動電話
-modem phone	addressbook	zh	Modem电话
+mobile phone	addressbook	zt	行動電話
-no vcard	addressbook	zh	无vCard
+modem phone	addressbook	zt	撥接電話
-number of records to read (<=200)	addressbook	zh	待读取记录数 (<=200)
+no vcard	addressbook	zt	沒有VCard
-other number	addressbook	zh	其他电话
+number of records to read (%1)	addressbook	zt	讀取記錄號碼(%1)
-other phone	addressbook	zh	其他电话
+number of records to read (<=200)	addressbook	zt	讀取的資料筆數(<=200)
-pager	common	zh	寻呼
+other number	addressbook	zt	其他號碼
-parcel	addressbook	zh	包裹
+other phone	addressbook	zt	其他電話
-phone number	common	zh	电话号码
+pager	common	zt	呼叫器
-phone numbers	common	zh	电话号码
+parcel	addressbook	zt	兼職
-please enter a name for that field !	addressbook	zh	请输入该字段名!
+phone number	common	zt	電話號碼
-postal	common	zh	邮政
+phone numbers	common	zt	電話號碼
+please enter a name for that field !	addressbook	zt	請輸入欄位名稱！
+postal	common	zt	郵政信箱
 pref	addressbook	zh	设为首选
-preference	addressbook	zh	通讯录个性化配置
 prefix	addressbook	zh	称谓
 public key	addressbook	zh	公钥
 read a list of entries.	addressbook	zh	读取条目列表.

admin/setup/phpgw_zh.lang

@@ -1,4 +1,5 @@
 %1 - %2 of %3 user accounts	admin	zh	共有%3个用户帐户, 正显示其中的第%1～%2个
+%1 - %2 of %3 user groups	admin	zt	第%1 到 %2 /共 %3 個使用者群組
 %1 not found or not executable !!!	admin	zh	%1找不到或无法执行!!!
 (stored password will not be shown here)	admin	zh	(此处不显示保存过的密码)
 (to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)	admin	zh	(请使用<br><a href="setup/" target="setup">安装程序</a>来安装新的应用程序!!!)
@@ -13,6 +14,7 @@ account preferences	admin	zh	帐户个性化配置
 acl manager	admin	zh	ACL权限管理
 acl rights	admin	zh	ACL权限管理
 action	admin	zh	操作
+activate wsiwyg-editor	admin	zt	啟用所見即所得編輯器
 add a category	admin	zh	添加类别
 add a group	admin	zh	添加组
 add a new account.	admin	zh	添加新帐户
@@ -113,7 +115,8 @@ deny access to user accounts	admin	zh	用户账户ACL
 deny all users access to grant other users access to their entries ?	admin	zh	是否禁止用户授权他人访问自身数据?
 description can not exceed 255 characters in length !	admin	zh	说明的长度不能超过255个字符!
 disable "auto completion" of the login form	admin	zh	是否禁用登录框的自动完成功能
-disabled (not recomended)	admin	zh	禁用(不推荐)
+disable wsiwyg-editor	admin	zt	停用所見即所得編輯器
+disabled (not recomended)	admin	zt	停用(不建議)
 display	admin	zh	显示
 do not delete the category and return back to the list	admin	zh	请勿删除该类别，返回列表
 do you also want to delete all global subcategories ?	admin	zh	确定也要删除所有的全局子类别吗?
@@ -124,6 +127,7 @@ edit application	admin	zh	编辑应用程序
 edit global category	admin	zh	编辑全局类别
 edit global category for %1	admin	zh	编辑全局类别%1为
 edit group	admin	zh	编辑组
+edit group acl's	admin	zt	編輯群組的ACL's
 edit login screen message	admin	zh	编辑登录页面信息
 edit main screen message	admin	zh	编辑首页信息
 edit peer server	admin	zh	编辑对等服务器
@@ -133,9 +137,9 @@ edit this group	admin	zh	编辑该组
 edit this user	admin	zh	编辑该用户
 edit user	admin	zh	编辑用户
 edit user account	admin	zh	编辑用户账户
-email settings	admin	zh	EMail配置
 enable debug-messages	admin	zh	显示调试信息
 enabled - hidden from navbar	admin	zh	在工具中隐藏
+enabled - popup window	admin	zt	啟用，顯示在跳出視窗中
 enter a description for the category	admin	zh	输入类别说明
 enter some random text for app_session <br>encryption (requires mcrypt)	admin	zh	请随机输入一些文本，用于<br>加密应用程序的会话(需要mcrypt)
 enter the background color for the login page	admin	zh	登录页面的背景颜色
@@ -150,6 +154,7 @@ enter the site password for peer servers	admin	zh	请输入对等服务器站点
 enter the site username for peer servers	admin	zh	请输入对等服务器站点的用户名
 enter the title for your site	admin	zh	站点名称
 enter the title of your logo	admin	zh	徽标名称
+enter the url or filename (in phpgwapi/templates/default/images) of your logo	admin	zt	輸入圖示的網址或檔案名稱(在phpgwapi/templates/default/images)
 enter the url where your logo should link to	admin	zh	徽标所链接的网址
 enter your default ftp server	admin	zh	请输入默认的FTP服务器
 enter your http proxy server	admin	zh	请输入HTTP代理服务器
@@ -252,7 +257,7 @@ please enter a name for that server !	admin	zh	请输入那台服务器的名称
 please run setup to become current	admin	zh	请运行安装程序以成为当前
 please select	admin	zh	请选择
 preferences	admin	zh	个性化配置
-primary Group	admin	zh	首选组
+primary group	admin	zt	主要群組
 re-enter password	admin	zh	重新输入密码
 read this list of methods.	admin	zh	读取方法列表.
 register application hooks	admin	zh	注册应用程序组件
@@ -283,6 +288,7 @@ server type(mode)	admin	zh	服务器类型(模式)
 server url	admin	zh	服务器网址
 server username	admin	zh	服务器用户名
 set preference values.	admin	zh	设置个性化配置值
+should the login page include a language selectbox (useful for demo-sites) ?	admin	zt	登入畫面要不要包含語言選單(利於展示)？
 show 'powered by' logo on	admin	zh	在何处显示软件内核信息:
 show access log	admin	zh	显示访问日志
 show current action	admin	zh	显示当前操作
@@ -293,6 +299,7 @@ site	admin	zh	站点
 site configuration	admin	zh	全局配置
 soap	admin	zh	SOAP
 sorry, that group name has already been taken.	admin	zh	抱歉，该组名已被占用.
+sorry, that group name has already been taking.	admin	zt	很抱歉，該群組名稱已被使用了
 sorry, the above users are still a member of the group %1	admin	zh	抱歉，以上用户也是%1组的成员
 sorry, the follow users are still a member of the group %1	admin	zh	抱歉，以下用户也是%1组的成员
 sort the entries	admin	zh	按序排列条目
@@ -310,11 +317,13 @@ that name has been used already	admin	zh	该名称已被占用
 that server name has been used already !	admin	zh	该服务器名称已被占用!
 the api is current	admin	zh	API当前在用
 the api requires an upgrade	admin	zh	API需要升级
+the groups must include the primary group	admin	zt	這個群組必須包含主要群組
 the login and password can not be the same	admin	zh	登录名不能与密码一样
 the loginid can not be more then 8 characters	admin	zh	loginid长度不能大于8个字符
 the testjob sends you a mail everytime it is called.	admin	zh	测试任务将在每次启动时向您发送Email.
 the two passwords are not the same	admin	zh	两次输入的密码不同
 the users bellow are still members of group %1	admin	zh	以下用户也是%1组的成员
+there already is a group with this name. userid's can not have the same name as a groupid	admin	zt	群組名稱已經存在，使用者帳號的群組不能使用同樣的群組
 they must be removed before you can continue	admin	zh	继续之前必须删除它们
 this application is current	admin	zh	该应用程序当前在用
 this application requires an upgrade	admin	zh	该应用程序需要升级
@@ -343,9 +352,11 @@ view sessions	admin	zh	查看会话
 view this user	admin	zh	查看该用户
 view user account	admin	zh	查看用户帐户
 who would you like to transfer all records owned by the deleted user to?	admin	zh	需要把被删除用户的所有记录转移给谁?
+would you like egroupware to check for a new version<br>when admins login ?	admin	zt	您希望eGroupWare在管理員登入時檢查系統最新版本嗎？
+would you like egroupware to check for new application versions when admins login ?	admin	zt	您希望eGroupWare在管理員登入時檢查應用程式最新版本嗎？
 would you like phpgroupware to cache the phpgw info array ?	admin	zh	需要phpGroupWare缓存phpgw信息数组吗?
-would you like egroupware to check for a new version<br>when admins login ?	admin	zh	管理员登录时，是否检查phpGroupWare的新版本?
+would you like phpgroupware to check for a new version<br>when admins login ?	admin	zt	您希望 phpGroupWare 自動於管理者登入時檢查是否有最新版本？
-would you like egroupware to check for new application versions when admins login ?	admin	zh	管理员登录时，是否检查应用程序的新版本?
+would you like phpgroupware to check for new application versions when admins login ?	admin	zt	您希望phpGroupWare在每次管理者登入時檢查新版的應用程式嗎？
 would you like to automaticaly load new langfiles (at login-time) ?	admin	zh	登录时，是否自动加载新的语言文件?
 would you like to show each application's upgrade status ?	admin	zh	是否显示每个应用程序的升级情况?
 xml-rpc	admin	zh	XML-RPC
@@ -358,4 +369,5 @@ you must enter an application name and title.	admin	zh	必须为应用程序指
 you must enter an application name.	admin	zh	必须为应用程序指定名称.
 you must enter an application title.	admin	zh	必须为应用程序指定标题.
 you must select a file type	admin	zh	必须选择文件类型
+you will need to remove the subcategories before you can delete the parent category	admin	zt	您需要將所有子分類移除後才可以移除上一層之分類！
 you will need to remove the subcategories before you can delete this category	admin	zh	在删除该类别前，必须删除它的所有子类别!

calendar/setup/phpgw_zh.lang

@@ -12,7 +12,8 @@ action that caused the notify: added, canceled, accepted, rejected, ...	calendar
 add a single entry by passing the fields.	calendar	zh	通过传递字段来添加一个条目
 add alarm	calendar	zh	添加闹铃
 add contact	calendar	zh	添加联系人
-added	calendar	zh	已添加
+add or update a single entry by passing the fields.	calendar	zt	透過傳遞欄位來新增或更新一筆記錄
+added	calendar	zt	新增日期
 address book	calendar	zh	通讯录
 alarm	calendar	zh	闹铃
 alarm for %1 at %2 in %3	calendar	zh	Alarm for %1 at %2 in %3
@@ -26,6 +27,10 @@ are you sure\nyou want to\ndelete these alarms?	calendar	zh	确定要删除这
 are you sure\nyou want to\ndelete this entry ?	calendar	zh	确定要删除该事项吗?
 are you sure\nyou want to\ndelete this entry ?\n\nthis will delete\nthis entry for all users.	calendar	zh	确定要删除该条目吗?\n\n所有用户的该条目都将被删除. 
 are you sure\nyou want to\ndelete this single occurence ?\n\nthis will delete\nthis entry for all users.	calendar	zh	确定要删除该事项吗? 所有用户的该事项都将被删除. 
+are you surenyou want tondelete these alarms?	calendar	zt	
+are you surenyou want tondelete this entry ?	calendar	zt	
+are you surenyou want tondelete this entry ?nnthis will deletenthis entry for all users.	calendar	zt	
+are you surenyou want tondelete this single occurence ?nnthis will deletenthis entry for all users.	calendar	zt	
 before the event	calendar	zh	在事项发生前
 brief description	calendar	zh	简要说明
 business	calendar	zh	商务
@@ -74,6 +79,7 @@ display interval in day view	calendar	zh	显示每日安排的间隔
 display mini calendars when printing	calendar	zh	打印时显示简明日程表
 display status of events	calendar	zh	显示事项状态
 displays your default calendar view on the startpage (page you get when you enter egroupware or click on the homepage icon)?	calendar	zh	是否在首页(即登录后的页面, 可点击“首页”按钮跳转至该页)显示日程表?
+displays your default calendar view on the startpage (page you get when you enter phpgroupware or click on the homepage icon)?	calendar	zt	顯示您預設的行事曆瀏覽模式在啟始頁(您登入phpGroupWare第一個看到或是按下您的首頁按鈕的頁面)
 do you want to be notified about new or changed appointments? you be notified about changes you make yourself.<br>you can limit the notifications to certain changes only. each item includes all the notification listed above it. all modifications include changes of title, description, participants, but no participant responses. if the owner of an event requested any notifcations, he will always get the participant responses like acceptions and rejections too.	calendar	zh	新建或更改事项时是否需要通知您? 您只能收到自己所作更改的通知. <br>每个事项上都列出了所有相关的通知, 您可以指定发生哪些更改时发出通知. 更改包括对标题、说明和参与者的变动, 但参与者的回应不在此列. 若启用更改通知, 事项的安排者将收到参与者对更改的回应：接受或拒绝. 
 do you want to receive a regulary summary of your appointsments via email?<br>the summary is sent to your standard email-address on the morning of that day or on monday for weekly summarys.<br>it is only sent when you have any appointments on that day or week.	calendar	zh	您希望定期收到有关事项统计的EMail吗?<br>每日统计将在每天早上发送至您的EMail信箱, 周一则发送每周统计. <br>该选项仅在当天或者该周有事项时生效. 
 do you wish to autoload calendar holidays files dynamically?	admin	zh	是否自动加载节日文件?
@@ -103,6 +109,7 @@ firstname of person to notify	calendar	zh	被通知者的名字
 format of event updates	calendar	zh	EMail通知的格式
 fr	calendar	zh	五
 free/busy	calendar	zh	当天安排
+freebusy: unknow user '%1', wrong password or not availible to not loged in users !!!	calendar	zt	狀態：不知名的使用者'%1'，錯誤的密碼或是目前無法登入！
 frequency	calendar	zh	频率
 fri	calendar	zh	五
 full description	calendar	zh	完整说明
@@ -125,9 +132,11 @@ hours	calendar	zh	小时
 i participate	calendar	zh	我要参与
 ical / rfc2445	calendar	zh	iCal/RFC2445标准格式
 if checked holidays falling on a weekend, are taken on the monday after.	calendar	zh	周末指定的节日将在下周一生效. 
+if you dont set a password here, the information is availible to everyone, who knows the url!!!	calendar	zt	如果您沒有在這裡設定密碼，所有的人都可以看到您的資訊！
 ignore conflict	calendar	zh	忽略冲突
 import	calendar	zh	导入
 import csv-file	common	zh	从CSV文件导入
+import csv-file into calendar	calendar	zt	匯入CSV檔案到行事曆
 interval	calendar	zh	间隔
 intervals in day view	calendar	zh	每日安排间隔
 intervals per day in planner view	calendar	zh	按组查看的每日间隔
@@ -136,9 +145,13 @@ last	calendar	zh	最后
 lastname of person to notify	calendar	zh	被通知者的姓氏
 length shown<br>(emtpy for full length)	calendar	zh	显示的长度<br>(留空则完全显示)
 length<br>(<= 255)	calendar	zh	长度<br>(不大于255)
+link	calendar	zt	連結
+link to view the event	calendar	zt	事件連結
+list all categories.	calendar	zt	顯示所有分類
 load [iv]cal	calendar	zh	导入[iv]日程表
 location	calendar	zh	地点
 location to autoload from	admin	zh	节日文件的位置
+make freebusy information availible to not loged in persons?	calendar	zt	讓未登入的使用者瀏覽您目前是有空或是忙碌中？
 matrixview	calendar	zh	日程安排
 minutes	calendar	zh	分钟
 mo	calendar	zh	一
@@ -153,6 +166,8 @@ monthview	calendar	zh	按月查看
 new entry	calendar	zh	新建事项
 new name must not exist and not be empty!!!	calendar	zh	新建的名字必须存在, 且不可为空!
 no matches found	calendar	zh	未找到符合的记录
+no matches found.	calendar	zt	沒有找到符合的資料
+no repsonse	calendar	zt	沒有回應
 no response	calendar	zh	无回应
 notification messages for added events	calendar	zh	新建事项的EMail通知的内容
 notification messages for canceled events	calendar	zh	取消事项的EMail通知的内容
@@ -161,6 +176,7 @@ notification messages for your alarms	calendar	zh	闹铃的EMail通知的内容
 notification messages for your responses	calendar	zh	回应事项的EMail通知的内容
 number of intervals per day in planner view	calendar	zh	日程规划中的每日间隔数
 number of months	calendar	zh	月份数
+number of records to read (%1)	calendar	zt	讀取的資料筆數(%1)
 number of records to read (<=200)	calendar	zh	待读取记录数(不大于200)
 observance rule	calendar	zh	惯例
 occurence	calendar	zh	发生
@@ -179,6 +195,7 @@ overlap holiday	calendar	zh	同一天的节日
 participant	calendar	zh	参与者
 participants	calendar	zh	参与者
 participates	calendar	zh	参与
+password for not loged in users to your freebusy information?	calendar	zt	讓未登入使用者檢視您有空或是忙碌的密碼？
 people holiday	calendar	zh	people holiday
 permission denied	calendar	zh	无权访问
 planner	calendar	zh	按组查看
@@ -203,6 +220,7 @@ receive summary of appointments	calendar	zh	接收事项统计
 recurring event	calendar	zh	循环事项
 refresh	calendar	zh	刷新
 reinstate	calendar	zh	复原
+reject	calendar	zt	拒絕
 rejected	calendar	zh	已拒绝
 repeat day	calendar	zh	发生日期
 repeat end date	calendar	zh	终止日期
@@ -223,6 +241,7 @@ set a year only for one-time / non-regular holidays.	calendar	zh	Set a Year only
 set new events to private	calendar	zh	新建事项设为私有
 should invitations you rejected still be shown in your calendar ?<br>you can only accept them later (eg. when your scheduling conflict is removed), if they are still shown in your calendar!	calendar	zh	是否在日程表中已拒绝的邀请?<br>这样, 您可以稍后再接受这些邀请, 例如, 当事项安排不冲突时. 
 should new events created as private by default ?	calendar	zh	新建事项是否默认设为私有?
+should not loged in persons be able to see your freebusy information? you can set an extra password, different from your normal password, to protect this informations. the freebusy information is in ical format and only include the times when you are busy. it does not include the event-name, description or locations. the url to your freebusy information is %1.	calendar	zt	沒有登入的使用者能否知道您現在是有空或是忙碌？您可以設定額外的密碼(不是自己登入的密碼)來避免其他未經授權的人瀏覽。有空或是忙碌的資訊是 iCal 格式，而且只會讓瀏覽的人看到有無行程，他們無法進一步取得行程的詳細資料，像是事件名稱、描述或是地點等。連結到這個功能的網址是  %1 。
 should the mini calendars by printed / displayed in the printer friendly views ?	calendar	zh	是否以便于打印的形式打印/显示简明日程表?
 should the printer friendly view be in black & white or in color (as in normal view)?	calendar	zh	是否以黑白的方式查看便于打印的版本?
 should the status of the event-participants (accept, reject, ...) be shown in brakets after each participants name ?	calendar	zh	在事项参与者的名字后, 是否显示该参与者的回应（接受、拒绝...）?
@@ -242,7 +261,7 @@ start- and enddates	calendar	zh	起始和终止日期
 startdate	calendar	zh	起始日期
 startrecord	calendar	zh	起始记录
 su	calendar	zh	日
-submit to repository	calendar	zh		
+submit to repository	calendar	zt	送出到儲藏庫中	calendar	zh		
 sun	calendar	zh	日
 tentative	calendar	zh	暂定
 test import (show importable records <u>only</u> in browser)	calendar	zh	导入测试(仅在浏览器中显示可导入记录)
@@ -292,6 +311,7 @@ which of calendar view do you want to see, when you start calendar ?	calendar	zh
 work day ends on	calendar	zh	每日止于
 work day starts on	calendar	zh	每日始于
 workdayends	calendar	zh	每日止于
+year	calendar	zt	年
 yearly	calendar	zh	按年查看
 yearview	calendar	zh	按年查看
 you can either set a year or a occurence, not both !!!	calendar	zh	只能设定年份或事件发生其中之一!
@@ -315,4 +335,3 @@ you need to set either a day or a occurence !!!	calendar	zh	只能设定日期
 your meeting scheduled for %1 has been canceled	calendar	zh	您在%1的会议安排已取消
 your meeting that had been scheduled for %1 has been rescheduled to %2	calendar	zh	您在%1的会议已被重新安排至%2
 your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries:	calendar	zh	安排的时间<B>%1—%2</B>和以下事项冲突：
-

filemanager/setup/phpgw_zh.lang

@@ -11,10 +11,12 @@ copied %1 to %2	filemanager	zh	%1已复制到%2
 copy to	filemanager	zh	复制到
 copy to:	filemanager	zh	复制到
 could not copy %1 to %2	filemanager	zh	无法将%1复制到%2
+could not copy file because no destination directory is given	filemanager	zt	無法複製檔案，因為沒有目標資料夾
 could not create %1	filemanager	zh	无法创建%1
 could not create directory %1	filemanager	zh	无法创建目录%1
 could not delete %1	filemanager	zh	无法删除%1
 could not move %1 to %2	filemanager	zh	无法将%1移动到%2
+could not move file because no destination directory is given	filemanager	zt	無法移動檔案，因為沒有目標資料夾
 could not rename %1 to %2	filemanager	zh	无法将%1重命名为%2
 could not save %1	filemanager	zh	无法保存%1
 create file	filemanager	zh	创建文件
@@ -48,7 +50,7 @@ file names cannot contain \ or /	filemanager	zh	文件名不能包含\或/
 filemanager	common	zh	网上文件柜
 filemanager preferences	filemanager	zh	首选项
 files	filemanager	zh	文件
-files is this directory	filemanager	zh	文件总数
+files in this directory	filemanager	zt	資料夾中的檔案
 folder	filemanager	zh	文件夹
 folder up	filemanager	zh	向上
 go home	filemanager	zh	返回首页
@@ -69,11 +71,12 @@ moved %1 to %2	filemanager	zh	%1已移动到%2
 no files in this directory.	filemanager	zh	该目录为空.
 no version history for this file/directory	filemanager	zh	该文件/文件夹无版本历史
 operation	filemanager	zh	操作
+other settings	filemanager	zt	其他設定
 owner	filemanager	zh	所有者
 please select a file to delete.	filemanager	zh	请选择待删除文件.
-preferences old	preferences	zh	首选项
 preview %1	filemanager	zh	预览%1
 preview of %1	filemanager	zh	%1的预览
+quick jump to	filemanager	zt	快速切換
 reload	filemanager	zh	重新载入
 rename	filemanager	zh	重命名
 renamed %1 to %2	filemanager	zh	 %1已重命名为%2
@@ -108,3 +111,4 @@ view documents in new window	filemanager	zh	打开新窗口以查看文档
 view documents on server (if available)	filemanager	zh	可能的话, 在服务器上查看文档
 who	filemanager	zh	谁
 you do not have access to %1	filemanager	zh	无权访问%1
+your home dir did not exist, egroupware created a new one.	filemanager	zt	您的家目錄不存在，eGroupWare建立一個新的

infolog/setup/phpgw_zh.lang

@@ -1,5 +1,6 @@
 %1 records imported	infolog	zh	已导入%1条记录
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	infolog	zh	已读取%1条记录(但尚未导入，您可以进入%2，返回%3，并且清除"测试导入"复选框)
+%1 records read (not yet imported, you may go back and uncheck test import)	infolog	zt	%1 筆資料準備好了(還沒匯入，您必須回到%2上一頁%3並且取消"匯入測試"項目的勾選)
 - subprojects from	infolog	zh	- 子项目来自
 0%	infolog	zh	0%
 10%	infolog	zh	10%
@@ -32,7 +33,6 @@ allows to set the status of an entry, eg. set a todo to done if it's finished (v
 applies the changes	infolog	zh	应用更改
 are you shure you want to delete this entry ?	infolog	zh	确定要删除该事项吗?
 are you sure you want to delete this entry	infolog	zh	确定要删除该事项
-attach	infolog	zh	关联
 attach a file	infolog	zh	添加文件
 attach file	infolog	zh	添加关联文件
 back to main list	infolog	zh	返回主列表
@@ -46,7 +46,6 @@ category	infolog	zh	类别
 change the status of an entry, eg. close it	infolog	zh	更改该事项的状态.
 charset of file	infolog	zh	文件编码
 check to set startday	infolog	zh	选中此项设定起始日期
-click here to attach the file	infolog	zh	点击此处关联该文件
 click here to create the link	infolog	zh	点击此处关联该条目
 click here to start the search	infolog	zh	点击此处开始搜索
 close	infolog	zh	关闭
@@ -72,12 +71,12 @@ customfields	infolog	zh	Customfields
 datecreated	infolog	zh	日期已创建
 dates, status, access	infolog	zh	其他信息
 days	infolog	zh	日
-default	infolog	zh	默认状态
 default filter for infolog	infolog	zh	浏览事项时的默认查看范围
 default status for a new log entry	infolog	zh	新建该类型事项的默认状态
 delegation	infolog	zh	委派
 delete	infolog	zh	删除
 delete all subs (if not subs will be subs of this enties parent or have no parent)	infolog	zh	Delete all subs (if not subs will be subs of this enties parent or have no parent)
+delete one record by passing its id.	infolog	zt	透過傳遞ID來刪除記錄
 delete the entry	infolog	zh	删除该事项
 delete this entry	infolog	zh	删除该事项
 deletes the selected typ	infolog	zh	删除选定类型
@@ -102,29 +101,24 @@ enddate	infolog	zh	终止日期
 enddate can not be before startdate	infolog	zh	终止日期必须在起始日期之后
 enter a custom contact, leave empty if linked entry should be used	infolog	zh	输入自定义联系人, 留空则使用链接条目
 enter a custom phone/email, leave empty if linked entry should be used	infolog	zh	输入自定义电话号码/EMail地址, 留空则使用链接条目
-enter a search pattern	infolog	zh	输入关键字
 enter a textual description of the log-entry	infolog	zh	输入该事项的具体内容
-enter filename to upload and attach, use [browse...] to search for it	infolog	zh	请输入待关联文件的名称, 或通过点击[浏览]来选定文件
 enter the query pattern	infolog	zh	输入查询模式
 entry and all files	infolog	zh	条目及所有文件
 existing links	infolog	zh	现有关联
 fax	infolog	zh	传真
 fieldseparator	infolog	zh	字段分隔符
-file	infolog	zh	文件
 finish	infolog	zh	结束
 for which types should this field be used	infolog	zh	请选择字段所属类型, 即字段对哪些类型的事项可见
 from	infolog	zh	寄件人
-global categories	infolog	zh	全局类别
 high	infolog	zh	高
 id	infolog	zh	代号
 import	infolog	zh	导入
 import next set	infolog	zh	导入下一配置
 info log	common	zh	记事簿
 infolog	common	zh	记事簿
-infolog index	infolog	zh	索引
+infolog - delete	infolog	zt	事件紀錄簿 - 刪除
-infolog - delete	infolog	zh	记事簿-删除
+infolog - edit	infolog	zt	事件紀錄簿 - 編輯
-infolog - edit	infolog	zh	记事簿-编辑
+infolog - import csv-file	infolog	zt	事件紀錄簿 - 匯入CSV檔案
-infolog - import csv-file	infolog	zh	记事簿 - 从CSV文件导入
 infolog - new	infolog	zh	记事簿-新建
 infolog - new subproject	infolog	zh	记事簿 - 新建子项目
 infolog - subprojects from	infolog	zh	记事簿 - 子项目来自
@@ -132,7 +126,6 @@ infolog list	infolog	zh	浏览事项
 infolog preferences	common	zh	记事簿个性化配置
 infolog-fieldname	infolog	zh	记事簿 - 字段名
 invalid filename	infolog	zh	文件名无效
-label	infolog	zh	显示名
 label<br>helptext	infolog	zh	标签<br>提示信息
 last changed	infolog	zh	最近修改记录
 last modified	infolog	zh	最近修改记录
@@ -142,6 +135,7 @@ length<br>rows	infolog	zh	长度<br>高度
 link	infolog	zh	关联
 links	infolog	zh	关联
 links of this entry	infolog	zh	设定与事项相关的条目或文件
+list all categories	infolog	zt	列出所有類別
 list no subs/childs	infolog	zh	不显示子事项
 longer textual description	infolog	zh	设定事项的具体内容
 low	infolog	zh	低
@@ -161,6 +155,7 @@ not	infolog	zh	not
 not assigned	infolog	zh	未指定
 note	infolog	zh	备注
 number of records to read (%1)	infolog	zh	待读取记录数(%1)
+number of records to read (<=200)	infolog	zt	讀取的資料筆數(<=200)
 number of row for a multiline inputfield or line of a multi-select-box	infolog	zh	文本框或多选框的高度
 offer	infolog	zh	等待回应
 ongoing	infolog	zh	正在进行
@@ -168,13 +163,15 @@ only the attachments	infolog	zh	仅显示关联文件
 only the links	infolog	zh	仅显示关联条目
 only up to this number of entries are displayed on the main screen.	infolog	zh	首页中最多可显示多少事项?
 open	infolog	zh	待决事项
-optional note about the link	infolog	zh	该关联的说明
+optional note to the link	infolog	zt	連結的附加說明
 order	infolog	zh	顺序
 overdue	infolog	zh	延误事项
 own	infolog	zh	个人事项
 own open	infolog	zh	待决的个人事项
 own overdue	infolog	zh	延误的个人事项
 own upcoming	infolog	zh	临近的个人事项
+owner	infolog	zt	擁有者
+owner responsible	infolog	zt	負責人
 path on (web-)serverside<br>eg. /var/samba/share	infolog	zh	(Web)服务器端的路径<br>例如. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	zh	存放用户和组文件的路径不能在Web服务器的根目录内!!!
 pattern for search in addressbook	infolog	zh	查找通讯录的模式
@@ -186,12 +183,13 @@ priority	infolog	zh	优先级
 private	infolog	zh	私有事项
 project	infolog	zh	项目
 re:	infolog	zh	回复:
-reg. expr. for local ip's<br>eg. ^192.168.1.	infolog	zh	本地IP地址的正则表达式<br>例如. ^192.168.1.
+read one record by passing its id.	infolog	zt	透過傳遞ID來讀取記錄
 reg. expr. for local ip's<br>eg. ^192\.168\.1\.	infolog	zh	本地IP地址的正则表达式<br>例如.. ^192\.168\.1\.
 remark	infolog	zh	注释
 remove this link (not the entry itself)	infolog	zh	取消关联
 responsible	infolog	zh	委派给
 responsible user, priority, ...	infolog	zh	设定事项的委派及优先级
+returns a list / search for records.	infolog	zt	傳回一個清單 / 搜尋記錄
 save	infolog	zh	确定
 saves the changes made and leaves	infolog	zh	保存更改, 返回上一级页面
 saves this entry	infolog	zh	保存该条目
@@ -199,7 +197,6 @@ search	infolog	zh	搜索
 search for:	infolog	zh	查找:
 select	infolog	zh	指定
 select a category for this entry	infolog	zh	指定该事项的类别
-select a primary contact, to show in the list	infolog	zh	指定在浏览事项时显示的首要关联
 select a priority for this task	infolog	zh	指定该任务的优先级
 select a responsible user: a person you want to delegate this task	infolog	zh	请指定受委派的用户, 将该事项委派给此人.
 select a typ to edit it's status-values or delete it	infolog	zh	选定一个类型以编辑其状态值或删除
@@ -214,7 +211,6 @@ show full usernames	infolog	zh	显示完整的用户名
 show in the infolog list	infolog	zh	浏览事项时是否显示关联?
 show list of upcoming entries	infolog	zh	仅显示临近的事项
 show open entries: tasks/calls/notes on main screen	infolog	zh	在首页显示待决事项
-site configuration	infolog	zh	全局配置
 small view	infolog	zh	小视图查看
 start a new search, cancel this link	infolog	zh	不关联该条目, 重新开始搜索
 startdate	infolog	zh	起始日期
@@ -226,8 +222,7 @@ sub	infolog	zh	子类别
 subject	infolog	zh	标题
 task	infolog	zh	任务
 test import (show importable records <u>only</u> in browser)	infolog	zh	测试导入 (在浏览器中仅显示可导入的记录)
-the name used internaly (<= 10 chars), changeing it makes existing data unavailible	infolog	zh	供系统使用的内部名称(最多10个字符), 更改该名称可能导致已有事项无效
+the name used internaly (<= 32 chars), changeing it makes existing data unavailible	infolog	zt	內部使用名稱(<=32字元)，改變它將造成已經存在的資料無法使用
-the name used internaly (<= 20 chars), changeing it makes existing data unavailible	infolog	zh	供系统使用的内部名称(最多20个字符), 更改该名称可能导致已有事项无效
 the text displayed to the user	infolog	zh	字段的显示名
 this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users.	infolog	zh	浏览记事簿中的事项时, 默认查看哪些条目? 
 til when should the todo or phonecall be finished	infolog	zh	事项的中止日期, 仅对任务和函电有效.
@@ -242,13 +237,10 @@ type ...	infolog	zh	(类型)
 type of the log-entry: note, phonecall or todo	infolog	zh	请选择该事项的类型: 任务, 函电或备注
 unlink	infolog	zh	取消关联
 upcoming	infolog	zh	临近事项
-upload	infolog	zh	提交
 urgency	infolog	zh	紧急
 urgent	infolog	zh	最高
 use button to search for address	infolog	zh	点击该按钮以查找地址
 use button to search for project	infolog	zh	点击该按钮以查找项目
-valid path on clientside<br>eg. \\\\\\\\server\\\\share or e:\\\\	infolog	zh	客户端有效路径<br>例如. \\Server\Share 或 e:\
-valid path on clientside<br>eg. \\\\server\\share or e:\\	infolog	zh	客户端有效路径<br>例如. \\Server\Share 或 e:\
 valid path on clientside<br>eg. \\server\share or e:\	infolog	zh	客户端有效路径<br>例如. \\Server\Share 或 e:\
 values for selectbox	infolog	zh	预设选项
 view all subs of this entry	infolog	zh	查看该条目的所有子任务
@@ -259,6 +251,7 @@ view the parent of this entry and all his subs	infolog	zh	查看该条目的父
 view this linked entry in its application	infolog	zh	查看该关联
 when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage)	infolog	zh	事项的起始日期, 仅对任务和函电有效.it shows up from that date in the filter open or own open (startpage)
 will-call	infolog	zh	将致电
+write (add or update) a record by passing its fields.	infolog	zt	透過傳遞它的欄位來寫入(新增或更新)一筆記錄
 yes - delete	infolog	zh	是
 you can't delete one of the stock types !!!	infolog	zh	无法删除stock类型!!!
 you have entered an invalid ending date	infolog	zh	输入的终止日期无效

phpgwapi/setup/phpgw_zh.lang

@@ -1,5 +1,6 @@
 %1 email addresses inserted	common	zh	已插入%1个EMail地址
-%1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	zh	%1eGroupWare%2 is a multi-user, web-based groupware suite written in %3PHP%4.
+%1 is not executable by the webserver !!!	common	zt	網頁伺服器無法執行 %1 ！
+%1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	zt	%1eGroupWare%2 是多使用者、網頁為基礎的群組軟體，以 %3PHP%4 設計。
 (shift-)click or drag to change value	jscalendar	zh	(Shift-)Click or drag to change value
 - click on any of the time parts to increase it	jscalendar	zh	- Click on any of the time parts to increase it
 - hold mouse button on any of the above buttons for faster selection.	jscalendar	zh	- Hold mouse button on any of the above buttons for faster selection.
@@ -9,6 +10,8 @@
 - use the %1, %2 buttons to select year	jscalendar	zh	- Use the %1, %2 buttons to select year
 00 (disable)	admin	zh	00 (disable)
 13 (ntp)	admin	zh	13 (ntp)
+3 number of chars for day-shortcut	jscalendar	zt	日期的三個字元簡寫
+3 number of chars for month-shortcut	jscalendar	zt	月份的三個字元簡寫
 80 (http)	admin	zh	80 (http)
 about	common	zh	关于
 about %1	common	zh	关于%1
@@ -117,6 +120,8 @@ cocos (keeling) islands	common	zh	科科斯(基灵)群岛
 colombia	common	zh	哥伦比亚
 comoros	common	zh	科摩罗
 company	common	zh	公司
+config password	common	zt	設定管理員密碼
+config username	common	zt	設定管理員帳號
 congo	common	zh	刚果
 congo, the democratic republic of the	common	zh	刚果民主共和国
 cook islands	common	zh	库克群岛
@@ -152,7 +157,8 @@ disable internet explorer png-image-bugfix	common	zh	Disable Internet Explorer p
 disable slider effects	common	zh	Disable slider effects
 disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this.	common	zh	Disable the animated slider effects when showing or hiding menus in the page? Opera and Konqueror users will probably must want this.
 disabled	common	zh	已禁用
-display monday first	common	zh	从星期一开始
+display %s first	jscalendar	zt	先顯示 %s
+display monday first	jscalendar	zt	星期一在首
 display sunday first	common	zh	从星期日开始
 djibouti	common	zh	吉布提
 do you also want to delete all subcategories ?	common	zh	确定也要删除所有的子类别吗?
@@ -245,6 +251,9 @@ guinea	common	zh	几内亚
 guinea-bissau	common	zh	几内亚比绍首都
 guyana	common	zh	圭亚那
 haiti	common	zh	HAITI
+header admin login	common	zt	頁首管理員登入
+header password	common	zt	密碼
+header username	common	zt	帳號
 heard island and mcdonald islands	common	zh	赫德与麦克唐纳群岛
 help	common	zh	显示提示信息
 help using editor	htmlarea	zh	Help using editor
@@ -282,6 +291,7 @@ january	common	zh	一月
 japan	common	zh	日本
 jordan	common	zh	约旦
 july	common	zh	七月
+jun	common	zt	六月
 june	common	zh	六月
 justify center	htmlarea	zh	Justify Center
 justify full	htmlarea	zh	Justify Full
@@ -424,6 +434,7 @@ personal	common	zh	个人
 peru	common	zh	秘鲁
 philippines	common	zh	菲律宾
 phone number	common	zh	电话号码
+phpgroupware: login blocked for user '%1', ip %2	common	zt	phpGroupWare：'%1'帳號鎖定了, IP %2
 pitcairn	common	zh	皮特凯恩
 please %1 by hand	common	zh	请手动%1
 please enter a name	common	zh	请输入名称!
@@ -490,6 +501,7 @@ server name	common	zh	服务器名
 session has been killed	common	zh	会话已中止
 setup	common	zh	安装程序
 setup main menu	common	zh	Setup Main Menu
+setup/config admin login	common	zt	安裝/設定管理員登入
 seychelles	common	zh	塞舌尔
 show all	common	zh	全部显示
 show all categorys	common	zh	显示所有类别
@@ -538,7 +550,6 @@ the mail server returned	common	zh	退回邮件
 this application is current	common	zh	该应用程序当前在用
 this application requires an upgrade	common	zh	该应用程序需要升级
 this name has been used already	common	zh	该名称已被占用!
-This PHP has no IMAP support compiled in!!	common	zh	当前使用的PHP版本不支持IMAP!!
 thursday	common	zh	星期四
 time	common	zh	时间
 time selection:	jscalendar	zh	Time selection:
@@ -616,6 +627,7 @@ you have not entered participants	common	zh	必须输入参与者
 you have selected an invalid date	common	zh	选定的日期无效!
 you have selected an invalid main category	common	zh	选定的主类别无效!
 you have successfully logged out	common	zh	注销成功
+you need to add the webserver user '%1' to the group '%2'.	common	zt	您必須將網站伺服器使用者 '%1' 新增到群組 '%2'
 your message could <b>not</b> be sent!<br>	common	zh	邮件<b>无法</b>发送!<br>
 your message has been sent	common	zh	邮件已发送
 your search returned %1 matchs	common	zh	查找结果：%1个符合条件的记录
@@ -625,3 +637,4 @@ your settings have been updated	common	zh	您的配置已更新
 yugoslavia	common	zh	南斯拉夫
 zambia	common	zh	赞比亚
 zimbabwe	common	zh	津巴布韦
+%1 email addresses inserted	common	zt	已匯入 %1 筆電子郵件位址

preferences/setup/phpgw_zh.lang

@@ -10,6 +10,8 @@ are you sure you want to delete this category ?	preferences	zh	确定要删除
 change your password	preferences	zh	更改密码
 change your profile	preferences	zh	更改个人配置文件
 change your settings	preferences	zh	更改个性化配置
+click to select a color	preferences	zt	選擇一個顏色
+color	preferences	zt	顏色
 country	preferences	zh	国家/地区
 date format	preferences	zh	日期格式
 default	preferences	zh	默认
@@ -27,15 +29,16 @@ hours	preferences	zh	小时
 how do you like to display accounts	preferences	zh	以何种方式显示帐户
 how do you like to select accounts	preferences	zh	以何种方式选择帐户
 how many hours are you in front or after the timezone of the server.<br>if you are in the same time zone as the server select 0 hours, else select your locale date and time.	preferences	zh	您与服务器所在时区的时差, <br>也可以是您所在地的日期和时间. 若在同一时区, 请输入0. 
-How many icons should be shown in the navbar (top of the page). Additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.	preferences	zh	页面顶部工具栏中显示的图标个数. 其余图标在工具栏右侧的下拉式菜单中显示.
+how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.	preferences	zt	導覽列每次要顯示多少個圖示，其他圖示會顯示在一個下拉式選單中。
 how should phpgroupware display dates for you.	preferences	zh	以何种方式显示日期. 
+icon	preferences	zt	圖示
 icons and text	preferences	zh	显示图标和文字
 icons only	preferences	zh	只显示图标
 in which country are you. this is used to set certain defaults for you.	preferences	zh	您所在的国家/地区. 此处的设定将用于设置一些默认值. 
 interface/template selection	preferences	zh	选择界面/界面模板
 language	preferences	zh	语言
 max matches per page	preferences	zh	每页显示的查找结果数
-Max number of icons in navbar	preferences	en	工具栏中的最大图标数
+max number of icons in navbar	preferences	zt	導覽列最多顯示圖示數量
 no default	preferences	zh	无默认值
 note: this feature does *not* change your email password. this will need to be done manually.	preferences	zh	注意：此功能「不会」更改EMail密码, 您必须手动更改. 
 please, select a new theme	preferences	zh	请选择新的界面主题
@@ -48,11 +51,12 @@ 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	选择是否总是显示活动会话的数目. 
 should this help messages shown up always, when you enter the preferences or only on request.	preferences	zh	设置个性化配置, 总是显示该提示信息
+show current users on navigation bar	preferences	zt	在功能列上顯示目前的使用者名稱
 show helpmessages by default	preferences	zh	默认显示提示信息
 show navigation bar as	preferences	zh	工具栏显示方式
-show_more_apps	common	zh	显示更多的应用程序
 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 phpgroupware or click on the homepage icon.<br>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	登录phpGroupWare或点击主页面图标时, 将运行此处指定的默认应用程序.<br>您也可以不设置该选项, 而分别设置应用程序的个性化配置, 籍此在主页面上运行多个应用程序.
 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	该选择框显示所有有效用户(用户数过多将导致显示时间长), 您可以在弹出窗口中按用户名或组名查找用户.
@@ -67,4 +71,4 @@ you can show the applications as icons only, icons with app-name or both.	prefer
 you do not have permission to set acl's in this mode!	preferences	zh	您无权在该模式下设置ACL! 
 you must enter a password	preferences	zh	必须输入密码
 your current theme is: %1	preferences	zh	当前使用的界面主题:%1
-your preferences	preferences	zh	您的个性化配置
+your preferences	preferences	zh	您的个性化配置