From: Nik Okuntseff Date: Thu, 22 Feb 2018 20:37:21 +0000 (+0000) Subject: Combining add button labels into one. X-Git-Tag: timetracker_1.19-1~1097 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=cdb0911b4f72d4bb1df7cd82f2bce0d9ab1579b0;p=timetracker.git Combining add button labels into one. --- diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index 88d59a56..eefcbb31 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -122,9 +122,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Agregar client', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Agregar', 'button.generate' => 'Generar', // TODO: translate the following. diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 7cd07f5d..bd4ce17d 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -125,9 +125,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Přidat zákazníka', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Přidat', 'button.generate' => 'Vytvořit', 'button.reset_password' => 'Resetovat heslo', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 5994d7f9..a95ecd98 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Tilføj project', 'button.add_task' => 'Tilføj opgave', 'button.add_client' => 'Tilføj kunde', -'button.add_invoice' => 'Tilføj faktura', -'button.add_option' => 'Tilføj mulighed', 'button.add' => 'Tilføj', 'button.generate' => 'Generer', 'button.reset_password' => 'Nulstil adgangskode', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 872a543a..3d2b6af9 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Projekt anlegen', 'button.add_task' => 'Task hinzufügen', 'button.add_client' => 'Auftraggeber anlegen', -'button.add_invoice' => 'Rechnung hinzufügen', -'button.add_option' => 'Option hinzufügen', 'button.add' => 'Hinzufügen', 'button.generate' => 'Erstellen', 'button.reset_password' => 'Passwort zurücksetzen', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 21a3fdf9..7601a02d 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Add project', 'button.add_task' => 'Add task', 'button.add_client' => 'Add client', -'button.add_invoice' => 'Add invoice', -'button.add_option' => 'Add option', 'button.add' => 'Add', 'button.generate' => 'Generate', 'button.reset_password' => 'Reset password', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index 6c9d5024..ebd98f4b 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -121,9 +121,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Agregar cliente', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Agregar', 'button.generate' => 'Generar', // TODO: translate the following. diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 2011aae0..9a3edcdd 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -125,9 +125,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Lisa klient', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Lisa', 'button.generate' => 'Loo', 'button.reset_password' => 'Tühjenda salasõna', diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index 40536a47..9df5c1f1 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -116,8 +116,6 @@ $i18n_key_words = array( 'button.add_project' => 'درج پروژه', 'button.add_task' => 'درج وظیفه', 'button.add_client' => 'درج مشتری', -'button.add_invoice' => 'درج فاکتور', -'button.add_option' => 'درج گزینه', 'button.add' => 'درج', 'button.generate' => 'تولید', 'button.reset_password' => 'بازسازی رمزعبور', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 58a33405..8a71f16c 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -109,8 +109,6 @@ $i18n_key_words = array( 'button.add_project' => 'Lisää projekti', 'button.add_task' => 'Lisää tehtävä', 'button.add_client' => 'Lisää asiakas', -'button.add_invoice' => 'Lisää lasku', -'button.add_option' => 'Lisää optio', 'button.add' => 'Lisää', 'button.generate' => 'Luo', 'button.reset_password' => 'Nollaa salasana', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index 027fec25..405abe67 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Ajouter un projet', 'button.add_task' => 'Ajouter une tâche', 'button.add_client' => 'Ajouter un client', -'button.add_invoice' => 'Ajouter une facture', -'button.add_option' => 'Ajouter une option', 'button.add' => 'Ajouter', 'button.generate' => 'Générer', 'button.reset_password' => 'Réinitialiser', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index 3341f030..c71637c0 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -125,8 +125,6 @@ $i18n_key_words = array( 'button.add_project' => 'הוסף פרוייקט', 'button.add_task' => 'הוסף משימה', 'button.add_client' => 'הוסף לקוח', -'button.add_invoice' => 'הוסף חשבונית', -'button.add_option' => 'הוסף אפשרות', 'button.add' => 'הוסף', 'button.generate' => 'הרץ', 'button.reset_password' => 'איפוס סיסמה', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index f17db397..838e626d 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -122,9 +122,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Ügyfél hozzáadása', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Hozzáadás', 'button.generate' => 'Generálás', // TODO: translate the following. diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index 3b04c35c..c40579ea 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -108,8 +108,6 @@ $i18n_key_words = array( 'button.add_project' => 'Aggiungi progetto', 'button.add_task' => 'Aggiungi compito', 'button.add_client' => 'Aggiungi cliente', -'button.add_invoice' => 'Aggiungi fattura', -'button.add_option' => 'Aggiungi opzione', 'button.add' => 'Aggiungi', 'button.generate' => 'Genera', 'button.reset_password' => 'Reset password', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 956fd561..5d14e289 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -123,8 +123,6 @@ $i18n_key_words = array( // 'button.add_project' => 'Add project', // 'button.add_task' => 'Add task', // 'button.add_client' => 'Add client', -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => '追加', 'button.generate' => '生成', // TODO: translate the following. diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index bfa326b7..2ec329c5 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -123,8 +123,6 @@ $i18n_key_words = array( // 'button.add_project' => 'Add project', // 'button.add_task' => 'Add task', // 'button.add_client' => 'Add client', -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => '추가', 'button.generate' => '생성', // TODO: translate the following. diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index 8149366d..f97fdfc5 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Project toevoegen', 'button.add_task' => 'Taak toevoegen', 'button.add_client' => 'Klant toevoegen', -'button.add_invoice' => 'Factuur toevoegen', -'button.add_option' => 'Optie toevoegen', 'button.add' => 'Toevoegen', 'button.generate' => 'Genereren', 'button.reset_password' => 'Herstel het wachtwoord', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 79d24e04..c9a4a57e 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -124,9 +124,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Legg til klient', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Legg til', 'button.generate' => 'Generer', 'button.reset_password' => 'Resett passord', diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index 39f37e38..04a1ee62 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -111,8 +111,6 @@ $i18n_key_words = array( 'button.add_project' => 'Dodaj projekt', 'button.add_task' => 'Dodaj zadanie', 'button.add_client' => 'Dodaj klienta', -'button.add_invoice' => 'Dodaj fakturę', -'button.add_option' => 'Dodaj opcję', 'button.add' => 'Dodaj', 'button.generate' => 'Wygeneruj', 'button.reset_password' => 'Resetuj hasło', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index 2a17b26d..edd2f8e6 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -108,8 +108,6 @@ $i18n_key_words = array( 'button.add_project' => 'Adicionar projeto', 'button.add_task' => 'Adicionar tarefa', 'button.add_client' => 'Adicionar cliente', -'button.add_invoice' => 'Adicionar fatura', -'button.add_option' => 'Adicionar opção', 'button.add' => 'Adicionar', 'button.generate' => 'Criar', 'button.reset_password' => 'Resetar senha', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index cab935db..a6edbce0 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -121,8 +121,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', // 'button.add_client' => 'Add client', -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Adicionar', // TODO: translate the following. // 'button.generate' => 'Generate', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 3a4d70a1..03b2a9a1 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -128,9 +128,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Adauga client', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Adauga', 'button.generate' => 'Genereaza', // TODO: translate the following. diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 42e0a8b8..c807cd8d 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -107,8 +107,6 @@ $i18n_key_words = array( 'button.add_project' => 'Добавить проект', 'button.add_task' => 'Добавить задачу', 'button.add_client' => 'Добавить клиента', -'button.add_invoice' => 'Добавить счёт', -'button.add_option' => 'Добавить опцию', 'button.add' => 'Добавить', 'button.generate' => 'Сгенерировать', 'button.reset_password' => 'Сбросить пароль', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index 67b2bead..9ada7baf 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -115,8 +115,6 @@ $i18n_key_words = array( 'button.add_project' => 'Pridať projekt', 'button.add_task' => 'Pridať úlohy', 'button.add_client' => 'Pridať klienta', -'button.add_invoice' => 'Pridať faktúru', -'button.add_option' => 'Pridať vlastné pole', 'button.add' => 'Pridať', 'button.generate' => 'Generovať', 'button.reset_password' => 'Obnoviť heslo', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index 08b3d296..31fb7280 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -119,9 +119,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Dodaj stranko', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Dodaj', 'button.generate' => 'Ustvari', // TODO: translate the following. diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index 783093e3..34ef63ac 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -108,8 +108,6 @@ $i18n_key_words = array( 'button.add_project' => 'Dodaj projekat', 'button.add_task' => 'Dodaj zadatak', 'button.add_client' => 'Dodaj klijenta', -'button.add_invoice' => 'Dodaj račun', -'button.add_option' => 'Dodaj opcije', 'button.add' => 'Dodaj', 'button.generate' => 'Napravi', 'button.reset_password' => 'Resetuj lozinku', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index 7500d44c..b3b4d8f4 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -108,8 +108,6 @@ $i18n_key_words = array( 'button.add_project' => 'Lägg till projekt', 'button.add_task' => 'Lägg till arbetsuppgift', 'button.add_client' => 'Lägg till kund', -'button.add_invoice' => 'Lägg till faktura', -'button.add_option' => 'Lägg till alternativ', 'button.add' => 'Lägg till', 'button.generate' => 'Generera', 'button.reset_password' => 'Återställ lösenord', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index ab9251b2..c7fc9ffb 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -130,9 +130,6 @@ $i18n_key_words = array( // TODO: translate the following. // 'button.add_task' => 'Add task', 'button.add_client' => 'Müşteri ekle', -// TODO: translate the following. -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => 'Ekle', 'button.generate' => 'Yarat', // TODO: translate the following. diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index 63931636..32d126d6 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -115,8 +115,6 @@ $i18n_key_words = array( // 'button.add_project' => 'Add project', // 'button.add_task' => 'Add task', // 'button.add_client' => 'Add client', -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => '添加', 'button.generate' => '创建', 'button.reset_password' => '重置密码', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 2fd24066..9ceb21b0 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -121,8 +121,6 @@ $i18n_key_words = array( // 'button.add_project' => 'Add project', // 'button.add_task' => 'Add task', // 'button.add_client' => 'Add client', -// 'button.add_invoice' => 'Add invoice', -// 'button.add_option' => 'Add option', 'button.add' => '添加', 'button.generate' => '創建', 'button.reset_password' => '重設密碼', diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl index 414c3bc2..2882d92c 100644 --- a/WEB-INF/templates/cf_dropdown_options.tpl +++ b/WEB-INF/templates/cf_dropdown_options.tpl @@ -29,7 +29,7 @@
- +
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 1acdad98..e0d07cda 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.29.4014 | Copyright © Anuko | +  Anuko Time Tracker 1.17.29.4015 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl index 0fad98d2..32d09544 100644 --- a/WEB-INF/templates/invoices.tpl +++ b/WEB-INF/templates/invoices.tpl @@ -37,7 +37,7 @@ {if !$user->isClient()} - +


{/if} {/if} diff --git a/WEB-INF/templates/roles.tpl b/WEB-INF/templates/roles.tpl index d703fef0..b93d0ef2 100644 --- a/WEB-INF/templates/roles.tpl +++ b/WEB-INF/templates/roles.tpl @@ -30,7 +30,7 @@

-
+
@@ -57,7 +57,7 @@

-
+