From a78ab1db279fd30f8281c317bf105e053fab56a9 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sun, 2 Dec 2018 13:37:53 +0100
Subject: Re-add proxy support

---
 src/components/subscription/SubscriptionForm.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 12965e307..12e8471ff 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -44,9 +44,9 @@ const messages = defineMessages({
       id: 'subscription.features.noInterruptions',
       defaultMessage: '!!!No app delays & nagging to upgrade license',
     },
-    vpn: {
-      id: 'subscription.features.vpn',
-      defaultMessage: '!!!Proxy & VPN support',
+    proxy: {
+      id: 'subscription.features.proxy',
+      defaultMessage: '!!!Proxy support for services',
     },
     spellchecker: {
       id: 'subscription.features.spellchecker',
@@ -171,6 +171,9 @@ export default @observer class SubscriptionForm extends Component {
                   <li>
                     {intl.formatMessage(messages.features.spellchecker)}
                   </li>
+                  <li>
+                    {intl.formatMessage(messages.features.proxy)}
+                  </li>
                   <li>
                     {intl.formatMessage(messages.features.ads)}
                   </li>
-- 
cgit v1.2.3-70-g09d2


From 68391deca769411b41c09ccbba67ec59da5dc4a7 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sun, 2 Dec 2018 13:45:46 +0100
Subject: Add missing translation string

---
 src/i18n/locales/en-US.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 864a18862..aa55f5dfe 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -52,7 +52,7 @@
   "subscription.features.onpremise": "Add on-premise/hosted services like HipChat",
   "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
   "subscription.features.encryptedSync": "Encrypted session synchronization",
-  "subscription.features.vpn": "Proxy & VPN support",
+  "subscription.features.proxy": "Proxy support for services",
   "subscription.features.ads": "No ads, ever!",
   "subscription.features.spellchecker": "Support for spellchecker",
   "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
-- 
cgit v1.2.3-70-g09d2


From 93a82f125db327912fcb9006fff06f94adf49593 Mon Sep 17 00:00:00 2001
From: FranzBot <i18n@meetfranz.com>
Date: Sun, 2 Dec 2018 13:03:06 +0000
Subject: Automatic i18n update (i18n.meetfranz.com)

---
 src/i18n/locales/ca.json    | 2 +-
 src/i18n/locales/cs.json    | 2 +-
 src/i18n/locales/de.json    | 2 +-
 src/i18n/locales/el.json    | 2 +-
 src/i18n/locales/es.json    | 2 +-
 src/i18n/locales/fr.json    | 2 +-
 src/i18n/locales/ga.json    | 2 +-
 src/i18n/locales/hr.json    | 2 +-
 src/i18n/locales/hu.json    | 2 +-
 src/i18n/locales/id.json    | 2 +-
 src/i18n/locales/it.json    | 2 +-
 src/i18n/locales/ja.json    | 2 +-
 src/i18n/locales/ka.json    | 2 +-
 src/i18n/locales/nl-BE.json | 2 +-
 src/i18n/locales/nl.json    | 2 +-
 src/i18n/locales/pl.json    | 2 +-
 src/i18n/locales/pt-BR.json | 2 +-
 src/i18n/locales/pt.json    | 2 +-
 src/i18n/locales/ru.json    | 2 +-
 src/i18n/locales/sk.json    | 2 +-
 src/i18n/locales/sr.json    | 2 +-
 src/i18n/locales/tr.json    | 2 +-
 src/i18n/locales/uk.json    | 2 +-
 src/i18n/locales/zh-TW.json | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index c5ecb0ebf..117e66d76 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Afegiu serveis en premissa\/allotjats com HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Compatibilitat amb proxy i VPN",
    "subscription.includedFeatures" : "El compte de pagament Franz Premium Supporter inclou",
    "subscription.paymentSessionError" : "No s'ha pogut inicialitzar el formulari de pagament",
    "subscription.submit.label" : "Vull donar suport al desenvolupament de Franz",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index db2c75752..eb8088e28 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Přidat hostované služby jako HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy & VPN podpora",
    "subscription.includedFeatures" : "Placený účet Premium Supporter Franz zahrnuje",
    "subscription.paymentSessionError" : "Nebylo možné inicializovat platbu od",
    "subscription.submit.label" : "Chci podpořit vývoj aplikace Franz",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index f822ff3f3..0e15976a6 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy- & VPN-Unterstützung",
    "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
    "subscription.submit.label" : "Ich möchte die Entwicklung von Franz unterstützen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index bbbbec92c..31852d20c 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Add on-premise \/ hosted services όπως το HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Υποστήριξη μεσολαβητή (Proxy) και VPN",
    "subscription.includedFeatures" : "Ο Premium λογαριασμός υποστήριξης Franz περιλαμβάνει",
    "subscription.paymentSessionError" : "Δεν ήταν δυνατή η προετοιμασία της φόρμας πληρωμής",
    "subscription.submit.label" : "Θέλω να βοηθήσω στην ανάπτυξη του Franz",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index d435ecaa3..a5984dd1c 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Añade servicios locales\/autoalojados como HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Soporte para Proxy y VPN",
    "subscription.includedFeatures" : "La Cuenta pagada de Colaborador Premium de Franz incluye",
    "subscription.paymentSessionError" : "No se pudo inicializar el formulario de pago",
    "subscription.submit.label" : "Quiero apoyar el desarrollo de Franz",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 3fe054daf..6964d27d2 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Ajouter des services locaux\/hébergés comme HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Support des Proxy et VPN",
    "subscription.includedFeatures" : "Le compte payant Supporter Premium Franz inclut",
    "subscription.paymentSessionError" : "Initialisation du paiement impossible",
    "subscription.submit.label" : "Je souhaite aider au développement de Franz",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index cdbff218b..3bb838ba3 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Cuir seirbhísí óstáilte ar nós HipChat leis",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Tacaíocht seachfhreastalaí ⁊ LPF",
    "subscription.includedFeatures" : "Cuireann Cuntas Phŕeimhthacadóra Franz san áireamh",
    "subscription.paymentSessionError" : "Ní féidir an bhfoirm íocaíochta a lódáil",
    "subscription.submit.label" : "Ba mhaith liom tacaíocht a thabhairt d'fhorbairt Franz",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 612d397c3..ae9f25695 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat ",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
    "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće: ",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca. ",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index b1ec87717..365dec9c6 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Helyi\/üzemeltetett szolgáltatások használata, pl. HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy & VPN támogatás",
    "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza",
    "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni",
    "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 98bfe1fc3..437c1304f 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Layanan add-on premise\/hosted seperti HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Dukungan proxy & VPN",
    "subscription.includedFeatures" : "Franz Premium Supporter Account berbayar menyertakan",
    "subscription.paymentSessionError" : "Tidak bisa menginisialisasi formulir pembayaran",
    "subscription.submit.label" : "Saya ingin mendukung pengembangan Franz",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 308761549..958d1470d 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Aggiungi servizi on-premise\/hosted come HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Supporto Proxy e VPN",
    "subscription.includedFeatures" : "L'account a pagamento Franz Premium Supporter include",
    "subscription.paymentSessionError" : "Impossibile inizializzare il modulo per il pagamento",
    "subscription.submit.label" : "Voglio supportare lo sviluppo di Franz",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index dbe11748d..57b767ef1 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "HipChatのようなオンプレミス\/ホスト型サービスの追加",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "プロキシサーバーとVPNのサポート",
    "subscription.includedFeatures" : "Franz Premium Supporter有料アカウントには以下が含まれます",
    "subscription.paymentSessionError" : "支払いフォームを初期化出来ません",
    "subscription.submit.label" : "Franzの開発を支援したい",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index f6d0378a6..d521c838a 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "on-premise\/hosted სერვისების დამატება, როგორიცაა HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy-სა და VPN-ის მხარდაჭერა",
    "subscription.includedFeatures" : "ფასიანი Franz-ის პრემიუმ მხარმდამჭერი ანგარიში",
    "subscription.paymentSessionError" : "გადახდის ფორმატის ინიციალიზაცია ვერ მოხერხდა",
    "subscription.submit.label" : "მინდა ხელი შევუწყო Franz-ის განვითარებას",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 5c1068997..5807f11f6 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Intern gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
    "subscription.includedFeatures" : "Een betalend account voor Franz omvat",
    "subscription.paymentSessionError" : "Betalingsformulier kon niet geladen worden",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz steunen",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 7d450f058..a6db3d773 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Add on-geschikt\/gehoste services zoals HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy & VPN ondersteuning",
    "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat",
    "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren",
    "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 50451bedf..60ced5933 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodawanie lokalnych\/hostowanych usług takich jak HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Wsprarcie Proxy i VPN",
    "subscription.includedFeatures" : "Płatne konto Franz Premium obejmuje",
    "subscription.paymentSessionError" : "Nie można wczytać formularza płatności\"",
    "subscription.submit.label" : "Chcę wspierać rozwój aplikacji Franz",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 6a0d73139..70f6431df 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Adicionar serviços locais\/hospedados como o HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Suporte a proxy e VPN",
    "subscription.includedFeatures" : "A conta Apoiador Franz Premium inclui",
    "subscription.paymentSessionError" : "Não foi possível abrir o formulário de pagamento",
    "subscription.submit.label" : "Eu quero apoiar o desenvolvimento do Franz",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 4cc62cc2f..71978ed6b 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Adicionar serviços 'on-premise'\/hosted como o HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Suporte para Proxy e VPN",
    "subscription.includedFeatures" : "Ao subscrever uma Conta Premium, tem acesso a",
    "subscription.paymentSessionError" : "Erro no serviço de pagamento",
    "subscription.submit.label" : "Pretendo ajudar o desenvolvimento do Franz",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index e78c1baed..78030dc15 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Добавление облачных служб или служб на своём хостинге типа HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Поддержка прокси и VPN",
    "subscription.includedFeatures" : "Платный премиум аккаунт Franz включает",
    "subscription.paymentSessionError" : "Невозможно загрузить форму оплаты",
    "subscription.submit.label" : "Я хочу поддержать разработку Franz",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 448ee0301..70e3e7f2d 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Pridať lokálne hostované služby, ako napr. HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy a VPN podpora",
    "subscription.includedFeatures" : "Platený účet Premium Supporter Franz zahŕňa",
    "subscription.paymentSessionError" : "Nepodarilo sa inicializovať platbu od",
    "subscription.submit.label" : "Chcem podporiť vývoj aplikácie Franz",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index d1003e791..dd4c74277 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Dodajte pretpostavljeni\/hostirani servis kao što ima usluga HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Podrška za Proxy i VPM ( VPN )",
    "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće:",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca.",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index 1d4c6c105..130b51ddf 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "HipChat gibi kurum içi\/barındırılan hizmetler ekle",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Proxy & VPN desteği",
    "subscription.includedFeatures" : "Ücretli Franz Premium Destekçi Hesabına dahil",
    "subscription.paymentSessionError" : "Ödeme formu başlatılamadı",
    "subscription.submit.label" : "Franz'ın gelişimini desteklemek istiyorum",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 033868a1a..94c6f7e54 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "Додайте on-premise \/ hosted сервіси, такі як Hipchat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "Підтримка проксі та VPN",
    "subscription.includedFeatures" : "Платний Преміальний Акаунт Прихильника Franz включає",
    "subscription.paymentSessionError" : "Не вдалося ініціалізувати форму платежу",
    "subscription.submit.label" : "Я хочу підтримати розробку Franz",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index b284e82ce..23bff247d 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -237,8 +237,8 @@
    "subscription.features.noInterruptions" : "No app delays & nagging to upgrade license",
    "subscription.features.onpremise" : "添加本地\/託管服務如HipChat",
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
+   "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
-   "subscription.features.vpn" : "代理和VPN支持",
    "subscription.includedFeatures" : "包含高級Franz付費帳戶",
    "subscription.paymentSessionError" : "無法初始化付款表單",
    "subscription.submit.label" : "我想支持Franz的開發",
-- 
cgit v1.2.3-70-g09d2


From 2d67749e22e5906f08a6b011ed2c8eb4483464de Mon Sep 17 00:00:00 2001
From: FranzBot <i18n@meetfranz.com>
Date: Sun, 2 Dec 2018 13:05:10 +0000
Subject: Automatic i18n update (i18n.meetfranz.com)

---
 src/i18n/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 0e15976a6..6aa909519 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -237,7 +237,7 @@
    "subscription.features.noInterruptions" : "Keine Wartezeiten um Franz zu verwenden",
    "subscription.features.onpremise" : "Integration von gehosteten Diensten, wie HipChat",
    "subscription.features.onpremise.mattermost" : "Integration von gehosteten Diensten, wie Mattermost",
-   "subscription.features.proxy" : "Proxy support for services",
+   "subscription.features.proxy" : "Proxy Support für Dienste",
    "subscription.features.spellchecker" : "Support for spellchecker",
    "subscription.includedFeatures" : "Bezahlte Franz Premium Support Konten beinhalten",
    "subscription.paymentSessionError" : "Das Zahlungs-Formular konnte nicht geladen werden.",
-- 
cgit v1.2.3-70-g09d2