Edit translation contexts to avoid retranslation

19 files changed, 95 insertions, 114 deletions

diff --git a/gui/locales/da/messages.po b/gui/locales/da/messages.po
index 3bb8978fec..6712fa6824 100644
--- a/gui/locales/da/messages.po
+++ b/gui/locales/da/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Bemærk: aktivering af dette medfører, at der altid kræves en Mullvad VPN-forbindelse for at oprette forbindelse til internettet."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Aktivér alligevel"
 
@@ -437,10 +436,10 @@ msgstr "Du er klar!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Vælg sprog"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Indgang"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Udgang"
 
diff --git a/gui/locales/de/messages.po b/gui/locales/de/messages.po
index 8cd10f195b..4fb3ed96ec 100644
--- a/gui/locales/de/messages.po
+++ b/gui/locales/de/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Achtung: Wenn Sie diese Einstellung aktivieren, wird immer eine Mullvad VPN-Verbindung erfordert, um das Internet zu erreichen."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Trotzdem aktivieren"
 
@@ -437,10 +436,10 @@ msgstr "Sie sind startklar!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s über %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s über %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Sprache auswählen"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Eingang"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Ausgang"
 
diff --git a/gui/locales/es/messages.po b/gui/locales/es/messages.po
index 4b239b31b9..144888932a 100644
--- a/gui/locales/es/messages.po
+++ b/gui/locales/es/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Atención: Si activa esta opción, se exigirá siempre el uso de una conexión de Mullvad VPN para conectarse a Internet."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Habilitar de todos modos"
 
@@ -437,10 +436,10 @@ msgstr "¡Ya está!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s a través de %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s a través de %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Seleccionar idioma"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Entrada"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Salida"
 
diff --git a/gui/locales/fi/messages.po b/gui/locales/fi/messages.po
index b9b6d24edc..432650424c 100644
--- a/gui/locales/fi/messages.po
+++ b/gui/locales/fi/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Huomio: jos tämä otetaan käyttöön, verkkoon yhdistäminen vaatii aina Mullvad VPN -yhteyden."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Ota silti käyttöön"
 
@@ -437,10 +436,10 @@ msgstr "Olet valmis!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s, yhteys: %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s, yhteys: %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Valitse kieli"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Tulo"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Lähtö"
 
diff --git a/gui/locales/fr/messages.po b/gui/locales/fr/messages.po
index 801cae4fc3..3a4c1eb228 100644
--- a/gui/locales/fr/messages.po
+++ b/gui/locales/fr/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Attention : si vous activez cette option, les connexions à Internet nécessiteront toujours une connexion Mullvad VPN."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Activer quand même"
 
@@ -437,10 +436,10 @@ msgstr "Tout est prêt !"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Sélectionner la langue"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Entrée"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Sortie"
 
diff --git a/gui/locales/it/messages.po b/gui/locales/it/messages.po
index bbe0f0876a..f1113b13d8 100644
--- a/gui/locales/it/messages.po
+++ b/gui/locales/it/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Attenzione: abilitando questa opzione, si richiederà sempre una connessione Mullvad VPN per navigare in Internet."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Abilita comunque"
 
@@ -437,10 +436,10 @@ msgstr "È tutto pronto!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s tramite %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s tramite %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Seleziona lingua"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Ingresso"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Uscita"
 
diff --git a/gui/locales/ja/messages.po b/gui/locales/ja/messages.po
index 027222949b..2129b6f714 100644
--- a/gui/locales/ja/messages.po
+++ b/gui/locales/ja/messages.po
@@ -258,7 +258,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "注意：この設定を有効化すると、インターネットにアクセスするために常にMullvad VPNへの接続が必要になります。"
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "それでも有効化する"
 
@@ -434,10 +433,10 @@ msgstr "準備完了！"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(bridge)s経由で%(relay)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(entry)s経由で%(relay)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -921,11 +920,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "言語を選択"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "入口"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "出口"
 
diff --git a/gui/locales/ko/messages.po b/gui/locales/ko/messages.po
index 5461d40ae1..5a471c6341 100644
--- a/gui/locales/ko/messages.po
+++ b/gui/locales/ko/messages.po
@@ -250,7 +250,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "주의: 이 기능을 사용하려면 인터넷 연결을 위해 항상 Mullvad VPN 연결이 필요합니다."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "그래도 사용"
 
