Some refactoring in translation files.

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 81805711d7cc88c17830d327e272b6d9529e7aee..00123766d904d599fcdbfe5e67bfa716964df853 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -154,10 +154,8 @@ $i18n_key_words = array(
 'label.cost' => 'Kosten',
 'label.day_total' => 'Summe (Tag)',
 'label.week_total' => 'Summe (Woche)',
-// TODO: translate the following strings.
+// TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Heute',
 'label.total_hours' => 'Gesamtstunden',
 'label.total_cost' => 'Totale Kosten',
@@ -309,6 +307,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm oder 0.0h)',
 'form.time.billable' => 'In Rechnung stellen',
 'form.time.uncompleted' => 'Unvollständig',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dieser Eintrag wurde ohne Startzeit gespeichert. Dies ist kein Fehler.',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 76a3e34b20e51fd61414e4c2bef624379c4edda1..054a622af47c11c5007eadb50c3c6b22d58de5c1 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -154,8 +154,6 @@ $i18n_key_words = array(
 'label.day_total' => 'Day total',
 'label.week_total' => 'Week total',
 'label.month_total' => 'Month total',
-'label.remaining_quota' => 'Remaining quota',
-'label.over_quota' => 'Over quota',
 'label.today' => 'Today',
 'label.total_hours' => 'Total hours',
 'label.total_cost' => 'Total cost',
@@ -301,6 +299,8 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm or 0.0h)',
 'form.time.billable' => 'Billable',
 'form.time.uncompleted' => 'Uncompleted',
+'form.time.remaining_quota' => 'Remaining quota',
+'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'This record was saved with only start time. It is not an error.',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3c809317f329a2775f1971ddd3be0c6cf4e54e8b..1fde7e7d0cc2246af82810a06d98996bd73944a6 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -179,8 +179,6 @@ $i18n_key_words = array(
 // 'label.day_total' => 'Day total',
 // 'label.week_total' => 'Week total',
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Hoy',
 'label.total_hours' => 'Horas totales',
 // TODO: translate the following strings.
@@ -357,8 +355,10 @@ $i18n_key_words = array(
 // Note to translators: translate form.time.duration_format.
 // 'form.time.duration_format' => '(hh:mm or 0.0h)',
 'form.time.billable' => 'Facturable',
-// TODO: translate form.time.uncompleted.
+// TODO: translate the following.
 // 'form.time.uncompleted' => 'Uncompleted',
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Este historial fue guardado solamente con la hora de Inicio. Esto no es un error.',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 207900ca45bc8bc7bb404751598c376666632a1c..25e411653b0b14ed505ad1c0deac202db7e3e2a0 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -162,10 +162,8 @@ $i18n_key_words = array(
 'label.cost' => 'هزینه',
 'label.day_total' => 'کل روز',
 'label.week_total' => 'کل هفته',
-// TODO: translate the following strings.
+// TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'امروز',
 'label.total_hours' => 'مجموع ساعت',
 'label.total_cost' => 'مجموع هزینه ها',
@@ -326,6 +324,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm یا 0.0h)',
 'form.time.billable' => 'قابل پرداخت',
 'form.time.uncompleted' => 'ناتمام',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 // TODO: translate form.time_edit.uncompleted. 

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 28275e770189ba802ca977da1c993d07820968ab..175e49470bbd44efbc7062543024f50b78e89f75 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -151,10 +151,8 @@ $i18n_key_words = array(
 'label.cost' => 'Hinta',
 'label.day_total' => 'Päivä yhteensä',
 'label.week_total' => 'Viikko yhteensä',
-// TODO: translate the following strings.
+// TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Tänään',
 'label.total_hours' => 'Tunnit yhteensä',
 'label.total_cost' => 'Hinta yhteensä',
@@ -301,6 +299,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm tai 0.0h)',
 'form.time.billable' => 'Laskutettava',
 'form.time.uncompleted' => 'Keskeneräinen',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Vain aloitusaika tallennettiin tietueeseen. Kyseessä ei ole virhe.',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3b04c2b01092483c7b384a51f45703bdec9ecf88..e7932a41d8658f858b50e07395df528ff0c02c8d 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -168,8 +168,6 @@ $i18n_key_words = array(
 'label.week_total' => 'Total hebdomadaire',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Aujourd\\\'hui',
 'label.total_hours' => 'Total d\\\'heures',
 'label.total_cost' => 'Coût total',
