commit 03f546850bc69dfa152036132a200052636dc76a
parent b49bd0121d492eda3de96559fae4019a9965f91f
Author: Marc Stibane <marc@taler.net>
Date: Fri, 20 Sep 2024 06:57:57 +0200
Fail -> abandon
Diffstat:
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/TalerWallet1/Localizable.xcstrings b/TalerWallet1/Localizable.xcstrings
@@ -1320,78 +1320,78 @@
}
}
},
- "Are you sure you want to abort this transaction?" : {
+ "Are you sure you want to abandon this transaction?" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Sind Sie sicher, dass Sie diese Transaktion abbrechen wollen?"
+ "value" : "Sind Sie sicher, dass Sie diese Transaktion aufgeben wollen?"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Seguro que quiere detener esta transacción?"
+ "value" : "Seguro que quiere fallar esta transacción?"
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Ви впевнені, що хочете скасувати цю транзакцію?"
- }
- }
- }
- },
- "Are you sure you want to delete this payment provider?" : {
- "localizations" : {
- "de" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Sind Sie sicher, dass Sie diesen Zahlungsdienst löschen wollen?"
+ "value" : "Ви впевнені, що хочете провалити цю транзакцію?"
}
}
}
},
- "Are you sure you want to delete this transaction?" : {
+ "Are you sure you want to abort this transaction?" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Sind Sie sicher, dass Sie diese Transaktion löschen wollen?"
+ "value" : "Sind Sie sicher, dass Sie diese Transaktion abbrechen wollen?"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Seguro que quiere borrar esta transacción?"
+ "value" : "Seguro que quiere detener esta transacción?"
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Ви впевнені, що хочете видалити цю транзакцію?"
+ "value" : "Ви впевнені, що хочете скасувати цю транзакцію?"
+ }
+ }
+ }
+ },
+ "Are you sure you want to delete this payment provider?" : {
+ "localizations" : {
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Sind Sie sicher, dass Sie diesen Zahlungsdienst löschen wollen?"
}
}
}
},
- "Are you sure you want to fail this transaction?" : {
+ "Are you sure you want to delete this transaction?" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Sind Sie sicher, dass Sie diese Transaktion scheitern lassen wollen?"
+ "value" : "Sind Sie sicher, dass Sie diese Transaktion löschen wollen?"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Seguro que quiere fallar esta transacción?"
+ "value" : "Seguro que quiere borrar esta transacción?"
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Ви впевнені, що хочете провалити цю транзакцію?"
+ "value" : "Ви впевнені, що хочете видалити цю транзакцію?"
}
}
}
@@ -2959,12 +2959,12 @@
}
}
},
- "For Delete, Fail & Abort buttons" : {
+ "For Delete, Abandon & Abort buttons" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Für Löschen, Scheitern und Annullieren"
+ "value" : "Für Löschen, Aufgeben und Annullieren"
}
},
"es" : {
@@ -3637,24 +3637,24 @@
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Gescheitert"
+ "value" : "Aufgegeben"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Failed"
+ "value" : "Abandoned"
}
},
"es" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Falló"
}
},
"uk" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Провалено"
}
}
@@ -7137,24 +7137,24 @@
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Scheitern"
+ "value" : "Aufgeben"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Fail"
+ "value" : "Abandon"
}
},
"es" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Fallar"
}
},
"uk" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Провалити"
}
}
@@ -7257,24 +7257,24 @@
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Scheitern..."
+ "value" : "Aufgeben..."
}
},
"en" : {
"stringUnit" : {
"state" : "new",
- "value" : "Failing..."
+ "value" : "Abandoning..."
}
},
"es" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Fallando..."
}
},
"uk" : {
"stringUnit" : {
- "state" : "translated",
+ "state" : "needs_review",
"value" : "Провалюється..."
}
}
diff --git a/TalerWallet1/Model/Transaction.swift b/TalerWallet1/Model/Transaction.swift
@@ -126,7 +126,7 @@ enum TransactionMajorState: String, Codable {
case .suspended: return "Suspended"
case .dialog: return String(localized: "MajorState.Dialog", defaultValue: "Dialog", comment: "TxMajorState heading")
case .suspendedAborting: return "AbortingSuspended"
- case .failed: return String(localized: "MajorState.Failed", defaultValue: "Failed", comment: "TxMajorState heading")
+ case .failed: return String(localized: "MajorState.Failed", defaultValue: "Abandoned", comment: "TxMajorState heading")
case .expired: return String(localized: "MajorState.Expired", defaultValue: "Expired", comment: "TxMajorState heading")
case .deleted: return String(localized: "MajorState.Deleted", defaultValue: "Deleted", comment: "TxMajorState heading")
}
@@ -166,7 +166,7 @@ enum TxAction: String, Codable {
case .resume: String("Resume")
case .abort: String(localized: "TxAction.Abort", defaultValue: "Abort", comment: "TxAction button")
// case .revive: String(localized: "TxAction.Revive", defaultValue: "Revive", comment: "TxAction button")
- case .fail: String(localized: "TxAction.Fail", defaultValue: "Fail", comment: "TxAction button")
+ case .fail: String(localized: "TxAction.Fail", defaultValue: "Abandon", comment: "TxAction button")
case .retry: String(localized: "TxAction.Retry", defaultValue: "Retry now", comment: "TxAction button")
}
}
@@ -193,7 +193,7 @@ enum TxAction: String, Codable {
case .resume: return String("Resuming...")
case .abort: return String(localized: "TxActionDone.Abort", defaultValue: "Abort pending...", comment: "TxAction button")
// case .revive: return String(localized: "TxActionDone.Revive", defaultValue: "Revive", comment: "TxAction button")
- case .fail: return String(localized: "TxActionDone.Fail", defaultValue: "Failing...", comment: "TxAction button")
+ case .fail: return String(localized: "TxActionDone.Fail", defaultValue: "Abandoning...", comment: "TxAction button")
case .retry: return String(localized: "TxActionDone.Retry", defaultValue: "Retrying...", comment: "TxAction button")
}
}
diff --git a/TalerWallet1/Views/Settings/SettingsView.swift b/TalerWallet1/Views/Settings/SettingsView.swift
@@ -122,7 +122,7 @@ struct SettingsView: View {
SettingsToggle(name: String(localized: "Play Payment Sounds"), value: $playSoundsB, id1: "playSounds",
description: hideDescriptions ? nil : String(localized: "When a transaction finished"))
SettingsToggle(name: String(localized: "Show Warnings"), value: $shouldShowWarning, id1: "warnings",
- description: hideDescriptions ? nil : String(localized: "For Delete, Fail & Abort buttons"))
+ description: hideDescriptions ? nil : String(localized: "For Delete, Abandon & Abort buttons"))
// SettingsFont(title: String(localized: "Font:"), value: talerFontIndex, action: redraw)
// .id("font")
SettingsStyle(title: String(localized: "List Style:"), myListStyle: $myListStyle)
diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryV.swift b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
@@ -170,7 +170,7 @@ struct TransactionSummaryV: View {
} } // Abort button
if transaction.isFailable { if let failAction {
TransactionButton(transactionId: common.transactionId, command: .fail,
- warning: String(localized: "Are you sure you want to fail this transaction?"),
+ warning: String(localized: "Are you sure you want to abandon this transaction?"),
action: failAction)
} } // Fail button
if transaction.isDeleteable { if let deleteAction {
