[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/03: [wallet] Organize strings alphabetically an
|
From: |
gnunet |
|
Subject: |
[taler-taler-android] 01/03: [wallet] Organize strings alphabetically and generalize amount strings (v2) |
|
Date: |
Fri, 17 May 2024 16:03:55 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 47a0595096e9f581d669bad7c0886f7f297ecf27
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Tue May 14 12:55:34 2024 -0600
[wallet] Organize strings alphabetically and generalize amount strings (v2)
bug 0008587
---
.../java/net/taler/wallet/ReceiveFundsFragment.kt | 4 +-
.../java/net/taler/wallet/SendFundsFragment.kt | 4 +-
.../wallet/deposit/MakeBitcoinDepositComposable.kt | 6 +-
.../taler/wallet/deposit/MakeDepositComposable.kt | 4 +-
.../net/taler/wallet/deposit/PayToUriFragment.kt | 4 +-
.../wallet/deposit/TransactionDepositComposable.kt | 2 +-
.../taler/wallet/payment/PayTemplateComposable.kt | 2 +-
.../wallet/payment/PayTemplateOrderComposable.kt | 4 +-
.../wallet/payment/TransactionPaymentComposable.kt | 2 +-
.../net/taler/wallet/peer/IncomingComposable.kt | 2 +-
.../taler/wallet/peer/OutgoingPullComposable.kt | 2 +-
.../taler/wallet/peer/TransactionPeerPullCredit.kt | 4 +-
.../taler/wallet/peer/TransactionPeerPullDebit.kt | 2 +-
.../taler/wallet/peer/TransactionPeerPushCredit.kt | 2 +-
.../taler/wallet/peer/TransactionPeerPushDebit.kt | 2 +-
.../wallet/refund/TransactionRefundComposable.kt | 2 +-
.../wallet/transactions/TransactionLossFragment.kt | 2 +-
.../transactions/TransactionRefreshFragment.kt | 2 +-
.../withdraw/TransactionWithdrawalComposable.kt | 4 +-
.../taler/wallet/withdraw/manual/ScreenTransfer.kt | 8 +-
.../main/res/layout-w550dp/payment_bottom_bar.xml | 2 +-
.../main/res/layout/fragment_prompt_withdraw.xml | 4 +-
wallet/src/main/res/layout/payment_bottom_bar.xml | 2 +-
wallet/src/main/res/navigation/nav_graph.xml | 2 +-
wallet/src/main/res/values/strings.xml | 371 +++++++++++----------
25 files changed, 234 insertions(+), 211 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 ec869f9..d356051 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,
@@ -107,13 +107,13 @@ fun MakeBitcoinDepositComposable(
if (totalAmount > effectiveAmount) {
val fee = totalAmount - effectiveAmount
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee,
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 b5d2409..2f9fd88 100644
--- a/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/deposit/MakeDepositComposable.kt
@@ -138,14 +138,14 @@ fun MakeDepositComposable(
val fee = totalAmount - effectiveAmount
TransactionAmountComposable(
- label = stringResource(R.string.withdraw_fees),
+ label = stringResource(R.string.amount_fee),
amount = fee.withSpec(amount.spec),
amountType = Negative,
)
}
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/deposit/TransactionDepositComposable.kt
b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
index b2384dd..11264a1 100644
---
a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt
@@ -80,7 +80,7 @@ fun TransactionDepositComposable(
if (t.amountEffective > t.amountRaw) {
val fee = t.amountEffective - t.amountRaw
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
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 ffa4875..9107dc9 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PayTemplateComposable.kt
@@ -56,7 +56,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/payment/TransactionPaymentComposable.kt
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
index 4304b54..beb37d9 100644
---
a/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/payment/TransactionPaymentComposable.kt
@@ -85,7 +85,7 @@ fun TransactionPaymentComposable(
if (t.amountEffective > t.amountRaw) {
val fee = t.amountEffective - t.amountRaw
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
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 07bc48e..609629e 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_label),
style = MaterialTheme.typography.bodyLarge,
)
Text(
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
index a456303..f3d569f 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullComposable.kt
@@ -151,7 +151,7 @@ fun OutgoingPullIntroComposable(
if (state is OutgoingChecked && state.amountRaw >
state.amountEffective) {
val fee = state.amountRaw - state.amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(amount.spec),
amountType = AmountType.Negative,
)
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 20d9a2f..59d405c 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -49,7 +49,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t:
TransactionPeerPullCredit
)
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,
)
@@ -57,7 +57,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t:
TransactionPeerPullCredit
if (t.amountRaw > t.amountEffective) {
val fee = t.amountRaw - t.amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
index 8c197b0..b8966d4 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
@@ -49,7 +49,7 @@ fun TransactionPeerPullDebitComposable(t:
TransactionPeerPullDebit, spec: Curren
if (t.amountEffective > t.amountRaw) {
val fee = t.amountEffective - t.amountRaw
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
index b522563..d407ff2 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
@@ -49,7 +49,7 @@ fun TransactionPeerPushCreditComposable(t:
TransactionPeerPushCredit, spec: Curr
if (t.amountRaw > t.amountEffective) {
val fee = t.amountRaw - t.amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
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 eedef94..f2edc19 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -68,7 +68,7 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t:
TransactionPeerPushDebit,
if (t.amountEffective > t.amountRaw) {
val fee = t.amountEffective - t.amountRaw
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
index c9a358f..b17658a 100644
---
a/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/refund/TransactionRefundComposable.kt
@@ -84,7 +84,7 @@ fun TransactionRefundComposable(
if (t.amountRaw > t.amountEffective) {
val fee = t.amountRaw - t.amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionLossFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionLossFragment.kt
index 9138345..2c95880 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionLossFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionLossFragment.kt
@@ -99,7 +99,7 @@ fun TransitionLossComposable(
)
TransactionAmountComposable(
- label = stringResource(id = R.string.loss_amount),
+ label = stringResource(id = R.string.amount_lost),
amount = t.amountEffective.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
index 8f474f9..e55d887 100644
---
a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
@@ -91,7 +91,7 @@ private fun TransactionRefreshComposable(
style = MaterialTheme.typography.bodyLarge,
)
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = t.amountEffective.withSpec(spec),
amountType = AmountType.Negative,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
index 8ffbc6e..9bfeda6 100644
---
a/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
+++
b/wallet/src/main/java/net/taler/wallet/withdraw/TransactionWithdrawalComposable.kt
@@ -92,14 +92,14 @@ fun TransactionWithdrawalComposable(
if (t.amountRaw > t.amountEffective) {
val fee = t.amountRaw - t.amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee.withSpec(spec),
amountType = AmountType.Negative,
)
}
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_total),
+ label = stringResource(id = R.string.amount_total),
amount = t.amountEffective.withSpec(spec),
amountType = AmountType.Positive,
)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
index 7f586c5..00495fb 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
@@ -193,14 +193,14 @@ fun WithdrawalAmountTransfer(
horizontalAlignment = Alignment.CenterHorizontally,
) {
TransactionAmountComposable(
- label = stringResource(R.string.withdraw_transfer),
+ label = stringResource(R.string.amount_transfer),
amount = conversionAmountRaw,
amountType = AmountType.Neutral,
)
if (amountRaw.currency != conversionAmountRaw.currency) {
TransactionAmountComposable(
- label = stringResource(R.string.withdraw_conversion),
+ label = stringResource(R.string.amount_conversion),
amount = amountRaw,
amountType = AmountType.Neutral,
)
@@ -209,13 +209,13 @@ fun WithdrawalAmountTransfer(
if (amountRaw > amountEffective) {
val fee = amountRaw - amountEffective
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_fees),
+ label = stringResource(id = R.string.amount_fee),
amount = fee,
amountType = AmountType.Negative,
)
TransactionAmountComposable(
- label = stringResource(id = R.string.withdraw_total),
+ label = stringResource(id = R.string.amount_total),
amount = amountEffective,
amountType = AmountType.Positive,
)
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..ebfeabb 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_label"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/totalView"
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 44d95de..e77a549 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -64,7 +64,7 @@
android:layout_marginTop="32dp"
android:layout_marginEnd="16dp"
android:gravity="center"
- android:text="@string/withdraw_fees"
+ android:text="@string/amount_fee"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/feeView"
app:layout_constraintEnd_toEndOf="parent"
@@ -100,7 +100,7 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:gravity="center"
- android:text="@string/withdraw_total"
+ android:text="@string/amount_total"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/effectiveAmountView"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml
b/wallet/src/main/res/layout/payment_bottom_bar.xml
index 496f2f3..9026127 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_label"
android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/confirmButton"
app:layout_constraintEnd_toStartOf="@+id/totalView"
diff --git a/wallet/src/main/res/navigation/nav_graph.xml
b/wallet/src/main/res/navigation/nav_graph.xml
index f6c90ab..94c13a7 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -36,7 +36,7 @@
<fragment
android:id="@+id/handleUri"
android:name="net.taler.wallet.HandleUriFragment"
- android:label="@string/handle_uri_title">
+ android:label="@string/loading">
<argument
android:name="uri"
app:argType="string"
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index b0fa772..85a5138 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -14,9 +14,13 @@
~ GNU Taler; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>
-->
+<!-- NOTE: please organize strings in alphabetic order! -->
+
<resources xmlns:tools="http://schemas.android.com/tools";>
<string name="app_name">Taler Wallet</string>
+ <!-- Google Play Store -->
+
<string name="google_play_title"
tools:keep="@string/google_play_title">Taler Wallet (experimental)</string>
<string name="google_play_short_desc"
tools:keep="@string/google_play_short_desc">GNU Taler makes privacy-friendly
online transactions fast and easy.</string>
<string name="google_play_full_desc"
tools:keep="@string/google_play_full_desc"><![CDATA[
@@ -33,137 +37,159 @@ 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_header_subtitle">Wallet</string>
+ <!-- Navigation -->
- <string name="nav_prompt_withdraw">Withdraw Digital Cash</string>
- <string name="nav_exchange_tos">PSP\'s Terms of Service</string>
- <string name="nav_exchange_select">Select provider</string>
- <string name="nav_exchange_fees">Provider fees</string>
<string name="nav_error">Error</string>
+ <string name="nav_exchange_fees">Provider fees</string>
+ <string name="nav_exchange_select">Select provider</string>
+ <string name="nav_exchange_tos">PSP\'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>
+
+ <!-- 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="cancel">Cancel</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="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="currency">Currency</string>
+ <string name="enter_uri">Enter taler:// URI</string>
+ <string name="import_db">Import</string>
+ <string name="loading">Loading</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="open">Open</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="import_db">Import</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>
+
+ <!-- Errors -->
- <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>
- <string name="menu_settings">Settings</string>
- <string name="menu_retry_pending_operations">Retry Pending
Operations</string>
-
- <string name="host_apdu_service_desc">Taler NFC Payments</string>
-
- <string name="handle_uri_title">Loading action</string>
+ <!-- Amounts -->
- <string name="balances_title">Balances</string>
- <string name="amount_positive">+%s</string>
+ <string name="amount_chosen">Chosen amount</string>
+ <string name="amount_conversion">Conversion</string>
+ <string name="amount_effective">Effective amount</string>
+ <string name="amount_error">Enter valid amount</string>
+ <string name="amount_fee">Fee</string>
+ <string name="amount_invalid">Amount invalid</string>
+ <string name="amount_invoiced">Amount invoiced</string>
+ <string name="amount_lost">Amount lost</string>
<string name="amount_negative">-%s</string>
- <string name="amount_chosen">Chosen Amount</string>
- <string name="amount_sent">Amount sent</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>
+ <string name="amount_total_label">Total:</string>
+ <string name="amount_transfer">Transfer</string>
+ <string name="amount_withdraw">Withdraw</string>
+
+ <!-- Balances -->
+
+ <string name="balance_scope_auditor">Auditor: %1$s</string>
+ <string name="balance_scope_exchange">From %1$s</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="balances_inbound_amount">+%1$s inbound</string>
<string name="balances_outbound_amount">-%1$s outbound</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">From %1$s</string>
- <string name="balance_scope_auditor">Auditor: %1$s</string>
+ <string name="balances_title">Balances</string>
- <string name="transactions_title">Transactions</string>
+ <!-- Transactions -->
+
+ <string name="transaction_action_kyc">Complete KYC</string>
+ <string name="transaction_denom_loss">Loss of funds</string>
+ <string name="transaction_deposit">Deposit</string>
+ <string name="transaction_deposit_to">Deposit to %1$s</string>
+ <string name="transaction_dummy_title">Unknown Transaction</string>
+ <string name="transaction_order">Purchase</string>
+ <string name="transaction_order_id">Order #%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="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</string>
- <string name="transactions_send_funds_title">Send %1$s</string>
- <string name="transactions_receive_funds">Receive</string>
- <string name="transactions_receive_funds_title">Receive %1$s</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_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</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</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">Order #%1$s</string>
- <string name="transaction_refund">Refund</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_deposit_to">Deposit to %1$s</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_denom_loss">Loss of funds</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_already_paid_title">Already paid</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>
+
+ <!-- P2P 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>
+ <!-- P2P 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_intro">Choose where to send money to:</string>
<string name="send_deposit">To a bank account</string>
<string name="send_deposit_bitcoin">To a Bitcoin wallet</string>
@@ -175,7 +201,6 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="send_deposit_name">Account holder</string>
<string name="send_deposit_bitcoin_address">Bitcoin address</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_peer">To another wallet</string>
@@ -192,142 +217,140 @@ GNU Taler is immune against many types of fraud, such
as phishing of credit card
<string name="send_peer_expiration_hours">Hours</string>
<string name="send_peer_purpose">Purpose</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">Provider</string>
+ <string name="withdraw_account">Account #%1$d</string>
+ <string name="withdraw_account_currency">Account #%1$d (%2$s)</string>
+ <string name="withdraw_amount">How much to withdraw?</string>
+ <string name="withdraw_amount_error">Enter valid amount</string>
<string name="withdraw_bank">Bank</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
provider</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_support">This provider supports currency
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">Provider</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_bitcoin_title">Bitcoin provider ready for
withdrawal</string>
<string name="withdraw_manual_check_fees">Check fees</string>
- <string name="withdraw_manual_ready_title">Provider is ready for
withdrawal!</string>
- <string name="withdraw_manual_ready_intro">To complete the process you
need to wire %s to the provider\'s 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_cancel">Cancel withdrawal</string>
<string name="withdraw_manual_ready_details_intro">Bank transfer
details</string>
- <string name="withdraw_manual_bitcoin_title">Bitcoin provider 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 provider\'s 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_title">Provider is ready for
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_transfer">Transfer</string>
- <string name="withdraw_conversion">Conversion</string>
- <string name="withdraw_conversion_support">This provider supports currency
conversion</string>
+ <string name="withdraw_manual_title">Make a manual transfer to the
provider</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_waiting_confirm">Waiting for confirmation</string>
- <string name="exchange_settings_title">Providers</string>
- <string name="exchange_settings_summary">Manage list of providers known to
this wallet</string>
- <string name="exchange_list_title">Providers</string>
- <string name="exchange_list_empty">No providers known\n\nAdd one manually
or withdraw digital cash!</string>
- <string name="exchange_list_currency">Currency: %s</string>
- <string name="exchange_list_add">Add provider</string>
- <string name="exchange_list_select">Select provider</string>
+ <!-- Exchanges -->
+
+ <string name="exchange_add_error">Could not add provider</string>
+ <string name="exchange_add_url">Enter address of provider</string>
<string name="exchange_delete">Delete provider</string>
<string name="exchange_delete_force">Force deletion (purge)</string>
<string name="exchange_dialog_delete_message">Are you sure you want to
delete this provider? Forcing this operation will result in a loss of
funds.</string>
- <string name="exchange_reload">Reload information</string>
- <string name="exchange_not_contacted">Provider not contacted</string>
- <string name="exchange_add_url">Enter address of provider</string>
- <string name="exchange_add_error">Could not add provider</string>
- <string name="exchange_list_error">Could not list providers</string>
- <string name="exchange_list_add_dev">Add development providers</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 provider</string>
+ <string name="exchange_list_add_dev">Add development providers</string>
+ <string name="exchange_list_currency">Currency: %s</string>
+ <string name="exchange_list_empty">No providers known\n\nAdd one manually
or withdraw digital cash!</string>
+ <string name="exchange_list_error">Could not list providers</string>
+ <string name="exchange_list_select">Select provider</string>
+ <string name="exchange_list_title">Providers</string>
+ <string name="exchange_menu_manual_withdraw">Withdraw</string>
+ <string name="exchange_not_contacted">Provider not contacted</string>
+ <string name="exchange_reload">Reload information</string>
+ <string name="exchange_settings_summary">Manage list of providers known to
this wallet</string>
+ <string name="exchange_settings_title">Providers</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="loss_amount">Amount lost</string>
+ <!-- Losses -->
+
<string name="loss_reason">Reason</string>
<string name="loss_reason_expired">Funds were not renewed, because the
wallet was not opened for a long time</string>
- <string name="loss_reason_vanished">The payment provider lost the record
of the funds</string>
<string name="loss_reason_unoffered">The payment provider stopped offering
the denomination backing the funds</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>
+ <string name="loss_reason_vanished">The payment provider lost the record
of the funds</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>
- <string name="wifi_disabled_error">Turn on Wi-Fi to get free Wi-Fi</string>
+ <!-- Miscellaneous -->
+
+ <string name="host_apdu_service_desc">Taler NFC Payments</string>
<string name="wifi_connect_error">Could not connect to free Wi-Fi:
%s</string>
+ <string name="wifi_disabled_error">Turn on Wi-Fi to get free Wi-Fi</string>
</resources>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.