From ceb103409d123c30e3c1c485b1f06293d1fe7308 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Wed, 7 Feb 2018 01:57:17 +0000
Subject: [PATCH] Some more recycling in translations.

---
 WEB-INF/resources/ca.lang.php    |  3 ++-
 WEB-INF/resources/cs.lang.php    |  4 ++--
 WEB-INF/resources/et.lang.php    | 28 +++++++++++++++-------------
 WEB-INF/resources/hu.lang.php    |  2 +-
 WEB-INF/resources/ja.lang.php    | 19 +++++++------------
 WEB-INF/resources/ko.lang.php    |  5 ++---
 WEB-INF/resources/no.lang.php    |  6 +++---
 WEB-INF/resources/pt.lang.php    |  3 ++-
 WEB-INF/resources/ro.lang.php    |  3 ++-
 WEB-INF/resources/sl.lang.php    |  3 ++-
 WEB-INF/resources/tr.lang.php    |  3 ++-
 WEB-INF/resources/zh-cn.lang.php | 11 +++++------
 WEB-INF/resources/zh-tw.lang.php |  3 +--
 WEB-INF/templates/footer.tpl     |  2 +-
 14 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 9326ef32..e5c5b810 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -307,7 +307,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Perfil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 084a0ab1..72c2a190 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -311,7 +311,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Profil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -504,7 +505,6 @@ $i18n_key_words = array(
 "form.invoice.th.rate" => 'sazba',
 "form.invoice.th.summ" => 'množství',
 "form.invoice.subtotal" => 'subtotal',
-"form.invoice.customer" => 'zákazník',
 "form.invoice.mailinv_above" => 'poslat fakturu e-mailem',
 "form.invoice.sending_str" => '<b>faktura odeslána</b>',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index d85027da..d6850f26 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -165,8 +165,9 @@ $i18n_key_words = array(
 'label.user' => 'Kasutaja',
 // TODO: translate the following.
 // 'label.users' => 'Users',
-// 'label.client' => 'Client',
-// 'label.clients' => 'Clients',
+'label.client' => 'Klient',
+'label.clients' => 'Kliendid',
+// TODO: translate the following.
 // 'label.option' => 'Option',
 // 'label.invoice' => 'Invoice',
 'label.project' => 'Projekt',
@@ -251,6 +252,10 @@ $i18n_key_words = array(
 // 'label.week_list' => 'Week list',
 
 // Form titles.
+// TODO: Improve titles for consistency, so that each title explains correctly what each
+// page is about and is "consistent" from page to page, meaning that correct grammar is used everywhere.
+// Compare with English file to see how it is done there and do Estonian titles similarly.
+// Specifically: lisamine vs lisa, etc.
 'title.login' => 'Login',
 // TODO: translate the following.
 // 'title.teams' => 'Teams',
@@ -290,10 +295,11 @@ $i18n_key_words = array(
 // 'title.add_user' => 'Adding User',
 // 'title.edit_user' => 'Editing User',
 // 'title.delete_user' => 'Deleting User',
-// 'title.clients' => 'Clients',
-// 'title.add_client' => 'Adding Client',
-// 'title.edit_client' => 'Editing Client',
-// 'title.delete_client' => 'Deleting Client',
+'title.clients' => 'Kliendid',
+'title.add_client' => 'Lisa klient',
+'title.edit_client' => 'Muuda klienti',
+'title.delete_client' => 'Kustuta klient',
+// TODO: translate the following.
 // 'title.invoices' => 'Invoices',
 // 'title.add_invoice' => 'Adding Invoice',
 // 'title.view_invoice' => 'Viewing Invoice',
@@ -306,8 +312,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 'title.options' => 'Suvandid',
+'title.profile' => 'Profiili',
 // TODO: translate the following.
-// 'title.profile' => 'Profile',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -342,7 +348,8 @@ $i18n_key_words = array(
 'dropdown.projects' => 'projektid',
 // TODO: translate the following.
 // 'dropdown.tasks' => 'tasks',
-// 'dropdown.clients' => 'clients',
+'dropdown.clients' => 'kliendid',
+// TODO: translate the following.
 // 'dropdown.select' => '--- select ---',
 // 'dropdown.select_invoice' => '--- select invoice ---',
 // 'dropdown.status_active' => 'active',
@@ -528,11 +535,6 @@ $i18n_key_words = array(
 "form.migration.compression.gzip" => 'gzip',
 "form.migration.compression.bzip" => 'bzip',
 
-"form.client.title" => 'kliendid',
-"form.client.add_title" => 'lisa klient',
-"form.client.edit_title" => 'muuda klienti',
-"form.client.del_title" => 'kustuta klient',
-
 // miscellaneous strings
 "forward.tocsvfile" => 'ekspordi andmed .csv faili',
 "forward.toxmlfile" => 'ekspordi andmed .xml faili',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index c86396db..9b2f42b3 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -305,8 +305,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 'title.options' => 'Opciók',
+'title.profile' => 'Profil',
 // TODO: translate the following.
-// 'title.profile' => 'Profile',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index d83a2824..6384565a 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -220,7 +220,7 @@ $i18n_key_words = array(
 '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.ldap_hint' => '下記のフィールドにあなたの<b>WindowsのログインID</b>と<b>パスワード</b>を入力してください。',
 'label.required_fields' => '* 必須のフィールド',
 'label.on_behalf' => 'を代表して',
 // TODO: translate all 3 roles properly, see https://www.anuko.com/time_tracker/user_guide/user_accounts.htm
@@ -292,10 +292,11 @@ $i18n_key_words = array(
 // 'title.add_user' => 'Adding User',
 // 'title.edit_user' => 'Editing User',
 // 'title.delete_user' => 'Deleting User',
-// 'title.clients' => 'Clients',
-// 'title.add_client' => 'Adding Client',
-// 'title.edit_client' => 'Editing Client',
-// 'title.delete_client' => 'Deleting Client',
+'title.clients' => 'クライアント',
+'title.add_client' => 'クライアントの追加',
+'title.edit_client' => 'クライアントの編集',
+'title.delete_client' => 'クライアントの削除',
+// TODO: translate the following.
 // 'title.invoices' => 'Invoices',
 // 'title.add_invoice' => 'Adding Invoice',
 // 'title.view_invoice' => 'Viewing Invoice',
@@ -308,8 +309,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 'title.options' => 'オプション',
+'title.profile' => 'プロファイル',
 // TODO: translate the following.
-// 'title.profile' => 'Profile',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -530,11 +531,6 @@ $i18n_key_words = array(
 "form.migration.compression.gzip" => 'gzip',
 "form.migration.compression.bzip" => 'bzip',
 
-"form.client.title" => 'クライアント',
-"form.client.add_title" => 'クライアントの追加',
-"form.client.edit_title" => 'クライアントの編集',
-"form.client.del_title" => 'クライアントの削除',
-
 // miscellaneous strings
 "forward.tocsvfile" => 'csvファイルにエクスポート',
 "forward.toxmlfile" => 'xmlファイルにエクスポート',
@@ -558,5 +554,4 @@ $i18n_key_words = array(
 "label.disable" => '使用中止',
 "label.enable" => '使用可能',
 "label.hrs" => '時間',
-"label.ldap_hint" => '下記のフィールドにあなたの<b>WindowsのログインID</b>と<b>パスワード</b>を入力してください。',
 );
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f7b904c8..b650bdd6 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -219,7 +219,7 @@ $i18n_key_words = array(
 '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.ldap_hint' => '아래의 필드들에서 <b>Windows 로그인</b> 및 <b>암호</b> 를 입력하십시오.',
 'label.required_fields' => '* 필수 필드',
 'label.on_behalf' => '을 대표하여',
 // TODO: translate all 3 roles properly, see https://www.anuko.com/time_tracker/user_guide/user_accounts.htm
@@ -309,8 +309,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 'title.options' => '옵션',
+'title.profile' => '프로필',
 // TODO: translate the following.
-// 'title.profile' => 'Profile',
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -554,5 +554,4 @@ $i18n_key_words = array(
 "label.disable" => '무력화',
 "label.enable" => '가능화',
 "label.hrs" => '시간',
-"label.ldap_hint" => '아래의 필드들에서 <b>Windows 로그인</b> 및 <b>암호</b> 를 입력하십시오.',
 );
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index df1df4b1..47f827ab 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -218,7 +218,7 @@ $i18n_key_words = array(
 'label.or' => 'eller',
 // 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.ldap_hint' => 'Skriv din <b>Windows login</b> og <b>passord</b> i feltene nedenfor.',
 'label.required_fields' => '* obligatoriske felt',
 'label.on_behalf' => 'på vegne av',
 // TODO: translate the following.
@@ -303,7 +303,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Profil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -559,7 +560,6 @@ $i18n_key_words = array(
 // "label.disable" => 'slå av',
 // "label.enable" => 'slå på',
 // "label.hrs" => 'timer',
-// "label.ldap_hint" => 'Skriv din <b>Windows login</b> og <b>passord</b> i feltene nedenfor.',
 
 // login hello text
 // "login.hello.text" => "Anuko Time Tracker er et enkelt, brukervennlig tidsregistreringssystem basert på åpen kildekode.",
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ae6fe226..02e776c7 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -296,7 +296,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Perfil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index cff13b56..5363dc14 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -307,7 +307,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Profil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7bd9d092..ae8f483c 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -293,7 +293,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Profil',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index febc990b..328ca55b 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -315,7 +315,8 @@ $i18n_key_words = array(
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
 // 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.profile' => 'Profili',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index a48a2940..29e8fd53 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -155,8 +155,8 @@ $i18n_key_words = array(
 'label.users' => '用户',
 'label.client' => '客户',
 'label.clients' => '客户',
+'label.option' => '选项',
 // TODO: translate the following.
-// 'label.option' => 'Option',
 // 'label.invoice' => 'Invoice',
 'label.project' => '项目',
 'label.projects' => '项目',
@@ -208,7 +208,7 @@ $i18n_key_words = array(
 '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.ldap_hint' => '在下面的栏目输入您的<b>Windows用户名</b>和<b>密码</b>。',
 'label.required_fields' => '* 必填栏目',
 'label.on_behalf' => '代表',
 'label.role_manager' => '(经理)',
@@ -294,8 +294,9 @@ $i18n_key_words = array(
 // 'title.monthly_quotas' => 'Monthly Quotas',
 // 'title.export' => 'Exporting Team Data',
 // 'title.import' => 'Importing Team Data',
-// 'title.options' => 'Options',
-// 'title.profile' => 'Profile',
+'title.options' => '选项',
+'title.profile' => '简介',
+// TODO: translate the following.
 // 'title.cf_custom_fields' => 'Custom Fields',
 // 'title.cf_add_custom_field' => 'Adding Custom Field',
 // 'title.cf_edit_custom_field' => 'Editing Custom Field',
@@ -445,7 +446,6 @@ $i18n_key_words = array(
 "form.admin.profile.comment" => '删除团队',
 "form.admin.profile.th.id" => 'ID号',
 "form.admin.profile.th.active" => '启用',
-"form.admin.options" => '选项',
 
 // my time form attributes
 "form.mytime.title" => '我的时间记录',
@@ -541,7 +541,6 @@ $i18n_key_words = array(
 "label.disable" => '禁用',
 "label.enable" => '启用',
 "label.hrs" => '小时',
-"label.ldap_hint" => '在下面的栏目输入您的<b>Windows用户名</b>和<b>密码</b>。',
 
 // login hello text
  "login.hello.text" => "anuko时间跟踪器是一种简单、易用、开放源代码的实时跟踪系统。",
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 608fa92c..953c7bcf 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -217,7 +217,7 @@ $i18n_key_words = array(
 '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.ldap_hint' => '在下麵的欄目輸入您的<b>Windows用戶名</b>和<b>密碼</b>。',
 'label.required_fields' => '* 必填欄目',
 'label.on_behalf' => '代表',
 'label.role_manager' => '(經理)',
@@ -549,5 +549,4 @@ $i18n_key_words = array(
 "label.disable" => '禁用',
 "label.enable" => '啟用',
 "label.hrs" => '小時',
-"label.ldap_hint" => '在下麵的欄目輸入您的<b>Windows用戶名</b>和<b>密碼</b>。',
 );
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bfb70079..77afab26 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.12.3923 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.12.3924 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
-- 
2.20.1