[wallet] Organize strings alphabetically and generalize amount stringsdev/ivan-avalos/res-cleanup

bug 0008587

14 files changed, 206 insertions, 197 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
index 2accaaf..25d35ec 100644
--- a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
@@ -144,9 +144,9 @@ private fun ReceiveFundsIntro(
                     isError = false
                     text = input
                 },
-                label = { Text(stringResource(R.string.receive_amount)) },
+                label = { Text(stringResource(R.string.amount_receive)) },
                 supportingText = {
-                    if (isError) Text(stringResource(R.string.receive_amount_invalid))
+                    if (isError) Text(stringResource(R.string.amount_invalid))
                 },
                 isError = isError,
                 numberOfDecimals = spec?.numFractionalInputDigits ?: DEFAULT_INPUT_DECIMALS,
diff --git a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
index 2581979..ca72a64 100644
--- a/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/SendFundsFragment.kt
@@ -126,9 +126,9 @@ private fun SendFundsIntro(
                     insufficientBalance = false
                     text = input
                 },
-                label = { Text(stringResource(R.string.send_amount)) },
+                label = { Text(stringResource(R.string.amount_send)) },
                 supportingText = {
-                    if (isError) Text(stringResource(R.string.receive_amount_invalid))
+                    if (isError) Text(stringResource(R.string.amount_invalid))
                     else if (insufficientBalance) {
                         Text(stringResource(R.string.payment_balance_insufficient))
                     }
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt
index 3fa0d98..411f88e 100644
--- a/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeBitcoinDepositComposable.kt
@@ -91,7 +91,7 @@ fun MakeBitcoinDepositComposable(
         }
         val amountTitle = if (state.effectiveDepositAmount == null) {
             R.string.amount_chosen
-        } else R.string.send_deposit_amount_effective
+        } else R.string.amount_effective
         TransactionAmountComposable(
             label = stringResource(id = amountTitle),
             amount = state.effectiveDepositAmount ?: amount,
@@ -111,7 +111,7 @@ fun MakeBitcoinDepositComposable(
                     amountType = AmountType.Negative,
                 )
                 TransactionAmountComposable(
-                    label = stringResource(id = R.string.send_amount),
+                    label = stringResource(id = R.string.amount_send),
                     amount = totalAmount,
                     amountType = AmountType.Positive,
                 )
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt
index 9333ce1..6b7657d 100644
--- a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt
@@ -143,7 +143,7 @@ fun MakeDepositComposable(
                 )
 
                 TransactionAmountComposable(
-                    label = stringResource(R.string.send_amount),
+                    label = stringResource(R.string.amount_send),
                     amount = effectiveAmount.withSpec(amount.spec),
                     amountType = Positive,
                 )
diff --git a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt
index 8961016..0dd3abd 100644
--- a/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/deposit/PayToUriFragment.kt
@@ -140,7 +140,7 @@ private fun PayToComposable(
                 amountError = ""
                 amountText = input
             },
-            label = { Text(stringResource(R.string.send_amount)) },
+            label = { Text(stringResource(R.string.amount_send)) },
             supportingText = {
                 if (amountError.isNotBlank()) Text(amountError)
             },
@@ -158,7 +158,7 @@ private fun PayToComposable(
         }
 
         val focusManager = LocalFocusManager.current
-        val errorStrInvalidAmount = stringResource(id = R.string.receive_amount_invalid)
+        val errorStrInvalidAmount = stringResource(id = R.string.amount_invalid)
         val errorStrInsufficientBalance = stringResource(id = R.string.payment_balance_insufficient)
         Button(
             modifier = Modifier.padding(16.dp),
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt
index 3ea04cc..2c92739 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt
@@ -54,7 +54,7 @@ fun PayTemplateComposable(
 ) {
     // If wallet is empty, there's no way the user can pay something
     if (amountStatus is AmountFieldStatus.Invalid) {
-        PayTemplateError(stringResource(R.string.receive_amount_invalid))
+        PayTemplateError(stringResource(R.string.amount_invalid))
     } else if (currencies.isEmpty()) {
         PayTemplateError(stringResource(R.string.payment_balance_insufficient))
     } else when (val p = payStatus) {
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt
index d6131c7..9647c42 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateOrderComposable.kt
@@ -85,7 +85,7 @@ fun PayTemplateOrderComposable(
             onClick = {
                 when (val res = onCreateAmount(amount, currency)) {
                     is AmountResult.InsufficientBalance -> onError(R.string.payment_balance_insufficient)
-                    is AmountResult.InvalidAmount -> onError(R.string.receive_amount_invalid)
+                    is AmountResult.InvalidAmount -> onError(R.string.amount_invalid)
                     is AmountResult.Success -> onSubmit(summary, res.amount)
                 }
             },
@@ -113,7 +113,7 @@ private fun AmountField(
                 .weight(1f),
             value = amount,
             onValueChange = { onAmountChosen(it, currency) },
-            label = { Text(stringResource(R.string.send_amount)) }
+            label = { Text(stringResource(R.string.amount_send)) }
         )
         CurrencyDropdown(
             modifier = Modifier.weight(1f),
diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
index 1ce0175..27403f4 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt
@@ -134,7 +134,7 @@ fun ColumnScope.PeerPullTermsComposable(
                 modifier = Modifier.align(End),
             ) {
                 Text(
-                    text = stringResource(id = R.string.payment_label_amount_total),
+                    text = stringResource(id = R.string.amount_total),
                     style = MaterialTheme.typography.bodyLarge,
                 )
                 Text(
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
index 3b15b6f..0eb3cf0 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -46,10 +46,11 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit
     if (t.error == null) PeerQrCode(
         state = t.txState,
         talerUri = t.talerUri,
+        isPush = false,
     )
     
     TransactionAmountComposable(
-        label = stringResource(id = R.string.receive_peer_amount_invoiced),
+        label = stringResource(id = R.string.amount_invoiced),
         amount = t.amountRaw.withSpec(spec),
         amountType = AmountType.Neutral,
     )
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
index e592c3e..39a4007 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -87,12 +87,16 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: TransactionPeerPushDebit,
 }
 
 @Composable
-fun ColumnScope.PeerQrCode(state: TransactionState, talerUri: String?) {
+fun ColumnScope.PeerQrCode(state: TransactionState, talerUri: String?, isPush: Boolean = true) {
     if (state == TransactionState(Pending)) {
         Text(
             modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp),
             style = MaterialTheme.typography.titleLarge,
-            text = stringResource(id = R.string.send_peer_payment_instruction),
+            text = if (isPush) {
+                stringResource(id = R.string.send_peer_payment_instruction)
+            } else {
+                stringResource(id = R.string.receive_peer_invoice_instruction)
+            },
             textAlign = TextAlign.Center,
         )
 
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
index c499c3b..ffd68c0 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
@@ -70,7 +70,7 @@ class ManualWithdrawFragment : Fragment() {
     private fun onCheckFees() {
         val currency = exchangeItem.currency
         if (currency == null || ui.amountView.text?.isEmpty() != false) {
-            ui.amountLayout.error = getString(R.string.withdraw_amount_error)
+            ui.amountLayout.error = getString(R.string.amount_error)
             return
         }
         ui.amountLayout.error = null
@@ -78,7 +78,7 @@ class ManualWithdrawFragment : Fragment() {
         try {
             amount = Amount.fromString(currency, ui.amountView.text.toString())
         } catch (e: AmountParserException) {
-            ui.amountLayout.error = getString(R.string.withdraw_amount_error)
+            ui.amountLayout.error = getString(R.string.amount_error)
             return
         }
         ui.amountView.hideKeyboard()
diff --git a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
index b5eabbe..6945b8a 100644
--- a/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
+++ b/wallet/src/main/res/layout-w550dp/payment_bottom_bar.xml
@@ -31,7 +31,7 @@
             android:id="@+id/totalLabelView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/payment_label_amount_total"
+            android:text="@string/amount_total"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/totalView"
diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml
index 496f2f3..50b78ec 100644
--- a/wallet/src/main/res/layout/payment_bottom_bar.xml
+++ b/wallet/src/main/res/layout/payment_bottom_bar.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:text="@string/payment_label_amount_total"
+            android:text="@string/amount_total"
             android:visibility="invisible"
             app:layout_constraintBottom_toTopOf="@+id/confirmButton"
             app:layout_constraintEnd_toStartOf="@+id/totalView"
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 64a0d7b..a46148b 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -33,289 +33,293 @@ When making a payment, customers only need a charged wallet. A merchant can acce
 GNU Taler is immune against many types of fraud, such as phishing of credit card information or chargeback fraud. In case of loss or theft, only the limited amount of money left in the wallet might be gone.
 ]]></string>
 
-    <string name="nav_header_title">GNU Taler</string>
+    <string name="nav_error">Error</string>
+    <string name="nav_exchange_fees">Exchange Fees</string>
+    <string name="nav_exchange_tos">Exchange\'s Terms of Service</string>
     <string name="nav_header_subtitle">Wallet</string>
-
+    <string name="nav_header_title">GNU Taler</string>
     <string name="nav_prompt_withdraw">Withdraw Digital Cash</string>
-    <string name="nav_exchange_tos">Exchange\'s Terms of Service</string>
-    <string name="nav_exchange_select">Select Exchange</string>
-    <string name="nav_exchange_fees">Exchange Fees</string>
-    <string name="nav_error">Error</string>
+
+    <!-- General -->
 
     <string name="button_back">Go Back</string>
     <string name="button_scan_qr_code">Scan Taler QR Code</string>
     <string name="button_scan_qr_code_label">Scan QR code</string>
-    <string name="enter_uri">Enter Taler URI</string>
-    <string name="copy" tools:override="true">Copy</string>
-    <string name="copy_uri">Copy Taler URI</string>
-    <string name="paste">Paste</string>
-    <string name="paste_invalid">Clipboard contains an invalid data type</string>
-    <string name="uri_invalid">Not a valid Taler URI</string>
-    <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="search">Search</string>
-    <string name="menu">Menu</string>
-    <string name="or">or</string>
-    <string name="currency">Currency</string>
     <!-- The count should be mirrored in RTL languages -->
     <string name="char_count">%1$d/%2$d</string>
+    <string name="copy" tools:override="true">Copy</string>
+    <string name="currency">Currency</string>
+    <string name="enter_uri">Enter Taler URI</string>
     <string name="import_db">Import</string>
+    <string name="menu">Menu</string>
+    <string name="offline">Operation requires internet access. Please ensure your internet connection works and try again.</string>
+    <string name="offline_banner">No internet access</string>
+    <string name="ok">OK</string>
+    <string name="or">or</string>
+    <string name="paste">Paste</string>
+    <string name="paste_invalid">Clipboard contains an invalid data type</string>
     <string name="reset">Reset</string>
+    <string name="search">Search</string>
     <string name="share_payment">Share payment link</string>
+    <string name="uri_invalid">Not a valid Taler URI</string>
 
-    <string name="offline">Operation requires internet access. Please ensure your internet connection works and try again.</string>
-    <string name="offline_banner">No internet access</string>
-    <string name="error_unsupported_uri">Error: This Taler URI is not supported.</string>
-    <string name="error_broken_uri">Error: This Taler URI is (currently) not working.</string>
+    <!-- Errors -->
 
-    <string name="menu_settings">Settings</string>
-    <string name="menu_retry_pending_operations">Retry Pending Operations</string>
+    <string name="error_broken_uri">Error: This Taler URI is (currently) not working.</string>
+    <string name="error_unsupported_uri">Error: This Taler URI is not supported.</string>
 
-    <string name="host_apdu_service_desc">Taler NFC Payments</string>
+    <!-- URI handling -->
 
     <string name="handle_uri_title">Loading action</string>
 
-    <string name="balances_title">Balances</string>
-    <string name="amount_positive">+%s</string>
-    <string name="amount_negative">-%s</string>
+    <!-- Amounts -->
+
     <string name="amount_chosen">Chosen Amount</string>
-    <string name="amount_sent">Amount sent</string>
+    <string name="amount_effective">Effective amount</string>
+    <string name="amount_error">Enter valid amount</string>
+    <string name="amount_invalid">Amount invalid</string>
+    <string name="amount_invoiced">Amount invoiced</string>
+    <string name="amount_negative">-%s</string>
+    <string name="amount_positive">+%s</string>
+    <string name="amount_receive">Amount to receive</string>
     <string name="amount_received">Amount received</string>
+    <string name="amount_send">Amount to send</string>
+    <string name="amount_sent">Amount sent</string>
+    <string name="amount_total">Total amount</string>
+
+    <!-- Balances -->
+
+    <string name="balances_title">Balances</string>
     <string name="balances_inbound_label">inbound</string>
     <string name="balances_empty_state">There is no digital cash in your wallet.\n\nYou can get test money from the demo bank:\n\nhttps://bank.demo.taler.net</string>
     <string name="balance_scope_exchange">Exchange: %1$s</string>
     <string name="balance_scope_auditor">Auditor: %1$s</string>
 
-    <string name="transactions_title">Transactions</string>
+    <!-- Transactions -->
+
+    <string name="transaction_action_kyc">Complete KYC</string>
+    <string name="transaction_deposit">Deposit</string>
+    <string name="transaction_dummy_title">Unknown Transaction</string>
+    <string name="transaction_order">Purchase</string>
+    <string name="transaction_order_id">Receipt #%1$s</string>
+    <string name="transaction_order_total">Total</string>
+    <string name="transaction_paid">Paid</string>
+    <string name="transaction_peer_pull_credit">Invoice</string>
+    <string name="transaction_peer_pull_debit">Invoice paid</string>
+    <string name="transaction_peer_push_credit">Push payment</string>
+    <string name="transaction_peer_push_debit">Push payment</string>
+    <string name="transaction_pending">PENDING</string>
+    <string name="transaction_refresh">Coin expiry change fee</string>
+    <string name="transaction_refund">Refund</string>
+    <string name="transaction_refund_from">Refund from %s</string>
+    <string name="transactions_abort">Abort</string>
+    <string name="transactions_abort_dialog_message">Are you sure you want to abort this transaction? Funds still in transit might get lost.</string>
+    <string name="transactions_abort_dialog_title">Abort Transaction</string>
     <string name="transactions_balance">Balance</string>
-    <string name="transactions_send_funds">Send\nFunds</string>
-    <string name="transactions_send_funds_title">Send %1$s</string>
-    <string name="transactions_receive_funds">Receive\nFunds</string>
-    <string name="transactions_receive_funds_title">Receive %1$s</string>
+    <string name="transactions_delete">Delete</string>
+    <string name="transactions_delete_dialog_message">Are you sure you want to remove this transaction from your wallet?</string>
+    <string name="transactions_delete_dialog_title">Delete Transaction</string>
+    <string name="transactions_delete_selected_dialog_message">Are you sure you want to remove the selected transactions from your wallet?</string>
+    <string name="transactions_detail_title">Transaction</string>
+    <string name="transactions_detail_title_currency">%s Transactions</string>
     <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_detail_title">Transaction</string>
-    <string name="transactions_detail_title_currency">%s Transactions</string>
-    <string name="transactions_delete">Delete</string>
-    <string name="transactions_retry">Retry</string>
-    <string name="transactions_abort">Abort</string>
     <string name="transactions_fail">Kill</string>
-    <string name="transactions_suspend">Suspend</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_receive_funds">Receive\nFunds</string>
+    <string name="transactions_receive_funds_title">Receive %1$s</string>
     <string name="transactions_resume">Resume</string>
+    <string name="transactions_retry">Retry</string>
     <string name="transactions_select_all">Select All</string>
-    <string name="transactions_delete_dialog_title">Delete Transaction</string>
-    <string name="transactions_delete_dialog_message">Are you sure you want to remove this transaction from your wallet?</string>
-    <string name="transactions_delete_selected_dialog_message">Are you sure you want to remove the selected transactions from your wallet?</string>
-    <string name="transactions_abort_dialog_title">Abort Transaction</string>
-    <string name="transactions_abort_dialog_message">Are you sure you want to abort this transaction? Funds still in transit might get lost.</string>
-    <string name="transactions_fail_dialog_title">Kill Transaction</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_cancel_dialog_message">Are you sure you want to cancel this withdrawal? Funds still in transit might get lost.</string>
+    <string name="transactions_send_funds">Send\nFunds</string>
+    <string name="transactions_send_funds_title">Send %1$s</string>
+    <string name="transactions_suspend">Suspend</string>
+    <string name="transactions_title">Transactions</string>
 
-    <!-- Transactions -->
-    <string name="transaction_paid">Paid</string>
-    <string name="transaction_order_total">Total</string>
-    <string name="transaction_order">Purchase</string>
-    <string name="transaction_order_id">Receipt #%1$s</string>
-    <string name="transaction_refund">Refund</string>
-    <string name="transaction_refund_from">Refund from %s</string>
-    <string name="transaction_pending">PENDING</string>
-    <string name="transaction_refresh">Coin expiry change fee</string>
-    <string name="transaction_deposit">Deposit</string>
-    <string name="transaction_peer_push_debit">Push payment</string>
-    <string name="transaction_peer_pull_credit">Invoice</string>
-    <string name="transaction_peer_pull_debit">Invoice paid</string>
-    <string name="transaction_peer_push_credit">Push payment</string>
-    <string name="transaction_action_kyc">Complete KYC</string>
-    <string name="transaction_dummy_title">Unknown Transaction</string>
+    <!-- Payments -->
 
-    <string name="payment_title">Payment</string>
-    <string name="payment_prompt_title">Review Payment</string>
-    <string name="payment_fee">+%s payment fee</string>
+    <string name="payment_aborted">Aborted</string>
+    <string name="payment_already_paid">You\'ve already paid for this purchase.</string>
+    <string name="payment_balance_insufficient">Balance insufficient!</string>
     <string name="payment_button_confirm">Confirm Payment</string>
-    <string name="payment_label_amount_total">Total Amount:</string>
-    <string name="payment_label_order_summary">Purchase</string>
+    <string name="payment_confirmation_code">Confirmation code</string>
+    <string name="payment_create_order">Create order</string>
     <string name="payment_error">Error: %s</string>
-    <string name="payment_pending">Payment not completed, it will be retried</string>
-    <string name="payment_balance_insufficient">Balance insufficient!</string>
-    <string name="payment_aborted">Aborted</string>
     <string name="payment_failed">Failed</string>
+    <string name="payment_fee">+%s payment fee</string>
     <string name="payment_initiated">Payment initiated</string>
-    <string name="payment_already_paid_title">Already paid</string>
-    <string name="payment_already_paid">You\'ve already paid for this purchase.</string>
+    <string name="payment_label_order_summary">Purchase</string>
     <string name="payment_pay_template_title">Customize your order</string>
-    <string name="payment_create_order">Create order</string>
-    <string name="payment_confirmation_code">Confirmation code</string>
+    <string name="payment_pending">Payment not completed, it will be retried</string>
+    <string name="payment_prompt_title">Review Payment</string>
     <string name="payment_template_error">Error creating order</string>
+    <string name="payment_title">Payment</string>
+
+    <!-- Peer receive -->
 
-    <string name="receive_amount">Amount to receive</string>
-    <string name="receive_amount_invalid">Amount invalid</string>
     <string name="receive_intro">Choose where to receive money from:</string>
-    <string name="receive_withdraw">Withdraw from bank account</string>
     <string name="receive_peer">Invoice another wallet</string>
-    <string name="receive_peer_title">Request payment</string>
     <string name="receive_peer_create_button">Create invoice</string>
     <string name="receive_peer_invoice_instruction">Let the payer scan this QR code to pay:</string>
     <string name="receive_peer_invoice_uri">Alternatively, copy and send this URI:</string>
-    <string name="receive_peer_amount_invoiced">Amount invoiced</string>
+    <string name="receive_peer_payment_intro">Do you want to receive this payment?</string>
+    <string name="receive_peer_payment_title">Receive payment</string>
+    <string name="receive_peer_title">Request payment</string>
+    <string name="receive_withdraw">Withdraw from bank account</string>
 
-    <string name="send_amount">Amount to send</string>
-    <string name="send_intro">Choose where to send money to:</string>
+    <!-- Peer send -->
+
+    <string name="pay_peer_title">Pay invoice</string>
+    <string name="pay_peer_intro">Do you want to pay this invoice?</string>
     <string name="send_deposit">To a bank account</string>
     <string name="send_deposit_bitcoin">To a Bitcoin wallet</string>
-    <string name="send_deposit_title">Deposit to a bank account</string>
-    <string name="send_deposit_iban">IBAN</string>
-    <string name="send_deposit_iban_error">IBAN is invalid</string>
-    <string name="send_deposit_bic_error">BIC is invalid</string>
-    <string name="send_deposit_bic">BIC/SWIFT</string>
-    <string name="send_deposit_name">Account holder</string>
     <string name="send_deposit_bitcoin_address">Bitcoin address</string>
+    <string name="send_deposit_bitcoin_create_button">Transfer Bitcoin</string>
     <string name="send_deposit_check_fees_button">Check fees</string>
-    <string name="send_deposit_amount_effective">Effective Amount</string>
     <string name="send_deposit_create_button">Make deposit</string>
-    <string name="send_deposit_bitcoin_create_button">Transfer Bitcoin</string>
+    <string name="send_deposit_iban">IBAN</string>
+    <string name="send_deposit_iban_error">IBAN is invalid</string>
+    <string name="send_deposit_name">Account holder</string>
+    <string name="send_deposit_title">Deposit to a bank account</string>
+    <string name="send_intro">Choose where to send money to:</string>
     <string name="send_peer">To another wallet</string>
     <string name="send_peer_bitcoin">To another Taler wallet</string>
-    <string name="send_peer_title">Send money to another wallet</string>
     <string name="send_peer_create_button">Send funds now</string>
-    <string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string>
-    <string name="send_peer_expiration_period">Expires in</string>
     <string name="send_peer_expiration_1d">1 day</string>
-    <string name="send_peer_expiration_7d">7 days</string>
     <string name="send_peer_expiration_30d">30 days</string>
+    <string name="send_peer_expiration_7d">7 days</string>
     <string name="send_peer_expiration_custom">Custom</string>
     <string name="send_peer_expiration_days">Days</string>
     <string name="send_peer_expiration_hours">Hours</string>
+    <string name="send_peer_expiration_period">Expires in</string>
+    <string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string>
     <string name="send_peer_purpose">Purpose</string>
+    <string name="send_peer_title">Send money to another wallet</string>
 
-    <string name="pay_peer_title">Pay invoice</string>
-    <string name="pay_peer_intro">Do you want to pay this invoice?</string>
-    <string name="receive_peer_payment_title">Receive payment</string>
-    <string name="receive_peer_payment_intro">Do you want to receive this payment?</string>
+    <!-- Withdrawals -->
 
-    <string name="withdraw_initiated">Withdrawal initiated</string>
-    <string name="withdraw_title">Withdrawal</string>
-    <string name="withdraw_subtitle">Select target bank account</string>
-    <string name="withdraw_total">Withdraw</string>
-    <string name="withdraw_fees">Fee</string>
-    <string name="withdraw_restrict_age">Restrict Usage to Age</string>
-    <string name="withdraw_restrict_age_unrestricted">Unrestricted</string>
-    <string name="withdraw_exchange">Exchange</string>
-    <string name="withdraw_bank">Bank</string>
+    <string name="withdraw_account">Account #%1$d</string>
+    <string name="withdraw_account_currency">Account #%1$d (%2$s)</string>
     <string name="withdraw_button_confirm">Confirm Withdraw</string>
     <string name="withdraw_button_confirm_bank">Confirm with bank</string>
     <string name="withdraw_button_tos">Review Terms</string>
-    <string name="withdraw_waiting_confirm">Waiting for confirmation</string>
-    <string name="withdraw_manual_title">Make a manual transfer to the exchange</string>
-    <string name="withdraw_amount">How much to withdraw?</string>
-    <string name="withdraw_amount_error">Enter valid amount</string>
-    <string name="withdraw_manual_payment_options">Payment options supported by %1$s:\n\n%2$s</string>
+    <string name="withdraw_conversion">Conversion</string>
+    <string name="withdraw_error_message">Withdrawing is currently not possible. Please try again later!</string>
+    <string name="withdraw_error_test">Error withdrawing TESTKUDOS</string>
+    <string name="withdraw_error_title">Withdrawal Error</string>
+    <string name="withdraw_exchange">Exchange</string>
+    <string name="withdraw_fees">Fee</string>
+    <string name="withdraw_initiated">Withdrawal initiated</string>
+    <string name="withdraw_manual_bitcoin_intro">Now make a split transaction with the following three outputs.</string>
     <string name="withdraw_manual_check_fees">Check fees</string>
-    <string name="withdraw_manual_ready_title">Exchange is ready for withdrawal!</string>
-    <string name="withdraw_manual_ready_intro">To complete the process you need to wire %s to the exchange bank account</string>
+    <string name="withdraw_manual_payment_options">Payment options supported by %1$s:\n\n%2$s</string>
+    <string name="withdraw_manual_ready_account">Account</string>
+    <string name="withdraw_manual_ready_bank_button">Open in banking app</string>
     <string name="withdraw_manual_ready_details_intro">Bank transfer details</string>
-    <string name="withdraw_manual_bitcoin_title">Bitcoin exchange ready for withdrawal</string>
-    <string name="withdraw_manual_bitcoin_intro">Now make a split transaction with the following three outputs.</string>
     <string name="withdraw_manual_ready_iban">IBAN</string>
-    <string name="withdraw_manual_ready_account">Account</string>
+    <string name="withdraw_manual_ready_intro">To complete the process you need to wire %s to the exchange bank account</string>
     <string name="withdraw_manual_ready_receiver">Receiver name</string>
     <string name="withdraw_manual_ready_subject">Subject</string>
-    <string name="withdraw_manual_ready_bank_button">Open in banking app</string>
-    <string name="withdraw_manual_ready_cancel">Cancel withdrawal</string>
     <string name="withdraw_manual_ready_warning">Make sure to use the correct subject, otherwise the money will not arrive in this wallet.</string>
-    <string name="withdraw_error_title">Withdrawal Error</string>
-    <string name="withdraw_error_message">Withdrawing is currently not possible. Please try again later!</string>
-    <string name="withdraw_error_test">Error withdrawing TESTKUDOS</string>
-    <string name="withdraw_account">Account #%1$d</string>
-    <string name="withdraw_account_currency">Account #%1$d (%2$s)</string>
+    <string name="withdraw_manual_title">Make a manual transfer to the exchange</string>
+    <string name="withdraw_restrict_age">Restrict Usage to Age</string>
+    <string name="withdraw_restrict_age_unrestricted">Unrestricted</string>
+    <string name="withdraw_subtitle">Select target bank account</string>
+    <string name="withdraw_title">Withdrawal</string>
+    <string name="withdraw_total">Withdraw</string>
     <string name="withdraw_transfer">Transfer</string>
-    <string name="withdraw_conversion">Conversion</string>
-    <string name="withdraw_conversion_support">This exchange supports currency conversion</string>
+    <string name="withdraw_waiting_confirm">Waiting for confirmation</string>
 
-    <string name="exchange_settings_title">Exchanges</string>
-    <string name="exchange_settings_summary">Manage list of exchanges known to this wallet</string>
-    <string name="exchange_list_title">Exchanges</string>
-    <string name="exchange_list_empty">No exchanges known\n\nAdd one manually or withdraw digital cash!</string>
-    <string name="exchange_list_currency">Currency: %s</string>
-    <string name="exchange_list_add">Add exchange</string>
-    <string name="exchange_list_select">Select exchange</string>
+    <!-- Exchanges -->
+
+    <string name="exchange_add_error">Could not add exchange</string>
+    <string name="exchange_add_url">Enter address of exchange</string>
     <string name="exchange_delete">Delete exchange</string>
     <string name="exchange_delete_force">Force deletion (purge)</string>
-    <string name="exchange_dialog_delete_message">Are you sure you want to delete this exchange? Forcing this operation will result in a loss of funds.</string>
-    <string name="exchange_not_contacted">Exchange not contacted</string>
-    <string name="exchange_add_url">Enter address of exchange</string>
-    <string name="exchange_add_error">Could not add exchange</string>
-    <string name="exchange_list_error">Could not list exchanges</string>
-    <string name="exchange_list_add_dev">Add development exchanges</string>
-    <string name="exchange_menu_manual_withdraw">Withdraw</string>
-
-    <string name="exchange_fee_withdrawal_fee_label">Withdrawal Fee:</string>
-    <string name="exchange_fee_overhead_label">Rounding Loss:</string>
-    <string name="exchange_fee_coin_expiration_label">Earliest Coin Expiry:</string>
-    <string name="exchange_fee_coin_fees_label">Coin Fees</string>
-    <string name="exchange_fee_wire_fees_label">Wire Fees</string>
     <plurals name="exchange_fee_coin">
         <item quantity="one">Coin: %s (used %d time)</item>
         <item quantity="other">Coin: %s (used %d times)</item>
     </plurals>
-    <string name="exchange_fee_withdraw_fee">Withdraw Fee: %s</string>
+    <string name="exchange_fee_coin_expiration_label">Earliest Coin Expiry:</string>
+    <string name="exchange_fee_coin_fees_label">Coin Fees</string>
     <string name="exchange_fee_deposit_fee">Deposit Fee: %s</string>
+    <string name="exchange_fee_overhead_label">Rounding Loss:</string>
     <string name="exchange_fee_refresh_fee">Change Fee: %s</string>
     <string name="exchange_fee_refund_fee">Refund Fee: %s</string>
+    <string name="exchange_fee_wire_fee_closing_fee">Closing Fee: %s</string>
     <string name="exchange_fee_wire_fee_timespan">Timespan: %1$s - %2$s</string>
     <string name="exchange_fee_wire_fee_wire_fee">Wire Fee: %s</string>
-    <string name="exchange_fee_wire_fee_closing_fee">Closing Fee: %s</string>
+    <string name="exchange_fee_wire_fees_label">Wire Fees</string>
+    <string name="exchange_fee_withdraw_fee">Withdraw Fee: %s</string>
+    <string name="exchange_fee_withdrawal_fee_label">Withdrawal Fee:</string>
+    <string name="exchange_list_add">Add exchange</string>
+    <string name="exchange_list_add_dev">Add development exchanges</string>
+    <string name="exchange_list_currency">Currency: %s</string>
+    <string name="exchange_list_empty">No exchanges known\n\nAdd one manually or withdraw digital cash!</string>
+    <string name="exchange_list_error">Could not list exchanges</string>
+    <string name="exchange_list_select">Select exchange</string>
+    <string name="exchange_list_title">Exchanges</string>
+    <string name="exchange_menu_manual_withdraw">Withdraw</string>
+    <string name="exchange_not_contacted">Exchange not contacted</string>
+    <string name="exchange_settings_summary">Manage list of exchanges known to this wallet</string>
+    <string name="exchange_settings_title">Exchanges</string>
     <string name="exchange_tos_accept">Accept Terms of Service</string>
     <string name="exchange_tos_error">Error showing Terms of Service: %s</string>
 
-    <string name="pending_operations_title">Pending Operations</string>
-    <string name="pending_operations_refuse">Refuse Proposal</string>
-    <string name="pending_operations_no_action">(no action)</string>
-
     <!-- Observability -->
-    <string name="show_logs">Show logs</string>
-    <string name="observability_title">Internal event log</string>
-    <string name="observability_show_json">Show JSON</string>
+
     <string name="observability_hide_json">Hide JSON</string>
+    <string name="observability_show_json">Show JSON</string>
+    <string name="observability_title">Internal event log</string>
+    <string name="show_logs">Show logs</string>
 
-    <string name="settings_dev_mode">Developer Mode</string>
-    <string name="settings_dev_mode_summary">Shows more information intended for debugging</string>
-    <string name="settings_withdraw_testkudos">Withdraw TESTKUDOS</string>
-    <string name="settings_withdraw_testkudos_summary">Get money for testing</string>
-    <string name="settings_logcat">Debug log</string>
-    <string name="settings_logcat_summary">Save internal log</string>
-    <string name="settings_logcat_error">Error exporting log</string>
-    <string name="settings_logcat_success">Log exported to file</string>
+    <!-- Settings -->
+
+    <string name="menu_settings">Settings</string>
+    <string name="settings_alert_import_canceled">Import cancelled</string>
+    <string name="settings_alert_reset_canceled">Reset cancelled</string>
+    <string name="settings_alert_reset_done">Wallet has been reset</string>
+    <string name="settings_db_clear_error">Error cleaning database</string>
     <string name="settings_db_export">Export database</string>
+    <string name="settings_db_export_error">Error exporting database</string>
+    <string name="settings_db_export_success">Database exported to file</string>
     <string name="settings_db_export_summary">Save internal database</string>
     <string name="settings_db_import">Import database</string>
-    <string name="settings_db_import_summary">Restore database from file</string>
-    <string name="settings_db_export_error">Error exporting database</string>
     <string name="settings_db_import_error">Error importing database</string>
-    <string name="settings_db_clear_error">Error cleaning database</string>
-    <string name="settings_db_export_success">Database exported to file</string>
     <string name="settings_db_import_success">Database imported from file</string>
+    <string name="settings_db_import_summary">Restore database from file</string>
+    <string name="settings_dev_mode">Developer Mode</string>
+    <string name="settings_dev_mode_summary">Shows more information intended for debugging</string>
+    <string name="settings_dialog_import_message">This operation will overwrite your existing database. Do you want to continue?</string>
+    <string name="settings_dialog_reset_message">Do you really want to reset the wallet and lose all coins and purchases?</string>
+    <string name="settings_logcat">Debug log</string>
+    <string name="settings_logcat_error">Error exporting log</string>
+    <string name="settings_logcat_success">Log exported to file</string>
+    <string name="settings_logcat_summary">Save internal log</string>
+    <string name="settings_reset">Reset Wallet (dangerous!)</string>
+    <string name="settings_reset_summary">Throws away your money</string>
+    <string name="settings_test">Run integration test</string>
+    <string name="settings_test_summary">Performs test transactions with demo setup</string>
     <string name="settings_version_app">App Version</string>
     <string name="settings_version_core">Wallet Core Version</string>
     <string name="settings_version_protocol_exchange">Supported Exchange Versions</string>
     <string name="settings_version_protocol_merchant">Supported Merchant Versions</string>
     <string name="settings_version_unknown">Unknown</string>
-    <string name="settings_test">Run integration test</string>
-    <string name="settings_test_summary">Performs test transactions with demo setup</string>
-    <string name="settings_reset">Reset Wallet (dangerous!)</string>
-    <string name="settings_reset_summary">Throws away your money</string>
+    <string name="settings_withdraw_testkudos">Withdraw TESTKUDOS</string>
+    <string name="settings_withdraw_testkudos_summary">Get money for testing</string>
 
-    <string name="settings_dialog_reset_message">Do you really want to reset the wallet and lose all coins and purchases?</string>
-    <string name="settings_dialog_import_message">This operation will overwrite your existing database. Do you want to continue?</string>
-    <string name="settings_alert_reset_done">Wallet has been reset</string>
-    <string name="settings_alert_reset_canceled">Reset cancelled</string>
-    <string name="settings_alert_import_canceled">Import cancelled</string>
+    <!-- Refunds -->
 
-    <string name="refund_title">Refund</string>
     <string name="refund_error">Error processing refund</string>
     <string name="refund_success">Refund received!</string>
+    <string name="refund_title">Refund</string>
 
+    <!-- Misc -->
+
+    <string name="host_apdu_service_desc">Taler NFC Payments</string>
     <string name="wifi_disabled_error">Turn on Wi-Fi to get free Wi-Fi</string>
     <string name="wifi_connect_error">Could not connect to free Wi-Fi: %s</string>