From 7ce203a78e9a8e54ab329e71212ef5b6626e53c8 Mon Sep 17 00:00:00 2001
From: Ben Schwartz <bemasc@google.com>
Date: Thu, 12 Aug 2021 10:39:54 -0400
Subject: [PATCH 1/2] Remove other string collisions

See #959
---
 src/server_manager/messages/am.json                |  4 ++--
 src/server_manager/messages/ar.json                |  4 ++--
 src/server_manager/messages/bg.json                |  4 ++--
 src/server_manager/messages/ca.json                |  4 ++--
 src/server_manager/messages/cs.json                |  4 ++--
 src/server_manager/messages/da.json                |  4 ++--
 src/server_manager/messages/de.json                |  4 ++--
 src/server_manager/messages/el.json                |  4 ++--
 src/server_manager/messages/en.json                |  6 ++----
 src/server_manager/messages/es-419.json            |  4 ++--
 src/server_manager/messages/fa.json                |  4 ++--
 src/server_manager/messages/fi.json                |  4 ++--
 src/server_manager/messages/fil.json               |  4 ++--
 src/server_manager/messages/fr.json                |  4 ++--
 src/server_manager/messages/he.json                |  4 ++--
 src/server_manager/messages/hi.json                |  4 ++--
 src/server_manager/messages/hr.json                |  4 ++--
 src/server_manager/messages/hu.json                |  4 ++--
 src/server_manager/messages/id.json                |  4 ++--
 src/server_manager/messages/it.json                |  4 ++--
 src/server_manager/messages/ja.json                |  4 ++--
 src/server_manager/messages/kk.json                |  4 ++--
 src/server_manager/messages/km.json                |  4 ++--
 src/server_manager/messages/ko.json                |  4 ++--
 src/server_manager/messages/lt.json                |  4 ++--
 src/server_manager/messages/lv.json                |  4 ++--
 src/server_manager/messages/master_messages.json   | 14 +++-----------
 src/server_manager/messages/my.json                |  4 ++--
 src/server_manager/messages/nl.json                |  4 ++--
 src/server_manager/messages/no.json                |  4 ++--
 src/server_manager/messages/pl.json                |  4 ++--
 src/server_manager/messages/pt-BR.json             |  4 ++--
 src/server_manager/messages/ro.json                |  4 ++--
 src/server_manager/messages/ru.json                |  4 ++--
 src/server_manager/messages/sk.json                |  4 ++--
 src/server_manager/messages/sl.json                |  4 ++--
 src/server_manager/messages/sr-Latn.json           |  4 ++--
 src/server_manager/messages/sr.json                |  4 ++--
 src/server_manager/messages/sv.json                |  4 ++--
 src/server_manager/messages/th.json                |  4 ++--
 src/server_manager/messages/tr.json                |  4 ++--
 src/server_manager/messages/uk.json                |  4 ++--
 src/server_manager/messages/ur.json                |  4 ++--
 src/server_manager/messages/vi.json                |  4 ++--
 src/server_manager/messages/zh-CN.json             |  4 ++--
 src/server_manager/messages/zh-TW.json             |  4 ++--
 .../ui_components/outline-gcp-create-server-app.ts |  2 +-
 .../web_app/ui_components/outline-intro-step.js    |  4 ++--
 .../web_app/ui_components/outline-server-view.js   |  2 +-
 49 files changed, 97 insertions(+), 107 deletions(-)

diff --git a/src/server_manager/messages/am.json b/src/server_manager/messages/am.json
index 4c378500..24dffe6d 100644
--- a/src/server_manager/messages/am.json
+++ b/src/server_manager/messages/am.json
@@ -167,7 +167,7 @@
   "server-data-used": "ጥቅም ላይ የዋለው አበል / ባለፉት 30 ቀናት",
   "server-destroy": "አገልጋዩን ያጥፉ",
   "server-help-access-key-description": "Outline (አውትላይን) አገልጋይዎን እንዲጠቀሙበት የመግቢያ ቁልፎን ከወዳጆችዎ ጋር ይጋሩ። ሁሉም ዲቫይሶቻቸው ላይ ተመሳሳይ የመግቢያ ቁልፍ መጠቀም ይችላሉ። ",
-  "server-help-access-key-next": "ቀጣይ",
+  "next": "ቀጣይ",
   "server-help-access-key-title": "ቁልፍ ይፍጠሩ፣ በጋራ ተጠቀሙ",
   "server-help-connection-description": "Outline (አውትላይን) አገልጋይዎ የመግቢያ ቁልፍዎን ተጠቅመው Outline (አውትላይን) ተጠቃሚ መተግበሪያ ለመጫን እዚህ ክሊክ ያድርጉ",
   "server-help-connection-ok": "እሺ፣ ገባኝ",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline (አውትላይን) የትኛውም ቦታ ይጫኑ",
   "setup-create": "አገልጋዩን ይፍጠሩ",
   "setup-description": "አገልጋይ የልዎትም? የዲጂታልኦሽን አካውንት ይፍጠሩ።",
-  "setup-do-cancel": "በፈለጉ ጊዜ ይሰርዙ",
+  "setup-cancel": "በፈለጉ ጊዜ ይሰርዙ",
   "setup-do-cost": "በወር የአሜሪካ $5 ",
   "setup-do-create": "በ$5 አዲስ የዲጂታልኦሽን አገልጋይ ለ30 ቀናት 1 ቴራ ባይት ዳታ ለማስተላለፍ ይፍጠሩ።",
   "setup-do-data": "የ1 ቴራ ባይት ዳታ ማስተላለፊያ አበል",
diff --git a/src/server_manager/messages/ar.json b/src/server_manager/messages/ar.json
index 4d585c1f..00cddf7f 100644
--- a/src/server_manager/messages/ar.json
+++ b/src/server_manager/messages/ar.json
@@ -167,7 +167,7 @@
   "server-data-used": "معدّل نقل البيانات / آخر 30 يومًا",
   "server-destroy": "إزالة الخادم",
   "server-help-access-key-description": "يمكنك مشاركة مفاتيح الوصول مع الأصدقاء حتى يتمكّنوا من الاتصال بخادمك على Outline. يمكنهم استخدام نفس مفتاح الوصول على جميع أجهزتهم.",
-  "server-help-access-key-next": "التالي",
+  "next": "التالي",
   "server-help-access-key-title": "إنشاء المفاتيح ومشاركة الوصول",
   "server-help-connection-description": "انقر هنا لتثبيت تطبيق عميل Outline باستخدام مفتاح وصولك الشخصي إلى خادم Outline.",
   "server-help-connection-ok": "حسنًا.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "إعداد Outline في أي مكان",
   "setup-create": "إنشاء خادم",
   "setup-description": "ألا تمتلك خادمًا؟ أنشِئ حسابًا باستخدام DigitalOcean.",
-  "setup-do-cancel": "الإلغاء في أي وقت",
+  "setup-cancel": "الإلغاء في أي وقت",
   "setup-do-cost": "5 دولارات أمريكية فقط في الشهر",
   "setup-do-create": "أنشِئ خادمًا جديدًا باستخدام حسابك على DigitalOcean مقابل 5 دولارات أمريكية إضافية / 30 يومًا لنقل بيانات تبلغ 1 تيرابايت.",
   "setup-do-data": "معدّل نقل بيانات يصل إلى 1 تيرابايت",
diff --git a/src/server_manager/messages/bg.json b/src/server_manager/messages/bg.json
index 756cbd43..9aa07f64 100644
--- a/src/server_manager/messages/bg.json
+++ b/src/server_manager/messages/bg.json
@@ -167,7 +167,7 @@
   "server-data-used": "Използвана квота/за последните 30 дни",
   "server-destroy": "Унищожаване на сървъра",
   "server-help-access-key-description": "Споделете ключовете за достъп с приятели, за да могат да се свържат към сървъра ви на Outline. Могат да използват един и същ ключ за достъп на всичките си устройства.",
-  "server-help-access-key-next": "Напред",
+  "next": "Напред",
   "server-help-access-key-title": "Създаване на ключове и споделяне на достъпа",
   "server-help-connection-description": "Кликнете тук, за да инсталирате клиентското приложение Outline, като използвате личния си ключ за достъп до сървъра си на Outline.",
   "server-help-connection-ok": "Добре, разбрах!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Настройване на Outline където и да е",
   "setup-create": "Създаване на сървър",
   "setup-description": "Нямате сървър? Създайте си профил в DigitalOcean.",
-  "setup-do-cancel": "Анулиране по всяко време",
+  "setup-cancel": "Анулиране по всяко време",
   "setup-do-cost": "Само 5 щ.д. на месец",
   "setup-do-create": "Създайте нов сървър с профила си в DigitalOcean за още 5 щ.д./30 дни за трафик от 1 ТБ.",
   "setup-do-data": "Квота от 1 ТБ трафик",
diff --git a/src/server_manager/messages/ca.json b/src/server_manager/messages/ca.json
index 663446bb..4cc598f2 100644
--- a/src/server_manager/messages/ca.json
+++ b/src/server_manager/messages/ca.json
@@ -167,7 +167,7 @@
   "server-data-used": "Capacitat utilitzada durant els últims 30 dies",
   "server-destroy": "Suprimeix el servidor",
   "server-help-access-key-description": "Comparteix les claus d'accés amb els amics perquè es puguin connectar al teu servidor d'Outline. Podran fer servir la mateixa clau d'accés en tots els seus dispositius.",
-  "server-help-access-key-next": "Següent",
+  "next": "Següent",
   "server-help-access-key-title": "Crea claus i comparteix l'accés",
   "server-help-connection-description": "Fes clic aquí per instal·lar l'aplicació de client Outline fent servir la teva clau d'accés personal per al servidor d'Outline.",
   "server-help-connection-ok": "Entesos",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Configura Outline en qualsevol lloc",
   "setup-create": "Crea un servidor",
   "setup-description": "No tens cap servidor? Crea un compte amb DigitalOcean.",
-  "setup-do-cancel": "Pots cancel·lar-lo en qualsevol moment",
+  "setup-cancel": "Pots cancel·lar-lo en qualsevol moment",
   "setup-do-cost": "Només 5 USD al mes",
   "setup-do-create": "Crea un servidor amb el compte de DigitalOcean per 5 USD més cada 30 dies i obtén una transferència de dades d'1 TB.",
   "setup-do-data": "Capacitat de transferència de dades d'1 TB",
diff --git a/src/server_manager/messages/cs.json b/src/server_manager/messages/cs.json
index 3ee0cf55..f289ff53 100644
--- a/src/server_manager/messages/cs.json
+++ b/src/server_manager/messages/cs.json
@@ -167,7 +167,7 @@
   "server-data-used": "Využité povolené vytížení / posledních 30 dní",
   "server-destroy": "Zničit server",
   "server-help-access-key-description": "Sdílejte přístupové klíče s přáteli, aby se mohli připojit k vašemu serveru Outline. Mohou používat jeden přístupový klíč na všech svých zařízeních.",
-  "server-help-access-key-next": "Další",
+  "next": "Další",
   "server-help-access-key-title": "Vytvořte klíče a sdílejte přístup",
   "server-help-connection-description": "Kliknutím sem nainstalujete klienta Outline s použitím svého osobního přístupového klíče k serveru Outline.",
   "server-help-connection-ok": "OK, rozumím",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Nastavte si Outline kdekoli",
   "setup-create": "Vytvořit server",
   "setup-description": "Nemáte server? Vytvořte si účet u DigitalOcean.",
-  "setup-do-cancel": "Zrušit to můžete kdykoli",
+  "setup-cancel": "Zrušit to můžete kdykoli",
   "setup-do-cost": "Jen za 5 $ za měsíc",
   "setup-do-create": "Vytvořte si k účtu DigitalOcean nový server za dalších 5 $ za 30 dní a povoleným přenosem dat o objemu 1 TB.",
   "setup-do-data": "Povolený přenos dat: 1 TB",
diff --git a/src/server_manager/messages/da.json b/src/server_manager/messages/da.json
index 7c55e1b9..db284bdc 100644
--- a/src/server_manager/messages/da.json
+++ b/src/server_manager/messages/da.json
@@ -167,7 +167,7 @@
   "server-data-used": "Procentdel af de tilladte data, der er blevet brugt i løbet af de seneste 30 dage",
   "server-destroy": "Slet server",
   "server-help-access-key-description": "Del din adgangsnøgle med dine venner, så de kan forbinde til din Outline-server. De kan bruge samme adgangsnøgle på alle deres enheder.",
-  "server-help-access-key-next": "Næste",
+  "next": "Næste",
   "server-help-access-key-title": "Opret nøgler og del adgang",
   "server-help-connection-description": "Klik her for at installere Outline-klienten, og brug din personlige adgangsnøgle til din Outline-server.",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Konfigurer Outline hvor som helst",
   "setup-create": "Opret server",
   "setup-description": "Har du ikke en server? Opret en konto med DigitalOcean.",
-  "setup-do-cancel": "Du kan opsige når som helst",
+  "setup-cancel": "Du kan opsige når som helst",
   "setup-do-cost": "Kun 5 USD om måneden",
   "setup-do-create": "Opret en ny server med din DigitalOcean-konto for yderligere 5 USD om måneden for at overføre op til 1 TB data.",
   "setup-do-data": "Du kan overføre op til 1 TB data",
diff --git a/src/server_manager/messages/de.json b/src/server_manager/messages/de.json
index 4abf95a2..f21b7ada 100644
--- a/src/server_manager/messages/de.json
+++ b/src/server_manager/messages/de.json
@@ -167,7 +167,7 @@
   "server-data-used": "Genutztes Datenvolumen / letzte 30 Tage",
   "server-destroy": "Server löschen",
   "server-help-access-key-description": "Geben Sie Zugriffsschlüssel für andere frei, damit sie eine Verbindung zu Ihrem Outline-Server herstellen können. Auf allen Geräten kann derselbe Zugriffsschlüssel verwendet werden.",
-  "server-help-access-key-next": "Weiter",
+  "next": "Weiter",
   "server-help-access-key-title": "Schlüssel erstellen und Zugriff freigeben",
   "server-help-connection-description": "Klicken Sie hier, um die Client-App von Outline zu installieren und mit Ihrem persönlichen Zugriffsschlüssel eine Verbindung zum Outline-Server herzustellen.",
   "server-help-connection-ok": "Ok.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline überall einrichten",
   "setup-create": "Server erstellen",
   "setup-description": "Sie haben keinen Server? Erstellen Sie einfach ein Konto bei DigitalOcean.",
-  "setup-do-cancel": "Jederzeit kündbar",
+  "setup-cancel": "Jederzeit kündbar",
   "setup-do-cost": "Nur 5 $ pro Monat",
   "setup-do-create": "Sie können mit Ihrem DigitalOcean-Konto für zusätzliche 5 $ / 30 Tage einen neuen Server mit 1 TB Datenvolumen erstellen.",
   "setup-do-data": "1 TB verfügbares Datenvolumen",
diff --git a/src/server_manager/messages/el.json b/src/server_manager/messages/el.json
index 064e035b..ec86cf7c 100644
--- a/src/server_manager/messages/el.json
+++ b/src/server_manager/messages/el.json
@@ -167,7 +167,7 @@
   "server-data-used": "Ποσοστό του ορίου που χρησιμοποιήθηκε / τελευταίες 30 ημέρες",
   "server-destroy": "Διαγραφή διακομιστή",
   "server-help-access-key-description": "Κοινοποιήστε τα κλειδιά πρόσβασης στους φίλους σας, ώστε να μπορούν να συνδεθούν στον διακομιστή Outline. Μπορούν να χρησιμοποιούν το ίδιο κλειδί πρόσβασης σε όλες τις συσκευές τους.",
-  "server-help-access-key-next": "Επόμενο",
+  "next": "Επόμενο",
   "server-help-access-key-title": "Δημιουργήστε κλειδιά και μοιραστείτε την πρόσβαση.",
   "server-help-connection-description": "Κάντε κλικ εδώ για να εγκαταστήσετε την εφαρμογή πελάτης Outline, χρησιμοποιώντας το προσωπικό κλειδί πρόσβασής στον διακομιστή Outline.",
   "server-help-connection-ok": "Το κατάλαβα!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Ρυθμίστε το Outline οπουδήποτε",
   "setup-create": "Δημιουργία διακομιστή",
   "setup-description": "Δεν διαθέτετε διακομιστή; Δημιουργήστε έναν λογαριασμό με το DigitalOcean.",
-  "setup-do-cancel": "Ακυρώστε ανά πάσα στιγμή",
+  "setup-cancel": "Ακυρώστε ανά πάσα στιγμή",
   "setup-do-cost": "Μόνο 5 $ ΗΠΑ τον μήνα",
   "setup-do-create": "Δημιουργήστε έναν νέο διακομιστή με τον λογαριασμό σας DigitalOcean με επιπλέον 5 $ ΗΠΑ/30 ημέρες για μεταφορά 1 TB δεδομένων.",
   "setup-do-data": "Όριο μεταφοράς 1 TB δεδομένων",
