Merge branch 'fix_duplicated_strings' into 'master'

Fix duplicated strings

See merge request leap/bitmask_android!174

28 files changed, 0 insertions, 200 deletions

diff --git a/app/build.gradle b/app/build.gradle
index c8dbafe8..cfd37d04 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -489,157 +489,9 @@ subprojects {
   }
 }
 
-def processFileInplace(file, Closure processText) {
-  def text = file.text
-  file.write(processText(text))
-}
-
-task copyIcsOpenVPNClasses(dependsOn: 'copyIcsOpenVPNFiles', type: Copy  ) {
-  println "copyIcsOpenVPNClasses"
-//  from ('../ics-openvpn/main/') {
-//    include '**/LaunchVPN.java'
-//    include '**/OpenVPNSservice.java'
-//    include '**/VpnProfile.java'
-//    include '**/DisconnectVPN.java'
-//    include '**/VpnProfile.java'
-//    include '**/SeekBarTicks.java'
-//    include '**/core/**.java'
-//    include '**/activities/BaseActivity.java'
-//    include '**/APIVpnProfile.java'
-//    include '**/aidl/**/api/**.aidl'
-//    include '**/aidl/**/core/**.aidl'
-//
-//    includeEmptyDirs = false
-//
-//    filter {
-//      line -> line.replaceAll('de.blinkt.openvpn.R', 'se.leap.bitmaskclient.R')
-//    }
-//    filter {
-//      line -> line.replaceAll('de.blinkt.openvpn.BuildConfig', 'se.leap.bitmaskclient.BuildConfig')
-//    }
-//    filter {
-//      line -> line.replace('package de.blinkt.openvpn;', 'package de.blinkt.openvpn;\n\nimport se.leap.bitmaskclient.R;')
-//    }
-//  } into '.'
-}
-
-task copyIcsOpenVPNXml(dependsOn: 'copyIcsOpenVPNFiles', type: Copy )  {
-  println "copyIcsOpenVPNXml"
-  from ('../ics-openvpn/main/') {
-    include '**/strings.xml'
-    include '**/refs.xml'
-    include '**/white_rect.xml'
-    include '**/plurals.xml'
-    includeEmptyDirs = false
-
-    rename 'strings.xml', 'strings-icsopenvpn.xml'
-    rename 'plurals.xml', 'plurals-icsopenvpn.xml'
-    filter {
-      line -> line.replaceAll('.*name="app".*', '')
-    }
-  } into '.'
-}
-
-task copyIcsOpenVPNImages(dependsOn: 'copyIcsOpenVPNFiles', type: Copy ) {
-  println "copyIcsOpenVPNImages"
-//  from ('../ics-openvpn/main/') {
-//    include '**/ic_filter*.png'
-//    include '**/ic_delete*.png'
-//    include '**/ic_share*.png'
-//    include '**/ic_close*.png'
-//    include '**/ic_edit*.png'
-//    include '**/ic_check*.png'
-//    include '**/ic_pause*.png'
-//    include '**/ic_play*.png'
-//    include '**/ic_content_copy_white_*.png'
-//    include '**/ic_add_circle_outline_white_*.png'
-//    include '**/ic_warning_black_*.png'
-//    include '**/ic_add_circle_outline_grey600_*.png'
-//    include '**/ic_archive_grey600_*.png'
-//    include '**/ic_receipt_white_*.png'
-//    include '**/ic_sort_white_*.png'
-//    include '**/ic_content_copy_white_*.png'
-//    include '**/ic_archive_white_*.png'
-//    include '**/ic_menu_archive*.png'
-//    include '**/vpn_item_settings*.png'
-//    include '**/ic_menu_log*.png'
-//    include '**/ic_menu_copy_holo_light*.png'
-//
-//    includeEmptyDirs = false
-//  } into '.'
-}
-
-// thanks to http://pleac.sourceforge.net/pleac_groovy/fileaccess.html
-def removeDuplicatedStrings() {
-  println "removeDuplicatedStrings"
-  new File('.').eachFileRecurse {
-    if(it.name.equals('strings.xml') || it.name.equals('plurals.xml')) {
-      replaceDuplicatesForSource(it, it.name.substring(0, it.name.lastIndexOf('.')))
-    }
-  }
-}
-
-def replaceDuplicatesForSource(File it, String type) {
-  def ics_openvpn_file = file(it.absolutePath.replace(type+'.xml', type+'-icsopenvpn.xml'))
-  if(ics_openvpn_file.exists()) {
-    def ics_openvpn_strings_names = new XmlParser().parse(ics_openvpn_file)
-    def current_file = it
-
-    ics_openvpn_strings_names.string.each {
-      processFileInplace(current_file) { text ->
-        text.replaceAll('.*name=\"' + it.attribute('name') + '\".*(\n)*.*string>.*\n+', '')
-      }
-    }
-  }
-}
-
-task mergeUntranslatable(dependsOn: 'copyIcsOpenVPNFiles',  type: Copy ) {
-  println "mergeUntranslatable"
-  from ('../ics-openvpn/main/') {
-    include '**/untranslatable.xml'
-    rename 'untranslatable.xml', 'untranslatable-icsopenvpn.xml'
-  } into '.'
-  def bitmask_untranslatable = file('src/main/res/values/untranslatable.xml')
-  def ics_openvpn_untranslatable = new File(bitmask_untranslatable.path.replace('untranslatable.xml', 'untranslatable-icsopenvpn.xml'))
-  ics_openvpn_untranslatable.createNewFile()
-  def string_continuation = false;
-  ics_openvpn_untranslatable.eachLine { text ->
-    if(text.contains('string name=')) {
-      if(!bitmask_untranslatable.text.contains(text))
-        bitmask_untranslatable << text
-      if(text.contains('</string>'))
-        string_continuation = true
-    }
-    else if(string_continuation) {
-      bitmask_untranslatable << text
-    }
-
-    if(text.contains('</string>')) {
-      string_continuation = false
-      bitmask_untranslatable << System.getProperty("line.separator")
-    }
-  }
-
-  bitmask_untranslatable.write(bitmask_untranslatable.text.replaceAll("</resources>", ""))
-  bitmask_untranslatable << "</resources>"
-
-  delete ics_openvpn_untranslatable
-}
-
-task copyIcsOpenVPNFiles(dependsOn: 'updateIcsOpenVpn') {
-  println "copyIcsOpenVPNFiles"
-
-  copyIcsOpenVPNClasses
-  copyIcsOpenVPNXml
-  copyIcsOpenVPNImages
-  //mergeUntranslatable.execute()
-  removeDuplicatedStrings()
-}
-
 task updateIcsOpenVpn( type: Exec ) {
   commandLine 'git', 'submodule', 'sync'
   commandLine 'git', 'submodule', 'update', '--init', '--recursive'
-
 }
 
 def getTag() {
@@ -647,7 +499,6 @@ def getTag() {
   return ("git describe --tags --exact-match "+ commit).execute().text.trim()
 }
 
-
 task cleanNative( type: Delete ) {
   def shouldClean = getCurrentFlavorForBetaOrRelease() == "production"
   println  "cleanNative: " + shouldClean
diff --git a/app/src/main/res/values-be/strings-icsopenvpn.xml b/app/src/main/res/values-be/strings-icsopenvpn.xml
index 45ec6c69..11eb6c76 100755
--- a/app/src/main/res/values-be/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-be/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Уключыць карыстацкія параметры</string>
   <string name="custom_config_summary">Карыстацкія параметры. Скарыстайце з асцярожнасцю!</string>
   <string name="route_rejected">Маршрут адхілены Android</string>
-  <string name="cancel_connection">Адключыць</string>
   <string name="cancel_connection_long">Адключыць VPN</string>
   <string name="clear_log">ачысціць журнал</string>
   <string name="title_cancel">Пацверджанне скасавання</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Вы павінны вызначыць і ўключыць прынамсі адзін выдалены сервер.</string>
   <string name="server_list">Спіс сервераў</string>
   <string name="vpn_allowed_apps">Дазволеныя дадаткі</string>
-  <string name="advanced_settings">Пашыраныя налады</string>
   <string name="payload_options">Налады карыснай нагрузкі</string>
   <string name="tls_settings">Налады TLS</string>
   <string name="no_remote_defined">Няма зададзенай падаленкі</string>
diff --git a/app/src/main/res/values-ca/strings-icsopenvpn.xml b/app/src/main/res/values-ca/strings-icsopenvpn.xml
index 1bf7c91a..2c30157d 100755
--- a/app/src/main/res/values-ca/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ca/strings-icsopenvpn.xml
@@ -40,7 +40,6 @@
   <string name="shortcut_profile_notfound">No s\'ha trobat el perfil especificat a l\'accès directe</string>
   <string name="random_host_prefix">Prefix aleatoria del host</string>
   <string name="route_rejected">La ruta ha estat refusas per Android</string>
-  <string name="cancel_connection">Desconecta</string>
   <string name="clear_log">Neteja el registre</string>
   <string name="title_cancel">Cancela la confirmació</string>
   <string name="cancel_connection_query">Desconcta la conexió VPN/cancela l\'intent de conexió?</string>
diff --git a/app/src/main/res/values-cs/strings-icsopenvpn.xml b/app/src/main/res/values-cs/strings-icsopenvpn.xml
index dc33007c..552bdd7b 100755
--- a/app/src/main/res/values-cs/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-cs/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Povolit vlastní nastavení</string>
   <string name="custom_config_summary">Zadat vlastní nastavení. Používat opatrně!</string>
   <string name="route_rejected">Směrování odmítnuto Androidem</string>
-  <string name="cancel_connection">Odpojit</string>
   <string name="cancel_connection_long">Odpojit VPN</string>
   <string name="clear_log">vymazat log</string>
   <string name="title_cancel">Zrušit potvrzení</string>
@@ -342,7 +341,6 @@
   <string name="remote_no_server_selected">Je potřeba definovat a povolit alespoň jeden vzdálený server.</string>
   <string name="server_list">Seznam serverů</string>
   <string name="vpn_allowed_apps">Povolené aplikace</string>
-  <string name="advanced_settings">Pokročilé nastavení</string>
   <string name="payload_options">Možnosti dat</string>
   <string name="tls_settings">Nastevení TLS</string>
   <string name="no_remote_defined">Nedefinovaná protistrana</string>
diff --git a/app/src/main/res/values-da/strings-icsopenvpn.xml b/app/src/main/res/values-da/strings-icsopenvpn.xml
index e1012c0a..1b750dd9 100755
--- a/app/src/main/res/values-da/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-da/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Aktiver brugerdefinerede indstillinger</string>
   <string name="custom_config_summary">Angiv brugerdefinerede indstillinger. Brug med omtanke!</string>
   <string name="route_rejected">Rute afvist af Android</string>
-  <string name="cancel_connection">Afbryd</string>
   <string name="cancel_connection_long">Afbryd VPN</string>
   <string name="clear_log">ryd log</string>
   <string name="title_cancel">Annuller bekræftelse</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Mindst én fjernserver skal definere og aktiveres.</string>
   <string name="server_list">Serverliste</string>
   <string name="vpn_allowed_apps">Tilladte apps</string>
-  <string name="advanced_settings">Avancerede Indstillinger</string>
   <string name="payload_options">Dataindholdsmuligheder</string>
   <string name="tls_settings">TLS-indstillinger</string>
   <string name="no_remote_defined">Ingen fjernserver defineret</string>
diff --git a/app/src/main/res/values-de/strings-icsopenvpn.xml b/app/src/main/res/values-de/strings-icsopenvpn.xml
index 245a3e40..230ce4c2 100755
--- a/app/src/main/res/values-de/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-de/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Eigene Konfigurationsoptionen</string>
   <string name="custom_config_summary">Hier können Sie eigene Konfigurationsoptionen angeben. Seien Sie vorsichtig!</string>
   <string name="route_rejected">Route von Android zurückgewiesen</string>
-  <string name="cancel_connection">Trennen</string>
   <string name="cancel_connection_long">VPN-Verbindung trennen</string>
   <string name="clear_log">Protokoll löschen</string>
   <string name="title_cancel">Trennen bestätigen</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Sie müssen mindestens einen Server definieren und aktivieren.</string>
   <string name="server_list">Serverliste</string>
   <string name="vpn_allowed_apps">Zugelassene Apps</string>
-  <string name="advanced_settings">Erweiterte Einstellungen</string>
   <string name="payload_options">Nutzlast-Optionen</string>
   <string name="tls_settings">TLS-Einstellungen</string>
   <string name="no_remote_defined">Keine Server definiert</string>
diff --git a/app/src/main/res/values-es/strings-icsopenvpn.xml b/app/src/main/res/values-es/strings-icsopenvpn.xml
index 3f0ab495..4f3fd5c0 100755
--- a/app/src/main/res/values-es/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-es/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Habilitar opciones personalizadas</string>
   <string name="custom_config_summary">Especificar opciones personalizadas. ¡Use con cuidado!</string>
   <string name="route_rejected">Ruta rechazada por Android</string>
-  <string name="cancel_connection">Desconectar</string>
   <string name="cancel_connection_long">Desconectar VPN</string>
   <string name="clear_log">Limpiar registro</string>
   <string name="title_cancel">Cancelar confirmación</string>
@@ -344,7 +343,6 @@ hacia/de Móvil)</string>
   <string name="remote_no_server_selected">Es necesario definir y habilitar al menos un servidor remoto.</string>
   <string name="server_list">Lista de servidores</string>
   <string name="vpn_allowed_apps">Aplicaciones permitidas</string>
-  <string name="advanced_settings">Opciones Avanzadas</string>
   <string name="payload_options">Opciones de carga útil</string>
   <string name="tls_settings">Configuración TLS</string>
   <string name="no_remote_defined">Servidor remoto no definido</string>
diff --git a/app/src/main/res/values-et/strings-icsopenvpn.xml b/app/src/main/res/values-et/strings-icsopenvpn.xml
index 266b38fc..2963871c 100755
--- a/app/src/main/res/values-et/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-et/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Luba kohandatud valikud</string>
   <string name="custom_config_summary">Määrake kohandatud valikud. Kasutage ettevaatlikult!</string>
   <string name="route_rejected">Androidi poolt keelatud ruutingud</string>
-  <string name="cancel_connection">Katkesta ühendus</string>
   <string name="cancel_connection_long">Katkesta VPN</string>
   <string name="clear_log">Tühjenda logi</string>
   <string name="title_cancel">Loobu kinnitusest</string>
@@ -341,7 +340,6 @@
   <string name="remote_no_server_selected">Peate määrama vähemalt ühe kaugserveri.</string>
   <string name="server_list">Serverite Nimistu</string>
   <string name="vpn_allowed_apps">Lubatud Programmid</string>
-  <string name="advanced_settings">Täpsemad seaded</string>
   <string name="payload_options">Nimikoormuse valikud</string>
   <string name="tls_settings">TLS Seaded</string>
   <string name="no_remote_defined">Kaugserverid määramata</string>
diff --git a/app/src/main/res/values-fr/strings-icsopenvpn.xml b/app/src/main/res/values-fr/strings-icsopenvpn.xml
index 7b37e6fd..f306da36 100755
--- a/app/src/main/res/values-fr/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-fr/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">"Activer les options personnalisées"</string>
   <string name="custom_config_summary">"Spécifiez les options personnalisées. A utiliser avec précaution !"</string>
   <string name="route_rejected">"Route rejetée par Android"</string>
-  <string name="cancel_connection">Déconnecter</string>
   <string name="cancel_connection_long">Déconnecter le VPN</string>
   <string name="clear_log">effacer le journal</string>
   <string name="title_cancel">"Annuler la confirmation"</string>
@@ -344,7 +343,6 @@ Sur certaines images, cette notification joue un son.\nAndroid à introduit ces
   <string name="remote_no_server_selected">Vous devez définir et activer au moins un serveur distant.</string>
   <string name="server_list">Liste des serveurs</string>
   <string name="vpn_allowed_apps">Applications autorisées</string>
-  <string name="advanced_settings">Paramètres avancés</string>
   <string name="payload_options">Options Payload</string>
   <string name="tls_settings">Paramètres TLS</string>
   <string name="no_remote_defined">Aucun serveur distant défini</string>
diff --git a/app/src/main/res/values-hu/strings-icsopenvpn.xml b/app/src/main/res/values-hu/strings-icsopenvpn.xml
index dec919b5..62a7079d 100755
--- a/app/src/main/res/values-hu/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-hu/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Egyéni Beállítások engedélyezése</string>
   <string name="custom_config_summary">Egyéni beállítások megadása. Óvatosan használja!</string>
   <string name="route_rejected">Az Android elutasította az útvonalat</string>
-  <string name="cancel_connection">Szétkapcsolás</string>
   <string name="cancel_connection_long">VPN kapcsolat szétkapcsolása</string>
   <string name="clear_log">napló törlése</string>
   <string name="title_cancel">Megszakítás jóváhagyása</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Legalább egy távoli kiszolgálót definiálnia és engedélyeznie kell.</string>
   <string name="server_list">Kiszolgáló lista</string>
   <string name="vpn_allowed_apps">Engedélyezett Alkalmazások</string>
-  <string name="advanced_settings">Haladó Beállítások</string>
   <string name="payload_options">Payload opciók</string>
   <string name="tls_settings">TLS Beállítások</string>
   <string name="no_remote_defined">Nincs kiszolgáló definiálva</string>
diff --git a/app/src/main/res/values-id/strings-icsopenvpn.xml b/app/src/main/res/values-id/strings-icsopenvpn.xml
index 4068af06..040c4627 100755
--- a/app/src/main/res/values-id/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-id/strings-icsopenvpn.xml
@@ -54,7 +54,6 @@
   <string name="custom_config_title">Aktifkan pilihan buatan</string>
   <string name="custom_config_summary">Tentukan seting buatan. Gunakan hati-hati</string>
   <string name="route_rejected">Rute ditolak Android</string>
-  <string name="cancel_connection">Putus</string>
   <string name="cancel_connection_long">Memutuskan sambungan VPN</string>
   <string name="clear_log">Bersihkan catatan</string>
   <string name="title_cancel">Batal Konfirmasi</string>
diff --git a/app/src/main/res/values-in/strings-icsopenvpn.xml b/app/src/main/res/values-in/strings-icsopenvpn.xml
index 823e9d5f..e7a044ac 100755
--- a/app/src/main/res/values-in/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-in/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Aktifkan pilihan buatan (Custom)</string>
   <string name="custom_config_summary">Tentukan seting buatan (Custom). Gunakan hati-hati!</string>
   <string name="route_rejected">Rute ditolak oleh Android</string>
-  <string name="cancel_connection">Koneksi Putus</string>
   <string name="cancel_connection_long">Memutuskan sambungan VPN</string>
   <string name="clear_log">Bersihkan catatan</string>
   <string name="title_cancel">Membatalkan Konfirmasi</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Anda harus menentukan dan memungkinkan setidaknya satu server jauh.</string>
   <string name="server_list">Daftar Server</string>
   <string name="vpn_allowed_apps">Diizinkan Apps</string>
-  <string name="advanced_settings">Pengaturan lanjutan</string>
   <string name="payload_options">Muatan pilihan</string>
   <string name="tls_settings">Pengaturan TLS</string>
   <string name="no_remote_defined">Didefinisikan Tidak ada remote</string>
diff --git a/app/src/main/res/values-it/strings-icsopenvpn.xml b/app/src/main/res/values-it/strings-icsopenvpn.xml
index d6f378b7..8fa64acc 100755
--- a/app/src/main/res/values-it/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-it/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Abilita opzioni personalizzate</string>
   <string name="custom_config_summary">Specifica opzioni personalizzate. Utilizzare con cautela!</string>
   <string name="route_rejected">Reindirizzamento (route) rifiutato da Android</string>
-  <string name="cancel_connection">Disconnetti</string>
   <string name="cancel_connection_long">Disconnettere VPN</string>
   <string name="clear_log">Cancella registro</string>
   <string name="title_cancel">Conferma l\'annullamento</string>
@@ -345,7 +344,6 @@ Effettuata la lettura del file di configurazione</string>
   <string name="remote_no_server_selected">È necessario definire e abilitare almeno un server remoto.</string>
   <string name="server_list">Lista Server</string>
   <string name="vpn_allowed_apps">Applicazioni consentite</string>
-  <string name="advanced_settings">Impostazioni Avanzate</string>
   <string name="payload_options">Opzioni Payload</string>
   <string name="tls_settings">Impostazioni TLS</string>
   <string name="no_remote_defined">Nessuna destinazione definita</string>
diff --git a/app/src/main/res/values-ja/strings-icsopenvpn.xml b/app/src/main/res/values-ja/strings-icsopenvpn.xml
index 4f0a6359..1159291a 100755
--- a/app/src/main/res/values-ja/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ja/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">カスタム オプションを使用する</string>
   <string name="custom_config_summary">カスタムオプションを指定します。注意して使用してください!</string>
   <string name="route_rejected">経路がAndroidにより拒否されました。</string>
-  <string name="cancel_connection">VPNを切断</string>
   <string name="cancel_connection_long">VPN接続を切断</string>
   <string name="clear_log">ログをクリア</string>
   <string name="title_cancel">切断の確認</string>
@@ -382,7 +381,6 @@ Android 4.4以上はポリシールーティングを使用します。route/ifc
   <string name="remote_no_server_selected">少なくとも一つ以上の接続先を設定し有効化する必要があります</string>
   <string name="server_list">接続先リスト</string>
   <string name="vpn_allowed_apps">許可されたアプリ</string>
-  <string name="advanced_settings">詳細設定</string>
   <string name="payload_options">ペイロードオプション</string>
   <string name="tls_settings">TLSの設定</string>
   <string name="no_remote_defined">接続先が設定されていません</string>
diff --git a/app/src/main/res/values-ko/strings-icsopenvpn.xml b/app/src/main/res/values-ko/strings-icsopenvpn.xml
index 02c8c364..4292f0de 100755
--- a/app/src/main/res/values-ko/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ko/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">사용자 지정 옵션 사용</string>
   <string name="custom_config_summary">사용자 지정 옵션을 지정하세요. 주의해서 사용!</string>
   <string name="route_rejected">안드로이드에 의해 거부된 경로</string>
-  <string name="cancel_connection">연결 끊기</string>
   <string name="cancel_connection_long">VPN 연결 끊기</string>
   <string name="clear_log">로그 지우기</string>
   <string name="title_cancel">취소 확인</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">하나 이상의 원격 서버를 정의하고 활성화해야 합니다.</string>
   <string name="server_list">서버 목록</string>
   <string name="vpn_allowed_apps">허용된 앱</string>
-  <string name="advanced_settings">고급 설정</string>
   <string name="payload_options">페이로드 옵션</string>
   <string name="tls_settings">TLS 설정</string>
   <string name="no_remote_defined">정의된 원격 서버 없음</string>
diff --git a/app/src/main/res/values-nl/strings-icsopenvpn.xml b/app/src/main/res/values-nl/strings-icsopenvpn.xml
index e7a2b5a1..9eb6964c 100755
--- a/app/src/main/res/values-nl/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-nl/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Aangepaste opties inschakelen</string>
   <string name="custom_config_summary">Geef aangepaste opties op. Wees voorzichtig!</string>
   <string name="route_rejected">Route geweigerd door Android</string>
-  <string name="cancel_connection">Verbinding verbreken</string>
   <string name="cancel_connection_long">VPN verbinding verbreken</string>
   <string name="clear_log">logboek wissen</string>
   <string name="title_cancel">Annuleer bevestiging</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">U moet tenminste één externe server definiëren en inschakelen.</string>
   <string name="server_list">Serverlijst</string>
   <string name="vpn_allowed_apps">Toegestane apps</string>
-  <string name="advanced_settings">Geavanceerde instellingen</string>
   <string name="payload_options">Payload opties</string>
   <string name="tls_settings">TLS-instellingen</string>
   <string name="no_remote_defined">Geen externe verbinding gedefinieerd</string>
diff --git a/app/src/main/res/values-no/strings-icsopenvpn.xml b/app/src/main/res/values-no/strings-icsopenvpn.xml
index 68638149..926c1ff0 100755
--- a/app/src/main/res/values-no/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-no/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Aktiver egendefinerte valg</string>
   <string name="custom_config_summary">Angi egendefinerte alternativer. Brukes med forsiktighet!</string>
   <string name="route_rejected">Route avvist av Android</string>
-  <string name="cancel_connection">Koble fra</string>
   <string name="cancel_connection_long">Koble fra VPN</string>
   <string name="clear_log">Tøm logg</string>
   <string name="title_cancel">Avbryt bekreftelse</string>
diff --git a/app/src/main/res/values-pl/strings-icsopenvpn.xml b/app/src/main/res/values-pl/strings-icsopenvpn.xml
index 07017e6a..ad6592fe 100755
--- a/app/src/main/res/values-pl/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-pl/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Włącz opcje niestandardowe</string>
   <string name="custom_config_summary">Określ niestandardowe opcje. Ostrożnie!</string>
   <string name="route_rejected">Trasa odrzucona przez Androida</string>
-  <string name="cancel_connection">Rozłącz</string>
   <string name="cancel_connection_long">Rozłącz VPN</string>
   <string name="clear_log">Wyczyść log</string>
   <string name="title_cancel">Anuluj potwierdzenie</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Musisz zdefiniować i włączyć co najmniej jeden serwer.</string>
   <string name="server_list">Lista serwerów</string>
   <string name="vpn_allowed_apps">Dozwolone aplikacje</string>
-  <string name="advanced_settings">Opcje zaawansowane</string>
   <string name="payload_options">Opcje ładunku</string>
   <string name="tls_settings">Ustawienia TLS</string>
   <string name="no_remote_defined">Nie ustawiono zdalnego</string>
diff --git a/app/src/main/res/values-pt/strings-icsopenvpn.xml b/app/src/main/res/values-pt/strings-icsopenvpn.xml
index 7f1407f9..7c67a17b 100755
--- a/app/src/main/res/values-pt/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-pt/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Ativar opções personalizadas</string>
   <string name="custom_config_summary">Especifique as opções personalizadas. Use com cuidado!</string>
   <string name="route_rejected">Rota rejeitada pelo Android</string>
-  <string name="cancel_connection">Desconectar</string>
   <string name="cancel_connection_long">Desconectar VPN</string>
   <string name="clear_log">Limpar registo</string>
   <string name="title_cancel">Cancelar Confirmação</string>
@@ -292,7 +291,6 @@
   <string name="delete">Eliminar</string>
   <string name="server_list">Lista servidores</string>
   <string name="vpn_allowed_apps">Aplicações permitidas</string>
-  <string name="advanced_settings">Definições avançadas</string>
   <string name="tls_settings">Definições TLS</string>
   <string name="duplicate_vpn">Perfil VPN duplicado</string>
   <string name="show_log">Mostrar registo</string>
diff --git a/app/src/main/res/values-ro/strings-icsopenvpn.xml b/app/src/main/res/values-ro/strings-icsopenvpn.xml
index a784a190..b716254d 100755
--- a/app/src/main/res/values-ro/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ro/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Activează opţiunile particularizate</string>
   <string name="custom_config_summary">Specificaţi opţiunile particularizate. Folosiţi cu grijă!</string>
   <string name="route_rejected">Rută respinsă de Android</string>
-  <string name="cancel_connection">Deconectaţi</string>
   <string name="cancel_connection_long">Deconectați VPN</string>
   <string name="clear_log">Golire jurnal</string>
   <string name="title_cancel">Anulare confirmare</string>
@@ -342,7 +341,6 @@
   <string name="remote_no_server_selected">Trebuie să definiți și să activați cel puțin un server de la distanță.</string>
   <string name="server_list">Listă de Servere</string>
   <string name="vpn_allowed_apps">Aplicații Permise</string>
-  <string name="advanced_settings">Setări Avansate</string>
   <string name="payload_options">Opțiuni de încărcare</string>
   <string name="tls_settings">Setări TLS</string>
   <string name="no_remote_defined">Nici o sursă la distanţă definită</string>
diff --git a/app/src/main/res/values-ru/strings-icsopenvpn.xml b/app/src/main/res/values-ru/strings-icsopenvpn.xml
index 9dda5191..bf8b151f 100755
--- a/app/src/main/res/values-ru/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-ru/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Включить пользовательские параметры</string>
   <string name="custom_config_summary">Пользовательские параметры. Используйте с осторожностью!</string>
   <string name="route_rejected">Маршрут отклонен Android</string>
-  <string name="cancel_connection">Отключить</string>
   <string name="cancel_connection_long">Отключить VPN</string>
   <string name="clear_log">очистить журнал</string>
   <string name="title_cancel">Подтверждение отмены</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Вы должны определить и включить как минимум один удаленный сервер.</string>
   <string name="server_list">Список серверов</string>
   <string name="vpn_allowed_apps">Разрешённые приложения</string>
-  <string name="advanced_settings">Расширенные настройки</string>
   <string name="payload_options">Настройки полезной нагрузки</string>
   <string name="tls_settings">Настройки TLS</string>
   <string name="no_remote_defined">Нет заданной удаленки</string>
diff --git a/app/src/main/res/values-sl/strings-icsopenvpn.xml b/app/src/main/res/values-sl/strings-icsopenvpn.xml
index d7ce31b9..52327134 100755
--- a/app/src/main/res/values-sl/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-sl/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Omogoči možnosti po meri</string>
   <string name="custom_config_summary">Določite možnosti po meri. Uporabljajte previdno!</string>
   <string name="route_rejected">Android je pot zavrnil</string>
-  <string name="cancel_connection">Prekini</string>
   <string name="cancel_connection_long">Prekini VPN</string>
   <string name="clear_log">Počisti dnevnik</string>
   <string name="title_cancel">Prekliči potrditev</string>
@@ -340,7 +339,6 @@
   <string name="remote_no_server_selected">Določiti in omogočiti morate vsaj en oddaljeni strežnik.</string>
   <string name="server_list">Seznam strežnikov</string>
   <string name="vpn_allowed_apps">Programi z dovoljenjem</string>
-  <string name="advanced_settings">Napredne nastavitve</string>
   <string name="payload_options">Možnosti vsebine</string>
   <string name="tls_settings">Nastavitve TLS</string>
   <string name="no_remote_defined">Noben oddaljeni strežnik ni določen</string>
diff --git a/app/src/main/res/values-sv/strings-icsopenvpn.xml b/app/src/main/res/values-sv/strings-icsopenvpn.xml
index 217de2aa..7af04354 100755
--- a/app/src/main/res/values-sv/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-sv/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Aktivera anpassade alternativ</string>
   <string name="custom_config_summary">Ange anpassade inställningar. Använd med försiktighet!</string>
   <string name="route_rejected">Rutten avvisades av Android</string>
-  <string name="cancel_connection">Koppla från</string>
   <string name="cancel_connection_long">Koppla från VPN</string>
   <string name="clear_log">rensa loggen</string>
   <string name="title_cancel">Avbryt bekräftelse</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Du måste definiera och aktivera åtminstone en fjärrserver.</string>
   <string name="server_list">Serverlista</string>
   <string name="vpn_allowed_apps">Tillåtna appar</string>
-  <string name="advanced_settings">Avancerade inställningar</string>
   <string name="payload_options">Alternativ för paketinnehåll</string>
   <string name="tls_settings">TLS-inställningar</string>
   <string name="no_remote_defined">Ingen server specifierad</string>
diff --git a/app/src/main/res/values-tr/strings-icsopenvpn.xml b/app/src/main/res/values-tr/strings-icsopenvpn.xml
index 8b2fad33..a6f57d24 100755
--- a/app/src/main/res/values-tr/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-tr/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Özel Seçenekleri Etkinleştir</string>
   <string name="custom_config_summary">Özel seçenekleri belirleyin. Dikkatli kullanın!</string>
   <string name="route_rejected">Yol Android tarafından reddedildi</string>
-  <string name="cancel_connection">Bağlantıyı Kes</string>
   <string name="cancel_connection_long">VPN Bağlantısını Kes</string>
   <string name="clear_log">kayıtları temizle</string>
   <string name="title_cancel">İptal Onayı</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">En az bir uzak sunucu tanımlamalı ve etkinleştirmelisiniz.</string>
   <string name="server_list">Sunucu Listesi</string>
   <string name="vpn_allowed_apps">İzin Verilen Uygulamalar</string>
-  <string name="advanced_settings">Gelişmiş Ayarlar</string>
   <string name="payload_options">Yük seçenekleri</string>
   <string name="tls_settings">TLS Ayarları</string>
   <string name="no_remote_defined">Tanımlanmış uzak makine yok</string>
diff --git a/app/src/main/res/values-uk/strings-icsopenvpn.xml b/app/src/main/res/values-uk/strings-icsopenvpn.xml
index 547ba025..086a7234 100755
--- a/app/src/main/res/values-uk/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-uk/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Увімкнути налаштовувані параметри</string>
   <string name="custom_config_summary">Укажіть налаштовувані параметри. Використовуйте з обережністю!</string>
   <string name="route_rejected">Маршрут відхилено Андроїдом</string>
-  <string name="cancel_connection">Від\'єднати</string>
   <string name="cancel_connection_long">Відключити VPN</string>
   <string name="clear_log">очистити журнал</string>
   <string name="title_cancel">Підтвердження скасування</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Вам потрібно вказати і включити принаймні один сервер.</string>
   <string name="server_list">Список серверів</string>
   <string name="vpn_allowed_apps">Дозволенi програми</string>
-  <string name="advanced_settings">Додаткові налаштування</string>
   <string name="payload_options">Варіанти Payload</string>
   <string name="tls_settings">Налаштування TLS</string>
   <string name="no_remote_defined">Не визначен сервер</string>
diff --git a/app/src/main/res/values-vi/strings-icsopenvpn.xml b/app/src/main/res/values-vi/strings-icsopenvpn.xml
index 75519b56..f9643c90 100755
--- a/app/src/main/res/values-vi/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-vi/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">Kích hoạt tùy chỉnh</string>
   <string name="custom_config_summary">Chỉ định các tùy chỉnh. Dùng cẩn thận!</string>
   <string name="route_rejected">Định tuyến bị từ chối bởi Android</string>
-  <string name="cancel_connection">Ngắt kết nối</string>
   <string name="cancel_connection_long">Ngắt kết nối VPN</string>
   <string name="clear_log">xóa Nhật ký</string>
   <string name="title_cancel">Xác nhận hủy bỏ</string>
@@ -343,7 +342,6 @@
   <string name="remote_no_server_selected">Bạn cần phải xác định và cho phép ít nhất một máy chủ từ xa.</string>
   <string name="server_list">Danh sách máy chủ</string>
   <string name="vpn_allowed_apps">Cho phép ứng dụng</string>
-  <string name="advanced_settings">Cài đặt nâng cao</string>
   <string name="payload_options">Tùy chọn Payload</string>
   <string name="tls_settings">Cài đặt TLS</string>
   <string name="no_remote_defined">Không xác định điều khiển từ xa</string>
diff --git a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml b/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
index 4d6cc300..f7b2fa8d 100755
--- a/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh-rCN/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">启用自定义选项</string>
   <string name="custom_config_summary">（此处）指定自定义选项。请谨慎使用！</string>
   <string name="route_rejected">路由被安卓系统拒绝</string>
-  <string name="cancel_connection">断开</string>
   <string name="cancel_connection_long">断开VPN</string>
   <string name="clear_log">清除日志</string>
   <string name="title_cancel">确认取消?</string>
@@ -345,7 +344,6 @@
   <string name="remote_no_server_selected">您需要至少定义并启用一个远程服务器。</string>
   <string name="server_list">服务器列表</string>
   <string name="vpn_allowed_apps">允许的应用程序</string>
-  <string name="advanced_settings">高级选项</string>
   <string name="payload_options">负载设置</string>
   <string name="tls_settings">TLS 设置</string>
   <string name="no_remote_defined">未定义任何远程服务器</string>
diff --git a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
index a754440e..af5a6d3b 100755
--- a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
@@ -58,7 +58,6 @@
   <string name="custom_config_title">啟用自訂選項</string>
   <string name="custom_config_summary">指定自訂選項，請小心使用！</string>
   <string name="route_rejected">路由被 Android 拒絕</string>
-  <string name="cancel_connection">中斷連線</string>
   <string name="cancel_connection_long">中斷 VPN 連線</string>
   <string name="clear_log">清除記錄</string>
   <string name="title_cancel">確認取消</string>
@@ -342,7 +341,6 @@
   <string name="remote_no_server_selected">您需要定義和啟用至少一個遠端伺服器。</string>
   <string name="server_list">伺服器列表</string>
   <string name="vpn_allowed_apps">允許的應用程式</string>
-  <string name="advanced_settings">進階設定</string>
   <string name="payload_options">資料 (payload) 選項</string>
   <string name="tls_settings">TLS 設定</string>
   <string name="no_remote_defined">遠端沒有定義</string>