L10N

7 files changed, 42 insertions, 27 deletions

diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
index 5b3179b..f9bdd70 100644
--- a/TalerWallet1/Views/Balances/BalanceRowView.swift
+++ b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -52,12 +52,18 @@ struct BalanceRowView: View {
     @AppStorage("iconOnly") var iconOnly: Bool = false
     @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
 
-    let sendTitle0 = String(localized: "Send", comment: "Abbreviation <Send Money>")
-    let sendTitle1 = String(localized: "Send", comment: "Top of button <Send Money>")
-    let sendTitle2 = String(localized: "Money", comment: "Bottom of button <Send Money>")
-    let requestTitle0 = String(localized: "Request", comment: "Abbreviation <Request Payment>")
-    let requestTitle1 = String(localized: "Request", comment: "Top of button <Request Payment>")
-    let requestTitle2 = String(localized: "Payment", comment: "Bottom of button <Request Payment>")
+    let sendTitle0 = String(localized: "SendButton_Short", defaultValue: "Send",
+                              comment: "Abbreviation of button `Send Money´")
+    let sendTitle1 = String(localized: "SendButton_Top", defaultValue: "Send",
+                              comment: "Top (first half) of button `Send Money´")
+    let sendTitle2 = String(localized: "SendButton_Bottom", defaultValue: "Money",
+                              comment: "Bottom (second half) of button `Send Money´")
+    let requestTitle0 = String(localized: "RequestButton_Short", defaultValue: "Request",
+                                 comment: "Abbreviation of button `Request Payment´")
+    let requestTitle1 = String(localized: "RequestButton_Top", defaultValue: "Request",
+                                 comment: "Top (first half) of button `Request Payment´")
+    let requestTitle2 = String(localized: "RequestButton_Bottom", defaultValue: "Payment",
+                                 comment: "Bottom (second half) of button `Request Payment´")
 
     var body: some View {
         SingleAxisGeometryReader { width in
diff --git a/TalerWallet1/Views/Balances/PendingRowView.swift b/TalerWallet1/Views/Balances/PendingRowView.swift
index f45d1fa..ffe1c7d 100644
--- a/TalerWallet1/Views/Balances/PendingRowView.swift
+++ b/TalerWallet1/Views/Balances/PendingRowView.swift
@@ -59,12 +59,18 @@ struct PendingRowView: View {
     @Environment(\.sizeCategory) var sizeCategory
     @AppStorage("iconOnly") var iconOnly: Bool = false
 
-    let inTitle0 = String(localized: "Incoming", comment: "Abbreviation <pending incoming>")
-    let inTitle1 = String(localized: "Pending", comment: "Top of line <Pending incoming>")
-    let inTitle2 = String(localized: "incoming", comment: "Bottom of line <pending incoming>")
-    let outTitle0 = String(localized: "Outgoing", comment: "Abbreviation <pending outgoing>")
-    let outTitle1 = String(localized: "Pending", comment: "Top of line <Pending outgoing>")
-    let outTitle2 = String(localized: "outgoing", comment: "Bottom of line <pending outgoing>")
+    let inTitle0 = String(localized: "TitleIncoming_Short", defaultValue: "Incoming",
+                            comment: "Abbreviation of `Pending incoming´ in Balances")
+    let inTitle1 = String(localized: "TitleIncoming_Top", defaultValue: "Pending",
+                            comment: "Top (first half) of line `Pending incoming´ in Balances")
+    let inTitle2 = String(localized: "TitleIncoming_Bottom", defaultValue: "incoming",
+                            comment: "Bottom (second half) of line `Pending incoming´ in Balances")
+    let outTitle0 = String(localized: "TitleOutgoing_Short", defaultValue: "Outgoing",
+                             comment: "Abbreviation of `Pending outgoing´ in Balances")
+    let outTitle1 = String(localized: "TitleOutgoing_Top", defaultValue: "Pending",
+                             comment: "Top (first half) of line `Pending outgoing´ in Balances")
+    let outTitle2 = String(localized: "TitleOutgoing_Bottom", defaultValue: "outgoing",
+                             comment: "Bottom (second half) of line `Pending outgoing´ in Balances")
 
     func needVStack(available: CGFloat, contentWidth: CGFloat, valueWidth: CGFloat) -> Bool {
         if available > 20 {
diff --git a/TalerWallet1/Views/Exchange/ExchangeRowView.swift b/TalerWallet1/Views/Exchange/ExchangeRowView.swift
index 7674c20..2e8aaf3 100644
--- a/TalerWallet1/Views/Exchange/ExchangeRowView.swift
+++ b/TalerWallet1/Views/Exchange/ExchangeRowView.swift
@@ -48,12 +48,14 @@ struct ExchangeRowView: View {
     }
 
     var body: some View {
-        let depositTitle0 = String(localized: "Deposit", comment: "Abbreviation <Deposit (currency)>")
-        let depositTitle1 = String(localized: "Deposit\n\(currency)",
-                                   comment: "Button <Deposit (currency)>, must have ONE \n and ONE %s")
-        let withdrawTitle0 = String(localized: "Withdraw", comment: "Abbreviation <Withdraw (currency)>")
-        let withdrawTitle1 = String(localized: "Withdraw\n\(currency)",
-                                    comment: "Button <Withdraw (currency)>, must have ONE \n and ONE %s")
+        let depositTitle0 = String(localized: "DepositButton_Short", defaultValue: "Deposit",
+                                   comment: "Abbreviation of `Deposit (currency)´")
+        let depositTitle1 = String(localized: "Deposit\t\(currency)",
+                                   comment: "Button `Deposit (currency)´, must have ONE \\t and ONE %@")
+        let withdrawTitle0 = String(localized: "WithdrawButton_Short", defaultValue: "Withdraw",
+                                    comment: "Abbreviation of `Withdraw (currency)´")
+        let withdrawTitle1 = String(localized: "Withdraw\t\(currency)",
+                                    comment: "Button `Withdraw (currency)´, must have ONE \\t and ONE %@")
         let baseURL = exchange.exchangeBaseUrl
 
         HStack(spacing: 0) {    // can't use the built in Label because it adds the accessory arrow
diff --git a/TalerWallet1/Views/Exchange/ManualWithdraw.swift b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
index 0492c95..dc98268 100644
--- a/TalerWallet1/Views/Exchange/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
@@ -27,7 +27,7 @@ struct ManualWithdraw: View {
         let _ = symLog.vlog()       // just to get the # to compare it with .onAppear & onDisappear
 #endif
         let currency = exchange.currency ?? String(localized: "Unknown", comment: "unknown currency")
-        let navTitle = String(localized: "Withdraw \(currency)")
+        let navTitle = String(localized: "NavTitle_Withdraw (currency)", defaultValue: "Withdraw \(currency)")
         let currencyField = CurrencyField(value: $centsToTransfer, currency: currency) // becomeFirstResponder
 //        let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge: $selectedAge)
 
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
index 3f7b139..2af6d8a 100644
--- a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
+++ b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -15,7 +15,7 @@ struct QRCodeDetailView: View {
     var body: some View {
         if talerURI.count > 10 {
             Section {
-                Text("Either")
+                Text("Either", comment: "Either (copy/share)")
                     .multilineTextAlignment(.leading)
                     .accessibilityFont(.title3)
 //                    .padding(.vertical)
@@ -26,9 +26,9 @@ struct QRCodeDetailView: View {
 //                    .padding(.bottom)
                     .listRowSeparator(.hidden)
 
-                let otherParty = incoming ? String(localized: "payer")
-                                          : String(localized: "payee")
-                Text("the link to the \(otherParty), or", comment: "(copy/share) the link to the other party (payer/payee), or")
+                let otherParty = incoming ? String(localized: "payer", comment: "the payment link to the (otherParty), or")
+                                          : String(localized: "payee", comment: "the payment link to the (otherParty), or")
+                Text("the payment link to the \(otherParty), or", comment:  "...the payment link to the (payer/payee), or")
                     .multilineTextAlignment(.leading)
                     .accessibilityFont(.title3)
                     .listRowSeparator(.hidden)
diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift
index 0f06dda..4a5e73b 100644
--- a/TalerWallet1/Views/Main/MainView.swift
+++ b/TalerWallet1/Views/Main/MainView.swift
@@ -81,9 +81,9 @@ extension MainView {
         @AppStorage("iconOnly") var iconOnly: Bool = false
         @EnvironmentObject private var controller: Controller
         @EnvironmentObject private var model: WalletModel
-        let balancesTitle = String(localized: "Balances")
-        let exchangesTitle = String(localized: "Exchanges")
-        let settingsTitle = String(localized: "Settings")
+        let balancesTitle = String(localized: "TitleBalances", defaultValue: "Balances")
+        let exchangesTitle = String(localized: "TitleExchanges", defaultValue: "Exchanges")
+        let settingsTitle = String(localized: "TitleSettings", defaultValue: "Settings")
 #if TABBAR  // Taler Wallet
         @State private var selectedTab: Tab = .balances
 
diff --git a/TalerWallet1/Views/Main/WalletEmptyView.swift b/TalerWallet1/Views/Main/WalletEmptyView.swift
index c357f03..00a9565 100644
--- a/TalerWallet1/Views/Main/WalletEmptyView.swift
+++ b/TalerWallet1/Views/Main/WalletEmptyView.swift
@@ -19,7 +19,8 @@ struct WalletEmptyView: View {
                 Text("There is no digital cash in your wallet.")
                     .accessibilityFont(.title3)
                     .listRowSeparator(.hidden)
-                Link("Get some test money", destination: URL(string: DEMOBANK)!)
+                let title = String(localized: "LinkTitle_DEMOBANK", defaultValue: "Get some test money")
+                Link(title, destination: URL(string: DEMOBANK)!)
                     .buttonStyle(TalerButtonStyle(type: .prominent, narrow: false, aligned: .center))
                     .padding(.vertical)
             }