diff --git a/src/server_manager/messages/en.json b/src/server_manager/messages/en.json
index 388b72a7..6a013606 100644
--- a/src/server_manager/messages/en.json
+++ b/src/server_manager/messages/en.json
@@ -116,7 +116,6 @@
   "feedback-title-install": "Outline Server Installation Failed",
   "gcp-billing-title": "Add billing information to your Google Cloud Platform account.",
   "gcp-billing-description": "{openLink}Open the Cloud Console billing page{closeLink} and add an account in order to proceed.",
-  "gcp-billing-action": "Next",
   "gcp-billing-body": "Waiting for you to {openLink}add a billing account on Google Cloud{closeLink}",
   "gcp-billing-error": "Unable to retrieve billing information",
   "gcp-billing-error-zero": "You must add a billing account before proceeding.",
@@ -205,7 +204,7 @@
   "server-data-used": "Allowance used / last 30 days",
   "server-destroy": "Destroy server",
   "server-help-access-key-description": "Share access keys with friends, so they can connect to your Outline server. They can use the same access key on all their devices.",
-  "server-help-access-key-next": "Next",
+  "next": "Next",
   "server-help-access-key-title": "Create keys, share access",
   "server-help-connection-description": "Click here to install the Outline client app, using your personal access key to your Outline server.",
   "server-help-connection-ok": "Okay, got it!",
@@ -242,7 +241,7 @@
   "setup-anywhere": "Set up Outline anywhere",
   "setup-create": "Create server",
   "setup-description": "Don't have a server? Create an account with DigitalOcean.",
-  "setup-do-cancel": "Cancel at any time",
+  "setup-cancel": "Cancel at any time",
   "setup-do-cost": "Only US$5 a month",
   "setup-do-create": "Create a new server with your DigitalOcean account for an additional US$5/30 days for 1 TB of data transfer.",
   "setup-do-data": "1 TB data transfer allowance",
@@ -251,7 +250,6 @@
   "setup-do-title": "Setting up Outline.",
   "setup-firewall-instructions": "Firewall instructions",
   "setup-gcp-easy": "Easy setup process",
-  "setup-gcp-cancel": "Cancel at any time",
   "setup-gcp-cost": "Your first server is free for 90 days, then as low as US$3/month",
   "setup-gcp-create": "Create a new server with your Google account. Costs vary by location and usage.",
   "setup-gcp-promo": "Try the new automatic Outline server creation process for Google Cloud",
diff --git a/src/server_manager/messages/es-419.json b/src/server_manager/messages/es-419.json
index 87426f37..d07eabd1 100644
--- a/src/server_manager/messages/es-419.json
+++ b/src/server_manager/messages/es-419.json
@@ -167,7 +167,7 @@
   "server-data-used": "Cantidad permitida que se utilizó/Últimos 30 días",
   "server-destroy": "Destruir servidor",
   "server-help-access-key-description": "Comparte las claves de acceso con tus amigos para que puedan conectarse a tu servidor de Outline. Podrán usar la misma clave de acceso en todos sus dispositivos.",
-  "server-help-access-key-next": "Siguiente",
+  "next": "Siguiente",
   "server-help-access-key-title": "Crear claves, compartir el acceso",
   "server-help-connection-description": "Haz clic aquí para instalar la app de cliente de Outline por medio de la clave de acceso personal a tu servidor de Outline.",
   "server-help-connection-ok": "Entendido",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Configurar Outline en cualquier lugar",
   "setup-create": "Crear servidor",
   "setup-description": "¿No tienes un servidor? Crea una cuenta con DigitalOcean.",
-  "setup-do-cancel": "Cancelar en cualquier momento",
+  "setup-cancel": "Cancelar en cualquier momento",
   "setup-do-cost": "Solo USD 5 al mes",
   "setup-do-create": "Crea un nuevo servidor con tu cuenta de DigitalOcean por un importe adicional de USD 5 cada 30 días y obtén 1 TB de transferencia de datos.",
   "setup-do-data": "Se permite 1 TB de transferencia de datos",
diff --git a/src/server_manager/messages/fa.json b/src/server_manager/messages/fa.json
index 0cd9fb76..b7107663 100644
--- a/src/server_manager/messages/fa.json
+++ b/src/server_manager/messages/fa.json
@@ -167,7 +167,7 @@
   "server-data-used": "میزان سهمیه استفاده‌شده / ۳۰ روز گذشته",
   "server-destroy": "سرور تخریب شود",
   "server-help-access-key-description": "کلیدهای دسترسی را با دوستان به‌اشتراک بگذارید تا بتوانند به سرور Outline شما متصل شوند. آن‌ها می‌توانند از یک کلید دسترسی در همه دستگاه‌هایشان استفاده کنند.",
-  "server-help-access-key-next": "بعدی",
+  "next": "بعدی",
   "server-help-access-key-title": "ایجاد کردن کلید، به‌اشتراک گذاشتن دسترسی",
   "server-help-connection-description": "اینجا را کلیک کنید تا بااستفاده از کلید دسترسی شخصی به سرور Outline خود، برنامه کارخواه Outline را نصب کنید.",
   "server-help-connection-ok": "بسیار خب، متوجه شدم!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "هرجا خواستید Outline را نصب کنید",
   "setup-create": "سرور ایجاد شود",
   "setup-description": "سرور ندارید؟ حسابی با DigitalOcean ایجاد کنید.",
-  "setup-do-cancel": "هرزمان خواستید لغو کنید",
+  "setup-cancel": "هرزمان خواستید لغو کنید",
   "setup-do-cost": "فقط ۵ دلار آمریکا در ماه",
   "setup-do-create": "با اضافه کردن ۵ دلار آمریکا به هزینه ماهانه‌تان، سرور جدیدی با سهمیه ۱ ‎TB انتقال داده با حساب DigitalOcean خود ایجاد کنید.",
   "setup-do-data": "سهمیه ۱ ‏TB انتقال داده",
diff --git a/src/server_manager/messages/fi.json b/src/server_manager/messages/fi.json
index 0829864a..817b271c 100644
--- a/src/server_manager/messages/fi.json
+++ b/src/server_manager/messages/fi.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kiintiötä käytetty / 30 viime päivää",
   "server-destroy": "Tuhoa palvelin",
   "server-help-access-key-description": "Jaa pääsyavaimia ystäville, jotta he voivat muodostaa yhteyden Outline-palvelimeesi. He voivat käyttää samaa pääsyavainta kaikilla laitteillaan.",
-  "server-help-access-key-next": "Seuraava",
+  "next": "Seuraava",
   "server-help-access-key-title": "Luo avaimia, jaa pääsyoikeuksia",
   "server-help-connection-description": "Asenna Outline-asiakassovellus klikkaamalla tätä. Käytä henkilökohtaista Outline-palvelimen pääsyavaintasi.",
   "server-help-connection-ok": "Selvä!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Määritä Outline missä tahansa",
   "setup-create": "Luo palvelin",
   "setup-description": "Eikö käytettävissäsi ole palvelinta? Luo DigitalOcean-tili.",
-  "setup-do-cancel": "Peru milloin tahansa",
+  "setup-cancel": "Peru milloin tahansa",
   "setup-do-cost": "Vain 5 $ kuukaudessa",
   "setup-do-create": "Luo DigitalOcean-tilisi avulla uusi palvelin: jos maksat lisämaksun 5 $ / 30 päivää, datansiirtokiintiö on 1 TB.",
   "setup-do-data": "1 TB:n datansiirtokiintiö",
diff --git a/src/server_manager/messages/fil.json b/src/server_manager/messages/fil.json
index 8e422427..51b1b486 100644
--- a/src/server_manager/messages/fil.json
+++ b/src/server_manager/messages/fil.json
@@ -167,7 +167,7 @@
   "server-data-used": "Nagamit na allowance / huling 30 araw",
   "server-destroy": "Sirain ang server",
   "server-help-access-key-description": "Magbahagi ng mga access key sa mga kaibigan, para makakonekta sila sa iyong Outline server. Puwede nilang gamitin ang iisang access key sa lahat ng kanilang device.",
-  "server-help-access-key-next": "Susunod",
+  "next": "Susunod",
   "server-help-access-key-title": "Gumawa ng mga key, magbahagi ng access",
   "server-help-connection-description": "Mag-click dito para i-install ang client app ng Outline, gamit ang iyong personal na access key sa Outline server mo.",
   "server-help-connection-ok": "Okay!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "I-set up ang Outline kahit saan",
   "setup-create": "Gumawa ng server",
   "setup-description": "Walang server? Gumawa ng account sa DigitalOcean.",
-  "setup-do-cancel": "Kanselahin anumang oras",
+  "setup-cancel": "Kanselahin anumang oras",
   "setup-do-cost": "US$5 lang bawat buwan",
   "setup-do-create": "Gumawa ng bagong server sa iyong DigitalOcean account para sa karagdagang US$5/30 araw para sa paglilipat ng data na 1 TB.",
   "setup-do-data": "Allowance sa paglilipat ng data na 1 TB",
diff --git a/src/server_manager/messages/fr.json b/src/server_manager/messages/fr.json
index bffde8e0..e3db8d1a 100644
--- a/src/server_manager/messages/fr.json
+++ b/src/server_manager/messages/fr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Dotation utilisée/30 derniers jours",
   "server-destroy": "Supprimer le serveur",
   "server-help-access-key-description": "Partagez vos clés d'accès avec vos proches, afin qu'ils puissent se connecter à votre serveur Outline. Ils peuvent utiliser la même clé d'accès sur tous leurs appareils.",
-  "server-help-access-key-next": "Suivant",
+  "next": "Suivant",
   "server-help-access-key-title": "Créer des clés et partager l'accès",
   "server-help-connection-description": "Cliquez ici pour installer l'application cliente Outline à l'aide de votre clé personnelle d'accès à votre serveur Outline.",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Installer Outline sur n'importe quel serveur cloud",
   "setup-create": "Créer un serveur",
   "setup-description": "Vous n'avez pas de serveur ? Créez un compte auprès de DigitalOcean.",
-  "setup-do-cancel": "Annulation possible à tout moment",
+  "setup-cancel": "Annulation possible à tout moment",
   "setup-do-cost": "Seulement 5 USD par mois",
   "setup-do-create": "Créez un serveur avec votre compte DigitalOcean pour 5 USD de plus pour 30 jours et pour un volume maximal d'un téraoctet de données transférées.",
   "setup-do-data": "Volume maximal de données transférées : 1 To",
diff --git a/src/server_manager/messages/he.json b/src/server_manager/messages/he.json
index 24b5b77b..d616b3ef 100644
--- a/src/server_manager/messages/he.json
+++ b/src/server_manager/messages/he.json
@@ -167,7 +167,7 @@
   "server-data-used": "אחוז הניצול ב-30 הימים האחרונים",
   "server-destroy": "מחיקת השרת",
   "server-help-access-key-description": "הידעת שאפשר לשתף את מפתחות הגישה עם חברים כדי שהם יוכלו להתחבר לשרת שלך ב-Outline? הם יוכלו להשתמש באותו מפתח גישה בכל המכשירים שלהם.",
-  "server-help-access-key-next": "הבא",
+  "next": "הבא",
   "server-help-access-key-title": "יצירת מפתחות, שיתוף הגישה",
   "server-help-connection-description": "אפשר ללחוץ כאן כדי להתקין את אפליקציית הלקוח של Outline ולהשתמש במפתח הגישה האישי לשרת שלך ב-Outline.",
   "server-help-connection-ok": "אוקיי, הבנתי!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "אפשר להתקין את Outline בכל מקום",
   "setup-create": "יצירת שרת",
   "setup-description": "אין לך שרת? אפשר ליצור חשבון ב-DigitalOcean.",
-  "setup-do-cancel": "ביטול מתי שרוצים",
+  "setup-cancel": "ביטול מתי שרוצים",
   "setup-do-cost": "רק $5 לחודש",
   "setup-do-create": "אפשר ליצור שרת חדש בחשבון שלך ב-DigitalOcean תמורת $5 נוספים ל-30 יום ולקבל מכסה של 1TB להעברת נתונים.",
   "setup-do-data": "מכסה של 1TB להעברת נתונים",
diff --git a/src/server_manager/messages/hi.json b/src/server_manager/messages/hi.json
index 29fd5d62..7a35938f 100644
--- a/src/server_manager/messages/hi.json
+++ b/src/server_manager/messages/hi.json
@@ -167,7 +167,7 @@
   "server-data-used": "इस्तेमाल किया गया कुल डेटा / पिछले 30 दिनों में",
   "server-destroy": "सर्वर मिटाएं",
   "server-help-access-key-description": "दोस्तों के साथ ऐक्सेस कुंजियां शेयर करें, ताकि वे आपके आउटलाइन सर्वर से कनेक्ट हो सकें. वे अपने सभी डिवाइस पर उसी ऐक्सेस कुंजी का इस्तेमाल कर सकते हैं.",
-  "server-help-access-key-next": "आगे बढ़ें",
+  "next": "आगे बढ़ें",
   "server-help-access-key-title": "कुंजियां बनाएं और ऐक्सेस शेयर करें",
   "server-help-connection-description": "अपने Outline सर्वर की निजी ऐक्सेस कुंजी का इस्तेमाल करके, Outline क्लाइंट ऐप्लिकेशन इंस्टॉल करने के लिए यहां क्लिक करें.",
   "server-help-connection-ok": "ठीक है, समझ लिया!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline को कहीं भी सेट अप करें",
   "setup-create": "सर्वर बनाएं",
   "setup-description": "सर्वर नहीं है? DigitalOcean के साथ खाता बनाएं.",
-  "setup-do-cancel": "किसी भी समय रद्द करें",
+  "setup-cancel": "किसी भी समय रद्द करें",
   "setup-do-cost": "हर महीने सिर्फ़ पांच अमेरिकी डॉलर",
   "setup-do-create": "1 TB डेटा ट्रांसफ़र के लिए हर महीने पांच अमेरिकी डॉलर ज़्यादा देकर, अपने DigitalOcean खाते के साथ एक नया सर्वर बनाएं.",
   "setup-do-data": "1 TB डेटा ट्रांसफ़र करने की सुविधा",
diff --git a/src/server_manager/messages/hr.json b/src/server_manager/messages/hr.json
index daf54aaa..bc333750 100644
--- a/src/server_manager/messages/hr.json
+++ b/src/server_manager/messages/hr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Iskorišteno dopuštenje / posljednjih 30 dana",
   "server-destroy": "Izbriši poslužitelj",
   "server-help-access-key-description": "Podijelite pristupne ključeve s prijateljima kako bi se mogli povezati s vašim Outline poslužiteljem. Mogu koristiti iste pristupne ključeve na svim svojim uređajima.",
-  "server-help-access-key-next": "Dalje",
+  "next": "Dalje",
   "server-help-access-key-title": "Izradite ključeve, podijelite pristup",
   "server-help-connection-description": "Kliknite ovdje da biste instalirali klijentsku aplikaciju Outline pomoću osobnog pristupnog ključa za Outline poslužitelj.",
   "server-help-connection-ok": "U redu, shvaćam!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Postavite Outline bilo gdje",
   "setup-create": "Izradi poslužitelj",
   "setup-description": "Nemate poslužitelj? Izradite račun kod davatelja usluge DigitalOcean.",
-  "setup-do-cancel": "Otkažite u bilo kojem trenutku",
+  "setup-cancel": "Otkažite u bilo kojem trenutku",
   "setup-do-cost": "Samo 5 USD mjesečno",
   "setup-do-create": "Izradite novi poslužitelj sa svojim DigitalOcean računom za dodatnih 5 USD/30 dana za prijenos podataka od 1 TB.",
   "setup-do-data": "Dopuštenje prijenosa podataka od 1 TB",
diff --git a/src/server_manager/messages/hu.json b/src/server_manager/messages/hu.json
index ed833ae5..c8cfe92c 100644
--- a/src/server_manager/messages/hu.json
+++ b/src/server_manager/messages/hu.json
@@ -167,7 +167,7 @@
   "server-data-used": "Felhasznált keret/elmúlt 30 nap",
   "server-destroy": "Szerver megsemmisítése",
   "server-help-access-key-description": "Ossza meg a hozzáférési kulcsokat az ismerőseivel, hogy csatlakozhassanak az Outline-szerveréhez. Az összes eszközükön ugyanazt a hozzáférési kulcsot használhatják.",
-  "server-help-access-key-next": "Következő",
+  "next": "Következő",
   "server-help-access-key-title": "Kulcsok létrehozása, hozzáférés megosztása",
   "server-help-connection-description": "Kattintson ide az Outline ügyfélprogramnak az Outline-szerveréhez tartozó személyes hozzáférési kulccsal történő telepítéséhez",
   "server-help-connection-ok": "Rendben, értem!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Bárhol beállíthatja az Outline-t",
   "setup-create": "Szerver létrehozása",
   "setup-description": "Nincs szervere? Hozzon létre egy fiókot a DigitalOceannel.",
-  "setup-do-cancel": "Bármikor lemondhatja",
+  "setup-cancel": "Bármikor lemondhatja",
   "setup-do-cost": "Csak havi 5 USD",
   "setup-do-create": "Hozzon létre új szervert a DigitalOcean-fiókjával mindössze ennyiért: 5 USD/30 nap (1 TB-nyi adatátvitel).",
   "setup-do-data": "1 TB-os adatátvitel-korlát",
