change conflicts fixed

This commit is contained in:
ogerly 2022-02-08 15:09:48 +01:00
parent 9b22b42457
commit 55866ef1fe
2 changed files with 4 additions and 2 deletions

View File

@ -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",

View File

@ -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",