Revert "Import translations. DO NOT MERGE"

Broken Build.

This reverts commit e88b7faf434ef1ddecf341e6c3470bc055610bb7

Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076

1 files changed, 12 insertions, 42 deletions

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a873c0e..fb378c9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -602,7 +602,6 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"検索しています…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"デバイス名を変更"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"ピアデバイス"</string>
-    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"接続履歴のあるグループ"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"接続できませんでした。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"端末の名前を変更できませんでした。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"切断しますか？"</string>
@@ -610,8 +609,6 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"切断すると、<xliff:g id="PEER_NAME">%1$s</xliff:g>と他の<xliff:g id="PEER_COUNT">%2$s</xliff:g>個のデバイスの接続が停止します。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
-    <string name="wifi_p2p_delete_group_title" msgid="8049872630241986374">"グループを削除"</string>
-    <string name="wifi_p2p_delete_group_message" msgid="5521624017163200215">"グループ<xliff:g id="GROUP_NAME">%1$s</xliff:g>を削除しますか？"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</string>
@@ -684,16 +681,17 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙の選択先:"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"スクリーンセーバー"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ホルダー装着時またはスリープ/充電時"</string>
-    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"いずれか"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="3642352561593337637">"スリープ/充電時"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ホルダー装着時"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"ホルダー装着時またはスリープ/充電時"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"スリープ/充電時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"ホルダー装着時"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"無効"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="2060724968623677666">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスクリーンセーバーをONにします。"</string>
-    <string name="screensaver_settings_start_dreaming" msgid="1695787491111862810">"スクリーンセーバーを開始"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="9110320844270942351">"スクリーンセーバー開始のタイミング"</string>
-    <!-- no translation found for screensaver_settings_dream_start (1265346994126658796) -->
-    <skip />
+    <string name="screensaver_component_title" msgid="5786117148360329058">"選択されているスクリーンセーバー"</string>
+    <string name="screensaver_timeout_title" msgid="4882666970355550822">"開始のタイミング"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
+    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"設定しない"</string>
+    <string name="screensaver_test" msgid="3048249263811694128">"プレビュー"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"スリープ時に起動する"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"ホルダー装着時に起動する"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"フォントサイズ"</string>
@@ -1400,34 +1398,6 @@
     <string name="gadget_title" msgid="5519037532720577836">"電源管理"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi設定の更新"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
-    <!-- no translation found for gadget_state_template (5156935629902649932) -->
-    <skip />
-    <!-- no translation found for gadget_state_on (6909119593004937688) -->
-    <skip />
-    <!-- no translation found for gadget_state_off (5220212352953066317) -->
-    <skip />
-    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
-    <skip />
-    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
-    <skip />
-    <!-- no translation found for gadget_wifi (5960290421313061434) -->
-    <skip />
-    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
-    <skip />
-    <!-- no translation found for gadget_gps (1558173602059236567) -->
-    <skip />
-    <!-- no translation found for gadget_sync (858895763714222152) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_template (930541920933123603) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_auto (6667967252426515446) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
-    <skip />
-    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
-    <skip />
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ストレージからのインストール"</string>
@@ -1613,7 +1583,6 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"ウィンドウアニメスケール"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"トランジションアニメスケール"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator再生時間スケール"</string>
-    <string name="overlay_display_devices_title" msgid="5364176287998398539">"2次画面シミュレート"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"アプリ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"アクティビティを保持しない"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ユーザーが離れたアクティビティを直ちに破棄する"</string>
@@ -1740,7 +1709,8 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
-    <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
     <string name="user_list_title" msgid="2152311434413878709">"ユーザー"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
     <string name="user_details_title" msgid="3037625632127241370">"詳細情報の編集"</string>