From 75728462433b19567710f54a9d4767681b10be95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 18:07:07 +0200
Subject: Coded dialog (now there is a button in the Dashboard), time to test.

I need to implement bypass for dev.bitmask.net, because bitmask.net is
down.
---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2deb23f..6e84bed 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,5 +265,9 @@
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</string>
+    <string name="username_ask">Introduce your username</string>
+    <string name="password_ask">Enter your password</string>
+    <string name="log_in_button">Log in</string>
+    <string name="login_button">Log In</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From bfe2263d6b73159a4f929bc7b1fdeb724c88e8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 20:17:43 +0200
Subject: Added danger mode: we can bypass dev.bitmask.net hostname io
 exception.

---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e84bed..eac73bc 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,5 +269,6 @@
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
     <string name="login_button">Log In</string>
+    <string name="danger_checkbox">Trust completely</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 84a11bb1620d2b9080992427c847b58007f2304a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 9 May 2013 17:29:38 +0200
Subject: Log in and Log out options are shown only if allow registration is
 true.

Allow registration is present in provider.json.

Provider.json is downloaded from both preseeded and custom providers.

Authentication success or fail is notified correctly to the user.
---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eac73bc..03de1ee 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,6 +269,7 @@
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
     <string name="login_button">Log In</string>
+    <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d14ae81fe92494a67994d703e1175ef4264adddb Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 21:58:00 -0600
Subject: Refactor ConfigurationWizard for better task handling, completion,
 and return information

---
 res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 03de1ee..ed32f61 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,5 +271,7 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
+    <string name="config_error_parsing">Error parsing provider\'s responses!</string>
+    <string name="success">Success!</string>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 2db010a78fe22380db871e67dfd05131c0b871b3 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 22:00:25 -0600
Subject: how the heck these got untracked, i do not know

---
 res/values/values-nl/arrays.xml  |  27 ++++++++++
 res/values/values-nl/strings.xml | 108 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100755 res/values/values-nl/arrays.xml
 create mode 100755 res/values/values-nl/strings.xml

(limited to 'res/values')

