Merge branch 'develop' into release-0.8.0

1 files changed, 39 insertions, 18 deletions

diff --git a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
index e467dd5b..bd155362 100755
--- a/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
+++ b/app/src/main/res/values-zh-rTW/strings-icsopenvpn.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (c) 2012-2014 Arne Schwabe
+  ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
+  -->
+<!-- Generated by crowdin.net -->
 <resources>
 
   <string name="address">伺服器地址:</string>
@@ -19,9 +24,10 @@
   <string name="copyright_guicode">取得原始碼與個案追蹤，可上 http://code.google.com/p/ics-openvpn/</string>
   <string name="copyright_others">本程序使用了以下元件，其作者和授權資訊如下</string>
   <string name="about">關於</string>
+  <string name="vpn_list_title">設定檔</string>
   <string name="vpn_type">類型</string>
   <string name="pkcs12pwquery">PKCS12 密碼</string>
-  <string name="file_select">選擇…</string>
+  <string name="file_select">選擇&#8230;</string>
   <string name="file_nothing_selected">你必須選擇一個檔案</string>
   <string name="useTLSAuth">使用傳輸層防火牆(TLS-Auth)</string>
   <string name="tls_direction">TLS方向</string>
@@ -43,19 +49,22 @@
   <string name="ipv4_format_error">解析IPv4地址時發生錯誤</string>
   <string name="custom_route_format_error">解析自訂路由時發生錯誤</string>
   <string name="vpn_shortcut">OpenVPN捷徑</string>
-  <string name="vpn_launch_title">連接到VPN</string>
+  <string name="vpn_launch_title">連線到VPN</string>
   <string name="shortcut_profile_notfound">在快捷方式找不到指定的設定檔</string>
   <string name="random_host_prefix">隨機主機名稱字首</string>
   <string name="random_host_summary">在主機名稱前加入6個隨機字符</string>
   <string name="custom_config_title">啟用自訂選項</string>
   <string name="custom_config_summary">自訂選項，使用時請小心！</string>
   <string name="route_rejected">路由被Android拒絕</string>
-  <string name="cancel_connection">斷線</string>
+  <string name="cancel_connection">中斷連線</string>
+  <string name="cancel_connection_long">中斷VPN連線</string>
   <string name="clear_log">清除記錄檔</string>
   <string name="title_cancel">確認取消</string>
+  <string name="cancel_connection_query">中斷已連接的VPN/取消正在嘗試的連線？</string>
   <string name="remove_vpn">移除VPN</string>
-  <string name="check_remote_tlscert">檢查對方出示的是否TLS伺服器憑證</string>
-  <string name="check_remote_tlscert_title">預期對方出示TLS伺服器憑證</string>
+  <string name="check_remote_tlscert_title">預計TLS服務器證書</string>
+  <string name="remote_tlscn_check_summary">檢查遠程服務器證書的主題DN</string>
+  <string name="remote_tlscn_check_title">證書的主機名檢查</string>
   <string name="tls_key_auth">啟用傳輸層防火牆(TLS-Auth)</string>
   <string name="tls_auth_file">TLS驗證檔</string>
   <string name="pull_on_summary">向伺服器請求IP地址, 路由和時間資訊</string>
@@ -117,7 +126,9 @@
   <string name="import_vpn">匯入</string>
   <string name="ipv4">IPv4</string>
   <string name="ipv6">IPv6</string>
-  <string name="speed_waiting">等待狀態訊息…</string>
+  <string name="speed_waiting">等待狀態訊息&#8230;</string>
+  <string name="converted_profile">匯入設定檔</string>
+  <string name="converted_profile_i">匯入設定檔%d</string>
   <string name="pkcs12_file_encryption_key">PKCS12檔加密金鑰</string>
   <string name="private_key_password">私密金鑰密碼</string>
   <string name="password">密碼</string>
@@ -128,45 +139,55 @@
   <string name="owner_fix">修正 /dev/tun 的擁有者</string>
   <string name="generated_config_summary">顯示本程序生成的設定檔</string>
   <string name="edit_profile_title">正在編輯\"%s\"</string>
-  <string name="building_configration">正在生成設定檔…</string>
-  <string name="netchange_summary">當網絡狀況變更時強制重新連接(例如從WiFi變成手機網絡，反之亦然)</string>
-  <string name="netchange">網絡異動時重新連接</string>
+  <string name="building_configration">正在生成設定檔&#8230;</string>
+  <string name="netchange_summary">若切換此選項當網絡狀況變更時將強制重新連線(例如從WiFi變成手機網絡，反之亦然)</string>
+  <string name="netchange">網絡異動時重新連線</string>
   <string name="netstatus">網絡狀態: %s</string>
   <string name="select_file">選擇</string>
