From 39a3d1c9cd3ff85abb24eafa115a31b0751d9eb5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 18 Jul 2012 00:34:30 +0200
Subject: - Remove not translatable strings - remove the experiential config
 importer string. The Importer should be quite stable now

---
 res/values-de/strings.xml |  1 -
 res/values-es/strings.xml |  6 ------
 res/values-ko/strings.xml |  2 --
 res/values-zh/strings.xml | 11 ++---------
 res/values/strings.xml    |  2 --
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0821ac89..77cf807e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,7 +46,6 @@
     <string name="import_done">Konfigurationsdatei lesen abgeschlossen.</string>
     <string name="nobind_summary">Binde nicht an lokalen Port und IP Adresse</string>
     <string name="no_bind">Kein lokales Binden</string>
-    <string name="import_experimental">Bitte beachten Sie, dass der Konfigurations Importer ein experimentelles Feature ist. Sollte dieser für Sie nicht funktionieren oder sollten Sie Verbeserungsvorschläge haben, schreiben Sie mir bitte eine Email.</string>
     <string name="import_configuration_file">Importiere Konfigurationsdatei</string>
     <string name="import_vpn">Importieren</string>
     <string name="speed_waiting">Warte auf OpenVPN Status Nachricht…</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 95506916..dfaeedb4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,8 +17,6 @@
     <string name="app">OpenVPN para Android</string>
     <string name="address">Dirección del servidor:</string>
     <string name="port">Puerto del servidor:</string>
-    <string name="defaultserver">openvpn.uni-paderborn.de</string>
-    <string name="defaultport">1194</string>
     <string name="location">Ubicación</string>
     <string name="cant_read_folder">¡carpeta no se puede leer!</string>
     <string name="select">Seleccionar</string>
@@ -33,9 +31,6 @@
     <string name="no_certificate">No hay nada seleccionado</string>
     <string name="copyright_guicode">El código fuente y seguimiento de problemas están disponibles a http://code.google.com/p/ics-openvpn/ </string>
     <string name="copyright_others">Este programa utiliza los siguientes componentes. Ver la fuente para detalles completos sobre las licencias.</string>
-    <string name="openvpn">OpenVPN</string>
-    <string name="lzo">LZO</string>
-    <string name="openssl">OpenSSL</string>
     <string name="about">Acerca de</string>
     <string name="about_summary">Acerca de OpenVPN para Android</string>
     <string name="vpn_list_summary">Lista de todas las VPNs configuradas</string>
@@ -163,7 +158,6 @@
     <string name="import_done">Lectura del archivo de configuración terminada.</string>
     <string name="nobind_summary">No enlazar a la dirección local y el puerto</string>
     <string name="no_bind">Sin enlazamiento local</string>
-    <string name="import_experimental">Por favor, ten en cuenta que importador de configuración es una característica experimental. Si no funciona para ti o crees que se podría mejorar, mándame un correo.</string>
     <string name="import_configuration_file">Importar archivo de configuración</string>
     <string name="faq_security_title">Seguridad</string>
     <string name="import_vpn">Importar</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 714ba52a..38978bfb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -163,7 +163,6 @@
     <string name="import_done">설정 파일 읽기 완료</string>
     <string name="nobind_summary">로컬 주소와 포트로 바인드 안하기</string>
     <string name="no_bind">로컬 바인딩 안함</string>
-    <string name="import_experimental">Please not that the config importer is an experimental feature. If it does not work for you or you think that things could be done better please drop me a email.</string>
     <string name="import_configuration_file">설정 파일 가져오기</string>
     <string name="faq_security_title">보안 고려 사항</string>
     <string name="faq_security">"OpenVPN은 보안에 민감하기 때문에 보안에 관련된 부분을 알고가는것이 현명하다. SD카드의 있는 데이터는 기본적으로 보안이 취약하다. 모든 앱이 읽을 수 있기 때문이다 (예로 이 프로그램 또한 SD카드의 읽기 권한이 필요없다). 본앱의 데이터는 본앱만이 읽을 수 있다. cacert/cert/key를 파일 탐색기의 가져오기 옵션을 사용하면 데이터는 VPN 프로파일 내에 저장된다. VPN 프로파일은 본앱만이 접근할 수 있다. (잊지말고 SD카드에 있는 것을 삭제해라). 접근은 본앱만이 가능하더라도 데이터는 암호화가 되어있지 않다. 루팅을 비롯한 다른 방법을 악용하여 데이터를 빼낼수있다. 암호 또한 일반 텍스트로 저장되어 있다. pkcs12 파일은 안드로이드 keystore에 보관할것을 강력하게 추천한다."</string>