diff --git a/res/values/values-nl/arrays.xml b/res/values/values-nl/arrays.xml
new file mode 100755
index 0000000..9be2a9d
--- /dev/null
+++ b/res/values/values-nl/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string-array name="vpn_types">
+    <item>Certificaten</item>
+    <item>PKCS12 Bestand</item>
+    <item>Android Certificaat</item>
+    <item>Gebruikersnaam/Wachtwoord</item>
+    <item>Statische Sleutels</item>
+    <item>Gebruiker/WW + Certificaten</item>
+    <item>Gebruiker/WW + PKCS12 </item>
+    <item>Gebruiker/WW + Android</item>
+  </string-array>
+  <string-array name="tls_directions_entries">
+    <item>0</item>
+    <item>1</item>
+    <item>Niet-gespecificeerd</item>
+  </string-array>
+  <string-array name="verb_entries">
+    <item>0 - Geen logboek</item>
+    <item>1 - Standaard logboek</item>
+    <item>2 - Uitgebreid logboek</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5 - Debug logboek</item>
+  </string-array>
+</resources>
diff --git a/res/values/values-nl/strings.xml b/res/values/values-nl/strings.xml
new file mode 100755
index 0000000..459c80e
--- /dev/null
+++ b/res/values/values-nl/strings.xml
@@ -0,0 +1,108 @@
+<?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>
+  <string name="select">Selecteer</string>
+  <string name="cancel">Annuleer</string>
+  <string name="no_data">Geen Gegevens</string>
+  <string name="useLZO">LZO Compressie</string>
+  <string name="client_no_certificate">Geen Certificaat</string>
+  <string name="client_certificate_title">Client Certificaat</string>
+  <string name="client_key_title">Client Certificaat Sleutel</string>
+  <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="vpn_list_summary">Lijst van alle geconfigureerde VPN verbindingen</string>
+  <string name="vpn_list_title">VPN Profielen</string>
+  <string name="vpn_type">Type</string>
+  <string name="pkcs12pwquery">PKCS12 Wachtwoord</string>
+  <string name="file_select">Selecteer…</string>
+  <string name="useTLSAuth">Gebruik TLS autentificatie</string>
+  <string name="tls_direction">TLS Richting</string>
+  <string name="ipv6_dialog_tile">Voer een IPv6 Adres/Netmask in met het CIDR Formaat (v.b. 2000:dd::23/64)</string>
+  <string name="ipv4_dialog_title">Voer een IPv4 Adres/Netmask in met het CIDR Formaat (v.b. 1.2.3.4/24)</string>
+  <string name="ipv4_address">IPv4 Adres</string>
+  <string name="ipv6_address">IPv4 Adres</string>
+  <string name="auth_username">Gebruikersnaam</string>
+  <string name="auth_pwquery">wachtwoord</string>
+  <string name="configure_the_vpn">VPN configureren</string>
+  <string name="menu_add_profile">Profiel toevoegen</string>
+  <string name="add_profile_name_prompt">Voer een naam in voor het nieuwe Profiel</string>
+  <string name="profilename">Profiel name</string>
+  <string name="no_error_found">Geen fout.</string>
+  <string name="config_error_found">Fout in de configuratie</string>
+  <string name="vpn_shortcut">Open VPN shortcut</string>
+  <string name="vpn_launch_title">Met VPN verbinden</string>
+  <string name="shortcut_profile_notfound">Het profiel zoals aangegeven in de snelkoppeling kon niet gevonden worden.</string>
+  <string name="random_host_prefix">Willekeurig Host Voorvoegsel</string>
+  <string name="random_host_summary">Voegt 6 willekeurige tekens toe voor de hostname</string>
+  <string name="custom_config_title">Eigen configuratie opties</string>
+  <string name="custom_config_summary">Geef je eigen configuratieopties aan. Wees voorzichtig!</string>
+  <string name="route_rejected">Route geweigert door Android</string>
+  <string name="cancel_connection">Verbinding verbreken</string>
+  <string name="clear_log">logboek wissen</string>
+  <string name="title_cancel">Annuleer bevestiging</string>
+  <string name="cancel_connection_query">Sluit de verbonden VPN af/annuleer de verbindingspoging?</string>
+  <string name="remove_vpn">VPN wissen</string>
+  <string name="check_remote_tlscert">Checkt of de server een TLS server certificaat gebruikt.</string>
+  <string name="remote_tlscn_check_title">Controleer Certificaat Hostname</string>
+  <string name="enter_tlscn_title">Externe Hostname(CN)</string>
+  <string name="tls_auth_file">TLS Auth Bestand</string>
+  <string name="pull_on_summary">Vraag IP adres, routes en timing opties van de server.</string>
+  <string name="use_pull">Pull Instellingen</string>
+  <string name="dns">DNS</string>
+  <string name="override_dns">DNS Instellingen van Server Overschrijven</string>
+  <string name="dns_override_summary">Gebruik eigen DNS Servers</string>
+  <string name="searchdomain">Zoekd domein</string>
+  <string name="dns1_summary">Primaire DNS server</string>
+  <string name="dns_server">DNS Server</string>
+  <string name="secondary_dns_message">Secundaire DNS server. Deze wordt gebruikt voor het geval dat de primaire DNS server niet bereikbaar is</string>
+  <string name="backup_dns">Backup DNS server</string>
+  <string name="ignored_pushed_routes">Negeer ontvangen routes</string>
+  <string name="ignore_routes_summary">Negeer routes ontvangen van de server.</string>
+  <string name="default_route_summary">Leid al het Verkeer over de VPN</string>
+  <string name="use_default_title">Gebruik standaard Route</string>
+  <string name="custom_routes_title">Eigen routes</string>
+  <string name="float_summary">Geverifieerde pakketen zijn vanuit elk IP toegestaan</string>
+  <string name="float_title">Zwevende server toestaan</string>
+  <string name="custom_options_title">Aangepaste Opties</string>
+  <string name="edit_vpn">VPN Instellingen Bewerken</string>
+  <string name="error">"Fout:"</string>
+  <string name="clear">Leeg maken</string>
+  <string name="info">info</string>
+  <string name="show_connection_details">Details van de verbinding weergeven</string>
+  <string name="last_openvpn_tun_config">Laatste interfaceconfiguratie van OpenVPN:</string>
+  <string name="local_ip_info">Lokaal IPv4: %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
+  <string name="dns_server_info">DNS Server: %s</string>
+  <string name="dns_domain_info">DNS Domein: %s</string>
+  <string name="routes_info">Routes: %s</string>
+  <string name="routes_info6">Routes IPv6: %s</string>
+  <string name="version_info">%1$s %2$s</string>
+  <string name="send_logfile">Logboek verzenden</string>
+  <string name="send">Verzenden</string>
+  <string name="tap_mode">Tap mode</string>
+  <string name="faq_tap_mode">De VPN API van Android werkt zonder rooten van de telefoon en ondersteunt alleen de tun modus. Daarom is de tap modus niet mogelijk met deze app.</string>
+  <string name="import_configuration_file">configuratie bestand importeren</string>
+  <string name="faq_security_title">Beveiligingsoverwegingen</string>
+  <string name="import_vpn">Importeren</string>
+  <string name="broken_image_cert_title">Fout bij het weergeven van de certificaat selectie</string>
+  <string name="ipv4">IPv4</string>
+  <string name="ipv6">IPv6</string>
+  <string name="speed_waiting">Wachten op status bericht…</string>
+  <string name="converted_profile">Geïmporteerd profiel</string>
+  <string name="converted_profile_i">Geïmporteerd profiel %d</string>
+  <string name="broken_images">Niet Werkende Afbeeldingen</string>
+  <string name="error_empty_username">De gebruikersnaam moet niet leeg zijn.</string>
+  <string name="pkcs12_file_encryption_key">PKCS12 Bestand Encryptie Sleutel</string>
+  <string name="private_key_password">Privé Sleutel Wachtwoord</string>
+  <string name="password">Wachtwoord</string>
+  <string name="file_icon">bestands pictogram</string>
+  <string name="tls_authentication">TLS Verificatie</string>
+  <string name="generated_config">Gegenereerde Configuratie</string>
+  <string name="generalsettings">Algemene Instellingen</string>
+  <string name="ipdns">IP en DNS</string>
+</resources>
-- 
cgit v1.2.3


