[gnome-control-center] Update Japanese translation



commit 3f0f4e0788aad0140a694212070a82ec35e58188
Author: sicklylife <translation sicklylife jp>
Date:   Mon Feb 17 17:55:50 2020 +0000

    Update Japanese translation

 po/ja.po | 5101 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 2898 insertions(+), 2203 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index fc31ca315..fdb2c4763 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -31,7 +31,7 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2019-09-26 14:24+0000\n"
+"POT-Creation-Date: 2020-02-13 21:10+0000\n"
 "PO-Revision-Date: 2019-09-27 23:00+0900\n"
 "Last-Translator: sicklylife <translation sicklylife jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -41,70 +41,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: panels/applications/cc-applications-panel.c:561
+#: panels/applications/cc-applications-panel.c:737
 msgid "System Bus"
 msgstr "システムバス"
 
-#: panels/applications/cc-applications-panel.c:561
-#: panels/applications/cc-applications-panel.c:563
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:737
+#: panels/applications/cc-applications-panel.c:739
+#: panels/applications/cc-applications-panel.c:752
+#: panels/applications/cc-applications-panel.c:757
 msgid "Full access"
 msgstr "フルアクセス"
 
-#: panels/applications/cc-applications-panel.c:563
+#: panels/applications/cc-applications-panel.c:739
 msgid "Session Bus"
 msgstr "セッションバス"
 
-#: panels/applications/cc-applications-panel.c:568
-#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:273
+#: panels/applications/cc-applications-panel.c:743
+#: panels/power/cc-power-panel.c:2467 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "デバイス"
 
-#: panels/applications/cc-applications-panel.c:568
+#: panels/applications/cc-applications-panel.c:743
 msgid "Full access to /dev"
 msgstr "/dev へのフルアクセス"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:747
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "ネットワーク"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "ネットワークアクセス"
 
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:581
-#: panels/search/cc-search-locations-dialog.c:293
+#: panels/applications/cc-applications-panel.c:752
+#: panels/applications/cc-applications-panel.c:754
+#: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "ホーム"
 
-#: panels/applications/cc-applications-panel.c:581
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:759
 msgid "Read-only"
 msgstr "読み取り専用"
 
-#: panels/applications/cc-applications-panel.c:584
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:757
+#: panels/applications/cc-applications-panel.c:759
 msgid "File System"
 msgstr "ファイルシステム"
 
-#: panels/applications/cc-applications-panel.c:591
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277
-#: shell/cc-window.c:975 shell/cc-window.ui:132
+#: panels/applications/cc-applications-panel.c:763
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
+#: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "設定"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:763
+#: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "設定の変更"
 
-#: panels/applications/cc-applications-panel.c:596
+#: panels/applications/cc-applications-panel.c:765
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -113,70 +114,69 @@ msgstr ""
 "%s には次の変更できない権限が組み込まれています。これらの権限に問題がある場合"
 "は、このアプリケーションの削除を検討してください。"
 
-#: panels/applications/cc-applications-panel.c:738
+#: panels/applications/cc-applications-panel.c:926
 msgid "Web Links"
 msgstr "ウェブリンク"
 
-#: panels/applications/cc-applications-panel.c:748
+#: panels/applications/cc-applications-panel.c:936
 msgid "Git Links"
 msgstr "Git リンク"
 
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:942
 #, c-format
 msgid "%s Links"
 msgstr "%s リンク"
 
-#: panels/applications/cc-applications-panel.c:762
-#: panels/applications/cc-applications-panel.c:798
+#: panels/applications/cc-applications-panel.c:950
+#: panels/applications/cc-applications-panel.c:986
 msgid "Unset"
 msgstr "削除"
 
-#: panels/applications/cc-applications-panel.c:853
+#: panels/applications/cc-applications-panel.c:1041
 msgid "Links"
 msgstr "リンク"
 
-#: panels/applications/cc-applications-panel.c:861
+#: panels/applications/cc-applications-panel.c:1049
 msgid "Hypertext Files"
 msgstr "ハイパーテキストファイル"
 
-#: panels/applications/cc-applications-panel.c:875
+#: panels/applications/cc-applications-panel.c:1063
 msgid "Text Files"
 msgstr "テキストファイル"
 
-#: panels/applications/cc-applications-panel.c:889
+#: panels/applications/cc-applications-panel.c:1077
 msgid "Image Files"
 msgstr "画像ファイル"
 
-#: panels/applications/cc-applications-panel.c:905
+#: panels/applications/cc-applications-panel.c:1093
 msgid "Font Files"
 msgstr "フォントファイル"
 
-#: panels/applications/cc-applications-panel.c:966
+#: panels/applications/cc-applications-panel.c:1154
 msgid "Archive Files"
 msgstr "アーカイブファイル"
 
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:1174
 msgid "Package Files"
 msgstr "パッケージファイル"
 
-#: panels/applications/cc-applications-panel.c:1009
+#: panels/applications/cc-applications-panel.c:1197
 msgid "Audio Files"
 msgstr "オーディオファイル"
 
-#: panels/applications/cc-applications-panel.c:1026
+#: panels/applications/cc-applications-panel.c:1214
 msgid "Video Files"
 msgstr "ビデオファイル"
 
-#: panels/applications/cc-applications-panel.c:1034
+#: panels/applications/cc-applications-panel.c:1222
 msgid "Other Files"
 msgstr "その他のファイル"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1376
-#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/cc-applications-panel.c:1564
+#: panels/applications/cc-applications-panel.ui:418
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
-#: panels/privacy/cc-privacy-panel.ui:1085
 msgid "Applications"
 msgstr "アプリケーション"
 
@@ -200,7 +200,7 @@ msgstr ""
 
 #: panels/applications/cc-applications-panel.ui:126
 #: panels/applications/cc-applications-panel.ui:132
-#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "カメラ"
 
@@ -213,12 +213,11 @@ msgstr "カメラ"
 #: panels/applications/cc-applications-panel.ui:145
 #: panels/applications/cc-applications-panel.ui:157
 #: panels/applications/cc-applications-panel.ui:237
-#: panels/applications/cc-applications-panel.ui:255
+#: panels/applications/cc-applications-panel.ui:267
 #: panels/keyboard/cc-keyboard-option.c:259
 #: panels/keyboard/cc-keyboard-option.c:378
-#: panels/keyboard/keyboard-shortcuts.c:425
-#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:96
+#: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126
 #: panels/user-accounts/um-fingerprint-dialog.c:211
 #: subprojects/gvc/gvc-mixer-control.c:1876
 msgid "Disabled"
@@ -226,18 +225,18 @@ msgstr "無効"
 
 #: panels/applications/cc-applications-panel.ui:138
 #: panels/applications/cc-applications-panel.ui:144
-#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 msgid "Microphone"
 msgstr "マイク"
 
 #: panels/applications/cc-applications-panel.ui:150
 #: panels/applications/cc-applications-panel.ui:156
-#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955
+#: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "位置情報サービス"
 
 #: panels/applications/cc-applications-panel.ui:162
-#: panels/applications/cc-applications-panel.ui:489
+#: panels/applications/cc-applications-panel.ui:501
 msgid "Built-in Permissions"
 msgstr "組み込みの権限"
 
@@ -262,7 +261,7 @@ msgstr "このアプリケーションが使用するシステムの機能です
 #: panels/applications/cc-applications-panel.ui:230
 #: panels/applications/cc-applications-panel.ui:236
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:162
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155
 msgid "Search"
 msgstr "検索"
 
@@ -272,74 +271,334 @@ msgid "Notifications"
 msgstr "通知"
 
 #: panels/applications/cc-applications-panel.ui:248
+#, fuzzy
+#| msgid "Current background"
+msgid "Run in background"
+msgstr "現在の背景"
+
 #: panels/applications/cc-applications-panel.ui:254
+#, fuzzy
+#| msgid "No Desktop Background"
+msgid "Set Desktop Background"
+msgstr "デスクトップの背景が見つかりません"
+
+#: panels/applications/cc-applications-panel.ui:260
+#: panels/applications/cc-applications-panel.ui:266
 msgid "Sounds"
 msgstr "サウンド"
 
-#: panels/applications/cc-applications-panel.ui:287
+#: panels/applications/cc-applications-panel.ui:299
 msgid "Default Handlers"
 msgstr "デフォルトのハンドラ"
 
-#: panels/applications/cc-applications-panel.ui:299
+#: panels/applications/cc-applications-panel.ui:311
 msgid "Types of files and links that this application opens."
 msgstr "このアプリケーションで開くファイルとリンクの種類です。"
 
-#: panels/applications/cc-applications-panel.ui:315
+#: panels/applications/cc-applications-panel.ui:327
 msgid "Reset"
 msgstr "リセット"
 
-#: panels/applications/cc-applications-panel.ui:351
+#: panels/applications/cc-applications-panel.ui:363
 msgid "Usage"
 msgstr "使用"
 
-#: panels/applications/cc-applications-panel.ui:363
+#: panels/applications/cc-applications-panel.ui:375
 msgid "How much resources this application is using."
 msgstr "このアプリケーションが使用中のリソース量です。"
 
-#: panels/applications/cc-applications-panel.ui:378
-#: panels/applications/cc-applications-panel.ui:525
+#: panels/applications/cc-applications-panel.ui:390
+#: panels/applications/cc-applications-panel.ui:537
 msgid "Storage"
 msgstr "ストレージ"
 
-#: panels/applications/cc-applications-panel.ui:413
+#: panels/applications/cc-applications-panel.ui:425
 msgid "Open in Software"
 msgstr "ソフトウェアで開く"
 
-#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+#: panels/applications/cc-applications-panel.ui:475 shell/cc-panel-list.ui:121
 msgid "No results found"
 msgstr "結果がありません"
 
-#: panels/applications/cc-applications-panel.ui:474
-#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201
+#: panels/applications/cc-applications-panel.ui:486
+#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "別の検索を試してください"
 
-#: panels/applications/cc-applications-panel.ui:542
+#: panels/applications/cc-applications-panel.ui:554
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr ""
 "このアプリケーションがデータとキャッシュで占有しているディスク容量です。"
 
-#: panels/applications/cc-applications-panel.ui:551
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Application"
 msgstr "アプリケーション"
 
-#: panels/applications/cc-applications-panel.ui:557
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Data"
 msgstr "データ"
 
-#: panels/applications/cc-applications-panel.ui:563
+#: panels/applications/cc-applications-panel.ui:575
 msgid "Cache"
 msgstr "キャッシュ"
 
-#: panels/applications/cc-applications-panel.ui:569
+#: panels/applications/cc-applications-panel.ui:581
 msgid "<b>Total</b>"
 msgstr "<b>合計</b>"
 
-#: panels/applications/cc-applications-panel.ui:586
+#: panels/applications/cc-applications-panel.ui:598
 msgid "Clear Cache…"
 msgstr "キャッシュの消去…"
 
+#: panels/applications/cc-snap-row.c:55
+#, fuzzy
+#| msgid "Add or remove users and change your password"
+msgid "Add user accounts and change passwords"
+msgstr "ユーザーの追加と削除、パスワードの変更を行います"
+
+#: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133
+msgid "Play and record sound"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:59
+msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:61
+msgid "Access bluetooth hardware directly"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:63
+#, fuzzy
+#| msgid "Bluetooth Settings"
+msgid "Use bluetooth devices"
+msgstr "Bluetooth の設定"
+
+#: panels/applications/cc-snap-row.c:65
+msgid "Use your camera"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:67
+#, fuzzy
+#| msgid "Printers"
+msgid "Print documents"
+msgstr "プリンター"
+
+#: panels/applications/cc-snap-row.c:69
+msgid "Use any connected joystick"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:71
+#, fuzzy
+#| msgid "_Allow connections to control the screen"
+msgid "Allow connecting to the Docker service"
+msgstr "このスクリーンの操作する接続を許可する(_A)"
+
+#: panels/applications/cc-snap-row.c:75
+#, fuzzy
+#| msgid "Configure input source"
+msgid "Configure network firewall"
+msgstr "入力ソースの設定を行う"
+
+#: panels/applications/cc-snap-row.c:77
+msgid "Setup and use privileged FUSE filesystems"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:79
+#, fuzzy
+#| msgid "Calibrate the device"
+msgid "Update firmware on this device"
+msgstr "デバイスのキャリブレート"
+
+#: panels/applications/cc-snap-row.c:81
+msgid "Access hardware information"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:83
+msgid "Provide entropy to hardware random number generator"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:85
+msgid "Use hardware-generated random numbers"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:87
+msgid "Access files in your home folder"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:89
+msgid "Access libvirt service"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:91
+#, fuzzy
+#| msgid "Change system time and date settings"
+msgid "Change system language and region settings"
+msgstr "システムの時刻と日付の設定を変更"
+
+#: panels/applications/cc-snap-row.c:93
+msgid "Change location settings and providers"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:95
+#, fuzzy
+#| msgid "Access Options"
+msgid "Access your location"
+msgstr "アクセスオプション"
+
+#: panels/applications/cc-snap-row.c:97
+msgid "Read system and application logs"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:99
+msgid "Access LXD service"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:101
+msgid "access the media-hub service"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:103
+msgid "Use and configure modems"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:105
+msgid "Read system mount information and disk quotas"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:107
+msgid "Control music and video players"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:111
+#, fuzzy
+#| msgid "Change system time and date settings"
+msgid "Change low-level network settings"
+msgstr "システムの時刻と日付の設定を変更"
+
+#: panels/applications/cc-snap-row.c:113
+msgid "Access the NetworkManager service to read and change network settings"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:115
+msgid "Read access to network settings"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:117
+#, fuzzy
+#| msgid "Can change settings"
+msgid "Change network settings"
+msgstr "設定の変更"
+
+#: panels/applications/cc-snap-row.c:119
+#, fuzzy
+#| msgid "Can change settings"
+msgid "Read network settings"
+msgstr "設定の変更"
+
+#: panels/applications/cc-snap-row.c:121
+msgid ""
+"Access the ofono service to read and change network settings for mobile "
+"telephony"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:123
+msgid "Control Open vSwitch hardware"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:125
+msgid "Read from CD/DVD"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:127
+msgid "Read, add, change, or remove saved passwords"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:129
+msgid ""
+"Access pppd and ppp devices for configuring Point-to-Point Protocol "
+"connections"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:131
+msgid "Pause or end any process on the system"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:135
+msgid "Access USB hardware directly"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:137
+msgid "Read/write files on removable storage devices"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:139
+msgid "Prevent screen sleep/lock"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:141
+msgid "Access serial port hardware"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:143
+msgid "Restart or power off the device"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:145
+msgid "Install, remove and configure software"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:147
+msgid "Access Storage Framework service"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:149
+msgid "Read process and system information"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:151
+msgid "Monitor and control any running program"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:153
+#, fuzzy
+#| msgid "Change the date and time, including time zone"
+msgid "Change the date and time"
+msgstr "日付、時刻、タイムゾーンを変更します。"
+
+#: panels/applications/cc-snap-row.c:155
+#, fuzzy
+#| msgid "Change system time and date settings"
+msgid "Change time server settings"
+msgstr "システムの時刻と日付の設定を変更"
+
+#: panels/applications/cc-snap-row.c:157
+#, fuzzy
+#| msgid "Change the date and time, including time zone"
+msgid "Change the time zone"
+msgstr "日付、時刻、タイムゾーンを変更します。"
+
+#: panels/applications/cc-snap-row.c:159
+msgid "Access the UDisks2 service for configuring disks and removable media"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:161
+msgid "Read/change shared calendar events in Ubuntu Unity 8"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:163
+msgid "Read/change shared contacts in Ubuntu Unity 8"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:165
+msgid "Access energy usage data"
+msgstr ""
+
+#: panels/applications/cc-snap-row.c:167
+msgid "Read/write access to U2F devices exposed"
+msgstr ""
+
 #: panels/applications/gnome-applications-panel.desktop.in.in:4
 msgid "Control various application permissions and settings"
 msgstr "アプリケーションの権限や設定を変更します"
@@ -352,41 +611,41 @@ msgstr ""
 "application;flatpak;permission;setting;アプリケーション;パーミッション;許可;"
 "権限;設定;"
 
-#: panels/background/cc-background-chooser.c:348
+#: panels/background/cc-background-chooser.c:350
 msgid "Select a picture"
 msgstr "画像の選択"
 
-#: panels/background/cc-background-chooser.c:351
-#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
-#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/background/cc-background-chooser.c:353
+#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:240
+#: panels/color/cc-color-panel.c:893 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
-#: panels/display/cc-display-panel.c:950
+#: panels/display/cc-display-panel.c:947
+#: panels/info-overview/cc-info-overview-panel.ui:235
+#: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: panels/network/connection-editor/connection-editor.ui:17
-#: panels/network/connection-editor/vpn-helpers.c:181
-#: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1260 panels/network/net-device-wifi.c:1340
-#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24
+#: panels/network/connection-editor/vpn-helpers.c:176
+#: panels/network/connection-editor/vpn-helpers.c:299
+#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:313
-#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24
-#: panels/region/cc-input-chooser.ui:11
-#: panels/search/cc-search-locations-dialog.c:614
-#: panels/sharing/cc-sharing-panel.c:428
+#: panels/printers/pp-details-dialog.c:252
+#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:638
+#: panels/sharing/cc-sharing-panel.c:410 panels/usage/cc-usage-panel.c:134
 #: panels/user-accounts/cc-add-user-dialog.ui:28
 #: panels/user-accounts/cc-avatar-chooser.c:107
 #: panels/user-accounts/cc-avatar-chooser.c:235
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:641
-#: panels/user-accounts/cc-user-panel.c:659
+#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:654
 #: panels/user-accounts/data/join-dialog.ui:20
-#: panels/user-accounts/um-fingerprint-dialog.c:261
+#: panels/user-accounts/um-fingerprint-dialog.c:260
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: panels/background/cc-background-chooser.c:352
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:314
-#: panels/sharing/cc-sharing-panel.c:429
+#: panels/background/cc-background-chooser.c:354
+#: panels/network/connection-editor/vpn-helpers.c:177
+#: panels/printers/pp-details-dialog.c:253
+#: panels/sharing/cc-sharing-panel.c:411
 #: panels/user-accounts/cc-avatar-chooser.c:236
 msgid "_Open"
 msgstr "開く(_O)"
@@ -418,11 +677,11 @@ msgstr "複数のサイズ"
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:278
+#: panels/background/cc-background-item.c:282
 msgid "No Desktop Background"
 msgstr "デスクトップの背景が見つかりません"
 
-#: panels/background/cc-background-panel.c:145
+#: panels/background/cc-background-panel.c:143
 msgid "Current background"
 msgstr "現在の背景"
 
@@ -447,46 +706,46 @@ msgstr "背景画像を壁紙や写真に変更します"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;Background;背景;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:309
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "No Bluetooth Found"
 msgstr "Bluetooth が見つかりません"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:310
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Bluetooth を使用するにはドングルを接続してください。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:313
+#: panels/bluetooth/cc-bluetooth-panel.ui:69
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth がオフになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:314
+#: panels/bluetooth/cc-bluetooth-panel.ui:80
 msgid "Turn on to connect devices and receive file transfers."
 msgstr ""
 "デバイスの接続やファイルの受信を行うには Bluetooth をオンにしてください。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:317
+#: panels/bluetooth/cc-bluetooth-panel.ui:107
 msgid "Airplane Mode is on"
 msgstr "機内モードがオンになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:318
+#: panels/bluetooth/cc-bluetooth-panel.ui:118
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "機内モードがオンの場合、Bluetooth は使用できません。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:321
+#: panels/bluetooth/cc-bluetooth-panel.ui:124
+msgid "Turn Off Airplane Mode"
+msgstr "機内モードをオフにする"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:154
 msgid "Hardware Airplane Mode is on"
 msgstr "ハードウェア機内モードがオンになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:322
+#: panels/bluetooth/cc-bluetooth-panel.ui:165
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Bluetooth を使用するには機内モードスイッチをオフにしてください。"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:324
-msgid "Turn Off Airplane Mode"
-msgstr "機内モードをオフにする"
-
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1714
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -499,6 +758,54 @@ msgstr "Bluetooth のオン/オフやデバイスへの接続を行います。"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;共有;シェアリング;ブルートゥース;"
 
+#: panels/camera/cc-camera-panel.ui:34
+msgid "Camera is turned off"
+msgstr ""
+
+#: panels/camera/cc-camera-panel.ui:43
+#, fuzzy
+#| msgid "No application is currently playing or recording audio."
+msgid "No applications can capture photos or video."
+msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
+
+#: panels/camera/cc-camera-panel.ui:77
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"アプリケーションがカメラで写真や動画を撮影できるようになります。無効にすると"
+"一部のアプリケーションが正常に動作しなくなる可能性があります。"
+
+#: panels/camera/cc-camera-panel.ui:87
+msgid "Allow the applications below to use your camera."
+msgstr ""
+
+#: panels/camera/cc-camera-panel.ui:107
+msgid "No Applications Have Asked for Camera Access"
+msgstr ""
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "Browse for more pictures"
+msgid "Protect your pictures"
+msgstr "他の画像も参照"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/camera/gnome-camera-panel.desktop.in.in:20
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
+#: panels/location/gnome-location-panel.desktop.in.in:20
+#: panels/lock/gnome-lock-panel.desktop.in.in:20
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
+#: panels/usage/gnome-usage-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テ"
+"ンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
@@ -574,6 +881,25 @@ msgstr "キャリブレーション装置を取り外せます。"
 msgid "Do not disturb the calibration device while in progress"
 msgstr "測定中はキャリブレーション装置に触らないでください"
 
+#: panels/color/cc-color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "キャリブレーションの表示"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:40
+msgid "_Start"
+msgstr "開始(_S)"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:54
+msgid "_Resume"
+msgstr "再開(_R)"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64
+msgid "_Done"
+msgstr "完了(_D)"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -632,49 +958,49 @@ msgstr "未較正"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: panels/color/cc-color-panel.c:170
+#: panels/color/cc-color-panel.c:169
 msgid "Default: "
 msgstr "デフォルト: "
 
 # ref. gnome-color-manager
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: panels/color/cc-color-panel.c:178
+#: panels/color/cc-color-panel.c:177
 msgid "Colorspace: "
 msgstr "色空間: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:185
+#: panels/color/cc-color-panel.c:184
 msgid "Test profile: "
 msgstr "テスト用プロファイル: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:239
+#: panels/color/cc-color-panel.c:238
 msgid "Select ICC Profile File"
 msgstr "ICC プロファイルの選択"
 
-#: panels/color/cc-color-panel.c:242
+#: panels/color/cc-color-panel.c:241
 msgid "_Import"
 msgstr "インポート(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:253
+#: panels/color/cc-color-panel.c:252
 msgid "Supported ICC profiles"
 msgstr "サポートする ICC プロファイル"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:259
+#: panels/network/wireless-security/eap-method-fast.c:356
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: panels/color/cc-color-panel.c:555
+#: panels/color/cc-color-panel.c:554
 msgid "Screen"
 msgstr "画面"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:847
+#: panels/color/cc-color-panel.c:846
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "ファイルのアップロードに失敗しました: %s"
@@ -682,43 +1008,43 @@ msgstr "ファイルのアップロードに失敗しました: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: panels/color/cc-color-panel.c:859
+#: panels/color/cc-color-panel.c:858
 msgid "The profile has been uploaded to:"
 msgstr "プロファイルがアップロードされました:"
 
-#: panels/color/cc-color-panel.c:861
+#: panels/color/cc-color-panel.c:860
 msgid "Write down this URL."
 msgstr "この URL をメモしてください。"
 
