Refactoring in localization files.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 417e77f93505f1a041118090d188935bc98ed7a3..2b3d24510f9fae9a91600a72295be6fa5f03da5f 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -487,8 +487,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'De',
 "form.mail.to" => 'Per a',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'Assumpte',
 "form.mail.comment" => 'Comentari',
 "form.mail.above" => 'Enviar aquest report por e-mail',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 1967944a35a8bf21adc6a24bd23ca93fe7d16e4e..50755b4f9165b63410a6490fff6bd87f3b392ade 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -307,8 +307,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'od',
 "form.mail.to" => 'komu',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'předmět',
 "form.mail.comment" => 'komentář',
 "form.mail.above" => 'poslat sestavu e-mailem',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 7c0b91a6107fbb6d1314efed59e2350238e60552..c07dd29e2ce71683ec273c176595d361c0cbf242 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -131,10 +131,10 @@ $i18n_key_words = array(
 'label.password' => 'Adgangskode',
 'label.confirm_password' => 'Gentag adgangskode',
 'label.email' => 'E-mail',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Emne',
 'label.date' => 'Dato',
 'label.start_date' => 'Start dato',
 'label.end_date' => 'Slut dato',
@@ -404,8 +404,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Emne',
 'form.mail.report_subject' => 'Tidsregistrerings Rapport',
 'form.mail.footer' => 'Anuko Time Tracker er et simpelt, let at bruge, open source<br>tidsregistrerings system. Besøg <a href="https://www.anuko.com">www.anuko.com</a> for mere information.',
 'form.mail.report_sent' => 'Rapport sendt.',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 34602602f8247f9817ee5de49ce39beb80f29713..b57a64b31a94fd32d50f44e8cc13fbd4cd824086 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -127,10 +127,10 @@ $i18n_key_words = array(
 'label.password' => 'Passwort',
 'label.confirm_password' => 'Passwort bestätigen',
 'label.email' => 'E-Mail',
+'label.cc' => 'CC',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Betreff',
 'label.date' => 'Datum',
 'label.start_date' => 'Anfangsdatum',
 'label.end_date' => 'Enddatum',
@@ -403,8 +403,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Von',
 'form.mail.to' => 'An',
-'form.mail.cc' => 'CC',
-'form.mail.subject' => 'Betreff',
 'form.mail.report_subject' => 'Time Tracker Bericht',
 'form.mail.footer' => 'Anuko Time Tracker ist ein einfaches, leicht zu bedienendes, Open-Source<br>Zeitverwaltungs-System. Besuchen Sie <a href="https://www.anuko.com">www.anuko.com</a> für weitere Informationen.',
 'form.mail.report_sent' => 'Der Bericht wurde gesendet.',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index a0c80b3300bfc9586b0dbd880ebac10bf9bf9af2..e91d9345618614492899b1155ba66313c1835044 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -410,8 +410,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'From',
 'form.mail.to' => 'To',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Subject',
 'form.mail.report_subject' => 'Time Tracker Report',
 '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.',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 186a68df6d2ed0f0c14a84b534adbe2a87ab4717..f03462a6321f8f18f26fd82f2661dfd8b4a7368e 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -152,10 +152,10 @@ $i18n_key_words = array(
 'label.password' => 'Contraseña',
 'label.confirm_password' => 'Confirmar Contraseña',
 'label.email' => 'Email',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Asunto',
 'label.date' => 'Fecha',
 'label.start_date' => 'Fecha de inicio',
 'label.end_date' => 'Fecha de fin',
@@ -471,8 +471,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Asunta',
 // TODO: translate form.mail.report_subject.
 // 'form.mail.report_subject' => 'Time Tracker Report',
 // Note to translators: the following strings need to be translated.

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c7c5183e4df52a5ef0f5e4a9fc3e8ca866bcc7ca..2de01308320ba2a6147ea8f440bbb55ebe4b06bc 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -151,11 +151,11 @@ $i18n_key_words = array(
 'label.login' => 'Login',
 'label.password' => 'Salasõna',
 'label.confirm_password' => 'Kinnita salasõna',
-// TODO: translate the following.
 // 'label.email' => 'Email',
-// 'label.cc' => 'Cc',
+'label.cc' => 'Cc',
+// TODO: translate the following.
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Teema',
 // 'label.date' => 'Date',
 // 'label.start_date' => 'Start date',
 // 'label.end_date' => 'End date',
@@ -389,8 +389,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'kellelt',
 "form.mail.to" => 'kellele',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'teema',
 "form.mail.comment" => 'märkus',
 "form.mail.above" => 'saada aruanne e-mailiga',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index e31791f6586fcbf3c8be9b7beee9f41ed6026341..71f5e33290d128b09e55f44dc2be805d48934a2a 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -139,10 +139,10 @@ $i18n_key_words = array(
 'label.password' => 'رمز عبور',
 'label.confirm_password' => 'تکرار رمزعبور',
 'label.email' => 'ایمیل',
+'label.cc' => 'کپی',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'موضوع',
 'label.date' => 'تاریخ',
 'label.start_date' => 'تاریخ شروع',
 'label.end_date' => 'تاریخ اتمام',
@@ -430,8 +430,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'از',
 'form.mail.to' => 'به',
-'form.mail.cc' => 'کپی',
-'form.mail.subject' => 'موضوع',
 'form.mail.report_subject' => 'گزارش تایم شیت',
 // TODO: translate form.mail.footer.
 // '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.',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 05d3afab316c431082c44995be008a281eedaf31..e6c3c5f136ed9a100d9f9c63cdf18783148478af 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -129,10 +129,10 @@ $i18n_key_words = array(
 'label.password' => 'Salasana',
 'label.confirm_password' => 'Vahvista salasana',
 'label.email' => 'Sähköposti',
+'label.cc' => 'Kopio',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Aihe',
 'label.date' => 'Päiväys',
 'label.start_date' => 'Aloituspäivä',
 'label.end_date' => 'Päättymispäivä',
@@ -402,8 +402,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Lähettäjä',
 'form.mail.to' => 'Vastaanottaja',
-'form.mail.cc' => 'Kopio',
-'form.mail.subject' => 'Aihe',
 'form.mail.report_subject' => 'Time Tracker -raportti',
 'form.mail.footer' => 'Anuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto. Lisätietoja sivulla <a href="https://www.anuko.com">www.anuko.com</a>.',
 'form.mail.report_sent' => 'Raportti lähetetty.',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index ec044a9de39552a1f9ea80c236edf7c5ed9cf526..f79e1ac821b4a0f603d9e70769ee14374bc2ff47 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -142,10 +142,10 @@ $i18n_key_words = array(
 'label.password' => 'Mot de passe',
 'label.confirm_password' => 'Confirmez le mot de passe',
 'label.email' => 'Email',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Objet',
 'label.date' => 'Date',
 'label.start_date' => 'Date de début',
 'label.end_date' => 'Date de fin',
@@ -448,8 +448,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'À',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Objet',
 'form.mail.report_subject' => 'Rapport Time Tracker',
 // Note to translators: the following strings need to be translated.
 // The problem seems to be that the first sentence does not seem like a complete sentence.

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 9d4951bf91f4fd13a7c1c877174c56531e3d5f50..da70403415413dda988c445aaaabcb39d10460e2 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -143,10 +143,10 @@ $i18n_key_words = array(
 'label.password' => 'סיסמה',
 'label.confirm_password' => 'בדיקת סיסמה',
 'label.email' => 'דואר אלקטרוני',
+'label.cc' => 'העתק',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'נושא',
 'label.date' => 'תאריך',
 'label.start_date' => 'תאריך התחלה',
 'label.end_date' => 'תאריך סיום',
@@ -432,8 +432,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'מאת',
 'form.mail.to' => 'אל',
-'form.mail.cc' => 'העתק',
-'form.mail.subject' => 'נושא',
 'form.mail.report_subject' => 'דוח Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker הינה מערכת פשוטה, קלה לשימוש וחינמית לניהול זמן. בקר באתר <a href="https://www.anuko.com">www.anuko.com</a> לפרטים נוספים.',
 'form.mail.report_sent' => 'הדוח נשלח.',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 589be7f5e0a43303680a6ca5b54ac3bdd2e3fc83..fbaf1079e7f79dca70d83ceeb2ef2ffef9f11161 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -134,9 +134,10 @@ $i18n_key_words = array(
 'label.confirm_password' => 'jelszó megerősítése',
 // TODO: translate the following.
 // 'label.email' => 'Email',
-// 'label.cc' => 'Cc',
+'label.cc' => 'Másolatot kap',
+// TODO: translate the following.
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Tárgy',
 'label.total' => 'összesen',
 // Translate the following.
 // 'label.page' => 'Page',
@@ -304,8 +305,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'feladó',
 "form.mail.to" => 'címzett',
-"form.mail.cc" => 'másolatot kap',
-"form.mail.subject" => 'tárgy',
 "form.mail.comment" => 'megjegyzés',
 "form.mail.above" => 'küldjük el ezt a riportot e-mail-ben...',
 // Note to translators: the string below must be translated

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8c5591b9cc326673ea43a9574ccd6e6b74aebd3c..27e39ae1abda189e16510cc36badb996ffd85b1d 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -134,9 +134,10 @@ $i18n_key_words = array(
 'label.email' => 'e-mail',
 // TODO: translate the following.
 // 'label.email' => 'Email',
-// 'label.cc' => 'Cc',
+'label.cc' => 'Cc',
+// TODO: translate the following.
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'oggetto',
 'label.total' => 'totale',
 // Translate the following.
 // 'label.page' => 'Page',
@@ -301,8 +302,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'da',
 "form.mail.to" => 'a',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'oggetto',
 "form.mail.comment" => 'commento',
 "form.mail.above" => 'invia questo report tramite e-mail',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 0e3462cd3fd25c409cf2a8e4c174fb342e33d1a6..79e2d1b0cb692c263ca1cec24044c192f895e3f1 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -139,7 +139,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => '主題',
 'label.total' => '合計',
 // Translate the following.
 // 'label.page' => 'Page',
@@ -300,8 +300,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'から',
 "form.mail.to" => 'まで',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => '主題',
 "form.mail.comment" => 'コメント',
 "form.mail.above" => 'このレポートをEメールで送信',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1ca57c471bb5258ad07e7da9dc1e33efec33f3a3..385815f3a88ab84052e700b945705281c59db0c7 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -135,7 +135,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => '제목',
 'label.total' => '합계',
 // TODO: translate the following.
 // 'label.page' => 'Page',
@@ -296,8 +296,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => '부터',
 "form.mail.to" => '까지',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => '제목',
 "form.mail.comment" => '코멘트',
 "form.mail.above" => '이 보고서를 이메일로 송신',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 352a31f072850c32910a5dc03e80374d178612b1..9bb84a97ed8acdea34bcbeb2ecedc13dfe86b633 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -130,10 +130,10 @@ $i18n_key_words = array(
 'label.password' => 'Wachtwoord',
 'label.confirm_password' => 'Bevestig wachtwoord',
 'label.email' => 'E-mailadres',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Onderwerp',
 'label.date' => 'Datum',
 'label.start_date' => 'Begindatum',
 'label.end_date' => 'Einddatum',
@@ -408,8 +408,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Van',
 'form.mail.to' => 'Aan',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Onderwerp',
 'form.mail.report_subject' => 'Time Tracker Rapport',
 'form.mail.footer' => 'Anuko Time Tracker is een eenvoudig en gemakkelijk te gebruiken open source tijdregistratiesysteem. Bezoek <a href="https://www.anuko.com">www.anuko.com</a> voor meer informatie.',
 'form.mail.report_sent' => 'Rapport is verzonden.',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index dba4cbf8fe78da3f7dd66a85dfdbdf8e3bbbcc1f..ac23f43eced599ca777d809922030a1d0bb91f25 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -135,7 +135,7 @@ $i18n_key_words = array(
 // 'label.email' => 'Email',
 // 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Emne',
 'label.total' => 'totalt',
 // TODO: translate the following.
 // 'label.page' => 'Page',
@@ -306,8 +306,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'fra',
 "form.mail.to" => 'til',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'emne',
 "form.mail.comment" => 'kommentar',
 "form.mail.above" => 'send denne rapporten som e-post',
 // Note to translators: the strings below must be translated

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index d52e38bfe048e273cd995ecd4face9d5a6b02ce5..f1eef73bff825a156af27e1c6fdc90bdd196d576 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -137,7 +137,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Temat',
 'label.date' => 'Data',
 'label.start_date' => 'Data początkowa',
 'label.end_date' => 'Data końcowa',
@@ -411,8 +411,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Do',
-'form.mail.cc' => 'DW',
-'form.mail.subject' => 'Temat',
 'form.mail.report_subject' => 'Raport Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker jest prostym, łatwym w użyciu, otwartoźródłowym<br>systemem śledzenia czasu. Odwiedź <a href="https://www.anuko.com">www.anuko.com</a>, aby uzyskać więcej informacji.',
 'form.mail.report_sent' => 'Wysłano raport',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 26cedd48a763a84dc7845e9a1b99f2549fc21019..3fa765245e77f51ad6d6b89926c8421f4dada77f 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -129,10 +129,10 @@ $i18n_key_words = array(
 'label.password' => 'Senha',
 'label.confirm_password' => 'Confirme a senha',
 'label.email' => 'E-mail',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Assunto',
 'label.date' => 'Data',
 'label.start_date' => 'Data inicial',
 'label.end_date' => 'Data final',
@@ -403,8 +403,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Assunto',
 'form.mail.report_subject' => 'Relatório do Time Tracker',
 'form.mail.footer' => 'Anuko Time Tracker é um sistema, simples, de fácil uso, de código aberto,<br>de rastreamento do tempo. Visite <a href="https://www.anuko.com">www.anuko.com</a> para mais informações.',
 'form.mail.report_sent' => 'Relatório enviado.',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index b460a771942d00ee6684097b3b25f253c5950298..29d8cc4bcbcf3e837ec82aa8818c1d971683d5ea 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -129,11 +129,11 @@ $i18n_key_words = array(
 // 'label.manager_login' => 'manager login',
 'label.password' => 'senha',
 'label.confirm_password' => 'confirme a senha',
-// TODO: translate the following.
 // 'label.email' => 'Email',
-// 'label.cc' => 'Cc',
+'label.cc' => 'Cc',
+// TODO: translate the following.
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Assunto',
 // 'label.page' => 'Page',
 // 'label.condition' => 'Condition',
 
@@ -307,8 +307,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'de',
 "form.mail.to" => 'para',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'assunto',
 "form.mail.comment" => 'comentário',
 "form.mail.above" => 'enviar este relatório por e-mail',
 // Note to translators: the strings below must be translated

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index a892ec95ba2594fa106665d3978b01c3bc1489c1..0442cae753865df063934ec98d8efb06c6e268aa 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -135,11 +135,11 @@ $i18n_key_words = array(
 // 'label.manager_login' => 'manager login',
 'label.password' => 'parola',
 'label.confirm_password' => 'confirma parola',
+'label.email' => 'E-mail',
+'label.cc' => 'Copie',
 // TODO: translate the following.
-// 'label.email' => 'Email',
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Subiect',
 'label.total' => 'total',
 // TODO: translate the following.
 // 'label.page' => 'Page',
@@ -306,8 +306,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'de la',
 "form.mail.to" => 'catre',
-"form.mail.cc" => 'copie',
-"form.mail.subject" => 'subiect',
 "form.mail.comment" => 'comentariu',
 "form.mail.above" => 'trimite acest raport pe e-mail',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 8fbc17830dee8e173aa7197607c6466200453dad..1a17deec08c378b21e0c1617440cab45d654ae3f 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -407,8 +407,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'От',
 'form.mail.to' => 'Кому',
-'form.mail.cc' => 'Копия',
-'form.mail.subject' => 'Тема',
 'form.mail.report_subject' => 'Time Tracker отчёт',
 'form.mail.footer' => 'Anuko Time Tracker - это открытая (open source), простая и лёгкая в использовании система трекинга рабочего времени. Подробности на сайте <a href="https://www.anuko.com">www.anuko.com</a>.',
 'form.mail.report_sent' => 'Отчёт отправлен.',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e7ed2563578294b33262b5e467312e45c3e666dd..3abfe4466894adbd733ceec5132dea39c2cf651e 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -140,10 +140,10 @@ $i18n_key_words = array(
 'label.password' => 'Heslo',
 'label.confirm_password' => 'Potvrdenie hesla',
 'label.email' => 'E-mail',
+'label.cc' => 'Kópia',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Predmet',
 'label.date' => 'Dátum',
 'label.start_date' => 'Dátum začiatku',
 'label.end_date' => 'Dátum konca',
@@ -430,8 +430,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
-'form.mail.cc' => 'Kópia',
-'form.mail.subject' => 'Predmet',
 'form.mail.report_subject' => 'Time Tracker zostava',
 'form.mail.footer' => 'Anuko Time Tracker je jednoduchý a ľahko použiteľný systém na sledovanie času s otvoreným zdrojovým kódom.<br> Navštívte <a href="https://www.anuko.com">www.anuko.com</a> pre viac informácií.',
 'form.mail.report_sent' => 'Zostava odoslaná.',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index e7553777264b4c000d3e10f674ac2587f5c16d1c..3f3548f6cc9e945fabd5f486d127732829135a7a 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -136,10 +136,10 @@ $i18n_key_words = array(
 'label.password' => 'geslo',
 // 'label.confirm_password' => 'confirm password',
 'label.email' => 'Email',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Predmet',
 'label.total' => 'total',
 // TODO: translate the following.
 // 'label.page' => 'Page',
@@ -299,8 +299,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'od',
 "form.mail.to" => 'za',
-"form.mail.cc" => 'cc',
-"form.mail.subject" => 'predmet',
 "form.mail.comment" => 'komentar',
 "form.mail.above" => 'pošlji to poročilo preko elektronske pošte',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index ade4ed1e76732e82c45951fc704c9a948c532b6e..11ee1fd30fea9ca51969d2f25baae799b930de27 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -131,10 +131,10 @@ $i18n_key_words = array(
 'label.password' => 'Lozinka',
 'label.confirm_password' => 'Potvrdi lozinku',
 'label.email' => 'Email',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Naslov',
 'label.date' => 'Datum',
 'label.start_date' => 'Početni datum',
 'label.end_date' => 'Krajnji datum',
@@ -407,8 +407,6 @@ $i18n_key_words = array(
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Naslov',
 'form.mail.report_subject' => 'Evidencija vremena',
 'form.mail.footer' => 'Anuko Time Tracker je jednostavan i lak za korišćenje za praćenje <br>radnog vremena. Posetite <a href="https://www.anuko.com">www.anuko.com</a> za više informacija.',
 'form.mail.report_sent' => 'Izveštaj poslat.',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ff948f8a7dceb37048a4ea4dca1c5a38b87abb31..75b7b56731fd102a8001945811f6d428c5bbb51d 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -130,10 +130,10 @@ $i18n_key_words = array(
 'label.password' => 'Lösenord',
 'label.confirm_password' => 'Bekräfta lösenord',
 'label.email' => 'E-postadress',
+'label.cc' => 'Cc',
 // TODO: translate the following.
-// 'label.cc' => 'Cc',
 // 'label.bcc' => 'Bcc',
-// 'label.subject' => 'Subject',
+'label.subject' => 'Ämne',
 'label.date' => 'Datum',
 'label.start_date' => 'Startdatum',
 'label.end_date' => 'Slutdatum',
@@ -405,8 +405,6 @@ $i18n_key_words = array(
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Från',
 'form.mail.to' => 'Till',
-'form.mail.cc' => 'Cc',
-'form.mail.subject' => 'Ämne',
 'form.mail.report_subject' => 'Tidsrapport',
 'form.mail.footer' => 'Anuko Time Tracker är en lättanvänd applikation byggd med öppen källkod för att enkelt spåra och hålla koll på arbetstider. Besök <a href="https://www.anuko.com">www.anuko.com</a> för mer information.',
 'form.mail.report_sent' => 'Rapporten skickades.',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 0cdf42c6c8bb9c5c5bf6f42df3762a655ef6f65e..267f6ba42881d4296c48a6ca106b1329f0f803e9 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -304,8 +304,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => 'kimden',
 "form.mail.to" => 'kime',
-"form.mail.cc" => 'bilgi',
-"form.mail.subject" => 'konu',
 "form.mail.comment" => 'yorum',
 "form.mail.above" => 'bu raporu e-posta ile yolla',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 2503608a9d677f88b508e3161b68b90c44027d26..395a10dd930eef9b231496a51f98d914b56ea9d7 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -446,8 +446,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => '从',
 "form.mail.to" => '到',
-"form.mail.cc" => '抄送',
-"form.mail.subject" => '主题',
 "form.mail.comment" => '留言',
 "form.mail.above" => '通过电子邮件发送该报告',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index f2b8b9d236667562585ca1a48dea6628646a420d..3b9ab68b3325522e68b87b8e0f86dc54abf7996c 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -298,8 +298,6 @@ $i18n_key_words = array(
 // mail form attributes
 "form.mail.from" => '從',
 "form.mail.to" => '到',
-"form.mail.cc" => '抄送',
-"form.mail.subject" => '主題',
 "form.mail.comment" => '留言',
 "form.mail.above" => '通過電子郵件發送該報告',
 // Note to translators: this string needs to be translated.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 26a9213ae8ff6df9dda3fb127e635a64ea24e6cb..fb3861a08f3dfbf21acb3ead35bf5f40b8ac1344 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.12.1.3667 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.12.1.3668 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl
index 4dcf34b79b0d1fd78a3d992c9d745c2bd99ad593..c57399f1f734af7beba41d1914fcf86551f089af 100644 (file)
--- a/WEB-INF/templates/mail.tpl
+++ b/WEB-INF/templates/mail.tpl
@@ -15,11 +15,11 @@
           <td>{$forms.mailForm.receiver.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.cc}:</td>
+          <td align="right">{$i18n.label.cc}:</td>
           <td>{$forms.mailForm.cc.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.subject} (*):</td>
+          <td align="right">{$i18n.label.subject} (*):</td>
           <td>{$forms.mailForm.subject.control}</td>
         </tr>
         <tr>

diff --git a/WEB-INF/templates/notification_add.tpl b/WEB-INF/templates/notification_add.tpl
index e565eda0cf8da4ee33d87a40c9738acb87da15a8..45fafce28aa50046e040270bd4863e55437befb6 100644 (file)
--- a/WEB-INF/templates/notification_add.tpl
+++ b/WEB-INF/templates/notification_add.tpl
@@ -16,11 +16,11 @@
           <td>{$forms.notificationForm.email.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.cc}:</td>
+          <td align="right">{$i18n.label.cc}:</td>
           <td>{$forms.notificationForm.cc.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.subject}:</td>
+          <td align="right">{$i18n.label.subject}:</td>
           <td>{$forms.notificationForm.subject.control}</td>
         </tr>
         <tr>

diff --git a/WEB-INF/templates/notification_edit.tpl b/WEB-INF/templates/notification_edit.tpl
index ed81067084ac3df116359970e728ce03cb828d37..d1e13dc16e107743e5af609a96910276a6a4738d 100644 (file)
--- a/WEB-INF/templates/notification_edit.tpl
+++ b/WEB-INF/templates/notification_edit.tpl
@@ -16,11 +16,11 @@
           <td>{$forms.notificationForm.email.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.cc}:</td>
+          <td align="right">{$i18n.label.cc}:</td>
           <td>{$forms.notificationForm.cc.control}</td>
         </tr>
         <tr>
-          <td align="right">{$i18n.form.mail.subject}:</td>
+          <td align="right">{$i18n.label.subject}:</td>
           <td>{$forms.notificationForm.subject.control}</td>
         </tr>
         <tr>

diff --git a/invoice_send.php b/invoice_send.php
index 3d219ab7ec1effcddc82cabf19d83ad56ce74b46..eb4b2a3f736ec60bbf307cffab8fabc864cfe797 100644 (file)
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -67,8 +67,8 @@ $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
 
   if ($err->no()) {

diff --git a/notification_add.php b/notification_add.php
index b33f6807b52871b338c4834f43e37516fc152028..3fa4073a810c68288ffdea7cb01b31a8ac8a2de3 100644 (file)
--- a/notification_add.php
+++ b/notification_add.php
@@ -73,8 +73,8 @@ if ($request->isPost()) {
   if (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));
   if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.condition'));
 
   if ($err->no()) {

diff --git a/notification_edit.php b/notification_edit.php
index 6751eb0776cba0752c094fbb4ced1a8b1e1ab68e..8e03b563b99ba365fee256e5e1bec600e856ff4f 100644 (file)
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -80,8 +80,8 @@ if ($request->isPost()) {
   if (!$cl_fav_report) $err->add($i18n->getKey('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));
   if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
   if (!ttValidCondition($cl_report_condition)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.condition'));
 
   if ($err->no()) {

diff --git a/report_send.php b/report_send.php
index b72c8b2635adefa6e320b99929a48d4fbd6d3cfc..a19756a2a323f35c13f9d3f0ab7d39c69153a04f 100644 (file)
--- a/report_send.php
+++ b/report_send.php
@@ -61,8 +61,8 @@ $form->addInput(array('type'=>'submit','name'=>'btn_send','value'=>$i18n->getKey
 if ($request->isPost()) {
   // Validate user input.
   if (!ttValidEmailList($cl_receiver)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.to'));
-  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.cc'));
-  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.mail.subject'));
+  if (!ttValidEmailList($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
+  if (!ttValidString($cl_subject)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.comment'));
 
   if ($err->no()) {