Import translations. DO NOT MERGE
Change-Id: Ibffff92fd92f0666f14db1c9f2542950796e783c
Auto-generated-cl: translation import
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 247fc01..bf495ae 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -498,4 +498,22 @@
<item msgid="5656544177755411222">"制限付き中断"</item>
<item msgid="8735337502532332056">"中断なし"</item>
</string-array>
+ <!-- no translation found for proc_stats_memory_states:0 (8845855295876909468) -->
+ <!-- no translation found for proc_stats_memory_states:1 (866544120205026771) -->
+ <!-- no translation found for proc_stats_memory_states:2 (7851902244436886890) -->
+ <!-- no translation found for proc_stats_memory_states:3 (3022922196817563960) -->
+ <!-- no translation found for proc_stats_process_states:0 (5069825997142785829) -->
+ <!-- no translation found for proc_stats_process_states:1 (5779398140277006695) -->
+ <!-- no translation found for proc_stats_process_states:2 (1439598363694578255) -->
+ <!-- no translation found for proc_stats_process_states:3 (3396458970745718652) -->
+ <!-- no translation found for proc_stats_process_states:4 (5214825238247511992) -->
+ <!-- no translation found for proc_stats_process_states:5 (311372689168254967) -->
+ <!-- no translation found for proc_stats_process_states:6 (7438189122367820362) -->
+ <!-- no translation found for proc_stats_process_states:7 (918687422516982498) -->
+ <!-- no translation found for proc_stats_process_states:8 (6807727069641853029) -->
+ <!-- no translation found for proc_stats_process_states:9 (6782857406100845127) -->
+ <!-- no translation found for proc_stats_process_states:10 (2860945127596974299) -->
+ <!-- no translation found for proc_stats_process_states:11 (8610560843693675830) -->
+ <!-- no translation found for proc_stats_process_states:12 (4338089220026248848) -->
+ <!-- no translation found for proc_stats_process_states:13 (6652164677254579050) -->
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c246e0a..155c7f4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -997,8 +997,6 @@
<string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMSアプリを変更しますか？"</string>
<string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMSアプリとして<xliff:g id="CURRENT_APP">%2$s</xliff:g>の代わりに<xliff:g id="NEW_APP">%1$s</xliff:g>を使用しますか？"</string>
<string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMSアプリとして<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか？"</string>
- <string name="phone_application_title" msgid="8232758172983316224">"デフォルトの電話アプリ"</string>
- <string name="phone_change_default_dialog_title" msgid="4972594589432598468">"デフォルト電話アプリを変更しますか？"</string>
<string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"不明なSIM事業者"</string>
<string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$sには既知のプロビジョニングウェブサイトがありません"</string>
<string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
@@ -1345,8 +1343,12 @@
<string name="select_runtime_warning_message" msgid="1937574953265648165">"再起動して、ランタイムを<xliff:g id="OLD">%1$s</xliff:g>から<xliff:g id="NEW">%2$s</xliff:g>に変更しますか？"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Wi-Fi詳細ログの有効化"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wi-Fiローミングスキャンを常に許可する"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"ワイヤレスディスプレイ認証のオプションを表示"</string>
<string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wi-Fiログレベルを上げて、Wi-Fi選択ツールでSSID RSSIごとに表示"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"有効にすると、Wi-Fiの電波強度が弱い場合は強制的にモバイルデータ接続に切り替わるようになります"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"インターフェースのデータトラフィック量に基づいたWi-Fiローミングスキャンを許可するかしないかを設定できます"</string>
<string name="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
<string name="select_logd_size_dialog_title" msgid="1206769310236476760">"各ログバッファのログサイズを選択"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
@@ -1600,6 +1602,24 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"実行時間"</string>
<string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
+ <!-- no translation found for mem_details_title (6548392825497290498) -->
+ <skip />
+ <!-- no translation found for mem_state_subtitle (2407238869781011933) -->
+ <skip />
+ <!-- no translation found for mem_use_subtitle (7319468770222422412) -->
+ <skip />
+ <!-- no translation found for mem_use_kernel_type (8698327165935012484) -->
+ <skip />
+ <!-- no translation found for mem_use_native_type (5976704902328347400) -->
+ <skip />
+ <!-- no translation found for mem_use_kernel_cache_type (6411475064463957513) -->
+ <skip />
+ <!-- no translation found for mem_use_zram_type (9087217476795358232) -->
+ <skip />
+ <!-- no translation found for mem_use_free_type (717708548454880840) -->
+ <skip />
+ <!-- no translation found for mem_use_total (6308786055749777934) -->
+ <skip />
<string name="menu_duration_3h" msgid="4714866438374738385">"3時間"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6時間"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>