-#: panels/color/cc-color-panel.c:862
+#: panels/color/cc-color-panel.c:861
 msgid "Restart this computer and boot your normal operating system."
 msgstr ""
 "このコンピューターを再起動して通常のオペレーティングシステムを起動してくださ"
 "い。"
 
-#: panels/color/cc-color-panel.c:863
+#: panels/color/cc-color-panel.c:862
 msgid "Type the URL into your browser to download and install the profile."
 msgstr ""
 "ブラウザーで URL を入力し、プロファイルをダウンロードしてインストールしてくだ"
 "さい。"
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: panels/color/cc-color-panel.c:891
+#: panels/color/cc-color-panel.c:890
 msgid "Save Profile"
 msgstr "プロファイルの保存"
 
-#: panels/color/cc-color-panel.c:895
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:894
+#: panels/network/connection-editor/vpn-helpers.c:300
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1209
+#: panels/color/cc-color-panel.c:1208
 msgid "Create a color profile for the selected device"
 msgstr "選択したデバイスのカラープロファイルを作成"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
+#: panels/color/cc-color-panel.c:1223 panels/color/cc-color-panel.c:1247
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -727,12 +1053,12 @@ msgstr ""
 "してください。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1258
+#: panels/color/cc-color-panel.c:1257
 msgid "The measuring instrument does not support printer profiling."
 msgstr "計測器がプリンターのプロファイルをサポートしていません。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1269
+#: panels/color/cc-color-panel.c:1268
 msgid "The device type is not currently supported."
 msgstr "このデバイスの形式は現在サポートしていません。"
 
@@ -862,7 +1188,7 @@ msgstr ""
 "かもしません。"
 
 #: panels/color/cc-color-panel.ui:607
-#: panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/user-accounts/um-fingerprint-dialog.c:719
 msgid "Summary"
 msgstr "概要"
 
@@ -875,7 +1201,7 @@ msgid "_Import File…"
 msgstr "ファイルを読み込む(_I)…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/network/connection-editor/net-connection-editor.c:513
 #: panels/printers/new-printer-dialog.ui:80
 #: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
@@ -896,7 +1222,9 @@ msgstr ""
 "カラーマネージメントを行うには、各デバイスの最新のカラープロファイルが必要に"
 "なります。"
 
+#. translators: Text used in link to privacy policy
 #: panels/color/cc-color-panel.ui:812
+#: panels/diagnostics/cc-diagnostics-panel.c:143
 msgid "Learn more"
 msgstr "もっと詳しく"
 
@@ -1104,25 +1432,6 @@ msgstr "このプロファイルでは全画面表示での補正はできませ
 msgid "This profile may no longer be accurate"
 msgstr "このプロファイルはもう正確ではなくなっているかもしれません。"
 
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "キャリブレーションの表示"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "開始(_S)"
-
-#. This resumes the calibration process
-#: panels/color/color-calibrate.ui:54
-msgid "_Resume"
-msgstr "再開(_R)"
-
-#. This button returns the user back to the color control panel
-#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "完了(_D)"
-
 #: panels/color/gnome-color-panel.desktop.in.in:3
 msgid "Color"
 msgstr "色"
@@ -1143,12 +1452,11 @@ msgstr ""
 msgid "Other…"
 msgstr "その他…"
 
-#: panels/common/cc-language-chooser.c:125
-#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "さらに…"
 
-#: panels/common/cc-language-chooser.c:142
+#: panels/common/cc-language-chooser.c:144
 msgid "No languages found"
 msgstr "言語が見つかりません"
 
@@ -1160,13 +1468,29 @@ msgstr "言語の選択"
 msgid "_Select"
 msgstr "選択(_S)"
 
+#: panels/common/cc-permission-infobar.ui:20
+#, fuzzy
+#| msgid "_Unlock"
+msgid "Unlock…"
+msgstr "アンロック(_U)"
+
+#: panels/common/cc-permission-infobar.ui:45
+#, fuzzy
+#| msgid "Can change settings"
+msgid "Unlock to Change Settings"
+msgstr "設定の変更"
+
+#: panels/common/cc-permission-infobar.ui:55
+msgid "Some settings must be unlocked before they can be changed."
+msgstr ""
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:152
 msgid "Today"
 msgstr "今日"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:154
 msgid "Yesterday"
 msgstr "昨日"
 
@@ -1180,6 +1504,43 @@ msgstr "%B%-e日"
 msgid "%b %e, %Y"
 msgstr "%Y年%B%-e日"
 
+#: panels/common/cc-util.c:165
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 時間"
+
+#: panels/common/cc-util.c:166
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+
+#: panels/common/cc-util.c:167
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:172
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:177
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/common/cc-util.c:187
+msgid "0 seconds"
+msgstr "0 秒"
+
 #. translators: This is the default hotspot name, need to be less than 32-bytes
 #: panels/common/hostname-helper.c:177
 msgctxt "hotspot"
@@ -1382,27 +1743,97 @@ msgstr "システムの時刻と日付の設定を変更"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: panels/display/cc-display-panel.c:961
-#: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
-msgid "_Apply"
-msgstr "適用(_A)"
+#: panels/default-apps/cc-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "ウェブ(_W)"
 
-#: panels/display/cc-display-panel.c:982
-msgid "Apply Changes?"
-msgstr "変更を適用しますか?"
+#: panels/default-apps/cc-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "メール(_M)"
 
-#: panels/display/cc-display-panel.c:987
-msgid "Changes Cannot be Applied"
-msgstr "変更を適用できません"
+#: panels/default-apps/cc-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "カレンダー(_C)"
 
-#: panels/display/cc-display-panel.c:988
-msgid "This could be due to hardware limitations."
-msgstr "この原因はハードウェアの制限にある可能性があります。"
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "音楽(_U)"
 
-#: panels/display/cc-display-panel.ui:91
-msgid "Single Display"
-msgstr "シングルディスプレイ"
+#: panels/default-apps/cc-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "ビデオ(_V)"
+
+#: panels/default-apps/cc-default-apps-panel.ui:162
+#: panels/removable-media/cc-removable-media-panel.ui:162
+msgid "_Photos"
+msgstr "写真(_P)"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "既定のアプリケーション"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "既定のアプリケーションを設定します"
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr ""
+"default;application;preferred;media;デフォルト;既定;アプリケーション;メディ"
+"ア;"
+
+#. translators: The first '%s' is the distributor's name, such as 'Fedora', the second '%s' is a link to the 
privacy policy
+#: panels/diagnostics/cc-diagnostics-panel.c:145
+#, fuzzy, c-format
+#| msgid ""
+#| "Sending reports of technical problems helps us improve %s. Reports are "
+#| "sent anonymously and are scrubbed of personal data."
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data. %s"
+msgstr ""
+"技術的な問題に遭遇した場合、問題に関するレポートを送信することで %s の改善に"
+"役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
+"す。"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:30
+msgid "Problem Reporting"
+msgstr "問題報告"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:67
+msgid "_Automatic Problem Reporting"
+msgstr "問題のレポートを自動で送信する(_A)"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr ""
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+msgstr ""
+
+#. FIXME
+#: panels/display/cc-display-panel.c:958
+#: panels/network/connection-editor/connection-editor.ui:27
+msgid "_Apply"
+msgstr "適用(_A)"
+
+#: panels/display/cc-display-panel.c:979
+msgid "Apply Changes?"
+msgstr "変更を適用しますか?"
+
+#: panels/display/cc-display-panel.c:984
+msgid "Changes Cannot be Applied"
+msgstr "変更を適用できません"
+
+#: panels/display/cc-display-panel.c:985
+msgid "This could be due to hardware limitations."
+msgstr "この原因はハードウェアの制限にある可能性があります。"
+
+#: panels/display/cc-display-panel.ui:91
+msgid "Single Display"
+msgstr "シングルディスプレイ"
 
 #: panels/display/cc-display-panel.ui:110
 #: panels/display/cc-display-panel.ui:315
@@ -1417,6 +1848,14 @@ msgstr "ミラー"
 msgid "Display Mode"
 msgstr "ディスプレイモード"
 
+#: panels/display/cc-display-panel.ui:222
+msgid "Contains top bar and Activities"
+msgstr ""
+
+#: panels/display/cc-display-panel.ui:223
+msgid "Primary Display"
+msgstr "プライマリディスプレイ"
+
 #: panels/display/cc-display-panel.ui:245
 msgid ""
 "Drag displays to match your physical display setup. Select a display to "
@@ -1429,6 +1868,12 @@ msgstr ""
 msgid "Display Arrangement"
 msgstr "ディスプレイの配置"
 
+#: panels/display/cc-display-panel.ui:387
+#, fuzzy
+#| msgid "Single Display"
+msgid "Active Display"
+msgstr "シングルディスプレイ"
+
 #: panels/display/cc-display-panel.ui:434
 msgid "Display Configuration"
 msgstr "ディスプレイの設定"
@@ -1531,7 +1976,7 @@ msgid "Manual Schedule"
 msgstr "手動スケジュール"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:154
+#: panels/region/cc-format-chooser.ui:346
 msgid "Times"
 msgstr "時刻"
 
@@ -1579,37 +2024,11 @@ msgstr ""
 "モニター;ナイトライト;夜間モード;ブルーライト;色管理;ディスプレイ;ディスプ"
 "レー;Displays;日没;日の出;"
 
-#: panels/info/cc-info-default-apps-panel.ui:31
-msgid "_Web"
-msgstr "ウェブ(_W)"
-
-#: panels/info/cc-info-default-apps-panel.ui:43
-msgid "_Mail"
-msgstr "メール(_M)"
-
-#: panels/info/cc-info-default-apps-panel.ui:59
-msgid "_Calendar"
-msgstr "カレンダー(_C)"
-
-#: panels/info/cc-info-default-apps-panel.ui:75
-msgid "M_usic"
-msgstr "音楽(_U)"
-
-#: panels/info/cc-info-default-apps-panel.ui:91
-msgid "_Video"
-msgstr "ビデオ(_V)"
-
-#: panels/info/cc-info-default-apps-panel.ui:162
-#: panels/info/cc-info-removable-media-panel.ui:162
-msgid "_Photos"
-msgstr "写真(_P)"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:369
-#: panels/info/cc-info-overview-panel.c:440
-#: panels/info/cc-info-overview-panel.c:452
-#: panels/info/cc-info-overview-panel.c:497
-#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123
+#: panels/info-overview/cc-info-overview-panel.c:406
+#: panels/info-overview/cc-info-overview-panel.c:421
+#: panels/info-overview/cc-info-overview-panel.c:433
+#: panels/info-overview/cc-info-overview-panel.c:479
+#: panels/info-overview/cc-info-overview-panel.c:509
 msgid "Unknown"
 msgstr "不明"
 
@@ -1617,220 +2036,122 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:441
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s (ビルド ID: %s)"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:477
+#: panels/info-overview/cc-info-overview-panel.c:456
 #, c-format
 msgid "64-bit"
 msgstr "64 ビット"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:480
+#: panels/info-overview/cc-info-overview-panel.c:459
 #, c-format
 msgid "32-bit"
 msgstr "32 ビット"
 
-#: panels/info/cc-info-overview-panel.c:710
-#, c-format
-msgid "Version %s"
-msgstr "バージョン %s"
+#: panels/info-overview/cc-info-overview-panel.c:665
+msgid "X11"
+msgstr ""
+
+#: panels/info-overview/cc-info-overview-panel.c:669
+msgid "Wayland"
+msgstr "Wayland"
 
-#: panels/info/cc-info-overview-panel.ui:70
-msgid "Device name"
+#: panels/info-overview/cc-info-overview-panel.c:671
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "不明"
+
+#: panels/info-overview/cc-info-overview-panel.ui:54
+#, fuzzy
+#| msgid "Device name"
+msgid "Device Name"
 msgstr "デバイス名"
 
-#: panels/info/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "メモリ"
 
-#: panels/info/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "プロセッサ"
 
-#: panels/info/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 msgid "Graphics"
 msgstr "グラフィック"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/cc-info-overview-panel.ui:133
-msgid "OS name"
-msgstr "OS 名"
-
-#. To translators: this field contains the distro type
-#: panels/info/cc-info-overview-panel.ui:149
-msgid "OS type"
-msgstr "OS の種類"
-
-#: panels/info/cc-info-overview-panel.ui:165
-msgid "Virtualization"
-msgstr "仮想化"
-
-#: panels/info/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "ディスク"
+#: panels/info-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr ""
 
-#: panels/info/cc-info-overview-panel.ui:293
+#: panels/info-overview/cc-info-overview-panel.ui:104
 msgid "Calculating…"
 msgstr "計算中…"
 
-#: panels/info/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "更新の確認"
-
-#: panels/info/cc-info-removable-media-panel.c:307
-msgid "Ask what to do"
-msgstr "どうするか確認する"
-
-#: panels/info/cc-info-removable-media-panel.c:311
-msgid "Do nothing"
-msgstr "なにもしない"
-
-#: panels/info/cc-info-removable-media-panel.c:315
-msgid "Open folder"
-msgstr "フォルダーを開く"
-
-#: panels/info/cc-info-removable-media-panel.c:401
-msgid "Other Media"
-msgstr "他のメディア"
-
-#: panels/info/cc-info-removable-media-panel.c:434
-msgid "Select an application for audio CDs"
-msgstr "オーディオ CD 用のアプリケーションを選択"
-
-#: panels/info/cc-info-removable-media-panel.c:435
-msgid "Select an application for video DVDs"
-msgstr "ビデオ DVD 用のアプリケーションを選択"
-
-#: panels/info/cc-info-removable-media-panel.c:436
-msgid "Select an application to run when a music player is connected"
-msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
-
-#: panels/info/cc-info-removable-media-panel.c:437
-msgid "Select an application to run when a camera is connected"
-msgstr "カメラが接続された時に起動するアプリケーションを選択"
-
-#: panels/info/cc-info-removable-media-panel.c:438
-msgid "Select an application for software CDs"
-msgstr "ソフトウェアの CD を開くアプリケーションを選択"
-
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "audio DVD"
-msgstr "オーディオ DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "blank Blu-ray disc"
-msgstr "空のブルーレイディスク"
-
-#: panels/info/cc-info-removable-media-panel.c:452
-msgid "blank CD disc"
-msgstr "空の CD"
-
-#: panels/info/cc-info-removable-media-panel.c:453
-msgid "blank DVD disc"
-msgstr "空の DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:454
-msgid "blank HD DVD disc"
-msgstr "空の HD DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:455
-msgid "Blu-ray video disc"
-msgstr "ブルーレイビデオディスク"
-
-#: panels/info/cc-info-removable-media-panel.c:456
-msgid "e-book reader"
-msgstr "電子書籍リーダー"
-
-#: panels/info/cc-info-removable-media-panel.c:457
-msgid "HD DVD video disc"
-msgstr "HD DVD ビデオディスク"
-
-#: panels/info/cc-info-removable-media-panel.c:458
-msgid "Picture CD"
-msgstr "ピクチャーCD"
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+#, fuzzy
+#| msgid "Name"
+msgid "OS Name"
+msgstr "名前"
 
-#: panels/info/cc-info-removable-media-panel.c:459
-msgid "Super Video CD"
-msgstr "スーパービデオCD"
+#: panels/info-overview/cc-info-overview-panel.ui:135
+#, fuzzy
+#| msgid "VPN Type"
+msgid "OS Type"
+msgstr "VPN の種類"
 
-#: panels/info/cc-info-removable-media-panel.c:460
-msgid "Video CD"
-msgstr "ビデオCD"
+#: panels/info-overview/cc-info-overview-panel.ui:144
+#, fuzzy
+#| msgid "Version 0"
+msgid "GNOME Version"
+msgstr "バージョン 0"
 
-#: panels/info/cc-info-removable-media-panel.c:461
-msgid "Windows software"
+#: panels/info-overview/cc-info-overview-panel.ui:154
+#, fuzzy
+#| msgid "Windows software"
+msgid "Windowing System"
 msgstr "Windows ソフトウェア"
 
-#: panels/info/cc-info-removable-media-panel.ui:44
-msgid "Select how media should be handled"
-msgstr "メディアの処理方法を選択してください"
-
-#: panels/info/cc-info-removable-media-panel.ui:75
-msgid "CD _audio"
-msgstr "CD オーディオ(_A)"
-
-#: panels/info/cc-info-removable-media-panel.ui:92
-msgid "_DVD video"
-msgstr "DVD ビデオ(_D)"
-
-#: panels/info/cc-info-removable-media-panel.ui:133
-msgid "_Music player"
-msgstr "音楽プレイヤー(_M)"
+#: panels/info-overview/cc-info-overview-panel.ui:162
+msgid "Virtualization"
+msgstr "仮想化"
 
-#: panels/info/cc-info-removable-media-panel.ui:191
-msgid "_Software"
-msgstr "ソフトウェア(_S)"
+#: panels/info-overview/cc-info-overview-panel.ui:171
+#, fuzzy
+#| msgid "Software Usage"
+msgid "Software Updates"
+msgstr "ソフトウェアの使用状況"
 
-#: panels/info/cc-info-removable-media-panel.ui:229
-msgid "_Other Media…"
-msgstr "他のメディア(_O)…"
+#: panels/info-overview/cc-info-overview-panel.ui:192
+#, fuzzy
+#| msgid "Pending Devices"
+msgid "Rename Device"
+msgstr "保留中のデバイス"
 
-#: panels/info/cc-info-removable-media-panel.ui:287
-msgid "_Never prompt or start programs on media insertion"
+#: panels/info-overview/cc-info-overview-panel.ui:209
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
 msgstr ""
-"メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
-
-#: panels/info/cc-info-removable-media-panel.ui:339
-msgid "Select how other media should be handled"
-msgstr "他のメディアの処理を選択してください"
 
-#: panels/info/cc-info-removable-media-panel.ui:378
-msgid "_Action:"
-msgstr "アクション(_A):"
-
-#: panels/info/cc-info-removable-media-panel.ui:401
-msgid "_Type:"
-msgstr "種類(_T):"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "既定のアプリケーション"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-msgstr "既定のアプリケーションを設定します"
-
-#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:19
-msgid "default;application;preferred;media;"
-msgstr ""
-"default;application;preferred;media;デフォルト;既定;アプリケーション;メディ"
-"ア;"
+#: panels/info-overview/cc-info-overview-panel.ui:226
+#, fuzzy
+#| msgid "_Username"
+msgid "_Rename"
+msgstr "ユーザー名(_U)"
 
-#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
 msgid "About"
 msgstr "このシステムについて"
 
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "システム情報を表示します"
 
@@ -1839,10 +2160,14 @@ msgstr "システム情報を表示します"
 #. The list MUST also end with a semicolon!
 #. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: panels/info/gnome-info-overview-panel.desktop.in.in:23
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
+#, fuzzy
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgid ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;default;"
+"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;デバイス;システ"
@@ -1850,25 +2175,6 @@ msgstr ""
 "ディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;"
 "自動起動;オートラン;Details;詳細;"
 
-#: panels/info/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "リムーバブルメディア"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "リムーバブルメディアを設定します"
-
-#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:19
-msgid ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
-msgstr ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;デバイス;システム;デフォルト;既定;アプリケーション;設"
-"定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディ"
-"ア;媒体;自動起動;オートラン;"
-
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "音とメディア"
@@ -2040,6 +2346,53 @@ msgstr "文字サイズを縮小"
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
+#: panels/keyboard/cc-keyboard-panel.ui:72
+#, fuzzy
+#| msgid "Alternative Characters Key"
+msgid "Alternate Characters Key"
+msgstr "代替文字キー"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr ""
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgid "Left Alt"
+msgstr "左Alt+右Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgid "Right Alt"
+msgstr "左Alt+右Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+#, fuzzy
+#| msgid "Left thumb"
+msgid "Left Super"
+msgstr "左の親指"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+#, fuzzy
+#| msgid "Right thumb"
+msgid "Right Super"
+msgstr "右の親指"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+msgid "Menu key"
+msgstr ""
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+#, fuzzy
+#| msgid "Right Half"
+msgid "Right Ctrl"
+msgstr "右半分"
+
 #: panels/keyboard/cc-keyboard-manager.c:501
 #: panels/keyboard/cc-keyboard-manager.c:509
 #: panels/keyboard/cc-keyboard-manager.c:809
@@ -2066,11 +2419,53 @@ msgstr "Compose キー"
 msgid "Modifiers-only switch to next source"
 msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
 
-#: panels/keyboard/cc-keyboard-panel.c:180
+#: panels/keyboard/cc-keyboard-panel.c:94
+#, fuzzy
+#| msgid "Right Half"
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "右半分"
+
+#: panels/keyboard/cc-keyboard-panel.c:95
+#, fuzzy
+#| msgid "_Mouse Keys"
+msgctxt "keyboard key"
+msgid "Menu Key"
+msgstr "マウスキー(_M)"
+
+#: panels/keyboard/cc-keyboard-panel.c:96
+#, fuzzy
+#| msgid "Left thumb"
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "左の親指"
+
+#: panels/keyboard/cc-keyboard-panel.c:97
+#, fuzzy
+#| msgid "Right thumb"
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "右の親指"
+
+#: panels/keyboard/cc-keyboard-panel.c:98
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "左Alt+右Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:99
+#, fuzzy
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "左Alt+右Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:201
 msgid "Reset All Shortcuts?"
 msgstr "すべてのショートカットをリセットしますか?"
 
-#: panels/keyboard/cc-keyboard-panel.c:183
+#: panels/keyboard/cc-keyboard-panel.c:204
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -2078,38 +2473,45 @@ msgstr ""
 "ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があ"
 "ります。 この処理を元に戻すことはできません。"
 
-#: panels/keyboard/cc-keyboard-panel.c:187
-#: panels/keyboard/shortcut-editor.ui:346
+#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:346
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/cc-keyboard-panel.c:209
 msgid "Reset All"
 msgstr "すべてリセット"
 
-#: panels/keyboard/cc-keyboard-panel.c:284
+#: panels/keyboard/cc-keyboard-panel.c:305
 msgid "Reset the shortcut to its default value"
 msgstr "ショートカットをデフォルトの値にリセットする"
 
-#: panels/keyboard/cc-keyboard-panel.ui:116
+#: panels/keyboard/cc-keyboard-panel.ui:73
+#, fuzzy
+#| msgid "The new password does not contain enough different characters"
+msgid "Hold down and type to enter different characters"
+msgstr "新しいパスワードには十分な種類の文字が含まれていません"
+
+#: panels/keyboard/cc-keyboard-panel.ui:147
 msgid "Reset All…"
 msgstr "すべてリセット…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:117
+#: panels/keyboard/cc-keyboard-panel.ui:148
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットする"
 
-#: panels/keyboard/cc-keyboard-panel.ui:146
+#: panels/keyboard/cc-keyboard-panel.ui:177
 msgid "No keyboard shortcut found"
 msgstr "キーボードショートカットがありません"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
-#, c-format
-msgid ""
-"%s is already being used for <b>%s</b>. If you replace it, %s will be "
-"disabled"
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
+#, fuzzy, c-format
+#| msgid ""
+#| "%s is already being used for <b>%s</b>. If you replace it, %s will be "
+#| "disabled"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
 msgstr ""
 "すでに %s は <b>%s</b> のために使われています。もし入れ替えなければ %s が無効"
 "化されます。"
@@ -2122,272 +2524,563 @@ msgstr "独自のショートカットの設定"
 msgid "Set Shortcut"
 msgstr "ショートカットの設定"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