diff --git a/src/server_manager/messages/id.json b/src/server_manager/messages/id.json
index 9e569059..aaf51d0b 100644
--- a/src/server_manager/messages/id.json
+++ b/src/server_manager/messages/id.json
@@ -167,7 +167,7 @@
   "server-data-used": "Batas yang digunakan/30 hari terakhir",
   "server-destroy": "Hancurkan server",
   "server-help-access-key-description": "Bagikan kunci akses dengan teman agar mereka dapat tersambung ke server Outline Anda. Mereka dapat menggunakan kunci akses yang sama di semua perangkatnya.",
-  "server-help-access-key-next": "Berikutnya",
+  "next": "Berikutnya",
   "server-help-access-key-title": "Buat kunci, bagikan akses",
   "server-help-connection-description": "Klik di sini untuk menginstal aplikasi klien Outline, menggunakan kunci akses pribadi ke server Outline Anda.",
   "server-help-connection-ok": "Oke, mengerti.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Siapkan Outline di mana saja",
   "setup-create": "Buat server",
   "setup-description": "Tidak memiliki server? Buat akun DigitalOcean.",
-  "setup-do-cancel": "Batalkan kapan saja",
+  "setup-cancel": "Batalkan kapan saja",
   "setup-do-cost": "Hanya USD $5 per bulan",
   "setup-do-create": "Buat server baru menggunakan akun DigitalOcean dengan biaya tambahan sebesar USD $5/30 hari untuk mendapatkan transfer data sebesar 1 TB.",
   "setup-do-data": "Batas transfer data sebesar 1 TB",
diff --git a/src/server_manager/messages/it.json b/src/server_manager/messages/it.json
index be448678..c1dbea9e 100644
--- a/src/server_manager/messages/it.json
+++ b/src/server_manager/messages/it.json
@@ -167,7 +167,7 @@
   "server-data-used": "Quantità usata/ultimi 30 giorni",
   "server-destroy": "Elimina server",
   "server-help-access-key-description": "Condividi le chiavi di accesso con gli amici in modo che possano collegarsi al tuo server Outline. Potranno usare la stessa chiave di accesso su tutti i loro dispositivi.",
-  "server-help-access-key-next": "Avanti",
+  "next": "Avanti",
   "server-help-access-key-title": "Crea chiavi, condividi l'accesso",
   "server-help-connection-description": "Fai clic qui per installare l'app client Outline usando la tua chiave di accesso personale al server Outline.",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Configura Outline ovunque",
   "setup-create": "Crea server",
   "setup-description": "Non hai un server? Crea un account con DigitalOcean.",
-  "setup-do-cancel": "Puoi annullare quando vuoi",
+  "setup-cancel": "Puoi annullare quando vuoi",
   "setup-do-cost": "Solo $ 5 al mese",
   "setup-do-create": "Crea un nuovo server con il tuo account DigitalOcean al costo di $ 5/30 giorni per 1 TB di trasferimento dati.",
   "setup-do-data": "Quantità di trasferimento dati consentita: 1 TB",
diff --git a/src/server_manager/messages/ja.json b/src/server_manager/messages/ja.json
index 0b2e35a8..7d9d3eb3 100644
--- a/src/server_manager/messages/ja.json
+++ b/src/server_manager/messages/ja.json
@@ -167,7 +167,7 @@
   "server-data-used": "過去 30 日間の使用割り当て量",
   "server-destroy": "サーバーを削除",
   "server-help-access-key-description": "他のユーザーが Outline サーバーに接続できるよう、アクセスキーを共有します。すべてのデバイスで同じアクセスキーを使用できます。",
-  "server-help-access-key-next": "次へ",
+  "next": "次へ",
   "server-help-access-key-title": "キーの作成とアクセスの共有",
   "server-help-connection-description": "ここをクリックして Outline クライアント アプリをインストールし、個人のアクセスキーを使用して Outline サーバーに接続します。",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "どこにでも Outline をセットアップ可能",
   "setup-create": "サーバーを作成",
   "setup-description": "サーバーがない場合は、DigitalOcean でアカウントを作成してください。",
-  "setup-do-cancel": "いつでもキャンセル可能",
+  "setup-cancel": "いつでもキャンセル可能",
   "setup-do-cost": "月々わずか 5 米ドル",
   "setup-do-create": "30 日につき 5 米ドルを追加すると、1 TB のデータ転送が可能な新しいサーバーを DigitalOcean アカウントに作成できます。",
   "setup-do-data": "1 TB のデータ転送が可能",
diff --git a/src/server_manager/messages/kk.json b/src/server_manager/messages/kk.json
index ab096404..10155a82 100644
--- a/src/server_manager/messages/kk.json
+++ b/src/server_manager/messages/kk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Пайдаланылған трафик/соңғы 30 күн",
   "server-destroy": "Серверді жою",
   "server-help-access-key-description": "Рұқсат кілттерін достарыңызбен бөліссеңіз, олар Outline серверімен байланыс орната алады. Олар барлық құрылғыларда бірдей рұқсат кілтін пайдалана алады.",
-  "server-help-access-key-next": "Келесі",
+  "next": "Келесі",
   "server-help-access-key-title": "Кілттер жасау, рұқсатты бөлісу",
   "server-help-connection-description": "Outline серверіне жеке рұқсат кілтін пайдалана отырып, Outline клиенттік қолданбасын орнату үшін осы жерді басыңыз.",
   "server-help-connection-ok": "Жарайды, түсінікті!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline-ды кез келген жерде реттеңіз",
   "setup-create": "Сервер жасау",
   "setup-description": "Сервер жоқ па? DigitalOcean арқылы есептік жазба жасаңыз.",
-  "setup-do-cancel": "Кез келген уақытта бас тартуға болады.",
+  "setup-cancel": "Кез келген уақытта бас тартуға болады.",
   "setup-do-cost": "Айына бар болғаны $5",
   "setup-do-create": "1 ТБ трафик үшін 30 күнге тағы $5 төлеп, DigitalOcean есептік жазбасымен жаңа сервер жасаңыз.",
   "setup-do-data": "Рұқсат етілген трафик көлемі: 1 ТБ.",
diff --git a/src/server_manager/messages/km.json b/src/server_manager/messages/km.json
index 99c26ce8..1a17a09b 100644
--- a/src/server_manager/messages/km.json
+++ b/src/server_manager/messages/km.json
@@ -167,7 +167,7 @@
   "server-data-used": "បាន​ប្រើ​បរិមាណ​ដែល​អនុញ្ញាត / 30 ថ្ងៃ​ចុង​ក្រោយ",
   "server-destroy": "បផ្លាញម៉ាស៊ីនមេ",
   "server-help-access-key-description": "ចែករំលែកកូនសោចូលប្រើជាមួយមិត្តភក្ដិ ដូច្នេះពួកគេអាចភ្ជាប់ទៅ Outline របស់អ្នក។ ពួកគេអាចប្រើកូនសោចូលប្រើដូចគ្នានៅលើឧបករណ៍របស់ពួកគេទាំងអស់។",
-  "server-help-access-key-next": "បន្ទាប់",
+  "next": "បន្ទាប់",
   "server-help-access-key-title": "បង្កើតកូនសោ ហើយចែកការប្រើប្រាស់",
   "server-help-connection-description": "ចុចទីនេះដើម្បីតំឡើងកម្មវិធីបម្រើ Outline ដោយប្រើកូនសោចូលផ្ទាល់ខ្លួនរបស់អ្នកទៅម៉ាស៊ីនបម្រើមេ Outline របស់អ្នក។",
   "server-help-connection-ok": "អូខេ យល់ហើយ!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "តំឡើង Outline គ្រប់ទីកន្លែង",
   "setup-create": "បង្កើតម៉ាស៊ីនមេ",
   "setup-description": "មិនមានម៉ាស៊ីនមេ? បង្កើតគណនីជាមួយ ជាមួយនឹង DigitalOcean ។",
-  "setup-do-cancel": "បោះបង់នៅពេលណាក៏បាន",
+  "setup-cancel": "បោះបង់នៅពេលណាក៏បាន",
   "setup-do-cost": "ត្រឹមតែ $5 ក្នុងមួយខែ",
   "setup-do-create": "បង្កើតម៉ាស៊ីនមេថ្មីជាមួយគណនី DigitalOcean របស់អ្នកសម្រាប់ការបន្ថែម US$5 / 30 ថ្ងៃសម្រាប់ផ្ទេរទិន្នន័យ 1 TB ។",
   "setup-do-data": "អនុញ្ញាត 1 TB ទិន្នន័យផ្ទេរ",
diff --git a/src/server_manager/messages/ko.json b/src/server_manager/messages/ko.json
index 4ce820d8..c39e6887 100644
--- a/src/server_manager/messages/ko.json
+++ b/src/server_manager/messages/ko.json
@@ -167,7 +167,7 @@
   "server-data-used": "사용한 용량/지난 30일",
   "server-destroy": "서버 삭제",
   "server-help-access-key-description": "친구들이 내 Outline 서버에 연결할 수 있도록 액세스 키를 공유하세요. 친구들은 모든 기기에서 동일한 액세스 키를 사용할 수 있습니다.",
-  "server-help-access-key-next": "다음",
+  "next": "다음",
   "server-help-access-key-title": "키 생성, 액세스 공유",
   "server-help-connection-description": "여기를 클릭하여 Outline 클라이언트 앱을 설치하세요. 개인 액세스 키를 사용하여 Outline 서버에 연결하게 됩니다.",
   "server-help-connection-ok": "확인",
@@ -203,7 +203,7 @@
   "setup-anywhere": "어디서든 Outline 설정",
   "setup-create": "서버 만들기",
   "setup-description": "서버가 없으신가요? DigitalOcean으로 계정을 만드세요.",
-  "setup-do-cancel": "언제든지 취소할 수 있습니다.",
+  "setup-cancel": "언제든지 취소할 수 있습니다.",
   "setup-do-cost": "USD $5/월",
   "setup-do-create": "DigitalOcean 계정으로 새 서버를 만드세요. USD $5/30일의 추가 요금으로 1TB의 데이터 전송 용량을 이용할 수 있습니다.",
   "setup-do-data": "1TB 데이터 전송 용량",
diff --git a/src/server_manager/messages/lt.json b/src/server_manager/messages/lt.json
index e516c00c..9b808593 100644
--- a/src/server_manager/messages/lt.json
+++ b/src/server_manager/messages/lt.json
@@ -167,7 +167,7 @@
   "server-data-used": "Išnaudotas pralaidumas / pastarosios 30 dienų",
   "server-destroy": "Naikinti serverį",
   "server-help-access-key-description": "Bendrinkite prieigos raktą su draugais, kad jie galėtų prisijungti prie jūsų „Outline“ serverio. Jie galės naudoti tą patį prieigos raktą visuose įrenginiuose.",
-  "server-help-access-key-next": "Kitas",
+  "next": "Kitas",
   "server-help-access-key-title": "Raktų kūrimas, prieigos bendrinimas",
   "server-help-connection-description": "Spustelėkite čia, kad įdiegtumėte „Outline“ klientų programą naudodami prieigos raktą „Outline“ serveryje.",
   "server-help-connection-ok": "Gerai, supratau!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Nustatykite „Outline“ bet kur",
   "setup-create": "Kurti serverį",
   "setup-description": "Neturite serverio? Sukurkite „DigitalOcean“ paskyrą.",
-  "setup-do-cancel": "Atšaukite bet kuriuo metu",
+  "setup-cancel": "Atšaukite bet kuriuo metu",
   "setup-do-cost": "Tik 5 USD per mėnesį",
   "setup-do-create": "Sukurkite naują serverį naudodami „DigitalOcean“ paskyrą už papildomą 5 USD mokestį per 30 dienų ir gaukite 1 TB duomenims perkelti.",
   "setup-do-data": "1 TB duomenų perkėlimo pralaidumas",
diff --git a/src/server_manager/messages/lv.json b/src/server_manager/messages/lv.json
index 2d28b655..9f9569de 100644
--- a/src/server_manager/messages/lv.json
+++ b/src/server_manager/messages/lv.json
@@ -167,7 +167,7 @@
   "server-data-used": "Izmantotais atļautais apjoms / pēdējās 30 dienas",
   "server-destroy": "Iznīcināt serveri",
   "server-help-access-key-description": "Kopīgojiet piekļuves atslēgas ar draugiem, lai viņi varētu izveidot savienojumu ar jūsu Outline serveri. Jūsu draugi var izmantot vienu piekļuves atslēgu visās savās ierīcēs.",
-  "server-help-access-key-next": "Tālāk",
+  "next": "Tālāk",
   "server-help-access-key-title": "Atslēgu izveide un piekļuves kopīgošana",
   "server-help-connection-description": "Noklikšķiniet šeit, lai instalētu Outline klienta lietotni, izmantojot personīgo piekļuves atslēgu savam Outline serverim.",
   "server-help-connection-ok": "Labi, sapratu!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline iestatīšana pie jebkura mākoņpakalpojumu sniedzēja",
   "setup-create": "Izveidot serveri",
   "setup-description": "Vai jums nav servera? Izveidojiet DigitalOcean kontu.",
-  "setup-do-cancel": "Atcelšana jebkurā brīdī",
+  "setup-cancel": "Atcelšana jebkurā brīdī",
   "setup-do-cost": "Tikai 5 USD mēnesī",
   "setup-do-create": "Izveidojiet jaunu serveri, izmantojot savu DigitalOcean kontu, par papildu 5 USD mēnesī un pārsūtiet datus 1 TB apmērā.",
   "setup-do-data": "Atļautais datu pārsūtīšanas apjoms: 1 TB",
diff --git a/src/server_manager/messages/master_messages.json b/src/server_manager/messages/master_messages.json
index 8b04e5d9..9c618195 100644
--- a/src/server_manager/messages/master_messages.json
+++ b/src/server_manager/messages/master_messages.json
@@ -559,10 +559,6 @@
       }
     }
   },
-  "gcp_billing_action": {
-    "message": "Next",
-    "description": "Button label for a button that opens a the billing page in the web browser"
-  },
   "gcp_billing_body": {
     "message": "Waiting for you to $START_OF_LINK$add a billing account on Google Cloud$END_OF_LINK$",
     "description": "Body text on the billing page",
@@ -965,9 +961,9 @@
     "message": "Share access keys with friends, so they can connect to your Outline server. They can use the same access key on all their devices.",
     "description": "This string appears within a help bubble as a paragraph. The help bubble is displayed when a server is installed. Informs to the user how to share access to their server."
   },
