ios: corrections, localizations (#4406)

apps/ios/Shared/Views/ChatList/ServersSummaryView.swift

@@ -363,7 +363,7 @@ struct ServersSummaryView: View {
         Button {
             alert = SomeAlert(
                 alert: Alert(
-                    title: Text("Reset all servers statistics?"),
+                    title: Text("Reset all statistics?"),
                     message: Text("Servers statistics will be reset - this cannot be undone!"),
                     primaryButton: .destructive(Text("Reset")) {
                         Task {
@@ -425,7 +425,7 @@ struct SubscriptionStatusPercentageView: View {
     var body: some View {
         let onionHosts = networkUseOnionHostsGroupDefault.get()
         let (_, _, _, statusPercent) = subscriptionStatusColorAndPercentage(m.networkInfo.online, onionHosts, subs, sess)
-        Text("\(Int(floor(statusPercent * 100)))%")
+        Text(verbatim: "\(Int(floor(statusPercent * 100)))%")
             .foregroundColor(.secondary)
             .font(.caption)
     }
@@ -595,21 +595,21 @@ struct DetailedSMPStatsView: View {
                 infoRowTwoValues("Sent via proxy", "attempts", stats._sentViaProxy, stats._sentViaProxyAttempts)
                 infoRowTwoValues("Proxied", "attempts", stats._sentProxied, stats._sentProxiedAttempts)
                 Text("Send errors")
-                indentedInfoRow("AUTH", numOrDash(stats._sentAuthErrs))
-                indentedInfoRow("QUOTA", numOrDash(stats._sentQuotaErrs))
-                indentedInfoRow("expired", numOrDash(stats._sentExpiredErrs))
-                indentedInfoRow("other", numOrDash(stats._sentOtherErrs))
+                infoRow(Text(verbatim: "AUTH"), numOrDash(stats._sentAuthErrs)).padding(.leading, 24)
+                infoRow(Text(verbatim: "QUOTA"), numOrDash(stats._sentQuotaErrs)).padding(.leading, 24)
+                infoRow("expired", numOrDash(stats._sentExpiredErrs)).padding(.leading, 24)
+                infoRow("other", numOrDash(stats._sentOtherErrs)).padding(.leading, 24)
             }
             Section("Received messages") {
                 infoRow("Received total", numOrDash(stats._recvMsgs))
                 Text("Receive errors")
-                indentedInfoRow("duplicates", numOrDash(stats._recvDuplicates))
-                indentedInfoRow("decryption errors", numOrDash(stats._recvCryptoErrs))
-                indentedInfoRow("other errors", numOrDash(stats._recvErrs))
+                infoRow("duplicates", numOrDash(stats._recvDuplicates)).padding(.leading, 24)
+                infoRow("decryption errors", numOrDash(stats._recvCryptoErrs)).padding(.leading, 24)
+                infoRow("other errors", numOrDash(stats._recvErrs)).padding(.leading, 24)
                 infoRowTwoValues("Acknowledged", "attempts", stats._ackMsgs, stats._ackAttempts)
                 Text("Acknowledgement errors")
-                indentedInfoRow("NO_MSG errors", numOrDash(stats._ackNoMsgErrs))
-                indentedInfoRow("other errors", numOrDash(stats._ackOtherErrs))
+                infoRow(Text(verbatim: "NO_MSG errors"), numOrDash(stats._ackNoMsgErrs)).padding(.leading, 24)
+                infoRow("other errors", numOrDash(stats._ackOtherErrs)).padding(.leading, 24)
             }
             Section {
                 infoRow("Created", numOrDash(stats._connCreated))
@@ -618,7 +618,7 @@ struct DetailedSMPStatsView: View {
                 infoRowTwoValues("Deleted", "attempts", stats._connDeleted, stats._connDelAttempts)
                 infoRow("Deletion errors", numOrDash(stats._connDelErrs))
                 infoRowTwoValues("Subscribed", "attempts", stats._connSubscribed, stats._connSubAttempts)
-                infoRow("Subscription results ignored", numOrDash(stats._connSubIgnored))
+                infoRow("Subscriptions ignored", numOrDash(stats._connSubIgnored))
                 infoRow("Subscription errors", numOrDash(stats._connSubErrs))
             } header: {
                 Text("Connections")
@@ -631,29 +631,19 @@ struct DetailedSMPStatsView: View {
 
 private func infoRowTwoValues(_ title: LocalizedStringKey, _ title2: LocalizedStringKey, _ value: Int, _ value2: Int) -> some View {
     HStack {
-        Text(title) + Text(" / ").font(.caption2) + Text(title2).font(.caption2)
+        Text(title) + Text(verbatim: " / ").font(.caption2) + Text(title2).font(.caption2)
         Spacer()
         Group {
             if value == 0 && value2 == 0 {
-                Text("-")
+                Text(verbatim: "-")
             } else {
-                Text(numOrDash(value)) + Text(" / ").font(.caption2) + Text(numOrDash(value2)).font(.caption2)
+                Text(numOrDash(value)) + Text(verbatim: " / ").font(.caption2) + Text(numOrDash(value2)).font(.caption2)
             }
         }
         .foregroundStyle(.secondary)
     }
 }
 
-private func indentedInfoRow(_ title: LocalizedStringKey, _ value: String) -> some View {
-    HStack {
-        Text(title)
-            .padding(.leading, 24)
-        Spacer()
-        Text(value)
-            .foregroundStyle(.secondary)
-    }
-}
-
 struct XFTPServerSummaryView: View {
     var summary: XFTPServerSummary
     var statsStartedAt: Date
@@ -732,8 +722,8 @@ struct DetailedXFTPStatsView: View {
                 infoRow("Size", prettySize(stats._downloadsSize))
                 infoRowTwoValues("Chunks downloaded", "attempts", stats._downloads, stats._downloadAttempts)
                 Text("Download errors")
-                indentedInfoRow("AUTH", numOrDash(stats._downloadAuthErrs))
-                indentedInfoRow("other", numOrDash(stats._downloadErrs))
+                infoRow(Text(verbatim: "AUTH"), numOrDash(stats._downloadAuthErrs)).padding(.leading, 24)
+                infoRow("other", numOrDash(stats._downloadErrs)).padding(.leading, 24)
             } header: {
                 Text("Downloaded files")
             } footer: {

apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift

@@ -747,7 +747,7 @@ struct ThemeDestinationPicker: View {
         let values = [(nil, "All profiles")] + m.users.filter { $0.user.activeUser }.map { ($0.user.userId, $0.user.chatViewName)}
 
         if values.contains(where: { (userId, text) in userId == themeUserDestination?.0 }) {
-            Picker("Apply to mode", selection: $themeUserDest) {
+            Picker("Apply to", selection: $themeUserDest) {
                 ForEach(values, id: \.0) { (_, text) in
                     Text(text)
                 }

apps/ios/SimpleX Localizations/bg.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "bg",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/cs.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "cs",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/de.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "de",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/en.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "en",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/es.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "es",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/fi.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "fi",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/fr.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "fr",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/hu.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "hu",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/it.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "it",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/ja.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "ja",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/nl.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "nl",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/pl.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "pl",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/ru.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "ru",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/th.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "th",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/tr.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "tr",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/uk.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "uk",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/zh-Hans.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "zh-Hans",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "15F31d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "15.4"
   },
   "version" : "1.0"
 }