-#, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
+#, fuzzy, c-format
+#| msgid "Enter new shortcut to change <b>%s</b>."
+msgid "Enter new shortcut to change %s."
 msgstr "<b>%s</b> の新しいショートカットを入力してください。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1016
 msgid "Add Custom Shortcut"
 msgstr "ショートカットの追加"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:340
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:318
+msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
+msgstr ""
+"Esc でキャンセル、Backspace でキーボードショートカットを無効にできます。"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr "キーボードショートカットの表示や変更、タイピングの設定を行います"
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:156
+#: panels/printers/pp-details-dialog.ui:40
+msgid "Name"
+msgstr "名前"
 
-#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
-msgid ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-msgstr ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-"ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラ"
-"スト;入力;インプット;ソース;ロック;ボリューム;音量;"
-
-#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
-msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
-msgstr ""
-"Esc でキャンセル、Backspace でキーボードショートカットを無効にできます。"
-
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
-msgid "Name"
-msgstr "名前"
-
-#: panels/keyboard/shortcut-editor.ui:168
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:168
 msgid "Command"
 msgstr "コマンド"
 
-#: panels/keyboard/shortcut-editor.ui:180
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: panels/keyboard/shortcut-editor.ui:259
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "ショートカットの設定…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:272
 msgid "None"
 msgstr "何もしない"
 
-#: panels/keyboard/shortcut-editor.ui:303
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "新しいショートカットキーを入力してください"
 
-#: panels/keyboard/shortcut-editor.ui:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:357
 msgid "Remove"
 msgstr "削除"
 
-#: panels/keyboard/shortcut-editor.ui:367
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:367
 msgid "Add"
 msgstr "追加"
 
-#: panels/keyboard/shortcut-editor.ui:382
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:382
 msgid "Replace"
 msgstr "入れ替え"
 
-#: panels/keyboard/shortcut-editor.ui:395
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:395
 msgid "Set"
 msgstr "設定"
 
-# Button Label
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
-msgid "Test Your _Settings"
-msgstr "設定を確認する(_S)"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-msgid "Mouse & Touchpad"
-msgstr "マウスとタッチパッド"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr "キーボードショートカットの表示や変更、タイピングの設定を行います"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
-msgstr "マウスやタッチパッドの感度の変更、利き手の選択をします"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+msgstr ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+"ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラ"
+"スト;入力;インプット;ソース;ロック;ボリューム;音量;"
 
-#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
-msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+#: panels/location/cc-location-panel.ui:31
+#, fuzzy
+#| msgid "Location Services"
+msgid "Location services turned off"
+msgstr "位置情報サービス"
+
+#: panels/location/cc-location-panel.ui:40
+#, fuzzy
+#| msgid "No application is currently playing or recording audio."
+msgid "No applications can obtain location information."
+msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
+
+#: panels/location/cc-location-panel.ui:74
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
+msgstr ""
+"位置情報サービスを有効にすると、アプリケーションが現在の位置情報を取得できる"
+"ようになります。Wi-Fi やモバイルブロードバンドを使用している場合、より正確な"
+"位置を取得できます。"
+
+#: panels/location/cc-location-panel.ui:83
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"Mozilla Location Service を使用します: <a href='https://location.services.";
+"mozilla.com/privacy'>プライバシーポリシー</a>"
+
+#: panels/location/cc-location-panel.ui:95
+msgid "Allow the applications below to determine your location."
+msgstr ""
+
+#: panels/location/cc-location-panel.ui:115
+msgid "No Applications Have Asked for Location Access"
+msgstr ""
+
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr ""
+
+#. FIXME
+#: panels/lock/cc-lock-panel.ui:29
+msgid ""
+"Automatically locking the screen prevents others from access the computer "
+"while you're away."
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:46
+#, fuzzy
+#| msgid "_Blank Screen"
+msgid "Blank Screen Delay"
+msgstr "ブランクスクリーン(_B)"
+
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period of inactivity after which the screen will go blank."
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:67
+msgid "Automatic Screen _Lock"
+msgstr "自動画面ロック(_L)"
+
+#: panels/lock/cc-lock-panel.ui:84
+#, fuzzy
+#| msgid "Automatic Screen _Lock"
+msgid "Automatic _Screen Lock Delay"
+msgstr "自動画面ロック(_L)"
+
+#: panels/lock/cc-lock-panel.ui:85
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr ""
+
+#: panels/lock/cc-lock-panel.ui:105
+#, fuzzy
+#| msgid "Show _Notifications"
+msgid "Show _Notifications on Lock Screen"
+msgstr "ロック画面に通知を表示する(_N)"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:149
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "画面オフのとき"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:153
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 秒"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:157
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:161
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:165
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:169
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:173
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:177
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 時間"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:192 panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:196 panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:200 panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:204 panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:208 panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:212 panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:216 panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:220 panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:224 panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:228 panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "しない"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "画面ロック"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+#, fuzzy
+#| msgid "Lock screen"
+msgid "Lock your screen"
+msgstr "画面をロック"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:34
+#, fuzzy
+#| msgid "Microphone mute/unmute"
+msgid "Microphone is turned off"
+msgstr "マイクのミュートを切り替える"
+
+#: panels/microphone/cc-microphone-panel.ui:43
+#, fuzzy
+#| msgid "No applications found"
+msgid "No applications can record sound."
+msgstr "アプリケーションが見つかりません"
+
+#: panels/microphone/cc-microphone-panel.ui:77
+#, fuzzy
+#| msgid ""
+#| "Use of the microphone allows applications to capture sounds. Disabling "
+#| "the microphone may cause some applications to not function properly."
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly."
+msgstr ""
+"アプリケーションがマイクで録音できるようになります。無効にすると一部のアプリ"
+"ケーションが正常に動作しなくなる可能性があります。"
+
+#: panels/microphone/cc-microphone-panel.ui:87
+msgid "Allow the applications below to use your microphone."
+msgstr ""
+
+#: panels/microphone/cc-microphone-panel.ui:107
+msgid "No Applications Have Asked for Microphone Access"
+msgstr ""
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
 msgstr ""
-"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;トラックパッド;ポインター;"
-"クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;Touchpad;マウ"
-"ス;タッチパッド;"
 
-#: panels/mouse/gnome-mouse-properties.ui:50
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:37
 msgid "General"
 msgstr "全般"
 
-#: panels/mouse/gnome-mouse-properties.ui:88
+#: panels/mouse/cc-mouse-panel.ui:75
 msgid "Primary Button"
 msgstr "主ボタン"
 
-#: panels/mouse/gnome-mouse-properties.ui:107
+#: panels/mouse/cc-mouse-panel.ui:94
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "マウス、タッチパッドのボタンの順位を設定します。"
 
-#: panels/mouse/gnome-mouse-properties.ui:136
-#: panels/sound/cc-balance-slider.ui:13
+#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "左"
 
-#: panels/mouse/gnome-mouse-properties.ui:146
-#: panels/sound/cc-balance-slider.ui:15
+#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "右"
 
-#: panels/mouse/gnome-mouse-properties.ui:182
+#: panels/mouse/cc-mouse-panel.ui:169
 msgid "Mouse"
 msgstr "マウス"
 
-#: panels/mouse/gnome-mouse-properties.ui:221
+#: panels/mouse/cc-mouse-panel.ui:208
 msgid "Mouse Speed"
 msgstr "マウスの速度"
 
-#: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:535
+#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522
 msgid "Double-click timeout"
 msgstr "ダブルクリックと認識される最長クリック間隔"
 
 #. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: panels/mouse/gnome-mouse-properties.ui:280
-#: panels/mouse/gnome-mouse-properties.ui:443
+#: panels/mouse/cc-mouse-panel.ui:267 panels/mouse/cc-mouse-panel.ui:430
 msgid "Natural Scrolling"
 msgstr "ナチュラルスクロール"
 
-#: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:459
+#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446
 msgid "Scrolling moves the content, not the view."
 msgstr "スクロールする方向にコンテンツが移動します。"
 
-#: panels/mouse/gnome-mouse-properties.ui:346
-#: panels/mouse/gnome-mouse-properties.ui:391
+#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378
 msgid "Touchpad"
 msgstr "タッチパッド"
 
-#: panels/mouse/gnome-mouse-properties.ui:514
+#: panels/mouse/cc-mouse-panel.ui:501
 msgid "Touchpad Speed"
 msgstr "タッチパッドの速度"
 
-#: panels/mouse/gnome-mouse-properties.ui:573
+#: panels/mouse/cc-mouse-panel.ui:560
 msgid "Tap to Click"
 msgstr "タップでクリックする"
 
-#: panels/mouse/gnome-mouse-properties.ui:625
+#: panels/mouse/cc-mouse-panel.ui:612
 msgid "Two-finger Scrolling"
 msgstr "2本指でのスクロール"
 
-#: panels/mouse/gnome-mouse-properties.ui:678
+#: panels/mouse/cc-mouse-panel.ui:665
 msgid "Edge Scrolling"
 msgstr "エッジスクロール"
 
-#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
+# Button Label
+#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:436
+msgid "Test Your _Settings"
+msgstr "設定を確認する(_S)"
+
+#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
 msgid "Try clicking, double clicking, scrolling"
 msgstr "クリック、ダブルクリック、スクロールを試してください"
 
-#: panels/mouse/gnome-mouse-test.c:137
+#: panels/mouse/cc-mouse-test.c:137
 msgid "Five clicks, GEGL time!"
 msgstr "クリック 5 回、GEGLタイム"
 
-#: panels/mouse/gnome-mouse-test.c:142
+#: panels/mouse/cc-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "ダブルクリック、主ボタン"
 
-#: panels/mouse/gnome-mouse-test.c:142
+#: panels/mouse/cc-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "シングルクリック、主ボタン"
 
-#: panels/mouse/gnome-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "ダブルクリック、中央ボタン"
 
-#: panels/mouse/gnome-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "シングルクリック、中央ボタン"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "ダブルクリック、副ボタン"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "シングルクリック、副ボタン"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:590
-msgid "Network proxy"
-msgstr "ネットワークプロキシ"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "マウスとタッチパッド"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167
-#: panels/network/net-vpn.c:295
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr "マウスやタッチパッドの感度の変更、利き手の選択をします"
+
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+msgstr ""
+"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;トラックパッド;ポインター;"
+"クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;Touchpad;マウ"
+"ス;タッチパッド;"
 
-#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306
+#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
 
-#: panels/network/cc-network-panel.c:795
+#: panels/network/cc-network-panel.c:654
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager が動作している必要があります。"
 
-#: panels/network/cc-network-panel.ui:102
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "その他のデバイス"
 
-#: panels/network/cc-network-panel.ui:143
-#: panels/network/connection-editor/net-connection-editor.c:581
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:596
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:195
+#: panels/network/cc-network-panel.ui:153
 msgid "Not set up"
 msgstr "未設定"
 
 #. TRANSLATORS: This happens when the connection name does not contain the SSID.
-#: panels/network/cc-wifi-connection-row.c:189
+#: panels/network/cc-wifi-connection-row.c:198
 #, c-format
 msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr ""
 
+#: panels/network/cc-wifi-connection-row.c:258
+msgid "Insecure network (WEP)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:263
+msgid "Secure network (WPA)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:268
+msgid "Secure network (WPA2)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:273
+msgid "Secure network (WPA3)"
+msgstr ""
+
+#: panels/network/cc-wifi-connection-row.c:278
+msgid "Secure network"
+msgstr ""
+
 #: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:359
-#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394
-#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79
+#: panels/network/net-device-ethernet.c:318
+#: panels/network/network-bluetooth.ui:76
+#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
+#: panels/network/network-vpn.ui:78
 msgid "Options…"
 msgstr "オプション…"
 
-#: panels/network/cc-wifi-panel.c:284
-#: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1738
-msgid "Wi-Fi"
-msgstr "Wi-Fi"
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:132
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr ""
 
-#: panels/network/cc-wifi-panel.ui:56
-msgid "Airplane Mode"
-msgstr "機内モード"
+#: panels/network/cc-wifi-hotspot-dialog.c:248
+msgid "Must have a minimum of 8 characters"
+msgstr ""
 
-#: panels/network/cc-wifi-panel.ui:72
-msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
-msgstr "Wi-Fi, Bluetooth および モバイルブロードバンドを無効にします"
+#: panels/network/cc-wifi-hotspot-dialog.c:458
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Wi-Fi アクセスポイントをオンにしますか?"
 
-#: panels/network/cc-wifi-panel.ui:141
-msgid "No Wi-Fi Adapter Found"
-msgstr "Wi-Fi アダプターが見つかりません"
+#: panels/network/cc-wifi-hotspot-dialog.ui:19
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+msgstr ""
 
-#: panels/network/cc-wifi-panel.ui:153
-msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
-msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
+#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/network-wifi.ui:105
+msgid "Network Name"
+msgstr "ネットワーク名"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:69
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:383
+#: panels/printers/pp-jobs-dialog.ui:70
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "パスワード"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:83
+#, fuzzy
+#| msgid "Group Password"
+msgid "Generate Random Password"
+msgstr "グループのパスワード"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:84
+#, fuzzy
+#| msgid "Current _Password"
+msgid "Autogenerate Password"
+msgstr "現在のパスワード(_P)"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:130
+msgid "_Turn On"
+msgstr "オン(_T)"
+
+#: panels/network/cc-wifi-panel.c:276
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:233
+msgid "Wi-Fi"
+msgstr "Wi-Fi"
+
+#: panels/network/cc-wifi-panel.ui:56
+msgid "Airplane Mode"
+msgstr "機内モード"
+
+#: panels/network/cc-wifi-panel.ui:72
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Wi-Fi, Bluetooth および モバイルブロードバンドを無効にします"
+
+#: panels/network/cc-wifi-panel.ui:141
+msgid "No Wi-Fi Adapter Found"
+msgstr "Wi-Fi アダプターが見つかりません"
+
+#: panels/network/cc-wifi-panel.ui:153
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
 
 #: panels/network/cc-wifi-panel.ui:188
 msgid "Airplane Mode On"
@@ -2405,357 +3098,316 @@ msgstr "ネットワーク一覧"
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager が動作している必要があります"
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
+#: panels/network/connection-editor/8021x-security-page.ui:20
 msgid "802.1x _Security"
 msgstr "802.1x セキュリティ(_S)"
 
-#: panels/network/connection-editor/8021x-security-page.ui:73
-#: panels/network/connection-editor/security-page.ui:72
-msgid "page 1"
-msgstr "ページ1"
-
-#: panels/network/connection-editor/8021x-security-page.ui:224
-#: panels/network/connection-editor/security-page.ui:223
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
-msgid "Anony_mous identity"
-msgstr "匿名の識別子(_M)"
-
-#: panels/network/connection-editor/8021x-security-page.ui:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "内部認証(_A)"
-
-#: panels/network/connection-editor/8021x-security-page.ui:281
-#: panels/network/connection-editor/security-page.ui:280
-msgid "page 2"
-msgstr "ページ2"
-
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
-#: panels/network/connection-editor/ce-page-security.c:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/ce-page-8021x-security.c:112
+#: panels/network/connection-editor/ce-page-security.c:404
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "セキュリティ"
 
-#: panels/network/connection-editor/ce-page.c:396
+#: panels/network/connection-editor/ce-page.c:234
 msgid "Preserve"
 msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:397
+#: panels/network/connection-editor/ce-page.c:235
 msgid "Permanent"
 msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:398
+#: panels/network/connection-editor/ce-page.c:236
 msgid "Random"
 msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:399
+#: panels/network/connection-editor/ce-page.c:237
 msgid "Stable"
 msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:403
+#: panels/network/connection-editor/ce-page.c:241
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on. This feature is known as MAC "
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: panels/network/connection-editor/ce-page.c:538
-msgid "automatic"
-msgstr "自動"
-
-#: panels/network/connection-editor/ce-page.c:578
+#: panels/network/connection-editor/ce-page.c:399
 #, c-format
 msgid "Profile %d"
 msgstr "プロファイル %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
+#: panels/network/connection-editor/ce-page-details.c:93
+#: panels/network/net-device-wifi.c:235
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
-#: panels/network/network-wifi.ui:592
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:240
 msgid "WPA"
 msgstr "WPA"
 
+#. TRANSLATORS: this WPA3 WiFi security
+#: panels/network/connection-editor/ce-page-details.c:103
+msgid "WPA3"
+msgstr ""
+
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:142
+#: panels/network/connection-editor/ce-page-details.c:109
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:115
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
+#: panels/network/connection-editor/ce-page-details.c:120
+#: panels/network/net-device-wifi.c:225
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
 
-#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/connection-editor/ce-page-details.c:141
 msgid "Never"
 msgstr "しない"
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:137
-#: panels/network/net-device-wifi.c:413
+#: panels/network/connection-editor/ce-page-details.c:156
+#: panels/network/net-device-ethernet.c:108
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 日前"
 
+#: panels/network/connection-editor/ce-page-details.c:281
+#, c-format
+msgid "%d Mb/s (%1.1f GHz)"
+msgstr ""
+
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:228
-#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
+#: panels/network/connection-editor/ce-page-details.c:283
+#: panels/network/net-device-ethernet.c:202
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:249
-#: panels/network/net-device-wifi.c:565
+#: panels/network/connection-editor/ce-page-details.c:300
+msgid "2.4 GHz / 5 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:302
+msgid "2.4 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:304
+msgid "5 GHz"
+msgstr ""
+
+#: panels/network/connection-editor/ce-page-details.c:324
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:567
+#: panels/network/connection-editor/ce-page-details.c:326
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:569
+#: panels/network/connection-editor/ce-page-details.c:328
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:330
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:332
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: panels/network/connection-editor/ce-page-details.c:300
+#: panels/network/connection-editor/ce-page-details.c:390
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:143
+#: panels/network/net-device-mobile.c:431
+msgid "IPv4 Address"
+msgstr "IPv4 アドレス"
+
+#: panels/network/connection-editor/ce-page-details.c:391
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-ethernet.c:148
+#: panels/network/net-device-mobile.c:432 panels/network/network-mobile.ui:200
+msgid "IPv6 Address"
+msgstr "IPv6 アドレス"
+
+#: panels/network/connection-editor/ce-page-details.c:394
+#: panels/network/connection-editor/ce-page-details.c:395
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:435
+#: panels/network/net-device-mobile.c:436 panels/network/network-mobile.ui:183
+msgid "IP Address"
+msgstr "IP アドレス"
+
+#: panels/network/connection-editor/ce-page-details.c:429
 msgid "Forget Connection"
 msgstr "接続情報を破棄"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:431
 msgid "Remove Connection Profile"
 msgstr "接続プロファイルを削除"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:433
 msgid "Remove VPN"
 msgstr "VPNを削除"
 
-#: panels/network/connection-editor/ce-page-details.c:332
-#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:269
+#: panels/network/connection-editor/ce-page-details.c:451
 msgid "Details"
 msgstr "詳細"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:177
-#: panels/network/connection-editor/ce-page-vpn.c:188
-#: panels/network/connection-editor/ce-page-wifi.c:196
-#: panels/network/network-wifi.ui:1437
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "自動"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:150
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "Identity"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:268
+#: panels/network/connection-editor/ce-page-ip6.c:249
 msgid "Delete Address"
 msgstr "アドレスを削除"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:428
+#: panels/network/connection-editor/ce-page-ip6.c:398
 msgid "Delete Route"
 msgstr "ルートを削除"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1441
+#: panels/network/connection-editor/ce-page-ip4.c:852
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1445
+#: panels/network/connection-editor/ce-page-ip6.c:783
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:260
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:283
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:293
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:306
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:319
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:333
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:347
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
+#: panels/network/connection-editor/ce-page-security.c:361
+#, fuzzy
+#| msgctxt "category"
+#| msgid "Personal"
+msgid "WPA3 Personal"
+msgstr "パーソナル"
+
 #: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "信号強度"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "リンクの速度"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
-#: panels/network/panel-common.c:644
-msgid "IPv4 Address"
-msgstr "IPv4 アドレス"
-
-#: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:171
-#: panels/network/net-device-ethernet.c:175
-#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
-#: panels/network/panel-common.c:645
-msgid "IPv6 Address"
-msgstr "IPv6 アドレス"
-
-#: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:151
 msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
-#: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:182
-#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
+#: panels/network/connection-editor/details-page.ui:162
+#, fuzzy
+#| msgid "Supported ICC profiles"
+msgid "Supported Frequencies"
+msgstr "サポートする ICC プロファイル"
+
+#: panels/network/connection-editor/details-page.ui:180
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/network-mobile.ui:217
 msgid "Default Route"
 msgstr "デフォルトルート"
 
-#: panels/network/connection-editor/details-page.ui:177
-#: panels/network/connection-editor/ip4-page.ui:197
-#: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:184
-#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:235
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:217
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:376
 msgid "Connect _automatically"
 msgstr "自動接続する(_A)"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:395
 msgid "Make available to _other users"
 msgstr "他のユーザーも利用可能(_O)"
 
-#: panels/network/connection-editor/details-page.ui:376
-msgid "Restrict _background data usage"
-msgstr "バックグラウンドデータの使用を制限する(_B)"
-
-#: panels/network/connection-editor/details-page.ui:387
-msgid "Appropriate for connections that have data charges or limits."
-msgstr "従量制課金接続のような制限のある接続に適しています。"
-
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291
-#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:239
-msgid "Automatic"
-msgstr "自動"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "ツイストペア (TP)"
+#: panels/network/connection-editor/details-page.ui:428
+msgid "_Metered connection: has data limits or can incur charges"
+msgstr ""
 
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: panels/network/connection-editor/details-page.ui:439
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr ""
 
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:71
 #: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: panels/network/connection-editor/wifi-page.ui:67
-#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "MAC アドレス(_M)"
 
-#: panels/network/connection-editor/ethernet-page.ui:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "MTU(_T)"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "クローンしたアドレス(_C)"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "バイト"
 
@@ -2764,7 +3416,6 @@ msgid "IPv_4 Method"
 msgstr "IPv4 メソッド(_4)"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
@@ -2775,9 +3426,7 @@ msgstr "リンクローカルのみ"
 
 #: panels/network/connection-editor/ip4-page.ui:69
 #: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
-#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
-#: panels/privacy/cc-privacy-panel.c:239
+#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
 msgid "Manual"
 msgstr "手動"
 
@@ -2786,61 +3435,76 @@ msgstr "手動"
 msgid "Disable"
 msgstr "無効"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:97
+#: panels/network/connection-editor/ip6-page.ui:111
+#, fuzzy
+#| msgid "Shared with other computers"
+msgid "Shared to other computers"
+msgstr "他のコンピューターと共有する"
+
+#: panels/network/connection-editor/ip4-page.ui:125
+#: panels/network/connection-editor/ip6-page.ui:139
 msgid "Addresses"
 msgstr "アドレス"
 
-#: panels/network/connection-editor/ip4-page.ui:129
-#: panels/network/connection-editor/ip4-page.ui:313
-#: panels/network/connection-editor/ip6-page.ui:143
-#: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:89
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/printers/pp-details-dialog.ui:95
 msgid "Address"
 msgstr "アドレス"
 
-#: panels/network/connection-editor/ip4-page.ui:143
-#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: panels/network/connection-editor/ip4-page.ui:157
-#: panels/network/connection-editor/ip4-page.ui:341
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+#: panels/network/connection-editor/ip4-page.ui:171
+#: panels/network/connection-editor/ip4-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:369
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: panels/network/connection-editor/ip4-page.ui:220
-#: panels/network/connection-editor/ip6-page.ui:234
+#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip4-page.ui:291
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/connection-editor/ip6-page.ui:305
+#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:33
+msgid "Automatic"
+msgstr "自動"
+
+#: panels/network/connection-editor/ip4-page.ui:234
+#: panels/network/connection-editor/ip6-page.ui:248
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip6-page.ui:272
 msgid "Separate IP addresses with commas"
 msgstr "複数の IP アドレスを指定する場合はそれぞれコンマで区切ってください"
 
