Refactor string ids after adding SettingsView

Passepartout/App/Views/AboutView.swift

@@ -70,14 +70,13 @@ struct AboutView: View {
         }
     }
     
-    // FIXME: l10n, refactor string ids
     private var supportSection: some View {
         Section {
-            Button(L10n.Menu.System.Support.joinCommunity) {
+            Button(L10n.About.Items.JoinCommunity.caption) {
                 URL.openURL(redditURL)
             }
-            Button(L10n.Menu.System.ShareTwitter.caption, action: shareOnTwitter)
+            Button(L10n.About.Items.ShareTwitter.caption, action: shareOnTwitter)
-            Button(L10n.Menu.System.Support.writeReview, action: submitReview)
+            Button(L10n.About.Items.WriteReview.caption, action: submitReview)
         } header: {
             Text(L10n.Menu.All.Support.title)
         }

Passepartout/App/Views/SettingsView.swift

@@ -49,7 +49,7 @@ struct SettingsView: View {
         }.toolbar {
             themeCloseItem(presentationMode: presentationMode)
         }.themeSecondaryView()
-        .navigationTitle(L10n.Settings.title) // FIXME: l10n
+        .navigationTitle(L10n.Settings.title)
     }
     
     private var aboutSection: some View {
@@ -62,7 +62,7 @@ struct SettingsView: View {
             NavigationLink {
                 DonateView()
             } label: {
-                Text(L10n.Menu.System.Support.donate)
+                Text(L10n.Settings.Items.Donate.caption)
             }.disabled(!productManager.canMakePayments())
         } footer: {
             HStack {

Passepartout/AppShared/Constants/SwiftGen+Strings.swift

@@ -22,14 +22,26 @@ internal enum L10n {
         /// Disclaimer
         internal static let caption = L10n.tr("Localizable", "about.items.disclaimer.caption", fallback: "Disclaimer")
       }
+      internal enum JoinCommunity {
+        /// Join community
+        internal static let caption = L10n.tr("Localizable", "about.items.join_community.caption", fallback: "Join community")
+      }
       internal enum PrivacyPolicy {
         /// Privacy policy
         internal static let caption = L10n.tr("Localizable", "about.items.privacy_policy.caption", fallback: "Privacy policy")
       }
+      internal enum ShareTwitter {
+        /// Tweet about it!
+        internal static let caption = L10n.tr("Localizable", "about.items.share_twitter.caption", fallback: "Tweet about it!")
+      }
       internal enum Website {
         /// Home page
         internal static let caption = L10n.tr("Localizable", "about.items.website.caption", fallback: "Home page")
       }
+      internal enum WriteReview {
+        /// Write a review
+        internal static let caption = L10n.tr("Localizable", "about.items.write_review.caption", fallback: "Write a review")
+      }
     }
     internal enum Sections {
       internal enum Web {
@@ -450,8 +462,6 @@ internal enum L10n {
       internal static let encryption = L10n.tr("Localizable", "global.strings.encryption", fallback: "Encryption")
       /// Endpoint
       internal static let endpoint = L10n.tr("Localizable", "global.strings.endpoint", fallback: "Endpoint")
-      /// Hide
-      internal static let hide = L10n.tr("Localizable", "global.strings.hide", fallback: "Hide")
       /// Interface
       internal static let interface = L10n.tr("Localizable", "global.strings.interface", fallback: "Interface")
       /// Keep-alive
@@ -546,18 +556,6 @@ internal enum L10n {
           return L10n.tr("Localizable", "menu.system.quit.title", String(describing: p1), fallback: "Quit %@")
         }
       }
-      internal enum ShareTwitter {
-        /// Tweet about it!
-        internal static let caption = L10n.tr("Localizable", "menu.system.share_twitter.caption", fallback: "Tweet about it!")
-      }
-      internal enum Support {
-        /// Make a donation
-        internal static let donate = L10n.tr("Localizable", "menu.system.support.donate", fallback: "Make a donation")
-        /// Join community
-        internal static let joinCommunity = L10n.tr("Localizable", "menu.system.support.join_community", fallback: "Join community")
-        /// Write a review
-        internal static let writeReview = L10n.tr("Localizable", "menu.system.support.write_review", fallback: "Write a review")
-      }
     }
   }
   internal enum NetworkSettings {
@@ -767,10 +765,6 @@ internal enum L10n {
           internal static let caption = L10n.tr("Localizable", "profile.items.provider.refresh.caption", fallback: "Refresh infrastructure")
         }
       }
-      internal enum Reconnect {
-        /// Reconnect
-        internal static let caption = L10n.tr("Localizable", "profile.items.reconnect.caption", fallback: "Reconnect")
-      }
       internal enum UseProfile {
         /// Use this profile
         internal static let caption = L10n.tr("Localizable", "profile.items.use_profile.caption", fallback: "Use this profile")
@@ -862,6 +856,12 @@ internal enum L10n {
   internal enum Settings {
     /// MARK: SettingsView
     internal static let title = L10n.tr("Localizable", "settings.title", fallback: "Settings")
+    internal enum Items {
+      internal enum Donate {
+        /// Make a donation
+        internal static let caption = L10n.tr("Localizable", "settings.items.donate.caption", fallback: "Make a donation")
+      }
+    }
   }
   internal enum Shortcuts {
     internal enum Add {

Passepartout/AppShared/de.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Einladen";
 
-"menu.system.show.title" = "Anzeigen";
+"global.strings.show" = "Anzeigen";
 "menu.system.switch_profile.title" = "Aktives Profil";
 "menu.system.active_profile.title.none" = "Keine aktiven Profile";
 "menu.system.active_profile.items.customize.title" = "Anpassen...";
 "menu.system.active_profile.messages.missing_credentials" = "Es wurde keine Konto konfiguriert";
 "menu.system.organizer.title" = "Organizer";
 "menu.system.preferences.title" = "Einstellungen";
-"menu.system.support.donate" = "Spenden";
+"settings.items.donate.caption" = "Spenden";
-"menu.system.support.join_community" = "Community beitreten";
+"about.items.join_community.caption" = "Community beitreten";
-"menu.system.support.write_review" = "Rezension schreiben";
+"about.items.write_review.caption" = "Rezension schreiben";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Darüber Twittern!";
+"about.items.share_twitter.caption" = "Darüber Twittern!";
 "menu.system.share_generic.caption" = "Freund einladen";
 "menu.system.quit.title" = "%@ beenden";
 "menu.system.quit.messages.confirm" = "Wenn das VPN aktiviert wurde, läuft es weiter im Hintergrund. Möchtest du beenden?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Nur favorisierte Standorte anzeigen";
 "profile.items.vpn_survives_sleep.caption" = "Verbindung aktiv halten trotz Schlafmodus";
 "profile.items.vpn_resolves_hostname.caption" = "Server Hostname auflösen";
-"profile.items.reconnect.caption" = "Erneut verbinden";
 
 "profile.alerts.rename.title" = "Profil umbenennen";
 "profile.alerts.reconnect_vpn.message" = "Möchtest du erneut zum VPN verbinden?";

Passepartout/AppShared/el.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Πρόσκληση";
 
-"menu.system.show.title" = "Προβολή";
+"global.strings.show" = "Προβολή";
 "menu.system.switch_profile.title" = "Ενεργό προφίλ";
 "menu.system.active_profile.title.none" = "Δεν υπάρχει ενεργό προφίλ";
 "menu.system.active_profile.items.customize.title" = "Προσαρμογή...";
 "menu.system.active_profile.messages.missing_credentials" = "Δεν έχει διαμορφωθεί λογαριασμός";
 "menu.system.organizer.title" = "Διοργανωτής";
 "menu.system.preferences.title" = "Προτιμήσεις";
-"menu.system.support.donate" = "Κάντε μια δωρεά";
+"settings.items.donate.caption" = "Κάντε μια δωρεά";
-"menu.system.support.join_community" = "Συμμετοχή στην κοινότητα";
+"about.items.join_community.caption" = "Συμμετοχή στην κοινότητα";
-"menu.system.support.write_review" = "Γράψτε μια κριτική";
+"about.items.write_review.caption" = "Γράψτε μια κριτική";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweet γι 'αυτό!";
+"about.items.share_twitter.caption" = "Tweet γι 'αυτό!";
 "menu.system.share_generic.caption" = "Πρόσκληση Φίλου";
 "menu.system.quit.title" = "Διακοπή %@";
 "menu.system.quit.messages.confirm" = "Το VPN, αν είναι ενεργοποιημένο, θα εξακολουθεί να εκτελείται στο παρασκήνιο. Θέλετε να το διακόψετε;";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Προβολή αγαπημένων τοποθεσιών μόνο";
 "profile.items.vpn_survives_sleep.caption" = "Κρατήστε ζωντανό στον ύπνο";
 "profile.items.vpn_resolves_hostname.caption" = "Επίλυση του ονόματος σέρβερ διακομιστή";
-"profile.items.reconnect.caption" = "Επανασύνδεση";
 
 "profile.alerts.rename.title" = "Μετονομασία προφίλ";
 "profile.alerts.reconnect_vpn.message" = "Θέλετε να συνδεθείτε ξανά με το VPN;";

Passepartout/AppShared/en.lproj/Localizable.strings

@@ -47,7 +47,6 @@
 "global.strings.advanced" = "Advanced";
 "global.strings.translations" = "Translations";
 "global.strings.show" = "Show";
-"global.strings.hide" = "Hide";
 "global.strings.connect" = "Connect";
 "global.strings.disconnect" = "Disconnect";
 "global.strings.download" = "Download";
@@ -76,20 +75,7 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Invite";
 
-//"menu.system.switch_profile.title" = "Active profile";
-//"menu.system.active_profile.title.none" = "No active profile";
-//"menu.system.active_profile.items.customize.title" = "Customize...";
-//"menu.system.active_profile.messages.missing_credentials" = "No account configured";
-//"menu.system.organizer.title" = "Organizer";
-//"menu.system.preferences.title" = "Preferences";
-"menu.system.support.donate" = "Make a donation";
-"menu.system.support.join_community" = "Join community";
-"menu.system.support.write_review" = "Write a review";
-// "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweet about it!";
-//"menu.system.share_generic.caption" = "Invite a friend";
 "menu.system.quit.title" = "Quit %@";
-//"menu.system.quit.messages.confirm" = "The VPN, if enabled, will still run in the background. Do you want to quit?";
 
 /* MARK: TunnelKit */
 
@@ -169,7 +155,6 @@
 "profile.items.only_shows_favorites.caption" = "Only show favorite locations";
 "profile.items.vpn_survives_sleep.caption" = "Keep alive on sleep";
 "profile.items.vpn_resolves_hostname.caption" = "Resolve provider hostname";
-"profile.items.reconnect.caption" = "Reconnect";
 
 "profile.alerts.rename.title" = "Rename profile";
 "profile.alerts.reconnect_vpn.message" = "Do you want to reconnect to the VPN?";
@@ -325,12 +310,16 @@
 /* MARK: SettingsView */
 
 "settings.title" = "Settings";
+"settings.items.donate.caption" = "Make a donation";
 
 /* MARK: AboutView */
 
 "about.title" = "About";
 "about.sections.web.header" = "Web";
 "about.items.credits.caption" = "Credits";
+"about.items.join_community.caption" = "Join community";
+"about.items.write_review.caption" = "Write a review";
+"about.items.share_twitter.caption" = "Tweet about it!";
 "about.items.website.caption" = "Home page";
 "about.items.disclaimer.caption" = "Disclaimer";
 "about.items.privacy_policy.caption" = "Privacy policy";

Passepartout/AppShared/es.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweetear";
 "menu.contextual.share_generic" = "Invitar";
 
-"menu.system.show.title" = "Mostrar";
+"global.strings.show" = "Mostrar";
 "menu.system.switch_profile.title" = "Perfil activo";
 "menu.system.active_profile.title.none" = "Ningún perfil activo";
 "menu.system.active_profile.items.customize.title" = "Personalizar...";
 "menu.system.active_profile.messages.missing_credentials" = "Ninguna cuenta configurada";
 "menu.system.organizer.title" = "Organizador";
 "menu.system.preferences.title" = "Preferencias";
-"menu.system.support.donate" = "Hacer una donación";
+"settings.items.donate.caption" = "Hacer una donación";
-"menu.system.support.join_community" = "Apuntarse a la comunidad";
+"about.items.join_community.caption" = "Apuntarse a la comunidad";
-"menu.system.support.write_review" = "Escribir una reseña";
+"about.items.write_review.caption" = "Escribir una reseña";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Enviar un Tweet!";
+"about.items.share_twitter.caption" = "Enviar un Tweet!";
 "menu.system.share_generic.caption" = "Invitar a un amig@";
 "menu.system.quit.title" = "Salir de %@";
 "menu.system.quit.messages.confirm" = "Si la VPN está habilitada, seguirá funcionando en segundo plano. ¿Deseas salir?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Mostrar solo ubicaciones favoritas";
 "profile.items.vpn_survives_sleep.caption" = "Mantener en modo inactivo";
 "profile.items.vpn_resolves_hostname.caption" = "Resolver hostname del servidor";
-"profile.items.reconnect.caption" = "Reconectar";
 
 "profile.alerts.rename.title" = "Renombrar perfil";
 "profile.alerts.reconnect_vpn.message" = "Quieres reconectarte al VPN?";

Passepartout/AppShared/fr.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Inviter";
 
-"menu.system.show.title" = "Afficher";
+"global.strings.show" = "Afficher";
 "menu.system.switch_profile.title" = "Profil actif";
 "menu.system.active_profile.title.none" = "Pas de profil actif";
 "menu.system.active_profile.items.customize.title" = "Personnaliser...";
 "menu.system.active_profile.messages.missing_credentials" = "Pas de compte configuré";
 "menu.system.organizer.title" = "Organisateur";
 "menu.system.preferences.title" = "Préférences";
-"menu.system.support.donate" = "Faire un don";
+"settings.items.donate.caption" = "Faire un don";
-"menu.system.support.join_community" = "Rejoindre la communauté";
+"about.items.join_community.caption" = "Rejoindre la communauté";
-"menu.system.support.write_review" = "Écrire un avis";
+"about.items.write_review.caption" = "Écrire un avis";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweetez!";
+"about.items.share_twitter.caption" = "Tweetez!";
 "menu.system.share_generic.caption" = "Inviter un amis";
 "menu.system.quit.title" = "Quitter %@";
 "menu.system.quit.messages.confirm" = "S'il est activé, le VPN fonctionnera en tâche de fond. Voulez-vous quitter ?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Afficher uniquement les emplacements favoris";
 "profile.items.vpn_survives_sleep.caption" = "Garder actif lors de la veille";
 "profile.items.vpn_resolves_hostname.caption" = "Résoudre le nom d'hôte du serveur";
-"profile.items.reconnect.caption" = "Reconnecter";
 
 "profile.alerts.rename.title" = "Renommer le profile";
 "profile.alerts.reconnect_vpn.message" = "Voulez-vous reconnecter le VPN?";

Passepartout/AppShared/it.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Invita";
 
-"menu.system.show.title" = "Mostra";
+"global.strings.show" = "Mostra";
 "menu.system.switch_profile.title" = "Profilo attivo";
 "menu.system.active_profile.title.none" = "Nessun profilo attivo";
 "menu.system.active_profile.items.customize.title" = "Personalizza...";
 "menu.system.active_profile.messages.missing_credentials" = "Nessun account configurato";
 "menu.system.organizer.title" = "Organizer";
 "menu.system.preferences.title" = "Preferenze";
-"menu.system.support.donate" = "Fai una donazione";
+"settings.items.donate.caption" = "Fai una donazione";
-"menu.system.support.join_community" = "Entra nella community";
+"about.items.join_community.caption" = "Entra nella community";
-"menu.system.support.write_review" = "Scrivi una recensione";
+"about.items.write_review.caption" = "Scrivi una recensione";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Manda un Tweet!";
+"about.items.share_twitter.caption" = "Manda un Tweet!";
 "menu.system.share_generic.caption" = "Invita un amico";
 "menu.system.quit.title" = "Esci da %@";
 "menu.system.quit.messages.confirm" = "La VPN, se abilitata, continuerà ad essere attiva in background. Vuoi comunque uscire?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Mostra solo le posizioni preferite";
 "profile.items.vpn_survives_sleep.caption" = "Mantieni attivo in sleep";
 "profile.items.vpn_resolves_hostname.caption" = "Risolvi hostname del server";
-"profile.items.reconnect.caption" = "Riconnetti";
 
 "profile.alerts.rename.title" = "Rinomina profilo";
 "profile.alerts.reconnect_vpn.message" = "Vuoi riconnetterti alla VPN?";

Passepartout/AppShared/nl.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweeten";
 "menu.contextual.share_generic" = "Uitnodigen";
 
-"menu.system.show.title" = "Weergeven";
+"global.strings.show" = "Weergeven";
 "menu.system.switch_profile.title" = "Actief profiel";
 "menu.system.active_profile.title.none" = "Geen actief profiel";
 "menu.system.active_profile.items.customize.title" = "Aanpassen...";
 "menu.system.active_profile.messages.missing_credentials" = "Geen account geconfigureerd";
 "menu.system.organizer.title" = "Organisator";
 "menu.system.preferences.title" = "Voorkeuren";
-"menu.system.support.donate" = "Doneer een gift";
+"settings.items.donate.caption" = "Doneer een gift";
-"menu.system.support.join_community" = "Word lid van de gemeenschap";
+"about.items.join_community.caption" = "Word lid van de gemeenschap";
-"menu.system.support.write_review" = "Schrijf een beoordeling";
+"about.items.write_review.caption" = "Schrijf een beoordeling";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweet about it!";
+"about.items.share_twitter.caption" = "Tweet about it!";
 "menu.system.share_generic.caption" = "Nodig een vriend uit";
 "menu.system.quit.title" = "%@ afsluiten";
 "menu.system.quit.messages.confirm" = "De VPN zal, indien geactiveerd, op de achtergrond blijven draaien. Wilt u sluiten?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Alleen favoriete locaties weergeven";
 "profile.items.vpn_survives_sleep.caption" = "Actief tijdens slaapstand";
 "profile.items.vpn_resolves_hostname.caption" = "Haal de naam van de host op";
-"profile.items.reconnect.caption" = "Opnieuw verbinden";
 
 "profile.alerts.rename.title" = "Profiel hernoemen";
 "profile.alerts.reconnect_vpn.message" = "Opnieuw verbinding maken met de VPN?";

Passepartout/AppShared/pl.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Zaproś";
 
-"menu.system.show.title" = "Pokaż";
+"global.strings.show" = "Pokaż";
 "menu.system.switch_profile.title" = "Aktywny profil";
 "menu.system.active_profile.title.none" = "Brak aktywnych profili";
 "menu.system.active_profile.items.customize.title" = "Personalizuj";
 "menu.system.active_profile.messages.missing_credentials" = "Brak skonfigurowanych kont";
 "menu.system.organizer.title" = "Organzator";
 "menu.system.preferences.title" = "Preferencje";
-"menu.system.support.donate" = "Wyślij dotację";
+"settings.items.donate.caption" = "Wyślij dotację";
-"menu.system.support.join_community" = "Dołącz do społeczności";
+"about.items.join_community.caption" = "Dołącz do społeczności";
-"menu.system.support.write_review" = "Napisz recenzję";
+"about.items.write_review.caption" = "Napisz recenzję";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Wyślij tweeta!";
+"about.items.share_twitter.caption" = "Wyślij tweeta!";
 "menu.system.share_generic.caption" = "Zaproś znajomego";
 "menu.system.quit.title" = "Zakończ %@";
 "menu.system.quit.messages.confirm" = "Jeśli  sieć VPN, jest włączona, będzie nadal działać w tle. Chcesz zakończyć?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Pokazuj tylko ulubione lokalizacje";
 "profile.items.vpn_survives_sleep.caption" = "Utrzymuj połączenie przy zablokowanym ekranie";
 "profile.items.vpn_resolves_hostname.caption" = "Rozwiązuj nazwy hostów usługodawcy";
-"profile.items.reconnect.caption" = "Połącz ponownie";
 
 "profile.alerts.rename.title" = "Zmień nazwę profilu";
 "profile.alerts.reconnect_vpn.message" = "Czy chcesz połączyć się ponownie z VPN?";

Passepartout/AppShared/pt.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Convite";
 
-"menu.system.show.title" = "Mostrar";
+"global.strings.show" = "Mostrar";
 "menu.system.switch_profile.title" = "Perfil ativo";
 "menu.system.active_profile.title.none" = "Sem perfil ativo";
 "menu.system.active_profile.items.customize.title" = "Personalizar...";
 "menu.system.active_profile.messages.missing_credentials" = "Não há uma conta configurada";
 "menu.system.organizer.title" = "Organizador";
 "menu.system.preferences.title" = "Preferências";
-"menu.system.support.donate" = "Fazer doação";
+"settings.items.donate.caption" = "Fazer doação";
-"menu.system.support.join_community" = "Participar da comunidade";
+"about.items.join_community.caption" = "Participar da comunidade";
-"menu.system.support.write_review" = "Escrever avaliação";
+"about.items.write_review.caption" = "Escrever avaliação";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweet sobre isso!";
+"about.items.share_twitter.caption" = "Tweet sobre isso!";
 "menu.system.share_generic.caption" = "Convide um amigo";
 "menu.system.quit.title" = "Sair %@";
 "menu.system.quit.messages.confirm" = "A VPN, se ativa, ainda vai ser executada em segundo plano. Quer sair?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Mostrar apenas os locais preferidos";
 "profile.items.vpn_survives_sleep.caption" = "Manter ativo em modo descanço";
 "profile.items.vpn_resolves_hostname.caption" = "Resolver hostname do servidor";
-"profile.items.reconnect.caption" = "Reconectar";
 
 "profile.alerts.rename.title" = "Renomear perfil";
 "profile.alerts.reconnect_vpn.message" = "Deseja reconectar à VPN?";

Passepartout/AppShared/ru.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Твит";
 "menu.contextual.share_generic" = "Пригласить";
 
-"menu.system.show.title" = "Показать";
+"global.strings.show" = "Показать";
 "menu.system.switch_profile.title" = "Активный профиль";
 "menu.system.active_profile.title.none" = "Нет активных профилей";
 "menu.system.active_profile.items.customize.title" = "Настроить...";
 "menu.system.active_profile.messages.missing_credentials" = "Нет настроенных аккаунтов";
 "menu.system.organizer.title" = "Организатор";
 "menu.system.preferences.title" = "Настройки";
-"menu.system.support.donate" = "Сделать пожертвование";
+"settings.items.donate.caption" = "Сделать пожертвование";
-"menu.system.support.join_community" = "Вступить в сообщество";
+"about.items.join_community.caption" = "Вступить в сообщество";
-"menu.system.support.write_review" = "Написать отзыв";
+"about.items.write_review.caption" = "Написать отзыв";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Твитнуть о нас!";
+"about.items.share_twitter.caption" = "Твитнуть о нас!";
 "menu.system.share_generic.caption" = "Пригласить друга";
 "menu.system.quit.title" = "Выйти из %@";
 "menu.system.quit.messages.confirm" = "Если включить VPN, он всё равно будет работать в фоновом режиме. Вы точно хотите выйти?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Показывать только места из избранного";
 "profile.items.vpn_survives_sleep.caption" = "Оставлять включенным во время сна";
 "profile.items.vpn_resolves_hostname.caption" = "Разрешить имя хоста сервера";
-"profile.items.reconnect.caption" = "Переподключиться";
 
 "profile.alerts.rename.title" = "Переименовать профиль";
 "profile.alerts.reconnect_vpn.message" = "Хотите заново подключиться к VPN?";

Passepartout/AppShared/sv.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "Tweet";
 "menu.contextual.share_generic" = "Bjud in";
 
-"menu.system.show.title" = "Visa";
+"global.strings.show" = "Visa";
 "menu.system.switch_profile.title" = "Aktiv profil";
 "menu.system.active_profile.title.none" = "Ingen aktiv profil";
 "menu.system.active_profile.items.customize.title" = "Anpassa";
 "menu.system.active_profile.messages.missing_credentials" = "Inget konto har konfigurerats";
 "menu.system.organizer.title" = "Organisatör";
 "menu.system.preferences.title" = "Inställningar";
-"menu.system.support.donate" = "Gör en donation";
+"settings.items.donate.caption" = "Gör en donation";
-"menu.system.support.join_community" = "Gå med i communityn";
+"about.items.join_community.caption" = "Gå med i communityn";
-"menu.system.support.write_review" = "Skriv en recension";
+"about.items.write_review.caption" = "Skriv en recension";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "Tweet om det!";
+"about.items.share_twitter.caption" = "Tweet om det!";
 "menu.system.share_generic.caption" = "Bjud in en vän";
 "menu.system.quit.title" = "Lämna %@";
 "menu.system.quit.messages.confirm" = "Om ett VPN är aktiverat kommer detta fortfarande att köra i bakgrunden. Vill du lämna?";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "Visa endast favoritplatser";
 "profile.items.vpn_survives_sleep.caption" = "Håll dig levande i sömnen";
 "profile.items.vpn_resolves_hostname.caption" = "Lösa server värdnamn";
-"profile.items.reconnect.caption" = "Återanslut";
 
 "profile.alerts.rename.title" = "Byt namn på profil";
 "profile.alerts.reconnect_vpn.message" = "Vill du återansluta till VPN?";

Passepartout/AppShared/zh-Hans.lproj/Localizable.strings

@@ -71,18 +71,18 @@
 "menu.contextual.share_twitter" = "发推文";
 "menu.contextual.share_generic" = "邀请";
 
-"menu.system.show.title" = "显示";
+"global.strings.show" = "显示";
 "menu.system.switch_profile.title" = "有效配置";
 "menu.system.active_profile.title.none" = "无有效配置";
 "menu.system.active_profile.items.customize.title" = "自定义......";
 "menu.system.active_profile.messages.missing_credentials" = "未配置账户";
 "menu.system.organizer.title" = "分类页面";
 "menu.system.preferences.title" = "偏好设置";
-"menu.system.support.donate" = "提供捐助";
+"settings.items.donate.caption" = "提供捐助";
-"menu.system.support.join_community" = "加入社区";
+"about.items.join_community.caption" = "加入社区";
-"menu.system.support.write_review" = "写下想法";
+"about.items.write_review.caption" = "写下想法";
 // "menu.system.support.translate" = "Offer to translate";
-"menu.system.share_twitter.caption" = "发送关于它的推特!";
+"about.items.share_twitter.caption" = "发送关于它的推特!";
 "menu.system.share_generic.caption" = "邀请朋友";
 "menu.system.quit.title" = "退出%@";
 "menu.system.quit.messages.confirm" = "VPN（如果启用）仍将在后台运行。您要退出吗？";
@@ -165,7 +165,6 @@
 "profile.items.only_shows_favorites.caption" = "仅显示收藏的地点";
 "profile.items.vpn_survives_sleep.caption" = "休眠时保持连接";
 "profile.items.vpn_resolves_hostname.caption" = "解析服务器主机名";
-"profile.items.reconnect.caption" = "重连";
 
 "profile.alerts.rename.title" = "重命名配置";
 "profile.alerts.reconnect_vpn.message" = "要重连VPN吗？";