Skip to content

Commit da3d854

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 5d14141 + c92a344 commit da3d854

File tree

4 files changed

+140
-68
lines changed

4 files changed

+140
-68
lines changed

lib/l10n/app_de.arb

+14-14
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
}
5252
}
5353
},
54-
"billsAmountAndFrequency": "Rechnung passt zu Transaktionen zwischen {minValue} und {maxvalue}. Wiederholt sich {frequency, select, weekly{wöchentlich} monthly{monatlich} quarterly{vierteljährlich} halfyear{halbjährlich} yearly{jährlich} other{unbekannt}}{skip, plural, =0{} other{, überspringt {skip}}}.",
54+
"billsAmountAndFrequency": "Abonnement passt zu Transaktionen zwischen {minValue} und {maxvalue}. Wiederholt sich {frequency, select, weekly{wöchentlich} monthly{monatlich} quarterly{vierteljährlich} halfyear{halbjährlich} yearly{jährlich} other{unbekannt}}{skip, plural, =0{} other{, überspringt {skip}}}.",
5555
"@billsAmountAndFrequency": {
5656
"description": "Subscription match for min and max amounts, and frequency",
5757
"placeholders": {
@@ -81,11 +81,11 @@
8181
"@billsChangeSortOrderTooltip": {
8282
"description": "Text for sort order change button tooltip"
8383
},
84-
"billsErrorLoading": "Fehler beim Laden der Rechnungen.",
84+
"billsErrorLoading": "Fehler beim Laden der Abonnements.",
8585
"@billsErrorLoading": {
8686
"description": "Generic error message when subscriptions can't be loaded (shouldn't occur)"
8787
},
88-
"billsExactAmountAndFrequency": "Rechnung passt zu Transaktionen mit {value}. Wiederholt sich {frequency, select, weekly{wöchentlich} monthly{monatlich} quarterly{vierteljährlich} halfyear{halbjährlich} yearly{jährlich} other{unbekannt}}{skip, plural, =0{} other{, überspringt {skip}}}.",
88+
"billsExactAmountAndFrequency": "Abonnement passt zu Transaktionen mit {value}. Wiederholt sich {frequency, select, weekly{wöchentlich} monthly{monatlich} quarterly{vierteljährlich} halfyear{halbjährlich} yearly{jährlich} other{unbekannt}}{skip, plural, =0{} other{, überspringt {skip}}}.",
8989
"@billsExactAmountAndFrequency": {
9090
"description": "Subscription match for exact amount and frequency",
9191
"placeholders": {
@@ -142,19 +142,19 @@
142142
"@billsInactive": {
143143
"description": "Text: when the subscription is inactive"
144144
},
145-
"billsIsActive": "Rechnung ist aktiv",
145+
"billsIsActive": "Abonnement ist aktiv",
146146
"@billsIsActive": {
147147
"description": "Text: the subscription is active"
148148
},
149-
"billsLayoutGroupSubtitle": "Rechnungen werden in ihrer Gruppe angezeigt.",
149+
"billsLayoutGroupSubtitle": "Abonnements werden in ihrer Gruppe angezeigt.",
150150
"@billsLayoutGroupSubtitle": {
151151
"description": "Subtitle text for group layout option"
152152
},
153153
"billsLayoutGroupTitle": "Gruppe",
154154
"@billsLayoutGroupTitle": {
155155
"description": "Title text for group layout option"
156156
},
157-
"billsLayoutListSubtitle": "Rechnungen werden sortiert in einer Liste angezeigt.",
157+
"billsLayoutListSubtitle": "Abonnements werden sortiert in einer Liste angezeigt.",
158158
"@billsLayoutListSubtitle": {
159159
"description": "Subtitle text for list layout option"
160160
},
@@ -170,7 +170,7 @@
170170
"@billsNextExpectedMatch": {
171171
"description": "Text: next expected match for subscription"
172172
},
173-
"billsNotActive": "Rechnung ist inaktiv",
173+
"billsNotActive": "Abonnement ist inaktiv",
174174
"@billsNotActive": {
175175
"description": "Text: the subscription is inactive"
176176
},
@@ -357,7 +357,7 @@
357357
}
358358
}
359359
},
360-
"generalBill": "Rechnung",
360+
"generalBill": "Abonnement",
361361
"@generalBill": {
362362
"description": "Subscription (caution: was named Bill until Firefly version 6.2.0)"
363363
},
@@ -451,7 +451,7 @@
451451
}
452452
}
453453
},
454-
"homeMainBillsTitle": "Rechnungen in der nächsten Woche",
454+
"homeMainBillsTitle": "Abonnements für die nächste Woche",
455455
"@homeMainBillsTitle": {
456456
"description": "Title: Subscriptions for the next week"
457457
},
@@ -639,11 +639,11 @@
639639
"@homeTransactionsDialogFilterAccountsAll": {
640640
"description": "Don't filter for a specific account (default entry)"
641641
},
642-
"homeTransactionsDialogFilterBillsAll": "<Alle Rechnungen>",
642+
"homeTransactionsDialogFilterBillsAll": "<Alle Abonnements>",
643643
"@homeTransactionsDialogFilterBillsAll": {
644644
"description": "Don't filter for a specific subscription (default entry)"
645645
},
646-
"homeTransactionsDialogFilterBillUnset": "<Ohne Rechnung>",
646+
"homeTransactionsDialogFilterBillUnset": "<Ohne Abonnement>",
647647
"@homeTransactionsDialogFilterBillUnset": {
648648
"description": "Filter for unset subscription"
649649
},
@@ -741,7 +741,7 @@
741741
"@navigationAccounts": {
742742
"description": "Navigation Label: Accounts Page"
743743
},
744-
"navigationBills": "Rechnungen",
744+
"navigationBills": "Abonnements",
745745
"@navigationBills": {
746746
"description": "Navigation Label: Subscriptions"
747747
},
@@ -1001,11 +1001,11 @@
10011001
"@transactionDialogAttachmentsTitle": {
10021002
"description": "Dialog Title: Attachments Dialog"
10031003
},
1004-
"transactionDialogBillNoBill": "Ohne Rechnung",
1004+
"transactionDialogBillNoBill": "Kein Abonnement",
10051005
"@transactionDialogBillNoBill": {
10061006
"description": "Button Label: no subscription to be used"
10071007
},
1008-
"transactionDialogBillTitle": "Mit Rechnung verknüpfen",
1008+
"transactionDialogBillTitle": "Mit Abonnement verknüpfen",
10091009
"@transactionDialogBillTitle": {
10101010
"description": "Dialog Title: Link Subscription to transaction"
10111011
},

