Some cleanup in translation files.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b5a5ddf4111fea3e9b84dadfeae4b9a8b87a5834..d06a021ee090a0e2fa68310095d7705f78976824 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -143,8 +143,7 @@ $i18n_key_words = array(
 'label.password' => 'Paraula de pas',
 'label.confirm_password' => 'Confirmar paraula de pas',
 'label.email' => 'E-mail',
 'label.password' => 'Paraula de pas',
 'label.confirm_password' => 'Confirmar paraula de pas',
 'label.email' => 'E-mail',

-// Translate the following string.
-// 'label.page' => 'Page',
+// TODO: the entire label section needs re-translating. See the English file.

 
 // Form titles.
 // TODO: the entire title section is missing here. See the English file.
 
 // Form titles.
 // TODO: the entire title section is missing here. See the English file.


@@ -179,7 +178,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'Modificar',
 "form.admin.profile.th.del" => 'Eliminar',
 "form.admin.profile.th.active" => 'Actiu',
 "form.admin.profile.th.edit" => 'Modificar',
 "form.admin.profile.th.del" => 'Eliminar',
 "form.admin.profile.th.active" => 'Actiu',

-"form.admin.lock.period" => 'interval de tancament en dies',

 
 // my time form attributes
 "form.mytime.title" => 'El meu temps',
 
 // my time form attributes
 "form.mytime.title" => 'El meu temps',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 4a8a7e40b72a359b156848ffe2a99e17dae8e351..9979785c1de218a70679702ada7055dfa40c7094 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -179,7 +179,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'upravit',
 "form.admin.profile.th.del" => 'smazat',
 "form.admin.profile.th.active" => 'aktovní',
 "form.admin.profile.th.edit" => 'upravit',
 "form.admin.profile.th.del" => 'smazat',
 "form.admin.profile.th.active" => 'aktovní',

-"form.admin.lock.period" => 'období uzamčení ve dnech',

 // Note to translators: the strings below are missing in the translation and must be added
 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',
 // Note to translators: the strings below are missing in the translation and must be added
 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 0e50dae05d539133b0abb8667f3b66e6ea9fbc2d..d91ebbdaf8f87de1116b85fe17367d7381a14323 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -174,8 +174,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'rediger',
 "form.admin.profile.th.del" => 'slet',
 "form.admin.profile.th.active" => 'aktive',
 "form.admin.profile.th.edit" => 'rediger',
 "form.admin.profile.th.del" => 'slet',
 "form.admin.profile.th.active" => 'aktive',

-// Note to translators: the strings below are missing in the translation and must be added
-// "form.admin.lock.period" => 'lock interval in days',

 "form.admin.options" => 'indstillinger',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",
 "form.admin.options" => 'indstillinger',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 715c0cb2bc8653b85492c7c36b3d7b413374af64..49238f3050be904ec52a08a9e441cc98bec79c8f 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -200,10 +200,6 @@ $i18n_key_words = array(
 // TODO: translate the following strings.
 // 'label.cron_schedule' => 'Cron schedule',
 // 'label.what_is_it' => 'What is it?',
 // TODO: translate the following strings.
 // 'label.cron_schedule' => 'Cron schedule',
 // 'label.what_is_it' => 'What is it?',

-// 'label.year' => 'Year',
-// 'label.month' => 'Month',
-// 'label.quota' => 'Quota',
-// 'label.workdayHours' => 'Daily working hours',

 
 // Form titles.
 'title.login' => 'Anmelden',
 
 // Form titles.
 'title.login' => 'Anmelden',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 97e125a1442293fb7503cfbd820e0ad729149e98..3537201c2d5a7fc3033f30838cd6a652bf96e901 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -151,8 +151,8 @@ $i18n_key_words = array(
 'label.note' => 'Note',
 'label.item' => 'Item',
 'label.cost' => 'Cost',
 'label.note' => 'Note',
 'label.item' => 'Item',
 'label.cost' => 'Cost',

-'label.week_total' => 'Week total',

 'label.day_total' => 'Day total',
 'label.day_total' => 'Day total',

+'label.week_total' => 'Week total',

 'label.month_total' => 'Month total',
 'label.month_left' => 'Time until quota is met',
 'label.month_over' => 'Over monthly quota',
 'label.month_total' => 'Month total',
 'label.month_left' => 'Time until quota is met',
 'label.month_over' => 'Over monthly quota',


@@ -196,11 +196,6 @@ $i18n_key_words = array(
 'label.fav_report' => 'Favorite report',
 'label.cron_schedule' => 'Cron schedule',
 'label.what_is_it' => 'What is it?',
 'label.fav_report' => 'Favorite report',
 'label.cron_schedule' => 'Cron schedule',
 'label.what_is_it' => 'What is it?',

-'label.year' => 'Year',
-'label.month' => 'Month',
-'label.quota' => 'Quota',
-'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',
 
 // Form titles.
 'title.login' => 'Login',


@@ -406,4 +401,12 @@ $i18n_key_words = array(
 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Invoice sent.',
 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source<br>time tracking system. Visit <a href="https://www.anuko.com">www.anuko.com</a> for more information.',
 'form.mail.report_sent' => 'Report sent.',
 'form.mail.invoice_sent' => 'Invoice sent.',

+
+// Quota configuration form.
+'form.quota.year' => 'Year',
+'form.quota.month' => 'Month',
+'form.quota.quota' => 'Quota',
+'form.quota.workdayHours' => 'Hours in a work day',
+'form.quota.hint' => 'If values are empty, quotas are calculated automatically based on workday hours and holidays.',
+

 );
 );

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 21d82d503c8432b9b66960150610212b2ce26f8f..80e5f71435e266b98994b2c5e720d777f5103721 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -177,7 +177,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'muuda',
 "form.admin.profile.th.del" => 'kustuta',
 "form.admin.profile.th.active" => 'aktiivne',
 "form.admin.profile.th.edit" => 'muuda',
 "form.admin.profile.th.del" => 'kustuta',
 "form.admin.profile.th.active" => 'aktiivne',

-"form.admin.lock.period" => 'lukusta intervall päevades',

 "form.admin.options" => 'suvandid',
 // Note to translators: the strings below are missing in the translation and must be translated
 // "form.admin.lang_default" => 'site default language',
 "form.admin.options" => 'suvandid',
 // Note to translators: the strings below are missing in the translation and must be translated
 // "form.admin.lang_default" => 'site default language',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 39baa9bc2499e706244416ce238b00f39d1c1fbf..280995791c0bf9f3ea7e8f1686fa727f3bffbd2a 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -173,8 +173,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'szerkesztés',
 "form.admin.profile.th.del" => 'törlés',
 "form.admin.profile.th.active" => 'aktív',
 "form.admin.profile.th.edit" => 'szerkesztés',
 "form.admin.profile.th.del" => 'törlés',
 "form.admin.profile.th.active" => 'aktív',

-// Note to translators: the strings below are missing and must be added and translated 
-// "form.admin.lock.period" => 'lock interval in days',

 "form.admin.options" => 'opciók',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",
 "form.admin.options" => 'opciók',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 523855a514ac02492d7fa338bcad283ae88899be..36c77ee3ea2bc7f5848add3a3d20eb3b86f49988 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -172,7 +172,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'edit',
 "form.admin.profile.th.del" => 'elimina',
 "form.admin.profile.th.active" => 'attivo',
 "form.admin.profile.th.edit" => 'edit',
 "form.admin.profile.th.del" => 'elimina',
 "form.admin.profile.th.active" => 'attivo',

-"form.admin.lock.period" => 'blocca l\\\'intervallo di tempo',

 "form.admin.options" => 'opzioni',
 // Note to translators: the strings below are missing and must be added and translated
 // "form.admin.lang_default" => 'site default language',
 "form.admin.options" => 'opzioni',
 // Note to translators: the strings below are missing and must be added and translated
 // "form.admin.lang_default" => 'site default language',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 961269586f7f606d8ac68d3bf16c75166e4e5861..0986141b3cb3e782eae7e52ab715b3d65cf0446a 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -173,7 +173,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => '編集',
 "form.admin.profile.th.del" => '削除',
 "form.admin.profile.th.active" => '活動内容',
 "form.admin.profile.th.edit" => '編集',
 "form.admin.profile.th.del" => '削除',
 "form.admin.profile.th.active" => '活動内容',

-"form.admin.lock.period" => '日付の間隔をロック',

 "form.admin.options" => 'オプション',
 "form.admin.lang_default" => 'サイトのデフォルト言語',
 "form.admin.custom_date_format" => "日付形式",
 "form.admin.options" => 'オプション',
 "form.admin.lang_default" => 'サイトのデフォルト言語',
 "form.admin.custom_date_format" => "日付形式",

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f6bc6237cdda3debb412ece41facbd6ec9516c56..98e4b2c3626be16fcc586d425d11e93a77730833 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -171,7 +171,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => '편집',
 "form.admin.profile.th.del" => '삭제',
 "form.admin.profile.th.active" => '활동내용',
 "form.admin.profile.th.edit" => '편집',
 "form.admin.profile.th.del" => '삭제',
 "form.admin.profile.th.active" => '활동내용',

-"form.admin.lock.period" => '날자로 된 간격을 로크하기',

 "form.admin.options" => '옵션',
 "form.admin.lang_default" => '사이트의 디폴트 언어',
 "form.admin.custom_date_format" => "날짜 포맷",
 "form.admin.options" => '옵션',
 "form.admin.lang_default" => '사이트의 디폴트 언어',
 "form.admin.custom_date_format" => "날짜 포맷",

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index aaf1ad3d5ee2fd2da898c31265df056fa03af96d..747bbe46a6378f482d474dead7e81ebada169d17 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -174,7 +174,6 @@ $i18n_key_words = array(
 // "form.admin.profile.th.edit" => 'endre',
 // "form.admin.profile.th.del" => 'slett',
 // "form.admin.profile.th.active" => 'aktiv',
 // "form.admin.profile.th.edit" => 'endre',
 // "form.admin.profile.th.del" => 'slett',
 // "form.admin.profile.th.active" => 'aktiv',

-// "form.admin.lock.period" => 'lås intervallet i antall dager',

 // "form.admin.options" => 'opsjoner',
 // "form.admin.lang_default" => 'sidens språk',
 // "form.admin.custom_date_format" => "datoformat",
 // "form.admin.options" => 'opsjoner',
 // "form.admin.lang_default" => 'sidens språk',
 // "form.admin.custom_date_format" => "datoformat",

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 989d17e5d2ecf8c05ea74bf545f44c1c4dc67fe7..91f6cb455e0cb945a9bc19a5f2fd576ebc430ec9 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -169,7 +169,6 @@ $i18n_key_words = array(
 // "form.admin.profile.th.edit" => 'edit',
 // "form.admin.profile.th.del" => 'delete',
 // "form.admin.profile.th.active" => 'active',
 // "form.admin.profile.th.edit" => 'edit',
 // "form.admin.profile.th.del" => 'delete',
 // "form.admin.profile.th.active" => 'active',

-// "form.admin.lock.period" => 'lock interval in days',

 "form.admin.options" => 'opções',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",
 "form.admin.options" => 'opções',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3ff5d2a38e16a28a9d0759dde229b9602d4ec40d..7a1abfc45a4d38a90835dc18717b3c570c5770f0 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -177,7 +177,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.del" => 'sterge',
 "form.admin.profile.th.active" => 'activ',
 // Note to translators: the strings below are missing and must be added and translated 
 "form.admin.profile.th.del" => 'sterge',
 "form.admin.profile.th.active" => 'activ',
 // Note to translators: the strings below are missing and must be added and translated 

-// "form.admin.lock.period" => 'lock interval in days',

 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",
 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',
 // "form.admin.custom_date_format" => "date format",

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 7b299db556fc963febd73b3d008b4c0ac2058e95..028b17a4ba53d5e63b0c578e7a5cdc1b2dfddac8 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -175,7 +175,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'edit',
 "form.admin.profile.th.del" => 'delete',
 "form.admin.profile.th.active" => 'active',
 "form.admin.profile.th.edit" => 'edit',
 "form.admin.profile.th.del" => 'delete',
 "form.admin.profile.th.active" => 'active',

-"form.admin.lock.period" => 'lock interval in days',

 "form.admin.options" => 'options',
 "form.admin.lang_default" => 'site default language',
 "form.admin.lang_browser_default" => '(browser default)',
 "form.admin.options" => 'options',
 "form.admin.lang_default" => 'site default language',
 "form.admin.lang_browser_default" => '(browser default)',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 444207b45ad8b894f358544c08d3d31ffa2ed599..8c7bc016368063cccdf0b9867a35c7081ecdaeb1 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -174,7 +174,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'redigera',
 "form.admin.profile.th.del" => 'ta bort',
 "form.admin.profile.th.active" => 'aktiverad',
 "form.admin.profile.th.edit" => 'redigera',
 "form.admin.profile.th.del" => 'ta bort',
 "form.admin.profile.th.active" => 'aktiverad',

-"form.admin.lock.period" => 'låsintervall i antal dagar',

 "form.admin.options" => 'inställningar',
 // Note to translators: the strings below are missing and must be added and translated
 // "form.admin.lang_default" => 'site default language',
 "form.admin.options" => 'inställningar',
 // Note to translators: the strings below are missing and must be added and translated
 // "form.admin.lang_default" => 'site default language',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 20d6bc04fe8105d04fca3e263a28931018d30dbc..6ec465fc5c73f673e24a29b7cb24a4610105341e 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -176,7 +176,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => 'düzenle',
 "form.admin.profile.th.del" => 'sil',
 "form.admin.profile.th.active" => 'aktif',
 "form.admin.profile.th.edit" => 'düzenle',
 "form.admin.profile.th.del" => 'sil',
 "form.admin.profile.th.active" => 'aktif',

-"form.admin.lock.period" => 'günler olarak kilit aralığı',

 // Note to translators: the strings below are missing and must be translated and added
 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',
 // Note to translators: the strings below are missing and must be translated and added
 // "form.admin.options" => 'options',
 // "form.admin.lang_default" => 'site default language',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b404fcc002f440d7089b6e4d98735240e1db893b..4ae46890f23be8501c6fb8918be92b11e6c1f302 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -171,7 +171,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => '编辑',
 "form.admin.profile.th.del" => '删除',
 "form.admin.profile.th.active" => '启用',
 "form.admin.profile.th.edit" => '编辑',
 "form.admin.profile.th.del" => '删除',
 "form.admin.profile.th.active" => '启用',

-"form.admin.lock.period" => '锁定天数间隔',

 "form.admin.options" => '选项',
 "form.admin.lang_default" => '网站默认语言',
 "form.admin.lang_browser_default" => '(默认浏览器)',
 "form.admin.options" => '选项',
 "form.admin.lang_default" => '网站默认语言',
 "form.admin.lang_browser_default" => '(默认浏览器)',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 4c26c01569c496faea12928a7b21868195dad782..dea7e56c5590b078c06d7eb5700266a86de687a5 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -171,7 +171,6 @@ $i18n_key_words = array(
 "form.admin.profile.th.edit" => '編輯',
 "form.admin.profile.th.del" => '刪除',
 "form.admin.profile.th.active" => '啟動',
 "form.admin.profile.th.edit" => '編輯',
 "form.admin.profile.th.del" => '刪除',
 "form.admin.profile.th.active" => '啟動',

-"form.admin.lock.period" => '鎖定天數間隔',

 "form.admin.options" => '選項',
 "form.admin.lang_default" => '網站預設語言',
 "form.admin.lang_browser_default" => '(默認流覽器)',
 "form.admin.options" => '選項',
 "form.admin.lang_default" => '網站預設語言',
 "form.admin.lang_browser_default" => '(默認流覽器)',

diff --git a/WEB-INF/templates/cf_monthly_quota.tpl b/WEB-INF/templates/cf_monthly_quota.tpl
index 874e2ebe274e2f2e255dfe6359edc9fd9d58ed38..d8a59cef0abd2c4a695fcc05e3887b1b339e57ca 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 align="center">
                 <table>
                     <tr>

-                        <td>{$i18n.label.workdayHours}</td>
+                        <td>{$i18n.form.quota.workdayHours}</td>

                         <td>{$forms.monthlyQuotaForm.dailyWorkingHours.control}</td>
                         <td><input type="submit" name="dailyHours" value="{$i18n.button.save}"></td>
                     </tr>
                         <td>{$forms.monthlyQuotaForm.dailyWorkingHours.control}</td>
                         <td><input type="submit" name="dailyHours" value="{$i18n.button.save}"></td>
                     </tr>


@@ -16,15 +16,15 @@
 </div>
 <table>
     <tr>
 </div>
 <table>
     <tr>

-        <td>{$i18n.label.year}:</td>
+        <td>{$i18n.form.quota.year}:</td>

         <td>{$forms.monthlyQuotaForm.years.control}</td>
     </tr>
     <tr>
         <td colspan="2">
             <table> 
             <tr>
         <td>{$forms.monthlyQuotaForm.years.control}</td>
     </tr>
     <tr>
         <td colspan="2">
             <table> 
             <tr>

-                <td class="tableHeader">{$i18n.label.month}</td>
-                <td class="tableHeader">{$i18n.label.quota}</td>
+                <td class="tableHeader">{$i18n.form.quota.month}</td>
+                <td class="tableHeader">{$i18n.form.quota.quota}</td>

             </tr>
  {foreach $months as $month}
                 <tr>
             </tr>
  {foreach $months as $month}
                 <tr>


@@ -41,7 +41,7 @@
         </td>
     </tr>
 </table>
         </td>
     </tr>
 </table>

-<div>* - {$i18n.label.quota_config_hint}</div>
+<div>* - {$i18n.form.quota.hint}</div>

 {$forms.monthlyQuotaForm.close}
 <script>
 function yearChange(value){
 {$forms.monthlyQuotaForm.close}
 <script>
 function yearChange(value){