-#: panels/network/connection-editor/ip4-page.ui:265
-#: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
+#: panels/network/connection-editor/ip4-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:293
 msgid "Routes"
 msgstr "ルート"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:302
+#: panels/network/connection-editor/ip6-page.ui:316
 msgid "Automatic Routes"
 msgstr "自動ルート"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:354
-#: panels/network/connection-editor/ip6-page.ui:368
+#: panels/network/connection-editor/ip4-page.ui:368
+#: panels/network/connection-editor/ip6-page.ui:382
 msgid "Metric"
 msgstr "メトリック"
 
-#: panels/network/connection-editor/ip4-page.ui:384
-#: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
+#: panels/network/connection-editor/ip4-page.ui:398
+#: panels/network/connection-editor/ip6-page.ui:412
 msgid "Use this connection _only for resources on its network"
 msgstr "この接続はネットワーク上のリソースのためだけに使用する(_O)"
 
@@ -2852,37 +3516,36 @@ msgstr "IPv6 メソッド(_6)"
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: panels/network/connection-editor/net-connection-editor.c:261
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "Unable to open connection editor"
 msgstr "接続エディターを起動できません"
 
-#: panels/network/connection-editor/net-connection-editor.c:279
+#: panels/network/connection-editor/net-connection-editor.c:307
 msgid "New Profile"
 msgstr "新規プロファイル"
 
-#: panels/network/connection-editor/net-connection-editor.c:727
+#: panels/network/connection-editor/net-connection-editor.c:740
 msgid "Import from file…"
 msgstr "ファイルからインポート…"
 
-#: panels/network/connection-editor/net-connection-editor.c:759
+#: panels/network/connection-editor/net-connection-editor.c:772
 msgid "Add VPN"
 msgstr "VPNの追加"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:20
 msgid "S_ecurity"
 msgstr "セキュリティ(_E)"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:139
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:141
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2894,29 +3557,29 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:173
 msgid "Select file to import"
 msgstr "インポートするファイルを選択する"
 
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:225
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "“%s”というファイルはすでに存在します。"
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:227
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s を、保存している VPN 接続に入れ替えますか?"
 
-#: panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:264
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:266
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2927,7 +3590,7 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:296
 msgid "Export VPN connection"
 msgstr "VPN 接続をエクスポートする"
 
@@ -2936,12 +3599,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(エラー: VPN 接続エディターを読み込めません)"
 
 #: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "SSID(_S)"
 
 #: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "BSSID(_B)"
 
@@ -2968,28 +3629,19 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;ネットワーク;無線;ワ"
 "イヤレス;ブロードバンド;ホットスポット;"
 
-#: panels/network/net-device-ethernet.c:123
-#: panels/network/net-device-wifi.c:399
+#: panels/network/net-device-ethernet.c:96
 msgid "never"
 msgstr "未接続"
 
-#: panels/network/net-device-ethernet.c:133
-#: panels/network/net-device-wifi.c:409
+#: panels/network/net-device-ethernet.c:104
 msgid "today"
 msgstr "今日"
 
-#: panels/network/net-device-ethernet.c:135
-#: panels/network/net-device-wifi.c:411
+#: panels/network/net-device-ethernet.c:106
 msgid "yesterday"
 msgstr "昨日"
 
-#: panels/network/net-device-ethernet.c:173
-#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
-#: panels/network/panel-common.c:649
-msgid "IP Address"
-msgstr "IP アドレス"
-
-#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:162
 msgid "Last used"
 msgstr "最後の利用"
 
@@ -2998,90 +3650,59 @@ msgstr "最後の利用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:291
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:252
+#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "有線"
 
-#: panels/network/net-device-mobile.c:236
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "新規の接続を追加"
 
-#: panels/network/net-device-wifi.c:1217
-#, c-format
-msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr ""
-"ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
-
-#: panels/network/net-device-wifi.c:1221
-msgid ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-msgstr ""
-"ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできま"
-"せん。"
-
-#: panels/network/net-device-wifi.c:1228
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "Wi-Fi アクセスポイントをオンにしますか?"
-
-#: panels/network/net-device-wifi.c:1250
-msgid ""
-"Wi-Fi hotspots are usually used to share an additional Internet connection "
-"over Wi-Fi."
-msgstr ""
-"Wi-Fi アクセスポイント機能は、追加のインターネット接続を Wi-Fi 経由で共有する"
-"ために使用されます。"
-
-#: panels/network/net-device-wifi.c:1261
-msgid "_Turn On"
-msgstr "オン(_T)"
-
-#: panels/network/net-device-wifi.c:1338
+#: panels/network/net-device-wifi.c:798
 msgid "Stop hotspot and disconnect any users?"
 msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
 
-#: panels/network/net-device-wifi.c:1341
+#: panels/network/net-device-wifi.c:801
 msgid "_Stop Hotspot"
 msgstr "停止(_S)"
 
-#: panels/network/net-device-wifi.c:1397
-msgid "System policy prohibits use as a Hotspot"
-msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
-
-#: panels/network/net-device-wifi.c:1400
-msgid "Wireless device does not support Hotspot mode"
-msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
-
-#: panels/network/net-device-wifi.c:1558
+#: panels/network/net-device-wifi.c:905
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "パスワードや独自の設定など、 選択したネットワークの詳細は失われます。"
 
-#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:909
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
+#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072
 msgid "Known Wi-Fi Networks"
 msgstr "既知の Wi-Fi ネットワーク"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:1769
+#: panels/network/net-device-wifi.c:1107
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/network/net-device-wifi.c:1268
+msgid "System policy prohibits use as a Hotspot"
+msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
+
+#: panels/network/net-device-wifi.c:1271
+msgid "Wireless device does not support Hotspot mode"
+msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
+
+#: panels/network/net-proxy.c:70
+#: panels/notifications/cc-notifications-panel.c:267
+#: panels/power/cc-power-panel.c:2063 panels/power/cc-power-panel.c:2074
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 #: panels/universal-access/cc-ua-panel.ui:323
 #: panels/universal-access/cc-ua-panel.ui:369
 #: panels/universal-access/cc-ua-panel.ui:415
@@ -3089,12 +3710,12 @@ msgstr "破棄(_F)"
 #: panels/universal-access/cc-ua-panel.ui:674
 #: panels/universal-access/cc-ua-panel.ui:720
 #: panels/universal-access/cc-ua-panel.ui:766
-#: panels/universal-access/cc-ua-panel.ui:918
+#: panels/universal-access/cc-ua-panel.ui:950
 msgid "Off"
 msgstr "オフ"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:113
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -3105,668 +3726,565 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:121
 msgid "This is not recommended for untrusted public networks."
 msgstr "信頼できない公衆ネットワークでは推奨されません。"
 
-#: panels/network/network-mobile.ui:30
+#. update title
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
+
+#: panels/network/network-bluetooth.ui:50
+msgid "Turn device off"
+msgstr "デバイスをオフにする"
+
+#: panels/network/network-mobile.ui:29
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:47
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
 msgid "Network Proxy"
 msgstr "ネットワークプロキシ"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:176
 msgid "_HTTP Proxy"
 msgstr "HTTP プロキシ(_H)"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:195
 msgid "H_TTPS Proxy"
 msgstr "HTTPS プロキシ(_T)"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:214
 msgid "_FTP Proxy"
 msgstr "FTP プロキシ(_F)"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:233
 msgid "_Socks Host"
 msgstr "Socks ホスト(_S)"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:252
 msgid "_Ignore Hosts"
 msgstr "次のホストを無視する(_I)"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:290
 msgid "HTTP proxy port"
 msgstr "HTTP プロキシポート"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:367
 msgid "HTTPS proxy port"
 msgstr "HTTPS プロキシポート"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:388
 msgid "FTP proxy port"
 msgstr "FTP プロキシポート"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:409
 msgid "Socks proxy port"
 msgstr "Socks プロキシポート"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:438
 msgid "_Configuration URL"
 msgstr "設定 URL(_C)"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "デバイスをオフにする"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:55
 msgid "Turn VPN connection off"
 msgstr "VPN 接続をオフにする"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "自動接続(_C)"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "詳細"
-
-#: panels/network/network-wifi.ui:545
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/cc-sharing-panel.ui:351
-#: panels/user-accounts/cc-add-user-dialog.ui:310
-#: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:216
-msgid "_Password"
-msgstr "パスワード(_P)"
-
-#: panels/network/network-wifi.ui:621
-msgid "Show P_assword"
-msgstr "パスワードを表示(_A)"
-
-#: panels/network/network-wifi.ui:651
-msgid "Make available to other users"
-msgstr "他のユーザーに利用可能にする"
-
-#: panels/network/network-wifi.ui:679
-msgid "identity"
-msgstr "識別情報"
-
-#: panels/network/network-wifi.ui:713
-msgid "IPv_4"
-msgstr "IPv4(_4)"
-
-#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
-msgid "_Addresses"
-msgstr "アドレス(_A)"
-
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
-msgid "Automatic (DHCP) addresses only"
-msgstr "自動 (DHCP) アドレスのみ"
-
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
-msgid "Link-local only"
-msgstr "リンクローカルのみ"
-
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
-msgid "Shared with other computers"
-msgstr "他のコンピューターと共有する"
-
-#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
-msgid "_Ignore automatically obtained routes"
-msgstr "自動的に得られたルートを無視する(_I)"
-
-#: panels/network/network-wifi.ui:959
-msgid "ipv4"
-msgstr "ipv4"
-
-#: panels/network/network-wifi.ui:990
-msgid "IPv_6"
-msgstr "IPv6(_6)"
-
-#: panels/network/network-wifi.ui:1236
-msgid "ipv6"
-msgstr "ipv6"
-
-#: panels/network/network-wifi.ui:1276
-msgid "_Cloned MAC Address"
-msgstr "クローンしたMACアドレス(_C)"
-
-#: panels/network/network-wifi.ui:1334
-msgid "_Reset"
-msgstr "リセット(_R)"
-
-#: panels/network/network-wifi.ui:1370
-msgid ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-msgstr ""
-"この接続の設定をデフォルトにリセットしますが、推奨接続であることは記憶しま"
-"す。"
-
-#: panels/network/network-wifi.ui:1387
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr ""
-"このネットワークに関する詳細はすべて削除して、自動的に接続しないようにしま"
-"す。"
-
-#: panels/network/network-wifi.ui:1449
-msgid "Hardware"
-msgstr "ハードウェア"
-
-#: panels/network/network-wifi.ui:1453
-msgctxt "tab"
-msgid "Reset"
-msgstr "リセット"
-
-#: panels/network/network-wifi.ui:1505
+#: panels/network/network-wifi.ui:37
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi アクセスポイント"
 
-#: panels/network/network-wifi.ui:1523
+#: panels/network/network-wifi.ui:55
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Wi-Fiネットワークへ接続するためスイッチをオフ"
 
-#: panels/network/network-wifi.ui:1572
-msgid "Network Name"
-msgstr "ネットワーク名"
-
-#: panels/network/network-wifi.ui:1590
-msgid "Connected Devices"
-msgstr "接続しているデバイス"
-
-#: panels/network/network-wifi.ui:1608
+#: panels/network/network-wifi.ui:123
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: panels/network/network-wifi.ui:1671
+#: panels/network/network-wifi.ui:175
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "パスワード"
 
-#: panels/network/network-wifi.ui:1768
+#: panels/network/network-wifi.ui:264
 msgid "Turn Wi-Fi off"
 msgstr "Wi-Fi をオフにする"
 
-#: panels/network/network-wifi.ui:1800
+#: panels/network/network-wifi.ui:296
 msgid "_Connect to Hidden Network…"
 msgstr "非表示のネットワークに接続(_C)…"
 
-#: panels/network/network-wifi.ui:1810
+#: panels/network/network-wifi.ui:307
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Wi-Fi アクセスポイントをオンにする(_T)"
 
-#: panels/network/network-wifi.ui:1820
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "既知の Wi-Fi ネットワーク(_K)"
 
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "アドホック"
-
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:131
-msgid "Infrastructure"
-msgstr "インフラストラクチャ"
-
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "ステータス不明"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "管理対象外"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "利用不可"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "接続中"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "認証が要求されました"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
+#: panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "接続済み"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "切断中"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "接続失敗"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "ステータス不明 (見つからない)"
 
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:223
-msgid "Not connected"
-msgstr "接続していない"
-
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:248
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "IP設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "IP設定の期限切れ"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "秘密の情報が必要でしたが入力されませんでした"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x サプリカントが切断されました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x サプリカントの設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "802.1x サプリカントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x サプリカントの認証に時間がかかりすぎました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:280
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "PPPサービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "PPPサービスの接続を切断しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP が失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "DHCPクライアントの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "DHCPクライアントにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "DHCPクライアントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "共有接続サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "AutoIP サービスにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "回線が使用中です"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "発信音がありません"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "キャリアの確立ができませんでした"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "発信要求がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "発信の試行に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "指定されたAPNの選択に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "ネットワーク登録が拒否されました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "ネットワーク登録がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:368
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "PINチェックに失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "このデバイスのファームウェアがないようです"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:376
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "接続が消失しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "既存の接続とみなされました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "モデムが見つかりませんでした"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth接続に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "SIMカードが挿入されていません"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "SIMのPIN番号が必要です"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "SIMのPUKが必要です"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIMが違います"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "接続が依存するデバイス等の準備ができません"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:351
 msgid "Firmware missing"
 msgstr "ファームウェア未検出"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:355
 msgid "Cable unplugged"
 msgstr "ケーブル非接続"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティ(wpa-eap)で未定義のエラー"
 
-#: panels/network/wireless-security/eap-method.c:245
+#: panels/network/wireless-security/eap-method.c:195
 msgid "no file selected"
 msgstr "ファイルが選択されていません"
 
-#: panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:222
 msgid "unspecified error validating eap-method file"
 msgstr "EAPメソッドファイルの検証中に特定できないエラー"
 
