diff options
| author | 2014-12-03 01:25:10 +0000 | |
|---|---|---|
| committer | 2014-12-03 01:25:17 +0000 | |
| commit | ed3383770e77b88ab0692bee9acef8d78b2cc7a2 (patch) | |
| tree | bddc3d791c7f417a5fd1d5bae327019db1d59d78 | |
| parent | 51bca143862c568507206adf119c9003a4f3f764 (diff) | |
| parent | 44ed3c11489bbad2252639a0e9679f25554a5396 (diff) | |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
| -rw-r--r-- | packages/VpnDialogs/res/values-eu-rES/strings.xml | 2 | ||||
| -rw-r--r-- | packages/VpnDialogs/res/values-zh-rCN/strings.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/VpnDialogs/res/values-eu-rES/strings.xml b/packages/VpnDialogs/res/values-eu-rES/strings.xml index 7467195e1c78..b71650974f99 100644 --- a/packages/VpnDialogs/res/values-eu-rES/strings.xml +++ b/packages/VpnDialogs/res/values-eu-rES/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="prompt" msgid="3183836924226407828">"Konektatzeko eskaera"</string> - <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> VPN bidez konektatu nahi da sareko trafikoa kontrolatzeko. Iturburua fidagarria bada bakarrik baimendu. <br /> <br /> VPN konexioa aktibo dagoenean, <img src=vpn_icon /> agertuko da pantailaren goialdean."</string> + <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> aplikazioak VPN bidezko konexioa ezarri nahi du sareko trafikoa kontrolatzeko. Iturburua fidagarria bada bakarrik baimendu. <br /> <br /> VPN konexioa aktibo dagoenean, <img src=vpn_icon /> agertuko da pantailaren goialdean."</string> <string name="legacy_title" msgid="192936250066580964">"VPN sarera konektatuta dago"</string> <string name="configure" msgid="4905518375574791375">"Konfiguratu"</string> <string name="disconnect" msgid="971412338304200056">"Deskonektatu"</string> diff --git a/packages/VpnDialogs/res/values-zh-rCN/strings.xml b/packages/VpnDialogs/res/values-zh-rCN/strings.xml index a77ba3bd9856..cdea95d6e17a 100644 --- a/packages/VpnDialogs/res/values-zh-rCN/strings.xml +++ b/packages/VpnDialogs/res/values-zh-rCN/strings.xml @@ -16,8 +16,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="prompt" msgid="3183836924226407828">"连接请求"</string> - <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g>想要设置一个VPN连接（可被用于监控网络流量）。请只在您信任该来源的情况下才接受此请求。在VPN处于活动状态时，您的屏幕顶部会显示 <br /> <br /> <img src=vpn_icon /> 图标。"</string> + <string name="prompt" msgid="3183836924226407828">"网络连接请求"</string> + <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g>想要设置一个VPN连接（可被用于监控网络流量）。请只在您信任该来源的情况下才接受此请求。在VPN处于活动状态时，您的屏幕顶部会显示 <img src=vpn_icon /> 图标。"</string> <string name="legacy_title" msgid="192936250066580964">"已连接VPN"</string> <string name="configure" msgid="4905518375574791375">"配置"</string> <string name="disconnect" msgid="971412338304200056">"断开连接"</string> |