Merge branch 'feature/rebrand-as-bitmask' into develop

25 files changed, 28 insertions, 28 deletions

diff --git a/res/drawable-hdpi/ic_stat_vpn.png b/res/drawable-hdpi/ic_stat_vpn.png
index 98d60516..9371b63c 100644
--- a/res/drawable-hdpi/ic_stat_vpn.png
+++ b/res/drawable-hdpi/ic_stat_vpn.png
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
index a07db1ef..02ede650 100644
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
diff --git a/res/drawable-ldpi/ic_stat_vpn.png b/res/drawable-ldpi/ic_stat_vpn.png
index 4f0ba1df..f973015c 100644
--- a/res/drawable-ldpi/ic_stat_vpn.png
+++ b/res/drawable-ldpi/ic_stat_vpn.png
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
index 6f25cd07..e312075d 100644
--- a/res/drawable-ldpi/icon.png
+++ b/res/drawable-ldpi/icon.png
diff --git a/res/drawable-mdpi/ic_stat_vpn.png b/res/drawable-mdpi/ic_stat_vpn.png
index e8c99c1c..26f55872 100644
--- a/res/drawable-mdpi/ic_stat_vpn.png
+++ b/res/drawable-mdpi/ic_stat_vpn.png
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index 4b3456ff..468314c6 100644
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
diff --git a/res/drawable-xhdpi/ic_stat_vpn.png b/res/drawable-xhdpi/ic_stat_vpn.png
index 51af141a..44aace71 100644
--- a/res/drawable-xhdpi/ic_stat_vpn.png
+++ b/res/drawable-xhdpi/ic_stat_vpn.png
diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
index dbb53eef..ead03720 100644
--- a/res/drawable-xhdpi/icon.png
+++ b/res/drawable-xhdpi/icon.png
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 74835d1e..40a15794 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autoLink="all"
-            android:text="@string/copyright_guicode" />
+            android:text="@string/repository_url_text" />
 
         <TextView
             android:id="@+id/translation"
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index b71ae664..542de365 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:leap="http://schemas.android.com/apk/res/se.leap.leapclient"
+    xmlns:leap="http://schemas.android.com/apk/res/se.leap.bitmaskclient"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" >
 
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6d2c6a5a..37ae7f40 100755
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 soubor</string>
   <string name="ca_title">CA certifikát</string>
   <string name="no_certificate">Je třeba vybrat certifikát</string>
-  <string name="copyright_guicode">Zdrojové kódy a seznam problémů je na https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f079ba53..df50b594 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 Datei</string>
   <string name="ca_title">CA Zertifikat</string>
   <string name="no_certificate">Kein Zertifikat ausgewählt</string>
-  <string name="copyright_guicode">Quellcode und Issue Tracker sind verfügbar unter https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e1979c05..36fcc199 100755
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">Archivo PKCS12</string>
   <string name="ca_title">Certificado de la CA</string>
   <string name="no_certificate">Debe seleccionar un certificado</string>
-  <string name="copyright_guicode">Codigo fuente y sistema de reporte de errores disponibles en https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 4e13e539..b0758d74 100755
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 fail</string>
   <string name="ca_title">CA sertifikaat</string>
   <string name="no_certificate">Peate valima sertifikaadi</string>
-  <string name="copyright_guicode">Lähtetekst ja probleemihaldur asuvad veebilehel https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f031c5fd..ec36bc8b 100755
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">"Fichier PKCS12"</string>
   <string name="ca_title">"Certificat CA"</string>
   <string name="no_certificate">"Vous devez sélectionner un certificat"</string>
-  <string name="copyright_guicode">"Le code source et le tracker de bugs est disponible ici: https://github.com/leapcode/leap_android/ "</string>
+  <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>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index fbf2231e..0166b7ea 100755
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">Berkas PKCS12</string>
   <string name="ca_title">Sertifikat CA</string>
   <string name="no_certificate">Anda harus memilih sertifikat</string>
-  <string name="copyright_guicode">Kode program dan perekam masalah tersedia di</string>
+  <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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 84072b1e..1e935bf2 100755
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">File PKCS12</string>
   <string name="ca_title">Certificato CA</string>
   <string name="no_certificate">Devi selezionare un certificato</string>
-  <string name="copyright_guicode">Il codice sorgente e il bug tracker sono disponibili all\'indirizzo https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 170b6c25..db7602f7 100755
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12ファイル</string>
   <string name="ca_title">CA 証明書</string>
   <string name="no_certificate">証明書を選択する必要があります。</string>
-  <string name="copyright_guicode">ソースコードと問題管理は以下で： https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fbf069d3..4cd9da70 100755
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 파일</string>
   <string name="ca_title">CA 인증서</string>
   <string name="no_certificate">인증서를 선택 해야 합니다</string>
-  <string name="copyright_guicode">소스 코드와 문제 추적기는 https://github.com/leapcode/leap_android/에서 사용할 수 있습니다</string>
+  <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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 43d6c17f..308a47ac 100755
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">Fişier PKCS12</string>
   <string name="ca_title">Certificat CA</string>
   <string name="no_certificate">Trebuie să selectați un certificat</string>
