Import translations. DO NOT MERGE
Change-Id: Id1d79b0917bd6e59425a959a3038fd05e1490c18
Auto-generated-cl: translation import
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 3459135..ef3c07f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -389,9 +389,9 @@
<item msgid="3025431211013424097">"16M"</item>
</string-array>
<string-array name="select_logd_size_lowram_titles">
- <item msgid="524799395770610154">"64 K"</item>
- <item msgid="3534782711045262344">"256 K"</item>
- <item msgid="8085867209202153403">"1 M"</item>
+ <item msgid="524799395770610154">"64K"</item>
+ <item msgid="3534782711045262344">"256K"</item>
+ <item msgid="8085867209202153403">"1M"</item>
</string-array>
<string-array name="select_logd_size_summaries">
<item msgid="7346595473588765019">"64K/ログバッファ"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 99cf56e..176e63d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -52,7 +52,7 @@
<string name="radioInfo_service_off" msgid="1434084741785525415">"無線通信をOFF"</string>
<string name="radioInfo_roaming_in" msgid="9045363884600341051">"ローミング"</string>
<string name="radioInfo_roaming_not" msgid="2851853244069662307">"ローミングなし"</string>
- <string name="radioInfo_phone_idle" msgid="7489244938838742820">"アイドル"</string>
+ <string name="radioInfo_phone_idle" msgid="7489244938838742820">"非アクティブ"</string>
<string name="radioInfo_phone_ringing" msgid="4883724645684297895">"着信中"</string>
<string name="radioInfo_phone_offhook" msgid="4174402846862780998">"通話中"</string>
<string name="radioInfo_data_disconnected" msgid="1959735267890719418">"切断"</string>
@@ -630,6 +630,8 @@
<string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
<string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
<string name="wifi_menu_advanced" msgid="7522252991919573664">"詳細設定"</string>
+ <string name="wifi_menu_apps" msgid="6003687912727859577">"アプリを表示"</string>
+ <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi強度を表示"</string>
<string name="wifi_menu_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
<string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
<string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
@@ -2439,13 +2441,14 @@
<string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動的にON"</string>
<string name="summary_divider_text" msgid="7228986578690919294">"、 "</string>
<string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"なし"</string>
- <string name="zen_mode_phone_calls" msgid="2872774457193013585">"電話"</string>
+ <string name="zen_mode_phone_calls" msgid="8956214416859303966">"通話"</string>
<string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
- <string name="zen_mode_from" msgid="1777739391289980762">"送信/発信元"</string>
+ <string name="zen_mode_from" msgid="1033337300289871697">"発信/送信元"</string>
<string name="zen_mode_from_anyone" msgid="1180865188673992959">"全員"</string>
<string name="zen_mode_from_contacts" msgid="8751503728985572786">"連絡先のみ"</string>
<string name="zen_mode_from_starred" msgid="2168651127340381533">"スター付きの連絡先のみ"</string>
- <string name="zen_mode_alarm_info" msgid="5061362593677527505">"アラームやその他の個人的な通知が最優先されます"</string>
+ <string name="zen_mode_events" msgid="2456995649835437565">"予定とリマインダー"</string>
+ <string name="zen_mode_alarm_info" msgid="3195430795475795398">"アラームは常に優先して通知されます"</string>
<string name="zen_mode_when" msgid="2767193283311106373">"自動的にON"</string>
<string name="zen_mode_when_never" msgid="8809494351918405602">"設定しない"</string>
<string name="zen_mode_when_every_night" msgid="3122486110091921009">"毎日の夜間"</string>