@@ -203,7 +202,6 @@
     <string name="keepstatus">트래픽 통계 보기</string>
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
-    <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">시스템에서는 VPN연결 경고를 통해 당신에게 본앱이 모든 트래픽을 가로챌수있다는 점을 알리게 되어 있는데 이는 VPNService API가 남용하는것을 막기 위함이다.\nVPN 연결 알림 (키 아이콘) 또한 안드로이드 시스템에서 부과하는 부분이며 이는 VPN연결을 알리는 신호이다. 어떤 버전에서는 소리를 알림으로 사용하는 경우도 있다.\n안드로이드는 이같은 방법을 당신의 안전을 위해 도입하였으며 사용은 필수적이다. (어떤 버전에서는 유감스럽게도 소리 알림 또한 포함된다.)</string>
     <string name="faq_system_dialogs_title">연결 경고와 알림 소리</string>
     <string name="translationby">한국어 번역 (주)기가드 안규태&lt;ktdann@gmail.com></string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 3d672a7e..206a7cfb 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -17,8 +17,6 @@
   <string name="app">OpenVPN Android版</string>
   <string name="address">服务器地址：</string>
   <string name="port">服务器端口：</string>
-  <string name="defaultserver">openvpn.uni-paderborn.de</string>
-  <string name="defaultport">1194</string>
   <string name="location">地点</string>
   <string name="cant_read_folder">无法读取文件夹！</string>
   <string name="select">选择</string>
@@ -31,12 +29,8 @@
   <string name="client_pkcs12_title">PKCS12 文件</string>
   <string name="ca_title">CA 证书</string>
   <string name="no_certificate">无证书</string>
-  <string name="openvpn">OpenVPN</string>
-  <string name="file_dialog">文件</string>
-  <string name="lzo">LZO</string>
-  <string name="openssl">OpenSSL</string>
-  <string name="about">关于</string>
-  <string name="about_summary">关于 OpenVPN Android版</string>
+<string name="about">关于</string>
+  <string name="about_summary">关于  Android版</string>
   <string name="vpn_list_summary">已配置的 VPN 列表</string>
   <string name="vpn_list_title">VPN列表</string>
   <string name="vpn_type">VPN类型</string>
@@ -137,7 +131,6 @@
   <string name="importing_config">从 %1$s 中导入配置文件</string>
   <string name="import_done">读取配置文件完成</string>
   <string name="nobind_summary">不关联到本地地址和端口</string>
-  <string name="import_experimental">请注意，设置导入是一个实验性功能。如果发生错误，或有任何建议请给我发电子邮件。</string>
   <string name="import_configuration_file">导入配置文件</string>
   <string name="faq_security_title">安全注意</string>
   <string name="import_vpn">导入</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d4604db7..f33cd74d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -179,7 +179,6 @@
     <string name="import_done">Done reading config file.</string>
     <string name="nobind_summary">Do not bind to local address and port</string>
     <string name="no_bind">No local binding</string>
-    <string name="import_experimental">Please not that the config importer is an experimental feature. If it does not work for you or you think that things could be done better please drop me a email.</string>
     <string name="import_configuration_file">Import configuration file</string>
     <string name="faq_security_title">Security considerations</string>
     <string name="faq_security">"As OpenVPN is security sensitive a few notes about security are sensible. All data on the sdcard is inherently insecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the VPN profile. The VPN profiles are only accessible by this application. (Do not forget to delete the copies on the sd card afterwards). Even though accessible only by this application the data is still unencrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>
@@ -219,7 +218,6 @@
     <string name="keepstatus">Show Traffic Statistics</string>
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
-    <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> 
-- 
cgit v1.2.3