X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Fresources%2Fzh-cn.lang.php;h=3dd3896cddb7f35378dc1d305a96f1499472204d;hb=59cc31a364495ff91d9b43fada500982418fd4e7;hp=23940d5e90871ac180bff932aa04ab9b8d49b8af;hpb=0e191e482cfe8660d293b6e0791935c945193b01;p=timetracker.git

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 23940d5e..3dd3896c 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -200,7 +200,8 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.client_name' => 'Client name',
 // 'label.client_address' => 'Client address',
-// 'label.or' => 'or',
+'label.or' => '或',
+// TODO: translate the following.
 // 'label.error' => 'Error',
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* 必填栏目',
@@ -331,8 +332,8 @@ $i18n_key_words = array(
 // 'dropdown.not_paid' => 'not paid',
 
 // Login form. See example at https://timetracker.anuko.com/login.php.
+'form.login.forgot_password' => '忘记密码？',
 // TODO: translate the following.
-// 'form.login.forgot_password' => 'Forgot password?',
 // 'form.login.about' =>'Anuko <a href="https://www.anuko.com/lp/tt_2.htm" target="_blank">Time Tracker</a> is a simple, easy to use, open source time tracking system.',
 
 // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php.
@@ -348,7 +349,8 @@ $i18n_key_words = array(
 // Time form. See example at https://timetracker.anuko.com/time.php.
 // TODO: translate the following.
 // 'form.time.duration_format' => '(hh:mm or 0.0h)',
-// 'form.time.billable' => 'Billable',
+'form.time.billable' => '计费时间',
+// TODO: translate the following.
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
@@ -365,9 +367,9 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.reports.save_as_favorite' => 'Save as favorite',
 'form.reports.confirm_delete' => '您确认要删除收藏的这个报告吗？',
+'form.reports.include_billable' => '计费时间',
+'form.reports.include_not_billable' => '非计费时间',
 // TODO: translate the following.
-// 'form.reports.include_billable' => 'billable',
-// 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 'form.reports.select_period' => '选择时间段',
@@ -443,7 +445,6 @@ $i18n_key_words = array(
 "form.mytime.th.note" => '备注',
 "form.mytime.del_yes" => '成功删除时间记录',
 "form.mytime.no_finished_rec" => '该记录只保存了开始时间。这不是错误。如果需要，请注销。',
-"form.mytime.billable" => '计费时间',
 "form.mytime.warn_tozero_rec" => '由于这段时间是锁定的，该时间记录必须删除',
 "form.mytime.uncompleted" => '未完成',
 
@@ -562,7 +563,6 @@ $i18n_key_words = array(
 "form.client.comment" => '备注',
 
 // miscellaneous strings
-"forward.forgot_password" => '忘记密码？',
 "forward.tocsvfile" => '将数据导出到.csv文件',
 "forward.toxmlfile" => '将数据导出到.xml文件',
 "forward.geninvoice" => '生成发票',
@@ -579,20 +579,11 @@ $i18n_key_words = array(
 "controls.per_at" => '全部时间',
 "controls.per_ty" => '今年',
 "controls.sel_period" => '--- 选择时间段 ---',
-"controls.inc_billable" => '计费时间',
-"controls.inc_nbillable" => '非计费时间',
-"controls.default" => '--- 默认 ---',
-
-// labels
-"label.chart.title1" => '活动用户',
-"label.chart.title2" => '项目用户',
-"label.chart.period" => '图表期限',
 
 "label.inv_str" => '发票',
 "label.set_empl" => '选择用户',
 "label.sel_all" => '全部选择',
 "label.sel_none" => '全部不选',
-"label.or" => '或',
 "label.disable" => '禁用',
 "label.enable" => '启用',
 "label.hrs" => '小时',