Unlocalize some strings

This commit is contained in:
Davide De Rosa 2019-04-23 15:19:53 +02:00
parent ea5992f6ee
commit 458ef496fd
6 changed files with 7 additions and 42 deletions

View File

@ -749,11 +749,10 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
let parameters = uncheckedHostProfile.parameters
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = L10n.Service.Cells.Host.Parameters.caption
let V = L10n.Service.Cells.Host.Parameters.Value.self
if !parameters.sessionConfiguration.fallbackCipher.embedsDigest {
cell.rightText = V.cipherDigest(parameters.sessionConfiguration.fallbackCipher.genericName, parameters.sessionConfiguration.fallbackDigest.genericName)
cell.rightText = "\(parameters.sessionConfiguration.fallbackCipher.genericName) / \(parameters.sessionConfiguration.fallbackDigest.genericName)"
} else {
cell.rightText = V.cipher(parameters.sessionConfiguration.fallbackCipher.genericName)
cell.rightText = parameters.sessionConfiguration.fallbackCipher.genericName
}
return cell
@ -780,7 +779,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
case .trustedWiFi:
let wifi = trustedNetworks.wifi(at: indexPath.row)
let cell = Cells.toggle.dequeue(from: tableView, for: indexPath, tag: row.rawValue, delegate: self)
cell.caption = L10n.Service.Cells.TrustedWifi.caption(wifi.0)
cell.caption = wifi.0
cell.isOn = wifi.1
return cell
@ -807,7 +806,9 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = L10n.Service.Cells.DataCount.caption
if let count = currentDataCount, vpn.status == .connected {
cell.rightText = L10n.Service.Cells.DataCount.value(count.0.dataUnitDescription, count.1.dataUnitDescription)
let down = count.0.dataUnitDescription
let up = count.1.dataUnitDescription
cell.rightText = "\(down) / ↑\(up)"
} else {
cell.rightText = L10n.Service.Cells.DataCount.none
}

View File

@ -105,18 +105,14 @@
"service.cells.provider.preset.caption" = "Voreinstellung";
"service.cells.provider.refresh.caption" = "Infrastruktur neu laden";
"service.cells.host.parameters.caption" = "Parameter";
"service.cells.host.parameters.value.cipher" = "%@";
"service.cells.host.parameters.value.cipher_digest" = "%@ / %@";
"service.cells.vpn_survives_sleep.caption" = "Verbindung aktiv halten trotz Schlafmodus";
"service.cells.vpn_resolves_hostname.caption" = "Server Hostname auflösen";
//"service.cells.vpn_prefers_udp.caption" = "Prefer UDP socket";
"service.cells.trusted_mobile.caption" = "Mobilfunknetz";
"service.cells.trusted_wifi.caption" = "%@";
"service.cells.trusted_add_wifi.caption" = "Aktuelles WLAN hinzufügen";
"service.cells.trusted_policy.caption" = "Vertrauen deaktiviert VPN";
"service.cells.test_connectivity.caption" = "Verbindung testen";
"service.cells.data_count.caption" = "Ausgetauschte Datenmenge";
"service.cells.data_count.value" = "↓%@ / ↑%@";
"service.cells.data_count.none" = "Nicht verfügbar";
"service.cells.debug_log.caption" = "Debug log";
"service.cells.masks_private_data.caption" = "Netzwerkdaten zensieren";

View File

@ -105,18 +105,14 @@
"service.cells.provider.preset.caption" = "Preset";
"service.cells.provider.refresh.caption" = "Refresh infrastructure";
"service.cells.host.parameters.caption" = "Parameters";
"service.cells.host.parameters.value.cipher" = "%@";
"service.cells.host.parameters.value.cipher_digest" = "%@ / %@";
"service.cells.vpn_survives_sleep.caption" = "Keep alive on sleep";
"service.cells.vpn_resolves_hostname.caption" = "Resolve server hostname";
//"service.cells.vpn_prefers_udp.caption" = "Prefer UDP socket";
"service.cells.trusted_mobile.caption" = "Cellular network";
"service.cells.trusted_wifi.caption" = "%@";
"service.cells.trusted_add_wifi.caption" = "Add current Wi-Fi";
"service.cells.trusted_policy.caption" = "Trust disables VPN";
"service.cells.test_connectivity.caption" = "Test connectivity";
"service.cells.data_count.caption" = "Exchanged data";
"service.cells.data_count.value" = "↓%@ / ↑%@";
"service.cells.data_count.none" = "Unavailable";
"service.cells.debug_log.caption" = "Debug log";
"service.cells.masks_private_data.caption" = "Mask network data";

View File

