From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 4 Jun 2015 19:20:15 +0200
Subject: ics-openvpn as a submodule! beautiful

ics-openvpn is now officially on GitHub, and they track openssl and
openvpn as submodules, so it's easier to update everything. Just a git
submodule update --recursive.

I've also set up soft links to native modules from ics-openvpn in app,
so that we don't copy files in Gradle (which was causing problems with
the submodules .git* files, not being copied). That makes the repo
cleaner.
---
 app/src/main/res/values-in/strings-icsopenvpn.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res/values-in')

diff --git a/app/src/main/res/values-in/strings-icsopenvpn.xml b/app/src/main/res/values-in/strings-icsopenvpn.xml
index 3dac7c71..c88db1db 100755
--- a/app/src/main/res/values-in/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-in/strings-icsopenvpn.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (c) 2012-2014 Arne Schwabe
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
-
-<!--Generated by crowdin.com-->
-<!-- Generated by crowdin.net -->
 <resources>
 
   <string name="address">Alamat Server:</string>
@@ -89,6 +87,7 @@
   <string name="default_route_summary">Alihkan semua lalulintas data melalui VPN</string>
   <string name="use_default_title">Gunakan rute standar</string>
   <string name="custom_route_message">Masukkan rute butan sendiri. Masukkan tujuan dalam format CIDR. \"10.0.0.0/8 2002:: / 16\" akan mengarahkan jaringan 10.0.0.0/8 dan 2002:: / 16 melalui jaringan VPN</string>
+  <string name="custom_route_message_excluded">Routes that should NOT be routed over the VPN. Use the same syntax as for included routes.</string>
   <string name="custom_routes_title">Rute buatan sendiri</string>
   <string name="custom_routes_title_excluded">Jaringan Dikecualikan</string>
   <string name="log_verbosity_level">Tingkat rincian catatan</string>
-- 
cgit v1.2.3


From 2d55413d913b4d6fc0f10900f80f13532ea74809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 11 Jun 2015 10:56:45 +0200
Subject: Update java and xml files

---
 app/src/main/res/values-in/strings-icsopenvpn.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res/values-in')

diff --git a/app/src/main/res/values-in/strings-icsopenvpn.xml b/app/src/main/res/values-in/strings-icsopenvpn.xml
index c88db1db..07331433 100755
--- a/app/src/main/res/values-in/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-in/strings-icsopenvpn.xml
@@ -103,6 +103,7 @@
   <string name="last_openvpn_tun_config">Membuka interface tun :</string>
   <string name="local_ip_info">IPv4 lokal : %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
   <string name="dns_server_info">DNS Server: %1$s, Domain: %2$s</string>
+  <string name="routes_info_incl">Rute: %1$s %2$s</string>
   <string name="ip_not_cidr">Memilki informasi antarmuka %1$s dan %2$s, asumsi alamat kedua adalah alamat remote. Menggunakan netmask /32 untuk IP lokal. Mode yang diberikan oleh OpenVPN adalah \"%3$s\".</string>
   <string name="route_not_cidr">Tidak masuk akal membuat %1$s dan %2$s sebagai rute IP dengan netmask CIDR, Gunakan /32 sebagai netmask.</string>
   <string name="route_not_netip">rute yang diperbaiki %1$s/%2$s hingga %3$s/%2$s</string>
-- 
cgit v1.2.3