commit 50d3b6ef06a10520b056eeeb4a2859ab91b6706d
parent 6fef7a155107d7a467c1fc62d8de6aa59580c18f
Author: Iván Ávalos <avalos@disroot.org>
Date: Wed, 9 Oct 2024 16:22:10 +0200
[wallet] change terminology: kill -> abandon
bug 0009186
Diffstat:
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/wallet/src/main/res/drawable/ic_fail.xml b/wallet/src/main/res/drawable/ic_fail.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#000000"
- android:viewportHeight="24" android:viewportWidth="24"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M14.69,2.21L4.33,11.49c-0.64,0.58 -0.28,1.65 0.58,1.73L13,14l-4.85,6.76c-0.22,0.31 -0.19,0.74 0.08,1.01h0c0.3,0.3 0.77,0.31 1.08,0.02l10.36,-9.28c0.64,-0.58 0.28,-1.65 -0.58,-1.73L11,10l4.85,-6.76c0.22,-0.31 0.19,-0.74 -0.08,-1.01l0,0C15.47,1.93 15,1.92 14.69,2.21z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+ <path android:fillColor="@android:color/white" android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
+
</vector>
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
@@ -140,7 +140,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="transaction_state_aborted_manual">This transaction was aborted. If you already sent money to this exchange, it will be transferred back to you in %1$s</string>
<string name="transaction_state_aborting">This transaction is aborting</string>
<string name="transaction_state_expired">This transaction has expired</string>
- <string name="transaction_state_failed">This transaction has failed</string>
+ <string name="transaction_state_failed">This transaction has failed or been abandoned</string>
<string name="transaction_state_pending">This transaction is pending</string>
<string name="transaction_state_pending_bank">Waiting for authorization in the bank</string>
<string name="transaction_state_pending_kyc_bank">This transaction would exceed the withdrawal limit set by your bank, in order to continue you must complete KYC verification</string>
@@ -159,9 +159,9 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
<string name="transactions_empty">You don\'t have any transactions</string>
<string name="transactions_empty_search">No transactions found. Try a different search.</string>
<string name="transactions_error">Could not load transactions\n\n%s</string>
- <string name="transactions_fail">Kill</string>
- <string name="transactions_fail_dialog_message">Are you sure you want to kill this transaction? Funds still in transit WILL GET LOST.</string>
- <string name="transactions_fail_dialog_title">Kill Transaction</string>
+ <string name="transactions_fail">Abandon</string>
+ <string name="transactions_fail_dialog_message">Are you sure you abandon this transaction? Funds still in transit WILL GET LOST.</string>
+ <string name="transactions_fail_dialog_title">Abandon transaction</string>
<string name="transactions_receive_funds">Receive</string>
<string name="transactions_receive_funds_title">Receive %1$s</string>
<string name="transactions_resume">Resume</string>