@ -105,18 +105,14 @@
"service.cells.provider.preset.caption" = "Preset";
"service.cells.provider.refresh.caption" = "Aggiorna infrastruttura";
"service.cells.host.parameters.caption" = "Parametri";
"service.cells.host.parameters.value.cipher" = "%@";
"service.cells.host.parameters.value.cipher_digest" = "%@ / %@";
"service.cells.vpn_survives_sleep.caption" = "Mantieni attivo in sleep";
"service.cells.vpn_resolves_hostname.caption" = "Risolvi hostname del server";
//"service.cells.vpn_prefers_udp.caption" = "Prefer UDP socket";
"service.cells.trusted_mobile.caption" = "Rete cellulare";
"service.cells.trusted_wifi.caption" = "%@";
"service.cells.trusted_add_wifi.caption" = "Aggiungi Wi-Fi corrente";
"service.cells.trusted_policy.caption" = "Spegni VPN in rete sicura";
"service.cells.test_connectivity.caption" = "Verifica connettività";
"service.cells.data_count.caption" = "Dati scambiati";
"service.cells.data_count.value" = "↓%@ / ↑%@";
"service.cells.data_count.none" = "Non disponibile";
"service.cells.debug_log.caption" = "Debug log";
"service.cells.masks_private_data.caption" = "Maschera dati rete";

View File

@ -105,18 +105,14 @@
"service.cells.provider.preset.caption" = "Пресет";
"service.cells.provider.refresh.caption" = "Обновить инфраструктуру";
"service.cells.host.parameters.caption" = "Параметры";
"service.cells.host.parameters.value.cipher" = "%@";
"service.cells.host.parameters.value.cipher_digest" = "%@ / %@";
"service.cells.vpn_survives_sleep.caption" = "Оставлять включенным во время сна";
"service.cells.vpn_resolves_hostname.caption" = "Разрешить имя хоста сервера";
//"service.cells.vpn_prefers_udp.caption" = "Предпочитать UDP подключение";
"service.cells.trusted_mobile.caption" = "Мобильная сеть";
"service.cells.trusted_wifi.caption" = "%@";
"service.cells.trusted_add_wifi.caption" = "Добавить текущий Wi-Fi";
"service.cells.trusted_policy.caption" = "Дов. сеть отключает VPN";
"service.cells.test_connectivity.caption" = "Проверить подключение";
"service.cells.data_count.caption" = "Переданная информация";
"service.cells.data_count.value" = "↓%@ / ↑%@";
"service.cells.data_count.none" = "Недоступно";
"service.cells.debug_log.caption" = "Журнал отладки";
"service.cells.masks_private_data.caption" = "Маскировать информацию сети";

View File

@ -678,10 +678,6 @@ public enum L10n {
public static let caption = L10n.tr("Localizable", "service.cells.data_count.caption")
/// Unavailable
public static let `none` = L10n.tr("Localizable", "service.cells.data_count.none")
/// %@ / %@
public static func value(_ p1: String, _ p2: String) -> String {
return L10n.tr("Localizable", "service.cells.data_count.value", p1, p2)
}
}
public enum DebugLog {
/// Debug log
@ -701,16 +697,6 @@ public enum L10n {
public enum Parameters {
/// Parameters
public static let caption = L10n.tr("Localizable", "service.cells.host.parameters.caption")
public enum Value {
/// %@
public static func cipher(_ p1: String) -> String {
return L10n.tr("Localizable", "service.cells.host.parameters.value.cipher", p1)
}
/// %@ / %@
public static func cipherDigest(_ p1: String, _ p2: String) -> String {
return L10n.tr("Localizable", "service.cells.host.parameters.value.cipher_digest", p1, p2)
}
}
}
}
public enum MasksPrivateData {
@ -755,12 +741,6 @@ public enum L10n {
/// Trust disables VPN
public static let caption = L10n.tr("Localizable", "service.cells.trusted_policy.caption")
}
public enum TrustedWifi {
/// %@
public static func caption(_ p1: String) -> String {
return L10n.tr("Localizable", "service.cells.trusted_wifi.caption", p1)
}
}
public enum UseProfile {
/// Use this profile
public static let caption = L10n.tr("Localizable", "service.cells.use_profile.caption")
@ -784,7 +764,7 @@ public enum L10n {
public static let header = L10n.tr("Localizable", "service.sections.configuration.header")
}
public enum Diagnostics {
/// Masking status will be effective after reconnecting. Network data is hostnames, IP addresses, routing, SSID. Credentials and private keys are not logged regardless.
/// Masking status will be effective after reconnecting. Network data are hostnames, IP addresses, routing, SSID. Credentials and private keys are not logged regardless.
public static let footer = L10n.tr("Localizable", "service.sections.diagnostics.footer")
/// Diagnostics
public static let header = L10n.tr("Localizable", "service.sections.diagnostics.header")