Import translations. DO NOT MERGE
Change-Id: I0a6f821b47bcd8d1a67f6c7436eb79b5bd9b6798
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 1070d46..33a4e72 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -79,10 +79,34 @@
<item msgid="4907380534957572531">"高い"</item>
<item msgid="4699640516390840297">"非常に高い"</item>
</string-array>
- <!-- no translation found for wifi_status:10 (6367044185730295334) -->
- <!-- no translation found for wifi_status:11 (503942654197908005) -->
- <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
- <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
+ <string-array name="wifi_status">
+ <item msgid="1922181315419294640"></item>
+ <item msgid="8934131797783724664">"スキャン中..."</item>
+ <item msgid="8513729475867537913">"接続中..."</item>
+ <item msgid="515055375277271756">"認証中..."</item>
+ <item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
+ <item msgid="4221763391123233270">"接続済み"</item>
+ <item msgid="624838831631122137">"保留中"</item>
+ <item msgid="7979680559596111948">"切断中..."</item>
+ <item msgid="1634960474403853625">"切断されました"</item>
+ <item msgid="746097431216080650">"失敗しました"</item>
+ <item msgid="6367044185730295334">"ブロック中"</item>
+ <item msgid="503942654197908005">"接続不良により一時的に無効"</item>
+ </string-array>
+ <string-array name="wifi_status_with_ssid">
+ <item msgid="7714855332363650812"></item>
+ <item msgid="8878186979715711006">"スキャン中..."</item>
+ <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続中..."</item>
+ <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>による認証中..."</item>
+ <item msgid="7928343808033020343">"IPアドレスを<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から取得中..."</item>
+ <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続しました"</item>
+ <item msgid="1330262655415760617">"保留中"</item>
+ <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
+ <item msgid="197508606402264311">"切断されました"</item>
+ <item msgid="8578370891960825148">"失敗しました"</item>
+ <item msgid="5660739516542454527">"ブロック中"</item>
+ <item msgid="1805837518286731242">"接続不良により一時的に無効"</item>
+ </string-array>
<!-- no translation found for wifi_security:0 (8491993170197127709) -->
<!-- no translation found for wifi_security:1 (6524315248437318854) -->
<!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -90,7 +114,12 @@
<!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->
<!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->
<!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
- <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
+ <string-array name="wifi_eap_method">
+ <item msgid="1160193392455075561">"PEAP"</item>
+ <item msgid="7981731051382306293">"TLS"</item>
+ <item msgid="2892994535305020162">"TTLS"</item>
+ <item msgid="435667726254379514">"PWD"</item>
+ </string-array>
<string-array name="wifi_p2p_wps_setup">
<item msgid="5085064298144493867">"ボタンを押す"</item>
<item msgid="1624323946324499595">"ピアデバイスのPIN"</item>
@@ -135,7 +164,12 @@
<item msgid="3703676222230317933">"起動回数"</item>
<item msgid="2502754479975776899">"アプリ名"</item>
</string-array>
- <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+ <string-array name="wifi_eap_entries">
+ <item msgid="8615575908717909498">"PEAP"</item>
+ <item msgid="8667872640594311615">"TLS"</item>
+ <item msgid="7182812872984827322">"TTLS"</item>
+ <item msgid="2318274046749286642">"PWD"</item>
+ </string-array>
<string-array name="wifi_phase2_entries">
<item msgid="1818786254010764570">"なし"</item>
<item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 95153cb..d9c9c82 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -571,14 +571,11 @@
<string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
<string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
<string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
- <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
- <skip />
+ <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
<string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
- <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
- <skip />
+ <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ネットワークから切断できませんでした"</string>
<string name="wifi_save" msgid="3331121567988522826">"保存"</string>
- <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
- <skip />
+ <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
<string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
<string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高度なWi-Fi設定"</string>
<string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi周波数帯域"</string>
@@ -1586,21 +1583,14 @@
<string name="vpn_cancel" msgid="1979937976123659332">"キャンセル"</string>
<string name="vpn_save" msgid="4233484051644764510">"保存"</string>
<string name="vpn_connect" msgid="8469608541746132301">"接続"</string>
- <!-- no translation found for vpn_edit (8647191407179996943) -->
- <skip />
- <!-- no translation found for vpn_connect_to (5965299358485793260) -->
- <skip />
+ <string name="vpn_edit" msgid="8647191407179996943">"VPNプロフィールの編集"</string>
+ <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>に接続"</string>
<string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
- <!-- no translation found for vpn_create (5628219087569761496) -->
- <skip />
- <!-- no translation found for vpn_menu_edit (408275284159243490) -->
- <skip />
- <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
- <skip />
- <!-- no translation found for vpn_no_network (3050233675132726155) -->
- <skip />
- <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
- <skip />
+ <string name="vpn_create" msgid="5628219087569761496">"VPNプロフィールの追加"</string>
+ <string name="vpn_menu_edit" msgid="408275284159243490">"プロフィールを編集"</string>
+ <string name="vpn_menu_delete" msgid="8098021690546891414">"プロフィールを削除"</string>
+ <string name="vpn_no_network" msgid="3050233675132726155">"ネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
+ <string name="vpn_missing_cert" msgid="7972907102570411501">"証明書がありません。プロフィールを編集してください。"</string>
<string name="trusted_credentials_system_tab" msgid="3984284264816924534">"システム"</string>
<string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ユーザー"</string>
<string name="trusted_credentials_disable_label" msgid="3864493185845818506">"無効にする"</string>