Some refactoring in translation files.

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 00123766d904d599fcdbfe5e67bfa716964df853..39b42eea094ae4fdead507952cbce928ad39d9f9 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -187,10 +187,12 @@ $i18n_key_words = array(
 'label.role_manager' => '(Manager)',
 'label.role_comanager' => '(Co-Manager)',
 'label.role_admin' => '(Administrator)',
-// Translate the following string.
+// Translate the following.
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Benutzerfelder',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'Ausklappen',
 'label.type_text' => 'Text',
@@ -245,7 +247,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Daten exportieren',
 'title.import' => 'Daten importieren',
 'title.options' => 'Optionen',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 054a622af47c11c5007eadb50c3c6b22d58de5c1..d3b5375db9b69e2f72e969bed815aacb654c6647 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -187,6 +187,7 @@ $i18n_key_words = array(
 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Custom fields',
+'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Type',
 'label.type_dropdown' => 'dropdown',
 'label.type_text' => 'text',
@@ -239,7 +240,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Adding Notification',
 'title.edit_notification' => 'Editing Notification',
 'title.delete_notification' => 'Deleting Notification',
-'title.monthly_quota' => 'Monthly quota',
+'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exporting Team Data',
 'title.import' => 'Importing Team Data',
 'title.options' => 'Options',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1fde7e7d0cc2246af82810a06d98996bd73944a6..464277589385d2103cfe6cb5c5f773f0cd9533bd 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -219,8 +219,9 @@ $i18n_key_words = array(
 // Translate the following string.
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
-// TODO: translate the following strings.
+// TODO: translate the following.
 // 'label.custom_fields' => 'Custom fields',
+// 'label.monthly_quotas' => 'Monthly quotas',
 // 'label.type' => 'Type',
 // 'label.type_dropdown' => 'dropdown',
 // 'label.type_text' => 'text',
@@ -286,7 +287,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportar datos',
 'title.import' => 'Importar datos',
 'title.options' => 'Opciones',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 25e411653b0b14ed505ad1c0deac202db7e3e2a0..ff52ae6262ead78bd0c62a4a3ab2f65d8c8e6e1a 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -199,6 +199,8 @@ $i18n_key_words = array(
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'فیلدهای سفارشی',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'نوع',
 'label.type_dropdown' => 'منو کشویی',
 'label.type_text' => 'متن',
@@ -258,7 +260,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'پشتیانی گرفتن از اطلاعات تیم',
 'title.import' => 'وارد کردن اطلاعات تیم',
 'title.options' => 'گزینه ها',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 175e49470bbd44efbc7062543024f50b78e89f75..98fb02d7363499e96d9c1cc4fdc183c5e13f977f 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -186,6 +186,8 @@ $i18n_key_words = array(
 'label.page' => 'Sivu',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Omat kentät',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Tyyppi',
 'label.type_dropdown' => 'pudotusvalikko',
 'label.type_text' => 'teksti',
@@ -242,7 +244,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Ilmoituksen lisäys',
 'title.edit_notification' => 'Ilmoituksen muokkaus',
 'title.delete_notification' => 'Ilmoituksen poisto',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Tiimitietojen vienti',
 'title.import' => 'Tiimitietojen tunti',
 'title.options' => 'Optiot',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index e7932a41d8658f858b50e07395df528ff0c02c8d..4381ac627c6efb78960ddfd61596fa5fb60ea91c 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -204,6 +204,8 @@ $i18n_key_words = array(
 
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Champs personalisés',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Type',
 'label.type_dropdown' => 'liste déroulante',
 'label.type_text' => 'texte',
@@ -266,7 +268,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exporter les données', // TODO: use a noun.
 'title.import' => 'Importer les données', // TODO: use a noun.
 'title.options' => 'Options',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 35aa6d3382765b3b38858062a15d9a1e8bf75620..f3325c3d858479bcb20727150b071b49d3dbe1c2 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -204,6 +204,8 @@ $i18n_key_words = array(
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'שדות אישיים',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'סוג',
 'label.type_dropdown' => 'רשימה',
 'label.type_text' => 'טקסט',
@@ -264,7 +266,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'ייצוא נתוני צוות',
 'title.import' => 'ייבוא נתוני צוות',
 'title.options' => 'אפשרויות',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 3bd10db84620d1100d3a75dde24b686baa15c824..683b44992fba2dc3f69f091af0857706da42ddcd 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -187,6 +187,8 @@ $i18n_key_words = array(
 'label.page' => 'Pagina',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Eigen velden',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Type',
 'label.type_dropdown' => 'uitklapbaar',
 'label.type_text' => 'tekst',
@@ -243,7 +245,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Notificatie toevoegen',
 'title.edit_notification' => 'Notificatie bewerken',
 'title.delete_notification' => 'Notificatie verwijderen',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exporteer teamgegevens',
 'title.import' => 'Importeer teamgegevens',
 'title.options' => 'Opties',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a7b2d8430d38d6a67a952f20d1106e528fd8caf9..3627205d698af1f99e63028a95dbb3134ec71796 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -192,6 +192,8 @@ $i18n_key_words = array(
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Niestandardowe pola',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Rodzaj',
 'label.type_dropdown' => 'lista rozwijana',
 'label.type_text' => 'tekst',
@@ -248,7 +250,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Dodawanie powiadomienia',
 'title.edit_notification' => 'Edytowanie powiadomienia',
 'title.delete_notification' => 'Usuwanie powiadomienia',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Eksport danych zespołu',
 'title.import' => 'Import danych zespołu',
 'title.options' => 'Opcje',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 8f7e01ae5fbec5d189899ba557d97cca3a0e10d0..8f84e025519693838206abe5b02e16258db49406 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -186,6 +186,8 @@ $i18n_key_words = array(
 'label.page' => 'Página',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Campos personalizados',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Tipo',
 'label.type_dropdown' => 'lista suspensa',
 'label.type_text' => 'texto',
@@ -242,7 +244,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Adicionando notificação',
 'title.edit_notification' => 'Editando notificação',
 'title.delete_notification' => 'Apagando notificação',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportando dados de equipe',
 'title.import' => 'Importando dados de equipe',
 'title.options' => 'Opções',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index ff53b43e88c8d18781b5f9dfd43e83f85dbca883..d0686229a9a1a568c7e10190891b9fde42a7bfb7 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -187,6 +187,7 @@ $i18n_key_words = array(
 'label.page' => 'Стр',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Дополнительные поля',
+'label.monthly_quotas' => 'Месячные квоты',
 'label.type' => 'Тип',
 'label.type_dropdown' => 'комбо',
 'label.type_text' => 'текст',
@@ -194,11 +195,6 @@ $i18n_key_words = array(
 'label.fav_report' => 'Стандартный отчёт',
 'label.cron_schedule' => 'Расписание cron',
 'label.what_is_it' => 'Что это?',
-'label.year' => 'Год',
-'label.month' => 'Месяц',
-'label.quota' => 'Квота',
-'label.workdayHours' => 'Количество часов в рабочем дне',
-'label.quota_config_hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 
 // Form titles.
 'title.login' => 'Вход в систему',
@@ -244,7 +240,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Добавление уведомления',
 'title.edit_notification' => 'Редактирование уведомления',
 'title.delete_notification' => 'Удаление уведомления',
-// 'title.monthly_quota' => 'Monthly quota',
+'title.monthly_quotas' => 'Месячные квоты',
 'title.export' => 'Экспортирование данных команды',
 'title.import' => 'Импортирование данных команды',
 'title.options' => 'Опции',
@@ -403,4 +399,11 @@ $i18n_key_words = array(
 'form.mail.footer' => 'Anuko Time Tracker - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени. Подробности на сайте <a href="https://www.anuko.com">www.anuko.com</a>.',
 'form.mail.report_sent' => 'Отчёт отправлен.',
 'form.mail.invoice_sent' => 'Счёт отправлен.',
+
+// Quota configuration form.
+'form.quota.year' => 'Год',
+'form.quota.month' => 'Месяц',
+'form.quota.quota' => 'Квота',
+'form.quota.workdayHours' => 'Количество часов в рабочем дне',
+'form.quota.hint' => 'При пустых значениях квоты автоматически определяются из длительности рабочего дня и праздников.',
 );

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3d731bd037519c98e72155c8cc5a3291274604e7..520f1bf00eb9ed3a9fe63bb5d0c62ed3869f2bda 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -201,6 +201,8 @@ $i18n_key_words = array(
 // 'label.page' => 'Page',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Vlastné polia',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Typ',
 'label.type_dropdown' => 'rozbaľovacie pole',
 'label.type_text' => 'text',
@@ -261,7 +263,7 @@ $i18n_key_words = array(
 // 'title.add_notification' => 'Adding Notification',
 // 'title.edit_notification' => 'Editing Notification',
 // 'title.delete_notification' => 'Deleting Notification',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Exportovanie údajov o tíme',
 'title.import' => 'Importovanie údajov o tíme',
 'title.options' => 'Nastavenia',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 02828376ab4513ba949e1ab9e95fc7fac135a948..29427729d8e06628ad653c6e3c667cedff9a9b7c 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -188,6 +188,8 @@ $i18n_key_words = array(
 'label.page' => 'Strana',
 // Labels for plugins (extensions to Time Tracker that provide additional features).
 'label.custom_fields' => 'Dodatna polja',
+// Translate the following.
+// 'label.monthly_quotas' => 'Monthly quotas',
 'label.type' => 'Tipovi',
 'label.type_dropdown' => 'odaberi',
 'label.type_text' => 'text',
@@ -244,7 +246,7 @@ $i18n_key_words = array(
 'title.add_notification' => 'Dodavanje napomene',
 'title.edit_notification' => 'Izmena napomene',
 'title.delete_notification' => 'Brisanje napomene',
-// 'title.monthly_quota' => 'Monthly quota',
+// 'title.monthly_quotas' => 'Monthly Quotas',
 'title.export' => 'Izvoz podataka tim-a',
 'title.import' => 'Uvoz podataka tim-a',
 'title.options' => 'Opcije',

diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 2da8041d8690a593c13f372df14cbe003d2fb868..8c8e27aef8a597da8b3e47db02b99db527050b77 100644 (file)
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -194,7 +194,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.profileForm.monthly_quota.control}</td>
-            <td><label for="monthly_quota">{$i18n.title.monthly_quota}</label> <span id="monthly_quota_config"><a href="cf_monthly_quota.php">{$i18n.label.configure}</a></span></td>
+            <td><label for="monthly_quota">{$i18n.label.monthly_quotas}</label> <span id="monthly_quota_config"><a href="cf_monthly_quota.php">{$i18n.label.configure}</a></span></td>
           </tr>
 {/if}
 

diff --git a/cf_monthly_quota.php b/cf_monthly_quota.php
index 6b94cfdad97ab4952916a2d49a4b86fb9e6d3ef0..0518c57edc89fe0859737d8efefb624403a88a9b 100644 (file)
--- a/cf_monthly_quota.php
+++ b/cf_monthly_quota.php
@@ -83,6 +83,6 @@ for ($i=0; $i < count($months); $i++) {
 $form->addInput(array('type'=>'text', 'name'=>'dailyWorkingHours', 'value'=>$quota->getDailyWorkingHours(), 'style'=>'width:50px'));
 $smarty->assign('months', $months);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.monthly_quota'));
+$smarty->assign('title', $i18n->getKey('title.monthly_quotas'));
 $smarty->assign('content_page_name', 'cf_monthly_quota.tpl');
 $smarty->display('index.tpl');