-  "server_help_access_key_next": {
+  "next": {
     "message": "Next",
-    "description": "This string appears within a help bubble as a button. Clicking it displays the next help bubble."
+    "description": "Button label for a button that takes a user to the next step in a sequence."
   },
   "server_help_access_key_title": {
     "message": "Create keys, share access",
@@ -1119,7 +1115,7 @@
     "message": "Don't have a server? Create an account with DigitalOcean.",
     "description": "This string appears in the server setup view as a sub-header. Prompts the user to create a DigitalOcean account to deploy Outline servers. DigitalOcean is a cloud provider name and should not be translated."
   },
-  "setup_do_cancel": {
+  "setup_cancel": {
     "message": "Cancel at any time",
     "description": "This string appears in the server setup view as an item of a list describing Outline's features."
   },
@@ -1151,10 +1147,6 @@
     "message": "Easy setup process",
     "description": "This string appears in the server setup view as an item of a list describing Outline's features."
   },
-  "setup_gcp_cancel": {
-    "message": "Cancel at any time",
-    "description": "This string appears in the server setup view as an item of a list describing Outline's features."
-  },
   "setup_gcp_cost": {
     "message": "Your first server is free for 90 days, then as low as US$3/month",
     "description": "This string appears in the server setup view as an item of a list describing Outline's features."
diff --git a/src/server_manager/messages/my.json b/src/server_manager/messages/my.json
index 101ac924..d5b04101 100644
--- a/src/server_manager/messages/my.json
+++ b/src/server_manager/messages/my.json
@@ -167,7 +167,7 @@
   "server-data-used": "သုံးထားသော ခွင့်ပြုပမာဏ / ပြီးခဲ့သော ရက် ၃၀",
   "server-destroy": "ဆာဗာကို ဖျက်ရန်",
   "server-help-access-key-description": "မိတ်ဆွေများနှင့် အသုံးပြုခွင့်ကီးများကို မျှဝေခြင်းဖြင့် ၎င်းတို့က သင်၏ Outline ဆာဗာကို ချိတ်ဆက်နိုင်ပါသည်။ ၎င်းတို့၏စက်ပစ္စည်းအားလုံးတွင် အသုံးပြုခွင့်ကီးတစ်ခုတည်းကို သုံးနိုင်သည်။",
-  "server-help-access-key-next": "ရှေ့သို့",
+  "next": "ရှေ့သို့",
   "server-help-access-key-title": "ကီးများ ပြုလုပ်ခြင်း၊ သုံးခွင့် မျှဝေခြင်း",
   "server-help-connection-description": "သင်၏ Outline ဆာဗာသို့ သင့်ကိုယ်ပိုင်အသုံးပြုခွင့်ကီး သုံးပြီး Outline ကလိုင်းယင့်အက်ပ် ထည့်သွင်းရန် ဤနေရာကိုနှိပ်ပါ။",
   "server-help-connection-ok": "ရပါပြီ။",
@@ -203,7 +203,7 @@
   "setup-anywhere": "မည်သည့်နေရာမှမဆို Outline ကို စနစ်ထည့်သွင်းခြင်း",
   "setup-create": "ဆာဗာပြုလုပ်ရန်",
   "setup-description": "ဆာဗာ မရှိဘူးလား။ DigitalOcean ဖြင့် အကောင့်ဖွင့်ပါ။",
-  "setup-do-cancel": "အချိန်မရွေး ပယ်ဖျက်နိုင်သည်",
+  "setup-cancel": "အချိန်မရွေး ပယ်ဖျက်နိုင်သည်",
   "setup-do-cost": "တစ်လလျှင် US$5 သာ",
   "setup-do-create": "၁ TB ဒေတာလွှဲပြောင်းမှုအတွက် နောက်ထပ် ရက် ၃၀ လျှင် US$5 နှုန်းဖြင့် သင်၏ DigitalOcean အကောင့်သုံး၍ ဆာဗာအသစ်ပြုလုပ်ပါ။",
   "setup-do-data": "၁ TB ဒေတာလွှဲပြောင်းမှု ခွင့်ပြုချက်",
diff --git a/src/server_manager/messages/nl.json b/src/server_manager/messages/nl.json
index bd93b8a0..8297d416 100644
--- a/src/server_manager/messages/nl.json
+++ b/src/server_manager/messages/nl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Gebruikte toegestane hoeveelheid/afgelopen dertig dagen",
   "server-destroy": "Server vernietigen",
   "server-help-access-key-description": "Deel toegangssleutels met vrienden, zodat zij verbinding kunnen maken met je Outline-server. Ze kunnen dezelfde sleutel gebruiken op al hun apparaten.",
-  "server-help-access-key-next": "Volgende",
+  "next": "Volgende",
   "server-help-access-key-title": "Sleutels maken, toegang delen",
   "server-help-connection-description": "Klik hier om de Outline-client-app te installeren met je persoonlijke toegangssleutel voor je Outline-server.",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline overal installeren",
   "setup-create": "Server maken",
   "setup-description": "Heb je geen server? Maak een account bij DigitalOcean.",
-  "setup-do-cancel": "Altijd opzegbaar",
+  "setup-cancel": "Altijd opzegbaar",
   "setup-do-cost": "Slechts $ 5 per maand",
   "setup-do-create": "Maak een nieuwe server met je DigitalOcean-account voor $ 5 per dertig dagen extra, voor 1 TB aan gegevensoverdracht.",
   "setup-do-data": "1 TB aan toegestane gegevensoverdracht",
diff --git a/src/server_manager/messages/no.json b/src/server_manager/messages/no.json
index 7e7ec21f..b2b66067 100644
--- a/src/server_manager/messages/no.json
+++ b/src/server_manager/messages/no.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kvote brukt / siste 30 dager",
   "server-destroy": "Slett tjeneren",
   "server-help-access-key-description": "Del tilgangsnøkler med venner slik at de kan koble seg til Outline-tjeneren din. De kan bruke samme tilgangsnøkkel på alle enhetene sine.",
-  "server-help-access-key-next": "Neste",
+  "next": "Neste",
   "server-help-access-key-title": "Opprett nøkler og del tilgang",
   "server-help-connection-description": "Klikk her for å installere Outline-klientappen ved å bruke den personlige tilgangsnøkkelen din til Outline-tjeneren din.",
   "server-help-connection-ok": "OK, skjønner!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Konfigurer Outline hvor som helst",
   "setup-create": "Opprett tjeneren",
   "setup-description": "Har du ikke noen tjener? Opprett en konto med DigitalOcean.",
-  "setup-do-cancel": "Du kan si opp når som helst",
+  "setup-cancel": "Du kan si opp når som helst",
   "setup-do-cost": "Bare US $ 5 per måned",
   "setup-do-create": "Opprett en ny tjener med DigitalOcean-kontoen din for US $ 5 ekstra per 30 dager for 1 TB dataoverføring.",
   "setup-do-data": "Dataoverføringskvote på 1 TB",
diff --git a/src/server_manager/messages/pl.json b/src/server_manager/messages/pl.json
index 5e787c8f..66b80872 100644
--- a/src/server_manager/messages/pl.json
+++ b/src/server_manager/messages/pl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Limit wykorzystany w ciągu ostatnich 30 dni",
   "server-destroy": "Zlikwiduj serwer",
   "server-help-access-key-description": "Udostępnij klucze dostępu znajomym, by mogli połączyć się z Twoim serwerem Outline. Mogą używać tego samego klucza dostępu na wszystkich swoich urządzeniach.",
-  "server-help-access-key-next": "Dalej",
+  "next": "Dalej",
   "server-help-access-key-title": "Utwórz klucze i przyznaj dostęp",
   "server-help-connection-description": "Kliknij tutaj, by zainstalować aplikację klienta Outline, używając własnego klucza dostępu do serwera Outline.",
   "server-help-connection-ok": "OK",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline możesz zainstalować wszędzie",
   "setup-create": "Utwórz serwer",
   "setup-description": "Nie masz serwera? Utwórz konto w DigitalOcean.",
-  "setup-do-cancel": "Możesz anulować w dowolnej chwili",
+  "setup-cancel": "Możesz anulować w dowolnej chwili",
   "setup-do-cost": "Tylko 5 USD miesięcznie",
   "setup-do-create": "Utwórz na swoim koncie DigitalOcean nowy serwer za dodatkowe 5 USD/30 dni, by uzyskać 1 TB transferu danych.",
   "setup-do-data": "1 TB limitu transferu danych",
diff --git a/src/server_manager/messages/pt-BR.json b/src/server_manager/messages/pt-BR.json
index 6109ded9..eae1a0a5 100644
--- a/src/server_manager/messages/pt-BR.json
+++ b/src/server_manager/messages/pt-BR.json
@@ -167,7 +167,7 @@
   "server-data-used": "Limite usado / últimos 30 dias",
   "server-destroy": "Destruir o servidor",
   "server-help-access-key-description": "Compartilhe as chaves de acesso com os amigos para eles se conectarem ao seu servidor do Outline. Eles podem usar a mesma chave de acesso em todos os dispositivos.",
-  "server-help-access-key-next": "Próxima",
+  "next": "Próxima",
   "server-help-access-key-title": "Crie chaves, compartilhe o acesso",
   "server-help-connection-description": "Clique aqui para instalar o app cliente do Outline usando sua chave de acesso pessoal com o servidor do Outline.",
   "server-help-connection-ok": "Ok.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Configure o Outline em qualquer lugar",
   "setup-create": "Criar servidor",
   "setup-description": "Não tem um servidor? Crie uma conta com a DigitalOcean.",
-  "setup-do-cancel": "Cancelamento a qualquer hora",
+  "setup-cancel": "Cancelamento a qualquer hora",
   "setup-do-cost": "Apenas USD 5 por mês",
   "setup-do-create": "Com mais USD 5, você cria um novo servidor com sua conta da DigitalOcean por 30 dias com transferência de dados de 1 TB.",
   "setup-do-data": "Transferência de dados de até 1 TB",
diff --git a/src/server_manager/messages/ro.json b/src/server_manager/messages/ro.json
index fb69c859..f0db95ae 100644
--- a/src/server_manager/messages/ro.json
+++ b/src/server_manager/messages/ro.json
@@ -167,7 +167,7 @@
   "server-data-used": "Volumul de date utilizate/ultimele 30 de zile",
   "server-destroy": "Distrugeți serverul",
   "server-help-access-key-description": "Trimiteți prietenilor cheile de acces pentru a se putea conecta la serverul dvs. Outline. Ei pot folosi aceeași cheie de acces pe toate dispozitivele.",
-  "server-help-access-key-next": "Înainte",
+  "next": "Înainte",
   "server-help-access-key-title": "Creați chei și permiteți accesul",
   "server-help-connection-description": "Dați clic aici pentru a instala aplicația client Outline, folosind cheia dvs. de acces personală la serverul Outline.",
   "server-help-connection-ok": "Am înțeles!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Configurați Outline oriunde",
   "setup-create": "Creați un server",
   "setup-description": "Nu aveți un server? Creați un cont cu DigitalOcean.",
-  "setup-do-cancel": "Anulați oricând",
+  "setup-cancel": "Anulați oricând",
   "setup-do-cost": "Doar 5 USD pe lună",
   "setup-do-create": "Creați un server nou prin contul DigitalOcean la un preț suplimentar de 5 USD/30 zile pentru transfer de date de 1 TB.",
   "setup-do-data": "Transfer de date de 1 TB",
diff --git a/src/server_manager/messages/ru.json b/src/server_manager/messages/ru.json
index 89ddc8c3..479b82e1 100644
--- a/src/server_manager/messages/ru.json
+++ b/src/server_manager/messages/ru.json
@@ -167,7 +167,7 @@
   "server-data-used": "Использованный объем данных/последние 30 дней",
   "server-destroy": "Удалить сервер",
   "server-help-access-key-description": "Предоставьте ключи доступа другим пользователям, чтобы они могли подключиться к вашему серверу Outline. Каждый пользователь может использовать один и тот же ключ доступа на всех своих устройствах.",
-  "server-help-access-key-next": "Далее",
+  "next": "Далее",
   "server-help-access-key-title": "Создайте ключи, предоставьте доступ",
   "server-help-connection-description": "Нажмите здесь, чтобы установить клиентское приложение Outline, используя персональные ключи для доступа к серверу Outline.",
   "server-help-connection-ok": "Ясно!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Настройте Outline где угодно",
   "setup-create": "Создать сервер",
   "setup-description": "Нет сервера? Создайте аккаунт в облачном сервисе DigitalOcean.",
-  "setup-do-cancel": "Возможность отмены в любое время",
+  "setup-cancel": "Возможность отмены в любое время",
   "setup-do-cost": "Всего 5 долларов США в месяц",
   "setup-do-create": "Создайте новый сервер в аккаунте DigitalOcean с пакетом трафика на 1 ТБ, доплатив всего 5 долларов США в месяц.",
   "setup-do-data": "Пакет трафика для передачи 1 TБ данных",
diff --git a/src/server_manager/messages/sk.json b/src/server_manager/messages/sk.json
index 296b7409..3b3125fa 100644
--- a/src/server_manager/messages/sk.json
+++ b/src/server_manager/messages/sk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Využitý limit za posledných 30 dní",
   "server-destroy": "Zrušiť server",
   "server-help-access-key-description": "Zdieľajte prístupové kľúče s priateľmi, aby sa mohli pripojiť na váš server služby Outline. Na všetkých zariadeniach môžu používať rovnaký prístupový kľúč.",
-  "server-help-access-key-next": "Ďalej",
+  "next": "Ďalej",
   "server-help-access-key-title": "Vytváranie kľúčov a zdieľanie prístupu",
   "server-help-connection-description": "Ak chcete pomocou svojho osobného prístupového kľúča k serveru služby Outline nainštalovať klientsku aplikáciu Outline, kliknite tu.",
   "server-help-connection-ok": "Dobre.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Nastavte Outline kdekoľvek",
   "setup-create": "Vytvoriť server",
   "setup-description": "Nemáte server? Vytvorte si účet DigitalOcean.",
-  "setup-do-cancel": "Dá sa kedykoľvek zrušiť",
+  "setup-cancel": "Dá sa kedykoľvek zrušiť",
   "setup-do-cost": "Iba 5 USD mesačne",
   "setup-do-create": "Vytvorte si pomocou účtu DigitalOcean nový server za dodatočných 5 USD za 30 dní s prenosom dát do 1 TB.",
   "setup-do-data": "Limit prenosu 1 TB dát",
diff --git a/src/server_manager/messages/sl.json b/src/server_manager/messages/sl.json
index 1fa3a818..d5a645ad 100644
--- a/src/server_manager/messages/sl.json
+++ b/src/server_manager/messages/sl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Uporabljena količina/zadnjih 30 dni",
   "server-destroy": "Uniči strežnik",
   "server-help-access-key-description": "Ključe za dostop delite s prijatelji, tako da se lahko povežejo v vaš strežnik Outline. V vseh svojih napravah lahko uporabijo isti ključ za dostop.",
-  "server-help-access-key-next": "Naprej",
+  "next": "Naprej",
   "server-help-access-key-title": "Ustvarjanje ključev, delitev dostopa",
   "server-help-connection-description": "Kliknite tukaj, da namestite aplikacijo odjemalca Outline prek osebnega ključa za dostop do strežnika Outline.",
   "server-help-connection-ok": "V redu, razumem.",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline lahko nastavite kjer koli",
   "setup-create": "Ustvari strežnik",
   "setup-description": "Ali nimate strežnika? Ustvarite račun pri ponudniku DigitalOcean.",
-  "setup-do-cancel": "Preklic je mogoč kadar koli",
+  "setup-cancel": "Preklic je mogoč kadar koli",
   "setup-do-cost": "Samo 5 USD na mesec",
   "setup-do-create": "Ustvarite nov strežnik z računom DigitalOcean in si zagotovite 5 USD/30 dni za 1 TB prenosa podatkov.",
   "setup-do-data": "1 TB razpoložljive količine prenosa podatkov",
diff --git a/src/server_manager/messages/sr-Latn.json b/src/server_manager/messages/sr-Latn.json
index 6f29a92e..5052a758 100644
--- a/src/server_manager/messages/sr-Latn.json
+++ b/src/server_manager/messages/sr-Latn.json
@@ -167,7 +167,7 @@
   "server-data-used": "Iskorišćena količina/poslednjih 30 dana",
   "server-destroy": "Izbriši server",
   "server-help-access-key-description": "Delite pristupne ključeve sa prijateljima da bi mogli da se povezuju na vaš Outline server. Mogu da koriste isti pristupni ključ na svim uređajima.",
-  "server-help-access-key-next": "Dalje",
+  "next": "Dalje",
   "server-help-access-key-title": "Pravite ključeve, delite pristup",
   "server-help-connection-description": "Kliknite ovde da biste instalirali klijentsku aplikaciju Outline pomoću ličnog pristupnog ključa za Outline server.",
   "server-help-connection-ok": "Važi!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Podesite Outline bilo gde",
   "setup-create": "Napravi server",
   "setup-description": "Nemate server? Napravite DigitalOcean nalog.",
-  "setup-do-cancel": "Uvek možete da otkažete",
+  "setup-cancel": "Uvek možete da otkažete",
   "setup-do-cost": "Samo 5 USD mesečno",
   "setup-do-create": "Napravite nov server pomoću DigitalOcean naloga po ceni od dodatnih 5 USD za 30 dana i 1 TB podataka koje možete da prenesete.",
   "setup-do-data": "Dozvoljena količina podataka za prenos je 1 TB",
diff --git a/src/server_manager/messages/sr.json b/src/server_manager/messages/sr.json
index 83d3d628..2f1fa9ca 100644
--- a/src/server_manager/messages/sr.json
+++ b/src/server_manager/messages/sr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Искоришћена количина/последњих 30 дана",
   "server-destroy": "Избриши сервер",
   "server-help-access-key-description": "Делите приступне кључеве са пријатељима да би могли да се повезују на ваш Outline сервер. Могу да користе исти приступни кључ на свим уређајима.",
-  "server-help-access-key-next": "Даље",
+  "next": "Даље",
   "server-help-access-key-title": "Правите кључеве, делите приступ",
   "server-help-connection-description": "Кликните овде да бисте инсталирали клијентску апликацију Outline помоћу личног приступног кључа за Outline сервер.",
   "server-help-connection-ok": "Важи!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Подесите Outline било где",
   "setup-create": "Направи сервер",
   "setup-description": "Немате сервер? Направите DigitalOcean налог.",
-  "setup-do-cancel": "Увек можете да откажете",
+  "setup-cancel": "Увек можете да откажете",
   "setup-do-cost": "Само 5 USD месечно",
   "setup-do-create": "Направите нов сервер помоћу DigitalOcean налога по цени од додатних 5 USD за 30 дана и 1 TB података које можете да пренесете.",
   "setup-do-data": "Дозвољена количина података за пренос је 1 TB",
diff --git a/src/server_manager/messages/sv.json b/src/server_manager/messages/sv.json
index b60385be..b4faf6e6 100644
--- a/src/server_manager/messages/sv.json
+++ b/src/server_manager/messages/sv.json
@@ -167,7 +167,7 @@
   "server-data-used": "Använd datamängd de senaste 30 dagarna",
   "server-destroy": "Förstör servern",
   "server-help-access-key-description": "Dela åtkomstnycklar med vänner, så att de kan ansluta till din Outline-server. De kan använda samma åtkomstnyckel på alla sina enheter.",
-  "server-help-access-key-next": "Nästa",
+  "next": "Nästa",
   "server-help-access-key-title": "Skapa nycklar, dela åtkomst",
   "server-help-connection-description": "Klicka här för att installera klientappen för Outline. Använd din personliga åtkomstnyckel till Outline-servern.",
   "server-help-connection-ok": "OK!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Konfigurera Outline var som helst",
   "setup-create": "Skapa server",
   "setup-description": "Har du ingen server? Skapa ett konto med DigitalOcean.",
-  "setup-do-cancel": "Avbryt när du vill",
+  "setup-cancel": "Avbryt när du vill",
   "setup-do-cost": "Endast 50 kronor i månaden",
   "setup-do-create": "Skapa en ny server med DigitalOcean-kontot för ytterligare 50 kronor/30 dagar för 1 TB dataöverföring.",
   "setup-do-data": "1 TB dataöverföring",
diff --git a/src/server_manager/messages/th.json b/src/server_manager/messages/th.json
index d43ed89a..2566688c 100644
--- a/src/server_manager/messages/th.json
+++ b/src/server_manager/messages/th.json
@@ -167,7 +167,7 @@
   "server-data-used": "ปริมาณที่ใช้ไป / 30 วันที่ผ่านมา",
   "server-destroy": "ลบเซิร์ฟเวอร์",
   "server-help-access-key-description": "แชร์คีย์การเข้าถึงกับเพื่อน เพื่อให้เพื่อนเชื่อมต่อเซิร์ฟเวอร์ Outline ของคุณได้ โดยให้ใช้คีย์การเข้าถึงเดียวกันนี้กับอุปกรณ์ทุกเครื่อง",
-  "server-help-access-key-next": "ถัดไป",
+  "next": "ถัดไป",
   "server-help-access-key-title": "สร้างคีย์และแชร์สิทธิ์เข้าถึง",
   "server-help-connection-description": "คลิกที่นี่เพื่อติดตั้งแอปไคลเอ็นต์ Outline โดยใช้คีย์การเข้าถึงเซิร์ฟเวอร์ Outline ส่วนตัวของคุณ",
   "server-help-connection-ok": "รับทราบ",
@@ -203,7 +203,7 @@
   "setup-anywhere": "ติดตั้ง Outline ได้ทุกที่",
   "setup-create": "สร้างเซิร์ฟเวอร์",
   "setup-description": "หากยังไม่มีเซิร์ฟเวอร์ โปรดสร้างบัญชีกับ DigitalOcean",
-  "setup-do-cancel": "ยกเลิกได้ทุกเมื่อ",
+  "setup-cancel": "ยกเลิกได้ทุกเมื่อ",
   "setup-do-cost": "เพียงเดือนละ US$5",
   "setup-do-create": "สร้างเซิร์ฟเวอร์ใหม่ด้วยบัญชี DigitalOcean และทุกๆ US$5/30 วัน คุณจะโอนข้อมูลได้ 1 TB",
   "setup-do-data": "ปริมาณการโอนข้อมูลที่ใช้ได้ 1 TB",
diff --git a/src/server_manager/messages/tr.json b/src/server_manager/messages/tr.json
index 2fb61f56..cc812721 100644
--- a/src/server_manager/messages/tr.json
+++ b/src/server_manager/messages/tr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kullanılan veri miktarı/son 30 gün",
   "server-destroy": "Sunucuyu sil",
   "server-help-access-key-description": "Outline sunucunuza bağlanabilmeleri için erişim anahtarlarınızı arkadaşlarınızla paylaşın. Arkadaşlarınız tüm cihazlarında aynı erişim anahtarını kullanabilir.",
-  "server-help-access-key-next": "Sonraki",
+  "next": "Sonraki",
   "server-help-access-key-title": "Anahtarlar oluşturun, erişimi paylaşın",
   "server-help-connection-description": "Outline sunucunuza ait kişisel erişim anahtarını kullanarak Outline istemci uygulamasını yüklemek için burayı tıklayın.",
   "server-help-connection-ok": "Tamam, anladım!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline'ı dilediğiniz yere kurun",
   "setup-create": "Sunucu oluştur",
   "setup-description": "Bir sunucunuz yok mu? DigitalOcean ile hesap oluşturun.",
-  "setup-do-cancel": "Dilediğiniz zaman iptal edebilirsiniz",
+  "setup-cancel": "Dilediğiniz zaman iptal edebilirsiniz",
   "setup-do-cost": "Ayda yalnızca 5 ABD doları",
   "setup-do-create": "1 TB veri aktarımı için ek 5 ABD doları/30 gün fiyata DigitalOcean hesabınızla yeni bir sunucu oluşturun.",
   "setup-do-data": "1 TB veri aktarımı hakkı",
diff --git a/src/server_manager/messages/uk.json b/src/server_manager/messages/uk.json
index fac311cf..1bcf4a36 100644
--- a/src/server_manager/messages/uk.json
+++ b/src/server_manager/messages/uk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Використано ліміту за 30 днів",
   "server-destroy": "Видалити сервер",
   "server-help-access-key-description": "Поділіться ключами доступу з друзями, щоб вони могли підключатися до вашого сервера Outline. Вони можуть використовувати один ключ доступу на всіх своїх пристроях.",
-  "server-help-access-key-next": "Далі",
+  "next": "Далі",
   "server-help-access-key-title": "Створіть ключі та надайте доступ",
   "server-help-connection-description": "Натисніть тут, щоб встановити клієнтський додаток Outline, використовуючи особистий ключ доступу до свого сервера Outline.",
   "server-help-connection-ok": "Зрозуміло",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Налаштуйте Outline будь-де",
   "setup-create": "Створити сервер",
   "setup-description": "Немає сервера? Створіть обліковий запис DigitalOcean.",
-  "setup-do-cancel": "Ви можете будь-коли скасувати підписку.",
+  "setup-cancel": "Ви можете будь-коли скасувати підписку.",
   "setup-do-cost": "Лише 5 $ на місяць",
   "setup-do-create": "Створіть новий сервер, використовуючи свій обліковий запис DigitalOcean, і отримайте додатково 1 TB трафіку на 30 днів за 5 $.",
   "setup-do-data": "Ліміт трафіку 1 TB",
diff --git a/src/server_manager/messages/ur.json b/src/server_manager/messages/ur.json
index 4be4b825..6467ee5a 100644
--- a/src/server_manager/messages/ur.json
+++ b/src/server_manager/messages/ur.json
@@ -167,7 +167,7 @@
   "server-data-used": "استعمال کردہ الاؤنس / آخری 30 دن",
   "server-destroy": "سرور حذف کریں",
   "server-help-access-key-description": "دوستوں کے ساتھ رسائی کی کلیدوں کا اشتراک کریں، تاکہ وہ آپ کے Outline سرور سے منسلک ہو سکیں۔ وہ اپنے سبھی آلات پر رسائی کی مماثل کلید کا استعمال کر سکتے ہیں۔",
-  "server-help-access-key-next": "اگلا",
+  "next": "اگلا",
   "server-help-access-key-title": "کلیدیں تخلیق کریں، رسائی کا اشتراک کریں",
   "server-help-connection-description": "اپنے Outline سرور پر کی ذاتی رسائی کی کلید کا استعمال کرتے ہوئے، Outline کلائنٹ ایپ کو انسٹال کرنے کے لیے یہاں کلک کریں۔",
   "server-help-connection-ok": "ٹھیک ہے، سمجھ آ گئی!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Outline کہیں بھی سیٹ اپ کریں",
   "setup-create": "سرور تخلیق کریں",
   "setup-description": "سرور نہیں ہے؟ DigitalOcean کے ساتھ ایک اکاؤنٹ تخلیق کریں۔",
-  "setup-do-cancel": "کسی بھی وقت منسوخ کریں",
+  "setup-cancel": "کسی بھی وقت منسوخ کریں",
   "setup-do-cost": "صرف US$5 ماہانہ",
   "setup-do-create": "1 TB ڈیٹا کی منتقلی کے لیے 30 دن کے لیے US$5 اضافی دے کر اپنے DigitalOcean اکاؤنٹ کے ساتھ ایک نیا سرور تخلیق کریں۔",
   "setup-do-data": "1 TB ڈیٹا کی منتقلی کا الاؤنس",
diff --git a/src/server_manager/messages/vi.json b/src/server_manager/messages/vi.json
index 36e1bb4b..32ec267d 100644
--- a/src/server_manager/messages/vi.json
+++ b/src/server_manager/messages/vi.json
@@ -167,7 +167,7 @@
   "server-data-used": "Hạn mức sử dụng/30 ngày qua",
   "server-destroy": "Hủy máy chủ",
   "server-help-access-key-description": "Chia sẻ khóa truy cập với bạn bè để họ có thể kết nối với máy chủ Outline của bạn. Họ có thể dùng cùng một khóa truy cập trên tất cả thiết bị.",
-  "server-help-access-key-next": "Tiếp",
+  "next": "Tiếp",
   "server-help-access-key-title": "Tạo khóa, chia sẻ quyền truy cập",
   "server-help-connection-description": "Nhấp vào đây để cài đặt ứng dụng Outline, sử dụng khóa truy cập cá nhân vào máy chủ Outline của bạn.",
   "server-help-connection-ok": "Đã hiểu!",
@@ -203,7 +203,7 @@
   "setup-anywhere": "Thiết lập Outline ở mọi nơi",
   "setup-create": "Tạo máy chủ",
   "setup-description": "Bạn chưa có máy chủ? Hãy tạo một tài khoản bằng DigitalOcean.",
-  "setup-do-cancel": "Hủy bất cứ lúc nào",
+  "setup-cancel": "Hủy bất cứ lúc nào",
   "setup-do-cost": "Chỉ 5 đô la Mỹ một tháng",
   "setup-do-create": "Tạo một máy chủ mới bằng tài khoản DigitalOcean của bạn. Bạn chỉ phải trả thêm 5 đô la Mỹ/30 ngày để chuyển 1 TB dữ liệu.",
   "setup-do-data": "Hạn mức chuyển dữ liệu 1 TB",
diff --git a/src/server_manager/messages/zh-CN.json b/src/server_manager/messages/zh-CN.json
index c1a3dd87..4c7196ec 100644
--- a/src/server_manager/messages/zh-CN.json
+++ b/src/server_manager/messages/zh-CN.json
@@ -167,7 +167,7 @@
   "server-data-used": "流量限额的已用比例 / 过去 30 天",
   "server-destroy": "销毁服务器",
   "server-help-access-key-description": "可与朋友分享您的访问密钥，让他们也能连接到您的 Outline 服务器。您的朋友在自己的所有设备上都可以使用这个访问密钥。",
-  "server-help-access-key-next": "下一步",
+  "next": "下一步",
   "server-help-access-key-title": "创建密钥，以共享访问权限",
   "server-help-connection-description": "点击此处即可安装 Outline 客户端应用，安装过程中需要用到您的个人访问密钥来连接 Outline 服务器。",
   "server-help-connection-ok": "知道了！",
@@ -203,7 +203,7 @@
   "setup-anywhere": "随时随地安装 Outline",
   "setup-create": "创建服务器",
   "setup-description": "没有服务器？您可以创建一个 DigitalOcean 帐号。",
-  "setup-do-cancel": "可随时取消",
+  "setup-cancel": "可随时取消",
   "setup-do-cost": "每月只需 5 美元",
   "setup-do-create": "使用您的 DigitalOcean 帐号创建一个新服务器，就能以每 30 天 5 美元的价格额外获享 1 TB 的数据传输流量。",
   "setup-do-data": "1 TB 数据传输限额",
diff --git a/src/server_manager/messages/zh-TW.json b/src/server_manager/messages/zh-TW.json
index feab39ff..0f3254e7 100644
--- a/src/server_manager/messages/zh-TW.json
+++ b/src/server_manager/messages/zh-TW.json
@@ -167,7 +167,7 @@
   "server-data-used": "配額用量/過去 30 天",
   "server-destroy": "刪除伺服器",
   "server-help-access-key-description": "將存取金鑰分享給好友，讓對方能夠連線至你的 Outline 伺服器。他們可以在自己的所有裝置上使用相同的存取金鑰。",
-  "server-help-access-key-next": "繼續",
+  "next": "繼續",
   "server-help-access-key-title": "建立金鑰並分享存取權",
   "server-help-connection-description": "只要按一下這裡，即可透過 Outline 伺服器的個人存取金鑰安裝 Outline 用戶端應用程式。",
   "server-help-connection-ok": "好，我知道了！",
@@ -203,7 +203,7 @@
   "setup-anywhere": "隨時隨地設定 Outline",
   "setup-create": "建立伺服器",
   "setup-description": "沒有伺服器嗎？請建立 DigitalOcean 帳戶。",
-  "setup-do-cancel": "隨時都能取消服務",
+  "setup-cancel": "隨時都能取消服務",
   "setup-do-cost": "每月只要 $5 美元",
   "setup-do-create": "只要使用你的 DigitalOcean 帳戶建立新伺服器，即可額外享有每 30 天 $5 美元的 1 TB 資料傳輸量。",
   "setup-do-data": "1 TB 資料傳輸配額",
diff --git a/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts b/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
index d762216a..bd99fdbd 100644
--- a/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
+++ b/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
@@ -160,7 +160,7 @@ export class GcpCreateServerApp extends LitElement {
         </span>
         <span slot="step-action">
           <paper-button id="billingPageAction" @tap="${this.handleBillingVerificationNextTap}">
-            ${this.localize('gcp-billing-action')}
+            ${this.localize('next')}
           </paper-button>
         </span>
         <paper-card class="card">
diff --git a/src/server_manager/web_app/ui_components/outline-intro-step.js b/src/server_manager/web_app/ui_components/outline-intro-step.js
index a9dd3f07..f96d7b0b 100644
--- a/src/server_manager/web_app/ui_components/outline-intro-step.js
+++ b/src/server_manager/web_app/ui_components/outline-intro-step.js
@@ -65,7 +65,7 @@ const DO_CARD_HTML = html`
           <li>[[localize('setup-do-easiest')]]</li>
           <li>[[localize('setup-do-cost')]]</li>
           <li>[[localize('setup-do-data')]]</li>
-          <li>[[localize('setup-do-cancel')]]</li>
+          <li>[[localize('setup-cancel')]]</li>
         </ul>
         <p hidden\$="[[!_computeIsAccountConnected(digitalOceanAccountName)]]">
           [[localize('setup-do-create')]]
@@ -110,7 +110,7 @@ const GCP_EXPERIMENTAL_CARD_HTML = html`
         <ul hidden\$="[[_computeIsAccountConnected(gcpAccountName)]]">
           <li>[[localize('setup-gcp-easy')]]</li>
           <li>[[localize('setup-gcp-cost')]]</li>
-          <li>[[localize('setup-gcp-cancel')]]</li>
+          <li>[[localize('setup-cancel')]]</li>
         </ul>
         <p hidden\$="[[!_computeIsAccountConnected(gcpAccountName)]]">
           [[localize('setup-gcp-create')]]
diff --git a/src/server_manager/web_app/ui_components/outline-server-view.js b/src/server_manager/web_app/ui_components/outline-server-view.js
index 2e22156e..8ea6727d 100644
--- a/src/server_manager/web_app/ui_components/outline-server-view.js
+++ b/src/server_manager/web_app/ui_components/outline-server-view.js
@@ -421,7 +421,7 @@ export class ServerView extends DirMixin(PolymerElement) {
       <img src="images/key-tip-2x.png">
       <h3>[[localize('server-help-access-key-title')]]</h3>
       <p>[[localize('server-help-access-key-description')]]</p>
-      <paper-button on-tap="_closeAddAccessKeyHelpBubble">[[localize('server-help-access-key-next')]]</paper-button>
+      <paper-button on-tap="_closeAddAccessKeyHelpBubble">[[localize('next')]]</paper-button>
     </outline-help-bubble>
     <outline-help-bubble id="dataLimitsHelpBubble" vertical-align="top" horizontal-align="right">
       <h3>[[localize('data-limits-dialog-title')]]</h3>

From 728600bd223ba3ea936927cc270fa87b9606fe02 Mon Sep 17 00:00:00 2001
From: Ben Schwartz <bemasc@google.com>
Date: Thu, 12 Aug 2021 13:16:23 -0400
Subject: [PATCH 2/2] Differentiate "Next" with a "meaning" field

---
 src/server_manager/messages/am.json                      | 4 ++--
 src/server_manager/messages/ar.json                      | 2 +-
 src/server_manager/messages/bg.json                      | 2 +-
 src/server_manager/messages/ca.json                      | 2 +-
 src/server_manager/messages/cs.json                      | 2 +-
 src/server_manager/messages/da.json                      | 2 +-
 src/server_manager/messages/de.json                      | 2 +-
 src/server_manager/messages/el.json                      | 2 +-
 src/server_manager/messages/en.json                      | 3 ++-
 src/server_manager/messages/es-419.json                  | 2 +-
 src/server_manager/messages/fa.json                      | 2 +-
 src/server_manager/messages/fi.json                      | 2 +-
 src/server_manager/messages/fil.json                     | 2 +-
 src/server_manager/messages/fr.json                      | 2 +-
 src/server_manager/messages/he.json                      | 2 +-
 src/server_manager/messages/hi.json                      | 2 +-
 src/server_manager/messages/hr.json                      | 2 +-
 src/server_manager/messages/hu.json                      | 2 +-
 src/server_manager/messages/id.json                      | 2 +-
 src/server_manager/messages/it.json                      | 2 +-
 src/server_manager/messages/ja.json                      | 2 +-
 src/server_manager/messages/kk.json                      | 2 +-
 src/server_manager/messages/km.json                      | 2 +-
 src/server_manager/messages/ko.json                      | 2 +-
 src/server_manager/messages/lt.json                      | 2 +-
 src/server_manager/messages/lv.json                      | 2 +-
 src/server_manager/messages/master_messages.json         | 9 +++++++--
 src/server_manager/messages/my.json                      | 2 +-
 src/server_manager/messages/nl.json                      | 2 +-
 src/server_manager/messages/no.json                      | 2 +-
 src/server_manager/messages/pl.json                      | 2 +-
 src/server_manager/messages/pt-BR.json                   | 2 +-
 src/server_manager/messages/ro.json                      | 2 +-
 src/server_manager/messages/ru.json                      | 2 +-
 src/server_manager/messages/sk.json                      | 2 +-
 src/server_manager/messages/sl.json                      | 2 +-
 src/server_manager/messages/sr-Latn.json                 | 2 +-
 src/server_manager/messages/sr.json                      | 2 +-
 src/server_manager/messages/sv.json                      | 2 +-
 src/server_manager/messages/th.json                      | 2 +-
 src/server_manager/messages/tr.json                      | 2 +-
 src/server_manager/messages/uk.json                      | 2 +-
 src/server_manager/messages/ur.json                      | 2 +-
 src/server_manager/messages/vi.json                      | 2 +-
 src/server_manager/messages/zh-CN.json                   | 2 +-
 src/server_manager/messages/zh-TW.json                   | 2 +-
 .../ui_components/outline-gcp-create-server-app.ts       | 2 +-
 .../web_app/ui_components/outline-server-view.js         | 2 +-
 48 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/server_manager/messages/am.json b/src/server_manager/messages/am.json
index 24dffe6d..dea9cf04 100644
--- a/src/server_manager/messages/am.json
+++ b/src/server_manager/messages/am.json
@@ -167,7 +167,7 @@
   "server-data-used": "ጥቅም ላይ የዋለው አበል / ባለፉት 30 ቀናት",
   "server-destroy": "አገልጋዩን ያጥፉ",
   "server-help-access-key-description": "Outline (አውትላይን) አገልጋይዎን እንዲጠቀሙበት የመግቢያ ቁልፎን ከወዳጆችዎ ጋር ይጋሩ። ሁሉም ዲቫይሶቻቸው ላይ ተመሳሳይ የመግቢያ ቁልፍ መጠቀም ይችላሉ። ",
-  "next": "ቀጣይ",
+  "server-help-access-key-next": "ቀጣይ",
   "server-help-access-key-title": "ቁልፍ ይፍጠሩ፣ በጋራ ተጠቀሙ",
   "server-help-connection-description": "Outline (አውትላይን) አገልጋይዎ የመግቢያ ቁልፍዎን ተጠቅመው Outline (አውትላይን) ተጠቃሚ መተግበሪያ ለመጫን እዚህ ክሊክ ያድርጉ",
   "server-help-connection-ok": "እሺ፣ ገባኝ",
@@ -229,4 +229,4 @@
   "survey-disclaimer": "ቀጥል የሚለውን ጠቅ በማድረግ Google ቅጾች ላይ ወዳለ አጭር የዳሰሳ ጥናት ይላካሉ። ከOutline ጋር እንደተገናኙ የዳሰሳ ጥናቱን እንዲወስዱ እንመክራለን።",
   "survey-go-to-survey": "ወደ የዳሰሳ ጥናት ሂድ",
   "terms-of-service": "የ{openLink}Outline (አውትላይን) መመሪያዎችን አንብቤ ተረድቻለሁ{closeLink}"
-}
\ No newline at end of file
+}
diff --git a/src/server_manager/messages/ar.json b/src/server_manager/messages/ar.json
index 00cddf7f..65b416db 100644
--- a/src/server_manager/messages/ar.json
+++ b/src/server_manager/messages/ar.json
@@ -167,7 +167,7 @@
   "server-data-used": "معدّل نقل البيانات / آخر 30 يومًا",
   "server-destroy": "إزالة الخادم",
   "server-help-access-key-description": "يمكنك مشاركة مفاتيح الوصول مع الأصدقاء حتى يتمكّنوا من الاتصال بخادمك على Outline. يمكنهم استخدام نفس مفتاح الوصول على جميع أجهزتهم.",
-  "next": "التالي",
+  "server-help-access-key-next": "التالي",
   "server-help-access-key-title": "إنشاء المفاتيح ومشاركة الوصول",
   "server-help-connection-description": "انقر هنا لتثبيت تطبيق عميل Outline باستخدام مفتاح وصولك الشخصي إلى خادم Outline.",
   "server-help-connection-ok": "حسنًا.",
diff --git a/src/server_manager/messages/bg.json b/src/server_manager/messages/bg.json
index 9aa07f64..9648b6f5 100644
--- a/src/server_manager/messages/bg.json
+++ b/src/server_manager/messages/bg.json
@@ -167,7 +167,7 @@
   "server-data-used": "Използвана квота/за последните 30 дни",
   "server-destroy": "Унищожаване на сървъра",
   "server-help-access-key-description": "Споделете ключовете за достъп с приятели, за да могат да се свържат към сървъра ви на Outline. Могат да използват един и същ ключ за достъп на всичките си устройства.",
-  "next": "Напред",
+  "server-help-access-key-next": "Напред",
   "server-help-access-key-title": "Създаване на ключове и споделяне на достъпа",
   "server-help-connection-description": "Кликнете тук, за да инсталирате клиентското приложение Outline, като използвате личния си ключ за достъп до сървъра си на Outline.",
   "server-help-connection-ok": "Добре, разбрах!",
diff --git a/src/server_manager/messages/ca.json b/src/server_manager/messages/ca.json
index 4cc598f2..0d5b1c00 100644
--- a/src/server_manager/messages/ca.json
+++ b/src/server_manager/messages/ca.json
@@ -167,7 +167,7 @@
   "server-data-used": "Capacitat utilitzada durant els últims 30 dies",
   "server-destroy": "Suprimeix el servidor",
   "server-help-access-key-description": "Comparteix les claus d'accés amb els amics perquè es puguin connectar al teu servidor d'Outline. Podran fer servir la mateixa clau d'accés en tots els seus dispositius.",
-  "next": "Següent",
+  "server-help-access-key-next": "Següent",
   "server-help-access-key-title": "Crea claus i comparteix l'accés",
   "server-help-connection-description": "Fes clic aquí per instal·lar l'aplicació de client Outline fent servir la teva clau d'accés personal per al servidor d'Outline.",
   "server-help-connection-ok": "Entesos",
diff --git a/src/server_manager/messages/cs.json b/src/server_manager/messages/cs.json
index f289ff53..61d79d0b 100644
--- a/src/server_manager/messages/cs.json
+++ b/src/server_manager/messages/cs.json
@@ -167,7 +167,7 @@
   "server-data-used": "Využité povolené vytížení / posledních 30 dní",
   "server-destroy": "Zničit server",
   "server-help-access-key-description": "Sdílejte přístupové klíče s přáteli, aby se mohli připojit k vašemu serveru Outline. Mohou používat jeden přístupový klíč na všech svých zařízeních.",
-  "next": "Další",
+  "server-help-access-key-next": "Další",
   "server-help-access-key-title": "Vytvořte klíče a sdílejte přístup",
   "server-help-connection-description": "Kliknutím sem nainstalujete klienta Outline s použitím svého osobního přístupového klíče k serveru Outline.",
   "server-help-connection-ok": "OK, rozumím",
diff --git a/src/server_manager/messages/da.json b/src/server_manager/messages/da.json
index db284bdc..c8d47980 100644
--- a/src/server_manager/messages/da.json
+++ b/src/server_manager/messages/da.json
@@ -167,7 +167,7 @@
   "server-data-used": "Procentdel af de tilladte data, der er blevet brugt i løbet af de seneste 30 dage",
   "server-destroy": "Slet server",
   "server-help-access-key-description": "Del din adgangsnøgle med dine venner, så de kan forbinde til din Outline-server. De kan bruge samme adgangsnøgle på alle deres enheder.",
-  "next": "Næste",
+  "server-help-access-key-next": "Næste",
   "server-help-access-key-title": "Opret nøgler og del adgang",
   "server-help-connection-description": "Klik her for at installere Outline-klienten, og brug din personlige adgangsnøgle til din Outline-server.",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/de.json b/src/server_manager/messages/de.json
index f21b7ada..f7115430 100644
--- a/src/server_manager/messages/de.json
+++ b/src/server_manager/messages/de.json
@@ -167,7 +167,7 @@
   "server-data-used": "Genutztes Datenvolumen / letzte 30 Tage",
   "server-destroy": "Server löschen",
   "server-help-access-key-description": "Geben Sie Zugriffsschlüssel für andere frei, damit sie eine Verbindung zu Ihrem Outline-Server herstellen können. Auf allen Geräten kann derselbe Zugriffsschlüssel verwendet werden.",
-  "next": "Weiter",
+  "server-help-access-key-next": "Weiter",
   "server-help-access-key-title": "Schlüssel erstellen und Zugriff freigeben",
   "server-help-connection-description": "Klicken Sie hier, um die Client-App von Outline zu installieren und mit Ihrem persönlichen Zugriffsschlüssel eine Verbindung zum Outline-Server herzustellen.",
   "server-help-connection-ok": "Ok.",
diff --git a/src/server_manager/messages/el.json b/src/server_manager/messages/el.json
index ec86cf7c..6f27e5e3 100644
--- a/src/server_manager/messages/el.json
+++ b/src/server_manager/messages/el.json
@@ -167,7 +167,7 @@
   "server-data-used": "Ποσοστό του ορίου που χρησιμοποιήθηκε / τελευταίες 30 ημέρες",
   "server-destroy": "Διαγραφή διακομιστή",
   "server-help-access-key-description": "Κοινοποιήστε τα κλειδιά πρόσβασης στους φίλους σας, ώστε να μπορούν να συνδεθούν στον διακομιστή Outline. Μπορούν να χρησιμοποιούν το ίδιο κλειδί πρόσβασης σε όλες τις συσκευές τους.",
-  "next": "Επόμενο",
+  "server-help-access-key-next": "Επόμενο",
   "server-help-access-key-title": "Δημιουργήστε κλειδιά και μοιραστείτε την πρόσβαση.",
   "server-help-connection-description": "Κάντε κλικ εδώ για να εγκαταστήσετε την εφαρμογή πελάτης Outline, χρησιμοποιώντας το προσωπικό κλειδί πρόσβασής στον διακομιστή Outline.",
   "server-help-connection-ok": "Το κατάλαβα!",
diff --git a/src/server_manager/messages/en.json b/src/server_manager/messages/en.json
index 6a013606..5adcc8c8 100644
--- a/src/server_manager/messages/en.json
+++ b/src/server_manager/messages/en.json
@@ -116,6 +116,7 @@
   "feedback-title-install": "Outline Server Installation Failed",
   "gcp-billing-title": "Add billing information to your Google Cloud Platform account.",
   "gcp-billing-description": "{openLink}Open the Cloud Console billing page{closeLink} and add an account in order to proceed.",
+  "gcp-billing-action": "Next",
   "gcp-billing-body": "Waiting for you to {openLink}add a billing account on Google Cloud{closeLink}",
   "gcp-billing-error": "Unable to retrieve billing information",
   "gcp-billing-error-zero": "You must add a billing account before proceeding.",
@@ -204,7 +205,7 @@
   "server-data-used": "Allowance used / last 30 days",
   "server-destroy": "Destroy server",
   "server-help-access-key-description": "Share access keys with friends, so they can connect to your Outline server. They can use the same access key on all their devices.",
-  "next": "Next",
+  "server-help-access-key-next": "Next",
   "server-help-access-key-title": "Create keys, share access",
   "server-help-connection-description": "Click here to install the Outline client app, using your personal access key to your Outline server.",
   "server-help-connection-ok": "Okay, got it!",
diff --git a/src/server_manager/messages/es-419.json b/src/server_manager/messages/es-419.json
index d07eabd1..fee0493d 100644
--- a/src/server_manager/messages/es-419.json
+++ b/src/server_manager/messages/es-419.json
@@ -167,7 +167,7 @@
   "server-data-used": "Cantidad permitida que se utilizó/Últimos 30 días",
   "server-destroy": "Destruir servidor",
   "server-help-access-key-description": "Comparte las claves de acceso con tus amigos para que puedan conectarse a tu servidor de Outline. Podrán usar la misma clave de acceso en todos sus dispositivos.",
-  "next": "Siguiente",
+  "server-help-access-key-next": "Siguiente",
   "server-help-access-key-title": "Crear claves, compartir el acceso",
   "server-help-connection-description": "Haz clic aquí para instalar la app de cliente de Outline por medio de la clave de acceso personal a tu servidor de Outline.",
   "server-help-connection-ok": "Entendido",
diff --git a/src/server_manager/messages/fa.json b/src/server_manager/messages/fa.json
index b7107663..dcc62766 100644
--- a/src/server_manager/messages/fa.json
+++ b/src/server_manager/messages/fa.json
@@ -167,7 +167,7 @@
   "server-data-used": "میزان سهمیه استفاده‌شده / ۳۰ روز گذشته",
   "server-destroy": "سرور تخریب شود",
   "server-help-access-key-description": "کلیدهای دسترسی را با دوستان به‌اشتراک بگذارید تا بتوانند به سرور Outline شما متصل شوند. آن‌ها می‌توانند از یک کلید دسترسی در همه دستگاه‌هایشان استفاده کنند.",
-  "next": "بعدی",
+  "server-help-access-key-next": "بعدی",
   "server-help-access-key-title": "ایجاد کردن کلید، به‌اشتراک گذاشتن دسترسی",
   "server-help-connection-description": "اینجا را کلیک کنید تا بااستفاده از کلید دسترسی شخصی به سرور Outline خود، برنامه کارخواه Outline را نصب کنید.",
   "server-help-connection-ok": "بسیار خب، متوجه شدم!",
diff --git a/src/server_manager/messages/fi.json b/src/server_manager/messages/fi.json
index 817b271c..38785f13 100644
--- a/src/server_manager/messages/fi.json
+++ b/src/server_manager/messages/fi.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kiintiötä käytetty / 30 viime päivää",
   "server-destroy": "Tuhoa palvelin",
   "server-help-access-key-description": "Jaa pääsyavaimia ystäville, jotta he voivat muodostaa yhteyden Outline-palvelimeesi. He voivat käyttää samaa pääsyavainta kaikilla laitteillaan.",
-  "next": "Seuraava",
+  "server-help-access-key-next": "Seuraava",
   "server-help-access-key-title": "Luo avaimia, jaa pääsyoikeuksia",
   "server-help-connection-description": "Asenna Outline-asiakassovellus klikkaamalla tätä. Käytä henkilökohtaista Outline-palvelimen pääsyavaintasi.",
   "server-help-connection-ok": "Selvä!",
diff --git a/src/server_manager/messages/fil.json b/src/server_manager/messages/fil.json
index 51b1b486..aacd71f8 100644
--- a/src/server_manager/messages/fil.json
+++ b/src/server_manager/messages/fil.json
@@ -167,7 +167,7 @@
   "server-data-used": "Nagamit na allowance / huling 30 araw",
   "server-destroy": "Sirain ang server",
   "server-help-access-key-description": "Magbahagi ng mga access key sa mga kaibigan, para makakonekta sila sa iyong Outline server. Puwede nilang gamitin ang iisang access key sa lahat ng kanilang device.",
-  "next": "Susunod",
+  "server-help-access-key-next": "Susunod",
   "server-help-access-key-title": "Gumawa ng mga key, magbahagi ng access",
   "server-help-connection-description": "Mag-click dito para i-install ang client app ng Outline, gamit ang iyong personal na access key sa Outline server mo.",
   "server-help-connection-ok": "Okay!",
diff --git a/src/server_manager/messages/fr.json b/src/server_manager/messages/fr.json
index e3db8d1a..6cba6af9 100644
--- a/src/server_manager/messages/fr.json
+++ b/src/server_manager/messages/fr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Dotation utilisée/30 derniers jours",
   "server-destroy": "Supprimer le serveur",
   "server-help-access-key-description": "Partagez vos clés d'accès avec vos proches, afin qu'ils puissent se connecter à votre serveur Outline. Ils peuvent utiliser la même clé d'accès sur tous leurs appareils.",
-  "next": "Suivant",
+  "server-help-access-key-next": "Suivant",
   "server-help-access-key-title": "Créer des clés et partager l'accès",
   "server-help-connection-description": "Cliquez ici pour installer l'application cliente Outline à l'aide de votre clé personnelle d'accès à votre serveur Outline.",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/he.json b/src/server_manager/messages/he.json
index d616b3ef..86e87650 100644
--- a/src/server_manager/messages/he.json
+++ b/src/server_manager/messages/he.json
@@ -167,7 +167,7 @@
   "server-data-used": "אחוז הניצול ב-30 הימים האחרונים",
   "server-destroy": "מחיקת השרת",
   "server-help-access-key-description": "הידעת שאפשר לשתף את מפתחות הגישה עם חברים כדי שהם יוכלו להתחבר לשרת שלך ב-Outline? הם יוכלו להשתמש באותו מפתח גישה בכל המכשירים שלהם.",
-  "next": "הבא",
+  "server-help-access-key-next": "הבא",
   "server-help-access-key-title": "יצירת מפתחות, שיתוף הגישה",
   "server-help-connection-description": "אפשר ללחוץ כאן כדי להתקין את אפליקציית הלקוח של Outline ולהשתמש במפתח הגישה האישי לשרת שלך ב-Outline.",
   "server-help-connection-ok": "אוקיי, הבנתי!",
diff --git a/src/server_manager/messages/hi.json b/src/server_manager/messages/hi.json
index 7a35938f..728e3e51 100644
--- a/src/server_manager/messages/hi.json
+++ b/src/server_manager/messages/hi.json
@@ -167,7 +167,7 @@
   "server-data-used": "इस्तेमाल किया गया कुल डेटा / पिछले 30 दिनों में",
   "server-destroy": "सर्वर मिटाएं",
   "server-help-access-key-description": "दोस्तों के साथ ऐक्सेस कुंजियां शेयर करें, ताकि वे आपके आउटलाइन सर्वर से कनेक्ट हो सकें. वे अपने सभी डिवाइस पर उसी ऐक्सेस कुंजी का इस्तेमाल कर सकते हैं.",
-  "next": "आगे बढ़ें",
+  "server-help-access-key-next": "आगे बढ़ें",
   "server-help-access-key-title": "कुंजियां बनाएं और ऐक्सेस शेयर करें",
   "server-help-connection-description": "अपने Outline सर्वर की निजी ऐक्सेस कुंजी का इस्तेमाल करके, Outline क्लाइंट ऐप्लिकेशन इंस्टॉल करने के लिए यहां क्लिक करें.",
   "server-help-connection-ok": "ठीक है, समझ लिया!",
diff --git a/src/server_manager/messages/hr.json b/src/server_manager/messages/hr.json
index bc333750..6402b675 100644
--- a/src/server_manager/messages/hr.json
+++ b/src/server_manager/messages/hr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Iskorišteno dopuštenje / posljednjih 30 dana",
   "server-destroy": "Izbriši poslužitelj",
   "server-help-access-key-description": "Podijelite pristupne ključeve s prijateljima kako bi se mogli povezati s vašim Outline poslužiteljem. Mogu koristiti iste pristupne ključeve na svim svojim uređajima.",
-  "next": "Dalje",
+  "server-help-access-key-next": "Dalje",
   "server-help-access-key-title": "Izradite ključeve, podijelite pristup",
   "server-help-connection-description": "Kliknite ovdje da biste instalirali klijentsku aplikaciju Outline pomoću osobnog pristupnog ključa za Outline poslužitelj.",
   "server-help-connection-ok": "U redu, shvaćam!",
diff --git a/src/server_manager/messages/hu.json b/src/server_manager/messages/hu.json
index c8cfe92c..de98e9bb 100644
--- a/src/server_manager/messages/hu.json
+++ b/src/server_manager/messages/hu.json
@@ -167,7 +167,7 @@
   "server-data-used": "Felhasznált keret/elmúlt 30 nap",
   "server-destroy": "Szerver megsemmisítése",
   "server-help-access-key-description": "Ossza meg a hozzáférési kulcsokat az ismerőseivel, hogy csatlakozhassanak az Outline-szerveréhez. Az összes eszközükön ugyanazt a hozzáférési kulcsot használhatják.",
-  "next": "Következő",
+  "server-help-access-key-next": "Következő",
   "server-help-access-key-title": "Kulcsok létrehozása, hozzáférés megosztása",
   "server-help-connection-description": "Kattintson ide az Outline ügyfélprogramnak az Outline-szerveréhez tartozó személyes hozzáférési kulccsal történő telepítéséhez",
   "server-help-connection-ok": "Rendben, értem!",
diff --git a/src/server_manager/messages/id.json b/src/server_manager/messages/id.json
index aaf51d0b..c949c5d8 100644
--- a/src/server_manager/messages/id.json
+++ b/src/server_manager/messages/id.json
@@ -167,7 +167,7 @@
   "server-data-used": "Batas yang digunakan/30 hari terakhir",
   "server-destroy": "Hancurkan server",
   "server-help-access-key-description": "Bagikan kunci akses dengan teman agar mereka dapat tersambung ke server Outline Anda. Mereka dapat menggunakan kunci akses yang sama di semua perangkatnya.",
-  "next": "Berikutnya",
+  "server-help-access-key-next": "Berikutnya",
   "server-help-access-key-title": "Buat kunci, bagikan akses",
   "server-help-connection-description": "Klik di sini untuk menginstal aplikasi klien Outline, menggunakan kunci akses pribadi ke server Outline Anda.",
   "server-help-connection-ok": "Oke, mengerti.",
diff --git a/src/server_manager/messages/it.json b/src/server_manager/messages/it.json
index c1dbea9e..7d64a502 100644
--- a/src/server_manager/messages/it.json
+++ b/src/server_manager/messages/it.json
@@ -167,7 +167,7 @@
   "server-data-used": "Quantità usata/ultimi 30 giorni",
   "server-destroy": "Elimina server",
   "server-help-access-key-description": "Condividi le chiavi di accesso con gli amici in modo che possano collegarsi al tuo server Outline. Potranno usare la stessa chiave di accesso su tutti i loro dispositivi.",
-  "next": "Avanti",
+  "server-help-access-key-next": "Avanti",
   "server-help-access-key-title": "Crea chiavi, condividi l'accesso",
   "server-help-connection-description": "Fai clic qui per installare l'app client Outline usando la tua chiave di accesso personale al server Outline.",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/ja.json b/src/server_manager/messages/ja.json
index 7d9d3eb3..66e98c31 100644
--- a/src/server_manager/messages/ja.json
+++ b/src/server_manager/messages/ja.json
@@ -167,7 +167,7 @@
   "server-data-used": "過去 30 日間の使用割り当て量",
   "server-destroy": "サーバーを削除",
   "server-help-access-key-description": "他のユーザーが Outline サーバーに接続できるよう、アクセスキーを共有します。すべてのデバイスで同じアクセスキーを使用できます。",
-  "next": "次へ",
+  "server-help-access-key-next": "次へ",
   "server-help-access-key-title": "キーの作成とアクセスの共有",
   "server-help-connection-description": "ここをクリックして Outline クライアント アプリをインストールし、個人のアクセスキーを使用して Outline サーバーに接続します。",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/kk.json b/src/server_manager/messages/kk.json
index 10155a82..a4e3e912 100644
--- a/src/server_manager/messages/kk.json
+++ b/src/server_manager/messages/kk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Пайдаланылған трафик/соңғы 30 күн",
   "server-destroy": "Серверді жою",
   "server-help-access-key-description": "Рұқсат кілттерін достарыңызбен бөліссеңіз, олар Outline серверімен байланыс орната алады. Олар барлық құрылғыларда бірдей рұқсат кілтін пайдалана алады.",
-  "next": "Келесі",
+  "server-help-access-key-next": "Келесі",
   "server-help-access-key-title": "Кілттер жасау, рұқсатты бөлісу",
   "server-help-connection-description": "Outline серверіне жеке рұқсат кілтін пайдалана отырып, Outline клиенттік қолданбасын орнату үшін осы жерді басыңыз.",
   "server-help-connection-ok": "Жарайды, түсінікті!",
diff --git a/src/server_manager/messages/km.json b/src/server_manager/messages/km.json
index 1a17a09b..e75c7513 100644
--- a/src/server_manager/messages/km.json
+++ b/src/server_manager/messages/km.json
@@ -167,7 +167,7 @@
   "server-data-used": "បាន​ប្រើ​បរិមាណ​ដែល​អនុញ្ញាត / 30 ថ្ងៃ​ចុង​ក្រោយ",
   "server-destroy": "បផ្លាញម៉ាស៊ីនមេ",
   "server-help-access-key-description": "ចែករំលែកកូនសោចូលប្រើជាមួយមិត្តភក្ដិ ដូច្នេះពួកគេអាចភ្ជាប់ទៅ Outline របស់អ្នក។ ពួកគេអាចប្រើកូនសោចូលប្រើដូចគ្នានៅលើឧបករណ៍របស់ពួកគេទាំងអស់។",
-  "next": "បន្ទាប់",
+  "server-help-access-key-next": "បន្ទាប់",
   "server-help-access-key-title": "បង្កើតកូនសោ ហើយចែកការប្រើប្រាស់",
   "server-help-connection-description": "ចុចទីនេះដើម្បីតំឡើងកម្មវិធីបម្រើ Outline ដោយប្រើកូនសោចូលផ្ទាល់ខ្លួនរបស់អ្នកទៅម៉ាស៊ីនបម្រើមេ Outline របស់អ្នក។",
   "server-help-connection-ok": "អូខេ យល់ហើយ!",
diff --git a/src/server_manager/messages/ko.json b/src/server_manager/messages/ko.json
index c39e6887..5046f349 100644
--- a/src/server_manager/messages/ko.json
+++ b/src/server_manager/messages/ko.json
@@ -167,7 +167,7 @@
   "server-data-used": "사용한 용량/지난 30일",
   "server-destroy": "서버 삭제",
   "server-help-access-key-description": "친구들이 내 Outline 서버에 연결할 수 있도록 액세스 키를 공유하세요. 친구들은 모든 기기에서 동일한 액세스 키를 사용할 수 있습니다.",
-  "next": "다음",
+  "server-help-access-key-next": "다음",
   "server-help-access-key-title": "키 생성, 액세스 공유",
   "server-help-connection-description": "여기를 클릭하여 Outline 클라이언트 앱을 설치하세요. 개인 액세스 키를 사용하여 Outline 서버에 연결하게 됩니다.",
   "server-help-connection-ok": "확인",
diff --git a/src/server_manager/messages/lt.json b/src/server_manager/messages/lt.json
index 9b808593..1c09dc86 100644
--- a/src/server_manager/messages/lt.json
+++ b/src/server_manager/messages/lt.json
@@ -167,7 +167,7 @@
   "server-data-used": "Išnaudotas pralaidumas / pastarosios 30 dienų",
   "server-destroy": "Naikinti serverį",
   "server-help-access-key-description": "Bendrinkite prieigos raktą su draugais, kad jie galėtų prisijungti prie jūsų „Outline“ serverio. Jie galės naudoti tą patį prieigos raktą visuose įrenginiuose.",
-  "next": "Kitas",
+  "server-help-access-key-next": "Kitas",
   "server-help-access-key-title": "Raktų kūrimas, prieigos bendrinimas",
   "server-help-connection-description": "Spustelėkite čia, kad įdiegtumėte „Outline“ klientų programą naudodami prieigos raktą „Outline“ serveryje.",
   "server-help-connection-ok": "Gerai, supratau!",
diff --git a/src/server_manager/messages/lv.json b/src/server_manager/messages/lv.json
index 9f9569de..d9311e4b 100644
--- a/src/server_manager/messages/lv.json
+++ b/src/server_manager/messages/lv.json
@@ -167,7 +167,7 @@
   "server-data-used": "Izmantotais atļautais apjoms / pēdējās 30 dienas",
   "server-destroy": "Iznīcināt serveri",
   "server-help-access-key-description": "Kopīgojiet piekļuves atslēgas ar draugiem, lai viņi varētu izveidot savienojumu ar jūsu Outline serveri. Jūsu draugi var izmantot vienu piekļuves atslēgu visās savās ierīcēs.",
-  "next": "Tālāk",
+  "server-help-access-key-next": "Tālāk",
   "server-help-access-key-title": "Atslēgu izveide un piekļuves kopīgošana",
   "server-help-connection-description": "Noklikšķiniet šeit, lai instalētu Outline klienta lietotni, izmantojot personīgo piekļuves atslēgu savam Outline serverim.",
   "server-help-connection-ok": "Labi, sapratu!",
diff --git a/src/server_manager/messages/master_messages.json b/src/server_manager/messages/master_messages.json
index 9c618195..6aac34c8 100644
--- a/src/server_manager/messages/master_messages.json
+++ b/src/server_manager/messages/master_messages.json
@@ -559,6 +559,11 @@
       }
     }
   },
