-
+
{{ $t('firefly.left_to_spend') }}
@@ -99,7 +99,7 @@
-
+
{{ $t('firefly.net_worth') }}
diff --git a/frontend/src/components/form/GenericAttachments.vue b/frontend/src/components/form/GenericAttachments.vue
index 73707d69c9..4554b6e7b0 100644
--- a/frontend/src/components/form/GenericAttachments.vue
+++ b/frontend/src/components/form/GenericAttachments.vue
@@ -77,6 +77,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/form/GenericCheckbox.vue b/frontend/src/components/form/GenericCheckbox.vue
index 9f0efdec82..0cc2074c37 100644
--- a/frontend/src/components/form/GenericCheckbox.vue
+++ b/frontend/src/components/form/GenericCheckbox.vue
@@ -81,6 +81,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/form/GenericLocation.vue b/frontend/src/components/form/GenericLocation.vue
index af883707d0..bbdcb3a75b 100644
--- a/frontend/src/components/form/GenericLocation.vue
+++ b/frontend/src/components/form/GenericLocation.vue
@@ -185,6 +185,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/form/GenericTextInput.vue b/frontend/src/components/form/GenericTextInput.vue
index f1d3186d1d..e357a3fbb3 100644
--- a/frontend/src/components/form/GenericTextInput.vue
+++ b/frontend/src/components/form/GenericTextInput.vue
@@ -94,6 +94,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/form/GenericTextarea.vue b/frontend/src/components/form/GenericTextarea.vue
index 31fc4cc5fc..3bf57ef376 100644
--- a/frontend/src/components/form/GenericTextarea.vue
+++ b/frontend/src/components/form/GenericTextarea.vue
@@ -78,6 +78,3 @@ name: "GenericTextarea",
}
-
\ No newline at end of file
diff --git a/frontend/src/components/new-user/Index.vue b/frontend/src/components/new-user/Index.vue
index 3060e63797..1f00586648 100644
--- a/frontend/src/components/new-user/Index.vue
+++ b/frontend/src/components/new-user/Index.vue
@@ -108,6 +108,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/Create.vue b/frontend/src/components/transactions/Create.vue
index 62633af550..1dd2a65ac4 100644
--- a/frontend/src/components/transactions/Create.vue
+++ b/frontend/src/components/transactions/Create.vue
@@ -898,6 +898,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/Edit.vue b/frontend/src/components/transactions/Edit.vue
index 5bd8f5b53a..0a11adb05f 100644
--- a/frontend/src/components/transactions/Edit.vue
+++ b/frontend/src/components/transactions/Edit.vue
@@ -1182,6 +1182,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/Index.vue b/frontend/src/components/transactions/Index.vue
index b2ff76a7e5..ad294d85e0 100644
--- a/frontend/src/components/transactions/Index.vue
+++ b/frontend/src/components/transactions/Index.vue
@@ -46,17 +46,17 @@
:sort-compare="tableSortCompare"
>
-
+
-
-
-
+
+
+
-
+
{{
data.value
}}
@@ -93,19 +93,19 @@
{{ $t('firefly.actions') }}
-
+
Expand split
-
+
Collapse split
@@ -117,7 +117,7 @@
@@ -254,10 +254,10 @@ export default {
api.get('./api/v1/transactions?type=' + this.type + '&page=' + page + "&start=" + startStr + "&end=" + endStr)
.then(response => {
- let currentPage = parseInt(response.data.meta.pagination.current_page);
- let totalPages = parseInt(response.data.meta.pagination.total_pages);
+ //let currentPage = parseInt(response.data.meta.pagination.current_page);
+ //let totalPages = parseInt(response.data.meta.pagination.total_pages);
this.total = parseInt(response.data.meta.pagination.total);
- console.log('total is ' + this.total);
+ //console.log('total is ' + this.total);
this.transactions.push(...response.data.data);
// if (currentPage < totalPage) {
// let nextPage = currentPage + 1;
diff --git a/frontend/src/components/transactions/SwitchAccount.vue b/frontend/src/components/transactions/SwitchAccount.vue
index ff19bdede9..3706a88b13 100644
--- a/frontend/src/components/transactions/SwitchAccount.vue
+++ b/frontend/src/components/transactions/SwitchAccount.vue
@@ -41,6 +41,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionAmount.vue b/frontend/src/components/transactions/TransactionAmount.vue
index 7cd1b37d7b..8441990bb8 100644
--- a/frontend/src/components/transactions/TransactionAmount.vue
+++ b/frontend/src/components/transactions/TransactionAmount.vue
@@ -112,6 +112,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionAttachments.vue b/frontend/src/components/transactions/TransactionAttachments.vue
index 2116a9e136..f3e1105190 100644
--- a/frontend/src/components/transactions/TransactionAttachments.vue
+++ b/frontend/src/components/transactions/TransactionAttachments.vue
@@ -138,6 +138,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionExternalUrl.vue b/frontend/src/components/transactions/TransactionExternalUrl.vue
index 2aa1ecb22d..349111b041 100644
--- a/frontend/src/components/transactions/TransactionExternalUrl.vue
+++ b/frontend/src/components/transactions/TransactionExternalUrl.vue
@@ -71,6 +71,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionForeignAmount.vue b/frontend/src/components/transactions/TransactionForeignAmount.vue
index ac1775ea30..c24731d481 100644
--- a/frontend/src/components/transactions/TransactionForeignAmount.vue
+++ b/frontend/src/components/transactions/TransactionForeignAmount.vue
@@ -94,6 +94,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionForeignCurrency.vue b/frontend/src/components/transactions/TransactionForeignCurrency.vue
index 5f68b02bef..e64403a6d1 100644
--- a/frontend/src/components/transactions/TransactionForeignCurrency.vue
+++ b/frontend/src/components/transactions/TransactionForeignCurrency.vue
@@ -124,6 +124,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionGroupTitle.vue b/frontend/src/components/transactions/TransactionGroupTitle.vue
index ce08f862e6..aa35d34ed4 100644
--- a/frontend/src/components/transactions/TransactionGroupTitle.vue
+++ b/frontend/src/components/transactions/TransactionGroupTitle.vue
@@ -99,6 +99,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionListLarge.vue b/frontend/src/components/transactions/TransactionListLarge.vue
index 118cb58897..8d169c6bf4 100644
--- a/frontend/src/components/transactions/TransactionListLarge.vue
+++ b/frontend/src/components/transactions/TransactionListLarge.vue
@@ -106,6 +106,3 @@ export default {
}
-
diff --git a/frontend/src/components/transactions/TransactionListMedium.vue b/frontend/src/components/transactions/TransactionListMedium.vue
index 776ed351fc..f2abc510cc 100644
--- a/frontend/src/components/transactions/TransactionListMedium.vue
+++ b/frontend/src/components/transactions/TransactionListMedium.vue
@@ -94,6 +94,3 @@ export default {
}
-
diff --git a/frontend/src/components/transactions/TransactionListSmall.vue b/frontend/src/components/transactions/TransactionListSmall.vue
index 26b99d0985..74df4e7a4a 100644
--- a/frontend/src/components/transactions/TransactionListSmall.vue
+++ b/frontend/src/components/transactions/TransactionListSmall.vue
@@ -86,6 +86,3 @@ export default {
}
-
diff --git a/frontend/src/components/transactions/TransactionLocation.vue b/frontend/src/components/transactions/TransactionLocation.vue
index eb1995801e..9ab2bbe73d 100644
--- a/frontend/src/components/transactions/TransactionLocation.vue
+++ b/frontend/src/components/transactions/TransactionLocation.vue
@@ -166,6 +166,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/frontend/src/components/transactions/TransactionNotes.vue b/frontend/src/components/transactions/TransactionNotes.vue
index d934115fc9..686ed7a601 100644
--- a/frontend/src/components/transactions/TransactionNotes.vue
+++ b/frontend/src/components/transactions/TransactionNotes.vue
@@ -72,6 +72,3 @@ export default {
}
-
\ No newline at end of file
diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 9c3d3e1fe8..a409fd9c66 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Nachricht',
'flash_warning' => 'Achtung!',
'flash_error' => 'Fehler!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Achtung!',
'flash_info_multiple' => 'Es gibt eine Nachricht | Es gibt :count Nachrichten',
'flash_error_multiple' => 'Es gibt einen Fehler|Es gibt :count Fehler',
'net_worth' => 'Eigenkapital',
diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php
index 4315128889..9873f1d171 100644
--- a/resources/lang/es_ES/config.php
+++ b/resources/lang/es_ES/config.php
@@ -28,7 +28,7 @@ return [
'month' => '%B %Y',
'month_and_day' => '%e de %B %Y',
'month_and_day_moment_js' => 'MMM D, YYYY',
- 'month_and_day_fns' => 'MMMM d, y',
+ 'month_and_day_fns' => 'd MMMM y',
'month_and_date_day' => '%A %e de %B %Y',
'month_and_day_no_year' => '%e %B',
'date_time' => '%e de %B %Y a las %T',
diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 706b7ab4a5..5331ae6dc1 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Mensaje',
'flash_warning' => '¡Atención!',
'flash_error' => '¡Error!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => '¡Peligro!',
'flash_info_multiple' => 'Hay un mensaje | Hay :count mensajes',
'flash_error_multiple' => 'Hay un error|Hay unos :count errores',
'net_worth' => 'Valor Neto',
@@ -1131,7 +1131,7 @@ return [
'already_cleared_transactions' => 'Transacciones ya despejadas (:count)',
'submitted_end_balance' => 'Balance final enviado',
'initial_balance_description' => 'Balance inicial para ":account"',
- 'liability_credit_description' => 'Liability credit for ":account"',
+ 'liability_credit_description' => 'Crédito pasivo para ":account"',
'interest_calc_' => 'desconocido',
'interest_calc_daily' => 'Por dia',
'interest_calc_monthly' => 'Por mes',
@@ -1319,17 +1319,17 @@ return [
'account_type_Debt' => 'Deuda',
'account_type_Loan' => 'Préstamo',
'account_type_Mortgage' => 'Hipoteca',
- 'account_type_debt' => 'Debt',
- 'account_type_loan' => 'Loan',
- 'account_type_mortgage' => 'Mortgage',
+ 'account_type_debt' => 'Deuda',
+ 'account_type_loan' => 'Préstamo',
+ 'account_type_mortgage' => 'Hipoteca',
'account_type_Credit card' => 'Tarjeta de crédito',
'liability_direction_credit' => 'Se me debe esta deuda',
'liability_direction_debit' => 'Le debo esta deuda a otra persona',
- 'liability_direction_credit_short' => 'Owed this debt',
- 'liability_direction_debit_short' => 'Owe this debt',
- 'liability_direction__short' => 'Unknown',
- 'liability_direction_null_short' => 'Unknown',
- 'Liability credit' => 'Liability credit',
+ 'liability_direction_credit_short' => 'Tenía esta deuda',
+ 'liability_direction_debit_short' => 'Tiene esta deuda',
+ 'liability_direction__short' => 'Desconocido',
+ 'liability_direction_null_short' => 'Desconocido',
+ 'Liability credit' => 'Crédito pasivo',
'budgets' => 'Presupuestos',
'tags' => 'Etiquetas',
'reports' => 'Informes',
@@ -1400,7 +1400,7 @@ return [
'splitByAccount' => 'Separada por cuenta',
'coveredWithTags' => 'Cubierta con etiquetas',
'leftInBudget' => 'Disponible en presupuesto',
- 'left_in_debt' => 'Amount due',
+ 'left_in_debt' => 'Importe debido',
'sumOfSums' => 'Suma de sumas',
'noCategory' => '(sin categoría)',
'notCharged' => 'No cargado (todavía)',
@@ -1713,13 +1713,13 @@ return [
'no_accounts_imperative_liabilities' => 'No necesita usar esta función pero, puede ser muy útil si desea hacer un seguimiento de estas cosas.',
'no_accounts_create_liabilities' => 'Crear un pasivo',
'no_budgets_title_default' => 'Vamos a crear un presupuesto',
- 'no_rules_title_default' => 'Let\'s create a rule',
+ 'no_rules_title_default' => 'Vamos a crear una regla',
'no_budgets_intro_default' => 'Todavía no tienes presupuestos. Los presupuestos se usan para organizar tus gastos en grupos, a los que puedes asignar un tope para limitarlos.',
- 'no_rules_intro_default' => 'You have no rules yet. Rules are powerful automations that can handle transactions for you.',
- 'no_rules_imperative_default' => 'Rules can be very useful when you\'re managing transactions. Let\'s create one now:',
+ 'no_rules_intro_default' => 'Aún no tiene reglas. Las reglas son potentes automatizaciones que pueden manejar transacciones por usted.',
+ 'no_rules_imperative_default' => 'Las reglas pueden ser muy útiles cuando está gestionando transacciones. Vamos a crear una ahora:',
'no_budgets_imperative_default' => 'Los presupuestos son las herramientas básicas de la gestión financiera. Vamos a crear uno ahora:',
'no_budgets_create_default' => 'Crear un presupuesto',
- 'no_rules_create_default' => 'Create a rule',
+ 'no_rules_create_default' => 'Crear regla',
'no_categories_title_default' => '¡Vamos a crear una categoría!',
'no_categories_intro_default' => 'Todavía no tienes categorías. Las categorías se utilizan para ajustar sus transacciones y etiquetarlas con su categoría designada.',
'no_categories_imperative_default' => 'Las categorías se crean automáticamente al crear transacciones, pero también puedes crearlas manualmente. Vamos a crear una:',
diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php
index 91f95bbfee..bc1f9ad7f3 100644
--- a/resources/lang/es_ES/list.php
+++ b/resources/lang/es_ES/list.php
@@ -130,7 +130,7 @@ return [
'field' => 'Campo',
'value' => 'Valor',
'interest' => 'Interés',
- 'interest_period' => 'Interest period',
+ 'interest_period' => 'Período de interés',
'liability_type' => 'Tipo de pasivo',
- 'liability_direction' => 'Liability in/out',
+ 'liability_direction' => 'Pasivo entrada/salida',
];
diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php
index f27e482137..d72bb66c62 100644
--- a/resources/lang/es_ES/validation.php
+++ b/resources/lang/es_ES/validation.php
@@ -200,7 +200,7 @@ return [
'need_id_in_edit' => 'Cada división debe tener transaction_journal_id (ID válido o 0).',
'ob_source_need_data' => 'Necesita obtener un ID de cuenta de origen válido y/o nombre de cuenta de origen válido para continuar.',
- 'lc_source_need_data' => 'Need to get a valid source account ID to continue.',
+ 'lc_source_need_data' => 'Necesita obtener un ID de cuenta de origen válido para continuar.',
'ob_dest_need_data' => 'Necesita obtener un ID de cuenta de destino válido y/o nombre de cuenta de destino válido para continuar.',
'ob_dest_bad_data' => 'No se pudo encontrar una cuenta de destino válida buscando ID ":id" o nombre ":name".',
diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 4b5feafa63..16be1b3289 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Message',
'flash_warning' => 'Attention !',
'flash_error' => 'Erreur !',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Danger !',
'flash_info_multiple' => 'Il y a un message| Il y a :count messages',
'flash_error_multiple' => 'Il y a une erreur|Il y a :count erreurs',
'net_worth' => 'Avoir net',
diff --git a/resources/lang/it_IT/config.php b/resources/lang/it_IT/config.php
index a6fcdb11fd..3bcb488520 100644
--- a/resources/lang/it_IT/config.php
+++ b/resources/lang/it_IT/config.php
@@ -28,7 +28,7 @@ return [
'month' => '%B %Y',
'month_and_day' => '%e %B %Y',
'month_and_day_moment_js' => 'D MMM YYYY',
- 'month_and_day_fns' => 'MMMM d, y',
+ 'month_and_day_fns' => 'd MMMM y',
'month_and_date_day' => '%A %B %e %Y',
'month_and_day_no_year' => '%B %e',
'date_time' => '%e %B %Y, @ %T',
diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php
index d0878f8f1f..b7de186916 100644
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Messaggio',
'flash_warning' => 'Avviso!',
'flash_error' => 'Errore!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Attenzione!',
'flash_info_multiple' => 'C\'è un messaggio | Ci sono :count messaggi',
'flash_error_multiple' => 'C\'è un errore | Ci sono :count errors',
'net_worth' => 'Patrimonio',
@@ -1131,7 +1131,7 @@ return [
'already_cleared_transactions' => 'Transazioni già conciliate (:count)',
'submitted_end_balance' => 'Saldo finale inserito',
'initial_balance_description' => 'Saldo iniziale per ":account"',
- 'liability_credit_description' => 'Liability credit for ":account"',
+ 'liability_credit_description' => 'Credito passività per ":account"',
'interest_calc_' => 'sconosciuto',
'interest_calc_daily' => 'Al giorno',
'interest_calc_monthly' => 'Al mese',
@@ -1319,17 +1319,17 @@ return [
'account_type_Debt' => 'Debito',
'account_type_Loan' => 'Prestito',
'account_type_Mortgage' => 'Mutuo',
- 'account_type_debt' => 'Debt',
- 'account_type_loan' => 'Loan',
- 'account_type_mortgage' => 'Mortgage',
+ 'account_type_debt' => 'Debito',
+ 'account_type_loan' => 'Prestito',
+ 'account_type_mortgage' => 'Mutuo',
'account_type_Credit card' => 'Carta di credito',
'liability_direction_credit' => 'Questo debito mi è dovuto',
'liability_direction_debit' => 'Devo questo debito a qualcun altro',
- 'liability_direction_credit_short' => 'Owed this debt',
- 'liability_direction_debit_short' => 'Owe this debt',
- 'liability_direction__short' => 'Unknown',
- 'liability_direction_null_short' => 'Unknown',
- 'Liability credit' => 'Liability credit',
+ 'liability_direction_credit_short' => 'Mi devono questo debito',
+ 'liability_direction_debit_short' => 'Devo questo debito',
+ 'liability_direction__short' => 'Sconosciuta',
+ 'liability_direction_null_short' => 'Sconosciuta',
+ 'Liability credit' => 'Credito passività',
'budgets' => 'Budget',
'tags' => 'Etichette',
'reports' => 'Resoconti',
@@ -1400,7 +1400,7 @@ return [
'splitByAccount' => 'Dividi per conto',
'coveredWithTags' => 'Coperto con etichetta',
'leftInBudget' => 'Rimanenza nel budget',
- 'left_in_debt' => 'Amount due',
+ 'left_in_debt' => 'Importo da pagare',
'sumOfSums' => 'Somma dei conti',
'noCategory' => '(nessuna categoria)',
'notCharged' => 'Non (ancora) addebitato',
@@ -1713,13 +1713,13 @@ return [
'no_accounts_imperative_liabilities' => 'Non è necessario che usi questa funzionalità ma può essere utile se vuoi tenere traccia di queste cose.',
'no_accounts_create_liabilities' => 'Crea una passività',
'no_budgets_title_default' => 'Creiamo un budget',
- 'no_rules_title_default' => 'Let\'s create a rule',
+ 'no_rules_title_default' => 'Creiamo una regola',
'no_budgets_intro_default' => 'Non hai ancora budget. I budget sono usati per organizzare le tue spese in gruppi logici, ai quali puoi dare un tetto indicativo per limitare le tue spese.',
- 'no_rules_intro_default' => 'You have no rules yet. Rules are powerful automations that can handle transactions for you.',
- 'no_rules_imperative_default' => 'Rules can be very useful when you\'re managing transactions. Let\'s create one now:',
+ 'no_rules_intro_default' => 'Non hai ancora regole. Le regole sono potenti automazioni in grado di gestire le transazioni per te.',
+ 'no_rules_imperative_default' => 'Le regole possono essere molto utili quando gestisci le transazioni. Creiamone una:',
'no_budgets_imperative_default' => 'I budget sono gli strumenti di base della gestione finanziaria. Creiamone uno ora:',
'no_budgets_create_default' => 'Crea budget',
- 'no_rules_create_default' => 'Create a rule',
+ 'no_rules_create_default' => 'Crea regola',
'no_categories_title_default' => 'Creaiamo una categoria!',
'no_categories_intro_default' => 'Non hai ancora categorie. Le categorie vengono utilizzate per mettere a punto le transazioni e etichettarle con la categoria designata.',
'no_categories_imperative_default' => 'Le categorie vengono create automaticamente quando si creano le transazioni, ma è possibile crearne anche manualmente. Ne creiamo una ora:',
diff --git a/resources/lang/it_IT/list.php b/resources/lang/it_IT/list.php
index a11f14bd7e..73ec9f3938 100644
--- a/resources/lang/it_IT/list.php
+++ b/resources/lang/it_IT/list.php
@@ -130,7 +130,7 @@ return [
'field' => 'Campo',
'value' => 'Valore',
'interest' => 'Interesse',
- 'interest_period' => 'Interest period',
+ 'interest_period' => 'Periodo interessi',
'liability_type' => 'Tipo di passività',
- 'liability_direction' => 'Liability in/out',
+ 'liability_direction' => 'Passività in entrata/uscita',
];
diff --git a/resources/lang/it_IT/validation.php b/resources/lang/it_IT/validation.php
index 0f9351e988..ca3d062797 100644
--- a/resources/lang/it_IT/validation.php
+++ b/resources/lang/it_IT/validation.php
@@ -200,7 +200,7 @@ return [
'need_id_in_edit' => 'Ogni suddivisione deve avere un "transaction_journal_id" (un ID valido oppure 0).',
'ob_source_need_data' => 'È necessario ottenere un ID e/o un nome del conto di origine validi per continuare.',
- 'lc_source_need_data' => 'Need to get a valid source account ID to continue.',
+ 'lc_source_need_data' => 'È necessario ottenere un ID del conto sorgente valido per continuare.',
'ob_dest_need_data' => 'È necessario ottenere un ID e/o un nome del conto di destinazione validi per continuare.',
'ob_dest_bad_data' => 'Non è stato possibile trovare un conto di destinazione valido effettuando la ricerca con l\'ID ":id" o il nome ":name".',
diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 2b19274648..164fd42d53 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Melding',
'flash_warning' => 'Waarschuwing!',
'flash_error' => 'Fout!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Gevaar!',
'flash_info_multiple' => 'Er is één melding|Er zijn :count meldingen',
'flash_error_multiple' => 'Er is één fout|Er zijn :count fouten',
'net_worth' => 'Kapitaal',
diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php
index 49448e13c4..e72508b926 100644
--- a/resources/lang/pl_PL/firefly.php
+++ b/resources/lang/pl_PL/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Komunikat',
'flash_warning' => 'Ostrzeżenie!',
'flash_error' => 'Błąd!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Uwaga!',
'flash_info_multiple' => 'Jest jedna wiadomość|Jest :count wiadomości',
'flash_error_multiple' => 'Jest jeden błąd|Jest :count błędów',
'net_worth' => 'Wartość netto',
diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 9c1afe37be..c07a0f4de0 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -83,7 +83,7 @@ return [
'flash_info' => 'Mensagem',
'flash_warning' => 'Atenção!',
'flash_error' => 'Erro!',
- 'flash_danger' => 'Danger!',
+ 'flash_danger' => 'Perigo!',
'flash_info_multiple' => 'Há uma mensagem|Existem :count mensagens',
'flash_error_multiple' => 'Houve um erro|Houve :count erros',
'net_worth' => 'Valor Líquido',
@@ -1319,17 +1319,17 @@ return [
'account_type_Debt' => 'Dívida',
'account_type_Loan' => 'Empréstimo',
'account_type_Mortgage' => 'Hipoteca',
- 'account_type_debt' => 'Debt',
- 'account_type_loan' => 'Loan',
- 'account_type_mortgage' => 'Mortgage',
+ 'account_type_debt' => 'Débito',
+ 'account_type_loan' => 'Empréstimo',
+ 'account_type_mortgage' => 'Hipoteca',
'account_type_Credit card' => 'Cartão de crédito',
'liability_direction_credit' => 'Devo este débito',
'liability_direction_debit' => 'Devo este débito a outra pessoa',
'liability_direction_credit_short' => 'Owed this debt',
'liability_direction_debit_short' => 'Owe this debt',
- 'liability_direction__short' => 'Unknown',
- 'liability_direction_null_short' => 'Unknown',
- 'Liability credit' => 'Liability credit',
+ 'liability_direction__short' => 'Desconhecida',
+ 'liability_direction_null_short' => 'Desconhecida',
+ 'Liability credit' => 'Crédito de passivo',
'budgets' => 'Orçamentos',
'tags' => 'Tags',
'reports' => 'Relatórios',
@@ -1400,7 +1400,7 @@ return [
'splitByAccount' => 'Dividir por conta',
'coveredWithTags' => 'Coberto com tags',
'leftInBudget' => 'Deixou no orçamento',
- 'left_in_debt' => 'Amount due',
+ 'left_in_debt' => 'Valor devido',
'sumOfSums' => 'Soma dos montantes',
'noCategory' => '(sem categoria)',
'notCharged' => 'Não cobrado (ainda)',
@@ -1713,13 +1713,13 @@ return [
'no_accounts_imperative_liabilities' => 'Você não precisa usar esse recurso, mas pode ser útil se você quer controlar esse tipo de coisas.',
'no_accounts_create_liabilities' => 'Criar um passivo',
'no_budgets_title_default' => 'Vamos criar um orçamento',
- 'no_rules_title_default' => 'Let\'s create a rule',
+ 'no_rules_title_default' => 'Vamos criar uma regra',
'no_budgets_intro_default' => 'Você ainda não tem nenhum orçamento. Eles são utilizados para organizar suas despesas em grupos lógicos, que você pode aplicar para limitar suas despesas.',
'no_rules_intro_default' => 'You have no rules yet. Rules are powerful automations that can handle transactions for you.',
'no_rules_imperative_default' => 'Rules can be very useful when you\'re managing transactions. Let\'s create one now:',
'no_budgets_imperative_default' => 'Os orçamentos são as ferramentas básicas de gestão financeira. Vamos criar um agora:',
'no_budgets_create_default' => 'Criar orçamento',
- 'no_rules_create_default' => 'Create a rule',
+ 'no_rules_create_default' => 'Criar uma regra',
'no_categories_title_default' => 'Vamos criar uma categoria!',
'no_categories_intro_default' => 'Você ainda não possui categorias. As categorias são usadas para ajustar suas transações e rotulá-las com a categoria designada.',
'no_categories_imperative_default' => 'As categorias são criadas automaticamente quando você cria transações, mas você também pode criar uma manualmente. Vamos criar uma agora:',
diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 26511cee68..01e947784f 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -130,7 +130,7 @@ return [
'field' => 'Campo',
'value' => 'Valor',
'interest' => 'Juros',
- 'interest_period' => 'Interest period',
+ 'interest_period' => 'Período de juros',
'liability_type' => 'Tipo de passivo',
'liability_direction' => 'Liability in/out',
];
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 121d07c405..cdc532f5f5 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -1143,7 +1143,7 @@ try {
Breadcrumbs::for(
'transactions.mass.edit',
static function (Generator $breadcrumbs, array $journals): void {
- if (count($journals) > 0) {
+ if (!empty($journals)) {
$objectType = strtolower(reset($journals)['transaction_type_type']);
$breadcrumbs->parent('transactions.index', $objectType);
$breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', ['']));
@@ -1167,7 +1167,7 @@ try {
Breadcrumbs::for(
'transactions.bulk.edit',
static function (Generator $breadcrumbs, array $journals): void {
- if (count($journals) > 0) {
+ if (!empty($journals)) {
$ids = Arr::pluck($journals, 'transaction_journal_id');
$first = reset($journals);
$breadcrumbs->parent('transactions.index', strtolower($first['transaction_type_type']));
diff --git a/tests/Objects/TestConfiguration.php b/tests/Objects/TestConfiguration.php
index 8dae309f83..e005474d32 100644
--- a/tests/Objects/TestConfiguration.php
+++ b/tests/Objects/TestConfiguration.php
@@ -189,7 +189,7 @@ class TestConfiguration
$totalCount = 0;
// no mandatory sets? Loop the optional sets:
- if (0 === count($this->mandatoryFieldSets)) {
+ if (empty($this->mandatoryFieldSets)) {
// expand the standard submission with extra sets from the optional field set.
$setCount = count($this->optionalFieldSets);
$this->debugMsg(sprintf('there are %d optional field sets', $setCount));
@@ -278,19 +278,19 @@ class TestConfiguration
private function mergeIgnoreArray($left, $right): array
{
// if both empty just return empty:
- if (0 === count($left) && 0 === count($right)) {
+ if (empty($left) && empty($right)) {
$this->debugMsg('Return empty array');
return [];
}
// if left is empty return right
- if (0 === count($left)) {
+ if (empty($left)) {
$this->debugMsg('Return right');
return $right;
}
// if right is empty return left
- if (0 === count($right)) {
+ if (empty($right)) {
$this->debugMsg('Return left');
return $left;
@@ -619,7 +619,7 @@ class TestConfiguration
if ($k === 0) {
return [[]];
}
- if (count($xs) === 0) {
+ if (empty($xs)) {
return [];
}
$x = $xs[0];
@@ -639,7 +639,7 @@ class TestConfiguration
*/
function updateIgnorables(int $index, array $customFields): void
{
- if (count($customFields) > 0) {
+ if (!empty($customFields)) {
/** @var Field $field */
foreach ($customFields as $field) {
if (0 !== count($field->ignorableFields)) {
@@ -656,7 +656,7 @@ class TestConfiguration
private function updateExpected(int $index, array $customFields): void
{
$this->debugMsg('Now parsing expected return values for this set.');
- if (count($customFields) > 0) {
+ if (!empty($customFields)) {
/** @var Field $field */
foreach ($customFields as $field) {
// fieldTitle indicates the position: