From 6237c1e3261d3d7d1f9510259421cd9418a2a2d5 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Sat, 10 Feb 2018 15:18:16 +0000
Subject: [PATCH] A bit more recycling in translations.

---
 WEB-INF/resources/et.lang.php    |  4 ++--
 WEB-INF/resources/hu.lang.php    |  4 ++--
 WEB-INF/resources/ja.lang.php    |  3 +--
 WEB-INF/resources/ko.lang.php    |  3 +--
 WEB-INF/resources/no.lang.php    |  6 ++----
 WEB-INF/resources/pt.lang.php    |  1 -
 WEB-INF/resources/ro.lang.php    |  4 ++--
 WEB-INF/resources/tr.lang.php    | 10 ++++------
 WEB-INF/resources/zh-cn.lang.php |  8 ++++----
 WEB-INF/resources/zh-tw.lang.php |  8 ++++----
 WEB-INF/templates/footer.tpl     |  2 +-
 11 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 982ef866..2187758a 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -449,7 +449,8 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => 'Roll',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -543,7 +544,6 @@ $i18n_key_words = array(
 "form.profile.edit_title" => 'profiili muutmine',
 
 // people form attributes
-"form.people.th.role" => 'roll',
 "form.people.th.rate" => 'hind',
 "form.people.manager" => 'haldur',
 "form.people.comanager" => 'kaashaldur',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 552a102c..e7df2f36 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -444,7 +444,8 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => 'Szerepkör',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -538,7 +539,6 @@ $i18n_key_words = array(
 "form.profile.edit_title" => 'profil szerkesztése',
 
 // people form attributes
-"form.people.th.role" => 'szerepkör',
 "form.people.th.rate" => 'tarifa',
 "form.people.manager" => 'vezető',
 "form.people.rate" => 'általános óradíj',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index eb07cb65..246b8c6e 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -443,7 +443,7 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => '役割', // TODO: is this correct?
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -536,7 +536,6 @@ $i18n_key_words = array(
 "form.profile.showchart" => 'パイ図表の表示',
 
 // people form attributes
-"form.people.th.role" => 'ルール',
 "form.people.th.rate" => '給料',
 "form.people.manager" => '管理者',
 "form.people.rate" => 'デフォルト時間当り給料',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 199342e7..51e28bff 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -446,7 +446,7 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => '직위', // TODO: is this correct? The term "role" describes user function, as in "team manager role".
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -539,7 +539,6 @@ $i18n_key_words = array(
 "form.profile.showchart" => '원 그래프를 보기',
 
 // people form attributes
-"form.people.th.role" => '직위',
 "form.people.th.rate" => '급여',
 "form.people.manager" => '관리자',
 "form.people.rate" => '디폴트 시간당 급여',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 7b77c0b0..5c0db5c8 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -439,7 +439,8 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => 'Rolle',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -535,8 +536,5 @@ $i18n_key_words = array(
 // "form.profile.showchart" => 'vis kakediagram',
 
 // people form attributes
-"form.people.th.role" => 'rolle',
-// Note to translators: the 2 strings below are missing and must be added and translated
-// "form.people.th.rate" => 'timesats',
 "form.people.rate" => 'timesats',
 );
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 70b934b4..d24ed425 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -511,6 +511,5 @@ $i18n_key_words = array(
 "form.profile.edit_title" => 'editando perfil',
 
 // people form attributes
-"form.people.th.role" => 'regra',
 "form.people.manager" => 'gerente',
 );
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index c93abcea..041a30e5 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -448,7 +448,8 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => 'Functie', // TODO: is "Rol" a better term here?
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
 // 'form.users.rate' => 'Rate',
@@ -540,7 +541,6 @@ $i18n_key_words = array(
 "form.profile.edit_title" => 'editeaza profilul',
 
 // people form attributes
-"form.people.th.role" => 'functie',
 "form.people.th.rate" => 'rata',
 "form.people.manager" => 'manager',
 "form.people.comanager" => 'comanager',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 679c410e..cb23b890 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -456,11 +456,12 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => 'Rol',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
-// 'form.users.rate' => 'Rate',
-// 'form.users.default_rate' => 'Default hourly rate',
+'form.users.rate' => 'Tarife', // TODO: is this correct?
+'form.users.default_rate' => 'Varsayılan saat ücreti',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
 // TODO: translate the following.
@@ -549,9 +550,6 @@ $i18n_key_words = array(
 "form.profile.edit_title" => 'profili düzenliyor',
 
 // people form attributes
-"form.people.th.role" => 'rol',
-"form.people.th.rate" => 'tarife',
 "form.people.manager" => 'yönetici',
 "form.people.comanager" => 'yardımcı yönetici',
-"form.people.rate" => 'varsayılan saat ücreti',
 );
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 0e22e6c6..0ccdff6d 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -431,10 +431,12 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => '角色',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
-// 'form.users.rate' => 'Rate',
+'form.users.rate' => '费率',
+// TODO: translate the following.
 // 'form.users.default_rate' => 'Default hourly rate',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
@@ -524,8 +526,6 @@ $i18n_key_words = array(
 "form.profile.showchart" => '显示饼状图',
 
 // people form attributes
-"form.people.th.role" => '角色',
-"form.people.th.rate" => '费率',
 "form.people.manager" => '经理',
 "form.people.comanager" => '合作经理人',
 "form.people.rate" => '默认小时收费',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index c40d31cc..a12c8e29 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -441,10 +441,12 @@ $i18n_key_words = array(
 // 'form.users.active_users' => 'Active Users',
 // 'form.users.inactive_users' => 'Inactive Users',
 // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
-// 'form.users.role' => 'Role',
+'form.users.role' => '角色',
+// TODO: translate the following.
 // 'form.users.manager' => 'Manager',
 // 'form.users.comanager' => 'Co-manager',
-// 'form.users.rate' => 'Rate',
+'form.users.rate' => '費率',
+// TODO: translate the following.
 // 'form.users.default_rate' => 'Default hourly rate',
 
 // Clients form. See example at https://timetracker.anuko.com/clients.php
@@ -534,8 +536,6 @@ $i18n_key_words = array(
 "form.profile.showchart" => '顯示餅狀圖',
 
 // people form attributes
-"form.people.th.role" => '角色',
-"form.people.th.rate" => '費率',
 "form.people.manager" => '經理',
 "form.people.comanager" => '合作經理人',
 "form.people.rate" => '默認小時收費',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b047eca4..75aa1b5a 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.3964 | 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.3965 | 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