+  <string name="show_log_summary">連接時顯示記錄檔視窗。記錄檔視窗可以隨時從通知欄中進入。</string>
   <string name="show_log_window">顯示記錄視窗</string>
   <string name="mobile_info">於 %1$s (%2$s) %3$s 上運行, Android API 版本: %4$d</string>
   <string name="faq_system_dialogs_title">連線警告和通知時發出音效</string>
-  <string name="translationby">繁體中文 由 羊羊@自由網絡研究中心 &lt;sora8964@gmail.com&gt; 翻譯</string>
+  <string name="translationby">繁體中文</string>
   <string name="ipdns">IP和DNS</string>
   <string name="basic">基本</string>
   <string name="routing">路由</string>
   <string name="obscure">鮮為人知的OpenVPN設定，一般情況下不需要派上用場。</string>
   <string name="advanced">進階</string>
   <string name="export_config_title">ICS Openvpn 設定</string>
-  <string name="warn_no_dns">沒有任何DNS伺服器可用，可能無法進行網域名稱解析。請考慮設置自訂的DNS伺服器</string>
   <string name="faq_howto_title">快速入門</string>
   <string name="setting_loadtun_summary">在連線前嘗試載入Tun模組，需要Root。</string>
   <string name="setting_loadtun">載入Tun模組</string>
   <string name="getproxy_error">取得代理伺服器資訊時發生錯誤: %s</string>
   <string name="using_proxy">使用代理伺服器 %1$s %2$d</string>
   <string name="use_system_proxy">使用系統代理</string>
-  <string name="use_system_proxy_summary">使用系統配置的 HTTP/HTTPS 代理伺服器進行連接。</string>
+  <string name="use_system_proxy_summary">使用系統配置的 HTTP/HTTPS 代理伺服器進行連線。</string>
   <string name="donatewithpaypal">你可以透過 &lt;a href=\"https://www.paypal.com/cgi-bin/webscr?hosted_button_id=R2M6ZP9AF25LS&amp;amp;cmd=_s-xclick\"&gt;PayPal&lt;/a&gt; 提供捐助</string>
-  <string name="onbootrestartsummary">如果在重新開機或關機前正連接VPN，開機時自動重新連接。在使用這個選項之前請先閱讀連線警告FAQ。</string>
-  <string name="onbootrestart">開機時重新連接</string>
+  <string name="onbootrestartsummary">如果在重新開機或關機前正連線VPN，開機時自動重新連線。在使用這個選項之前請先閱讀連線警告FAQ。</string>
+  <string name="onbootrestart">開機時重新連線</string>
   <string name="ignore">忽略</string>
   <string name="restart">重置</string>
   <string name="restart_vpn_after_change">配置變更只會在重新啟動VPN時才生效，現在要(重新)啟動VPN嗎？</string>
   <string name="configuration_changed">設定已變更</string>
+  <string name="log_no_last_vpn">無法判斷最後一次連線使用的設定檔，因此無法編輯設定檔。</string>
   <string name="faq_duplicate_notification_title">重複的通知</string>
   <string name="faq_routing_title">路由/網絡介面 設定</string>
   <string name="openvpn_log">OpenVPN 運作記錄</string>
   <string name="import_config">匯入 OpenVPN 配置</string>
   <string name="battery_consumption_title">電池消耗</string>
   <string name="vpn_tethering_title">VPN與可攜式無線基地台</string>
-  <string name="connection_retries">連線重試次數</string>
-  <string name="connectretrymessage">嘗試重新連線之間的等待秒數</string>
-  <string name="connectretrywait">重新連接間隔時間</string>
+  <string name="connection_retries">重新連線次數</string>
+  <string name="reconnection_settings">重新連線設定</string>
+  <string name="connectretrymessage">嘗試重新連線之間的等待秒數。</string>
+  <string name="connectretrywait">重新連線的間隔時間</string>
   <string name="minidump_generated">OpenVPN非預期地崩潰，你或者會考慮在主選單下傳送Minidump給開發人員。</string>
   <string name="send_minidump">向開發人員傳送Minidump</string>
+  <string name="state_connecting">連線中</string>
+  <string name="state_connected">已連線</string>
+  <string name="state_disconnected">中斷連線</string>
+  <string name="state_reconnecting">正在重新連線</string>
+  <string name="state_tcp_connect">連線中 (TCP)</string>
+  <string name="notifcation_title_notconnect">未連線</string>
+  <string name="start_vpn_title">正在連接至 VPN %s</string>
+  <string name="start_vpn_ticker">正在連接至 VPN %s</string>
 </resources>