More refactoring in translation files.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c0a6931344273edfed510c8433e3aaa33ef4d016..29347170090bf6ae9633163102f4e60d635cecc8 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_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',
 '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 d48497cf2081b222b21d029a5e4aef62341c4746..c85cb6867314c3a950994298684c4727791a817a 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_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',
 '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 2a639b2ade68ba3be6e156925d02c51ab3d45fc2..3dfb41c870505a65ab13554dc29ee97558395e40 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_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',
 '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 016ec855818c47d0c0669ca2b70a97236b7238dd..c787f6d87dbcbda707ecebf86f381dc94e86748c 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_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',
 '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 4ec12f82dadc8a94322d5d576838aecc6ce16b54..5c91c3ee43713a7fa36cb3e38e80b9f937c34d51 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_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',
 '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 3c6c44c8567934999d9d44b4ee8aa3a722d46065..c86741762e8389dca427fc9689436387fad58b28 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_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',
 '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 cccc548b87f2acd5d95c07efae17d3b453808dd3..7f2fe8eb052511db14ca6144e4eb408c7669a46f 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_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',
 '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 95a15739114a5879e7fc1980a4d26c69ffbbaf78..fdbcdba5f62bae0130a22a13bb2e154a83e31e64 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_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' => 'نمایش فیلدها',
 '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 c06af3dec12344f1cdaa3453bb9796c328127292..bc66a226454afe109fb5e0beded8dfc4628380b4 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_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',
 '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 f95325d6cb6b09ec2bd56ac03526fc5bf0376d18..840f85590ac83a336d64b8c86cb0bcf40557aac7 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_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',
 '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 8079b6f8f1a5ccb4b7bc0931bb69d4e500d625dc..2ebdaa8f317e7c7b04d8c265e22e17837678fede 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_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' => 'Εμφάνιση πεδίων',
 '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 c2f66657a463748f44145f3a6c37d0635f0bb670..cac16e9c52c5fa7d6fe51d4002a775ce8f31a438 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_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' => 'הראה שדות',
 '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 245275ab9780cbdb0e0720dc50dc2f03fe4699d9..f4d5dd1390ad91c4bee2673a868b7a0470ba1926 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_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.
 '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 da1f2ff99f4a2c553c907a330cc8a82aff149b51..3d898e2f2771691ff6e9651a442ad2cadb69208f 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_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',
 '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 faa4979719b1dba3f02fa916327b19f7d8878ec0..7f1a841199f0f4db97fcac5960b6690de12d580b 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_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' => 'フィールドの表示',
 '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 89c01a34f6e1ec46dafbcea2ff40256114ddabe0..c5b7e0a219468247bac4ea50e252aac54e79c301 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_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' => '필드들을 보기',
 '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 191e8aeea1ba46a99cec7f7f273617deaac3805d..7307ec4a9db80120d573bbed92b7ed5bc7d9e32c 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_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',
 '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 1f4cd35c80b30a3ca5a7c5c4d0f085aafd8c15cc..a050711670fcb44d1e0dfe02ef90f4328e57a210 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_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',
 '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 53cb7e4bf2c69d60d628784ba5ef480a2631a209..28e8a0aceb31641502c22567a5e414a0adc99807 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_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',
 '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 8189bdb4888b8229ec916b9e95aad0a6c1004d38..74e5822f05e5e53e9ffffb4ea1acba74d02b07c4 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_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',
 '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 9ec2d495bfcc9009346a94b73323057f744dee4c..e1e6b29d8413fe3d5e7dc3d77c5600c2e6a88d56 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_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',
 '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 902ca04ba23fb0c0aa8aee46580fbbbe3bb2b9c1..cf701cf63ebc8ecf4925c00001a31f9e7c0640de 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_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',
 '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 588b737a74fc544df7ef9c56355b722c361a0d83..2fec5db797a07ac54f8ab25d9574c4089d8c64c7 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_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' => 'Показывать поля',
 '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 d08d06bc5f870a063493ea9667af54861dc97fa9..08999f1dec2000163ddbfe985fa1bddfff73127a 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_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',
 '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 c3ee36cbe64470a7b4a43e6adccbd82ae1ae2ed6..95d3f85873b9684ccad4d842daac3fb5ed39897c 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_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',
 // '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 6c2f926fbb36d6c165658a561167896f85b9e58a..170e5409f5c10f7b950c2f7d96a5320b33939848 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_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',
 '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 380958784b33c8c26c95b86f7f689ce1b5eb6eac..be3f4f28057fe9d31f8aef1efab16a43fe53955b 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_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',
 '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 1c2ce69f3831e30bfcee3b15a32181657da5d846..e30ddf06a902211cea1a9fbb2190c6db42a5ed9a 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_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',
 '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 91ae2e993b670324957ccc2866c35593c7eae20a..05fa7a88edb37d09494d148f7be296ef78a3df39 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_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' => '显示栏目',
 '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 2888d53652aea38ca41e46d9ed4125e99c6aa6e9..760e9acfa8ef8bd087b8ed04e12e453d3cbd54b3 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_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' => '顯示欄目',
 '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 0fb5ca50b8dde495a7aa2a8c0b4e77b10c1cbd4f..4f4adc75a6cb54729acd63115378f334eabee3e0 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>
       <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>
             <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 135c8f2727fba211f278b561e6aabf154ed08965..6b26fe1ca9f086050de330c6df97e5c8f03fa7a8 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));
     '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,
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_action_options',
     'data'=>$mark_approved_action_options,

diff --git a/reports.php b/reports.php
index d8bf40995af6bf4ffbe6c376c38c0e9b12ef47c3..107f8cee6cf8cf1c5d5b8f93619b05027c2299fb 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'),
    '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'))
   ));
 }
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }


@@ -206,7 +206,7 @@ if ($showApproved) {
   $form->addInput(array('type'=>'combobox',
    'name'=>'approved',
    'style'=>'width: 250px;',
   $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'))
   ));
 }
    'empty'=>array(''=>$i18n->get('dropdown.all'))
   ));
 }