Merge branch 'develop' into js_translations

resources/assets/js/components/transactions/CreateTransaction.vue

@@ -449,6 +449,7 @@
                 }).catch(error => {
                     // give user errors things back.
                     // something something render errors.
+
                     console.error('Error in transaction submission.');
                     console.error(error);
                     this.parseErrors(error.response.data);
@@ -475,7 +476,7 @@
                 // if count is 0, send user onwards.
                 if (this.createAnother) {
                     // do message:
-                    this.success_message = '<a href="transactions/show/' + groupId + '">Transaction #' + groupId + ' ("' + this.escapeHTML(title) + '")</a> has been stored.';
+                    this.success_message = this.$t('firefly.transaction_stored_link', { ID: groupId, title: title });
                     this.error_message = '';
                     if (this.resetFormAfter) {
                         // also clear form.
@@ -651,10 +652,10 @@
             parseErrors: function (errors) {
                 this.setDefaultErrors();
                 this.error_message = "";
-                if (errors.message.length > 0) {
-                    this.error_message = this.$t('firefly.errors_submission');
+                if (typeof errors.errors === 'undefined') {
+                    this.error_message = errors.message;
                 } else {
-                    this.error_message = '';
+                    this.error_message = this.$t('firefly.errors_submission');
                 }
                 let transactionIndex;
                 let fieldName;

resources/assets/js/components/transactions/CustomAttachments.vue

@@ -26,11 +26,20 @@
             {{ title }}
         </div>
         <div class="col-sm-12">
-            <input multiple="multiple"
-                   autocomplete="off"
-                   :placeholder="title"
-                   :title="title"
-                   :name="name" type="file" class="form-control">
+            <div class="input-group">
+                <input multiple="multiple"
+                       autocomplete="off"
+                       :placeholder="title"
+                       :title="title"
+                       ref="input"
+                       :name="name" type="file" class="form-control">
+                <span class="input-group-btn">
+            <button
+                    v-on:click="clearAtt"
+                    class="btn btn-default"
+                    type="button"><i class="fa fa-trash-o"></i></button>
+        </span>
+            </div>
             <ul class="list-unstyled" v-for="error in this.error">
                 <li class="text-danger">{{ error }}</li>
             </ul>
@@ -47,6 +56,9 @@
             error: Array
         },
         methods: {
+            clearAtt: function() {
+                this.$refs.input.value = '';
+            },
             hasError: function () {
                 return this.error.length > 0;
             },
@@ -56,4 +68,4 @@
 
 <style scoped>
 
-</style>
+</style>

resources/assets/js/components/transactions/EditTransaction.vue

@@ -656,10 +656,10 @@
                     this.setDefaultErrors();
                     // do message if update or new:
                     if (this.storeAsNew) {
-                        this.success_message = '<a href="transactions/show/' + groupId + '">Transaction #' + groupId + '</a> has been created.';
+                        this.success_message = this.$t('firefly.transaction_new_stored_link', { ID: groupId });
                         this.error_message = '';
                     } else {
-                        this.success_message = '<a href="transactions/show/' + groupId + '">The transaction</a> has been updated.';
+                        this.success_message = this.$t('firefly.transaction_updated_link', { ID: groupId });
                         this.error_message = '';
                     }
                 } else {

resources/assets/js/locales/cs.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Popis roz\u00fa\u010dtov\u00e1n\u00ed",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "Rozd\u011blit",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informace o transakci",
         "no_budget_pointer": "Zd\u00e1 se, \u017ee zat\u00edm nem\u00e1te \u017e\u00e1dn\u00e9 rozpo\u010dty. Na str\u00e1nce <a href=\":link\">rozpo\u010dty<\/a> byste n\u011bjak\u00e9 m\u011bli vytvo\u0159it. Rozpo\u010dty mohou pomoci udr\u017eet si p\u0159ehled ve v\u00fddaj\u00edch.",
         "source_account": "Zdrojov\u00fd \u00fa\u010det",

resources/assets/js/locales/de.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Beschreibung der Splittbuchung",
         "errors_submission": "Problem bei der \u00dcbermittlung. Bitte \u00fcberpr\u00fcfen Sie die nachfolgenden Fehler.",
         "split": "Teilen",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Buchung#{ID}<\/a> wurde aktualisiert.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transaktionsinformationen",
         "no_budget_pointer": "Sie scheinen noch keine Kostenrahmen festgelegt zu haben. Sie sollten einige davon auf der Seite <a href=\"\/budgets\">\u201eKostenrahmen\u201d<\/a> anlegen. Kostenrahmen k\u00f6nnen Ihnen dabei helfen, den \u00dcberblick \u00fcber die Ausgaben zu behalten.",
         "source_account": "Quellkonto",

resources/assets/js/locales/el.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03c4\u03b7\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc",
         "errors_submission": "\u03a5\u03c0\u03ae\u03c1\u03be\u03b5 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf \u03bb\u03ac\u03b8\u03bf\u03c2 \u03bc\u03b5 \u03c4\u03b7\u03bd \u03c5\u03c0\u03bf\u03b2\u03bf\u03bb\u03ae \u03c3\u03b1\u03c2. \u0395\u03bb\u03ad\u03b3\u03be\u03c4\u03b5 \u03c4\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1\u03c4\u03b1.",
         "split": "\u0394\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "\u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2",
         "no_budget_pointer": "\u03a6\u03b1\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 \u03c0\u03c9\u03c2 \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03c4\u03b5 \u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03cd\u03c2 \u03b1\u03ba\u03cc\u03bc\u03b7. \u03a0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03b5\u03c4\u03b5 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf\u03bd \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 <a href=\"\/budgets\">\u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03ce\u03bd<\/a>. \u039f\u03b9 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03af \u03c3\u03b1\u03c2 \u03b2\u03bf\u03b7\u03b8\u03bf\u03cd\u03bd \u03bd\u03b1 \u03b5\u03c0\u03b9\u03b2\u03bb\u03ad\u03c0\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b4\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2 \u03c3\u03b1\u03c2.",
         "source_account": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2",

resources/assets/js/locales/en.json

@@ -15,6 +15,9 @@
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "Split",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transaction information",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Source account",

resources/assets/js/locales/es.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Descripci\u00f3n de la transacci\u00f3n dividida",
         "errors_submission": "Hubo algo malo con su env\u00edo. Por favor, revise los errores de abajo.",
         "split": "Separar",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informaci\u00f3n de transacci\u00f3n",
         "no_budget_pointer": "Parece que a\u00fan no tiene presupuestos. Debe crear algunos en la p\u00e1gina <a href=\"\/budgets\">presupuestos<\/a>. Los presupuestos pueden ayudarle a realizar un seguimiento de los gastos.",
         "source_account": "Cuenta origen",

resources/assets/js/locales/fi.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Jaetun tapahtuman kuvaus",
         "errors_submission": "Lomakkeen tiedoissa oli puutteita - alta l\u00f6yd\u00e4t listan puutteista.",
         "split": "Jaa",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Tapahtumatiedot",
         "no_budget_pointer": "Sinulla ei n\u00e4ytt\u00e4isi olevan viel\u00e4 yht\u00e4\u00e4n budjettia. Sinun kannattaisi luoda niit\u00e4 <a href=\"\/budgets\">budjetit<\/a>-sivulla. Budjetit voivat auttaa sinua pit\u00e4m\u00e4\u00e4n kirjaa kuluistasi.",
         "source_account": "L\u00e4hdetili",

resources/assets/js/locales/fr.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Description de l'op\u00e9ration ventil\u00e9e",
         "errors_submission": "Certaines informations ne sont pas correctes dans votre formulaire. Veuillez v\u00e9rifier les erreurs ci-dessous.",
         "split": "Ventiler",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID}<\/a> a \u00e9t\u00e9 mise \u00e0 jour.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informations sur les op\u00e9rations",
         "no_budget_pointer": "Vous semblez n\u2019avoir encore aucun budget. Vous devriez en cr\u00e9er un sur la page des <a href=\"\/budgets\">budgets<\/a>. Les budgets peuvent vous aider \u00e0 garder une trace des d\u00e9penses.",
         "source_account": "Compte source",

resources/assets/js/locales/hu.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Felosztott tranzakci\u00f3 le\u00edr\u00e1sa",
         "errors_submission": "Hiba t\u00f6rt\u00e9nt a bek\u00fcld\u00e9s sor\u00e1n. K\u00e9rem, jav\u00edtsa az al\u00e1bbi hib\u00e1kat.",
         "split": "Feloszt\u00e1s",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Tranzakci\u00f3s inform\u00e1ci\u00f3k",
         "no_budget_pointer": "\u00dagy t\u0171nik, m\u00e9g nincsenek k\u00f6lts\u00e9gkeretek. K\u00f6lts\u00e9gkereteket a <a href=\"\/budgets\">k\u00f6lts\u00e9gkeretek<\/a> oldalon lehet l\u00e9trehozni. A k\u00f6lts\u00e9gkeretek seg\u00edtenek nyomon k\u00f6vetni a k\u00f6lts\u00e9geket.",
         "source_account": "Forr\u00e1s sz\u00e1mla",

resources/assets/js/locales/id.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "Pisah",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informasi transaksi",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Source account",

resources/assets/js/locales/it.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Descrizione della transazione suddivisa",
         "errors_submission": "Errore durante l'invio. Controlla gli errori segnalati qui sotto.",
         "split": "Dividi",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "La <a href=\"transactions\/show\/{ID}\">transazione #{ID}<\/a> \u00e8 stata aggiornata.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informazioni transazione",
         "no_budget_pointer": "Sembra che tu non abbia ancora dei budget. Dovresti crearne alcuni nella pagina dei <a href=\"\/budgets\">budget<\/a>. I budget possono aiutarti a tenere traccia delle spese.",
         "source_account": "Conto di origine",

resources/assets/js/locales/nb.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "Del opp",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transaksjonsinformasjon",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Source account",

resources/assets/js/locales/nl.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Beschrijving van de gesplitste transactie",
         "errors_submission": "Er ging iets mis. Check de errors.",
         "split": "Splitsen",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transactie #{ID}<\/a> is ge\u00fcpdatet.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transactieinformatie",
         "no_budget_pointer": "Je hebt nog geen budgetten. Maak er een aantal op de <a href=\"\/budgets\">budgetten<\/a>-pagina. Met budgetten kan je je uitgaven beter bijhouden.",
         "source_account": "Bronrekening",

resources/assets/js/locales/pl.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Opis podzielonej transakcji",
         "errors_submission": "Co\u015b posz\u0142o nie tak w czasie zapisu. Prosz\u0119 sprawd\u017a b\u0142\u0119dy poni\u017cej.",
         "split": "Podziel",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transakcja #{ID}<\/a> zosta\u0142a zaktualizowana.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informacje o transakcji",
         "no_budget_pointer": "Wygl\u0105da na to \u017ce nie masz jeszcze bud\u017cet\u00f3w. Powiniene\u015b utworzy\u0107 kilka na stronie <a href=\"\/budgets\">bud\u017cety<\/a>. Bud\u017cety mog\u0105 Ci pom\u00f3c \u015bledzi\u0107 wydatki.",
         "source_account": "Konto \u017ar\u00f3d\u0142owe",

resources/assets/js/locales/pt-br.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "Dividir",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transa\u00e7\u00e3o #{ID}<\/a> foi atualizada.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informa\u00e7\u00e3o da transa\u00e7\u00e3o",
         "no_budget_pointer": "Parece que voc\u00ea ainda n\u00e3o tem or\u00e7amentos. Voc\u00ea deve criar alguns na p\u00e1gina de <a href=\"\/budgets\">or\u00e7amentos<\/a>. Or\u00e7amentos podem ajud\u00e1-lo a manter o controle das despesas.",
         "source_account": "Conta origem",

resources/assets/js/locales/ro.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Descrierea tranzac\u021biei divizate",
         "errors_submission": "A fost ceva \u00een neregul\u0103 cu transmiterea dvs. V\u0103 rug\u0103m s\u0103 consulta\u021bi erorile de mai jos.",
         "split": "\u00cemparte",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Informa\u021bii despre tranzac\u021bii",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Contul surs\u0103",

resources/assets/js/locales/ru.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
         "errors_submission": "\u041f\u0440\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0435 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 \u043d\u0438\u0436\u0435.",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438",
         "no_budget_pointer": "\u041f\u043e\u0445\u043e\u0436\u0435, \u0443 \u0432\u0430\u0441 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442 \u0431\u044e\u0434\u0436\u0435\u0442\u043e\u0432. \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0438\u0445 \u0432 \u0440\u0430\u0437\u0434\u0435\u043b\u0435 <a href=\"\/budgets\">\u0411\u044e\u0434\u0436\u0435\u0442\u044b<\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u044b \u043c\u043e\u0433\u0443\u0442 \u043f\u043e\u043c\u043e\u0447\u044c \u0432\u0430\u043c \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0440\u0430\u0441\u0445\u043e\u0434\u044b.",
         "source_account": "\u0421\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",

resources/assets/js/locales/sv.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "N\u00e5got fel uppstod med inskickningen. V\u00e4nligen kontrollera felen nedan.",
         "split": "Dela",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Transaktionsinformation",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Fr\u00e5n konto",

resources/assets/js/locales/tr.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "Description of the split transaction",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "B\u00f6l",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "\u0130\u015flem Bilgileri",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Kaynak hesap",

resources/assets/js/locales/vi.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "M\u00f4 t\u1ea3 giao d\u1ecbch t\u00e1ch",
         "errors_submission": "C\u00f3 g\u00ec \u0111\u00f3 sai. Vui l\u00f2ng ki\u1ec3m tra c\u00e1c l\u1ed7i d\u01b0\u1edbi \u0111\u00e2y.",
         "split": "Chia ra",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "Th\u00f4ng tin giao d\u1ecbch",
         "no_budget_pointer": "B\u1ea1n d\u01b0\u1eddng nh\u01b0 ch\u01b0a c\u00f3 ng\u00e2n s\u00e1ch. B\u1ea1n n\u00ean t\u1ea1o m\u1ed9t c\u00e1i tr\u00ean <a href=\":link\">budgets<\/a>-page. Ng\u00e2n s\u00e1ch c\u00f3 th\u1ec3 gi\u00fap b\u1ea1n theo d\u00f5i chi ph\u00ed.",
         "source_account": "Ngu\u1ed3n t\u00e0i kho\u1ea3n",

resources/assets/js/locales/zh-cn.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
         "errors_submission": "\u60a8\u7684\u63d0\u4ea4\u6709\u8bef\uff0c\u8bf7\u67e5\u770b\u4e0b\u9762\u8f93\u51fa\u7684\u9519\u8bef\u4fe1\u606f\u3002",
         "split": "\u5206\u5272",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "\u4ea4\u6613\u8d44\u8baf",
         "no_budget_pointer": "\u60a8\u4f3c\u4e4e\u8fd8\u6ca1\u6709\u4efb\u4f55\u9884\u7b97\u3002\u60a8\u5e94\u8be5\u5728 <a href=\"\/budgets\">\u9884\u7b97<\/a>\u9875\u9762\u4e0a\u521b\u5efa\u4ed6\u4eec\u3002\u9884\u7b97\u53ef\u4ee5\u5e2e\u52a9\u60a8\u8ddf\u8e2a\u8d39\u7528\u3002",
         "source_account": "\u6765\u6e90\u5e10\u6237",

resources/assets/js/locales/zh-tw.json

@@ -7,6 +7,9 @@
         "split_transaction_title": "\u62c6\u5206\u4ea4\u6613\u7684\u63cf\u8ff0",
         "errors_submission": "There was something wrong with your submission. Please check out the errors below.",
         "split": "\u5206\u5272",
+        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
+        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been updated.",
+        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
         "transaction_journal_information": "\u4ea4\u6613\u8cc7\u8a0a",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"\/budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
         "source_account": "Source account",

resources/lang/cs_CZ/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Vytvořit novou věc',
     'new_withdrawal'                             => 'Nový výběr',
     'create_new_transaction'                     => 'Přidat novou transakci',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Nová transakce',
     'no_rules_for_bill'                          => 'Tento účet nemá přiřazena žádná pravidla.',
     'go_to_asset_accounts'                       => 'Zobrazit účty s aktivy',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Zapomenuté heslo do Firefly III',
     'reset_pw_page_title'                        => 'Reset hesla do Firefly III',
     'cannot_reset_demo_user'                     => 'Heslo uživatele pro ukázku (demo) nelze resetovat.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Zaregistrovat se',
     'authorization'                              => 'Pověření',
     'active_bills_only'                          => 'pouze aktivní účty',
     'active_exp_bills_only'                      => 'pouze aktivní a očekávané účty',
     'average_per_bill'                           => 'průměr na účet',
     'expected_total'                             => 'očekávaný celkový součet',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Požadavek na ověření – Firefly III verze :version',
     'authorization_request_intro'                => '<strong>:client</strong> žádá oprávnění pro přístup k vaší finanční správě. Chcete autorizovat <strong>:client</strong> pro přístup k těmto záznamům?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Popis obsahuje „:trigger_value“',
     'rule_trigger_description_is_choice'         => 'Popis je…',
     'rule_trigger_description_is'                => 'Popis je „:trigger_value“',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Rozpočet je…',
     'rule_trigger_budget_is'                     => 'Rozpočet je „:trigger_value“',
     'rule_trigger_tag_is_choice'                 => 'Štítek je…',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Poznámky začínají na „:trigger_value“',
     'rule_trigger_notes_end_choice'              => 'Poznámky končí na…',
     'rule_trigger_notes_end'                     => 'Poznámky končí na „:trigger_value“',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Nastavit kategorii na „:action_value“',
     'rule_action_clear_category'                 => 'Vyčistit kategorii',
     'rule_action_set_budget'                     => 'Nastavit rozpočet na „:action_value“',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Odebrat štítek…',
     'rule_action_remove_all_tags_choice'         => 'Odebrat veškeré štítky',
     'rule_action_set_description_choice'         => 'Nastavit popis na…',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Připojit k popisu…',
     'rule_action_prepend_description_choice'     => 'Přidat před popis…',
-    'rule_action_set_source_account_choice'      => 'Nastavit zdrojový účet na…',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Nastavit účet na :action_value',
-    'rule_action_set_destination_account_choice' => 'Nastavit cílový účet na…',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Nastavit cílový účet na :action_value',
     'rule_action_append_notes_choice'            => 'Připojit za poznámky…',
     'rule_action_append_notes'                   => 'Přidat za poznámky „:action_value“',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III vám umožňuje nastavit další lokální nastavení, jako je formátování měn, čísel a dat. Položky v tomto seznamu nemusí být podporovány vaším systémem. Firefly III nemá správné nastavení data pro každé lokální místo. Pro vylepšení mě kontaktujte.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Nastavení fiskálního roku',
     'pref_custom_fiscal_year_label'   => 'Zapnuto',
     'pref_custom_fiscal_year_help'    => 'Pro země, ve kterých finanční rok nezačíná 1. ledna a tedy ani nekončí 31. prosince, je možné zapnutím tohoto určit den začátku a konce fiskálního roku',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Možnosti',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Celkový rozpočet k dispozici v :currency',
     'see_below'                                 => 'viz níže',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => 'Vyúčtovat tento účet',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Potvrdit vyúčtování',
     'submitted_start_balance'                   => 'Předložený počáteční zůstatek',
     'selected_transactions'                     => 'Vybrané transakce (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Transakci se nedaří uložit. Podívejte se do souborů se záznamy událostí.',
     'attachment_not_found'                      => 'Tuto přílohu se nepodařilo najít.',
     'journal_link_bill'                         => 'This transaction is linked to bill <a href=":route">:name</a>. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Vítejte ve Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Opakované transakce',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Kalendář',
     'no_recurring_title_default'            => 'Pojďme vytvořit opakující se transakci!',
     'no_recurring_intro_default'            => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/de_DE/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Erstelle neue Dinge',
     'new_withdrawal'                             => 'Neue Ausgabe',
     'create_new_transaction'                     => 'Neue Buchung erstellen',
+    'sidebar_frontpage_create'                   => 'Erstellen',
     'new_transaction'                            => 'Neue Buchung',
     'no_rules_for_bill'                          => 'Diese Rechnung enthält keine mit ihr verbundenen Regeln.',
     'go_to_asset_accounts'                       => 'Bestandskonten anzeigen',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Haben Sie Ihr Passwort für Firefly III vergessen?',
     'reset_pw_page_title'                        => 'Passwort für Firefly III zurücksetzen',
     'cannot_reset_demo_user'                     => 'Sie können das Passwort des Demo-Benutzers nicht zurücksetzen.',
+    'no_att_demo_user'                           => 'Anwender der Demo-Version können keine Anhänge hochladen.',
     'button_register'                            => 'Registrieren',
     'authorization'                              => 'Autorisierung',
     'active_bills_only'                          => 'Nur aktive Rechnungen',
     'active_exp_bills_only'                      => 'nur aktive und erwartete Rechnungen',
     'average_per_bill'                           => 'Durchschnitt je Rechnung',
     'expected_total'                             => 'Voraussichtliche Summe',
-    'reconciliation_account_name'                => ':name Kontenabgleich',
+    'reconciliation_account_name'                => ':name Kontenabgleich (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Autorisierungsanfrage',
     'authorization_request_intro'                => '<strong>:client</strong> bittet um Erlaubnis, auf Ihre Finanzverwaltung zuzugreifen. Möchten Sie <strong>:client</strong> erlauben auf diese Datensätze zuzugreifen?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Bei der Suche nach Aktualisierungen ist ein Fehler aufgetreten: :error',
     'unknown_error'                              => 'Leider ist ein unbekannter Fehler aufgetreten.',
     'just_new_release'                           => 'Eine neue Version ist verfügbar! Version :version wurde veröffentlicht :date. Diese Version ist sehr jung. Warten Sie ein paar Tage, bis sich die neue Version etabliert hat.',
+    'disabled_but_check'                         => 'Die Aktualisierungsprüfung ist deaktiviert. Vergessen Sie also nicht, von Zeit zu Zeit selbst nach Aktualisierungen zu suchen. Vielen Dank!',
     'admin_update_channel_title'                 => 'Aktualisierungskanal',
     'admin_update_channel_explain'               => 'Firefly III verfügt über drei Aktualisierungskanäle, welche bestimmen, wie weit Sie in Bezug auf Funktionen, Verbesserungen und Fehler experimentierfreudig sind. Nutzen Sie den „Beta”-Kanal, wenn Sie abenteuerlustig sind, und den „Alpha”-Kanal, wenn Sie ein gefährliches Leben führen möchten.',
     'update_channel_stable'                      => 'Stabil — Alles sollte wie erwartet funktionieren.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Beschreibung enthält ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
     'rule_trigger_description_is'                => 'Beschreibung ist ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Buchungsdatum ist …',
+    'rule_trigger_date_is'                       => 'Buchungsdatum ist „:trigger_value”',
+    'rule_trigger_date_before_choice'            => 'Buchungsdatum ist vor …',
+    'rule_trigger_date_before'                   => 'Buchungsdatum ist vor „:trigger_value”',
+    'rule_trigger_date_after_choice'             => 'Buchungsdatum ist nach …',
+    'rule_trigger_date_after'                    => 'Buchungsdatum ist nach „:trigger_value”',
+
     'rule_trigger_budget_is_choice'              => 'Budget ist..',
     'rule_trigger_budget_is'                     => 'Budget ist „:trigger_value”',
     'rule_trigger_tag_is_choice'                 => '(Ein) Schlagwort ist …',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notizen beginnen mit „:trigger_value”',
     'rule_trigger_notes_end_choice'              => 'Notizen enden mit ..',
     'rule_trigger_notes_end'                     => 'Notizen enden mit „:trigger_value”',
+    'rule_action_delete_transaction_choice'      => 'Buchung löschen (!)',
+    'rule_action_delete_transaction'             => 'Buchung löschen (!)',
     'rule_action_set_category'                   => 'Kategorie auf ":action_value" setzen',
     'rule_action_clear_category'                 => 'Kategorie entfernen',
     'rule_action_set_budget'                     => 'Budget auf „:action_value” setzen',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Schlagwort entfernen …',
     'rule_action_remove_all_tags_choice'         => 'Alle Schlagwörter entfernen',
     'rule_action_set_description_choice'         => 'Beschreibung festlegen auf..',
+    'rule_action_update_piggy_choice'            => 'Buchungsbetrag im Sparschwein hinzufügen/entfernen …',
+    'rule_action_update_piggy'                   => 'Buchungsbetrag im Sparschwein „:action_value” hinzufügen/entfernen',
     'rule_action_append_description_choice'      => 'An Beschreibung anhängen..',
     'rule_action_prepend_description_choice'     => 'Vor Beschreibung voranstellen..',
-    'rule_action_set_source_account_choice'      => 'Lege Quellkonto fest...',
+    'rule_action_set_source_account_choice'      => 'Quellkonto festlegen auf …',
     'rule_action_set_source_account'             => 'Lege Quellkonto als :action_value fest',
-    'rule_action_set_destination_account_choice' => 'Zielkonto festlegen...',
+    'rule_action_set_destination_account_choice' => 'Zielkonto festlegen auf …',
     'rule_action_set_destination_account'        => 'Lege Zielkonto als :action_value fest',
     'rule_action_append_notes_choice'            => 'An Notizen anhängen..',
     'rule_action_append_notes'                   => '„:action_value” an Notizen anhängen',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Mit Firefly III können Sie weitere lokale Einstellungen vornehmen, z.B. wie Währungen, Zahlen und Daten formatiert werden sollen. Einträge in dieser Liste werden von Ihrem System möglicherweise nicht unterstützt. Firefly III enthält nicht die korrekten Datumseinstellungen für jedes Gebietsschema. Kontaktieren Sie uns für Verbesserungen.',
     'pref_locale_no_windows'          => 'Diese Funktion funktioniert unter Windows möglicherweise nicht.',
     'pref_locale_no_docker'           => 'Das Docker-Abbild enthält nur einen kleinen Satz installierter Gebietsschemata.',
+    'pref_locale_no_demo'             => 'Diese Funktion kann von Demo-Nutzern nicht genutzt werden.',
     'pref_custom_fiscal_year'         => 'Einstellungen zum Geschäftsjahr',
     'pref_custom_fiscal_year_label'   => 'Aktiviert',
     'pref_custom_fiscal_year_help'    => 'In Ländern, in denen ein Geschäftsjahr nicht vom 1. Januar bis 31. Dezember dauert, können Sie diese Option ändern und Start / Ende des Geschäftsjahres angeben',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Einstellungen',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Dieser Betrag gilt von :start bis :end.',
     'total_available_budget'                    => 'Verfügbares Gesamtbudget (zwischen :start und :end)',
     'total_available_budget_in_currency'        => 'Verfügbares Gesamtbudget in :currency',
     'see_below'                                 => 'Siehe unten',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Ausgleich (:from zu :to)',
     'sum_of_reconciliation'                     => 'Summe der Überleitungsrechnung',
     'reconcile_this_account'                    => 'Dieses Konto abgleichen',
+    'reconcile'                                 => 'Abgleichen',
+    'show'                                      => 'Anzeigen',
     'confirm_reconciliation'                    => 'Kontenabgleich bestätigen',
     'submitted_start_balance'                   => 'Übermitteltes Startguthaben',
     'selected_transactions'                     => 'Ausgewählte Umsätze (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Die Buchung konnte nicht gespeichert werden. Bitte überprüfen Sie die Protokolldateien.',
     'attachment_not_found'                      => 'Der Anhang konnte nicht gefunden werden.',
     'journal_link_bill'                         => 'Diese Buchung ist mit der Rechnung <a href=":route">:name</a> verknüpft. Um diese Verbindung aufzuheben, deaktivieren Sie das Kontrollkästchen. Verwenden Sie Regeln, um es mit einer anderen Rechnung zu verbinden.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Buchung #{ID} ("{title}")</a> wurde gespeichert.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Buchung#{ID}</a> wurde aktualisiert.',
 
     // new user:
     'welcome'                                   => 'Willkommen bei Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Regelmäßige Buchungen',
+    'repeat_until_in_past'                  => 'Diese wiederkehrende Buchung wiederholte ab dem :date nicht mehr.',
     'recurring_calendar_view'               => 'Kalender',
     'no_recurring_title_default'            => 'Lassen Sie uns eine regelmäßige Buchung erstellen!',
     'no_recurring_intro_default'            => 'Sie verfügen noch über keine regelmäßigen Buchungen. Mit diesen können Sie Firefly III dazu einsetzen, automatisch Buchungen für Sie zu erstellen.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Zurück zum Telemetrieindex',
     'not_yet_submitted'                  => 'Noch nicht übermittelt',
     'telemetry_type_feature'             => 'Funktions-Flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Wiederkehrend',
     'telemetry_submit_all'               => 'Datensätze übermitteln',
     'telemetry_delete_submitted_records' => 'Übertragene Datensätze löschen',
     'telemetry_submission_executed'      => 'Datensätze wurden übermittelt. Überprüfen Sie Ihre Protokolldateien für weitere Informationen.',

resources/lang/de_DE/list.php

@@ -77,7 +77,7 @@ return [
     'type'                    => 'Typ',
     'completed'               => 'Abgeschlossen',
     'iban'                    => 'IBAN',
-    'paid_current_period'     => 'Diese Periode bezahlt',
+    'paid_current_period'     => 'Diesen Zeitraum bezahlt',
     'email'                   => 'E-Mail',
     'registered_at'           => 'Registriert am',
     'is_blocked'              => 'Ist blockiert',

resources/lang/el_GR/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Νέα καταχώρηση',
     'new_withdrawal'                             => 'Νέα ανάληψη',
     'create_new_transaction'                     => 'Δημιουργία νέας συναλλαγής',
+    'sidebar_frontpage_create'                   => 'Δημιουργία',
     'new_transaction'                            => 'Νέα συναλλαγή',
     'no_rules_for_bill'                          => 'Αυτό το πάγιο έξοδο δεν έχει σχετιζόμενους κανόνες.',
     'go_to_asset_accounts'                       => 'Δείτε τους λογαριασμούς κεφαλαίου σας',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Ξεχάσατε τον κωδικό πρόσβασης για το Firefly III',
     'reset_pw_page_title'                        => 'Επαναφέρετε τον κωδικό πρόσβασης για το Firefly III',
     'cannot_reset_demo_user'                     => 'Δε μπορείτε να επαναφέρετε τον κωδικό πρόσβασης του χρήστη επίδειξης.',
+    'no_att_demo_user'                           => 'Ο χρήστης επίδειξης δε μπορεί να ανεβάσει συνημμένα.',
     'button_register'                            => 'Εγγραφή',
     'authorization'                              => 'Εξουσιοδότηση',
     'active_bills_only'                          => 'μόνο ενεργά πάγια έξοδα',
     'active_exp_bills_only'                      => 'ενεργοί και αναμενόμενοι λογαριασμοί μόνο',
     'average_per_bill'                           => 'μέσος όρος ανά πάγιο έξοδο',
     'expected_total'                             => 'αναμενόμενο σύνολο',
-    'reconciliation_account_name'                => 'τακτοποίηση :name',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Αίτημα Εξουσιοδότησης Firefly III v:version',
     'authorization_request_intro'                => 'Ο <strong>:client</strong> αιτείται άδεια πρόσβασης στην οικονομική σας διαχείριση. Θέλετε να εξουσιοδοτήσετε τον <strong>:client</strong> ώστε να έχει πρόσβαση σε αυτές τις εγγραφές;',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Παρουσιάστηκε σφάλμα κατά τον έλεγχο για ενημερώσεις: :error',
     'unknown_error'                              => 'Άγνωστο σφάλμα. Μας συγχωρείτε γι αυτό.',
     'just_new_release'                           => 'Μια νέα έκδοση είναι διαθέσιμη! Η εκδοσή :version κυκλοφόρησε :date. Όταν μια έκδοση είναι πολύ νέα είναι καλύτερο να περιμένετε λίγες μέρες για να είμαστε σίγουροι για τη νέα έκδοση.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Κανάλι ενημερώσεων',
     'admin_update_channel_explain'               => 'Το Firefly III έχει τρία "κανάλια" ενημερώσεων που καθορίζουν πόσο μπροστά είστε σε θέματα χαρακτηριστικών, βελτιστοποιήσεων και σφαλμάτων. Χρησιμοποιήστε το "beta" κανάλι εάν είστε τολμηροί και το "alpha" εάν είστε ριψοκίνδυνοι.',
     'update_channel_stable'                      => 'Σταθερή. Όλα λειτουργούν όπως προβλέπονται.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Η περιγραφή περιέχει ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Η περιγραφή είναι..',
     'rule_trigger_description_is'                => 'Η περιγραφή είναι ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Ο προϋπολογισμός είναι..',
     'rule_trigger_budget_is'                     => 'Ο προϋπολογισμός είναι ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Η(μία) ετικέτα είναι..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Οι σημειώσεις αρχίζουν με ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Οι σημειώσεις τελειώνουν με..',
     'rule_trigger_notes_end'                     => 'Οι σημειώσεις τελειώνουν με ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Ορίστε την κατηγορία σε ":action_value"',
     'rule_action_clear_category'                 => 'Καθαρισμός κατηγορίας',
     'rule_action_set_budget'                     => 'Ορίστε τον προϋπολογισμό σε ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Αφαίρεση ετικέτας..',
     'rule_action_remove_all_tags_choice'         => 'Αφαίρεση όλων των ετικετών',
     'rule_action_set_description_choice'         => 'Ορισμός της περιγραφής σε..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Προσάρτηση περιγραφής με..',
     'rule_action_prepend_description_choice'     => 'Προεπιλογή περιγραφής με..',
-    'rule_action_set_source_account_choice'      => 'Ορισμός του λογαριασμού προέλευσης σε...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Ορισμός του λογαριασμού προέλευσης σε :action_value',
-    'rule_action_set_destination_account_choice' => 'Ορισμός του λογαριασμού προορισμού...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Ορισμός του λογαριασμού προορισμού σε :action_value',
     'rule_action_append_notes_choice'            => 'Προσάρτηση σημειώσεων με..',
     'rule_action_append_notes'                   => 'Προσάρτηση σημειώσεων με ":action_value"',
@@ -541,8 +556,9 @@ return [
     'pref_locale'                     => 'Ρυθμίσεις τοποθεσίας',
     'pref_languages_help'             => 'Το Firefly III υποστηρίζει διάφορες γλώσσες. Ποιά προτιμάτε;',
     'pref_locale_help'                => 'Το Firefly III σας επιτρέπει να ορίσετε ορισμένες ρυθμίσεις τοποθεσίας, όπως τον τρόπο μορφοποίησης νομισμάτων, αριθμών και ημερομηνιών. Οι καταχωρήσεις σε αυτήν τη λίστα ενδέχεται να μην υποστηρίζονται από το σύστημά σας. Το Firefly III δεν έχει τις σωστές ρυθμίσεις ημερομηνίας για κάθε τοποθεσία. επικοινωνήστε μαζί μου για βελτιώσεις.',
-    'pref_locale_no_windows'          => 'This feature may not work on Windows.',
-    'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_windows'          => 'Αυτή η δυνατότητα ενδέχεται να μην λειτουργεί στα Windows.',
+    'pref_locale_no_docker'           => 'Η εικόνα Docker έχει μόνο ένα μικρό σύνολο εγκατεστημένων τοπικών ρυθμίσεων.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Ρυθμίσεις οικονομικού έτους',
     'pref_custom_fiscal_year_label'   => 'Ενεργοποιημένο',
     'pref_custom_fiscal_year_help'    => 'Σε χώρες που χρησιμοποιούν οικονομικό έτος διαφορετικό από 1 Ιανουαρίου εώς 31 Δεκεμβρίου, μπορείτε να ενεργοποιήσετε αυτή την επιλογή και να ορίσετε την αρχή και το τέλος του οικονομικού έτους',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Επιλογές',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Συνολικός διαθέσιμος προϋπολογισμός (μεταξύ :start και :end)',
     'total_available_budget_in_currency'        => 'Συνολικός διαθέσιμος προϋπολογισμός σε :currency',
     'see_below'                                 => 'δες παρακάτω',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Τακτοποίηση (:from σε :to)',
     'sum_of_reconciliation'                     => 'Άθροισμα της τακτοποίησης',
     'reconcile_this_account'                    => 'Τακτοποίηση αυτού του λογαριασμού',
+    'reconcile'                                 => 'Τακτοποίηση',
+    'show'                                      => 'Εμφάνιση',
     'confirm_reconciliation'                    => 'Επιβεβαίωση τακτοποίησης',
     'submitted_start_balance'                   => 'Υποβλήθηκε το αρχικό υπόλοιπο',
     'selected_transactions'                     => 'Επιλεγμένες συναλλαγές (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Δεν ήταν δυνατή η αποθήκευση της συναλλαγής. Ελέγξτε τα αρχεία καταγραφής.',
     'attachment_not_found'                      => 'Αυτό το συνημμένο δεν βρέθηκε.',
     'journal_link_bill'                         => 'Αυτή η συναλλαγή συνδέεται με το πάγιο έξοδο <a href=":route">:name</a>. Για να καταργήσετε τη σύνδεση, καταργήστε την επιλογή στο κουτάκι. Χρησιμοποιήστε κανόνες για να το συνδέσετε με ένα άλλο πάγιο έξοδο.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Καλωσήρθατε στο Firefly III!',
@@ -1132,11 +1154,11 @@ return [
     'interest_period_help'                      => 'Αυτό το πεδίο είναι διακοσμητικό και δεν θα υπολογιστεί για εσάς. Όπως φαίνεται, οι τράπεζες είναι αρκετά πονηρές οπότε το Firefly III δεν το βρίσκει ποτέ σωστά.',
     'store_new_liabilities_account'             => 'Αποθήκευση νέας υποχρέωσης',
     'edit_liabilities_account'                  => 'Επεξεργασία υποχρέωσης ":name"',
-    'financial_control'                         => 'Financial control',
-    'accounting'                                => 'Accounting',
-    'automation'                                => 'Automation',
-    'others'                                    => 'Others',
-    'classification'                            => 'Classification',
+    'financial_control'                         => 'Οικονομικός έλεγχος',
+    'accounting'                                => 'Λογιστική',
+    'automation'                                => 'Αυτοματοποίηση',
+    'others'                                    => 'Λοιπά',
+    'classification'                            => 'Ταξινόμηση',
 
     // reports:
     'report_default'                            => 'Προεπιλεγμένη οικονομική αναφορά μεταξύ :start και :end',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Επαναλαμβανόμενες συναλλαγές',
+    'repeat_until_in_past'                  => 'Αυτή η επαναλαμβανόμενη συναλλαγή σταμάτησε να επαναλαμβάνεται στις :date.',
     'recurring_calendar_view'               => 'Ημερολόγιο',
     'no_recurring_title_default'            => 'Ας δημιουργήσουμε μια επαναλαμβανόμενη συναλλαγή!',
     'no_recurring_intro_default'            => 'Δεν έχετε ακόμα επαναλαμβανόμενες συναλλαγές. Μπορείτε να τις χρησιμοποιήσετε για να κάνετε το Firefly III να δημιουργεί αυτόματα συναλλαγές για εσάς.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Επιστροφή στις ενδείξεις τηλεμετρίας',
     'not_yet_submitted'                  => 'Δεν έχει υποβληθεί ακόμη',
     'telemetry_type_feature'             => 'Επισήμανση λειτουργίας',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Υποβολή εγγραφών',
     'telemetry_delete_submitted_records' => 'Διαγραφή καταχωρισμένων εγγραφών',
     'telemetry_submission_executed'      => 'Έχουν υποβληθεί εγγραφές. Ελέγξτε τα αρχεία καταγραφής για περισσότερες πληροφορίες.',

resources/lang/en_GB/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Create new stuff',
     'new_withdrawal'                             => 'New withdrawal',
     'create_new_transaction'                     => 'Create new transaction',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'New transaction',
     'no_rules_for_bill'                          => 'This bill has no rules associated to it.',
     'go_to_asset_accounts'                       => 'View your asset accounts',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Forgot your password for Firefly III',
     'reset_pw_page_title'                        => 'Reset your password for Firefly III',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demo user.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Register',
     'authorization'                              => 'Authorisation',
     'active_bills_only'                          => 'active bills only',
     'active_exp_bills_only'                      => 'active and expected bills only',
     'average_per_bill'                           => 'average per bill',
     'expected_total'                             => 'expected total',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Authorisation Request',
     'authorization_request_intro'                => '<strong>:client</strong> is requesting permission to access your financial administration. Would you like to authorise <strong>:client</strong> to access these records?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilise.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Description is..',
     'rule_trigger_description_is'                => 'Description is ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budget is..',
     'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notes start with ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notes end with..',
     'rule_trigger_notes_end'                     => 'Notes end with ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Remove tag..',
     'rule_action_remove_all_tags_choice'         => 'Remove all tags',
     'rule_action_set_description_choice'         => 'Set description to..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Append description with..',
     'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Set destination account to :action_value',
     'rule_action_append_notes_choice'            => 'Append notes with..',
     'rule_action_append_notes'                   => 'Append notes with ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Fiscal year settings',
     'pref_custom_fiscal_year_label'   => 'Enabled',
     'pref_custom_fiscal_year_help'    => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Options',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => 'Reconcile this account',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Confirm reconciliation',
     'submitted_start_balance'                   => 'Submitted start balance',
     'selected_transactions'                     => 'Selected transactions (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Could not store the transaction. Please check the log files.',
     'attachment_not_found'                      => 'This attachment could not be found.',
     'journal_link_bill'                         => 'This transaction is linked to bill <a href=":route">:name</a>. To remove the connection, untick the checkbox. Use rules to connect it to another bill.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Welcome to Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Recurring transactions',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Let\'s create a recurring transaction!',
     'no_recurring_intro_default'            => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/en_US/email.php

@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * email.php
+ * Copyright (c) 2019 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+return [
+    // common items
+    'greeting'                         => 'Hi there,',
+    'closing'                          => 'Beep boop,',
+    'signature'                        => 'The Firefly III Mail Robot',
+    'footer_ps'                        => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
+
+    // admin test
+    'admin_test_subject'               => 'A test message from your Firefly III installation',
+    'admin_test_body'                  => 'This is a test message from your Firefly III instance. It was sent to :email.',
+
+    // access token created
+    'access_token_created_subject'     => 'A new access token was created',
+    'access_token_created_body'        => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
+    'access_token_created_explanation' => 'With this token, they can access <strong>all</strong> of your financial records through the Firefly III API.',
+    'access_token_created_revoke'      => 'If this wasn\'t you, please revoke this token as soon as possible at :url.',
+
+    // registered
+    'registered_subject'               => 'Welcome to Firefly III!',
+    'registered_welcome'               => 'Welcome to <a style="color:#337ab7" href=":address">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!',
+    'registered_pw'                    => 'If you have forgotten your password already, please reset it using <a style="color:#337ab7" href=":address/password/reset">the password reset tool</a>.',
+    'registered_help'                  => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
+    'registered_doc_html'              => 'If you haven\'t already, please read the <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.',
+    'registered_doc_text'              => 'If you haven\'t already, please read the first use guide and the full description.',
+    'registered_closing'               => 'Enjoy!',
+    'registered_firefly_iii_link'      => 'Firefly III:',
+    'registered_pw_reset_link'         => 'Password reset:',
+    'registered_doc_link'              => 'Documentation:',
+
+    // email change
+    'email_change_subject'             => 'Your Firefly III email address has changed',
+    'email_change_body_to_new'         => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
+    'email_change_body_to_old'         => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you <strong>must</strong> follow the "undo"-link below to protect your account!',
+    'email_change_ignore'              => 'If you initiated this change, you may safely ignore this message.',
+    'email_change_old'                 => 'The old email address was: :email',
+    'email_change_old_strong'          => 'The old email address was: <strong>:email</strong>',
+    'email_change_new'                 => 'The new email address is: :email',
+    'email_change_new_strong'          => 'The new email address is: <strong>:email</strong>',
+    'email_change_instructions'        => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
+    'email_change_undo_link'           => 'To undo the change, follow this link:',
+
+    // OAuth token created
+    'oauth_created_subject'            => 'A new OAuth client has been created',
+    'oauth_created_body'               => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL <span style="font-family: monospace;">:url</span>.',
+    'oauth_created_explanation'        => 'With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.',
+    'oauth_created_undo'               => 'If this wasn\'t you, please revoke this client as soon as possible at :url.',
+
+    // reset password
+    'reset_pw_subject'                 => 'Your password reset request',
+    'reset_pw_instructions'            => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
+    'reset_pw_warning'                 => '<strong>PLEASE</strong> verify that the link actually goes to the Firefly III you expect it to go!',
+
+    // error
+    'error_subject'                    => 'Caught an error in Firefly III',
+    'error_intro'                      => 'Firefly III v:version ran into an error: <span style="font-family: monospace;">:errorMessage</span>.',
+    'error_type'                       => 'The error was of type ":class".',
+    'error_timestamp'                  => 'The error occurred on/at: :time.',
+    'error_location'                   => 'This error occurred in file "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
+    'error_user'                       => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
+    'error_no_user'                    => 'There was no user logged in for this error or no user was detected.',
+    'error_ip'                         => 'The IP address related to this error is: :ip',
+    'error_url'                        => 'URL is: :url',
+    'error_user_agent'                 => 'User agent: :userAgent',
+    'error_stacktrace'                 => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
+    'error_github_html'                => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
+    'error_github_text'                => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
+    'error_stacktrace_below'           => 'The full stacktrace is below:',
+
+    // report new journals
+    'new_journals_subject'             => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
+    'new_journals_header'              => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
+];

resources/lang/en_US/firefly.php

@@ -242,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -421,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Description contains ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Description is..',
     'rule_trigger_description_is'                => 'Description is ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budget is..',
     'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag is..',
@@ -455,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notes start with ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notes end with..',
     'rule_trigger_notes_end'                     => 'Notes end with ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
@@ -477,9 +488,9 @@ return [
     'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Append description with..',
     'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Set source account to :action_value',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Set destination account to :action_value',
     'rule_action_append_notes_choice'            => 'Append notes with..',
     'rule_action_append_notes'                   => 'Append notes with ":action_value"',
@@ -547,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Fiscal year settings',
     'pref_custom_fiscal_year_label'   => 'Enabled',
     'pref_custom_fiscal_year_help'    => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
@@ -757,6 +769,7 @@ return [
     'options'                                   => 'Options',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -1042,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Could not store the transaction. Please check the log files.',
     'attachment_not_found'                      => 'This attachment could not be found.',
     'journal_link_bill'                         => 'This transaction is linked to bill <a href=":route">:name</a>. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Welcome to Firefly III!',
@@ -1623,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/es_ES/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Crear nueva etiqueta',
     'new_withdrawal'                             => 'Nuevo retiro',
     'create_new_transaction'                     => 'Crear una nueva transacción',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Nueva transacción',
     'no_rules_for_bill'                          => 'Esta factura no tiene reglas asociadas a ella.',
     'go_to_asset_accounts'                       => 'Ver tus cuentas de activos',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Olvidó su contraseña para Firefly III',
     'reset_pw_page_title'                        => 'Restablecer contraseña para Firefly III',
     'cannot_reset_demo_user'                     => 'No puedes restablecer la contraseña del usuario demo.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Registrarse',
     'authorization'                              => 'Autorización',
     'active_bills_only'                          => 'sólo facturas activas',
     'active_exp_bills_only'                      => 'sólo facturas activas y esperadas',
     'average_per_bill'                           => 'promedio por cuenta',
     'expected_total'                             => 'total esperado',
-    'reconciliation_account_name'                => 'Reconciliación :name',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Solicitud de autorización',
     'authorization_request_intro'                => '<strong>:client</strong> está solicitando permiso para acceder a su administración financiera. ¿Desea autorizar a <strong>:client</strong> para acceder a estos registros?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Se ha producido un error al buscar actualizaciones: :error',
     'unknown_error'                              => 'Error desconocido. Lo sentimos.',
     'just_new_release'                           => '¡Una nueva versión está disponible! La versión :version ha sido liberada :date. Esta versión es muy fresca. Espere unos días a que la nueva versión se estabilice.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Canal de actualizaciones',
     'admin_update_channel_explain'               => 'Firefly III tiene tres "canales" de actualización que determinan cuán por delante está en términos de características, mejoras y errores. Use el canal "beta" si es aventurero y el "alfa" cuando quiera vivir la vida peligrosamente.',
     'update_channel_stable'                      => 'Estable. Todo debería funcionar como se espera.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'La descripción contiene ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Descripción es..',
     'rule_trigger_description_is'                => 'La descripción es ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Presupuesto es..',
     'rule_trigger_budget_is'                     => 'Presupuesto es ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(una) etiqueta es..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Las notas comienzan con ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Las notas terminan con..',
     'rule_trigger_notes_end'                     => 'Las notas terminan con ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Establecer categoría en ":action_value"',
     'rule_action_clear_category'                 => 'Borrar categoría',
     'rule_action_set_budget'                     => 'Establecer presupuesto en ":action_value "',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Eliminar etiqueta..',
     'rule_action_remove_all_tags_choice'         => 'Eliminar todas las etiquetas',
     'rule_action_set_description_choice'         => 'Establecer descripción para..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Adjuntar descripción con..',
     'rule_action_prepend_description_choice'     => 'Anteponer descripción con..',
-    'rule_action_set_source_account_choice'      => 'Configurar cuenta de origen para...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Establecer cuenta de origen en :action_value',
-    'rule_action_set_destination_account_choice' => 'Establecer cuenta de destino en...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Establecer cuenta de destino en :action_value',
     'rule_action_append_notes_choice'            => 'Anexar notas con..',
     'rule_action_append_notes'                   => 'Anexar notas con ":action_value"',
@@ -540,9 +555,10 @@ return [
     'pref_languages'                  => 'Idiomas',
     'pref_locale'                     => 'Configuración del idioma',
     'pref_languages_help'             => 'Firefly III apoya varios idiomas. cual usted prefiere?',
-    'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
-    'pref_locale_no_windows'          => 'This feature may not work on Windows.',
-    'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_help'                => 'Firefly III le permite configurar otros ajustes locales, como cómo se da formato a las monedas, números y fechas. Las entradas en esta lista pueden no ser soportadas por su sistema. Firefly III no tiene los ajustes de fecha correctos para cada local; póngase en contacto conmigo para obtener mejoras.',
+    'pref_locale_no_windows'          => 'Esta característica puede no funcionar en Windows.',
+    'pref_locale_no_docker'           => 'La imagen de Docker sólo tiene un pequeño conjunto de locales instalados.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Configuraciónes del año fiscal',
     'pref_custom_fiscal_year_label'   => 'Habilitado',
     'pref_custom_fiscal_year_help'    => 'En países que utilizan año fiscal diferente del 1 al 31 de diciembre, usted puede cambiarlo y especificar los días de inicio / y termino del año fiscal',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opciones',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Presupuesto total disponible (entre :start y :end)',
     'total_available_budget_in_currency'        => 'Presupuesto total disponible en :currency',
     'see_below'                                 => 'ver abajo',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliación (:from a :to)',
     'sum_of_reconciliation'                     => 'Suma de reconciliación',
     'reconcile_this_account'                    => 'Reconciliar esta cuenta',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Confirmar la reconciliacion',
     'submitted_start_balance'                   => 'Balance final enviado',
     'selected_transactions'                     => 'Transacciones seleccionadas (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'No se pudo guardar la transacción. Por favor, revise los archivos de registro.',
     'attachment_not_found'                      => 'No se pudo encontrar este adjunto.',
     'journal_link_bill'                         => 'Esta transacción está vinculada a la factura <a href=":route">:name</a>. Para eliminar la conexión, desmarca la casilla de verificación. Usa reglas para conectarla a otra factura.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Bienvenido a Firefly III!',
@@ -1132,11 +1154,11 @@ return [
     'interest_period_help'                      => 'Este campo es meramente cosmético y no se calculará para usted. Como resulta que los bancos son muy estrepitosos, por lo que Firefly III nunca lo hace bien.',
     'store_new_liabilities_account'             => 'Crear nuevo pasivo',
     'edit_liabilities_account'                  => 'Editar pasivo ":name"',
-    'financial_control'                         => 'Financial control',
-    'accounting'                                => 'Accounting',
-    'automation'                                => 'Automation',
-    'others'                                    => 'Others',
-    'classification'                            => 'Classification',
+    'financial_control'                         => 'Control financiero',
+    'accounting'                                => 'Contabilidad',
+    'automation'                                => 'Automatización',
+    'others'                                    => 'Otros',
+    'classification'                            => 'Clasificación',
 
     // reports:
     'report_default'                            => 'Reporte financiero por defecto entre :start y :end',
@@ -1461,7 +1483,7 @@ return [
     'tools_index_intro'                     => 'Existen varias herramientas para importar datos en Firefly III. Reviselas a continuación. Para más información, consulte <a href="https://docs.firefly-iii.org/importing-data/introduction">esta página</a>.',
     'firefly_iii_csv_importer_name'         => 'Importador CSV de Firefly III',
     'firefly_iii_bunq_importer_name'        => 'Importador de Firefly III bunq',
-    'firefly_iii_ynab_importer_name'        => 'Firefly III YNAB importer',
+    'firefly_iii_ynab_importer_name'        => 'Importador YNAB de Firefly III',
     'ludo_revolut_importer_name'            => 'Importador Ludo444\'s Revolut',
     //
     // sandstorm.io errors and messages:
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Transacciones Recurrentes',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendario',
     'no_recurring_title_default'            => 'Vamos a crear una transacción recurrente!',
     'no_recurring_intro_default'            => 'Usted no tiene transacciones recurrentes aún. Puede usar esto para hacer que Firefly III cree transacciones por usted.',
@@ -1615,7 +1638,9 @@ return [
     'telemetry_admin_overview'           => 'Resumen de telemetría',
     'telemetry_back_to_index'            => 'Volver al índice de telemetría',
     'not_yet_submitted'                  => 'No enviada',
-    'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_feature'             => 'Marca de características',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Enviar registros',
     'telemetry_delete_submitted_records' => 'Eliminar los registros enviados',
     'telemetry_submission_executed'      => 'Los registros han sido enviados. Revise sus archivos de registro para más información.',

resources/lang/es_ES/form.php

@@ -266,9 +266,9 @@ return [
     'auto_budget_amount'            => 'Monto del autopresupuesto',
     'auto_budget_period'            => 'Período del autopresupuesto',
 
-    'collected' => 'Collected',
+    'collected' => 'Cobrado',
     'submitted' => 'Enviado',
-    'key' => 'Key',
+    'key' => 'Clave',
     'value' => 'Contenido del registro'
 
 

resources/lang/fi_FI/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Luo uusia juttuja',
     'new_withdrawal'                             => 'Uusi nosto',
     'create_new_transaction'                     => 'Luo uusi tapahtuma',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Uusi tapahtuma',
     'no_rules_for_bill'                          => 'Tälle laskulle ei ole lisätty yhtään sääntöä.',
     'go_to_asset_accounts'                       => 'Tarkastele omaisuustilejäsi',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Unohdit salasanasi Firefly III:een',
     'reset_pw_page_title'                        => 'Nollaa salasanasi Firefly III:een',
     'cannot_reset_demo_user'                     => 'Demokäyttäjän salasanaa ei voi nollata.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Rekisteröidy',
     'authorization'                              => 'Valtuutus',
     'active_bills_only'                          => 'vain aktiiviset laskut',
     'active_exp_bills_only'                      => 'vain aktiiviset ja odotettavissa olevat laskut',
     'average_per_bill'                           => 'keskiarvo laskuittain',
     'expected_total'                             => 'odotettavissa yhteensä',
-    'reconciliation_account_name'                => 'täsmäytetään :name',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Valtuutus Pyyntö',
     'authorization_request_intro'                => '<strong>:client</strong> pyytää valtuutustasi nähdäkseen sinun taloushallintosi. Haluatko antaa hänelle pääsyn näihin tietoihin?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Päivityksiä tarkistettaessa tapahtui virhe: :error',
     'unknown_error'                              => 'Tuntematon virhe. Pahoittelut siitä.',
     'just_new_release'                           => 'Uusi versio on saatavilla! Versio :version on julkaistu :date. Tämä julkaisu on aivan tuore, kannattaa vielä odottaa muutama päivä julkaisun vakiintumista.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Päivityskanava',
     'admin_update_channel_explain'               => 'Firefly III:lla on kolme päivitys-"kanavaa" jotka määrittävät kuinka kehityksen huipulla olet ominaisuuksissa, parannuksissa ja ohjelmavirheissä. Käytä "beta"-kanavaa jos olet seikkailija ja "alpha"-kanavaa jos haluat elää vaarallisesti.',
     'update_channel_stable'                      => 'Vakaa. Kaiken pitäisi toimia kuten oletat.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Kuvaus sisältää tekstin ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Kuvaus on ...',
     'rule_trigger_description_is'                => 'Kuvaus on ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budjetti on ...',
     'rule_trigger_budget_is'                     => 'Budjetti on ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Tägi on ...',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Muistiinpano alkaa tekstillä ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Muistiinpano loppuu tekstiin ...',
     'rule_trigger_notes_end'                     => 'Muistiinpano loppuu tekstiin ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Aseta kategoriaksi ":action_value"',
     'rule_action_clear_category'                 => 'Tyhjennä kategoria',
     'rule_action_set_budget'                     => 'Aseta budjetiksi ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Poista tägi ...',
     'rule_action_remove_all_tags_choice'         => 'Poista kaikki tägit',
     'rule_action_set_description_choice'         => 'Aseta kuvaus ...',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Liitä kuvauksen loppuun teksti ...',
     'rule_action_prepend_description_choice'     => 'Aloita kuvaus tekstillä ...',
-    'rule_action_set_source_account_choice'      => 'Aseta lähdetiliksi ...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Aseta lähdetiliksi :action_value',
-    'rule_action_set_destination_account_choice' => 'Aseta kohdetiliksi ...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Aseta kohdetiliksi :action_value',
     'rule_action_append_notes_choice'            => 'Liitä muistiinpanon loppuun ...',
     'rule_action_append_notes'                   => 'Liitä muistiinpanon loppuun teksti ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III antaa sinun asettaa erikseen paikallisia asetuksia, kuten valuuttojen, numeroiden ja päivämäärien muotoilun. Järjestelmäsi ei ehkä tue kaikkia tämän luettelon alueasetuksia. Firefly III:lla ei ole oikeita päivämääräasetuksia jokaiselle alueelle; ota minuun yhteyttä saadaksesi parannuksia.',
     'pref_locale_no_windows'          => 'Tämä ominaisuus ei välttämättä toimi Windowsissa.',
     'pref_locale_no_docker'           => 'Docker imagessa on vain pieni määrä asennettuja lokalisaatioita.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Tilikauden asetukset',
     'pref_custom_fiscal_year_label'   => 'Käytössä',
     'pref_custom_fiscal_year_help'    => 'Maissa joiden tilikausi on jokin muu kuin Tammikuun 1:stä Joulukuun 31:seen päivään, voit valita tämän ja määrittää tilikauden aloitus- ja lopetuspäivän',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Valinnat',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Budjetissa jäljellä (välillä :start ja :end)',
     'total_available_budget_in_currency'        => 'Budjetissa jäljellä valuutassa :currency',
     'see_below'                                 => 'katso alla',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Täsmäytys (:from - :to)',
     'sum_of_reconciliation'                     => 'Täsmäytykset yhteensä',
     'reconcile_this_account'                    => 'Täsmäytä tämä tili',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Vahvista täsmäytys',
     'submitted_start_balance'                   => 'Annettu avaussaldo',
     'selected_transactions'                     => 'Valitut tapahtumat (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Tapahtuman tallennus epäonnistui. Syy tallentui lokitiedostoon.',
     'attachment_not_found'                      => 'Tätä liitettä ei löydy.',
     'journal_link_bill'                         => 'Tämä tapahtuma liittyy laskuun <a href=":route">:name</a>. Jos haluat poistaa yhteyden, poista valinta liitos-valintaruudusta. Käytä sääntöjä yhdistääksesi tapahtuma toiseen laskuun.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Tervetuloa Firefly III:een!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Toistuvat tapahtumat',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Kalenteri',
     'no_recurring_title_default'            => 'Luodaan toistuva tapahtuma!',
     'no_recurring_intro_default'            => 'Sinulla ei ole vielä yhtään toistuvaa tapahtumaa. Niiden avulla Firefly III osaa luoda automaattisesti tapahtumia sinulle.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Takaisin käyttötietojen hakemistoon',
     'not_yet_submitted'                  => 'Ei vielä lähetetty',
     'telemetry_type_feature'             => 'Ominaisuusasetus',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Lähetä tiedot',
     'telemetry_delete_submitted_records' => 'Poista lähetetyt tiedot',
     'telemetry_submission_executed'      => 'Tiedot on lähetetty. Lokitiedostoistasi löydät lisätietoja.',

resources/lang/fr_FR/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Créer de nouvelles choses',
     'new_withdrawal'                             => 'Nouvelle dépense',
     'create_new_transaction'                     => 'Créer une nouvelle opération',
+    'sidebar_frontpage_create'                   => 'Créer',
     'new_transaction'                            => 'Nouvelle opération',
     'no_rules_for_bill'                          => 'Cette facture n\'a aucune règle associée.',
     'go_to_asset_accounts'                       => 'Afficher vos comptes d\'actifs',
@@ -189,7 +190,7 @@ return [
     'sign_in'                                    => 'S\'identifier',
     'register_new_account'                       => 'Créer un nouveau compte',
     'forgot_my_password'                         => 'J\'ai oublié mon mot de passe',
-    'problems_with_input'                        => 'Il y a eu quelques problèmes avec votre entrée.',
+    'problems_with_input'                        => 'Il y a eu quelques problèmes avec votre saisie.',
     'reset_password'                             => 'Réinitialisez votre mot de passe',
     'button_reset_password'                      => 'Réinitialiser le mot de passe',
     'reset_button'                               => 'Réinitialiser',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Mot de passe Firefly III oublié',
     'reset_pw_page_title'                        => 'Réinitialiser votre mot de passe Firefly III',
     'cannot_reset_demo_user'                     => 'Vous ne pouvez pas réinitialiser le mot de passe de l\'utilisateur de démonstration.',
+    'no_att_demo_user'                           => 'L\'utilisateur de la démo ne peut pas envoyer de pièces jointes.',
     'button_register'                            => 'S\'inscrire',
     'authorization'                              => 'Autorisation',
     'active_bills_only'                          => 'factures actives seulement',
     'active_exp_bills_only'                      => 'uniquement les factures actives et attendues',
     'average_per_bill'                           => 'moyenne par facture',
     'expected_total'                             => 'total prévu',
-    'reconciliation_account_name'                => 'Régularisation :name',
+    'reconciliation_account_name'                => 'Régularisation de :name (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version demande d\'autorisation',
     'authorization_request_intro'                => '<strong>:client</strong> demande l\'autorisation d\'accéder à votre administration financière. Souhaitez-vous autoriser <strong>:client</strong> à accéder à ces enregistrements?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Une erreur est survenue lors de la vérification d\'une mise à jour : :error',
     'unknown_error'                              => 'Erreur inconnue. Désolé.',
     'just_new_release'                           => 'Une nouvelle version est disponible ! La version :version a été publiée :date. Cette version est très récente. Attendez quelques jours pour que la nouvelle version se stabilise.',
+    'disabled_but_check'                         => 'Vous avez désactivé la vérification des mises à jour. N\'oubliez donc pas de vérifier vous-même les mises à jour de temps en temps. Merci !',
     'admin_update_channel_title'                 => 'Canal de mise à jour',
     'admin_update_channel_explain'               => 'Firefly III dispose de trois canaux de mise à jour qui déterminent ce que vous êtes prêt à accepter en termes de fonctionnalités, d\'améliorations et de bogues. Utilisez le canal « bêta » si vous êtes aventurier et le « alpha » lorsque vous aimez vivre dangereusement.',
     'update_channel_stable'                      => 'Stable. Tout devrait fonctionner comme prévu.',
@@ -419,11 +422,19 @@ return [
     'rule_trigger_description_contains'          => 'La description contient ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'La description est..',
     'rule_trigger_description_is'                => 'La description est ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'La date de l\'opération est..',
+    'rule_trigger_date_is'                       => 'La date de l\'opération est.. ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'La date de l\'opération se situe avant..',
+    'rule_trigger_date_before'                   => 'La date de l\'opération se situe avant ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'La date de l\'opération se situe après..',
+    'rule_trigger_date_after'                    => 'La date de l\'opération se situe après ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Le budget est..',
     'rule_trigger_budget_is'                     => 'Le budget est ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) le tag est..',
     'rule_trigger_tag_is'                        => 'Un tag est ":trigger_value"',
-    'rule_trigger_currency_is_choice'            => 'La devise de l\'opération est ..',
+    'rule_trigger_currency_is_choice'            => 'La devise de l\'opération est..',
     'rule_trigger_currency_is'                   => 'La devise de l\'opération est ":trigger_value"',
     'rule_trigger_has_attachments_choice'        => 'À au moins autant de pièces jointes',
     'rule_trigger_has_attachments'               => 'À au moins :trigger_value pièce(s) jointe(s)',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Les notes commencent par ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Les notes se terminent par..',
     'rule_trigger_notes_end'                     => 'Les notes se finissent par ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'SUPPRIMER l\'opération (!)',
+    'rule_action_delete_transaction'             => 'SUPPRIMER l\'opération (!)',
     'rule_action_set_category'                   => 'Définir la catégorie à ":action_value"',
     'rule_action_clear_category'                 => 'Supprimer de la catégorie',
     'rule_action_set_budget'                     => 'Définir le budget à ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Retirer le tag..',
     'rule_action_remove_all_tags_choice'         => 'Supprimer tous les tags',
     'rule_action_set_description_choice'         => 'Définir la description à..',
+    'rule_action_update_piggy_choice'            => 'Ajouter/supprimer un montant dans la tirelire..',
+    'rule_action_update_piggy'                   => 'Ajouter/supprimer le montant de l\'opération dans la tirelire ":action_value"',
     'rule_action_append_description_choice'      => 'Suffixer la description avec..',
     'rule_action_prepend_description_choice'     => 'Préfixer la description avec..',
-    'rule_action_set_source_account_choice'      => 'Définissez le compte source à...',
+    'rule_action_set_source_account_choice'      => 'Définir le compte source à..',
     'rule_action_set_source_account'             => 'Définir le compte source à :action_value',
-    'rule_action_set_destination_account_choice' => 'Définissez le compte de destination à ...',
+    'rule_action_set_destination_account_choice' => 'Définir le compte de destination à..',
     'rule_action_set_destination_account'        => 'Définissez le compte de destination à :action_value',
     'rule_action_append_notes_choice'            => 'Rajouter aux notes..',
     'rule_action_append_notes'                   => 'Rajouter aux notes ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III vous permet de définir d\'autres paramètres locaux, comme la façon dont les devises, les nombres et les dates sont formatées. Les entrées dans cette liste peuvent ne pas être prises en charge par votre système. Firefly III n\'est pas paramétré correctement pour toutes les langues ; contactez-moi pour les améliorer.',
     'pref_locale_no_windows'          => 'Cette fonctionnalité peut ne pas fonctionner sous Windows.',
     'pref_locale_no_docker'           => 'L\'image Docker ne dispose que d\'un petit nombre de paramètres régionaux installés.',
+    'pref_locale_no_demo'             => 'Cette fonctionnalité ne fonctionnera pas pour l\'utilisateur de démonstration.',
     'pref_custom_fiscal_year'         => 'Paramètres fiscaux de l\'année',
     'pref_custom_fiscal_year_label'   => 'Activé',
     'pref_custom_fiscal_year_help'    => 'Dans les pays qui utilisent une année financière autre que du 1er janvier au 31 décembre, vous pouvez la changer en spécifiant le jour de début et de fin de l\'année fiscale',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Options',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Ce montant s\'applique du :start au :end.',
     'total_available_budget'                    => 'Budget total disponible (entre :start et :end)',
     'total_available_budget_in_currency'        => 'Budget total disponible en :currency',
     'see_below'                                 => 'voir ci-dessous',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Régularisation (du :from au :to)',
     'sum_of_reconciliation'                     => 'Total des rapprochements',
     'reconcile_this_account'                    => 'Rapprocher ce compte',
+    'reconcile'                                 => 'Rapprocher',
+    'show'                                      => 'Afficher',
     'confirm_reconciliation'                    => 'Confirmer le rapprochement',
     'submitted_start_balance'                   => 'Solde initial soumis',
     'selected_transactions'                     => 'Opérations sélectionnées ( :count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Impossible de stocker l\'opération. Veuillez vérifier les fichiers journaux.',
     'attachment_not_found'                      => 'Cette pièce jointe est introuvable.',
     'journal_link_bill'                         => 'Cette opération est liée à la facture <a href=":route">:name</a>. Pour supprimer l\'association, décocher la case. Utilisez les règles pour la connecter à une autre facture.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">L\'opération n°{ID} ("{title}")</a> a été enregistrée.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">L\'opération n°{ID}</a> a été enregistrée.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">L\'opération n°{ID}</a> a été mise à jour.',
 
     // new user:
     'welcome'                                   => 'Bienvenue sur Firefly III !',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Opérations périodiques',
+    'repeat_until_in_past'                  => 'Cette opération récurrente a cessé de se répéter le :date.',
     'recurring_calendar_view'               => 'Calendrier',
     'no_recurring_title_default'            => 'Créons une opération périodique !',
     'no_recurring_intro_default'            => 'Vous n’avez pas encore d\'opérations périodiques. Vous pouvez en utiliser pour que Firefly III crée automatiquement des opérations pour vous.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Retour à l\'index de la télémétrie',
     'not_yet_submitted'                  => 'Pas encore soumis',
     'telemetry_type_feature'             => 'Indicateur de fonctionnalité',
+    'telemetry_type_string'              => 'Texte',
+    'telemetry_type_recurring'           => 'Récurrence',
     'telemetry_submit_all'               => 'Soumettre les enregistrements',
     'telemetry_delete_submitted_records' => 'Supprimer les enregistrements envoyés',
     'telemetry_submission_executed'      => 'Les enregistrements ont été soumis. Consultez vos fichiers journaux pour plus d\'informations.',

resources/lang/hu_HU/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Új dolog létrehozása',
     'new_withdrawal'                             => 'Új költség',
     'create_new_transaction'                     => 'Új tranzakció létrehozása',
+    'sidebar_frontpage_create'                   => 'Létrehozás',
     'new_transaction'                            => 'Új tranzakció',
     'no_rules_for_bill'                          => 'Ehhez a számlához nincsenek szabályok kapcsolva.',
     'go_to_asset_accounts'                       => 'Eszközszámlák megtekintése',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Elfelejtette a jelszavát a Firefly III-hoz',
     'reset_pw_page_title'                        => 'Firefly III jelszó visszaállítása',
     'cannot_reset_demo_user'                     => 'A bemutató felhasználónak nem nem lehet visszaállítani a jelszavát.',
+    'no_att_demo_user'                           => 'Demo felhasználó nem tölthet fel csatolmányokat.',
     'button_register'                            => 'Regisztráció',
     'authorization'                              => 'Hitelesítés',
     'active_bills_only'                          => 'csak az aktív számlák',
     'active_exp_bills_only'                      => 'csak az aktív és a várható számlák',
     'average_per_bill'                           => 'számlánkénti átlag',
     'expected_total'                             => 'várható teljes összeg',
-    'reconciliation_account_name'                => ':name egyeztetés',
+    'reconciliation_account_name'                => ':name egyeztetés (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version engedély kérelem',
     'authorization_request_intro'                => '<strong>:client</strong> hozzáférést kért az Ön pénzügyi adminisztrációjához. Szeretne hozzáférést ezekhez adatokhoz <strong>:client</strong> részére?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Hiba történt a frissítések ellenőrzése közben: :error',
     'unknown_error'                              => 'Ismeretlen hiba. Elnézést kérünk.',
     'just_new_release'                           => 'Új verzió érhető el! :version verzió ekkor került kiadásra: :date. Ez a verzió nagyon friss. Érdemes néhány napot várni amíg az új kiadás stabilizálódik.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Frissítési csatorna',
     'admin_update_channel_explain'               => 'A Firefly III-hoz három frissítési csatorna létezik, melyek meghatározzák, hogy a felhasználók mennyivel járnak előbbre a funkciók, fejlesztések és hibák szempontjából. A kalandvágyók használhatják a "beta" csatornát, míg azok akik szeretnek veszélyesen élni az "alpha"-t.',
     'update_channel_stable'                      => 'Stabil. Mindennek az elvártnak megfelelően kell működnie.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Leírás tartalmazza: ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'A leírás pontosan..',
     'rule_trigger_description_is'                => 'Leírás: ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'A költségkeret..',
     'rule_trigger_budget_is'                     => 'Költségkeret: ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'A címke..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Megjegyzések kezdetén ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Megjegyzések a végén..',
     'rule_trigger_notes_end'                     => 'Megjegyzések végén ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Kategória beállítása ":action_value"',
     'rule_action_clear_category'                 => 'Kategória törlése',
     'rule_action_set_budget'                     => 'Költségvetés beállítása: ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Címke eltávolítása..',
     'rule_action_remove_all_tags_choice'         => 'Minden címke eltávolítása',
     'rule_action_set_description_choice'         => 'Leírás megadása..',
+    'rule_action_update_piggy_choice'            => 'Tranzakcióösszeg hozzáadása/törlése a malacperselyből.',
+    'rule_action_update_piggy'                   => 'Tranzakcióösszeg hozzáadása/törlése a malacperselyből ":action_value"',
     'rule_action_append_description_choice'      => 'Hozzáfűzés a leíráshoz..',
     'rule_action_prepend_description_choice'     => 'Hozzáfűzés a leírás elejéhez..',
-    'rule_action_set_source_account_choice'      => 'Forrásszámla beállítása...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Forrásfiók beállítása :action_value',
-    'rule_action_set_destination_account_choice' => 'Célszámla beállítása...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Célfiók beállítása :action_value',
     'rule_action_append_notes_choice'            => 'Hozzáfűzés a jegyzetekhez..',
     'rule_action_append_notes'                   => 'Hozzáfűzés a jegyzetekhez ":action_value"',
@@ -541,8 +556,9 @@ return [
     'pref_locale'                     => 'Területi beállítások',
     'pref_languages_help'             => 'A Firefly III több nyelven is elérhető. Melyiket szeretné használni?',
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
-    'pref_locale_no_windows'          => 'This feature may not work on Windows.',
-    'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_windows'          => 'Lehet, hogy ez a szolgáltatás nem működik Windows rendszeren.',
+    'pref_locale_no_docker'           => 'A Docker-képfájlnak kevés előretelepített regionális beállítása van.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Költségvetési év beállításai',
     'pref_custom_fiscal_year_label'   => 'Engedélyezett',
     'pref_custom_fiscal_year_help'    => 'Azokban az országokban ahol a pénzügyi év nem Január 1 és December 31 közé esik, be lehet ezt kapcsolni és meg lehet adni a pénzügyi év kezdő- és végdátumát',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Beállítások',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Teljes elérhető költségkeret (:start és :end között)',
     'total_available_budget_in_currency'        => 'Teljes elérhető költségkeret :currency pénznemben',
     'see_below'                                 => 'lásd lentebb',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Egyeztetés (:from - :to)',
     'sum_of_reconciliation'                     => 'Egyeztetés összege',
     'reconcile_this_account'                    => 'Számla egyeztetése',
+    'reconcile'                                 => 'Egyeztetés',
+    'show'                                      => 'Mutat',
     'confirm_reconciliation'                    => 'Számla megerősítése',
     'submitted_start_balance'                   => 'Beküldött kezdő egyenleg',
     'selected_transactions'                     => 'Kiválasztott tranzakciók (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Nem lehet letárolni a tranzakciót. Ellenőrizni kell a naplófájlokat.',
     'attachment_not_found'                      => 'Ez a melléklet nem található.',
     'journal_link_bill'                         => 'Ez a tranzakció <a href=":route">:name</a> számlához van csatolva. A kapcsolat eltávolításához ki kell venni a jelölést a jelölőnégyzetből. Szabályok használatával másik számlához lehet csatolni.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Üdvözöli a Firefly III!',
@@ -1132,11 +1154,11 @@ return [
     'interest_period_help'                      => 'Ez kizárólag kozmetikázásra használt mező, nem fog a számláláshoz hozzáadódni. Mint kiderült, a bankok néha sunyik és Firefly III tévedhet.',
     'store_new_liabilities_account'             => 'Új kötelezettség eltárolása',
     'edit_liabilities_account'                  => '":name" kötelezettség szerkesztése',
-    'financial_control'                         => 'Financial control',
-    'accounting'                                => 'Accounting',
-    'automation'                                => 'Automation',
-    'others'                                    => 'Others',
-    'classification'                            => 'Classification',
+    'financial_control'                         => 'Pénzügyi felügyelet',
+    'accounting'                                => 'Számlázás',
+    'automation'                                => 'Automatizálás',
+    'others'                                    => 'Egyebek',
+    'classification'                            => 'Besorolás',
 
     // reports:
     'report_default'                            => 'Alapértelmezett pénzügyi jelentés :start és :end között',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Ismétlődő tranzakciók',
+    'repeat_until_in_past'                  => 'Ez a rendszeres tranzakció leállt ekkor: :date.',
     'recurring_calendar_view'               => 'Naptár',
     'no_recurring_title_default'            => 'Hozzunk létre egy ismétlődő tranzakciót!',
     'no_recurring_intro_default'            => 'Még nincsenek ismétlődő tranzakciók. Ezek használatával a Firefly III automatikusan létrehozza a tranzakciókat.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Vissza a telemetria kezdőoldalra',
     'not_yet_submitted'                  => 'Nem beküldött',
     'telemetry_type_feature'             => 'Funkciókapcsoló',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Bejegyzések beküldése',
     'telemetry_delete_submitted_records' => 'Beküldött bejegyzések törlése',
     'telemetry_submission_executed'      => 'A bejegyzések beküldve. További információ a naplófájlokban található.',

resources/lang/id_ID/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Buat barang baru',
     'new_withdrawal'                             => 'Penarikan baru',
     'create_new_transaction'                     => 'Membuat transaksi baru',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Transaksi baru',
     'no_rules_for_bill'                          => 'Tagihan ini tidak terkait dengan aturan yang telah ada.',
     'go_to_asset_accounts'                       => 'Menampilkan rekening aset',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Forgot your password for Firefly III',
     'reset_pw_page_title'                        => 'Reset your password for Firefly III',
     'cannot_reset_demo_user'                     => 'You cannot reset the password of the demo user.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Register',
     'authorization'                              => 'Authorization',
     'active_bills_only'                          => 'active bills only',
     'active_exp_bills_only'                      => 'active and expected bills only',
     'average_per_bill'                           => 'average per bill',
     'expected_total'                             => 'expected total',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Authorization Request',
     'authorization_request_intro'                => '<strong>:client</strong> is requesting permission to access your financial administration. Would you like to authorize <strong>:client</strong> to access these records?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Deskripsi berisi ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Deskripsi adalah..',
     'rule_trigger_description_is'                => 'Deskripsi adalah ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Anggaran adalah..',
     'rule_trigger_budget_is'                     => 'Anggaran adalah ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag adalah..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Catatan dimulai dengan ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Catatan diakhiri dengan..',
     'rule_trigger_notes_end'                     => 'Catatan diakhiri dengan ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Tetapkan kategori ke ":action_value"',
     'rule_action_clear_category'                 => 'Kategori yang jelas',
     'rule_action_set_budget'                     => 'Tetapkan anggaran ke ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Hapus tanda..',
     'rule_action_remove_all_tags_choice'         => 'Hapus semua tag',
     'rule_action_set_description_choice'         => 'Setel deskripsi ke..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Tambahkan deskripsi dengan..',
     'rule_action_prepend_description_choice'     => 'Tambahkan deskripsi dengan..',
-    'rule_action_set_source_account_choice'      => 'Tetapkan akun sumber ke...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Tetapkan akun sumber ke :action_value',
-    'rule_action_set_destination_account_choice' => 'Tetapkan akun tujuan ke...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Tetapkan akun tujuan ke :action_value',
     'rule_action_append_notes_choice'            => 'Tambahkan catatan dengan..',
     'rule_action_append_notes'                   => 'Tambahkan catatan dengan ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Pengaturan tahun fiskal',
     'pref_custom_fiscal_year_label'   => 'Diaktifkan',
     'pref_custom_fiscal_year_help'    => 'Di negara-negara yang menggunakan tahun keuangan selain 1 Januari sampai 31 Desember, Anda dapat mengaktifkannya dan menentukan hari-hari awal / akhir dari tahun fiskal',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Pilihan',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => 'Rekonsiliasi akun ini',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Konfirmasikan rekonsiliasi',
     'submitted_start_balance'                   => 'Saldo awal yang dikirim',
     'selected_transactions'                     => 'Transaksi yang dipilih (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Could not store the transaction. Please check the log files.',
     'attachment_not_found'                      => 'This attachment could not be found.',
     'journal_link_bill'                         => 'This transaction is linked to bill <a href=":route">:name</a>. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Welcome to Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Recurring transactions',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Let\'s create a recurring transaction!',
     'no_recurring_intro_default'            => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/it_IT/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Crea nuove cose',
     'new_withdrawal'                             => 'Nuova uscita',
     'create_new_transaction'                     => 'Crea nuova transazione',
+    'sidebar_frontpage_create'                   => 'Crea',
     'new_transaction'                            => 'Nuova transazione',
     'no_rules_for_bill'                          => 'Questa bolletta non ha regole ad essa associate.',
     'go_to_asset_accounts'                       => 'Visualizza i tuoi conti attività',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Hai dimenticato la password per Firefly III',
     'reset_pw_page_title'                        => 'Reimposta la password per Firefly III',
     'cannot_reset_demo_user'                     => 'Non puoi reimpostare la password dell\'utente demo.',
+    'no_att_demo_user'                           => 'L\'utente demo non può caricare allegati.',
     'button_register'                            => 'Registrare',
     'authorization'                              => 'Autorizzazione',
     'active_bills_only'                          => 'solo bollette attive',
     'active_exp_bills_only'                      => 'solo bollette attive e previste',
     'average_per_bill'                           => 'media per bolletta',
     'expected_total'                             => 'totale previsto',
-    'reconciliation_account_name'                => 'Riconciliazione di :name',
+    'reconciliation_account_name'                => ':name riconciliazione (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Richiesta Autorizzazione',
     'authorization_request_intro'                => '<strong>:client</strong> sta richiedendo l\'autorizzazione per accedere alla tua amministrazione finanziaria. Desideri autorizzare <strong>:client</strong> ad accedere a questi record?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Si è verificato un errore durante il controllo degli aggiornamenti: :error',
     'unknown_error'                              => 'Errore sconosciuto. Siamo spiacenti.',
     'just_new_release'                           => 'Una nuova versione è disponibile! La versione :version è stata rilasciata :date. Questa versione è molto recente. Attendi qualche giorno affinché la nuova versione venga considerata stabile.',
+    'disabled_but_check'                         => 'Hai disabilitato il controllo degli aggiornamenti. Quindi non dimenticarti di controllare gli aggiornamenti di tanto in tanto. Grazie!',
     'admin_update_channel_title'                 => 'Canale di aggiornamento',
     'admin_update_channel_explain'               => 'Firefly III dispone di tre "canali" di aggiornamento che indicano quanto avanti ti trovi in termini di funzionalità, miglioramenti e bug. Usa il canale "beta" se sei avventuroso e quello "alpha" se vuoi vivere pericolosamente.',
     'update_channel_stable'                      => 'Stabile. Tutto dovrebbe funzionare come previsto.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'La descrizione contiene ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'La descrizione è...',
     'rule_trigger_description_is'                => 'La descrizione è ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'La data della transazione è...',
+    'rule_trigger_date_is'                       => 'La data della transazione è ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'La data della transazione è antecedente al...',
+    'rule_trigger_date_before'                   => 'La data della transazione è antecedente al ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'La data della transazione è successiva al...',
+    'rule_trigger_date_after'                    => 'La data della transazione è successiva al ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Il budget è...',
     'rule_trigger_budget_is'                     => 'Il budget è ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Un tag è...',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Le note iniziano con ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Le note finiscono con...',
     'rule_trigger_notes_end'                     => 'Le note finiscono con ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'ELIMINA transazione (!)',
+    'rule_action_delete_transaction'             => 'ELIMINA transazione (!)',
     'rule_action_set_category'                   => 'Imposta categoria a ":action_value"',
     'rule_action_clear_category'                 => 'Rimuovi dalla categoria',
     'rule_action_set_budget'                     => 'Imposta il budget su ":action_value"',
@@ -471,6 +484,8 @@ return [
     'rule_action_remove_tag_choice'              => 'Rimuovi l\'etichetta...',
     'rule_action_remove_all_tags_choice'         => 'Rimuovi tutte le etichette',
     'rule_action_set_description_choice'         => 'Imposta come descrizione...',
+    'rule_action_update_piggy_choice'            => 'Aggiungi/rimuovi l\'importo della transazione nel salvadanaio..',
+    'rule_action_update_piggy'                   => 'Aggiungi/rimuovi l\'importo della transazione nel salvadanaio ":action_value"',
     'rule_action_append_description_choice'      => 'Aggiungi alla descrizione...',
     'rule_action_prepend_description_choice'     => 'Anteponi alla descrizione...',
     'rule_action_set_source_account_choice'      => 'Imposta come conto di origine...',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III ti permette di impostare altre impostazioni regionali, come la formattazione delle valute, dei numeri e delle date. Le voci in questa lista potrebbero non essere supportate dal tuo sistema. Firefly III non ha le corrette impostazioni di data per ogni regione; contattami per ulteriori miglioramenti.',
     'pref_locale_no_windows'          => 'Questa funzionalità potrebbe non funzionare su Windows.',
     'pref_locale_no_docker'           => 'L\'immagine Docker ha solo un piccolo insieme di localizzazioni installate.',
+    'pref_locale_no_demo'             => 'Questa funzionalità non è disponibile per l\'utente demo.',
     'pref_custom_fiscal_year'         => 'Impostazioni anno fiscale',
     'pref_custom_fiscal_year_label'   => 'Abilita',
     'pref_custom_fiscal_year_help'    => 'Nei paesi che utilizzano un anno finanziario che non va dal 1 gennaio al 31 dicembre, è possibile attivare questa opzione e specificare i giorni di inizio / fine dell\'anno fiscale',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opzioni',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Questo importo si applica da :start a :end.',
     'total_available_budget'                    => 'Budget totale disponibile (tra :start e :end)',
     'total_available_budget_in_currency'        => 'Budget totale disponibile in :currency',
     'see_below'                                 => 'vedi sotto',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Riconciliazione (:from - :to)',
     'sum_of_reconciliation'                     => 'Somma riconciliazione',
     'reconcile_this_account'                    => 'Riconcilia questo conto',
+    'reconcile'                                 => 'Riconcilia',
+    'show'                                      => 'Mostra',
     'confirm_reconciliation'                    => 'Conferma riconciliazione',
     'submitted_start_balance'                   => 'Saldo iniziale inserito',
     'selected_transactions'                     => 'Transazioni selezionate (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Impossibile memorizzare la transazione. Controllare i file di log.',
     'attachment_not_found'                      => 'Impossibile trovare questo allegato.',
     'journal_link_bill'                         => 'Questa transazione è collegata alla bolletta <a href=":route">:name</a>. Per rimuovere il collegamento, deseleziona la casella di controllo. Usa le regole per collegarla ad un\'altra bolletta.',
+    'transaction_stored_link'                   => 'La <a href="transactions/show/{ID}">transazione #{ID} ("{title}")</a> è stata salvata.',
+    'transaction_new_stored_link'               => 'La <a href="transactions/show/{ID}">transazione #{ID}</a> è stata salvata.',
+    'transaction_updated_link'                  => 'La <a href="transactions/show/{ID}">transazione #{ID}</a> è stata aggiornata.',
 
     // new user:
     'welcome'                                   => 'Benvenuto in Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Transazioni ricorrenti',
+    'repeat_until_in_past'                  => 'Questa transazione ricorrente ha smesso di ripetersi il :date.',
     'recurring_calendar_view'               => 'Calendario',
     'no_recurring_title_default'            => 'Creiamo una transazione ricorrente!',
     'no_recurring_intro_default'            => 'Non hai ancora una transazione ricorrente. Puoi utilizzare queste per lasciare che Firefly III crei automaticamente le transazioni per te.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Torna all\'indice della telemetria',
     'not_yet_submitted'                  => 'Non ancora inviata',
     'telemetry_type_feature'             => 'Indicatore funzionalità',
+    'telemetry_type_string'              => 'Testo',
+    'telemetry_type_recurring'           => 'Ricorrente',
     'telemetry_submit_all'               => 'Invia dati',
     'telemetry_delete_submitted_records' => 'Elimina i dati inviati',
     'telemetry_submission_executed'      => 'I dati sono stati inviati. Controlla i file di log per maggiori informazioni.',

resources/lang/nb_NO/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Lag nye ting',
     'new_withdrawal'                             => 'Nytt uttak',
     'create_new_transaction'                     => 'Opprett ny transaksjon',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'New transaction',
     'no_rules_for_bill'                          => 'This bill has no rules associated to it.',
     'go_to_asset_accounts'                       => 'Se aktivakontoene dine',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Glemt passord for Firefly III',
     'reset_pw_page_title'                        => 'Nullstill passord for Firefly III',
     'cannot_reset_demo_user'                     => 'Du kan ikke nustille passordet til demo bruker.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Registrer',
     'authorization'                              => 'Autorisasjon',
     'active_bills_only'                          => 'kun aktive regninger',
     'active_exp_bills_only'                      => 'active and expected bills only',
     'average_per_bill'                           => 'gjennomsnitt per regning',
     'expected_total'                             => 'forventet totalt',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version autorisasjonsforespørsel',
     'authorization_request_intro'                => '<strong>:client</strong> ber om tillatelse til å få tilgang til finansadministrasjonen din. Vil du autorisere <strong>:client</strong> slik at den får tilgang til disse dine data?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Beskrivelse inneholder ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Beskrivelse er..',
     'rule_trigger_description_is'                => 'Beskrivelse er ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budsjett er..',
     'rule_trigger_budget_is'                     => 'Budsjett er ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(En) tagg er..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notat som starter med ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notat som slutter med..',
     'rule_trigger_notes_end'                     => 'Notat som slutter med ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Sett kategori til ":action_value"',
     'rule_action_clear_category'                 => 'Tøm kategori',
     'rule_action_set_budget'                     => 'Sett budsjett til ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Fjern tagg..',
     'rule_action_remove_all_tags_choice'         => 'Fjern alle tagger',
     'rule_action_set_description_choice'         => 'Sett beskrivelse til..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Legg til etter beskrivelse..',
     'rule_action_prepend_description_choice'     => 'Legg til foran beskrivelse..',
-    'rule_action_set_source_account_choice'      => 'Sett kildekonto til...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Sett kildekonto til :action_value',
-    'rule_action_set_destination_account_choice' => 'Sett målkonto til...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Sett målkonto til :action_value',
     'rule_action_append_notes_choice'            => 'Legg til notater med..',
     'rule_action_append_notes'                   => 'Legg til notater med ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Innstillinger for regnskapsår',
     'pref_custom_fiscal_year_label'   => 'Aktivert',
     'pref_custom_fiscal_year_help'    => 'I land som bruker et annet regnskapsår enn 1. januar til 31. desember, kan du slå på dette og angi start- og sluttdager for regnskapsåret',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Alternativer',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => 'Avstem denne kontoen',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Bekreft avstemming',
     'submitted_start_balance'                   => 'Innsendt startsaldo',
     'selected_transactions'                     => 'Valgte transaksjoner (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Kunne ikke lagre transaksjonen. Vennligst sjekk loggfilene.',
     'attachment_not_found'                      => 'Finner ikke dette vedlegget.',
     'journal_link_bill'                         => 'Denne transaksjonen er knyttet til regning <a href=":route">:name</a>. Hvis du vil fjerne knytningen, fjerner du avmerkingen. Bruke regler for å koble den til en annen regning.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Velkommen til Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Gjentakende transaksjoner',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Kalender',
     'no_recurring_title_default'            => 'La oss opprette en gjentakende transaksjon!',
     'no_recurring_intro_default'            => 'Du har ingen gjentakende transaksjoner ennå. Du kan bruke disse for å få Firefly III til å automatisk opprette transaksjoner for deg.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/nl_NL/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Nieuw',
     'new_withdrawal'                             => 'Nieuwe uitgave',
     'create_new_transaction'                     => 'Maak nieuwe transactie',
+    'sidebar_frontpage_create'                   => 'Maak',
     'new_transaction'                            => 'Nieuwe transactie',
     'no_rules_for_bill'                          => 'Dit contract heeft geen regels.',
     'go_to_asset_accounts'                       => 'Bekijk je betaalrekeningen',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Je wachtwoord voor Firefly III vergeten',
     'reset_pw_page_title'                        => 'Reset je Firefly III wachtwoord',
     'cannot_reset_demo_user'                     => 'Je kan het wachtwoord van de demo-gebruiker niet resetten.',
+    'no_att_demo_user'                           => 'De demo user kan niks uploaden.',
     'button_register'                            => 'Registreren',
     'authorization'                              => 'Toestemming',
     'active_bills_only'                          => 'alleen actieve contracten',
     'active_exp_bills_only'                      => 'alleen actieve en verwachte contracten',
     'average_per_bill'                           => 'gemiddeld per contract',
     'expected_total'                             => 'verwacht totaal',
-    'reconciliation_account_name'                => ':name afstemmingsrekening',
+    'reconciliation_account_name'                => ':name afstemming (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version autorisatieverzoek',
     'authorization_request_intro'                => '<strong>:client</strong> vraagt ​​toestemming om toegang te krijgen tot je financiële administratie. Wil je <strong>:client</strong> autoriseren om toegang te krijgen tot je gegevens?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Er is een fout opgetreden bij het controleren op updates: :error',
     'unknown_error'                              => 'Onbekende fout. Sorry.',
     'just_new_release'                           => 'Er is een nieuwe versie beschikbaar! Versie :version werd uitgebracht :date. Deze is pas net uit. Wacht een paar dagen om er zeker van te zijn dat de versie stabiel is.',
+    'disabled_but_check'                         => 'Je hebt de update-controle uitgeschakeld. Vergeet dus niet zo nu en dan zelf te controleren op updates. Bedankt!',
     'admin_update_channel_title'                 => 'Updatekanaal',
     'admin_update_channel_explain'               => 'Firefly III heeft drie "kanalen" die bepalen of en hoever je voorloopt als het gaat om features, wijzigingen en bugs. Gebruik het "beta"-kanaal als je een avontuurlijke bui hebt en gebruik het "alpha" kanaal als je ook graag met krokodillen zwemt.',
     'update_channel_stable'                      => 'Stabiel. Zou allemaal goed moeten gaan.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Omschrijving bevat ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Omschrijving is..',
     'rule_trigger_description_is'                => 'Omschrijving is ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transactiedatum is..',
+    'rule_trigger_date_is'                       => 'Transactiedatum is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transactiedatum is vóór..',
+    'rule_trigger_date_before'                   => 'Transactiedatum is vóór ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transactiedatum is na..',
+    'rule_trigger_date_after'                    => 'Transactiedatum is na ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budget is..',
     'rule_trigger_budget_is'                     => 'Budget is ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(Een) tag is..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notitie begint met ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notitie eindigt op..',
     'rule_trigger_notes_end'                     => 'Notitie eindigt op ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'VERWIJDER transactie (!)',
+    'rule_action_delete_transaction'             => 'VERWIJDER transactie (!)',
     'rule_action_set_category'                   => 'Verander categorie naar ":action_value"',
     'rule_action_clear_category'                 => 'Maak categorie-veld leeg',
     'rule_action_set_budget'                     => 'Sla op onder budget ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Haal tag weg..',
     'rule_action_remove_all_tags_choice'         => 'Haal alle tags weg',
     'rule_action_set_description_choice'         => 'Geef omschrijving..',
+    'rule_action_update_piggy_choice'            => 'Bedrag +/- bij spaarpotje..',
+    'rule_action_update_piggy'                   => 'Bedrag +/- bij spaarpotje ":action_value"',
     'rule_action_append_description_choice'      => 'Zet .. achter de omschrijving',
     'rule_action_prepend_description_choice'     => 'Zet .. voor de omschrijving',
-    'rule_action_set_source_account_choice'      => 'Verander bronrekening naar...',
+    'rule_action_set_source_account_choice'      => 'Verander bronrekening naar..',
     'rule_action_set_source_account'             => 'Verander bronrekening naar ":action_value"',
-    'rule_action_set_destination_account_choice' => 'Verander doelrekening naar...',
+    'rule_action_set_destination_account_choice' => 'Verander doelrekening naar..',
     'rule_action_set_destination_account'        => 'Verander doelrekening naar ":action_value"',
     'rule_action_append_notes_choice'            => 'Vul notitie aan met..',
     'rule_action_append_notes'                   => 'Vul notitie aan met ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III kan andere lokale instellingen gebruiken, die bepalen hoe valuta, nummers en datums worden weergegeven. De lijst hieronder is compleet maar niet alles wordt ondersteund door jouw systeem. Het kan zijn dat Firefly III bepaalde lokale instellingen niet lekker weergeeft; neem dan contact met me op.',
     'pref_locale_no_windows'          => 'Deze functie werkt mogelijk niet op Windows.',
     'pref_locale_no_docker'           => 'Het Docker image heeft maar een paar geïnstalleerde locales.',
+    'pref_locale_no_demo'             => 'Deze functie werkt niet voor de demo-gebruiker.',
     'pref_custom_fiscal_year'         => 'Instellingen voor boekjaar',
     'pref_custom_fiscal_year_label'   => 'Ingeschakeld',
     'pref_custom_fiscal_year_help'    => 'Voor in landen die een boekjaar gebruiken anders dan 1 januari tot 31 december',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opties',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Dit bedrag is van toepassing op :start tot :end.',
     'total_available_budget'                    => 'Totaal beschikbare budget (tussen :start en :end)',
     'total_available_budget_in_currency'        => 'Totaal beschikbare budget in :currency',
     'see_below'                                 => 'zie onder',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Afstemming (:from tot :to)',
     'sum_of_reconciliation'                     => 'Som van afstemming',
     'reconcile_this_account'                    => 'Stem deze rekening af',
+    'reconcile'                                 => 'Afstemmen',
+    'show'                                      => 'Bekijken',
     'confirm_reconciliation'                    => 'Bevestig afstemming',
     'submitted_start_balance'                   => 'Ingevoerd startsaldo',
     'selected_transactions'                     => 'Geselecteerde transacties (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Kon de transactie niet opslaan. Kijk in de logbestanden.',
     'attachment_not_found'                      => 'Deze bijlage kon niet gevonden worden.',
     'journal_link_bill'                         => 'Deze transactie is gekoppeld aan contract <a href=":route">:name</a>. Om de verbinding te verwijderen haal je het vinkje weg. Gebruik regels om een ander contract te koppelen.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transactie #{ID} ("{title}")</a> is opgeslagen.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transactie #{ID}</a> is opgeslagen.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transactie #{ID}</a> is geüpdatet.',
 
     // new user:
     'welcome'                                   => 'Welkom bij Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Periodieke transacties',
+    'repeat_until_in_past'                  => 'Deze periodieke transactie stopte met herhalen op :date.',
     'recurring_calendar_view'               => 'Kalender',
     'no_recurring_title_default'            => 'Maak een periodieke transactie!',
     'no_recurring_intro_default'            => 'Je hebt nog geen periodieke transacties. Je kan deze gebruiken om er voor te zorgen dat Firefly III automatisch nieuwe transacties voor je maakt.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Terug naar telemetrie-index',
     'not_yet_submitted'                  => 'Nog niet verstuurd',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Tekst',
+    'telemetry_type_recurring'           => 'Herhalend',
     'telemetry_submit_all'               => 'Verstuur records',
     'telemetry_delete_submitted_records' => 'Verwijder verstuurde records',
     'telemetry_submission_executed'      => 'Records zijn verstuurd. Check je log files voor meer info.',

resources/lang/pl_PL/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Utwórz nowe rzeczy',
     'new_withdrawal'                             => 'Nowa wypłata',
     'create_new_transaction'                     => 'Stwórz nową transakcję',
+    'sidebar_frontpage_create'                   => 'Utwórz',
     'new_transaction'                            => 'Nowa transakcja',
     'no_rules_for_bill'                          => 'Ten rachunek nie ma przypisanych reguł.',
     'go_to_asset_accounts'                       => 'Zobacz swoje konta aktywów',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Nie pamiętam hasła do Firefly III',
     'reset_pw_page_title'                        => 'Resetowanie hasła do Firefly III',
     'cannot_reset_demo_user'                     => 'Nie można zresetować hasła dla użytkownika demonstracyjnego.',
+    'no_att_demo_user'                           => 'Użytkownik demonstracyjny nie może przesyłać załączników.',
     'button_register'                            => 'Zarejestruj',
     'authorization'                              => 'Autoryzacja',
     'active_bills_only'                          => 'tylko aktywne rachunki',
     'active_exp_bills_only'                      => 'tylko aktywne i oczekiwane rachunki',
     'average_per_bill'                           => 'średnia za rachunek',
     'expected_total'                             => 'oczekiwana suma',
-    'reconciliation_account_name'                => 'Uzgodnienie :name',
+    'reconciliation_account_name'                => 'Uzgadnianie :name (:currency)',
     // API access
     'authorization_request'                      => 'Żądanie autoryzacji Firefly III v:version',
     'authorization_request_intro'                => '<strong>:client</strong> prosi o pozwolenie na dostęp do Twojej administracji finansowej. Czy chcesz pozwolić <strong>:client</strong> na dostęp do tych danych?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Wystąpił błąd podczas sprawdzania aktualizacji :error',
     'unknown_error'                              => 'Nieznany błąd. Przepraszamy za to.',
     'just_new_release'                           => 'Dostępna jest nowa wersja! Wersja :version została wydana :date. To wydanie jest bardzo świeże. Poczekaj kilka dni na stabilizację nowej wersji.',
+    'disabled_but_check'                         => 'Wyłączyłeś sprawdzanie aktualizacji. Więc nie zapomnij sprawdzać aktualizacji osobiście od czasu do czasu. Dziękujemy!',
     'admin_update_channel_title'                 => 'Kanał aktualizacji',
     'admin_update_channel_explain'               => 'Firefly III posiada trzy "kanały", które decydują jak wczesnej pod względem funkcji, ulepszeń i błędów wersji używasz. Użyj kanału "beta", jeśli lubisz przygody i "alfa", gdy lubisz żyć niebezpiecznie.',
     'update_channel_stable'                      => 'Stabilne. Wszystko powinno działać zgodnie z oczekiwaniami.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Opis zawiera ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Opis to..',
     'rule_trigger_description_is'                => 'Opis to ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Daty transakcji to..',
+    'rule_trigger_date_is'                       => 'Data transakcji to ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Data transakcji jest przed..',
+    'rule_trigger_date_before'                   => 'Data transakcji jest przed ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Data transakcji jest po..',
+    'rule_trigger_date_after'                    => 'Data transakcji jest po ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budżet to..',
     'rule_trigger_budget_is'                     => 'Budżet to ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Tag to..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notatki zaczynają się od ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notatki kończą się na..',
     'rule_trigger_notes_end'                     => 'Notatki kończą się na ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'USUŃ transakcję (!)',
+    'rule_action_delete_transaction'             => 'USUŃ transakcję (!)',
     'rule_action_set_category'                   => 'Ustaw kategorię na ":action_value"',
     'rule_action_clear_category'                 => 'Wyczyść kategorię',
     'rule_action_set_budget'                     => 'Ustaw budżet na ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Usuń tag..',
     'rule_action_remove_all_tags_choice'         => 'Usuń wszystkie tagi',
     'rule_action_set_description_choice'         => 'Ustaw opis na..',
+    'rule_action_update_piggy_choice'            => 'Dodaj/usuń kwotę transakcji w skarbonce.',
+    'rule_action_update_piggy'                   => 'Dodaj/usuń kwotę transakcji w skarbonce ":action_value"',
     'rule_action_append_description_choice'      => 'Dołącz do opisu..',
     'rule_action_prepend_description_choice'     => 'Poprzedź opis..',
-    'rule_action_set_source_account_choice'      => 'Ustaw konto źródłowe na...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Ustaw konto źródłowe na :action_value',
-    'rule_action_set_destination_account_choice' => 'Ustaw konto docelowe na...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Ustaw konto docelowe na :action_value',
     'rule_action_append_notes_choice'            => 'Dołącz do notatek..',
     'rule_action_append_notes'                   => 'Dołącz do notatek wartość ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III pozwala na ustawienie innych ustawień lokalnych, takich jak formatowanie walut, liczb i dat. Wpisy na tej liście mogą nie być obsługiwane przez Twój system. Firefly III nie ma poprawnych ustawień daty dla każdego miejsca; skontaktuj się ze mną, abym mógł to ulepszyć.',
     'pref_locale_no_windows'          => 'Ta funkcja może nie działać w systemie Windows.',
     'pref_locale_no_docker'           => 'Obraz Dockera ma zainstalowany tylko mały zestaw wersji lokalnych.',
+    'pref_locale_no_demo'             => 'Ta funkcja nie zadziała dla użytkownika demonstracyjnego.',
     'pref_custom_fiscal_year'         => 'Ustawienia roku podatkowego',
     'pref_custom_fiscal_year_label'   => 'Włączone',
     'pref_custom_fiscal_year_help'    => 'W krajach, w których rok podatkowy nie zaczyna się 1 stycznia i nie kończy 31 grudnia, możesz włączyć tą opcję oraz podać początek / koniec roku podatkowego',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opcje',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Ta kwota dotyczy okresu od :start do :end.',
     'total_available_budget'                    => 'Dostępny budżet (pomiędzy :start i :end)',
     'total_available_budget_in_currency'        => 'Dostępny budżet w :currency',
     'see_below'                                 => 'zobacz poniżej',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Rozrachunek (od :from do :to)',
     'sum_of_reconciliation'                     => 'Suma rozrachunku',
     'reconcile_this_account'                    => 'Uzgodnij to konto',
+    'reconcile'                                 => 'Uzgodnij',
+    'show'                                      => 'Pokaż',
     'confirm_reconciliation'                    => 'Potwierdź rozrachunek',
     'submitted_start_balance'                   => 'Przesłane saldo początkowe',
     'selected_transactions'                     => 'Wybrane transakcje (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Nie można zapisać transakcji. Sprawdź pliki dziennika.',
     'attachment_not_found'                      => 'Nie udało się znaleźć tego załącznika.',
     'journal_link_bill'                         => 'Ta transakcja jest powiązana z rachunkiem <a href=":route">:name</a>. Aby usunąć to powiązanie odznacz pole wyboru. Użyj reguł aby połączyć ją z innym rachunkiem.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transakcja #{ID} ("{title}")</a> została zapisana.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transakcja #{ID}</a> została zapisana.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transakcja #{ID}</a> została zaktualizowana.',
 
     // new user:
     'welcome'                                   => 'Witaj w Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Cykliczne transakcje',
+    'repeat_until_in_past'                  => 'Ta cykliczna transakcja przestała powtarzać się w dniu :date.',
     'recurring_calendar_view'               => 'Kalendarz',
     'no_recurring_title_default'            => 'Utwórzmy cykliczną transakcję!',
     'no_recurring_intro_default'            => 'Nie masz jeszcze żadnych cyklicznych transakcji. Możesz ich użyć, aby Firefly III automatycznie tworzył transakcje za Ciebie.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Powrót do indeksu telemetrii',
     'not_yet_submitted'                  => 'Jeszcze nie wysłano',
     'telemetry_type_feature'             => 'Flaga funkcji',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Powtarzające się',
     'telemetry_submit_all'               => 'Prześlij rekordy',
     'telemetry_delete_submitted_records' => 'Usuń przesłane rekordy',
     'telemetry_submission_executed'      => 'Rekordy zostały wysłane. Sprawdź pliki dziennika, aby uzyskać więcej informacji.',

resources/lang/pt_BR/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Criar novas coisas',
     'new_withdrawal'                             => 'Nova retirada',
     'create_new_transaction'                     => 'Criar nova transação',
+    'sidebar_frontpage_create'                   => 'Criar',
     'new_transaction'                            => 'Nova transação',
     'no_rules_for_bill'                          => 'Esta conta não tem regras associadas a ela.',
     'go_to_asset_accounts'                       => 'Veja suas contas ativas',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Esqueceu sua senha do Firefly III',
     'reset_pw_page_title'                        => 'Redefinir sua senha para Firefly III',
     'cannot_reset_demo_user'                     => 'Você não pode redefinir a senha do usuário demo.',
+    'no_att_demo_user'                           => 'O usuário de demonstração não pode enviar anexos.',
     'button_register'                            => 'Registrar',
     'authorization'                              => 'Autorização',
     'active_bills_only'                          => 'apenas faturas ativas',
     'active_exp_bills_only'                      => 'somente faturas ativas e esperadas',
     'average_per_bill'                           => 'média por fatura',
     'expected_total'                             => 'total esperado',
-    'reconciliation_account_name'                => ':name reconciliação',
+    'reconciliation_account_name'                => 'Reconciliação :name (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Pedido de autorização',
     'authorization_request_intro'                => '<strong>:client</strong> está pedindo permissão para acessar sua administração financeira. Gostaria de autorizar <strong>:client</strong> para acessar esses registros?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Ocorreu um erro durante a verificação de atualizações: :error',
     'unknown_error'                              => 'Erro desconhecido. Desculpe por isso.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'Você desativou a verificação de atualizações. Então, não se esqueça de verificar se há atualizações de vez em quando. Obrigado!',
     'admin_update_channel_title'                 => 'Atualizar canal',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Descrição contém ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Descrição é..',
     'rule_trigger_description_is'                => 'Descrição é ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'A data da transação é...',
+    'rule_trigger_date_is'                       => 'A data da transação é ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'A data da transação é anterior a...',
+    'rule_trigger_date_before'                   => 'A data da transação é anterior a ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'A data da transação é posterior a...',
+    'rule_trigger_date_after'                    => 'A data da transação é posterior a ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'O orçamento é..',
     'rule_trigger_budget_is'                     => 'O orçamento é ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) tag é..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'As notas começam com ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'As notas terminam com..',
     'rule_trigger_notes_end'                     => 'Notas terminam com ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'EXCLUIR transação (!)',
+    'rule_action_delete_transaction'             => 'EXCLUIR transação (!)',
     'rule_action_set_category'                   => 'Definir categoria para ":action_value"',
     'rule_action_clear_category'                 => 'Limpar categoria',
     'rule_action_set_budget'                     => 'Definir orçamento para ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Remover tag..',
     'rule_action_remove_all_tags_choice'         => 'Remover todas as tags',
     'rule_action_set_description_choice'         => 'Definir descrição para..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Adicionar/remover o valor da transação no cofrinho ":action_value"',
     'rule_action_append_description_choice'      => 'Acrescentar a descrição com..',
     'rule_action_prepend_description_choice'     => 'Preceder a descrição com..',
-    'rule_action_set_source_account_choice'      => 'Definir a conta de origem...',
+    'rule_action_set_source_account_choice'      => 'Definir conta de origem para...',
     'rule_action_set_source_account'             => 'Definir a conta de origem para :action_value',
-    'rule_action_set_destination_account_choice' => 'Definir a conta de destino...',
+    'rule_action_set_destination_account_choice' => 'Definir conta de destino para...',
     'rule_action_set_destination_account'        => 'Definir a conta de destino :action_value',
     'rule_action_append_notes_choice'            => 'Anexar notas com..',
     'rule_action_append_notes'                   => 'Anexar notas com ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III permite que você defina outras configurações locais, por exemplo, como moedas, números e datas são formatadas. Os itens nesta lista podem não ser suportadas pelo seu sistema. Firefly III não tem as corretas configurações de data para cada local; entre em contato para melhorias.',
     'pref_locale_no_windows'          => 'Esse recurso pode não funcionar no Windows.',
     'pref_locale_no_docker'           => 'A imagem do Docker tem apenas um pequeno conjunto de localidades instaladas.',
+    'pref_locale_no_demo'             => 'Este recurso não funcionará para o usuário de demonstração.',
     'pref_custom_fiscal_year'         => 'Configurações de ano fiscal',
     'pref_custom_fiscal_year_label'   => 'Habilitado',
     'pref_custom_fiscal_year_help'    => 'Nos países que usam um exercício diferente de 1 de Janeiro a 31 de Dezembro, você pode ativar isto e especificar início / fim do ano fiscal',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opções',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'Esta quantia aplica-se de :start a :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'veja abaixo',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliação (:from a :to)',
     'sum_of_reconciliation'                     => 'Total reconciliado',
     'reconcile_this_account'                    => 'Concilie esta conta',
+    'reconcile'                                 => 'Reconciliar',
+    'show'                                      => 'Exibir',
     'confirm_reconciliation'                    => 'Confirmar reconciliação',
     'submitted_start_balance'                   => 'Saldo inicial enviado',
     'selected_transactions'                     => 'Transações selecionadas (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'A transação não pôde ser armazenada. Por favor, verifique os arquivos de log.',
     'attachment_not_found'                      => 'O anexo não foi encontrado.',
     'journal_link_bill'                         => 'Esta transação está ligada à conta <a href=":route">:name</a>. Para remover a conexão, desmarque a caixa de seleção. Use as regras para conectá-la a outra conta.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transação #{ID} ("{title}")</a> foi salva.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transação #{ID}</a> foi salva.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transação #{ID}</a> foi atualizada.',
 
     // new user:
     'welcome'                                   => 'Bem Vindo ao Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Transações recorrentes',
+    'repeat_until_in_past'                  => 'Esta transação recorrente parou de repetir em :date.',
     'recurring_calendar_view'               => 'Calendário',
     'no_recurring_title_default'            => 'Vamos criar uma transação recorrente!',
     'no_recurring_intro_default'            => 'Você ainda não tem nenhuma transação recorrente. Você pode usá-las para que o Firefly III crie transações para você automaticamente.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Voltar ao índice de telemetria',
     'not_yet_submitted'                  => 'Ainda não enviado',
     'telemetry_type_feature'             => 'Indicador de Característica',
+    'telemetry_type_string'              => 'Texto',
+    'telemetry_type_recurring'           => 'Recorrente',
     'telemetry_submit_all'               => 'Enviar registros',
     'telemetry_delete_submitted_records' => 'Excluir registros enviados',
     'telemetry_submission_executed'      => 'Os registros foram enviados. Verifique seus arquivos de log para mais informações.',

resources/lang/ro_RO/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Creați lucruri noi',
     'new_withdrawal'                             => 'Tranzacție nouă',
     'create_new_transaction'                     => 'Creați o nouă tranzacție',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Tranzacţie nouă',
     'no_rules_for_bill'                          => 'Acestă factură nu are asociate reguli.',
     'go_to_asset_accounts'                       => 'Vizualizați conturile de active',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Am uitat parola',
     'reset_pw_page_title'                        => 'Reseteaza parola',
     'cannot_reset_demo_user'                     => 'Nu puteți reseta parola utilizatorului demo.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Înregistrare',
     'authorization'                              => 'Autorizare',
     'active_bills_only'                          => 'numai facturi active',
     'active_exp_bills_only'                      => 'numai facturi active și așteptate',
     'average_per_bill'                           => 'media pe factură',
     'expected_total'                             => 'total așteptat',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'v: Solicitare de autorizare',
     'authorization_request_intro'                => '<strong> :client </ strong> solicită permisiunea de a accesa administrația financiară. Doriți să autorizați <strong> :client </ strong> pentru a accesa aceste înregistrări?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Actualizare canal',
     'admin_update_channel_explain'               => 'Firefly III are trei "canale" de actualizare, care determină cât de avansați sunteți în termeni de caracteristici, îmbunătățiri și bug-uri. Folosiți canalul „beta” dacă sunteți aventuroși și „alfa” atunci când vă place să trăiți periculos viața.',
     'update_channel_stable'                      => 'Stabil. Totul ar trebui să funcționeze așa cum este de așteptat.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Descrierea conține ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Descrierea este..',
     'rule_trigger_description_is'                => 'Descrierea este ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Bugetul este..',
     'rule_trigger_budget_is'                     => 'Bugetul este ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'O etichetă este..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Notele încep cu ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Notele se termină cu..',
     'rule_trigger_notes_end'                     => 'Notele se termină cu ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Setați categoria la ":action_value"',
     'rule_action_clear_category'                 => 'Șterge categorie',
     'rule_action_set_budget'                     => 'Setați bugetul la ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Eliminați eticheta..',
     'rule_action_remove_all_tags_choice'         => 'Eliminați toate etichetele',
     'rule_action_set_description_choice'         => 'Setați descrierea la..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Adăugați descrierea cu..',
     'rule_action_prepend_description_choice'     => 'Prefixați descrierea cu..',
-    'rule_action_set_source_account_choice'      => 'Setați contul sursă la...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Setați contul sursă la :action_value',
-    'rule_action_set_destination_account_choice' => 'Setați contul de destinație la...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Setați contul de destinație la :action_value',
     'rule_action_append_notes_choice'            => 'Adăugați notițe cu..',
     'rule_action_append_notes'                   => 'Adăugați notițe cu ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Setări an fiscal',
     'pref_custom_fiscal_year_label'   => 'Activat',
     'pref_custom_fiscal_year_help'    => 'În țările care utilizează un exercițiu financiar, altul decât 1 ianuarie până la 31 decembrie, puteți să le activați și să specificați zilele de începere / sfârșit ale anului fiscal',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Opțiuni',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Buget total disponibil (între :start și :end)',
     'total_available_budget_in_currency'        => 'Buget total disponibil în :currency',
     'see_below'                                 => 'vezi mai jos',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliere (:from la :to)',
     'sum_of_reconciliation'                     => 'Suma împăcărilor',
     'reconcile_this_account'                    => 'Reconciliați acest cont',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Confirmați reconcilierea',
     'submitted_start_balance'                   => 'Balanța inițială afișată',
     'selected_transactions'                     => 'Tranzacții selectate (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Nu a putut fi stocată tranzacția. Te rog verifică log-urile.',
     'attachment_not_found'                      => 'Acest atașament nu a putut fi găsit.',
     'journal_link_bill'                         => 'Această tranzacție este legată de factura <a href=":route">:nume </a>. Pentru a elimina conexiunea, debifați caseta de selectare. Utilizați regulile pentru conectarea la o altă factură.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Bine ați venit!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Tranzacții recurente',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Să cream o tranzacție recurentă!',
     'no_recurring_intro_default'            => 'Nu ai încă nici o tranzacție recurentă. Puteți utiliza aceste pentru a face Firefly III să creeze automat tranzacții pentru dvs..',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/ru_RU/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Создать новый объект',
     'new_withdrawal'                             => 'Новый расход',
     'create_new_transaction'                     => 'Создать новую транзакцию',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Новая транзакция',
     'no_rules_for_bill'                          => 'С этим счётом не связано ни одно правило.',
     'go_to_asset_accounts'                       => 'Просмотр ваших основных счетов',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Забыли свой пароль к Firefly III?',
     'reset_pw_page_title'                        => 'Сбросить свой пароль к Firefly III',
     'cannot_reset_demo_user'                     => 'Вы не можете сбросить пароль демонстрационной учётной записи.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Регистрация',
     'authorization'                              => 'Авторизация',
     'active_bills_only'                          => 'только активные счета',
     'active_exp_bills_only'                      => 'только активные и ожидаемые счета на оплату',
     'average_per_bill'                           => 'в среднем на счёт',
     'expected_total'                             => 'ожидаемый итог',
-    'reconciliation_account_name'                => 'Сверка :name',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Запрос авторизации Firefly III v:version',
     'authorization_request_intro'                => '<strong>:client</strong> запрашивает доступ к управлению вашими финансами. Вы хотите разрешить <strong>:client</strong> доступ к этой информации?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Произошла ошибка при проверке обновлений: :error',
     'unknown_error'                              => 'Неизвестная ошибка. Извините за это.',
     'just_new_release'                           => 'Доступна новая версия! Версия :version была выпущена :date. Этот релиз очень свежий. Подождите несколько дней, пока этот релиз стабилизируется.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Канал обновлений',
     'admin_update_channel_explain'               => 'Firefly III может использовать три "канала" обновлений, которые различаются наборами новых функций и ошибок. Используйте "бета"-канал, если вы любите приключения и "альфа", если вам нравится жить с чувством постоянной опасности.',
     'update_channel_stable'                      => 'Стабильный. Всё должно работать, как вы ожидаете.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Описание содержит ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Описание =',
     'rule_trigger_description_is'                => 'Описание = ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Бюджет =',
     'rule_trigger_budget_is'                     => 'Бюджет = ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Метка =',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Заметки начинаются с ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Заметки заканчиваются на...',
     'rule_trigger_notes_end'                     => 'Заметки заканчиваются на ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Назначить категорию ":action_value"',
     'rule_action_clear_category'                 => 'Очистить поле "Категория"',
     'rule_action_set_budget'                     => 'Назначить бюджет ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Удалить метку...',
     'rule_action_remove_all_tags_choice'         => 'Удалить все метки...',
     'rule_action_set_description_choice'         => 'Назначить описание...',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Добавить в конце описание с...',
     'rule_action_prepend_description_choice'     => 'Добавить в начале описание с...',
-    'rule_action_set_source_account_choice'      => 'Назначить счёт-источник...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Назначить счёт-источник :action_value',
-    'rule_action_set_destination_account_choice' => 'Назначить целевой счёт...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Назначить целевой счёт :action_value',
     'rule_action_append_notes_choice'            => 'Добавить в конце заметки с...',
     'rule_action_append_notes'                   => 'Добавить в конце заметки с ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Параметры финансового года',
     'pref_custom_fiscal_year_label'   => 'Включить',
     'pref_custom_fiscal_year_help'    => 'Для стран, в которых финансовый год начинается не 1 января, а заканчивается не 31 декабря, вы должны указать даты начала и окончания финансового года',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Параметры',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Общий доступный бюджет (между :start и :end)',
     'total_available_budget_in_currency'        => 'Всего доступно в бюджете (:currency)',
     'see_below'                                 => 'см. ниже',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Сверка (с :from по :to)',
     'sum_of_reconciliation'                     => 'Сумма по сверке',
     'reconcile_this_account'                    => 'Произвести сверку данного счёта',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Подтвердить сверку',
     'submitted_start_balance'                   => 'Подтверждённый начальный баланс',
     'selected_transactions'                     => 'Выбранный транзакции (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Не удалось сохранить транзакцию. Пожалуйста, проверьте log-файлы.',
     'attachment_not_found'                      => 'Вложение не найдено.',
     'journal_link_bill'                         => 'Эта транзакция связана со счётом на оплату <a href=":route">:name</a>. Чтобы удалить эту связь, снимите галочку. Используйте правила для связи с другим счётом на оплату.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Добро пожаловать в Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Повторяющиеся транзакции',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Календарь',
     'no_recurring_title_default'            => 'Давайте создадим повторяющуюся транзакцию!',
     'no_recurring_intro_default'            => 'У вас пока нет повторяющихся транзакций. Вы можете использовать их для автоматического создания транзакций в Firefly III.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Вернуться к списку телеметрии',
     'not_yet_submitted'                  => 'Ещё не отправлено',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Отправить записи',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/sv_SE/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Skapa nya saker',
     'new_withdrawal'                             => 'Nytt uttag',
     'create_new_transaction'                     => 'Skapa ny transaktion',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Lägg till transaktion',
     'no_rules_for_bill'                          => 'Notan saknar associerade regler.',
     'go_to_asset_accounts'                       => 'Visa dina tillgångskonton',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Glömt ditt lösenord till Firefly III',
     'reset_pw_page_title'                        => 'Återställ ditt lösenord för Firefly III',
     'cannot_reset_demo_user'                     => 'Går inte att återställa lösenordet för demo användaren.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Registrera',
     'authorization'                              => 'Auktorisering',
     'active_bills_only'                          => 'endast aktiva notor',
     'active_exp_bills_only'                      => 'endast aktiva och väntade notor',
     'average_per_bill'                           => 'medel per nota',
     'expected_total'                             => 'total förväntad',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v:version Auktorisationsbegäran',
     'authorization_request_intro'                => '<strong>:client</strong> begär tillstånd för åtkomst till din ekonomi administration. Vill du tillåta <strong>:client</strong> åtkomst till dessa poster?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Uppdatera kanal',
     'admin_update_channel_explain'               => 'Firefly III har tre uppdaterings "kanaler" som bestämmer hur frammåt i kurvan du är i form av funktioner, förbättringar och buggar. Använd "beta" kanalen om du är äventyrslysten och "alpha" om du tycket om att leva farligt.',
     'update_channel_stable'                      => 'Stabil. Allting fungerar som förväntat.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Beskrivning innehåller ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Beskrivning är..',
     'rule_trigger_description_is'                => 'Beskrivning är ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Budget är..',
     'rule_trigger_budget_is'                     => 'Budget är ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(En) etikett är..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Anteckningar börjar med ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Anteckningar slutar med..',
     'rule_trigger_notes_end'                     => 'Anteckningar slutar med ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Sätt kategori till ":action_value"',
     'rule_action_clear_category'                 => 'Rensa kategori',
     'rule_action_set_budget'                     => 'Sätt budget till ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Ta bort etikett..',
     'rule_action_remove_all_tags_choice'         => 'Ta bort alla etiketter',
     'rule_action_set_description_choice'         => 'Sätt beskrivning till..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Lägg till beskrivning med..',
     'rule_action_prepend_description_choice'     => 'Förbered beskrivning med..',
-    'rule_action_set_source_account_choice'      => 'Sätt källkonto till...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Sätt källkonto till :action_value',
-    'rule_action_set_destination_account_choice' => 'Sätt destinationskonto till...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Sätt destinationskonto till :action_value',
     'rule_action_append_notes_choice'            => 'Lägg till anteckningar med..',
     'rule_action_append_notes'                   => 'Lägg till anteckningar med ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Räkneskapsårs inställningar',
     'pref_custom_fiscal_year_label'   => 'Aktiverad',
     'pref_custom_fiscal_year_help'    => 'I länder som använder räkneskapsår annat än 1a Januari till 31a December, går det att ändra detta och välja start / slut dagar för räkneskapsåret',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Alternativ',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total tillgänglig budget (mellan :start och :end)',
     'total_available_budget_in_currency'        => 'Total tillgänglig budget i :currency',
     'see_below'                                 => 'se nedan',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Avstämning (:from till :to)',
     'sum_of_reconciliation'                     => 'Summa av avstämning',
     'reconcile_this_account'                    => 'Stäm av detta konto',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Bekräfta avstämning',
     'submitted_start_balance'                   => 'Inskickad startbalans',
     'selected_transactions'                     => 'Valda transaktioner (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Transaktion kunde inte lagras. Vänligen se loggfiler.',
     'attachment_not_found'                      => 'Denna bilaga kunde inte hittas.',
     'journal_link_bill'                         => 'Transaktion länkad till nota <a href=":route">:name</a>. För att ta bort koppling, avmarkera kryssrutan. Använd regler för att koppla den till en annan nota.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Välkommen till Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Recurring transactions',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Let\'s create a recurring transaction!',
     'no_recurring_intro_default'            => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/tr_TR/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Yeni bir şey oluştur',
     'new_withdrawal'                             => 'Yeni para çekme',
     'create_new_transaction'                     => 'Yeni  işlem oluştur',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Yeni işlem',
     'no_rules_for_bill'                          => 'Bu faturaya bağlı bir kural yok.',
     'go_to_asset_accounts'                       => 'Varlık hesaplarınızı görüntüleyin
@@ -200,13 +201,14 @@ return [
     'forgot_pw_page_title'                       => 'Firefly III için şifrenizi mi unuttunuz',
     'reset_pw_page_title'                        => 'Firefly III şifrenizi sıfırlayın',
     'cannot_reset_demo_user'                     => 'Demo kullanıcısının şifresini sıfırlayamazsınız.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Kayıt ol',
     'authorization'                              => 'Yetkilendirme',
     'active_bills_only'                          => 'sadece aktif faturalar',
     'active_exp_bills_only'                      => 'sadece aktif ve beklenen faturalar',
     'average_per_bill'                           => 'fatura başına ortalama',
     'expected_total'                             => 'beklenen toplam',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v: version Yetkilendirme İsteği',
     'authorization_request_intro'                => '<strong>:client</strong> finansal yönetiminize erişmek için izin istiyor. Bu kayıtlara erişmek için  <strong>:client</strong> \'yi yetkilendirmek ister misiniz?',
@@ -241,6 +243,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Güncelleme kanalı',
     'admin_update_channel_explain'               => 'Firefly III 3 adet güncelleme kanalına sahiptir. Bu kanallar sizin özellikler, geliştirmeler ve hatalar ile ilgili ne kadar önde olduğunuzu belirler. Maceracası iseniz "beta", tehlikeli yaşamayı seviyorsanız "alpha" versiyonunu kullanın.',
     'update_channel_stable'                      => 'Stabil. Herşey olması gerektiği gibi.',
@@ -421,6 +424,14 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'rule_trigger_description_contains'          => 'Açıklama ":trigger_value" içerir',
     'rule_trigger_description_is_choice'         => 'Açıklama..',
     'rule_trigger_description_is'                => 'Açıklama ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Bütçe..',
     'rule_trigger_budget_is'                     => 'Bütçe ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(A) etiketi..',
@@ -455,6 +466,8 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'rule_trigger_notes_start'                   => 'Notlar ":trigger_value" ile başlar',
     'rule_trigger_notes_end_choice'              => 'Notlar bitiyor..',
     'rule_trigger_notes_end'                     => 'Notlar ":trigger_value" ile bitiyor',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Kategoriyi ":action_value" olarak ayarla',
     'rule_action_clear_category'                 => 'Kategoriyi temizle',
     'rule_action_set_budget'                     => 'Bütçeyi ":action_value" olarak ayarlayın',
@@ -473,11 +486,13 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'rule_action_remove_tag_choice'              => 'Etiketi kaldır..',
     'rule_action_remove_all_tags_choice'         => 'Tüm etiketleri kaldır',
     'rule_action_set_description_choice'         => 'Açıklama belirtiniz..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'İle açıklamayı ekle..',
     'rule_action_prepend_description_choice'     => 'Açıklamanın başlığını ekleyin..',
-    'rule_action_set_source_account_choice'      => 'Kaynak hesabı ayarla...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Kaynak hesaba :action_value ayarlayınız',
-    'rule_action_set_destination_account_choice' => 'Hedef hesabı ayarla...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Hedef hesaba :action_value ayarlayınız',
     'rule_action_append_notes_choice'            => 'İle not ekle..',
     'rule_action_append_notes'                   => '":action_value" ile not ekle',
@@ -545,6 +560,7 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Mali yıl ayarları',
     'pref_custom_fiscal_year_label'   => 'Etkin',
     'pref_custom_fiscal_year_help'    => '1 Ocak - 31 Aralık arasındaki bir mali yılı kullanan ülkelerde bu ayarı açabilir ve mali yılın başlangıç / bitiş günlerini belirleyebilirsiniz',
@@ -755,6 +771,7 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'options'                                   => 'Seçenekler',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -927,6 +944,8 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => 'Bu hesabı bağdaştırınız',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Mutabakatı onayla',
     'submitted_start_balance'                   => 'Gönderilen başlangıç bakiyesi',
     'selected_transactions'                     => 'Seçilen İşlemler (:count)',
@@ -1038,6 +1057,9 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'unknown_journal_error'                     => 'Could not store the transaction. Please check the log files.',
     'attachment_not_found'                      => 'This attachment could not be found.',
     'journal_link_bill'                         => 'This transaction is linked to bill <a href=":route">:name</a>. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Firefly III\'e hoşgeldiniz!',
@@ -1521,6 +1543,7 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
 
     // recurring transactions
     'recurrences'                           => 'Tekrar Eden İşlemler',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Yinelenen bir işlem yapalım!',
     'no_recurring_intro_default'            => 'Henüz yinelenen işleminiz yok. Firefly III\'ün sizin için otomatik olarak işlemler oluşturmasını sağlamak için bunları kullanabilirsiniz.',
@@ -1618,6 +1641,8 @@ işlemlerin kontrol edildiğini lütfen unutmayın.',
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/vi_VN/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => 'Tạo công cụ mới',
     'new_withdrawal'                             => 'Rút tiền mới',
     'create_new_transaction'                     => 'Tạo giao dịch mới',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => 'Giao dịch mới',
     'no_rules_for_bill'                          => 'Hóa đơn này không có quy tắc nào liên quan đến nó.',
     'go_to_asset_accounts'                       => 'Xem tài khoản của bạn',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => 'Quên mật khẩu của bạn cho Firefly III',
     'reset_pw_page_title'                        => 'Đặt lại mật khẩu của bạn cho Firefly III',
     'cannot_reset_demo_user'                     => 'Bạn không thể đặt lại mật khẩu của người dùng demo.',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => 'Đăng ký',
     'authorization'                              => 'Ủy quyền',
     'active_bills_only'                          => 'Chỉ hóa đơn hoạt động',
     'active_exp_bills_only'                      => 'hóa đơn hoạt động và dự kiến',
     'average_per_bill'                           => 'trung bình mỗi hóa đơn',
     'expected_total'                             => 'tổng dự kiến',
-    'reconciliation_account_name'                => ':tên bản đối chiếu số dư tiền gửi ngân hàng',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III v: phiên bản Yêu cầu ủy quyền',
     'authorization_request_intro'                => '<strong>:client</strong> đang yêu cầu sự cho phép truy cập quản trị tài chính của bạn. Bạn có muốn ủy quyền <strong>:client</strong> để truy cập những hồ sơ này?',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'Đã xảy ra lỗi trong khi kiểm tra cập nhật. Vui lòng xem các tập tin nhật ký.',
     'unknown_error'                              => 'Không xác định được lỗi. Xin lỗi vì điều này.',
     'just_new_release'                           => 'Đã có phiên bản mới!',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Cập nhật kênh',
     'admin_update_channel_explain'               => 'Firefly III có ba "kênh" cập nhật xác định mức độ vượt trội của bạn về các tính năng, cải tiến và lỗi. Sử dụng kênh "beta" nếu bạn thích phiêu lưu và "alpha" khi bạn muốn sống một cách nguy hiểm.',
     'update_channel_stable'                      => 'Ổn định. Mọi thứ hoạt động như mong đợi.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => 'Mô tả có chứa ":trigger_value"',
     'rule_trigger_description_is_choice'         => 'Mô tả là..',
     'rule_trigger_description_is'                => 'Mô tả là ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => 'Ngân sách là..',
     'rule_trigger_budget_is'                     => 'Ngân sách là ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => 'Thẻ là..',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => 'Ghi chú bắt đầu bằng ":trigger_value"',
     'rule_trigger_notes_end_choice'              => 'Ghi chú kết thúc bằng..',
     'rule_trigger_notes_end'                     => 'Ghi chú kết thúc bằng ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => 'Đặt danh mục thành ":action_value"',
     'rule_action_clear_category'                 => 'Xóa danh mục',
     'rule_action_set_budget'                     => 'Đặt ngân sách thành ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => 'Xóa thẻ..',
     'rule_action_remove_all_tags_choice'         => 'Xóa tất cả các thẻ',
     'rule_action_set_description_choice'         => 'Đặt mô tả thành..',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => 'Nối mô tả với..',
     'rule_action_prepend_description_choice'     => 'Chuẩn bị mô tả với..',
-    'rule_action_set_source_account_choice'      => 'Đặt tài khoản nguồn thành...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => 'Đặt tài khoản nguồn thành :action_value',
-    'rule_action_set_destination_account_choice' => 'Đặt tài khoản đích thành...',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => 'Đặt tài khoản đích thành :action_value',
     'rule_action_append_notes_choice'            => 'Nối ghi chú với..',
     'rule_action_append_notes'                   => 'Nối ghi chú với ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => 'Cài đặt năm tài chính',
     'pref_custom_fiscal_year_label'   => 'Đã bật',
     'pref_custom_fiscal_year_help'    => 'Ở các quốc gia sử dụng năm tài chính khác từ ngày 1 tháng 1 đến ngày 31 tháng 12, bạn có thể bật tính năng này và chỉ định ngày bắt đầu / ngày kết thúc của năm tài chính',
@@ -753,6 +769,7 @@ return [
     'options'                                   => 'Tùy chọn',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'TTổng ngân sách có sẵn (giữa: bắt đầu và: kết thúc)',
     'total_available_budget_in_currency'        => 'Tổng ngân sách có sẵn bằng: tiền tệ',
     'see_below'                                 => 'xem bên dưới',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Đối chiếu (:từ đến :)',
     'sum_of_reconciliation'                     => 'Tổng đối chiếu',
     'reconcile_this_account'                    => 'Điều chỉnh tài khoản này',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => 'Xác nhận đối chiếu',
     'submitted_start_balance'                   => 'Gửi số dư bắt đầu',
     'selected_transactions'                     => 'Giao dịch được chọn (: tính)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => 'Không thể lưu trữ giao dịch. Vui lòng kiểm tra các tệp nhật ký.',
     'attachment_not_found'                      => 'Không thể tìm thấy tệp đính kèm này.',
     'journal_link_bill'                         => 'Giao dịch này được liên kết với hóa đơn <a href=":route">:name</a>. Để xóa kết nối, bỏ chọn hộp kiểm. Sử dụng quy tắc để kết nối nó với hóa đơn khác.',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => 'Chào mừng đến với Firefly III!',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Giao dịch định kỳ',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => 'Lịch',
     'no_recurring_title_default'            => 'Hãy tạo một giao dịch định kỳ!',
     'no_recurring_intro_default'            => 'Bạn chưa có giao dịch định kỳ. Bạn có thể sử dụng những thứ này để Firefly III tự động tạo giao dịch cho bạn.',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/lang/zh_CN/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => '建立新内容',
     'new_withdrawal'                             => '新提款',
     'create_new_transaction'                     => '建立新交易',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => '新交易',
     'no_rules_for_bill'                          => '该账单没有与之相关的规则。',
     'go_to_asset_accounts'                       => '检视您的资产帐户',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => '忘记您 Firefly III 的密码',
     'reset_pw_page_title'                        => '重设您 Firefly III 的密码',
     'cannot_reset_demo_user'                     => '您不能重置 演示使用者 的密码。',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => '注册帐号',
     'authorization'                              => '认证',
     'active_bills_only'                          => '只显示进行中的工作',
     'active_exp_bills_only'                      => '只显示有效和预期的账单',
     'average_per_bill'                           => '每张帐单的平均数',
     'expected_total'                             => '期望总数',
-    'reconciliation_account_name'                => ':name 对账',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III :version 版授权请求',
     'authorization_request_intro'                => '<strong>:client</strong> 正在要求通行您的财务管理后台的许可，您是否愿意授权 <strong>:client</strong> 通行这些纪录？',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => '检查更新时发生错误：:error',
     'unknown_error'                              => '未知错误。抱歉。',
     'just_new_release'                           => '有一个新版本可用！版本 :version 在 :date 发布。这个版本非常新。等待几天后新版本才能稳定。',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => '更新通道',
     'admin_update_channel_explain'               => 'Firefly III具有三个更新“通道”，这些通道确定您在功能，增强功能和错误方面都处于最新。 如果您喜欢冒险，请使用“ beta”频道；如果您不惧危险，请使用“ alpha”频道。',
     'update_channel_stable'                      => '稳定版。一切应该都如预期的那样运行。',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => '描述包含 ":trigger_value"',
     'rule_trigger_description_is_choice'         => '描述是…',
     'rule_trigger_description_is'                => '描述为 ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => '预算为…',
     'rule_trigger_budget_is'                     => '预算为 ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(一个) 标签为…',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => '注释开头为 ":trigger_value"',
     'rule_trigger_notes_end_choice'              => '注释结尾为…',
     'rule_trigger_notes_end'                     => '注释结尾为 ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => '设定分类为 ":action_value"',
     'rule_action_clear_category'                 => '清空分类',
     'rule_action_set_budget'                     => '设定预算为 ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => '移除标签…',
     'rule_action_remove_all_tags_choice'         => '移除所有标签',
     'rule_action_set_description_choice'         => '把描述设置为…',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => '描述后加上…',
     'rule_action_prepend_description_choice'     => '描述前加上…',
-    'rule_action_set_source_account_choice'      => '将来源帐户设为...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => '将来源帐户设为 :action_value',
-    'rule_action_set_destination_account_choice' => '将目标帐户设为…',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => '将目标帐户设为 :action_value',
     'rule_action_append_notes_choice'            => '注释后加入…',
     'rule_action_append_notes'                   => '注释后加上 ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => '财政年度设定',
     'pref_custom_fiscal_year_label'   => '已启用',
     'pref_custom_fiscal_year_help'    => '在使用1月1日至12月31日以外作为会计年度的国家，您可开启此功能并指定财政年度的起迄日。',
@@ -753,6 +769,7 @@ return [
     'options'                                   => '选项',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => '可用预算总额 (:start 和 :end之间)',
     'total_available_budget_in_currency'        => '可用预算总额 以:currency为单位',
     'see_below'                                 => '请在下方查看',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => 'Reconciliation (:from to :to)',
     'sum_of_reconciliation'                     => 'Sum of reconciliation',
     'reconcile_this_account'                    => '对帐此帐户',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => '确认对帐',
     'submitted_start_balance'                   => '初始余额已提交',
     'selected_transactions'                     => '已选择交易 (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => '无法储存交易，请检视日志档。',
     'attachment_not_found'                      => '此附加档案无法被找到。',
     'journal_link_bill'                         => '此交易已与帐单 <a href=":route">:name</a> 链结。如要移除链结，取消核选方块，使用规则将它与其他帐单链结。',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => '欢迎使用 Firefly III！',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => '周期性交易',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => '日历',
     'no_recurring_title_default'            => '一起建立一笔周期性交易！',
     'no_recurring_intro_default'            => '您目前没有定期重复的交易。您可使用此功能让 Firefly III 自动为您建立交易。',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => '返回到遥测索引',
     'not_yet_submitted'                  => '尚未提交',
     'telemetry_type_feature'             => '功能标志',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => '提交记录',
     'telemetry_delete_submitted_records' => '删除提交的记录',
     'telemetry_submission_executed'      => '记录已提交。请检查您的日志文件获取更多信息。',

resources/lang/zh_TW/firefly.php

@@ -54,6 +54,7 @@ return [
     'create_new_stuff'                           => '建立新內容',
     'new_withdrawal'                             => '新提款',
     'create_new_transaction'                     => '建立新交易',
+    'sidebar_frontpage_create'                   => 'Create',
     'new_transaction'                            => '新交易',
     'no_rules_for_bill'                          => '此帳單未設定相關的規則。',
     'go_to_asset_accounts'                       => '檢視您的資產帳戶',
@@ -199,13 +200,14 @@ return [
     'forgot_pw_page_title'                       => '忘記您 Firefly III 的密碼',
     'reset_pw_page_title'                        => '重設您 Firefly III 的密碼',
     'cannot_reset_demo_user'                     => '您不能重設 展示使用者 的密碼。',
+    'no_att_demo_user'                           => 'The demo user can\'t upload attachments.',
     'button_register'                            => '註冊帳號',
     'authorization'                              => '身份認證',
     'active_bills_only'                          => '僅限使用中帳單',
     'active_exp_bills_only'                      => 'active and expected bills only',
     'average_per_bill'                           => '每張帳單的平均數',
     'expected_total'                             => '預期總數',
-    'reconciliation_account_name'                => ':name reconciliation',
+    'reconciliation_account_name'                => ':name reconciliation (:currency)',
     // API access
     'authorization_request'                      => 'Firefly III :version 版授權請求',
     'authorization_request_intro'                => '<strong>:client</strong> 正要求權限存取您的財務管理，您是否願意授權 <strong>:client</strong> 存取這些紀錄？',
@@ -240,6 +242,7 @@ return [
     'update_check_error'                         => 'An error occurred while checking for updates: :error',
     'unknown_error'                              => 'Unknown error. Sorry about that.',
     'just_new_release'                           => 'A new version is available! Version :version was released :date. This release is very fresh. Wait a few days for the new release to stabilize.',
+    'disabled_but_check'                         => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
     'admin_update_channel_title'                 => 'Update channel',
     'admin_update_channel_explain'               => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
     'update_channel_stable'                      => 'Stable. Everything should work as expected.',
@@ -419,6 +422,14 @@ return [
     'rule_trigger_description_contains'          => '描述包含 ":trigger_value"',
     'rule_trigger_description_is_choice'         => '描述是…',
     'rule_trigger_description_is'                => '描述為 ":trigger_value"',
+
+    'rule_trigger_date_is_choice'                => 'Transaction date is..',
+    'rule_trigger_date_is'                       => 'Transaction date is ":trigger_value"',
+    'rule_trigger_date_before_choice'            => 'Transaction date is before..',
+    'rule_trigger_date_before'                   => 'Transaction date is before ":trigger_value"',
+    'rule_trigger_date_after_choice'             => 'Transaction date is after..',
+    'rule_trigger_date_after'                    => 'Transaction date is after ":trigger_value"',
+
     'rule_trigger_budget_is_choice'              => '預算為…',
     'rule_trigger_budget_is'                     => '預算為 ":trigger_value"',
     'rule_trigger_tag_is_choice'                 => '(一個) 標籤為…',
@@ -453,6 +464,8 @@ return [
     'rule_trigger_notes_start'                   => '註釋開頭為 ":trigger_value"',
     'rule_trigger_notes_end_choice'              => '註釋結尾為…',
     'rule_trigger_notes_end'                     => '註釋結尾為 ":trigger_value"',
+    'rule_action_delete_transaction_choice'      => 'DELETE transaction (!)',
+    'rule_action_delete_transaction'             => 'DELETE transaction (!)',
     'rule_action_set_category'                   => '設定分類為 ":action_value"',
     'rule_action_clear_category'                 => '清空分類',
     'rule_action_set_budget'                     => '設定預算為 ":action_value"',
@@ -471,11 +484,13 @@ return [
     'rule_action_remove_tag_choice'              => '移除標籤…',
     'rule_action_remove_all_tags_choice'         => '移除所有標籤',
     'rule_action_set_description_choice'         => '把描述設置為…',
+    'rule_action_update_piggy_choice'            => 'Add/remove transaction amount in piggy bank..',
+    'rule_action_update_piggy'                   => 'Add/remove transaction amount in piggy bank ":action_value"',
     'rule_action_append_description_choice'      => '描述後加上…',
     'rule_action_prepend_description_choice'     => '描述前加上…',
-    'rule_action_set_source_account_choice'      => '將來源帳戶設為...',
+    'rule_action_set_source_account_choice'      => 'Set source account to..',
     'rule_action_set_source_account'             => '將來源帳戶設為 :action_value',
-    'rule_action_set_destination_account_choice' => '將目標帳戶設為…',
+    'rule_action_set_destination_account_choice' => 'Set destination account to..',
     'rule_action_set_destination_account'        => '將目標帳戶設為 :action_value',
     'rule_action_append_notes_choice'            => '註釋後加入…',
     'rule_action_append_notes'                   => '註釋後加上 ":action_value"',
@@ -543,6 +558,7 @@ return [
     'pref_locale_help'                => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
     'pref_locale_no_windows'          => 'This feature may not work on Windows.',
     'pref_locale_no_docker'           => 'The Docker image only has a small set of installed locales.',
+    'pref_locale_no_demo'             => 'This feature won\'t work for the demo user.',
     'pref_custom_fiscal_year'         => '財政年度設定',
     'pref_custom_fiscal_year_label'   => '已啟用',
     'pref_custom_fiscal_year_help'    => '有些國家/地區採用的會計年度有別於每年 1 月 1 日至 12 月 31 日，您可開啟此功能並指定財政年度的起迄日。',
@@ -753,6 +769,7 @@ return [
     'options'                                   => '選項',
 
     // budgets:
+    'budget_limit_not_in_range'                 => 'This amount applies from :start to :end.',
     'total_available_budget'                    => 'Total available budget (between :start and :end)',
     'total_available_budget_in_currency'        => 'Total available budget in :currency',
     'see_below'                                 => 'see below',
@@ -925,6 +942,8 @@ return [
     'reconciliation_transaction_title'          => '對帳 (:from 至 :to)',
     'sum_of_reconciliation'                     => '對帳加總',
     'reconcile_this_account'                    => '對帳此帳戶',
+    'reconcile'                                 => 'Reconcile',
+    'show'                                      => 'Show',
     'confirm_reconciliation'                    => '確認對帳',
     'submitted_start_balance'                   => '初始餘額已送出',
     'selected_transactions'                     => '已選擇交易 (:count)',
@@ -1036,6 +1055,9 @@ return [
     'unknown_journal_error'                     => '無法儲存交易，請檢視日誌檔。',
     'attachment_not_found'                      => '此附加檔案無法被找到。',
     'journal_link_bill'                         => '此交易已與帳單 <a href=":route">:name</a> 鏈結。如要移除鏈結，取消核選方塊，使用規則將它與其他帳單鏈結。',
+    'transaction_stored_link'                   => '<a href="transactions/show/{ID}">Transaction #{ID} ("{title}")</a> has been stored.',
+    'transaction_new_stored_link'               => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been stored.',
+    'transaction_updated_link'                  => '<a href="transactions/show/{ID}">Transaction #{ID}</a> has been updated.',
 
     // new user:
     'welcome'                                   => '歡迎使用 Firefly III！',
@@ -1519,6 +1541,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => '週期性交易',
+    'repeat_until_in_past'                  => 'This recurring transaction stopped repeating on :date.',
     'recurring_calendar_view'               => '月曆',
     'no_recurring_title_default'            => '一起建立一筆週期性交易！',
     'no_recurring_intro_default'            => '您目前沒有週期性交易。您可使用此功能讓 Firefly III 自動為您建立交易。',
@@ -1616,6 +1639,8 @@ return [
     'telemetry_back_to_index'            => 'Back to telemetry index',
     'not_yet_submitted'                  => 'Not yet submitted',
     'telemetry_type_feature'             => 'Feature flag',
+    'telemetry_type_string'              => 'Text',
+    'telemetry_type_recurring'           => 'Recurring',
     'telemetry_submit_all'               => 'Submit records',
     'telemetry_delete_submitted_records' => 'Delete submitted records',
     'telemetry_submission_executed'      => 'Records have been submitted. Check your log files for more info.',

resources/views/v1/accounts/reconcile/transactions.twig

@@ -20,9 +20,12 @@
         {# start marker #}
         {% if journal.date < start and startSet == false %}
             <tr>
-                <td colspan="5">
+                <td colspan="4">
                     &nbsp;
                 </td>
+                <td>
+                    <input type="checkbox" class="check_all_btn">
+                </td>
                 <td colspan="3">
                     <span class="label label-default">
                         {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
@@ -38,9 +41,12 @@
         {# end marker #}
         {% if journal.date <= end and endSet == false %}
             <tr>
-                <td colspan="5">
+                <td colspan="4">
                     &nbsp;
                 </td>
+                <td>
+                    <input type="checkbox" class="check_all_btn">
+                </td>
                 <td colspan="3">
                     <span class="label label-default">
                         {{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }}

resources/views/v1/budgets/index.twig

@@ -276,6 +276,11 @@
                                                     </ul>
                                                 </div>
                                             </div>
+                                            {% if not budgetLimit.in_range %}
+                                            <small class="text-muted">
+                                                {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
+                                            </small><br>
+                                                {% endif %}
                                             <span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
                                                   style="display:none;"></span>
                                         {% endfor %}

resources/views/v1/debug.twig

@@ -15,31 +15,43 @@
 <textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
 Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION }}**.
 
-| Variable | Content |
+| Scope | Version |
+| --- | --- |
+| Firefly III | {{ FF_VERSION }} |
+| Firefly III API | {{ config('firefly.api_version') }} |
+| PHP | {{ phpVersion }} |
+| Host | {{ phpOs }} |
+
+| System info | Value |
 | --- | --- |
-| FF version | {{ FF_VERSION }} |
-| FF API version | {{ config('firefly.api_version') }} |
 | Installation ID | {{ installationId }} |
+| Using docker? | {% if isDocker %}true{% else %}false{% endif %} |
+| Telemetry | {% if telemetry %}true{% else%}false{% endif%} |
 | App environment | {{ appEnv }} |
 | App debug mode | {{ appDebug }} |
 | App cache driver | {{ cacheDriver }} |
 | App logging | {{ appLogLevel }}, {{ logChannel }} |
-| PHP version | {{ phpVersion }} |
 | Display errors | {{ displayErrors }} |
-| Session start | {{ session('start') }} |
-| Session end | {{ session('end') }} |
-| Session first | {{ session('first') }} |
 | Error reporting | {{ errorReporting }} |
-| Host | {{ phpOs }} |
 | Interface | {{ interface }} |
-| UserID | {{ Auth.user.id }} |
-{% for code,result in localeAttempts %}
-| Attempt at "{{ code }}" | {{ result }} |
-{% endfor %}
+| Default language | {{ defaultLanguage }} |
+| Default locale | {{ defaultLocale }} |
 | DB drivers | {{ drivers }} |
 | Current driver | {{ currentDriver }} |
 | Login provider | {{ loginProvider }}  |
 | Trusted proxies (.env) | {{ trustedProxies }} |
+
+| User info | Value |
+| --- | --- |
+| Session start | {{ session('start') }} |
+| Session end | {{ session('end') }} |
+| Session first | {{ session('first') }} |
+| User ID | {{ Auth.user.id }} |
+| User language | {{ userLanguage }} |
+| User locale | {{ userLocale }} |
+{% for code,result in localeAttempts %}
+| Attempt at "{{ code }}" | {{ result }} |
+{% endfor %}
 | User agent | {{ userAgent }} |
 </textarea>
 

resources/views/v1/emails/access-token-created-html.twig

@@ -1,13 +1,13 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+    {{ trans('email.access_token_created_body') }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    With this token, they can access <strong>all</strong> of your financial records through the Firefly III API.
+    {{ trans('email.access_token_created_explanation')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+    {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
 {% include 'emails.footer-html' %}

resources/views/v1/emails/access-token-created-text.twig

@@ -1,7 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+{{ trans('email.access_token_created_body')|raw }}
 
-With this token, they can access all of your financial records through the Firefly III API.
+{{ trans('email.access_token_created_explanation')|striptags|raw }}
 
-If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+{{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/admin-test-html.twig

@@ -1,5 +1,5 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    This is a test message from your Firefly III instance. It was sent to {{ email }}.
+    {{ trans('email.admin_test_body', {email: email })}}
 </p>
 {% include 'emails.footer-html' %}

resources/views/v1/emails/admin-test-text.twig

@@ -1,3 +1,3 @@
 {% include 'emails.header-text' %}
-    This is a test message from your Firefly III instance. It was sent to {{ email }}.
+{{ trans('email.admin_test_body', {email: email })|raw }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/confirm-account-html.twig

@@ -1,20 +0,0 @@
-{% include 'emails.header-html' %}
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
-    valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-</p>
-
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To active your account please follow the link below.
-</p>
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <strong>PLEASE</strong> verify that this activation link goes to the Firefly III installation you expect it to be:
-</p>
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <a href="{{ route }}" style="color:#337ab7">{{ route }}</a>
-</p>
-
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You should be redirected to the index page right away. The link expires in about four hours.
-</p>
-{% include 'emails.footer-html' %}

resources/views/v1/emails/confirm-account-text.twig

@@ -1,11 +0,0 @@
-{% include 'emails.header-text' %}
-To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-
-To active your account please follow the link below.
-
-PLEASE verify that this activation link goes to the Firefly III installation you expect it to be:
-
-{{ route }}
-
-You should be redirected to the index page right away. The link expires in about four hours.
-{% include 'emails.footer-text' %}

resources/views/v1/emails/confirm-email-change-html.twig

@@ -1,15 +1,15 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+    {{ trans('email.email_change_body_to_new')}}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The old email addres was: {{ oldEmail }}
+    {{trans('email.email_change_old', { email: oldEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The new email address is: <strong>{{ newEmail }}</strong>
+    {{trans('email.email_change_new_strong', { email: newEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You cannot use Firefly III until you confirm this change. Please follow the link below to do so.
+    {{ trans('email.email_change_instructions')}}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

resources/views/v1/emails/confirm-email-change-text.twig

@@ -1,9 +1,10 @@
 {% include 'emails.header-text' %}
-You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+{{ trans('email.email_change_body_to_new')|raw }}
 
-The old email addres was: {{ oldEmail }}
+{{trans('email.email_change_old', { email: oldEmail })|raw }}
 
-The new email address is: {{ newEmail }}
+{{trans('email.email_change_new', { email: newEmail })|raw }}
 
-You cannot use Firefly III until you confirm this change. Please follow the link to do so: {{ uri }}
+{{ trans('email.email_change_instructions')|raw }}
+{{ uri }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/error-html.twig

@@ -1,46 +1,44 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Firefly III v{{ version }} ran into an error: <span style="font-family: monospace;">{{ errorMessage }}</span>
+    {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The error was of type "{{ class }}".
+    {{ trans('email.error_type', {class: class }) }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The error occured on/at: {{ time }}.
+    {{ trans('email.error_timestamp', {time: time }) }}
+
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    This error occured in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
+    {{ trans('email.error_location', { file: file, line: line, code: code })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {% if loggedIn %}
-        The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>.
+        {{ trans('email.error_user', { id: user.id, email: user.email })|raw }}
     {% else %}
-        There was no user logged in for this error or no user was detected.
+        {{ trans('email.error_no_user') }}
     {% endif %}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The IP address related to this error is: {{ ip }}<br />
-    URL is: {{ url }}<br>
-    User agent: {{ userAgent }}
+    {{ trans('email.error_ip', { ip: ip }) }}<br />
+    {{ trans('email.error_url', {url :url }) }}<br />
+    {{ trans('email.error_user_agent', {userAgent: userAgent }) }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The full stacktrace is below. If you think this is a bug in Firefly III, you
-    can forward this message to
-    <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>.
-    This can help fix the bug you just encountered.
+    {{ trans('email.error_stacktrace')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.
+    {{ trans('email.error_github_html')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The full stacktrace is below:</p>
+    {{ trans('email.error_stacktrace_below') }}</p>
 <p style="font-family: monospace;font-size:11px;color:#aaa">
     {{ stackTrace|nl2br }}
 </p>

resources/views/v1/emails/error-text.twig

@@ -1,31 +1,27 @@
 {% include 'emails.header-text' %}
-Firefly III v{{ version }} ran into an error: {{ errorMessage }}.
+{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
 
-The error was of type "{{ class }}".
+{{ trans('email.error_type', {class: class })|raw }}
 
-The error occured on/at: {{ time }}.
+{{ trans('email.error_timestamp', {time: time })|raw }}
 
-This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}.
+{{ trans('email.error_location', { file: file , line: line, code: code })|striptags|raw }}
 
 {% if loggedIn %}
-    The error was encountered by user #{{ user.id }}, {{ user.email }}.
+{{     trans('email.error_user', { id: user.id, email: user.email })|striptags|raw }}
 {% else %}
-    There was no user logged in for this error or no user was detected.
+{{     trans('email.error_no_user')|raw }}
 {% endif %}
 
-The IP address related to this error is: {{ ip }}
-URL is: {{ url }}
-User agent: {{ userAgent }}
+{{ trans('email.error_ip', { ip: ip }) }}
+{{ trans('email.error_url', {url :url}) }}
+{{ trans('email.error_user_agent', {userAgent: userAgent } ) }}
 
-The full stacktrace is below. If you think this is a bug in Firefly III, you
-can forward this message to james@firefly-iii.org. This can help fix
-the bug you just encountered.
+{{ trans('email.error_stacktrace')|striptags|raw }}
 
-If you prefer, you can also open a new issue here:
+{{ trans('email.error_github_text' )|raw }}
 
-https://github.com/firefly-iii/firefly-iii/issues
+{{ trans('email.error_stacktrace_below')|raw }}
 
-The full stacktrace is below:
-
-{{ stackTrace }}
+{{ stackTrace|raw }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/footer-html.twig

@@ -1,12 +1,12 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Beep boop,
+    {{ trans('email.closing') }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The Firefly III Mail Robot
+    {{ trans('email.signature') }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
-    PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+    {{ trans('email.footer_ps', {ipAddress: ipAddress}) }}
 </p>
 
 </body>

resources/views/v1/emails/footer-text.twig

@@ -1,6 +1,6 @@
 
-Beep boop,
+{{ trans('email.closing')|raw }}
 
-The Firefly III Mail Robot
+{{ trans('email.signature')|raw }}
 
-PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+{{ trans('email.footer_ps', {ipAddress: ipAddress})|raw }}

resources/views/v1/emails/header-html.twig

@@ -6,5 +6,5 @@
 </head>
 <body>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Hi there,
+    {{ trans('email.greeting') }}
 </p>

resources/views/v1/emails/header-text.twig

@@ -1,2 +1,2 @@
-Hi there,
+{{ trans('email.greeting')|raw }}
 

resources/views/v1/emails/oauth-client-created-html.twig

@@ -1,14 +1,13 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}"
-    and has callback URL <span style="font-family: monospace;">{{ client.redirect }}</span>.
+    {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
+    {{ trans('email.oauth_created_explanation')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
+    {{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
 </p>
 {% include 'emails.footer-html' %}

resources/views/v1/emails/oauth-client-created-text.twig

@@ -1,9 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL:
+{{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|striptags|raw }}
 
-{{ client.redirect }}
+{{ trans('email.oauth_created_explanation')|striptags|raw }}
 
-With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
-
-If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
+{{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/password-html.twig

@@ -1,10 +1,10 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody tried to reset your password. If it was you, please follow the link below to do so.
+    {{ trans('email.reset_pw_instructions') }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <strong>PLEASE</strong> verify that the link actually goes to the Firefly III you expect it to go!
+    {{ trans('email.reset_pw_warning')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

resources/views/v1/emails/password-text.twig

@@ -1,7 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody tried to reset your password. If it was you, please follow the link below to do so.
+{{ trans('email.reset_pw_instructions')|raw }}
 
-PLEASE verify that the link actually goes to the Firefly III you expect it to go!
+{{ trans('email.reset_pw_warning')|striptags|raw }}
 
 {{ url }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/registered-html.twig

@@ -1,18 +1,20 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Welcome to <a style="color:#337ab7" href="{{ address }}">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!
+    {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>
 
 <ul>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        If you have forgotten your password already, please reset it using
-        <a style="color:#337ab7" href="{{ address }}/password/reset">the password reset tool</a>.
+        {{ trans('email.registered_pw', {address: address})|raw }}
     </li>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        There is a help-icon in the top right corner of each page. If you need help, click it!
+        {{ trans('email.registered_help')}}
     </li>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        If you haven't already, please read the <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.
+        {{ trans('email.registered_doc_html')|raw }}
     </li>
 </ul>
+<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+    {{ trans('email.registered_closing')}}
+</p>
 {% include 'emails.footer-html' %}

resources/views/v1/emails/registered-text.twig

@@ -1,19 +1,20 @@
 {% include 'emails.header-text' %}
-Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!
 
-* If you have forgotten your password already, please reset it using the password reset tool.
-* There is a help-icon in the top right corner of each page. If you need help, click it!
-* If you haven't already, please read the first use guide and the full description.
+{{ trans('email.registered_welcome')|striptags|raw }}
 
-Enjoy!
+* {{ trans('email.registered_pw')|striptags|raw }}
+* {{ trans('email.registered_help')|raw }}
+* {{ trans('email.registered_doc_text')|raw }}
 
-Firefly III:
+{{ trans('email.registered_closing')|raw }}
+
+{{ trans('email.registered_firefly_iii_link')|raw }}
 {{ address }}
 
-Password reset:
+{{ trans('email.registered_pw_reset_link')|raw }}
 {{ address }}/password/reset
 
-Documentation:
+{{ trans('email.registered_doc_link')}}
 https://github.com/firefly-iii/firefly-iii
 https://firefly-iii.org/
 

resources/views/v1/emails/report-new-journals-html.twig

@@ -1,11 +1,6 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {% if transformed|length == 1 %}
-        Firefly III has created a transaction for you. You can find it in your Firefly III installation:
-    {% endif %}
-    {% if transformed|length > 1 %}
-        Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:
-    {% endif %}
+    {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>
 
 <!-- loop groups -->

resources/views/v1/emails/report-new-journals-text.twig

@@ -1,6 +1,5 @@
 {% include 'emails.header-text' %}
-{% if transformed|length == 1 %}Firefly III has created a transaction for you. You can find it in your Firefly III installation:{% endif %}
-{% if transformed|length > 1 %}Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:{% endif %}
+{{ trans_choice('email.new_journals_header', transformed|length )|raw }}
 
 
 {% for group in transformed %}

resources/views/v1/emails/undo-email-change-html.twig

@@ -1,18 +1,17 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You or somebody with access to your Firefly III account has changed your email address.
-    If you did not expect this to happen, you <strong>must</strong> follow the "undo"-link below to protect your account!
+    {{ trans('email.email_change_body_to_old')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If you initiated this change, you may safely ignore this message.
+    {{ trans('email.email_change_ignore') }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The old email addres was: <strong>{{ oldEmail }}</strong>
+    {{trans('email.email_change_old_strong', { email: oldEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The new email address is: {{ newEmail }}
+    {{trans('email.email_change_new', { email: newEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To undo the change, follow this link: <a href="{{ uri }}">{{ uri }}</a>
+    {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
 </p>
 {% include 'emails.footer-html' %}

resources/views/v1/emails/undo-email-change-text.twig

@@ -1,12 +1,11 @@
 {% include 'emails.header-text' %}
-You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen,
-you must follow the "undo"-link below to protect your account!
+{{ trans('email.email_change_body_to_old')|striptags|raw }}
 
-If you initiated this change, you may safely ignore this message.
+{{ trans('email.email_change_ignore')|raw }}
 
-The old email addres was: {{ oldEmail }}
+{{trans('email.email_change_old', { email: oldEmail })|raw }}
 
-The new email address is: {{ newEmail }}
+{{trans('email.email_change_new', { email: newEmail })|raw }}
 
-To undo the change, follow this link: {{ uri }}
+{{ trans('email.email_change_undo_link')|raw }} {{ uri }}
 {% include 'emails.footer-text' %}

resources/views/v1/errors/FireflyException.twig

@@ -76,7 +76,7 @@
 {% if debug %}
     <div class="error-stack">
         <h4>Error</h4>
-        <p>This error occured in file <span style="font-family: monospace;">{{ exception.getFile }}</span> on line {{ exception.getLine }} with
+        <p>This error occurred in file <span style="font-family: monospace;">{{ exception.getFile }}</span> on line {{ exception.getLine }} with
             code {{ exception.getCode }}.</p>
         <h4>Stack trace</h4>
         <div style="font-family: monospace;font-size:11px;">

resources/views/v1/list/groups.twig

@@ -104,7 +104,7 @@ TODO: hide and show columns
                     {% endif %}
 
                     {% if transaction.transaction_type_type == 'Transfer' %}
-                        <i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i>
+                        <i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Transfer') }}"></i>
                     {% endif %}
 
                     {% if transaction.transaction_type_type == 'Reconciliation' %}

resources/views/v1/preferences/index.twig

@@ -69,6 +69,8 @@
                                                 </select>
                                             </div></div>
                                         <ul class="text-warning">
+
+                                            {% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
                                             <li>{{ 'pref_locale_no_windows'|_ }}</li>
                                             <li>{{ 'pref_locale_no_docker'|_ }}</li>
                                         </ul>