auto import from //depot/cupcake/@137055

2 files changed, 31 insertions, 18 deletions

diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 4f7d8d5..d73a3d7 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -55,18 +55,15 @@
     <item>"電源接続時はスリープしない"</item>
     <item>"スリープしない"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU使用状況"</item>
-    <item>"ネットワーク使用状況"</item>
-    <item>"センサー使用状況"</item>
-    <item>"画面をONにした時刻"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"デバイスリセットからの経過時間"</item>
-    <item>"前回起動時より前"</item>
-    <item>"起動時からの経過時間"</item>
-    <item>"バッテリ使用開始からの経過時間"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"使用時間"</item>
     <item>"起動回数"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bc481c2..f1c2414 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"切断"</string>
     <string name="bluetooth_disconnecting">"切断中..."</string>
     <string name="bluetooth_connecting">"接続中..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"この端末をペアに設定する"</string>
     <string name="bluetooth_pairing">"ペアとして設定中..."</string>
-    <string name="bluetooth_paired">"ペア設定。切断。"</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"ハンズフリー/ヘッドセット"</string>
     <string name="progress_scanning">"スキャン中"</string>
     <string name="bluetooth_notif_ticker">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title">"ペア設定リクエスト"</string>
-    <string name="bluetooth_notif_message">"ペアとして設定"</string>
+    <string name="bluetooth_notif_message">"ペアとして設定 "</string>
     <string name="date_and_time">"日付形式"</string>
     <string name="date_time_12_hour_sample">"1:00 PM"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"タイムゾーンの選択"</string>
     <string name="display_preview_label">"プレビュー:"</string>
     <string name="display_font_size_label">"フォントサイズ:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g>を送信"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"SDカードをフォーマット"</string>
     <string name="sd_format_summary">"SDカードをフォーマット（消去）"</string>
     <string name="sd_unavailable">"使用不可"</string>
-    <string name="read_only">"（読み取り専用）"</string>
+    <string name="read_only">" （読み取り専用）"</string>
     <string name="battery_status_title">"電池の状態:"</string>
     <string name="battery_level_title">"電池残量"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary">"擬似ロケーションを許可"</string>
-    <string name="gadget_picker_title">"ガジェットを選択"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"UID %dの詳細"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g>のネットワーク使用状況の詳細:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"このUIDを共有するパッケージ:"</string>
     <string name="battery_history_no_data">"バッテリ使用状況のデータは利用できません"</string>
     <string name="battery_history_sensor">"センサー:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"パッケージで使用されるセンサー:"</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g>により<xliff:g id="COUNT">%1$d</xliff:g>回使用"</string>
     <string name="battery_history_sensor_usage_multi">"次のいずれかにより<xliff:g id="COUNT">%1$d</xliff:g>回使用:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"画面をONで使用した時間:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"バッテリ使用開始:"</string>
     <string name="battery_history_screen_on_plugged">"電源に接続:"</string>
     <string name="usage_stats_label">"使用統計情報"</string>