From 12d9d34ecb39f9c3976e8bcfecdfc4148cc89b46 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 16 Dec 2012 10:45:15 +0100
Subject: Update translations again, fix broken Italian string (closes issue
 #116)

---
 res/values-it/strings.xml     |  3 +--
 res/values-zh-rCN/strings.xml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ccd66dc6..f4f52397 100755
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -92,7 +92,7 @@
   <string name="info">Info</string>
   <string name="show_connection_details">Visualizza i dettagli della connessione</string>
   <string name="last_openvpn_tun_config">Ultima configurazione interfaccia OpenVPN:</string>
-  <string name="local_ip_info">IPv4 locale: %1$s/%2$d IPv6: %3$ s MTU: %4$ d</string>
+  <string name="local_ip_info">IPv4 locale: %1$s/%2$d IPv6: %3$s MTU: %4$ d</string>
   <string name="dns_server_info">Server DNS: %s</string>
   <string name="dns_domain_info">Dominio DNS: %s</string>
   <string name="routes_info">Rotte: %s</string>
@@ -174,5 +174,4 @@ Effettuata la lettura del file di configurazione</string>
   <string name="openvpn_log">Log di OpenVPN</string>
   <string name="import_config">Importa configurazione OpenVPN</string>
   <string name="battery_consumption_title">Consumo della batteria</string>
-  <string name="baterry_consumption">Nei miei test la causa principale per il consumo elevato della batteria di OpenVPN sono i pacchetti keepalive. La maggior parte dei server OpenVPN hanno una direttiva di configurazione tipo \' keepalive 10 60\', che si traduce in un pacchetto keepalive dal client al server e al client ogni dieci secondi. &lt;p&gt; Anche se questi pacchetti sono piccoli e non utilizzano drandi quantità di traffico, tengono occupata la rete radio mobile e aumentano il consumo di energia. &lt;p&gt; Non è possibile modificare il settaggio keepalive sul client. Solo l\'amministratore di sistema dell\'OpenVPN può modificare l\'impostazione. Purtroppo &lt;p&gt; utilizzando un keepalive maggiore di 60 secondi, udp ha problemi con alcuni gateway NAT che terminano lo stato per garantire una connessione dopo un timeout breve (60 secondi nei miei test). Utilizzare TCP keepalive lungo funziona, ma si crea un problema di TCP su TCP. (Vedere &lt; un href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\" &gt; perché TCP Over TCP è A Bad Ide &lt;/a&gt;)</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 34c1836d..9bf73221 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -59,6 +59,7 @@
   <string name="cancel_connection_query">断开已连接的 VPN / 取消连接尝试？</string>
   <string name="remove_vpn">删除 VPN</string>
   <string name="check_remote_tlscert">检查服务器是否使用 TLS 服务器证书</string>
+  <string name="remote_tlscn_check_title">证书主机名检查</string>
   <string name="enter_tlscn_title">远程主机名 （CN）</string>
   <string name="tls_key_auth">启用 TLS 密钥认证</string>
   <string name="tls_auth_file">TLS 认证文件</string>
@@ -73,6 +74,7 @@
   <string name="backup_dns">备用 DNS 服务器</string>
   <string name="ignored_pushed_routes">忽略推送路由</string>
   <string name="ignore_routes_summary">忽略服务器推送的路由</string>
+  <string name="default_route_summary">重定向所有流量到VPN</string>
   <string name="use_default_title">使用默认路由</string>
   <string name="custom_route_message">输入自定义路由。输入 CIDR 格式地址。</string>
   <string name="custom_routes_title">自定义路由</string>
@@ -107,9 +109,11 @@
   <string name="chipher_dialog_message">输入 OpenVPN 密钥。留空以使用默认密码</string>
   <string name="settings_auth">认证/加密</string>
   <string name="file_explorer_tab">文件浏览器</string>
+  <string name="inline_file_tab">内联文件</string>
   <string name="import_file">导入</string>
   <string name="error_importing_file">导入文件出错</string>
   <string name="import_error_message">无法导入文件系统文件</string>
+  <string name="inline_file_data">[[内联文件数据]]</string>
   <string name="menu_import">从 ovpn 文件中导入配置文件</string>
   <string name="menu_import_short">导入</string>
   <string name="import_content_resolve_error">无法读取要导入的配置文件</string>
@@ -120,6 +124,7 @@
   <string name="importing_config">从 %1$s 中导入配置文件</string>
   <string name="import_done">读取配置文件完成</string>
   <string name="nobind_summary">不关联到本地地址和端口</string>
+  <string name="no_bind">无本地绑定</string>
   <string name="import_configuration_file">导入配置文件</string>
   <string name="faq_security_title">安全注意</string>
   <string name="import_vpn">导入</string>
@@ -154,6 +159,7 @@
   <string name="routing">路由设置</string>
   <string name="obscure">其他 OpenVPN 设置，一般不需要修改。</string>
   <string name="advanced">高级设置</string>
+  <string name="export_config_title">ICS Openvpn 配置</string>
   <string name="faq_howto_title">快速入门</string>
   <string name="setting_loadtun_summary">尝试在连接之前加载 tun.ko 内核模块。需要 root 权限。</string>
   <string name="setting_loadtun">载入 tun 模块</string>
@@ -165,6 +171,13 @@
   <string name="ignore">忽略</string>
   <string name="restart">重启</string>
   <string name="configuration_changed">配置已更改</string>
+  <string name="faq_duplicate_notification_title">重复的通知</string>
+  <string name="no_vpn_profiles_defined">没有定义 VPN 配置文件</string>
+  <string name="add_new_vpn_hint">使用 &lt; img src =\"ic_menu_add\"/ &gt; 图标以添加新的 VPN</string>
   <string name="persisttun_summary">当 OpenVPN 重连时，也一直使用 VPN 连接。</string>
   <string name="persistent_tun_title">保持 tun 通道</string>
+  <string name="translation">翻译</string>
+  <string name="openvpn_log">OpenVPN 日志</string>
+  <string name="import_config">导入 OpenVPN 配置文件</string>
+  <string name="battery_consumption_title">电池消耗</string>
 </resources>
-- 
cgit v1.2.3