@@ -426,10 +425,10 @@ msgstr "준비가 완료되었습니다!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(bridge)s을(를) 통한 %(relay)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(entry)s을(를) 통한 %(relay)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -913,11 +912,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "언어 선택"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "시작"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "종료"
 
diff --git a/gui/locales/my/messages.po b/gui/locales/my/messages.po
index 4371bedf36..4c56802ef8 100644
--- a/gui/locales/my/messages.po
+++ b/gui/locales/my/messages.po
@@ -250,7 +250,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "သတိပြုရန်- ၎င်းကို ဖွင့်ခြင်းဖြင့် အင်တာနက် သုံးရန်အတွက် Mullvad VPN ချိတ်ဆက်မှုကို အမြဲ လိုအပ်ပါမည်။"
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "မည်သို့ပင်ဖြစ်စေ ဖွင့်ရန်"
 
@@ -426,10 +425,10 @@ msgstr "အားလုံး သတ်မှတ်ပြီးပါပြီ�
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(bridge)s မှတစ်ဆင့် %(relay)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(entry)s မှတစ်ဆင့် %(relay)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -913,11 +912,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "ဘာသာစကား ရွေးရန်"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "အဝင်"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "အထွက်"
 
diff --git a/gui/locales/nb/messages.po b/gui/locales/nb/messages.po
index 6f50ffe534..3a42ac695d 100644
--- a/gui/locales/nb/messages.po
+++ b/gui/locales/nb/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Advarsel: Hvis du aktiverer dette, må du alltid ha en Mullvad VPN-tilkobling for å være tilkoblet internett."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Aktiver uansett"
 
@@ -437,10 +436,10 @@ msgstr "Du er klar!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Velg språk"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Inngang"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Utgang"
 
diff --git a/gui/locales/nl/messages.po b/gui/locales/nl/messages.po
index e83ae4eac8..76ecdeb648 100644
--- a/gui/locales/nl/messages.po
+++ b/gui/locales/nl/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Opgelet: dit inschakelen vereist altijd een Mullvad VPN-verbinding om het internet te bereiken."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Toch inschakelen"
 
@@ -437,10 +436,10 @@ msgstr "U bent er helmaal klaar voor!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Taal selecteren"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Ingang"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Uitgang"
 
diff --git a/gui/locales/pl/messages.po b/gui/locales/pl/messages.po
index 8d2e67be6a..1bf0ec3973 100644
--- a/gui/locales/pl/messages.po
+++ b/gui/locales/pl/messages.po
@@ -283,7 +283,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Uwaga: wskutek włączenia tej opcji w celu uzyskania dostępu do Internetu zawsze wymagane będzie połączenie przez Mullvad VPN."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Mimo to włącz"
 
@@ -459,10 +458,10 @@ msgstr "Wszystko gotowe!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s przez %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s przez %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -946,11 +945,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Wybierz język"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Wejście"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Wyjście"
 
diff --git a/gui/locales/pt/messages.po b/gui/locales/pt/messages.po
index fe20d75db1..34878cfad1 100644
--- a/gui/locales/pt/messages.po
+++ b/gui/locales/pt/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Atenção: ativar esta opção exige sempre uma ligação através de Mullvad VPN para aceder à Internet."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Ativar mesmo assim"
 
@@ -437,10 +436,10 @@ msgstr "Está pronto!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Selecionar idioma"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Entrada"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Saída"
 
diff --git a/gui/locales/ru/messages.po b/gui/locales/ru/messages.po
index ff4b88fa1b..b921156406 100644
--- a/gui/locales/ru/messages.po
+++ b/gui/locales/ru/messages.po
@@ -283,7 +283,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Внимание: при активации этого параметра для выхода в Интернет необходимо будет обязательно подключиться через Mullvad VPN."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Всё равно активировать"
 
@@ -459,10 +458,10 @@ msgstr "Готово!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s через %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s через %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -946,11 +945,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Выбрать язык"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Вход"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Выход"
 
