diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 3524fc5..ddf8775 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -47,6 +47,14 @@
     <item msgid="5721688686241190620">"10分"</item>
     <item msgid="7156442995039264948">"30分"</item>
   </string-array>
+    <!-- no translation found for lock_after_timeout_entries:0 (5416834369150305288) -->
+    <!-- no translation found for lock_after_timeout_entries:1 (6736512735606834431) -->
+    <!-- no translation found for lock_after_timeout_entries:2 (8044619388267891375) -->
+    <!-- no translation found for lock_after_timeout_entries:3 (1822002388249545488) -->
+    <!-- no translation found for lock_after_timeout_entries:4 (8538071621211916519) -->
+    <!-- no translation found for lock_after_timeout_entries:5 (5663439580228932882) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (7505084444184116101) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (4621683909972069205) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常に遅い"</item>
     <item msgid="2361722960903353554">"遅い"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d4da77b..10ce312 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -197,6 +197,8 @@
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"使用済みバイト数:"</string>
     <string name="sdcard_settings_scanning_status" msgid="2763464949274455656">"メディア用のSDカードをスキャン中..."</string>
     <string name="sdcard_settings_read_only_status" msgid="5706115860484118911">"読み取り専用としてSDカードをマウントしました"</string>
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
     <string name="next_label" msgid="4693520878012668114">"次へ"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"言語"</string>
     <string name="activity_picker_label" msgid="4910700713930693329">"操作の選択"</string>
@@ -237,6 +239,10 @@
     <string name="date_time_date_format" msgid="436706100255870967">"日付形式"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"アルファベット順"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"タイムゾーン順"</string>
+    <!-- no translation found for lock_after_timeout (9100576335787336455) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (5751027735105958453) -->
+    <skip />
     <string name="security_settings_title" msgid="5168491784222013179">"現在地情報とセキュリティ"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"位置情報とセキュリティの設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -338,14 +344,12 @@
     <string name="bluetooth_profile_headset" msgid="1874975688666658946">"電話"</string>
     <string name="bluetooth_profile_opp" msgid="3799470046565284440">"転送"</string>
     <string name="bluetooth_profile_hid" msgid="3000858580917633478">"入力デバイス"</string>
-    <!-- no translation found for bluetooth_profile_pan (4225813400648547154) -->
-    <skip />
+    <string name="bluetooth_profile_pan" msgid="4225813400648547154">"テザリング"</string>
     <string name="bluetooth_summary_connected_to_a2dp" msgid="510833839847758664">"メディアの音声に接続"</string>
     <string name="bluetooth_summary_connected_to_headset" msgid="4876496372728623918">"携帯電話の音声に接続"</string>
     <string name="bluetooth_summary_connected_to_a2dp_headset" msgid="3045032710457800891">"携帯電話とメディアの音声に接続"</string>
     <string name="bluetooth_summary_connected_to_hid" msgid="8147499644396475561">"入力デバイスに接続されています"</string>
-    <!-- no translation found for bluetooth_summary_connected_to_pan (3157622705092537266) -->
-    <skip />
+    <string name="bluetooth_summary_connected_to_pan" msgid="3157622705092537266">"テザリング接続"</string>
     <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>オプション"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"接続"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetoothデバイスに接続"</string>
@@ -355,8 +359,7 @@
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"入力デバイスに接続されています"</string>
-    <!-- no translation found for bluetooth_pan_profile_summary_connected (7456487225516323485) -->
-    <skip />
+    <string name="bluetooth_pan_profile_summary_connected" msgid="7456487225516323485">"テザリング接続"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"メディアの音声に使用"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"携帯電話の音声に使用"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
@@ -566,6 +569,10 @@
     <string name="memory_size" msgid="6629067715017232195">"合計容量"</string>
     <string name="sd_eject" msgid="6915293408836853020">"SDカードのマウント解除"</string>
     <string name="sd_eject_summary" msgid="3315557796211542962">"SDカードを安全に取り外すためマウントを解除する"</string>
+    <!-- no translation found for ptp_mode (3954718349875117695) -->
+    <skip />
+    <!-- no translation found for ptp_mode_summary (8709697530987890394) -->
+    <skip />
     <string name="sd_insert_summary" msgid="2048640010381803841">"マウントするSDカードを挿入"</string>
     <string name="sd_mount" msgid="5940523765187704135">"SDカードをマウント"</string>
     <string name="sd_mount_summary" msgid="4936591681679097699">"SDカードをマウント"</string>