-#: panels/network/wireless-security/eap-method.c:451
+#: panels/network/wireless-security/eap-method.c:397
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:454
+#: panels/network/wireless-security/eap-method.c:400
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER か PEM の証明書 (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:87
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PACファイルが見つかりません"
 
-#: panels/network/wireless-security/eap-method-fast.c:268
-#: panels/network/wireless-security/eap-method-peap.c:302
-#: panels/network/wireless-security/eap-method-ttls.c:361
-msgid "GTC"
-msgstr "GTC"
-
-#: panels/network/wireless-security/eap-method-fast.c:283
-#: panels/network/wireless-security/eap-method-peap.c:272
-#: panels/network/wireless-security/eap-method-ttls.c:299
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:347
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:352
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
+msgid "GTC"
+msgstr "GTC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "匿名"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "認証"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "両方"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:49
+#: panels/network/wireless-security/eap-method-peap.ui:52
+#: panels/network/wireless-security/eap-method-ttls.ui:51
+msgid "Anony_mous identity"
+msgstr "匿名の識別子(_M)"
+
+#: panels/network/wireless-security/eap-method-fast.ui:75
 msgid "PAC _file"
 msgstr "PAC ファイル(_F)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:123
+#: panels/network/wireless-security/eap-method-fast.ui:115
+#: panels/network/wireless-security/eap-method-peap.ui:150
+#: panels/network/wireless-security/eap-method-ttls.ui:143
 msgid "_Inner authentication"
 msgstr "内部認証(_I)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:144
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動的なPACプロビジョニングを許可する(_V)"
 
-#: panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:64
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAPユーザー名が見つかりません"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:73
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAPパスワードが見つかりません"
 
-#: panels/network/wireless-security/eap-method-leap.ui:26
-#: panels/network/wireless-security/eap-method-simple.ui:26
-#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/network/wireless-security/eap-method-leap.ui:17
+#: panels/network/wireless-security/eap-method-simple.ui:17
+#: panels/network/wireless-security/ws-leap.ui:18
 #: panels/user-accounts/cc-add-user-dialog.ui:146
 #: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "ユーザー名(_U)"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:31
+#: panels/network/wireless-security/eap-method-simple.ui:31
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:385
+msgid "_Password"
+msgstr "パスワード(_P)"
+
+#: panels/network/wireless-security/eap-method-leap.ui:55
+#: panels/network/wireless-security/eap-method-simple.ui:73
+#: panels/network/wireless-security/eap-method-tls.ui:157
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:87
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "無効なEAP-LEAP CA証明書: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:96
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無効なEAP-LEAP CA証明書: 認証書が指定されていない"
 
-#: panels/network/wireless-security/eap-method-peap.c:287
-#: panels/network/wireless-security/eap-method-ttls.c:346
-#: panels/network/wireless-security/wireless-security.c:441
-msgid "MD5"
-msgstr "MD5"
-
-#: panels/network/wireless-security/eap-method-peap.c:381
-#: panels/network/wireless-security/eap-method-tls.c:492
-#: panels/network/wireless-security/eap-method-ttls.c:440
+#: panels/network/wireless-security/eap-method-peap.c:328
+#: panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-ttls.c:336
 msgid "Choose a Certificate Authority certificate"
 msgstr "認証局(CA)証明書を選択"
 
-#: panels/network/wireless-security/eap-method-peap.ui:25
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
+msgid "MD5"
+msgstr "MD5"
+
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "バージョン 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:82
+#: panels/network/wireless-security/eap-method-peap.ui:78
+#: panels/network/wireless-security/eap-method-tls.ui:68
+#: panels/network/wireless-security/eap-method-ttls.ui:102
 msgid "C_A certificate"
 msgstr "CA証明書(_A)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:105
+#: panels/network/wireless-security/eap-method-peap.ui:100
+#: panels/network/wireless-security/eap-method-tls.ui:90
+#: panels/network/wireless-security/eap-method-ttls.ui:125
 msgid "No CA certificate is _required"
 msgstr "CA証明書が要求されましたが存在しません(_R)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:118
 msgid "PEAP _version"
 msgstr "PEAPバージョン(_V)"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:78
 msgid "missing EAP username"
 msgstr "EAPユーザー名が見つかりません"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:91
 msgid "missing EAP password"
 msgstr "EAPパスワードが見つかりません"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:91
 msgid "missing EAP-TLS identity"
 msgstr "EAP-ELS認証"
 
-#: panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "EAP-TLSユーザー名が見つかりません: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:111
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TLS CA証明書: 認証書が指定されていない"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:125
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無効なEAP-TLS秘密鍵: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:135
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無効なEAP-TLSユーザー証明書: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:266
 msgid "Unencrypted private keys are insecure"
 msgstr "暗号化のないプライベートキーは安全ではありません"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:269
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3780,92 +4298,97 @@ msgstr ""
 "\n"
 "(プライベートキーは openssl を使用してパスワード保護ができます)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:500
 msgid "Choose your personal certificate"
 msgstr "個人用証明書を選択する"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:514
 msgid "Choose your private key"
 msgstr "プライベートキーを選択する"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:17
 msgid "I_dentity"
 msgstr "アイデンティティ(_D)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:43
 msgid "_User certificate"
 msgstr "ユーザー証明書(_U)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "Private _key"
 msgstr "プライベートキー(_K)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:133
 msgid "_Private key password"
 msgstr "プライベートキーのパスワード(_P)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:98
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "無効なEAP-TTLS CA証明書: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:106
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TTLS CA証明書: 証明書が指定されていない"
 
-#: panels/network/wireless-security/eap-method-ttls.c:269
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:284
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:315
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:331
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:71
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X セキュリティを検証中に未知のエラー"
 
-#: panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:61
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:65
 msgid "missing leap-username"
 msgstr "LEAPユーザー名が指定されていません"
 
@@ -3919,15 +4442,15 @@ msgstr "オープンシステム"
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "キー(_K)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "キーを表示(_W)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "WEPインデックス(_X)"
 
@@ -3944,7 +4467,7 @@ msgstr ""
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効なWPA PSK: キーが64文字の場合、十六進数字以外は使用できません"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "種類(_T)"
 
@@ -3987,20 +4510,19 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "ロック画面にメッセージの内容を表示する(_O)"
 
-#: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/notifications/cc-notifications-panel.c:267
+#: panels/power/cc-power-panel.c:2069 panels/power/cc-power-panel.c:2076
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 msgid "On"
 msgstr "オン"
 
 #: panels/notifications/cc-notifications-panel.ui:70
-msgid "Notification _Popups"
-msgstr "通知ポップアップ(_P)"
+msgid "_Do Not Disturb"
+msgstr ""
 
 #: panels/notifications/cc-notifications-panel.ui:121
 msgid "_Lock Screen Notifications"
@@ -4036,9 +4558,10 @@ msgstr "アカウント削除に失敗"
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:989
-#, c-format
-msgid "<b>%s</b> removed"
+#: panels/online-accounts/cc-online-accounts-panel.c:991
+#, fuzzy, c-format
+#| msgid "<b>%s</b> removed"
+msgid "%s removed"
 msgstr "<b>%s</b> 削除しました"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
@@ -4064,7 +4587,7 @@ msgstr ""
 "OnlineAccounts;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:54
 msgid "Undo"
 msgstr "元に戻す"
 
@@ -4086,17 +4609,17 @@ msgstr "アカウントの追加"
 msgid "Remove Account"
 msgstr "アカウントの削除"
 
-#: panels/power/cc-power-panel.c:327
+#: panels/power/cc-power-panel.c:331
 msgid "Unknown time"
 msgstr "残り時間は不明"
 
-#: panels/power/cc-power-panel.c:333
+#: panels/power/cc-power-panel.c:337
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
 
-#: panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:349
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4104,292 +4627,255 @@ msgstr[0] "%i 時間"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:353
+#: panels/power/cc-power-panel.c:357
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:354
+#: panels/power/cc-power-panel.c:358
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:359
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:373
+#: panels/power/cc-power-panel.c:377
 #, c-format
 msgid "%s until fully charged"
 msgstr "フル充電まで %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:380
+#: panels/power/cc-power-panel.c:384
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意: 残り %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:385
+#: panels/power/cc-power-panel.c:389
 #, c-format
 msgid "%s remaining"
 msgstr "残り %s"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
+#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
 msgid "Not charging"
 msgstr "放電中"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-power-panel.c:402 panels/power/cc-power-panel.c:432
 msgid "Empty"
 msgstr "空"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:411
+#: panels/power/cc-power-panel.c:415
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:416
+#: panels/power/cc-power-panel.c:420
 msgid "Discharging"
 msgstr "放電中"
 
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:553
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主"
 
-#: panels/power/cc-power-panel.c:551
+#: panels/power/cc-power-panel.c:555
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "予備"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:626
+#: panels/power/cc-power-panel.c:630
 msgid "Wireless mouse"
 msgstr "ワイヤレスマウス"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:633
 msgid "Wireless keyboard"
 msgstr "ワイヤレスキーボード"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:636
 msgid "Uninterruptible power supply"
 msgstr "無停電電源装置"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
+#: panels/power/cc-power-panel.c:639
 msgid "Personal digital assistant"
 msgstr "携帯情報端末"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:638
+#: panels/power/cc-power-panel.c:642
 msgid "Cellphone"
 msgstr "携帯電話"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:645
 msgid "Media player"
 msgstr "音楽プレイヤー"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
+#: panels/power/cc-power-panel.c:648 panels/wacom/cc-wacom-panel.c:809
 msgid "Tablet"
 msgstr "タブレット"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:647
+#: panels/power/cc-power-panel.c:651
 msgid "Computer"
 msgstr "コンピューター"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:650
+#: panels/power/cc-power-panel.c:654
 msgid "Gaming input device"
 msgstr "ゲーム用入力デバイス"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
-#: panels/power/cc-power-panel.c:2430
+#: panels/power/cc-power-panel.c:657 panels/power/cc-power-panel.c:939
+#: panels/power/cc-power-panel.c:2420
 msgid "Battery"
 msgstr "バッテリー"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:714
+#: panels/power/cc-power-panel.c:718
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:721
+#: panels/power/cc-power-panel.c:725
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:726
+#: panels/power/cc-power-panel.c:730
 msgctxt "Battery power"
 msgid "Low"
 msgstr "少ない"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
+#: panels/power/cc-power-panel.c:735
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充分"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:736
+#: panels/power/cc-power-panel.c:740
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:740
+#: panels/power/cc-power-panel.c:744
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: panels/power/cc-power-panel.c:909
+#: panels/power/cc-power-panel.c:937
 msgid "Batteries"
 msgstr "バッテリー"
 
-#: panels/power/cc-power-panel.c:1274
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 時間"
-
-#: panels/power/cc-power-panel.c:1276
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分"
-
-#: panels/power/cc-power-panel.c:1279
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-
-#. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1284
-#, c-format
-msgctxt "time"
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1287
-#, c-format
-msgctxt "time"
-msgid "%s %s"
-msgstr "%s %s"
-
-#. 0 seconds
-#: panels/power/cc-power-panel.c:1293
-msgid "0 seconds"
-msgstr "0 秒"
-
-#: panels/power/cc-power-panel.c:1390
+#: panels/power/cc-power-panel.c:1378
 msgid "When _idle"
 msgstr "アイドル時(_I)"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1824
 msgid "Power Saving"
 msgstr "省電力"
 
-#: panels/power/cc-power-panel.c:1869
+#: panels/power/cc-power-panel.c:1858
 msgid "_Screen Brightness"
 msgstr "画面の明るさ(_S)"
 
-#: panels/power/cc-power-panel.c:1890
+#: panels/power/cc-power-panel.c:1879
 msgid "Automatic Brightness"
 msgstr "明るさ自動調整"
 
-#: panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1892
 msgid "_Keyboard Brightness"
 msgstr "キーボードの明るさ(_K)"
 
-#: panels/power/cc-power-panel.c:1914
+#: panels/power/cc-power-panel.c:1903
 msgid "_Dim Screen When Inactive"
 msgstr "操作していないときに画面を暗くする(_D)"
 
-#: panels/power/cc-power-panel.c:1932
+#: panels/power/cc-power-panel.c:1921
 msgid "_Blank Screen"
 msgstr "ブランクスクリーン(_B)"
 
-#: panels/power/cc-power-panel.c:1955
+#: panels/power/cc-power-panel.c:1944
 msgid "_Wi-Fi"
 msgstr "Wi-Fi(_W)"
 
-#: panels/power/cc-power-panel.c:1956
+#: panels/power/cc-power-panel.c:1945
 msgid "Wi-Fi can be turned off to save power."
 msgstr "Wi-Fi をオフにすると節電できます。"
 
-#: panels/power/cc-power-panel.c:1972
+#: panels/power/cc-power-panel.c:1961
 msgid "_Mobile Broadband"
 msgstr "モバイルブロードバンド(_M)"
 
-#: panels/power/cc-power-panel.c:1973
+#: panels/power/cc-power-panel.c:1962
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr "モバイルブロードバンド (LTE、4G、3G など) をオフにすると節電できます。"
 
-#: panels/power/cc-power-panel.c:2023
+#: panels/power/cc-power-panel.c:2012
 msgid "_Bluetooth"
 msgstr "Bluetooth(_B)"
 
-#: panels/power/cc-power-panel.c:2024
+#: panels/power/cc-power-panel.c:2013
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bluetooth をオフにすると節電できます。"
 
-#: panels/power/cc-power-panel.c:2076
+#: panels/power/cc-power-panel.c:2065
 msgid "When on battery power"
 msgstr "バッテリー動作時"
 
-#: panels/power/cc-power-panel.c:2078
+#: panels/power/cc-power-panel.c:2067
 msgid "When plugged in"
 msgstr "電源接続時"
 
-#: panels/power/cc-power-panel.c:2172
+#: panels/power/cc-power-panel.c:2161
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: panels/power/cc-power-panel.c:2173
+#: panels/power/cc-power-panel.c:2162
 msgid "Power Off"
 msgstr "電源オフ"
 
-#: panels/power/cc-power-panel.c:2174
+#: panels/power/cc-power-panel.c:2163
 msgid "Hibernate"
 msgstr "ハイバーネート"
 
-#: panels/power/cc-power-panel.c:2175
+#: panels/power/cc-power-panel.c:2164
 msgid "Nothing"
 msgstr "なにもしない"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2275
+#: panels/power/cc-power-panel.c:2264
 msgid "Suspend & Power Button"
 msgstr "サスペンド, 電源ボタン"
 
-#: panels/power/cc-power-panel.c:2316
+#: panels/power/cc-power-panel.c:2305
 msgid "_Automatic Suspend"
 msgstr "自動サスペンド(_A)"
 
-#: panels/power/cc-power-panel.c:2317
+#: panels/power/cc-power-panel.c:2306
 msgid "Automatic suspend"
 msgstr "自動サスペンド"
 
-#: panels/power/cc-power-panel.c:2374
+#: panels/power/cc-power-panel.c:2364
 msgid "Po_wer Button Action"
 msgstr "電源ボタンの動作(_W)"
 
@@ -4453,66 +4939,6 @@ msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 時間"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:63
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:67
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:71
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:75
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:79
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:83
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:87
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:91
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:95
-msgctxt "blank_screen"
-msgid "15 minutes"
-msgstr "15 分"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:99
-msgctxt "blank_screen"
-msgid "Never"
-msgstr "しない"
-
 #: panels/power/cc-power-panel.ui:147
 msgid "Automatic Suspend"
 msgstr "自動サスペンド"
@@ -4526,7 +4952,7 @@ msgid "On _Battery Power"
 msgstr "バッテリー動作時(_B)"
 
 #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
-#: panels/universal-access/cc-ua-panel.ui:1495
+#: panels/universal-access/cc-ua-panel.ui:1527
 msgid "Delay"
 msgstr "時間"
 
@@ -4557,65 +4983,33 @@ msgstr "認証"
 
 #. Translators: This is a username on a print server.
 #: panels/printers/authentication-dialog.ui:80
-#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:362
+#: panels/printers/new-printer-dialog.ui:362
+#: panels/printers/pp-jobs-dialog.ui:57
 msgid "Username"
 msgstr "ユーザー名"
 
-#. Translators: This is a password needed for printing.
-#: panels/printers/authentication-dialog.ui:96
-#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
-#: panels/user-accounts/cc-add-user-dialog.ui:249
-msgid "Password"
-msgstr "パスワード"
-
 #: panels/printers/authentication-dialog.ui:139
 #: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
 msgstr "認証が要求されました"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:715
+#: panels/printers/cc-printers-panel.c:699
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "プリンター“%s”を削除しました"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:938
+#: panels/printers/cc-printers-panel.c:922
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1242
+#: panels/printers/cc-printers-panel.c:1216
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
 
-#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
-msgid "Location"
-msgstr "場所"
-
-#. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:114
-#: panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "ドライバー"
-
-#: panels/printers/details-dialog.ui:152
-msgid "Searching for preferred drivers…"
-msgstr "推奨ドライバーの検索中…"
-
-#: panels/printers/details-dialog.ui:174
-msgid "Search for Drivers"
-msgstr "ドライバーを検索する"
-
-#: panels/printers/details-dialog.ui:182
-msgid "Select from Database…"
-msgstr "データベースから選択…"
-
-#: panels/printers/details-dialog.ui:190
-msgid "Install PPD File…"
-msgstr "PPDファイルのインストール…"
-
 #: panels/printers/gnome-printers-panel.desktop.in.in:3
 msgid "Printers"
 msgstr "プリンター"
@@ -4630,31 +5024,6 @@ msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
 
-#. Translators: This is a windows domain used with SMB protocol.
-#: panels/printers/jobs-dialog.ui:44
-msgid "Domain"
-msgstr "ドメイン"
-
-#. Translators: This button authenticates all print jobs and send them for printing.
-#: panels/printers/jobs-dialog.ui:123
-msgid "A_uthenticate"
-msgstr "認証(_U)"
-
-#. Translators: this action removes (purges) all the listed jobs from the list.
-#: panels/printers/jobs-dialog.ui:163
-msgid "Clear All"
-msgstr "すべてクリア"
-
-#. Translators: This button pop up authentication dialog for print jobs which need credentials.
-#: panels/printers/jobs-dialog.ui:225
-msgid "_Authenticate"
-msgstr "認証(_A)"
-
-#. Translators: this label describes the dialog empty state, with no jobs listed.
-#: panels/printers/jobs-dialog.ui:354
-msgid "No Active Printer Jobs"
-msgstr "アクティブなジョブはありません"
-
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
 #: panels/printers/pp-new-printer-dialog.c:363
@@ -4685,28 +5054,22 @@ msgstr ""
 "プリンターサーバーで利用可能なプリンターを表示するにはユーザー名とパスワード"
 "を入力してください。"
 
-#. Translators: This button triggers the printing of a test page.
-#. Translators: Name of job which makes printer to print test page
-#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907
-msgid "Test Page"
-msgstr "テストページ"
-
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: panels/printers/pp-details-dialog.c:133
-#: panels/printers/pp-details-dialog.c:417
+#: panels/printers/pp-details-dialog.c:75
+#: panels/printers/pp-details-dialog.c:370
 #, c-format
 msgid "%s Details"
 msgstr "%s の詳細"
 
-#: panels/printers/pp-details-dialog.c:180
+#: panels/printers/pp-details-dialog.c:122
 msgid "No suitable driver found"
 msgstr "適切なドライバーが見つかりませんでした"
 
-#: panels/printers/pp-details-dialog.c:310
+#: panels/printers/pp-details-dialog.c:249
 msgid "Select PPD File"
 msgstr "PPDファイルの選択"
 
-#: panels/printers/pp-details-dialog.c:319
+#: panels/printers/pp-details-dialog.c:258
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4714,6 +5077,32 @@ msgstr ""
 "PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
+#: panels/printers/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "場所"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "ドライバー"
+
+#: panels/printers/pp-details-dialog.ui:162
+msgid "Searching for preferred drivers…"
+msgstr "推奨ドライバーの検索中…"
+
+#: panels/printers/pp-details-dialog.ui:183
+msgid "Search for Drivers"
+msgstr "ドライバーを検索する"
+
+#: panels/printers/pp-details-dialog.ui:192
+msgid "Select from Database…"
+msgstr "データベースから選択…"
+
+#: panels/printers/pp-details-dialog.ui:201
+msgid "Install PPD File…"
+msgstr "PPDファイルのインストール…"
+
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "プリンタードライバーの選択"
@@ -4728,12 +5117,12 @@ msgid "Loading drivers database…"
 msgstr "ドライバーのデータベースをロード中..."
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:472
+#: panels/printers/pp-host.c:479
 msgid "JetDirect Printer"
 msgstr "JetDirect プリンター"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:707
+#: panels/printers/pp-host.c:714
 msgid "LPD Printer"
 msgstr "LPD プリンター"
 
@@ -4776,73 +5165,98 @@ msgid "Reverse portrait"
 msgstr "縦方向(逆向き)"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-jobs-dialog.c:234
+#: panels/printers/pp-jobs-dialog.c:222
 msgctxt "print job"
 msgid "Pending"
 msgstr "待機中"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-jobs-dialog.c:240
+#: panels/printers/pp-jobs-dialog.c:228
 msgctxt "print job"
 msgid "Paused"
 msgstr "一時停止"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-jobs-dialog.c:245
+#: panels/printers/pp-jobs-dialog.c:233
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "認証が要求されました"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-jobs-dialog.c:250
+#: panels/printers/pp-jobs-dialog.c:238
 msgctxt "print job"
 msgid "Processing"
 msgstr "印刷中"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-jobs-dialog.c:254
+#: panels/printers/pp-jobs-dialog.c:242
 msgctxt "print job"
 msgid "Stopped"
 msgstr "停止"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-jobs-dialog.c:258
+#: panels/printers/pp-jobs-dialog.c:246
 msgctxt "print job"
 msgid "Canceled"
 msgstr "キャンセル"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-jobs-dialog.c:262
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Aborted"
 msgstr "中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-jobs-dialog.c:266
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Completed"
 msgstr "完了"
 
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:390
+#: panels/printers/pp-jobs-dialog.c:363
 #, c-format
 msgid "%u Job Requires Authentication"
 msgid_plural "%u Jobs Require Authentication"
 msgstr[0] "%u 件のジョブで認証が要求されています"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:613
+#: panels/printers/pp-jobs-dialog.c:520
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — アクティブなジョブ"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:524
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "%s から印刷するにはユーザー名とパスワードを入力してください。"
 
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/pp-jobs-dialog.ui:44
+msgid "Domain"
+msgstr "ドメイン"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/pp-jobs-dialog.ui:129
+msgid "A_uthenticate"
+msgstr "認証(_U)"
+
+#. Translators: this action removes (purges) all the listed jobs from the list.
+#: panels/printers/pp-jobs-dialog.ui:169
+msgid "Clear All"
+msgstr "すべてクリア"
+
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/pp-jobs-dialog.ui:232
+msgid "_Authenticate"
+msgstr "認証(_A)"
+
+#. Translators: this label describes the dialog empty state, with no jobs listed.
+#: panels/printers/pp-jobs-dialog.ui:358
+msgid "No Active Printer Jobs"
+msgstr "アクティブなジョブはありません"
+
 #: panels/printers/pp-new-printer-dialog.c:380
 msgid "Unlock Print Server"
 msgstr "プリンターサーバーのロックを解除"
@@ -4866,127 +5280,134 @@ msgid "Searching for Printers"
 msgstr "プリンターの検索"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1680
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1685
+#: panels/printers/pp-new-printer-dialog.c:1702
 msgid "Serial Port"
 msgstr "シリアルポート"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1692
+#: panels/printers/pp-new-printer-dialog.c:1709
 msgid "Parallel Port"
 msgstr "パラレルポート"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1734
+#: panels/printers/pp-new-printer-dialog.c:1751
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1739
+#: panels/printers/pp-new-printer-dialog.c:1756
 #, c-format
 msgid "Address: %s"
 msgstr "アドレス: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: panels/printers/pp-new-printer-dialog.c:1766
+#: panels/printers/pp-new-printer-dialog.c:1783
 msgid "Server requires authentication"
 msgstr "サーバーが認証を要求しています"
 
-#: panels/printers/pp-options-dialog.c:90
+#: panels/printers/pp-options-dialog.c:91
 msgid "Two Sided"
 msgstr "両面"
 
-#: panels/printers/pp-options-dialog.c:91
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Type"
 msgstr "用紙の種類"
 
-#: panels/printers/pp-options-dialog.c:92
+#: panels/printers/pp-options-dialog.c:93
 msgid "Paper Source"
 msgstr "給紙元"
 
-#: panels/printers/pp-options-dialog.c:93
+#: panels/printers/pp-options-dialog.c:94
 msgid "Output Tray"
 msgstr "出力トレイ"
 
-#: panels/printers/pp-options-dialog.c:94
+#: panels/printers/pp-options-dialog.c:95
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "解像度"
 
-#: panels/printers/pp-options-dialog.c:95
+#: panels/printers/pp-options-dialog.c:96
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript のプレフィルタリング"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:548
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "片面のページ数"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:560
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "両面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:572
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "向き"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "汎用"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "ページ設定"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: panels/printers/pp-options-dialog.c:675
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "インストール可能なオプション"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:678
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "ジョブ"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: panels/printers/pp-options-dialog.c:681
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "画質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:684
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:687
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "表面処理"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:690
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高度"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:920
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:869
+#: panels/printers/pp-options-dialog.ui:18
+msgid "Test Page"
+msgstr "テストページ"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:882
 msgid "Test page"
 msgstr "テストページ"
 
@@ -5032,123 +5453,123 @@ msgid "Manufacturer"
 msgstr "製造元"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:594 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "アクティブなジョブがありません"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:611
+#: panels/printers/pp-printer-entry.c:599
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u ジョブ"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:745
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:747
 msgid "Out of toner"
 msgstr "トナーが空です"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:771
+#: panels/printers/pp-printer-entry.c:750
 msgid "Low on developer"
 msgstr "現像液が少ないです"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:774
+#: panels/printers/pp-printer-entry.c:753
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:755
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:757
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:759
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:761
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:763
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:765
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:767
 msgctxt "printer state"
 msgid "Offline"
 msgstr "オフライン"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: panels/printers/pp-printer-entry.c:790
-#: panels/printers/pp-printer-entry.c:918
+#: panels/printers/pp-printer-entry.c:769
+#: panels/printers/pp-printer-entry.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:771
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:773
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:775
 msgid "The optical photo conductor is near end of life"
 msgstr "感光体の寿命が近づいています"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:777
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光体の寿命です"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: panels/printers/pp-printer-entry.c:904
+#: panels/printers/pp-printer-entry.c:883
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備完了"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: panels/printers/pp-printer-entry.c:909
+#: panels/printers/pp-printer-entry.c:888
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "ジョブ受付不可"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:914
+#: panels/printers/pp-printer-entry.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:938
+#: panels/printers/pp-printer-entry.c:917
 msgid "Clean print heads"
 msgstr "ヘッドクリーニング"
 
@@ -5193,21 +5614,21 @@ msgid "Restart"
 msgstr "再起動"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
+#: panels/printers/printers.ui:8
 msgid "Add…"
 msgstr "追加…"
 
-#: panels/printers/printers.ui:186
+#: panels/printers/printers.ui:174
 msgid "No printers"
 msgstr "プリンターが見つかりません"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
+#: panels/printers/printers.ui:188
 msgid "Add a Printer…"
 msgstr "プリンターの追加…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
+#: panels/printers/printers.ui:220
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -5215,544 +5636,375 @@ msgstr ""
 "申し訳ありません! システムの印刷サービスは\n"
 "現在、利用できないようです。"
 
-#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
-msgid "Screen Lock"
-msgstr "画面ロック"
+#: panels/region/cc-format-chooser.c:148
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "ヤード・ポンド法"
 
-#: panels/privacy/cc-privacy-panel.c:467
-msgid "In use"
-msgstr "使用中"
+#: panels/region/cc-format-chooser.c:150
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "メートル法"
 
-#: panels/privacy/cc-privacy-panel.c:472
-msgctxt "Location services status"
-msgid "On"
-msgstr "オン"
+#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296
+#: panels/region/cc-format-chooser.ui:6
+msgid "Formats"
+msgstr "フォーマット"
 
-#: panels/privacy/cc-privacy-panel.c:473
-msgctxt "Location services status"
-msgid "Off"
-msgstr "オフ"
+#: panels/region/cc-format-chooser.ui:48 panels/wacom/wacom-stylus-page.ui:37
+#: shell/cc-window.ui:232
+msgid "Back"
+msgstr "戻る"
 
-#: panels/privacy/cc-privacy-panel.c:895
-msgctxt "Camera status"
-msgid "Off"
-msgstr "オフ"
+#: panels/region/cc-format-chooser.ui:103
+msgid ""
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
+msgstr ""
 
-#: panels/privacy/cc-privacy-panel.c:897
-msgctxt "Camera status"
-msgid "On"
-msgstr "オン"
+#: panels/region/cc-format-chooser.ui:119
+#, fuzzy
+#| msgid "Search Locations"
+msgid "Search locales..."
+msgstr "検索する場所"
 
-#: panels/privacy/cc-privacy-panel.c:928
-msgctxt "Microphone status"
-msgid "Off"
-msgstr "オフ"
+#: panels/region/cc-format-chooser.ui:160
+#, fuzzy
+#| msgid "Formats"
+msgid "Common Formats"
+msgstr "フォーマット"
 
-#: panels/privacy/cc-privacy-panel.c:930
-msgctxt "Microphone status"
-msgid "On"
-msgstr "オン"
+#: panels/region/cc-format-chooser.ui:191
+#, fuzzy
+#| msgid "Formats"
+msgid "All Formats"
+msgstr "フォーマット"
 
-#: panels/privacy/cc-privacy-panel.c:1036
-#: panels/privacy/cc-privacy-panel.ui:127
-msgid "Usage & History"
-msgstr "使用と履歴"
+#: panels/region/cc-format-chooser.ui:244
+#, fuzzy
+#| msgid "No results found"
+msgid "No Search Results"
+msgstr "結果がありません"
 
-#: panels/privacy/cc-privacy-panel.c:1157
-msgid "Empty all items from Trash?"
-msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?"
+#: panels/region/cc-format-chooser.ui:257
+msgid "Searches can be for countries or languages."
+msgstr ""
 
-#: panels/privacy/cc-privacy-panel.c:1158
-msgid "All items in the Trash will be permanently deleted."
-msgstr "ここでアイテムを削除すると元に戻すことはできません。"
+#: panels/region/cc-format-chooser.ui:309
+msgid "Preview"
+msgstr "プレビュー"
 
-#: panels/privacy/cc-privacy-panel.c:1159
-msgid "_Empty Trash"
-msgstr "ゴミ箱を空にする(_E)"
+#: panels/region/cc-format-chooser.ui:324
+msgid "Dates"
+msgstr "日付"
 
-#: panels/privacy/cc-privacy-panel.c:1180
-msgid "Delete all the temporary files?"
-msgstr "一時ファイルをすべて削除しますか?"
+#: panels/region/cc-format-chooser.ui:368
+msgid "Dates & Times"
+msgstr "日付と時刻"
 
-#: panels/privacy/cc-privacy-panel.c:1181
-msgid "All the temporary files will be permanently deleted."
-msgstr "一時ファイルは完全に削除されます。"
+#: panels/region/cc-format-chooser.ui:390
+msgid "Numbers"
+msgstr "数字"
 
-#: panels/privacy/cc-privacy-panel.c:1182
-msgid "_Purge Temporary Files"
-msgstr "一時ファイルを削除する(_P)"
+#: panels/region/cc-format-chooser.ui:412
+msgid "Measurement"
+msgstr "計量単位"
 
-#: panels/privacy/cc-privacy-panel.c:1204
-#: panels/privacy/cc-privacy-panel.ui:432
-msgid "Purge Trash & Temporary Files"
-msgstr "ゴミ箱と一時ファイルの削除"
+#: panels/region/cc-format-chooser.ui:434
+msgid "Paper"
+msgstr "用紙サイズ"
 
-#: panels/privacy/cc-privacy-panel.c:1237
-#: panels/privacy/cc-privacy-panel.ui:637
-msgid "Software Usage"
-msgstr "ソフトウェアの使用状況"
+#: panels/region/cc-input-chooser.c:193
+msgid "No input sources found"
+msgstr "入力ソースが見つかりません"
 
-#: panels/privacy/cc-privacy-panel.c:1276
-#: panels/privacy/cc-privacy-panel.ui:1169
-msgid "Problem Reporting"
-msgstr "問題報告"
-
-#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: panels/privacy/cc-privacy-panel.c:1288
-#, c-format
-msgid ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-msgstr ""
-"技術的な問題に遭遇した場合、問題に関するレポートを送信することで %s の改善に"
-"役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
-"す。"
-
-#: panels/privacy/cc-privacy-panel.c:1300
-#: panels/privacy/cc-privacy-panel.ui:719
-msgid "Privacy Policy"
-msgstr "プライバシーポリシー"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:14
-msgctxt "lock_screen"
-msgid "Screen Turns Off"
-msgstr "画面オフのとき"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:18
-msgctxt "lock_screen"
-msgid "30 seconds"
-msgstr "30 秒"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:22
-msgctxt "lock_screen"
-msgid "1 minute"
-msgstr "1 分"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:26
-msgctxt "lock_screen"
-msgid "2 minutes"
-msgstr "2 分"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:30
-msgctxt "lock_screen"
-msgid "3 minutes"
-msgstr "3 分"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:34
-msgctxt "lock_screen"
-msgid "5 minutes"
-msgstr "5 分"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:38
-msgctxt "lock_screen"
-msgid "30 minutes"
-msgstr "30 分"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:42
-msgctxt "lock_screen"
-msgid "1 hour"
-msgstr "1 時間"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:56
-msgctxt "purge_files"
-msgid "1 hour"
-msgstr "1 時間"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:60
-msgctxt "purge_files"
-msgid "1 day"
-msgstr "1 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:64
-msgctxt "purge_files"
-msgid "2 days"
-msgstr "2 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:68
-msgctxt "purge_files"
-msgid "3 days"
-msgstr "3 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:72
-msgctxt "purge_files"
-msgid "4 days"
-msgstr "4 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:76
-msgctxt "purge_files"
-msgid "5 days"
-msgstr "5 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:80
-msgctxt "purge_files"
-msgid "6 days"
-msgstr "6 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:84
-msgctxt "purge_files"
-msgid "7 days"
-msgstr "7 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:88
-msgctxt "purge_files"
-msgid "14 days"
-msgstr "14 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:92
-msgctxt "purge_files"
-msgid "30 days"
-msgstr "30 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:106
-msgctxt "retain_history"
-msgid "1 day"
-msgstr "1 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:110
-msgctxt "retain_history"
-msgid "7 days"
-msgstr "7 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:114
-msgctxt "retain_history"
-msgid "30 days"
-msgstr "30 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:118
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "無期限"
+#: panels/region/cc-input-chooser.c:948
+msgctxt "Input Source"
+msgid "Other"
+msgstr "その他"
 
-#: panels/privacy/cc-privacy-panel.ui:148
-msgid ""
-"Remembering your history makes things easier to find again. These items are "
-"never shared over the network."
-msgstr ""
-"履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目は"
-"ネットワークを越えて共有されることはありません。"
+#: panels/region/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "入力ソースの追加"
 
-#: panels/privacy/cc-privacy-panel.ui:176
-msgid "_Recently Used"
-msgstr "最近使用したファイル(_R)"
+#: panels/region/cc-input-chooser.ui:77
+msgid "Input methods can’t be used on the login screen"
+msgstr "インプットメソッドはログイン画面で使用できません"
 
-#: panels/privacy/cc-privacy-panel.ui:207
-msgid "Retain _History"
-msgstr "記憶する期間(_H)"
+#: panels/region/cc-region-panel.c:1507
+msgid "Login _Screen"
+msgstr "ログイン画面(_S)"
 
-#: panels/privacy/cc-privacy-panel.ui:247
-msgid "Cl_ear Recent History"
-msgstr "履歴をクリアする(_E)"
+#: panels/region/cc-region-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:313
+msgid "_Language"
+msgstr "言語(_L)"
 
-#: panels/privacy/cc-privacy-panel.ui:301
-msgid "The Screen Lock protects your privacy when you are away."
-msgstr "画面をロックして離席中もプライバシーを保護します。"
+#: panels/region/cc-region-panel.ui:99
+msgid "Restart the session for changes to take effect"
+msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: panels/privacy/cc-privacy-panel.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "自動画面ロック(_L)"
+#: panels/region/cc-region-panel.ui:114
+msgid "Restart…"
+msgstr "再起動…"
 
-#: panels/privacy/cc-privacy-panel.ui:362
-msgid "Lock screen _after blank for"
-msgstr "画面オフ後にロックするまでの時間(_A)"
+#: panels/region/cc-region-panel.ui:147
+msgid "_Formats"
+msgstr "フォーマット(_F)"
 
-#: panels/privacy/cc-privacy-panel.ui:394
-msgid "Lock Screen _Notifications"
-msgstr "ロック画面での通知(_N)"
+#: panels/region/cc-region-panel.ui:195
+msgid "Input Sources"
+msgstr "入力ソース"
 
-#: panels/privacy/cc-privacy-panel.ui:454
-msgid ""
-"Automatically purge the Trash and temporary files to help keep your computer "
-"free of unnecessary sensitive information."
-msgstr ""
-"ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残ったま"
-"まにならないようにします。"
+#: panels/region/cc-region-panel.ui:209
+msgid "Choose keyboard layouts or input methods."
+msgstr "キーボードレイアウトかインプットメソッドを選択してください。"
 
-#: panels/privacy/cc-privacy-panel.ui:483
-msgid "Automatically empty _Trash"
-msgstr "ゴミ箱を自動で空にする(_T)"
+#: panels/region/cc-region-panel.ui:266
+msgid "No input source selected"
+msgstr "入力ソースが選択されていません"
 
-#: panels/privacy/cc-privacy-panel.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "一時ファイルを自動で削除する(_F)"
+#: panels/region/cc-region-panel.ui:300
+msgid "Login settings are used by all users when logging into the system"
+msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
 
-#: panels/privacy/cc-privacy-panel.ui:546
-msgid "Purge _After"
-msgstr "次の時間経過後に削除する(_A)"
+#: panels/region/cc-region-panel.ui:337
+msgid "Input Source Options"
+msgstr "入力ソースのオプション"
 
-#: panels/privacy/cc-privacy-panel.ui:590
-msgid "_Empty Trash…"
-msgstr "ゴミ箱を空にする(_E)…"
+#: panels/region/cc-region-panel.ui:352
+msgid "Use the _same source for all windows"
+msgstr "すべてのウィンドウで同じソースを使う(_S)"
 
-#: panels/privacy/cc-privacy-panel.ui:606
-msgid "_Purge Temporary Files…"
-msgstr "一時ファイルを削除する(_P)…"
+#: panels/region/cc-region-panel.ui:370
+msgid "Allow _different sources for each window"
+msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
 
-#: panels/privacy/cc-privacy-panel.ui:654
-msgid ""
-"Sending us information about which software you use helps us provide you "
-"with more accurate recommendations. It also helps us to improve our "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-msgstr ""
-"利用しているソフトウェアについての情報を私たちに送ることで、より適切な提案を"
-"私たちができるようになります。また、ソフトウェアの改善にも役立てられます。\n"
-"\n"
-"私たちが収集する情報はすべて匿名であり、また収集したデータを第三者と共有する"
-"ことはありません。"
+#: panels/region/cc-region-panel.ui:412
+msgid "Previous source"
+msgstr "前のソース"
 
-#: panels/privacy/cc-privacy-panel.ui:681
-msgid "_Send software usage statistics"
-msgstr "ソフトウェアの使用統計情報を送信する(_S)"
+#: panels/region/cc-region-panel.ui:430
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: panels/privacy/cc-privacy-panel.ui:764
-msgid ""
-"Use of the camera allows applications to capture photos and video. Disabling "
-"the camera may cause some applications to not function properly."
-msgstr ""
-"アプリケーションがカメラで写真や動画を撮影できるようになります。無効にすると"
-"一部のアプリケーションが正常に動作しなくなる可能性があります。"
+#: panels/region/cc-region-panel.ui:445
+msgid "Next source"
+msgstr "次のソース"
 
-#: panels/privacy/cc-privacy-panel.ui:812
-msgid "_Camera"
-msgstr "カメラ(_C)"
+#: panels/region/cc-region-panel.ui:463
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#: panels/privacy/cc-privacy-panel.ui:869
-msgid ""
-"Use of the microphone allows applications to capture sounds. Disabling the "
-"microphone may cause some applications to not function properly."
-msgstr ""
-"アプリケーションがマイクで録音できるようになります。無効にすると一部のアプリ"
-"ケーションが正常に動作しなくなる可能性があります。"
+#: panels/region/cc-region-panel.ui:478
+msgid "Left+Right Alt"
+msgstr "左Alt+右Alt"
 
-#: panels/privacy/cc-privacy-panel.ui:917
-msgid "_Microphone"
-msgstr "マイク(_M)"
+#: panels/region/cc-region-panel.ui:494
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "キーボード設定でショートカットを変更できます"
 
-#: panels/privacy/cc-privacy-panel.ui:974
-msgid ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
-msgstr ""
-"位置情報サービスを有効にすると、アプリケーションが現在の位置情報を取得できる"
-"ようになります。Wi-Fi やモバイルブロードバンドを使用している場合、より正確な"
-"位置を取得できます。"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "地域と言語"
 
-#: panels/privacy/cc-privacy-panel.ui:988
+#: panels/region/gnome-region-panel.desktop.in.in:4
 msgid ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
-msgstr ""
-"Mozilla Location Service を使用します: <a href='https://location.services.";
-"mozilla.com/privacy'>プライバシーポリシー</a>"
-
-#: panels/privacy/cc-privacy-panel.ui:1038
-msgid "_Location Services"
-msgstr "位置情報サービス(_L)"
-
-#: panels/privacy/cc-privacy-panel.ui:1236
-msgid "_Automatic Problem Reporting"
-msgstr "問題のレポートを自動で送信する(_A)"
-
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "プライバシー"
-
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr "個人情報の保護と外部からの見え方を設定します"
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
 
-#. FIXME
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テ"
-"ンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
+"Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
+"Region;地域;"
 
-#: panels/region/cc-format-chooser.c:133
-msgctxt "measurement format"
-msgid "Imperial"
-msgstr "ヤード・ポンド法"
+#: panels/removable-media/cc-removable-media-panel.c:267
+msgid "Ask what to do"
+msgstr "どうするか確認する"
 
-#: panels/region/cc-format-chooser.c:135
-msgctxt "measurement format"
-msgid "Metric"
-msgstr "メートル法"
+#: panels/removable-media/cc-removable-media-panel.c:271
+msgid "Do nothing"
+msgstr "なにもしない"
 
-#: panels/region/cc-format-chooser.c:314
-msgid "No regions found"
-msgstr "地域が見つかりません"
+#: panels/removable-media/cc-removable-media-panel.c:275
+msgid "Open folder"
+msgstr "フォルダーを開く"
 
-#: panels/region/cc-format-chooser.ui:7
-msgid "Formats"
-msgstr "フォーマット"
+#: panels/removable-media/cc-removable-media-panel.c:341
+msgid "Other Media"
+msgstr "他のメディア"
 
-#: panels/region/cc-format-chooser.ui:106
-msgid "Preview"
-msgstr "プレビュー"
+#: panels/removable-media/cc-removable-media-panel.c:362
+msgid "Select an application for audio CDs"
+msgstr "オーディオ CD 用のアプリケーションを選択"
 
-#: panels/region/cc-format-chooser.ui:123
-msgid "Dates"
-msgstr "日付"
+#: panels/removable-media/cc-removable-media-panel.c:363
+msgid "Select an application for video DVDs"
+msgstr "ビデオ DVD 用のアプリケーションを選択"
 
-#: panels/region/cc-format-chooser.ui:185
-msgid "Dates & Times"
-msgstr "日付と時刻"
+#: panels/removable-media/cc-removable-media-panel.c:364
+msgid "Select an application to run when a music player is connected"
+msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
 
-#: panels/region/cc-format-chooser.ui:216
-msgid "Numbers"
-msgstr "数字"
+#: panels/removable-media/cc-removable-media-panel.c:365
+msgid "Select an application to run when a camera is connected"
+msgstr "カメラが接続された時に起動するアプリケーションを選択"
 
-#: panels/region/cc-format-chooser.ui:233
-msgid "Measurement"
-msgstr "計量単位"
+#: panels/removable-media/cc-removable-media-panel.c:366
+msgid "Select an application for software CDs"
+msgstr "ソフトウェアの CD を開くアプリケーションを選択"
 
-#: panels/region/cc-format-chooser.ui:250
-msgid "Paper"
-msgstr "用紙サイズ"
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "audio DVD"
+msgstr "オーディオ DVD"
 
-#: panels/region/cc-input-chooser.c:193
-msgid "No input sources found"
-msgstr "入力ソースが見つかりません"
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "blank Blu-ray disc"
+msgstr "空のブルーレイディスク"
 
-#: panels/region/cc-input-chooser.c:948
-msgctxt "Input Source"
-msgid "Other"
-msgstr "その他"
+#: panels/removable-media/cc-removable-media-panel.c:380
+msgid "blank CD disc"
+msgstr "空の CD"
 
-#: panels/region/cc-input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "入力ソースの追加"
+#: panels/removable-media/cc-removable-media-panel.c:381
+msgid "blank DVD disc"
+msgstr "空の DVD"
 
-#: panels/region/cc-input-chooser.ui:77
-msgid "Input methods can’t be used on the login screen"
-msgstr "インプットメソッドはログイン画面で使用できません"
+#: panels/removable-media/cc-removable-media-panel.c:382
+msgid "blank HD DVD disc"
+msgstr "空の HD DVD"
 
-#: panels/region/cc-region-panel.c:1512
-msgid "Login _Screen"
-msgstr "ログイン画面(_S)"
+#: panels/removable-media/cc-removable-media-panel.c:383
+msgid "Blu-ray video disc"
+msgstr "ブルーレイビデオディスク"
 
-#: panels/region/cc-region-panel.ui:64
-#: panels/user-accounts/cc-user-panel.ui:364
-msgid "_Language"
-msgstr "言語(_L)"
+#: panels/removable-media/cc-removable-media-panel.c:384
+msgid "e-book reader"
+msgstr "電子書籍リーダー"
 
-#: panels/region/cc-region-panel.ui:99
-msgid "Restart the session for changes to take effect"
-msgstr "変更内容を反映させるにはログインしなおす必要があります"
+#: panels/removable-media/cc-removable-media-panel.c:385
+msgid "HD DVD video disc"
+msgstr "HD DVD ビデオディスク"
 
-#: panels/region/cc-region-panel.ui:114
-msgid "Restart…"
-msgstr "再起動…"
+#: panels/removable-media/cc-removable-media-panel.c:386
+msgid "Picture CD"
+msgstr "ピクチャーCD"
 
-#: panels/region/cc-region-panel.ui:147
-msgid "_Formats"
-msgstr "フォーマット(_F)"
+#: panels/removable-media/cc-removable-media-panel.c:387
+msgid "Super Video CD"
+msgstr "スーパービデオCD"
 
-#: panels/region/cc-region-panel.ui:195
-msgid "Input Sources"
-msgstr "入力ソース"
+#: panels/removable-media/cc-removable-media-panel.c:388
+msgid "Video CD"
+msgstr "ビデオCD"
 
-#: panels/region/cc-region-panel.ui:209
-msgid "Choose keyboard layouts or input methods."
-msgstr "キーボードレイアウトかインプットメソッドを選択してください。"
+#: panels/removable-media/cc-removable-media-panel.c:389
+msgid "Windows software"
+msgstr "Windows ソフトウェア"
 
-#: panels/region/cc-region-panel.ui:266
-msgid "No input source selected"
-msgstr "入力ソースが選択されていません"
+#: panels/removable-media/cc-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "メディアの処理方法を選択してください"
 
-#: panels/region/cc-region-panel.ui:300
-msgid "Login settings are used by all users when logging into the system"
-msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
+#: panels/removable-media/cc-removable-media-panel.ui:75
+msgid "CD _audio"
+msgstr "CD オーディオ(_A)"
 
-#: panels/region/cc-region-panel.ui:337
-msgid "Input Source Options"
-msgstr "入力ソースのオプション"
+#: panels/removable-media/cc-removable-media-panel.ui:92
+msgid "_DVD video"
+msgstr "DVD ビデオ(_D)"
 
-#: panels/region/cc-region-panel.ui:352
-msgid "Use the _same source for all windows"
-msgstr "すべてのウィンドウで同じソースを使う(_S)"
+#: panels/removable-media/cc-removable-media-panel.ui:133
+msgid "_Music player"
+msgstr "音楽プレイヤー(_M)"
 
-#: panels/region/cc-region-panel.ui:370
-msgid "Allow _different sources for each window"
-msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
+#: panels/removable-media/cc-removable-media-panel.ui:191
+msgid "_Software"
+msgstr "ソフトウェア(_S)"
 
-#: panels/region/cc-region-panel.ui:412
-msgid "Previous source"
-msgstr "前のソース"
+#: panels/removable-media/cc-removable-media-panel.ui:229
+msgid "_Other Media…"
+msgstr "他のメディア(_O)…"
 
-#: panels/region/cc-region-panel.ui:430
-msgid "Super+Shift+Space"
-msgstr "Super+Shift+Space"
+#: panels/removable-media/cc-removable-media-panel.ui:288
+msgid "_Never prompt or start programs on media insertion"
+msgstr ""
+"メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
 
-#: panels/region/cc-region-panel.ui:445
-msgid "Next source"
-msgstr "次のソース"
+#: panels/removable-media/cc-removable-media-panel.ui:342
+msgid "Select how other media should be handled"
+msgstr "他のメディアの処理を選択してください"
 
-#: panels/region/cc-region-panel.ui:463
-msgid "Super+Space"
-msgstr "Super+Space"
+#: panels/removable-media/cc-removable-media-panel.ui:389
+msgid "_Action:"
+msgstr "アクション(_A):"
 
-#: panels/region/cc-region-panel.ui:478
-msgid "Left+Right Alt"
-msgstr "左Alt+右Alt"
+#: panels/removable-media/cc-removable-media-panel.ui:412
+msgid "_Type:"
+msgstr "種類(_T):"
 
-#: panels/region/cc-region-panel.ui:494
-msgid "These keyboard shortcuts can be changed in the keyboard settings"
-msgstr "キーボード設定でショートカットを変更できます"
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "リムーバブルメディア"
 
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "地域と言語"
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "リムーバブルメディアを設定します"
 
-#: panels/region/gnome-region-panel.desktop.in.in:4
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
 msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
-
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
 msgstr ""
-"Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
-"Region;地域;"
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;デバイス;システム;デフォルト;既定;アプリケーション;設"
+"定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディ"
+"ア;媒体;自動起動;オートラン;"
 
-#: panels/search/cc-search-locations-dialog.c:611
+#: panels/search/cc-search-locations-dialog.c:635
 msgid "Select Location"
 msgstr "場所の選択"
 
-#: panels/search/cc-search-locations-dialog.c:615
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: panels/search/cc-search-panel.c:153
+#: panels/search/cc-search-locations-dialog.ui:9
+#: panels/search/cc-search-panel.ui:61
+msgid "Search Locations"
+msgstr "検索する場所"
+
+#: panels/search/cc-search-locations-dialog.ui:32
+#: panels/search/cc-search-locations-dialog.ui:69
+#: panels/search/cc-search-locations-dialog.ui:107
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr ""
+"システムアプリケーション (ファイル、ビデオ、写真など) が検索対象にするフォル"
+"ダーです。"
+
+#: panels/search/cc-search-locations-dialog.ui:52
+msgid "Places"
+msgstr "場所"
+
+#: panels/search/cc-search-locations-dialog.ui:91
+msgid "Bookmarks"
+msgstr "ブックマーク"
+
+#: panels/search/cc-search-locations-dialog.ui:156
+msgid "Other"
+msgstr "その他"
+
+#: panels/search/cc-search-panel.c:152
 msgid "No applications found"
 msgstr "アプリケーションが見つかりません"
 
@@ -5764,7 +6016,7 @@ msgstr "上へ"
 msgid "Move Down"
 msgstr "下へ"
 
-#: panels/search/cc-search-panel.ui:32
+#: panels/search/cc-search-panel.ui:33
 msgid ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
@@ -5772,11 +6024,6 @@ msgstr ""
 "アクティビティ画面で、どれの検索結果を表示するかを設定します。一覧の項目を入"
 "れ替えると、検索結果の表示順が変更されます。"
 
-#: panels/search/cc-search-panel.ui:60
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "検索する場所"
-
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5789,92 +6036,87 @@ msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;"
 "プライバシー;結果;"
 
-#: panels/search/search-locations-dialog.ui:32
-#: panels/search/search-locations-dialog.ui:69
-#: panels/search/search-locations-dialog.ui:107
-msgid ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-msgstr ""
-"システムアプリケーション (ファイル、ビデオ、写真など) が検索対象にするフォル"
-"ダーです。"
-
-#: panels/search/search-locations-dialog.ui:52
-msgid "Places"
-msgstr "場所"
-
-#: panels/search/search-locations-dialog.ui:91
-msgid "Bookmarks"
-msgstr "ブックマーク"
-
-#: panels/search/search-locations-dialog.ui:156
-msgid "Other"
-msgstr "その他"
-
 #. Label
 #: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "共有するネットワークが選択されていません"
 
-#: panels/sharing/cc-sharing-panel.c:320
+#: panels/sharing/cc-sharing-networks.ui:19
+msgid "Networks"
+msgstr "ネットワーク"
+
+#: panels/sharing/cc-sharing-panel.c:302
 msgctxt "service is enabled"
 msgid "On"
 msgstr "オン"
 
-#: panels/sharing/cc-sharing-panel.c:322 panels/sharing/cc-sharing-panel.c:349
+#: panels/sharing/cc-sharing-panel.c:304 panels/sharing/cc-sharing-panel.c:331
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "オフ"
 
-#: panels/sharing/cc-sharing-panel.c:352
+#: panels/sharing/cc-sharing-panel.c:334
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "有効"
 
-#: panels/sharing/cc-sharing-panel.c:355
+#: panels/sharing/cc-sharing-panel.c:337
 msgctxt "service is active"
 msgid "Active"
 msgstr "アクティブ"
 
-#: panels/sharing/cc-sharing-panel.c:425
+#: panels/sharing/cc-sharing-panel.c:407
 msgid "Choose a Folder"
 msgstr "フォルダーの選択"
 
-#: panels/sharing/cc-sharing-panel.c:726
-#, c-format
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:711
+#, fuzzy, c-format
+#| msgid ""
+#| "File Sharing allows you to share your Public folder with others on your "
+#| "current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
-"current network using: <a href=\"dav://%s\">dav://%s</a>"
+"current network using: %s"
 msgstr ""
 "ファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に接続し、あ"
 "なたの公開フォルダーを共有できるようにします: <a href=\"dav://%s\">dav://%s</"
 "a>"
 
-#: panels/sharing/cc-sharing-panel.c:728
-#, c-format
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:717
+#, fuzzy, c-format
+#| msgid ""
+#| "When remote login is enabled, remote users can connect using the Secure "
+#| "Shell command:\n"
+#| "<a href=\"ssh %s\">ssh %s</a>"
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 msgstr ""
 "リモートログインを有効化した場合、リモートユーザーによる Secure Shell コマン"
 "ドを使用した接続を許可します:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:730
-#, c-format
+#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:723
+#, fuzzy, c-format
+#| msgid ""
+#| "Screen sharing allows remote users to view or control your screen by "
+#| "connecting to <a href=\"vnc://%s\">vnc://%s</a>"
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
-"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+"connecting to %s"
 msgstr ""
 "スクリーン共有を許可した場合、リモートユーザーが次の URI に接続して画面の表示"
 "または操作を行うことを許可します: <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:834
+#: panels/sharing/cc-sharing-panel.c:828
 msgid "Copy"
 msgstr "コピー"
 
-#: panels/sharing/cc-sharing-panel.c:1287
+#: panels/sharing/cc-sharing-panel.c:1277
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共有"
@@ -5975,10 +6217,6 @@ msgstr ""
 "ディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;"
 "ムービー;映画;サーバー;レンダラー;"
 
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "ネットワーク"
-
 #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "リモートログインの有効化/無効化"
@@ -6076,7 +6314,7 @@ msgstr "音量"
 msgid "Alert Sound"
 msgstr "警告音"
 
-#: panels/sound/cc-volume-slider.c:92
+#: panels/sound/cc-volume-slider.c:115
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
@@ -6204,14 +6442,14 @@ msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
 msgstr "認証済み"
 
-#: panels/thunderbolt/cc-bolt-panel.c:176
+#: panels/thunderbolt/cc-bolt-panel.c:175
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 msgstr ""
 "Thunderbolt サブシステム (boltd) がインストールされていないか、正しくセット"
 "アップされていません。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:469
+#: panels/thunderbolt/cc-bolt-panel.c:468
 msgid ""
 "Thunderbolt could not be detected.\n"
 "Either the system lacks Thunderbolt support, it has been disabled in the "
@@ -6222,15 +6460,15 @@ msgstr ""
 "になっているか、もしくは BIOS で Thunderbolt のセキュリティレベルが対応してい"
 "ない設定になっているかのいずれかです。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:513
+#: panels/thunderbolt/cc-bolt-panel.c:512
 msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt サポートは BIOS で無効化されています。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:517
+#: panels/thunderbolt/cc-bolt-panel.c:516
 msgid "Thunderbolt security level could not be determined."
 msgstr "Thunderbolt のセキュリティレベルを確認できませんでした。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:622
+#: panels/thunderbolt/cc-bolt-panel.c:621
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "ダイレクトモードの切り替え中にエラーが発生しました: %s"
@@ -6274,32 +6512,32 @@ msgstr ""
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:497
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Default"
 msgstr "デフォルト"
 
-#: panels/universal-access/cc-ua-panel.c:500
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.c:503
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.c:506
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "特大"
 
-#: panels/universal-access/cc-ua-panel.c:509
+#: panels/universal-access/cc-ua-panel.c:512
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.c:513
+#: panels/universal-access/cc-ua-panel.c:516
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
@@ -6335,7 +6573,7 @@ msgid "Screen _Reader"
 msgstr "スクリーンリーダー(_R)"
 
 #: panels/universal-access/cc-ua-panel.ui:397
-#: panels/universal-access/cc-ua-panel.ui:1231
+#: panels/universal-access/cc-ua-panel.ui:1263
 msgid "_Sound Keys"
 msgstr "切り替えキー(_S)"
 
@@ -6344,7 +6582,7 @@ msgid "Hearing"
 msgstr "聞く"
 
 #: panels/universal-access/cc-ua-panel.ui:503
-#: panels/universal-access/cc-ua-panel.ui:1334
+#: panels/universal-access/cc-ua-panel.ui:1366
 msgid "_Visual Alerts"
 msgstr "視覚警告(_V)"
 
@@ -6373,39 +6611,45 @@ msgid "_Mouse Keys"
 msgstr "マウスキー(_M)"
 
 #: panels/universal-access/cc-ua-panel.ui:900
+#, fuzzy
+#| msgid "Remove Printer"
+msgid "_Locate Pointer"
+msgstr "プリンターの削除"
+
+#: panels/universal-access/cc-ua-panel.ui:932
 msgid "_Click Assist"
 msgstr "クリック支援(_C)"
 
-#: panels/universal-access/cc-ua-panel.ui:946
+#: panels/universal-access/cc-ua-panel.ui:978
 msgid "_Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:966
+#: panels/universal-access/cc-ua-panel.ui:998
 msgid "Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔"
 
-#: panels/universal-access/cc-ua-panel.ui:1036
+#: panels/universal-access/cc-ua-panel.ui:1068
 msgid "Cursor Size"
 msgstr "カーソルの大きさ"
 
-#: panels/universal-access/cc-ua-panel.ui:1063
+#: panels/universal-access/cc-ua-panel.ui:1095
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "ズーム機能と組み合わせてカーソルの大きさを設定することでカーソルがより見やす"
 "くなります。"
 
-#: panels/universal-access/cc-ua-panel.ui:1099
+#: panels/universal-access/cc-ua-panel.ui:1131
 msgid "Screen Reader"
 msgstr "スクリーンリーダー"
 
-#: panels/universal-access/cc-ua-panel.ui:1116
+#: panels/universal-access/cc-ua-panel.ui:1148
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr ""
 "スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み"
 "上げます。"
 
-#: panels/universal-access/cc-ua-panel.ui:1149
+#: panels/universal-access/cc-ua-panel.ui:1181
 msgid "_Screen Reader"
 msgstr "スクリーンリーダー(_S)"
 
@@ -6414,218 +6658,220 @@ msgstr "スクリーンリーダー(_S)"
 # 
「切り替えキー」もわかりやすいとは言いづらいが、Windows側の機能を知っているユーザーには類推できること、またWeb検索などで機能を特定しやすいこと、「サウンドキー」よりかは幾分ましであること、などを考慮し「切り替えキー」を採用する。
 # [1] http://windows.microsoft.com/en-us/Windows7/Make-the-keyboard-easier-to-use
 # [2] http://windows.microsoft.com/ja-JP/Windows7/Make-the-keyboard-easier-to-use
-#: panels/universal-access/cc-ua-panel.ui:1188
+#: panels/universal-access/cc-ua-panel.ui:1220
 msgid "Sound Keys"
 msgstr "切り替えキー"
 
-#: panels/universal-access/cc-ua-panel.ui:1206
+#: panels/universal-access/cc-ua-panel.ui:1238
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Caps Lock と Num Lock のON/OFFが切り替わるとビープ音を鳴らします。"
 
-#: panels/universal-access/cc-ua-panel.ui:1276
+#: panels/universal-access/cc-ua-panel.ui:1308
 msgid "Visual Alerts"
 msgstr "視覚警告"
 
-#: panels/universal-access/cc-ua-panel.ui:1280
+#: panels/universal-access/cc-ua-panel.ui:1312
 msgid "_Test flash"
 msgstr "動作確認(_T)"
 
-#: panels/universal-access/cc-ua-panel.ui:1309
+#: panels/universal-access/cc-ua-panel.ui:1341
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "警告音が鳴った場合に視覚的に警告を表示します。"
 
-#: panels/universal-access/cc-ua-panel.ui:1360
-msgid "Flash the _window title"
-msgstr "ウィンドウのタイトルバーをひらめかせる(_W)"
+#: panels/universal-access/cc-ua-panel.ui:1392
+#, fuzzy
+#| msgid "Flash the entire _screen"
+msgid "Flash the entire _window"
+msgstr "画面全体をひらめかせる(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1378
+#: panels/universal-access/cc-ua-panel.ui:1410
 msgid "Flash the entire _screen"
 msgstr "画面全体をひらめかせる(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1423
+#: panels/universal-access/cc-ua-panel.ui:1455
 msgid "Repeat Keys"
 msgstr "リピートキー"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-ua-panel.ui:1485
 msgid "Key presses repeat when key is held down."
 msgstr "キーを長押しすると繰り返しキー入力を行う"
 
-#: panels/universal-access/cc-ua-panel.ui:1533
+#: panels/universal-access/cc-ua-panel.ui:1565
 msgid "Repeat keys delay"
 msgstr "リピートキーが行われるまでの時間です"
 
-#: panels/universal-access/cc-ua-panel.ui:1581
-#: panels/universal-access/cc-ua-panel.ui:1716
+#: panels/universal-access/cc-ua-panel.ui:1613
+#: panels/universal-access/cc-ua-panel.ui:1748
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/cc-ua-panel.ui:1620
+#: panels/universal-access/cc-ua-panel.ui:1652
 msgid "Repeat keys speed"
 msgstr "押したキーをリピートする際の速さです"
 
-#: panels/universal-access/cc-ua-panel.ui:1644
+#: panels/universal-access/cc-ua-panel.ui:1676
 msgid "Cursor Blinking"
 msgstr "カーソルの点滅"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
+#: panels/universal-access/cc-ua-panel.ui:1706
 msgid "Cursor blinks in text fields."
 msgstr "テキストフィールドでカーソルを点滅させる"
 
-#: panels/universal-access/cc-ua-panel.ui:1753
+#: panels/universal-access/cc-ua-panel.ui:1785
 msgid "Cursor blinking speed"
 msgstr "カーソルが点滅する速さです"
 
-#: panels/universal-access/cc-ua-panel.ui:1789
+#: panels/universal-access/cc-ua-panel.ui:1821
 msgid "Typing Assist"
 msgstr "タイピング支援"
 
-#: panels/universal-access/cc-ua-panel.ui:1828
+#: panels/universal-access/cc-ua-panel.ui:1860
 msgid "_Sticky Keys"
 msgstr "固定キー(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:1845
+#: panels/universal-access/cc-ua-panel.ui:1877
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr ""
 "修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
 
-#: panels/universal-access/cc-ua-panel.ui:1869
+#: panels/universal-access/cc-ua-panel.ui:1901
 msgid "_Disable if two keys are pressed together"
 msgstr "同時に 2 つのキーを押したら無効にする(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:1887
+#: panels/universal-access/cc-ua-panel.ui:1919
 msgid "Beep when a _modifier key is pressed"
 msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
 
-#: panels/universal-access/cc-ua-panel.ui:1935
+#: panels/universal-access/cc-ua-panel.ui:1967
 msgid "S_low Keys"
 msgstr "スローキー(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:1952
+#: panels/universal-access/cc-ua-panel.ui:1984
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
 
-#: panels/universal-access/cc-ua-panel.ui:1985
-#: panels/universal-access/cc-ua-panel.ui:2198
-#: panels/universal-access/cc-ua-panel.ui:2535
+#: panels/universal-access/cc-ua-panel.ui:2017
+#: panels/universal-access/cc-ua-panel.ui:2230
+#: panels/universal-access/cc-ua-panel.ui:2567
 msgid "A_cceptance delay:"
 msgstr "認識するまでの間隔(_C):"
 
-#: panels/universal-access/cc-ua-panel.ui:2007
+#: panels/universal-access/cc-ua-panel.ui:2039
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-ua-panel.ui:2026
+#: panels/universal-access/cc-ua-panel.ui:2058
 msgid "Slow keys typing delay"
 msgstr "スローキーの入力間隔"
 
-#: panels/universal-access/cc-ua-panel.ui:2041
+#: panels/universal-access/cc-ua-panel.ui:2073
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-ua-panel.ui:2068
+#: panels/universal-access/cc-ua-panel.ui:2100
 msgid "Beep when a key is pr_essed"
 msgstr "キーが押されたらビープ音を鳴らす(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2085
+#: panels/universal-access/cc-ua-panel.ui:2117
 msgid "Beep when a key is _accepted"
 msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:2102
-#: panels/universal-access/cc-ua-panel.ui:2281
+#: panels/universal-access/cc-ua-panel.ui:2134
+#: panels/universal-access/cc-ua-panel.ui:2313
 msgid "Beep when a key is _rejected"
 msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
 
-#: panels/universal-access/cc-ua-panel.ui:2148
+#: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
 msgstr "バウンスキー(_B)"
 
-#: panels/universal-access/cc-ua-panel.ui:2165
+#: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
 msgstr "同じキーを繰り返し押した場合は無視する"
 
-#: panels/universal-access/cc-ua-panel.ui:2220
+#: panels/universal-access/cc-ua-panel.ui:2252
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-ua-panel.ui:2239
+#: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
 msgstr "バウンスキーの入力間隔"
 
-#: panels/universal-access/cc-ua-panel.ui:2254
+#: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-ua-panel.ui:2367
+#: panels/universal-access/cc-ua-panel.ui:2399
 msgid "_Enable by Keyboard"
 msgstr "キーボードから有効化できるようにする(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:2384
+#: panels/universal-access/cc-ua-panel.ui:2416
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
 
-#: panels/universal-access/cc-ua-panel.ui:2448
+#: panels/universal-access/cc-ua-panel.ui:2480
 msgid "Click Assist"
 msgstr "クリック支援"
 
-#: panels/universal-access/cc-ua-panel.ui:2484
+#: panels/universal-access/cc-ua-panel.ui:2516
 msgid "_Simulated Secondary Click"
 msgstr "副ボタンのクリックの代替(_S)"
 
-#: panels/universal-access/cc-ua-panel.ui:2502
+#: panels/universal-access/cc-ua-panel.ui:2534
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
 
-#: panels/universal-access/cc-ua-panel.ui:2556
+#: panels/universal-access/cc-ua-panel.ui:2588
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-ua-panel.ui:2575
+#: panels/universal-access/cc-ua-panel.ui:2607
 msgid "Secondary click delay"
 msgstr "副ボタンのクリックの間隔"
 
-#: panels/universal-access/cc-ua-panel.ui:2590
+#: panels/universal-access/cc-ua-panel.ui:2622
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長い"
 
 # See also ja.po of mousetweak
-#: panels/universal-access/cc-ua-panel.ui:2647
+#: panels/universal-access/cc-ua-panel.ui:2679
 msgid "_Hover Click"
 msgstr "ホバークリック(_H)"
 
-#: panels/universal-access/cc-ua-panel.ui:2665
+#: panels/universal-access/cc-ua-panel.ui:2697
 msgid "Trigger a click when the pointer hovers"
 msgstr "ポインターの移動を停止したらクリック動作を行う"
 
-#: panels/universal-access/cc-ua-panel.ui:2698
+#: panels/universal-access/cc-ua-panel.ui:2730
 msgid "D_elay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: panels/universal-access/cc-ua-panel.ui:2720
+#: panels/universal-access/cc-ua-panel.ui:2752
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-ua-panel.ui:2751
+#: panels/universal-access/cc-ua-panel.ui:2783
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-ua-panel.ui:2787
+#: panels/universal-access/cc-ua-panel.ui:2819
 msgid "Motion _threshold:"
 msgstr "ジェスチャーのしきい値(_T):"
 
-#: panels/universal-access/cc-ua-panel.ui:2809
+#: panels/universal-access/cc-ua-panel.ui:2841
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: panels/universal-access/cc-ua-panel.ui:2840
+#: panels/universal-access/cc-ua-panel.ui:2872
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
@@ -6783,54 +7029,240 @@ msgstr "反転(_W):"
 msgid "_Brightness:"
 msgstr "明るさ(_B):"
 
-#: panels/universal-access/zoom-options.ui:866
-msgid "_Contrast:"
-msgstr "コントラスト(_C):"
+#: panels/universal-access/zoom-options.ui:866
+msgid "_Contrast:"
+msgstr "コントラスト(_C):"
+
+#. The contrast scale goes from Color to None (grayscale)
+#: panels/universal-access/zoom-options.ui:886
+msgctxt "universal access, contrast"
+msgid "Co_lor"
+msgstr "色(_L)"
+
+#: panels/universal-access/zoom-options.ui:911
+msgctxt "universal access, color"
+msgid "None"
+msgstr "白黒"
+
+#: panels/universal-access/zoom-options.ui:943
+msgctxt "universal access, color"
+msgid "Full"
+msgstr "カラー"
+
+#: panels/universal-access/zoom-options.ui:1006
+msgctxt "universal access, brightness"
+msgid "Low"
+msgstr "暗い"
+
+#: panels/universal-access/zoom-options.ui:1039
+msgctxt "universal access, brightness"
+msgid "High"
+msgstr "明るい"
+
+#: panels/universal-access/zoom-options.ui:1070
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "低い"
+
+#: panels/universal-access/zoom-options.ui:1103
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "高い"
+
+#: panels/universal-access/zoom-options.ui:1139
+msgid "Color Effects:"
+msgstr "色の設定:"
+
+#: panels/universal-access/zoom-options.ui:1164
+msgid "Color Effects"
+msgstr "色の設定"
+
+#: panels/usage/cc-usage-panel.c:155
+msgid "Empty all items from Trash?"
+msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?"
+
+#: panels/usage/cc-usage-panel.c:156
+msgid "All items in the Trash will be permanently deleted."
+msgstr "ここでアイテムを削除すると元に戻すことはできません。"
+
+#: panels/usage/cc-usage-panel.c:157
+msgid "_Empty Trash"
+msgstr "ゴミ箱を空にする(_E)"
+
+#: panels/usage/cc-usage-panel.c:178
+msgid "Delete all the temporary files?"
+msgstr "一時ファイルをすべて削除しますか?"
+
+#: panels/usage/cc-usage-panel.c:179
+msgid "All the temporary files will be permanently deleted."
+msgstr "一時ファイルは完全に削除されます。"
+
+#: panels/usage/cc-usage-panel.c:180
+msgid "_Purge Temporary Files"
+msgstr "一時ファイルを削除する(_P)"
+
+#: panels/usage/cc-usage-panel.ui:31
+#, fuzzy
+#| msgid "History"
+msgid "File History"
+msgstr "履歴"
+
+#: panels/usage/cc-usage-panel.ui:43
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
+
+#: panels/usage/cc-usage-panel.ui:58
+#, fuzzy
+#| msgid "History"
+msgid "File H_istory"
+msgstr "履歴"
+
+#: panels/usage/cc-usage-panel.ui:80
+msgid "File _History Duration"
+msgstr ""
+
+#: panels/usage/cc-usage-panel.ui:121
+#, fuzzy
+#| msgid "Cl_ear Recent History"
+msgid "_Clear History…"
+msgstr "履歴をクリアする(_E)"
+
+#: panels/usage/cc-usage-panel.ui:137
+#, fuzzy
+#| msgid "Purge Trash & Temporary Files"
+msgid "Trash & Temporary Files"
+msgstr "ゴミ箱と一時ファイルの削除"
+
+#: panels/usage/cc-usage-panel.ui:147
+msgid ""
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr ""
+
+#: panels/usage/cc-usage-panel.ui:161
+#, fuzzy
+#| msgid "Automatically empty _Trash"
+msgid "Automatically Delete _Trash Content"
+msgstr "ゴミ箱を自動で空にする(_T)"
+
+#: panels/usage/cc-usage-panel.ui:176
+#, fuzzy
+#| msgid "Automatically purge Temporary _Files"
+msgid "Automatically Delete Temporary _Files"
+msgstr "一時ファイルを自動で削除する(_F)"
+
+#: panels/usage/cc-usage-panel.ui:198
+#, fuzzy
+#| msgid "Automatically empty _Trash"
+msgid "Automatically Delete _Period"
+msgstr "ゴミ箱を自動で空にする(_T)"
+
+#: panels/usage/cc-usage-panel.ui:240
+msgid "_Empty Trash…"
+msgstr "ゴミ箱を空にする(_E)…"
+
+#: panels/usage/cc-usage-panel.ui:252
+#, fuzzy
+#| msgid "_Purge Temporary Files…"
+msgid "_Delete Temporary Files…"
+msgstr "一時ファイルを削除する(_P)…"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:280
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 時間"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:284
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 日"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:288
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 日"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:292
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 日"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:296
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 日"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:300
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 日"
 
-#. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:886
-msgctxt "universal access, contrast"
-msgid "Co_lor"
-msgstr "色(_L)"
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:304
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 日"
 
-#: panels/universal-access/zoom-options.ui:911
-msgctxt "universal access, color"
-msgid "None"
-msgstr "白黒"
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:308
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 日"
 
-#: panels/universal-access/zoom-options.ui:943
-msgctxt "universal access, color"
-msgid "Full"
-msgstr "カラー"
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:312
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 日"
 
-#: panels/universal-access/zoom-options.ui:1006
-msgctxt "universal access, brightness"
-msgid "Low"
-msgstr "暗い"
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:316
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 日"
 
-#: panels/universal-access/zoom-options.ui:1039
-msgctxt "universal access, brightness"
-msgid "High"
-msgstr "明るい"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:331
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 日"
 
-#: panels/universal-access/zoom-options.ui:1070
-msgctxt "universal access, contrast"
-msgid "Low"
-msgstr "低い"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:335
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 日"
 
-#: panels/universal-access/zoom-options.ui:1103
-msgctxt "universal access, contrast"
-msgid "High"
-msgstr "高い"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:339
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 日"
 
-#: panels/universal-access/zoom-options.ui:1139
-msgid "Color Effects:"
-msgstr "色の設定:"
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:343
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "無期限"
 
-#: panels/universal-access/zoom-options.ui:1164
-msgid "Color Effects"
-msgstr "色の設定"
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr ""
 
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr ""
+
+#. FIXME
 #: panels/user-accounts/cc-add-user-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "ログイン提供者のウェブアドレスと一致させる必要があります。"
@@ -6892,17 +7324,14 @@ msgid "_Full Name"
 msgstr "フルネーム(_F)"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:206
-#: panels/user-accounts/cc-user-panel.ui:153
 msgid "Standard"
 msgstr "標準"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:216
-#: panels/user-accounts/cc-user-panel.ui:163
 msgid "Administrator"
 msgstr "管理者"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:232
-#: panels/user-accounts/cc-user-panel.ui:181
 msgid "Account _Type"
 msgstr "アカウントの種類(_T)"
 
@@ -6991,7 +7420,7 @@ msgstr "%s — %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: panels/user-accounts/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:771
+#: panels/user-accounts/cc-user-panel.c:766
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%H:%M"
@@ -6999,7 +7428,7 @@ msgstr "%H:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:775
+#: panels/user-accounts/cc-user-panel.c:770
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7083,30 +7512,30 @@ msgstr "無効なパスワードです、やり直してください"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "%sドメインに接続できませんでした: %s"
 
-#: panels/user-accounts/cc-user-panel.c:214
+#: panels/user-accounts/cc-user-panel.c:209
 msgid "Your account"
 msgstr "あなたのアカウント"
 
-#: panels/user-accounts/cc-user-panel.c:389
+#: panels/user-accounts/cc-user-panel.c:384
 msgid "Failed to delete user"
 msgstr "ユーザーの削除に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:447
-#: panels/user-accounts/cc-user-panel.c:506
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:442
+#: panels/user-accounts/cc-user-panel.c:501
+#: panels/user-accounts/cc-user-panel.c:553
 msgid "Failed to revoke remotely managed user"
 msgstr "リモート管理ユーザーの削除に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:610
+#: panels/user-accounts/cc-user-panel.c:605
 msgid "You cannot delete your own account."
 msgstr "自分自身のアカウントは削除できません。"
 
-#: panels/user-accounts/cc-user-panel.c:619
+#: panels/user-accounts/cc-user-panel.c:614
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s はまだログインしています"
 
-#: panels/user-accounts/cc-user-panel.c:623
+#: panels/user-accounts/cc-user-panel.c:618
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7114,12 +7543,12 @@ msgstr ""
 "ログイン中のユーザーを削除すると、システムが不整合な状態になることがありま"
 "す。"
 
-#: panels/user-accounts/cc-user-panel.c:632
+#: panels/user-accounts/cc-user-panel.c:627
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "%s のファイルを残しますか?"
 
-#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:631
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7127,47 +7556,47 @@ msgstr ""
 "ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールス"
 "プールおよび一時ファイルを残しておくことができます。"
 
-#: panels/user-accounts/cc-user-panel.c:639
+#: panels/user-accounts/cc-user-panel.c:634
 msgid "_Delete Files"
 msgstr "ファイルを削除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:635
 msgid "_Keep Files"
 msgstr "ファイルを残す(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:649
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "リモート管理の %s のアカウントを削除してもよろしいですか?"
 
-#: panels/user-accounts/cc-user-panel.c:658
+#: panels/user-accounts/cc-user-panel.c:653
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:708
+#: panels/user-accounts/cc-user-panel.c:703
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "無効アカウント"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:711
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "次のログイン時に設定"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:714
 msgctxt "Password mode"
 msgid "None"
 msgstr "なし"
 
-#: panels/user-accounts/cc-user-panel.c:764
+#: panels/user-accounts/cc-user-panel.c:759
 msgid "Logged in"
 msgstr "ログイン中"
 
-#: panels/user-accounts/cc-user-panel.c:1098
+#: panels/user-accounts/cc-user-panel.c:1137
 msgid "Failed to contact the accounts service"
 msgstr "アカウントサービスの接続に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:1100
+#: panels/user-accounts/cc-user-panel.c:1139
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr ""
 "AccountService がインストールされ、有効になっているか確認してください。"
@@ -7176,18 +7605,18 @@ msgstr ""
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/cc-user-panel.c:1132
+#: panels/user-accounts/cc-user-panel.c:1171
 msgid ""
 "To make changes,\n"
 "click the * icon first"
 msgstr "変更するには、まず * アイコンをクリックしてください"
 
-#: panels/user-accounts/cc-user-panel.c:1205
+#: panels/user-accounts/cc-user-panel.c:1244
 msgid "Create a user account"
 msgstr "ユーザーアカウントを作成します"
 
-#: panels/user-accounts/cc-user-panel.c:1216
-#: panels/user-accounts/cc-user-panel.c:1344
+#: panels/user-accounts/cc-user-panel.c:1255
+#: panels/user-accounts/cc-user-panel.c:1383
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7195,12 +7624,12 @@ msgstr ""
 "ユーザーアカウントを作成するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: panels/user-accounts/cc-user-panel.c:1225
+#: panels/user-accounts/cc-user-panel.c:1264
 msgid "Delete the selected user account"
 msgstr "選択したユーザーアカウントを削除します"
 
-#: panels/user-accounts/cc-user-panel.c:1237
-#: panels/user-accounts/cc-user-panel.c:1348
+#: panels/user-accounts/cc-user-panel.c:1276
+#: panels/user-accounts/cc-user-panel.c:1387
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7208,45 +7637,71 @@ msgstr ""
 "選択したユーザーアカウントを削除するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: panels/user-accounts/cc-user-panel.ui:18
+#: panels/user-accounts/cc-user-panel.ui:5
 msgid "_Add User…"
 msgstr "ユーザーの追加(_A)"
 
-#: panels/user-accounts/cc-user-panel.ui:70
+#: panels/user-accounts/cc-user-panel.ui:52
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: panels/user-accounts/cc-user-panel.ui:78
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Restart Now"
 msgstr "ログアウト"
 
-#: panels/user-accounts/cc-user-panel.ui:256
-msgid "A_utomatic Login"
-msgstr "自動ログイン(_U)"
+#: panels/user-accounts/cc-user-panel.ui:146
+#: panels/user-accounts/cc-user-panel.ui:162
+msgid "User Icon"
+msgstr "ユーザーアイコン"
+
+#: panels/user-accounts/cc-user-panel.ui:238
+#, fuzzy
+#| msgid "All Settings"
+msgid "Account Settings"
+msgstr "すべての設定"
+
+#: panels/user-accounts/cc-user-panel.ui:265
+#, fuzzy
+#| msgid "Administrator"
+msgid "_Administrator"
+msgstr "管理者"
+
+#: panels/user-accounts/cc-user-panel.ui:285
+msgid ""
+"Administrators can add and remove other users, and can change settings for "
+"all users."
+msgstr ""
 
-#: panels/user-accounts/cc-user-panel.ui:298
+#: panels/user-accounts/cc-user-panel.ui:359
+#, fuzzy
+#| msgid "Au_thentication"
+msgid "Authentication & Login"
+msgstr "認証(_T)"
+
+#: panels/user-accounts/cc-user-panel.ui:428
 msgid "_Fingerprint Login"
 msgstr "指紋認証ログイン(_F)"
 
-#: panels/user-accounts/cc-user-panel.ui:324
-#: panels/user-accounts/cc-user-panel.ui:340
-msgid "User Icon"
-msgstr "ユーザーアイコン"
+#: panels/user-accounts/cc-user-panel.ui:470
+msgid "A_utomatic Login"
+msgstr "自動ログイン(_U)"
 
-#: panels/user-accounts/cc-user-panel.ui:404
-msgid "Last Login"
-msgstr "最終ログイン"
+#: panels/user-accounts/cc-user-panel.ui:500
+#, fuzzy
+#| msgid "%s — Account Activity"
+msgid "Account Activity"
+msgstr "%s — アカウントのアクティビティ"
 
-#: panels/user-accounts/cc-user-panel.ui:453
+#: panels/user-accounts/cc-user-panel.ui:541
 msgid "Remove User…"
 msgstr "ユーザーの削除…"
 
 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:486
+#: panels/user-accounts/cc-user-panel.ui:580
 msgid "No Users Found"
 msgstr "ユーザーが見つかりません"
 
-#: panels/user-accounts/cc-user-panel.ui:496
+#: panels/user-accounts/cc-user-panel.ui:590
 msgid "Unlock to add a user account."
 msgstr "ユーザーアカウントをアンロックします。"
 
@@ -7283,7 +7738,7 @@ msgid "Right little finger"
 msgstr "右の小指"
 
 #: panels/user-accounts/data/account-fingerprint.ui:39
-#: panels/user-accounts/um-fingerprint-dialog.c:677
+#: panels/user-accounts/um-fingerprint-dialog.c:676
 msgid "Enable Fingerprint Login"
 msgstr "指紋認証ログインを有効にする"
 
@@ -7464,77 +7919,55 @@ msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr "さらに文字や数字、記号を追加するともっと強くなります。"
 
-#: panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The new password is too short"
 msgstr "新しいパスワードは短すぎます"
 
-#: panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "新しいパスワードは単純すぎます"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "新旧のパスワードが酷似しています"
 
-#: panels/user-accounts/run-passwd.c:517
+#: panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "新しいパスワードは最近使用したものです。"
 
-#: panels/user-accounts/run-passwd.c:520
+#: panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "新しいパスワードには数字または特殊文字を含めてください"
 
-#: panels/user-accounts/run-passwd.c:524
+#: panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "新旧のパスワードが同じです"
 
-#: panels/user-accounts/run-passwd.c:528
+#: panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "最初に認証を行った以降にパスワードが変更されています!"
 
-#: panels/user-accounts/run-passwd.c:532
+#: panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "新しいパスワードには十分な種類の文字が含まれていません"
 
-#: panels/user-accounts/run-passwd.c:536
+#: panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
-#: panels/user-accounts/user-utils.c:427
-msgid ""
-"The username should usually only consist of lower case letters from a-z, "
-"digits and the following characters: - _"
-msgstr ""
-"ユーザー名には小文字の“a”から“z”、数字の“0”から“9”、記号の“-”と“_”のみを使用"
-"してください。"
-
-#: panels/user-accounts/user-utils.c:431
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr ""
-"申し訳ありませんが、そのユーザー名は使用できません。 もう一度お試しください。"
-
-#: panels/user-accounts/user-utils.c:476
-msgid "The username is too long."
-msgstr "ユーザー名が長すぎます。"
-
-#: panels/user-accounts/user-utils.c:526
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr ""
-"ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
-
 #: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -7553,29 +7986,29 @@ msgstr "システム内部のエラーが発生しました。"
 msgid "Enabled"
 msgstr "有効"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:260
+#: panels/user-accounts/um-fingerprint-dialog.c:259
 msgid "Delete registered fingerprints?"
 msgstr "登録した指紋情報を削除しますか?"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:264
+#: panels/user-accounts/um-fingerprint-dialog.c:263
 msgid "_Delete Fingerprints"
 msgstr "指紋情報を削除(_D)"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:270
+#: panels/user-accounts/um-fingerprint-dialog.c:269
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:440
+#: panels/user-accounts/um-fingerprint-dialog.c:439
 msgid "Done!"
 msgstr "完了です!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
+#: panels/user-accounts/um-fingerprint-dialog.c:500
+#: panels/user-accounts/um-fingerprint-dialog.c:542
 #, c-format
 msgid "Could not access “%s” device"
 msgstr "“%s”というデバイスにアクセスできません"
@@ -7583,16 +8016,16 @@ msgstr "“%s”というデバイスにアクセスできません"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:584
+#: panels/user-accounts/um-fingerprint-dialog.c:583
 #, c-format
 msgid "Could not start finger capture on “%s” device"
 msgstr "“%s”デバイスで指紋を読み取れませんでした"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:628
+#: panels/user-accounts/um-fingerprint-dialog.c:627
 msgid "Could not access any fingerprint readers"
 msgstr "指紋リーダーにアクセスできませんでした"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:629
+#: panels/user-accounts/um-fingerprint-dialog.c:628
 msgid "Please contact your system administrator for help."
 msgstr "システム管理者に連絡してください。"
 
@@ -7601,7 +8034,7 @@ msgstr "システム管理者に連絡してください。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: panels/user-accounts/um-fingerprint-dialog.c:711
+#: panels/user-accounts/um-fingerprint-dialog.c:710
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -7610,19 +8043,41 @@ msgstr ""
 "指紋認証ログインを有効にするには、“%s”のデバイスを使って、指紋を登録する必要"
 "があります。"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:718
+#: panels/user-accounts/um-fingerprint-dialog.c:717
 msgid "Selecting finger"
 msgstr "指の選択"
 
-#: panels/user-accounts/um-fingerprint-dialog.c:719
+#: panels/user-accounts/um-fingerprint-dialog.c:718
 msgid "Enrolling fingerprints"
 msgstr "指紋の登録"
 
+#: panels/user-accounts/user-utils.c:439
+msgid ""
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+msgstr ""
+"ユーザー名には小文字の“a”から“z”、数字の“0”から“9”、記号の“-”と“_”のみを使用"
+"してください。"
+
+#: panels/user-accounts/user-utils.c:443
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr ""
+"申し訳ありませんが、そのユーザー名は使用できません。 もう一度お試しください。"
+
+#: panels/user-accounts/user-utils.c:488
+msgid "The username is too long."
+msgstr "ユーザー名が長すぎます。"
+
+#: panels/user-accounts/user-utils.c:550
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr ""
+"ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
+
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "ボタン割り当て"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "閉じる(_C)"
@@ -7652,7 +8107,7 @@ msgstr ""
 msgid "Mis-click detected, restarting…"
 msgstr "誤クリックを検出しました。再起動します..."
 
-#: panels/wacom/cc-wacom-button-row.c:253
+#: panels/wacom/cc-wacom-button-row.c:249
 #, c-format
 msgid "Button %d"
 msgstr "ボタン %d"
@@ -7677,18 +8132,18 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "オンスクリーンヘルプの表示"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:256
+#: panels/wacom/cc-wacom-mapping-panel.c:249
 msgid "Output:"
 msgstr "出力:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:268
+#: panels/wacom/cc-wacom-mapping-panel.c:261
 msgid "Keep aspect ratio (letterbox):"
 msgstr "縦横比を保持 (レターボックス):"
 
 # 参考: intuos 5 のマニュアル p.57
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:279
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Map to single monitor"
 msgstr "単一画面にマッピング"
 
@@ -7697,15 +8152,15 @@ msgstr "単一画面にマッピング"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: panels/wacom/cc-wacom-page.c:530
+#: panels/wacom/cc-wacom-page.c:516
 msgid "Display Mapping"
 msgstr "画面のマッピング"
 
-#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:806 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "ペン"
 
-#: panels/wacom/cc-wacom-stylus-page.c:355
+#: panels/wacom/cc-wacom-stylus-page.c:360
 msgid "Button"
 msgstr "ボタン"
 
@@ -7764,6 +8219,7 @@ msgstr "左手用"
 
 # 参考: intuos 5 のマニュアル p.57
 #: panels/wacom/gnome-wacom-properties.ui:296
+#: panels/wacom/gnome-wacom-properties.ui:401
 msgid "Map to Monitor…"
 msgstr "画面にマッピング…"
 
@@ -7783,6 +8239,12 @@ msgstr "マウス設定の調整"
 msgid "Adjust display resolution"
 msgstr "ディスプレイの解像度を調整"
 
+#: panels/wacom/gnome-wacom-properties.ui:376
+#, fuzzy
+#| msgid "Single Display"
+msgid "Decouple Display"
+msgstr "シングルディスプレイ"
+
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "新しいショートカット…"
@@ -7799,10 +8261,6 @@ msgstr "マウスの中ボタンクリック"
 msgid "Right Mouse Button Click"
 msgstr "マウスの右ボタンクリック"
 
-#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
-msgid "Back"
-msgstr "戻る"
-
 #: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "進む"
@@ -7819,27 +8277,27 @@ msgstr "スタイラスペンをタブレットの近くに移動して設定を
 msgid "Eraser Pressure Feel"
 msgstr "消しゴムの感触"
 
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
 msgid "Soft"
 msgstr "柔らかい"
 
-#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
 msgid "Firm"
 msgstr "硬い"
 
-#: panels/wacom/wacom-stylus-page.ui:233
+#: panels/wacom/wacom-stylus-page.ui:234
 msgid "Top Button"
 msgstr "上のサイドスイッチ"
 
-#: panels/wacom/wacom-stylus-page.ui:262
+#: panels/wacom/wacom-stylus-page.ui:263
 msgid "Lower Button"
 msgstr "下のサイドスイッチ"
 
-#: panels/wacom/wacom-stylus-page.ui:291
+#: panels/wacom/wacom-stylus-page.ui:292
 msgid "Lowest Button"
 msgstr "一番下のボタン"
 
-#: panels/wacom/wacom-stylus-page.ui:320
+#: panels/wacom/wacom-stylus-page.ui:321
 msgid "Tip Pressure Feel"
 msgstr "ペン先の感触"
 
@@ -7883,23 +8341,27 @@ msgstr "表示するパネル"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: shell/cc-panel-loader.c:279
+#: shell/cc-panel-list.ui:45 shell/cc-window.c:277
+msgid "Privacy"
+msgstr "プライバシー"
+
+#: shell/cc-panel-loader.c:292
 msgid "Available panels:"
 msgstr "利用可能なパネル:"
 
-#: shell/cc-window.ui:147
+#: shell/cc-window.ui:140
 msgid "All Settings"
 msgstr "すべての設定"
 
-#: shell/cc-window.ui:185
+#: shell/cc-window.ui:178
 msgid "Primary Menu"
 msgstr "プライマリメニュー"
 
-#: shell/cc-window.ui:332
+#: shell/cc-window.ui:319
 msgid "Warning: Development Version"
 msgstr "警告: 開発版です"
 
-#: shell/cc-window.ui:333
+#: shell/cc-window.ui:320
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7908,7 +8370,7 @@ msgstr ""
 "このバージョンの“設定”は、開発目的の場合にのみ使用してください。システムの不"
 "正動作、データ消失、その他の予期せぬ不具合が発生する可能性があります。"
 
-#: shell/cc-window.ui:344
+#: shell/cc-window.ui:331
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -7986,6 +8448,267 @@ msgstr[0] "%u 入力"
 msgid "System Sounds"
 msgstr "システムのサウンド"
 
+#~ msgid "Version %s"
+#~ msgstr "バージョン %s"
+
+#~ msgid "OS name"
+#~ msgstr "OS 名"
+
+#~ msgid "OS type"
+#~ msgstr "OS の種類"
+
+#~ msgid "Disk"
+#~ msgstr "ディスク"
+
+#~ msgid "Check for updates"
+#~ msgstr "更新の確認"
+
+#~ msgid "Network proxy"
+#~ msgstr "ネットワークプロキシ"
+
+#~ msgid "page 1"
+#~ msgstr "ページ1"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "内部認証(_A)"
+
+#~ msgid "page 2"
+#~ msgstr "ページ2"
+
+#~ msgid "Restrict _background data usage"
+#~ msgstr "バックグラウンドデータの使用を制限する(_B)"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr "従量制課金接続のような制限のある接続に適しています。"
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "ツイストペア (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "Attachment Unit Interface (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "Media Independent Interface (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid ""
+#~ "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+#~ msgstr ""
+#~ "ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
+
+#~ msgid ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+#~ msgstr ""
+#~ "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はでき"
+#~ "ません。"
+
+#~ msgid ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+#~ msgstr ""
+#~ "Wi-Fi アクセスポイント機能は、追加のインターネット接続を Wi-Fi 経由で共有"
+#~ "するために使用されます。"
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "自動接続(_C)"
+
+#~ msgid "details"
+#~ msgstr "詳細"
+
+#~ msgid "Show P_assword"
+#~ msgstr "パスワードを表示(_A)"
+
+#~ msgid "Make available to other users"
+#~ msgstr "他のユーザーに利用可能にする"
+
+#~ msgid "identity"
+#~ msgstr "識別情報"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv4(_4)"
+
+#~ msgid "_Addresses"
+#~ msgstr "アドレス(_A)"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "自動 (DHCP) アドレスのみ"
+
+#~ msgid "Link-local only"
+#~ msgstr "リンクローカルのみ"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "自動的に得られたルートを無視する(_I)"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv6(_6)"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "クローンしたMACアドレス(_C)"
+
+#~ msgid "_Reset"
+#~ msgstr "リセット(_R)"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+#~ msgstr ""
+#~ "この接続の設定をデフォルトにリセットしますが、推奨接続であることは記憶しま"
+#~ "す。"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+#~ msgstr ""
+#~ "このネットワークに関する詳細はすべて削除して、自動的に接続しないようにしま"
+#~ "す。"
+
+#~ msgid "Hardware"
+#~ msgstr "ハードウェア"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "リセット"
+
+#~ msgid "Connected Devices"
+#~ msgstr "接続しているデバイス"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "アドホック"
+
+#~ msgid "Infrastructure"
+#~ msgstr "インフラストラクチャ"
+
+#~ msgid "Not connected"
+#~ msgstr "接続していない"
+
+#~ msgid "Notification _Popups"
+#~ msgstr "通知ポップアップ(_P)"
+
+#~ msgid "In use"
+#~ msgstr "使用中"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "オン"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "オフ"
+
+#~ msgctxt "Camera status"
+#~ msgid "Off"
+#~ msgstr "オフ"
+
+#~ msgctxt "Camera status"
+#~ msgid "On"
+#~ msgstr "オン"
+
+#~ msgctxt "Microphone status"
+#~ msgid "Off"
+#~ msgstr "オフ"
+
+#~ msgctxt "Microphone status"
+#~ msgid "On"
+#~ msgstr "オン"
+
+#~ msgid "Usage & History"
+#~ msgstr "使用と履歴"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "プライバシーポリシー"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr ""
+#~ "履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目"
+#~ "はネットワークを越えて共有されることはありません。"
+
+#~ msgid "_Recently Used"
+#~ msgstr "最近使用したファイル(_R)"
+
+#~ msgid "Retain _History"
+#~ msgstr "記憶する期間(_H)"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr "画面をロックして離席中もプライバシーを保護します。"
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "画面オフ後にロックするまでの時間(_A)"
+
+#~ msgid "Lock Screen _Notifications"
+#~ msgstr "ロック画面での通知(_N)"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr ""
+#~ "ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残った"
+#~ "ままにならないようにします。"
+
+#~ msgid "Purge _After"
+#~ msgstr "次の時間経過後に削除する(_A)"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+#~ msgstr ""
+#~ "利用しているソフトウェアについての情報を私たちに送ることで、より適切な提案"
+#~ "を私たちができるようになります。また、ソフトウェアの改善にも役立てられま"
+#~ "す。\n"
+#~ "\n"
+#~ "私たちが収集する情報はすべて匿名であり、また収集したデータを第三者と共有す"
+#~ "ることはありません。"
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "ソフトウェアの使用統計情報を送信する(_S)"
+
+#~ msgid "_Camera"
+#~ msgstr "カメラ(_C)"
+
+#~ msgid "_Microphone"
+#~ msgstr "マイク(_M)"
+
+#~ msgid "_Location Services"
+#~ msgstr "位置情報サービス(_L)"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr "個人情報の保護と外部からの見え方を設定します"
+
+#~ msgid "No regions found"
+#~ msgstr "地域が見つかりません"
+
+#~ msgid "Flash the _window title"
+#~ msgstr "ウィンドウのタイトルバーをひらめかせる(_W)"
+
+#~ msgid "Last Login"
+#~ msgstr "最終ログイン"
+
 #~ msgid "The username cannot start with a “-”."
 #~ msgstr "ユーザー名の先頭文字に“-”は使えません。"
 
@@ -8094,9 +8817,6 @@ msgstr "システムのサウンド"
 #~ msgid "printer"
 #~ msgstr "printer"
 
-#~ msgid "Show _Notifications"
-#~ msgstr "ロック画面に通知を表示する(_N)"
-
 #~ msgid "preferences-system-privacy"
 #~ msgstr "preferences-system-privacy"
 
@@ -8186,9 +8906,6 @@ msgstr "システムのサウンド"
 #~ msgid "Sound Effects"
 #~ msgstr "音響効果"
 
-#~ msgid "No application is currently playing or recording audio."
-#~ msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
-
 #~ msgid "Built-in"
 #~ msgstr "組み込み"
 
@@ -8207,9 +8924,6 @@ msgstr "システムのサウンド"
 #~ msgid "Stop"
 #~ msgstr "停止"
 
-#~ msgid "Primary Display"
-#~ msgstr "プライマリディスプレイ"
-
 #~ msgid "_Night Light"
 #~ msgstr "夜間モード(_N)"
 
@@ -8228,9 +8942,6 @@ msgstr "システムのサウンド"
 #~ msgid "Move input source down"
 #~ msgstr "入力ソースを下に移動する"
 
-#~ msgid "Configure input source"
-#~ msgstr "入力ソースの設定を行う"
-
 #~ msgid "Show input source keyboard layout"
 #~ msgstr "入力ソースのキーボードレイアウトを表示する"
 
@@ -8345,10 +9056,6 @@ msgstr "システムのサウンド"
 #~ msgid "page 3"
 #~ msgstr "ページ3"
 
-#~ msgctxt "category"
-#~ msgid "Personal"
-#~ msgstr "パーソナル"
-
 #~ msgctxt "category"
 #~ msgid "Hardware"
 #~ msgstr "ハードウェア"
@@ -8447,15 +9154,9 @@ msgstr "システムのサウンド"
 #~ msgid "_Method"
 #~ msgstr "メソッド(_M)"
 
-#~ msgid "VPN Type"
-#~ msgstr "VPN の種類"
-
 #~ msgid "Group Name"
 #~ msgstr "グループ名"
 
-#~ msgid "Group Password"
-#~ msgstr "グループのパスワード"
-
 #~ msgid "_Use as Hotspot…"
 #~ msgstr "アクセスポイントとして使用(_U)…"
 
@@ -8511,9 +9212,6 @@ msgstr "システムのサウンド"
 #~ "ワイヤレス以外のインターネット接続がある場合には、 ワイヤレスホットスポッ"
 #~ "トを設定し、他の人とインターネット接続を共有することができます。"
 
-#~ msgid "History"
-#~ msgstr "履歴"
-
 #~ msgid "Loading options…"
 #~ msgstr "オプションをロード中…"
 
@@ -8553,9 +9251,6 @@ msgstr "システムのサウンド"
 #~ msgid "<small>Your account</small>"
 #~ msgstr "<small>あなたのアカウント</small>"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
 #~ msgid ""
 #~ "To edit a shortcut, click the row and hold down the new keys or press "
 #~ "Backspace to clear."


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]