From 2c35ee142d1273658ba59acdcff963edb1fb0a3e Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Thu, 21 Jul 2016 19:26:39 +0000 Subject: [PATCH] Some cleanup in translation files. --- WEB-INF/resources/ca.lang.php | 4 +--- WEB-INF/resources/cs.lang.php | 1 - WEB-INF/resources/da.lang.php | 2 -- WEB-INF/resources/de.lang.php | 4 ---- WEB-INF/resources/en.lang.php | 15 +++++++++------ WEB-INF/resources/et.lang.php | 1 - WEB-INF/resources/hu.lang.php | 2 -- WEB-INF/resources/it.lang.php | 1 - WEB-INF/resources/ja.lang.php | 1 - WEB-INF/resources/ko.lang.php | 1 - WEB-INF/resources/no.lang.php | 1 - WEB-INF/resources/pt.lang.php | 1 - WEB-INF/resources/ro.lang.php | 1 - WEB-INF/resources/sl.lang.php | 1 - WEB-INF/resources/sv.lang.php | 1 - WEB-INF/resources/tr.lang.php | 1 - WEB-INF/resources/zh-cn.lang.php | 1 - WEB-INF/resources/zh-tw.lang.php | 1 - WEB-INF/templates/cf_monthly_quota.tpl | 10 +++++----- 19 files changed, 15 insertions(+), 35 deletions(-) diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index b5a5ddf4..d06a021e 100644 --- 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', -// 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. @@ -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.lock.period" => 'interval de tancament en dies', // 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 4a8a7e40..9979785c 100644 --- 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.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', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 0e50dae0..d91ebbda 100644 --- 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', -// 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", diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 715c0cb2..49238f30 100644 --- 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?', -// 'label.year' => 'Year', -// 'label.month' => 'Month', -// 'label.quota' => 'Quota', -// '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 97e125a1..3537201c 100644 --- 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.week_total' => 'Week 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', @@ -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.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', @@ -406,4 +401,12 @@ $i18n_key_words = array( 'form.mail.footer' => 'Anuko Time Tracker is a simple, easy to use, open source
time tracking system. Visit www.anuko.com 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 21d82d50..80e5f714 100644 --- 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.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', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index 39baa9bc..28099579 100644 --- 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', -// 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", diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index 523855a5..36c77ee3 100644 --- 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.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', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 96126958..0986141b 100644 --- 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.lock.period" => '日付の間隔をロック', "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 f6bc6237..98e4b2c3 100644 --- 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.lock.period" => '날자로 된 간격을 로크하기', "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 aaf1ad3d..747bbe46 100644 --- 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.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", diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index 989d17e5..91f6cb45 100644 --- 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.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", diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 3ff5d2a3..7a1abfc4 100644 --- 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.lock.period" => 'lock interval in days', // "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 7b299db5..028b17a4 100644 --- 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.lock.period" => 'lock interval in days', "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 444207b4..8c7bc016 100644 --- 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.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', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 20d6bc04..6ec465fc 100644 --- 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.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', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index b404fcc0..4ae46890 100644 --- 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.lock.period" => '锁定天数间隔', "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 4c26c015..dea7e56c 100644 --- 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.lock.period" => '鎖定天數間隔', "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 874e2ebe..d8a59cef 100644 --- a/WEB-INF/templates/cf_monthly_quota.tpl +++ b/WEB-INF/templates/cf_monthly_quota.tpl @@ -5,7 +5,7 @@ - + @@ -16,15 +16,15 @@
{$i18n.label.workdayHours}{$i18n.form.quota.workdayHours} {$forms.monthlyQuotaForm.dailyWorkingHours.control}
- +
{$i18n.label.year}:{$i18n.form.quota.year}: {$forms.monthlyQuotaForm.years.control}
- - + + {foreach $months as $month} @@ -41,7 +41,7 @@
{$i18n.label.month}{$i18n.label.quota}{$i18n.form.quota.month}{$i18n.form.quota.quota}
-
* - {$i18n.label.quota_config_hint}
+
* - {$i18n.form.quota.hint}
{$forms.monthlyQuotaForm.close}