@@ -341,6 +339,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm ou 0.0h)',
 'form.time.billable' => 'Facturable',
 'form.time.uncompleted' => 'Non terminée',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Cet enregistrement a été enregistré avec seulement une heure de début. Il ne s\\\'agit pas d\\\'une erreur.',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6650dfaf380baad1a5adc58f2f5961be7af68f90..35aa6d3382765b3b38858062a15d9a1e8bf75620 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -169,8 +169,6 @@ $i18n_key_words = array(
 'label.week_total' => 'סיכום שבועי',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'היום',
 'label.total_hours' => 'סך הכל שעות',
 'label.total_cost' => 'סך הכל עלות',
@@ -328,6 +326,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm או 0.0h)',
 'form.time.billable' => 'לחיוב',
 'form.time.uncompleted' => 'רישום חסר',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'רישום זה נשמר עם שעת התחלה בלבד. זאת איננה טעות.',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b7e93281e3f2379e2b5e68a2c7343dd5fc168cc0..3bd10db84620d1100d3a75dde24b686baa15c824 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -154,8 +154,6 @@ $i18n_key_words = array(
 'label.week_total' => 'Week totaal',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Vandaag',
 'label.total_hours' => 'Uren totaal',
 'label.total_cost' => 'Totale kosten',
@@ -302,6 +300,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(uu:mm of 0.0u)',
 'form.time.billable' => 'Factureerbaar',
 'form.time.uncompleted' => 'Onvolledig',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Dit tijdrecord is opgeslagen met alleen een starttijd. Dit is geen fout.',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index eaa303fdf64a382e90e67e41456c2ca4ab8120ca..a7b2d8430d38d6a67a952f20d1106e528fd8caf9 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -158,8 +158,6 @@ $i18n_key_words = array(
 'label.week_total' => 'W tym tygodniu',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Dziś',
 'label.total_hours' => 'Całkowita liczba godzin',
 'label.total_cost' => 'Koszt całkowity',
@@ -311,6 +309,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm or 0.0h)',
 'form.time.billable' => 'Płatne dla klienta',
 'form.time.uncompleted' => 'Nieukończone',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Ten wpis ma określony jedynie czas rozpoczęcia. To nie jest błąd.',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 21ed4e74537bf02ba9bfba50f1b7b34321883943..8f7e01ae5fbec5d189899ba557d97cca3a0e10d0 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -153,8 +153,6 @@ $i18n_key_words = array(
 'label.week_total' => 'Total semanal',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Hoje',
 'label.total_hours' => 'Total de horas',
 'label.total_cost' => 'Custo total',
@@ -302,6 +300,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm ou 0.0h)',
 'form.time.billable' => 'Faturável',
 'form.time.uncompleted' => 'Incompleta',
+// TODO: translate the following.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Eesta entrada foi salva somente com hora de início. Não é um erro.',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1f9074a0e1799f28ae2d79cb84bb2a1f0fea2d07..ff53b43e88c8d18781b5f9dfd43e83f85dbca883 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -154,8 +154,6 @@ $i18n_key_words = array(
 'label.day_total' => 'Итог за день',
 'label.week_total' => 'Итог за неделю',
 'label.month_total' => 'Итог за месяц',
-'label.remaining_quota' => 'Доступная квота',
-'label.over_quota' => 'Превышение квоты',
 'label.today' => 'Сегодня',
 'label.total_hours' => 'Итого часов',
 'label.total_cost' => 'Итоговая стоимость',
@@ -303,6 +301,8 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(чч:мм или 0.0ч)',
 'form.time.billable' => 'Включается в счёт',
 'form.time.uncompleted' => 'Не завершено',
+'form.time.remaining_quota' => 'Доступная квота',
+'form.time.over_quota' => 'Превышение квоты',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Эта запись сохранена только со временем начала. Это не ошибка.',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3c5bb2f47339f19bff729f4ed4b5b8d88a3bfa05..4440615d3bf867d3f270919d1854b455ca6fc2a3 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -166,8 +166,6 @@ $i18n_key_words = array(
 'label.week_total' => 'Týždeň celkom',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Dnes',
 'label.total_hours' => 'Hodín celkom',
 'label.total_cost' => 'Náklady celkom',
@@ -327,6 +325,9 @@ $i18n_key_words = array(
 'form.time.billable' => 'Faktúrovateľných',
 'form.time.no_records' => 'Neexistujú časové záznamy.',
 'form.time.uncompleted' => 'Neukončené',
+// TODO: translate the folllowing.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Editing Time Record form. See example at https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Tento záznam bol uložený iba s časom začiatku. Nie je to chyba.',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 8bf548814dcbd0a2e80f8dce91caf90e47bb06d1..02828376ab4513ba949e1ab9e95fc7fac135a948 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -155,8 +155,6 @@ $i18n_key_words = array(
 'label.week_total' => 'Zbir časova nedeljno',
 // TODO: translate the following.
 // 'label.month_total' => 'Month total',
-// 'label.remaining_quota' => 'Remaining quota',
-// 'label.over_quota' => 'Over quota',
 'label.today' => 'Danas',
 'label.total_hours' => 'Ukupno časova',
 'label.total_cost' => 'Ukupna cena',
@@ -306,6 +304,9 @@ $i18n_key_words = array(
 'form.time.duration_format' => '(hh:mm or 0.0h)',
 'form.time.billable' => 'Naplativ',
 'form.time.uncompleted' => 'Nezavršen',
+// TODO: translate the folllowing.
+// 'form.time.remaining_quota' => 'Remaining quota',
+// 'form.time.over_quota' => 'Over quota',
 
 // Izmena vremenske forme. Pogledajte primer na https://timetracker.anuko.com/time_edit.php (get there by editing an uncompleted time record).
 'form.time_edit.uncompleted' => 'Ovaj zapis je sačuvan sa početnim vremenom i nije greška.',

diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 8df37772621d2b8bb19b3f1b9202bab85c2de88f..a4f4af6d0fce951b65542f1f3bf157dd71bdc2eb 100644 (file)
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -358,9 +358,9 @@ function get_time() {
   <tr>
     <td align="left">{$i18n.label.month_total}: {$month_total}</td>
     {if $over_quota}
-    <td align="right">{$i18n.label.over_quota}: <span style="color: green;">{$month_left}</span></td>
+    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$month_left}</span></td>
     {else}
-    <td align="right">{$i18n.label.remaining_quota}: <span style="color: red;">{$month_left}</span></td>
+    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$month_left}</span></td>
     {/if}
   </tr>
   {/if}