+  "gcp_billing_action": {
+    "message": "Next",
+    "description": "Button label for a button that opens the billing page in the web browser (i.e. next step).",
+    "meaning": "gcp_billing_action"
+  },
   "gcp_billing_body": {
     "message": "Waiting for you to $START_OF_LINK$add a billing account on Google Cloud$END_OF_LINK$",
     "description": "Body text on the billing page",
@@ -961,9 +966,9 @@
     "message": "Share access keys with friends, so they can connect to your Outline server. They can use the same access key on all their devices.",
     "description": "This string appears within a help bubble as a paragraph. The help bubble is displayed when a server is installed. Informs to the user how to share access to their server."
   },
-  "next": {
+  "server_help_access_key_next": {
     "message": "Next",
-    "description": "Button label for a button that takes a user to the next step in a sequence."
+    "description": "This string appears within a help bubble as a button. Clicking it displays the next help bubble."
   },
   "server_help_access_key_title": {
     "message": "Create keys, share access",
diff --git a/src/server_manager/messages/my.json b/src/server_manager/messages/my.json
index d5b04101..72626ef2 100644
--- a/src/server_manager/messages/my.json
+++ b/src/server_manager/messages/my.json
@@ -167,7 +167,7 @@
   "server-data-used": "သုံးထားသော ခွင့်ပြုပမာဏ / ပြီးခဲ့သော ရက် ၃၀",
   "server-destroy": "ဆာဗာကို ဖျက်ရန်",
   "server-help-access-key-description": "မိတ်ဆွေများနှင့် အသုံးပြုခွင့်ကီးများကို မျှဝေခြင်းဖြင့် ၎င်းတို့က သင်၏ Outline ဆာဗာကို ချိတ်ဆက်နိုင်ပါသည်။ ၎င်းတို့၏စက်ပစ္စည်းအားလုံးတွင် အသုံးပြုခွင့်ကီးတစ်ခုတည်းကို သုံးနိုင်သည်။",
-  "next": "ရှေ့သို့",
+  "server-help-access-key-next": "ရှေ့သို့",
   "server-help-access-key-title": "ကီးများ ပြုလုပ်ခြင်း၊ သုံးခွင့် မျှဝေခြင်း",
   "server-help-connection-description": "သင်၏ Outline ဆာဗာသို့ သင့်ကိုယ်ပိုင်အသုံးပြုခွင့်ကီး သုံးပြီး Outline ကလိုင်းယင့်အက်ပ် ထည့်သွင်းရန် ဤနေရာကိုနှိပ်ပါ။",
   "server-help-connection-ok": "ရပါပြီ။",
diff --git a/src/server_manager/messages/nl.json b/src/server_manager/messages/nl.json
index 8297d416..448d829c 100644
--- a/src/server_manager/messages/nl.json
+++ b/src/server_manager/messages/nl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Gebruikte toegestane hoeveelheid/afgelopen dertig dagen",
   "server-destroy": "Server vernietigen",
   "server-help-access-key-description": "Deel toegangssleutels met vrienden, zodat zij verbinding kunnen maken met je Outline-server. Ze kunnen dezelfde sleutel gebruiken op al hun apparaten.",
-  "next": "Volgende",
+  "server-help-access-key-next": "Volgende",
   "server-help-access-key-title": "Sleutels maken, toegang delen",
   "server-help-connection-description": "Klik hier om de Outline-client-app te installeren met je persoonlijke toegangssleutel voor je Outline-server.",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/no.json b/src/server_manager/messages/no.json
index b2b66067..cfacb4b6 100644
--- a/src/server_manager/messages/no.json
+++ b/src/server_manager/messages/no.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kvote brukt / siste 30 dager",
   "server-destroy": "Slett tjeneren",
   "server-help-access-key-description": "Del tilgangsnøkler med venner slik at de kan koble seg til Outline-tjeneren din. De kan bruke samme tilgangsnøkkel på alle enhetene sine.",
-  "next": "Neste",
+  "server-help-access-key-next": "Neste",
   "server-help-access-key-title": "Opprett nøkler og del tilgang",
   "server-help-connection-description": "Klikk her for å installere Outline-klientappen ved å bruke den personlige tilgangsnøkkelen din til Outline-tjeneren din.",
   "server-help-connection-ok": "OK, skjønner!",
diff --git a/src/server_manager/messages/pl.json b/src/server_manager/messages/pl.json
index 66b80872..659afc36 100644
--- a/src/server_manager/messages/pl.json
+++ b/src/server_manager/messages/pl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Limit wykorzystany w ciągu ostatnich 30 dni",
   "server-destroy": "Zlikwiduj serwer",
   "server-help-access-key-description": "Udostępnij klucze dostępu znajomym, by mogli połączyć się z Twoim serwerem Outline. Mogą używać tego samego klucza dostępu na wszystkich swoich urządzeniach.",
-  "next": "Dalej",
+  "server-help-access-key-next": "Dalej",
   "server-help-access-key-title": "Utwórz klucze i przyznaj dostęp",
   "server-help-connection-description": "Kliknij tutaj, by zainstalować aplikację klienta Outline, używając własnego klucza dostępu do serwera Outline.",
   "server-help-connection-ok": "OK",
diff --git a/src/server_manager/messages/pt-BR.json b/src/server_manager/messages/pt-BR.json
index eae1a0a5..fc25448f 100644
--- a/src/server_manager/messages/pt-BR.json
+++ b/src/server_manager/messages/pt-BR.json
@@ -167,7 +167,7 @@
   "server-data-used": "Limite usado / últimos 30 dias",
   "server-destroy": "Destruir o servidor",
   "server-help-access-key-description": "Compartilhe as chaves de acesso com os amigos para eles se conectarem ao seu servidor do Outline. Eles podem usar a mesma chave de acesso em todos os dispositivos.",
-  "next": "Próxima",
+  "server-help-access-key-next": "Próxima",
   "server-help-access-key-title": "Crie chaves, compartilhe o acesso",
   "server-help-connection-description": "Clique aqui para instalar o app cliente do Outline usando sua chave de acesso pessoal com o servidor do Outline.",
   "server-help-connection-ok": "Ok.",
diff --git a/src/server_manager/messages/ro.json b/src/server_manager/messages/ro.json
index f0db95ae..2d0c044a 100644
--- a/src/server_manager/messages/ro.json
+++ b/src/server_manager/messages/ro.json
@@ -167,7 +167,7 @@
   "server-data-used": "Volumul de date utilizate/ultimele 30 de zile",
   "server-destroy": "Distrugeți serverul",
   "server-help-access-key-description": "Trimiteți prietenilor cheile de acces pentru a se putea conecta la serverul dvs. Outline. Ei pot folosi aceeași cheie de acces pe toate dispozitivele.",
-  "next": "Înainte",
+  "server-help-access-key-next": "Înainte",
   "server-help-access-key-title": "Creați chei și permiteți accesul",
   "server-help-connection-description": "Dați clic aici pentru a instala aplicația client Outline, folosind cheia dvs. de acces personală la serverul Outline.",
   "server-help-connection-ok": "Am înțeles!",
diff --git a/src/server_manager/messages/ru.json b/src/server_manager/messages/ru.json
index 479b82e1..f2841134 100644
--- a/src/server_manager/messages/ru.json
+++ b/src/server_manager/messages/ru.json
@@ -167,7 +167,7 @@
   "server-data-used": "Использованный объем данных/последние 30 дней",
   "server-destroy": "Удалить сервер",
   "server-help-access-key-description": "Предоставьте ключи доступа другим пользователям, чтобы они могли подключиться к вашему серверу Outline. Каждый пользователь может использовать один и тот же ключ доступа на всех своих устройствах.",
-  "next": "Далее",
+  "server-help-access-key-next": "Далее",
   "server-help-access-key-title": "Создайте ключи, предоставьте доступ",
   "server-help-connection-description": "Нажмите здесь, чтобы установить клиентское приложение Outline, используя персональные ключи для доступа к серверу Outline.",
   "server-help-connection-ok": "Ясно!",
diff --git a/src/server_manager/messages/sk.json b/src/server_manager/messages/sk.json
index 3b3125fa..c455e423 100644
--- a/src/server_manager/messages/sk.json
+++ b/src/server_manager/messages/sk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Využitý limit za posledných 30 dní",
   "server-destroy": "Zrušiť server",
   "server-help-access-key-description": "Zdieľajte prístupové kľúče s priateľmi, aby sa mohli pripojiť na váš server služby Outline. Na všetkých zariadeniach môžu používať rovnaký prístupový kľúč.",
-  "next": "Ďalej",
+  "server-help-access-key-next": "Ďalej",
   "server-help-access-key-title": "Vytváranie kľúčov a zdieľanie prístupu",
   "server-help-connection-description": "Ak chcete pomocou svojho osobného prístupového kľúča k serveru služby Outline nainštalovať klientsku aplikáciu Outline, kliknite tu.",
   "server-help-connection-ok": "Dobre.",
diff --git a/src/server_manager/messages/sl.json b/src/server_manager/messages/sl.json
index d5a645ad..c0e7e839 100644
--- a/src/server_manager/messages/sl.json
+++ b/src/server_manager/messages/sl.json
@@ -167,7 +167,7 @@
   "server-data-used": "Uporabljena količina/zadnjih 30 dni",
   "server-destroy": "Uniči strežnik",
   "server-help-access-key-description": "Ključe za dostop delite s prijatelji, tako da se lahko povežejo v vaš strežnik Outline. V vseh svojih napravah lahko uporabijo isti ključ za dostop.",
-  "next": "Naprej",
+  "server-help-access-key-next": "Naprej",
   "server-help-access-key-title": "Ustvarjanje ključev, delitev dostopa",
   "server-help-connection-description": "Kliknite tukaj, da namestite aplikacijo odjemalca Outline prek osebnega ključa za dostop do strežnika Outline.",
   "server-help-connection-ok": "V redu, razumem.",
diff --git a/src/server_manager/messages/sr-Latn.json b/src/server_manager/messages/sr-Latn.json
index 5052a758..80d21788 100644
--- a/src/server_manager/messages/sr-Latn.json
+++ b/src/server_manager/messages/sr-Latn.json
@@ -167,7 +167,7 @@
   "server-data-used": "Iskorišćena količina/poslednjih 30 dana",
   "server-destroy": "Izbriši server",
   "server-help-access-key-description": "Delite pristupne ključeve sa prijateljima da bi mogli da se povezuju na vaš Outline server. Mogu da koriste isti pristupni ključ na svim uređajima.",
-  "next": "Dalje",
+  "server-help-access-key-next": "Dalje",
   "server-help-access-key-title": "Pravite ključeve, delite pristup",
   "server-help-connection-description": "Kliknite ovde da biste instalirali klijentsku aplikaciju Outline pomoću ličnog pristupnog ključa za Outline server.",
   "server-help-connection-ok": "Važi!",
diff --git a/src/server_manager/messages/sr.json b/src/server_manager/messages/sr.json
index 2f1fa9ca..64c5bb47 100644
--- a/src/server_manager/messages/sr.json
+++ b/src/server_manager/messages/sr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Искоришћена количина/последњих 30 дана",
   "server-destroy": "Избриши сервер",
   "server-help-access-key-description": "Делите приступне кључеве са пријатељима да би могли да се повезују на ваш Outline сервер. Могу да користе исти приступни кључ на свим уређајима.",
-  "next": "Даље",
+  "server-help-access-key-next": "Даље",
   "server-help-access-key-title": "Правите кључеве, делите приступ",
   "server-help-connection-description": "Кликните овде да бисте инсталирали клијентску апликацију Outline помоћу личног приступног кључа за Outline сервер.",
   "server-help-connection-ok": "Важи!",
diff --git a/src/server_manager/messages/sv.json b/src/server_manager/messages/sv.json
index b4faf6e6..07d72b57 100644
--- a/src/server_manager/messages/sv.json
+++ b/src/server_manager/messages/sv.json
@@ -167,7 +167,7 @@
   "server-data-used": "Använd datamängd de senaste 30 dagarna",
   "server-destroy": "Förstör servern",
   "server-help-access-key-description": "Dela åtkomstnycklar med vänner, så att de kan ansluta till din Outline-server. De kan använda samma åtkomstnyckel på alla sina enheter.",
-  "next": "Nästa",
+  "server-help-access-key-next": "Nästa",
   "server-help-access-key-title": "Skapa nycklar, dela åtkomst",
   "server-help-connection-description": "Klicka här för att installera klientappen för Outline. Använd din personliga åtkomstnyckel till Outline-servern.",
   "server-help-connection-ok": "OK!",
diff --git a/src/server_manager/messages/th.json b/src/server_manager/messages/th.json
index 2566688c..ffeb63fe 100644
--- a/src/server_manager/messages/th.json
+++ b/src/server_manager/messages/th.json
@@ -167,7 +167,7 @@
   "server-data-used": "ปริมาณที่ใช้ไป / 30 วันที่ผ่านมา",
   "server-destroy": "ลบเซิร์ฟเวอร์",
   "server-help-access-key-description": "แชร์คีย์การเข้าถึงกับเพื่อน เพื่อให้เพื่อนเชื่อมต่อเซิร์ฟเวอร์ Outline ของคุณได้ โดยให้ใช้คีย์การเข้าถึงเดียวกันนี้กับอุปกรณ์ทุกเครื่อง",
-  "next": "ถัดไป",
+  "server-help-access-key-next": "ถัดไป",
   "server-help-access-key-title": "สร้างคีย์และแชร์สิทธิ์เข้าถึง",
   "server-help-connection-description": "คลิกที่นี่เพื่อติดตั้งแอปไคลเอ็นต์ Outline โดยใช้คีย์การเข้าถึงเซิร์ฟเวอร์ Outline ส่วนตัวของคุณ",
   "server-help-connection-ok": "รับทราบ",
diff --git a/src/server_manager/messages/tr.json b/src/server_manager/messages/tr.json
index cc812721..a483a078 100644
--- a/src/server_manager/messages/tr.json
+++ b/src/server_manager/messages/tr.json
@@ -167,7 +167,7 @@
   "server-data-used": "Kullanılan veri miktarı/son 30 gün",
   "server-destroy": "Sunucuyu sil",
   "server-help-access-key-description": "Outline sunucunuza bağlanabilmeleri için erişim anahtarlarınızı arkadaşlarınızla paylaşın. Arkadaşlarınız tüm cihazlarında aynı erişim anahtarını kullanabilir.",
-  "next": "Sonraki",
+  "server-help-access-key-next": "Sonraki",
   "server-help-access-key-title": "Anahtarlar oluşturun, erişimi paylaşın",
   "server-help-connection-description": "Outline sunucunuza ait kişisel erişim anahtarını kullanarak Outline istemci uygulamasını yüklemek için burayı tıklayın.",
   "server-help-connection-ok": "Tamam, anladım!",
diff --git a/src/server_manager/messages/uk.json b/src/server_manager/messages/uk.json
index 1bcf4a36..a792be2c 100644
--- a/src/server_manager/messages/uk.json
+++ b/src/server_manager/messages/uk.json
@@ -167,7 +167,7 @@
   "server-data-used": "Використано ліміту за 30 днів",
   "server-destroy": "Видалити сервер",
   "server-help-access-key-description": "Поділіться ключами доступу з друзями, щоб вони могли підключатися до вашого сервера Outline. Вони можуть використовувати один ключ доступу на всіх своїх пристроях.",
-  "next": "Далі",
+  "server-help-access-key-next": "Далі",
   "server-help-access-key-title": "Створіть ключі та надайте доступ",
   "server-help-connection-description": "Натисніть тут, щоб встановити клієнтський додаток Outline, використовуючи особистий ключ доступу до свого сервера Outline.",
   "server-help-connection-ok": "Зрозуміло",
diff --git a/src/server_manager/messages/ur.json b/src/server_manager/messages/ur.json
index 6467ee5a..c827c409 100644
--- a/src/server_manager/messages/ur.json
+++ b/src/server_manager/messages/ur.json
@@ -167,7 +167,7 @@
   "server-data-used": "استعمال کردہ الاؤنس / آخری 30 دن",
   "server-destroy": "سرور حذف کریں",
   "server-help-access-key-description": "دوستوں کے ساتھ رسائی کی کلیدوں کا اشتراک کریں، تاکہ وہ آپ کے Outline سرور سے منسلک ہو سکیں۔ وہ اپنے سبھی آلات پر رسائی کی مماثل کلید کا استعمال کر سکتے ہیں۔",
-  "next": "اگلا",
+  "server-help-access-key-next": "اگلا",
   "server-help-access-key-title": "کلیدیں تخلیق کریں، رسائی کا اشتراک کریں",
   "server-help-connection-description": "اپنے Outline سرور پر کی ذاتی رسائی کی کلید کا استعمال کرتے ہوئے، Outline کلائنٹ ایپ کو انسٹال کرنے کے لیے یہاں کلک کریں۔",
   "server-help-connection-ok": "ٹھیک ہے، سمجھ آ گئی!",
diff --git a/src/server_manager/messages/vi.json b/src/server_manager/messages/vi.json
index 32ec267d..94b3085e 100644
--- a/src/server_manager/messages/vi.json
+++ b/src/server_manager/messages/vi.json
@@ -167,7 +167,7 @@
   "server-data-used": "Hạn mức sử dụng/30 ngày qua",
   "server-destroy": "Hủy máy chủ",
   "server-help-access-key-description": "Chia sẻ khóa truy cập với bạn bè để họ có thể kết nối với máy chủ Outline của bạn. Họ có thể dùng cùng một khóa truy cập trên tất cả thiết bị.",
-  "next": "Tiếp",
+  "server-help-access-key-next": "Tiếp",
   "server-help-access-key-title": "Tạo khóa, chia sẻ quyền truy cập",
   "server-help-connection-description": "Nhấp vào đây để cài đặt ứng dụng Outline, sử dụng khóa truy cập cá nhân vào máy chủ Outline của bạn.",
   "server-help-connection-ok": "Đã hiểu!",
diff --git a/src/server_manager/messages/zh-CN.json b/src/server_manager/messages/zh-CN.json
index 4c7196ec..43bdc245 100644
--- a/src/server_manager/messages/zh-CN.json
+++ b/src/server_manager/messages/zh-CN.json
@@ -167,7 +167,7 @@
   "server-data-used": "流量限额的已用比例 / 过去 30 天",
   "server-destroy": "销毁服务器",
   "server-help-access-key-description": "可与朋友分享您的访问密钥，让他们也能连接到您的 Outline 服务器。您的朋友在自己的所有设备上都可以使用这个访问密钥。",
-  "next": "下一步",
+  "server-help-access-key-next": "下一步",
   "server-help-access-key-title": "创建密钥，以共享访问权限",
   "server-help-connection-description": "点击此处即可安装 Outline 客户端应用，安装过程中需要用到您的个人访问密钥来连接 Outline 服务器。",
   "server-help-connection-ok": "知道了！",
diff --git a/src/server_manager/messages/zh-TW.json b/src/server_manager/messages/zh-TW.json
index 0f3254e7..e87a6d02 100644
--- a/src/server_manager/messages/zh-TW.json
+++ b/src/server_manager/messages/zh-TW.json
@@ -167,7 +167,7 @@
   "server-data-used": "配額用量/過去 30 天",
   "server-destroy": "刪除伺服器",
   "server-help-access-key-description": "將存取金鑰分享給好友，讓對方能夠連線至你的 Outline 伺服器。他們可以在自己的所有裝置上使用相同的存取金鑰。",
-  "next": "繼續",
+  "server-help-access-key-next": "繼續",
   "server-help-access-key-title": "建立金鑰並分享存取權",
   "server-help-connection-description": "只要按一下這裡，即可透過 Outline 伺服器的個人存取金鑰安裝 Outline 用戶端應用程式。",
   "server-help-connection-ok": "好，我知道了！",
diff --git a/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts b/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
index bd99fdbd..d762216a 100644
--- a/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
+++ b/src/server_manager/web_app/ui_components/outline-gcp-create-server-app.ts
@@ -160,7 +160,7 @@ export class GcpCreateServerApp extends LitElement {
         </span>
         <span slot="step-action">
           <paper-button id="billingPageAction" @tap="${this.handleBillingVerificationNextTap}">
-            ${this.localize('next')}
+            ${this.localize('gcp-billing-action')}
           </paper-button>
         </span>
         <paper-card class="card">
diff --git a/src/server_manager/web_app/ui_components/outline-server-view.js b/src/server_manager/web_app/ui_components/outline-server-view.js
index 8ea6727d..2e22156e 100644
--- a/src/server_manager/web_app/ui_components/outline-server-view.js
+++ b/src/server_manager/web_app/ui_components/outline-server-view.js
@@ -421,7 +421,7 @@ export class ServerView extends DirMixin(PolymerElement) {
       <img src="images/key-tip-2x.png">
       <h3>[[localize('server-help-access-key-title')]]</h3>
       <p>[[localize('server-help-access-key-description')]]</p>
-      <paper-button on-tap="_closeAddAccessKeyHelpBubble">[[localize('next')]]</paper-button>
+      <paper-button on-tap="_closeAddAccessKeyHelpBubble">[[localize('server-help-access-key-next')]]</paper-button>
     </outline-help-bubble>
     <outline-help-bubble id="dataLimitsHelpBubble" vertical-align="top" horizontal-align="right">
       <h3>[[localize('data-limits-dialog-title')]]</h3>