@@ -634,27 +641,18 @@
     <string name="media_format_gesture_explanation" msgid="4239529439389660159">"ロック解除パターンを入力してSDカードのフォーマット実行を確認する必要があります。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
-    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
-    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ポータブルアクセスポイント"</string>
-    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
-    <skip />
-    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
-    <skip />
-    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
-    <skip />
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"テザリングとポータブルアクセスポイント"</string>
     <string name="tether_settings_summary_usb" msgid="3562431455625637370">"携帯のデータ通信をUSB経由で共有する"</string>
     <string name="tether_settings_summary_wifi" msgid="4690912027002467246">"携帯のデータ通信をポータブルWi-Fiアクセスポイントとして共有する"</string>
-    <!-- no translation found for tether_settings_summary_bluetooth (4363059913219151114) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_usb_wifi (3700323208282018772) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_usb_bluetooth (4008195891276675882) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_wifi_bluetooth (2753904149495692201) -->
-    <skip />
-    <!-- no translation found for tether_settings_summary_all (1171769255924636665) -->
-    <skip />
+    <string name="tether_settings_summary_bluetooth" msgid="4363059913219151114">"携帯端末のデータ通信をBluetooth経由で共有する"</string>
+    <string name="tether_settings_summary_usb_wifi" msgid="3700323208282018772">"携帯端末のデータ通信をUSB経由で、またはポータブルWi-Fiアクセスポイントとして共有する"</string>
+    <string name="tether_settings_summary_usb_bluetooth" msgid="4008195891276675882">"携帯端末のデータ通信をUSBまたはBluetooth経由で共有する"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" msgid="2753904149495692201">"携帯端末のデータ通信をBluetooth経由で、またはポータブルWi-Fiアクセスポイントとして共有する"</string>
+    <string name="tether_settings_summary_all" msgid="1171769255924636665">"携帯端末のデータ通信をUSB、Wi-Fi、またはBluetooth経由で共有する"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USBテザリング"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB接続済み、テザリングするには選択"</string>
@@ -662,20 +660,13 @@
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"USBストレージの使用中はテザリングできません"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USBが接続されていません"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBテザリングエラー"</string>
-    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (3317112145693933963) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_connected_subtext (893888246368164894) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1798863866978968964) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_errored_subtext (1344187103463073993) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_overflow_error (2222060504731415763) -->
-    <skip />
-    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
-    <skip />
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetoothテザリング"</string>
+    <string name="bluetooth_tethering_available_subtext" msgid="3317112145693933963">"BluetoothテザリングはONですが、接続されていません"</string>
+    <string name="bluetooth_tethering_connected_subtext" msgid="893888246368164894">"BluetoothテザリングはONで接続中です"</string>
+    <string name="bluetooth_tethering_off_subtext" msgid="1798863866978968964">"BluetoothテザリングはOFFです"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetoothテザリングのエラー"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"テザリングできるデバイスは<xliff:g id="MAXCONNECTION">%1$d</xliff:g>個までです"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
     <!-- no translation found for bluetooth_tether_settings_text (2273368767599539525) -->
     <skip />
     <!-- no translation found for bluetooth_tether_settings_subtext (5970033999897946708) -->
@@ -688,8 +679,7 @@
     <string name="location_networks_disabled" msgid="2708968452901433980">"無線ネットワーク使用のアプリケーション（地図など）で位置を表示する"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Wi-Fi/モバイルネットワークで位置を検出する"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS機能を使用"</string>
-    <!-- no translation found for location_street_level (7456259025474443314) -->
-    <skip />
+    <string name="location_street_level" msgid="7456259025474443314">"高精度測位"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"高精度測位（電池消費増、電波が良好な場所で使用）"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します（OFFにするとネットワーク使用率が減少します）"</string>
@@ -772,18 +762,15 @@
     <string name="application_size_label" msgid="5055196275624686382">"アプリケーション"</string>
     <string name="data_size_label" msgid="8679376373625710107">"データ"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"アンインストール"</string>
-    <!-- no translation found for disable_text (6544054052049395202) -->
-    <skip />
-    <!-- no translation found for enable_text (9217362512327828987) -->
-    <skip />
+    <string name="disable_text" msgid="6544054052049395202">"無効にする"</string>
+    <string name="enable_text" msgid="9217362512327828987">"有効にする"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"データを消去"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"アップデートのアンインストール"</string>
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"特定の操作で使用する既定アプリケーションとして設定されています。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"設定されていません。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"設定を消去"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
-    <!-- no translation found for sort_order_alpha (1410278099123670628) -->
-    <skip />
+    <string name="sort_order_alpha" msgid="1410278099123670628">"名前順に表示する"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
@@ -792,10 +779,8 @@
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
     <string name="filter_apps_onsdcard" msgid="1477351142334784771">"SDカード上"</string>
