Merge branch 'update_translations2' into 'master'

another translations MR

Closes #9062

See merge request leap/bitmask_android!273

14 files changed, 23 insertions, 22 deletions

diff --git a/.tx/config b/.tx/config
index 6f5665a6..1cb3557e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -3,7 +3,7 @@ host = https://rest.api.transifex.com
 
 
 [o:otf:p:bitmask:r:strings]
-lang_map = es_AR: es-rAR, es_CU: es-rCU, fa_IR: fa-rIR, kn_IN: kn-rIN, pt_BR: pt-rBR, pt_PT: pt-rPT, zh: zh-rCN, zh_TW: zh-rTW, nb: no
+lang_map = es_AR: es-rAR, es_CU: es-rCU, fa_IR: fa-rIR, kn_IN: kn-rIN, pt_BR: pt-rBR, pt_PT: pt-rPT, zh_TW: zh-rTW, nb: no
 file_filter = app/src/main/res/values-<lang>/strings.xml
 minimum_perc = 75
 source_file = app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@ type = ANDROID
 resource_name = Bitmask Android
 
 [o:otf:p:bitmask:r:riseupvpn]
-lang_map = es_AR: es-rAR, es_CU: es-rCU, fa_IR: fa-rIR, kn_IN: kn-rIN, pt_BR: pt-rBR, pt_PT: pt-rPT, zh: zh-rCN, zh_TW: zh-rTW, nb: no
+lang_map = es_AR: es-rAR, es_CU: es-rCU, fa_IR: fa-rIR, kn_IN: kn-rIN, pt_BR: pt-rBR, pt_PT: pt-rPT, zh_TW: zh-rTW, nb: no
 file_filter = app/src/custom/res/values-<lang>/strings.xml
 minimum_perc = 75
 source_file = app/src/custom/res/values/strings.xml
@@ -21,7 +21,7 @@ type = ANDROID
 resource_name = RiseupVPN Android
 
 [o:otf:p:bitmask:r:bitmask-playstore-listing]
-lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh: zh-CN, zh_TW: zh-TW, nb: no
+lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh_TW: zh-TW, nb: no
 source_file = src/normal/fastlane/metadata/android/en-US/store-meta-en-US.json
 type = KEYVALUEJSON
 resource_name = Bitmask details in Appstore
@@ -29,7 +29,7 @@ file_filter = src/normal/fastlane/metadata/android/<lang>/store-meta-<lang>.json
 minimum_perc = 98
 
 [o:otf:p:bitmask:r:riseupvpn-playstore-listing]
-lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh: zh-CN, zh_TW: zh-TW, nb: no
+lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh_TW: zh-TW, nb: no
 source_file = src/custom/fastlane/metadata/android/en-US/store-meta-en-US.json
 type = KEYVALUEJSON
 resource_name = RiseupVPN details in Appstore
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
index 8477c302..cdb255fc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
@@ -4,6 +4,7 @@ import static android.app.Activity.RESULT_CANCELED;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static se.leap.bitmaskclient.R.string.app_name;
 import static se.leap.bitmaskclient.R.string.description_configure_provider;
 import static se.leap.bitmaskclient.R.string.description_configure_provider_circumvention;
 import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE;