lib/l10n/app_it.arb

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
}
5252
}
5353
},
54-
"billsAmountAndFrequency": "La bolletta comprende le transazioni con importo tra {minValue} e {maxvalue}. Si ripete con frequenza {frequency, select, weekly{settimanale} monthly{mensile} quarterly{trimestrale} halfyear{semestrale} yearly{annuale} other{sconosciuta}}{skip, plural, =0{} other{, rimandata il {skip}}}.",
54+
"billsAmountAndFrequency": "Il pagamento ricorrente comprende le transazioni con importo tra {minValue} e {maxvalue}. Si ripete con frequenza {frequency, select, weekly{settimanale} monthly{mensile} quarterly{trimestrale} halfyear{semestrale} yearly{annuale} other{sconosciuta}}{skip, plural, =0{} other{, rimandata il {skip}}}.",
5555
"@billsAmountAndFrequency": {
5656
"description": "Subscription match for min and max amounts, and frequency",
5757
"placeholders": {
@@ -81,11 +81,11 @@
8181
"@billsChangeSortOrderTooltip": {
8282
"description": "Text for sort order change button tooltip"
8383
},
84-
"billsErrorLoading": "Errore nel caricamento delle bollette.",
84+
"billsErrorLoading": "Errore caricando i pagamenti ricorrenti.",
8585
"@billsErrorLoading": {
8686
"description": "Generic error message when subscriptions can't be loaded (shouldn't occur)"
8787
},
88-
"billsExactAmountAndFrequency": "La bolletta comprende transazioni di valore {value}. Si ripete con frequenza {frequency, select, weekly{settimanale} monthly{mensile} quarterly{trimestrale} halfyear{semestrale} yearly{annuale} other{sconosciuta}}{skip, plural, =0{} other{, rimandata il {skip}}}.",
88+
"billsExactAmountAndFrequency": "Il pagamento ricorrente comprende transazioni di valore {value}. Si ripete con frequenza {frequency, select, weekly{settimanale} monthly{mensile} quarterly{trimestrale} halfyear{semestrale} yearly{annuale} other{sconosciuta}}{skip, plural, =0{} other{, rimandata il {skip}}}.",
8989
"@billsExactAmountAndFrequency": {
9090
"description": "Subscription match for exact amount and frequency",
9191
"placeholders": {
@@ -142,19 +142,19 @@
142142
"@billsInactive": {
143143
"description": "Text: when the subscription is inactive"
144144
},
145-
"billsIsActive": "Bolletta attiva",
145+
"billsIsActive": "Il pagamento ricorrente è attivo",
146146
"@billsIsActive": {
147147
"description": "Text: the subscription is active"
148148
},
149-
"billsLayoutGroupSubtitle": "Bollette visualizzate nei gruppi assegnati.",
149+
"billsLayoutGroupSubtitle": "Pagamenti ricorrenti visualizzati nei gruppi assegnati.",
150150
"@billsLayoutGroupSubtitle": {
151151
"description": "Subtitle text for group layout option"
152152
},
153153
"billsLayoutGroupTitle": "Gruppo",
154154
"@billsLayoutGroupTitle": {
155155
"description": "Title text for group layout option"
156156
},
157-
"billsLayoutListSubtitle": "Bollette visualizzate in un elenco ordinate in base a determinati criteri.",
157+
"billsLayoutListSubtitle": "Pagamenti ricorrenti visualizzati in un elenco ordinate in base a determinati criteri.",
158158
"@billsLayoutListSubtitle": {
159159
"description": "Subtitle text for list layout option"
160160
},
@@ -170,7 +170,7 @@
170170
"@billsNextExpectedMatch": {
171171
"description": "Text: next expected match for subscription"
172172
},
173-
"billsNotActive": "La bolletta non è attiva",
173+
"billsNotActive": "Il pagamento ricorrente è inattivo",
174174
"@billsNotActive": {
175175
"description": "Text: the subscription is inactive"
176176
},
@@ -741,7 +741,7 @@
741741
"@navigationAccounts": {
742742
"description": "Navigation Label: Accounts Page"
743743
},
744-
"navigationBills": "Bollette",
744+
"navigationBills": "Pagamenti ricorrenti",
745745
"@navigationBills": {
746746
"description": "Navigation Label: Subscriptions"
747747
},

0 commit comments

Comments
 (0)