Added 2 labels for timesheets in translation files.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 1e4b299e268895802a4e4db37999509760301406..c4822d38b6f1d21a758332e1612aca8eb1cb2503 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,6 +263,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Només totals',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 08480f525b99a725b09cb69f5ee8406ff1313c32..3ec87f3c50929836690eb8cab4359253c19854ad 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,6 +273,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Pouze součty',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 560126347f27574e4c833dc60ebdc93cc02b5925..d5087b8df009242b02340507a5442e18b6a19dc0 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -248,6 +248,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Kun Total',
 'label.quota' => 'Kvota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fejl',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 8c6318477ac1b4950919db9682a4163b24558f76..076bfae1ad7ca8fa72c18b6bd0ae38c5f0e19d16 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -236,6 +236,9 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Einheiten',
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fehler',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index ce580485efdcd6746be334c99ddff477a25a1af6..7797a8d8e4ca2d6c8ff1986b8be9bdbafc1d9c8c 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -229,6 +229,8 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
 'label.quota' => 'Quota',
+'label.submitted' => 'Submitted',
+'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Error',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 53b42913166a690abf4dc893e39c9b9ca614e9cb..1b307300733898cc8397262a9b32aa7d25ad616d 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -266,6 +266,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Solo totales',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 70d6d441c775e576d6d4031d1e6d49f0f91c0787..10beccf8222d4fe49c795c2350236c1b294c4d28 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -250,6 +250,9 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Ühikud',
 'label.totals_only' => 'Ainult summad',
 'label.quota' => 'Kvoot',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 75db180116d57955b874ac52cb950556f346bf7b..9c6ef591cabadabc92e61b7b36891a0861fcc9be 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -259,6 +259,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'خطا',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 9aee3a2605c50613c8246f202a14445f6e5c339d..71515dfff754df9f9c9c95e027389b935d190ca9 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -253,6 +253,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Vain yhteissummat',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Virhe',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 17d43b0913521f64b169765bfe44206eb5892021..5132326fef8c4696964914ceccf8933cac460d56 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -246,6 +246,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totaux uniquement',
 'label.quota' => 'Quota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Erreur',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 4e82d825e6052e6072717f1e48399c881c01d9c7..77a7833ab222cc00b3cbe5339bbaa4e08a157109 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -239,6 +239,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Σύνολα μόνο',
 'label.quota' => 'Ποσοστό',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Σφάλμα',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 2c4cbc066185a15d86842c9b796f4b8ad3a95b56..ac4bbfd2eff53801b1fae0130f2da31b29cffe61 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -270,6 +270,8 @@ $i18n_key_words = array(
 'labl.totals_only' => 'סיכומים בלבד',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'שגיאה',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 5dafe96d7f92642fda46e4a97dd1f6b458881fd3..8549700d9d92ce87de4b2e6b87c21cd186660009 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -267,6 +267,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 32e3b84a0b978bbc2fc04b19438c7c362c867ae7..87f899ffd7362f8f07d24631ef885bf7dcd9daa8 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -243,6 +243,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Solo i totali',
 'label.quota' => 'Quota',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 2574d315480688aac5c013d4890468ade2984117..a54f25f787b127fc80d187aeaa0b449d3e087337 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -273,6 +273,8 @@ $i18n_key_words = array(
 'label.totals_only' => '全体だけ',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4403f9f1720d384b2c90754691ac8fca34d53206..4d0e0f29266d6f5debd3435b5041951bb22b8643 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -273,6 +273,8 @@ $i18n_key_words = array(
 'label.totals_only' => '오직 전체만',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9c88ca063da0779a649cd8db598bad9e63d8717b..336bed5a9c24c5e449ac521007233f39a586da47 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -229,6 +229,9 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Eenheid',
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Fout',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index a08aeffe0ff6182d0d5b29bebd5da9503730a24b..5cb49d3451310c32a5cf001722a0d3d93b3b2e04 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -270,6 +270,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota'
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a1f4bfa76e21e2328d69cd71fd5581b72401d8e9..3e2e97c549ecca4c66c944ebd020a5a4ef224f4e 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -253,7 +253,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Tylko sumy',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Błąd',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 639092d83c05354b1cc90227e2221586ef992c28..db9ef805e4f312a8b87c3f17e31b9c9a3479d7a1 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -250,7 +250,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Somente totais',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Erro',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index fcd31a4471c904e7607123c044b32d7dec9968d3..1d7a99563f6be39a37258844ae07cb0c4fd795a1 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -257,7 +257,9 @@ $i18n_key_words = array(
 // 'label.work_units' => 'Work units',
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 1747b81f40339ae7d596887354e6d712557f8b09..3fa54ace8e07cf2546b41137bd43424575898c58 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -269,7 +269,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Numai totaluri',
 // TODO: translate the following.
-// 'label.quota' => 'Quota'
+// 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 42dfc9c9f7cda3c0b9f618f0df09d04d83ff8c5e..1c046857eaa9fa7c90c92cac5ece9fbec9e6db65 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -228,6 +228,8 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
 'label.quota' => 'Квота',
+'label.submitted' => 'Подано',
+'label.approved' => 'Одобрено',
 
 // Form titles.
 'title.error' => 'Ошибка',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 587575f37194bf29cc43f60909d0e67b4020428b..c8eede8af37f5574002696e3e95eaedf1198c182 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -260,6 +260,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Iba celkové',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Chyba',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index b0b23677d3f746a3bdf512441cb90655cbbb858f..3adbda815c7df0c2cde407963aa97a965a46d5c3 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -253,6 +253,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index d5c4fff7010f4d1c45f5ab15fb49103570d917c4..3dae77abe2972b94b8eb05696441b85f47f3e475 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -252,6 +252,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 'title.error' => 'Greška',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index b3fc0929df7df925a0668eb8adf3d5ba1490b9e4..0f4faac3f28e35f23f4af269f78369358bb9dbed 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -247,6 +247,9 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Visa endast summeringar',
 'label.quota' => 'Kvot',
+// TODO: translate the following.
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Rubriker för formulär
 'title.error' => 'Fel',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b8577374438b34308ecfe814493b52ac8df6bd25..8c6f2154faf3f1b3c687de7644d2cefbff38b26a 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,6 +277,8 @@ $i18n_key_words = array(
 'label.totals_only' => 'Sadece toplamlar',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // Form titles.

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5820ab3a2867cbf87bfe8a45a1e3f6da70ed7df4..f4912f1d9bc595cb11da1b28dacaca18361dcf32 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -261,6 +261,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 59ce3716ec48da4e99aa58b2e3d49b4f5d5a8814..5b04d348b4875ecaa980408f644be26e89708dfe 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -268,6 +268,8 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.submitted' => 'Submitted',
+// 'label.approved' => 'Approved',
 
 // Form titles.
 // TODO: Translate the following.

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 2b7990a88d1a843e52c526aaf9085b496cb11d46..626065846423b0d7d5f225326eff6028ca292f5d 100644 (file)
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -9,18 +9,15 @@
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
         <tr>
-          <td class="tableHeader">{$i18n.label.invoice}</td>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+  {if $user->isPluginEnabled('cl')}
           <td class="tableHeader">{$i18n.label.client}</td>
-          <td class="tableHeader">{$i18n.label.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td class="tableHeader">{$i18n.label.paid}</td>
   {/if}
+  <td class="tableHeader">{$i18n.label.submitted}</td>
+  <td class="tableHeader">{$i18n.label.approved}</td>
           <td class="tableHeader">{$i18n.label.view}</td>
-  {if !$user->isClient()}
-          <td class="tableHeader">{$i18n.label.delete}</td>
-  {/if}
         </tr>
-        {foreach $invoices as $invoice}
+        {foreach $timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$invoice.name|escape}</td>
           <td>{$invoice.client_name|escape}</td>
@@ -38,7 +35,7 @@
 
   {if !$user->isClient()}
       <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('invoice_add.php');" value="{$i18n.button.add}"></form></td></tr>
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
 {/if}