Move some strings to Core

This commit is contained in:
Davide De Rosa 2019-06-23 10:33:43 +02:00
parent 7186beb6bd
commit 40a7ac56f7
14 changed files with 13 additions and 33 deletions

View File

@ -62,12 +62,6 @@ internal enum L10n {
/// Add new provider
internal static let caption = L10n.tr("App", "organizer.cells.add_provider.caption")
}
internal enum Profile {
internal enum Value {
/// In use
internal static let current = L10n.tr("App", "organizer.cells.profile.value.current")
}
}
}
}
internal enum Provider {
@ -125,10 +119,6 @@ internal enum L10n {
internal static let header = L10n.tr("App", "service.sections.vpn.header")
}
}
internal enum Welcome {
/// Welcome to Passepartout!\n\nUse the organizer to add a new profile.
internal static let message = L10n.tr("App", "service.welcome.message")
}
}
internal enum Shortcuts {
internal enum Add {
@ -596,6 +586,12 @@ internal enum L10n {
/// Support me on Patreon
internal static let caption = L10n.tr("Core", "organizer.cells.patreon.caption")
}
internal enum Profile {
internal enum Value {
/// In use
internal static let current = L10n.tr("Core", "organizer.cells.profile.value.current")
}
}
internal enum SiriShortcuts {
/// Manage shortcuts
internal static let caption = L10n.tr("Core", "organizer.cells.siri_shortcuts.caption")
@ -853,6 +849,10 @@ internal enum L10n {
internal static let footer = L10n.tr("Core", "service.sections.vpn_survives_sleep.footer")
}
}
internal enum Welcome {
/// Welcome to Passepartout!\n\nUse the organizer to add a new profile.
internal static let message = L10n.tr("Core", "service.welcome.message")
}
}
internal enum Share {
/// Passepartout is an user-friendly, open source OpenVPN client for iOS and macOS

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "In Benutzung";
"organizer.cells.add_provider.caption" = "Neuen Anbieter hinzufügen";
"organizer.cells.add_host.caption" = "Neuen Host hinzufügen";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Importierte Hosts";
"service.welcome.message" = "Willkommen bei Passepartout!\n\nBenutze den Organizer um ein neues Profil hinzuzufügen.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Verbindung";
"service.sections.configuration.header" = "Konfiguration";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "Σε χρήση";
"organizer.cells.add_provider.caption" = "Προσθήκη νέου παρόχου";
"organizer.cells.add_host.caption" = "Προσθήκη νέου διακομιστή";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Εισαγόμενοι διακομιστές";
"service.welcome.message" = "Καλώς Ήλθατε στο Passepartout!\n\nΧρησιμοποιήστε τον διοργανωτή για να προσθέσετε ένα νέο προφίλ.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Σύνδεση";
"service.sections.configuration.header" = "Ρύθμιση";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "In use";
"organizer.cells.add_provider.caption" = "Add new provider";
"organizer.cells.add_host.caption" = "Add new host";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Imported hosts";
"service.welcome.message" = "Welcome to Passepartout!\n\nUse the organizer to add a new profile.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Connection";
"service.sections.configuration.header" = "Configuration";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "En uso";
"organizer.cells.add_provider.caption" = "Añadir proveedor";
"organizer.cells.add_host.caption" = "Añadir host";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Hosts importados";
"service.welcome.message" = "Bienvenid@ a Passepartout!\n\nUsa el organizador para añadir un nuevo perfil.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Conexión";
"service.sections.configuration.header" = "Configuración";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "En utilisation";
"organizer.cells.add_provider.caption" = "Ajouter un nouveau fournisseur";
"organizer.cells.add_host.caption" = "Ajouter un nouvel hôte";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Hôtes importés";
"service.welcome.message" = "Bienvenue à Passepartout!\n\nUtilisez l'organiseur pour ajouter un nouveau profile.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Connection";
"service.sections.configuration.header" = "Configuration";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "In uso";
"organizer.cells.add_provider.caption" = "Aggiungi provider";
"organizer.cells.add_host.caption" = "Aggiungi host";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Host importati";
"service.welcome.message" = "Benvenuto in Passepartout!\n\nUsa il menu per aggiungere un nuovo profilo.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Connessione";
"service.sections.configuration.header" = "Configurazione";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "In gebruik";
"organizer.cells.add_provider.caption" = "Voeg nieuwe aanbieder toe";
"organizer.cells.add_host.caption" = "Voeg nieuwe host toe";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Geïmporteerde hosts";
"service.welcome.message" = "Welkom bij Passepartout!\n\nGebruik de organizer om een nieuw profiel toe te voegen.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Verbinding";
"service.sections.configuration.header" = "Configuratie";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "Ativo";
"organizer.cells.add_provider.caption" = "Adicionar novo perfil";
"organizer.cells.add_host.caption" = "Adicionar novo host";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Hosts importados";
"service.welcome.message" = "Bem-vindo ao Passepartout!\n\nUse o organizador para adicionar um novo perfil.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Conexão";
"service.sections.configuration.header" = "Configuração";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "Используется";
"organizer.cells.add_provider.caption" = "Добавить нового провайдера";
"organizer.cells.add_host.caption" = "Добавить новый хост";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Импортированные хост профили";
"service.welcome.message" = "Добро пожаловать в Passepartout!\n\nИспользуйте организатор для добавления нового профиля.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Соединение";
"service.sections.configuration.header" = "Конфигурация";

View File

@ -23,7 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
//
"organizer.cells.profile.value.current" = "Under användning";
"organizer.cells.add_provider.caption" = "Lägg till ny leverantör";
"organizer.cells.add_host.caption" = "Lägg till ny värd";
@ -32,7 +31,6 @@
"imported_hosts.title" = "Importerade värdar";
"service.welcome.message" = "Välkommen till Passepartout! \n\nAnvänd arrangören för att lägga till en ny profil.";
"service.sections.vpn.header" = "VPN";
"service.sections.status.header" = "Koppling";
"service.sections.configuration.header" = "Konfiguration";

View File

@ -431,7 +431,7 @@ extension OrganizerViewController {
cell.imageView?.image = nil
}
cell.leftText = rowProfile.id
cell.rightText = service.isActiveProfile(rowProfile) ? L10n.App.Organizer.Cells.Profile.Value.current : nil
cell.rightText = service.isActiveProfile(rowProfile) ? L10n.Core.Organizer.Cells.Profile.Value.current : nil
return cell
case .addProvider:

View File

@ -97,7 +97,7 @@ class ServiceViewController: UIViewController, TableModelHost {
navigationItem.leftBarButtonItem = splitViewController?.displayModeButtonItem
navigationItem.leftItemsSupplementBackButton = true
labelWelcome.text = L10n.App.Service.Welcome.message
labelWelcome.text = L10n.Core.Service.Welcome.message
labelWelcome.apply(Theme.current)
let nc = NotificationCenter.default

@ -1 +1 @@
Subproject commit b58dbe713459f631220fd903bc17bd99748c750c
Subproject commit 2d5f1f6f0d4d8d8353543da547d6b531beab1894