diff --git a/Passepartout/App/iOS/Global/SwiftGen+Strings.swift b/Passepartout/App/iOS/Global/SwiftGen+Strings.swift index b048dbac..4fe4791c 100644 --- a/Passepartout/App/iOS/Global/SwiftGen+Strings.swift +++ b/Passepartout/App/iOS/Global/SwiftGen+Strings.swift @@ -551,6 +551,8 @@ internal enum L10n { internal enum Values { /// Automatic internal static let automatic = L10n.tr("Core", "global.values.automatic") + /// Default + internal static let `default` = L10n.tr("Core", "global.values.default") /// Disabled internal static let disabled = L10n.tr("Core", "global.values.disabled") /// Enabled diff --git a/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift b/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift index a6dcd5d6..905e7e75 100644 --- a/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift +++ b/Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift @@ -514,7 +514,7 @@ extension NetworkSettingsViewController { case .mtuBytes: let cell = Cells.setting.dequeue(from: tableView, for: indexPath) cell.leftText = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption - cell.rightText = networkSettings.mtuBytes?.description ?? "Default" + cell.rightText = networkSettings.mtuBytes?.description ?? L10n.Core.Global.Values.default return cell } } @@ -616,7 +616,7 @@ extension NetworkSettingsViewController { vc.options = ProfileNetworkSettings.mtuOptions vc.descriptionBlock = { guard $0 != 0 else { - return "Default" + return L10n.Core.Global.Values.default } return $0.description } diff --git a/Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift b/Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift index 32f049b4..bb099dc9 100644 --- a/Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift +++ b/Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift @@ -232,7 +232,7 @@ extension ProviderPoolViewController: UITableViewDataSource, UITableViewDelegate vc.title = group.localizedCountry vc.options = group.pools.sortedPools() vc.selectedOption = currentPool - vc.descriptionBlock = { !$0.secondaryId.isEmpty ? $0.secondaryId : "Default" } + vc.descriptionBlock = { !$0.secondaryId.isEmpty ? $0.secondaryId : L10n.Core.Global.Values.default } vc.selectionBlock = { self.currentPool = $0 self.delegate?.providerPoolController(self, didSelectPool: $0) diff --git a/Passepartout/App/macOS/Global/SwiftGen+Strings.swift b/Passepartout/App/macOS/Global/SwiftGen+Strings.swift index fea51209..a5e88608 100644 --- a/Passepartout/App/macOS/Global/SwiftGen+Strings.swift +++ b/Passepartout/App/macOS/Global/SwiftGen+Strings.swift @@ -35,12 +35,6 @@ internal enum L10n { internal static let `protocol` = L10n.tr("App", "endpoint.cells.protocol") } } - internal enum Global { - internal enum Values { - /// Default - internal static let `default` = L10n.tr("App", "global.values.default") - } - } internal enum Menu { internal enum ActiveProfile { internal enum Items { @@ -547,6 +541,8 @@ internal enum L10n { internal enum Values { /// Automatic internal static let automatic = L10n.tr("Core", "global.values.automatic") + /// Default + internal static let `default` = L10n.tr("Core", "global.values.default") /// Disabled internal static let disabled = L10n.tr("Core", "global.values.disabled") /// Enabled diff --git a/Passepartout/App/macOS/Menu/StatusMenu.swift b/Passepartout/App/macOS/Menu/StatusMenu.swift index 0f50d9fc..71229293 100644 --- a/Passepartout/App/macOS/Menu/StatusMenu.swift +++ b/Passepartout/App/macOS/Menu/StatusMenu.swift @@ -306,7 +306,7 @@ class StatusMenu: NSObject { let infrastructure = providerProfile.infrastructure for category in infrastructure.categories { - let title = category.name.isEmpty ? L10n.App.Global.Values.default : category.name.capitalized + let title = category.name.isEmpty ? L10n.Core.Global.Values.default : category.name.capitalized let submenu = NSMenu() let item = NSMenuItem(title: title, action: nil, keyEquivalent: "") item.indentationLevel = 1 @@ -325,7 +325,7 @@ class StatusMenu: NSObject { itemGroup.state = .on } - let title = !pool.secondaryId.isEmpty ? pool.secondaryId : "Default" + let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.Core.Global.Values.default let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "") if let extraCountry = pool.extraCountries?.first { item.image = extraCountry.image diff --git a/Passepartout/App/macOS/Scenes/Service/Customization/ConfigurationViewController.swift b/Passepartout/App/macOS/Scenes/Service/Customization/ConfigurationViewController.swift index afe486b9..51d27573 100644 --- a/Passepartout/App/macOS/Scenes/Service/Customization/ConfigurationViewController.swift +++ b/Passepartout/App/macOS/Scenes/Service/Customization/ConfigurationViewController.swift @@ -131,7 +131,7 @@ class ConfigurationViewController: NSViewController, ProfileCustomization { popupCompressionFraming.isEnabled = false popupCompressionAlgorithm.isEnabled = false } else { - popupPreset.addItem(withTitle: L10n.App.Global.Values.default) + popupPreset.addItem(withTitle: L10n.Core.Global.Values.default) popupPreset.isEnabled = false } diff --git a/Passepartout/App/macOS/Scenes/Service/Customization/MTUViewController.swift b/Passepartout/App/macOS/Scenes/Service/Customization/MTUViewController.swift index 5708a9b2..353e8ccc 100644 --- a/Passepartout/App/macOS/Scenes/Service/Customization/MTUViewController.swift +++ b/Passepartout/App/macOS/Scenes/Service/Customization/MTUViewController.swift @@ -67,7 +67,7 @@ class MTUViewController: NSViewController, ProfileCustomization { labelMTUCaption.stringValue = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption.asCaption popupMTU.removeAllItems() for opt in ProfileNetworkSettings.mtuOptions { - popupMTU.addItem(withTitle: (opt != 0) ? opt.description : "Default") + popupMTU.addItem(withTitle: (opt != 0) ? opt.description : L10n.Core.Global.Values.default) } loadSettings(from: currentChoice ?? ProfileNetworkChoices.defaultChoice) } @@ -115,7 +115,7 @@ class MTUViewController: NSViewController, ProfileCustomization { popupMTU.isEnabled = (currentChoice == .manual) for (i, opt) in popupMTU.itemTitles.enumerated() { - if opt == "Default" { + if opt == L10n.Core.Global.Values.default { if bytes == nil { popupMTU.selectItem(at: i) break diff --git a/Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift b/Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift index 629e1538..d28aa464 100644 --- a/Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift +++ b/Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift @@ -153,7 +153,7 @@ class ProviderServiceView: NSView { categories.forEach { let categoryTitle: String if $0.name.isEmpty { - categoryTitle = L10n.App.Global.Values.default + categoryTitle = L10n.Core.Global.Values.default } else { categoryTitle = $0.name.capitalized } @@ -228,7 +228,7 @@ class ProviderServiceView: NSView { guard !$0.secondaryId.isEmpty || currentSortedPools.count > 1 else { return } - let title = !$0.secondaryId.isEmpty ? $0.secondaryId : "Default" + let title = !$0.secondaryId.isEmpty ? $0.secondaryId : L10n.Core.Global.Values.default let item = NSMenuItem(title: title, action: nil, keyEquivalent: "") if let extraCountry = $0.extraCountries?.first { item.image = extraCountry.image diff --git a/Passepartout/App/macOS/en.lproj/App.strings b/Passepartout/App/macOS/en.lproj/App.strings index 21291c10..de736691 100644 --- a/Passepartout/App/macOS/en.lproj/App.strings +++ b/Passepartout/App/macOS/en.lproj/App.strings @@ -23,8 +23,6 @@ // along with Passepartout. If not, see . // -"global.values.default" = "Default"; - "vpn.unused" = "Off"; "organizer.title" = "%@"; diff --git a/Passepartout/Core/Resources/de.lproj/Core.strings b/Passepartout/Core/Resources/de.lproj/Core.strings index f5d11a3b..8f626fae 100644 --- a/Passepartout/Core/Resources/de.lproj/Core.strings +++ b/Passepartout/Core/Resources/de.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Dieses Profil verwenden"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/el.lproj/Core.strings b/Passepartout/Core/Resources/el.lproj/Core.strings index 637c20fb..3b43b031 100644 --- a/Passepartout/Core/Resources/el.lproj/Core.strings +++ b/Passepartout/Core/Resources/el.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Χρησιμοποιήστε αυτό το προφίλ"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/en.lproj/Core.strings b/Passepartout/Core/Resources/en.lproj/Core.strings index 42b0bcca..1de06743 100644 --- a/Passepartout/Core/Resources/en.lproj/Core.strings +++ b/Passepartout/Core/Resources/en.lproj/Core.strings @@ -30,6 +30,7 @@ "global.host.title_input.message" = "Acceptable characters are alphanumerics plus dash \"-\", underscore \"_\" and dot \".\"."; "global.host.title_input.placeholder" = "My profile"; "global.email_not_configured" = "No e-mail account is configured."; +"global.values.default" = "Default"; "global.captions.address" = "Address"; "global.captions.port" = "Port"; diff --git a/Passepartout/Core/Resources/es.lproj/Core.strings b/Passepartout/Core/Resources/es.lproj/Core.strings index 16fb42c7..56a59b60 100644 --- a/Passepartout/Core/Resources/es.lproj/Core.strings +++ b/Passepartout/Core/Resources/es.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Usar este perfil"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/fr.lproj/Core.strings b/Passepartout/Core/Resources/fr.lproj/Core.strings index 178064e2..c35614db 100644 --- a/Passepartout/Core/Resources/fr.lproj/Core.strings +++ b/Passepartout/Core/Resources/fr.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Utiliser ce profile"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/it.lproj/Core.strings b/Passepartout/Core/Resources/it.lproj/Core.strings index 9dab62bc..0329c6e3 100644 --- a/Passepartout/Core/Resources/it.lproj/Core.strings +++ b/Passepartout/Core/Resources/it.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Usa questo profilo"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/nl.lproj/Core.strings b/Passepartout/Core/Resources/nl.lproj/Core.strings index 0591abad..172b81b6 100644 --- a/Passepartout/Core/Resources/nl.lproj/Core.strings +++ b/Passepartout/Core/Resources/nl.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Gebruik dit profiel"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/pl.lproj/Core.strings b/Passepartout/Core/Resources/pl.lproj/Core.strings index b7e4df0f..89b06988 100644 --- a/Passepartout/Core/Resources/pl.lproj/Core.strings +++ b/Passepartout/Core/Resources/pl.lproj/Core.strings @@ -39,6 +39,7 @@ "global.values.none" = "Brak"; "global.values.automatic" = "Automatycznie"; "global.values.manual" = "Ręcznie"; +"global.values.default" = "Default"; "reddit.title" = "Reddit"; "reddit.message" = "Wiedziałeś/łaś, że Passepartout ma swój subreddit? Subskrybuj dla aktualizacji, dyskusji o funkcjonalności, nowych platformach lub o czymkolwiek zechcesz.\n\nTo również świetny sposób na okazanie zainteresowania projektem."; diff --git a/Passepartout/Core/Resources/pt.lproj/Core.strings b/Passepartout/Core/Resources/pt.lproj/Core.strings index 9ede871f..d54ed49d 100644 --- a/Passepartout/Core/Resources/pt.lproj/Core.strings +++ b/Passepartout/Core/Resources/pt.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Usar esse perfil"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/ru.lproj/Core.strings b/Passepartout/Core/Resources/ru.lproj/Core.strings index 091c378e..a374d068 100644 --- a/Passepartout/Core/Resources/ru.lproj/Core.strings +++ b/Passepartout/Core/Resources/ru.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Использовать это профиль."; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "байты"; +"global.values.default" = "По умолчанию"; diff --git a/Passepartout/Core/Resources/sv.lproj/Core.strings b/Passepartout/Core/Resources/sv.lproj/Core.strings index fe64246c..2aba6d89 100644 --- a/Passepartout/Core/Resources/sv.lproj/Core.strings +++ b/Passepartout/Core/Resources/sv.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "Använd den här profilen"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "Default"; diff --git a/Passepartout/Core/Resources/zh-Hans.lproj/Core.strings b/Passepartout/Core/Resources/zh-Hans.lproj/Core.strings index 9ccaf7af..7eea041d 100644 --- a/Passepartout/Core/Resources/zh-Hans.lproj/Core.strings +++ b/Passepartout/Core/Resources/zh-Hans.lproj/Core.strings @@ -238,3 +238,4 @@ "service.cells.use_profile.caption" = "使用此配置"; "network_settings.mtu.title" = "MTU"; "network_settings.mtu.cells.bytes.caption" = "Bytes"; +"global.values.default" = "默认";