From 47a30e69b5389f5e6cf7b7fa879d3410887ab24b Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Tue, 6 Feb 2018 22:27:38 +0000
Subject: [PATCH] A bit more recycling.

---
 WEB-INF/resources/ca.lang.php    |  3 +--
 WEB-INF/resources/cs.lang.php    | 10 +++-------
 WEB-INF/resources/et.lang.php    |  9 ++-------
 WEB-INF/resources/hu.lang.php    |  1 -
 WEB-INF/resources/ja.lang.php    | 21 ++++++++-------------
 WEB-INF/resources/ko.lang.php    | 17 ++++++-----------
 WEB-INF/resources/no.lang.php    | 20 ++++++--------------
 WEB-INF/resources/ro.lang.php    |  5 ++---
 WEB-INF/resources/tr.lang.php    |  5 ++---
 WEB-INF/resources/zh-cn.lang.php | 10 ++++------
 WEB-INF/resources/zh-tw.lang.php | 14 ++++----------
 WEB-INF/templates/footer.tpl     |  2 +-
 12 files changed, 39 insertions(+), 78 deletions(-)

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 35e7c83d..ae785345 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -401,8 +401,8 @@ $i18n_key_words = array(
 'form.reports.group_by' => 'Agrupar per',
 'form.reports.group_by_no' => '--- no agrupar ---',
 'form.reports.group_by_date' => 'data',
+'form.reports.group_by_user' => 'usuari',
 // TODO: translate the following.
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'projecte',
 // TODO: translate the following.
@@ -474,7 +474,6 @@ $i18n_key_words = array(
 // report attributes
 "form.report.from" => 'Data d\\\'inici',
 "form.report.to" => 'Data de fi',
-"form.report.groupby_user" => 'Usuari',
 "form.report.totals_only" => 'Només totals',
 "form.report.total" => 'Hores Totals',
 "form.report.th.empllist" => 'Usuari',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e9583a2a..4fca2246 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -400,8 +400,9 @@ $i18n_key_words = array(
 'form.reports.group_by' => 'Seskupit podle',
 // TODO: translate the following.
 // 'form.reports.group_by_no' => '--- no grouping ---',
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
+// TODO: translate the following.
+'form.reports.group_by_date' => 'datum',
+'form.reports.group_by_user' => 'uživatel',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
@@ -443,7 +444,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => 'přihlásit',
 "form.fpass.send_pass_str" => 'zaslán požadavek k vymazání hesla',
 "form.fpass.send_pass_subj" => 'Anuko Time Tracker požadavek na vymazání hesla',
 // Note to translators: this string needs to be translated.
@@ -475,7 +475,6 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => 'vytvořit nový manažerský účet',
 "form.profile.edit_title" => 'upravit profil',
-"form.profile.login" => 'přihlásit',
 
 "form.profile.showchart" => 'zobrazuj grafy',
 
@@ -484,13 +483,11 @@ $i18n_key_words = array(
 "form.people.createu_str" => 'vytváření nového uživatele',
 "form.people.edit_str" => 'nastavení uživatele',
 "form.people.del_str" => 'smazat uživatele',
-"form.people.th.login" => 'přihlásit',
 "form.people.th.role" => 'role',
 "form.people.th.rate" => 'sazba',
 "form.people.manager" => 'manažer',
 "form.people.comanager" => 'spolumanažer',
 "form.people.empl" => 'uživatel',
-"form.people.login" => 'přihlásit',
 
 "form.people.rate" => 'hodinová sazba',
 "form.people.comanager" => 'spolumanažer',
@@ -498,7 +495,6 @@ $i18n_key_words = array(
 // report attributes
 "form.report.from" => 'počáteční datum',
 "form.report.to" => 'koncové datum',
-"form.report.groupby_user" => 'uživatel',
 "form.report.totals_only" => 'pouze součty',
 "form.report.total" => 'součty hodin',
 "form.report.th.empllist" => 'uzivatel',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 875b9921..2bb2da70 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -398,9 +398,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => 'Näita välju',
 'form.reports.group_by' => 'Grupeeri',
 'form.reports.group_by_no' => '--- ilma grupeerimata ---',
+'form.reports.group_by_date' => 'kuupäev',
+'form.reports.group_by_user' => 'kasutaja',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'projekt',
 // TODO: translate the following.
@@ -442,7 +442,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => 'login',
 "form.fpass.send_pass_str" => 'salasõna tühjendamise käsk edastatud',
 // Note to translators: the 3 strings below must be translated
 // "form.fpass.send_pass_subj" => 'AnukoTime Tracker password reset request',
@@ -476,20 +475,17 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => 'loo uus halduri konto',
 "form.profile.edit_title" => 'profiili muutmine',
-"form.profile.login" => 'login',
 
 // people form attributes
 "form.people.ppl_str" => 'inimesed',
 "form.people.createu_str" => 'loo uus kasutaja',
 "form.people.edit_str" => 'kasutaja muutmine',
 "form.people.del_str" => 'kasutaja kustutamine',
-"form.people.th.login" => 'login',
 "form.people.th.role" => 'roll',
 "form.people.th.rate" => 'hind',
 "form.people.manager" => 'haldur',
 "form.people.comanager" => 'kaashaldur',
 "form.people.empl" => 'kasutaja',
-"form.people.login" => 'login',
 
 "form.people.rate" => 'vaikimisi tunni hind',
 "form.people.comanager" => 'kaashaldur',
@@ -497,7 +493,6 @@ $i18n_key_words = array(
 // report attributes
 "form.report.from" => 'algab kuupäevast',
 "form.report.to" => 'lõpeb kuupäeval',
-"form.report.groupby_user" => 'kasutaja',
 "form.report.totals_only" => 'ainult summad',
 "form.report.total" => 'tunde kokku',
 "form.report.th.empllist" => 'kasutaja',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 67c99c17..30d0c736 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -486,7 +486,6 @@ $i18n_key_words = array(
 // report attributes
 "form.report.from" => 'kezdő időpont',
 "form.report.to" => 'vég időpont',
-"form.report.groupby_user" => 'személyek szerint',
 "form.report.totals_only" => 'csak a teljes óraszám',
 "form.report.total" => 'összesített óraszám',
 "form.report.th.empllist" => 'dolgozó',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 8ebdc92c..7c5814bb 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -151,8 +151,7 @@ $i18n_key_words = array(
 // 'label.manager_login' => 'Manager login',
 'label.person_name' => '名前',
 'label.thing_name' => '名前',
-// TODO: translate the following.
-// 'label.login' => 'Login',
+'label.login' => 'ログインID',
 'label.password' => 'パスワード',
 'label.confirm_password' => 'パスワードの確認',
 'label.email' => 'Eメール',
@@ -164,8 +163,9 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.start_date' => 'Start date',
 // 'label.end_date' => 'End date',
-// 'label.user' => 'User',
-// 'label.users' => 'Users',
+'label.user' => 'ユーザー',
+'label.users' => 'ユーザー',
+// TODO: translate the following.
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
 // 'label.option' => 'Option',
@@ -202,7 +202,8 @@ $i18n_key_words = array(
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
 // 'label.id' => 'ID',
-// 'label.language' => 'Language',
+'label.language' => '言語',
+// TODO: translate the following.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.date_format' => '日付形式',
 'label.time_format' => '時間形式',
@@ -398,9 +399,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => 'フィールドの表示',
 'form.reports.group_by' => '次のようにグループ化',
 'form.reports.group_by_no' => '--- グループの機能がありません ---',
+'form.reports.group_by_date' => '日付',
+'form.reports.group_by_user' => 'ユーザー',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'プロジェクト',
 // TODO: translate the following.
@@ -442,7 +443,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => 'ログイン',
 "form.fpass.send_pass_str" => '送信したパスワードの初期化の要求',
 "form.fpass.send_pass_subj" => 'Anuko Time Trackerのパスワードの初期化の要求',
 // Note to translators: the ending of this string below needs to be translated.
@@ -476,22 +476,18 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => '新規管理者のアカウントの作成',
 "form.profile.edit_title" => 'プロファイルの編集',
-"form.profile.login" => 'ログインID',
 "form.profile.showchart" => 'パイ図表の表示',
-"form.profile.lang" => '言語',
 
 // people form attributes
 "form.people.ppl_str" => 'メンバー',
 "form.people.createu_str" => '新規ユーザーの作成',
 "form.people.edit_str" => 'ユーザーの編集',
 "form.people.del_str" => 'ユーザーの削除',
-"form.people.th.login" => 'ログインID',
 "form.people.th.role" => 'ルール',
 "form.people.th.rate" => '給料',
 "form.people.manager" => '管理者',
 "form.people.comanager" => '共同管理者',
 "form.people.empl" => 'ユーザー',
-"form.people.login" => 'ログインID',
 
 "form.people.rate" => 'デフォルト時間当り給料',
 "form.people.comanager" => '共同管理者',
@@ -500,7 +496,6 @@ $i18n_key_words = array(
 "form.report.title" => 'レポート',
 "form.report.from" => '開始日付',
 "form.report.to" => '終了日付',
-"form.report.groupby_user" => 'ユーザー',
 "form.report.totals_only" => '全体だけ',
 "form.report.total" => '合計時間',
 "form.report.th.empllist" => 'ユーザー',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4f116fa1..230e5507 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -151,8 +151,7 @@ $i18n_key_words = array(
 // 'label.manager_login' => 'Manager login',
 'label.person_name' => '이름',
 'label.thing_name' => '이름',
-// TODO: translate the following.
-// 'label.login' => 'Login',
+'label.login' => '로그인ID',
 'label.password' => 'Password',
 'label.confirm_password' => '암호 확인',
 'label.email' => '이메일',
@@ -164,8 +163,9 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.start_date' => 'Start date',
 // 'label.end_date' => 'End date',
-// 'label.user' => 'User',
-// 'label.users' => 'Users',
+'label.user' => '사용자',
+'label.users' => '사용자',
+// TODO: translate the following.
 // 'label.client' => 'Client',
 // 'label.clients' => 'Clients',
 // 'label.option' => 'Option',
@@ -399,9 +399,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => '필드들을 보기',
 'form.reports.group_by' => '다음것에 의한 그룹화',
 'form.reports.group_by_no' => '--- 그룹화되지 않음 ---',
+'form.reports.group_by_date' => '날짜',
+'form.reports.group_by_user' => '사용자',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => '프로젝트',
 // TODO: translate the following.
@@ -443,7 +443,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => '로그인',
 "form.fpass.send_pass_str" => '송신한 암호 재설정 요청',
 "form.fpass.send_pass_subj" => 'Anuko Time Tracker 암호 재설정 요청',
 // Note to translators: the ending of this string below needs to be translated.
@@ -477,7 +476,6 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => '신규 관리자 계정을 생성',
 "form.profile.edit_title" => '프로필을 편집하기',
-"form.profile.login" => '로그인ID',
 "form.profile.showchart" => '원 그래프를 보기',
 
 // people form attributes
@@ -485,13 +483,11 @@ $i18n_key_words = array(
 "form.people.createu_str" => '신규 사용자를 만들기',
 "form.people.edit_str" => '사용자를 편집하기',
 "form.people.del_str" => '사용자를 삭제하기',
-"form.people.th.login" => '로그인ID',
 "form.people.th.role" => '직위',
 "form.people.th.rate" => '급여',
 "form.people.manager" => '관리자',
 "form.people.comanager" => '공동관리자',
 "form.people.empl" => '사용자',
-"form.people.login" => '로그인ID',
 
 "form.people.rate" => '디폴트 시간당 급여',
 "form.people.comanager" => '공동관리자',
@@ -500,7 +496,6 @@ $i18n_key_words = array(
 "form.report.title" => '보고서',
 "form.report.from" => '시작 날짜',
 "form.report.to" => '마감 날짜',
-"form.report.groupby_user" => '사용자',
 "form.report.totals_only" => '오직 전체만',
 "form.report.total" => '시간 총합',
 "form.report.th.empllist" => '사용자',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a617c366..b6dde611 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -150,8 +150,7 @@ $i18n_key_words = array(
 // 'label.manager_login' => 'Manager login',
 'label.person_name' => 'Navn',
 'label.thing_name' => 'Navn',
-// TODO: translate the following.
-// 'label.login' => 'Login',
+'label.login' => 'Innlogging', // TODO: is this correct translation for a label?
 'label.password' => 'Passord',
 'label.confirm_password' => 'Bekreft passord',
 'label.email' => 'E-post',
@@ -201,7 +200,8 @@ $i18n_key_words = array(
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
 // 'label.id' => 'ID',
-// 'label.language' => 'Language',
+'label.language' => 'Språk',
+// TODO: translate the following.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.date_format' => 'Datoformat',
 'label.time_format' => 'Tidsformat',
@@ -392,8 +392,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => 'Vis feltene',
 // 'form.reports.group_by' => 'Group by',
 // 'form.reports.group_by_no' => '--- no grouping ---',
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
+'form.reports.group_by_date' => 'dato',
+'form.reports.group_by_user' => 'bruker',
+// TODO: translate the following.
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'prosjekt',
 // TODO: translate the following.
@@ -435,7 +436,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => 'innlogging',
 "form.fpass.send_pass_str" => 'passordet er sendt',
 "form.fpass.send_pass_subj" => 'Anuko Time Tracker passordet ditt',
 // Note to translators: strings below need to be translated.
@@ -472,31 +472,23 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => 'lag ny adminkonto',
 "form.profile.edit_title" => 'endre profil',
-"form.profile.login" => 'innlogging',
 
 // Note to translators: the strings below are missing and must be added and translated
 // "form.profile.showchart" => 'vis kakediagram',
-// "form.profile.lang" => 'språk',
 
 // people form attributes
 "form.people.ppl_str" => 'personer',
 "form.people.createu_str" => 'legg til ny bruker',
 "form.people.edit_str" => 'endre bruker',
 "form.people.del_str" => 'slett bruker',
-"form.people.th.login" => 'innlogging',
 "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',
-// Note to translators: the strings below must be correctly translated
-// "form.people.manager" => 'admin',
-// "form.people.comanager" => 'co-manager',
 "form.people.empl" => 'bruker',
-"form.people.login" => 'innlogging',
 "form.people.rate" => 'timesats',
 
 // report attributes
 "form.report.title" => 'rapporter',
-"form.report.groupby_user" => 'bruker',
 // Note to translators: the strings below must be translated 
 // "form.report.totals_only" => 'kun summer',
 "form.report.total" => 'totalt antall timer',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index bd1eecb3..e14dca3d 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -395,9 +395,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => 'Arata campuri',
 'form.reports.group_by' => 'Grupat dupa',
 'form.reports.group_by_no' => '--- fara grupare ---',
+'form.reports.group_by_date' => 'data',
+'form.reports.group_by_user' => 'utilizator',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'proiect',
 // TODO: translate the following.
@@ -489,7 +489,6 @@ $i18n_key_words = array(
 "form.report.title" => 'rapoarte',
 "form.report.from" => 'data inceput',
 "form.report.to" => 'data sfarsit',
-"form.report.groupby_user" => 'utilizator',
 "form.report.totals_only" => 'numai totaluri',
 "form.report.total" => 'ore total',
 "form.report.th.empllist" => 'utilizator',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index dce08450..7fcb6bee 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -406,9 +406,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => 'Alanları göster',
 'form.reports.group_by' => 'Gruplandırma kıstas',
 'form.reports.group_by_no' => '--- gruplama yok ---',
+'form.reports.group_by_date' => 'tarih',
+'form.reports.group_by_user' => 'kullanıcı',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => 'proje',
 // TODO: translate the following.
@@ -502,7 +502,6 @@ $i18n_key_words = array(
 "form.report.title" => 'raporlar',
 "form.report.from" => 'başlangıç tarihi',
 "form.report.to" => 'son tarihi',
-"form.report.groupby_user" => 'kullanıcı',
 "form.report.totals_only" => 'sadece toplamlar',
 "form.report.total" => 'saat toplamı',
 "form.report.th.empllist" => 'kullanıcı',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 9ec9f838..3a08ff6e 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -190,7 +190,8 @@ $i18n_key_words = array(
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
 // 'label.id' => 'ID',
-// 'label.language' => 'Language',
+'label.language' => '语言',
+// TODO: translate the following.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.date_format' => '日期格式',
 'label.time_format' => '时间格式',
@@ -383,9 +384,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => '显示栏目',
 'form.reports.group_by' => '分组方式',
 'form.reports.group_by_no' => '--- 没有分组 ---',
+'form.reports.group_by_date' => '日期',
+'form.reports.group_by_user' => '用户',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => '项目',
 // TODO: translate the following.
@@ -460,9 +461,7 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => '新建管理账号',
 "form.profile.edit_title" => '编辑简介',
-
 "form.profile.showchart" => '显示饼状图',
-"form.profile.lang" => '语言',
 
 // people form attributes
 "form.people.ppl_str" => '人员',
@@ -482,7 +481,6 @@ $i18n_key_words = array(
 "form.report.title" => '报告',
 "form.report.from" => '开始日期',
 "form.report.to" => '结束日期',
-"form.report.groupby_user" => '用户',
 "form.report.totals_only" => '仅仅今天',
 "form.report.total" => '总计时间',
 "form.report.th.empllist" => '用户',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 1c5483e4..2a509d02 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -198,7 +198,8 @@ $i18n_key_words = array(
 // 'label.day_view' => 'Day view',
 // 'label.week_view' => 'Week view',
 // 'label.id' => 'ID',
-// 'label.language' => 'Language',
+'label.language' => '語言',
+// TODO: translate the following.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.date_format' => '日期格式',
 'label.time_format' => '時間格式',
@@ -391,9 +392,9 @@ $i18n_key_words = array(
 'form.reports.show_fields' => '顯示欄目',
 'form.reports.group_by' => '分組方式',
 'form.reports.group_by_no' => '--- 沒有分組 ---',
+'form.reports.group_by_date' => '日期',
+'form.reports.group_by_user' => '用戶',
 // TODO: translate the following.
-// 'form.reports.group_by_date' => 'date',
-// 'form.reports.group_by_user' => 'user',
 // 'form.reports.group_by_client' => 'client',
 'form.reports.group_by_project' => '項目',
 // TODO: translate the following.
@@ -435,7 +436,6 @@ $i18n_key_words = array(
 // TODO: refactoring ongoing down from here.
 
 // password reminder form attributes
-"form.fpass.login" => '登錄',
 "form.fpass.send_pass_str" => '密碼重設請求已經發送',
 "form.fpass.send_pass_subj" => 'Anuko時間追蹤器密碼重設請求',
 // Note to translators: the ending of this string below needs to be translated.
@@ -469,23 +469,18 @@ $i18n_key_words = array(
 // Note to translators: we need a more accurate translation of form.profile.create_title
 "form.profile.create_title" => '創建新管理帳號',
 "form.profile.edit_title" => '編輯簡介',
-"form.profile.login" => '登錄',
-
 "form.profile.showchart" => '顯示餅狀圖',
-"form.profile.lang" => '語言',
 
 // people form attributes
 "form.people.ppl_str" => '人員',
 "form.people.createu_str" => '新建用戶',
 "form.people.edit_str" => '編輯用戶',
 "form.people.del_str" => '刪除用戶',
-"form.people.th.login" => '登錄',
 "form.people.th.role" => '角色',
 "form.people.th.rate" => '費率',
 "form.people.manager" => '經理',
 "form.people.comanager" => '合作經理人',
 "form.people.empl" => '用戶',
-"form.people.login" => '登錄',
 
 "form.people.rate" => '默認小時收費',
 "form.people.comanager" => '合作經理人',
@@ -494,7 +489,6 @@ $i18n_key_words = array(
 "form.report.title" => '報告',
 "form.report.from" => '開始日期',
 "form.report.to" => '結束日期',
-"form.report.groupby_user" => '用戶',
 "form.report.totals_only" => '僅僅今天',
 "form.report.total" => '總計時間',
 "form.report.th.empllist" => '用戶',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bc4a131b..5d52e894 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.3918 | 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.3919 | 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