-    <!-- no translation found for disabled (9206776641295849915) -->
-    <skip />
-    <!-- no translation found for no_applications (5190227407135243904) -->
-    <skip />
+    <string name="disabled" msgid="9206776641295849915">"無効"</string>
+    <string name="no_applications" msgid="5190227407135243904">"アプリケーションはありません"</string>
     <string name="recompute_size" msgid="7722567982831691718">"サイズを再計算中..."</string>
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"削除"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"このアプリケーションのすべてのデータ（ファイル、設定、アカウント、データベースを含む）が完全に削除されます。"</string>
@@ -823,21 +808,18 @@
     <string name="invalid_location" msgid="4934491353200240499">"指定したインストール先が無効です。"</string>
     <string name="system_package" msgid="1030561474413022831">"システムアップデートは外部メディアにはインストールできません。"</string>
     <string name="force_stop_dlg_title" msgid="4289453224368188476">"強制停止"</string>
-    <!-- no translation found for force_stop_dlg_text (5157374701213502922) -->
-    <skip />
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"アプリケーションを強制終了すると正常に動作しない場合があります。終了してもよろしいですか？"</string>
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"アプリケーションを移動"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"アプリケーションを移動できません。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"優先インストール先"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"新しいアプリケーションの優先インストール先を変更する"</string>
-    <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
-    <skip />
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
     <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
     <skip />
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"現在実行中のサービスを表示して制御する"</string>
     <string name="service_restarting" msgid="2242747937372354306">"再起動中"</string>
-    <!-- no translation found for no_running_services (2059536495597645347) -->
-    <skip />
+    <string name="no_running_services" msgid="2059536495597645347">"実行中のサービスはありません"</string>
     <string name="service_started_by_app" msgid="6575184738671598131">"アプリケーションによって起動されたサービス。"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
@@ -890,7 +872,6 @@
     <string name="testing" msgid="6584352735303604146">"テスト中"</string>
     <string name="testing_phone_info" msgid="8656693364332840056">"携帯電話情報"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"電池情報"</string>
-    <string name="testing_battery_history" msgid="3043329445810695647">"充電池データ"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"クイック起動"</string>
     <string name="quick_launch_summary" msgid="3453825712466417452">"アプリケーションの起動にショートカットキーを割り当てる"</string>
     <string name="quick_launch_assign_application" msgid="4521368464929956350">"アプリを選択"</string>
@@ -950,16 +931,12 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池使用時間: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"電池使用時間: <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
-    <skip />
-    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
-    <skip />
-    <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
-    <skip />
-    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"WiFi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"起動"</string>
-    <!-- no translation found for battery_stats_phone_signal_label (6822042940376636775) -->
-    <skip />
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電中"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"画面点灯"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSがON"</string>
+    <string name="battery_stats_wifi_running_label" msgid="4100552585961214960">"Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"スリープなし"</string>
+    <string name="battery_stats_phone_signal_label" msgid="6822042940376636775">"電波状態"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
@@ -1004,11 +981,9 @@
     <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bluetoothの電池使用量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"未使用時はBluetoothをOFFにします"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"別のBluetooth端末に接続してみてください"</string>
-    <!-- no translation found for battery_desc_apps (6665712811746233450) -->
-    <skip />
+    <string name="battery_desc_apps" msgid="6665712811746233450">"アプリケーションの電池使用量"</string>
     <string name="battery_sugg_apps_info" msgid="6065882899391322442">"アプリケーションを停止またはアンインストールします"</string>
-    <!-- no translation found for battery_sugg_apps_gps (4545056413090932541) -->
-    <skip />
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"GPSをアプリケーションが使用しないように手動で管理する"</string>
     <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"アプリケーション側の設定で電池使用量を抑えられる場合があります"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1206,4 +1181,26 @@
     <string name="sound_category_calls_title" msgid="3688531959256239012">"着信"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_feedback_title" msgid="4399742321363475393">"フィードバック"</string>
+    <!-- no translation found for wifi_setup_title (3130584822275278425) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (4438531984292574854) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (2594117697215042584) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connected (5350876766935146953) -->
+    <skip />
 </resources>