From 55866ef1fe23b2c28690c4b2197477db942b6475 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 8 Feb 2022 15:09:48 +0100 Subject: [PATCH] change conflicts fixed --- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 64161e214..ea57152e5 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -29,7 +29,8 @@ "decayStart": " - Startblock für Vergänglichkeit am: ", "decay_introduced": "Die Vergänglichkeit wurde eingeführt am ", "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion", - "first_transaction": "Die erste Transaktion hat keine Vergänglichkeit.", + "befor_startblock_transaction": "Die Transanktion binhaltet noch keine Vergänglichkeit.", + "first_transaction": "Die erste Transanktion binhaltet keinen Vergänglichkeit.", "hours": "Stunden", "last_transaction": "Letzte Transaktion", "minutes": "Minuten", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 024cab870..55343c9b8 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -29,7 +29,8 @@ "decayStart": " - Starting block for decay at: ", "decay_introduced": "Decay was introduced on", "decay_since_last_transaction": "Decay since the last transaction", - "first_transaction": "The first transaction has no decay.", + "befor_startblock_transaction": "The transanction does not yet contain transience.", + "first_transaction": "The first transanction does not include decay.", "hours": "Hours", "last_transaction": "Last transaction:", "minutes": "Minutes",