From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 7 Apr 2014 20:43:34 +0200
Subject: Next step: compile jni sources correctly.

---
 app/src/main/res/values-no/strings.xml | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/src/main/res/values-no/strings.xml

(limited to 'app/src/main/res/values-no/strings.xml')

diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
new file mode 100644
index 00000000..a363b2f9
--- /dev/null
+++ b/app/src/main/res/values-no/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="about">Om</string>
+  <string name="no_error_found">Ingen feil funnet</string>
+  <string name="config_error_found">Feil i konfigurasjonen</string>
+  <string name="vpn_launch_title">Koble til VPN</string>
+  <string name="cancel_connection">Koble fra</string>
+  <string name="clear_log">Tøm logg</string>
+  <string name="title_cancel">Avbryt bekreftelse</string>
+  <string name="edit_vpn">Rediger VPN-innstillinger</string>
+  <string name="error">"Feil:"</string>
+  <string name="clear">Fjern</string>
+  <string name="info">info</string>
+  <string name="show_connection_details">Vis Tilkoblingsdetaljer</string>
+  <string name="dns_server_info">DNS-server: %s</string>
+  <string name="dns_domain_info">DNS-domene: %s</string>
+  <string name="routes_info">Ruter: %s</string>
+  <string name="version_info">%1$s %2$s</string>
+  <string name="send_logfile">Send loggfilen</string>
+  <string name="send">Send</string>
+  <string name="bitmask_openvpn_log_file">LEAP Android loggfil</string>
+  <string name="speed_waiting">Venter på tilstands melding...</string>
+  <string name="converted_profile">importert profil</string>
+  <string name="converted_profile_i">importert profilen %d</string>
+  <string name="error_empty_username">Brukernavnet kan ikke være tomt.</string>
+  <string name="pkcs12_file_encryption_key">PKCS12 Filkrypteringsnøkkel</string>
+  <string name="private_key_password">Privat nøkkel passord</string>
+  <string name="password">Passord</string>
+  <string name="building_configration">Lager konfigurasjon...</string>
+  <string name="netstatus">Nettverksstatus: %s</string>
+  <string name="mobile_info">Kjører på %1$s (%2$s) %3$s, Android API %4$d</string>
+  <string name="translationby">Norsk oversettelse av Jonny</string>
+  <string name="getproxy_error">Feil ved henting av proxy-innstillinger: %s</string>
+  <string name="using_proxy">Bruker proxy %1$s %2$d</string>
+  <string name="ignore">Ignorer</string>
+  <string name="restart">Start på nytt</string>
+  <string name="configuration_changed">Konfigurasjon endret</string>
+</resources>
-- 
cgit v1.2.3


From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 app/src/main/res/values-no/strings.xml | 38 ----------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 app/src/main/res/values-no/strings.xml

(limited to 'app/src/main/res/values-no/strings.xml')

diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
deleted file mode 100644
index a363b2f9..00000000
--- a/app/src/main/res/values-no/strings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="about">Om</string>
-  <string name="no_error_found">Ingen feil funnet</string>
-  <string name="config_error_found">Feil i konfigurasjonen</string>
-  <string name="vpn_launch_title">Koble til VPN</string>
-  <string name="cancel_connection">Koble fra</string>
-  <string name="clear_log">Tøm logg</string>
-  <string name="title_cancel">Avbryt bekreftelse</string>
-  <string name="edit_vpn">Rediger VPN-innstillinger</string>
-  <string name="error">"Feil:"</string>
-  <string name="clear">Fjern</string>
-  <string name="info">info</string>
-  <string name="show_connection_details">Vis Tilkoblingsdetaljer</string>
-  <string name="dns_server_info">DNS-server: %s</string>
-  <string name="dns_domain_info">DNS-domene: %s</string>
-  <string name="routes_info">Ruter: %s</string>
-  <string name="version_info">%1$s %2$s</string>
-  <string name="send_logfile">Send loggfilen</string>
-  <string name="send">Send</string>
-  <string name="bitmask_openvpn_log_file">LEAP Android loggfil</string>
-  <string name="speed_waiting">Venter på tilstands melding...</string>
-  <string name="converted_profile">importert profil</string>
-  <string name="converted_profile_i">importert profilen %d</string>
-  <string name="error_empty_username">Brukernavnet kan ikke være tomt.</string>
-  <string name="pkcs12_file_encryption_key">PKCS12 Filkrypteringsnøkkel</string>
-  <string name="private_key_password">Privat nøkkel passord</string>
-  <string name="password">Passord</string>
-  <string name="building_configration">Lager konfigurasjon...</string>
-  <string name="netstatus">Nettverksstatus: %s</string>
-  <string name="mobile_info">Kjører på %1$s (%2$s) %3$s, Android API %4$d</string>
-  <string name="translationby">Norsk oversettelse av Jonny</string>
-  <string name="getproxy_error">Feil ved henting av proxy-innstillinger: %s</string>
-  <string name="using_proxy">Bruker proxy %1$s %2$d</string>
-  <string name="ignore">Ignorer</string>
-  <string name="restart">Start på nytt</string>
-  <string name="configuration_changed">Konfigurasjon endret</string>
-</resources>
-- 
cgit v1.2.3


From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 16:03:55 +0200
Subject: Back to the standard "app" module.

This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure
I'll have to tweak the final apk name in build.gradle.
---
 app/src/main/res/values-no/strings.xml | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/src/main/res/values-no/strings.xml

(limited to 'app/src/main/res/values-no/strings.xml')

diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
new file mode 100644
index 00000000..a363b2f9
--- /dev/null
+++ b/app/src/main/res/values-no/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="about">Om</string>
+  <string name="no_error_found">Ingen feil funnet</string>
+  <string name="config_error_found">Feil i konfigurasjonen</string>
+  <string name="vpn_launch_title">Koble til VPN</string>
+  <string name="cancel_connection">Koble fra</string>
+  <string name="clear_log">Tøm logg</string>
+  <string name="title_cancel">Avbryt bekreftelse</string>
+  <string name="edit_vpn">Rediger VPN-innstillinger</string>
+  <string name="error">"Feil:"</string>
+  <string name="clear">Fjern</string>
+  <string name="info">info</string>
+  <string name="show_connection_details">Vis Tilkoblingsdetaljer</string>
+  <string name="dns_server_info">DNS-server: %s</string>
+  <string name="dns_domain_info">DNS-domene: %s</string>
+  <string name="routes_info">Ruter: %s</string>
+  <string name="version_info">%1$s %2$s</string>
+  <string name="send_logfile">Send loggfilen</string>
+  <string name="send">Send</string>
+  <string name="bitmask_openvpn_log_file">LEAP Android loggfil</string>
+  <string name="speed_waiting">Venter på tilstands melding...</string>
+  <string name="converted_profile">importert profil</string>
+  <string name="converted_profile_i">importert profilen %d</string>
+  <string name="error_empty_username">Brukernavnet kan ikke være tomt.</string>
+  <string name="pkcs12_file_encryption_key">PKCS12 Filkrypteringsnøkkel</string>
+  <string name="private_key_password">Privat nøkkel passord</string>
+  <string name="password">Passord</string>
+  <string name="building_configration">Lager konfigurasjon...</string>
+  <string name="netstatus">Nettverksstatus: %s</string>
+  <string name="mobile_info">Kjører på %1$s (%2$s) %3$s, Android API %4$d</string>
+  <string name="translationby">Norsk oversettelse av Jonny</string>
+  <string name="getproxy_error">Feil ved henting av proxy-innstillinger: %s</string>
+  <string name="using_proxy">Bruker proxy %1$s %2$d</string>
+  <string name="ignore">Ignorer</string>
+  <string name="restart">Start på nytt</string>
+  <string name="configuration_changed">Konfigurasjon endret</string>
+</resources>
-- 
cgit v1.2.3