From 7bdc51c2a9ad53e194f4966085cc7a0a890235e4 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 5 Jul 2012 10:40:33 +0200
Subject: add translations fixes for zh, es (closes issue #44, closes #45) make
 a few left out strings translatable (closes issue #44)

---
 res/values-es/strings.xml |  9 +++++----
 res/values-zh/arrays.xml  | 28 ++++++++++++++++++++++++++++
 res/values-zh/strings.xml |  8 ++++----
 res/values/strings.xml    | 10 ++++++++--
 res/xml/vpn_headers.xml   | 10 +++++-----
 5 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 res/values-zh/arrays.xml

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 712b9744..7d72c70b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -175,19 +175,20 @@
     <string name="generated_config">"Configuración generada"</string>
     <string name="generalsettings">"Ajustes generales"</string>
     <string name="owner_fix">"Corregir la propiedad de /dev/tun"</string>
+<string name="owner_fix_summary">Intentar definir la propriedad de /dev/tun como system. Algunos firmwares CM9 lo necesita para que la API VPNService funcione. Necesita root.</string>
     <string name="generated_config_summary">"Muestra el archivo de configuración de OpenVPN generado"</string>
-    <string name="edit_profile_title">"Editar \" %s \""</string>
+    <string name="edit_profile_title">"Editar \"%s\""</string>
     <string name="building_configration">"Generando configuración…"</string>
     <string name="netchange_summary">"Habilitar esta opción obliga la reconexión si el estado de la red se cambia (Wi-Fi a móvil, y al revés)"</string>
     <string name="netchange">"Reconectar si la red se cambia"</string>
     <string name="cert_from_keystore">"Tiene certificado de '%s' del llavero"</string>
     <string name="netstatus">"Estado de red: %s"</string>
     <string name="select_file">"Seleccionar"</string>
-    <string name="show_log_summary">"Muestra la ventana de registro cuando se establece la conexión. La ventana de registro se puede acceder de la barra de notificaciones."</string>
+    <string name="show_log_summary">"Mostrar la ventana de registro cuando se establece la conexión. La ventana de registro se puede acceder de la barra de notificaciones."</string>
     <string name="show_log_window">"Mostrar ventana de registro"</string>
-    <string name="keppstatus_summary">"Mantenga la notificación mostrada después de que la conexión se establece para mostrar las estadísticas de tráfico."</string>
+    <string name="keppstatus_summary">"Mantener la notificación mostrada después de que la conexión se establece, para mostrar las estadísticas de tráfico."</string>
     <string name="keepstatus">"Mostrar estadísticas de tráfico"</string>
     <string name="mobile_info">"Correr en %1$s (%2$s) %3$s, Android API %4$d"</string>
 	<string name="translationby">Traducción español por Gerard Bonner
-&lt;gbonner689@gmail.com</string>
+   &lt;59539051+ovpntrans.es@mail.dcu.ie&gt;</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-zh/arrays.xml b/res/values-zh/arrays.xml
new file mode 100644
index 00000000..1a78cb8e
--- /dev/null
+++ b/res/values-zh/arrays.xml
@@ -0,0 +1,28 @@
+<resources>
+	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
+    <string-array name="vpn_types">
+        <item>"证书"</item>
+        <item>"PKCS12 文件"</item>
+        <item>"Android 证书"</item>
+        <item>"用户名/密码"</item>
+        <item>"静态密钥"</item>
+        <item>"用户名/密码 + 证书"</item>
+        <item>"用户名/密码 + PKCS12 "</item>
+        <item>"用户名/密码 + Android"</item>
+    </string-array>
+
+    <string-array name="tls_directions_entries">
+        <item>"0"</item>
+        <item>"1"</item>
+        <item>"未指定"</item>
+    </string-array>
+      <string-array name="verb_entries">
+        <item>"0 - 无记录"</item>
+        <item>"1 - 默认详细级别"</item>
+        <item>"2 - 多详细"</item>
+        <item>"3"</item>
+        <item>"4"</item>
+        <item>"5 - 调试记录"</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 03577617..3f93f78e 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -14,7 +14,7 @@
   limitations under the License.
 --><resources>
 
-    <string name="app">"OpenVPN为Android"</string>
+    <string name="app">"OpenVPN 为 Android"</string>
     <string name="address">"服务器地址："</string>
     <string name="port">"服务器端口："</string>
     <string name="location">"地点"</string>
@@ -76,7 +76,7 @@
     <string name="dns">"DNS"</string>
     <string name="override_dns">"覆盖服务器 DNS 设定"</string>
     <string name="dns_override_summary">"使用自定义 DNS 服务器"</string>
-    <string name="searchdomain">"sea​​rchDomain"</string>
+    <string name="searchdomain">"searchDomain"</string>
     <string name="dns1_summary">"要使用的 DNS 服务器。"</string>
     <string name="dns_server">"DNS 服务器"</string>
     <string name="secondary_dns_message">"如果无法达到主 DNS 服务器，要使用辅助 DNS 服务器。"</string>
@@ -156,7 +156,7 @@
    <string name="show_log_window">"显示记录窗口"</string>
         <string name="keepstatus">"显示流量统计"</string>
     <string name="mobile_info">"运行 %1$s （ %2$s ） %3$s ，Android API %4$d"</string>
-    	<string name="translationby">中文翻译： 白达卫 （Gerard Bonner）
-&lt;gbonner689@gmail.com</string>
+    	<string name="translationby">中文翻译： 白达卫
+&lt;59539051+ovpntrans.zh@mail.dcu.ie&gt;</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e764b4e8..6cdfcc7e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -222,10 +222,16 @@
     <string name="keychain_jellybeans">Reading from Android Keystore does not work in Jelly Beans (Google change the way private keys are returned)</string>
     <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialog are for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
     <string name="faq_system_dialogs_title">Connection warning and notification sound</string>
-    <!--  <string name="translationby"></string> -->
+    <string name="translationby"></string> 
     <!--
-    When translating use a string like this: --> 
+    When translating use a string like this:  
     <string name="translationby">English translation by Arne Schwabe&lt;arne@rfc2549.org></string>
+    -->
+    <string name="ipdns">IP and DNS</string>
+    <string name="basic">Basic</string>
+    <string name="routing">Routing</string>
+    <string name="obscure">Obscure OpenVPN Settings. Normally not needed.</string>
+    <string name="advanced">Advanced</string>
     
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index 9d051a4d..495c2c72 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -4,15 +4,15 @@
     <header
         android:id="@+id/basicsettingsid"
         android:fragment="de.blinkt.openvpn.Settings_Basic"
-        android:title="Basic" />
+        android:title="@string/basic" />
     <!-- android:icon="@drawable/ic_settings_applications" -->
 
     <header
         android:fragment="de.blinkt.openvpn.Settings_IP"
-        android:title="IP and DNS" />
+        android:title="@string/ipdns" />
     <header
         android:fragment="de.blinkt.openvpn.Settings_Routing"
-        android:title="Routing" />
+        android:title="@string/routing" />
     <header
         android:fragment="de.blinkt.openvpn.Settings_Authentication"
         android:title="@string/settings_auth" />
@@ -20,8 +20,8 @@
     <!-- android:icon="@drawable/ic_settings_display" -->
     <header
         android:fragment="de.blinkt.openvpn.Settings_Obscure"
-        android:summary="Obscure OpenVPN Settings. Normally not needed."
-        android:title="Advanced" >
+        android:summary="@string/obscure"
+        android:title="@string/advanced" >
     </header>
     <header
         android:fragment="de.blinkt.openvpn.ShowConfigFragment"
-- 
cgit v1.2.3