More refactoring in translation files.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c0a6931..2934717 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -446,8 +446,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar període de temps',
 'form.reports.set_period' => 'o establir dates',
 'form.reports.show_fields' => 'Mostrar camps',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d48497c..c85cb68 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -456,8 +456,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Výberte období',
 'form.reports.set_period' => 'nebo určete dny',
 'form.reports.show_fields' => 'Zobrazit pole',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 2a639b2..3dfb41c 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -422,8 +422,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vælg en periode',
 'form.reports.set_period' => 'eller sæt datoer',
 'form.reports.show_fields' => 'Vis felter',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 016ec85..c787f6d 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -402,8 +402,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zeitraum auswählen',
 'form.reports.set_period' => 'oder Datum eingeben',
 'form.reports.show_fields' => 'Felder anzeigen',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 4ec12f8..5c91c3e 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -398,8 +398,6 @@ $i18n_key_words = array(
 'form.reports.include_assigned' => 'assigned',
 'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.include_pending' => 'pending',
-'form.reports.include_approved' => 'approved',
-'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3c6c44c..c867417 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -459,8 +459,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleccionar período de tiempo',
 'form.reports.set_period' => 'o establecer fechas',
 'form.reports.show_fields' => 'Mostrar campos',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index cccc548..7f2fe8e 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -427,9 +427,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
-
 'form.reports.select_period' => 'Vali ajaperiood',
 'form.reports.set_period' => 'või märgi kuupäevad',
 'form.reports.show_fields' => 'Näita välju',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 95a1573..fdbcdba 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -442,8 +442,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'انتخاب بازه زمانی',
 'form.reports.set_period' => 'یا تعیین تاریخ',
 'form.reports.show_fields' => 'نمایش فیلدها',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index c06af3d..bc66a22 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -427,8 +427,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Valitse ajanjakso',
 'form.reports.set_period' => 'tai aseta päivät',
 'form.reports.show_fields' => 'Näytä kentät',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index f95325d..840f855 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -419,8 +419,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Sélectionner la période de temps',
 'form.reports.set_period' => 'ou dates indiquées',
 'form.reports.show_fields' => 'Afficher les champs',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8079b6f..2ebdaa8 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -411,8 +411,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Επιλογή χρονικής περιόδου',
 'form.reports.set_period' => 'ή εύρος ημερομηνιών',
 'form.reports.show_fields' => 'Εμφάνιση πεδίων',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index c2f6665..cac16e9 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -448,8 +448,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'בחר תקופת זמן',
 'form.reports.set_period' => 'או הגדר תאריכים',
 'form.reports.show_fields' => 'הראה שדות',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 245275a..f4d5dd1 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -448,8 +448,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Jelölj meg egy időszakot',
 'form.reports.set_period' => 'vagy állíts be konkrét dátumot',
 // TODO: translate the following.

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index da1f2ff..3d898e2 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -424,8 +424,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Seleziona il periodo di tempo',
 'form.reports.set_period' => 'oppure setta le date',
 'form.reports.show_fields' => 'Mostra i campi',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index faa4979..7f1a841 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -454,8 +454,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '時間期間の選択',
 'form.reports.set_period' => 'あるいは日付を設定',
 'form.reports.show_fields' => 'フィールドの表示',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 89c01a3..c5b7e0a 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -452,8 +452,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '시간 기간을 선택',
 'form.reports.set_period' => '혹은 날짜를 설정',
 'form.reports.show_fields' => '필드들을 보기',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 191e8ae..7307ec4 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -398,8 +398,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Kies periode',
 'form.reports.set_period' => 'of stel datums in',
 'form.reports.show_fields' => 'Toon velden',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 1f4cd35..a050711 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -452,8 +452,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Velg tidsperiode',
 'form.reports.set_period' => 'eller sett dato',
 'form.reports.show_fields' => 'Vis feltene',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 53cb7e4..28e8a0a 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -430,8 +430,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Wybierz okres',
 'form.reports.set_period' => 'lub ustaw daty',
 'form.reports.show_fields' => 'Pokaż pola',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 8189bdb..74e5822 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -425,8 +425,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 9ec2d49..e1e6b29 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -432,8 +432,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Selecione o período de tempo',
 'form.reports.set_period' => 'ou selecionar datas',
 'form.reports.show_fields' => 'Exibir campos',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 902ca04..cf701cf 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -455,8 +455,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Alege perioada',
 'form.reports.set_period' => 'sau introdu intervalul de date',
 'form.reports.show_fields' => 'Arata campuri',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 588b737..2fec5db 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -389,8 +389,6 @@ $i18n_key_words = array(
 'form.reports.include_assigned' => 'присвоена',
 'form.reports.include_not_assigned' => 'не присвоена',
 'form.reports.include_pending' => 'в ожидании',
-'form.reports.include_approved' => 'одобрена',
-'form.reports.include_not_approved' => 'не одобрена',
 'form.reports.select_period' => 'Выберите интервал времени',
 'form.reports.set_period' => 'или укажите даты',
 'form.reports.show_fields' => 'Показывать поля',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d08d06b..08999f1 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -438,8 +438,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Vyberte časový rozsah',
 'form.reports.set_period' => 'alebo nastavte dátumy',
 'form.reports.show_fields' => 'Zobraziť polia',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index c3ee36c..95d3f85 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -429,8 +429,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 // 'form.reports.select_period' => 'Select time period',
 // 'form.reports.set_period' => 'or set dates',
 // 'form.reports.show_fields' => 'Show fields',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6c2f926..170e540 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -428,8 +428,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Odaberi vremenski raspon',
 'form.reports.set_period' => 'ili podesi datum',
 'form.reports.show_fields' => 'Prikaži polja u izveštaju',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 3809587..be3f4f2 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -426,8 +426,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Välj intervall',
 'form.reports.set_period' => 'eller ställ in datum',
 'form.reports.show_fields' => 'Visa fält',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 1c2ce69..e30ddf0 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -465,8 +465,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => 'Zaman aralığını seç',
 'form.reports.set_period' => 'ya da tarihleri belirle',
 'form.reports.show_fields' => 'Alanları göster',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 91ae2e9..05fa7a8 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -437,8 +437,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '选择时间段',
 'form.reports.set_period' => '或设定日期',
 'form.reports.show_fields' => '显示栏目',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 2888d53..760e9ac 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -445,8 +445,6 @@ $i18n_key_words = array(
 // 'form.reports.include_assigned' => 'assigned',
 // 'form.reports.include_not_assigned' => 'not assigned',
 // 'form.reports.include_pending' => 'pending',
-// 'form.reports.include_approved' => 'approved',
-// 'form.reports.include_not_approved' => 'not approved',
 'form.reports.select_period' => '選擇時間段',
 'form.reports.set_period' => '或設定日期',
 'form.reports.show_fields' => '顯示欄目',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0fb5ca5..4f4adc7 100644 (file)
--- 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.18.43.4776 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.43.4777 | 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>

diff --git a/report.php b/report.php
index 135c8f2..6b26fe1 100644 (file)
--- a/report.php
+++ b/report.php
@@ -92,7 +92,7 @@ if ($showForApproved) {
     'name'=>'mark_approved_select_options',
     'data'=>$mark_approved_select_options,
     'value'=>$cl_mark_approved_select_option));
-  $mark_approved_action_options = array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved'));
+  $mark_approved_action_options = array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_action_options',
     'data'=>$mark_approved_action_options,

diff --git a/reports.php b/reports.php
index d8bf409..107f8ce 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -189,8 +189,8 @@ if ($showTimesheetDropdown) {
    'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
      TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
      TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
-     TIMESHEET_APPROVED=>$i18n->get('form.reports.include_approved'),
-     TIMESHEET_NOT_APPROVED=>$i18n->get('form.reports.include_not_approved')),
+     TIMESHEET_APPROVED=>$i18n->get('dropdown.approved'),
+     TIMESHEET_NOT_APPROVED=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }
@@ -206,7 +206,7 @@ if ($showApproved) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'approved',
    'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved')),
+   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }