Merge branch 'bug/translation_Bitmask_instead_of_Leap_Android' into develop

19 files changed, 21 insertions, 38 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5131250a..0840c365 100755
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP per Android</string>
   <string name="address">Adreá del servidor:</string>
   <string name="port">Port del servidor:</string>
   <string name="location">Lloc</string>
@@ -15,7 +14,7 @@
   <string name="client_pkcs12_title">Fitxer PKCS12</string>
   <string name="ca_title">Certificat CA</string>
   <string name="about">Quan a</string>
-  <string name="about_summary">Quan a LEAP per Android</string>
+  <string name="about_summary">Quan a Bitmask per Android</string>
   <string name="vpn_list_summary">Llista de VPNs configurades</string>
   <string name="vpn_list_title">Perfils VPN</string>
   <string name="vpn_type">Tipus</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 37ae7f40..85a4f8a2 100755
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP pro Android</string>
   <string name="address">Adresa serveru:</string>
   <string name="port">Port serveru:</string>
   <string name="location">Lokace</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Zdrojové kódy a seznam problémů je na https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Tento program používá následující komponenty; viz zdrojový kód pro detaily o licenci</string>
   <string name="about">O programu</string>
-  <string name="about_summary">O programu LEAP pro Android</string>
+  <string name="about_summary">O programu Bitmask pro Android</string>
   <string name="vpn_list_summary">Seznam všech nakonfigurovaných VPN</string>
   <string name="vpn_list_title">Všechny VPN</string>
   <string name="vpn_type">Typ</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index df50b594..fdad6103 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP für Android</string>
   <string name="address">Server:</string>
   <string name="port">Server Port:</string>
   <string name="location">Ort</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Quellcode und Issue Tracker sind verfügbar unter https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Dieses Programm nutzt die folgenden Komponenten. Die kompletten Lizenzdetails sind im Quelltext verfügbar.</string>
   <string name="about">Über</string>
-  <string name="about_summary">Über LEAP für Android</string>
+  <string name="about_summary">Über Bitmask für Android</string>
   <string name="vpn_list_summary">Alle konfigurierten VPN Profile</string>
   <string name="vpn_list_title">VPN Liste</string>
   <string name="vpn_type">Typ</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 36fcc199..e8398560 100755
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP para Android</string>
   <string name="address">Dirección del servidor:</string>
   <string name="port">Puerto del servidor:</string>
   <string name="location">Ubicación</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Codigo fuente y sistema de reporte de errores disponibles en https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">El programa utiliza los siguientes componentes. Vea los códigos fuentes para obtener más información sobre las licencias</string>
   <string name="about">Acerca de</string>
-  <string name="about_summary">Acerca de LEAP para Android</string>
+  <string name="about_summary">Acerca de Bitmask para Android</string>
   <string name="vpn_list_summary">Lista de todas las VPN configuradas</string>
   <string name="vpn_list_title">Perfiles VPN</string>
   <string name="vpn_type">Tipo</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b0758d74..dba6caa4 100755
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP Androidile</string>
   <string name="address">Serveri aadress:</string>
   <string name="port">Serveri port:</string>
   <string name="location">Asukoht</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Lähtetekst ja probleemihaldur asuvad veebilehel https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Programmis kasutatakse järgnevaid komponente. Detailse litsenseerimisinfo leiate lähtekoodist</string>
   <string name="about">Lähemalt</string>
-  <string name="about_summary">Täpsemalt programmist LEAP Androidile</string>
+  <string name="about_summary">Täpsemalt programmist Bitmask Androidile</string>
   <string name="vpn_list_summary">Kõigi seadistatud VPN kanalite nimekiri</string>
   <string name="vpn_list_title">VPN profiilid</string>
   <string name="vpn_type">Tüüp</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ec36bc8b..6ed418ff 100755
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">"LEAP pour Android"</string>
   <string name="address">"Adresse du serveur:"</string>
   <string name="port">"Port:"</string>
   <string name="location">"Emplacement"</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">"Le code source et le tracker de bugs est disponible ici: https://github.com/leapcode/bitmask_android/ "</string>
   <string name="copyright_others">"Le programme utilise les composants suivants. Voir le code source pour plus de détails sur les licences."</string>
   <string name="about">"À propos"</string>
-  <string name="about_summary">"À propos d\'LEAP pour Android"</string>
+  <string name="about_summary">"À propos d\'Bitmask pour Android"</string>
   <string name="vpn_list_summary">"Liste de tous les VPN configurés"</string>
   <string name="vpn_list_title">"Vos VPNs"</string>
   <string name="vpn_type">"Type"</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 0166b7ea..f4e49938 100755
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP untuk Android</string>
   <string name="address">Alamat Server:</string>
   <string name="port">Port server:</string>
   <string name="location">Lokasi</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Kode program dan perekam masalah tersedia di</string>
   <string name="copyright_others">Aplikasi memakai komponen berikut; lihat kode program untuk lebih jelas mengenai lisensi</string>
   <string name="about">Tentang...</string>
-  <string name="about_summary">Tentang LEAP untuk Android</string>
+  <string name="about_summary">Tentang Bitmask untuk Android</string>
   <string name="vpn_list_summary">Daftar konfigurasi VPN</string>
   <string name="vpn_list_title">Profil VPN</string>
   <string name="vpn_type">Tipe</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1e935bf2..341d4d50 100755
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP per Android</string>
   <string name="address">Indirizzo server:</string>
   <string name="port">Porta del server:</string>
   <string name="location">Posizione</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Il codice sorgente e il bug tracker sono disponibili all\'indirizzo https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Questo programma usa i seguenti componenti; guarda il codice sorgente per i dettagli completi sulle licenze</string>
   <string name="about">Informazioni</string>
-  <string name="about_summary">Informazioni su LEAP per Android</string>
+  <string name="about_summary">Informazioni su Bitmask per Android</string>
   <string name="vpn_list_summary">Elenco connessioni VPN configurate</string>
   <string name="vpn_list_title">Profili VPN</string>
   <string name="vpn_type">Tipo</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index db7602f7..00831c68 100755
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP Android</string>
   <string name="address">サーバアドレス</string>
   <string name="port">ポート番号</string>
   <string name="location">場所</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">ソースコードと問題管理は以下で： https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">プログラムは、次のコンポーネントを使用します。完全な詳細についてはソース上のライセンスを参照してください。</string>
   <string name="about">バージョン情報</string>
-  <string name="about_summary">LEAP Androidについて</string>
+  <string name="about_summary">Bitmask Androidについて</string>
   <string name="vpn_list_summary">設定されたすべてのVPN</string>
   <string name="vpn_list_title">VPNプロファイル</string>
   <string name="vpn_type">種別</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4cd9da70..08c1bc26 100755
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">안드로이드용 LEAP</string>
   <string name="address">서버 주소:</string>
   <string name="port">서버 포트:</string>
   <string name="location">위치</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">소스 코드와 문제 추적기는 https://github.com/leapcode/bitmask_android/에서 사용할 수 있습니다</string>
   <string name="copyright_others">프로그램은 다음 구성 요소를 사용합니다. 라이선스에 대 한 자세한 내용은 소스를 참조 하십시오</string>
   <string name="about">소개</string>
-  <string name="about_summary">안드로이드용 LEAP 소개</string>
+  <string name="about_summary">안드로이드용 Bitmask 소개</string>
   <string name="vpn_list_summary">설정된 VPN의 목록</string>
   <string name="vpn_list_title">VPN 프로파일</string>
   <string name="vpn_type">유형</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 459c80ec..01eefb86 100755
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP voor Android</string>
   <string name="address">Server Adres:</string>
   <string name="port">Server Poort:</string>
   <string name="location">Locatie</string>
@@ -15,7 +14,7 @@
   <string name="client_pkcs12_title">PKCS12 Bestand</string>
   <string name="ca_title">CA Certificaat</string>
   <string name="about">Over</string>
-  <string name="about_summary">Over LEAP voor Android</string>
+  <string name="about_summary">Over Bitmask voor Android</string>
   <string name="vpn_list_summary">Lijst van alle geconfigureerde VPN verbindingen</string>
   <string name="vpn_list_title">VPN Profielen</string>
   <string name="vpn_type">Type</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 99b97277..a5551578 100755
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP Android</string>
   <string name="address">Server adresse:</string>
   <string name="port">Server port:</string>
   <string name="location">Plassering</string>
@@ -15,7 +14,7 @@
   <string name="client_pkcs12_title">PKCS12 fil</string>
   <string name="ca_title">CA-sertifikat</string>
   <string name="about">Om</string>
-  <string name="about_summary">Om LEAP Android</string>
+  <string name="about_summary">Om Bitmask Android</string>
   <string name="vpn_list_summary">Liste over alle konfigurerte VPN-tilkoblinger</string>
   <string name="vpn_list_title">VPN-profiler</string>
   <string name="vpn_type">Type</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 308a47ac..0b669803 100755
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP pentru Android</string>
   <string name="address">Adresa server:</string>
   <string name="port">Port server:</string>
   <string name="location">Locaţie</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Cod sursă şi tracker probleme disponibile la https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Acest program utilizează următoarele componente; a se vedea codul sursă pentru mai multe detalii despre licente</string>
   <string name="about">Despre</string>
-  <string name="about_summary">Despre LEAP pentru Android</string>
+  <string name="about_summary">Despre Bitmask pentru Android</string>
   <string name="vpn_list_summary">Lista tuturor VPN-urilor configurate</string>
   <string name="vpn_list_title">Profile VPN</string>
   <string name="vpn_type">Tip</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1d3c10a3..009e090d 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP для Android</string>
   <string name="address">Адрес сервера:</string>
   <string name="port">Порт сервера:</string>
   <string name="location">Расположение</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Исходники и информация о версиях находятся по адресу https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Данная программа использует следующие компоненты; смотрите исходный код для получения подробной информации о лицензии</string>
   <string name="about">О программе</string>
-  <string name="about_summary">Описание LEAP для Android</string>
+  <string name="about_summary">Описание Bitmask для Android</string>
   <string name="vpn_list_summary">Список всех туннелей VPN</string>
   <string name="vpn_list_title">Профили VPN</string>
   <string name="vpn_type">Тип</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 14d9ce90..5b08be94 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP для Android</string>
   <string name="address">Адреса сервера:</string>
   <string name="port">Порт сервера:</string>
   <string name="location">Розташування</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">Початковий код і відстеження проблем доступні по https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">Ця програма використовує такі компоненти; перегляньте вихідний код для повної інформації про ліцензії</string>
   <string name="about">Про</string>
-  <string name="about_summary">Про LEAP для Android</string>
+  <string name="about_summary">Про Bitmask для Android</string>
   <string name="vpn_list_summary">Список всіх налаштованих VPN</string>
   <string name="vpn_list_title">VPN профілі</string>
   <string name="vpn_type">Тип</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 89d3aeab..5dfc1b68 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP Android版</string>
   <string name="address">服务器地址：</string>
   <string name="port">服务器端口：</string>
   <string name="location">地点</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">请前往 https://github.com/leapcode/bitmask_android/ 源码或提供问题反馈</string>
   <string name="copyright_others">本程序使用以下组件，请在 Licenses 查看源码获取更详细内容。</string>
   <string name="about">关于</string>
-  <string name="about_summary">关于 LEAP Android</string>
+  <string name="about_summary">关于 Bitmask Android</string>
   <string name="vpn_list_summary">已完成配置的 VPN 列表</string>
   <string name="vpn_list_title">VPN 配置文件</string>
   <string name="vpn_type">类型</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2d2f31ca..3d178545 100755
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app">LEAP Android</string>
   <string name="address">伺服器地址:</string>
   <string name="port">伺服器端口:</string>
   <string name="location">位置</string>
@@ -19,7 +18,7 @@
   <string name="repository_url_text">取得原始碼與個案追蹤，可上 https://github.com/leapcode/bitmask_android/</string>
   <string name="copyright_others">本程序使用了以下元件，其作者和授權資訊如下</string>
   <string name="about">關於</string>
-  <string name="about_summary">關於 LEAP Android</string>
+  <string name="about_summary">關於 Bitmask Android</string>
   <string name="vpn_list_summary">列出所有已設置的VPN</string>
   <string name="vpn_list_title">VPN設定檔</string>
   <string name="vpn_type">類型</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2598d452..01eab8fe 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,8 +2,6 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">Bitmask</string>
-    <string name="app_name">Bitmask</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
@@ -21,7 +19,7 @@
     <string name="no_certificate">You must select a certificate</string>
     <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
     <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
-    <string name="about">About LEAP</string>
+    <string name="about">About Bitmask</string>
     <string name="switch_provider_menu_option">Switch provider</string>
     <string name="about_summary">About Bitmask for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index fe620aa8..8c15a213 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+	<string name="app" translatable="false">Bitmask</string>
+	<string name="app_name" translatable="false">Bitmask</string>
+	
     <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
     <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n