[gnome-control-center] Update Japanese translation



commit a4810f3e9e69fe4a5795a6dfc020326a22c00839
Author: sicklylife <translation sicklylife jp>
Date:   Thu Mar 10 13:03:14 2022 +0000

    Update Japanese translation

 po/ja.po | 5047 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 2536 insertions(+), 2511 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index e9ddc9bcb..8b77b5626 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -33,7 +33,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: 2022-01-24 13:03+0000\n"
+"POT-Creation-Date: 2022-03-10 12:54+0000\n"
 "PO-Revision-Date: 2022-03-10 21:00+0900\n"
 "Last-Translator: sicklylife <translation sicklylife jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -43,70 +43,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: panels/applications/cc-applications-panel.c:823
+#: panels/applications/cc-applications-panel.c:803
 msgid "System Bus"
 msgstr "システムバス"
 
+#: panels/applications/cc-applications-panel.c:803
+#: panels/applications/cc-applications-panel.c:805
+#: panels/applications/cc-applications-panel.c:818
 #: panels/applications/cc-applications-panel.c:823
-#: panels/applications/cc-applications-panel.c:825
-#: panels/applications/cc-applications-panel.c:838
-#: panels/applications/cc-applications-panel.c:843
 msgid "Full access"
 msgstr "フルアクセス"
 
-#: panels/applications/cc-applications-panel.c:825
+#: panels/applications/cc-applications-panel.c:805
 msgid "Session Bus"
 msgstr "セッションバス"
 
-#: panels/applications/cc-applications-panel.c:829
-#: panels/power/cc-power-panel.ui:85 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525
+#: panels/applications/cc-applications-panel.c:809
+#: panels/power/cc-power-panel.ui:75 panels/thunderbolt/cc-bolt-panel.ui:266
+#: panels/thunderbolt/cc-bolt-panel.ui:310
 msgid "Devices"
 msgstr "デバイス"
 
-#: panels/applications/cc-applications-panel.c:829
+#: panels/applications/cc-applications-panel.c:809
 msgid "Full access to /dev"
 msgstr "/dev へのフルアクセス"
 
-#: panels/applications/cc-applications-panel.c:833
+#: panels/applications/cc-applications-panel.c:813
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:288 panels/wwan/cc-wwan-device-page.ui:114
-#: panels/wwan/cc-wwan-network-dialog.ui:4
+#: panels/network/network-mobile.ui:230 panels/wwan/cc-wwan-device-page.ui:61
+#: panels/wwan/cc-wwan-network-dialog.ui:5
 msgid "Network"
 msgstr "ネットワーク"
 
-#: panels/applications/cc-applications-panel.c:833
+#: panels/applications/cc-applications-panel.c:813
 msgid "Has network access"
 msgstr "ネットワークアクセス"
 
-#: panels/applications/cc-applications-panel.c:838
-#: panels/applications/cc-applications-panel.c:840
-#: panels/search/cc-search-locations-dialog.c:362
+#: panels/applications/cc-applications-panel.c:818
+#: panels/applications/cc-applications-panel.c:820
+#: panels/search/cc-search-locations-dialog.c:384
 msgid "Home"
 msgstr "ホーム"
 
-#: panels/applications/cc-applications-panel.c:840
-#: panels/applications/cc-applications-panel.c:845
+#: panels/applications/cc-applications-panel.c:820
+#: panels/applications/cc-applications-panel.c:825
 msgid "Read-only"
 msgstr "読み取り専用"
 
-#: panels/applications/cc-applications-panel.c:843
-#: panels/applications/cc-applications-panel.c:845
+#: panels/applications/cc-applications-panel.c:823
+#: panels/applications/cc-applications-panel.c:825
 msgid "File System"
 msgstr "ファイルシステム"
 
-#: panels/applications/cc-applications-panel.c:849
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:279
-#: shell/cc-window.c:938 shell/cc-window.ui:121
-#: shell/gnome-control-center.desktop.in.in:3
+#: panels/applications/cc-applications-panel.c:829
+#: panels/keyboard/01-launchers.xml.in:6
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:7 shell/cc-window.c:246
+#: shell/cc-window.c:878 shell/cc-window.ui:22
+#: shell/org.gnome.Settings.desktop.in.in:3
 msgid "Settings"
 msgstr "設定"
 
-#: panels/applications/cc-applications-panel.c:849
+#: panels/applications/cc-applications-panel.c:829
 msgid "Can change settings"
 msgstr "設定の変更"
 
-#: panels/applications/cc-applications-panel.c:851
+#: panels/applications/cc-applications-panel.c:831
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -115,63 +116,16 @@ msgstr ""
 "%s には次の変更できない権限が組み込まれています。これらの権限に問題がある場合"
 "は、このアプリケーションの削除を検討してください。"
 
-#: panels/applications/cc-applications-panel.c:1024
-msgid "Web Links"
-msgstr "ウェブリンク"
-
-#: panels/applications/cc-applications-panel.c:1034
-msgid "Git Links"
-msgstr "Git リンク"
-
-#: panels/applications/cc-applications-panel.c:1040
+#: panels/applications/cc-applications-panel.c:1164
 #, c-format
-msgid "%s Links"
-msgstr "%s リンク"
-
-#: panels/applications/cc-applications-panel.c:1048
-#: panels/applications/cc-applications-panel.c:1084
-msgid "Unset"
-msgstr "削除"
-
-#: panels/applications/cc-applications-panel.c:1139
-msgid "Links"
-msgstr "リンク"
-
-#: panels/applications/cc-applications-panel.c:1147
-msgid "Hypertext Files"
-msgstr "ハイパーテキストファイル"
-
-#: panels/applications/cc-applications-panel.c:1161
-msgid "Text Files"
-msgstr "テキストファイル"
-
-#: panels/applications/cc-applications-panel.c:1175
-msgid "Image Files"
-msgstr "画像ファイル"
-
-#: panels/applications/cc-applications-panel.c:1191
-msgid "Font Files"
-msgstr "フォントファイル"
-
-#: panels/applications/cc-applications-panel.c:1252
-msgid "Archive Files"
-msgstr "アーカイブファイル"
-
-#: panels/applications/cc-applications-panel.c:1272
-msgid "Package Files"
-msgstr "パッケージファイル"
-
-#: panels/applications/cc-applications-panel.c:1295
-msgid "Audio Files"
-msgstr "オーディオファイル"
-
-#: panels/applications/cc-applications-panel.c:1312
-msgid "Video Files"
-msgstr "ビデオファイル"
+msgid "%u file and link type that is opened by the app"
+msgid_plural "%u file and link types that are opened by the app"
+msgstr[0] ""
 
-#: panels/applications/cc-applications-panel.c:1320
-msgid "Other Files"
-msgstr "その他のファイル"
+#: panels/applications/cc-applications-panel.c:1171
+#, c-format
+msgid "<b>%s</b> is used to open the following types of files and links."
+msgstr ""
 
 #. Translators: '%s' is the formatted size, e.g. "26.2 MB"
 #: panels/applications/cc-applications-panel.c:1223
@@ -180,18 +134,18 @@ msgid "%s of disk space used"
 msgstr "ディスク容量の %s を使用中"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1660
-#: panels/applications/cc-applications-panel.ui:416
+#: panels/applications/cc-applications-panel.c:1387
+#: panels/applications/cc-applications-panel.ui:19
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
-#: panels/notifications/cc-notifications-panel.ui:70
+#: panels/notifications/cc-notifications-panel.ui:26
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: panels/applications/cc-applications-panel.ui:43
+#: panels/applications/cc-applications-panel.ui:31
 msgid "No applications"
 msgstr "アプリケーションがありません"
 
-#: panels/applications/cc-applications-panel.ui:57
+#: panels/applications/cc-applications-panel.ui:34
 msgid "Install some…"
 msgstr "インストール…"
 
@@ -204,21 +158,17 @@ msgstr "開く"
 msgid "View Details"
 msgstr "詳細を表示"
 
-#: panels/applications/cc-applications-panel.ui:94
-msgid "Permissions & Access"
-msgstr "パーミッションとアクセス"
-
-#: panels/applications/cc-applications-panel.ui:106
-msgid ""
-"Data and services that this app has asked for access to and permissions that "
-"it requires."
-msgstr "このアプリが要求している権限です。"
+#: panels/applications/cc-applications-panel.ui:112
+#: panels/applications/cc-applications-panel.ui:119
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:41
+msgid "Search"
+msgstr "検索"
 
-#: panels/applications/cc-applications-panel.ui:121
-#: panels/applications/cc-applications-panel.ui:127
-#: panels/camera/gnome-camera-panel.desktop.in.in:3
-msgid "Camera"
-msgstr "カメラ"
+#: panels/applications/cc-applications-panel.ui:113
+#: panels/applications/cc-applications-panel.ui:120
+msgid "Receive system searches and send results."
+msgstr ""
 
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
@@ -226,66 +176,22 @@ msgstr "カメラ"
 #. TRANSLATORS: Status of Parental Controls setup
 #. translators:
 #. * The device has been disabled
-#: panels/applications/cc-applications-panel.ui:128
-#: panels/applications/cc-applications-panel.ui:140
-#: panels/applications/cc-applications-panel.ui:152
-#: panels/applications/cc-applications-panel.ui:232
-#: panels/applications/cc-applications-panel.ui:262
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:85
-#: panels/keyboard/cc-xkb-modifier-dialog.c:353
-#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:129
-#: panels/user-accounts/cc-user-panel.c:848
-#: panels/user-accounts/cc-user-panel.c:938
-#: panels/wwan/cc-wwan-device-page.c:479
+#: panels/applications/cc-applications-panel.ui:121
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/applications/cc-applications-panel.ui:177
+#: panels/applications/cc-applications-panel.ui:191
+#: panels/applications/cc-applications-panel.ui:205
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:118
+#: panels/keyboard/cc-xkb-modifier-dialog.c:344
+#: panels/keyboard/keyboard-shortcuts.c:367 panels/network/network-proxy.ui:105
+#: panels/user-accounts/cc-user-panel.c:789
+#: panels/user-accounts/cc-user-panel.c:879
+#: panels/wwan/cc-wwan-device-page.c:478
 #: subprojects/gvc/gvc-mixer-control.c:1900
 msgid "Disabled"
 msgstr "無効"
 
-#: panels/applications/cc-applications-panel.ui:133
-#: panels/applications/cc-applications-panel.ui:139
-#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
-msgid "Microphone"
-msgstr "マイク"
-
-#: panels/applications/cc-applications-panel.ui:145
-#: panels/applications/cc-applications-panel.ui:151
-#: panels/location/gnome-location-panel.desktop.in.in:3
-msgid "Location Services"
-msgstr "位置情報サービス"
-
-#: panels/applications/cc-applications-panel.ui:157
-#: panels/applications/cc-applications-panel.ui:500
-msgid "Built-in Permissions"
-msgstr "組み込みの権限"
-
-#: panels/applications/cc-applications-panel.ui:158
-msgid "Cannot be changed"
-msgstr "変更できません"
-
-#: panels/applications/cc-applications-panel.ui:175
-msgid ""
-"Individual permissions for applications can be reviewed in the <a href="
-"\"privacy\">Privacy</a> Settings."
-msgstr ""
-"アプリケーションごとの権限設定は<a href=\"privacy\">プライバシー</a>設定にも"
-"あります。"
-
-#: panels/applications/cc-applications-panel.ui:199
-msgid "Integration"
-msgstr "統合"
-
-#: panels/applications/cc-applications-panel.ui:211
-msgid "System features used by this application."
-msgstr "このアプリケーションが使用するシステムの機能です。"
-
-#: panels/applications/cc-applications-panel.ui:225
-#: panels/applications/cc-applications-panel.ui:231
-#: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:151
-msgid "Search"
-msgstr "検索"
-
-#: panels/applications/cc-applications-panel.ui:237
+#: panels/applications/cc-applications-panel.ui:126
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:3
 msgid "Notifications"
 msgstr "通知"
@@ -294,14 +200,13 @@ msgstr "通知"
 msgid "Show system notifications."
 msgstr "システムの通知を表示します。"
 
-#: panels/applications/cc-applications-panel.ui:243
+#: panels/applications/cc-applications-panel.ui:133
 msgid "Run in background"
 msgstr "バックグラウンドで実行"
 
 #: panels/applications/cc-applications-panel.ui:134
 msgid "Allow activity when the app is closed."
-msgstr ""
-"アプリを閉じても実行し続けることを許可します。"
+msgstr "アプリを閉じても実行し続けることを許可します。"
 
 #: panels/applications/cc-applications-panel.ui:140
 msgid "Change Wallpaper"
@@ -311,58 +216,97 @@ msgstr "壁紙を変更"
 msgid "Change the desktop wallpaper."
 msgstr "デスクトップの壁紙を変更します。"
 
-#: panels/applications/cc-applications-panel.ui:249
-msgid "Set Desktop Background"
-msgstr "デスクトップの背景の設定"
-
-#: panels/applications/cc-applications-panel.ui:255
-#: panels/applications/cc-applications-panel.ui:261
+#: panels/applications/cc-applications-panel.ui:147
+#: panels/applications/cc-applications-panel.ui:154
 msgid "Sounds"
 msgstr "サウンド"
 
-#: panels/applications/cc-applications-panel.ui:267
-msgid "Inhibit system keyboard shortcuts"
+#: panels/applications/cc-applications-panel.ui:148
+#: panels/applications/cc-applications-panel.ui:155
+msgid "Reproduce sounds."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:161
+#, fuzzy
+#| msgid "Set Shortcut"
+msgid "Inhibit Shortcuts"
+msgstr "ショートカットを設定"
+
+#: panels/applications/cc-applications-panel.ui:162
+#, fuzzy
+#| msgid "Inhibit system keyboard shortcuts"
+msgid "Block standard keyboard shortcuts."
 msgstr "システムのキーボードショートカットの禁止"
 
-#: panels/applications/cc-applications-panel.ui:300
-msgid "Default Handlers"
-msgstr "デフォルトのハンドラ"
+#: panels/applications/cc-applications-panel.ui:168
+#: panels/applications/cc-applications-panel.ui:175
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
+msgid "Camera"
+msgstr "カメラ"
 
-#: panels/applications/cc-applications-panel.ui:312
-msgid "Types of files and links that this application opens."
-msgstr "このアプリケーションで開くファイルとリンクの種類です。"
+#: panels/applications/cc-applications-panel.ui:169
+#: panels/applications/cc-applications-panel.ui:176
+msgid "Take pictures with the camera."
+msgstr ""
 
-#: panels/applications/cc-applications-panel.ui:328
-msgid "Reset"
-msgstr "リセット"
+#: panels/applications/cc-applications-panel.ui:182
+#: panels/applications/cc-applications-panel.ui:189
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
+msgid "Microphone"
+msgstr "マイク"
+
+#: panels/applications/cc-applications-panel.ui:183
+#: panels/applications/cc-applications-panel.ui:190
+msgid "Record audio with the microphone."
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:196
+#: panels/applications/cc-applications-panel.ui:203
+#: panels/location/gnome-location-panel.desktop.in.in:3
+msgid "Location Services"
+msgstr "位置情報サービス"
 
-#: panels/applications/cc-applications-panel.ui:364
-msgid "Usage"
-msgstr "使用"
+#: panels/applications/cc-applications-panel.ui:197
+#: panels/applications/cc-applications-panel.ui:204
+#, fuzzy
+#| msgid "Access your location"
+msgid "Access device location data."
+msgstr "位置情報へのアクセス"
 
-#: panels/applications/cc-applications-panel.ui:376
-msgid "How much resources this application is using."
-msgstr "このアプリケーションが使用中のリソース量です。"
+#: panels/applications/cc-applications-panel.ui:215
+#: panels/applications/cc-applications-panel.ui:319
+msgid "Built-in Permissions"
+msgstr "組み込みの権限"
+
+#: panels/applications/cc-applications-panel.ui:216
+#, fuzzy
+#| msgid "System features used by this application."
+msgid "System access that is required by the app"
+msgstr "このアプリケーションが使用するシステムの機能です。"
 
-#: panels/applications/cc-applications-panel.ui:391
-#: panels/applications/cc-applications-panel.ui:537
+#: panels/applications/cc-applications-panel.ui:224
+msgid "File &amp; Link Associations"
+msgstr ""
+
+#: panels/applications/cc-applications-panel.ui:232
+#: panels/applications/cc-applications-panel.ui:399
 msgid "Storage"
 msgstr "ストレージ"
 
-#: panels/applications/cc-applications-panel.ui:424
-msgid "Open in Software"
-msgstr "“ソフトウェア”で開く"
-
-#: panels/applications/cc-applications-panel.ui:474 shell/cc-panel-list.ui:121
+#: panels/applications/cc-applications-panel.ui:294 shell/cc-panel-list.ui:105
 msgid "No results found"
 msgstr "結果がありません"
 
-#: panels/applications/cc-applications-panel.ui:485
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:177
-#: shell/cc-panel-list.ui:132
+#: panels/applications/cc-applications-panel.ui:304
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:198
+#: shell/cc-panel-list.ui:114
 msgid "Try a different search"
 msgstr "他のキーワードを試してください"
 
+#: panels/applications/cc-applications-panel.ui:344
+msgid "File & Link Associations"
+msgstr ""
+
 #: panels/applications/cc-applications-panel.ui:367
 msgid "File Types"
 msgstr "ファイルの種類"
@@ -371,29 +315,33 @@ msgstr "ファイルの種類"
 msgid "Link Types"
 msgstr "リンクの種類"
 
-#: panels/applications/cc-applications-panel.ui:555
+#: panels/applications/cc-applications-panel.ui:383
+msgid "Reset"
+msgstr "リセット"
+
+#: panels/applications/cc-applications-panel.ui:410
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr ""
 "このアプリケーションがデータとキャッシュで占有しているディスク容量です。"
 
-#: panels/applications/cc-applications-panel.ui:564
+#: panels/applications/cc-applications-panel.ui:413
 msgid "Application"
 msgstr "アプリケーション"
 
-#: panels/applications/cc-applications-panel.ui:570
+#: panels/applications/cc-applications-panel.ui:419
 msgid "Data"
 msgstr "データ"
 
-#: panels/applications/cc-applications-panel.ui:576
+#: panels/applications/cc-applications-panel.ui:425
 msgid "Cache"
 msgstr "キャッシュ"
 
-#: panels/applications/cc-applications-panel.ui:582
+#: panels/applications/cc-applications-panel.ui:431
 msgid "<b>Total</b>"
 msgstr "<b>合計</b>"
 
-#: panels/applications/cc-applications-panel.ui:599
+#: panels/applications/cc-applications-panel.ui:441
 msgid "Clear Cache…"
 msgstr "キャッシュを消去…"
 
@@ -409,66 +357,65 @@ msgstr ""
 "application;flatpak;permission;setting;アプリケーション;パーミッション;許可;"
 "権限;設定;snap;"
 
-#: panels/background/cc-background-chooser.c:344
+#: panels/background/cc-background-chooser.c:307
 msgid "Select a picture"
 msgstr "画像を選択"
 
-#: panels/background/cc-background-chooser.c:347
-#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:238
-#: panels/color/cc-color-panel.c:886 panels/color/cc-color-panel.ui:657
-#: panels/common/cc-language-chooser.ui:25
-#: panels/display/cc-display-panel.c:1006
-#: panels/info-overview/cc-info-overview-panel.ui:243
+#: panels/background/cc-background-chooser.c:310
+#: panels/color/cc-color-calibrate.ui:22 panels/color/cc-color-panel.c:284
+#: panels/color/cc-color-panel.c:844 panels/common/cc-language-chooser.ui:21
+#: panels/display/cc-display-panel.ui:31
+#: panels/info-overview/cc-info-overview-panel.ui:198
 #: panels/keyboard/cc-input-chooser.ui:11
-#: panels/network/cc-wifi-hotspot-dialog.ui:122
-#: panels/network/cc-wifi-panel.c:866
-#: panels/network/connection-editor/connection-editor.ui:17
-#: panels/network/connection-editor/vpn-helpers.c:176
-#: panels/network/connection-editor/vpn-helpers.c:299
-#: panels/network/net-device-wifi.c:854
-#: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:235
-#: panels/region/cc-format-chooser.ui:28
-#: panels/search/cc-search-locations-dialog.c:639
-#: panels/sharing/cc-sharing-panel.c:396 panels/usage/cc-usage-panel.c:133
-#: panels/user-accounts/cc-add-user-dialog.ui:28
-#: panels/user-accounts/cc-avatar-chooser.c:105
-#: panels/user-accounts/cc-avatar-chooser.c:228
-#: panels/user-accounts/cc-fingerprint-dialog.ui:36
-#: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:638
-#: panels/user-accounts/cc-user-panel.c:656
-#: panels/user-accounts/data/join-dialog.ui:20
-#: panels/wwan/cc-wwan-mode-dialog.ui:35
-#: panels/wwan/cc-wwan-network-dialog.ui:166
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:297
+#: panels/network/cc-wifi-hotspot-dialog.ui:123
+#: panels/network/cc-wifi-panel.c:881
+#: panels/network/connection-editor/connection-editor.ui:14
+#: panels/network/connection-editor/vpn-helpers.c:226
+#: panels/network/connection-editor/vpn-helpers.c:346
+#: panels/network/net-device-wifi.c:860
+#: panels/printers/new-printer-dialog.ui:50
+#: panels/printers/pp-details-dialog.c:263
+#: panels/region/cc-format-chooser.ui:24
+#: panels/search/cc-search-locations-dialog.c:677
+#: panels/sharing/cc-sharing-panel.c:523 panels/usage/cc-usage-panel.c:139
+#: panels/user-accounts/cc-add-user-dialog.ui:25
+#: panels/user-accounts/cc-avatar-chooser.c:96
+#: panels/user-accounts/cc-avatar-chooser.c:167
+#: panels/user-accounts/cc-fingerprint-dialog.ui:32
+#: panels/user-accounts/cc-password-dialog.ui:18
+#: panels/user-accounts/cc-user-panel.c:579
+#: panels/user-accounts/cc-user-panel.c:597
+#: panels/user-accounts/data/join-dialog.ui:17
+#: panels/wwan/cc-wwan-mode-dialog.ui:32
+#: panels/wwan/cc-wwan-network-dialog.ui:139
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:268
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: panels/background/cc-background-chooser.c:348
-#: panels/network/connection-editor/vpn-helpers.c:177
-#: panels/printers/pp-details-dialog.c:236
-#: panels/sharing/cc-sharing-panel.c:397
-#: panels/user-accounts/cc-avatar-chooser.c:229
+#: panels/background/cc-background-chooser.c:311
+#: panels/network/connection-editor/vpn-helpers.c:227
+#: panels/printers/pp-details-dialog.c:264
+#: panels/sharing/cc-sharing-panel.c:524
+#: panels/user-accounts/cc-avatar-chooser.c:168
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: panels/background/cc-background-item.c:140
+#: panels/background/cc-background-item.c:169
 msgid "multiple sizes"
 msgstr "複数のサイズ"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: panels/background/cc-background-item.c:144
+#: panels/background/cc-background-item.c:173
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: panels/background/cc-background-item.c:282
+#: panels/background/cc-background-item.c:325
 msgid "No Desktop Background"
 msgstr "デスクトップの背景が見つかりません"
 
-#: panels/background/cc-background-panel.c:110
+#: panels/background/cc-background-panel.c:227
 msgid "Current background"
 msgstr "現在の背景"
 
@@ -484,7 +431,11 @@ msgstr "明るい"
 msgid "Dark"
 msgstr "暗い"
 
-#: panels/background/cc-background-panel.ui:55
+#: panels/background/cc-background-panel.ui:91
+msgid "Background"
+msgstr "背景"
+
+#: panels/background/cc-background-panel.ui:97
 msgid "Add Picture…"
 msgstr "画像を追加…"
 
@@ -496,63 +447,53 @@ msgstr "外観"
 msgid "Change your background image or the UI colors"
 msgstr "背景画像や UI の色を変更します"
 
-#: panels/background/cc-background-preview.ui:55
-msgid "Activities"
-msgstr "アクティビティ"
-
-#: panels/background/gnome-background-panel.desktop.in.in:3
-msgid "Background"
-msgstr "背景"
-
-#: panels/background/gnome-background-panel.desktop.in.in:4
-msgid "Change your background image to a wallpaper or photo"
-msgstr "背景画像を壁紙や写真に変更します"
-
-#. Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#. Translators: Search terms to find the Appearance panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
 #: panels/background/gnome-background-panel.desktop.in.in:15
-msgid "Wallpaper;Screen;Desktop;"
+#, fuzzy
+#| msgid "Wallpaper;Screen;Desktop;"
+msgid "Background;Wallpaper;Screen;Desktop;Style;Light;Dark;"
 msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;Background;背景;"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:31
+#: panels/bluetooth/cc-bluetooth-panel.ui:21
 msgid "No Bluetooth Found"
 msgstr "Bluetooth が見つかりませんでした"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:42
+#: panels/bluetooth/cc-bluetooth-panel.ui:22
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Bluetooth を使用するにはドングルを接続してください。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:69
+#: panels/bluetooth/cc-bluetooth-panel.ui:28
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth がオフになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:80
+#: panels/bluetooth/cc-bluetooth-panel.ui:29
 msgid "Turn on to connect devices and receive file transfers."
 msgstr ""
 "デバイスの接続やファイルの受信を行うには Bluetooth をオンにしてください。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:107
+#: panels/bluetooth/cc-bluetooth-panel.ui:35
 msgid "Airplane Mode is On"
 msgstr "機内モードがオンになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:118
+#: panels/bluetooth/cc-bluetooth-panel.ui:36
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "機内モードがオンの場合、Bluetooth は使用できません。"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:124
+#: panels/bluetooth/cc-bluetooth-panel.ui:39
 msgid "Turn Off Airplane Mode"
 msgstr "機内モードをオフにする"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:154
+#: panels/bluetooth/cc-bluetooth-panel.ui:53
 msgid "Hardware Airplane Mode is On"
 msgstr "ハードウェアの機内モードがオンになっています"
 
-#: panels/bluetooth/cc-bluetooth-panel.ui:165
+#: panels/bluetooth/cc-bluetooth-panel.ui:54
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Bluetooth を使用するには機内モードスイッチをオフにしてください。"
 
 #. 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:1392
+#: panels/printers/pp-new-printer-dialog.c:1383
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -565,15 +506,15 @@ msgstr "Bluetooth のオン/オフやデバイスへの接続を行います"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;共有;シェアリング;ブルートゥース;"
 
-#: panels/camera/cc-camera-panel.ui:34
+#: panels/camera/cc-camera-panel.ui:21
 msgid "Camera is Turned Off"
 msgstr "カメラがオフになっています"
 
-#: panels/camera/cc-camera-panel.ui:43
+#: panels/camera/cc-camera-panel.ui:22
 msgid "No applications can capture photos or video."
 msgstr "アプリケーションが写真や動画を撮影できません。"
 
-#: panels/camera/cc-camera-panel.ui:75
+#: panels/camera/cc-camera-panel.ui:36
 msgid ""
 "Use of the camera allows applications to capture photos and video. Disabling "
 "the camera may cause some applications to not function properly.\n"
@@ -585,11 +526,7 @@ msgstr ""
 "\n"
 "以下のアプリケーションがカメラを使用することを許可します。"
 
-#: panels/camera/cc-camera-panel.ui:85
-msgid "Allow the applications below to use your camera."
-msgstr "以下のアプリケーションがカメラを使用することを許可します。"
-
-#: panels/camera/cc-camera-panel.ui:105
+#: panels/camera/cc-camera-panel.ui:52
 msgid "No Applications Have Asked for Camera Access"
 msgstr "カメラへのアクセスを要求しているアプリケーションはありません"
 
@@ -684,23 +621,23 @@ msgstr "キャリブレーション装置を取り外せます。"
 msgid "Do not disturb the calibration device while in progress"
 msgstr "測定中はキャリブレーション装置に触らないでください"
 
-#: panels/color/cc-color-calibrate.ui:7
+#: panels/color/cc-color-calibrate.ui:9
 msgid "Display Calibration"
 msgstr "キャリブレーションの表示"
 
 #. This starts the calibration process
-#: panels/color/cc-color-calibrate.ui:40
+#: panels/color/cc-color-calibrate.ui:28
 msgid "_Start"
 msgstr "開始(_S)"
 
 #. This resumes the calibration process
-#: panels/color/cc-color-calibrate.ui:54
+#: panels/color/cc-color-calibrate.ui:34
 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
-#: panels/user-accounts/cc-fingerprint-dialog.ui:73
+#: panels/color/cc-color-calibrate.ui:40 panels/region/cc-format-chooser.ui:49
+#: panels/user-accounts/cc-fingerprint-dialog.ui:60
 msgid "_Done"
 msgstr "完了(_D)"
 
@@ -745,12 +682,12 @@ msgstr "%s プリンター"
 msgid "%s Webcam"
 msgstr "%s ウェブカム"
 
-#: panels/color/cc-color-device.c:90
+#: panels/color/cc-color-device.c:87
 #, c-format
 msgid "Enable color management for %s"
 msgstr "%s のカラーマネージメントを有効にする"
 
-#: panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:92
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "%s のカラープロファイルを表示する"
@@ -762,94 +699,65 @@ msgstr "未較正"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: panels/color/cc-color-panel.c:167
+#: panels/color/cc-color-panel.c:160
 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:175
+#: panels/color/cc-color-panel.c:168
 msgid "Colorspace: "
 msgstr "色空間: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:182
+#: panels/color/cc-color-panel.c:175
 msgid "Test profile: "
 msgstr "テスト用プロファイル: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:236
+#: panels/color/cc-color-panel.c:282
 msgid "Select ICC Profile File"
 msgstr "ICC プロファイルを選択"
 
-#: panels/color/cc-color-panel.c:239
+#: panels/color/cc-color-panel.c:285
 msgid "_Import"
 msgstr "インポート(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:250
+#: panels/color/cc-color-panel.c:296
 msgid "Supported ICC profiles"
 msgstr "サポートする ICC プロファイル"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:257
-#: panels/network/wireless-security/eap-method-fast.c:356
+#: panels/color/cc-color-panel.c:303
+#: panels/network/wireless-security/eap-method-fast.c:357
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: panels/color/cc-color-panel.c:549
+#: panels/color/cc-color-panel.c:586
 msgid "Screen"
 msgstr "画面"
 
-#. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:839
-#, c-format
-msgid "Failed to upload file: %s"
-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:851
-msgid "The profile has been uploaded to:"
-msgstr "プロファイルがアップロードされました:"
-
-#: panels/color/cc-color-panel.c:853
-msgid "Write down this URL."
-msgstr "この URL をメモしてください。"
-
-#: panels/color/cc-color-panel.c:854
-msgid "Restart this computer and boot your normal operating system."
-msgstr ""
-"このコンピューターを再起動して通常のオペレーティングシステムを起動してくださ"
-"い。"
-
-#: panels/color/cc-color-panel.c:855
-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:883
+#: panels/color/cc-color-panel.c:841
 msgid "Save Profile"
 msgstr "プロファイルを保存"
 
-#: panels/color/cc-color-panel.c:887
-#: panels/network/connection-editor/vpn-helpers.c:300
-#: panels/wwan/cc-wwan-apn-dialog.ui:64
+#: panels/color/cc-color-panel.c:845
+#: panels/network/connection-editor/vpn-helpers.c:347
+#: panels/wwan/cc-wwan-apn-dialog.ui:43
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1196
+#: panels/color/cc-color-panel.c:1146
 msgid "Create a color profile for the selected device"
 msgstr "選択したデバイスのカラープロファイルを作成"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1211 panels/color/cc-color-panel.c:1235
+#: panels/color/cc-color-panel.c:1161 panels/color/cc-color-panel.c:1185
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -858,20 +766,24 @@ msgstr ""
 "してください。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1245
+#: panels/color/cc-color-panel.c:1195
 msgid "The measuring instrument does not support printer profiling."
 msgstr "計測器がプリンターのプロファイルをサポートしていません。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1256
+#: panels/color/cc-color-panel.c:1206
 msgid "The device type is not currently supported."
 msgstr "このデバイスの形式は現在サポートしていません。"
 
-#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:48
+#: panels/color/cc-color-panel.ui:4 panels/wacom/calibrator/calibrator.ui:40
 msgid "Screen Calibration"
 msgstr "画面位置調整"
 
-#: panels/color/cc-color-panel.ui:23
+#: panels/color/cc-color-panel.ui:12
+msgid "Calibration Quality"
+msgstr "キャリブレーション品質"
+
+#: panels/color/cc-color-panel.ui:21
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
@@ -880,42 +792,42 @@ msgstr ""
 "キャリブレーションは画面の色管理に利用できるプロファイルを作成します。キャリ"
 "ブレーションに時間をかけるほど色プロファイルの品質は向上します。"
 
-#: panels/color/cc-color-panel.ui:38
+#: panels/color/cc-color-panel.ui:28
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "キャリブレーション処理中はコンピューターを使えなくなります。"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/cc-color-panel.ui:58
+#: panels/color/cc-color-panel.ui:40
 msgid "Quality"
 msgstr "品質"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/cc-color-panel.ui:75
+#: panels/color/cc-color-panel.ui:51
 msgid "Approximate Time"
 msgstr "予測時間"
 
-#: panels/color/cc-color-panel.ui:121
-msgid "Calibration Quality"
-msgstr "キャリブレーション品質"
+#: panels/color/cc-color-panel.ui:82
+msgid "Calibration Device"
+msgstr "キャリブレーション装置"
 
-#: panels/color/cc-color-panel.ui:137
+#: panels/color/cc-color-panel.ui:90
 msgid "Select the sensor device you want to use for calibration."
 msgstr "キャリブレーションに使用するセンサーデバイスを選択してください。"
 
-#: panels/color/cc-color-panel.ui:174
-msgid "Calibration Device"
-msgstr "キャリブレーション装置"
+#: panels/color/cc-color-panel.ui:117
+msgid "Display Type"
+msgstr "ディスプレイの種類"
 
-#: panels/color/cc-color-panel.ui:189
+#: panels/color/cc-color-panel.ui:125
 msgid "Select the type of display that is connected."
 msgstr "接続しているディスプレイの種類を選択してください。"
 
-#: panels/color/cc-color-panel.ui:226
-msgid "Display Type"
-msgstr "ディスプレイの種類"
+#: panels/color/cc-color-panel.ui:152
+msgid "Profile Whitepoint"
+msgstr "白色点のプロファイル作成"
 
-#: panels/color/cc-color-panel.ui:241
+#: panels/color/cc-color-panel.ui:160
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -923,11 +835,11 @@ msgstr ""
 "表示対象の白色点を選択してください。ほとんどのディスプレイが D65 光源に対して"
 "キャリブレーションを行えばいいはずです。"
 
-#: panels/color/cc-color-panel.ui:278
-msgid "Profile Whitepoint"
-msgstr "白色点のプロファイル作成"
+#: panels/color/cc-color-panel.ui:187
+msgid "Display Brightness"
+msgstr "ディスプレイの明るさ"
 
-#: panels/color/cc-color-panel.ui:293
+#: panels/color/cc-color-panel.ui:195
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
@@ -935,18 +847,18 @@ msgstr ""
 "ディスプレイを標準的に使っている輝度に設定してください。色管理はこの輝度で最"
 "も正確になります。 "
 
-#: panels/color/cc-color-panel.ui:307
+#: panels/color/cc-color-panel.ui:202
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr ""
 "他のプロファイルで使っている輝度をこのデバイス用に利用することもできます。"
 
-#: panels/color/cc-color-panel.ui:318
-msgid "Display Brightness"
-msgstr "ディスプレイの明るさ"
+#: panels/color/cc-color-panel.ui:214
+msgid "Profile Name"
+msgstr "プロファイル名"
 
-#: panels/color/cc-color-panel.ui:333
+#: panels/color/cc-color-panel.ui:222
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -954,35 +866,27 @@ msgstr ""
 "異なるコンピューターの色プロファイルを利用したり、異なる照明条件のプロファイ"
 "ルを作成することもできます。"
 
-#: panels/color/cc-color-panel.ui:348
+#: panels/color/cc-color-panel.ui:229
 msgid "Profile Name:"
 msgstr "プロファイル名:"
 
-#: panels/color/cc-color-panel.ui:377
-msgid "Profile Name"
-msgstr "プロファイル名"
+#: panels/color/cc-color-panel.ui:251
+msgid "Summary"
+msgstr "概要"
 
-#: panels/color/cc-color-panel.ui:392
+#: panels/color/cc-color-panel.ui:259
 msgid "Profile successfully created!"
 msgstr "プロファイルが正常に作成されました!"
 
-#: panels/color/cc-color-panel.ui:443
+#: panels/color/cc-color-panel.ui:290
 msgid "Copy profile"
 msgstr "プロファイルの複製"
 
-#: panels/color/cc-color-panel.ui:456
+#: panels/color/cc-color-panel.ui:296
 msgid "Requires writable media"
 msgstr "書き込み可能メディアが必要です"
 
-#: panels/color/cc-color-panel.ui:519
-msgid "Upload profile"
-msgstr "プロファイルのアップロード"
-
-#: panels/color/cc-color-panel.ui:532
-msgid "Requires Internet connection"
-msgstr "インターネット接続が必要です"
-
-#: panels/color/cc-color-panel.ui:591
+#: panels/color/cc-color-panel.ui:313
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -992,26 +896,11 @@ msgstr ""
 "\"windows\">Microsoft Windows</a> システムでのプロファイルの利用方法が役立つ"
 "かもしません。"
 
-#: panels/color/cc-color-panel.ui:607
-msgid "Summary"
-msgstr "概要"
-
-#: panels/color/cc-color-panel.ui:621
+#: panels/color/cc-color-panel.ui:335
 msgid "Add Profile"
 msgstr "プロファイルを追加"
 
-#: panels/color/cc-color-panel.ui:643
-msgid "_Import File…"
-msgstr "ファイルを読み込む(_I)…"
-
-#: panels/color/cc-color-panel.ui:672 panels/keyboard/cc-input-chooser.ui:20
-#: panels/network/connection-editor/net-connection-editor.c:504
-#: panels/printers/new-printer-dialog.ui:80
-#: panels/user-accounts/cc-add-user-dialog.ui:47
-msgid "_Add"
-msgstr "追加(_A)"
-
-#: panels/color/cc-color-panel.ui:732
+#: panels/color/cc-color-panel.ui:373
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -1019,143 +908,154 @@ msgstr ""
 "問題が検出されました。プロファイルは正しく動作しない可能性があります。<a "
 "href=\"\">詳細を表示する。</a>"
 
-#: panels/color/cc-color-panel.ui:788
+#: panels/color/cc-color-panel.ui:384
+msgid "_Import File…"
+msgstr "ファイルを読み込む(_I)…"
+
+#: panels/color/cc-color-panel.ui:390 panels/keyboard/cc-input-chooser.ui:18
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:84
+#: panels/user-accounts/cc-add-user-dialog.ui:39
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: panels/color/cc-color-panel.ui:424
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
 "カラーマネージメントを行うには、各デバイスの最新のカラープロファイルが必要に"
 "なります。"
 
 #. translators: Text used in link to privacy policy
-#: panels/color/cc-color-panel.ui:810
-#: panels/diagnostics/cc-diagnostics-panel.c:144
+#: panels/color/cc-color-panel.ui:434
+#: panels/diagnostics/cc-diagnostics-panel.c:137
 msgid "Learn more"
 msgstr "もっと詳しく"
 
-#: panels/color/cc-color-panel.ui:815
+#: panels/color/cc-color-panel.ui:436
 msgid "Learn more about color management"
 msgstr "カラーマネージメントについてもっと詳しく知る"
 
-#: panels/color/cc-color-panel.ui:863
+#: panels/color/cc-color-panel.ui:473
 msgid "_Set for all users"
 msgstr "全ユーザー用に設定(_S)"
 
-#: panels/color/cc-color-panel.ui:867 panels/color/cc-color-panel.ui:882
-#: panels/color/cc-color-panel.ui:883
+#: panels/color/cc-color-panel.ui:475 panels/color/cc-color-panel.ui:483
+#: panels/color/cc-color-panel.ui:484
 msgid "Set this profile for all users on this computer"
 msgstr "コンピューターのすべてのユーザーでプロファイルを利用"
 
-#: panels/color/cc-color-panel.ui:878
+#: panels/color/cc-color-panel.ui:481
 msgid "_Enable"
 msgstr "有効にする(_E)"
 
-#: panels/color/cc-color-panel.ui:909
+#: panels/color/cc-color-panel.ui:497
 msgid "_Add profile"
 msgstr "プロファイルを追加(_A)"
 
-#: panels/color/cc-color-panel.ui:922
+#: panels/color/cc-color-panel.ui:503
 msgid "_Calibrate…"
 msgstr "キャリブレート(_C)…"
 
-#: panels/color/cc-color-panel.ui:926
+#: panels/color/cc-color-panel.ui:505
 msgid "Calibrate the device"
 msgstr "デバイスのキャリブレート"
 
-#: panels/color/cc-color-panel.ui:937
+#: panels/color/cc-color-panel.ui:511
 msgid "_Remove profile"
 msgstr "プロファイルを削除(_R)"
 
-#: panels/color/cc-color-panel.ui:950
+#: panels/color/cc-color-panel.ui:517
 msgid "_View details"
 msgstr "詳細を表示(_V)"
 
-#: panels/color/cc-color-panel.ui:986
+#: panels/color/cc-color-panel.ui:529
 msgid "Unable to detect any devices that can be color managed"
 msgstr "カラーマネジメント対象のデバイスを検出できません"
 
-#: panels/color/cc-color-panel.ui:1030
+#: panels/color/cc-color-panel.ui:568
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/cc-color-panel.ui:1035
+#: panels/color/cc-color-panel.ui:573
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/cc-color-panel.ui:1040
+#: panels/color/cc-color-panel.ui:578
 msgid "CRT"
 msgstr "CRT"
 
-#: panels/color/cc-color-panel.ui:1045
+#: panels/color/cc-color-panel.ui:583
 msgid "Projector"
 msgstr "プロジェクター"
 
-#: panels/color/cc-color-panel.ui:1050
+#: panels/color/cc-color-panel.ui:588
 msgid "Plasma"
 msgstr "プラズマ"
 
-#: panels/color/cc-color-panel.ui:1055
+#: panels/color/cc-color-panel.ui:593
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL バックライト)"
 
-#: panels/color/cc-color-panel.ui:1060
+#: panels/color/cc-color-panel.ui:598
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED バックライト)"
 
-#: panels/color/cc-color-panel.ui:1065
+#: panels/color/cc-color-panel.ui:603
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED バックライト)"
 
-#: panels/color/cc-color-panel.ui:1070
+#: panels/color/cc-color-panel.ui:608
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "広色域 LCD (CCFL バックライト)"
 
-#: panels/color/cc-color-panel.ui:1075
+#: panels/color/cc-color-panel.ui:613
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "広色域 LCD (RGB LED バックライト)"
 
-#: panels/color/cc-color-panel.ui:1092
+#: panels/color/cc-color-panel.ui:630
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: panels/color/cc-color-panel.ui:1093
+#: panels/color/cc-color-panel.ui:631
 msgid "40 minutes"
 msgstr "40 分"
 
-#: panels/color/cc-color-panel.ui:1097
+#: panels/color/cc-color-panel.ui:635
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: panels/color/cc-color-panel.ui:1098
+#: panels/color/cc-color-panel.ui:636
 msgid "30 minutes"
 msgstr "30 分"
 
-#: panels/color/cc-color-panel.ui:1102
+#: panels/color/cc-color-panel.ui:640
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: panels/color/cc-color-panel.ui:1103
+#: panels/color/cc-color-panel.ui:641
 msgid "15 minutes"
 msgstr "15 分"
 
-#: panels/color/cc-color-panel.ui:1125
+#: panels/color/cc-color-panel.ui:663
 msgid "Native to display"
 msgstr "ディスプレイ本来の設定"
 
-#: panels/color/cc-color-panel.ui:1129
+#: panels/color/cc-color-panel.ui:667
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (印刷および出版)"
 
-#: panels/color/cc-color-panel.ui:1133
+#: panels/color/cc-color-panel.ui:671
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/cc-color-panel.ui:1137
+#: panels/color/cc-color-panel.ui:675
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (写真とグラフィック)"
 
-#: panels/color/cc-color-panel.ui:1141
+#: panels/color/cc-color-panel.ui:679
 msgid "D75"
 msgstr "D75"
 
@@ -1263,55 +1163,47 @@ msgstr "言語を選択"
 msgid "_Select"
 msgstr "選択(_S)"
 
-#: panels/common/cc-language-chooser.ui:69
+#: panels/common/cc-language-chooser.ui:58
 msgid "No languages found"
 msgstr "言語が見つかりません"
 
-#: panels/common/cc-language-chooser.ui:82
-#: panels/keyboard/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.ui:69
+#: panels/keyboard/cc-input-chooser.c:173
 msgid "More…"
 msgstr "さらに…"
 
-#: panels/common/cc-permission-infobar.c:107
+#: panels/common/cc-permission-infobar.c:109
 msgid "Unlock to Change Settings"
 msgstr "設定を変更する場合はロックを解除してください"
 
-#: panels/common/cc-permission-infobar.ui:20
-msgid "Unlock…"
-msgstr "ロック解除…"
-
-#: panels/common/cc-permission-infobar.ui:56
+#: panels/common/cc-permission-infobar.ui:40
 msgid "Some settings must be unlocked before they can be changed."
 msgstr "一部の設定は変更する前にロックを解除しておく必要があります。"
 
-#: panels/common/cc-time-editor.ui:33
+#: panels/common/cc-permission-infobar.ui:57
+msgid "Unlock…"
+msgstr "ロック解除…"
+
+#: panels/common/cc-time-editor.ui:25
 msgid "Increment Hour"
 msgstr "一時間単位で時刻を進める"
 
-#: panels/common/cc-time-editor.ui:65
+#: panels/common/cc-time-editor.ui:53
 msgid "Increment Minute"
 msgstr "一分単位で時刻を進める"
 
-#: panels/common/cc-time-editor.ui:80
+#: panels/common/cc-time-editor.ui:73
 msgid "Time"
 msgstr "時刻"
 
-#: panels/common/cc-time-editor.ui:113
+#: panels/common/cc-time-editor.ui:94
 msgid "Decrement Hour"
 msgstr "一時間単位で時刻を戻す"
 
-#: panels/common/cc-time-editor.ui:145
+#: panels/common/cc-time-editor.ui:122
 msgid "Decrement Minute"
 msgstr "一分単位で時刻を戻す"
 
-#: panels/common/cc-time-entry.c:219
-msgid "_Copy"
-msgstr "コピー(_C)"
-
-#: panels/common/cc-time-entry.c:225
-msgid "Select _All"
-msgstr "すべて選択(_A)"
-
 #: panels/common/cc-util.c:127
 #: panels/network/connection-editor/ce-page-details.c:162
 msgid "Today"
@@ -1339,7 +1231,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 
 #. Translators: Option for "Blank Screen" in "Power" panel
-#: panels/common/cc-util.c:166 panels/power/cc-power-panel.c:973
+#: panels/common/cc-util.c:166 panels/power/cc-power-panel.c:846
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1397,18 +1289,26 @@ msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "ホットスポット"
 
+#: panels/datetime/cc-datetime-panel.c:175
+msgid "24-hour"
+msgstr "24時制"
+
+#: panels/datetime/cc-datetime-panel.c:177
+msgid "AM / PM"
+msgstr "午前/午後"
+
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:262
+#: panels/datetime/cc-datetime-panel.c:248
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%B%-e日 %p %I:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:267
+#: panels/datetime/cc-datetime-panel.c:253
 msgid "%e %B %Y, %R"
 msgstr "%Y年%B%-e日 %H:%M"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:449
+#: panels/datetime/cc-datetime-panel.c:423
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -1416,7 +1316,7 @@ msgstr "%2$s, %1$s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:476
+#: panels/datetime/cc-datetime-panel.c:450
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -1424,98 +1324,98 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: panels/datetime/cc-datetime-panel.c:483
+#: panels/datetime/cc-datetime-panel.c:457
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:488
+#: panels/datetime/cc-datetime-panel.c:462
 msgid "%l:%M %p"
 msgstr "%p %I:%M"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:493
+#: panels/datetime/cc-datetime-panel.c:467
 msgid "%R"
 msgstr "%H:%M"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:498
+#: panels/datetime/cc-datetime-panel.c:472
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/cc-datetime-panel.ui:38
+#: panels/datetime/cc-datetime-panel.ui:15
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
+msgid "Date & Time"
+msgstr "日付と時刻"
+
+#: panels/datetime/cc-datetime-panel.ui:50
+msgid "Year"
+msgstr "年"
+
+#: panels/datetime/cc-datetime-panel.ui:66
+msgid "Month"
+msgstr "月"
+
+#: panels/datetime/cc-datetime-panel.ui:71
 msgid "January"
 msgstr "1月"
 
-#: panels/datetime/cc-datetime-panel.ui:46
+#: panels/datetime/cc-datetime-panel.ui:72
 msgid "February"
 msgstr "2月"
 
-#: panels/datetime/cc-datetime-panel.ui:54
+#: panels/datetime/cc-datetime-panel.ui:73
 msgid "March"
 msgstr "3月"
 
-#: panels/datetime/cc-datetime-panel.ui:62
+#: panels/datetime/cc-datetime-panel.ui:74
 msgid "April"
 msgstr "4月"
 
-#: panels/datetime/cc-datetime-panel.ui:70
+#: panels/datetime/cc-datetime-panel.ui:75
 msgid "May"
 msgstr "5月"
 
-#: panels/datetime/cc-datetime-panel.ui:78
+#: panels/datetime/cc-datetime-panel.ui:76
 msgid "June"
 msgstr "6月"
 
-#: panels/datetime/cc-datetime-panel.ui:86
+#: panels/datetime/cc-datetime-panel.ui:77
 msgid "July"
 msgstr "7月"
 
-#: panels/datetime/cc-datetime-panel.ui:94
+#: panels/datetime/cc-datetime-panel.ui:78
 msgid "August"
 msgstr "8月"
 
-#: panels/datetime/cc-datetime-panel.ui:102
+#: panels/datetime/cc-datetime-panel.ui:79
 msgid "September"
 msgstr "9月"
 
-#: panels/datetime/cc-datetime-panel.ui:110
+#: panels/datetime/cc-datetime-panel.ui:80
 msgid "October"
 msgstr "10月"
 
-#: panels/datetime/cc-datetime-panel.ui:118
+#: panels/datetime/cc-datetime-panel.ui:81
 msgid "November"
 msgstr "11月"
 
-#: panels/datetime/cc-datetime-panel.ui:126
+#: panels/datetime/cc-datetime-panel.ui:82
 msgid "December"
 msgstr "12月"
 
-#: panels/datetime/cc-datetime-panel.ui:136
-#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
-msgid "Date & Time"
-msgstr "日付と時刻"
-
-#: panels/datetime/cc-datetime-panel.ui:187
-msgid "Year"
-msgstr "年"
-
-#: panels/datetime/cc-datetime-panel.ui:220
-msgid "Month"
-msgstr "月"
-
-#: panels/datetime/cc-datetime-panel.ui:257
+#: panels/datetime/cc-datetime-panel.ui:92
 msgid "Day"
 msgstr "日"
 
-#: panels/datetime/cc-datetime-panel.ui:286
+#: panels/datetime/cc-datetime-panel.ui:113
 msgid "Time Zone"
 msgstr "タイムゾーン"
 
-#: panels/datetime/cc-datetime-panel.ui:307
+#: panels/datetime/cc-datetime-panel.ui:130
 msgid "Search for a city"
 msgstr "都市を検索する"
 
@@ -1523,7 +1423,7 @@ msgstr "都市を検索する"
 msgid "Automatic _Date &amp; Time"
 msgstr "自動日時設定(_D)"
 
-#: panels/datetime/cc-datetime-panel.ui:376
+#: panels/datetime/cc-datetime-panel.ui:165
 msgid "Requires internet access"
 msgstr "インターネットアクセスが必要です"
 
@@ -1531,30 +1431,22 @@ msgstr "インターネットアクセスが必要です"
 msgid "Date &amp; _Time"
 msgstr "日付と時刻(_T)"
 
-#: panels/datetime/cc-datetime-panel.ui:430
+#: panels/datetime/cc-datetime-panel.ui:201
 msgid "Automatic Time _Zone"
 msgstr "自動タイムゾーン設定(_Z)"
 
-#: panels/datetime/cc-datetime-panel.ui:431
+#: panels/datetime/cc-datetime-panel.ui:202
 msgid "Requires location services enabled and internet access"
 msgstr "位置サービスの有効化とインターネットアクセスが必要です"
 
-#: panels/datetime/cc-datetime-panel.ui:446
+#: panels/datetime/cc-datetime-panel.ui:214
 msgid "Time Z_one"
 msgstr "タイムゾーン(_O)"
 
-#: panels/datetime/cc-datetime-panel.ui:481
+#: panels/datetime/cc-datetime-panel.ui:239
 msgid "Time _Format"
 msgstr "日時書式(_F)"
 
-#: panels/datetime/cc-datetime-panel.ui:490
-msgid "24-hour"
-msgstr "24時制"
-
-#: panels/datetime/cc-datetime-panel.ui:491
-msgid "AM / PM"
-msgstr "午前/午後"
-
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "日付、時刻、タイムゾーンを変更します。"
@@ -1573,28 +1465,28 @@ msgstr "システムの時刻と日付の設定を変更"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: panels/default-apps/cc-default-apps-panel.ui:31
+#: panels/default-apps/cc-default-apps-panel.ui:23
 msgid "_Web"
 msgstr "ウェブ(_W)"
 
-#: panels/default-apps/cc-default-apps-panel.ui:43
+#: panels/default-apps/cc-default-apps-panel.ui:33
 msgid "_Mail"
 msgstr "メール(_M)"
 
-#: panels/default-apps/cc-default-apps-panel.ui:59
+#: panels/default-apps/cc-default-apps-panel.ui:47
 msgid "_Calendar"
 msgstr "カレンダー(_C)"
 
-#: panels/default-apps/cc-default-apps-panel.ui:75
+#: panels/default-apps/cc-default-apps-panel.ui:61
 msgid "M_usic"
 msgstr "音楽(_U)"
 
-#: panels/default-apps/cc-default-apps-panel.ui:91
+#: panels/default-apps/cc-default-apps-panel.ui:75
 msgid "_Video"
 msgstr "ビデオ(_V)"
 
-#: panels/default-apps/cc-default-apps-panel.ui:162
-#: panels/removable-media/cc-removable-media-panel.ui:162
+#: panels/default-apps/cc-default-apps-panel.ui:134
+#: panels/removable-media/cc-removable-media-panel.ui:127
 msgid "_Photos"
 msgstr "写真(_P)"
 
@@ -1614,7 +1506,7 @@ msgstr ""
 "ア;"
 
 #. 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:146
+#: panels/diagnostics/cc-diagnostics-panel.c:139
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -1624,11 +1516,11 @@ msgstr ""
 "役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
 "す。%s"
 
-#: panels/diagnostics/cc-diagnostics-panel.ui:28
+#: panels/diagnostics/cc-diagnostics-panel.ui:8
 msgid "Problem Reporting"
 msgstr "問題報告"
 
-#: panels/diagnostics/cc-diagnostics-panel.ui:65
+#: panels/diagnostics/cc-diagnostics-panel.ui:11
 msgid "_Automatic Problem Reporting"
 msgstr "問題のレポートを自動で送信する(_A)"
 
@@ -1654,57 +1546,50 @@ msgstr ""
 "network;identity;privacy;画面;スクリーン;ロック;診断;クラッシュ;プライベート;"
 "最近;テンポラリー;一時;インデックス;索引;名前;ネットワーク;プライバシー;"
 
-#: panels/display/cc-display-panel.c:1017
-#: panels/network/connection-editor/connection-editor.ui:27
-msgid "_Apply"
-msgstr "適用(_A)"
+#: panels/display/cc-display-panel.c:512
+#: panels/notifications/cc-notifications-panel.c:217
+#: panels/power/cc-power-panel.c:734 panels/power/cc-power-panel.c:741
+#: panels/universal-access/cc-ua-panel.c:337
+#: panels/universal-access/cc-ua-panel.c:469
+#: panels/universal-access/cc-ua-panel.c:479
+#: panels/universal-access/cc-ua-panel.c:491
+#: panels/universal-access/cc-ua-panel.c:527
+msgid "On"
+msgstr "オン"
+
+#: panels/display/cc-display-panel.c:514 panels/network/net-proxy.c:69
+#: panels/notifications/cc-notifications-panel.c:217
+#: panels/power/cc-power-panel.c:728 panels/power/cc-power-panel.c:739
+#: panels/universal-access/cc-ua-panel.c:337
+#: panels/universal-access/cc-ua-panel.c:469
+#: panels/universal-access/cc-ua-panel.c:479
+#: panels/universal-access/cc-ua-panel.c:491
+#: panels/universal-access/cc-ua-panel.c:527
+msgid "Off"
+msgstr "オフ"
 
-#: panels/display/cc-display-panel.c:1038
+#: panels/display/cc-display-panel.c:945
 msgid "Apply Changes?"
 msgstr "変更を適用しますか?"
 
-#: panels/display/cc-display-panel.c:1043
+#: panels/display/cc-display-panel.c:950
 msgid "Changes Cannot be Applied"
 msgstr "変更を適用できません"
 
-#: panels/display/cc-display-panel.c:1044
+#: panels/display/cc-display-panel.c:952
 msgid "This could be due to hardware limitations."
 msgstr "この原因はハードウェアの制限にある可能性があります。"
 
-#: panels/display/cc-display-panel.ui:89
-msgid "Single Display"
-msgstr "シングルディスプレイ"
-
-#: panels/display/cc-display-panel.ui:108
-#: panels/display/cc-display-panel.ui:310
-msgid "Join Displays"
-msgstr "画面を拡張"
-
-#: panels/display/cc-display-panel.ui:126
-msgid "Mirror"
-msgstr "ミラー"
-
-#: panels/display/cc-display-panel.ui:151
-msgid "Display Mode"
-msgstr "ディスプレイモード"
-
-#: panels/display/cc-display-panel.ui:220
-msgid "Contains top bar and Activities"
-msgstr "トップバーとアクティビティボタンを含みます"
-
-#: panels/display/cc-display-panel.ui:221
-msgid "Primary Display"
-msgstr "プライマリディスプレイ"
+#: panels/display/cc-display-panel.ui:43
+#: panels/network/connection-editor/connection-editor.ui:21
+msgid "_Apply"
+msgstr "適用(_A)"
 
-#: panels/display/cc-display-panel.ui:243
-msgid ""
-"Drag displays to match your physical display setup. Select a display to "
-"change its settings."
+#: panels/display/cc-display-panel.ui:97
+msgid "Display Settings Disabled"
 msgstr ""
-"実際の配置に合わせてディスプレイをドラッグしてください。設定を変更するには、"
-"ディスプレイを選択してください。"
 
-#: panels/display/cc-display-panel.ui:250
+#: panels/display/cc-display-panel.ui:113
 msgid "Display Arrangement"
 msgstr "ディスプレイの配置"
 
@@ -1712,93 +1597,90 @@ msgstr "ディスプレイの配置"
 msgid "Multiple Displays"
 msgstr "マルチディスプレイ"
 
-#: panels/display/cc-display-panel.ui:374
-msgid "Active Display"
-msgstr "アクティブディスプレイ"
+#. 'Join' as in 'Join displays'
+#: panels/display/cc-display-panel.ui:133
+msgid "Join"
+msgstr ""
 
-#: panels/display/cc-display-panel.ui:421
-msgid "Display Configuration"
-msgstr "ディスプレイの設定"
+#: panels/display/cc-display-panel.ui:140
+msgid "Mirror"
+msgstr "ミラー"
 
-#: panels/display/cc-display-panel.ui:440
-#: panels/display/gnome-display-panel.desktop.in.in:3
-msgid "Displays"
-msgstr "ディスプレイ"
+#: panels/display/cc-display-panel.ui:153
+msgid "Contains top bar and Activities"
+msgstr "トップバーとアクティビティボタンを含みます"
+
+#: panels/display/cc-display-panel.ui:154
+msgid "Primary Display"
+msgstr "プライマリディスプレイ"
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-display-panel.ui:451
-#: panels/display/cc-night-light-page.ui:111
+#: panels/display/cc-display-panel.ui:175
+#: panels/display/cc-display-panel.ui:223
+#: panels/display/cc-night-light-page.ui:77
 msgid "Night Light"
 msgstr "夜間モード"
 
-#: panels/display/cc-display-settings.c:107
+#: panels/display/cc-display-settings.c:110
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "横方向"
 
-#: panels/display/cc-display-settings.c:110
+#: panels/display/cc-display-settings.c:113
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "縦方向 (右向き)"
 
-#: panels/display/cc-display-settings.c:113
+#: panels/display/cc-display-settings.c:116
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "縦方向 (左向き)"
 
-#: panels/display/cc-display-settings.c:116
+#: panels/display/cc-display-settings.c:119
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
 msgstr "横方向 (逆向き)"
 
-#: panels/display/cc-display-settings.c:190
+#: panels/display/cc-display-settings.c:177
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
-#: panels/display/cc-display-settings.ui:15
+#: panels/display/cc-display-settings.ui:40
 msgctxt "display setting"
 msgid "Orientation"
 msgstr "向き"
 
-#: panels/display/cc-display-settings.ui:24
+#: panels/display/cc-display-settings.ui:47
 msgctxt "display setting"
 msgid "Resolution"
 msgstr "解像度"
 
-#: panels/display/cc-display-settings.ui:33
+#: panels/display/cc-display-settings.ui:54
 msgid "Refresh Rate"
 msgstr "リフレッシュレート"
 
-#: panels/display/cc-display-settings.ui:42
+#: panels/display/cc-display-settings.ui:61
 msgid "Adjust for TV"
 msgstr "TV 向けに調整"
 
-#: panels/display/cc-display-settings.ui:59
-#: panels/display/cc-display-settings.ui:76
+#: panels/display/cc-display-settings.ui:75
+#: panels/display/cc-display-settings.ui:90
 msgctxt "display setting"
 msgid "Scale"
 msgstr "サイズ調整"
 
-#: panels/display/cc-night-light-page.c:627
-msgid "More Warm"
-msgstr "濃い暖色"
-
-#: panels/display/cc-night-light-page.c:639
-msgid "Less Warm"
-msgstr "薄い暖色"
+#. Inhibit the redshift functionality until the next day starts
+#: panels/display/cc-night-light-page.ui:21
+msgid "Temporarily Disabled Until Tomorrow"
+msgstr "明日まで一時的に無効にする"
 
 #. This cancels the redshift inhibit.
-#: panels/display/cc-night-light-page.ui:28
+#: panels/display/cc-night-light-page.ui:35
 msgid "Restart Filter"
 msgstr "フィルターを再始動"
 
-#. Inhibit the redshift functionality until the next day starts
-#: panels/display/cc-night-light-page.ui:61
-msgid "Temporarily Disabled Until Tomorrow"
-msgstr "明日まで一時的に無効にする"
-
-#: panels/display/cc-night-light-page.ui:88
+#: panels/display/cc-night-light-page.ui:57
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1806,62 +1688,66 @@ msgstr ""
 "夜間モードは画面の色を少し暖色にします。これは目の疲れを緩和し、不眠を防ぐの"
 "に役立ちます。"
 
-#: panels/display/cc-night-light-page.ui:127
+#: panels/display/cc-night-light-page.ui:91
 msgid "Schedule"
 msgstr "スケジュール"
 
-#: panels/display/cc-night-light-page.ui:136
+#: panels/display/cc-night-light-page.ui:99
 msgid "Sunset to Sunrise"
 msgstr "日没から日の出まで"
 
-#: panels/display/cc-night-light-page.ui:137
+#: panels/display/cc-night-light-page.ui:100
 msgid "Manual Schedule"
 msgstr "手動スケジュール"
 
-#: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-preview.ui:40
+#: panels/display/cc-night-light-page.ui:110
+#: panels/region/cc-format-preview.ui:35
 msgid "Times"
 msgstr "時刻"
 
-#: panels/display/cc-night-light-page.ui:165
+#: panels/display/cc-night-light-page.ui:123
 msgid "From"
 msgstr "開始"
 
-#: panels/display/cc-night-light-page.ui:194
-#: panels/display/cc-night-light-page.ui:297
+#: panels/display/cc-night-light-page.ui:148
+#: panels/display/cc-night-light-page.ui:235
 msgid "Hour"
 msgstr "時"
 
-#: panels/display/cc-night-light-page.ui:203
-#: panels/display/cc-night-light-page.ui:306
+#: panels/display/cc-night-light-page.ui:154
+#: panels/display/cc-night-light-page.ui:241
 msgid ":"
 msgstr ":"
 
-#: panels/display/cc-night-light-page.ui:222
-#: panels/display/cc-night-light-page.ui:325
+#: panels/display/cc-night-light-page.ui:171
+#: panels/display/cc-night-light-page.ui:258
 msgid "Minute"
 msgstr "分"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-page.ui:234
-#: panels/display/cc-night-light-page.ui:337
+#: panels/display/cc-night-light-page.ui:181
+#: panels/display/cc-night-light-page.ui:268
 msgid "AM"
 msgstr "午前"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-page.ui:247
-#: panels/display/cc-night-light-page.ui:350
+#: panels/display/cc-night-light-page.ui:193
+#: panels/display/cc-night-light-page.ui:280
 msgid "PM"
 msgstr "午後"
 
-#: panels/display/cc-night-light-page.ui:267
+#: panels/display/cc-night-light-page.ui:210
 msgid "To"
 msgstr "終了"
 
-#: panels/display/cc-night-light-page.ui:374
+#: panels/display/cc-night-light-page.ui:316
 msgid "Color Temperature"
 msgstr "色温度"
 
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
+msgstr "ディスプレイ"
+
 #: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "接続したモニターやプロジェクターの使用方法を変更します"
@@ -1877,11 +1763,11 @@ msgstr ""
 "モニター;ナイトライト;夜間モード;ブルーライト;色管理;ディスプレイ;ディスプ"
 "レー;Displays;日没;日の出;"
 
-#: panels/info-overview/cc-info-overview-panel.c:413
-#: panels/info-overview/cc-info-overview-panel.c:437
-#: panels/info-overview/cc-info-overview-panel.c:483
-#: panels/info-overview/cc-info-overview-panel.c:513
-#: panels/wwan/cc-wwan-details-dialog.c:101
+#: panels/info-overview/cc-info-overview-panel.c:411
+#: panels/info-overview/cc-info-overview-panel.c:435
+#: panels/info-overview/cc-info-overview-panel.c:481
+#: panels/info-overview/cc-info-overview-panel.c:511
+#: panels/wwan/cc-wwan-details-dialog.c:100
 msgid "Unknown"
 msgstr "不明"
 
@@ -1889,19 +1775,19 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info-overview/cc-info-overview-panel.c:445
+#: panels/info-overview/cc-info-overview-panel.c:443
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s (ビルド ID: %s)"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:458
 #, c-format
 msgid "64-bit"
 msgstr "64 ビット"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info-overview/cc-info-overview-panel.c:463
+#: panels/info-overview/cc-info-overview-panel.c:461
 #, c-format
 msgid "32-bit"
 msgstr "32 ビット"
@@ -1923,64 +1809,65 @@ msgstr "不明"
 msgid "System Logo"
 msgstr "システムロゴ"
 
-#: panels/info-overview/cc-info-overview-panel.ui:52
+#: panels/info-overview/cc-info-overview-panel.ui:32
+#: panels/sharing/cc-sharing-panel.ui:299
 msgid "Device Name"
 msgstr "デバイス名"
 
-#: panels/info-overview/cc-info-overview-panel.ui:74
+#: panels/info-overview/cc-info-overview-panel.ui:50
 msgid "Hardware Model"
 msgstr "ハードウェアモデル"
 
-#: panels/info-overview/cc-info-overview-panel.ui:83
+#: panels/info-overview/cc-info-overview-panel.ui:58
 msgid "Memory"
 msgstr "メモリ"
 
-#: panels/info-overview/cc-info-overview-panel.ui:92
+#: panels/info-overview/cc-info-overview-panel.ui:66
 msgid "Processor"
 msgstr "プロセッサー"
 
-#: panels/info-overview/cc-info-overview-panel.ui:101
+#: panels/info-overview/cc-info-overview-panel.ui:74
 msgid "Graphics"
 msgstr "グラフィック"
 
-#: panels/info-overview/cc-info-overview-panel.ui:110
+#: panels/info-overview/cc-info-overview-panel.ui:82
 msgid "Disk Capacity"
 msgstr "ディスク容量"
 
-#: panels/info-overview/cc-info-overview-panel.ui:111
+#: panels/info-overview/cc-info-overview-panel.ui:83
 msgid "Calculating…"
 msgstr "計算中…"
 
 #. translators: this field contains the distro name and version
-#: panels/info-overview/cc-info-overview-panel.ui:133
+#: panels/info-overview/cc-info-overview-panel.ui:98
 msgid "OS Name"
 msgstr "OS 名"
 
-#: panels/info-overview/cc-info-overview-panel.ui:142
+#: panels/info-overview/cc-info-overview-panel.ui:106
 msgid "OS Type"
 msgstr "OS の種類"
 
-#: panels/info-overview/cc-info-overview-panel.ui:151
+#: panels/info-overview/cc-info-overview-panel.ui:114
 msgid "GNOME Version"
 msgstr "GNOME のバージョン"
 
-#: panels/info-overview/cc-info-overview-panel.ui:161
+#: panels/info-overview/cc-info-overview-panel.ui:123
 msgid "Windowing System"
 msgstr "ウィンドウシステム"
 
-#: panels/info-overview/cc-info-overview-panel.ui:169
+#: panels/info-overview/cc-info-overview-panel.ui:131
 msgid "Virtualization"
 msgstr "仮想化"
 
-#: panels/info-overview/cc-info-overview-panel.ui:178
+#: panels/info-overview/cc-info-overview-panel.ui:139
 msgid "Software Updates"
 msgstr "ソフトウェアのアップデート"
 
-#: panels/info-overview/cc-info-overview-panel.ui:199
+#: panels/info-overview/cc-info-overview-panel.ui:158
 msgid "Rename Device"
 msgstr "デバイス名を変更"
 
-#: panels/info-overview/cc-info-overview-panel.ui:216
+#: panels/info-overview/cc-info-overview-panel.ui:174
 msgid ""
 "The device name is used to identify this device when it is viewed over the "
 "network, or when pairing Bluetooth devices."
@@ -1988,7 +1875,7 @@ msgstr ""
 "デバイス名は、ネットワーク上での表示や Bluetooth デバイスのペアリングにおい"
 "て、このデバイスを識別するのに使用されます。"
 
-#: panels/info-overview/cc-info-overview-panel.ui:234
+#: panels/info-overview/cc-info-overview-panel.ui:190
 msgid "_Rename"
 msgstr "名前を変更(_R)"
 
@@ -2065,7 +1952,7 @@ msgid "Eject"
 msgstr "取り出し"
 
 #: panels/keyboard/01-input-sources.xml.in:4
-#: panels/universal-access/cc-ua-panel.ui:580
+#: panels/universal-access/cc-ua-panel.ui:163
 msgid "Typing"
 msgstr "タイピング"
 
@@ -2106,38 +1993,6 @@ msgctxt "keybinding"
 msgid "Search"
 msgstr "検索"
 
-#: panels/keyboard/01-screenshot.xml.in:2
-msgid "Screenshots"
-msgstr "スクリーンショット"
-
-#: panels/keyboard/01-screenshot.xml.in:6
-msgid "Save a screenshot to $PICTURES"
-msgstr "スクリーンショットを$PICTURESフォルダーに保存する"
-
-#: panels/keyboard/01-screenshot.xml.in:10
-msgid "Save a screenshot of a window to $PICTURES"
-msgstr "ウィンドウのスクリーンショットを$PICTURESフォルダーに保存する"
-
-#: panels/keyboard/01-screenshot.xml.in:14
-msgid "Save a screenshot of an area to $PICTURES"
-msgstr "選択領域のスクリーンショットを$PICTURESフォルダーに保存する"
-
-#: panels/keyboard/01-screenshot.xml.in:17
-msgid "Copy a screenshot to clipboard"
-msgstr "スクリーンショットをクリップボードにコピーする"
-
-#: panels/keyboard/01-screenshot.xml.in:20
-msgid "Copy a screenshot of a window to clipboard"
-msgstr "ウィンドウのスクリーンショットをクリップボードにコピーする"
-
-#: panels/keyboard/01-screenshot.xml.in:23
-msgid "Copy a screenshot of an area to clipboard"
-msgstr "選択領域のスクリーンショットをクリップボードにコピーする"
-
-#: panels/keyboard/01-screenshot.xml.in:26
-msgid "Record a short screencast"
-msgstr "スクリーンキャストを撮る"
-
 #: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "システム"
@@ -2187,11 +2042,11 @@ msgstr "文字サイズを縮小"
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
-#: panels/keyboard/cc-input-chooser.c:193
+#: panels/keyboard/cc-input-chooser.c:186
 msgid "No input sources found"
 msgstr "入力ソースが見つかりませんでした"
 
-#: panels/keyboard/cc-input-chooser.c:964
+#: panels/keyboard/cc-input-chooser.c:931
 msgctxt "Input Source"
 msgid "Other"
 msgstr "その他"
@@ -2200,47 +2055,47 @@ msgstr "その他"
 msgid "Add an Input Source"
 msgstr "入力ソースを追加"
 
-#: panels/keyboard/cc-input-chooser.ui:77
+#: panels/keyboard/cc-input-chooser.ui:81
 msgid "Input methods can’t be used on the login screen"
 msgstr "インプットメソッドはログイン画面では使用できません"
 
-#: panels/keyboard/cc-input-list-box.ui:23
+#: panels/keyboard/cc-input-list-box.ui:24
 msgid "No input source selected"
 msgstr "入力ソースを選択していません"
 
-#: panels/keyboard/cc-input-row.ui:75
-msgid "Move up"
+#: panels/keyboard/cc-input-row.ui:28 panels/search/cc-search-panel-row.ui:49
+msgid "Move Up"
 msgstr "上へ"
 
-#: panels/keyboard/cc-input-row.ui:86
-msgid "Move down"
+#: panels/keyboard/cc-input-row.ui:32 panels/search/cc-search-panel-row.ui:53
+msgid "Move Down"
 msgstr "下へ"
 
-#: panels/keyboard/cc-input-row.ui:103
+#: panels/keyboard/cc-input-row.ui:38
 msgid "Preferences"
 msgstr "設定"
 
-#: panels/keyboard/cc-input-row.ui:120
+#: panels/keyboard/cc-input-row.ui:45
 msgid "View Keyboard Layout"
 msgstr "キーボードレイアウトを表示"
 
-#: panels/keyboard/cc-input-row.ui:137
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:286
+#: panels/keyboard/cc-input-row.ui:51
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:29
 msgid "Remove"
 msgstr "削除"
 
-#: panels/keyboard/cc-keyboard-manager.c:486
-#: panels/keyboard/cc-keyboard-manager.c:494
-#: panels/keyboard/cc-keyboard-manager.c:779
+#: panels/keyboard/cc-keyboard-manager.c:485
+#: panels/keyboard/cc-keyboard-manager.c:493
+#: panels/keyboard/cc-keyboard-manager.c:922
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"
 
-#: panels/keyboard/cc-keyboard-panel.c:68
-#: panels/keyboard/cc-keyboard-panel.ui:213
+#: panels/keyboard/cc-keyboard-panel.c:64
+#: panels/keyboard/cc-keyboard-panel.ui:62
 msgid "Alternate Characters Key"
 msgstr "代替文字キー"
 
-#: panels/keyboard/cc-keyboard-panel.c:69
+#: panels/keyboard/cc-keyboard-panel.c:65
 msgid ""
 "The alternate characters key can be used to enter additional characters. "
 "These are sometimes printed as a third-option on your keyboard."
@@ -2248,48 +2103,48 @@ msgstr ""
 "代替文字キーを使用すると追加の文字を入力できます。追加の文字はキーボード上に "
 "3 番目のオプションとして印刷されている場合があります。"
 
-#: panels/keyboard/cc-keyboard-panel.c:71
-#: panels/keyboard/cc-keyboard-panel.c:89
+#: panels/keyboard/cc-keyboard-panel.c:67
+#: panels/keyboard/cc-keyboard-panel.c:85
 msgctxt "keyboard key"
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: panels/keyboard/cc-keyboard-panel.c:72
-#: panels/keyboard/cc-keyboard-panel.c:90
+#: panels/keyboard/cc-keyboard-panel.c:68
+#: panels/keyboard/cc-keyboard-panel.c:86
 msgctxt "keyboard key"
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: panels/keyboard/cc-keyboard-panel.c:73
-#: panels/keyboard/cc-keyboard-panel.c:91
+#: panels/keyboard/cc-keyboard-panel.c:69
+#: panels/keyboard/cc-keyboard-panel.c:87
 msgctxt "keyboard key"
 msgid "Left Super"
 msgstr "左 Super"
 
-#: panels/keyboard/cc-keyboard-panel.c:74
-#: panels/keyboard/cc-keyboard-panel.c:92
+#: panels/keyboard/cc-keyboard-panel.c:70
+#: panels/keyboard/cc-keyboard-panel.c:88
 msgctxt "keyboard key"
 msgid "Right Super"
 msgstr "右 Super"
 
-#: panels/keyboard/cc-keyboard-panel.c:75
-#: panels/keyboard/cc-keyboard-panel.c:93
+#: panels/keyboard/cc-keyboard-panel.c:71
+#: panels/keyboard/cc-keyboard-panel.c:89
 msgctxt "keyboard key"
 msgid "Menu key"
 msgstr "メニューキー"
 
-#: panels/keyboard/cc-keyboard-panel.c:76
-#: panels/keyboard/cc-keyboard-panel.c:94
+#: panels/keyboard/cc-keyboard-panel.c:72
+#: panels/keyboard/cc-keyboard-panel.c:90
 msgctxt "keyboard key"
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: panels/keyboard/cc-keyboard-panel.c:84
-#: panels/keyboard/cc-keyboard-panel.ui:237
+#: panels/keyboard/cc-keyboard-panel.c:80
+#: panels/keyboard/cc-keyboard-panel.ui:79
 msgid "Compose Key"
 msgstr "Compose キー"
 
-#: panels/keyboard/cc-keyboard-panel.c:85
+#: panels/keyboard/cc-keyboard-panel.c:81
 msgid ""
 "The compose key allows a wide variety of characters to be entered. To use "
 "it, press compose then a sequence of characters.  For example, compose key "
@@ -2297,22 +2152,22 @@ msgid ""
 "<b>'</b> will enter <b>á</b>."
 msgstr ""
 
-#: panels/keyboard/cc-keyboard-panel.c:95
+#: panels/keyboard/cc-keyboard-panel.c:91
 msgctxt "keyboard key"
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: panels/keyboard/cc-keyboard-panel.c:96
+#: panels/keyboard/cc-keyboard-panel.c:92
 msgctxt "keyboard key"
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: panels/keyboard/cc-keyboard-panel.c:97
+#: panels/keyboard/cc-keyboard-panel.c:93
 msgctxt "keyboard key"
 msgid "Print Screen"
 msgstr "Print Screen"
 
-#: panels/keyboard/cc-keyboard-panel.c:233
+#: panels/keyboard/cc-keyboard-panel.c:217
 #, c-format
 msgid ""
 "Input sources can be switched using the %s keyboard shortcut.\n"
@@ -2321,55 +2176,55 @@ msgstr ""
 "入力ソースはキーボードショートカット (%s) で切り替えることができます。\n"
 "キーはキーボードショートカットの設定で変更可能です。"
 
-#: panels/keyboard/cc-keyboard-panel.ui:48
+#: panels/keyboard/cc-keyboard-panel.ui:17
 msgid "Input Sources"
 msgstr "入力ソース"
 
-#: panels/keyboard/cc-keyboard-panel.ui:59
+#: panels/keyboard/cc-keyboard-panel.ui:18
 msgid "Includes keyboard layouts and input methods."
 msgstr "キーボードレイアウトとインプットメソッドを含みます。"
 
-#: panels/keyboard/cc-keyboard-panel.ui:85
+#: panels/keyboard/cc-keyboard-panel.ui:28
 msgid "Input Source Switching"
 msgstr "入力ソースの切り替え"
 
-#: panels/keyboard/cc-keyboard-panel.ui:131
+#: panels/keyboard/cc-keyboard-panel.ui:31
 msgid "Use the _same source for all windows"
 msgstr "すべてのウィンドウで同じソースを使用する(_S)"
 
-#: panels/keyboard/cc-keyboard-panel.ui:158
+#: panels/keyboard/cc-keyboard-panel.ui:43
 msgid "Switch input sources _individually for each window"
 msgstr "ウィンドウごとに個別に入力ソースを切り替える(_I)"
 
-#: panels/keyboard/cc-keyboard-panel.ui:177
+#: panels/keyboard/cc-keyboard-panel.ui:58
 msgid "Special Character Entry"
 msgstr "特殊文字の入力"
 
-#: panels/keyboard/cc-keyboard-panel.ui:188
+#: panels/keyboard/cc-keyboard-panel.ui:59
 msgid "Methods for entering symbols and letter variants using the keyboard."
 msgstr "キーボードで記号や文字の異体字を入力する方法です。"
 
-#: panels/keyboard/cc-keyboard-panel.ui:263
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:306
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:322 shell/cc-window.ui:326
+#: panels/keyboard/cc-keyboard-panel.ui:97
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:319
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:334 shell/cc-window.ui:160
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: panels/keyboard/cc-keyboard-panel.ui:283
+#: panels/keyboard/cc-keyboard-panel.ui:100
 msgid "View and Customize Shortcuts"
 msgstr "ショートカットの表示とカスタマイズ"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:283
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:296
 #, c-format
 msgid "%d modified"
 msgid_plural "%d modified"
 msgstr[0] "%d 個変更"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:428
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:460
 msgid "Reset All Shortcuts?"
 msgstr "すべてのショートカットをリセットしますか?"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:431
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:463
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -2377,100 +2232,108 @@ msgstr ""
 "ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があ"
 "ります。この処理を元に戻すことはできません。"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:435
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:275
-#: panels/printers/authentication-dialog.ui:29
-#: panels/printers/ppd-selection-dialog.ui:27
-#: panels/wwan/cc-wwan-device-page.c:190
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:467
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:23
+#: panels/network/wireless-security/ws-file-chooser-button.c:94
+#: panels/printers/ppd-selection-dialog.ui:83
+#: panels/wwan/cc-wwan-device-page.c:189
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.c:436
+#: panels/keyboard/cc-keyboard-shortcut-dialog.c:468
 msgid "Reset All"
 msgstr "すべてリセット"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:115
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:35
+msgid "Reset All…"
+msgstr "すべてリセット…"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:36
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットします"
+
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:143
 msgid "Add Custom Shortcuts"
 msgstr "独自のショートカットを追加"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:124
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:151
 msgid "Set up custom shortcuts for launching apps, running scripts, and more."
 msgstr ""
-"アプリを起動したりスクリプトを実行したりする独自のショートカットを設定します。"
+"アプリを起動したりスクリプトを実行したりする独自のショートカットを設定しま"
+"す。"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:131
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:157
 msgid "Add Shortcut"
 msgstr "ショートカットを追加"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:166
+#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:189
 msgid "No keyboard shortcut found"
 msgstr "キーボードショートカットがありません"
 
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:211
-#: panels/region/cc-format-chooser.ui:48
-#: panels/user-accounts/cc-fingerprint-dialog.ui:53
-#: panels/wacom/wacom-stylus-page.ui:37 panels/wwan/cc-wwan-apn-dialog.ui:21
-#: shell/cc-window.ui:230
-msgid "Back"
-msgstr "戻る"
-
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:235
-msgid "Reset All…"
-msgstr "すべてリセット…"
-
-#: panels/keyboard/cc-keyboard-shortcut-dialog.ui:236
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットします"
-
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:391
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:392
 #, c-format
 msgid "%s is already being used for %s. If you replace it, %s will be disabled"
 msgstr ""
 "すでに %s は %s のために使用されています。もし入れ替えなければ %s が無効化さ"
 "れます。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:535
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:536
 msgid "Enter the new shortcut"
 msgstr "新しいショートカットキーを入力してください"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:550
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:551
 msgid "Set Custom Shortcut"
 msgstr "独自のショートカットを設定"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:550
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:551
 msgid "Set Shortcut"
 msgstr "ショートカットを設定"
 
 #. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:561
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:562
 #, c-format
 msgid "Enter new shortcut to change %s."
 msgstr "%s の新しいショートカットを入力してください。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:987
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:992
 msgid "Add Custom Shortcut"
 msgstr "独自のショートカットを追加"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:60
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:39
+#: panels/wwan/cc-wwan-apn-dialog.ui:33
+msgid "Add"
+msgstr "追加"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:46
+msgid "Replace"
+msgstr "入れ替え"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:52
+msgid "Set"
+msgstr "設定"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:98
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 msgstr ""
 "Esc でキャンセル、Backspace でキーボードショートカットを無効にできます。"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:135
-#: panels/printers/pp-details-dialog.ui:40
-#: panels/wwan/cc-wwan-apn-dialog.ui:132
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:153
+#: panels/printers/pp-details-dialog.ui:39
+#: panels/user-accounts/cc-add-user-dialog.ui:68
+#: panels/user-accounts/cc-user-panel.ui:132
+#: panels/wwan/cc-wwan-apn-dialog.ui:96
 msgid "Name"
 msgstr "名前"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:147
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:163
 msgid "Command"
 msgstr "コマンド"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:159
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:173
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:238
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:240
 msgid "Set Shortcut…"
 msgstr "ショートカットを設定…"
 
@@ -2478,20 +2341,7 @@ msgstr "ショートカットを設定…"
 msgid "None"
 msgstr "何もしない"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:296
-#: panels/wwan/cc-wwan-apn-dialog.ui:44
-msgid "Add"
-msgstr "追加"
-
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:311
-msgid "Replace"
-msgstr "入れ替え"
-
-#: panels/keyboard/cc-keyboard-shortcut-editor.ui:325
-msgid "Set"
-msgstr "設定"
-
-#: panels/keyboard/cc-keyboard-shortcut-row.ui:27
+#: panels/keyboard/cc-keyboard-shortcut-row.ui:23
 msgid "Reset the shortcut to its default value"
 msgstr "ショートカットをデフォルトの値にリセットします"
 
@@ -2504,7 +2354,8 @@ msgid ""
 "Change keyboard shortcuts and set your typing preferences, keyboard layouts "
 "and input sources"
 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
@@ -2515,11 +2366,11 @@ msgstr ""
 "ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラ"
 "スト;入力;インプット;ソース;ロック;ボリューム;音量;"
 
-#: panels/location/cc-location-panel.ui:31
+#: panels/location/cc-location-panel.ui:20
 msgid "Location Services Turned Off"
 msgstr "位置情報サービスがオフになっています"
 
-#: panels/location/cc-location-panel.ui:40
+#: panels/location/cc-location-panel.ui:21
 msgid "No applications can obtain location information."
 msgstr "アプリケーションが位置情報を取得できません。"
 
@@ -2541,7 +2392,7 @@ msgstr ""
 "\n"
 "以下のアプリケーションが現在地を特定することを許可します。"
 
-#: panels/location/cc-location-panel.ui:114
+#: panels/location/cc-location-panel.ui:53
 msgid "No Applications Have Asked for Location Access"
 msgstr "位置情報へのアクセスを要求しているアプリケーションはありません"
 
@@ -2550,156 +2401,150 @@ msgid "Protect your location information"
 msgstr "位置情報を保護します"
 
 #. FIXME
-#: panels/lock/cc-lock-panel.ui:27
-msgid ""
-"Automatically locking the screen prevents others from accessing the computer "
-"while you're away."
-msgstr ""
-"画面の自動ロックは、離席中に他の誰かがコンピューターにアクセスするのを防ぎま"
-"す。"
-
-#: panels/lock/cc-lock-panel.ui:44
-msgid "Blank Screen Delay"
-msgstr "ブランクスクリーンの遅延"
-
-#: panels/lock/cc-lock-panel.ui:45
-msgid "Period of inactivity after which the screen will go blank."
-msgstr "指定した時間、何もしないと画面がブランクになります。"
-
-#: panels/lock/cc-lock-panel.ui:65
-msgid "Automatic Screen _Lock"
-msgstr "自動画面ロック(_L)"
-
-#: panels/lock/cc-lock-panel.ui:82
-msgid "Automatic _Screen Lock Delay"
-msgstr "自動画面ロックの遅延(_S)"
-
-#: panels/lock/cc-lock-panel.ui:83
-msgid "Period after the screen blanks when the screen is automatically locked."
-msgstr "画面がブランクになったあと、指定した条件で自動的に画面をロックします。"
-
-#: panels/lock/cc-lock-panel.ui:103
-msgid "Show _Notifications on Lock Screen"
-msgstr "ロック画面に通知を表示する(_N)"
-
-#: panels/lock/cc-lock-panel.ui:120
-msgid "Forbid new _USB devices"
-msgstr "新しい USB デバイスを認識しない(_U)"
-
-#: panels/lock/cc-lock-panel.ui:121
-msgid ""
-"Prevent new USB devices from interacting with the system when the screen is "
-"locked."
-msgstr "画面をロックしているときは、新しい USB デバイスとの通信を行いません。"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/lock/cc-lock-panel.ui:166
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:62
 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:170
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:65
 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:174
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:68
 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:178
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:71
 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:182
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:74 panels/lock/cc-lock-panel.c:77
 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:186
-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:190
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:80
 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:194
+#. Translators: Option for "Lock screen after blank" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:83
 msgctxt "lock_screen"
 msgid "1 hour"
 msgstr "1 時間"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:209
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:126
 msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:213
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:129
 msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:217
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:132
 msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:221
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:135
 msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:225
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:138
 msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:229
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:141
 msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:233
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:144
 msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:237
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:147
 msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:241
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:150
 msgctxt "blank_screen"
 msgid "15 minutes"
 msgstr "15 分"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/lock/cc-lock-panel.ui:245
+#. Translators: Option for "Blank screen" in "Screen Lock" panel
+#: panels/lock/cc-lock-panel.c:153
 msgctxt "blank_screen"
 msgid "Never"
 msgstr "しない"
 
+#: panels/lock/cc-lock-panel.ui:8
+msgid ""
+"Automatically locking the screen prevents others from accessing the computer "
+"while you're away."
+msgstr ""
+"画面の自動ロックは、離席中に他の誰かがコンピューターにアクセスするのを防ぎま"
+"す。"
+
+#: panels/lock/cc-lock-panel.ui:13
+msgid "Blank Screen Delay"
+msgstr "ブランクスクリーンの遅延"
+
+#: panels/lock/cc-lock-panel.ui:14
+msgid "Period of inactivity after which the screen will go blank."
+msgstr "指定した時間、何もしないと画面がブランクになります。"
+
+#: panels/lock/cc-lock-panel.ui:32
+msgid "Automatic Screen _Lock"
+msgstr "自動画面ロック(_L)"
+
+#: panels/lock/cc-lock-panel.ui:46
+msgid "Automatic _Screen Lock Delay"
+msgstr "自動画面ロックの遅延(_S)"
+
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr "画面がブランクになったあと、指定した条件で自動的に画面をロックします。"
+
+#: panels/lock/cc-lock-panel.ui:65
+msgid "Show _Notifications on Lock Screen"
+msgstr "ロック画面に通知を表示する(_N)"
+
+#: panels/lock/cc-lock-panel.ui:80
+msgid "Forbid new _USB devices"
+msgstr "新しい USB デバイスを認識しない(_U)"
+
+#: panels/lock/cc-lock-panel.ui:81
+msgid ""
+"Prevent new USB devices from interacting with the system when the screen is "
+"locked."
+msgstr "画面をロックしているときは、新しい USB デバイスとの通信を行いません。"
+
 #: panels/lock/gnome-lock-panel.desktop.in.in:3
 msgid "Screen Lock"
 msgstr "画面ロック"
@@ -2709,11 +2554,11 @@ msgid "Lock your screen"
 msgstr "画面をロックします"
 
 #. FIXME
-#: panels/microphone/cc-microphone-panel.ui:34
+#: panels/microphone/cc-microphone-panel.ui:20
 msgid "Microphone Turned Off"
 msgstr "マイクがオフになっています"
 
-#: panels/microphone/cc-microphone-panel.ui:43
+#: panels/microphone/cc-microphone-panel.ui:21
 msgid "No applications can record sound."
 msgstr "アプリケーションが録音できません。"
 
@@ -2730,7 +2575,7 @@ msgstr ""
 "\n"
 "以下のアプリケーションがマイクを使用することを許可します。"
 
-#: panels/microphone/cc-microphone-panel.ui:105
+#: panels/microphone/cc-microphone-panel.ui:51
 msgid "No Applications Have Asked for Microphone Access"
 msgstr "マイクへのアクセスを要求しているアプリケーションはありません"
 
@@ -2738,76 +2583,72 @@ msgstr "マイクへのアクセスを要求しているアプリケーション
 msgid "Protect your conversations"
 msgstr "会話を保護します"
 
+# Button Label
 #. FIXME
-#: panels/mouse/cc-mouse-panel.ui:37
-#: panels/multitasking/cc-multitasking-panel.ui:31
+#: panels/mouse/cc-mouse-panel.ui:9 panels/wacom/cc-wacom-panel.ui:9
+msgid "Test Your _Settings"
+msgstr "設定を確認(_S)"
+
+#: panels/mouse/cc-mouse-panel.ui:23
+#: panels/multitasking/cc-multitasking-panel.ui:9
 msgid "General"
 msgstr "全般"
 
-#: panels/mouse/cc-mouse-panel.ui:57
+#: panels/mouse/cc-mouse-panel.ui:26
 msgid "Primary Button"
 msgstr "主ボタン"
 
-#: panels/mouse/cc-mouse-panel.ui:58
+#: panels/mouse/cc-mouse-panel.ui:27
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "マウス、タッチパッドのボタンの順位を設定します。"
 
-#: panels/mouse/cc-mouse-panel.ui:84 panels/sound/cc-balance-slider.ui:13
+#: panels/mouse/cc-mouse-panel.ui:41 panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "左"
 
-#: panels/mouse/cc-mouse-panel.ui:94 panels/sound/cc-balance-slider.ui:15
+#: panels/mouse/cc-mouse-panel.ui:48 panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "右"
 
-#: panels/mouse/cc-mouse-panel.ui:122
+#: panels/mouse/cc-mouse-panel.ui:62
 msgid "Mouse"
 msgstr "マウス"
 
-#: panels/mouse/cc-mouse-panel.ui:142
+#: panels/mouse/cc-mouse-panel.ui:65
 msgid "Mouse Speed"
 msgstr "マウスの速度"
 
-#: panels/mouse/cc-mouse-panel.ui:154 panels/mouse/cc-mouse-panel.ui:258
-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/cc-mouse-panel.ui:166 panels/mouse/cc-mouse-panel.ui:230
+#: panels/mouse/cc-mouse-panel.ui:81 panels/mouse/cc-mouse-panel.ui:108
 msgid "Natural Scrolling"
 msgstr "ナチュラルスクロール"
 
-#: panels/mouse/cc-mouse-panel.ui:167 panels/mouse/cc-mouse-panel.ui:231
+#: panels/mouse/cc-mouse-panel.ui:82 panels/mouse/cc-mouse-panel.ui:109
 msgid "Scrolling moves the content, not the view."
 msgstr "スクロールする方向にコンテンツが移動します。"
 
-#: panels/mouse/cc-mouse-panel.ui:193 panels/mouse/cc-mouse-panel.ui:213
+#: panels/mouse/cc-mouse-panel.ui:95 panels/mouse/cc-mouse-panel.ui:98
 msgid "Touchpad"
 msgstr "タッチパッド"
 
-#: panels/mouse/cc-mouse-panel.ui:247
+#: panels/mouse/cc-mouse-panel.ui:119
 msgid "Touchpad Speed"
 msgstr "タッチパッドの速度"
 
-#: panels/mouse/cc-mouse-panel.ui:270
+#: panels/mouse/cc-mouse-panel.ui:136
 msgid "Tap to Click"
 msgstr "タップでクリックする"
 
-#: panels/mouse/cc-mouse-panel.ui:286
+#: panels/mouse/cc-mouse-panel.ui:147
 msgid "Two-finger Scrolling"
 msgstr "2 本指でのスクロール"
 
-#: panels/mouse/cc-mouse-panel.ui:303
+#: panels/mouse/cc-mouse-panel.ui:159
 msgid "Edge Scrolling"
 msgstr "エッジスクロール"
 
-# Button Label
-#: panels/mouse/cc-mouse-panel.ui:335 panels/wacom/cc-wacom-panel.c:441
-msgid "Test Your _Settings"
-msgstr "設定を確認(_S)"
-
-#: panels/mouse/cc-mouse-test.c:131 panels/mouse/cc-mouse-test.ui:25
+#: panels/mouse/cc-mouse-test.c:131 panels/mouse/cc-mouse-test.ui:62
 msgid "Try clicking, double clicking, scrolling"
 msgstr "クリック、ダブルクリック、スクロールを試してください"
 
@@ -2856,71 +2697,71 @@ msgstr ""
 "ンター;クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;"
 "Touchpad;マウス;タッチパッド;"
 
-#: panels/multitasking/cc-multitasking-panel.ui:56
+#: panels/multitasking/cc-multitasking-panel.ui:15
 msgid "_Hot Corner"
 msgstr "ホットコーナー(_H)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:57
+#: panels/multitasking/cc-multitasking-panel.ui:16
 msgid "Touch the top-left corner to open the Activities Overview."
 msgstr "画面左上隅にタッチするとアクティビティ画面を開きます。"
 
-#: panels/multitasking/cc-multitasking-panel.ui:84
+#: panels/multitasking/cc-multitasking-panel.ui:42
 msgid "_Active Screen Edges"
 msgstr "スクリーンエッジを有効にする(_A)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:85
+#: panels/multitasking/cc-multitasking-panel.ui:43
 msgid ""
 "Drag windows against the top, left, and right screen edges to resize them."
 msgstr ""
-"ウィンドウを画面上部、画面左端、画面右端にドラッグすることでウィンドウサイズを変更できるよ"
-"うにします。"
+"ウィンドウを画面上部、画面左端、画面右端にドラッグすることでウィンドウサイズ"
+"を変更できるようにします。"
 
 # ref. gnome-color-manager
-#: panels/multitasking/cc-multitasking-panel.ui:114
+#: panels/multitasking/cc-multitasking-panel.ui:70
 msgid "Workspaces"
 msgstr "ワークスペース"
 
-#: panels/multitasking/cc-multitasking-panel.ui:139
+#: panels/multitasking/cc-multitasking-panel.ui:76
 msgid "_Dynamic workspaces"
 msgstr "動的ワークスペース(_D)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:140
+#: panels/multitasking/cc-multitasking-panel.ui:77
 msgid "Automatically removes empty workspaces."
 msgstr "空のワークスペースを自動的に削除します。"
 
-#: panels/multitasking/cc-multitasking-panel.ui:158
+#: panels/multitasking/cc-multitasking-panel.ui:91
 msgid "_Fixed number of workspaces"
 msgstr "ワークスペースの数を指定する(_F)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:159
+#: panels/multitasking/cc-multitasking-panel.ui:92
 msgid "Specify a number of permanent workspaces."
 msgstr "常に指定した数のワークスペースが用意されます。"
 
-#: panels/multitasking/cc-multitasking-panel.ui:179
+#: panels/multitasking/cc-multitasking-panel.ui:108
 msgid "_Number of Workspaces"
 msgstr "ワークスペースの数(_N)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:200
+#: panels/multitasking/cc-multitasking-panel.ui:124
 msgid "Multi-Monitor"
 msgstr "マルチモニター"
 
-#: panels/multitasking/cc-multitasking-panel.ui:225
+#: panels/multitasking/cc-multitasking-panel.ui:130
 msgid "Workspaces on _primary display only"
 msgstr "プライマリーディスプレイにのみワークスペースを表示する(_P)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:252
+#: panels/multitasking/cc-multitasking-panel.ui:156
 msgid "Workspaces on all d_isplays"
 msgstr "すべてのディスプレイにワークスペースを表示する(_I)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:282
+#: panels/multitasking/cc-multitasking-panel.ui:184
 msgid "Application Switching"
 msgstr "アプリケーションの切り替え"
 
-#: panels/multitasking/cc-multitasking-panel.ui:307
+#: panels/multitasking/cc-multitasking-panel.ui:190
 msgid "Include applications from all _workspaces"
 msgstr "すべてのワークスペースのアプリケーションを含める(_W)"
 
-#: panels/multitasking/cc-multitasking-panel.ui:325
+#: panels/multitasking/cc-multitasking-panel.ui:204
 msgid "Include applications from the _current workspace only"
 msgstr "現在のワークスペースのアプリケーションのみを含める(_C)"
 
@@ -2935,27 +2776,28 @@ msgstr "プロダクティビティとマルチタスクに関する設定を管
 #. Translators: Search terms to find the Search panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: panels/multitasking/gnome-multitasking-panel.desktop.in.in:15
 msgid "Multitasking;Multitask;Productivity;Customize;Desktop;"
-msgstr "Multitasking;Multitask;Productivity;Customize;Desktop;"
-"マルチタスク;プロダクティビティ;カスタマイズ;デスクトップ;"
+msgstr ""
+"Multitasking;Multitask;Productivity;Customize;Desktop;マルチタスク;プロダク"
+"ティビティ;カスタマイズ;デスクトップ;"
 
-#: panels/network/cc-network-panel.c:686 panels/network/cc-wifi-panel.ui:307
+#: panels/network/cc-network-panel.c:662 panels/network/cc-wifi-panel.ui:300
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
 
-#: panels/network/cc-network-panel.c:692
+#: panels/network/cc-network-panel.c:669
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager が動作している必要があります。"
 
-#: panels/network/cc-network-panel.ui:66
+#: panels/network/cc-network-panel.ui:21 panels/network/cc-network-panel.ui:26
 msgid "Other Devices"
 msgstr "その他のデバイス"
 
-#: panels/network/cc-network-panel.ui:107
-#: panels/network/connection-editor/net-connection-editor.c:587
+#: panels/network/cc-network-panel.ui:37 panels/network/cc-network-panel.ui:53
+#: panels/network/connection-editor/net-connection-editor.c:580
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:151
+#: panels/network/cc-network-panel.ui:70
 msgid "Not set up"
 msgstr "未設定"
 
@@ -2966,7 +2808,7 @@ msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
-#: panels/network/cc-wifi-connection-row.c:262
+#: panels/network/cc-wifi-connection-row.c:263
 msgid "Insecure network (WEP)"
 msgstr "安全ではないネットワーク (WEP)"
 
@@ -2974,33 +2816,32 @@ msgstr "安全ではないネットワーク (WEP)"
 msgid "Secure network (WPA)"
 msgstr "安全なネットワーク (WPA)"
 
-#: panels/network/cc-wifi-connection-row.c:272
+#: panels/network/cc-wifi-connection-row.c:271
 msgid "Secure network (WPA2)"
 msgstr "安全なネットワーク (WPA2)"
 
-#: panels/network/cc-wifi-connection-row.c:277
+#: panels/network/cc-wifi-connection-row.c:275
 msgid "Secure network (WPA3)"
 msgstr "安全なネットワーク (WPA3)"
 
-#: panels/network/cc-wifi-connection-row.c:282
+#: panels/network/cc-wifi-connection-row.c:279
 msgid "Secure network"
 msgstr "安全なネットワーク"
 
 #. TRANSLATORS: device status
-#: panels/network/cc-wifi-connection-row.ui:68 panels/network/panel-common.c:63
+#: panels/network/cc-wifi-connection-row.ui:41 panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "接続"
 
-#: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:333
-#: panels/network/network-bluetooth.ui:76
-#: panels/network/network-ethernet.ui:111 panels/network/network-mobile.ui:450
-#: panels/network/network-vpn.ui:77
+#: panels/network/cc-wifi-connection-row.ui:62
+#: panels/network/net-device-ethernet.c:325
+#: panels/network/network-bluetooth.ui:22 panels/network/network-ethernet.ui:50
+#: panels/network/network-mobile.ui:321 panels/network/network-vpn.ui:21
 msgid "Options…"
 msgstr "オプション…"
 
 #. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
-#: panels/network/cc-wifi-hotspot-dialog.c:134
+#: panels/network/cc-wifi-hotspot-dialog.c:133
 #, c-format
 msgid ""
 "Turning on the hotspot will disconnect from %s, and it will not be possible "
@@ -3009,7 +2850,7 @@ msgstr ""
 "アクセスポイントをオンにすると %s から切断され、Wi-Fi でのインターネットアク"
 "セスができなくなります。"
 
-#: panels/network/cc-wifi-hotspot-dialog.c:267
+#: panels/network/cc-wifi-hotspot-dialog.c:266
 msgid "Must have a minimum of 8 characters"
 msgstr "8 文字以上にしてください"
 
@@ -3019,11 +2860,11 @@ msgid "Must have a maximum of %d character"
 msgid_plural "Must have a maximum of %d characters"
 msgstr[0] "%d 文字以下にしてください"
 
-#: panels/network/cc-wifi-hotspot-dialog.c:488
+#: panels/network/cc-wifi-hotspot-dialog.ui:4
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Wi-Fi アクセスポイントをオンにしますか?"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:19
+#: panels/network/cc-wifi-hotspot-dialog.ui:28
 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 "
@@ -3033,97 +2874,98 @@ msgstr ""
 "たのインターネット接続を全員で共有できるようにします。これには、Wi-Fi 以外の"
 "方法でのインターネット接続が必要です。"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/cc-wifi-hotspot-dialog.ui:51
 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:389
-#: panels/printers/pp-jobs-dialog.ui:70
-#: panels/user-accounts/cc-add-user-dialog.ui:249
-#: panels/wwan/cc-wwan-apn-dialog.ui:214
+#: panels/network/cc-wifi-hotspot-dialog.ui:74
+#: panels/printers/new-printer-dialog.ui:331
+#: panels/printers/pp-jobs-dialog.ui:52 panels/sharing/cc-sharing-panel.ui:376
+#: panels/user-accounts/cc-add-user-dialog.ui:145
+#: panels/user-accounts/cc-add-user-dialog.ui:181
+#: panels/user-accounts/cc-add-user-dialog.ui:362
+#: panels/wwan/cc-wwan-apn-dialog.ui:172
 msgid "Password"
 msgstr "パスワード"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:83
+#: panels/network/cc-wifi-hotspot-dialog.ui:86
 msgid "Generate Random Password"
 msgstr "ランダムパスワードを生成します"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:84
+#: panels/network/cc-wifi-hotspot-dialog.ui:87
 msgid "Autogenerate Password"
 msgstr "パスワードを自動生成できます"
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:130
+#: panels/network/cc-wifi-hotspot-dialog.ui:129
 msgid "_Turn On"
 msgstr "オン(_T)"
 
 #: panels/network/cc-wifi-panel.c:544
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:53
+#: panels/network/network-wifi.ui:66
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: panels/network/cc-wifi-panel.c:864
+#: panels/network/cc-wifi-panel.c:879
 msgid "Stop hotspot and disconnect any users?"
 msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
 
-#: panels/network/cc-wifi-panel.c:867
+#: panels/network/cc-wifi-panel.c:882
 msgid "_Stop Hotspot"
 msgstr "停止(_S)"
 
-#: panels/network/cc-wifi-panel.ui:46
+#: panels/network/cc-wifi-panel.ui:72
 msgid "Airplane Mode"
 msgstr "機内モード"
 
-#: panels/network/cc-wifi-panel.ui:47
+#: panels/network/cc-wifi-panel.ui:73
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Wi-Fi、Bluetooth、モバイルブロードバンドを無効にします"
 
-#: panels/network/cc-wifi-panel.ui:87
+#: panels/network/cc-wifi-panel.ui:110
 msgid "No Wi-Fi Adapter Found"
 msgstr "Wi-Fi アダプターが見つかりませんでした"
 
-#: panels/network/cc-wifi-panel.ui:99
+#: panels/network/cc-wifi-panel.ui:120
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "Wi-Fi アダプターが接続されオンになっているか確認してください"
 
-#: panels/network/cc-wifi-panel.ui:134 panels/wwan/cc-wwan-panel.ui:143
+#: panels/network/cc-wifi-panel.ui:152 panels/wwan/cc-wwan-panel.ui:135
 msgid "Airplane Mode On"
 msgstr "機内モードオン"
 
-#: panels/network/cc-wifi-panel.ui:146
+#: panels/network/cc-wifi-panel.ui:162
 msgid "Turn off to use Wi-Fi"
 msgstr "Wi-Fi を使用する場合はオフにしてください"
 
-#: panels/network/cc-wifi-panel.ui:184
+#: panels/network/cc-wifi-panel.ui:199
 msgid "Wi-Fi Hotspot Active"
 msgstr "Wi-Fi アクセスポイント有効"
 
-#: panels/network/cc-wifi-panel.ui:195
+#: panels/network/cc-wifi-panel.ui:209
 msgid "Mobile devices can scan the QR code to connect."
 msgstr "モバイルデバイスで QR コードをスキャンすると接続できます。"
 
-#: panels/network/cc-wifi-panel.ui:205
+#: panels/network/cc-wifi-panel.ui:217
 msgid "Turn Off Hotspot…"
 msgstr "アクセスポイントをオフにする…"
 
-#: panels/network/cc-wifi-panel.ui:227
+#: panels/network/cc-wifi-panel.ui:237
 msgid "Visible Networks"
 msgstr "ネットワーク一覧"
 
-#: panels/network/cc-wifi-panel.ui:296
+#: panels/network/cc-wifi-panel.ui:294
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManager が動作している必要があります"
 
-#: panels/network/connection-editor/8021x-security-page.ui:20
+#: panels/network/connection-editor/8021x-security-page.ui:16
 msgid "802.1x _Security"
 msgstr "802.1x セキュリティ(_S)"
 
-#: panels/network/connection-editor/ce-page-8021x-security.c:112
-#: panels/network/connection-editor/ce-page-security.c:424
-#: panels/network/connection-editor/details-page.ui:90
+#: panels/network/connection-editor/ce-page-8021x-security.c:109
+#: panels/network/connection-editor/ce-page-security.c:419
+#: panels/network/connection-editor/details-page.ui:78
 msgid "Security"
 msgstr "セキュリティ"
 
@@ -3160,13 +3002,13 @@ msgstr "プロファイル %d"
 
 #. TRANSLATORS: this WEP WiFi security
 #: panels/network/connection-editor/ce-page-details.c:97
-#: panels/network/net-device-wifi.c:228
+#: panels/network/net-device-wifi.c:229
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:101
-#: panels/network/net-device-wifi.c:233
+#: panels/network/net-device-wifi.c:234
 msgid "WPA"
 msgstr "WPA"
 
@@ -3177,7 +3019,7 @@ msgstr "WPA3"
 
 #. TRANSLATORS: this Enhanced Open WiFi security
 #: panels/network/connection-editor/ce-page-details.c:112
-#: panels/network/connection-editor/ce-page-security.c:279
+#: panels/network/connection-editor/ce-page-security.c:274
 msgid "Enhanced Open"
 msgstr "Enhanced Open"
 
@@ -3192,7 +3034,7 @@ msgid "Enterprise"
 msgstr "Enterprise"
 
 #: panels/network/connection-editor/ce-page-details.c:130
-#: panels/network/net-device-wifi.c:218
+#: panels/network/net-device-wifi.c:219
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
@@ -3202,7 +3044,7 @@ msgid "Never"
 msgstr "しない"
 
 #: panels/network/connection-editor/ce-page-details.c:166
-#: panels/network/net-device-ethernet.c:108
+#: panels/network/net-device-ethernet.c:105
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -3215,110 +3057,110 @@ msgstr "%d Mb/s (%1.1f GHz)"
 
 #. Translators: network device speed
 #: panels/network/connection-editor/ce-page-details.c:295
-#: panels/network/net-device-ethernet.c:220
+#: panels/network/net-device-ethernet.c:217
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:308
+#: panels/network/connection-editor/ce-page-details.c:310
 msgid "2.4 GHz / 5 GHz"
 msgstr "2.4 GHz / 5 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:310
+#: panels/network/connection-editor/ce-page-details.c:312
 msgid "2.4 GHz"
 msgstr "2.4 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:312
+#: panels/network/connection-editor/ce-page-details.c:314
 msgid "5 GHz"
 msgstr "5 GHz"
 
-#: panels/network/connection-editor/ce-page-details.c:332
+#: panels/network/connection-editor/ce-page-details.c:334
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: panels/network/connection-editor/ce-page-details.c:334
+#: panels/network/connection-editor/ce-page-details.c:336
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: panels/network/connection-editor/ce-page-details.c:336
+#: panels/network/connection-editor/ce-page-details.c:338
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: panels/network/connection-editor/ce-page-details.c:338
+#: panels/network/connection-editor/ce-page-details.c:340
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: panels/network/connection-editor/ce-page-details.c:340
+#: panels/network/connection-editor/ce-page-details.c:342
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: panels/network/connection-editor/ce-page-details.c:407
-#: panels/network/connection-editor/details-page.ui:108
-#: panels/network/net-device-ethernet.c:147
-#: panels/network/net-device-mobile.c:442
+#: panels/network/connection-editor/ce-page-details.c:409
+#: panels/network/connection-editor/details-page.ui:94
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-mobile.c:441
 msgid "IPv4 Address"
 msgstr "IPv4 アドレス"
 
-#: panels/network/connection-editor/ce-page-details.c:408
-#: panels/network/connection-editor/details-page.ui:126
-#: panels/network/net-device-ethernet.c:149
-#: panels/network/net-device-mobile.c:443 panels/network/network-mobile.ui:218
+#: panels/network/connection-editor/ce-page-details.c:410
+#: panels/network/connection-editor/details-page.ui:110
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:442 panels/network/network-mobile.ui:176
 msgid "IPv6 Address"
 msgstr "IPv6 アドレス"
 
-#: panels/network/connection-editor/ce-page-details.c:410
-#: panels/network/connection-editor/ce-page-details.c:411
-#: panels/network/net-device-ethernet.c:152
-#: panels/network/net-device-ethernet.c:154
-#: panels/network/net-device-mobile.c:446
-#: panels/network/net-device-mobile.c:447 panels/network/network-mobile.ui:201
+#: panels/network/connection-editor/ce-page-details.c:412
+#: panels/network/connection-editor/ce-page-details.c:413
+#: panels/network/net-device-ethernet.c:149
+#: panels/network/net-device-ethernet.c:151
+#: panels/network/net-device-mobile.c:445
+#: panels/network/net-device-mobile.c:446 panels/network/network-mobile.ui:163
 msgid "IP Address"
 msgstr "IP アドレス"
 
-#: panels/network/connection-editor/ce-page-details.c:415
-#: panels/network/net-device-ethernet.c:169
-#: panels/network/net-device-mobile.c:451
+#: panels/network/connection-editor/ce-page-details.c:417
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-mobile.c:450
 msgid "DNS4"
 msgstr "DNS4"
 
-#: panels/network/connection-editor/ce-page-details.c:416
-#: panels/network/net-device-ethernet.c:170
-#: panels/network/net-device-mobile.c:452
+#: panels/network/connection-editor/ce-page-details.c:418
+#: panels/network/net-device-ethernet.c:167
+#: panels/network/net-device-mobile.c:451
 msgid "DNS6"
 msgstr "DNS6"
 
-#: panels/network/connection-editor/ce-page-details.c:418
-#: panels/network/connection-editor/ce-page-details.c:419
-#: panels/network/connection-editor/details-page.ui:199
-#: panels/network/connection-editor/details-page.ui:218
-#: panels/network/connection-editor/ip4-page.ui:211
-#: panels/network/connection-editor/ip6-page.ui:225
-#: panels/network/net-device-ethernet.c:172
-#: panels/network/net-device-ethernet.c:174
-#: panels/network/net-device-mobile.c:454
-#: panels/network/net-device-mobile.c:455 panels/network/network-mobile.ui:253
-#: panels/network/network-mobile.ui:271
+#: panels/network/connection-editor/ce-page-details.c:420
+#: panels/network/connection-editor/ce-page-details.c:421
+#: panels/network/connection-editor/details-page.ui:175
+#: panels/network/connection-editor/details-page.ui:192
+#: panels/network/connection-editor/ip4-page.ui:165
+#: panels/network/connection-editor/ip6-page.ui:175
+#: panels/network/net-device-ethernet.c:169
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-mobile.c:453
+#: panels/network/net-device-mobile.c:454 panels/network/network-mobile.ui:203
+#: panels/network/network-mobile.ui:217
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/ce-page-details.c:471
+#: panels/network/connection-editor/ce-page-details.c:473
 msgid "Forget Connection"
 msgstr "接続情報を破棄"
 
-#: panels/network/connection-editor/ce-page-details.c:473
+#: panels/network/connection-editor/ce-page-details.c:475
 msgid "Remove Connection Profile"
 msgstr "接続プロファイルを削除"
 
-#: panels/network/connection-editor/ce-page-details.c:475
+#: panels/network/connection-editor/ce-page-details.c:477
 msgid "Remove VPN"
 msgstr "VPN を削除"
 
-#: panels/network/connection-editor/ce-page-details.c:493
+#: panels/network/connection-editor/ce-page-details.c:495
 msgid "Details"
 msgstr "詳細"
 
@@ -3327,7 +3169,7 @@ 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-vpn.c:148
 #: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "Identity"
@@ -3337,259 +3179,260 @@ msgstr "Identity"
 msgid "Delete Address"
 msgstr "アドレスを削除"
 
-#: panels/network/connection-editor/ce-page-ip4.c:400
-#: panels/network/connection-editor/ce-page-ip6.c:370
+#: panels/network/connection-editor/ce-page-ip4.c:392
+#: panels/network/connection-editor/ce-page-ip6.c:361
 msgid "Delete Route"
 msgstr "ルートを削除"
 
-#: panels/network/connection-editor/ce-page-ip4.c:754
+#: panels/network/connection-editor/ce-page-ip4.c:742
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:726
+#: panels/network/connection-editor/ce-page-ip6.c:712
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:263
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: panels/network/connection-editor/ce-page-security.c:303
+#: panels/network/connection-editor/ce-page-security.c:298
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:313
+#: panels/network/connection-editor/ce-page-security.c:308
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: panels/network/connection-editor/ce-page-security.c:326
+#: panels/network/connection-editor/ce-page-security.c:321
 #: 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:339
+#: panels/network/connection-editor/ce-page-security.c:334
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:353
+#: panels/network/connection-editor/ce-page-security.c:348
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: panels/network/connection-editor/ce-page-security.c:367
+#: panels/network/connection-editor/ce-page-security.c:362
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: panels/network/connection-editor/ce-page-security.c:381
+#: panels/network/connection-editor/ce-page-security.c:376
 msgid "WPA3 Personal"
 msgstr "WPA3 パーソナル"
 
-#: panels/network/connection-editor/details-page.ui:18
-#: panels/wwan/cc-wwan-details-dialog.ui:105
+#: panels/network/connection-editor/details-page.ui:14
+#: panels/wwan/cc-wwan-details-dialog.ui:73
 msgid "Signal Strength"
 msgstr "信号強度"
 
-#: panels/network/connection-editor/details-page.ui:54
+#: panels/network/connection-editor/details-page.ui:46
 msgid "Link speed"
 msgstr "リンクの速度"
 
-#: panels/network/connection-editor/details-page.ui:144
-#: panels/network/net-device-ethernet.c:157
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:154
 msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
-#: panels/network/connection-editor/details-page.ui:162
+#: panels/network/connection-editor/details-page.ui:142
 msgid "Supported Frequencies"
 msgstr "サポートする周波数帯"
 
-#: panels/network/connection-editor/details-page.ui:180
-#: panels/network/net-device-ethernet.c:161
-#: panels/network/net-device-ethernet.c:163
-#: panels/network/net-device-ethernet.c:165
-#: panels/network/network-mobile.ui:235
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:158
+#: panels/network/net-device-ethernet.c:160
+#: panels/network/net-device-ethernet.c:162
+#: panels/network/network-mobile.ui:189
 msgid "Default Route"
 msgstr "デフォルトルート"
 
-#: panels/network/connection-editor/details-page.ui:236
+#: panels/network/connection-editor/details-page.ui:208
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: panels/network/connection-editor/details-page.ui:415
+#: panels/network/connection-editor/details-page.ui:369
 msgid "Connect _automatically"
 msgstr "自動接続する(_A)"
 
-#: panels/network/connection-editor/details-page.ui:434
+#: panels/network/connection-editor/details-page.ui:383
 msgid "Make available to _other users"
 msgstr "他のユーザーも利用できるようにする(_O)"
 
-#: panels/network/connection-editor/details-page.ui:467
+#: panels/network/connection-editor/details-page.ui:412
 msgid "_Metered connection: has data limits or can incur charges"
 msgstr "従量制接続(_M): データ通信量に上限がある、または通信料がかかります"
 
-#: panels/network/connection-editor/details-page.ui:478
+#: panels/network/connection-editor/details-page.ui:421
 msgid ""
 "Software updates and other large downloads will not be started automatically."
 msgstr ""
 "ソフトウェアのアップデートや、その他のサイズが大きいもののダウンロードは、自"
 "動的に開始されません。"
 
-#: panels/network/connection-editor/ethernet-page.ui:25
-#: panels/network/connection-editor/vpn-page.ui:23
+#: panels/network/connection-editor/ethernet-page.ui:21
+#: panels/network/connection-editor/vpn-page.ui:17
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: panels/network/connection-editor/ethernet-page.ui:54
-#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/connection-editor/ethernet-page.ui:42
+#: panels/network/connection-editor/wifi-page.ui:51
 msgid "_MAC Address"
 msgstr "MAC アドレス(_M)"
 
-#: panels/network/connection-editor/ethernet-page.ui:105
+#: panels/network/connection-editor/ethernet-page.ui:80
 msgid "M_TU"
 msgstr "MTU(_T)"
 
-#: panels/network/connection-editor/ethernet-page.ui:122
-#: panels/network/connection-editor/wifi-page.ui:102
+#: panels/network/connection-editor/ethernet-page.ui:93
+#: panels/network/connection-editor/wifi-page.ui:77
 msgid "_Cloned Address"
 msgstr "クローンしたアドレス(_C)"
 
-#: panels/network/connection-editor/ethernet-page.ui:137
+#: panels/network/connection-editor/ethernet-page.ui:104
 msgid "bytes"
 msgstr "バイト"
 
-#: panels/network/connection-editor/ip4-page.ui:27
+#: panels/network/connection-editor/ip4-page.ui:21
 msgid "IPv_4 Method"
 msgstr "IPv4 メソッド(_4)"
 
-#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/connection-editor/ip4-page.ui:36
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: panels/network/connection-editor/ip4-page.ui:55
-#: panels/network/connection-editor/ip6-page.ui:69
+#: panels/network/connection-editor/ip4-page.ui:45
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Link-Local Only"
 msgstr "リンクローカルのみ"
 
-#: panels/network/connection-editor/ip4-page.ui:69
-#: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:118
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:65
+#: panels/network/net-proxy.c:71 panels/network/network-proxy.ui:98
 msgid "Manual"
 msgstr "手動"
 
-#: panels/network/connection-editor/ip4-page.ui:83
-#: panels/network/connection-editor/ip6-page.ui:97
+#: panels/network/connection-editor/ip4-page.ui:65
+#: panels/network/connection-editor/ip6-page.ui:75
 msgid "Disable"
 msgstr "無効"
 
-#: panels/network/connection-editor/ip4-page.ui:97
-#: panels/network/connection-editor/ip6-page.ui:111
+#: panels/network/connection-editor/ip4-page.ui:75
+#: panels/network/connection-editor/ip6-page.ui:85
 msgid "Shared to other computers"
 msgstr "他のコンピューターと共有"
 
-#: panels/network/connection-editor/ip4-page.ui:125
-#: panels/network/connection-editor/ip6-page.ui:139
+#: panels/network/connection-editor/ip4-page.ui:98
+#: panels/network/connection-editor/ip6-page.ui:108
 msgid "Addresses"
 msgstr "アドレス"
 
-#: 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
+#: panels/network/connection-editor/ip4-page.ui:112
+#: panels/network/connection-editor/ip4-page.ui:246
+#: panels/network/connection-editor/ip6-page.ui:122
+#: panels/network/connection-editor/ip6-page.ui:255
+#: panels/printers/pp-details-dialog.ui:90
 msgid "Address"
 msgstr "アドレス"
 
-#: panels/network/connection-editor/ip4-page.ui:157
-#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip4-page.ui:124
+#: panels/network/connection-editor/ip4-page.ui:258
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: 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
+#: panels/network/connection-editor/ip4-page.ui:136
+#: panels/network/connection-editor/ip4-page.ui:270
+#: panels/network/connection-editor/ip6-page.ui:146
+#: panels/network/connection-editor/ip6-page.ui:279
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
+#: panels/network/connection-editor/ip4-page.ui:175
 #: 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:73 panels/network/network-proxy.ui:107
+#: panels/network/connection-editor/ip6-page.ui:36
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:232
+#: panels/network/net-proxy.c:73 panels/network/network-proxy.ui:91
 #: panels/network/wireless-security/eap-method-peap.ui:33
+#: panels/wacom/cc-wacom-page.c:621
 msgid "Automatic"
 msgstr "自動"
 
-#: panels/network/connection-editor/ip4-page.ui:234
-#: panels/network/connection-editor/ip6-page.ui:248
+#: panels/network/connection-editor/ip4-page.ui:183
+#: panels/network/connection-editor/ip6-page.ui:193
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:258
-#: panels/network/connection-editor/ip6-page.ui:272
+#: panels/network/connection-editor/ip4-page.ui:196
+#: panels/network/connection-editor/ip6-page.ui:205
 msgid "Separate IP addresses with commas"
 msgstr "複数の IP アドレスを指定する場合はそれぞれコンマで区切ってください"
 
-#: panels/network/connection-editor/ip4-page.ui:279
-#: panels/network/connection-editor/ip6-page.ui:293
+#: panels/network/connection-editor/ip4-page.ui:213
+#: panels/network/connection-editor/ip6-page.ui:222
 msgid "Routes"
 msgstr "ルート"
 
-#: panels/network/connection-editor/ip4-page.ui:302
-#: panels/network/connection-editor/ip6-page.ui:316
+#: panels/network/connection-editor/ip4-page.ui:231
+#: panels/network/connection-editor/ip6-page.ui:240
 msgid "Automatic Routes"
 msgstr "自動ルート"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:368
-#: panels/network/connection-editor/ip6-page.ui:382
+#: panels/network/connection-editor/ip4-page.ui:281
+#: panels/network/connection-editor/ip6-page.ui:290
 msgid "Metric"
 msgstr "メトリック"
 
-#: panels/network/connection-editor/ip4-page.ui:398
-#: panels/network/connection-editor/ip6-page.ui:412
+#: panels/network/connection-editor/ip4-page.ui:304
+#: panels/network/connection-editor/ip6-page.ui:313
 msgid "Use this connection _only for resources on its network"
 msgstr "この接続はネットワーク上のリソースのためだけに使用する(_O)"
 
-#: panels/network/connection-editor/ip6-page.ui:27
+#: panels/network/connection-editor/ip6-page.ui:21
 msgid "IPv_6 Method"
 msgstr "IPv6 メソッド(_6)"
 
-#: panels/network/connection-editor/ip6-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:45
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:134
+#: panels/network/connection-editor/ip6-page.ui:267
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: panels/network/connection-editor/net-connection-editor.c:280
+#: panels/network/connection-editor/net-connection-editor.c:277
 msgid "Unable to open connection editor"
 msgstr "接続エディターを起動できません"
 
-#: panels/network/connection-editor/net-connection-editor.c:296
+#: panels/network/connection-editor/net-connection-editor.c:293
 msgid "New Profile"
 msgstr "新しいプロファイル"
 
-#: panels/network/connection-editor/net-connection-editor.c:731
+#: panels/network/connection-editor/net-connection-editor.c:715
 msgid "Import from file…"
 msgstr "ファイルからインポート…"
 
-#: panels/network/connection-editor/net-connection-editor.c:763
+#: panels/network/connection-editor/net-connection-editor.c:741
 msgid "Add VPN"
 msgstr "VPN を追加"
 
-#: panels/network/connection-editor/security-page.ui:20
+#: panels/network/connection-editor/security-page.ui:16
 msgid "S_ecurity"
 msgstr "セキュリティ(_E)"
 
-#: panels/network/connection-editor/vpn-helpers.c:139
+#: panels/network/connection-editor/vpn-helpers.c:191
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:193
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -3601,29 +3444,29 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: panels/network/connection-editor/vpn-helpers.c:173
+#: panels/network/connection-editor/vpn-helpers.c:223
 msgid "Select file to import"
 msgstr "インポートするファイルを選択"
 
-#: panels/network/connection-editor/vpn-helpers.c:225
+#: panels/network/connection-editor/vpn-helpers.c:276
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "ファイル“%s”はすでに存在します。"
 
-#: panels/network/connection-editor/vpn-helpers.c:227
+#: panels/network/connection-editor/vpn-helpers.c:278
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: panels/network/connection-editor/vpn-helpers.c:229
+#: panels/network/connection-editor/vpn-helpers.c:280
 #, 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:264
+#: panels/network/connection-editor/vpn-helpers.c:315
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: panels/network/connection-editor/vpn-helpers.c:266
+#: panels/network/connection-editor/vpn-helpers.c:317
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3634,19 +3477,19 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: panels/network/connection-editor/vpn-helpers.c:296
+#: panels/network/connection-editor/vpn-helpers.c:343
 msgid "Export VPN connection"
 msgstr "VPN 接続をエクスポート"
 
-#: panels/network/connection-editor/vpn-page.ui:58
+#: panels/network/connection-editor/vpn-page.ui:34
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(エラー: VPN 接続エディターを読み込めません)"
 
-#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/connection-editor/wifi-page.ui:16
 msgid "_SSID"
 msgstr "SSID(_S)"
 
-#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/connection-editor/wifi-page.ui:28
 msgid "_BSSID"
 msgstr "BSSID(_B)"
 
@@ -3673,19 +3516,19 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;ネットワーク;無線;ワ"
 "イヤレス;ブロードバンド;ホットスポット;"
 
-#: panels/network/net-device-ethernet.c:96
+#: panels/network/net-device-ethernet.c:93
 msgid "never"
 msgstr "未接続"
 
-#: panels/network/net-device-ethernet.c:104
+#: panels/network/net-device-ethernet.c:101
 msgid "today"
 msgstr "今日"
 
-#: panels/network/net-device-ethernet.c:106
+#: panels/network/net-device-ethernet.c:103
 msgid "yesterday"
 msgstr "昨日"
 
-#: panels/network/net-device-ethernet.c:180
+#: panels/network/net-device-ethernet.c:177
 msgid "Last used"
 msgstr "最後の利用"
 
@@ -3694,62 +3537,43 @@ msgstr "最後の利用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:267
-#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
+#: panels/network/net-device-ethernet.c:264
+#: panels/network/network-bluetooth.ui:5 panels/network/network-ethernet.ui:5
 msgid "Wired"
 msgstr "有線"
 
-#: panels/network/net-device-mobile.c:209
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "新しい接続を追加"
 
-#: panels/network/net-device-wifi.c:851
+#: panels/network/net-device-wifi.c:857
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "パスワードや独自の設定など、選択したネットワークの詳細は失われます。"
 
-#: panels/network/net-device-wifi.c:855
+#: panels/network/net-device-wifi.c:861
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: panels/network/net-device-wifi.c:1034 panels/network/net-device-wifi.c:1041
+#: panels/network/net-device-wifi.c:1041
 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:1076
+#: panels/network/net-device-wifi.c:1073
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: panels/network/net-device-wifi.c:1217
+#: panels/network/net-device-wifi.c:1216
 msgid "System policy prohibits use as a Hotspot"
 msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
 
-#: panels/network/net-device-wifi.c:1220
+#: panels/network/net-device-wifi.c:1219
 msgid "Wireless device does not support Hotspot mode"
 msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
 
-#: panels/network/net-proxy.c:69
-#: panels/notifications/cc-notifications-panel.c:260
-#: panels/power/cc-power-panel.c:856 panels/power/cc-power-panel.c:867
-#: panels/universal-access/cc-ua-panel.c:331
-#: panels/universal-access/cc-ua-panel.c:612
-#: panels/universal-access/cc-ua-panel.c:622
-#: panels/universal-access/cc-ua-panel.c:634
-#: panels/universal-access/cc-ua-panel.c:677
-#: panels/universal-access/cc-ua-panel.ui:338
-#: panels/universal-access/cc-ua-panel.ui:384
-#: panels/universal-access/cc-ua-panel.ui:430
-#: panels/universal-access/cc-ua-panel.ui:536
-#: panels/universal-access/cc-ua-panel.ui:689
-#: panels/universal-access/cc-ua-panel.ui:735
-#: panels/universal-access/cc-ua-panel.ui:781
-#: panels/universal-access/cc-ua-panel.ui:965
-msgid "Off"
-msgstr "オフ"
-
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: panels/network/net-proxy.c:112
 msgid ""
@@ -3766,105 +3590,95 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "信頼できない公衆ネットワークでは推奨されません。"
 
-#. 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:65 panels/network/net-vpn.c:158
-#, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
-
-#: panels/network/network-bluetooth.ui:50
+#: panels/network/network-bluetooth.ui:11
 msgid "Turn device off"
 msgstr "デバイスをオフにする"
 
-#: panels/network/network-mobile.ui:29
-#: panels/wwan/cc-wwan-details-dialog.ui:286
+#: panels/network/network-mobile.ui:27
+#: panels/wwan/cc-wwan-details-dialog.ui:237
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:47
+#: panels/network/network-mobile.ui:41
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:96
+#: panels/network/network-proxy.ui:40 panels/network/network-proxy.ui:80
 msgid "Network Proxy"
 msgstr "ネットワークプロキシ"
 
-#: panels/network/network-proxy.ui:180
+#: panels/network/network-proxy.ui:139
 msgid "_HTTP Proxy"
 msgstr "HTTP プロキシ(_H)"
 
-#: panels/network/network-proxy.ui:199
+#: panels/network/network-proxy.ui:156
 msgid "H_TTPS Proxy"
 msgstr "HTTPS プロキシ(_T)"
 
-#: panels/network/network-proxy.ui:218
+#: panels/network/network-proxy.ui:173
 msgid "_FTP Proxy"
 msgstr "FTP プロキシ(_F)"
 
-#: panels/network/network-proxy.ui:237
+#: panels/network/network-proxy.ui:190
 msgid "_Socks Host"
 msgstr "Socks ホスト(_S)"
 
-#: panels/network/network-proxy.ui:256
+#: panels/network/network-proxy.ui:207
 msgid "_Ignore Hosts"
 msgstr "次のホストを無視する(_I)"
 
-#: panels/network/network-proxy.ui:294
+#: panels/network/network-proxy.ui:244
 msgid "HTTP proxy port"
 msgstr "HTTP プロキシポート"
 
-#: panels/network/network-proxy.ui:371
+#: panels/network/network-proxy.ui:307
 msgid "HTTPS proxy port"
 msgstr "HTTPS プロキシポート"
 
-#: panels/network/network-proxy.ui:392
+#: panels/network/network-proxy.ui:322
 msgid "FTP proxy port"
 msgstr "FTP プロキシポート"
 
-#: panels/network/network-proxy.ui:413
+#: panels/network/network-proxy.ui:337
 msgid "Socks proxy port"
 msgstr "Socks プロキシポート"
 
-#: panels/network/network-proxy.ui:442
+#: panels/network/network-proxy.ui:357
 msgid "_Configuration URL"
 msgstr "設定 URL(_C)"
 
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:11
 msgid "Turn VPN connection off"
 msgstr "VPN 接続をオフにする"
 
-#: panels/network/network-wifi.ui:22
+#: panels/network/network-wifi.ui:34
 msgctxt "Wi-Fi Hotspot"
 msgid "Network Name"
 msgstr "ネットワーク名"
 
-#: panels/network/network-wifi.ui:28
+#: panels/network/network-wifi.ui:40
 msgctxt "Wi-Fi Hotspot"
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: panels/network/network-wifi.ui:34
+#: panels/network/network-wifi.ui:46
 msgctxt "Wi-Fi Hotspot"
 msgid "Password"
 msgstr "パスワード"
 
-#: panels/network/network-wifi.ui:84
+#: panels/network/network-wifi.ui:90
 msgid "Turn Wi-Fi off"
 msgstr "Wi-Fi をオフにする"
 
-#: panels/network/network-wifi.ui:116
+#: panels/network/network-wifi.ui:121
 msgid "_Connect to Hidden Network…"
 msgstr "非表示のネットワークに接続(_C)…"
 
-#: panels/network/network-wifi.ui:127
+#: panels/network/network-wifi.ui:128
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Wi-Fi アクセスポイントをオンにする(_T)…"
 
-#: panels/network/network-wifi.ui:138
+#: panels/network/network-wifi.ui:135
 msgid "_Known Wi-Fi Networks"
 msgstr "既知の Wi-Fi ネットワーク(_K)"
 
@@ -4127,31 +3941,27 @@ msgstr "ケーブル非接続"
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティ (wpa-eap) で未定義のエラーが発生しました"
 
-#: panels/network/wireless-security/eap-method.c:195
+#: panels/network/wireless-security/eap-method.c:196
 msgid "no file selected"
 msgstr "ファイルが選択されていません"
 
-#: panels/network/wireless-security/eap-method.c:222
+#: panels/network/wireless-security/eap-method.c:224
 msgid "unspecified error validating eap-method file"
 msgstr "EAP メソッドファイルの検証中に特定できないエラーが発生しました"
 
-#: panels/network/wireless-security/eap-method.c:397
+#: panels/network/wireless-security/eap-method.c:389
 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:400
+#: panels/network/wireless-security/eap-method.c:392
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER か PEM の証明書 (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:87
+#: panels/network/wireless-security/eap-method-fast.c:88
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC ファイルがありません"
 
-#: panels/network/wireless-security/eap-method-fast.c:347
-msgid "Choose a PAC file"
-msgstr "PAC ファイルを選択"
-
-#: panels/network/wireless-security/eap-method-fast.c:352
+#: panels/network/wireless-security/eap-method-fast.c:353
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
@@ -4179,23 +3989,27 @@ msgstr "認証"
 msgid "Both"
 msgstr "両方"
 
-#: 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
+#: panels/network/wireless-security/eap-method-fast.ui:46
+#: panels/network/wireless-security/eap-method-peap.ui:49
+#: panels/network/wireless-security/eap-method-ttls.ui:48
 msgid "Anony_mous identity"
 msgstr "匿名の識別子(_M)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:75
+#: panels/network/wireless-security/eap-method-fast.ui:67
 msgid "PAC _file"
 msgstr "PAC ファイル(_F)"
 
-#: 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
+#: panels/network/wireless-security/eap-method-fast.ui:79
+msgid "Choose a PAC file"
+msgstr "PAC ファイルを選択"
+
+#: panels/network/wireless-security/eap-method-fast.ui:99
+#: panels/network/wireless-security/eap-method-peap.ui:131
+#: panels/network/wireless-security/eap-method-ttls.ui:122
 msgid "_Inner authentication"
 msgstr "内部認証(_I)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:144
+#: panels/network/wireless-security/eap-method-fast.ui:126
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動的な PAC プロビジョニングを許可する(_V)"
 
@@ -4207,50 +4021,40 @@ msgstr "EAP-LEAP ユーザー名がありません"
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP パスワードがありません"
 
-#: 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
+#: panels/network/wireless-security/eap-method-leap.ui:11
+#: panels/network/wireless-security/eap-method-simple.ui:11
+#: panels/network/wireless-security/ws-leap.ui:11
 msgid "_Username"
 msgstr "ユーザー名(_U)"
 
-#: 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-sae.ui:14
-#: panels/network/wireless-security/ws-wpa-psk.ui:14
-#: panels/sharing/cc-sharing-panel.ui:202
-#: 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:365
+#: panels/network/wireless-security/eap-method-leap.ui:23
+#: panels/network/wireless-security/eap-method-simple.ui:23
+#: panels/network/wireless-security/ws-leap.ui:23
+#: panels/network/wireless-security/ws-sae.ui:10
+#: panels/network/wireless-security/ws-wpa-psk.ui:10
+#: panels/sharing/cc-sharing-panel.ui:152
+#: panels/user-accounts/cc-user-panel.ui:175
 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-sae.ui:54
-#: panels/network/wireless-security/ws-wpa-psk.ui:64
+#: panels/network/wireless-security/eap-method-leap.ui:44
+#: panels/network/wireless-security/eap-method-simple.ui:61
+#: panels/network/wireless-security/eap-method-tls.ui:129
+#: panels/network/wireless-security/ws-leap.ui:44
+#: panels/network/wireless-security/ws-sae.ui:45
+#: panels/network/wireless-security/ws-wpa-psk.ui:53
 msgid "Sho_w password"
 msgstr "パスワードを表示する(_W)"
 
-#: panels/network/wireless-security/eap-method-peap.c:87
+#: panels/network/wireless-security/eap-method-peap.c:88
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "無効な EAP-PEAP CA 証明書: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:96
+#: panels/network/wireless-security/eap-method-peap.c:97
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無効な EAP-PEAP CA 証明書: 認証書が指定されていません"
 
-#: panels/network/wireless-security/eap-method-peap.c:328
-#: panels/network/wireless-security/eap-method-tls.c:513
-#: 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:17
 #: panels/network/wireless-security/eap-method-ttls.ui:33
 #: panels/network/wireless-security/ws-wpa-eap.ui:15
@@ -4265,19 +4069,26 @@ msgstr "バージョン 0"
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: 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
+#: panels/network/wireless-security/eap-method-peap.ui:70
+#: panels/network/wireless-security/eap-method-tls.ui:54
+#: panels/network/wireless-security/eap-method-ttls.ui:89
 msgid "C_A certificate"
 msgstr "CA 証明書(_A)"
 
-#: 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
+#: panels/network/wireless-security/eap-method-peap.ui:82
+#: panels/network/wireless-security/eap-method-tls.c:524
+#: panels/network/wireless-security/eap-method-tls.ui:44
+#: panels/network/wireless-security/eap-method-tls.ui:66
+msgid "Choose a Certificate Authority certificate"
+msgstr "認証局 (CA) 証明書を選択"
+
+#: panels/network/wireless-security/eap-method-peap.ui:91
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:110
 msgid "No CA certificate is _required"
 msgstr "CA 証明書が要求されましたが存在しません(_R)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:118
+#: panels/network/wireless-security/eap-method-peap.ui:103
 msgid "PEAP _version"
 msgstr "PEAP バージョン(_V)"
 
@@ -4289,34 +4100,34 @@ msgstr "EAP ユーザー名がありません"
 msgid "missing EAP password"
 msgstr "EAP パスワードがありません"
 
-#: panels/network/wireless-security/eap-method-tls.c:92
+#: panels/network/wireless-security/eap-method-tls.c:93
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS Identity がありません"
 
-#: panels/network/wireless-security/eap-method-tls.c:102
+#: panels/network/wireless-security/eap-method-tls.c:103
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "無効な EAP-TLS CA 証明書: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:112
+#: panels/network/wireless-security/eap-method-tls.c:113
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無効な EAP-TLS CA 証明書: 認証書が指定されていません"
 
-#: panels/network/wireless-security/eap-method-tls.c:129
+#: panels/network/wireless-security/eap-method-tls.c:130
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無効な EAP-TLS 秘密鍵: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:139
+#: panels/network/wireless-security/eap-method-tls.c:140
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無効な EAP-TLS ユーザー証明書: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:272
+#: panels/network/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "暗号化されていない秘密鍵は安全ではありません"
 
-#: panels/network/wireless-security/eap-method-tls.c:275
+#: panels/network/wireless-security/eap-method-tls.c:282
 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 "
@@ -4329,36 +4140,36 @@ msgstr ""
 "\n"
 "(秘密鍵は openssl を使用してパスワード保護ができます)"
 
-#: panels/network/wireless-security/eap-method-tls.c:506
+#: panels/network/wireless-security/eap-method-tls.c:517
 msgid "Choose your personal certificate"
 msgstr "個人用証明書を選択する"
 
-#: panels/network/wireless-security/eap-method-tls.c:520
+#: panels/network/wireless-security/eap-method-tls.c:531
 msgid "Choose your private key"
 msgstr "秘密鍵を選択する"
 
-#: panels/network/wireless-security/eap-method-tls.ui:17
+#: panels/network/wireless-security/eap-method-tls.ui:11
 msgid "I_dentity"
 msgstr "Identity(_D)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:43
+#: panels/network/wireless-security/eap-method-tls.ui:32
 msgid "_User certificate"
 msgstr "ユーザー証明書(_U)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:108
+#: panels/network/wireless-security/eap-method-tls.ui:87
 msgid "Private _key"
 msgstr "秘密鍵(_K)"
 
-#: panels/network/wireless-security/eap-method-tls.ui:133
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "_Private key password"
 msgstr "秘密鍵のパスワード(_P)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:98
+#: panels/network/wireless-security/eap-method-ttls.c:99
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "無効な EAP-TTLS CA 証明書: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:106
+#: panels/network/wireless-security/eap-method-ttls.c:107
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無効な EAP-TTLS CA 証明書: 証明書が指定されていません"
 
@@ -4378,9 +4189,8 @@ msgstr "MSCHAPv2 (no EAP)"
 msgid "CHAP"
 msgstr "CHAP"
 
-#: 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
+#: panels/network/wireless-security/eap-method-ttls.ui:68
+#: panels/user-accounts/data/join-dialog.ui:90
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
@@ -4413,9 +4223,9 @@ msgstr "トンネル化 TLS"
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: 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
+#: panels/network/wireless-security/ws-dynamic-wep.ui:52
+#: panels/network/wireless-security/ws-wep-key.ui:87
+#: panels/network/wireless-security/ws-wpa-eap.ui:57
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
@@ -4435,8 +4245,8 @@ msgstr "LEAP パスワードがありません"
 msgid "Wi-Fi password is missing."
 msgstr "Wi-Fi パスワードがありません。"
 
-#: panels/network/wireless-security/ws-sae.ui:42
-#: panels/network/wireless-security/ws-wpa-psk.ui:42
+#: panels/network/wireless-security/ws-sae.ui:33
+#: panels/network/wireless-security/ws-wpa-psk.ui:33
 msgid "_Type"
 msgstr "種類(_T)"
 
@@ -4488,15 +4298,15 @@ msgstr "オープンシステム"
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: panels/network/wireless-security/ws-wep-key.ui:48
+#: panels/network/wireless-security/ws-wep-key.ui:44
 msgid "_Key"
 msgstr "キー(_K)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:84
+#: panels/network/wireless-security/ws-wep-key.ui:75
 msgid "Sho_w key"
 msgstr "キーを表示する(_W)"
 
-#: panels/network/wireless-security/ws-wep-key.ui:134
+#: panels/network/wireless-security/ws-wep-key.ui:115
 msgid "WEP inde_x"
 msgstr "WEP インデックス(_X)"
 
@@ -4514,59 +4324,49 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効な WPA PSK: キーが 64 文字の場合、16 進数字以外は使用できません"
 
 #. This is the per application switch for message tray usage.
-#: panels/notifications/cc-app-notifications-dialog.ui:60
+#: panels/notifications/cc-app-notifications-dialog.ui:15
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: panels/notifications/cc-app-notifications-dialog.ui:112
+#: panels/notifications/cc-app-notifications-dialog.ui:29
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "サウンドアラート(_A)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:168
+#: panels/notifications/cc-app-notifications-dialog.ui:42
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "通知ポップアップ(_P)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:184
+#: panels/notifications/cc-app-notifications-dialog.ui:43
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
 msgstr "ポップアップを無効にすると、通知リストに通知が表示され続けます。"
 
 #. Popups here refers to message tray notifications in the middle of the screen.
-#: panels/notifications/cc-app-notifications-dialog.ui:249
+#: panels/notifications/cc-app-notifications-dialog.ui:56
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "ポップアップにメッセージの内容を表示する(_C)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:300
+#: panels/notifications/cc-app-notifications-dialog.ui:69
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
-#: panels/notifications/cc-app-notifications-dialog.ui:351
+#: panels/notifications/cc-app-notifications-dialog.ui:82
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "ロック画面にメッセージの内容を表示する(_O)"
 
-#: panels/notifications/cc-notifications-panel.c:260
-#: panels/power/cc-power-panel.c:862 panels/power/cc-power-panel.c:869
-#: panels/universal-access/cc-ua-panel.c:331
-#: panels/universal-access/cc-ua-panel.c:612
-#: panels/universal-access/cc-ua-panel.c:622
-#: panels/universal-access/cc-ua-panel.c:634
-#: panels/universal-access/cc-ua-panel.c:677
-msgid "On"
-msgstr "オン"
-
-#: panels/notifications/cc-notifications-panel.ui:44
+#: panels/notifications/cc-notifications-panel.ui:10
 msgid "_Do Not Disturb"
 msgstr "通知ポップアップを表示しない(_D)"
 
-#: panels/notifications/cc-notifications-panel.ui:52
+#: panels/notifications/cc-notifications-panel.ui:17
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
@@ -4581,29 +4381,53 @@ msgstr ""
 "Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップ"
 "アップ;"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:148
+#. Translators: The %s is the username (eg., debarshi ray gmail com
+#. * or rishi).
+#.
+#: panels/online-accounts/cc-online-accounts-panel.c:277
+#, c-format
+msgid "%s removed"
+msgstr "%s を削除しました"
+
+#: panels/online-accounts/cc-online-accounts-panel.c:406
 msgctxt "Online Account"
 msgid "Other"
 msgstr "その他"
 
+#: panels/online-accounts/cc-online-accounts-panel.c:803
+msgid "Error removing account"
+msgstr "アカウントの削除に失敗しました"
+
+#. Translators: This is the button which allows undoing the removal of the printer.
+#: panels/online-accounts/cc-online-accounts-panel.ui:23
+#: panels/printers/printers.ui:51
+msgid "Undo"
+msgstr "元に戻す"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:55
+msgid "Connect to your data in the cloud"
+msgstr "クラウド上のあなたのデータと接続します"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:66
+msgid "No internet connection — connect to set up new online accounts"
+msgstr ""
+"インターネット接続がありません — 新しいオンラインアカウントのセットアップのた"
+"めに接続してください"
+
+#: panels/online-accounts/cc-online-accounts-panel.ui:93
+msgid "Add an account"
+msgstr "アカウントの追加"
+
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: panels/online-accounts/cc-online-accounts-panel.c:576
+#: panels/online-accounts/gnome-control-center-goa-helper.c:426
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:870
-msgid "Error removing account"
-msgstr "アカウントの削除に失敗しました"
-
-#. Translators: The %s is the username (eg., debarshi ray gmail com
-#. * or rishi).
-#.
-#: panels/online-accounts/cc-online-accounts-panel.c:936
-#, c-format
-msgid "%s removed"
-msgstr "%s を削除しました"
+#: panels/online-accounts/gnome-control-center-goa-helper.c:429
+msgid "Remove Account"
+msgstr "アカウントを削除"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
 msgid "Online Accounts"
@@ -4627,29 +4451,6 @@ msgstr ""
 "フー;ウェブ;オンライン;チャット;カレンダー;メール;連絡先;Flickr;"
 "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:61
-msgid "Undo"
-msgstr "元に戻す"
-
-#: panels/online-accounts/online-accounts.ui:94
-msgid "Connect to your data in the cloud"
-msgstr "クラウド上のあなたのデータと接続します"
-
-#: panels/online-accounts/online-accounts.ui:109
-msgid "No internet connection — connect to set up new online accounts"
-msgstr ""
-"インターネット接続がありません — 新しいオンラインアカウントのセットアップのた"
-"めに接続してください"
-
-#: panels/online-accounts/online-accounts.ui:134
-msgid "Add an account"
-msgstr "アカウントの追加"
-
-#: panels/online-accounts/online-accounts.ui:223
-msgid "Remove Account"
-msgstr "アカウントを削除"
-
 #: panels/power/cc-battery-row.c:80
 msgid "Unknown time"
 msgstr "残り時間は不明"
@@ -4757,7 +4558,7 @@ msgid "Media player"
 msgstr "音楽プレーヤー"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-battery-row.c:209 panels/wacom/cc-wacom-panel.c:728
+#: panels/power/cc-battery-row.c:209
 msgid "Tablet"
 msgstr "タブレット"
 
@@ -4772,8 +4573,8 @@ msgid "Gaming input device"
 msgstr "ゲーム用入力デバイス"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-battery-row.c:218 panels/power/cc-power-panel.c:384
-#: panels/power/cc-power-panel.ui:63
+#: panels/power/cc-battery-row.c:218 panels/power/cc-power-panel.c:257
+#: panels/power/cc-power-panel.ui:58
 msgid "Battery"
 msgstr "バッテリー"
 
@@ -4787,261 +4588,243 @@ msgctxt "Battery name"
 msgid "Extra"
 msgstr "予備"
 
-#: panels/power/cc-power-panel.c:382
+#: panels/power/cc-power-panel.c:255
 msgid "Batteries"
 msgstr "バッテリー"
 
-#: panels/power/cc-power-panel.c:644
+#: panels/power/cc-power-panel.c:511
 msgid "When _idle"
 msgstr "アイドル時(_I)"
 
-#: panels/power/cc-power-panel.c:796
+#: panels/power/cc-power-panel.c:671
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: panels/power/cc-power-panel.c:797
+#: panels/power/cc-power-panel.c:672
 msgid "Power Off"
 msgstr "電源オフ"
 
-#: panels/power/cc-power-panel.c:798
+#: panels/power/cc-power-panel.c:673
 msgid "Hibernate"
 msgstr "ハイバネート"
 
-#: panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:674
 msgid "Nothing"
 msgstr "なにもしない"
 
-#: panels/power/cc-power-panel.c:858
+#: panels/power/cc-power-panel.c:730
 msgid "When on battery power"
 msgstr "バッテリー動作時"
 
-#: panels/power/cc-power-panel.c:860
+#: panels/power/cc-power-panel.c:732
 msgid "When plugged in"
 msgstr "電源接続時"
 
-#: panels/power/cc-power-panel.c:980
+#: panels/power/cc-power-panel.c:853
 msgctxt "Idle time"
 msgid "Never"
 msgstr "しない"
 
-#: panels/power/cc-power-panel.c:1066
+#: panels/power/cc-power-panel.c:937
 msgid "Automatic suspend"
 msgstr "自動サスペンド"
 
-#: panels/power/cc-power-panel.c:1171
+#: panels/power/cc-power-panel.c:1030
 msgid ""
 "Performance mode temporarily disabled due to high operating temperature."
-msgstr ""
-"動作温度が高いためパフォーマンスモードが一時的に無効になりました。"
+msgstr "動作温度が高いためパフォーマンスモードが一時的に無効になりました。"
 
-#: panels/power/cc-power-panel.c:1173
+#: panels/power/cc-power-panel.c:1032
 msgid ""
 "Lap detected: performance mode temporarily unavailable. Move the device to a "
 "stable surface to restore."
 msgstr ""
 
-#: panels/power/cc-power-panel.c:1175
+#: panels/power/cc-power-panel.c:1034
 msgid "Performance mode temporarily disabled."
 msgstr "パフォーマンスモードが一時的に無効になりました。"
 
-#: panels/power/cc-power-panel.c:1218
+#: panels/power/cc-power-panel.c:1076
 msgid ""
 "Low battery: power saver enabled. Previous mode will be restored when "
 "battery is sufficiently charged."
 msgstr ""
-"バッテリー低下: 省電力が有効になりました。バッテリーが十分に充電されると"
-"以前のモードに戻ります。"
+"バッテリー低下: 省電力が有効になりました。バッテリーが十分に充電されると以前"
+"のモードに戻ります。"
 
 #. translators: "%s" is an application name
-#: panels/power/cc-power-panel.c:1226
+#: panels/power/cc-power-panel.c:1084
 #, c-format
 msgid "Power Saver mode activated by “%s”."
 msgstr "“%s”によって省電力モードがアクティブになります。"
 
 #. translators: "%s" is an application name
-#: panels/power/cc-power-panel.c:1230
+#: panels/power/cc-power-panel.c:1088
 #, c-format
 msgid "Performance mode activated by “%s”."
 msgstr "“%s”によってパフォーマンスモードがアクティブになります。"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:13
+#: panels/power/cc-power-panel.ui:12
 msgctxt "automatic_suspend"
 msgid "15 minutes"
 msgstr "15 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:17
+#: panels/power/cc-power-panel.ui:16
 msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:21
+#: panels/power/cc-power-panel.ui:20
 msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:25
+#: panels/power/cc-power-panel.ui:24
 msgctxt "automatic_suspend"
 msgid "30 minutes"
 msgstr "30 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:29
+#: panels/power/cc-power-panel.ui:28
 msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:33
+#: panels/power/cc-power-panel.ui:32
 msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 時間"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:37
+#: panels/power/cc-power-panel.ui:36
 msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:41
+#: panels/power/cc-power-panel.ui:40
 msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:45
+#: panels/power/cc-power-panel.ui:44
 msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 分"
 
 #. Translators: Option for "Delay" in "Automatic suspend" dialog.
-#: panels/power/cc-power-panel.ui:49
+#: panels/power/cc-power-panel.ui:48
 msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 時間"
 
-#: panels/power/cc-power-panel.ui:107
+#: panels/power/cc-power-panel.ui:93
 msgid "Power Mode"
 msgstr "電源モード"
 
-#: panels/power/cc-power-panel.ui:108
+#: panels/power/cc-power-panel.ui:94
 msgid "Affects system performance and power usage."
 msgstr "システムのパフォーマンスと消費電力に関係します。"
 
-#: panels/power/cc-power-panel.ui:142
+#: panels/power/cc-power-panel.ui:123
 msgid "Power Saving Options"
 msgstr "省電力オプション"
 
-#: panels/power/cc-power-panel.ui:146
+#: panels/power/cc-power-panel.ui:126
 msgid "Automatic Screen Brightness"
 msgstr "画面の明るさを自動調整する"
 
-#: panels/power/cc-power-panel.ui:147
+#: panels/power/cc-power-panel.ui:127
 msgid "Screen brightness adjusts to the surrounding light."
 msgstr "周囲光で画面の明るさを調節します。"
 
-#: panels/power/cc-power-panel.ui:160
+#: panels/power/cc-power-panel.ui:138
 msgid "Dim Screen"
 msgstr "画面を暗くする"
 
-#: panels/power/cc-power-panel.ui:161
+#: panels/power/cc-power-panel.ui:139
 msgid "Reduces the screen brightness when the computer is inactive."
 msgstr "コンピューターが非アクティブなときに画面の明るさを下げます。"
 
-#: panels/power/cc-power-panel.ui:174
+#: panels/power/cc-power-panel.ui:150
 msgid "Screen _Blank"
 msgstr "画面のブランク(_B)"
 
-#: panels/power/cc-power-panel.ui:175
+#: panels/power/cc-power-panel.ui:151
 msgid "Turns the screen off after a period of inactivity."
 msgstr "何もしない状態が一定時間続いたら画面をオフにします。"
 
-#: panels/power/cc-power-panel.ui:183
+#: panels/power/cc-power-panel.ui:159
 msgid "Automatic Power Saver"
 msgstr "自動的に消費電力を抑える"
 
-#: panels/power/cc-power-panel.ui:184
+#: panels/power/cc-power-panel.ui:160
 msgid "Enables power saver mode when battery is low."
 msgstr "バッテリーが低下したときに省電力モードを有効にします。"
 
-#: panels/power/cc-power-panel.ui:198
+#: panels/power/cc-power-panel.ui:173
 msgid "_Automatic Suspend"
 msgstr "自動サスペンド(_A)"
 
-#: panels/power/cc-power-panel.ui:199
+#: panels/power/cc-power-panel.ui:174
 msgid "Pauses the computer after a period of inactivity."
 msgstr "何もしない状態が一定時間続いたらコンピューターを休止します。"
 
-#: panels/power/cc-power-panel.ui:217
-msgid "Suspend & Power Button"
-msgstr "サスペンド, 電源ボタン"
-
-#: panels/power/cc-power-panel.ui:221
+#: panels/power/cc-power-panel.ui:199
 msgid "Po_wer Button Behavior"
 msgstr "電源ボタンの挙動(_W)"
 
-#: panels/power/cc-power-panel.ui:229
+#: panels/power/cc-power-panel.ui:207
 msgid "Show Battery _Percentage"
 msgstr "バッテリー残量を表示する(_P)"
 
-#: panels/power/cc-power-panel.ui:268
+#: panels/power/cc-power-panel.ui:243
 msgid "Automatic Suspend"
 msgstr "自動サスペンド"
 
-#: panels/power/cc-power-panel.ui:293
+#: panels/power/cc-power-panel.ui:266
 msgid "_Plugged In"
 msgstr "電源接続時(_P)"
 
-#: panels/power/cc-power-panel.ui:309
+#: panels/power/cc-power-panel.ui:278
 msgid "On _Battery Power"
 msgstr "バッテリー動作時(_B)"
 
-#: panels/power/cc-power-panel.ui:354 panels/power/cc-power-panel.ui:414
-#: panels/universal-access/cc-repeat-keys-dialog.ui:74
+#: panels/power/cc-power-panel.ui:311 panels/power/cc-power-panel.ui:347
+#: panels/universal-access/cc-repeat-keys-dialog.ui:62
 msgid "Delay"
 msgstr "時間"
 
-#: panels/power/cc-power-profile-row.c:61
-msgid "Lap detected: performance mode unavailable"
-msgstr ""
-
-#: panels/power/cc-power-profile-row.c:63
-msgid "High hardware temperature: performance mode unavailable"
-msgstr "ハードウェアが高温です: パフォーマンスモードは利用できません"
-
-#: panels/power/cc-power-profile-row.c:64
-msgid "Performance mode unavailable"
-msgstr "パフォーマンスモードは利用できません"
-
-#: panels/power/cc-power-profile-row.c:86
-#: panels/power/cc-power-profile-row.c:185
-msgid "High performance and power usage."
-msgstr "高いパフォーマンスと消費電力です。"
-
-#: panels/power/cc-power-profile-row.c:184
+#: panels/power/cc-power-profile-row.c:132
 msgctxt "Power profile"
 msgid "Performance"
 msgstr "パフォーマンス"
 
-#: panels/power/cc-power-profile-row.c:188
+#: panels/power/cc-power-profile-row.c:133
+msgid "High performance and power usage."
+msgstr "高いパフォーマンスと消費電力です。"
+
+#: panels/power/cc-power-profile-row.c:136
 msgctxt "Power profile"
 msgid "Balanced"
 msgstr "バランス"
 
-#: panels/power/cc-power-profile-row.c:189
+#: panels/power/cc-power-profile-row.c:137
 msgid "Standard performance and power usage."
 msgstr "標準的なパフォーマンスと消費電力です。"
 
-#: panels/power/cc-power-profile-row.c:192
+#: panels/power/cc-power-profile-row.c:140
 msgctxt "Power profile"
 msgid "Power Saver"
 msgstr "省電力"
 
-#: panels/power/cc-power-profile-row.c:193
+#: panels/power/cc-power-profile-row.c:141
 msgid "Reduced performance and power usage."
 msgstr "パフォーマンスと消費電力を抑えます。"
 
@@ -5063,44 +4846,24 @@ msgstr ""
 "Energy;電源;スリープ;サスペンド;ハイバネート;バッテリー;明るさ;ブランクスク"
 "リーン;モニター;画面;ディスプレイ;アイドル;待機;電力;エネルギー;"
 
-#: panels/printers/authentication-dialog.ui:11
-msgid " "
-msgstr " "
-
-#: panels/printers/authentication-dialog.ui:42
-msgid "Authenticate"
-msgstr "認証"
-
-#. Translators: This is a username on a print server.
-#: panels/printers/authentication-dialog.ui:80
-#: panels/printers/new-printer-dialog.ui:366
-#: panels/printers/pp-jobs-dialog.ui:57 panels/wwan/cc-wwan-apn-dialog.ui:188
-msgid "Username"
-msgstr "ユーザー名"
-
-#: panels/printers/authentication-dialog.ui:139
-#: panels/printers/new-printer-dialog.ui:339
-msgid "Authentication Required"
-msgstr "認証が必要です"
-
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:682
+#: panels/printers/cc-printers-panel.c:676
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "プリンター“%s”を削除しました"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:926
+#: panels/printers/cc-printers-panel.c:928
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1225
+#: panels/printers/cc-printers-panel.c:1229
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
 
-#: panels/printers/cc-printers-panel.c:1293
+#: panels/printers/cc-printers-panel.c:1297
 msgid "Unlock to Add Printers and Change Settings"
 msgstr "設定の変更やプリンターを追加する場合はロックを解除してください"
 
@@ -5119,39 +4882,53 @@ msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
 
 #. 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:254
-#: panels/printers/pp-new-printer-dialog.c:311
+#: panels/printers/new-printer-dialog.ui:28
+#: panels/printers/new-printer-dialog.ui:38
+#: panels/printers/pp-new-printer-dialog.c:255
+#: panels/printers/pp-new-printer-dialog.c:312
 msgid "Add Printer"
 msgstr "プリンターを追加"
 
 #. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: panels/printers/new-printer-dialog.ui:96
-#: panels/printers/new-printer-dialog.ui:111
-#: panels/wwan/cc-wwan-device-page.ui:90
+#: panels/printers/new-printer-dialog.ui:100
+#: panels/printers/new-printer-dialog.ui:115
+#: panels/wwan/cc-wwan-device-page.ui:38
 msgid "_Unlock"
 msgstr "ロック解除(_U)"
 
 #. Translators: No printers were detected
-#: panels/printers/new-printer-dialog.ui:211
+#: panels/printers/new-printer-dialog.ui:194
 msgid "No Printers Found"
 msgstr "プリンターが見つかりませんでした"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: panels/printers/new-printer-dialog.ui:284
+#: panels/printers/new-printer-dialog.ui:244
 msgid "Enter a network address or search for a printer"
 msgstr "ネットワークアドレスを入力するかプリンターを検索してください"
 
-#: panels/printers/new-printer-dialog.ui:356
+#: panels/printers/new-printer-dialog.ui:286
+msgid "Authentication Required"
+msgstr "認証が必要です"
+
+#: panels/printers/new-printer-dialog.ui:302
 msgid "Enter username and password to view printers on Print Server."
 msgstr ""
 "プリンターサーバーで利用可能なプリンターを表示するにはユーザー名とパスワード"
 "を入力してください。"
 
+#. Translators: This is a username on a print server.
+#: panels/printers/new-printer-dialog.ui:311
+#: panels/printers/pp-jobs-dialog.ui:41
+#: panels/user-accounts/cc-add-user-dialog.ui:94
+#: panels/user-accounts/cc-add-user-dialog.ui:342
+#: panels/wwan/cc-wwan-apn-dialog.ui:148
+msgid "Username"
+msgstr "ユーザー名"
+
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: panels/printers/pp-details-dialog.c:74
-#: panels/printers/pp-details-dialog.c:351
+#: panels/printers/pp-details-dialog.c:365
 #, c-format
 msgid "%s Details"
 msgstr "%s の詳細"
@@ -5160,11 +4937,11 @@ msgstr "%s の詳細"
 msgid "No suitable driver found"
 msgstr "適切なドライバーが見つかりませんでした"
 
-#: panels/printers/pp-details-dialog.c:232
+#: panels/printers/pp-details-dialog.c:260
 msgid "Select PPD File"
 msgstr "PPD ファイルを選択"
 
-#: panels/printers/pp-details-dialog.c:241
+#: panels/printers/pp-details-dialog.c:269
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -5172,45 +4949,45 @@ 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
+#: panels/printers/pp-details-dialog.ui:65 panels/printers/printer-entry.ui:215
 msgid "Location"
 msgstr "場所"
 
 #. Translators: Name of column showing printer drivers
-#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-details-dialog.ui:115
 #: panels/printers/pp-ppd-selection-dialog.c:236
 msgid "Driver"
 msgstr "ドライバー"
 
-#: panels/printers/pp-details-dialog.ui:162
+#: panels/printers/pp-details-dialog.ui:154
 msgid "Searching for preferred drivers…"
 msgstr "推奨ドライバーの検索中…"
 
-#: panels/printers/pp-details-dialog.ui:183
+#: panels/printers/pp-details-dialog.ui:173
 msgid "Search for Drivers"
 msgstr "ドライバーを検索する"
 
-#: panels/printers/pp-details-dialog.ui:192
+#: panels/printers/pp-details-dialog.ui:181
 msgid "Select from Database…"
 msgstr "データベースから選択…"
 
-#: panels/printers/pp-details-dialog.ui:201
+#: panels/printers/pp-details-dialog.ui:189
 msgid "Install PPD File…"
 msgstr "PPD ファイルをインストール…"
 
-#: panels/printers/ppd-selection-dialog.ui:10
+#: panels/printers/ppd-selection-dialog.ui:8
 msgid "Select Printer Driver"
 msgstr "プリンタードライバーを選択"
 
-#: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/cc-avatar-chooser.c:107
-msgid "Select"
-msgstr "選択"
-
 #: panels/printers/ppd-selection-dialog.ui:75
 msgid "Loading drivers database…"
 msgstr "ドライバーのデータベースを読み込み中…"
 
+#: panels/printers/ppd-selection-dialog.ui:91
+#: panels/user-accounts/cc-avatar-chooser.c:98
+msgid "Select"
+msgstr "選択"
+
 #. Translators: The found device is a JetDirect printer
 #: panels/printers/pp-host.c:478
 msgid "JetDirect Printer"
@@ -5260,49 +5037,49 @@ msgid "Reverse portrait"
 msgstr "縦方向 (逆向き)"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: panels/printers/pp-job-row.c:106
+#: panels/printers/pp-job-row.c:134
 msgctxt "print job"
 msgid "Pending"
 msgstr "待機中"
 
 #. Translators: Job's state (job is held for printing)
-#: panels/printers/pp-job-row.c:112
+#: panels/printers/pp-job-row.c:140
 msgctxt "print job"
 msgid "Paused"
 msgstr "一時停止"
 
 #. Translators: Job's state (job needs authentication to proceed further)
-#: panels/printers/pp-job-row.c:117
+#: panels/printers/pp-job-row.c:145
 msgctxt "print job"
 msgid "Authentication required"
 msgstr "認証が必要です"
 
 #. Translators: Job's state (job is currently printing)
-#: panels/printers/pp-job-row.c:122
+#: panels/printers/pp-job-row.c:150
 msgctxt "print job"
 msgid "Processing"
 msgstr "印刷中"
 
 #. Translators: Job's state (job has been stopped)
-#: panels/printers/pp-job-row.c:126
+#: panels/printers/pp-job-row.c:154
 msgctxt "print job"
 msgid "Stopped"
 msgstr "停止"
 
 #. Translators: Job's state (job has been canceled)
-#: panels/printers/pp-job-row.c:130
+#: panels/printers/pp-job-row.c:158
 msgctxt "print job"
 msgid "Canceled"
 msgstr "キャンセル"
 
 #. Translators: Job's state (job has aborted due to error)
-#: panels/printers/pp-job-row.c:134
+#: panels/printers/pp-job-row.c:162
 msgctxt "print job"
 msgid "Aborted"
 msgstr "中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: panels/printers/pp-job-row.c:138
+#: panels/printers/pp-job-row.c:166
 msgctxt "print job"
 msgid "Completed"
 msgstr "完了"
@@ -5313,101 +5090,102 @@ msgid "Move this job to the top of the queue"
 msgstr "このジョブをキューの先頭に移動する"
 
 #. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
-#: panels/printers/pp-jobs-dialog.c:249
+#: panels/printers/pp-jobs-dialog.c:318
 #, 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:401
+#: panels/printers/pp-jobs-dialog.c:456
 #, 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:405
+#: panels/printers/pp-jobs-dialog.c:460
 #, 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
+#: panels/printers/pp-jobs-dialog.ui:30
+#: panels/user-accounts/cc-add-user-dialog.ui:300
 msgid "Domain"
 msgstr "ドメイン"
 
 #. Translators: This button authenticates all print jobs and send them for printing.
-#: panels/printers/pp-jobs-dialog.ui:129
+#: panels/printers/pp-jobs-dialog.ui:100
 msgid "A_uthenticate"
 msgstr "認証(_U)"
 
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: panels/printers/pp-jobs-dialog.ui:169
+#: panels/printers/pp-jobs-dialog.ui:128
 msgid "Clear All"
 msgstr "すべて消去"
 
 #. Translators: This button pop up authentication dialog for print jobs which need credentials.
-#: panels/printers/pp-jobs-dialog.ui:232
+#: panels/printers/pp-jobs-dialog.ui:173
 msgid "_Authenticate"
 msgstr "認証(_A)"
 
 #. Translators: this label describes the dialog empty state, with no jobs listed.
-#: panels/printers/pp-jobs-dialog.ui:358
+#: panels/printers/pp-jobs-dialog.ui:214
 msgid "No Active Printer Jobs"
 msgstr "アクティブなジョブはありません"
 
-#: panels/printers/pp-new-printer-dialog.c:269
+#: panels/printers/pp-new-printer-dialog.c:270
 msgid "Unlock Print Server"
 msgstr "プリンターサーバーのロック解除"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:273
+#: panels/printers/pp-new-printer-dialog.c:274
 #, c-format
 msgid "Unlock %s."
 msgstr "%s のロック解除"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:277
+#: panels/printers/pp-new-printer-dialog.c:278
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr ""
 "%s で利用可能なプリンターを表示するにはユーザー名とパスワードを入力してくださ"
 "い。"
 
-#: panels/printers/pp-new-printer-dialog.c:587
+#: panels/printers/pp-new-printer-dialog.c:578
 msgid "Searching for Printers"
 msgstr "プリンターの検索"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1375
+#: panels/printers/pp-new-printer-dialog.c:1366
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1380
+#: panels/printers/pp-new-printer-dialog.c:1371
 msgid "Serial Port"
 msgstr "シリアルポート"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1387
+#: panels/printers/pp-new-printer-dialog.c:1378
 msgid "Parallel Port"
 msgstr "パラレルポート"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1429
+#: panels/printers/pp-new-printer-dialog.c:1420
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1434
+#: panels/printers/pp-new-printer-dialog.c:1425
 #, 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:1461
+#: panels/printers/pp-new-printer-dialog.c:1452
 msgid "Server requires authentication"
 msgstr "サーバーが認証を要求しています"
 
@@ -5437,77 +5215,77 @@ msgid "GhostScript pre-filtering"
 msgstr "GhostScript のプレフィルタリング"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:530
+#: panels/printers/pp-options-dialog.c:517
 msgid "Pages per side"
 msgstr "片面のページ数"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:542
+#: panels/printers/pp-options-dialog.c:529
 msgid "Two-sided"
 msgstr "両面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:554
+#: panels/printers/pp-options-dialog.c:541
 msgid "Orientation"
 msgstr "向き"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:651
+#: panels/printers/pp-options-dialog.c:638
 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:654
+#: panels/printers/pp-options-dialog.c:641
 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:657
+#: panels/printers/pp-options-dialog.c:644
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "インストール可能なオプション"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:660
+#: panels/printers/pp-options-dialog.c:647
 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:663
+#: panels/printers/pp-options-dialog.c:650
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "画質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:666
+#: panels/printers/pp-options-dialog.c:653
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:656
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "表面処理"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:659
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高度"
 
 #. Translators: Name of job which makes printer to print test page
 #. Translators: This button triggers the printing of a test page.
-#: panels/printers/pp-options-dialog.c:857
-#: panels/printers/pp-options-dialog.ui:18
+#: panels/printers/pp-options-dialog.c:844
+#: panels/printers/pp-options-dialog.ui:14
 msgid "Test Page"
 msgstr "テストページ"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:870
+#: panels/printers/pp-options-dialog.c:857
 msgid "Test page"
 msgstr "テストページ"
 
@@ -5549,188 +5327,188 @@ msgstr "プレフィルタリングなし"
 
 #. Translators: Name of column showing printer manufacturers
 #: panels/printers/pp-ppd-selection-dialog.c:220
-#: panels/wwan/cc-wwan-details-dialog.ui:203
+#: panels/wwan/cc-wwan-details-dialog.ui:160
 msgid "Manufacturer"
 msgstr "製造元"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:523 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:526 panels/printers/printer-entry.ui:167
 msgid "No Active Jobs"
 msgstr "アクティブなジョブがありません"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:528
+#: panels/printers/pp-printer-entry.c:531
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u ジョブ"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:648
+#: panels/printers/pp-printer-entry.c:651
 msgid "Clean print heads"
 msgstr "ヘッドクリーニング"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:713
+#: panels/printers/pp-printer-entry.c:719
 msgid "Low on toner"
 msgstr "トナーの残量が少なくなっています"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:715
+#: panels/printers/pp-printer-entry.c:721
 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:718
+#: panels/printers/pp-printer-entry.c:724
 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:721
+#: panels/printers/pp-printer-entry.c:727
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:723
+#: panels/printers/pp-printer-entry.c:729
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:725
+#: panels/printers/pp-printer-entry.c:731
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:727
+#: panels/printers/pp-printer-entry.c:733
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:729
+#: panels/printers/pp-printer-entry.c:735
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:731
+#: panels/printers/pp-printer-entry.c:737
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:733
+#: panels/printers/pp-printer-entry.c:739
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:735
+#: panels/printers/pp-printer-entry.c:741
 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:737
-#: panels/printers/pp-printer-entry.c:880
+#: panels/printers/pp-printer-entry.c:743
+#: panels/printers/pp-printer-entry.c:886
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:739
+#: panels/printers/pp-printer-entry.c:745
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:741
+#: panels/printers/pp-printer-entry.c:747
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:743
+#: panels/printers/pp-printer-entry.c:749
 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:745
+#: panels/printers/pp-printer-entry.c:751
 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:866
+#: panels/printers/pp-printer-entry.c:872
 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:871
+#: panels/printers/pp-printer-entry.c:877
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "ジョブ受付不可"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:876
+#: panels/printers/pp-printer-entry.c:882
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
-#: panels/printers/printer-entry.ui:14
+#: panels/printers/printer-entry.ui:18
 msgid "Printing Options"
 msgstr "プリンターのオプション"
 
-#: panels/printers/printer-entry.ui:26
+#: panels/printers/printer-entry.ui:29
 msgid "Printer Details"
 msgstr "プリンターの詳細"
 
 #. Set this printer as default
-#: panels/printers/printer-entry.ui:38
+#: panels/printers/printer-entry.ui:40
 msgid "Use Printer by Default"
 msgstr "デフォルトプリンター"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: panels/printers/printer-entry.ui:50
+#: panels/printers/printer-entry.ui:52
 msgid "Clean Print Heads"
 msgstr "ヘッドクリーニング"
 
-#: panels/printers/printer-entry.ui:61
+#: panels/printers/printer-entry.ui:62
 msgid "Remove Printer"
 msgstr "プリンターを削除"
 
-#: panels/printers/printer-entry.ui:193
-#: panels/wwan/cc-wwan-details-dialog.ui:229
+#: panels/printers/printer-entry.ui:187
+#: panels/wwan/cc-wwan-details-dialog.ui:184
 msgid "Model"
 msgstr "型式"
 
-#: panels/printers/printer-entry.ui:251
+#: panels/printers/printer-entry.ui:242
 msgid "Ink Level"
 msgstr "インクの量"
 
 #. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:313
+#: panels/printers/printer-entry.ui:304
 msgid "Please restart when the problem is resolved."
 msgstr "問題が解決した場合、再起動してください。"
 
 #. Translators: This is the button which restarts the printer.
-#: panels/printers/printer-entry.ui:320
+#: panels/printers/printer-entry.ui:310
 msgid "Restart"
 msgstr "再起動"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:12
+#: panels/printers/printers.ui:10
 msgid "Add Printer…"
 msgstr "プリンターを追加…"
 
-#: panels/printers/printers.ui:187
+#: panels/printers/printers.ui:168
 msgid "No printers"
 msgstr "プリンターが見つかりません"
 
 #. Translators: This button adds new printer.
-#: panels/printers/printers.ui:201
+#: panels/printers/printers.ui:179
 msgid "Add a Printer…"
 msgstr "プリンターを追加…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:233
+#: panels/printers/printers.ui:204
 msgid ""
 "Sorry! The system printing service\n"
 "    doesn’t seem to be available."
@@ -5738,40 +5516,36 @@ msgstr ""
 "申し訳ありません! システムの印刷サービスは\n"
 "    現在、利用できないようです。"
 
-#: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:189
-#: panels/region/cc-format-chooser.ui:6 panels/region/cc-region-panel.ui:203
+#: panels/region/cc-format-chooser.c:148 panels/region/cc-format-chooser.c:196
+#: panels/region/cc-format-chooser.ui:4
 msgid "Formats"
 msgstr "フォーマット"
 
-#: panels/region/cc-format-chooser.ui:101
-msgid ""
-"Choose the format for numbers, dates and currencies. Changes take effect on "
-"next login."
-msgstr ""
-"数値、日時、通貨の形式を選択してください。変更は次回ログイン時に反映されま"
-"す。"
+#: panels/region/cc-format-chooser.ui:37 panels/wwan/cc-wwan-apn-dialog.ui:21
+msgid "Back"
+msgstr "戻る"
 
-#: panels/region/cc-format-chooser.ui:117
+#: panels/region/cc-format-chooser.ui:76
 msgid "Search locales…"
 msgstr "地域を検索…"
 
-#: panels/region/cc-format-chooser.ui:158
+#: panels/region/cc-format-chooser.ui:113
 msgid "Common Formats"
 msgstr "一般的な形式"
 
-#: panels/region/cc-format-chooser.ui:189
+#: panels/region/cc-format-chooser.ui:140
 msgid "All Formats"
 msgstr "すべての形式"
 
-#: panels/region/cc-format-chooser.ui:242
+#: panels/region/cc-format-chooser.ui:188
 msgid "No Search Results"
 msgstr "検索結果はありません"
 
-#: panels/region/cc-format-chooser.ui:255
+#: panels/region/cc-format-chooser.ui:200
 msgid "Searches can be for countries or languages."
 msgstr "国または言語を検索できます。"
 
-#: panels/region/cc-format-chooser.ui:300
+#: panels/region/cc-format-chooser.ui:236
 msgid "Preview"
 msgstr "プレビュー"
 
@@ -5785,23 +5559,23 @@ msgctxt "measurement format"
 msgid "Metric"
 msgstr "メートル法"
 
-#: panels/region/cc-format-preview.ui:18
+#: panels/region/cc-format-preview.ui:17
 msgid "Dates"
 msgstr "日付"
 
-#: panels/region/cc-format-preview.ui:62
+#: panels/region/cc-format-preview.ui:53
 msgid "Dates & Times"
 msgstr "日付と時刻"
 
-#: panels/region/cc-format-preview.ui:84
+#: panels/region/cc-format-preview.ui:71
 msgid "Numbers"
 msgstr "数字"
 
-#: panels/region/cc-format-preview.ui:106
+#: panels/region/cc-format-preview.ui:89
 msgid "Measurement"
 msgstr "計量単位"
 
-#: panels/region/cc-format-preview.ui:128
+#: panels/region/cc-format-preview.ui:107
 msgid "Paper"
 msgstr "用紙サイズ"
 
@@ -5818,54 +5592,25 @@ msgid ""
 "The language setting is used for interface text and web pages. Formats is "
 "used for numbers, dates, and currencies."
 msgstr ""
-"設定した言語でインターフェースやウェブページのテキストが表示されます。フォ"
-"ーマットは数値、日時、通貨の形式に使用されます。"
+"設定した言語でインターフェースやウェブページのテキストが表示されます。フォー"
+"マットは数値、日時、通貨の形式に使用されます。"
 
 #: panels/region/cc-region-panel.ui:51
 msgid "Your Account"
 msgstr "あなたのアカウント"
 
-#: panels/region/cc-region-panel.ui:42
-msgid "My Account"
-msgstr "自分のアカウント"
-
-#: panels/region/cc-region-panel.ui:53
-msgid "Login Screen"
-msgstr "ログイン画面"
-
-#: panels/region/cc-region-panel.ui:78
-msgid "Language"
-msgstr "言語"
-
-#: panels/region/cc-region-panel.ui:89
-msgid "The language used for text in windows and web pages."
-msgstr "ウェブページやウィンドウのテキストで使われる言語です。"
-
-#: panels/region/cc-region-panel.ui:129
-#: panels/user-accounts/cc-user-panel.ui:311
+#: panels/region/cc-region-panel.ui:56 panels/region/cc-region-panel.ui:95
+#: panels/user-accounts/cc-user-panel.ui:299
 msgid "_Language"
 msgstr "言語(_L)"
 
-#: panels/region/cc-region-panel.ui:164
-msgid "Restart the session for changes to take effect"
-msgstr "変更内容を反映させるにはログインし直す必要があります"
-
-# 言語設定を変更すると表示されるボタンのラベル。クリックするとログアウトダイアログが表示されます。
-#: panels/region/cc-region-panel.ui:179
-msgid "Restart…"
-msgstr "ログアウト…"
-
-#: panels/region/cc-region-panel.ui:214
-msgid "The format used for numbers, dates, and currencies."
-msgstr "数値、日時、通貨の形式です。"
-
-#: panels/region/cc-region-panel.ui:248
+#: panels/region/cc-region-panel.ui:72 panels/region/cc-region-panel.ui:111
 msgid "_Formats"
 msgstr "フォーマット(_F)"
 
-#: panels/region/cc-region-panel.ui:275
-msgid "Login settings are used by all users when logging into the system"
-msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
+#: panels/region/cc-region-panel.ui:90
+msgid "Login Screen"
+msgstr "ログイン画面"
 
 #: panels/region/gnome-region-panel.desktop.in.in:3
 msgid "Region & Language"
@@ -5882,39 +5627,39 @@ msgstr ""
 "Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
 "Region;地域;"
 
-#: panels/removable-media/cc-removable-media-panel.c:267
+#: panels/removable-media/cc-removable-media-panel.c:256
 msgid "Ask what to do"
 msgstr "どうするか確認する"
 
-#: panels/removable-media/cc-removable-media-panel.c:271
+#: panels/removable-media/cc-removable-media-panel.c:260
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: panels/removable-media/cc-removable-media-panel.c:275
+#: panels/removable-media/cc-removable-media-panel.c:264
 msgid "Open folder"
 msgstr "フォルダーを開く"
 
-#: panels/removable-media/cc-removable-media-panel.c:341
+#: panels/removable-media/cc-removable-media-panel.c:331
 msgid "Other Media"
 msgstr "他のメディア"
 
-#: panels/removable-media/cc-removable-media-panel.c:362
+#: panels/removable-media/cc-removable-media-panel.c:352
 msgid "Select an application for audio CDs"
 msgstr "オーディオ CD 用のアプリケーションを選択"
 
-#: panels/removable-media/cc-removable-media-panel.c:363
+#: panels/removable-media/cc-removable-media-panel.c:353
 msgid "Select an application for video DVDs"
 msgstr "ビデオ DVD 用のアプリケーションを選択"
 
-#: panels/removable-media/cc-removable-media-panel.c:364
+#: panels/removable-media/cc-removable-media-panel.c:354
 msgid "Select an application to run when a music player is connected"
 msgstr "音楽プレーヤーが接続されたときに起動するアプリケーションを選択"
 
-#: panels/removable-media/cc-removable-media-panel.c:365
+#: panels/removable-media/cc-removable-media-panel.c:355
 msgid "Select an application to run when a camera is connected"
 msgstr "カメラが接続されたときに起動するアプリケーションを選択"
 
-#: panels/removable-media/cc-removable-media-panel.c:366
+#: panels/removable-media/cc-removable-media-panel.c:356
 msgid "Select an application for software CDs"
 msgstr "ソフトウェアの CD を開くアプリケーションを選択"
 
@@ -5923,92 +5668,92 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: panels/removable-media/cc-removable-media-panel.c:378
+#: panels/removable-media/cc-removable-media-panel.c:368
 msgid "audio DVD"
 msgstr "オーディオ DVD"
 
-#: panels/removable-media/cc-removable-media-panel.c:379
+#: panels/removable-media/cc-removable-media-panel.c:369
 msgid "blank Blu-ray disc"
 msgstr "空のブルーレイディスク"
 
-#: panels/removable-media/cc-removable-media-panel.c:380
+#: panels/removable-media/cc-removable-media-panel.c:370
 msgid "blank CD disc"
 msgstr "空の CD"
 
-#: panels/removable-media/cc-removable-media-panel.c:381
+#: panels/removable-media/cc-removable-media-panel.c:371
 msgid "blank DVD disc"
 msgstr "空の DVD"
 
-#: panels/removable-media/cc-removable-media-panel.c:382
+#: panels/removable-media/cc-removable-media-panel.c:372
 msgid "blank HD DVD disc"
 msgstr "空の HD DVD"
 
-#: panels/removable-media/cc-removable-media-panel.c:383
+#: panels/removable-media/cc-removable-media-panel.c:373
 msgid "Blu-ray video disc"
 msgstr "ブルーレイビデオディスク"
 
-#: panels/removable-media/cc-removable-media-panel.c:384
+#: panels/removable-media/cc-removable-media-panel.c:374
 msgid "e-book reader"
 msgstr "電子書籍リーダー"
 
-#: panels/removable-media/cc-removable-media-panel.c:385
+#: panels/removable-media/cc-removable-media-panel.c:375
 msgid "HD DVD video disc"
 msgstr "HD DVD ビデオディスク"
 
-#: panels/removable-media/cc-removable-media-panel.c:386
+#: panels/removable-media/cc-removable-media-panel.c:376
 msgid "Picture CD"
 msgstr "ピクチャー CD"
 
-#: panels/removable-media/cc-removable-media-panel.c:387
+#: panels/removable-media/cc-removable-media-panel.c:377
 msgid "Super Video CD"
 msgstr "スーパービデオ CD"
 
-#: panels/removable-media/cc-removable-media-panel.c:388
+#: panels/removable-media/cc-removable-media-panel.c:378
 msgid "Video CD"
 msgstr "ビデオ CD"
 
-#: panels/removable-media/cc-removable-media-panel.c:389
+#: panels/removable-media/cc-removable-media-panel.c:379
 msgid "Windows software"
 msgstr "Windows ソフトウェア"
 
-#: panels/removable-media/cc-removable-media-panel.ui:44
+#: panels/removable-media/cc-removable-media-panel.ui:32
 msgid "Select how media should be handled"
 msgstr "メディアの処理方法を選択してください"
 
-#: panels/removable-media/cc-removable-media-panel.ui:75
+#: panels/removable-media/cc-removable-media-panel.ui:52
 msgid "CD _audio"
 msgstr "CD オーディオ(_A)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:92
+#: panels/removable-media/cc-removable-media-panel.ui:67
 msgid "_DVD video"
 msgstr "DVD ビデオ(_D)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:133
+#: panels/removable-media/cc-removable-media-panel.ui:102
 msgid "_Music player"
 msgstr "音楽プレーヤー(_M)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:191
+#: panels/removable-media/cc-removable-media-panel.ui:152
 msgid "_Software"
 msgstr "ソフトウェア(_S)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:229
+#: panels/removable-media/cc-removable-media-panel.ui:178
 msgid "_Other Media…"
 msgstr "他のメディア(_O)…"
 
-#: panels/removable-media/cc-removable-media-panel.ui:288
+#: panels/removable-media/cc-removable-media-panel.ui:195
 msgid "_Never prompt or start programs on media insertion"
 msgstr ""
 "メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
 
-#: panels/removable-media/cc-removable-media-panel.ui:342
+#: panels/removable-media/cc-removable-media-panel.ui:225
 msgid "Select how other media should be handled"
 msgstr "他のメディアの処理を選択してください"
 
-#: panels/removable-media/cc-removable-media-panel.ui:389
+#: panels/removable-media/cc-removable-media-panel.ui:259
 msgid "_Action:"
 msgstr "アクション(_A):"
 
-#: panels/removable-media/cc-removable-media-panel.ui:412
+#: panels/removable-media/cc-removable-media-panel.ui:278
 msgid "_Type:"
 msgstr "種類(_T):"
 
@@ -6031,22 +5776,20 @@ msgstr ""
 "定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディ"
 "ア;媒体;自動起動;オートラン;"
 
-#: panels/search/cc-search-locations-dialog.c:636
+#: panels/search/cc-search-locations-dialog.c:674
 msgid "Select Location"
 msgstr "場所を選択"
 
-#: panels/search/cc-search-locations-dialog.c:640
+#: panels/search/cc-search-locations-dialog.c:678
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: panels/search/cc-search-locations-dialog.ui:9
-#: panels/search/cc-search-panel.ui:57
+#: panels/search/cc-search-locations-dialog.ui:8
+#: panels/search/cc-search-panel.ui:22
 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
+#: panels/search/cc-search-locations-dialog.ui:13
 msgid ""
 "Folders which are searched by system applications, such as Files, Photos and "
 "Videos."
@@ -6054,15 +5797,15 @@ msgstr ""
 "システムアプリケーション (ファイル、ビデオ、写真など) が検索対象にするフォル"
 "ダーです。"
 
-#: panels/search/cc-search-locations-dialog.ui:52
+#: panels/search/cc-search-locations-dialog.ui:18
 msgid "Places"
 msgstr "場所"
 
-#: panels/search/cc-search-locations-dialog.ui:91
+#: panels/search/cc-search-locations-dialog.ui:33
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: panels/search/cc-search-locations-dialog.ui:156
+#: panels/search/cc-search-locations-dialog.ui:48
 msgid "Others"
 msgstr "その他"
 
@@ -6070,7 +5813,7 @@ msgstr "その他"
 msgid "Add Location"
 msgstr "場所を追加"
 
-#: panels/search/cc-search-panel.c:151
+#: panels/search/cc-search-panel.c:165
 msgid "No applications found"
 msgstr "アプリケーションが見つかりませんでした"
 
@@ -6078,25 +5821,29 @@ msgstr "アプリケーションが見つかりませんでした"
 msgid "Application Search"
 msgstr "アプリケーション検索"
 
+#: panels/search/cc-search-panel.ui:11
+#, fuzzy
+#| msgid "Include applications from all _workspaces"
+msgid "Include application-provided search results."
+msgstr "すべてのワークスペースのアプリケーションを含める(_W)"
+
+#: panels/search/cc-search-panel.ui:23
+#, fuzzy
+#| msgid ""
+#| "Folders which are searched by system applications, such as Files, Photos "
+#| "and Videos."
+msgid "Folders which are searched by system applications."
+msgstr ""
+"システムアプリケーション (ファイル、ビデオ、写真など) が検索対象にするフォル"
+"ダーです。"
+
 #: panels/search/cc-search-panel.ui:37
 msgid "Search Results"
 msgstr "検索結果"
 
-#: panels/search/cc-search-panel-row.ui:92
-msgid "Move Up"
-msgstr "上へ"
-
-#: panels/search/cc-search-panel-row.ui:102
-msgid "Move Down"
-msgstr "下へ"
-
-#: panels/search/cc-search-panel.ui:31
-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."
+#: panels/search/cc-search-panel.ui:38
+msgid "Results are displayed according to the list order."
 msgstr ""
-"アクティビティ画面で、どれの検索結果を表示するかを設定します。一覧の項目を入"
-"れ替えると、検索結果の表示順が変更されます。"
 
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
@@ -6111,40 +5858,40 @@ msgstr ""
 "プライバシー;結果;"
 
 #. Label
-#: panels/sharing/cc-sharing-networks.c:306
+#: panels/sharing/cc-sharing-networks.c:265
 msgid "No networks selected for sharing"
 msgstr "共有するネットワークを選択していません"
 
-#: panels/sharing/cc-sharing-networks.ui:19
+#: panels/sharing/cc-sharing-networks.ui:15
 msgid "Networks"
 msgstr "ネットワーク"
 
-#: panels/sharing/cc-sharing-panel.c:289
+#: panels/sharing/cc-sharing-panel.c:367
 msgctxt "service is enabled"
 msgid "On"
 msgstr "オン"
 
-#: panels/sharing/cc-sharing-panel.c:291 panels/sharing/cc-sharing-panel.c:318
+#: panels/sharing/cc-sharing-panel.c:369 panels/sharing/cc-sharing-panel.c:396
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "オフ"
 
-#: panels/sharing/cc-sharing-panel.c:321
+#: panels/sharing/cc-sharing-panel.c:399
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "有効"
 
-#: panels/sharing/cc-sharing-panel.c:324
+#: panels/sharing/cc-sharing-panel.c:402
 msgctxt "service is active"
 msgid "Active"
 msgstr "アクティブ"
 
-#: panels/sharing/cc-sharing-panel.c:393
+#: panels/sharing/cc-sharing-panel.c:520
 msgid "Choose a Folder"
 msgstr "フォルダーを選択"
 
 #. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
-#: panels/sharing/cc-sharing-panel.c:696
+#: panels/sharing/cc-sharing-panel.c:748
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
@@ -6154,7 +5901,7 @@ msgstr ""
 "なたの公開フォルダーを共有できるようにします: %s"
 
 #. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
-#: panels/sharing/cc-sharing-panel.c:702
+#: panels/sharing/cc-sharing-panel.c:754
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -6165,60 +5912,43 @@ msgstr ""
 "ドを使用した接続を許可します:\n"
 "%s"
 
-#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
-#: panels/sharing/cc-sharing-panel.c:708
-#, c-format
-msgid ""
-"Screen sharing allows remote users to view or control your screen by "
-"connecting to %s"
-msgstr ""
-"スクリーン共有を許可した場合、リモートユーザーは次の URI に接続して画面の表示"
-"や操作を行うことができます: %s"
-
-#: panels/sharing/cc-sharing-panel.c:813
-msgid "Copy"
-msgstr "コピー"
-
-#: panels/sharing/cc-sharing-panel.c:1203
+#: panels/sharing/cc-sharing-panel.ui:9
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共有"
 
-#: panels/sharing/cc-sharing-panel.ui:32
+#: panels/sharing/cc-sharing-panel.ui:31
 msgid "_Computer Name"
 msgstr "コンピューター名(_C)"
 
-#: panels/sharing/cc-sharing-panel.ui:79
+#: panels/sharing/cc-sharing-panel.ui:58
 msgid "_File Sharing"
 msgstr "ファイル共有(_F)"
 
-#: panels/sharing/cc-sharing-panel.ui:87
-msgid "_Screen Sharing"
-msgstr "画面共有(_S)"
+#: panels/sharing/cc-sharing-panel.ui:65
+#, fuzzy
+#| msgid "Remote Desktop"
+msgid "Remote _Desktop"
+msgstr "リモートデスクトップ"
 
-#: panels/sharing/cc-sharing-panel.ui:95
+#: panels/sharing/cc-sharing-panel.ui:72
 msgid "_Media Sharing"
 msgstr "メディア共有(_M)"
 
-#: panels/sharing/cc-sharing-panel.ui:103
+#: panels/sharing/cc-sharing-panel.ui:79
 msgid "_Remote Login"
 msgstr "リモートログイン(_R)"
 
-#: panels/sharing/cc-sharing-panel.ui:119
-msgid "Some services are disabled because of no network access."
-msgstr "ネットワークに接続していないため無効になっているサービスがあります。"
-
-#: panels/sharing/cc-sharing-panel.ui:137
-#: panels/sharing/cc-sharing-panel.ui:264
+#: panels/sharing/cc-sharing-panel.ui:92
 msgid "File Sharing"
 msgstr "ファイル共有"
 
-#: panels/sharing/cc-sharing-panel.ui:184
+#: panels/sharing/cc-sharing-panel.ui:138
 msgid "_Require Password"
 msgstr "パスワードを要求する(_R)"
 
-#: panels/sharing/cc-sharing-panel.ui:275
-#: panels/sharing/cc-sharing-panel.ui:345
+#: panels/sharing/cc-sharing-panel.ui:195
+#: panels/sharing/cc-sharing-panel.ui:231
 msgid "Remote Login"
 msgstr "リモートログイン"
 
@@ -6227,6 +5957,12 @@ msgstr "リモートログイン"
 msgid "Remote Desktop"
 msgstr "リモートデスクトップ"
 
+#: panels/sharing/cc-sharing-panel.ui:263
+msgid ""
+"Remote desktop allows viewing and controlling your desktop from another "
+"computer."
+msgstr ""
+
 #: panels/sharing/cc-sharing-panel.ui:268
 msgid "Enable or disable remote desktop connections to this computer."
 msgstr ""
@@ -6240,6 +5976,17 @@ msgstr "リモートコントロール"
 msgid "Allows remote connections to control the screen."
 msgstr "リモート接続でスクリーンを操作することを許可します。"
 
+#: panels/sharing/cc-sharing-panel.ui:294
+#, fuzzy
+#| msgid "Forget Connection"
+msgid "How to Connect"
+msgstr "接続情報を破棄"
+
+#: panels/sharing/cc-sharing-panel.ui:295
+msgid ""
+"Connect to this computer using the device name or remote desktop address."
+msgstr ""
+
 #: panels/sharing/cc-sharing-panel.ui:323
 msgid "Remote Desktop Address"
 msgstr "リモートデスクトップアドレス"
@@ -6248,49 +5995,42 @@ msgstr "リモートデスクトップアドレス"
 msgid "Authentication"
 msgstr "認証"
 
+#: panels/sharing/cc-sharing-panel.ui:351
+#, fuzzy
+#| msgid "Enable or disable remote desktop connections to this computer."
+msgid "The user name and password are required to connect to this computer."
+msgstr ""
+"このコンピューターへのリモートデスクトップ接続の有効/無効を切り替えます。"
+
 #: panels/sharing/cc-sharing-panel.ui:355
 msgid "User Name"
 msgstr "ユーザー名"
 
-#: panels/sharing/cc-sharing-panel.ui:368
-#: panels/sharing/cc-sharing-panel.ui:590
-msgid "Screen Sharing"
-msgstr "画面共有"
-
-#: panels/sharing/cc-sharing-panel.ui:422
-msgid "_Allow connections to control the screen"
-msgstr "このスクリーンを操作する接続を許可する(_A)"
-
-#: panels/sharing/cc-sharing-panel.ui:447
-msgid "_Password:"
-msgstr "パスワード(_P):"
-
-#: panels/sharing/cc-sharing-panel.ui:477
-msgid "_Show Password"
-msgstr "パスワードを表示する(_S)"
-
-#: panels/sharing/cc-sharing-panel.ui:508
-msgid "Access Options"
-msgstr "アクセスオプション"
+#: panels/sharing/cc-sharing-panel.ui:401
+msgid "Verify Encryption"
+msgstr ""
 
-#: panels/sharing/cc-sharing-panel.ui:522
-msgid "_New connections must ask for access"
-msgstr "新規接続の場合アクセス要求を必要とする(_N)"
+#: panels/sharing/cc-sharing-panel.ui:430
+#, fuzzy
+#| msgid "Fingerprint"
+msgid "Encryption Fingerprint"
+msgstr "指紋認証"
 
-#: panels/sharing/cc-sharing-panel.ui:540
-msgid "_Require a password"
-msgstr "パスワードを要求する(_R)"
+#: panels/sharing/cc-sharing-panel.ui:431
+msgid ""
+"The encryption fingerprint can be seen in connecting clients and should be "
+"identical"
+msgstr ""
 
-#: panels/sharing/cc-sharing-panel.ui:601
-#: panels/sharing/cc-sharing-panel.ui:695
+#: panels/sharing/cc-sharing-panel.ui:463
 msgid "Media Sharing"
 msgstr "メディア共有"
 
-#: panels/sharing/cc-sharing-panel.ui:634
+#: panels/sharing/cc-sharing-panel.ui:485
 msgid "Share music, photos and videos over the network."
 msgstr "音楽や写真、ビデオをネットワーク上で共有できます。"
 
-#: panels/sharing/cc-sharing-panel.ui:649
+#: panels/sharing/cc-sharing-panel.ui:498
 msgid "Folders"
 msgstr "フォルダー"
 
@@ -6317,7 +6057,7 @@ msgstr "リモートログインの有効化/無効化"
 msgid "Authentication is required to enable or disable remote login"
 msgstr "リモートログインを有効化または無効化するには認証が必要になります"
 
-#: panels/sound/cc-alert-chooser.c:151
+#: panels/sound/cc-alert-chooser.c:150
 msgid "Custom"
 msgstr "その他"
 
@@ -6325,15 +6065,15 @@ msgstr "その他"
 msgid "Bark"
 msgstr "犬が吠える音"
 
-#: panels/sound/cc-alert-chooser.ui:19
+#: panels/sound/cc-alert-chooser.ui:20
 msgid "Drip"
 msgstr "水が滴る音"
 
-#: panels/sound/cc-alert-chooser.ui:26
+#: panels/sound/cc-alert-chooser.ui:28
 msgid "Glass"
 msgstr "ガラスを叩く音"
 
-#: panels/sound/cc-alert-chooser.ui:33
+#: panels/sound/cc-alert-chooser.ui:36
 msgid "Sonar"
 msgstr "ソナーのピング音"
 
@@ -6350,59 +6090,59 @@ msgstr "フロント"
 msgid "Testing %s"
 msgstr "%s のテスト中"
 
-#: panels/sound/cc-output-test-dialog.ui:127
+#: panels/sound/cc-output-test-dialog.ui:131
 msgid "Click a speaker to test"
 msgstr "スピーカーをクリックしてテストしてください"
 
-#: panels/sound/cc-sound-panel.ui:27
+#: panels/sound/cc-sound-panel.ui:8
 msgid "System Volume"
 msgstr "システムの音量"
 
-#: panels/sound/cc-sound-panel.ui:43
+#: panels/sound/cc-sound-panel.ui:25
 msgid "Volume Levels"
 msgstr "音量レベル"
 
-#: panels/sound/cc-sound-panel.ui:63
+#: panels/sound/cc-sound-panel.ui:35
 msgid "Output"
 msgstr "出力"
 
-#: panels/sound/cc-sound-panel.ui:90
+#: panels/sound/cc-sound-panel.ui:56
 msgid "Output Device"
 msgstr "出力デバイス"
 
-#: panels/sound/cc-sound-panel.ui:113
+#: panels/sound/cc-sound-panel.ui:75
 msgid "Test"
 msgstr "テスト"
 
-#: panels/sound/cc-sound-panel.ui:144 panels/sound/cc-sound-panel.ui:319
+#: panels/sound/cc-sound-panel.ui:104 panels/sound/cc-sound-panel.ui:263
 msgid "Configuration"
 msgstr "設定"
 
-#: panels/sound/cc-sound-panel.ui:177
+#: panels/sound/cc-sound-panel.ui:135
 msgid "Balance"
 msgstr "バランス"
 
-#: panels/sound/cc-sound-panel.ui:204
+#: panels/sound/cc-sound-panel.ui:161
 msgid "Fade"
 msgstr "フェード"
 
-#: panels/sound/cc-sound-panel.ui:231
+#: panels/sound/cc-sound-panel.ui:187
 msgid "Subwoofer"
 msgstr "サブウーファー"
 
-#: panels/sound/cc-sound-panel.ui:251
+#: panels/sound/cc-sound-panel.ui:205
 msgid "Input"
 msgstr "入力"
 
-#: panels/sound/cc-sound-panel.ui:278
+#: panels/sound/cc-sound-panel.ui:226
 msgid "Input Device"
 msgstr "入力デバイス"
 
-#: panels/sound/cc-sound-panel.ui:352
+#: panels/sound/cc-sound-panel.ui:294
 msgid "Volume"
 msgstr "音量"
 
-#: panels/sound/cc-sound-panel.ui:372
+#: panels/sound/cc-sound-panel.ui:312
 msgid "Alert Sound"
 msgstr "警告音"
 
@@ -6428,120 +6168,129 @@ msgstr ""
 "ド;マイク;音量;フェード;バランス;ブルートゥース;ヘッドセット;オーディオ;"
 "Sound;サウンド;アウトプット;インプット;"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:94
-#: panels/thunderbolt/cc-bolt-device-entry.c:125
+#: panels/thunderbolt/cc-bolt-device-dialog.c:92
+#: panels/thunderbolt/cc-bolt-device-entry.c:123
 msgctxt "Thunderbolt Device Status"
 msgid "Disconnected"
 msgstr "切断"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:97
-#: panels/thunderbolt/cc-bolt-device-entry.c:128
+#: panels/thunderbolt/cc-bolt-device-dialog.c:95
+#: panels/thunderbolt/cc-bolt-device-entry.c:126
 msgctxt "Thunderbolt Device Status"
 msgid "Connecting"
 msgstr "接続中"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:100
-#: panels/thunderbolt/cc-bolt-device-entry.c:132
-#: panels/thunderbolt/cc-bolt-device-entry.c:144
+#: panels/thunderbolt/cc-bolt-device-dialog.c:98
+#: panels/thunderbolt/cc-bolt-device-entry.c:130
+#: panels/thunderbolt/cc-bolt-device-entry.c:142
 msgctxt "Thunderbolt Device Status"
 msgid "Connected"
 msgstr "接続"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:103
+#: panels/thunderbolt/cc-bolt-device-dialog.c:101
 msgctxt "Thunderbolt Device Status"
 msgid "Authorization Error"
 msgstr "認証エラー"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:106
-#: panels/thunderbolt/cc-bolt-device-entry.c:138
+#: panels/thunderbolt/cc-bolt-device-dialog.c:104
+#: panels/thunderbolt/cc-bolt-device-entry.c:136
 msgctxt "Thunderbolt Device Status"
 msgid "Authorizing"
 msgstr "認証中"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:113
+#: panels/thunderbolt/cc-bolt-device-dialog.c:111
 msgctxt "Thunderbolt Device Status"
 msgid "Reduced Functionality"
 msgstr ""
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:115
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
 msgctxt "Thunderbolt Device Status"
 msgid "Connected & Authorized"
 msgstr "接続 & 認証"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:121
-#: panels/thunderbolt/cc-bolt-device-entry.c:152
+#: panels/thunderbolt/cc-bolt-device-dialog.c:119
+#: panels/thunderbolt/cc-bolt-device-entry.c:150
 msgctxt "Thunderbolt Device Status"
 msgid "Unknown"
 msgstr "不明"
 
 #. Translators: The time point the device was authorized.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:177
+#: panels/thunderbolt/cc-bolt-device-dialog.c:175
 msgid "Authorized at:"
 msgstr "認証日時:"
 
 #. Translators: The time point the device was connected.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:183
+#: panels/thunderbolt/cc-bolt-device-dialog.c:181
 msgid "Connected at:"
 msgstr "接続日時:"
 
 #. Translators: The time point the device was enrolled,
 #. * i.e. authorized and stored in the device database.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:190
+#: panels/thunderbolt/cc-bolt-device-dialog.c:188
 msgid "Enrolled at:"
 msgstr "登録日時:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:264
+#: panels/thunderbolt/cc-bolt-device-dialog.c:262
 msgid "Failed to authorize device: "
 msgstr "デバイスの認証に失敗しました: "
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:333
+#: panels/thunderbolt/cc-bolt-device-dialog.c:329
 msgid "Failed to forget device: "
 msgstr "デバイスの削除に失敗しました: "
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:491
+#: panels/thunderbolt/cc-bolt-device-dialog.c:485
 #, c-format
 msgid "Depends on %u other device"
 msgid_plural "Depends on %u other devices"
 msgstr[0] ""
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:109
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:84
 msgid "Name:"
 msgstr "名前:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:112
 msgid "Status:"
 msgstr "ステータス:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:174
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
 msgid "UUID:"
 msgstr "UUID:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:324
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:247
 msgid "Authorize and Connect"
 msgstr "認証と接続"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:346
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:263
 msgid "Forget Device"
 msgstr "デバイスを削除"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:135
+#: panels/thunderbolt/cc-bolt-device-entry.c:133
 msgctxt "Thunderbolt Device Status"
 msgid "Error"
 msgstr "エラー"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:146
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
 msgstr "認証"
 
-#: panels/thunderbolt/cc-bolt-panel.c:175
+#: panels/thunderbolt/cc-bolt-panel.c:169
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 msgstr ""
 "Thunderbolt サブシステム (boltd) がインストールされていないか、正しくセット"
 "アップされていません。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:468
+#: panels/thunderbolt/cc-bolt-panel.c:425
+#: panels/thunderbolt/cc-bolt-panel.ui:157
+msgid "Allow direct access to devices such as docks and external GPUs."
+msgstr "ドックや外付け GPU などのデバイスへのダイレクトアクセスを許可します。"
+
+#: panels/thunderbolt/cc-bolt-panel.c:426
+msgid "Only USB and Display Port devices can attach."
+msgstr "USB デバイスと DisplayPort デバイスのみ接続できます。"
+
+#: panels/thunderbolt/cc-bolt-panel.c:461
 msgid ""
 "Thunderbolt could not be detected.\n"
 "Either the system lacks Thunderbolt support, it has been disabled in the "
@@ -6552,20 +6301,20 @@ msgstr ""
 "になっているか、もしくは BIOS で Thunderbolt のセキュリティレベルが対応してい"
 "ない設定になっているかのいずれかです。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:512
+#: panels/thunderbolt/cc-bolt-panel.c:505
 msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt サポートは BIOS で無効化されています。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:516
+#: panels/thunderbolt/cc-bolt-panel.c:509
 msgid "Thunderbolt security level could not be determined."
 msgstr "Thunderbolt のセキュリティレベルを確認できませんでした。"
 
-#: panels/thunderbolt/cc-bolt-panel.c:621
+#: panels/thunderbolt/cc-bolt-panel.c:614
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "ダイレクトモードの切り替え中にエラーが発生しました: %s"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:143
+#: panels/thunderbolt/cc-bolt-panel.ui:103
 msgid "No Thunderbolt Support"
 msgstr "Thunderbolt サポートがありません"
 
@@ -6573,23 +6322,15 @@ msgstr "Thunderbolt サポートがありません"
 msgid "Could not connect to the thunderbolt subsystem."
 msgstr "Thunderbolt サブシステムに接続できませんでした。"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:246
+#: panels/thunderbolt/cc-bolt-panel.ui:153
 msgid "Direct Access"
 msgstr "ダイレクトアクセス"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:269
-msgid "Allow direct access to devices such as docks and external GPUs."
-msgstr "ドックや外付け GPU などのデバイスへのダイレクトアクセスを許可します。"
-
-#: panels/thunderbolt/cc-bolt-panel.ui:289
-msgid "Only USB and Display Port devices can attach."
-msgstr "USB デバイスと DisplayPort デバイスのみ接続できます。"
-
-#: panels/thunderbolt/cc-bolt-panel.ui:397
+#: panels/thunderbolt/cc-bolt-panel.ui:225
 msgid "Pending Devices"
 msgstr "保留中のデバイス"
 
-#: panels/thunderbolt/cc-bolt-panel.ui:535
+#: panels/thunderbolt/cc-bolt-panel.ui:319
 msgid "No devices attached"
 msgstr "デバイスが接続されていません"
 
@@ -6606,393 +6347,375 @@ msgstr "Thunderbolt デバイスを管理します"
 msgid "Thunderbolt;privacy;"
 msgstr "Thunderbolt;privacy;プライバシー;"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:7
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:5
 msgid "Cursor Blinking"
 msgstr "カーソルの点滅"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:37
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:29
 msgid "Cursor blinks in text fields."
 msgstr "テキストフィールドでカーソルを点滅させます。"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:74
-#: panels/universal-access/cc-repeat-keys-dialog.ui:145
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:62
+#: panels/universal-access/cc-repeat-keys-dialog.ui:117
 msgid "Speed"
 msgstr "速度"
 
-#: panels/universal-access/cc-cursor-blinking-dialog.ui:101
+#: panels/universal-access/cc-cursor-blinking-dialog.ui:84
 msgid "Cursor blinking speed"
 msgstr "カーソルが点滅する速さです"
 
-#: panels/universal-access/cc-cursor-size-dialog.ui:7
+#: panels/universal-access/cc-cursor-size-dialog.ui:5
 msgid "Cursor Size"
 msgstr "カーソルの大きさ"
 
-#: panels/universal-access/cc-cursor-size-dialog.ui:29
+#: panels/universal-access/cc-cursor-size-dialog.ui:22
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "ズーム機能と組み合わせてカーソルの大きさを設定することでカーソルがより見やす"
 "くなります。"
 
-#: panels/universal-access/cc-pointing-dialog.ui:7
+#: panels/universal-access/cc-pointing-dialog.ui:5
 msgid "Click Assist"
 msgstr "クリック支援"
 
-#: panels/universal-access/cc-pointing-dialog.ui:43
+#: panels/universal-access/cc-pointing-dialog.ui:38
 msgid "_Simulated Secondary Click"
 msgstr "副ボタンのクリックの代替(_S)"
 
-#: panels/universal-access/cc-pointing-dialog.ui:56
+#: panels/universal-access/cc-pointing-dialog.ui:49
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
 
-#: panels/universal-access/cc-pointing-dialog.ui:79
-#: panels/universal-access/cc-typing-dialog.ui:158
-#: panels/universal-access/cc-typing-dialog.ui:307
+#: panels/universal-access/cc-pointing-dialog.ui:66
+#: panels/universal-access/cc-typing-dialog.ui:123
+#: panels/universal-access/cc-typing-dialog.ui:230
 msgid "A_cceptance delay:"
 msgstr "認識するまでの間隔(_C):"
 
-#: panels/universal-access/cc-pointing-dialog.ui:95
+#: panels/universal-access/cc-pointing-dialog.ui:78
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-pointing-dialog.ui:110
+#: panels/universal-access/cc-pointing-dialog.ui:90
 msgid "Secondary click delay"
 msgstr "副ボタンのクリックの間隔"
 
-#: panels/universal-access/cc-pointing-dialog.ui:120
+#: panels/universal-access/cc-pointing-dialog.ui:97
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長い"
 
 # See also ja.po of mousetweak
-#: panels/universal-access/cc-pointing-dialog.ui:157
+#: panels/universal-access/cc-pointing-dialog.ui:126
 msgid "_Hover Click"
 msgstr "ホバークリック(_H)"
 
-#: panels/universal-access/cc-pointing-dialog.ui:170
+#: panels/universal-access/cc-pointing-dialog.ui:137
 msgid "Trigger a click when the pointer hovers"
 msgstr "ポインターの移動を停止したらクリック動作を行う"
 
-#: panels/universal-access/cc-pointing-dialog.ui:193
+#: panels/universal-access/cc-pointing-dialog.ui:154
 msgid "D_elay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: panels/universal-access/cc-pointing-dialog.ui:210
+#: panels/universal-access/cc-pointing-dialog.ui:166
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-pointing-dialog.ui:232
+#: panels/universal-access/cc-pointing-dialog.ui:184
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-pointing-dialog.ui:253
+#: panels/universal-access/cc-pointing-dialog.ui:201
 msgid "Motion _threshold:"
 msgstr "ジェスチャーのしきい値(_T):"
 
-#: panels/universal-access/cc-pointing-dialog.ui:270
+#: panels/universal-access/cc-pointing-dialog.ui:213
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: panels/universal-access/cc-pointing-dialog.ui:292
+#: panels/universal-access/cc-pointing-dialog.ui:231
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:7
+#: panels/universal-access/cc-repeat-keys-dialog.ui:5
 msgid "Repeat Keys"
 msgstr "リピートキー"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:37
+#: panels/universal-access/cc-repeat-keys-dialog.ui:29
 msgid "Key presses repeat when key is held down."
 msgstr "キーを長押しすると繰り返しキー入力を行います。"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:102
+#: panels/universal-access/cc-repeat-keys-dialog.ui:85
 msgid "Repeat keys delay"
 msgstr "リピートキーが行われるまでの時間です"
 
-#: panels/universal-access/cc-repeat-keys-dialog.ui:174
+#: panels/universal-access/cc-repeat-keys-dialog.ui:141
 msgid "Repeat keys speed"
 msgstr "押したキーをリピートするときの速さです"
 
-# 直訳するなら「サウンドキー」のようになるが、この直訳ではユーザーに意味を誤解されるおそれがある。
-# Windows では、これに相当する機能は「Toggle Keys」と呼ばれており[1]、その日本語訳は「切り替えキー」である[2]。
-# 
「切り替えキー」もわかりやすいとは言いづらいが、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-sound-keys-dialog.ui:7
-msgid "Sound Keys"
-msgstr "切り替えキー"
-
-#: panels/universal-access/cc-sound-keys-dialog.ui:25
-msgid "Beep when Num Lock or Caps Lock are turned on or off."
-msgstr "Caps Lock と Num Lock の ON/OFF が切り替わるとビープ音を鳴らします。"
-
-#: panels/universal-access/cc-sound-keys-dialog.ui:45
-#: panels/universal-access/cc-ua-panel.ui:412
-msgid "_Sound Keys"
-msgstr "切り替えキー(_S)"
-
-#: panels/universal-access/cc-screen-reader-dialog.ui:7
-msgid "Screen Reader"
-msgstr "スクリーンリーダー"
-
-#: panels/universal-access/cc-screen-reader-dialog.ui:24
-msgid "The screen reader reads displayed text as you move the focus."
-msgstr ""
-"スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み"
-"上げます。"
-
-#: panels/universal-access/cc-screen-reader-dialog.ui:52
-msgid "_Screen Reader"
-msgstr "スクリーンリーダー(_S)"
-
-#: panels/universal-access/cc-typing-dialog.ui:7
+#: panels/universal-access/cc-typing-dialog.ui:4
 msgid "Typing Assist"
 msgstr "タイピング支援"
 
-#: panels/universal-access/cc-typing-dialog.ui:46
+#: panels/universal-access/cc-typing-dialog.ui:41
 msgid "_Sticky Keys"
 msgstr "固定キー(_S)"
 
-#: panels/universal-access/cc-typing-dialog.ui:58
+#: panels/universal-access/cc-typing-dialog.ui:51
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr ""
 "修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
 
-#: panels/universal-access/cc-typing-dialog.ui:72
+#: panels/universal-access/cc-typing-dialog.ui:63
 msgid "_Disable if two keys are pressed together"
 msgstr "同時に 2 つのキーを押したら無効にする(_D)"
 
-#: panels/universal-access/cc-typing-dialog.ui:85
+#: panels/universal-access/cc-typing-dialog.ui:71
 msgid "Beep when a _modifier key is pressed"
 msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
 
-#: panels/universal-access/cc-typing-dialog.ui:123
+#: panels/universal-access/cc-typing-dialog.ui:96
 msgid "S_low Keys"
 msgstr "スローキー(_L)"
 
-#: panels/universal-access/cc-typing-dialog.ui:135
+#: panels/universal-access/cc-typing-dialog.ui:106
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
 
-#: panels/universal-access/cc-typing-dialog.ui:175
+#: panels/universal-access/cc-typing-dialog.ui:135
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-typing-dialog.ui:190
+#: panels/universal-access/cc-typing-dialog.ui:147
 msgid "Slow keys typing delay"
 msgstr "スローキーの入力間隔"
 
-#: panels/universal-access/cc-typing-dialog.ui:200
+#: panels/universal-access/cc-typing-dialog.ui:154
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-typing-dialog.ui:212
+#: panels/universal-access/cc-typing-dialog.ui:166
 msgid "Beep when a key is pr_essed"
 msgstr "キーが押されたらビープ音を鳴らす(_E)"
 
-#: panels/universal-access/cc-typing-dialog.ui:224
+#: panels/universal-access/cc-typing-dialog.ui:173
 msgid "Beep when a key is _accepted"
 msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
 
-#: panels/universal-access/cc-typing-dialog.ui:236
-#: panels/universal-access/cc-typing-dialog.ui:361
+#: panels/universal-access/cc-typing-dialog.ui:180
+#: panels/universal-access/cc-typing-dialog.ui:273
 msgid "Beep when a key is _rejected"
 msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
 
-#: panels/universal-access/cc-typing-dialog.ui:272
+#: panels/universal-access/cc-typing-dialog.ui:203
 msgid "_Bounce Keys"
 msgstr "バウンスキー(_B)"
 
-#: panels/universal-access/cc-typing-dialog.ui:284
+#: panels/universal-access/cc-typing-dialog.ui:213
 msgid "Ignores fast duplicate keypresses"
 msgstr "同じキーを繰り返し押した場合は無視する"
 
-#: panels/universal-access/cc-typing-dialog.ui:324
+#: panels/universal-access/cc-typing-dialog.ui:242
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-typing-dialog.ui:339
+#: panels/universal-access/cc-typing-dialog.ui:254
 msgid "Bounce keys typing delay"
 msgstr "バウンスキーの入力間隔"
 
-#: panels/universal-access/cc-typing-dialog.ui:349
+#: panels/universal-access/cc-typing-dialog.ui:261
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: panels/universal-access/cc-typing-dialog.ui:437
+#: panels/universal-access/cc-typing-dialog.ui:326
 msgid "_Enable by Keyboard"
 msgstr "キーボードから有効化できるようにする(_E)"
 
-#: panels/universal-access/cc-typing-dialog.ui:449
+#: panels/universal-access/cc-typing-dialog.ui:336
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:351
+#: panels/universal-access/cc-ua-panel.c:357
 msgctxt "cursor size"
 msgid "Default"
 msgstr "デフォルト"
 
-#: panels/universal-access/cc-ua-panel.c:354
+#: panels/universal-access/cc-ua-panel.c:360
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: panels/universal-access/cc-ua-panel.c:357
+#: panels/universal-access/cc-ua-panel.c:363
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: panels/universal-access/cc-ua-panel.c:360
+#: panels/universal-access/cc-ua-panel.c:366
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "特大"
 
-#: panels/universal-access/cc-ua-panel.c:363
+#: panels/universal-access/cc-ua-panel.c:369
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: panels/universal-access/cc-ua-panel.c:367
+#: panels/universal-access/cc-ua-panel.c:373
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d ピクセル"
 
-#: panels/universal-access/cc-ua-panel.ui:55
+#: panels/universal-access/cc-ua-panel.ui:17
 msgid "_Always Show Accessibility Menu"
 msgstr "常にアクセシビリティメニューを表示する(_A)"
 
-#: panels/universal-access/cc-ua-panel.ui:97
+#: panels/universal-access/cc-ua-panel.ui:31
 msgid "Seeing"
 msgstr "見る"
 
-#: panels/universal-access/cc-ua-panel.ui:143
+#: panels/universal-access/cc-ua-panel.ui:34
 msgid "_High Contrast"
 msgstr "ハイコントラスト(_H)"
 
-#: panels/universal-access/cc-ua-panel.ui:190
+#: panels/universal-access/cc-ua-panel.ui:46
 msgid "_Large Text"
 msgstr "大きな文字(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:238
+#: panels/universal-access/cc-ua-panel.ui:58
 msgid "Enable A_nimations"
 msgstr "アニメーションを有効にする(_N)"
 
-#: panels/universal-access/cc-ua-panel.ui:273
+#: panels/universal-access/cc-ua-panel.ui:70
+msgid "Screen _Reader"
+msgstr "スクリーンリーダー(_R)"
+
+#: panels/universal-access/cc-ua-panel.ui:71
+msgid "The screen reader reads displayed text as you move the focus."
+msgstr ""
+"スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み"
+"上げます。"
+
+#: panels/universal-access/cc-ua-panel.ui:83
+msgid "_Sound Keys"
+msgstr "切り替えキー(_S)"
+
+#: panels/universal-access/cc-ua-panel.ui:84
+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:96
 msgid "C_ursor Size"
 msgstr "カーソルの大きさ(_U)"
 
-#: panels/universal-access/cc-ua-panel.ui:320
-#: panels/universal-access/cc-zoom-options-dialog.ui:91
+#: panels/universal-access/cc-ua-panel.ui:116
+#: panels/universal-access/cc-zoom-options-dialog.ui:82
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: panels/universal-access/cc-ua-panel.ui:366
-msgid "Screen _Reader"
-msgstr "スクリーンリーダー(_R)"
-
-#: panels/universal-access/cc-ua-panel.ui:474
+#: panels/universal-access/cc-ua-panel.ui:138
 msgid "Hearing"
 msgstr "聞く"
 
-#: panels/universal-access/cc-ua-panel.ui:518
-#: panels/universal-access/cc-visual-alerts-dialog.ui:68
+#: panels/universal-access/cc-ua-panel.ui:141
+#: panels/universal-access/cc-visual-alerts-dialog.ui:54
 msgid "_Visual Alerts"
 msgstr "視覚警告(_V)"
 
-#: panels/universal-access/cc-ua-panel.ui:626
+#: panels/universal-access/cc-ua-panel.ui:166
 msgid "Screen _Keyboard"
 msgstr "スクリーンキーボード(_K)"
 
-#: panels/universal-access/cc-ua-panel.ui:671
+#: panels/universal-access/cc-ua-panel.ui:178
 msgid "R_epeat Keys"
 msgstr "リピートキー(_E)"
 
-#: panels/universal-access/cc-ua-panel.ui:717
+#: panels/universal-access/cc-ua-panel.ui:198
 msgid "Cursor _Blinking"
 msgstr "カーソルの点滅(_B)"
 
-#: panels/universal-access/cc-ua-panel.ui:763
+#: panels/universal-access/cc-ua-panel.ui:218
 msgid "_Typing Assist (AccessX)"
 msgstr "タイピング支援 [AccessX](_T)"
 
-#: panels/universal-access/cc-ua-panel.ui:824
+#: panels/universal-access/cc-ua-panel.ui:240
 msgid "Pointing &amp; Clicking"
 msgstr "ポインター操作とクリック"
 
-#: panels/universal-access/cc-ua-panel.ui:870
+#: panels/universal-access/cc-ua-panel.ui:243
 msgid "_Mouse Keys"
 msgstr "マウスキー(_M)"
 
-#: panels/universal-access/cc-ua-panel.ui:915
+#: panels/universal-access/cc-ua-panel.ui:255
 msgid "_Locate Pointer"
 msgstr "ポインターの位置確認(_L)"
 
-#: panels/universal-access/cc-ua-panel.ui:947
+#: panels/universal-access/cc-ua-panel.ui:267
 msgid "_Click Assist"
 msgstr "クリック支援(_C)"
 
-#: panels/universal-access/cc-ua-panel.ui:993
+#: panels/universal-access/cc-ua-panel.ui:287
 msgid "_Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔(_D)"
 
-#: panels/universal-access/cc-ua-panel.ui:1013
+#: panels/universal-access/cc-ua-panel.ui:297
 msgid "Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔"
 
-#: panels/universal-access/cc-visual-alerts-dialog.ui:15
+#: panels/universal-access/cc-visual-alerts-dialog.ui:5
 msgid "Visual Alerts"
 msgstr "視覚警告"
 
-#: panels/universal-access/cc-visual-alerts-dialog.ui:19
+#: panels/universal-access/cc-visual-alerts-dialog.ui:14
 msgid "_Test flash"
 msgstr "動作確認(_T)"
 
-#: panels/universal-access/cc-visual-alerts-dialog.ui:48
+#: panels/universal-access/cc-visual-alerts-dialog.ui:38
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "警告音が鳴った場合に視覚的に警告を表示します。"
 
-#: panels/universal-access/cc-visual-alerts-dialog.ui:94
-msgid "Flash the entire _window"
-msgstr "ウィンドウ全体をひらめかせる(_W)"
-
-#: panels/universal-access/cc-visual-alerts-dialog.ui:112
+#: panels/universal-access/cc-visual-alerts-dialog.ui:74
 msgid "Flash the entire _screen"
 msgstr "画面全体をひらめかせる(_S)"
 
-#: panels/universal-access/cc-zoom-options-dialog.c:303
+#: panels/universal-access/cc-visual-alerts-dialog.ui:86
+msgid "Flash the entire _window"
+msgstr "ウィンドウ全体をひらめかせる(_W)"
+
+#: panels/universal-access/cc-zoom-options-dialog.c:306
 msgctxt "Distance"
 msgid "Short"
 msgstr "短い"
 
-#: panels/universal-access/cc-zoom-options-dialog.c:304
+#: panels/universal-access/cc-zoom-options-dialog.c:307
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "画面の¼"
 
-#: panels/universal-access/cc-zoom-options-dialog.c:305
+#: panels/universal-access/cc-zoom-options-dialog.c:308
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "画面の½"
 
-#: panels/universal-access/cc-zoom-options-dialog.c:306
+#: panels/universal-access/cc-zoom-options-dialog.c:309
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "画面の¾"
 
-#: panels/universal-access/cc-zoom-options-dialog.c:307
+#: panels/universal-access/cc-zoom-options-dialog.c:310
 msgctxt "Distance"
 msgid "Long"
 msgstr "長い"
@@ -7017,137 +6740,137 @@ msgstr "左半分"
 msgid "Right Half"
 msgstr "右半分"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:70
+#: panels/universal-access/cc-zoom-options-dialog.ui:68
 msgid "Zoom Options"
 msgstr "ズームオプション"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:151
+#: panels/universal-access/cc-zoom-options-dialog.ui:119
 msgid "_Magnification:"
 msgstr "拡大率(_M):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:201
+#: panels/universal-access/cc-zoom-options-dialog.ui:146
+msgid "Magnifier Position:"
+msgstr "拡大領域の位置:"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:163
 msgid "_Follow mouse cursor"
 msgstr "マウスカーソルの動きを追う(_F)"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:221
+#: panels/universal-access/cc-zoom-options-dialog.ui:174
 msgid "_Screen part:"
 msgstr "拡大部分(_S):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:278
+#: panels/universal-access/cc-zoom-options-dialog.ui:208
 msgid "Magnifier _extends outside of screen"
 msgstr "画面の外側も表示する(_E)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: panels/universal-access/cc-zoom-options-dialog.ui:292
+#: panels/universal-access/cc-zoom-options-dialog.ui:215
 msgid "_Keep magnifier cursor centered"
 msgstr "カーソルを画面中央にキープする (中央)(_K)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: panels/universal-access/cc-zoom-options-dialog.ui:307
+#: panels/universal-access/cc-zoom-options-dialog.ui:223
 msgid "Magnifier cursor _pushes contents around"
 msgstr "拡大領域を押し出すように移動する (プッシュ)(_P)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: panels/universal-access/cc-zoom-options-dialog.ui:322
+#: panels/universal-access/cc-zoom-options-dialog.ui:231
 msgid "Magnifier cursor moves with _contents"
 msgstr "カーソルの動きに拡大領域を移動する (プロポーショナル)(_C)"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:347
-msgid "Magnifier Position:"
-msgstr "拡大領域の位置:"
-
-#: panels/universal-access/cc-zoom-options-dialog.ui:362
+#: panels/universal-access/cc-zoom-options-dialog.ui:247
 msgid "Magnifier"
 msgstr "拡大鏡"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:410
+#: panels/universal-access/cc-zoom-options-dialog.ui:267
+msgid "_Crosshairs:"
+msgstr "照準線(_C):"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:284
+msgid "_Overlaps mouse cursor"
+msgstr "マウスカーソルに重ねる(_O)"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:306
 msgid "_Thickness:"
 msgstr "太さ(_T):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:436
+#: panels/universal-access/cc-zoom-options-dialog.ui:330
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "細い"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:458
+#: panels/universal-access/cc-zoom-options-dialog.ui:348
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "太い"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:479
+#: panels/universal-access/cc-zoom-options-dialog.ui:361
 msgid "_Length:"
 msgstr "長さ(_L):"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/cc-zoom-options-dialog.ui:523
+#: panels/universal-access/cc-zoom-options-dialog.ui:395
 msgid "Co_lor:"
 msgstr "色(_L):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:577
-msgid "_Crosshairs:"
-msgstr "照準線(_C):"
-
-#: panels/universal-access/cc-zoom-options-dialog.ui:610
-msgid "_Overlaps mouse cursor"
-msgstr "マウスカーソルに重ねる(_O)"
-
-#: panels/universal-access/cc-zoom-options-dialog.ui:634
+#: panels/universal-access/cc-zoom-options-dialog.ui:427
 msgid "Crosshairs"
 msgstr "照準線"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:683
+#: panels/universal-access/cc-zoom-options-dialog.ui:444
+msgid "Color Effects:"
+msgstr "色の設定:"
+
+#: panels/universal-access/cc-zoom-options-dialog.ui:466
 msgid "_White on black:"
 msgstr "反転(_W):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:703
+#: panels/universal-access/cc-zoom-options-dialog.ui:482
 msgid "_Brightness:"
 msgstr "明るさ(_B):"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:724
+#: panels/universal-access/cc-zoom-options-dialog.ui:499
 msgid "_Contrast:"
 msgstr "コントラスト(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/cc-zoom-options-dialog.ui:744
+#: panels/universal-access/cc-zoom-options-dialog.ui:515
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色(_L)"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:769
+#: panels/universal-access/cc-zoom-options-dialog.ui:538
 msgctxt "universal access, color"
 msgid "None"
 msgstr "白黒"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:791
+#: panels/universal-access/cc-zoom-options-dialog.ui:556
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "カラー"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:844
+#: panels/universal-access/cc-zoom-options-dialog.ui:588
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "暗い"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:867
+#: panels/universal-access/cc-zoom-options-dialog.ui:606
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "明るい"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:893
+#: panels/universal-access/cc-zoom-options-dialog.ui:626
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低い"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:916
+#: panels/universal-access/cc-zoom-options-dialog.ui:644
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高い"
 
-#: panels/universal-access/cc-zoom-options-dialog.ui:942
-msgid "Color Effects:"
-msgstr "色の設定:"
-
-#: panels/universal-access/cc-zoom-options-dialog.ui:958
+#: panels/universal-access/cc-zoom-options-dialog.ui:664
 msgid "Color Effects"
 msgstr "色の設定"
 
@@ -7174,35 +6897,119 @@ msgstr ""
 "ユーザー支援;リピート;点滅;ビジュアル;視覚;ヒアリング;聴覚;音声;タイピング;ユ"
 "ニバーサルアクセス;animations;アニメーション;"
 
-#: panels/usage/cc-usage-panel.c:154
-msgid "Empty all items from Trash?"
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:55
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 時間"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:58
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:61
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:64
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:67
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:70
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:73
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:76
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:79
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 日"
+
+#. Translators: Option for "Automatically Delete Period" in "Trash & Temporary Files" group
+#: panels/usage/cc-usage-panel.c:82
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 日"
+
+#: panels/usage/cc-usage-panel.c:180
+msgid "Empty all items from Trash?"
 msgstr "ゴミ箱からすべてのアイテムを削除しますか?"
 
-#: panels/usage/cc-usage-panel.c:155
+#: panels/usage/cc-usage-panel.c:181
 msgid "All items in the Trash will be permanently deleted."
 msgstr "ここでアイテムを削除すると元に戻すことはできません。"
 
-#: panels/usage/cc-usage-panel.c:156
+#: panels/usage/cc-usage-panel.c:182
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
-#: panels/usage/cc-usage-panel.c:177
+#: panels/usage/cc-usage-panel.c:218
 msgid "Delete all the temporary files?"
 msgstr "一時ファイルをすべて削除しますか?"
 
-#: panels/usage/cc-usage-panel.c:178
+#: panels/usage/cc-usage-panel.c:219
 msgid "All the temporary files will be permanently deleted."
 msgstr "一時ファイルは完全に削除されます。"
 
-#: panels/usage/cc-usage-panel.c:179
+#: panels/usage/cc-usage-panel.c:220
 msgid "_Purge Temporary Files"
 msgstr "一時ファイルを削除する(_P)"
 
-#: panels/usage/cc-usage-panel.ui:29
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:247
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 日"
+
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:250
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 日"
+
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:253
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 日"
+
+#. Translators: Option for "File History Duration" in "File History" group
+#: panels/usage/cc-usage-panel.c:256
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "無期限"
+
+#: panels/usage/cc-usage-panel.ui:9
 msgid "File History"
 msgstr "ファイル履歴"
 
-#: panels/usage/cc-usage-panel.ui:41
+#: panels/usage/cc-usage-panel.ui:10
 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 "
@@ -7211,23 +7018,23 @@ msgstr ""
 "ファイルを使用するとファイル履歴に記録されます。この情報はアプリケーション間"
 "で共有されるため、使用したいファイルを見つけやすくなります。"
 
-#: panels/usage/cc-usage-panel.ui:56
+#: panels/usage/cc-usage-panel.ui:13
 msgid "File H_istory"
 msgstr "ファイル履歴(_I)"
 
-#: panels/usage/cc-usage-panel.ui:78
+#: panels/usage/cc-usage-panel.ui:25
 msgid "File _History Duration"
 msgstr "ファイル履歴の期間(_H)"
 
-#: panels/usage/cc-usage-panel.ui:119
+#: panels/usage/cc-usage-panel.ui:48
 msgid "_Clear History…"
 msgstr "履歴を消去(_C)…"
 
-#: panels/usage/cc-usage-panel.ui:135
-msgid "Trash &amp; Temporary Files"    
+#: panels/usage/cc-usage-panel.ui:63
+msgid "Trash &amp; Temporary Files"
 msgstr "ゴミ箱と一時ファイル"
 
-#: panels/usage/cc-usage-panel.ui:145
+#: panels/usage/cc-usage-panel.ui:64
 msgid ""
 "Trash and temporary files can sometimes include personal or sensitive "
 "information. Automatically deleting them can help to protect privacy."
@@ -7236,110 +7043,26 @@ msgstr ""
 "こに個人情報や機密情報が含まれていたとしても、プライバシーを保つことができま"
 "す。"
 
-#: panels/usage/cc-usage-panel.ui:159
+#: panels/usage/cc-usage-panel.ui:67
 msgid "Automatically Delete _Trash Content"
 msgstr "ゴミ箱の内容を自動的に削除する(_T)"
 
-#: panels/usage/cc-usage-panel.ui:174
+#: panels/usage/cc-usage-panel.ui:79
 msgid "Automatically Delete Temporary _Files"
 msgstr "一時ファイルを自動的に削除する(_F)"
 
-#: panels/usage/cc-usage-panel.ui:196
+#: panels/usage/cc-usage-panel.ui:91
 msgid "Automatically Delete _Period"
 msgstr "自動的に削除する期間(_P)"
 
-#: panels/usage/cc-usage-panel.ui:238
+#: panels/usage/cc-usage-panel.ui:115
 msgid "_Empty Trash…"
 msgstr "ゴミ箱を空にする(_E)…"
 
-#: panels/usage/cc-usage-panel.ui:250
+#: panels/usage/cc-usage-panel.ui:126
 msgid "_Delete Temporary Files…"
 msgstr "一時ファイルを削除する(_D)…"
 
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/usage/cc-usage-panel.ui:278
-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:282
-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:286
-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:290
-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:294
-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:298
-msgctxt "purge_files"
-msgid "5 days"
-msgstr "5 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/usage/cc-usage-panel.ui:302
-msgctxt "purge_files"
-msgid "6 days"
-msgstr "6 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/usage/cc-usage-panel.ui:306
-msgctxt "purge_files"
-msgid "7 days"
-msgstr "7 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/usage/cc-usage-panel.ui:310
-msgctxt "purge_files"
-msgid "14 days"
-msgstr "14 日"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/usage/cc-usage-panel.ui:314
-msgctxt "purge_files"
-msgid "30 days"
-msgstr "30 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/usage/cc-usage-panel.ui:329
-msgctxt "retain_history"
-msgid "1 day"
-msgstr "1 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/usage/cc-usage-panel.ui:333
-msgctxt "retain_history"
-msgid "7 days"
-msgstr "7 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/usage/cc-usage-panel.ui:337
-msgctxt "retain_history"
-msgid "30 days"
-msgstr "30 日"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/usage/cc-usage-panel.ui:341
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "無期限"
-
 #: panels/usage/gnome-usage-panel.desktop.in.in:3
 msgid "File History & Trash"
 msgstr "ファイルの履歴と削除"
@@ -7349,34 +7072,34 @@ msgid "Don't leave traces"
 msgstr "痕跡を残さないようにします"
 
 #. FIXME
-#: panels/user-accounts/cc-add-user-dialog.c:34
+#: panels/user-accounts/cc-add-user-dialog.c:35
 msgid "Should match the web address of your login provider."
 msgstr "ログイン提供者のウェブアドレスと一致させる必要があります。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:204
+#: panels/user-accounts/cc-add-user-dialog.c:216
 msgid "Failed to add account"
 msgstr "アカウントの追加に失敗しました"
 
-#: panels/user-accounts/cc-add-user-dialog.c:661
-#: panels/user-accounts/cc-password-dialog.c:261
+#: panels/user-accounts/cc-add-user-dialog.c:679
+#: panels/user-accounts/cc-password-dialog.c:258
 msgid "The passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:875
-#: panels/user-accounts/cc-add-user-dialog.c:914
-#: panels/user-accounts/cc-add-user-dialog.c:932
+#: panels/user-accounts/cc-add-user-dialog.c:883
+#: panels/user-accounts/cc-add-user-dialog.c:922
+#: panels/user-accounts/cc-add-user-dialog.c:940
 msgid "Failed to register account"
 msgstr "アカウントの登録に失敗しました"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1047
+#: panels/user-accounts/cc-add-user-dialog.c:1055
 msgid "No supported way to authenticate with this domain"
 msgstr "このドメインで認証を行う方法はサポートしていません"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1111
+#: panels/user-accounts/cc-add-user-dialog.c:1119
 msgid "Failed to join domain"
 msgstr "ドメインの参加に失敗しました"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1166
+#: panels/user-accounts/cc-add-user-dialog.c:1174
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -7384,7 +7107,7 @@ msgstr ""
 "ログイン名に問題がありました。\n"
 "やり直してください。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1173
+#: panels/user-accounts/cc-add-user-dialog.c:1181
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -7392,28 +7115,20 @@ msgstr ""
 "パスワードに問題がありました。\n"
 "やり直してください。"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1181
+#: panels/user-accounts/cc-add-user-dialog.c:1189
 msgid "Failed to log into domain"
 msgstr "ドメインへのログインに失敗しました"
 
-#: panels/user-accounts/cc-add-user-dialog.c:1236
+#: panels/user-accounts/cc-add-user-dialog.c:1244
 msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "ドメインを見つけられません。スペルミスがないか確認してください。"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:18
-#: panels/user-accounts/data/join-dialog.ui:11
+#: panels/user-accounts/cc-add-user-dialog.ui:15
+#: panels/user-accounts/data/join-dialog.ui:9
 msgid "Add User"
 msgstr "ユーザーを追加"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:180
-msgid "_Full Name"
-msgstr "フルネーム(_F)"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:206
-msgid "Standard"
-msgstr "標準"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:216
+#: panels/user-accounts/cc-add-user-dialog.ui:131
 msgid "Administrator"
 msgstr "管理者"
 
@@ -7421,8 +7136,9 @@ msgstr "管理者"
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users. Parental controls cannot be applied to administrators."
-msgstr "管理者は他のユーザーの追加、削除、設定の変更ができます。管理者をペア"
-"レンタルコントロールで管理することはできません。"
+msgstr ""
+"管理者は他のユーザーの追加、削除、設定の変更ができます。管理者をペアレンタル"
+"コントロールで管理することはできません。"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:149
 msgid "User sets password on first login"
@@ -7444,24 +7160,11 @@ msgstr "エンタープライズログイン"
 msgid "User accounts which are managed by a company or organisation."
 msgstr "会社や組織に管理されているユーザーアカウントです。"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:232
-msgid "Account _Type"
-msgstr "アカウントの種類(_T)"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:269
-msgid "Allow user to set a password when they next _login"
-msgstr "次回ログイン時にユーザー自身にパスワードを設定させる(_L)"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:283
-msgid "Set a password _now"
-msgstr "今パスワードを設定する(_N)"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:405
-msgid "_Confirm"
-msgstr "確認(_C)"
+#: panels/user-accounts/cc-add-user-dialog.ui:385
+msgid "You are Offline"
+msgstr "現在オフラインです"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:485
-#: panels/user-accounts/cc-add-user-dialog.ui:692
+#: panels/user-accounts/cc-add-user-dialog.ui:386
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
@@ -7471,29 +7174,11 @@ msgstr ""
 "バイスで使用できます。このアカウントを使用して、インターネット上の企業内の各"
 "種リソースにアクセスすることができます。"
 
-#: panels/user-accounts/cc-add-user-dialog.ui:732
-msgid "You are Offline"
-msgstr "現在オフラインです"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:751
-msgid "You must be online in order to add enterprise users."
-msgstr ""
-"エンタープライズユーザーを追加するには、システムをオンラインにする必要があり"
-"ます。"
-
-#: panels/user-accounts/cc-add-user-dialog.ui:782
-msgid "_Enterprise Login"
-msgstr "エンタープライズログイン(_E)"
-
-#: panels/user-accounts/cc-avatar-chooser.c:225
+#: panels/user-accounts/cc-avatar-chooser.c:164
 msgid "Browse for more pictures"
 msgstr "他の画像を参照"
 
-#: panels/user-accounts/cc-avatar-chooser.ui:39
-msgid "Take a Picture…"
-msgstr "写真を撮る…"
-
-#: panels/user-accounts/cc-avatar-chooser.ui:46
+#: panels/user-accounts/cc-avatar-chooser.ui:32
 msgid "Select a File…"
 msgstr "ファイルを選択…"
 
@@ -7501,46 +7186,50 @@ msgstr "ファイルを選択…"
 msgid "Fingerprint Manager"
 msgstr "指紋認証マネージャー"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:23
+#: panels/user-accounts/cc-fingerprint-dialog.ui:20
 msgid "Fingerprint"
 msgstr "指紋認証"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:118
+#: panels/user-accounts/cc-fingerprint-dialog.ui:88
 msgid "_No"
 msgstr "いいえ(_N)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:128
+#: panels/user-accounts/cc-fingerprint-dialog.ui:96
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:155
+#: panels/user-accounts/cc-fingerprint-dialog.ui:116
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
 
+#: panels/user-accounts/cc-fingerprint-dialog.ui:172
+msgid "No fingerprint device"
+msgstr "指紋認証デバイスがありません"
+
 #. Translators: This is the empty state page label which states that there are no devices ready.
-#: panels/user-accounts/cc-fingerprint-dialog.ui:249
+#: panels/user-accounts/cc-fingerprint-dialog.ui:187
 msgid "No Fingerprint device"
 msgstr "指紋認証デバイスがありません"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:259
+#: panels/user-accounts/cc-fingerprint-dialog.ui:196
 msgid "Ensure the device is properly connected."
 msgstr "デバイスが正しく接続されていることを確認してください。"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:264
-msgid "No fingerprint device"
-msgstr "指紋認証デバイスがありません"
+#: panels/user-accounts/cc-fingerprint-dialog.ui:204
+msgid "Fingerprint Device"
+msgstr "指紋認証デバイス"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:280
+#: panels/user-accounts/cc-fingerprint-dialog.ui:213
 msgid "Choose the fingerprint device you want to configure"
 msgstr "設定する指紋認証デバイスを選択してください"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:309
-msgid "Fingerprint Device"
-msgstr "指紋認証デバイス"
+#: panels/user-accounts/cc-fingerprint-dialog.ui:243
+msgid "Fingerprint Login"
+msgstr "指紋認証ログイン"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:322
+#: panels/user-accounts/cc-fingerprint-dialog.ui:249
 msgid ""
 "Fingerprint login allows you to unlock and log into your computer with your "
 "finger"
@@ -7548,172 +7237,168 @@ msgstr ""
 "指紋認証ログインは指を使ってコンピューターにログインしたりロックを解除したり"
 "できるようにします"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:352
+#: panels/user-accounts/cc-fingerprint-dialog.ui:276
 msgid "_Delete Fingerprints"
 msgstr "指紋情報を削除(_D)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:363
-msgid "Fingerprint Login"
-msgstr "指紋認証ログイン"
-
-#: panels/user-accounts/cc-fingerprint-dialog.ui:412
+#: panels/user-accounts/cc-fingerprint-dialog.ui:290
 msgid "Fingerprint Enroll"
 msgstr "指紋の登録"
 
-#: panels/user-accounts/cc-fingerprint-dialog.ui:436
-msgid "_Re-enroll this finger…"
-msgstr "この指を再登録(_R)…"
-
-#: panels/user-accounts/cc-fingerprint-dialog.c:236
+#: panels/user-accounts/cc-fingerprint-dialog.c:235
 msgid "the device needs to be claimed to perform this action"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:238
+#: panels/user-accounts/cc-fingerprint-dialog.c:237
 msgid "the device is already claimed by another process"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:240
+#: panels/user-accounts/cc-fingerprint-dialog.c:239
 msgid "you do not have permission to perform the action"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:242
+#: panels/user-accounts/cc-fingerprint-dialog.c:241
 msgid "no prints have been enrolled"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:251
+#: panels/user-accounts/cc-fingerprint-dialog.c:250
 msgid "Failed to communicate with the device during enrollment"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:255
+#: panels/user-accounts/cc-fingerprint-dialog.c:254
 msgid "Failed to communicate with the fingerprint reader"
 msgstr "指紋リーダーとの通信に失敗しました"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:257
+#: panels/user-accounts/cc-fingerprint-dialog.c:256
 msgid "Failed to communicate with the fingerprint daemon"
 msgstr "指紋認証デーモンとの通信に失敗しました"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:585
+#: panels/user-accounts/cc-fingerprint-dialog.c:539
 #, c-format
 msgid "Failed to list fingerprints: %s"
 msgstr "指紋情報の一覧を表示できませんでした: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:652
+#: panels/user-accounts/cc-fingerprint-dialog.c:606
 #, c-format
 msgid "Failed to delete saved fingerprints: %s"
 msgstr "保存された指紋情報の削除に失敗しました: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:683
+#: panels/user-accounts/cc-fingerprint-dialog.c:637
 msgid "Left thumb"
 msgstr "左の親指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:685
+#: panels/user-accounts/cc-fingerprint-dialog.c:639
 msgid "Left middle finger"
 msgstr "左の中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:687
+#: panels/user-accounts/cc-fingerprint-dialog.c:641
 msgid "_Left index finger"
 msgstr "左の人差し指(_L)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:689
+#: panels/user-accounts/cc-fingerprint-dialog.c:643
 msgid "Left ring finger"
 msgstr "左の薬指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:691
+#: panels/user-accounts/cc-fingerprint-dialog.c:645
 msgid "Left little finger"
 msgstr "左の小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:693
+#: panels/user-accounts/cc-fingerprint-dialog.c:647
 msgid "Right thumb"
 msgstr "右の親指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:695
+#: panels/user-accounts/cc-fingerprint-dialog.c:649
 msgid "Right middle finger"
 msgstr "右の中指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:697
+#: panels/user-accounts/cc-fingerprint-dialog.c:651
 msgid "_Right index finger"
 msgstr "右の人差し指(_R)"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:699
+#: panels/user-accounts/cc-fingerprint-dialog.c:653
 msgid "Right ring finger"
 msgstr "右の薬指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:701
+#: panels/user-accounts/cc-fingerprint-dialog.c:655
 msgid "Right little finger"
 msgstr "右の小指"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:703
+#: panels/user-accounts/cc-fingerprint-dialog.c:657
 msgid "Unknown Finger"
 msgstr "不明な指です"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:837
+#: panels/user-accounts/cc-fingerprint-dialog.c:791
 msgctxt "Fingerprint enroll state"
 msgid "Complete"
 msgstr "完了"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:848
+#: panels/user-accounts/cc-fingerprint-dialog.c:802
 msgid "Fingerprint device disconnected"
 msgstr "指紋認証デバイスが切断されました"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:854
+#: panels/user-accounts/cc-fingerprint-dialog.c:808
 msgid "Fingerprint device storage is full"
 msgstr "指紋認証デバイスの登録数が上限に達しています"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:858
+#: panels/user-accounts/cc-fingerprint-dialog.c:812
 msgid "Failed to enroll new fingerprint"
 msgstr "新しい指紋の登録に失敗しました"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:889
+#: panels/user-accounts/cc-fingerprint-dialog.c:843
 #, c-format
 msgid "Failed to start enrollment: %s"
 msgstr "登録を開始できませんでした: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:897
+#: panels/user-accounts/cc-fingerprint-dialog.c:851
 msgctxt "Fingerprint enroll state"
 msgid "Failed to enroll new fingerprint"
 msgstr "新しい指紋の登録に失敗しました"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:928
+#: panels/user-accounts/cc-fingerprint-dialog.c:882
 #, c-format
 msgid "Failed to stop enrollment: %s"
 msgstr "登録を停止できませんでした: %s"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:974
+#: panels/user-accounts/cc-fingerprint-dialog.c:928
 msgid ""
 "Repeatedly lift and place your finger on the reader to enroll your "
 "fingerprint"
 msgstr "指紋リーダーに指を何度か押し付けて指紋を登録してください"
 
+#: panels/user-accounts/cc-fingerprint-dialog.c:1047
+msgid "_Re-enroll this finger…"
+msgstr "この指を再登録(_R)…"
+
 #. TRANSLATORS: This is the label for the button to enroll a new finger
-#: panels/user-accounts/cc-fingerprint-dialog.c:1118
+#: panels/user-accounts/cc-fingerprint-dialog.c:1062
 msgid "Scan new fingerprint"
 msgstr "新しい指紋の採取"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1157
+#: panels/user-accounts/cc-fingerprint-dialog.c:1100
 #, c-format
 msgid "Failed to release fingerprint device %s: %s"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1229
+#: panels/user-accounts/cc-fingerprint-dialog.c:1172
 msgctxt "Fingerprint enroll state"
 msgid "Problem Reading Device"
 msgstr "デバイスの読み取りに問題があります"
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1264
+#: panels/user-accounts/cc-fingerprint-dialog.c:1207
 #, c-format
 msgid "Failed to claim fingerprint device %s: %s"
 msgstr ""
 
-#: panels/user-accounts/cc-fingerprint-dialog.c:1413
+#: panels/user-accounts/cc-fingerprint-dialog.c:1358
 #, c-format
 msgid "Failed to get fingerprint devices: %s"
 msgstr "指紋認証デバイスの取得に失敗しました: %s"
 
-#: panels/user-accounts/cc-login-history-dialog.c:69
+#: panels/user-accounts/cc-login-history-dialog.c:71
 msgid "This Week"
 msgstr "今週"
 
-#: panels/user-accounts/cc-login-history-dialog.c:72
+#: panels/user-accounts/cc-login-history-dialog.c:74
 msgid "Last Week"
 msgstr "先週"
 
@@ -7721,22 +7406,22 @@ msgstr "先週"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/cc-login-history-dialog.c:82
-#: panels/user-accounts/cc-login-history-dialog.c:86
+#: panels/user-accounts/cc-login-history-dialog.c:84
+#: panels/user-accounts/cc-login-history-dialog.c:88
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%B%-e日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/cc-login-history-dialog.c:91
+#: panels/user-accounts/cc-login-history-dialog.c:93
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%Y年%B%-e日"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: panels/user-accounts/cc-login-history-dialog.c:96
+#: panels/user-accounts/cc-login-history-dialog.c:98
 #, c-format
 msgctxt "login history week label"
 msgid "%s — %s"
@@ -7745,73 +7430,73 @@ msgstr "%s — %s"
 # %k:%M よりも %H:%M の方がガタガタしていなくて見やすい (sicklylife)
 #. 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-login-history-dialog.c:179
+#: panels/user-accounts/cc-user-panel.c:712
 msgctxt "login date-time"
 msgid "%k:%M"
 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-login-history-dialog.c:182
+#: panels/user-accounts/cc-user-panel.c:716
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s %s"
 
-#: panels/user-accounts/cc-login-history-dialog.c:243
+#: panels/user-accounts/cc-login-history-dialog.c:238
 msgid "Session Ended"
 msgstr "セッション終了"
 
-#: panels/user-accounts/cc-login-history-dialog.c:249
+#: panels/user-accounts/cc-login-history-dialog.c:244
 msgid "Session Started"
 msgstr "セッション開始"
 
 #. Translators: This is the title of the "Account Activity" dialog.
 #. The %s is the user real name.
-#: panels/user-accounts/cc-login-history-dialog.c:343
+#: panels/user-accounts/cc-login-history-dialog.c:339
 #, c-format
 msgid "%s — Account Activity"
 msgstr "%s — アカウントのアクティビティ"
 
-#: panels/user-accounts/cc-password-dialog.c:125
+#: panels/user-accounts/cc-password-dialog.c:133
 msgid "Please choose another password."
 msgstr "他のパスワードを選択してください。"
 
-#: panels/user-accounts/cc-password-dialog.c:134
+#: panels/user-accounts/cc-password-dialog.c:142
 msgid "Please type your current password again."
 msgstr "現在のパスワードを再度入力してください。"
 
-#: panels/user-accounts/cc-password-dialog.c:140
+#: panels/user-accounts/cc-password-dialog.c:148
 msgid "Password could not be changed"
 msgstr "パスワードを変更できません"
 
-#: panels/user-accounts/cc-password-dialog.ui:7
+#: panels/user-accounts/cc-password-dialog.ui:4
 msgid "Change Password"
 msgstr "パスワードを変更"
 
-#: panels/user-accounts/cc-password-dialog.ui:37
+#: panels/user-accounts/cc-password-dialog.ui:32
 msgid "Ch_ange"
 msgstr "変更(_A)"
 
-#: panels/user-accounts/cc-password-dialog.ui:145
-msgid "Confirm Password"
-msgstr "パスワードの確認"
+#: panels/user-accounts/cc-password-dialog.ui:51
+msgid "Current Password"
+msgstr "現在のパスワード"
 
-#: panels/user-accounts/cc-password-dialog.ui:162
+#: panels/user-accounts/cc-password-dialog.ui:76
 msgid "New Password"
 msgstr "新しいパスワード"
 
-#: panels/user-accounts/cc-password-dialog.ui:216
-msgid "Current Password"
-msgstr "現在のパスワード"
+#: panels/user-accounts/cc-password-dialog.ui:121
+msgid "Confirm Password"
+msgstr "パスワードの確認"
 
-#: panels/user-accounts/cc-password-dialog.ui:254
+#: panels/user-accounts/cc-password-dialog.ui:175
 msgid "Allow user to change their password on next login"
 msgstr "次回ログイン時にユーザー自身にパスワードを設定させる"
 
-#: panels/user-accounts/cc-password-dialog.ui:267
+#: panels/user-accounts/cc-password-dialog.ui:186
 msgid "Set a password now"
 msgstr "今すぐパスワードを設定する"
 
@@ -7838,30 +7523,26 @@ msgstr "不正なパスワードです、やり直してください"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "%s ドメインに接続できませんでした: %s"
 
-#: panels/user-accounts/cc-user-panel.c:222
-msgid "Your account"
-msgstr "あなたのアカウント"
-
-#: panels/user-accounts/cc-user-panel.c:402
+#: panels/user-accounts/cc-user-panel.c:341
 msgid "Failed to delete user"
 msgstr "ユーザーの削除に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:457
-#: panels/user-accounts/cc-user-panel.c:512
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:398
+#: panels/user-accounts/cc-user-panel.c:453
+#: panels/user-accounts/cc-user-panel.c:499
 msgid "Failed to revoke remotely managed user"
 msgstr "リモート管理ユーザーの削除に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:607
+#: panels/user-accounts/cc-user-panel.c:548
 msgid "You cannot delete your own account."
 msgstr "自分自身のアカウントは削除できません。"
 
-#: panels/user-accounts/cc-user-panel.c:616
+#: panels/user-accounts/cc-user-panel.c:557
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s はまだログインしています"
 
-#: panels/user-accounts/cc-user-panel.c:620
+#: panels/user-accounts/cc-user-panel.c:561
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7869,12 +7550,12 @@ msgstr ""
 "ログイン中のユーザーを削除すると、システムが不整合な状態になることがありま"
 "す。"
 
-#: panels/user-accounts/cc-user-panel.c:629
+#: panels/user-accounts/cc-user-panel.c:570
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "%s のファイルを残しますか?"
 
-#: panels/user-accounts/cc-user-panel.c:633
+#: panels/user-accounts/cc-user-panel.c:574
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7882,74 +7563,68 @@ msgstr ""
 "ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールス"
 "プールおよび一時ファイルを残しておくことができます。"
 
-#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:577
 msgid "_Delete Files"
 msgstr "ファイルを削除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:637
+#: panels/user-accounts/cc-user-panel.c:578
 msgid "_Keep Files"
 msgstr "ファイルを残す(_K)"
 
-#: panels/user-accounts/cc-user-panel.c:651
+#: panels/user-accounts/cc-user-panel.c:592
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "本当にリモート管理の %s のアカウントを削除しますか?"
 
-#: panels/user-accounts/cc-user-panel.c:655
+#: panels/user-accounts/cc-user-panel.c:596
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: panels/user-accounts/cc-user-panel.c:705
+#: panels/user-accounts/cc-user-panel.c:646
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "無効アカウント"
 
-#: panels/user-accounts/cc-user-panel.c:713
+#: panels/user-accounts/cc-user-panel.c:654
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "次回ログイン時に設定"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:657
 msgctxt "Password mode"
 msgid "None"
 msgstr "なし"
 
-#: panels/user-accounts/cc-user-panel.c:759
+#: panels/user-accounts/cc-user-panel.c:700
 msgid "Logged in"
 msgstr "ログイン中"
 
 #. TRANSLATORS: Status of Parental Controls setup
-#: panels/user-accounts/cc-user-panel.c:846
-#: panels/user-accounts/cc-user-panel.c:935
-#: panels/wwan/cc-wwan-device-page.c:477
+#: panels/user-accounts/cc-user-panel.c:787
+#: panels/user-accounts/cc-user-panel.c:876
+#: panels/wwan/cc-wwan-device-page.c:476
 msgid "Enabled"
 msgstr "有効"
 
-#: panels/user-accounts/cc-user-panel.c:1259
+#: panels/user-accounts/cc-user-panel.c:1173
 msgid "Failed to contact the accounts service"
 msgstr "アカウントサービスの接続に失敗しました"
 
-#: panels/user-accounts/cc-user-panel.c:1261
+#: panels/user-accounts/cc-user-panel.c:1175
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr ""
 "AccountService がインストールされ、有効になっているか確認してください。"
 
-#. Translator comments:
-#. * 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:1293
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr "変更するには、まず * アイコンをクリックしてください"
+#: panels/user-accounts/cc-user-panel.c:1197
+msgid "This panel must be unlocked to change this setting"
+msgstr ""
 
-#: panels/user-accounts/cc-user-panel.c:1366
+#: panels/user-accounts/cc-user-panel.c:1264
 msgid "Delete the selected user account"
 msgstr "選択したユーザーアカウントを削除します"
 
-#: panels/user-accounts/cc-user-panel.c:1378
-#: panels/user-accounts/cc-user-panel.c:1489
+#: panels/user-accounts/cc-user-panel.c:1268
+#: panels/user-accounts/cc-user-panel.c:1377
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7957,91 +7632,76 @@ msgstr ""
 "選択したユーザーアカウントを削除するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: panels/user-accounts/cc-user-panel.c:1535
+#: panels/user-accounts/cc-user-panel.c:1423
 msgid "Unlock to Add Users and Change Settings"
 msgstr "設定の変更やユーザーを追加する場合はロックを解除してください"
 
-#: panels/user-accounts/cc-user-panel.ui:6
-msgid "Add User…"
-msgstr "ユーザーを追加…"
-
-#: panels/user-accounts/cc-user-panel.ui:9
-msgid "Create a user account"
-msgstr "ユーザーアカウントを作成します"
+#: panels/user-accounts/cc-user-panel.ui:23
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
+msgid "Users"
+msgstr "ユーザー"
 
-#: panels/user-accounts/cc-user-panel.ui:64
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "変更内容を反映させるにはログインし直す必要があります"
 
 # ユーザー設定を変更すると表示されるボタンのラベル。クリックするとログアウトダイアログが表示されます。
-#: panels/user-accounts/cc-user-panel.ui:72
+#: panels/user-accounts/cc-user-panel.ui:67
 msgid "Restart Now"
 msgstr "ログアウト"
 
-#: panels/user-accounts/cc-user-panel.ui:157
-#: panels/user-accounts/cc-user-panel.ui:173
-msgid "User Icon"
-msgstr "ユーザーアイコン"
+#. FIXME
+#: panels/user-accounts/cc-user-panel.ui:195
+msgid "_Fingerprint Login"
+msgstr "指紋認証ログイン(_F)"
 
-#: panels/user-accounts/cc-user-panel.ui:249
-msgid "Account Settings"
-msgstr "アカウント設定"
+#: panels/user-accounts/cc-user-panel.ui:218
+msgid "A_utomatic Login"
+msgstr "自動ログイン(_U)"
+
+#: panels/user-accounts/cc-user-panel.ui:231
+msgid "Account Activity"
+msgstr "アカウントのアクティビティ"
 
-#: panels/user-accounts/cc-user-panel.ui:267
+#: panels/user-accounts/cc-user-panel.ui:259
 msgid "_Administrator"
 msgstr "管理者(_A)"
 
-#: panels/user-accounts/cc-user-panel.ui:268
+#: panels/user-accounts/cc-user-panel.ui:260
 msgid ""
 "Administrators can add and remove other users, and can change settings for "
 "all users."
 msgstr "管理者は他のユーザーの追加、削除、設定の変更ができます。"
 
-#: panels/user-accounts/cc-user-panel.ui:284
+#: panels/user-accounts/cc-user-panel.ui:276
 msgid "_Parental Controls"
 msgstr "ペアレンタルコントロール(_P)"
 
-#: panels/user-accounts/cc-user-panel.ui:285
+#: panels/user-accounts/cc-user-panel.ui:277
 msgid "Open the Parental Controls application."
 msgstr "ペアレンタルコントロールアプリケーションを開きます。"
 
-#: panels/user-accounts/cc-user-panel.ui:347
-msgid "Authentication & Login"
-msgstr "認証とログイン"
-
-#: panels/user-accounts/cc-user-panel.ui:390
-msgid "_Fingerprint Login"
-msgstr "指紋認証ログイン(_F)"
-
-#: panels/user-accounts/cc-user-panel.ui:415
-msgid "A_utomatic Login"
-msgstr "自動ログイン(_U)"
-
-#: panels/user-accounts/cc-user-panel.ui:429
-msgid "Account Activity"
-msgstr "アカウントのアクティビティ"
-
-#: panels/user-accounts/cc-user-panel.ui:460
+#: panels/user-accounts/cc-user-panel.ui:328
 msgid "Remove User…"
 msgstr "ユーザーを削除…"
 
-#: panels/user-accounts/cc-user-panel.ui:330
+#: panels/user-accounts/cc-user-panel.ui:340
 msgid "Other Users"
 msgstr "他のユーザー"
 
+#: panels/user-accounts/cc-user-panel.ui:353
+msgid "Add 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:501
+#: panels/user-accounts/cc-user-panel.ui:381
 msgid "No Users Found"
 msgstr "ユーザーが見つかりませんでした"
 
-#: panels/user-accounts/cc-user-panel.ui:511
+#: panels/user-accounts/cc-user-panel.ui:390
 msgid "Unlock to add a user account."
 msgstr "ユーザーアカウントのロックを解除します。"
 
-#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
-msgid "Users"
-msgstr "ユーザー"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "ユーザーの追加と削除、パスワードの変更を行います"
@@ -8053,21 +7713,20 @@ msgid ""
 "Time;App Restrictions;Web Restrictions;Usage;Usage Limit;Kid;Child;"
 msgstr ""
 "Login;Name;Fingerprint;Avatar;Logo;Face;Password;Parental Controls;Screen "
-"Time;App Restrictions;Web Restrictions;Usage;Usage Limit;Kid;Child;"
-"ログイン;名前;指紋認証;アバター;ロゴ;顔;パスワード;ペアレンタルコントロール;"
-"スクリーンタイム;アプリの使用制限;ウェブの閲覧制限;使用量;使用制限;使用上限;"
-"子供;"
+"Time;App Restrictions;Web Restrictions;Usage;Usage Limit;Kid;Child;ログイン;"
+"名前;指紋認証;アバター;ロゴ;顔;パスワード;ペアレンタルコントロール;スクリーン"
+"タイム;アプリの使用制限;ウェブの閲覧制限;使用量;使用制限;使用上限;子供;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: panels/user-accounts/data/join-dialog.ui:39
+#: panels/user-accounts/data/join-dialog.ui:30
 msgid "_Enroll"
 msgstr "登録(_E)"
 
-#: panels/user-accounts/data/join-dialog.ui:75
+#: panels/user-accounts/data/join-dialog.ui:59
 msgid "Domain Administrator Login"
 msgstr "ドメイン管理者のログイン"
 
-#: panels/user-accounts/data/join-dialog.ui:93
+#: panels/user-accounts/data/join-dialog.ui:72
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -8077,11 +7736,11 @@ msgstr ""
 "ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
 "パスワード入力を行ってもらってください。"
 
-#: panels/user-accounts/data/join-dialog.ui:150
+#: panels/user-accounts/data/join-dialog.ui:112
 msgid "Administrator _Name"
 msgstr "管理者名(_N)"
 
-#: panels/user-accounts/data/join-dialog.ui:185
+#: panels/user-accounts/data/join-dialog.ui:135
 msgid "Administrator Password"
 msgstr "管理者のパスワード"
 
@@ -8250,7 +7909,7 @@ msgstr "新しいパスワードには十分な種類の文字が含まれてい
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
-#: panels/user-accounts/user-utils.c:432
+#: panels/user-accounts/user-utils.c:144
 msgid ""
 "The username should usually only consist of lower case letters from a-z, "
 "digits and the following characters: - _"
@@ -8258,35 +7917,25 @@ msgstr ""
 "ユーザー名には小文字の“a”から“z”、数字の“0”から“9”、記号の“-”と“_”のみを使用"
 "してください。"
 
-#: panels/user-accounts/user-utils.c:436
+#: panels/user-accounts/user-utils.c:148
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr ""
 "申し訳ありませんが、そのユーザー名は使用できません。他の名前を試してくださ"
 "い。"
 
-#: panels/user-accounts/user-utils.c:478
+#: panels/user-accounts/user-utils.c:190
 msgid "The username is too long."
 msgstr "ユーザー名が長すぎます。"
 
-#: panels/user-accounts/user-utils.c:537
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr ""
-"ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
-
-#: panels/wacom/button-mapping.ui:9
+#: panels/wacom/button-mapping.ui:7 panels/wacom/cc-wacom-page.ui:38
 msgid "Map Buttons"
 msgstr "ボタン割り当て"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519
-#: panels/wacom/gnome-wacom-properties.ui:60
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#: panels/wacom/button-mapping.ui:71
+#: panels/wacom/button-mapping.ui:26
 msgid "Map buttons to functions"
 msgstr "ボタンへ機能を割り当て"
 
-#: panels/wacom/button-mapping.ui:119
+#: panels/wacom/button-mapping.ui:51
 msgid ""
 "To edit a shortcut, choose the “Send Keystroke” action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
@@ -8295,7 +7944,11 @@ msgstr ""
 "カットボタンを押して、新しいキー組み合わせを入力するか、[BS] キーで取り消して"
 "ください。"
 
-#: panels/wacom/calibrator/calibrator.ui:61
+#: panels/wacom/button-mapping.ui:66
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+#: panels/wacom/calibrator/calibrator.ui:51
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -8303,7 +7956,7 @@ msgstr ""
 "タブレットの位置調整を行いますので、画面に出現するマーカーをタップしてくださ"
 "い。"
 
-#: panels/wacom/calibrator/calibrator.ui:78
+#: panels/wacom/calibrator/calibrator.ui:63
 msgid "Mis-click detected, restarting…"
 msgstr "誤クリックを検出しました。再起動します…"
 
@@ -8332,6 +7985,20 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "オンスクリーンヘルプの表示"
 
+#: panels/wacom/cc-wacom-device.c:431
+msgid "Tablet mounted on laptop panel"
+msgstr ""
+
+#: panels/wacom/cc-wacom-device.c:433
+msgid "Tablet mounted on external display"
+msgstr ""
+
+#: panels/wacom/cc-wacom-device.c:435
+#, fuzzy
+#| msgid "Use bluetooth devices"
+msgid "External tablet device"
+msgstr "Bluetooth デバイスの使用"
+
 #. All displays item
 #: panels/wacom/cc-wacom-page.c:608
 msgid "All Displays"
@@ -8341,10 +8008,18 @@ msgstr "すべてのディスプレイ"
 msgid "Tablet Mode"
 msgstr "タブレットモード"
 
+#: panels/wacom/cc-wacom-page.ui:17
+msgid "Use absolute positioning for the pen"
+msgstr ""
+
 #: panels/wacom/cc-wacom-page.ui:27
 msgid "Left Hand Orientation"
 msgstr "左手用"
 
+#: panels/wacom/cc-wacom-page.ui:28
+msgid "Tablet and Express Keys™ are rotated for left hand use"
+msgstr ""
+
 # 参考: intuos 5 のマニュアル p.57
 #: panels/wacom/cc-wacom-page.ui:56
 msgctxt "display setting"
@@ -8355,83 +8030,26 @@ msgstr "画面にマッピング"
 msgid "Keep Aspect Ratio"
 msgstr "縦横比を保持"
 
+#: panels/wacom/cc-wacom-page.ui:63
+msgid "Only use a portion of the tablet surface to keep monitor aspect ratio"
+msgstr ""
+
 #: panels/wacom/cc-wacom-page.ui:73
 msgid "Calibrate"
 msgstr "キャリブレート"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:245
-msgid "Output:"
-msgstr "出力:"
-
-#. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:257
-msgid "Keep aspect ratio (letterbox):"
-msgstr "縦横比を保持 (レターボックス):"
-
-# 参考: intuos 5 のマニュアル p.57
-#. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:268
-msgid "Map to single monitor"
-msgstr "単一画面にマッピング"
-
-#: panels/wacom/cc-wacom-nav-button.c:84
-#, c-format
-msgid "%d of %d"
-msgstr "%d / %d"
-
-#: panels/wacom/cc-wacom-page.c:516
-msgid "Display Mapping"
-msgstr "画面のマッピング"
-
-#: panels/wacom/cc-wacom-panel.c:725 panels/wacom/wacom-stylus-page.ui:119
-msgid "Stylus"
-msgstr "ペン"
-
-#: panels/wacom/cc-wacom-stylus-page.c:357
-msgid "Button"
-msgstr "ボタン"
-
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
-#: panels/wacom/gnome-wacom-properties.ui:200
-msgid "Wacom Tablet"
-msgstr "ワコムタブレット"
-
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
-msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
-msgstr ""
-"グラフィックスタブレットのボタン割り当てやスタイラスの感度の設定をします。"
-
-#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
-msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
-msgstr ""
-"Tablet;Wacom;Stylus;Eraser;Mouse;タブレット;スタイラスペン;ペン;消しゴム;マウ"
-"ス;"
-
-#: panels/wacom/gnome-wacom-properties.ui:15
-msgid "Tablet (absolute)"
-msgstr "タブレット(絶対座標)"
-
-#: panels/wacom/gnome-wacom-properties.ui:19
-msgid "Touchpad (relative)"
-msgstr "タッチパッド(相対座標)"
-
-#: panels/wacom/gnome-wacom-properties.ui:27
-msgid "Tablet Preferences"
-msgstr "タブレット設定"
-
-#: panels/wacom/gnome-wacom-properties.ui:44
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: panels/wacom/gnome-wacom-properties.ui:125
+#: panels/wacom/cc-wacom-panel.ui:56
 msgid "No tablet detected"
 msgstr "タブレットを検出できません"
 
-#: panels/wacom/gnome-wacom-properties.ui:141
+#: panels/wacom/cc-wacom-panel.ui:57
 msgid "Please plug in or turn on your Wacom tablet."
 msgstr "ワコムタブレットを接続するか、電源を入れてください。"
 
+#: panels/wacom/cc-wacom-stylus-page.ui:16
+msgid "Tip Pressure Feel"
+msgstr "ペン先の感触"
+
 #: panels/wacom/cc-wacom-stylus-page.ui:54
 msgctxt "display setting"
 msgid "Button 1"
@@ -8447,169 +8065,115 @@ msgctxt "display setting"
 msgid "Button 3"
 msgstr "ボタン 3"
 
-#: panels/wacom/gnome-wacom-properties.ui:161
-msgid "Bluetooth Settings"
-msgstr "Bluetooth の設定"
-
-#: panels/wacom/gnome-wacom-properties.ui:238
-msgid "Tracking Mode"
-msgstr "検出モード"
+#: panels/wacom/cc-wacom-stylus-page.ui:77
+msgid "Eraser Pressure Feel"
+msgstr "消しゴムの感触"
 
-#: panels/wacom/gnome-wacom-properties.ui:266
-msgid "Left-Handed Orientation"
-msgstr "左手用"
+#: panels/wacom/cc-wacom-tool.c:321
+msgid "Airbrush stylus with pressure, tilt, and integrated slider"
+msgstr ""
 
-# 参考: intuos 5 のマニュアル p.57
-#: panels/wacom/gnome-wacom-properties.ui:296
-#: panels/wacom/gnome-wacom-properties.ui:401
-msgid "Map to Monitor…"
-msgstr "画面にマッピング…"
+#: panels/wacom/cc-wacom-tool.c:323
+msgid "Airbrush stylus with pressure, tilt, and rotation"
+msgstr ""
 
-#: panels/wacom/gnome-wacom-properties.ui:309
-msgid "Map Buttons…"
-msgstr "ボタン割り当て…"
+#: panels/wacom/cc-wacom-tool.c:325
+msgid "Standard stylus with pressure and tilt"
+msgstr ""
 
-#: panels/wacom/gnome-wacom-properties.ui:322
-msgid "Calibrate…"
-msgstr "キャリブレート…"
+#: panels/wacom/cc-wacom-tool.c:327
+msgid "Standard stylus with pressure"
+msgstr ""
 
-#: panels/wacom/gnome-wacom-properties.ui:340
-msgid "Adjust mouse settings"
-msgstr "マウス設定の調整"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+msgid "Wacom Tablet"
+msgstr "ワコムタブレット"
 
-#: panels/wacom/gnome-wacom-properties.ui:356
-msgid "Adjust display resolution"
-msgstr "ディスプレイの解像度を調整"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr ""
+"グラフィックスタブレットのボタン割り当てやスタイラスの感度の設定をします。"
 
-#: panels/wacom/gnome-wacom-properties.ui:376
-msgid "Decouple Display"
+#. Translators: Search terms to find the Wacom Tablet panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:19
+msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr ""
+"Tablet;Wacom;Stylus;Eraser;Mouse;タブレット;スタイラスペン;ペン;消しゴム;マウ"
+"ス;"
 
-#: panels/wacom/gsd-wacom-key-shortcut-button.c:217
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:190
 msgid "New shortcut…"
 msgstr "新しいショートカット…"
 
-#: panels/wacom/wacom-stylus-page.ui:25
-msgid "Default"
-msgstr "デフォルト"
-
-#: panels/wacom/wacom-stylus-page.ui:29
-msgid "Middle Mouse Button Click"
-msgstr "マウスの中ボタンクリック"
-
-#: panels/wacom/wacom-stylus-page.ui:33
-msgid "Right Mouse Button Click"
-msgstr "マウスの右ボタンクリック"
-
-#: panels/wacom/wacom-stylus-page.ui:41
-msgid "Forward"
-msgstr "進む"
-
-#: panels/wacom/wacom-stylus-page.ui:79
-msgid "No stylus found"
-msgstr "スタイラスペンが見つかりません"
-
-#: panels/wacom/wacom-stylus-page.ui:93
-msgid "Please move your stylus to the proximity of the tablet to configure it"
-msgstr "スタイラスペンをタブレットの近くに移動して設定を行ってください"
-
-#: panels/wacom/wacom-stylus-page.ui:159
-msgid "Eraser Pressure Feel"
-msgstr "消しゴムの感触"
-
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
-msgid "Soft"
-msgstr "柔らかい"
-
-#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
-msgid "Firm"
-msgstr "硬い"
-
-#: panels/wacom/wacom-stylus-page.ui:234
-msgid "Top Button"
-msgstr "上のサイドスイッチ"
-
-#: panels/wacom/wacom-stylus-page.ui:263
-msgid "Lower Button"
-msgstr "下のサイドスイッチ"
-
-#: panels/wacom/wacom-stylus-page.ui:292
-msgid "Lowest Button"
-msgstr "一番下のボタン"
-
-#: panels/wacom/wacom-stylus-page.ui:321
-msgid "Tip Pressure Feel"
-msgstr "ペン先の感触"
-
-#: panels/wwan/cc-wwan-apn-dialog.ui:11
+#: panels/wwan/cc-wwan-apn-dialog.ui:8
 msgid "Access Points"
 msgstr "アクセスポイント"
 
-#: panels/wwan/cc-wwan-apn-dialog.ui:160
+#: panels/wwan/cc-wwan-apn-dialog.ui:122
 msgid "APN"
 msgstr "APN"
 
-#: panels/wwan/cc-wwan-data.c:543
+#: panels/wwan/cc-wwan-data.c:542
 msgid "Operation Cancelled"
 msgstr ""
 
-#: panels/wwan/cc-wwan-data.c:546
+#: panels/wwan/cc-wwan-data.c:545
 msgid "<b>Error:</b> Access denied changing settings"
 msgstr ""
 
-#: panels/wwan/cc-wwan-data.c:549
+#: panels/wwan/cc-wwan-data.c:548
 msgid "<b>Error:</b> Mobile Equipment Error"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.c:81
+#: panels/wwan/cc-wwan-details-dialog.c:80
 msgid "Not Registered"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.c:85
+#: panels/wwan/cc-wwan-details-dialog.c:84
 msgid "Registered"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.c:89
+#: panels/wwan/cc-wwan-details-dialog.c:88
 msgid "Roaming"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.c:93
+#: panels/wwan/cc-wwan-details-dialog.c:92
 msgid "Searching"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.c:97
+#: panels/wwan/cc-wwan-details-dialog.c:96
 msgid "Denied"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.ui:4
+#: panels/wwan/cc-wwan-details-dialog.ui:5
 msgid "Modem Details"
 msgstr "モデムの詳細"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:33
+#: panels/wwan/cc-wwan-details-dialog.ui:16
 msgid "Modem Status"
 msgstr "モデムの状態"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:53
+#: panels/wwan/cc-wwan-details-dialog.ui:25
 msgid "Carrier"
 msgstr "キャリア"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:79
+#: panels/wwan/cc-wwan-details-dialog.ui:49
 msgid "Network Type"
 msgstr "ネットワークの種類"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:131
+#: panels/wwan/cc-wwan-details-dialog.ui:97
 msgid "Network Status"
 msgstr "ネットワークの状態"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:158
+#: panels/wwan/cc-wwan-details-dialog.ui:122
 msgid "Own Number"
 msgstr ""
 
-#: panels/wwan/cc-wwan-details-dialog.ui:185
+#: panels/wwan/cc-wwan-details-dialog.ui:151
 msgid "Device Details"
 msgstr "デバイスの詳細"
 
-#: panels/wwan/cc-wwan-details-dialog.ui:257
+#: panels/wwan/cc-wwan-details-dialog.ui:210
 msgid "Firmware Version"
 msgstr "ファームウェアのバージョン"
 
@@ -8682,57 +8246,57 @@ msgctxt "Network mode"
 msgid "Unknown"
 msgstr "不明"
 
-#: panels/wwan/cc-wwan-device-page.c:188
+#: panels/wwan/cc-wwan-device-page.c:187
 msgid "Unlock SIM card"
 msgstr "SIM カードのロック解除"
 
-#: panels/wwan/cc-wwan-device-page.c:189 panels/wwan/cc-wwan-device-page.c:237
+#: panels/wwan/cc-wwan-device-page.c:188 panels/wwan/cc-wwan-device-page.c:236
 msgid "Unlock"
 msgstr "ロック解除"
 
-#: panels/wwan/cc-wwan-device-page.c:194
+#: panels/wwan/cc-wwan-device-page.c:193
 #, c-format
 msgid "Please provide PIN code for SIM %d"
 msgstr "SIM %d の PIN コードが必要です"
 
-#: panels/wwan/cc-wwan-device-page.c:195
+#: panels/wwan/cc-wwan-device-page.c:194
 msgid "Enter PIN to unlock your SIM card"
 msgstr "SIM カードのロックを解除する PIN を入力してください"
 
-#: panels/wwan/cc-wwan-device-page.c:199
+#: panels/wwan/cc-wwan-device-page.c:198
 #, c-format
 msgid "Please provide PUK code for SIM %d"
 msgstr "SIM %d の PUK コードが必要です"
 
-#: panels/wwan/cc-wwan-device-page.c:200
+#: panels/wwan/cc-wwan-device-page.c:199
 msgid "Enter PUK to unlock your SIM card"
 msgstr "SIM カードのロックを解除する PUK を入力してください"
 
-#: panels/wwan/cc-wwan-device-page.c:218
+#: panels/wwan/cc-wwan-device-page.c:217
 #, c-format
 msgid "Wrong password entered. You have %1$u try left"
 msgid_plural "Wrong password entered. You have %1$u tries left"
 msgstr[0] "違うパスワードを入力しました (残り %1$u 回)"
 
-#: panels/wwan/cc-wwan-device-page.c:221
+#: panels/wwan/cc-wwan-device-page.c:220
 #, c-format
 msgid "You have %u try left"
 msgid_plural "You have %u tries left"
 msgstr[0] "残り %u 回"
 
-#: panels/wwan/cc-wwan-device-page.c:226
+#: panels/wwan/cc-wwan-device-page.c:225
 msgid "Wrong password entered."
 msgstr "違うパスワードを入力しました。"
 
-#: panels/wwan/cc-wwan-device-page.c:271
+#: panels/wwan/cc-wwan-device-page.c:270
 msgid "PUK code should be an 8 digit number"
 msgstr "PUK コードは 8 桁です"
 
-#: panels/wwan/cc-wwan-device-page.c:295
+#: panels/wwan/cc-wwan-device-page.c:294
 msgid "Enter New PIN"
 msgstr "新しい PIN を入力してください"
 
-#: panels/wwan/cc-wwan-device-page.c:299
+#: panels/wwan/cc-wwan-device-page.c:298
 msgid "PIN code should be a 4-8 digit number"
 msgstr "PIN コードは 4-8 桁です"
 
@@ -8740,59 +8304,59 @@ msgstr "PIN コードは 4-8 桁です"
 msgid "Unlocking…"
 msgstr "ロック解除…"
 
-#: panels/wwan/cc-wwan-device-page.ui:34
+#: panels/wwan/cc-wwan-device-page.ui:18
 msgid "No SIM"
 msgstr "SIM なし"
 
-#: panels/wwan/cc-wwan-device-page.ui:45
+#: panels/wwan/cc-wwan-device-page.ui:19
 msgid "Insert a SIM card to use this modem"
 msgstr "モデムに SIM カードを挿入してください"
 
-#: panels/wwan/cc-wwan-device-page.ui:78
+#: panels/wwan/cc-wwan-device-page.ui:33
 msgid "SIM Locked"
 msgstr "SIM はロックされています"
 
-#: panels/wwan/cc-wwan-device-page.ui:139
+#: panels/wwan/cc-wwan-device-page.ui:77
 msgid "_Mobile Data"
 msgstr "モバイルデータ(_M)"
 
-#: panels/wwan/cc-wwan-device-page.ui:140
+#: panels/wwan/cc-wwan-device-page.ui:78
 msgid "Access data using mobile network"
 msgstr "モバイルネットワークでデータにアクセスします"
 
-#: panels/wwan/cc-wwan-device-page.ui:151
+#: panels/wwan/cc-wwan-device-page.ui:88
 msgid "_Data Roaming"
 msgstr "データローミング(_D)"
 
-#: panels/wwan/cc-wwan-device-page.ui:152
+#: panels/wwan/cc-wwan-device-page.ui:89
 msgid "Use mobile data when roaming"
 msgstr "ローミング時にモバイルデータを使用します"
 
-#: panels/wwan/cc-wwan-device-page.ui:177
+#: panels/wwan/cc-wwan-device-page.ui:115
 msgid "_Network Mode"
 msgstr "ネットワークモード(_N)"
 
-#: panels/wwan/cc-wwan-device-page.ui:187
+#: panels/wwan/cc-wwan-device-page.ui:122
 msgid "N_etwork"
 msgstr "ネットワーク(_E)"
 
-#: panels/wwan/cc-wwan-device-page.ui:199
+#: panels/wwan/cc-wwan-device-page.ui:132
 msgid "Advanced"
 msgstr "高度"
 
-#: panels/wwan/cc-wwan-device-page.ui:225
+#: panels/wwan/cc-wwan-device-page.ui:146
 msgid "_Access Point Names"
 msgstr "アクセスポイント名(_A)"
 
-#: panels/wwan/cc-wwan-device-page.ui:235
+#: panels/wwan/cc-wwan-device-page.ui:155
 msgid "_SIM Lock"
 msgstr "SIM ロック(_S)"
 
-#: panels/wwan/cc-wwan-device-page.ui:236
+#: panels/wwan/cc-wwan-device-page.ui:156
 msgid "Lock SIM with PIN"
 msgstr "PIN で SIM をロックします"
 
-#: panels/wwan/cc-wwan-device-page.ui:246
+#: panels/wwan/cc-wwan-device-page.ui:165
 msgid "M_odem Details"
 msgstr "モデムの詳細(_O)"
 
@@ -8880,83 +8444,83 @@ msgstr ""
 msgid "Unknown Error"
 msgstr "原因不明のエラー"
 
-#: panels/wwan/cc-wwan-mode-dialog.ui:4
+#: panels/wwan/cc-wwan-mode-dialog.ui:5
 msgid "Network Mode"
 msgstr "ネットワークモード"
 
-#: panels/wwan/cc-wwan-mode-dialog.ui:44
-#: panels/wwan/cc-wwan-network-dialog.ui:175
-#: panels/wwan/cc-wwan-sim-lock-dialog.c:230
+#: panels/wwan/cc-wwan-mode-dialog.ui:39
+#: panels/wwan/cc-wwan-network-dialog.ui:146
+#: panels/wwan/cc-wwan-sim-lock-dialog.c:229
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:46 panels/wwan/cc-wwan-panel.ui:39
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:101
+#: panels/wwan/cc-wwan-network-dialog.ui:41 panels/wwan/cc-wwan-panel.ui:41
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:90
 msgid "Close"
 msgstr "閉じる"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:84
+#: panels/wwan/cc-wwan-network-dialog.ui:69
 msgid "_Automatic"
 msgstr "自動(_A)"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:100
+#: panels/wwan/cc-wwan-network-dialog.ui:84
 msgid "Choose Network"
 msgstr "ネットワークを選択"
 
-#: panels/wwan/cc-wwan-network-dialog.ui:118
+#: panels/wwan/cc-wwan-network-dialog.ui:99
 msgid "Refresh Network Providers"
 msgstr "ネットワークプロバイダーを更新"
 
-#: panels/wwan/cc-wwan-panel.c:453 panels/wwan/cc-wwan-panel.c:482
+#: panels/wwan/cc-wwan-panel.c:417 panels/wwan/cc-wwan-panel.c:448
 #, c-format
 msgid "SIM %d"
 msgstr "SIM %d"
 
-#: panels/wwan/cc-wwan-panel.ui:101
+#: panels/wwan/cc-wwan-panel.ui:10
+msgid "Enable Mobile Network"
+msgstr "モバイルネットワークを有効にする"
+
+#: panels/wwan/cc-wwan-panel.ui:94
 msgid "No WWAN Adapter Found"
 msgstr "WWAN アダプターが見つかりませんでした"
 
-#: panels/wwan/cc-wwan-panel.ui:112
+#: panels/wwan/cc-wwan-panel.ui:104
 msgid "Make sure you have a Wireless Wan/Cellular device"
 msgstr "ワイヤレス Wan/Cellular デバイスを確認してください"
 
-#: panels/wwan/cc-wwan-panel.ui:154
+#: panels/wwan/cc-wwan-panel.ui:145
 msgid "Wireless Wan is disabled when airplane mode is on"
 msgstr "機内モードがオンの場合ワイヤレス WAN は使用できません"
 
-#: panels/wwan/cc-wwan-panel.ui:163
+#: panels/wwan/cc-wwan-panel.ui:153
 msgid "_Turn off Airplane Mode"
 msgstr "機内モードをオフにする(_T)"
 
-#: panels/wwan/cc-wwan-panel.ui:210
+#: panels/wwan/cc-wwan-panel.ui:184
 msgid "Data Connection"
 msgstr "データ接続"
 
-#: panels/wwan/cc-wwan-panel.ui:224
+#: panels/wwan/cc-wwan-panel.ui:185
 msgid "SIM card used for internet"
 msgstr "SIM カードをインターネットに使用します"
 
-#: panels/wwan/cc-wwan-panel.ui:332
-msgid "Enable Mobile Network"
-msgstr "モバイルネットワークを有効にする"
-
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:11
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:9
 msgid "SIM Lock"
 msgstr "SIM ロック"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:22
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:24
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:141
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:122
 msgid "_Lock SIM with PIN"
 msgstr "PIN で SIM をロックする(_L)"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:158
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:138
 msgid "Change PIN"
 msgstr "PIN を変更"
 
-#: panels/wwan/cc-wwan-sim-lock-dialog.ui:256
+#: panels/wwan/cc-wwan-sim-lock-dialog.ui:231
 msgid "Enter current PIN to change SIM lock settings"
 msgstr "SIM ロック設定の変更のために現在の PIN を入力してください"
 
@@ -8970,24 +8534,43 @@ msgstr "モバイルデータ接続やテレフォニー接続を設定します
 
 #. FIXME
 #. Translators: Search terms to find the WWAN panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/wwan/gnome-wwan-panel.desktop.in.in:17
+#: panels/wwan/gnome-wwan-panel.desktop.in.in:16
 msgid "cellular;wwan;telephony;sim;mobile;"
-msgstr "cellular;wwan;telephony;sim;mobile;"
-"セルラー;ワイヤレスワイドエリアネットワーク;テレフォニー;モバイル;"
-
-#: shell/appdata/gnome-control-center.appdata.xml.in:7
-msgid "GNOME Settings"
-msgstr "GNOME Settings"
+msgstr ""
+"cellular;wwan;telephony;sim;mobile;セルラー;ワイヤレスワイドエリアネットワー"
+"ク;テレフォニー;モバイル;"
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:8
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:8
 msgid "Utility to configure the GNOME desktop"
 msgstr "GNOME デスクトップの設定ユーティリティ"
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:10
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:10
 msgid "Settings is the primary interface for configuring your system."
 msgstr "“設定”はシステム設定用のプライマリインターフェースです。"
 
-#: shell/appdata/gnome-control-center.appdata.xml.in:20
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:17
+#, fuzzy
+#| msgid "GNOME Settings"
+msgid "GNOME Settings Sound Panel"
+msgstr "GNOME Settings"
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:21
+msgid "GNOME Settings Mouse &amp; Touchpad Panel"
+msgstr ""
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:25
+#, fuzzy
+#| msgid "GNOME Settings"
+msgid "GNOME Settings Background Panel"
+msgstr "GNOME Settings"
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:29
+#, fuzzy
+#| msgid "GNOME Settings"
+msgid "GNOME Settings Keyboard Panel"
+msgstr "GNOME Settings"
+
+#: shell/appdata/org.gnome.Settings.appdata.xml.in:38
 msgid "The GNOME Project"
 msgstr "The GNOME Project"
 
@@ -9015,27 +8598,27 @@ msgstr "表示するパネル"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: shell/cc-panel-list.ui:45 shell/cc-window.c:275
+#: shell/cc-panel-list.ui:39 shell/cc-window.c:242
 msgid "Privacy"
 msgstr "プライバシー"
 
-#: shell/cc-panel-loader.c:299
+#: shell/cc-panel-loader.c:301
 msgid "Available panels:"
 msgstr "利用可能なパネル:"
 
-#: shell/cc-window.ui:136
+#: shell/cc-window.ui:30
 msgid "All Settings"
 msgstr "すべての設定"
 
-#: shell/cc-window.ui:174
+#: shell/cc-window.ui:54
 msgid "Primary Menu"
 msgstr "プライマリメニュー"
 
-#: shell/cc-window.ui:318
+#: shell/cc-window.ui:152
 msgid "Warning: Development Version"
 msgstr "警告: 開発版です"
 
-#: shell/cc-window.ui:319
+#: shell/cc-window.ui:153
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -9044,15 +8627,10 @@ msgstr ""
 "このバージョンの“設定”は、開発目的の場合にのみ使用してください。システムの不"
 "正動作、データ消失、その他の予期せぬ不具合が発生する可能性があります。"
 
-#: shell/cc-window.ui:330
+#: shell/cc-window.ui:164
 msgid "Help"
 msgstr "ヘルプ"
 
-#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: shell/gnome-control-center.desktop.in.in:17
-msgid "Preferences;Settings;"
-msgstr "Preferences;Settings;設定;"
-
 #: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
@@ -9083,11 +8661,16 @@ msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "検索をキャンセルする"
 
-#: shell/org.gnome.ControlCenter.gschema.xml:5
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: shell/org.gnome.Settings.desktop.in.in:17
+msgid "Preferences;Settings;"
+msgstr "Preferences;Settings;設定;"
+
+#: shell/org.gnome.Settings.gschema.xml:5
 msgid "The identifier for the last Settings panel to be opened"
 msgstr "最後に開いた設定パネルの識別子"
 
-#: shell/org.gnome.ControlCenter.gschema.xml:6
+#: shell/org.gnome.Settings.gschema.xml:6
 msgid ""
 "The identifier for the last Settings panel to be opened. Unrecognised values "
 "will be ignored and the first panel in the list selected."
@@ -9095,15 +8678,25 @@ msgstr ""
 "最後に開いた設定パネルの識別子です。値を認識できない場合は無視して一覧の最初"
 "のパネルを選択します。"
 
-#: shell/org.gnome.ControlCenter.gschema.xml:13
+#: shell/org.gnome.Settings.gschema.xml:13
 msgid "Show warning when running a development build of Settings"
 msgstr "“設定”の開発版を起動したときに警告を表示する"
 
-#: shell/org.gnome.ControlCenter.gschema.xml:14
+#: shell/org.gnome.Settings.gschema.xml:14
 msgid ""
 "Whether Settings should show a warning when running a development build."
 msgstr "開発版を起動したときに“設定”が警告を表示するかどうかです。"
 
+#: shell/org.gnome.Settings.gschema.xml:20
+msgid "Initial state of the window"
+msgstr ""
+
+#: shell/org.gnome.Settings.gschema.xml:21
+msgid ""
+"A tuple containing the initial width, height and maximized state of the "
+"application window."
+msgstr ""
+
 #. translators:
 #. * The number of sound outputs on a particular device
 #: subprojects/gvc/gvc-mixer-control.c:1907
@@ -9124,6 +8717,444 @@ msgstr[0] "%u 入力"
 msgid "System Sounds"
 msgstr "システムのサウンド"
 
+#~ msgid "Web Links"
+#~ msgstr "ウェブリンク"
+
+#~ msgid "Git Links"
+#~ msgstr "Git リンク"
+
+#~ msgid "%s Links"
+#~ msgstr "%s リンク"
+
+#~ msgid "Unset"
+#~ msgstr "削除"
+
+#~ msgid "Links"
+#~ msgstr "リンク"
+
+#~ msgid "Hypertext Files"
+#~ msgstr "ハイパーテキストファイル"
+
+#~ msgid "Text Files"
+#~ msgstr "テキストファイル"
+
+#~ msgid "Image Files"
+#~ msgstr "画像ファイル"
+
+#~ msgid "Font Files"
+#~ msgstr "フォントファイル"
+
+#~ msgid "Archive Files"
+#~ msgstr "アーカイブファイル"
+
+#~ msgid "Package Files"
+#~ msgstr "パッケージファイル"
+
+#~ msgid "Audio Files"
+#~ msgstr "オーディオファイル"
+
+#~ msgid "Video Files"
+#~ msgstr "ビデオファイル"
+
+#~ msgid "Other Files"
+#~ msgstr "その他のファイル"
+
+#~ msgid "Permissions & Access"
+#~ msgstr "パーミッションとアクセス"
+
+#~ msgid ""
+#~ "Data and services that this app has asked for access to and permissions "
+#~ "that it requires."
+#~ msgstr "このアプリが要求している権限です。"
+
+#~ msgid "Cannot be changed"
+#~ msgstr "変更できません"
+
+#~ msgid ""
+#~ "Individual permissions for applications can be reviewed in the <a href="
+#~ "\"privacy\">Privacy</a> Settings."
+#~ msgstr ""
+#~ "アプリケーションごとの権限設定は<a href=\"privacy\">プライバシー</a>設定に"
+#~ "もあります。"
+
+#~ msgid "Integration"
+#~ msgstr "統合"
+
+#~ msgid "Set Desktop Background"
+#~ msgstr "デスクトップの背景の設定"
+
+#~ msgid "Default Handlers"
+#~ msgstr "デフォルトのハンドラ"
+
+#~ msgid "Types of files and links that this application opens."
+#~ msgstr "このアプリケーションで開くファイルとリンクの種類です。"
+
+#~ msgid "Usage"
+#~ msgstr "使用"
+
+#~ msgid "How much resources this application is using."
+#~ msgstr "このアプリケーションが使用中のリソース量です。"
+
+#~ msgid "Open in Software"
+#~ msgstr "“ソフトウェア”で開く"
+
+#~ msgid "Activities"
+#~ msgstr "アクティビティ"
+
+#~ msgid "Change your background image to a wallpaper or photo"
+#~ msgstr "背景画像を壁紙や写真に変更します"
+
+#~ msgid "Allow the applications below to use your camera."
+#~ msgstr "以下のアプリケーションがカメラを使用することを許可します。"
+
+#~ msgid "Failed to upload file: %s"
+#~ msgstr "ファイルのアップロードに失敗しました: %s"
+
+#~ msgid "The profile has been uploaded to:"
+#~ msgstr "プロファイルがアップロードされました:"
+
+#~ msgid "Write down this URL."
+#~ msgstr "この URL をメモしてください。"
+
+#~ msgid "Restart this computer and boot your normal operating system."
+#~ msgstr ""
+#~ "このコンピューターを再起動して通常のオペレーティングシステムを起動してくだ"
+#~ "さい。"
+
+#~ msgid "Type the URL into your browser to download and install the profile."
+#~ msgstr ""
+#~ "ブラウザーで URL を入力し、プロファイルをダウンロードしてインストールして"
+#~ "ください。"
+
+#~ msgid "Upload profile"
+#~ msgstr "プロファイルのアップロード"
+
+#~ msgid "Requires Internet connection"
+#~ msgstr "インターネット接続が必要です"
+
+#~ msgid "_Copy"
+#~ msgstr "コピー(_C)"
+
+#~ msgid "Select _All"
+#~ msgstr "すべて選択(_A)"
+
+#~ msgid "Single Display"
+#~ msgstr "シングルディスプレイ"
+
+#~ msgid "Join Displays"
+#~ msgstr "画面を拡張"
+
+#~ msgid "Display Mode"
+#~ msgstr "ディスプレイモード"
+
+#~ msgid ""
+#~ "Drag displays to match your physical display setup. Select a display to "
+#~ "change its settings."
+#~ msgstr ""
+#~ "実際の配置に合わせてディスプレイをドラッグしてください。設定を変更するに"
+#~ "は、ディスプレイを選択してください。"
+
+#~ msgid "Active Display"
+#~ msgstr "アクティブディスプレイ"
+
+#~ msgid "Display Configuration"
+#~ msgstr "ディスプレイの設定"
+
+#~ msgid "More Warm"
+#~ msgstr "濃い暖色"
+
+#~ msgid "Less Warm"
+#~ msgstr "薄い暖色"
+
+#~ msgid "Screenshots"
+#~ msgstr "スクリーンショット"
+
+#~ msgid "Save a screenshot to $PICTURES"
+#~ msgstr "スクリーンショットを$PICTURESフォルダーに保存する"
+
+#~ msgid "Save a screenshot of a window to $PICTURES"
+#~ msgstr "ウィンドウのスクリーンショットを$PICTURESフォルダーに保存する"
+
+#~ msgid "Save a screenshot of an area to $PICTURES"
+#~ msgstr "選択領域のスクリーンショットを$PICTURESフォルダーに保存する"
+
+#~ msgid "Copy a screenshot to clipboard"
+#~ msgstr "スクリーンショットをクリップボードにコピーする"
+
+#~ msgid "Copy a screenshot of a window to clipboard"
+#~ msgstr "ウィンドウのスクリーンショットをクリップボードにコピーする"
+
+#~ msgid "Copy a screenshot of an area to clipboard"
+#~ msgstr "選択領域のスクリーンショットをクリップボードにコピーする"
+
+#~ msgid "Record a short screencast"
+#~ msgstr "スクリーンキャストを撮る"
+
+#~ msgid "Move up"
+#~ msgstr "上へ"
+
+#~ msgid "Move down"
+#~ msgstr "下へ"
+
+#~ msgctxt "lock_screen"
+#~ msgid "5 minutes"
+#~ msgstr "5 分"
+
+#~ msgid "Double-click timeout"
+#~ msgstr "ダブルクリックと認識される最長クリック間隔"
+
+#~ msgid "%s VPN"
+#~ msgstr "%s VPN"
+
+#~ msgid "Suspend & Power Button"
+#~ msgstr "サスペンド, 電源ボタン"
+
+#~ msgid "High hardware temperature: performance mode unavailable"
+#~ msgstr "ハードウェアが高温です: パフォーマンスモードは利用できません"
+
+#~ msgid "Performance mode unavailable"
+#~ msgstr "パフォーマンスモードは利用できません"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Authenticate"
+#~ msgstr "認証"
+
+#~ msgid ""
+#~ "Choose the format for numbers, dates and currencies. Changes take effect "
+#~ "on next login."
+#~ msgstr ""
+#~ "数値、日時、通貨の形式を選択してください。変更は次回ログイン時に反映されま"
+#~ "す。"
+
+#~ msgid "My Account"
+#~ msgstr "自分のアカウント"
+
+#~ msgid "Language"
+#~ msgstr "言語"
+
+#~ msgid "The language used for text in windows and web pages."
+#~ msgstr "ウェブページやウィンドウのテキストで使われる言語です。"
+
+#~ msgid "Restart the session for changes to take effect"
+#~ msgstr "変更内容を反映させるにはログインし直す必要があります"
+
+# 言語設定を変更すると表示されるボタンのラベル。クリックするとログアウトダイアログが表示されます。
+#~ msgid "Restart…"
+#~ msgstr "ログアウト…"
+
+#~ msgid "The format used for numbers, dates, and currencies."
+#~ msgstr "数値、日時、通貨の形式です。"
+
+#~ msgid "Login settings are used by all users when logging into the system"
+#~ msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
+
+#~ 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."
+#~ msgstr ""
+#~ "アクティビティ画面で、どれの検索結果を表示するかを設定します。一覧の項目を"
+#~ "入れ替えると、検索結果の表示順が変更されます。"
+
+#~ msgid ""
+#~ "Screen sharing allows remote users to view or control your screen by "
+#~ "connecting to %s"
+#~ msgstr ""
+#~ "スクリーン共有を許可した場合、リモートユーザーは次の URI に接続して画面の"
+#~ "表示や操作を行うことができます: %s"
+
+#~ msgid "Copy"
+#~ msgstr "コピー"
+
+#~ msgid "_Screen Sharing"
+#~ msgstr "画面共有(_S)"
+
+#~ msgid "Some services are disabled because of no network access."
+#~ msgstr ""
+#~ "ネットワークに接続していないため無効になっているサービスがあります。"
+
+#~ msgid "Screen Sharing"
+#~ msgstr "画面共有"
+
+#~ msgid "_Allow connections to control the screen"
+#~ msgstr "このスクリーンを操作する接続を許可する(_A)"
+
+#~ msgid "_Password:"
+#~ msgstr "パスワード(_P):"
+
+#~ msgid "_Show Password"
+#~ msgstr "パスワードを表示する(_S)"
+
+#~ msgid "Access Options"
+#~ msgstr "アクセスオプション"
+
+#~ msgid "_New connections must ask for access"
+#~ msgstr "新規接続の場合アクセス要求を必要とする(_N)"
+
+#~ msgid "_Require a password"
+#~ msgstr "パスワードを要求する(_R)"
+
+# 直訳するなら「サウンドキー」のようになるが、この直訳ではユーザーに意味を誤解されるおそれがある。
+# Windows では、これに相当する機能は「Toggle Keys」と呼ばれており[1]、その日本語訳は「切り替えキー」である[2]。
+# 
「切り替えキー」もわかりやすいとは言いづらいが、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
+#~ msgid "Sound Keys"
+#~ msgstr "切り替えキー"
+
+#~ msgid "Screen Reader"
+#~ msgstr "スクリーンリーダー"
+
+#~ msgid "_Screen Reader"
+#~ msgstr "スクリーンリーダー(_S)"
+
+#~ msgid "_Full Name"
+#~ msgstr "フルネーム(_F)"
+
+#~ msgid "Standard"
+#~ msgstr "標準"
+
+#~ msgid "Account _Type"
+#~ msgstr "アカウントの種類(_T)"
+
+#~ msgid "Allow user to set a password when they next _login"
+#~ msgstr "次回ログイン時にユーザー自身にパスワードを設定させる(_L)"
+
+#~ msgid "Set a password _now"
+#~ msgstr "今パスワードを設定する(_N)"
+
+#~ msgid "_Confirm"
+#~ msgstr "確認(_C)"
+
+#~ msgid "You must be online in order to add enterprise users."
+#~ msgstr ""
+#~ "エンタープライズユーザーを追加するには、システムをオンラインにする必要があ"
+#~ "ります。"
+
+#~ msgid "_Enterprise Login"
+#~ msgstr "エンタープライズログイン(_E)"
+
+#~ msgid "Take a Picture…"
+#~ msgstr "写真を撮る…"
+
+#~ msgid "Your account"
+#~ msgstr "あなたのアカウント"
+
+#~ msgid ""
+#~ "To make changes,\n"
+#~ "click the * icon first"
+#~ msgstr "変更するには、まず * アイコンをクリックしてください"
+
+#~ msgid "Create a user account"
+#~ msgstr "ユーザーアカウントを作成します"
+
+#~ msgid "User Icon"
+#~ msgstr "ユーザーアイコン"
+
+#~ msgid "Account Settings"
+#~ msgstr "アカウント設定"
+
+#~ msgid "Authentication & Login"
+#~ msgstr "認証とログイン"
+
+#~ msgid "This will be used to name your home folder and can’t be changed."
+#~ msgstr ""
+#~ "ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
+
+#~ msgid "Output:"
+#~ msgstr "出力:"
+
+#~ msgid "Keep aspect ratio (letterbox):"
+#~ msgstr "縦横比を保持 (レターボックス):"
+
+# 参考: intuos 5 のマニュアル p.57
+#~ msgid "Map to single monitor"
+#~ msgstr "単一画面にマッピング"
+
+#~ msgid "%d of %d"
+#~ msgstr "%d / %d"
+
+#~ msgid "Display Mapping"
+#~ msgstr "画面のマッピング"
+
+#~ msgid "Stylus"
+#~ msgstr "ペン"
+
+#~ msgid "Button"
+#~ msgstr "ボタン"
+
+#~ msgid "Tablet (absolute)"
+#~ msgstr "タブレット(絶対座標)"
+
+#~ msgid "Touchpad (relative)"
+#~ msgstr "タッチパッド(相対座標)"
+
+#~ msgid "Tablet Preferences"
+#~ msgstr "タブレット設定"
+
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
+
+#~ msgid "Bluetooth Settings"
+#~ msgstr "Bluetooth の設定"
+
+#~ msgid "Tracking Mode"
+#~ msgstr "検出モード"
+
+#~ msgid "Left-Handed Orientation"
+#~ msgstr "左手用"
+
+# 参考: intuos 5 のマニュアル p.57
+#~ msgid "Map to Monitor…"
+#~ msgstr "画面にマッピング…"
+
+#~ msgid "Map Buttons…"
+#~ msgstr "ボタン割り当て…"
+
+#~ msgid "Calibrate…"
+#~ msgstr "キャリブレート…"
+
+#~ msgid "Adjust mouse settings"
+#~ msgstr "マウス設定の調整"
+
+#~ msgid "Adjust display resolution"
+#~ msgstr "ディスプレイの解像度を調整"
+
+#~ msgid "Default"
+#~ msgstr "デフォルト"
+
+#~ msgid "Middle Mouse Button Click"
+#~ msgstr "マウスの中ボタンクリック"
+
+#~ msgid "Right Mouse Button Click"
+#~ msgstr "マウスの右ボタンクリック"
+
+#~ msgid "Forward"
+#~ msgstr "進む"
+
+#~ msgid "No stylus found"
+#~ msgstr "スタイラスペンが見つかりません"
+
+#~ msgid ""
+#~ "Please move your stylus to the proximity of the tablet to configure it"
+#~ msgstr "スタイラスペンをタブレットの近くに移動して設定を行ってください"
+
+#~ msgid "Soft"
+#~ msgstr "柔らかい"
+
+#~ msgid "Firm"
+#~ msgstr "硬い"
+
+#~ msgid "Top Button"
+#~ msgstr "上のサイドスイッチ"
+
+#~ msgid "Lower Button"
+#~ msgstr "下のサイドスイッチ"
+
+#~ msgid "Lowest Button"
+#~ msgstr "一番下のボタン"
+
 #~ msgid "Left Alt"
 #~ msgstr "左 Alt"
 
@@ -9304,9 +9335,6 @@ msgstr "システムのサウンド"
 #~ msgid "Access bluetooth hardware directly"
 #~ msgstr "Bluetooth ハードウェアへの直接アクセス"
 
-#~ msgid "Use bluetooth devices"
-#~ msgstr "Bluetooth デバイスの使用"
-
 #~ msgid "Use your camera"
 #~ msgstr "カメラの使用"
 
@@ -9346,9 +9374,6 @@ msgstr "システムのサウンド"
 #~ msgid "Change location settings and providers"
 #~ msgstr "位置設定と位置プロバイダーの変更"
 
-#~ msgid "Access your location"
-#~ msgstr "位置情報へのアクセス"
-
 #~ msgid "Read system and application logs"
 #~ msgstr "システムログとアプリケーションログの読み取り"
 


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