@@ -86,7 +87,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Prop
                              @Nullable Bundle savedInstanceState) {
         binding = FConfigureProviderBinding.inflate(inflater, container, false);
         binding.detailContainer.setVisibility(getUseSnowflake() ? VISIBLE : GONE);
-        binding.tvCircumventionDescription.setText(getUseSnowflake() ? description_configure_provider_circumvention : description_configure_provider);
+        binding.tvCircumventionDescription.setText(getUseSnowflake() ? getString(description_configure_provider_circumvention, getString(app_name)) : getString(description_configure_provider, getString(app_name)));
         binding.detailHeaderContainer.setOnClickListener(v -> {
             binding.ivExpand.animate().setDuration(250).rotation(isExpanded ? -90 : 0);
             showConnectionDetails();
@@ -123,7 +124,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Prop
         super.onFragmentSelected();
         ignoreProviderAPIUpdates = false;
         binding.detailContainer.setVisibility(getUseSnowflake() ? VISIBLE : GONE);
-        binding.tvCircumventionDescription.setText(getUseSnowflake() ? description_configure_provider_circumvention : description_configure_provider);
+        binding.tvCircumventionDescription.setText(getUseSnowflake() ? getString(description_configure_provider_circumvention, getString(app_name)) : getString(description_configure_provider, getString(app_name)));
         if (!isDefaultBitmask()) {
             Drawable drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.setup_progress_spinner, null);
             binding.progressSpinner.setAnimatedSpinnerDrawable(drawable);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 73c0fdb9..cbe9da4d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -218,8 +218,8 @@
   <string name="circumvention_setup_hint">%s versucht automatisch, dich mithilfe einer Reihe von Umgehungstechnologien mit dem Internet zu verbinden. Du kannst dies in den erweiterten Einstellungen genau anpassen.</string>
   <string name="use_standard_vpn">Benutze die Standardverbindung von %s</string>
   <string name="use_circumvention_tech">Benutze Umgehungstechnologie (langsamer)</string>
-  <string name="description_configure_provider">Um eine Verbindung zu Ihrem Provider herzustellen, holt Bitmask alle erforderlichen Konfigurationsinformationen ein. Dies geschieht nur während der Ersteinrichtung.</string>
-  <string name="description_configure_provider_circumvention">Bitmask versucht, alle erforderlichen Konfigurationsdaten vom Anbieter zu empfangen. Dies geschieht nur bei der Ersteinrichtung. Sie haben sich für die Umgehungstechnologie entschieden, daher kann dies einige Zeit dauern.</string>
+  <string name="description_configure_provider">Um eine Verbindung zu Ihrem Provider herzustellen, holt %1$s alle erforderlichen Konfigurationsinformationen ein. Dies geschieht nur während der Ersteinrichtung.</string>
+  <string name="description_configure_provider_circumvention">%1$s versucht, alle erforderlichen Konfigurationsdaten vom Anbieter zu empfangen. Dies geschieht nur bei der Ersteinrichtung. Sie haben sich für die Umgehungstechnologie entschieden, daher kann dies einige Zeit dauern.</string>
   <string name="details">Details</string>
   <string name="tor_status">Tor-Status</string>
   <string name="snowflake_status">Snowflake-Status</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a45b4388..33356e97 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -218,8 +218,8 @@
   <string name="circumvention_setup_hint">Το %s θα προσπαθήσει αυτόματα να σας συνδέσει στο διαδίκτυο χρησιμοποιώντας μια ποικιλία τεχνολογιών παράκαμψης. Μπορείτε να το ρυθμίσετε με ακρίβεια στις ρυθμίσεις για προχωρημένους.</string>
   <string name="use_standard_vpn">Χρήση τυπικού %s</string>
   <string name="use_circumvention_tech">Χρήση τεχνολογίας παράκαμψης (πιο αργή)</string>
-  <string name="description_configure_provider">Για να συνδεθείτε στον πάροχο σας, το Bitmask ανακτά όλες τις απαιτούμενες πληροφορίες διαμόρφωσης. Αυτό συμβαίνει μόνο κατά την πρώτη εγκατάσταση.</string>
-  <string name="description_configure_provider_circumvention">Το Bitmask προσπαθεί να συλλέξει όλα τα απαιτούμενα δεδομένα διαμόρφωσης από τον πάροχο. Αυτό συμβαίνει μόνο κατά την πρώτη εγκατάσταση. Επιλέξατε να χρησιμοποιήσετε την τεχνολογία παράκαμψης, επομένως αυτό μπορεί να πάρει κάποιο χρόνο.</string>
+  <string name="description_configure_provider">Για να συνδεθείτε στον πάροχο σας, το %1$s ανακτά όλες τις απαιτούμενες πληροφορίες διαμόρφωσης. Αυτό συμβαίνει μόνο κατά την πρώτη εγκατάσταση.</string>
+  <string name="description_configure_provider_circumvention">Το %1$s προσπαθεί να συλλέξει όλα τα απαιτούμενα δεδομένα διαμόρφωσης από τον πάροχο. Αυτό συμβαίνει μόνο κατά την πρώτη εγκατάσταση. Επιλέξατε να χρησιμοποιήσετε την τεχνολογία παράκαμψης, επομένως αυτό μπορεί να πάρει κάποιο χρόνο.</string>
   <string name="details">Λεπτομέρειες</string>
   <string name="tor_status">Κατάσταση του Tor </string>
   <string name="snowflake_status">Κατάσταση Snowflake</string>
diff --git a/app/src/main/res/values-es-rCU/strings.xml b/app/src/main/res/values-es-rCU/strings.xml
index fcc1f404..8f582320 100644
--- a/app/src/main/res/values-es-rCU/strings.xml
+++ b/app/src/main/res/values-es-rCU/strings.xml
@@ -219,8 +219,8 @@
   <string name="circumvention_setup_hint">%s tratará de conectarte a Internet usando varias tecnologías de evasión. Puedes modificar algunas opciones en la configuración avanzada.</string>
   <string name="use_standard_vpn">Utiliza el estándar %s</string>
   <string name="use_circumvention_tech">Usa  tecnología de evasión (más lento)</string>
-  <string name="description_configure_provider">Para conectarte a tu proveedor, Bitmask está obteniendo toda la información de configuración requerida. Esto solo sucede durante la primera configuración. </string>
-  <string name="description_configure_provider_circumvention">Bitmask está intentando recopilar toda la información de tu proveedor. Esto solo sucede durante la primera configuración y podría demorar algún tiempo.</string>
+  <string name="description_configure_provider">Para conectarte a tu proveedor, %1$s está obteniendo toda la información de configuración requerida. Esto solo sucede durante la primera configuración. </string>
+  <string name="description_configure_provider_circumvention">%1$s está intentando recopilar toda la información de tu proveedor. Esto solo sucede durante la primera configuración y podría demorar algún tiempo.</string>
   <string name="details">Detalles</string>
   <string name="tor_status">Estado de Tor</string>
   <string name="snowflake_status">Estado Snowflake</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4385649d..6314ca8f 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -220,8 +220,8 @@
   <string name="circumvention_setup_hint">%s automatiškai bandys prijungti jus prie interneto, naudojant įvairias apėjimo technologijas. Jūs galite derinti šias parinktis išplėstiniuose nustatymuose.</string>
   <string name="use_standard_vpn">Naudoti standartinį %s</string>
   <string name="use_circumvention_tech">Naudoti apėjimo technologijas (lėčiau)</string>
-  <string name="description_configure_provider">Tam, kad prisijungtų prie jūsų teikėjo, Bitmask gauna visą reikiamą konfigūracijos informaciją. Tai vyksta tik pirmosios sąrankos metu.</string>
-  <string name="description_configure_provider_circumvention">Bitmask bando iš teikėjo surinkti visus reikiamus konfigūracijos duomenis. Tai vyksta tik pirmosios sąrankos metu. Jūs pasirinkote naudoti apėjimo technologiją, todėl tai gali šiek tiek užtrukti.</string>
+  <string name="description_configure_provider">Tam, kad prisijungtų prie jūsų teikėjo, %1$s gauna visą reikiamą konfigūracijos informaciją. Tai vyksta tik pirmosios sąrankos metu.</string>
+  <string name="description_configure_provider_circumvention">%1$s bando iš teikėjo surinkti visus reikiamus konfigūracijos duomenis. Tai vyksta tik pirmosios sąrankos metu. Jūs pasirinkote naudoti apėjimo technologiją, todėl tai gali šiek tiek užtrukti.</string>
   <string name="details">Išsamiau</string>
   <string name="tor_status">Tor būsena</string>
   <string name="snowflake_status">„Snowflake“ būsena</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2416143d..993486d3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -219,8 +219,8 @@
   <string name="circumvention_setup_hint">%s tentará conectá-lo automaticamente à Internet usando uma variedade de tecnologias de evasão. Você pode ajustar isso nas configurações avançadas.</string>
   <string name="use_standard_vpn">Usar padrão %s</string>
   <string name="use_circumvention_tech">Use tecnologia de evasão (mais lenta)</string>
-  <string name="description_configure_provider">Para se conectar ao seu provedor, o Bitmask está buscando todas as informações de configuração necessárias. Isso só acontece durante a primeira configuração.</string>
-  <string name="description_configure_provider_circumvention">Bitmask está tentando coletar todos os dados de configuração necessários do provedor. Isso só acontece durante a primeira configuração. Você optou por usar tecnologia de evasão, então isso pode levar algum tempo.</string>
+  <string name="description_configure_provider">Para se conectar ao seu provedor, o %1$s está buscando todas as informações de configuração necessárias. Isso só acontece durante a primeira configuração.</string>
+  <string name="description_configure_provider_circumvention">%1$s está tentando coletar todos os dados de configuração necessários do provedor. Isso só acontece durante a primeira configuração. Você optou por usar tecnologia de evasão, então isso pode levar algum tempo.</string>
   <string name="details">Detalhes</string>
   <string name="tor_status">Estado do Tor</string>
   <string name="snowflake_status">Status do floco de neve</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f561fdca..43fe5b8a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -221,8 +221,8 @@ https://0xacab.org/leap/bitmask_android/issues</string>
   <string name="circumvention_setup_hint">%s автоматически попытается подключить вас к интернету, используя различные технологии обхода. Параметры можно изменить в настройках.</string>
   <string name="use_standard_vpn">Использовать стандарт %s</string>
   <string name="use_circumvention_tech">Использовать технологию обхода (медленнее)</string>
-  <string name="description_configure_provider">Для подключения к вашему провайдеру Bitmask получает всю необходимую информацию о конфигурации. Это происходит только при первичной настройке.</string>
-  <string name="description_configure_provider_circumvention">Bitmask получает все необходимые конфигурационные данные от провайдера. Это происходит только при первичной настройке. Вы выбрали использование технологии обхода, поэтому процесс может занять некоторое время.</string>
+  <string name="description_configure_provider">Для подключения к вашему провайдеру %1$s получает всю необходимую информацию о конфигурации. Это происходит только при первичной настройке.</string>
+  <string name="description_configure_provider_circumvention">%1$s получает все необходимые конфигурационные данные от провайдера. Это происходит только при первичной настройке. Вы выбрали использование технологии обхода, поэтому процесс может занять некоторое время.</string>
   <string name="details">Подробности</string>
   <string name="tor_status">Статус Tor</string>
   <string name="snowflake_status">Статус Snowflake</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2584fb77..d7918c34 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -218,8 +218,8 @@
   <string name="circumvention_setup_hint">%s otomatik olarak çeşitli engellemeyi aşma teknolojileri kullanarak sizi İnternet\'e ulaştırmaya çalışır. Gelişmiş ayarlar bölümünden ince ayarları yapabilirsiniz.</string>
   <string name="use_standard_vpn">Standart %s kullanılsın</string>
   <string name="use_circumvention_tech">Engellemeyi aşma teknolojisi kullanılsın (daha yavaş)</string>
-  <string name="description_configure_provider">Bitmask, hizmet sağlayıcınızla bağlantı kurmak için gerekli yapılandırma bilgilerini alıyor. Bu işlem yalnızca ilk kurulum sırasında yapılır.</string>
-  <string name="description_configure_provider_circumvention">Bitmask, hizmet sağlayıcıdan gerekli yapılandırma verilerini almaya çalışıyor. Bu işlem yalnızca ilk kurulum sırasında yapılır. Engellemeyi aşma teknolojisini kullanmayı seçtiniz, bu yüzden işlemin yapılması biraz zaman alabilir.</string>
+  <string name="description_configure_provider">%1$s, hizmet sağlayıcınızla bağlantı kurmak için gerekli yapılandırma bilgilerini alıyor. Bu işlem yalnızca ilk kurulum sırasında yapılır.</string>
+  <string name="description_configure_provider_circumvention">%1$s, hizmet sağlayıcıdan gerekli yapılandırma verilerini almaya çalışıyor. Bu işlem yalnızca ilk kurulum sırasında yapılır. Engellemeyi aşma teknolojisini kullanmayı seçtiniz, bu yüzden işlemin yapılması biraz zaman alabilir.</string>
   <string name="details">Ayrıntılar</string>
   <string name="tor_status">Tor durumu</string>
   <string name="snowflake_status">Snowflake durumu</string>
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh/arrays.xml
index 045e125f..045e125f 100644
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh/arrays.xml
diff --git a/app/src/main/res/values-zh-rCN/plurals-icsopenvpn.xml b/app/src/main/res/values-zh/plurals-icsopenvpn.xml
index 8aa121e6..8aa121e6 100755
--- a/app/src/main/res/values-zh-rCN/plurals-icsopenvpn.xml
+++ b/app/src/main/res/values-zh/plurals-icsopenvpn.xml
diff --git a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml b/app/src/main/res/values-zh/strings-icsopenvpn.xml
index f7b2fa8d..f7b2fa8d 100755
--- a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh/strings-icsopenvpn.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh/strings.xml
index c88a7ada..c88a7ada 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bddd094..edbe56bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -218,8 +218,8 @@
     <string name="circumvention_setup_hint">%s will automatically try to connect you to the internet using a variety of circumvention technologies. You can fine tune this in the advanced settings.</string>
     <string name="use_standard_vpn">Use standard %s</string>
     <string name="use_circumvention_tech">Use circumvention tech (slower)</string>
-    <string name="description_configure_provider">To connect to your provider Bitmask is fetching all the required configuration information. This only happens during first setup.</string>
-    <string name="description_configure_provider_circumvention">Bitmask is attempting to collect all required configuration data from the provider. This only happens during first setup. You selected to use circumvention technology, so this might take some time.</string>
+    <string name="description_configure_provider">To connect to your provider %1$s is fetching all the required configuration information. This only happens during first setup.</string>
+    <string name="description_configure_provider_circumvention">%1$s is attempting to collect all required configuration data from the provider. This only happens during first setup. You selected to use circumvention technology, so this might take some time.</string>
     <string name="percentage" translatable="false">%d%</string>
     <string name="details">Details</string>
     <string name="tor_status">Tor Status</string>