From 7b479316eaf590ab16982b1566137ff6dd7ef8cd Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:38 +0100 Subject: [PATCH 01/23] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 9bb6dc172e..960f89a9a1 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres', 'mail_for_bad_login_help' => 'Als een user met de verkeerde gegevens probeert in te loggen', 'mail_for_blocked_login_help' => 'Als een geblokkeerde gebruiker probeert in te loggen', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From 4c4625583a281374a5f69b92f565ae644f544143 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:46 +0100 Subject: [PATCH 02/23] Approved. Step name: Proofread --- resources/lang/nl_NL/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index a976726e74..b42cccded4 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.', 'tag_keep_transactions' => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domein', - 'single_user_mode' => 'Enkele gebruiker-modus', - 'must_confirm_account' => 'Nieuwe gebruikers moeten hun account activeren', - 'is_demo_site' => 'Is demo website', - 'mail_for_lockout' => 'Tijdelijk niet inloggen', - 'mail_for_blocked_domain' => 'Geblokkeerd domein', - 'mail_for_blocked_email' => 'Geblokkeerd e-mailadres', - 'mail_for_bad_login' => 'Mislukte login', - 'mail_for_blocked_login' => 'Geblokkeerde gebruiker', + 'domain' => 'Domein', + 'single_user_mode' => 'Enkele gebruiker-modus', + 'must_confirm_account' => 'Nieuwe gebruikers moeten hun account activeren', + 'is_demo_site' => 'Is demo website', + 'mail_for_lockout' => 'Tijdelijk niet inloggen', + 'mail_for_blocked_domain' => 'Geblokkeerd domein', + 'mail_for_blocked_email' => 'Geblokkeerd e-mailadres', + 'mail_for_bad_login' => 'Mislukte login', + 'mail_for_blocked_login' => 'Geblokkeerde gebruiker', // import - 'import_file' => 'Importbestand', - 'configuration_file' => 'Configuratiebestand', - 'import_file_type' => 'Importbestandstype', - 'csv_comma' => 'Een komma (,)', - 'csv_semicolon' => 'Een puntkomma (;)', - 'csv_tab' => 'Een tab (onzichtbaar)', - 'csv_delimiter' => 'CSV scheidingsteken', - 'csv_import_account' => 'Standaard rekening voor importeren', - 'csv_config' => 'Configuratiebestand', + 'import_file' => 'Importbestand', + 'configuration_file' => 'Configuratiebestand', + 'import_file_type' => 'Importbestandstype', + 'csv_comma' => 'Een komma (,)', + 'csv_semicolon' => 'Een puntkomma (;)', + 'csv_tab' => 'Een tab (onzichtbaar)', + 'csv_delimiter' => 'CSV scheidingsteken', + 'csv_import_account' => 'Standaard rekening voor importeren', + 'csv_config' => 'Configuratiebestand', 'due_date' => 'Vervaldatum', From a1609542c38a45c8ea9f6f226b4aeedd94deb061 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:48 +0100 Subject: [PATCH 03/23] Translated --- resources/lang/de_DE/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 0e08e2ee69..b7aeba4eb0 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Schaltfläche', 'icon' => 'Icon', + 'id' => 'ID', 'create_date' => 'Erstellt am', 'update_date' => 'Aktualisiert am', 'balance_before' => 'Bilanz vor', From 3609b515e56dc009ff844a46c8ded4d8ba5da2d6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:50 +0100 Subject: [PATCH 04/23] Translated --- resources/lang/de_DE/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index 056c7b8f5e..a695d4be5f 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'Die eine Überweisungen, die mit dieser Kategorie verknüpft ist, wird nicht gelöscht. | Keine der :count Kategorien, die mit dieser Rechnung verknüpft sind, werden gelöscht.', 'tag_keep_transactions' => 'Die einzige Überweisung, die mit diesem Tag verknüpft ist, wird nicht gelöscht. | Keiner der :count Tags, die mit dieser Rechnung verknüpft sind, werden gelöscht.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domain', - 'single_user_mode' => 'Einzelnutzermodus', - 'must_confirm_account' => 'Erstanwender müssen ihr Konto aktivieren', - 'is_demo_site' => 'Ist eine Demonstrationsseite', - 'mail_for_lockout' => 'Ausgesperrt', - 'mail_for_blocked_domain' => 'Gesperrte Domain', - 'mail_for_blocked_email' => 'Gesperrte Email-Adresse', - 'mail_for_bad_login' => 'Anmeldung fehlgeschlagen', - 'mail_for_blocked_login' => 'Gesperrter Benutzer', + 'domain' => 'Domain', + 'single_user_mode' => 'Einzelnutzermodus', + 'must_confirm_account' => 'Erstanwender müssen ihr Konto aktivieren', + 'is_demo_site' => 'Ist eine Demonstrationsseite', + 'mail_for_lockout' => 'Ausgesperrt', + 'mail_for_blocked_domain' => 'Gesperrte Domain', + 'mail_for_blocked_email' => 'Gesperrte Email-Adresse', + 'mail_for_bad_login' => 'Anmeldung fehlgeschlagen', + 'mail_for_blocked_login' => 'Gesperrter Benutzer', // import - 'import_file' => 'Datei importieren', - 'configuration_file' => 'Konfigurationsdatei', - 'import_file_type' => 'Import-Dateityp', - 'csv_comma' => 'Ein Komma (,)', - 'csv_semicolon' => 'Ein Semikolon (;)', - 'csv_tab' => 'Ein Tab (unsichtbar)', - 'csv_delimiter' => 'CSV-Trennzeichen', - 'csv_import_account' => 'Standard Import-Konto', - 'csv_config' => 'CSV-Import Einstellungen', + 'import_file' => 'Datei importieren', + 'configuration_file' => 'Konfigurationsdatei', + 'import_file_type' => 'Import-Dateityp', + 'csv_comma' => 'Ein Komma (,)', + 'csv_semicolon' => 'Ein Semikolon (;)', + 'csv_tab' => 'Ein Tab (unsichtbar)', + 'csv_delimiter' => 'CSV-Trennzeichen', + 'csv_import_account' => 'Standard Import-Konto', + 'csv_config' => 'CSV-Import Einstellungen', 'due_date' => 'Fälligkeitstermin', From e87456b2f8180de81ec3dcf10b38f9bd1928fa56 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:52 +0100 Subject: [PATCH 05/23] New translations --- resources/lang/pt_BR/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php index 6a994e6ba4..4cc4bbbd49 100644 --- a/resources/lang/pt_BR/list.php +++ b/resources/lang/pt_BR/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Botões', 'icon' => 'Ícone', + 'id' => 'ID', 'create_date' => 'Criado em', 'update_date' => 'Atualizado em', 'balance_before' => 'Saldo Antes', From 2ec56626f30837a67e277a964eb52db7988c94ff Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:56 +0100 Subject: [PATCH 06/23] Approved. Step name: Proofread --- resources/lang/nl_NL/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index ced437cc40..95efafc5d6 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Knoppen', 'icon' => 'Icoon', + 'id' => 'ID', 'create_date' => 'Aangemaakt op', 'update_date' => 'Bijgewerkt op', 'balance_before' => 'Saldo voor', From 5c0c00188ff4da0ccfd32cbeb0100f6175799e3f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:01:59 +0100 Subject: [PATCH 07/23] New translations --- resources/lang/pt_BR/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php index 9745c121c8..b9e54eeeaf 100644 --- a/resources/lang/pt_BR/form.php +++ b/resources/lang/pt_BR/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'A única transação ligada a esta categoria não será excluída.|Todos :count transações ligadas a esta categoria não serão excluídos.', 'tag_keep_transactions' => 'A única transação ligada a essa marca não será excluída.|Todos :count transações ligadas a essa marca não serão excluídos.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domínio', - 'single_user_mode' => 'Modo de usuário único', - 'must_confirm_account' => 'Novos usuários devem ativar a conta', - 'is_demo_site' => 'É o site de demonstração', - 'mail_for_lockout' => 'Locked out', - 'mail_for_blocked_domain' => 'Blocked domain', - 'mail_for_blocked_email' => 'Blocked email address', - 'mail_for_bad_login' => 'Login failure', - 'mail_for_blocked_login' => 'Blocked user', + 'domain' => 'Domínio', + 'single_user_mode' => 'Modo de usuário único', + 'must_confirm_account' => 'Novos usuários devem ativar a conta', + 'is_demo_site' => 'É o site de demonstração', + 'mail_for_lockout' => 'Locked out', + 'mail_for_blocked_domain' => 'Blocked domain', + 'mail_for_blocked_email' => 'Blocked email address', + 'mail_for_bad_login' => 'Login failure', + 'mail_for_blocked_login' => 'Blocked user', // import - 'import_file' => 'Importar arquivo', - 'configuration_file' => 'Arquivo de configuração', - 'import_file_type' => 'Tipo de arquivo de importação', - 'csv_comma' => 'Uma vírgula (,)', - 'csv_semicolon' => 'Um ponto e vírgula (;)', - 'csv_tab' => 'Um Tab (invisível)', - 'csv_delimiter' => 'Delimitador de campo CSV', - 'csv_import_account' => 'Conta de importação padrão', - 'csv_config' => 'Importar CSV de configuração', + 'import_file' => 'Importar arquivo', + 'configuration_file' => 'Arquivo de configuração', + 'import_file_type' => 'Tipo de arquivo de importação', + 'csv_comma' => 'Uma vírgula (,)', + 'csv_semicolon' => 'Um ponto e vírgula (;)', + 'csv_tab' => 'Um Tab (invisível)', + 'csv_delimiter' => 'Delimitador de campo CSV', + 'csv_import_account' => 'Conta de importação padrão', + 'csv_config' => 'Importar CSV de configuração', 'due_date' => 'Data de vencimento', From 00b3dced2c4c3d145914d2a80ee25aec63dbe3e8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:02 +0100 Subject: [PATCH 08/23] New translations --- resources/lang/pt_BR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 86f5868d83..ad85daa201 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From d42e9c75ef4ea4aff7909dd513ed0ce445db714c Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:03 +0100 Subject: [PATCH 09/23] New translations --- resources/lang/zh_HK/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php index cdebfbd8db..90625d54e6 100644 --- a/resources/lang/zh_HK/list.php +++ b/resources/lang/zh_HK/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Buttons', 'icon' => 'Icon', + 'id' => 'ID', 'create_date' => 'Created at', 'update_date' => 'Updated at', 'balance_before' => 'Balance before', From 50278a679a1a3da27cad63bccf25b53e684555eb Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:05 +0100 Subject: [PATCH 10/23] New translations --- resources/lang/zh_HK/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php index bcb6e0c3b2..af698dcb73 100644 --- a/resources/lang/zh_HK/form.php +++ b/resources/lang/zh_HK/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.', 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domain', - 'single_user_mode' => 'Single user mode', - 'must_confirm_account' => 'New users must activate account', - 'is_demo_site' => 'Is demo site', - 'mail_for_lockout' => 'Locked out', - 'mail_for_blocked_domain' => 'Blocked domain', - 'mail_for_blocked_email' => 'Blocked email address', - 'mail_for_bad_login' => 'Login failure', - 'mail_for_blocked_login' => 'Blocked user', + 'domain' => 'Domain', + 'single_user_mode' => 'Single user mode', + 'must_confirm_account' => 'New users must activate account', + 'is_demo_site' => 'Is demo site', + 'mail_for_lockout' => 'Locked out', + 'mail_for_blocked_domain' => 'Blocked domain', + 'mail_for_blocked_email' => 'Blocked email address', + 'mail_for_bad_login' => 'Login failure', + 'mail_for_blocked_login' => 'Blocked user', // import - 'import_file' => 'Import file', - 'configuration_file' => 'Configuration file', - 'import_file_type' => 'Import file type', - 'csv_comma' => 'A comma (,)', - 'csv_semicolon' => 'A semicolon (;)', - 'csv_tab' => 'A tab (invisible)', - 'csv_delimiter' => 'CSV field delimiter', - 'csv_import_account' => 'Default import account', - 'csv_config' => 'CSV import configuration', + 'import_file' => 'Import file', + 'configuration_file' => 'Configuration file', + 'import_file_type' => 'Import file type', + 'csv_comma' => 'A comma (,)', + 'csv_semicolon' => 'A semicolon (;)', + 'csv_tab' => 'A tab (invisible)', + 'csv_delimiter' => 'CSV field delimiter', + 'csv_import_account' => 'Default import account', + 'csv_config' => 'CSV import configuration', 'due_date' => 'Due date', From 814fc6eabdaa21dc2e48d84e965592712d3fedd4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:11 +0100 Subject: [PATCH 11/23] New translations --- resources/lang/zh_HK/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index bf4a08a112..b300e5b679 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From 6af2b37ac20daf6bf77265e48288be02bd91c4aa Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:13 +0100 Subject: [PATCH 12/23] New translations --- resources/lang/zh_TW/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php index 8cba160c13..b50b217c62 100644 --- a/resources/lang/zh_TW/form.php +++ b/resources/lang/zh_TW/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.', 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domain', - 'single_user_mode' => 'Single user mode', - 'must_confirm_account' => 'New users must activate account', - 'is_demo_site' => 'Is demo site', - 'mail_for_lockout' => 'Locked out', - 'mail_for_blocked_domain' => 'Blocked domain', - 'mail_for_blocked_email' => 'Blocked email address', - 'mail_for_bad_login' => 'Login failure', - 'mail_for_blocked_login' => 'Blocked user', + 'domain' => 'Domain', + 'single_user_mode' => 'Single user mode', + 'must_confirm_account' => 'New users must activate account', + 'is_demo_site' => 'Is demo site', + 'mail_for_lockout' => 'Locked out', + 'mail_for_blocked_domain' => 'Blocked domain', + 'mail_for_blocked_email' => 'Blocked email address', + 'mail_for_bad_login' => 'Login failure', + 'mail_for_blocked_login' => 'Blocked user', // import - 'import_file' => '匯入檔案', - 'configuration_file' => 'Configuration file', - 'import_file_type' => '匯入檔案類型', - 'csv_comma' => 'A comma (,)', - 'csv_semicolon' => 'A semicolon (;)', - 'csv_tab' => 'A tab (invisible)', - 'csv_delimiter' => 'CSV field delimiter', - 'csv_import_account' => 'Default import account', - 'csv_config' => 'CSV import configuration', + 'import_file' => '匯入檔案', + 'configuration_file' => 'Configuration file', + 'import_file_type' => '匯入檔案類型', + 'csv_comma' => 'A comma (,)', + 'csv_semicolon' => 'A semicolon (;)', + 'csv_tab' => 'A tab (invisible)', + 'csv_delimiter' => 'CSV field delimiter', + 'csv_import_account' => 'Default import account', + 'csv_config' => 'CSV import configuration', 'due_date' => '到期日', From d0084becea1c1a56f8c36a0dbfa19575afa4e4d0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:16 +0100 Subject: [PATCH 13/23] New translations --- resources/lang/zh_TW/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index f0e2bd7c4b..5589304af8 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From ebbf2659b1ee5d5e827b6065b9a4b01d8b5924fe Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:17 +0100 Subject: [PATCH 14/23] New translations --- resources/lang/zh_TW/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php index f8633af468..d5df766461 100644 --- a/resources/lang/zh_TW/list.php +++ b/resources/lang/zh_TW/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => '按鈕', 'icon' => '圖標', + 'id' => 'ID', 'create_date' => '建立於', 'update_date' => '更新於', 'balance_before' => '交易前餘額', From 82bb35262430ca45a9076e43ff292607b47b8c73 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:22 +0100 Subject: [PATCH 15/23] New translations --- resources/lang/fr_FR/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index da3a9b3a66..ec5aca8d95 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'La seule opération liée à cette catégorie ne sera pas supprimée.|Les :count opérations liées à cette catégorie ne seront pas supprimées.', 'tag_keep_transactions' => 'La seule opération liée à ce tag ne sera pas supprimée.|Les :count opérations liées à ce tag ne seront pas supprimées.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domaine', - 'single_user_mode' => 'Mode utilisateur unique', - 'must_confirm_account' => 'New users must activate account', - 'is_demo_site' => 'Is demo site', - 'mail_for_lockout' => 'Locked out', - 'mail_for_blocked_domain' => 'Blocked domain', - 'mail_for_blocked_email' => 'Blocked email address', - 'mail_for_bad_login' => 'Login failure', - 'mail_for_blocked_login' => 'Blocked user', + 'domain' => 'Domaine', + 'single_user_mode' => 'Mode utilisateur unique', + 'must_confirm_account' => 'New users must activate account', + 'is_demo_site' => 'Is demo site', + 'mail_for_lockout' => 'Locked out', + 'mail_for_blocked_domain' => 'Blocked domain', + 'mail_for_blocked_email' => 'Blocked email address', + 'mail_for_bad_login' => 'Login failure', + 'mail_for_blocked_login' => 'Blocked user', // import - 'import_file' => 'Fichier à importer', - 'configuration_file' => 'Fichier de configuration', - 'import_file_type' => 'Type de fichier de configuration', - 'csv_comma' => 'Une virgule (,)', - 'csv_semicolon' => 'Un point-virgule (;)', - 'csv_tab' => 'Un onglet (invisible)', - 'csv_delimiter' => 'Délimiteur de champ CSV', - 'csv_import_account' => 'Compte d’importation par défaut', - 'csv_config' => 'Configuration d\'importation CSV', + 'import_file' => 'Fichier à importer', + 'configuration_file' => 'Fichier de configuration', + 'import_file_type' => 'Type de fichier de configuration', + 'csv_comma' => 'Une virgule (,)', + 'csv_semicolon' => 'Un point-virgule (;)', + 'csv_tab' => 'Un onglet (invisible)', + 'csv_delimiter' => 'Délimiteur de champ CSV', + 'csv_import_account' => 'Compte d’importation par défaut', + 'csv_config' => 'Configuration d\'importation CSV', 'due_date' => 'Due date', From a5b412f546c4a5be0ca31fb74faa7dd06cb00e9e Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:26 +0100 Subject: [PATCH 16/23] New translations --- resources/lang/fr_FR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 2bd9293870..f429f4e364 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From ce8164dd873a91213983e03bc722386bc0cb751a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:28 +0100 Subject: [PATCH 17/23] New translations --- resources/lang/fr_FR/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 3d09d60ae9..55aba8cc1d 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Boutons', 'icon' => 'Icône', + 'id' => 'ID', 'create_date' => 'Créé le', 'update_date' => 'Mis à jour le', 'balance_before' => 'Solde avant', From 913dbe6b1a9e2174b58417766353667b1b8b485f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:31 +0100 Subject: [PATCH 18/23] New translations --- resources/lang/de_DE/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index d74c8c5c3b..9330403f7f 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -858,6 +858,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From 4bcacc5d685abd0163d1f387c0a1b0dfcc9a6664 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:35 +0100 Subject: [PATCH 19/23] New translations --- resources/lang/hr_HR/form.php | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php index bcb6e0c3b2..af698dcb73 100644 --- a/resources/lang/hr_HR/form.php +++ b/resources/lang/hr_HR/form.php @@ -150,28 +150,35 @@ return [ 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.', 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.', + 'email' => 'Email address', + 'password' => 'Password', + 'password_confirmation' => 'Password (again)', + 'blocked' => 'Is blocked?', + 'blocked_code' => 'Reason for block', + + // admin - 'domain' => 'Domain', - 'single_user_mode' => 'Single user mode', - 'must_confirm_account' => 'New users must activate account', - 'is_demo_site' => 'Is demo site', - 'mail_for_lockout' => 'Locked out', - 'mail_for_blocked_domain' => 'Blocked domain', - 'mail_for_blocked_email' => 'Blocked email address', - 'mail_for_bad_login' => 'Login failure', - 'mail_for_blocked_login' => 'Blocked user', + 'domain' => 'Domain', + 'single_user_mode' => 'Single user mode', + 'must_confirm_account' => 'New users must activate account', + 'is_demo_site' => 'Is demo site', + 'mail_for_lockout' => 'Locked out', + 'mail_for_blocked_domain' => 'Blocked domain', + 'mail_for_blocked_email' => 'Blocked email address', + 'mail_for_bad_login' => 'Login failure', + 'mail_for_blocked_login' => 'Blocked user', // import - 'import_file' => 'Import file', - 'configuration_file' => 'Configuration file', - 'import_file_type' => 'Import file type', - 'csv_comma' => 'A comma (,)', - 'csv_semicolon' => 'A semicolon (;)', - 'csv_tab' => 'A tab (invisible)', - 'csv_delimiter' => 'CSV field delimiter', - 'csv_import_account' => 'Default import account', - 'csv_config' => 'CSV import configuration', + 'import_file' => 'Import file', + 'configuration_file' => 'Configuration file', + 'import_file_type' => 'Import file type', + 'csv_comma' => 'A comma (,)', + 'csv_semicolon' => 'A semicolon (;)', + 'csv_tab' => 'A tab (invisible)', + 'csv_delimiter' => 'CSV field delimiter', + 'csv_import_account' => 'Default import account', + 'csv_config' => 'CSV import configuration', 'due_date' => 'Due date', From 02f2def88beedd8cd1ec3c744ed72246d1917262 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:38 +0100 Subject: [PATCH 20/23] New translations --- resources/lang/hr_HR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index bf4a08a112..b300e5b679 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -857,6 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address', 'mail_for_bad_login_help' => 'When a user fails to login', 'mail_for_blocked_login_help' => 'When a blocked user tries to login', + 'block_code_bounced' => 'Email message(s) bounced', + 'block_code_expired' => 'Demo account expired', + 'no_block_code' => 'No reason for block or user not blocked', // split a transaction: From 4c1d8e8e85c098697823629637502aa4d44177de Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 23:02:39 +0100 Subject: [PATCH 21/23] New translations --- resources/lang/hr_HR/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php index cdebfbd8db..90625d54e6 100644 --- a/resources/lang/hr_HR/list.php +++ b/resources/lang/hr_HR/list.php @@ -12,6 +12,7 @@ return [ 'buttons' => 'Buttons', 'icon' => 'Icon', + 'id' => 'ID', 'create_date' => 'Created at', 'update_date' => 'Updated at', 'balance_before' => 'Balance before', From a923c288e6aa1a6e457f563112d871aa6d2dff66 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 16 Dec 2016 07:31:41 +0100 Subject: [PATCH 22/23] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 960f89a9a1..8af126f24c 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -857,9 +857,9 @@ return [ 'mail_for_blocked_email_help' => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres', 'mail_for_bad_login_help' => 'Als een user met de verkeerde gegevens probeert in te loggen', 'mail_for_blocked_login_help' => 'Als een geblokkeerde gebruiker probeert in te loggen', - 'block_code_bounced' => 'Email message(s) bounced', - 'block_code_expired' => 'Demo account expired', - 'no_block_code' => 'No reason for block or user not blocked', + 'block_code_bounced' => 'Email kwam niet aan', + 'block_code_expired' => 'Demo-account verlopen', + 'no_block_code' => 'Geen reden of gebruiker niet geblokkeerd', // split a transaction: From 6c64023bf7f904072e3e7c84053b89de7a2d1aa8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 16 Dec 2016 07:31:43 +0100 Subject: [PATCH 23/23] New translations --- resources/lang/nl_NL/form.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index b42cccded4..8119fed791 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -150,11 +150,11 @@ return [ 'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.', 'tag_keep_transactions' => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.', - 'email' => 'Email address', - 'password' => 'Password', - 'password_confirmation' => 'Password (again)', - 'blocked' => 'Is blocked?', - 'blocked_code' => 'Reason for block', + 'email' => 'E-mailadres', + 'password' => 'Wachtwoord', + 'password_confirmation' => 'Wachtwoord (nogmaals)', + 'blocked' => 'Is geblokkeerd?', + 'blocked_code' => 'Reden voor blokkade', // admin