From d73c83783ddef1071cf4de845b8594b116aa51ba Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 1 Dec 2014 19:05:39 +0100
Subject: Update icsopenvpn version, update translation, sync with released
 OpenVPN master

--HG--
extra : rebase_source : 68991da2166a00a17978934f9e20eea4b34a3425
---
 main/build.gradle                           |  4 ++--
 main/openvpn/config-version.h               |  2 +-
 main/openvpn/configure.ac                   |  6 +++---
 main/src/main/res/values-cs/strings.xml     | 19 +++++++++++++++++++
 main/src/main/res/values-de/strings.xml     |  3 +++
 main/src/main/res/values-es/strings.xml     | 19 +++++++++++++++++++
 main/src/main/res/values-hu/arrays.xml      |  2 +-
 main/src/main/res/values-tr/strings.xml     | 18 +++++++++++++++++-
 main/src/main/res/values-zh-rCN/strings.xml |  3 +++
 9 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/main/build.gradle b/main/build.gradle
index 45c43031..0f026f5f 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -19,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode = 103
-        versionName = "0.6.22"
+        versionCode = 104
+        versionName = "0.6.23"
     }
 
     sourceSets {
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index 1b41a56b..d5ea5dff 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_623-7119a45a4cbb1778"
+#define CONFIGURE_GIT_REVISION "icsopenvpn_623-ac8bac5aff772eaa"
 #define CONFIGURE_GIT_FLAGS ""
diff --git a/main/openvpn/configure.ac b/main/openvpn/configure.ac
index 608ab6d1..ddaa2b2e 100644
--- a/main/openvpn/configure.ac
+++ b/main/openvpn/configure.ac
@@ -73,7 +73,7 @@ AC_ARG_ENABLE(
 
 AC_ARG_ENABLE(
 	[ofb-cfb],
-	[AS_HELP_STRING([--enable-ofb-cfb], [enable support for OFB and CFB cipher modes @<:@default=yes@:>@])],
+	[AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],
 	,
 	[enable_crypto_ofb_cfb="yes"]
 )
@@ -157,14 +157,14 @@ AC_ARG_ENABLE(
 
 AC_ARG_ENABLE(
 	[small],
-	[AS_HELP_STRING([--enable-small], [enable smaller executable size (disable OCC, usage message, and verb 4 parm list) @<:@default=yes@:>@])],
+	[AS_HELP_STRING([--enable-small], [enable smaller executable size (disable OCC, usage message, and verb 4 parm list) @<:@default=no@:>@])],
 	,
 	[enable_small="no"]
 )
 
 AC_ARG_ENABLE(
 	[password-save],
-	[AS_HELP_STRING([--enable-password-save], [allow --askpass and --auth-user-pass passwords to be read from a file @<:@default=yes@:>@])],
+	[AS_HELP_STRING([--enable-password-save], [allow --askpass and --auth-user-pass passwords to be read from a file @<:@default=no@:>@])],
 	,
 	[enable_password_save="no"]
 )
diff --git a/main/src/main/res/values-cs/strings.xml b/main/src/main/res/values-cs/strings.xml
index 33445939..b81397e1 100755
--- a/main/src/main/res/values-cs/strings.xml
+++ b/main/src/main/res/values-cs/strings.xml
@@ -329,4 +329,23 @@
   <string name="mssfix_value_dialog">Oznámit TCP sezením běžícím skrze tunel, že mají limitovat velikost odesílaných paketů tak, aby poté, co je OpenVPN zabalí, byla výsledná velikost UDP paketu, které OpenVPN posílá menší než tento počet bytů. (výchozí je 1450)</string>
   <string name="mssfix_checkbox">Přepsat hodnotu MSS pro TCP obsah</string>
   <string name="mssfix_dialogtitle">Nastavit MSS pro TCP obsah</string>
+  <string name="client_behaviour">Chování klienta</string>
+  <string name="clear_external_apps">Zrušit povolené externí aplikace</string>
+  <string name="loading">Načítání&#8230;</string>
+  <string name="allowed_vpn_apps_info">Povolené VPN aplikace: %1$s</string>
+  <string name="disallowed_vpn_apps_info">Zakázané VPN aplikace: %1$s</string>
+  <string name="app_no_longer_exists">Balíček %s již není nainstalován, odstraňuji ho ze seznamu povolených/zakázaných aplikací</string>
+  <string name="vpn_disallow_radio">VPN je používaná pro všechny aplikace, kromě</string>
+  <string name="vpn_allow_radio">VPN je používaná je pro vybrané aplikace</string>
+  <string name="query_delete_remote">Odstranit položku vzdáleného serveru?</string>
+  <string name="keep">Zachovat</string>
+  <string name="delete">Smazat</string>
+  <string name="add_remote">Přidat nové vzdálené místo</string>
+  <string name="remote_random">Použít položky k připojení v náhodném pořadí</string>
+  <string name="remote_no_server_selected">Je potřeba definovat a povolit alespoň jeden vzdálený server.</string>
+  <string name="server_list">Seznam serverů</string>
+  <string name="vpn_allowed_apps">Povolené aplikace</string>
+  <string name="advanced_settings">Pokročilé nastavení</string>
+  <string name="payload_options">Možnosti dat</string>
+  <string name="tls_settings">Nastevení TLS</string>
 </resources>
diff --git a/main/src/main/res/values-de/strings.xml b/main/src/main/res/values-de/strings.xml
index 52596775..da23caba 100755
--- a/main/src/main/res/values-de/strings.xml
+++ b/main/src/main/res/values-de/strings.xml
@@ -348,4 +348,7 @@
   <string name="advanced_settings">Erweiterte Einstellungen</string>
   <string name="payload_options">Nutzlast-Optionen</string>
   <string name="tls_settings">TLS-Einstellungen</string>
+  <string name="no_remote_defined">Keine Server definiert</string>
+  <string name="duplicate_vpn">VPN Profil duplizieren</string>
+  <string name="duplicate_profile_title">VPN Profil duplizieren: %s</string>
 </resources>
diff --git a/main/src/main/res/values-es/strings.xml b/main/src/main/res/values-es/strings.xml
index d80c842b..1104ba8d 100755
--- a/main/src/main/res/values-es/strings.xml
+++ b/main/src/main/res/values-es/strings.xml
@@ -328,4 +328,23 @@
   <string name="mssfix_invalid_value">El valor de mssfix debe ser un número entero entre 0 y 9000</string>
   <string name="mssfix_checkbox">Reemplazar el valor MSS de la carga TCP</string>
   <string name="mssfix_dialogtitle">Establecer MSS de la carga TCP</string>
+  <string name="client_behaviour">Comportamiento del cliente</string>
+  <string name="clear_external_apps">Borrar aplicaciones externas permitidas</string>
+  <string name="loading">Cargando&#8230;</string>
+  <string name="allowed_vpn_apps_info">Aplicaciones VPN permitidas: %1$s</string>
+  <string name="disallowed_vpn_apps_info">Aplicaciones VPN no permitidas: %1$s</string>
+  <string name="app_no_longer_exists">El paquete %s ya no está instalado, sacándolo de la lista de apps permitidas/no permitidas</string>
+  <string name="vpn_disallow_radio">La VPN es usada por todas las aplicaciones, excepto por las seleccionadas</string>
+  <string name="vpn_allow_radio">La VPN es utilizada únicamente por las aplicaciones seleccionadas</string>
+  <string name="query_delete_remote">¿Eliminar entrada del servidor remoto?</string>
+  <string name="keep">Mantener</string>
+  <string name="delete">Eliminar</string>
+  <string name="add_remote">Añadir nuevo acceso remoto</string>
+  <string name="remote_random">Utiliza las entradas de conexión en orden aleatorio en la conexión</string>
+  <string name="remote_no_server_selected">Es necesario definir y habilitar al menos un servidor remoto.</string>
+  <string name="server_list">Lista de servidores</string>
+  <string name="vpn_allowed_apps">Aplicaciones permitidas</string>
+  <string name="advanced_settings">Opciones Avanzadas</string>
+  <string name="payload_options">Opciones de carga útil</string>
+  <string name="tls_settings">Configuración TLS</string>
 </resources>
diff --git a/main/src/main/res/values-hu/arrays.xml b/main/src/main/res/values-hu/arrays.xml
index fe022aae..6c279a8a 100755
--- a/main/src/main/res/values-hu/arrays.xml
+++ b/main/src/main/res/values-hu/arrays.xml
@@ -8,7 +8,7 @@
 <resources>
   <string-array name="vpn_types">
     <item>Tanúsítványok</item>
-    <item>PKCS12 fájl</item>
+    <item>PKCS12 fáj</item>
     <item>Android tanúsítvány</item>
     <item>Felhasználónév/Jelszó</item>
     <item>Statikus Kulcsok</item>
diff --git a/main/src/main/res/values-tr/strings.xml b/main/src/main/res/values-tr/strings.xml
index 5f438bea..4c4dfce0 100755
--- a/main/src/main/res/values-tr/strings.xml
+++ b/main/src/main/res/values-tr/strings.xml
@@ -12,7 +12,7 @@
   <string name="port">Sunucu Portu:</string>
   <string name="location">Konum</string>
   <string name="cant_read_folder">Dizin Okunamıyor</string>
-  <string name="select">Seçin</string>
+  <string name="select">Seç</string>
   <string name="cancel">İptal</string>
   <string name="no_data">Veri Yok</string>
   <string name="useLZO">LZO sıkıştırma</string>
@@ -317,4 +317,20 @@
   <string name="userpw_file">Kullanıcı adı / Şifre dosyası</string>
   <string name="imported_from_file">[Buradan içeri aktar: %s]</string>
   <string name="import_log">Kaydı içe aktar:</string>
+  <string name="client_behaviour">İstemci davranışı</string>
+  <string name="loading">Yükleniyor&#8230;</string>
+  <string name="allowed_vpn_apps_info">Izin verilen VPN uygulamaları: %1$s</string>
+  <string name="disallowed_vpn_apps_info">İzin verilmeyen VPN uygulamaları: %1$s</string>
+  <string name="app_no_longer_exists">%s adlı paket artık yüklü değil, izin listesinden çıkarılıyor</string>
+  <string name="vpn_disallow_radio">Seçilen uygulamar dışındaki tüm uygulamalar için VPN kullanılır</string>
+  <string name="vpn_allow_radio">Sadece seçilen uygulamar için VPN kullanılır</string>
+  <string name="query_delete_remote">Uzak sunucu girişi kaldırılsın mı?</string>
+  <string name="keep">Sakla</string>
+  <string name="delete">Sil</string>
+  <string name="add_remote">Yenı uzak sunucu ekle</string>
+  <string name="remote_no_server_selected">En az bir uzak sunucu tanımlamalı ve etkinleştirmelisiniz.</string>
+  <string name="server_list">Sunucu Listesi</string>
+  <string name="vpn_allowed_apps">İzin verilen uygulamalar</string>
+  <string name="advanced_settings">Gelişmiş Ayarlar</string>
+  <string name="tls_settings">TLS Ayarları</string>
 </resources>
diff --git a/main/src/main/res/values-zh-rCN/strings.xml b/main/src/main/res/values-zh-rCN/strings.xml
index a8e002bf..744ab9da 100755
--- a/main/src/main/res/values-zh-rCN/strings.xml
+++ b/main/src/main/res/values-zh-rCN/strings.xml
@@ -91,6 +91,7 @@
   <string name="custom_route_message">输入自定义路由。输入 CIDR 格式地址。</string>
   <string name="custom_route_message_excluded">路线不应该被路由通过VPN。使用相同的语法包括路线。</string>
   <string name="custom_routes_title">自定义路由</string>
+  <string name="custom_routes_title_excluded">排查网络</string>
   <string name="log_verbosity_level">日志详细级别</string>
   <string name="float_summary">允许来自任何 IP 的认证数据包</string>
   <string name="float_title">允许浮服务器</string>
@@ -104,7 +105,9 @@
   <string name="last_openvpn_tun_config">正在打开 tun 设备：</string>
   <string name="local_ip_info">本地 IPv4： %1$s/%2$d IPv6： %3$s MTU： %4$d</string>
   <string name="dns_server_info">DNS 服务器: %1$s, 域名: %2$s</string>
+  <string name="routes_info_incl">路线: %1$s %2$s</string>
   <string name="routes_info_excl">排除的路由： %1$s %2$s</string>
+  <string name="routes_debug">VpnService安装路线 : %1$s %2$s</string>
   <string name="ip_not_cidr">已获得接口信息 %1$s 以及 %2$s，将第二个地址作为远程地址。使用 /32 作为本地掩码。OpenVPN 给出的模式是 \"%3$s\"。</string>
   <string name="route_not_cidr">无法将 %1$s 和 %2$s 作为 CIDR 形式的路由，将使用 /32 的子网掩码。</string>
   <string name="route_not_netip">纠正路由 %1$s/%2$s 为 %3$s/%2$s</string>
-- 
cgit v1.2.3