From 566768d0efea85c215de537c667ae610ddf95909 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Tue, 6 Feb 2018 00:50:52 +0000 Subject: [PATCH] A bit more recycling in translations. --- WEB-INF/resources/ca.lang.php | 4 +--- WEB-INF/resources/cs.lang.php | 8 +++----- WEB-INF/resources/et.lang.php | 8 +++----- WEB-INF/resources/hu.lang.php | 8 +++----- WEB-INF/resources/ja.lang.php | 8 +++----- WEB-INF/resources/ko.lang.php | 8 +++----- WEB-INF/resources/no.lang.php | 9 +++------ WEB-INF/resources/pt.lang.php | 9 +-------- WEB-INF/resources/ro.lang.php | 9 ++++----- WEB-INF/resources/tr.lang.php | 8 +++----- WEB-INF/resources/zh-cn.lang.php | 8 +++----- WEB-INF/resources/zh-tw.lang.php | 8 +++----- WEB-INF/templates/footer.tpl | 2 +- 13 files changed, 34 insertions(+), 63 deletions(-) diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index fce5e087..33ee714d 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -206,8 +206,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Comentari', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Estat', 'label.tax' => 'Impost', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -447,7 +446,6 @@ $i18n_key_words = array( "form.people.del_str" => 'Eliminant usuari', "form.people.th.email" => 'e-mail', "form.people.th.role" => 'Rol', -"form.people.th.status" => 'Estat', "form.people.th.rate" => 'Taxa', "form.people.manager" => 'Manejador', "form.people.comanager" => 'Auxiliar del manejador', diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 9235b2dd..5601343c 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -87,7 +87,8 @@ $i18n_key_words = array( 'error.project' => 'Výběr projektu.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Výběr zákazníka.', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => 'Nesprávné jméno nebo heslo.', @@ -210,8 +211,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Komentář', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Status', 'label.tax' => 'DPH', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -470,7 +470,6 @@ $i18n_key_words = array( "form.people.del_str" => 'smazat uživatele', "form.people.th.login" => 'přihlásit', "form.people.th.role" => 'role', -"form.people.th.status" => 'status', "form.people.th.rate" => 'sazba', "form.people.manager" => 'manažer', "form.people.comanager" => 'spolumanažer', @@ -544,7 +543,6 @@ $i18n_key_words = array( "forward.toxmlfile" => 'exportovat data do .xml souboru', "forward.geninvoice" => 'vytvořit fakturu', -"controls.select.client" => '--- výběr zákazníka ---', "controls.project_bind" => '--- všechny ---', "controls.all" => '--- vše ---', "controls.notbind" => '--- nic ---', diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 9b67eb8c..7d0a6bf9 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -87,7 +87,8 @@ $i18n_key_words = array( 'error.project' => 'Vali projekt.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Vali klient.', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => 'Vale login või salasõna.', @@ -207,8 +208,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Kommentaar', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Seisund', 'label.tax' => 'Maks', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -481,7 +481,6 @@ $i18n_key_words = array( "form.people.del_str" => 'kasutaja kustutamine', "form.people.th.login" => 'login', "form.people.th.role" => 'roll', -"form.people.th.status" => 'seisund', "form.people.th.project" => 'projekt', "form.people.th.rate" => 'hind', "form.people.manager" => 'haldur', @@ -568,7 +567,6 @@ $i18n_key_words = array( "forward.toxmlfile" => 'ekspordi andmed .xml faili', "forward.geninvoice" => 'loo arve', -"controls.select.client" => '--- vali klient ---', "controls.project_bind" => '--- kõik ---', "controls.all" => '--- kõik ---', "controls.notbind" => '--- ei ---', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index 48d18b4d..51487394 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -87,7 +87,8 @@ $i18n_key_words = array( 'error.project' => 'Válassz projektet.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Válassz ügyfelet.', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', // 'error.auth' => 'Incorrect login or password.', @@ -207,8 +208,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Megjegyzés', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Státusz', 'label.tax' => 'Adó', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -455,7 +455,6 @@ $i18n_key_words = array( "form.people.edit_str" => 'munkatárs adatainak szerkesztése', "form.people.del_str" => 'munkatárs adatainak törlése', "form.people.th.role" => 'szerepkör', -"form.people.th.status" => 'státusz', "form.people.th.project" => 'projekt', "form.people.th.rate" => 'tarifa', "form.people.manager" => 'vezető', @@ -537,7 +536,6 @@ $i18n_key_words = array( "forward.tocsvfile" => 'az adatok exportálása CSV file-ba', "forward.geninvoice" => 'számla készítés', -"controls.select.client" => '--- válassz ügyfelet ---', "controls.project_bind" => '--- összes ---', "controls.all" => '--- összes ---', "controls.notbind" => '--- nincs ---', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index c0035466..6e276005 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -86,7 +86,8 @@ $i18n_key_words = array( 'error.project' => 'プロジェクトの選択', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'クライアントの選択', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => '不正確なログインあるいはパスワードが不正確です', @@ -207,8 +208,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'コメント', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => '状態', 'label.tax' => '税', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -475,7 +475,6 @@ $i18n_key_words = array( "form.people.del_str" => 'ユーザーの削除', "form.people.th.login" => 'ログインID', "form.people.th.role" => 'ルール', -"form.people.th.status" => '状態', "form.people.th.project" => 'プロジェクト', "form.people.th.rate" => '給料', "form.people.manager" => '管理者', @@ -567,7 +566,6 @@ $i18n_key_words = array( "forward.toxmlfile" => 'xmlファイルにエクスポート', "forward.geninvoice" => '送り状の作成', -"controls.select.client" => '--- クライアントの選択 ---', "controls.project_bind" => '--- すべて ---', "controls.all" => '--- すべて ---', "controls.notbind" => '--- いいえ ---', diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index 568524f4..483e4572 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -86,7 +86,8 @@ $i18n_key_words = array( 'error.project' => '프로젝트의 선택', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => '클라이언트 선택', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => '부정확한 로그인 혹은 암호가 틀립니다', @@ -207,8 +208,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => '코멘트', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => '상태', 'label.tax' => '세금', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -475,7 +475,6 @@ $i18n_key_words = array( "form.people.del_str" => '사용자를 삭제하기', "form.people.th.login" => '로그인ID', "form.people.th.role" => '직위', -"form.people.th.status" => '상태', "form.people.th.project" => '프로젝트', "form.people.th.rate" => '급여', "form.people.manager" => '관리자', @@ -562,7 +561,6 @@ $i18n_key_words = array( "forward.toxmlfile" => '데이터를 .xml 파일로 익스포트', "forward.geninvoice" => '송장 만들기', -"controls.select.client" => '--- 클라이언트 선택 ---', "controls.project_bind" => '--- 전부 ---', "controls.all" => '--- 전부 ---', "controls.notbind" => '--- 아니 ---', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 0f7672da..9c7e68b2 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -84,7 +84,8 @@ $i18n_key_words = array( 'error.project' => 'Velg prosjekt.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Velg klient.', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => 'Feil brukernavn eller passord.', @@ -205,8 +206,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Kommentar', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Status', 'label.tax' => 'MVA', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -474,7 +474,6 @@ $i18n_key_words = array( "form.people.del_str" => 'slett bruker', "form.people.th.login" => 'innlogging', "form.people.th.role" => 'rolle', -"form.people.th.status" => 'status', // Note to translators: the 2 strings below are missing and must be added and translated // "form.people.th.project" => 'prosjekt', // "form.people.th.rate" => 'timesats', @@ -568,8 +567,6 @@ $i18n_key_words = array( // "forward.toxmlfile" => 'eksporter data til en .xml fil', // "forward.geninvoice" => 'lag faktura', -// Note to translators: the string below is missing and must be translated and added -// "controls.select.client" => '--- velg klient ---', "controls.project_bind" => '--- alle ---', "controls.all" => '--- alle ---', // Note to translators: the strings below are missing and must be translated and added diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index b914f24a..647ac8ed 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -198,8 +198,8 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Comentário', +'label.status' => 'Status', // TODO: translate the following. -// 'label.status' => 'Status', // 'label.tax' => 'Tax', // 'label.subtotal' => 'Subtotal', // 'label.total' => 'Total', @@ -424,15 +424,8 @@ $i18n_key_words = array( "form.people.edit_str" => 'editando usuário', "form.people.del_str" => 'apagando usuário', -// Note to translators: "form.people.th.login" => 'e-mail', // email has been changed to login "form.people.th.role" => 'regra', -"form.people.th.status" => 'status', -// Note to translators: the strings below are missing and must be added and translated -// "form.people.th.project" => 'project', -// "form.people.th.rate" => 'rate', "form.people.manager" => 'gerente', -// Note to translators: the string below is missing and must be added and translated -// "form.people.comanager" => 'comanager', "form.people.empl" => 'usuário', // projects form attributes diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 51b37acf..9d4feff4 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -86,10 +86,12 @@ $i18n_key_words = array( 'error.not_equal' => 'Campul "{0}" nu este egal cu campul "{1}".', // TODO: translate the following. // 'error.interval' => 'Field "{0}" must be greater than "{1}".', +// TODO: for "select" errors: Selecteaza or Alege? We need consistent usage. 'error.project' => 'Selecteaza proiect.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Alege client.', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => 'Nume de utilizator sau parola incorecta.', @@ -207,8 +209,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Comentariu', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Stare', 'label.tax' => 'Taxa', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -461,7 +462,6 @@ $i18n_key_words = array( "form.people.edit_str" => 'editare utilizator', "form.people.del_str" => 'stergee utilizator', "form.people.th.role" => 'functie', -"form.people.th.status" => 'stare', "form.people.th.project" => 'proiect', "form.people.th.rate" => 'rata', "form.people.manager" => 'manager', @@ -547,7 +547,6 @@ $i18n_key_words = array( "forward.tocsvfile" => 'exporta date in fisier .csv', "forward.geninvoice" => 'genereaza factura', -"controls.select.client" => '--- alege client ---', "controls.project_bind" => '--- toate ---', "controls.all" => '--- toate ---', "controls.notbind" => '--- nu ---', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index b2fff74e..0f02f2b9 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -92,7 +92,8 @@ $i18n_key_words = array( 'error.project' => 'Proje seç.', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => 'Müşteri seç', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => 'Hatalı kullanıcı adı veya parola.', @@ -214,8 +215,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => 'Yorum', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => 'Durum', 'label.tax' => 'Vergi', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -469,7 +469,6 @@ $i18n_key_words = array( "form.people.edit_str" => 'kullanıcı düzenleniyor', "form.people.del_str" => 'kullanıcı siliniyor', "form.people.th.role" => 'rol', -"form.people.th.status" => 'durum', "form.people.th.project" => 'proje', "form.people.th.rate" => 'tarife', "form.people.manager" => 'yönetici', @@ -557,7 +556,6 @@ $i18n_key_words = array( "forward.toxmlfile" => 'bilgileri .xml dosyasına aktar', "forward.geninvoice" => 'fatura yarat', -"controls.select.client" => '--- müşteri seç ---', "controls.project_bind" => '--- tümü ---', "controls.all" => '--- tümü ---', "controls.notbind" => '--- hiç ---', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index 9c39e784..6967f855 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -77,7 +77,8 @@ $i18n_key_words = array( 'error.project' => '选择项目。', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => '选择客户。', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => '不正确的用户名或密码。', @@ -194,8 +195,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => '留言', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => '状态', 'label.tax' => '税', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -469,7 +469,6 @@ $i18n_key_words = array( "form.people.del_str" => '删除用户', "form.people.th.login" => '登录', "form.people.th.role" => '角色', -"form.people.th.status" => '状态', "form.people.th.project" => '项目', "form.people.th.rate" => '费率', "form.people.manager" => '经理', @@ -561,7 +560,6 @@ $i18n_key_words = array( "forward.toxmlfile" => '将数据导出到.xml文件', "forward.geninvoice" => '生成发票', -"controls.select.client" => '--- 选择客户 ---', "controls.project_bind" => '--- 全部 ---', "controls.all" => '--- 全部 ---', "controls.notbind" => '--- 无 ---', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 2a4d958d..568aa181 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -84,7 +84,8 @@ $i18n_key_words = array( 'error.project' => '選擇項目', // TODO: translate the following. // 'error.task' => 'Select task.', -// 'error.client' => 'Select client.', +'error.client' => '選擇客戶', +// TODO: translate the following. // 'error.report' => 'Select report.', // 'error.record' => 'Select record.', 'error.auth' => '不正確的用戶名或密碼', @@ -203,8 +204,7 @@ $i18n_key_words = array( // 'label.time_format' => 'Time format', // 'label.week_start' => 'First day of week', 'label.comment' => '留言', -// TODO: translate the following. -// 'label.status' => 'Status', +'label.status' => '狀態', 'label.tax' => '稅', // TODO: translate the following. // 'label.subtotal' => 'Subtotal', @@ -469,7 +469,6 @@ $i18n_key_words = array( "form.people.del_str" => '刪除用戶', "form.people.th.login" => '登錄', "form.people.th.role" => '角色', -"form.people.th.status" => '狀態', "form.people.th.project" => '項目', "form.people.th.rate" => '費率', "form.people.manager" => '經理', @@ -561,7 +560,6 @@ $i18n_key_words = array( "forward.toxmlfile" => '將資料輸出到.xml文件', "forward.geninvoice" => '生成發票', -"controls.select.client" => '--- 選擇客戶 ---', "controls.project_bind" => '--- 全部 ---', "controls.all" => '--- 全部 ---', "controls.notbind" => '--- 無 ---', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index bd9b6a59..cbdd450a 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.12.3905 | Copyright © Anuko | +  Anuko Time Tracker 1.17.12.3906 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1