From 626b32fba7b6b45bead3b79fb7e7aa6cddc5c535 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 22:07:39 -0600
Subject: Add ProgressDialog to ConfigurationWizard while downloading from
 provider

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ed32f61..0efa941 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,6 +271,10 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
+    <string name="config_wait_title">Configuring LEAP 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>
 
-- 
cgit v1.2.3


From 769344327d5cb16adbdc04db224ff6902b4a4771 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sat, 8 Jun 2013 22:27:25 -0600
Subject: Better config/partial config handling in Dashboard

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0efa941..4501ac1 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,6 +271,10 @@
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
     <string name="danger_checkbox">Trust completely</string>
+    <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="config_connecting_provider">Downloading provider configuration</string>
     <string name="config_downloading_services">Downloading service definitions</string>
-- 
cgit v1.2.3


From f4956bb818fb9ed04760e6de3b53b876272da5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 20 Jun 2013 16:52:43 +0200
Subject: User messages are now in string.xml

Some more constants added to ConfigHelper.

This solves #2908.
---
 res/values/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4501ac1..804964c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,6 +265,8 @@
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</string>
+    <string name="valid_url_entered">It seems your URL is well formed</string>
+    <string name="not_valid_url_entered">It seems your URL is not well formed</string>
     <string name="username_ask">Introduce your username</string>
     <string name="password_ask">Enter your password</string>
     <string name="log_in_button">Log in</string>
@@ -281,5 +283,17 @@
     <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="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="incorrectly_updated_provider_dot_json_message">Install a new version of this app.</string>
+    <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
+    <string name="succesful_authentication_message">Authentication succeeded.</string>
+    <string name="authentication_failed_message">Authentication failed.</string>
+    <string name="successful_log_out_message">Logged out.</string>
+    <string name="log_out_failed_message">Didn\'t logged out.</string>
+    <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
+    <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3