Some refactoring in translation files.

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index ae05e9f7532eec0600cfa1761ddf7b634186f2f6..715c0cb2bc8653b85492c7c36b3d7b413374af64 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -203,8 +203,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Anmelden',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f82e543273109bdb913fb7c6d0a144f9afb1b661..97e125a1442293fb7503cfbd820e0ad729149e98 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -199,8 +199,8 @@ $i18n_key_words = array(
 'label.year' => 'Year',
 'label.month' => 'Month',
 'label.quota' => 'Quota',
-'label.dailyWorkingHours' => 'Daily working hours',
-'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+'label.workdayHours' => 'Hours in a work day',
+'label.quota_config_hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 3f1696e515bd5b58609d6ed1d8258f3e6f22e427..efb21750369523c892db11c083444fb2b3728dba 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -234,8 +234,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Sesión iniciada',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index acdb8f06f1a3c9d28d4a3a2ed065d5e7e6566e7f..97bc6a4bc2228ff327a5c3917857d1ad1869d1ae 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -211,8 +211,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'ورود',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index ee94cad00de9989e3bad0302f0092004be800b67..3b45375d27895bac4ef04f804c81bc86563591cf 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -197,8 +197,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Kirjautuminen',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ee899fa2a518f97e2be050f6d06f1d2eb259dac6..251b2f34f0dc6191403f330f379fc349c15515ad 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -216,8 +216,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Connexion',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ce02dba807b6e066d7fbd8558a93924bd55800a8..c16eaacece38d2c5f24273f9236f22c0a928b5d8 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -216,8 +216,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'כניסה',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b2ad9bf8aae8d1a8369c2de41dc0272eb6d479e9..2b81fd29545411a22e85d75079fb6bdfe5f3ae39 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -198,8 +198,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Aanmelden',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 35a53557523b36e5d2e2212bcec1f6c48db7e6b0..60bdafe54adbdc640f8fd489582a9212fd159541 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -203,8 +203,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Logowanie',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 021c1386972454a1518c91eb2df2ae9fae4d3ec5..3966949017373e45c1b9f378ea08774b5421be17 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -197,8 +197,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 0c99c07185f4302c0b021f42ecd5d28687b2d68a..c29ad037e1f21c21224632a3d72d6ce60327f96a 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -196,11 +196,11 @@ $i18n_key_words = array(
 'label.fav_report' => 'Стандартный отчёт',
 'label.cron_schedule' => 'Расписание cron',
 'label.what_is_it' => 'Что это?',
-// 'label.year' => 'Year',
-// 'label.month' => 'Month',
-// 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+'label.year' => 'Год',
+'label.month' => 'Месяц',
+'label.quota' => 'Квота',
+'label.workdayHours' => 'Количество часов в рабочем дне',
+'label.quota_config_hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 
 // Form titles.
 'title.login' => 'Вход в систему',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c8479ad4d3c85b846b1ed77739cae6a2ff0b3d57..f0918ed12961e572f8aa0c8d11e041a7de3a1c18 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -213,8 +213,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Prihlásenie',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 546515b788bffcb9c3b703e7c473df1474aa3364..5600049e05934e180f04789561fe09533bd178f9 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -199,8 +199,7 @@ $i18n_key_words = array(
 // 'label.year' => 'Year',
 // 'label.month' => 'Month',
 // 'label.quota' => 'Quota',
-// 'label.dailyWorkingHours' => 'Daily working hours',
-// 'label.empty_values_explanation' => 'If values are empty, quotas are calculated automatically based on holidays in config',
+// 'label.workdayHours' => 'Daily working hours',
 
 // Form titles.
 'title.login' => 'Prijava',

diff --git a/WEB-INF/templates/cf_monthly_quota.tpl b/WEB-INF/templates/cf_monthly_quota.tpl
index 6e3d9feebce114019e9ef6643c5ad6e001ca45b7..874e2ebe274e2f2e255dfe6359edc9fd9d58ed38 100644 (file)
--- a/WEB-INF/templates/cf_monthly_quota.tpl
+++ b/WEB-INF/templates/cf_monthly_quota.tpl
@@ -5,7 +5,7 @@
             <td align="center">
                 <table>
                     <tr>
-                        <td>{$i18n.label.dailyWorkingHours}</td>
+                        <td>{$i18n.label.workdayHours}</td>
                         <td>{$forms.monthlyQuotaForm.dailyWorkingHours.control}</td>
                         <td><input type="submit" name="dailyHours" value="{$i18n.button.save}"></td>
                     </tr>
@@ -41,7 +41,7 @@
         </td>
     </tr>
 </table>
-<div>* - {$i18n.label.empty_values_explanation}</div>
+<div>* - {$i18n.label.quota_config_hint}</div>
 {$forms.monthlyQuotaForm.close}
 <script>
 function yearChange(value){