-  <string name="copyright_guicode">Cod sursă şi tracker probleme disponibile la https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ee1fed82..1d3c10a3 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 файл</string>
   <string name="ca_title">CA сертификат</string>
   <string name="no_certificate">Вам необходимо выбрать сертификат</string>
-  <string name="copyright_guicode">Исходники и информация о версиях находятся по адресу https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 20cd0d6a..14d9ce90 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">Файл PKCS12</string>
   <string name="ca_title">Сертифікат CA</string>
   <string name="no_certificate">Потрібно вибрати сертифікат</string>
-  <string name="copyright_guicode">Початковий код і відстеження проблем доступні по https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0d6f4d2c..89d3aeab 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 文件</string>
   <string name="ca_title">CA 证书</string>
   <string name="no_certificate">您必须选择一个证书</string>
-  <string name="copyright_guicode">请前往 https://github.com/leapcode/leap_android/ 源码或提供问题反馈</string>
+  <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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 76404d12..2d2f31ca 100755
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,7 +16,7 @@
   <string name="client_pkcs12_title">PKCS12 檔案</string>
   <string name="ca_title">CA證書</string>
   <string name="no_certificate">您必須選擇一個憑證</string>
-  <string name="copyright_guicode">取得原始碼與個案追蹤，可上 https://github.com/leapcode/leap_android/</string>
+  <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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a6afb71d..39c82d40 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,8 +2,8 @@
 <!-- Generated by crowdin.net -->
 <resources>
 
-    <string name="app">LEAP for Android</string>
-    <string name="app_name">LEAP</string>
+    <string name="app">Bitmask for Android</string>
+    <string name="app_name">Bitmask</string>
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="location">Location</string>
@@ -18,11 +18,11 @@
     <string name="client_pkcs12_title">PKCS12 File</string>
     <string name="ca_title">CA Certificate</string>
     <string name="no_certificate">You must select a certificate</string>
-    <string name="copyright_guicode">Source code and issue tracker available at https://github.com/leapcode/leap_android/</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</string>
     <string name="switch_provider_menu_option">Switch provider</string>
-    <string name="about_summary">About LEAP for Android</string>
+    <string name="about_summary">About Bitmask for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
     <string name="vpn_list_title">VPN Profiles</string>
     <string name="vpn_type">Type</string>
@@ -113,7 +113,7 @@
     <string name="version_info">%1$s %2$s</string>
     <string name="send_logfile">Send log file</string>
     <string name="send">Send</string>
-    <string name="ics_openvpn_log_file">LEAP OpenVPN log file</string>
+    <string name="ics_openvpn_log_file">Bitmask OpenVPN log file</string>
     <string name="copied_entry">Copied log entry to clip board</string>
     <string name="tap_mode">Tap Mode</string>
     <string name="faq_tap_mode">Tap Mode is not possible with the non root VPN API. Therefore this application cannot provide tap support</string>
@@ -256,13 +256,13 @@
     <string name="state_auth_failed">Authentication failed</string>
     <string name="state_nonetwork">Waiting for usable network</string>
     <string name="menu_settings">Settings</string>
-    <string name="title_activity_dashboard">LEAP Dashboard</string>
+    <string name="title_activity_dashboard">Bitmask Dashboard</string>
     <string name="provider_label">Provider:</string>
     <string name="provider_label_none">No provider configured</string>
     <string name="eip_settings_button_description">Access EIP connection settings</string>
     <string name="eip_status">Status unknown</string>
     <string name="eip_service_label">Encrypted Internet</string>
-    <string name="title_activity_configuration_wizard">Configure LEAP</string>
+    <string name="title_activity_configuration_wizard">Configure Bitmask</string>
     <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
@@ -290,19 +290,19 @@
     <string name="setup_error_title">Configuration Error</string>
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
-    <string name="setup_error_text">There was an error configuring LEAP with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
-    <string name="config_wait_title">Configuring LEAP provider</string>
+    <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
+    <string name="config_wait_title">Configuring Bitmask provider</string>
     <string name="config_connecting_provider">Downloading provider configuration</string>
     <string name="config_downloading_services">Downloading service definitions</string>
     <string name="config_downloading_certificates">Downloading authentication certificates</string>
     <string name="config_error_parsing">Error parsing provider\'s responses!</string>
     <string name="success">Success!</string>
-    <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP provider URL or it is unavailable</string>
+    <string name="incorrectly_downloaded_json_files_message">You have not entered a Bitmask provider URL or it is unavailable</string>
     <string name="correctly_downloaded_json_files_message">Your anon cert has been correctly downloaded</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="server_is_down_message">Server is down.</string>
-    <string name="malformed_url">It doesn\'t seem to be a LEAP provider.</string>
-    <string name="certificate_error">This is not a trusted LEAP provider.</string>
+    <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
+    <string name="certificate_error">This is not a trusted Bitmask provider.</string>
     <string name="authenticating_title">Authenticating</string>
     <string name="authenticating_message">Authenticating with entered login and password.</string>
     <string name="logout_title">Log out</string>