commit fecf6f3f9dfe695664b496219902fe0597b63b5f parent 5aa95c61544443a0491c73201c29a94d0d107a36 Author: Marc Stibane <marc@taler.net> Date: Thu, 7 Nov 2024 19:55:43 +0100 wording Diffstat:
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/ScopePicker.swift b/TalerWallet1/Views/HelperViews/ScopePicker.swift @@ -73,7 +73,7 @@ struct ScopePicker: View { } .talerFont(.picker) .accessibilityLabel(a11yLabel) - .accessibilityHint(String(localized: "Choose the payment provider.", comment: "a11y")) + .accessibilityHint(String(localized: "Choose the payment service.", comment: "a11y")) .task() { withAnimation { selected = value } } diff --git a/TalerWallet1/Views/HelperViews/SelectDays.swift b/TalerWallet1/Views/HelperViews/SelectDays.swift @@ -77,7 +77,7 @@ struct SelectDays: View { .disabled(!isEnabled || maxExpiration < THIRTYDAYS) } // 3 buttons if !minimalistic { - Text(outgoing ? "The exchange will send your money back if it won't get collected in time, or when you abort the operation." + Text(outgoing ? "The payment service will send your money back if it won't get collected in time, or when you abort the operation." : "This request will be cancelled if it doesn't get paid in time, or when you abort the operation.") .talerFont(.body) } diff --git a/TalerWallet1/Views/HelperViews/ToSButtonView.swift b/TalerWallet1/Views/HelperViews/ToSButtonView.swift @@ -18,9 +18,9 @@ struct ToSButtonView: View { @AppStorage("minimalistic") var minimalistic: Bool = false var body: some View { - let hint = minimalistic ? String(localized: "You must accept the payment provider's terms of service first.") - : p2p ? String(localized: "You must accept the payment provider's terms of service first before you can receive electronic cash in your wallet.", comment: "P2P Receive") - : String(localized: "You must accept the payment provider's terms of service first before you can use it to withdraw electronic cash to your wallet.") + let hint = minimalistic ? String(localized: "You must accept the Terms of Service of the payment service first.") + : p2p ? String(localized: "You must accept the Terms of Service of the payment service first before you can receive electronic cash in your wallet.", comment: "P2P Receive") + : String(localized: "You must accept the Terms of Service of the payment service first before you can use it to withdraw electronic cash to your wallet.") Text(hint) .talerFont(.body) .multilineTextAlignment(.leading) diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift @@ -108,9 +108,9 @@ struct ExchangeSectionView: View { .listRowSeparator(.hidden) } - let buttonTitle = String(localized: "Exchange.Delete", defaultValue: "Delete payment provider", comment: "Action button") - let warningText1 = String(localized: "Are you sure you want to delete this payment provider?") - let warningText2 = String(localized: "This payment provider is in use. Delete anyway?") + let buttonTitle = String(localized: "Exchange.Delete", defaultValue: "Delete payment service", comment: "Action button") + let warningText1 = String(localized: "Are you sure you want to delete this payment service?") + let warningText2 = String(localized: "This payment service is in use. Delete anyway?") WarningButton(warningText: warningText1, buttonTitle: buttonTitle, buttonIcon: "trash", @@ -127,7 +127,7 @@ struct ExchangeSectionView: View { showAlert = false } }, message: { - Text("You will loose all \(currency) of this payment provider") + Text("You will loose all \(currency) of this payment service") }) } header: { BarGraphHeader(stack: stack.push(), diff --git a/TalerWallet1/Views/Settings/SettingsItem.swift b/TalerWallet1/Views/Settings/SettingsItem.swift @@ -203,7 +203,7 @@ struct SettingsItemPreview : View { var body: some View { VStack { - SettingsToggle(name: "Developer Mode", value: $developerMode, id1: "dev1", + SettingsToggle(name: "Developer Preview", value: $developerMode, id1: "dev1", description: "More information intended for debugging") SettingsTriState(name: "Observe walletCore", value: $observe, description: "on LocalConsole") diff --git a/TalerWallet1/Views/Settings/SettingsView.swift b/TalerWallet1/Views/Settings/SettingsView.swift @@ -107,7 +107,7 @@ struct SettingsView: View { exchangesDest } label: { SettingsItem(name: exchangesTitle, id1: "exchanges", - description: hideDescriptions ? nil : String(localized: "Manage payment service providers...")) {} + description: hideDescriptions ? nil : String(localized: "Manage payment services...")) {} } SettingsToggle(name: String(localized: "Minimalistic"), value: $minimalistic, id1: "minimal", description: hideDescriptions ? nil : String(localized: "Omit text where possible")) { diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift b/TalerWallet1/Views/Transactions/ManualDetailsV.swift @@ -148,7 +148,7 @@ struct ManualDetailsV: View { let obtainStr = common.amountEffective.formatted(specs: specs, isNegative: false) // let _ = print(amountStr, " | ", obtainStr) if !minimalistic { - Text("The payment service provider is waiting for your wire-transfer.") + Text("The payment service is waiting for your wire-transfer.") .bold() .multilineTextAlignment(.leading) .listRowSeparator(.hidden) diff --git a/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift b/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift @@ -23,7 +23,7 @@ struct TransferRestrictionsV: View { let amountNBS = amountStr.nbs let obtainNBS = obtainStr.nbs Text(minimalistic ? "Transfer \(amountNBS) to the payment service." - : "You need to transfer \(amountNBS) from your regular bank account to the payment service provider to receive \(obtainNBS) as electronic cash in this wallet.") + : "You need to transfer \(amountNBS) from your regular bank account to the payment service to receive \(obtainNBS) as electronic cash in this wallet.") .talerFont(.body) .multilineTextAlignment(.leading) if let restrictions { @@ -72,16 +72,16 @@ struct ManualDetailsWireV: View { } .padding(.leading) let payeeCode = HStack { VStack(alignment: .leading) { - Text("Payee:") + Text("Recipient:") .talerFont(.subheadline) Text(receiverStr) .monospacedDigit() .padding(.leading) } .frame(maxWidth: .infinity, alignment: .leading) .accessibilityElement(children: .combine) - .accessibilityLabel(Text("Payee", comment: "VoiceOver")) + .accessibilityLabel(Text("Recipient", comment: "VoiceOver")) CopyButton(textToCopy: receiverStr, vertical: true) - .accessibilityLabel(Text("Copy the payee", comment: "VoiceOver")) + .accessibilityLabel(Text("Copy the recipient", comment: "VoiceOver")) .disabled(false) } .padding(.top, -8) let ibanCode = HStack { @@ -93,7 +93,7 @@ struct ManualDetailsWireV: View { .padding(.leading) } .frame(maxWidth: .infinity, alignment: .leading) .accessibilityElement(children: .combine) - .accessibilityLabel(Text("IBAN of the payee", comment: "VoiceOver")) + .accessibilityLabel(Text("IBAN of the recipient", comment: "VoiceOver")) CopyButton(textToCopy: iban ?? EMPTYSTRING, vertical: true) .accessibilityLabel(Text("Copy the IBAN", comment: "VoiceOver")) .disabled(false) @@ -107,7 +107,7 @@ struct ManualDetailsWireV: View { .padding(.leading) } .frame(maxWidth: .infinity, alignment: .leading) .accessibilityElement(children: .combine) - .accessibilityLabel(Text("account of the payee", comment: "VoiceOver")) + .accessibilityLabel(Text("account of the recipient", comment: "VoiceOver")) CopyButton(textToCopy: xTaler, vertical: true) .accessibilityLabel(Text("Copy the account", comment: "VoiceOver")) .disabled(false) @@ -121,13 +121,13 @@ struct ManualDetailsWireV: View { .talerFont(.body) .multilineTextAlignment(.leading) .listRowSeparator(.hidden) - let step2i = Text(minimalistic ? "**Step 2:** Copy+Paste payee and IBAN:" - : "**Step 2:** If you don't already have it in your banking favorites list, then copy and paste payee and IBAN into the payee/IBAN fields in your banking app or website (and save it as favorite for the next time):") + let step2i = Text(minimalistic ? "**Step 2:** Copy+Paste recipient and IBAN:" + : "**Step 2:** If you don't already have it in your banking favorites list, then copy and paste recipient and IBAN into the recipient/IBAN fields in your banking app or website (and save it as favorite for the next time):") .talerFont(.body) .multilineTextAlignment(.leading) .padding(.top) - let step2x = Text(minimalistic ? "**Step 2:** Copy+Paste payee and account:" - : "**Step 2:** Copy and paste payee and account into the corresponding fields in your banking app or website:") + let step2x = Text(minimalistic ? "**Step 2:** Copy+Paste recipient and account:" + : "**Step 2:** Copy and paste recipient and account into the corresponding fields in your banking app or website:") .talerFont(.body) .multilineTextAlignment(.leading) .padding(.top) diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryV.swift b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift @@ -339,7 +339,7 @@ struct TransactionSummaryV: View { let details = withdrawalTransaction.details if common.isAborted && details.withdrawalDetails.type == .manual { if let dayStr = abortedHint(details.withdrawalDetails.reserveClosingDelay) { - Text("The withdrawal was aborted.\nIf you have already sent money to the exchange, it will wire it back in \(dayStr) days.") + Text("The withdrawal was aborted.\nIf you have already sent money to the payment service, it will wire it back in \(dayStr) days.") .talerFont(.callout) } }