diff --git a/gui/locales/sv/messages.po b/gui/locales/sv/messages.po
index 415b9c6db0..00717c2377 100644
--- a/gui/locales/sv/messages.po
+++ b/gui/locales/sv/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Obs! Om du aktiverar detta kommer det alltid att krävas en Mullvad VPN-anslutning för att nå internet."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Aktivera ändå"
 
@@ -437,10 +436,10 @@ msgstr "Du är klar!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s via %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s via %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Välj språk"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Ingång"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Utgång"
 
diff --git a/gui/locales/th/messages.po b/gui/locales/th/messages.po
index aeccff64bf..45d0d7c821 100644
--- a/gui/locales/th/messages.po
+++ b/gui/locales/th/messages.po
@@ -250,7 +250,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "โปรดทราบ: การเปิดใช้งานสิ่งนี้จะทำให้คุณจำเป็นต้องเชื่อมต่อ Mullvad VPN ไว้ตลอดเวลา เพื่อที่จะเข้าถึงอินเทอร์เน็ต"
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "เปิดใช้งานต่อไป"
 
@@ -426,10 +425,10 @@ msgstr "คุณพร้อมแล้ว!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s ผ่าน %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s ผ่าน %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -913,11 +912,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "เลือกภาษา"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "เข้า"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "ออก"
 
diff --git a/gui/locales/tr/messages.po b/gui/locales/tr/messages.po
index 735ce3dde7..facbcd33eb 100644
--- a/gui/locales/tr/messages.po
+++ b/gui/locales/tr/messages.po
@@ -261,7 +261,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "Dikkat: bu seçeneğin etkinleştirilmesi, internete erişim için her zaman bir Mullvad VPN bağlantısı gerektirir."
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "Yine de etkinleştir"
 
@@ -437,10 +436,10 @@ msgstr "Hazırsınız!"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(bridge)s aracılığıyla %(relay)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(entry)s aracılığıyla %(relay)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -924,11 +923,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "Dili seçin"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "Giriş"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "Çıkış"
 
diff --git a/gui/locales/zh-CN/messages.po b/gui/locales/zh-CN/messages.po
index 9e418cb1f4..a532140cdd 100644
--- a/gui/locales/zh-CN/messages.po
+++ b/gui/locales/zh-CN/messages.po
@@ -250,7 +250,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "注意：启用此选项后，将始终需要 Mullvad VPN 才能连接到网络。"
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "仍然启用"
 
@@ -426,10 +425,10 @@ msgstr "您已设置完毕！"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s，经由 %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s，经由 %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -913,11 +912,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "选择语言"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "入口"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "出口"
 
diff --git a/gui/locales/zh-TW/messages.po b/gui/locales/zh-TW/messages.po
index fad8b7fe9c..4f04b41046 100644
--- a/gui/locales/zh-TW/messages.po
+++ b/gui/locales/zh-TW/messages.po
@@ -250,7 +250,6 @@ msgctxt "advanced-settings-view"
 msgid "Attention: enabling this will always require a Mullvad VPN connection in order to reach the internet."
 msgstr "注意：啟用此功能，皆需 Mullvad VPN 連線才能上網。"
 
-msgctxt "advanced-settings-view"
 msgid "Enable anyway"
 msgstr "仍然啟用"
 
@@ -426,10 +425,10 @@ msgstr "您已設定完畢！"
 #. The hostname line displayed below the country on the main screen
 #. Available placeholders:
 #. %(relay)s - the relay hostname
-#. %(bridge)s - the bridge hostname
+#. %(entry)s - the entry relay hostname
 msgctxt "connection-info"
-msgid "%(relay)s via %(bridge)s"
-msgstr "%(relay)s 透過 %(bridge)s"
+msgid "%(relay)s via %(entry)s"
+msgstr "%(relay)s 透過 %(entry)s"
 
 #. The tunnel type line displayed below the hostname line on the main screen
 #. Available placeholders:
@@ -913,11 +912,11 @@ msgctxt "select-language-nav"
 msgid "Select language"
 msgstr "選擇語言"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Entry"
 msgstr "入口"
 
-msgctxt "select-location-nav"
+msgctxt "select-location-view"
 msgid "Exit"
 msgstr "出口"