[gnome-control-center] Update Japanese translation



commit 9f24a731a60a76d914a54fc6a4da06cff62e658a
Author: Ryuta Fujii <translation sicklylife jp>
Date:   Wed Jan 2 17:34:05 2019 +0000

    Update Japanese translation

 po/ja.po | 6153 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 3362 insertions(+), 2791 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 5f4767f39..4db4a62a4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,240 +4,252 @@
 # Eiichiro ITANI <emu ceres dti ne jp>, 1999.
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2000, 2009, 2010-2013.
 # Akira TAGOH <tagoh gnome gr jp>, 2001.
-# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2008.
 # KAMAGASAKO Masatoshi <emerald gnome gr jp>, 2003.
+# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2008.
 # Satoru SATOH <ss gnome gr jp>, 2006.
 # Hideki Yamane (Debian-JP) <henrich debian or jp>, 2009.
 # Yasumichi Akahoshi <yasumichi vinelinux org>, 2010.
-# Kiyotaka NISHIBORI <ml nishibori kiyotaka gmail com>, 2011.
 # Jiro Matsuzawa <jmatsuzawa gnome org>, 2010-2017.
+# Kiyotaka NISHIBORI <ml nishibori kiyotaka gmail com>, 2011.
 # Hideki Yamnane <henrich debian org>, 2011.
 # Noriko Mizumoto <noriko fedoraproject org>, 2012.
 # Ikuya Awashiro <ikuya fruitsbasket info>, 2014.
-# Hajime Taira <htaira redhat com>, 2015-2017
+# Hajime Taira <htaira redhat com>, 2015-2018.
+# sicklylife <translation sicklylife jp>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-12 10:59+0000\n"
-"PO-Revision-Date: 2017-09-19 22:58+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
+"issues\n"
+"POT-Creation-Date: 2018-12-18 20:54+0000\n"
+"PO-Revision-Date: 2019-01-03 01:58+0900\n"
+"Last-Translator: sicklylife <translation sicklylife jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.2\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "背景(_B)"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "時間の経過とともに画像が変化します"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "ロック画面(_L)"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "並べる"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "ズーム"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "中央"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "サイズ調整"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "引き伸ばす"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "スパン(複数に跨げる)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
+#: panels/background/cc-background-chooser-dialog.c:412
 msgid "Wallpapers"
 msgstr "壁紙"
 
-#: ../panels/background/cc-background-chooser-dialog.c:439
+#: panels/background/cc-background-chooser-dialog.c:423
 msgid "Colors"
 msgstr "色"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:476
+#: panels/background/cc-background-chooser-dialog.c:455
 msgid "Select Background"
 msgstr "背景の選択"
 
-#: ../panels/background/cc-background-chooser-dialog.c:504
+#: panels/background/cc-background-chooser-dialog.c:484
 msgid "Pictures"
 msgstr "画像"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:536
+#: panels/background/cc-background-chooser-dialog.c:519
 msgid "No Pictures Found"
 msgstr "画像が見つかりません"
 
 #. translators: "Home" is used in place of the Pictures
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
-#: ../panels/background/cc-background-chooser-dialog.c:554
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:536
+#: panels/search/cc-search-locations-dialog.c:286
 msgid "Home"
 msgstr "ホーム"
 
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:566
+#: panels/background/cc-background-chooser-dialog.c:546
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "画像を %s フォルダーに追加すると、その画像がここに表示されます。"
 
-#: ../panels/background/cc-background-chooser-dialog.c:573
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:2697
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1318
-#: ../panels/network/net-device-wifi.c:1398
-#: ../panels/network/net-device-wifi.c:1633
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1049
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:382
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:644
-#: ../panels/user-accounts/um-user-panel.c:662
+#: panels/background/cc-background-chooser-dialog.c:550
+#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:2061
+#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1411 panels/network/net-device-wifi.c:1491
+#: panels/network/net-device-wifi.c:1733 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:330
+#: panels/privacy/cc-privacy-panel.c:1051 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:607
+#: panels/sharing/cc-sharing-panel.c:427
+#: panels/user-accounts/cc-add-user-dialog.ui:28
+#: panels/user-accounts/cc-avatar-chooser.c:144
+#: panels/user-accounts/cc-avatar-chooser.c:272
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/um-fingerprint-dialog.c:261
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../panels/background/cc-background-chooser-dialog.c:574
+#: panels/background/cc-background-chooser-dialog.c:551
+#: panels/common/cc-language-chooser.ui:12
 msgid "_Select"
 msgstr "選択(_S)"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:191
 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:207
+#: panels/background/cc-background-item.c:195
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:320
 msgid "No Desktop Background"
 msgstr "デスクトップの背景が見つかりません"
 
-#: ../panels/background/cc-background-panel.c:493
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "現在の背景"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Back­ground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "背景"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
-msgstr "背景画像を変更します。"
+msgstr "背景画像を壁紙や写真に変更します"
 
-#. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/background/gnome-background-panel.desktop.in.in:7
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
+#. Translators: Search terms to find the Background 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;"
 msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;Background;背景;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:268
-msgid "Turn Off Airplane Mode"
-msgstr "機内モードをオフにする"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "Bluetooth が見つかりません"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Bluetooth を使用するにはドングルを接続してください。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth がオフになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 msgid "Turn on to connect devices and receive file transfers."
 msgstr ""
 "デバイスの接続やファイルの受信を行うには Bluetooth をオンにしてください。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "機内モードがオンになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "機内モードがオンの場合、Bluetooth は使用できません。"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "ハードウェア機内モードがオンになっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Bluetooth を使用するには機内モードスイッチをオフにしてください。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "Blue­tooth"
-msgstr "Blue­tooth"
+#: panels/bluetooth/cc-bluetooth-panel.c:324
+msgid "Turn Off Airplane Mode"
+msgstr "機内モードをオフにする"
+
+#. Translators: The found device is a printer connected via Bluetooth
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
+#: panels/network/cc-network-panel.ui:101
+#: panels/printers/pp-new-printer-dialog.c:1805
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Bluetooth のオン/オフやデバイスへの接続を行います。"
 
-#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:6
+msgid "bluetooth"
+msgstr "bluetooth"
+
+#. Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:19
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;共有;シェアリング;ブルートゥース;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:361
+#: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
 msgstr "キャリブレーション装置を四角形に合わせて \"開始\" を押してください"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:367
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr "キャリブレーション装置を測定位置に移動して \"次へ\" を押してください"
@@ -245,7 +257,7 @@ msgstr "キャリブレーション装置を測定位置に移動して \"次へ
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:373
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr "キャリブレーション装置を表面の位置に移動して \"次へ\" を押してください"
@@ -253,158 +265,158 @@ msgstr "キャリブレーション装置を表面の位置に移動して \"次
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:379
+#: panels/color/cc-color-calibrate.c:366
 msgid "Shut the laptop lid"
 msgstr "ノート PC を閉じてください"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:397
 msgid "An internal error occurred that could not be recovered."
 msgstr "回復できないエラーが発生しました。"
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:415
+#: panels/color/cc-color-calibrate.c:402
 msgid "Tools required for calibration are not installed."
 msgstr "キャリブレーションに必要なツールがインストールされていません。"
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:421
+#: panels/color/cc-color-calibrate.c:408
 msgid "The profile could not be generated."
 msgstr "プロファイルを生成できません。"
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:427
+#: panels/color/cc-color-calibrate.c:414
 msgid "The target whitepoint was not obtainable."
 msgstr "対象の白色点は取得できません。"
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:467
+#: panels/color/cc-color-calibrate.c:453
 msgid "Complete!"
 msgstr "完了!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:475
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "キャリブレーションに失敗!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:468
 msgid "You can remove the calibration device."
 msgstr "キャリブレーション装置を取り外せます。"
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:553
+#: panels/color/cc-color-calibrate.c:537
 msgid "Do not disturb the calibration device while in progress"
 msgstr "測定中はキャリブレーション装置に触らないでください"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "ラップトップ画面"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "組み込みのウェブカム"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "%s モニター"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "%s スキャナー"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "%s カメラ"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "%s プリンター"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "%s ウェブカム"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:91
 #, c-format
 msgid "Enable color management for %s"
 msgstr "%s のカラーマネージメントを有効にする"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:94
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "%s のカラープロファイルを表示する"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:301
 msgid "Not calibrated"
 msgstr "未較正"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:141
+#: panels/color/cc-color-panel.c:170
 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:149
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
-msgstr "色空間:"
+msgstr "色空間: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:156
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "テスト用プロファイル: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "ICC プロファイルの選択"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "インポート(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "サポートする ICC プロファイル"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:260
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "画面"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "ファイルのアップロードに失敗しました: %s"
@@ -412,43 +424,43 @@ msgstr "ファイルのアップロードに失敗しました: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:922
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "プロファイルがアップロードされました:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "この URL をメモしてください。"
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:862
 msgid "Restart this computer and boot your normal operating system."
 msgstr ""
 "このコンピューターを再起動して通常のオペレーティングシステムを起動してくださ"
 "い。"
 
-#: ../panels/color/cc-color-panel.c:926
+#: panels/color/cc-color-panel.c:863
 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:960
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "プロファイルの保存"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:895
+#: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1324
+#: panels/color/cc-color-panel.c:1209
 msgid "Create a color profile for the selected device"
 msgstr "選択したデバイスのカラープロファイルを作成"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -457,121 +469,20 @@ msgstr ""
 "してください。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1373
+#: panels/color/cc-color-panel.c:1258
 msgid "The measuring instrument does not support printer profiling."
 msgstr "計測器がプリンターのプロファイルをサポートしていません。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1384
+#: panels/color/cc-color-panel.c:1269
 msgid "The device type is not currently supported."
 msgstr "このデバイスの種類は現在サポートされていません。"
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:103
-msgid "Standard Space"
-msgstr "標準の色空間"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:109
-msgid "Test Profile"
-msgstr "テスト用プロファイル"
-
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:117
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "自動"
-
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: ../panels/color/cc-color-profile.c:127
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "低品質"
-
-#. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "中品質"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: ../panels/color/cc-color-profile.c:139
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "高品質"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:156
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "デフォルト RGB"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:163
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "デフォルト CMYK"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:170
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "デフォルトグレー"
-
-#: ../panels/color/cc-color-profile.c:194
-msgid "Vendor supplied factory calibration data"
-msgstr "ベンダーが提供している工場でのキャリブレーションデータ"
-
-#: ../panels/color/cc-color-profile.c:203
-msgid "Full-screen display correction not possible with this profile"
-msgstr "このプロファイルでは全画面表示での補正はできません"
-
-#: ../panels/color/cc-color-profile.c:225
-msgid "This profile may no longer be accurate"
-msgstr "このプロファイルはもう正確ではなくなっているかもしれません。"
-
-#: ../panels/color/color-calibrate.ui.h:1
-msgid "Display Calibration"
-msgstr "キャリブレーションの表示"
-
-#. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
-msgid "_Start"
-msgstr "開始(_S)"
-
-#. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
-msgid "_Resume"
-msgstr "再開(_R)"
-
-#. This button returns the user back to the color control panel
-#: ../panels/color/color-calibrate.ui.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
-msgid "_Done"
-msgstr "完了(_D)"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:47
 msgid "Screen Calibration"
 msgstr "画面位置調整"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/cc-color-panel.ui:23
 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 "
@@ -580,42 +491,42 @@ msgstr ""
 "キャリブレーションは画面の色管理に利用できるプロファイルを作成します。キャリ"
 "ブレーションに時間をかけるほど色プロファイルの品質は向上します。"
 
-#: ../panels/color/color.ui.h:3
+#: panels/color/cc-color-panel.ui:38
 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/color.ui.h:5
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "品質"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "予測時間"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
 msgstr "キャリブレーション品質"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/cc-color-panel.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "キャリブレーションに使用するセンサーデバイスを選択してください。"
 
-#: ../panels/color/color.ui.h:10
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
 msgstr "キャリブレーション装置"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
 msgstr "接続しているディスプレイの種類を選択してください。"
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "ディスプレイの種類"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -623,11 +534,11 @@ msgstr ""
 "表示対象の白色点を選択してください。ほとんどのディスプレイが D65 光源に対して"
 "キャリブレーションを行えばいいはずです。"
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "白色点のプロファイル作成"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/cc-color-panel.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
@@ -635,18 +546,18 @@ msgstr ""
 "ディスプレイを標準的に使っている輝度に設定してください。色管理はこの輝度で最"
 "も正確になります。 "
 
-#: ../panels/color/color.ui.h:16
+#: panels/color/cc-color-panel.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr ""
 "他のプロファイルで使っている輝度をこのデバイス用に利用することもできます。"
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "ディスプレイの明るさ"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/cc-color-panel.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -654,35 +565,35 @@ msgstr ""
 "異なるコンピューターの色プロファイルを利用したり、異なる照明条件のプロファイ"
 "ルを作成することもできます。"
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "プロファイル名:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "プロファイル名"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "プロファイルが正常に作成されました!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "プロファイルの複製"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
 msgstr "書き込み可能メディアが必要です"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "プロファイルのアップロード"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "インターネット接続が必要です"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/cc-color-panel.ui:591
 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"
@@ -692,28 +603,28 @@ msgstr ""
 "\"windows\">Microsoft Windows</a> システムでのプロファイルの利用方法が役立つ"
 "かもしません。"
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:723
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "概要"
 
-#: ../panels/color/color.ui.h:28
+#: panels/color/cc-color-panel.ui:621
 msgid "Add Profile"
 msgstr "プロファイルの追加"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "ファイルを読み込む(_I)…"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:519
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:519
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -721,226 +632,330 @@ msgstr ""
 "問題が検出されました。プロファイルは正しく動作しない可能性があります。<a "
 "href=\"\">詳細を表示する。</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/cc-color-panel.ui:811
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
 "カラーマネージメントを行うには、各デバイスの最新のカラープロファイルが必要に"
 "なります。"
 
-#: ../panels/color/color.ui.h:34
+#: panels/color/cc-color-panel.ui:833
 msgid "Learn more"
 msgstr "もっと詳しく"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/cc-color-panel.ui:838
 msgid "Learn more about color management"
 msgstr "カラーマネージメントについてもっと詳しく知る"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/cc-color-panel.ui:886
 msgid "_Set for all users"
 msgstr "全ユーザー用に設定(_S)"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/cc-color-panel.ui:890 panels/color/cc-color-panel.ui:905
+#: panels/color/cc-color-panel.ui:906
 msgid "Set this profile for all users on this computer"
 msgstr "コンピューターのすべてのユーザーでプロファイルを利用"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/cc-color-panel.ui:901
 msgid "_Enable"
 msgstr "有効にする(_E)"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/cc-color-panel.ui:932
 msgid "_Add profile"
 msgstr "プロファイルの追加(_A)"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/cc-color-panel.ui:945
 msgid "_Calibrate…"
 msgstr "キャリブレート(_C)…"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/cc-color-panel.ui:949
 msgid "Calibrate the device"
 msgstr "デバイスのキャリブレート"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/cc-color-panel.ui:960
 msgid "_Remove profile"
 msgstr "プロファイルの削除(_R)"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/cc-color-panel.ui:973
 msgid "_View details"
 msgstr "詳細を表示(_V)"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/cc-color-panel.ui:1009
 msgid "Unable to detect any devices that can be color managed"
 msgstr "カラーマネジメント対象のデバイスを検出できません"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/cc-color-panel.ui:1053
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/cc-color-panel.ui:1058
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/cc-color-panel.ui:1063
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/cc-color-panel.ui:1068
 msgid "Projector"
 msgstr "プロジェクター"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/cc-color-panel.ui:1073
 msgid "Plasma"
 msgstr "プラズマ"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/cc-color-panel.ui:1078
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL バックライト)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/cc-color-panel.ui:1083
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED バックライト)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/cc-color-panel.ui:1088
 msgid "LCD (white LED backlight)"
 msgstr "LCD (白色 LED バックライト)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/cc-color-panel.ui:1093
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "広色域 LCD (CCFL バックライト)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/cc-color-panel.ui:1098
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "広色域 LCD (RGB LED backlight)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/cc-color-panel.ui:1115
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "高"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/cc-color-panel.ui:1116
 msgid "40 minutes"
 msgstr "40 分"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/cc-color-panel.ui:1120
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/cc-color-panel.ui:1121
 msgid "30 minutes"
 msgstr "30 分"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/cc-color-panel.ui:1125
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "低"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/cc-color-panel.ui:1126
 msgid "15 minutes"
 msgstr "15 分"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/cc-color-panel.ui:1148
 msgid "Native to display"
 msgstr "ディスプレイ本来の設定"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/cc-color-panel.ui:1152
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (印刷および出版)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/cc-color-panel.ui:1156
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/cc-color-panel.ui:1160
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (写真とグラフィック)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/cc-color-panel.ui:1164
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Co­lor"
-msgstr "色管理"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "標準の色空間"
+
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: panels/color/cc-color-profile.c:106
+msgid "Test Profile"
+msgstr "テスト用プロファイル"
+
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "自動"
+
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "低品質"
+
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "中品質"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:136
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "高品質"
+
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:153
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "デフォルト RGB"
+
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:160
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "デフォルト CMYK"
+
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "デフォルトグレー"
+
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "ベンダーが提供している工場でのキャリブレーションデータ"
+
+#: panels/color/cc-color-profile.c:199
+msgid "Full-screen display correction not possible with this profile"
+msgstr "このプロファイルでは全画面表示での補正はできません"
+
+#: panels/color/cc-color-profile.c:221
+msgid "This profile may no longer be accurate"
+msgstr "このプロファイルはもう正確ではなくなっているかもしれません。"
+
+#: panels/color/color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "キャリブレーションの表示"
+
+#. This starts the calibration process
+#: panels/color/color-calibrate.ui:40
+msgid "_Start"
+msgstr "開始(_S)"
+
+#. This resumes the calibration process
+#: panels/color/color-calibrate.ui:54
+msgid "_Resume"
+msgstr "再開(_R)"
+
+#. This button returns the user back to the color control panel
+#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
+msgid "_Done"
+msgstr "完了(_D)"
+
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "色"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: panels/color/gnome-color-panel.desktop.in.in:4
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr "ディスプレイやカメラ、プリンター等のデバイスのキャリブレート"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr ""
 "Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレー"
 "ション;プリンター;ディスプレイ;"
 
-#: ../panels/common/cc-common-language.c:323
+#: panels/common/cc-common-language.c:300
 msgid "Other…"
 msgstr "その他…"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:269
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:268 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "さらに…"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:142
 msgid "No languages found"
 msgstr "言語が見つかりません"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:106
+#: panels/common/cc-language-chooser.ui:5
+msgid "Select Language"
+msgstr "言語の選択"
+
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "今日"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:108
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%m月%d日"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Language"
-msgstr "言語"
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: panels/common/hostname-helper.c:177
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "ホットスポット"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "日"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "月"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: panels/datetime/cc-datetime-panel.c:332
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Y年%B%d日 %p%I:%M"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:344
+#: panels/datetime/cc-datetime-panel.c:337
 msgid "%e %B %Y, %R"
 msgstr "%Y年%B%d日 %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:522
+#: panels/datetime/cc-datetime-panel.c:502
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -948,7 +963,7 @@ msgstr "%2$s、%1$s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:529
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -956,309 +971,311 @@ 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:560
+#: panels/datetime/cc-datetime-panel.c:536
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:565
+#: panels/datetime/cc-datetime-panel.c:541
 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:570
+#: panels/datetime/cc-datetime-panel.c:546
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:575
+#: panels/datetime/cc-datetime-panel.c:551
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "1月"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "2月"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "3月"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "4月"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "5月"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "6月"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "7月"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "8月"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "9月"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "10月"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "11月"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "12月"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/cc-datetime-panel.ui:65
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "日付と時刻"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/cc-datetime-panel.ui:113
 msgid "Hour"
 msgstr "時"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
 msgstr "∶"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/cc-datetime-panel.ui:152
 msgid "Minute"
 msgstr "分"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "タイムゾーン"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "都市を検索する"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/cc-datetime-panel.ui:322
 msgid "Automatic _Date & Time"
 msgstr "自動日時設定(_D)"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/cc-datetime-panel.ui:337
 msgid "Requires internet access"
 msgstr "インターネットアクセスが必要です"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/cc-datetime-panel.ui:400
 msgid "Automatic Time _Zone"
 msgstr "自動タイムゾーン設定(_Z)"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/cc-datetime-panel.ui:415
+msgid "Requires location services enabled and internet access"
+msgstr "位置サービスの有効化とインターネットアクセスが必要です"
+
+#: panels/datetime/cc-datetime-panel.ui:472
 msgid "Date & _Time"
 msgstr "日付と時刻(_T)"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/cc-datetime-panel.ui:520
 msgid "Time Z_one"
 msgstr "タイムゾーン(_O)"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/cc-datetime-panel.ui:590
 msgid "Time _Format"
 msgstr "日時書式(_F)"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/cc-datetime-panel.ui:609
 msgid "24-hour"
 msgstr "24時制"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/cc-datetime-panel.ui:610
 msgid "AM / PM"
 msgstr "午前/午後"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "日付、時刻、タイムゾーンを変更します。"
 
-#. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:7
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
+#. Translators: Search terms to find the Date and Time panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:15
 msgid "Clock;Timezone;Location;"
 msgstr ""
 "Clock;Timezone;Location;時計;日付;時刻;時間;日時;タイムゾーン;場所;Date;Time;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "システムの時刻と日付の設定を変更"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: ../panels/display/cc-display-panel.c:738
+#: panels/display/cc-display-panel.c:535
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "横方向"
 
-#: ../panels/display/cc-display-panel.c:741
-#, fuzzy
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:538
 msgctxt "Display rotation"
 msgid "Portrait Right"
-msgstr "縦方向"
+msgstr "縦方向 (右向き)"
 
-#: ../panels/display/cc-display-panel.c:744
-#, fuzzy
-#| msgid "Portrait"
+#: panels/display/cc-display-panel.c:541
 msgctxt "Display rotation"
 msgid "Portrait Left"
-msgstr "縦方向"
+msgstr "縦方向 (左向き)"
 
-#: ../panels/display/cc-display-panel.c:747
-#, fuzzy
-#| msgid "Landscape"
+#: panels/display/cc-display-panel.c:544
 msgctxt "Display rotation"
 msgid "Landscape (flipped)"
-msgstr "横方向 (逆)"
+msgstr "横方向 (逆向き)"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/display/cc-display-panel.c:788
-#: ../panels/display/cc-display-panel.c:838
-#: ../panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:617
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "向き"
 
-#: ../panels/display/cc-display-panel.c:881
-#: ../panels/display/cc-display-panel.c:933
-#: ../panels/display/cc-display-panel.c:1751
-#: ../panels/display/cc-display-panel.c:1797
-#: ../panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-panel.c:712 panels/display/cc-display-panel.c:1545
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:978
-#: ../panels/display/cc-display-panel.c:1049
+#: panels/display/cc-display-panel.c:806
 msgid "Refresh Rate"
 msgstr "リフレッシュレート"
 
-#: ../panels/display/cc-display-panel.c:1186
-#, fuzzy
-#| msgctxt "background, style"
-#| msgid "Scale"
+#: panels/display/cc-display-panel.c:950
 msgid "Scale"
-msgstr "サイズ調整"
+msgstr "スケール"
 
-#: ../panels/display/cc-display-panel.c:1239
+#: panels/display/cc-display-panel.c:1001
 msgid "Adjust for TV"
-msgstr "TV向けに調整"
+msgstr "TV 向けに調整"
 
-#: ../panels/display/cc-display-panel.c:1451
-#: ../panels/display/cc-display-panel.c:1497
-#, fuzzy
-#| msgid "Secondary Display"
+#: panels/display/cc-display-panel.c:1258
 msgid "Primary Display"
-msgstr "セカンダリディスプレイ"
+msgstr "プライマリディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:1546
-#, fuzzy
-#| msgid "Display Mapping"
+#: panels/display/cc-display-panel.c:1292
 msgid "Display Arrangement"
-msgstr "画面のマッピング"
+msgstr "ディスプレイの配置"
 
-#: ../panels/display/cc-display-panel.c:1547
+#: panels/display/cc-display-panel.c:1293
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
 msgstr ""
+"あなたの調整に合うようにディスプレイをドラッグしてください。トップバーはプラ"
+"イマリディスプレイに配置されます。"
 
-#: ../panels/display/cc-display-panel.c:1985
+#: panels/display/cc-display-panel.c:1747
 msgid "Display Mode"
 msgstr "ディスプレイモード"
 
-#: ../panels/display/cc-display-panel.c:2001
-#, fuzzy
-#| msgid "Dis­plays"
+#: panels/display/cc-display-panel.c:1768
 msgid "Join Displays"
-msgstr "ディスプレイ"
+msgstr "画面を拡張"
 
-#: ../panels/display/cc-display-panel.c:2004
+#: panels/display/cc-display-panel.c:1771
 msgid "Mirror"
 msgstr "ミラー"
 
-#: ../panels/display/cc-display-panel.c:2007
+#: panels/display/cc-display-panel.c:1774
 msgid "Single Display"
 msgstr "シングルディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:2693
+#: panels/display/cc-display-panel.c:2072
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
+msgid "_Apply"
+msgstr "適用(_A)"
+
+#: panels/display/cc-display-panel.c:2093
 msgid "Apply Changes?"
 msgstr "変更を適用しますか?"
 
-#: ../panels/display/cc-display-panel.c:2707
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Apply"
-msgstr "適用(_A)"
+#: panels/display/cc-display-panel.c:2098
+msgid "Changes Cannot be Applied"
+msgstr ""
+
+#: panels/display/cc-display-panel.c:2099
+msgid "This could be due to hardware limitations."
+msgstr ""
 
-#: ../panels/display/cc-display-panel.c:3083
+#: panels/display/cc-display-panel.c:2230
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:3299
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
+#: panels/display/cc-display-panel.c:2402
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2111 panels/power/cc-power-panel.c:2118
+#: panels/privacy/cc-privacy-panel.c:206 panels/privacy/cc-privacy-panel.c:273
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:841
+#: panels/universal-access/cc-ua-panel.c:854
+#: panels/universal-access/cc-ua-panel.c:866
+#: panels/universal-access/cc-ua-panel.c:1031
 msgid "On"
 msgstr "オン"
 
-#: ../panels/display/cc-display-panel.c:3299 ../panels/network/net-proxy.c:54
-#: ../panels/notifications/cc-notifications-panel.c:293
-#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/display/cc-display-panel.c:2402 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2105 panels/power/cc-power-panel.c:2116
+#: panels/privacy/cc-privacy-panel.c:206 panels/privacy/cc-privacy-panel.c:273
+#: panels/universal-access/cc-ua-panel.c:478
+#: panels/universal-access/cc-ua-panel.c:841
+#: panels/universal-access/cc-ua-panel.c:854
+#: panels/universal-access/cc-ua-panel.c:866
+#: panels/universal-access/cc-ua-panel.c:1031
+#: 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:933
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/display/cc-display-panel.c:3320
+#: panels/display/cc-display-panel.c:2423
 msgid "_Night Light"
 msgstr "夜間モード(_N)"
 
-#: ../panels/display/cc-display-panel.c:3385
+#: panels/display/cc-display-panel.c:2488
 msgid "Could not get screen information"
 msgstr "スクリーンの情報を取得できませんでした"
 
 #. This cancels the redshift inhibit.
-#: ../panels/display/display.ui.h:2
+#: panels/display/cc-night-light-dialog.ui:46
 msgid "Restart Filter"
 msgstr "フィルターを再起動"
 
 #. Inhibit the redshift functionality until the next day starts
-#: ../panels/display/display.ui.h:4
+#: panels/display/cc-night-light-dialog.ui:79
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "明日まで一時的に無効にする"
 
-#: ../panels/display/display.ui.h:5
+#: panels/display/cc-night-light-dialog.ui:106
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1267,60 +1284,68 @@ msgstr ""
 "に役立ちます。"
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: ../panels/display/display.ui.h:7
+#: panels/display/cc-night-light-dialog.ui:128
+#: panels/display/cc-night-light-dialog.ui:465
 msgid "Night Light"
 msgstr "夜間モード"
 
-#: ../panels/display/display.ui.h:8
+#: panels/display/cc-night-light-dialog.ui:144
 msgid "Schedule"
 msgstr "スケジュール"
 
-#: ../panels/display/display.ui.h:9
+#: panels/display/cc-night-light-dialog.ui:173
 msgid "Sunset to Sunrise"
 msgstr "日没から日の出まで"
 
-#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/display/cc-night-light-dialog.ui:188
+#: panels/network/connection-editor/ip4-page.ui:69
+#: panels/network/connection-editor/ip6-page.ui:83
+#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
+#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
+#: panels/privacy/cc-privacy-panel.c:233
 msgid "Manual"
 msgstr "手動"
 
-#: ../panels/display/display.ui.h:11
+#: panels/display/cc-night-light-dialog.ui:223
 msgid "From"
 msgstr "開始"
 
-#: ../panels/display/display.ui.h:12
+#: panels/display/cc-night-light-dialog.ui:255
+#: panels/display/cc-night-light-dialog.ui:352
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: ../panels/display/display.ui.h:14
+#: panels/display/cc-night-light-dialog.ui:280
+#: panels/display/cc-night-light-dialog.ui:377
 msgid "AM"
 msgstr "午前"
 
 #. This is the short form for the time period in the afternoon
-#: ../panels/display/display.ui.h:16
+#: panels/display/cc-night-light-dialog.ui:296
+#: panels/display/cc-night-light-dialog.ui:393
 msgid "PM"
 msgstr "午後"
 
-#: ../panels/display/display.ui.h:17
+#: panels/display/cc-night-light-dialog.ui:435
 msgid "To"
 msgstr "終了"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Dis­plays"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
 msgstr "ディスプレイ"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "接続したモニターやプロジェクターの使用方法を変更します。"
 
-#. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/display/gnome-display-panel.desktop.in.in:7
+msgid "preferences-desktop-display"
+msgstr ""
+
+#. Translators: Search terms to find the Displays panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/display/gnome-display-panel.desktop.in.in:19
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
@@ -1330,10 +1355,34 @@ msgstr ""
 "モニター;ナイトライト;夜間モード;ブルーライト;色管理;ディスプレイ;ディスプ"
 "レー;Displays;日没;日の出;"
 
+#: panels/info/cc-info-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "ウェブ(_W)"
+
+#: panels/info/cc-info-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "メール(_M)"
+
+#: panels/info/cc-info-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "カレンダー(_C)"
+
+#: panels/info/cc-info-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "音楽(_U)"
+
+#: panels/info/cc-info-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "ビデオ(_V)"
+
+#: panels/info/cc-info-default-apps-panel.ui:162
+#: panels/info/cc-info-removable-media-panel.ui:161
+msgid "_Photos"
+msgstr "写真(_P)"
+
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-overview-panel.c:381
-#: ../panels/info/cc-info-overview-panel.c:468
-#: ../panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:374
+#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "不明"
 
@@ -1341,77 +1390,103 @@ msgstr "不明"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: ../panels/info/cc-info-overview-panel.c:476
+#: panels/info/cc-info-overview-panel.c:465
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s (ビルド ID: %s)"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:493
+#: panels/info/cc-info-overview-panel.c:482
 #, c-format
 msgid "64-bit"
 msgstr "64 ビット"
 
 #. translators: This is the type of architecture for the OS
-#: ../panels/info/cc-info-overview-panel.c:496
+#: panels/info/cc-info-overview-panel.c:485
 #, c-format
 msgid "32-bit"
 msgstr "32 ビット"
 
-#: ../panels/info/cc-info-overview-panel.c:807
+#: panels/info/cc-info-overview-panel.c:775
 #, c-format
 msgid "Version %s"
 msgstr "バージョン %s"
 
-#: ../panels/info/cc-info-panel.c:138
-msgid "Section"
-msgstr "セクション"
+#: panels/info/cc-info-overview-panel.ui:58
+msgid "Device name"
+msgstr "デバイス名"
 
-#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
-msgid "Overview"
-msgstr "概要"
+#: panels/info/cc-info-overview-panel.ui:74
+msgid "Memory"
+msgstr "メモリ"
 
-#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
-msgid "Default Applications"
-msgstr "既定のアプリケーション"
+#: panels/info/cc-info-overview-panel.ui:90
+msgid "Processor"
+msgstr "プロセッサ"
 
-#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
-msgid "Removable Media"
-msgstr "リムーバブルメディア"
+#: panels/info/cc-info-overview-panel.ui:106
+msgid "Graphics"
+msgstr "グラフィック"
+
+#. To translators: this field contains the distro name and version
+#: panels/info/cc-info-overview-panel.ui:121
+msgid "OS name"
+msgstr "OS 名"
+
+#. To translators: this field contains the distro type
+#: panels/info/cc-info-overview-panel.ui:137
+msgid "OS type"
+msgstr "OS の種類"
+
+#: panels/info/cc-info-overview-panel.ui:153
+msgid "Virtualization"
+msgstr "仮想化"
+
+#: panels/info/cc-info-overview-panel.ui:169
+msgid "Disk"
+msgstr "ディスク"
+
+#: panels/info/cc-info-overview-panel.ui:274
+msgid "Calculating…"
+msgstr "計算中…"
+
+#: panels/info/cc-info-overview-panel.ui:314
+msgid "Check for updates"
+msgstr "更新の確認"
 
-#: ../panels/info/cc-info-removable-media-panel.c:312
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "どうするか確認する"
 
-#: ../panels/info/cc-info-removable-media-panel.c:316
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: ../panels/info/cc-info-removable-media-panel.c:320
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "フォルダーを開く"
 
-#: ../panels/info/cc-info-removable-media-panel.c:411
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "他のメディア"
 
-#: ../panels/info/cc-info-removable-media-panel.c:444
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "オーディオCD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:445
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "ビデオDVD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:446
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
 msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:447
+#: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
 msgstr "カメラが接続された時に起動するアプリケーションを選択"
 
-#: ../panels/info/cc-info-removable-media-panel.c:448
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "ソフトウェアの CD を開くアプリケーションを選択してください"
 
@@ -1420,83 +1495,134 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択し
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-removable-media-panel.c:460
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "オーディオ DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:461
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "空のブルーレイディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:462
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "空の CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:463
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "空の DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:464
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "空の HD DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:465
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "ブルーレイビデオディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:466
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "電子書籍リーダー"
 
-#: ../panels/info/cc-info-removable-media-panel.c:467
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD ビデオディスク"
 
-#: ../panels/info/cc-info-removable-media-panel.c:468
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "ピクチャーCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:469
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
 msgstr "スーパービデオCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:470
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "ビデオCD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:471
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows ソフトウェア"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
-msgid "Defa­ult Applications"
-msgstr "既定のアプリケーション"
+#: panels/info/cc-info-removable-media-panel.ui:43
+msgid "Select how media should be handled"
+msgstr "メディアの処理方法を選択してください"
 
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
-msgid "Configure Default Applications"
-msgstr "既定のアプリケーションを設定します"
+#: panels/info/cc-info-removable-media-panel.ui:74
+msgid "CD _audio"
+msgstr "CD オーディオ(_A)"
 
-#. Translators: those are keywords for the Default Applications panel
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
-msgid "default;application;preferred;media;"
+#: panels/info/cc-info-removable-media-panel.ui:91
+msgid "_DVD video"
+msgstr "DVD ビデオ(_D)"
+
+#: panels/info/cc-info-removable-media-panel.ui:132
+msgid "_Music player"
+msgstr "音楽プレイヤー(_M)"
+
+#: panels/info/cc-info-removable-media-panel.ui:190
+msgid "_Software"
+msgstr "ソフトウェア(_S)"
+
+#: panels/info/cc-info-removable-media-panel.ui:228
+msgid "_Other Media…"
+msgstr "他のメディア(_O)…"
+
+#: panels/info/cc-info-removable-media-panel.ui:272
+msgid "_Never prompt or start programs on media insertion"
+msgstr ""
+"メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
+
+#: panels/info/cc-info-removable-media-panel.ui:331
+msgid "Select how other media should be handled"
+msgstr "他のメディアの処理を選択してください"
+
+#: panels/info/cc-info-removable-media-panel.ui:370
+msgid "_Action:"
+msgstr "アクション(_A):"
+
+#: panels/info/cc-info-removable-media-panel.ui:393
+msgid "_Type:"
+msgstr "種類(_T):"
+
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "既定のアプリケーション"
+
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "既定のアプリケーションを設定します"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:7
+msgid "starred"
+msgstr ""
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/info/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
 msgstr ""
 "default;application;preferred;media;デフォルト;既定;アプリケーション;メディ"
 "ア;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
-msgid "Ab­out"
-msgstr "情報"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "このシステムについて"
 
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
-msgstr "システム情報を表示します。"
+msgstr "システム情報を表示します"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-info-overview-panel.desktop.in.in:7
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: Search terms to find the About panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
+#. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
+#: panels/info/gnome-info-overview-panel.desktop.in.in:23
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1507,22 +1633,21 @@ msgstr ""
 "ディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;"
 "自動起動;オートラン;Details;詳細;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "De­tails"
-msgstr "詳細"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
-msgid "Remo­vable Media"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
 msgstr "リムーバブルメディア"
 
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
 msgid "Configure Removable Media settings"
 msgstr "リムーバブルメディアを設定します"
 
-#. Translators: those are keywords for the Removable Media panel
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:7
+msgid "media-removable"
+msgstr ""
+
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/info/gnome-removable-media-panel.desktop.in.in:19
 msgid ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
@@ -1532,292 +1657,182 @@ msgstr ""
 "定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディ"
 "ア;媒体;自動起動;オートラン;"
 
-#: ../panels/info/info-default-apps.ui.h:1
-msgid "_Web"
-msgstr "ウェブ(_W)"
-
-#: ../panels/info/info-default-apps.ui.h:2
-msgid "_Mail"
-msgstr "メール(_M)"
-
-#: ../panels/info/info-default-apps.ui.h:3
-msgid "_Calendar"
-msgstr "カレンダー(_C)"
-
-#: ../panels/info/info-default-apps.ui.h:4
-msgid "M_usic"
-msgstr "音楽(_U)"
-
-#: ../panels/info/info-default-apps.ui.h:5
-msgid "_Video"
-msgstr "ビデオ(_V)"
-
-#: ../panels/info/info-default-apps.ui.h:6
-#: ../panels/info/info-removable-media.ui.h:5
-msgid "_Photos"
-msgstr "写真(_P)"
-
-#: ../panels/info/info-overview.ui.h:1
-msgid "Device name"
-msgstr "デバイス名"
-
-#: ../panels/info/info-overview.ui.h:2
-msgid "Memory"
-msgstr "メモリ"
-
-#: ../panels/info/info-overview.ui.h:3
-msgid "Processor"
-msgstr "プロセッサ"
-
-#: ../panels/info/info-overview.ui.h:4
-msgid "Graphics"
-msgstr "グラフィック"
-
-#. To translators: this field contains the distro name and version
-#: ../panels/info/info-overview.ui.h:6
-msgid "OS name"
-msgstr "OS 名"
-
-#. To translators: this field contains the distro type
-#: ../panels/info/info-overview.ui.h:8
-msgid "OS type"
-msgstr "OSの種類"
-
-#: ../panels/info/info-overview.ui.h:9
-msgid "Virtualization"
-msgstr "仮想化"
-
-#: ../panels/info/info-overview.ui.h:10
-msgid "Disk"
-msgstr "ディスク"
-
-#: ../panels/info/info-overview.ui.h:11
-msgid "Calculating…"
-msgstr "計算中…"
-
-#: ../panels/info/info-overview.ui.h:12
-msgid "Check for updates"
-msgstr "更新の確認"
-
-#: ../panels/info/info-removable-media.ui.h:1
-msgid "Select how media should be handled"
-msgstr "メディアの処理方法を選択してください"
-
-#: ../panels/info/info-removable-media.ui.h:2
-msgid "CD _audio"
-msgstr "CD オーディオ(_A)"
-
-#: ../panels/info/info-removable-media.ui.h:3
-msgid "_DVD video"
-msgstr "DVD ビデオ(_D)"
-
-#: ../panels/info/info-removable-media.ui.h:4
-msgid "_Music player"
-msgstr "音楽プレイヤー(_M)"
-
-#: ../panels/info/info-removable-media.ui.h:6
-msgid "_Software"
-msgstr "ソフトウェア(_S)"
-
-#: ../panels/info/info-removable-media.ui.h:7
-msgid "_Other Media…"
-msgstr "他のメディア(_O)…"
-
-#: ../panels/info/info-removable-media.ui.h:8
-msgid "_Never prompt or start programs on media insertion"
-msgstr ""
-"メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
-
-#: ../panels/info/info-removable-media.ui.h:9
-msgid "Select how other media should be handled"
-msgstr "他のメディアの処理を選択してください"
-
-#: ../panels/info/info-removable-media.ui.h:10
-msgid "_Action:"
-msgstr "アクション(_A):"
-
-#: ../panels/info/info-removable-media.ui.h:11
-msgid "_Type:"
-msgstr "種類(_T):"
-
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "音とメディア"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "ミュートにする"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "音量を下げる"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "音量を上げる"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "メディアプレイヤーを起動"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "再生 (あるいは再生/一時停止)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "再生を一時停止"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "再生を停止"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "前のトラック"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "次のトラック"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "取り出し"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:580
 msgid "Typing"
 msgstr "タイピング"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "次の入力ソースへ切り替える"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "前の入力ソースへ切り替える"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "ランチャー"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "ヘルプブラウザーを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
-#: ../shell/cc-window.c:251 ../shell/cc-window.c:794
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:287
+#: shell/cc-window.c:927 shell/cc-window.ui:123
+#: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "設定"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "電卓を起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "メールクライアントを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "ウェブブラウザーを起動"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "ホームフォルダー"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
-msgctxt "keybinding"
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:153
 msgid "Search"
 msgstr "検索"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "スクリーンショット"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "スクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "ウィンドウのスクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "選択領域のスクリーンショットを$PICTURESフォルダーに保存する"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "スクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "ウィンドウのスクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "選択領域のスクリーンショットをクリップボードにコピーする"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "スクリーンキャストを撮る"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "システム"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "ログアウト"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "画面をロック"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "ユニバーサルアクセス"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "ズームのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "ズームイン"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "ズームアウト"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "スクリーンリーダーのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "オンスクリーンキーボードのオン/オフを切り替える"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "文字サイズを拡大"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "文字サイズを縮小"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:506
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-keyboard-manager.c:501
+#: panels/keyboard/cc-keyboard-manager.c:509
+#: panels/keyboard/cc-keyboard-manager.c:809
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"
 
@@ -1826,14 +1841,13 @@ msgstr "独自のショートカット"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:435
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-proxy.ui.h:4
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1866
-#: ../panels/user-accounts/um-fingerprint-dialog.c:214
+#: panels/keyboard/cc-keyboard-option.c:259
+#: panels/keyboard/cc-keyboard-option.c:378
+#: panels/keyboard/keyboard-shortcuts.c:425
+#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "無効"
 
@@ -1841,7 +1855,7 @@ msgstr "無効"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:337
 msgid "Alternative Characters Key"
 msgstr "代替文字キー"
 
@@ -1849,19 +1863,19 @@ msgstr "代替文字キー"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:346
 msgid "Compose Key"
 msgstr "Compose キー"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:351
 msgid "Modifiers-only switch to next source"
 msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
+#: panels/keyboard/cc-keyboard-panel.c:179
 msgid "Reset All Shortcuts?"
 msgstr "すべてのショートカットをリセットしますか?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-panel.c:182
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -1869,22 +1883,43 @@ msgstr ""
 "ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があ"
 "ります。 この処理を元に戻すことはできません。"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: panels/keyboard/cc-keyboard-panel.c:186
+#: panels/keyboard/shortcut-editor.ui:346
+#: panels/printers/authentication-dialog.ui:29
+#: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:189
+#: panels/keyboard/cc-keyboard-panel.c:187
 msgid "Reset All"
 msgstr "すべてリセット"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:281
+#: panels/keyboard/cc-keyboard-panel.c:283
 msgid "Reset the shortcut to its default value"
 msgstr "ショートカットをデフォルトの値にリセットする"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#: panels/keyboard/cc-keyboard-panel.ui:67 panels/region/cc-region-panel.ui:581
+#: shell/cc-window.ui:255
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
+
+#: panels/keyboard/cc-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "すべてリセット…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットする"
+
+#: panels/keyboard/cc-keyboard-panel.ui:164
+msgid "No keyboard shortcut found"
+msgstr "キーボードショートカットがありません"
+
+#: panels/keyboard/cc-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
+msgid "Try a different search"
+msgstr "別の検索を試す"
+
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1893,35 +1928,39 @@ msgstr ""
 "すでに %s は <b>%s</b> のために使われています。もし入れ替えなければ %s が無効"
 "化されます。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Custom Shortcut"
 msgstr "独自のショートカットの設定"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:581
 msgid "Set Shortcut"
 msgstr "ショートカットの設定"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "<b>%s</b> の新しいショートカットを入力してください。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
 msgid "Add Custom Shortcut"
 msgstr "ショートカットの追加"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Key­board"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "キーボード"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "キーボードショートカットの表示や変更、タイピングの設定を行います"
 
-#. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:7
+msgid "input-keyboard"
+msgstr ""
+
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
@@ -1929,195 +1968,180 @@ msgstr ""
 "ショートカット;ワークスペース;ウィンドウ;リサイズ;サイズ変更;ズーム;コントラ"
 "スト;入力;インプット;ソース;ロック;ボリューム;音量;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
-msgid "Reset All…"
-msgstr "すべてリセット…"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "すべてのショートカットをデフォルトのキーバインディングにリセットする"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "No keyboard shortcut found"
-msgstr "キーボードショートカットがありません"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 ../shell/panel-list.ui.h:4
-msgid "Try a different search"
-msgstr "別の検索を試す"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 msgstr ""
 "Esc でキャンセル、Backspace でキーボードショートカットをリセットできます。"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:3
-#: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/sound/gvc-mixer-dialog.c:1480
+#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "名前"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "コマンド"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
+#: panels/keyboard/shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "ショートカットの設定…"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:7
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "何もしない"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "新しいショートカットキーを入力してください"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:357
 msgid "Remove"
 msgstr "削除"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "追加"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "入れ替え"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "設定"
 
 # Button Label
-#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:449
 msgid "Test Your _Settings"
 msgstr "設定を確認する(_S)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & Touch­pad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "マウスとタッチパッド"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "マウスやタッチパッドの感度の変更、利き手の選択をします"
 
-#. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:7
+msgid "input-mouse"
+msgstr "input-mouse"
+
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;トラックパッド;ポインター;"
 "クリック;タップ;ダブル;ボタン;トラックボール;スクロール;Mouse;Touchpad;マウ"
 "ス;タッチパッド;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:50
 msgid "General"
 msgstr "全般"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:88
 msgid "Primary Button"
 msgstr "主ボタン"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:107
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr "マウス、タッチパッドのボタンの順位を設定します。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:136
 msgid "Left"
 msgstr "左"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:146
 msgid "Right"
 msgstr "右"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:182
 msgid "Mouse"
 msgstr "マウス"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:221
 msgid "Mouse Speed"
 msgstr "マウスの速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:243
+#: panels/mouse/gnome-mouse-properties.ui:548
 msgid "Double-click timeout"
 msgstr "ダブルクリックと認識される最長クリック間隔"
 
+#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: panels/mouse/gnome-mouse-properties.ui:280
+#: panels/mouse/gnome-mouse-properties.ui:456
 msgid "Natural Scrolling"
 msgstr "ナチュラルスクロール"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:296
+#: panels/mouse/gnome-mouse-properties.ui:472
 msgid "Scrolling moves the content, not the view."
 msgstr "スクロールする方向にコンテンツが移動します。"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:346
+#: panels/mouse/gnome-mouse-properties.ui:391
 msgid "Touchpad"
 msgstr "タッチパッド"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:527
 msgid "Touchpad Speed"
 msgstr "タッチパッドの速度"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:586
 msgid "Tap to Click"
 msgstr "タップでクリックする"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:638
 msgid "Two-finger Scrolling"
 msgstr "2本指でのスクロール"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:691
 msgid "Edge Scrolling"
 msgstr "エッジスクロール"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
 msgid "Try clicking, double clicking, scrolling"
 msgstr "クリック、ダブルクリック、スクロールを試してください"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:137
 msgid "Five clicks, GEGL time!"
 msgstr "クリック 5 回、GEGLタイム"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "ダブルクリック、主ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "シングルクリック、主ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "ダブルクリック、中央ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "シングルクリック、中央ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "ダブルクリック、副ボタン"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "シングルクリック、副ボタン"
 
 #. add proxy to device list
-#: ../panels/network/cc-network-panel.c:579
+#: panels/network/cc-network-panel.c:583
 msgid "Network proxy"
 msgstr "ネットワークプロキシ"
 
@@ -2125,470 +2149,514 @@ msgstr "ネットワークプロキシ"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
-#: ../panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:167
+#: panels/network/net-vpn.c:296
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
+#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:303
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
 
-#: ../panels/network/cc-network-panel.c:785
+#: panels/network/cc-network-panel.c:789
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager が動作している必要があります。"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/cc-wifi-panel.c:209
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
-#: ../panels/network/network-wifi.ui.h:58
+#: panels/network/cc-network-panel.ui:142
+#: panels/network/connection-editor/net-connection-editor.c:603
+msgid "VPN"
+msgstr "VPN"
+
+#: panels/network/cc-network-panel.ui:194
+msgid "Not set up"
+msgstr "未設定"
+
+#: panels/network/cc-wifi-panel.c:281
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1747
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/cc-wifi-panel.ui:56
+msgid "Airplane Mode"
+msgstr "機内モード"
+
+#: panels/network/cc-wifi-panel.ui:71
+msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
+msgstr "Wi-Fi, Bluetooth および モバイルブロードバンドを無効にします"
+
+#: panels/network/cc-wifi-panel.ui:140
+msgid "No Wi-Fi Adapter Found"
+msgstr "Wi-Fi アダプターが見つかりません"
+
+#: panels/network/cc-wifi-panel.ui:152
+msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
+msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
+
+#: panels/network/cc-wifi-panel.ui:187
+msgid "Airplane Mode On"
+msgstr "機内モードオン"
+
+#: panels/network/cc-wifi-panel.ui:199
+msgid "Turn off to use Wi-Fi"
+msgstr "Wi-Fi の使用をオフ"
+
+#: panels/network/cc-wifi-panel.ui:225
+msgid "Visible Networks"
+msgstr "ネットワーク一覧"
+
+#: panels/network/cc-wifi-panel.ui:292
+msgid "NetworkManager needs to be running"
+msgstr "NetworkManager が動作している必要があります"
+
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1x セキュリティ(_S)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
 msgid "page 1"
 msgstr "ページ1"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:224
+#: panels/network/connection-editor/security-page.ui:223
+#: panels/network/wireless-security/eap-method-fast.ui:50
+#: panels/network/wireless-security/eap-method-peap.ui:48
+#: panels/network/wireless-security/eap-method-ttls.ui:31
 msgid "Anony_mous identity"
 msgstr "匿名の識別子(_M)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: panels/network/connection-editor/8021x-security-page.ui:238
+#: panels/network/connection-editor/security-page.ui:237
 msgid "Inner _authentication"
 msgstr "内部認証(_A)"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
 msgid "page 2"
 msgstr "ページ2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:445
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-security.c:445
+#: panels/network/connection-editor/details-page.ui:86
+#: panels/network/network-wifi.ui:239
 msgid "Security"
 msgstr "セキュリティ"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, c-format
 msgid "Profile %d"
 msgstr "プロファイル %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:231
-#: ../panels/network/net-device-wifi.c:407
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:469
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:235
-#: ../panels/network/net-device-wifi.c:412
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:474
+#: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:64
-#: ../panels/network/net-device-wifi.c:239
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:243
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:69
-#: ../panels/network/net-device-wifi.c:244
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:248
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:74
-#: ../panels/network/net-device-wifi.c:249
-#: ../panels/network/net-device-wifi.c:397
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:459
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:95
-#: ../panels/power/power.ui.h:17
+#: panels/network/connection-editor/ce-page-details.c:95
 msgid "Never"
 msgstr "しない"
 
-#: ../panels/network/connection-editor/ce-page-details.c:110
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:505
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:568
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 日前"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:176
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:561
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:646
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:202
-#: ../panels/network/net-device-wifi.c:590
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:675
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:204
-#: ../panels/network/net-device-wifi.c:592
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:677
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:206
-#: ../panels/network/net-device-wifi.c:594
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:679
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/connection-editor/ce-page-details.c:208
-#: ../panels/network/net-device-wifi.c:596
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:681
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:210
-#: ../panels/network/net-device-wifi.c:598
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:683
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/connection-editor/ce-page-details.c:300
 msgid "Forget Connection"
 msgstr "接続情報を破棄"
 
-#: ../panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Remove Connection Profile"
 msgstr "接続プロファイルを削除"
 
-#: ../panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove VPN"
 msgstr "VPNを削除"
 
-#: ../panels/network/connection-editor/ce-page-details.c:280
-#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:332
+#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
+#: shell/cc-window.c:279
 msgid "Details"
 msgstr "詳細"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:173
-#: ../panels/network/connection-editor/ce-page-vpn.c:188
-#: ../panels/network/connection-editor/ce-page-wifi.c:194
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:174
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "Identity"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:251
-#: ../panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "アドレスを削除"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "ルートを削除"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:896
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:827
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:828
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../panels/network/connection-editor/ce-page-security.c:291
-#: ../panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: panels/network/connection-editor/details-page.ui:18
+#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "信号強度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "リンクの速度"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
+#: panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "IPv4 アドレス"
 
-#: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:171
+#: panels/network/net-device-ethernet.c:175
+#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
+#: panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "IPv6 アドレス"
 
-#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:182
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "デフォルトルート"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:10
-#: ../panels/network/connection-editor/ip6-page.ui.h:11
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: panels/network/connection-editor/details-page.ui:177
+#: panels/network/connection-editor/ip4-page.ui:197
+#: panels/network/connection-editor/ip6-page.ui:211
+#: panels/network/net-device-ethernet.c:184
+#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: ../panels/network/connection-editor/details-page.ui.h:10
+#: panels/network/connection-editor/details-page.ui:324
 msgid "Connect _automatically"
 msgstr "自動接続する(_A)"
 
-#: ../panels/network/connection-editor/details-page.ui.h:11
+#: panels/network/connection-editor/details-page.ui:343
 msgid "Make available to _other users"
 msgstr "他のユーザーも利用可能(_O)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:11
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/network/connection-editor/details-page.ui:376
+msgid "Restrict background data usage"
+msgstr "バックグラウンドデータの使用を制限"
+
+#: panels/network/connection-editor/details-page.ui:386
+msgid "Appropriate for connections that have data charges or limits."
+msgstr "従量制課金接続のような制限のある接続に適しています。"
+
+#: panels/network/connection-editor/ethernet-page.ui:16
+#: panels/network/connection-editor/ethernet-page.ui:39
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:291
+#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
+#: panels/network/wireless-security/eap-method-peap.ui:22
+#: panels/privacy/cc-privacy-panel.c:233
 msgid "Automatic"
 msgstr "自動"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "ツイストペア (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: panels/network/connection-editor/ethernet-page.ui:71
+#: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "名前(_N)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "MAC アドレス(_M)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "MTU(_T)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:97
 msgid "_Cloned Address"
 msgstr "クローンしたアドレス(_C)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "バイト"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: panels/network/connection-editor/ip4-page.ui:27
 msgid "IPv_4 Method"
 msgstr "IPv4 メソッド(_4)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:27
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
 msgid "Link-Local Only"
 msgstr "リンクローカルのみ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
 msgstr "無効"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
 msgid "Addresses"
 msgstr "アドレス"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/printers/details-dialog.ui.h:3
+#: panels/network/connection-editor/ip4-page.ui:129
+#: panels/network/connection-editor/ip4-page.ui:313
+#: panels/network/connection-editor/ip6-page.ui:143
+#: panels/network/connection-editor/ip6-page.ui:327
+#: panels/printers/details-dialog.ui:87
 msgid "Address"
 msgstr "アドレス"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:9
-#: ../panels/network/connection-editor/ip6-page.ui.h:10
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:12
-#: ../panels/network/connection-editor/ip6-page.ui.h:12
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:13
-#: ../panels/network/connection-editor/ip6-page.ui.h:13
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
 msgid "Separate IP addresses with commas"
 msgstr "複数の IP アドレスを指定する場合はそれぞれコンマで区切ってください"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:14
-#: ../panels/network/connection-editor/ip6-page.ui.h:14
-#: ../panels/network/network-wifi.ui.h:32
+#: panels/network/connection-editor/ip4-page.ui:265
+#: panels/network/connection-editor/ip6-page.ui:279
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "ルート"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:15
-#: ../panels/network/connection-editor/ip6-page.ui.h:15
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "自動ルート"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ip4-page.ui.h:17
-#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:18
-#: ../panels/network/connection-editor/ip6-page.ui.h:18
-#: ../panels/network/network-wifi.ui.h:34
+#: panels/network/connection-editor/ip4-page.ui:384
+#: panels/network/connection-editor/ip6-page.ui:398
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 msgid "Use this connection _only for resources on its network"
 msgstr "この接続はネットワーク上のリソースのためだけに使用(_O)"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: panels/network/connection-editor/ip6-page.ui:27
 msgid "IPv_6 Method"
 msgstr "IPv6 メソッド(_6)"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:9
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "接続エディターを起動できません"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "新規プロファイル"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:603
-#: ../panels/network/network.ui.h:2
-msgid "VPN"
-msgstr "VPN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "ファイルからインポート…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "VPNの追加"
 
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "セキュリティ(_E)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2601,36 +2669,36 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "インポートするファイルを選択する"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:383
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:331
+#: panels/sharing/cc-sharing-panel.c:428
+#: panels/user-accounts/cc-avatar-chooser.c:273
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "'%s' というファイルはすでに存在します。"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s を、保存している VPN 接続に入れ替えますか?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2641,40 +2709,40 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "VPN 接続をエクスポートする"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: panels/network/connection-editor/vpn-page.ui:58
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(エラー: VPN 接続エディターを読み込めません)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "SSID(_S)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "BSSID(_B)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
-msgid "My Home Network"
-msgstr "マイホームネットワーク"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Net­work"
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
 msgstr "ネットワーク"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "ネットワークへの接続方法を設定します。"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-network-panel.desktop.in.in:7
+msgid "network-workgroup"
+msgstr ""
+
+#. Translators: Search terms to find the Network panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/network/gnome-network-panel.desktop.in.in:19
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
@@ -2683,40 +2751,44 @@ msgstr ""
 "DNS;ネットワーク;インターネット;無線;ワイヤレス;有線;プロキシー;プロキシ;ブ"
 "ロードバンド;モデム;ブルートゥース;VPN;ドメイン名;ドメインネームサーバー;"
 
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "Wi-Fi ネットワークへの接続方法を設定します。"
 
-#. Translators: those are keywords for the wi-fi control-center panel
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/network/gnome-wifi-panel.desktop.in.in:7
+msgid "network-wireless"
+msgstr ""
+
+#. Translators: Search terms to find the Wi-Fi panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/network/gnome-wifi-panel.desktop.in.in:19
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;ネットワーク;無線;ワイヤレ"
 "ス;ブロードバンド;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:491
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:554
 msgid "never"
 msgstr "未接続"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:501
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:564
 msgid "today"
 msgstr "今日"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:503
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:566
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649
+#: panels/network/net-device-ethernet.c:173
+#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
+#: panels/network/panel-common.c:649
 msgid "IP Address"
 msgstr "IP アドレス"
 
-#: ../panels/network/net-device-ethernet.c:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "最後の利用"
 
@@ -2725,31 +2797,29 @@ msgstr "最後の利用"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:275
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:292
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "有線"
 
-#: ../panels/network/net-device-ethernet.c:343
-#: ../panels/network/net-device-wifi.c:1792
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
+#: panels/network/net-device-ethernet.c:360
+#: panels/network/net-device-wifi.c:1894 panels/network/network-ethernet.ui:120
+#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
+#: panels/network/network-vpn.ui:79
 msgid "Options…"
 msgstr "オプション…"
 
-#: ../panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:236
 msgid "Add new connection"
 msgstr "新規の接続を追加"
 
-#: ../panels/network/net-device-wifi.c:1275
+#: panels/network/net-device-wifi.c:1368
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr ""
 "ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
 
-#: ../panels/network/net-device-wifi.c:1279
+#: panels/network/net-device-wifi.c:1372
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2757,11 +2827,11 @@ msgstr ""
 "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできま"
 "せん。"
 
-#: ../panels/network/net-device-wifi.c:1286
+#: panels/network/net-device-wifi.c:1379
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Wi-Fi アクセスポイントをオンにしますか?"
 
-#: ../panels/network/net-device-wifi.c:1308
+#: panels/network/net-device-wifi.c:1401
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2769,50 +2839,48 @@ msgstr ""
 "Wi-Fi アクセスポイント機能は、追加のインターネット接続を Wi-Fi 経由で共有する"
 "ために使用されます。"
 
-#: ../panels/network/net-device-wifi.c:1319
+#: panels/network/net-device-wifi.c:1412
 msgid "_Turn On"
 msgstr "オン(_T)"
 
-#: ../panels/network/net-device-wifi.c:1396
+#: panels/network/net-device-wifi.c:1489
 msgid "Stop hotspot and disconnect any users?"
 msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
 
-#: ../panels/network/net-device-wifi.c:1399
+#: panels/network/net-device-wifi.c:1492
 msgid "_Stop Hotspot"
 msgstr "停止(_S)"
 
-#: ../panels/network/net-device-wifi.c:1496
+#: panels/network/net-device-wifi.c:1592
 msgid "System policy prohibits use as a Hotspot"
 msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
 
-#: ../panels/network/net-device-wifi.c:1499
+#: panels/network/net-device-wifi.c:1595
 msgid "Wireless device does not support Hotspot mode"
 msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
 
-#: ../panels/network/net-device-wifi.c:1630
+#: panels/network/net-device-wifi.c:1730
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "パスワードや独自の設定など、 選択したネットワークの詳細は失われます。"
 
-#: ../panels/network/net-device-wifi.c:1634
-#: ../panels/network/network-wifi.ui.h:42
+#: panels/network/net-device-wifi.c:1734 panels/network/network-wifi.ui:1350
 msgid "_Forget"
 msgstr "破棄(_F)"
 
-#: ../panels/network/net-device-wifi.c:1943
-#: ../panels/network/net-device-wifi.c:1950
+#: panels/network/net-device-wifi.c:2045 panels/network/net-device-wifi.c:2052
 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:1983
+#: panels/network/net-device-wifi.c:2085
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "破棄(_F)"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -2823,164 +2891,147 @@ msgstr ""
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "信頼できない公衆ネットワークでは推奨されません。"
 
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "ネットワーク"
-
-#: ../panels/network/network-proxy.ui.h:1
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
 msgid "Network Proxy"
 msgstr "ネットワークプロキシ"
 
-#: ../panels/network/network-proxy.ui.h:5
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "HTTP プロキシ(_H)"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "HTTPS プロキシ(_T)"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "FTP プロキシ(_F)"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "Socks ホスト(_S)"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "次のホストを無視する(_I)"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "Socks プロキシポート"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:435
 msgid "_Configuration URL"
 msgstr "設定 URL(_C)"
 
-#: ../panels/network/network-simple.ui.h:2
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "デバイスをオフにする"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/network/network.ui.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/network/network.ui.h:3
-msgid "Not set up"
-msgstr "未設定"
-
-#: ../panels/network/network-vpn.ui.h:1
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "VPN 接続をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "自動接続(_C)"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "詳細"
 
-#: ../panels/network/network-wifi.ui.h:17
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
-#: ../panels/network/wireless-security/ws-leap.ui.h:2
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: panels/network/network-wifi.ui:545
+#: panels/network/wireless-security/eap-method-leap.ui:40
+#: panels/network/wireless-security/eap-method-simple.ui:40
+#: panels/network/wireless-security/ws-leap.ui:40
+#: panels/network/wireless-security/ws-wpa-psk.ui:22
+#: panels/sharing/cc-sharing-panel.ui:357
+#: panels/user-accounts/cc-add-user-dialog.ui:309
+#: panels/user-accounts/cc-add-user-dialog.ui:546
+#: panels/user-accounts/cc-user-panel.ui:213
 msgid "_Password"
 msgstr "パスワード(_P)"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:621
 msgid "Show P_assword"
 msgstr "パスワードを表示(_A)"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:651
 msgid "Make available to other users"
 msgstr "他のユーザーに利用可能にする"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:679
 msgid "identity"
 msgstr "識別情報"
 
-#: ../panels/network/network-wifi.ui.h:24
+#: panels/network/network-wifi.ui:713
 msgid "IPv_4"
 msgstr "IPv4(_4)"
 
-#: ../panels/network/network-wifi.ui.h:25
+#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
 msgid "_Addresses"
 msgstr "アドレス(_A)"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP) addresses only"
 msgstr "自動 (DHCP) アドレスのみ"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Link-local only"
 msgstr "リンクローカルのみ"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Shared with other computers"
 msgstr "他のコンピューターと共有する"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
 msgid "_Ignore automatically obtained routes"
 msgstr "自動的に得られたルートを無視する(_I)"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:959
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:36
+#: panels/network/network-wifi.ui:990
 msgid "IPv_6"
 msgstr "IPv6(_6)"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:1236
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1276
 msgid "_Cloned MAC Address"
 msgstr "クローンしたMACアドレス(_C)"
 
-#: ../panels/network/network-wifi.ui.h:40
-msgid "hardware"
-msgstr "ハードウェア"
-
-#: ../panels/network/network-wifi.ui.h:41
+#: panels/network/network-wifi.ui:1334
 msgid "_Reset"
 msgstr "リセット(_R)"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1370
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -2988,7 +3039,7 @@ msgstr ""
 "この接続の設定をデフォルトにリセットしますが、推奨接続であることは記憶しま"
 "す。"
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1387
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -2996,545 +3047,512 @@ msgstr ""
 "このネットワークに関する詳細はすべて削除して、自動的に接続しないようにしま"
 "す。"
 
-#: ../panels/network/network-wifi.ui.h:45
-msgid "reset"
-msgstr "リセット"
-
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1449
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../panels/network/network-wifi.ui.h:51
+#: panels/network/network-wifi.ui:1453
 msgctxt "tab"
 msgid "Reset"
 msgstr "リセット"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1514
 msgid "Wi-Fi Hotspot"
 msgstr "Wi-Fi アクセスポイント"
 
-#: ../panels/network/network-wifi.ui.h:53
+#: panels/network/network-wifi.ui:1532
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Wi-Fiネットワークへ接続するためスイッチをオフ"
 
-#: ../panels/network/network-wifi.ui.h:54
+#: panels/network/network-wifi.ui:1581
 msgid "Network Name"
 msgstr "ネットワーク名"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: panels/network/network-wifi.ui:1599
 msgid "Connected Devices"
 msgstr "接続しているデバイス"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: panels/network/network-wifi.ui:1617
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: ../panels/network/network-wifi.ui.h:57
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/printers/new-printer-dialog.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1680
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "パスワード"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1777
 msgid "Turn Wi-Fi off"
 msgstr "Wi-Fi をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1809
 msgid "_Connect to Hidden Network…"
 msgstr "非表示のネットワークに接続(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui:1819
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "Wi-Fi アクセスポイントをオンにする(_T)"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1829
 msgid "_Known Wi-Fi Networks"
 msgstr "既知の Wi-Fi ネットワーク(_K)"
 
-#: ../panels/network/wifi.ui.h:1
-msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
-msgstr "Wi-Fi アダプターが装着されオンになっていることを確認してください"
-
-#: ../panels/network/wifi.ui.h:2
-msgid "No Wi-Fi Adapter Found"
-msgstr "Wi-Fi アダプターが見つかりません"
-
-#: ../panels/network/wifi.ui.h:3
-msgid "Airplane Mode"
-msgstr "機内モード(_P)"
-
-#: ../panels/network/wifi.ui.h:4
-msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
-msgstr "Wi-Fi, Bluetooth および モバイルブロードバンドを無効にします"
-
-#: ../panels/network/wifi.ui.h:5
-msgid "Visible Networks"
-msgstr "ネットワーク一覧"
-
-#: ../panels/network/wifi.ui.h:6
-msgid "NetworkManager needs to be running"
-msgstr "NetworkManager が動作している必要があります"
-
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "アドホック"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "インフラストラクチャ"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
+#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "ステータス不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "管理対象外"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "利用不可"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
+#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "接続中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "認証が要求されました"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "接続済み"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "切断中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
+#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "接続失敗"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
+#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "ステータス不明 (見つからない)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223
+#: panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "接続していない"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:248
+#: panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP設定の期限切れ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "秘密の情報が必要でしたが入力されませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x サプリカントが切断されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x サプリカントの設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x サプリカントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x サプリカントの認証に時間がかかりすぎました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPPサービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPPサービスの接続を切断しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP が失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCPクライアントの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCPクライアントにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCPクライアントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "共有接続サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP サービスにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "回線が使用中です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "発信音がありません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "キャリアの確立ができませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "発信要求がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "発信の試行に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "指定されたAPNの選択に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "ネットワーク登録が拒否されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "ネットワーク登録がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PINチェックに失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "このデバイスのファームウェアがないようです"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "接続が消失しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "既存の接続とみなされました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "モデムが見つかりませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth接続に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIMカードが挿入されていません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIMのPIN番号が必要です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIMのPUKが必要です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIMが違います"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "接続が依存するデバイス等の準備ができません"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "ファームウェア未検出"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "ケーブル抜け"
 
-#: ../panels/network/wireless-security/eap-method.c:57
+#: panels/network/wireless-security/eap-method.c:69
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティ(wpa-eap)で未定義のエラー"
 
-#: ../panels/network/wireless-security/eap-method.c:233
+#: panels/network/wireless-security/eap-method.c:245
 msgid "no file selected"
 msgstr "ファイルが選択されていません"
 
-#: ../panels/network/wireless-security/eap-method.c:264
+#: panels/network/wireless-security/eap-method.c:276
 msgid "unspecified error validating eap-method file"
 msgstr "EAPメソッドファイルの検証中に特定できないエラー"
 
-#: ../panels/network/wireless-security/eap-method.c:439
+#: panels/network/wireless-security/eap-method.c:451
 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:442
+#: panels/network/wireless-security/eap-method.c:454
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER か PEM の証明書 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PACファイルが見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:268
-#: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:351
+#: panels/network/wireless-security/eap-method-fast.c:268
+#: panels/network/wireless-security/eap-method-peap.c:302
+#: panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:283
-#: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:289
+#: panels/network/wireless-security/eap-method-fast.c:283
+#: panels/network/wireless-security/eap-method-peap.c:272
+#: panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "認証"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "両方"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PAC ファイル(_F)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: panels/network/wireless-security/eap-method-fast.ui:122
+#: panels/network/wireless-security/eap-method-peap.ui:146
+#: panels/network/wireless-security/eap-method-ttls.ui:97
 msgid "_Inner authentication"
 msgstr "内部認証(_I)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: panels/network/wireless-security/eap-method-fast.ui:156
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動的なPACプロビジョニングを許可する(_V)"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAPユーザー名が見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAPパスワードが見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
-#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: panels/network/wireless-security/eap-method-leap.ui:26
+#: panels/network/wireless-security/eap-method-simple.ui:26
+#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:526
 msgid "_Username"
 msgstr "ユーザー名(_U)"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
-#: ../panels/network/wireless-security/ws-leap.ui.h:3
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#: panels/network/wireless-security/eap-method-leap.ui:68
+#: panels/network/wireless-security/eap-method-simple.ui:85
+#: panels/network/wireless-security/eap-method-tls.ui:164
+#: panels/network/wireless-security/ws-leap.ui:68
+#: panels/network/wireless-security/ws-wpa-psk.ui:76
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "無効なEAP-LEAP CA証明書: %s"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "無効なEAP-LEAP CA証明書: 認証書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:336
-#: ../panels/network/wireless-security/wireless-security.c:441
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:501
-#: ../panels/network/wireless-security/eap-method-ttls.c:430
+#: panels/network/wireless-security/eap-method-peap.c:381
+#: panels/network/wireless-security/eap-method-tls.c:492
+#: panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "認証局(CA)証明書を選択"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "バージョン 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:28
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:74
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:57
 msgid "C_A certificate"
 msgstr "CA証明書(_A)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:96
+#: panels/network/wireless-security/eap-method-tls.ui:97
+#: panels/network/wireless-security/eap-method-ttls.ui:79
 msgid "No CA certificate is _required"
 msgstr "CA証明書が要求されましたが存在しません(_R)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAPバージョン(_V)"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "EAPユーザー名が見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "EAPパスワードが見つかりません"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "EAP-ELS認証"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "EAP-TLSユーザー名が見つかりません: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TLS CA証明書: 認証書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:95
-msgid "invalid EAP-TLS password: missing"
-msgstr "無効なEAP-TLSパスワード: 見つかりません"
-
-#: ../panels/network/wireless-security/eap-method-tls.c:109
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "無効なEAP-TLS秘密鍵: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:119
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "無効なEAP-TLSユーザー証明書: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:316
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "暗号化のないプライベートキーは安全ではありません"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:319
+#: panels/network/wireless-security/eap-method-tls.c:310
 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 "
@@ -3548,111 +3566,111 @@ msgstr ""
 "\n"
 "(プライベートキーは openssl を使用してパスワード保護ができます)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:495
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "個人用証明書を選択する"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:507
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "プライベートキーを選択する"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "アイデンティティ(_D)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "ユーザー証明書(_U)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "プライベートキー(_K)"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "プライベートキーのパスワード(_P)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "無効なEAP-TTLS CA証明書: %s"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "無効なEAP-TTLS CA証明書: 証明書が指定されていない"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:259
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#: panels/network/wireless-security/eap-method-ttls.c:305
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:87
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X セキュリティを検証中に未知のエラー"
 
-#: ../panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: panels/network/wireless-security/ws-dynamic-wep.ui:39
+#: panels/network/wireless-security/ws-wep-key.ui:115
+#: panels/network/wireless-security/ws-wpa-eap.ui:33
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "LEAPユーザー名が指定されていません"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "LEAPパスワードが指定されていません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "WEPキーが指定されていません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "無効なWEPキー: キーの長さが%zu文字の場合、十六進数字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "無効なWEPキー: キーの長さが%zu文字の場合、アスキー文字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3661,39 +3679,39 @@ msgstr ""
 "無効なWEPキー: キーの長さ %zu は使用できません。WEPキーは長さ5文字か13文字の"
 "アスキー文字、または10文字か26文字の十六進数字のどちらかでなければなりません"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無効なWEPキー: パスフレーズには必ず何か入力してください"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無効なWEPキー: パスフレーズは64文字未満でなければなりません"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
 msgstr "1 (デフォルト)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "オープンシステム"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "キー(_K)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "キーを表示(_W)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEPインデックス(_X)"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3702,118 +3720,129 @@ msgstr ""
 "無効なWPA PSK: キーの長さ %zu は無効です。8文字以上〜63文字以下、もしくは十六"
 "進数表記で64文字でなければなりません"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効なWPA PSK: キーが64文字の場合、十六進数字以外は使用できません"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "種類(_T)"
 
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/cc-app-notifications-dialog.ui:61
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "通知(_N)"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/cc-app-notifications-dialog.ui:113
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "サウンドアラート(_A)"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
+#: panels/notifications/cc-app-notifications-dialog.ui:169
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "通知ポップアップ(_P)"
 
-#: ../panels/notifications/edit-dialog.ui.h:6
+#: panels/notifications/cc-app-notifications-dialog.ui:185
 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/edit-dialog.ui.h:8
+#: panels/notifications/cc-app-notifications-dialog.ui:250
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "ポップアップにメッセージの内容を表示する(_C)"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/cc-app-notifications-dialog.ui:301
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
-#: ../panels/notifications/edit-dialog.ui.h:10
+#: panels/notifications/cc-app-notifications-dialog.ui:352
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "ロック画面にメッセージの内容を表示する(_O)"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "No­ti­fi­ca­tions"
-msgstr "通知"
-
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
-msgid "Control which notifications are displayed and what they show"
-msgstr "表示する通知およびその表示方法について設定します"
-
-#. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
-msgid "Notifications;Banner;Message;Tray;Popup;"
-msgstr ""
-"Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップ"
-"アップ;"
-
-#: ../panels/notifications/notifications.ui.h:1
+#: panels/notifications/cc-notifications-panel.ui:70
 msgid "Notification _Popups"
 msgstr "通知ポップアップ(_P)"
 
-#: ../panels/notifications/notifications.ui.h:2
+#: panels/notifications/cc-notifications-panel.ui:121
 msgid "_Lock Screen Notifications"
 msgstr "ロック画面での通知(_L)"
 
 #. List of applications.
-#: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781
+#: panels/notifications/cc-notifications-panel.ui:167
+#: panels/privacy/cc-privacy-panel.ui:875 panels/sound/gvc-mixer-dialog.c:1796
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "通知"
+
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
+msgid "Control which notifications are displayed and what they show"
+msgstr "表示する通知およびその表示方法について設定します"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:7
+msgid "preferences-system-notifications"
+msgstr "preferences-system-notifications"
+
+#. Translators: Search terms to find the Notifications panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:20
+msgid "Notifications;Banner;Message;Tray;Popup;"
+msgstr ""
+"Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップ"
+"アップ;"
+
+#: panels/online-accounts/cc-online-accounts-panel.c:150
 msgctxt "Online Account"
 msgid "Other"
 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:603
+#: panels/online-accounts/cc-online-accounts-panel.c:620
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:895
+#: panels/online-accounts/cc-online-accounts-panel.c:917
 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:960
+#: panels/online-accounts/cc-online-accounts-panel.c:982
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> 削除しました"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "On­line Accounts"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+msgid "Online Accounts"
 msgstr "オンラインアカウント"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "オンラインアカウントへの接続や利用方法を設定します。"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:7
+msgid "goa-panel"
+msgstr ""
+
+#. Translators: Search terms to find the Online Accounts panel.
+#. Do NOT translate or localize the semicolons!
+#. The list MUST also end with a semicolon!
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:22
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3824,40 +3853,39 @@ msgstr ""
 "OnlineAccounts;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: ../panels/online-accounts/online-accounts.ui.h:1
-#: ../panels/printers/printers.ui.h:4
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: panels/online-accounts/online-accounts.ui:96
 msgid "Connect to your data in the cloud"
 msgstr "クラウド上のあなたのデータと接続する"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
+#: panels/online-accounts/online-accounts.ui:108
 msgid "No internet connection — connect to set up new online accounts"
 msgstr ""
 "インターネット接続がありません — 新しいオンラインアカウントのセットアップのた"
 "めに接続"
 
-#: ../panels/online-accounts/online-accounts.ui.h:4
+#: panels/online-accounts/online-accounts.ui:130
 msgid "Add an account"
 msgstr "アカウントの追加"
 
-#: ../panels/online-accounts/online-accounts.ui.h:5
+#: panels/online-accounts/online-accounts.ui:231
 msgid "Remove Account"
 msgstr "アカウントの削除"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:260
 msgid "Unknown time"
 msgstr "不明"
 
-#: ../panels/power/cc-power-panel.c:259
+#: panels/power/cc-power-panel.c:266
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
 
-#: ../panels/power/cc-power-panel.c:271
+#: panels/power/cc-power-panel.c:278
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3865,449 +3893,598 @@ msgstr[0] "%i 時間"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:279
+#: panels/power/cc-power-panel.c:286
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:280
+#: panels/power/cc-power-panel.c:287
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../panels/power/cc-power-panel.c:281
+#: panels/power/cc-power-panel.c:288
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:300
+#: panels/power/cc-power-panel.c:306
 #, c-format
 msgid "%s until fully charged"
 msgstr "フル充電まで %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:307
+#: panels/power/cc-power-panel.c:313
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "注意: 残り %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:312
+#: panels/power/cc-power-panel.c:318
 #, c-format
 msgid "%s remaining"
 msgstr "残り %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:323 panels/power/cc-power-panel.c:353
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
+#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
+msgid "Not charging"
+msgstr "放電中"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
 msgid "Empty"
 msgstr "空"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:336
+#: panels/power/cc-power-panel.c:344
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:349
 msgid "Discharging"
 msgstr "放電中"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:479
 msgctxt "Battery name"
 msgid "Main"
 msgstr "主"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:481
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "予備"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:559
 msgid "Wireless mouse"
 msgstr "ワイヤレスマウス"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:562
 msgid "Wireless keyboard"
 msgstr "ワイヤレスキーボード"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:565
 msgid "Uninterruptible power supply"
 msgstr "無停電電源装置"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:568
 msgid "Personal digital assistant"
 msgstr "携帯情報端末"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:571
 msgid "Cellphone"
 msgstr "携帯電話"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:574
 msgid "Media player"
 msgstr "音楽プレイヤー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-power-panel.c:577 panels/wacom/cc-wacom-panel.c:829
 msgid "Tablet"
 msgstr "タブレット"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:580
 msgid "Computer"
 msgstr "コンピューター"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:583
+msgid "Gaming input device"
+msgstr "ゲーム用入力デバイス"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2356
+#: panels/power/cc-power-panel.c:586 panels/power/cc-power-panel.c:847
+#: panels/power/cc-power-panel.c:2481
 msgid "Battery"
 msgstr "バッテリー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:646
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:653
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:658
 msgctxt "Battery power"
 msgid "Low"
 msgstr "少ない"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:663
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充分"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:668
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:672
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:845
 msgid "Batteries"
 msgstr "バッテリー"
 
-#: ../panels/power/cc-power-panel.c:1227
-msgid "When _idle"
-msgstr "アイドル時(_I)"
+#: panels/power/cc-power-panel.c:1206
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 時間"
 
-#: ../panels/power/cc-power-panel.c:1681
-msgid "Power Saving"
-msgstr "省電力"
+#: panels/power/cc-power-panel.c:1208
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
 
-#: ../panels/power/cc-power-panel.c:1712
-msgid "_Screen brightness"
-msgstr "画面の明るさ(_S)"
+#: panels/power/cc-power-panel.c:1211
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
 
-#: ../panels/power/cc-power-panel.c:1731
+#. 5 hours 2 minutes 12 seconds
+#: panels/power/cc-power-panel.c:1216
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/power/cc-power-panel.c:1219
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/power/cc-power-panel.c:1225
+msgid "0 seconds"
+msgstr "0 秒"
+
+#: panels/power/cc-power-panel.c:1322
+msgid "When _idle"
+msgstr "アイドル時(_I)"
+
+#: panels/power/cc-power-panel.c:1779
+msgid "Power Saving"
+msgstr "省電力"
+
+#: panels/power/cc-power-panel.c:1811
+msgid "_Screen brightness"
+msgstr "画面の明るさ(_S)"
+
+#: panels/power/cc-power-panel.c:1833
 msgid "Automatic brightness"
 msgstr "明るさ自動調整"
 
-#: ../panels/power/cc-power-panel.c:1751
+#: panels/power/cc-power-panel.c:1855
 msgid "_Keyboard brightness"
 msgstr "キーボードの明るさ(_K)"
 
-#: ../panels/power/cc-power-panel.c:1761
+#: panels/power/cc-power-panel.c:1868
 msgid "_Dim screen when inactive"
 msgstr "操作していないときに画面を暗くする(_D)"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: panels/power/cc-power-panel.c:1897
 msgid "_Blank screen"
 msgstr "ブランクスクリーン(_B)"
 
-#: ../panels/power/cc-power-panel.c:1823
+#: panels/power/cc-power-panel.c:1939
 msgid "_Wi-Fi"
 msgstr "Wi-Fi(_W)"
 
-#: ../panels/power/cc-power-panel.c:1828
-msgid "Turn off Wi-Fi to save power."
-msgstr "Wi-Fi をオフにして節電します。"
+#: panels/power/cc-power-panel.c:1945
+msgid "Wi-Fi can be turned off to save power."
+msgstr "Wi-Fi をオフにすると節電できます。"
 
-#: ../panels/power/cc-power-panel.c:1853
+#: panels/power/cc-power-panel.c:1975
 msgid "_Mobile broadband"
 msgstr "モバイルブロードバンド(_M)"
 
-#: ../panels/power/cc-power-panel.c:1858
-msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
-msgstr "モバイルブロードバンド (3G、4G、LTE など) をオフにして節電します。"
+#: panels/power/cc-power-panel.c:1981
+msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
+msgstr "モバイルブロードバンド (LTE、4G、3G など) をオフにすると節電できます。"
 
-#: ../panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:2045
 msgid "_Bluetooth"
 msgstr "Bluetooth(_B)"
 
-#: ../panels/power/cc-power-panel.c:1966
+#: panels/power/cc-power-panel.c:2051
+msgid "Bluetooth can be turned off to save power."
+msgstr "Bluetooth をオフにすると節電できます。"
+
+#: panels/power/cc-power-panel.c:2107
 msgid "When on battery power"
 msgstr "バッテリー動作時"
 
-#: ../panels/power/cc-power-panel.c:1968
+#: panels/power/cc-power-panel.c:2109
 msgid "When plugged in"
 msgstr "電源接続時"
 
-#: ../panels/power/cc-power-panel.c:2063
+#: panels/power/cc-power-panel.c:2203
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: ../panels/power/cc-power-panel.c:2064
+#: panels/power/cc-power-panel.c:2204
 msgid "Power Off"
 msgstr "電源オフ"
 
-#: ../panels/power/cc-power-panel.c:2065
+#: panels/power/cc-power-panel.c:2205
 msgid "Hibernate"
 msgstr "ハイバーネート"
 
-#: ../panels/power/cc-power-panel.c:2066
+#: panels/power/cc-power-panel.c:2206
 msgid "Nothing"
 msgstr "なにもしない"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2180
+#: panels/power/cc-power-panel.c:2306
 msgid "Suspend & Power Button"
 msgstr "サスペンド, 電源ボタン"
 
-#: ../panels/power/cc-power-panel.c:2219
+#: panels/power/cc-power-panel.c:2348
 msgid "_Automatic suspend"
 msgstr "自動サスペンド(_A)"
 
-#: ../panels/power/cc-power-panel.c:2220
+#: panels/power/cc-power-panel.c:2350
 msgid "Automatic suspend"
 msgstr "自動サスペンド"
 
-#: ../panels/power/cc-power-panel.c:2287
+#: panels/power/cc-power-panel.c:2416
 msgid "_When the Power Button is pressed"
 msgstr "電源ボタンを押した時の動作(_W)"
 
-#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
-#: ../shell/panel-list.ui.h:1
+#: panels/power/cc-power-panel.c:2528 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
+#: shell/cc-window.c:283
 msgid "Devices"
 msgstr "デバイス"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Po­wer"
-msgstr "電源管理"
-
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
-msgid "View your battery status and change power saving settings"
-msgstr "バッテリー状態の表示、省電力の設定をします"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:13
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "15 分"
 
-#. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"電源;スリープ;サスペンド;ハイバネート;バッテリー;明るさ;ブランクスクリーン;モ"
-"ニター;画面;ディスプレイ;アイドル;待機;"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:17
+msgctxt "automatic_suspend"
+msgid "20 minutes"
+msgstr "20 分"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:21
+msgctxt "automatic_suspend"
+msgid "25 minutes"
+msgstr "25 分"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:25
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "30 分"
 
-#: ../panels/power/power.ui.h:3
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:29
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 分"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:33
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 時間"
 
-#: ../panels/power/power.ui.h:5
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:37
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 分"
 
-#: ../panels/power/power.ui.h:6
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:41
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 分"
 
-#: ../panels/power/power.ui.h:7
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:45
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 分"
 
-#: ../panels/power/power.ui.h:8
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:49
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 時間"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 分"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 分"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 分"
 
-#: ../panels/power/power.ui.h:12
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 分"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 分"
 
-#: ../panels/power/power.ui.h:14
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 分"
 
-#: ../panels/power/power.ui.h:15
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 分"
 
-#: ../panels/power/power.ui.h:16
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 分"
 
-#: ../panels/power/power.ui.h:18
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 分"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "しない"
+
+#: panels/power/cc-power-panel.ui:167
 msgid "Automatic Suspend"
 msgstr "自動サスペンド"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/cc-power-panel.ui:192
 msgid "_Plugged In"
 msgstr "電源接続時(_P)"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/cc-power-panel.ui:208
 msgid "On _Battery Power"
 msgstr "バッテリー動作時(_B)"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
+#: panels/power/cc-power-panel.ui:253 panels/power/cc-power-panel.ui:313
+#: panels/universal-access/cc-ua-panel.ui:1507
 msgid "Delay"
 msgstr "時間"
 
-#: ../panels/printers/authentication-dialog.ui.h:1
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "電源管理"
+
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr "バッテリー状態の表示、省電力の設定をします"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr ""
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"電源;スリープ;サスペンド;ハイバネート;バッテリー;明るさ;ブランクスクリーン;モ"
+"ニター;画面;ディスプレイ;アイドル;待機;"
+
+#: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
 
-#: ../panels/printers/authentication-dialog.ui.h:3
+#: panels/printers/authentication-dialog.ui:42
 msgid "Authenticate"
 msgstr "認証"
 
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
+#. Translators: This is a username on a print server.
+#: panels/printers/authentication-dialog.ui:80
+#: panels/printers/jobs-dialog.ui:57 panels/printers/new-printer-dialog.ui:362
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../panels/printers/authentication-dialog.ui.h:6
-#: ../panels/printers/new-printer-dialog.ui.h:11
+#. Translators: This is a password needed for printing.
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
+#: panels/user-accounts/cc-add-user-dialog.ui:248
+msgid "Password"
+msgstr "パスワード"
+
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
 msgstr "認証が要求されました"
 
 #. Translators: %s is the printer name
-#: ../panels/printers/cc-printers-panel.c:718
+#: panels/printers/cc-printers-panel.c:805
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "プリンター“%s”を削除しました"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:909
+#: panels/printers/cc-printers-panel.c:1052
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1221
+#: panels/printers/cc-printers-panel.c:1389
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
 
-#: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:9
+#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "場所"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/details-dialog.ui.h:4
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: panels/printers/details-dialog.ui:111
+#: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "ドライバー"
 
-#: ../panels/printers/details-dialog.ui.h:5
+#: panels/printers/details-dialog.ui:147
 msgid "Searching for preferred drivers…"
 msgstr "推奨ドライバーの検索中…"
 
-#: ../panels/printers/details-dialog.ui.h:6
+#: panels/printers/details-dialog.ui:169
 msgid "Search for Drivers"
 msgstr "ドライバーを検索する"
 
-#: ../panels/printers/details-dialog.ui.h:7
+#: panels/printers/details-dialog.ui:177
 msgid "Select from Database…"
 msgstr "データベースから選択…"
 
-#: ../panels/printers/details-dialog.ui.h:8
+#: panels/printers/details-dialog.ui:185
 msgid "Install PPD File…"
 msgstr "PPDファイルのインストール…"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Prin­ters"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
 msgstr "プリンター"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "プリンターの追加、プリンタージョブの表示、印刷方法の設定を行います。"
 
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/printers/gnome-printers-panel.desktop.in.in:7
+msgid "printer"
+msgstr "printer"
+
+#. Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/printers/gnome-printers-panel.desktop.in.in:16
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
 
+#. Translators: This is a windows domain used with SMB protocol.
+#: panels/printers/jobs-dialog.ui:44
+msgid "Domain"
+msgstr "ドメイン"
+
+#. Translators: This button authenticates all print jobs and send them for printing.
+#: panels/printers/jobs-dialog.ui:123
+msgid "A_uthenticate"
+msgstr "認証(_U)"
+
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
+#: panels/printers/jobs-dialog.ui:163
 msgid "Clear All"
 msgstr "すべてクリア"
 
+#. Translators: This button pop up authentication dialog for print jobs which need credentials.
+#: panels/printers/jobs-dialog.ui:225
+msgid "_Authenticate"
+msgstr "認証(_A)"
+
 #. Translators: this label describes the dialog empty state, with no jobs listed.
-#: ../panels/printers/jobs-dialog.ui.h:4
+#: panels/printers/jobs-dialog.ui:354
 msgid "No Active Printer Jobs"
 msgstr "アクティブなジョブはありません"
 
 #. Translators: This is the title presented at top of the dialog.
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/printers/pp-new-printer-dialog.c:384
-#: ../panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/new-printer-dialog.ui:29
+#: panels/printers/pp-new-printer-dialog.c:382
+#: panels/printers/pp-new-printer-dialog.c:454
 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.h:6
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
 msgid "_Unlock"
 msgstr "アンロック(_U)"
 
 #. Translators: No printers were detected
-#: ../panels/printers/new-printer-dialog.ui.h:8
+#: panels/printers/new-printer-dialog.ui:211
 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.h:10
+#: panels/printers/new-printer-dialog.ui:284
 msgid "Enter a network address or search for a printer"
 msgstr "ネットワークアドレスを入力するかプリンターを検索してください"
 
-#: ../panels/printers/new-printer-dialog.ui.h:12
+#: panels/printers/new-printer-dialog.ui:353
 msgid "Enter username and password to view printers on Print Server."
 msgstr ""
 "プリンターサーバーで利用可能なプリンターを表示するにはユーザー名とパスワード"
@@ -4315,27 +4492,26 @@ msgstr ""
 
 #. Translators: This button triggers the printing of a test page.
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/printers/pp-options-dialog.c:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:893
 msgid "Test Page"
 msgstr "テストページ"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: ../panels/printers/pp-details-dialog.c:123
-#: ../panels/printers/pp-details-dialog.c:415
+#: panels/printers/pp-details-dialog.c:134
+#: panels/printers/pp-details-dialog.c:434
 #, c-format
 msgid "%s Details"
 msgstr "%s の詳細"
 
-#: ../panels/printers/pp-details-dialog.c:172
+#: panels/printers/pp-details-dialog.c:183
 msgid "No suitable driver found"
 msgstr "適切なドライバーが見つかりませんでした"
 
-#: ../panels/printers/pp-details-dialog.c:316
+#: panels/printers/pp-details-dialog.c:327
 msgid "Select PPD File"
 msgstr "PPDファイルの選択"
 
-#: ../panels/printers/pp-details-dialog.c:325
+#: panels/printers/pp-details-dialog.c:336
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4343,471 +4519,490 @@ msgstr ""
 "PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "プリンタードライバーの選択"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/cc-avatar-chooser.c:146
 msgid "Select"
 msgstr "選択"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
+#: panels/printers/ppd-selection-dialog.ui:73
 msgid "Loading drivers database…"
 msgstr "ドライバーのデータベースをロード中..."
 
 #. Translators: The found device is a JetDirect printer
-#: ../panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:476
 msgid "JetDirect Printer"
 msgstr "JetDirect プリンター"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: ../panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:711
 msgid "LPD Printer"
 msgstr "LPD プリンター"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:66
-#: ../panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:66
+#: panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "片面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:68
-#: ../panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:68
+#: panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "長辺とじ(標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:70
-#: ../panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:70
+#: panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "短辺とじ(フリップ)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "縦方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "横方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "横方向(逆向き)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "縦方向(逆向き)"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:104
+#: panels/printers/pp-jobs-dialog.c:234
 msgctxt "print job"
 msgid "Pending"
 msgstr "待機中"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:108
+#: panels/printers/pp-jobs-dialog.c:240
 msgctxt "print job"
 msgid "Paused"
 msgstr "一時停止"
 
+#. Translators: Job's state (job needs authentication to proceed further)
+#: panels/printers/pp-jobs-dialog.c:245
+msgctxt "print job"
+msgid "Authentication required"
+msgstr "認証が要求されました"
+
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:112
+#: panels/printers/pp-jobs-dialog.c:250
 msgctxt "print job"
 msgid "Processing"
 msgstr "印刷中"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:116
+#: panels/printers/pp-jobs-dialog.c:254
 msgctxt "print job"
 msgid "Stopped"
 msgstr "停止"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:120
+#: panels/printers/pp-jobs-dialog.c:258
 msgctxt "print job"
 msgid "Canceled"
 msgstr "キャンセル"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:124
+#: panels/printers/pp-jobs-dialog.c:262
 msgctxt "print job"
 msgid "Aborted"
 msgstr "中止"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:128
+#: panels/printers/pp-jobs-dialog.c:266
 msgctxt "print job"
 msgid "Completed"
 msgstr "完了"
 
+#. Translators: This label shows how many jobs of this printer needs to be authenticated to be printed.
+#: panels/printers/pp-jobs-dialog.c:389
+#, 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:310
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — アクティブなジョブ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:402
+#. Translators: The printer needs authentication info to print.
+#: panels/printers/pp-jobs-dialog.c:618
+#, c-format
+msgid "Enter credentials to print from %s."
+msgstr "%s から印刷するにはユーザー名とパスワードを入力してください。"
+
+#: panels/printers/pp-new-printer-dialog.c:400
 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:406
+#: panels/printers/pp-new-printer-dialog.c:404
 #, 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:411
+#: panels/printers/pp-new-printer-dialog.c:409
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr ""
 "%s で利用可能なプリンターを表示するにはユーザー名とパスワードを入力してくださ"
 "い。"
 
-#: ../panels/printers/pp-new-printer-dialog.c:876
+#: panels/printers/pp-new-printer-dialog.c:891
 msgid "Searching for Printers"
 msgstr "プリンターの検索"
 
 #. Translators: The found device is a printer connected via USB
-#: ../panels/printers/pp-new-printer-dialog.c:1799
+#: panels/printers/pp-new-printer-dialog.c:1788
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1804
+#: panels/printers/pp-new-printer-dialog.c:1793
 msgid "Serial Port"
 msgstr "シリアルポート"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1811
+#: panels/printers/pp-new-printer-dialog.c:1800
 msgid "Parallel Port"
 msgstr "パラレルポート"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1853
+#: panels/printers/pp-new-printer-dialog.c:1842
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1858
+#: panels/printers/pp-new-printer-dialog.c:1847
 #, 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:1887
+#: panels/printers/pp-new-printer-dialog.c:1876
 msgid "Server requires authentication"
 msgstr "サーバーが認証を要求しています"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "両面"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "用紙の種類"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "給紙元"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "出力トレイ"
 
-#: ../panels/printers/pp-options-dialog.c:88
+#: panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScriptのプレフィルタリング"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:534
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "片面のページ数"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:546
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "両面"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "汎用"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:658
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "ページ設定"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:661
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "インストール可能なオプション"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "ジョブ"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:667
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "画質"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:670
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "色"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "表面処理"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "高度"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/pp-options-dialog.c:908
+#: panels/printers/pp-options-dialog.c:908
 msgid "Test page"
 msgstr "テストページ"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:76
-#: ../panels/printers/pp-ppd-option-widget.c:78
-#: ../panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:76
+#: panels/printers/pp-ppd-option-widget.c:78
+#: panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "自動選択"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:80
-#: ../panels/printers/pp-ppd-option-widget.c:82
-#: ../panels/printers/pp-ppd-option-widget.c:84
-#: ../panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:80
+#: panels/printers/pp-ppd-option-widget.c:82
+#: panels/printers/pp-ppd-option-widget.c:84
+#: panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "プリンターのデフォルト"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "内蔵GhostScriptフォントのみ"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "PSレベル1に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
 msgstr "PSレベル2に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "プレフィルタリングなし"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "製造元"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:577
+#: panels/printers/pp-printer-entry.c:612 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "アクティブなジョブがありません"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:582
+#: panels/printers/pp-printer-entry.c:617
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
 msgstr[0] "%u ジョブ"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:730
+#: panels/printers/pp-printer-entry.c:777
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:732
+#: panels/printers/pp-printer-entry.c:779
 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:735
+#: panels/printers/pp-printer-entry.c:782
 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:738
+#: panels/printers/pp-printer-entry.c:785
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:740
+#: panels/printers/pp-printer-entry.c:787
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:742
+#: panels/printers/pp-printer-entry.c:789
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:744
+#: panels/printers/pp-printer-entry.c:791
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:746
+#: panels/printers/pp-printer-entry.c:793
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:748
+#: panels/printers/pp-printer-entry.c:795
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:750
+#: panels/printers/pp-printer-entry.c:797
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:752
+#: panels/printers/pp-printer-entry.c:799
 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:754
-#: ../panels/printers/pp-printer-entry.c:884
+#: panels/printers/pp-printer-entry.c:801
+#: panels/printers/pp-printer-entry.c:929
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:756
+#: panels/printers/pp-printer-entry.c:803
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:758
+#: panels/printers/pp-printer-entry.c:805
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:760
+#: panels/printers/pp-printer-entry.c:807
 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:762
+#: panels/printers/pp-printer-entry.c:809
 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:870
+#: panels/printers/pp-printer-entry.c:915
 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:875
+#: panels/printers/pp-printer-entry.c:920
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "ジョブ受付不可"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:880
+#: panels/printers/pp-printer-entry.c:925
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/pp-printer-entry.c:904
+#: panels/printers/pp-printer-entry.c:949
 msgid "Clean print heads"
 msgstr "ヘッドクリーニング"
 
-#: ../panels/printers/printer-entry.ui.h:1
+#: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
 msgstr "プリンターのオプション"
 
-#: ../panels/printers/printer-entry.ui.h:2
+#: panels/printers/printer-entry.ui:26
 msgid "Printer Details"
 msgstr "プリンターの詳細"
 
 #. Set this printer as default
-#: ../panels/printers/printer-entry.ui.h:4
+#: panels/printers/printer-entry.ui:38
 msgid "Use Printer by Default"
 msgstr "デフォルトプリンター"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: ../panels/printers/printer-entry.ui.h:6
+#: panels/printers/printer-entry.ui:50
 msgid "Clean Print Heads"
 msgstr "ヘッドクリーニング"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: panels/printers/printer-entry.ui:61
 msgid "Remove Printer"
 msgstr "プリンターの削除"
 
-#: ../panels/printers/printer-entry.ui.h:8
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "型式"
 
-#: ../panels/printers/printer-entry.ui.h:10
+#: panels/printers/printer-entry.ui:251
 msgid "Ink Level"
 msgstr "インクの量"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:12
+#: panels/printers/printer-entry.ui:312
 msgid "Please restart when the problem is resolved."
 msgstr "問題が解決した場合、再起動してください。"
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:14
+#: panels/printers/printer-entry.ui:319
 msgid "Restart"
 msgstr "再起動"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:2
+#: panels/printers/printers.ui:20
 msgid "Add…"
 msgstr "追加…"
 
-#: ../panels/printers/printers.ui.h:5
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "プリンターが見つかりません"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:7
+#: panels/printers/printers.ui:200
 msgid "Add a Printer…"
 msgstr "プリンターの追加…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:9
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -4815,70 +5010,73 @@ msgstr ""
 "申し訳ありません! システムの印刷サービスは\n"
 "現在、利用できないようです。"
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:403 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "画面ロック"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:447
 msgid "In use"
 msgstr "使用中"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:452
 msgctxt "Location services status"
 msgid "On"
 msgstr "オン"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:453
 msgctxt "Location services status"
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#: panels/privacy/cc-privacy-panel.c:830 panels/privacy/cc-privacy-panel.ui:745
 msgid "Location Services"
 msgstr "位置情報サービス"
 
-#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:950 panels/privacy/cc-privacy-panel.ui:127
 msgid "Usage & History"
 msgstr "使用と履歴"
 
-#: ../panels/privacy/cc-privacy-panel.c:1071
+#: panels/privacy/cc-privacy-panel.c:1071
 msgid "Empty all items from Trash?"
 msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1072
 msgid "All items in the Trash will be permanently deleted."
 msgstr "ここでアイテムを削除すると元に戻すことはできません。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1073
+#: panels/privacy/cc-privacy-panel.c:1073
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1094
 msgid "Delete all the temporary files?"
 msgstr "一時ファイルをすべて削除しますか?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1095
 msgid "All the temporary files will be permanently deleted."
 msgstr "一時ファイルは完全に削除されます。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1096
 msgid "_Purge Temporary Files"
 msgstr "一時ファイルを削除する(_P)"
 
-#: ../panels/privacy/cc-privacy-panel.c:1120 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1118
+#: panels/privacy/cc-privacy-panel.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "ゴミ箱と一時ファイルの削除"
 
-#: ../panels/privacy/cc-privacy-panel.c:1160 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1151
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "ソフトウェアの使用状況"
 
-#: ../panels/privacy/cc-privacy-panel.c:1201 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1190
+#: panels/privacy/cc-privacy-panel.ui:959
 msgid "Problem Reporting"
 msgstr "問題報告"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1215
+#: panels/privacy/cc-privacy-panel.c:1202
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4888,78 +5086,144 @@ msgstr ""
 "役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
 "す。"
 
-#: ../panels/privacy/cc-privacy-panel.c:1227 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1214
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "プライバシーポリシー"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "Pri­va­cy"
-msgstr "プライバシー"
-
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
-msgid "Protect your personal information and control what others might see"
-msgstr "個人情報の保護と外部からの見え方を設定します"
-
-#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
-msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
-msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テ"
-"ンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
-
-#: ../panels/privacy/privacy.ui.h:1
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:14
+msgctxt "lock_screen"
 msgid "Screen Turns Off"
 msgstr "画面オフのとき"
 
-#: ../panels/privacy/privacy.ui.h:2
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:18
+msgctxt "lock_screen"
 msgid "30 seconds"
 msgstr "30 秒"
 
-#: ../panels/privacy/privacy.ui.h:9
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:22
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:26
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:30
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:34
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:38
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 分"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/privacy/cc-privacy-panel.ui:42
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 時間"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:56
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 時間"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:60
+msgctxt "purge_files"
 msgid "1 day"
 msgstr "1 日"
 
-#: ../panels/privacy/privacy.ui.h:10
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:64
+msgctxt "purge_files"
 msgid "2 days"
 msgstr "2 日"
 
-#: ../panels/privacy/privacy.ui.h:11
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:68
+msgctxt "purge_files"
 msgid "3 days"
 msgstr "3 日"
 
-#: ../panels/privacy/privacy.ui.h:12
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:72
+msgctxt "purge_files"
 msgid "4 days"
 msgstr "4 日"
 
-#: ../panels/privacy/privacy.ui.h:13
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:76
+msgctxt "purge_files"
 msgid "5 days"
 msgstr "5 日"
 
-#: ../panels/privacy/privacy.ui.h:14
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:80
+msgctxt "purge_files"
 msgid "6 days"
 msgstr "6 日"
 
-#: ../panels/privacy/privacy.ui.h:15
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:84
+msgctxt "purge_files"
 msgid "7 days"
 msgstr "7 日"
 
-#: ../panels/privacy/privacy.ui.h:16
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:88
+msgctxt "purge_files"
 msgid "14 days"
 msgstr "14 日"
 
-#: ../panels/privacy/privacy.ui.h:17
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/privacy/cc-privacy-panel.ui:92
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 日"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:106
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 日"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:110
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 日"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:114
+msgctxt "retain_history"
 msgid "30 days"
 msgstr "30 日"
 
-#: ../panels/privacy/privacy.ui.h:18
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:118
+msgctxt "retain_history"
 msgid "Forever"
 msgstr "無期限"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/cc-privacy-panel.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4967,35 +5231,35 @@ msgstr ""
 "履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目は"
 "ネットワークを越えて共有されることはありません。"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "最近使用したファイル(_R)"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "記憶する期間(_H)"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "履歴をクリアする(_E)"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/cc-privacy-panel.ui:301
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "画面をロックして離席中もプライバシーを保護します。"
 
-#: ../panels/privacy/privacy.ui.h:26
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "自動画面ロック(_L)"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/cc-privacy-panel.ui:362
 msgid "Lock screen _after blank for"
 msgstr "画面オフ後にロックするまでの時間(_A)"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: panels/privacy/cc-privacy-panel.ui:394
 msgid "Show _Notifications"
 msgstr "ロック画面に通知を表示する(_N)"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/cc-privacy-panel.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -5003,27 +5267,27 @@ msgstr ""
 "ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残ったま"
 "まにならないようにします。"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "ゴミ箱を自動で空にする(_T)"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "一時ファイルを自動で削除する(_F)"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "次の時間経過後に削除する(_A)"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: panels/privacy/cc-privacy-panel.ui:590
 msgid "_Empty Trash…"
 msgstr "ゴミ箱を空にする(_E)…"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: panels/privacy/cc-privacy-panel.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "一時ファイルを削除する(_P)v"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/cc-privacy-panel.ui:654
 msgid ""
 "Sending us information about which software you use helps us provide you "
 "with more accurate recommendations. It also helps us to improve our "
@@ -5038,11 +5302,11 @@ msgstr ""
 "私たちが収集する情報はすべて匿名であり、また収集したデータを第三者と共有する"
 "ことはありません。"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "ソフトウェアの使用統計情報を送信する(_S)"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/cc-privacy-panel.ui:764
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5051,301 +5315,324 @@ msgstr ""
 "ようになります。Wi-Fi やモバイルブロードバンドを使用している場合、より正確な"
 "位置を取得できます。"
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/cc-privacy-panel.ui:778
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"Mozilla Location Service を使用します: <a href='https://location.services.";
+"mozilla.com/privacy'>プライバシーポリシー</a>"
+
+#: panels/privacy/cc-privacy-panel.ui:828
 msgid "_Location Services"
 msgstr "位置情報サービス(_L)"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/cc-privacy-panel.ui:1026
 msgid "_Automatic Problem Reporting"
 msgstr "問題のレポートを自動で送信する(_A)"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "プライバシー"
+
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
+msgid "Protect your personal information and control what others might see"
+msgstr "個人情報の保護と外部からの見え方を設定します"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr ""
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テ"
+"ンポラリー;一時;インデックス;索引;名前;ネットワーク;Privacy;プライバシー;"
+
+#: panels/region/cc-format-chooser.c:114
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "ヤード・ポンド法"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/region/cc-format-chooser.c:116
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "メートル法"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: panels/region/cc-format-chooser.c:286
 msgid "No regions found"
 msgstr "地域が見つかりません"
 
-#: ../panels/region/cc-input-chooser.c:182
-msgid "No input sources found"
-msgstr "入力ソースが見つかりません"
-
-#: ../panels/region/cc-input-chooser.c:1012
-msgctxt "Input Source"
-msgid "Other"
-msgstr "その他"
-
-#: ../panels/region/cc-region-panel.c:881
-msgid "No input source selected"
-msgstr "入力ソースが選択されていません"
-
-#: ../panels/region/cc-region-panel.c:1773
-msgid "Login _Screen"
-msgstr "ログイン画面(_S)"
-
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/cc-format-chooser.ui:7
 msgid "Formats"
 msgstr "フォーマット"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "プレビュー"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "日付"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/cc-format-chooser.ui:154
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: panels/region/cc-format-chooser.ui:185
 msgid "Dates & Times"
 msgstr "日付と時刻"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "計量単位"
 
-#: ../panels/region/format-chooser.ui.h:10
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "用紙サイズ"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Re­gion & Lan­guage"
-msgstr "地域と言語"
-
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
-msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
+#: panels/region/cc-input-chooser.c:193
+msgid "No input sources found"
+msgstr "入力ソースが見つかりません"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
-msgid "Language;Layout;Keyboard;Input;"
-msgstr ""
-"Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
-"Region;地域;"
+#: panels/region/cc-input-chooser.c:948
+msgctxt "Input Source"
+msgid "Other"
+msgstr "その他"
 
-#: ../panels/region/input-chooser.ui.h:1
+#: panels/region/cc-input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "入力ソースの追加"
 
-#: ../panels/region/input-chooser.ui.h:4
+#: panels/region/cc-input-chooser.ui:77
 msgid "Input methods can’t be used on the login screen"
 msgstr "インプットメソッドはログイン画面で使用できません"
 
-#: ../panels/region/input-options.ui.h:1
-msgid "Input Source Options"
-msgstr "入力ソースのオプション"
-
-#: ../panels/region/input-options.ui.h:2
-msgid "Use the _same source for all windows"
-msgstr "すべてのウィンドウで同じソースを使う(_S)"
-
-#: ../panels/region/input-options.ui.h:3
-msgid "Allow _different sources for each window"
-msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
-
-#: ../panels/region/input-options.ui.h:5
-msgid "Switch to previous source"
-msgstr "前のソースへ切り替える"
-
-#: ../panels/region/input-options.ui.h:6
-msgid "Super+Shift+Space"
-msgstr "Super+Shift+Space"
-
-#: ../panels/region/input-options.ui.h:7
-msgid "Switch to next source"
-msgstr "次のソースへ切り替える"
-
-#: ../panels/region/input-options.ui.h:8
-msgid "Super+Space"
-msgstr "Super+Space"
-
-#: ../panels/region/input-options.ui.h:9
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "キーボード設定でショートカットを変更できます"
-
-#: ../panels/region/input-options.ui.h:10
-msgid "Alternative switch to next source"
-msgstr "次のソースへ切り替える (代替)"
-
-#: ../panels/region/input-options.ui.h:11
-msgid "Left+Right Alt"
-msgstr "左Alt+右Alt"
+#: panels/region/cc-region-panel.c:1537
+msgid "Login _Screen"
+msgstr "ログイン画面(_S)"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: panels/region/cc-region-panel.ui:60
+#: panels/user-accounts/cc-user-panel.ui:358
 msgid "_Language"
 msgstr "言語(_L)"
 
-#: ../panels/region/region.ui.h:2
-msgid "English (United Kingdom)"
-msgstr "英語 (UK)"
-
-#: ../panels/region/region.ui.h:3
+#: panels/region/cc-region-panel.ui:95
 msgid "Restart the session for changes to take effect"
 msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: ../panels/region/region.ui.h:4
+#: panels/region/cc-region-panel.ui:112
 msgid "Restart…"
 msgstr "再起動…"
 
-#: ../panels/region/region.ui.h:5
+#: panels/region/cc-region-panel.ui:143
 msgid "_Formats"
 msgstr "フォーマット(_F)"
 
-#: ../panels/region/region.ui.h:6
-msgid "United Kingdom"
-msgstr "UK"
-
-#: ../panels/region/region.ui.h:7
+#: panels/region/cc-region-panel.ui:193
 msgid "Input Sources"
 msgstr "入力ソース"
 
-#: ../panels/region/region.ui.h:8
-msgid "_Options"
-msgstr "オプション(_O)"
+#: panels/region/cc-region-panel.ui:207
+msgid "Choose keyboard layouts or input methods."
+msgstr ""
+
+#: panels/region/cc-region-panel.ui:270
+msgid "No input source selected"
+msgstr "入力ソースが選択されていません"
 
-#: ../panels/region/region.ui.h:9
+#: panels/region/cc-region-panel.ui:305
 msgid "Add input source"
 msgstr "入力ソースを追加する"
 
-#: ../panels/region/region.ui.h:10
+#: panels/region/cc-region-panel.ui:326
 msgid "Remove input source"
 msgstr "入力ソースを削除する"
 
-#: ../panels/region/region.ui.h:11
+#: panels/region/cc-region-panel.ui:369
 msgid "Move input source up"
 msgstr "入力ソースを上に移動する"
 
-#: ../panels/region/region.ui.h:12
+#: panels/region/cc-region-panel.ui:390
 msgid "Move input source down"
 msgstr "入力ソースを下に移動する"
 
-#: ../panels/region/region.ui.h:13
+#: panels/region/cc-region-panel.ui:433
 msgid "Configure input source"
 msgstr "入力ソースの設定を行う"
 
-#: ../panels/region/region.ui.h:14
+#: panels/region/cc-region-panel.ui:454
 msgid "Show input source keyboard layout"
 msgstr "入力ソースのキーボードレイアウトを表示する"
 
-#: ../panels/region/region.ui.h:15
+#: panels/region/cc-region-panel.ui:480
 msgid "Login settings are used by all users when logging into the system"
 msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
 
-#: ../panels/search/cc-search-locations-dialog.c:639
+#: panels/region/cc-region-panel.ui:524
+msgid "Input Source Options"
+msgstr "入力ソースのオプション"
+
+#: panels/region/cc-region-panel.ui:539
+msgid "Use the _same source for all windows"
+msgstr "すべてのウィンドウで同じソースを使う(_S)"
+
+#: panels/region/cc-region-panel.ui:557
+msgid "Allow _different sources for each window"
+msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
+
+#: panels/region/cc-region-panel.ui:599
+msgid "Previous source"
+msgstr "前のソース"
+
+#: panels/region/cc-region-panel.ui:617
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
+
+#: panels/region/cc-region-panel.ui:632
+msgid "Next source"
+msgstr "次のソース"
+
+#: panels/region/cc-region-panel.ui:650
+msgid "Super+Space"
+msgstr "Super+Space"
+
+#: panels/region/cc-region-panel.ui:665
+msgid "Left+Right Alt"
+msgstr "左Alt+右Alt"
+
+#: panels/region/cc-region-panel.ui:681
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "キーボード設定でショートカットを変更できます"
+
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "地域と言語"
+
+#: panels/region/gnome-region-panel.desktop.in.in:4
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr ""
+
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr ""
+"Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
+"Region;地域;"
+
+#: panels/search/cc-search-locations-dialog.c:604
 msgid "Select Location"
 msgstr "場所の選択"
 
-#: ../panels/search/cc-search-locations-dialog.c:643
+#: panels/search/cc-search-locations-dialog.c:608
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../panels/search/cc-search-panel.c:178
+#: panels/search/cc-search-panel.c:175
 msgid "No applications found"
 msgstr "アプリケーションが見つかりません"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search"
-msgstr "検索"
+#: panels/search/cc-search-panel.ui:52
+msgid "Move Up"
+msgstr "上へ"
+
+#: panels/search/cc-search-panel.ui:69
+msgid "Move Down"
+msgstr "下へ"
+
+#: panels/search/cc-search-panel.ui:105
+msgid "Preferences"
+msgstr "設定"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
+#: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
 msgstr "アクティビティ画面で検索結果を表示するアプリケーションを設定します"
 
-#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/search/gnome-search-panel.desktop.in.in:7
+msgid "preferences-system-search"
+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/search/gnome-search-panel.desktop.in.in:19
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;"
 "プライバシー;結果;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "検索する場所"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "場所"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 msgstr "その他"
 
-#: ../panels/search/search.ui.h:1
-msgid "Move Up"
-msgstr "上へ"
-
-#: ../panels/search/search.ui.h:2
-msgid "Move Down"
-msgstr "下へ"
-
-#: ../panels/search/search.ui.h:3
-msgid "Preferences"
-msgstr "設定"
-
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "共有するネットワークが選択されていません"
 
-#: ../panels/sharing/cc-sharing-panel.c:273
+#: panels/sharing/cc-sharing-panel.c:319
 msgctxt "service is enabled"
 msgid "On"
 msgstr "オン"
 
-#: ../panels/sharing/cc-sharing-panel.c:275
-#: ../panels/sharing/cc-sharing-panel.c:302
+#: panels/sharing/cc-sharing-panel.c:321 panels/sharing/cc-sharing-panel.c:348
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/sharing/cc-sharing-panel.c:305
+#: panels/sharing/cc-sharing-panel.c:351
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "有効"
 
-#: ../panels/sharing/cc-sharing-panel.c:308
+#: panels/sharing/cc-sharing-panel.c:354
 msgctxt "service is active"
 msgid "Active"
 msgstr "アクティブ"
 
-#: ../panels/sharing/cc-sharing-panel.c:379
+#: panels/sharing/cc-sharing-panel.c:424
 msgid "Choose a Folder"
 msgstr "フォルダーの選択"
 
-#: ../panels/sharing/cc-sharing-panel.c:690
+#: panels/sharing/cc-sharing-panel.c:724
 #, c-format
 msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+"File Sharing allows you to share your Public folder with others on your "
+"current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr ""
-"パーソナルファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に"
-"接続し、あなたの公開フォルダーを共有できるようにします: <a href=\"dav://%s"
-"\">dav://%s</a>"
+"ファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に接続し、あ"
+"なたの公開フォルダーを共有できるようにします: <a href=\"dav://%s\">dav://%s</"
+"a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:692
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5356,7 +5643,7 @@ msgstr ""
 "ドを使用した接続を許可します:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:694
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5365,133 +5652,143 @@ msgstr ""
 "スクリーン共有を許可した場合、リモートユーザーが次の URI に接続して画面の表示"
 "または操作を行うことを許可します: <a href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:806
+#: panels/sharing/cc-sharing-panel.c:832
 msgid "Copy"
 msgstr "コピー"
 
-#: ../panels/sharing/cc-sharing-panel.c:1233
+#: panels/sharing/cc-sharing-panel.c:1285
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "共有"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
-msgid "Sha­ring"
-msgstr "共有"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
-msgid "Control what you want to share with others"
-msgstr "他のユーザーと共有するものを設定します"
+#: panels/sharing/cc-sharing-panel.ui:50
+msgid "_Computer Name"
+msgstr "コンピューター名(_C)"
 
-#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-msgstr ""
-"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
-"pictures;photos;movies;server;renderer;共有;シェアリング;セキュアシェル;ホス"
-"ト;名前;リモート;遠隔;デスクトップ;ブルートゥース;メディア;コンテンツ;オー"
-"ディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;"
-"ムービー;映画;サーバー;レンダラー;"
+#: panels/sharing/cc-sharing-panel.ui:108
+msgid "_File Sharing"
+msgstr "ファイル共有(_F)"
 
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "ネットワーク"
-
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
-msgid "Enable or disable remote login"
-msgstr "リモートログインの有効化/無効化"
-
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2
-msgid "Authentication is required to enable or disable remote login"
-msgstr "リモートログインを有効化または無効化するには認証が必要になります"
-
-#: ../panels/sharing/sharing.ui.h:1
-msgid "_Computer Name"
-msgstr "コンピューター名(_C)"
-
-#: ../panels/sharing/sharing.ui.h:2
-msgid "_File Sharing"
-msgstr "ファイル共有(_F)"
-
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/cc-sharing-panel.ui:151
 msgid "_Screen Sharing"
 msgstr "画面共有(_S)"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/cc-sharing-panel.ui:194
 msgid "_Media Sharing"
 msgstr "メディア共有(_M)"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/cc-sharing-panel.ui:237
 msgid "_Remote Login"
 msgstr "リモートログイン(_R)"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/cc-sharing-panel.ui:276
 msgid "Some services are disabled because of no network access."
 msgstr "ネットワークに接続していないため無効となっているサービスがあります。"
 
-#: ../panels/sharing/sharing.ui.h:7
+#: panels/sharing/cc-sharing-panel.ui:292
+#: panels/sharing/cc-sharing-panel.ui:419
 msgid "File Sharing"
 msgstr "ファイル共有"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/cc-sharing-panel.ui:339
 msgid "_Require Password"
 msgstr "パスワードを要求する(_R)"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/cc-sharing-panel.ui:430
+#: panels/sharing/cc-sharing-panel.ui:502
 msgid "Remote Login"
 msgstr "リモートログイン"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/cc-sharing-panel.ui:525
+#: panels/sharing/cc-sharing-panel.ui:771
 msgid "Screen Sharing"
 msgstr "画面共有"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/cc-sharing-panel.ui:583
 msgid "_Allow connections to control the screen"
 msgstr "このスクリーンの操作する接続を許可する(_A)"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/cc-sharing-panel.ui:628
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/cc-sharing-panel.ui:658
 msgid "_Show Password"
 msgstr "パスワードを表示(_S)"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "Access Options"
 msgstr "アクセスオプション"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/cc-sharing-panel.ui:703
 msgid "_New connections must ask for access"
 msgstr "新規接続の場合アクセス要求を必要とする(_N)"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/cc-sharing-panel.ui:721
 msgid "_Require a password"
 msgstr "パスワードを要求する(_R)"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/cc-sharing-panel.ui:782
+#: panels/sharing/cc-sharing-panel.ui:876
 msgid "Media Sharing"
 msgstr "メディア共有"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/cc-sharing-panel.ui:815
 msgid "Share music, photos and videos over the network."
 msgstr "音楽や写真、ビデオをネットワーク上で共有できます。"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/cc-sharing-panel.ui:830
 msgid "Folders"
 msgstr "フォルダー"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "他のユーザーと共有するものを設定します"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr ""
+
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
+msgstr ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;共有;シェアリング;セキュアシェル;ホス"
+"ト;名前;リモート;遠隔;デスクトップ;ブルートゥース;メディア;コンテンツ;オー"
+"ディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;"
+"ムービー;映画;サーバー;レンダラー;"
+
+#: panels/sharing/networks.ui:19
+msgid "Networks"
+msgstr "ネットワーク"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
+msgid "Enable or disable remote login"
+msgstr "リモートログインの有効化/無効化"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "リモートログインを有効化または無効化するには認証が必要になります"
+
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
 msgstr "サウンド"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
 msgid "Change sound levels, inputs, outputs, and alert sounds"
 msgstr "サウンドレベルや入力、出力、アラート音を設定します"
 
-#. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr ""
+
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 msgstr ""
 "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;カード;マイク;音"
@@ -5499,368 +5796,490 @@ msgstr ""
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:3
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
 msgid "Bark"
 msgstr "犬が吠える音"
 
 #. Translators: This is the name of an audio file that sounds like a water drip.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:6
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
 msgid "Drip"
 msgstr "水が滴る音"
 
 #. Translators: This is the name of an audio file that sounds like tapping glass.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:9
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
 msgid "Glass"
 msgstr "ガラスを叩く音"
 
 #. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
 #. You might want to translate it into the equivalent words of your language.
-#: ../panels/sound/data/sounds/gnome-sounds-default.xml.in.in.h:12
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
 msgid "Sonar"
 msgstr "ソナーのピング音"
 
-#: ../panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "リア"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "フロント"
 
-#: ../panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大"
 
-#: ../panels/sound/gvc-balance-bar.c:289
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Balance:"
 msgstr "バランス(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:292
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Fade:"
 msgstr "フェード(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: panels/sound/gvc-balance-bar.c:297
 msgid "_Subwoofer:"
 msgstr "サブウーファー(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: panels/sound/gvc-channel-bar.c:614 panels/sound/gvc-channel-bar.c:623
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:615
+#: panels/sound/gvc-channel-bar.c:618
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "非増幅"
 
-#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
+#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
+#: panels/sound/gvc-mixer-dialog.c:520
 msgid "_Profile:"
 msgstr "プロファイル(_P):"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u 出力"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u 入力"
-
-#: ../panels/sound/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "システムのサウンド"
-
-#: ../panels/sound/gvc-mixer-dialog.c:251
+#: panels/sound/gvc-mixer-dialog.c:255
 msgid "_Test Speakers"
 msgstr "スピーカーのテスト(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
+#: panels/sound/gvc-mixer-dialog.c:424
 msgid "Peak detect"
 msgstr "ピークの検出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1512
+#: panels/sound/gvc-mixer-dialog.c:1499
 msgid "Device"
 msgstr "デバイス"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1575
+#: panels/sound/gvc-mixer-dialog.c:1562
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s のスピーカーテスト"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/gvc-mixer-dialog.c:1620
 msgid "_Output volume:"
 msgstr "出力の音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1645
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "Output"
 msgstr "出力"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1650
+#: panels/sound/gvc-mixer-dialog.c:1642
 msgid "C_hoose a device for sound output:"
 msgstr "サウンド出力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1672
+#: panels/sound/gvc-mixer-dialog.c:1667
 msgid "Settings for the selected device:"
 msgstr "選択したデバイスの設定:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1683
+#: panels/sound/gvc-mixer-dialog.c:1681
 msgid "Input"
 msgstr "入力"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1690
+#: panels/sound/gvc-mixer-dialog.c:1690
 msgid "_Input volume:"
 msgstr "入力の音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1711
+#: panels/sound/gvc-mixer-dialog.c:1713
 msgid "Input level:"
 msgstr "入力レベル:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1737
+#: panels/sound/gvc-mixer-dialog.c:1743
 msgid "C_hoose a device for sound input:"
 msgstr "サウンド入力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1761
+#: panels/sound/gvc-mixer-dialog.c:1771
 msgid "Sound Effects"
 msgstr "音響効果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1768
+#: panels/sound/gvc-mixer-dialog.c:1780
 msgid "_Alert volume:"
 msgstr "警告音の音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1785
+#: panels/sound/gvc-mixer-dialog.c:1805
 msgid "No application is currently playing or recording audio."
 msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:188
+#: panels/sound/gvc-sound-theme-chooser.c:187
 msgid "Built-in"
 msgstr "組み込み"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: panels/sound/gvc-sound-theme-chooser.c:446
+#: panels/sound/gvc-sound-theme-chooser.c:458
+#: panels/sound/gvc-sound-theme-chooser.c:470
 msgid "Sound Preferences"
 msgstr "サウンドの設定"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: panels/sound/gvc-sound-theme-chooser.c:449
+#: panels/sound/gvc-sound-theme-chooser.c:460
+#: panels/sound/gvc-sound-theme-chooser.c:472
 msgid "Testing event sound"
 msgstr "イベント音のテスト中"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:554
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
+#: panels/sound/gvc-sound-theme-chooser.c:544
+#: panels/wacom/wacom-stylus-page.ui:25
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: panels/sound/gvc-sound-theme-chooser.c:545
 msgid "From theme"
 msgstr "テーマから"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: panels/sound/gvc-sound-theme-chooser.c:720
 msgid "C_hoose an alert sound:"
 msgstr "警告音の選択(_H):"
 
-#: ../panels/sound/gvc-speaker-test.c:231
+#: panels/sound/gvc-speaker-test.c:229
 msgid "Stop"
 msgstr "停止"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:343
 msgid "Test"
 msgstr "テスト"
 
-#: ../panels/sound/gvc-speaker-test.c:239
+#: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
 msgstr "サブウーファー"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
+#: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
 msgstr "その他"
 
+#: panels/thunderbolt/cc-bolt-device-dialog.c:86
+#: panels/thunderbolt/cc-bolt-device-entry.c:119
+msgctxt "Thunderbolt Device Status"
+msgid "Disconnected"
+msgstr "切断中"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:89
+#: panels/thunderbolt/cc-bolt-device-entry.c:122
+msgctxt "Thunderbolt Device Status"
+msgid "Connecting"
+msgstr "接続中"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:92
+#: panels/thunderbolt/cc-bolt-device-entry.c:126
+#: panels/thunderbolt/cc-bolt-device-entry.c:138
+msgctxt "Thunderbolt Device Status"
+msgid "Connected"
+msgstr "接続済み"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:95
+msgctxt "Thunderbolt Device Status"
+msgid "Authorization Error"
+msgstr "認証エラー"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:98
+#: panels/thunderbolt/cc-bolt-device-entry.c:132
+msgctxt "Thunderbolt Device Status"
+msgid "Authorizing"
+msgstr "認証中"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:105
+msgctxt "Thunderbolt Device Status"
+msgid "Reduced Functionality"
+msgstr ""
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:107
+msgctxt "Thunderbolt Device Status"
+msgid "Connected & Authorized"
+msgstr "接続済みと認証済み"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
+#: panels/thunderbolt/cc-bolt-device-entry.c:146
+msgctxt "Thunderbolt Device Status"
+msgid "Unknown"
+msgstr "不明"
+
+#. Translators: The time point the device was authorized.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:169
+msgid "Authorized at:"
+msgstr "認証済み:"
+
+#. Translators: The time point the device was connected.
+#: panels/thunderbolt/cc-bolt-device-dialog.c:175
+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:182
+msgid "Enrolled at:"
+msgstr "登録済み:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:250
+msgid "Failed to authorize device: "
+msgstr "デバイスの認証に失敗しました: "
+
+#: panels/thunderbolt/cc-bolt-device-dialog.c:327
+msgid "Failed to forget device: "
+msgstr "デバイスの削除に失敗しました: "
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:109
+msgid "Name:"
+msgstr "名前:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:141
+msgid "Status:"
+msgstr "ステータス:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:174
+msgid "UUID:"
+msgstr "UUID:"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:280
+msgid "Authorize and Connect"
+msgstr "認証と接続"
+
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:303
+msgid "Forget Device"
+msgstr "デバイスの削除"
+
+#: panels/thunderbolt/cc-bolt-device-entry.c:129
+msgctxt "Thunderbolt Device Status"
+msgid "Error"
+msgstr "エラー"
+
+#: panels/thunderbolt/cc-bolt-device-entry.c:140
+msgctxt "Thunderbolt Device Status"
+msgid "Authorized"
+msgstr "認証済み"
+
+#: panels/thunderbolt/cc-bolt-panel.c:175
+msgid ""
+"The Thunderbolt subsystem (boltd) is not installed or not set up properly."
+msgstr ""
+"Thunderbolt サブシステム (boltd) がインストールされていないか、正しくセット"
+"アップされていません。"
+
+#: panels/thunderbolt/cc-bolt-panel.c:460
+msgid ""
+"Thunderbolt could not be detected.\n"
+"Either the system lacks Thunderbolt support, it has been disabled in the "
+"BIOS or is set to an unsupported security level in the BIOS."
+msgstr ""
+
+#: panels/thunderbolt/cc-bolt-panel.c:504
+msgid "Thunderbolt support has been disabled in the BIOS."
+msgstr "Thunderbolt サポートは BIOS で無効化されています。"
+
+#: panels/thunderbolt/cc-bolt-panel.c:613
+#, c-format
+msgid "Error switching direct mode: %s"
+msgstr "ダイレクトモードの切り替え中にエラーが発生しました: %s"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:143
+msgid "No Thunderbolt support"
+msgstr "Thunderbolt サポートがありません"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:246
+msgid "Direct Access"
+msgstr "直接アクセス"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:269
+msgid "Allow direct access to devices such as docks and external GPUs."
+msgstr ""
+
+#: 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
+msgid "Pending Devices"
+msgstr "保留中のデバイス"
+
+#: panels/thunderbolt/cc-bolt-panel.ui:535
+msgid "No devices attached"
+msgstr "デバイスが接続されていません"
+
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:3
+msgid "Thunderbolt"
+msgstr "Thunderbolt"
+
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:4
+msgid "Manage Thunderbolt devices"
+msgstr "Thunderbolt デバイスの管理"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:7
+msgid "thunderbolt"
+msgstr "thunderbolt"
+
+#. Translators: those are keywords for the thunderbolt control-center panel. Do NOT translate or localize 
the semicolons! The list MUST also end with a semicolon!
+#: panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in:19
+msgid "Thunderbolt;"
+msgstr ""
+
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: ../panels/universal-access/cc-ua-panel.c:351
+#: panels/universal-access/cc-ua-panel.c:498
 msgctxt "cursor size"
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../panels/universal-access/cc-ua-panel.c:354
+#: panels/universal-access/cc-ua-panel.c:501
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "中"
 
-#: ../panels/universal-access/cc-ua-panel.c:357
+#: panels/universal-access/cc-ua-panel.c:504
 msgctxt "cursor size"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/cc-ua-panel.c:360
+#: panels/universal-access/cc-ua-panel.c:507
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "特大"
 
-#: ../panels/universal-access/cc-ua-panel.c:363
+#: panels/universal-access/cc-ua-panel.c:510
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "最大"
 
-#: ../panels/universal-access/cc-ua-panel.c:367
+#: panels/universal-access/cc-ua-panel.c:514
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d ピクセル"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Uni­ver­sal Access"
-msgstr "ユニバーサルアクセス"
-
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
-msgid "Make it easier to see, hear, type, point and click"
-msgstr ""
-"見る、聞く、タイピング、クリック操作など、コンピューターを簡単に使えるように"
-"します"
-
-#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-"キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大鏡;スクリーンリー"
-"ダー;テキスト;文字;フォント;サイズ;大きさ;固定;キー;スロー;バウンス;マウス;ダ"
-"ブルクリック;ディレイ;ユーザー支援;リピート;点滅;Universal;ユニバーサルアクセ"
-"ス;"
-
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/cc-ua-panel.ui:93
 msgid "_Always Show Universal Access Menu"
 msgstr "ユニバーサルアクセスメニューを常に表示する(_A)"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/cc-ua-panel.ui:135
 msgid "Seeing"
 msgstr "見る"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/cc-ua-panel.ui:181
 msgid "_High Contrast"
 msgstr "ハイコントラスト(_H)"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/cc-ua-panel.ui:228
 msgid "_Large Text"
 msgstr "大きな文字(_L)"
 
-#: ../panels/universal-access/uap.ui.h:5
+#: panels/universal-access/cc-ua-panel.ui:273
 msgid "C_ursor Size"
 msgstr "カーソルの大きさ(_U)"
 
-#: ../panels/universal-access/uap.ui.h:6
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/cc-ua-panel.ui:320
+#: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/cc-ua-panel.ui:366
 msgid "Screen _Reader"
 msgstr "スクリーンリーダー(_R)"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/cc-ua-panel.ui:412
+#: panels/universal-access/cc-ua-panel.ui:1243
 msgid "_Sound Keys"
 msgstr "切り替えキー(_S)"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/cc-ua-panel.ui:474
 msgid "Hearing"
 msgstr "聞く"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/universal-access/cc-ua-panel.ui:518
+#: panels/universal-access/cc-ua-panel.ui:1346
 msgid "_Visual Alerts"
 msgstr "視覚警告(_V)"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/cc-ua-panel.ui:626
 msgid "Screen _Keyboard"
 msgstr "スクリーンキーボード(_K)"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/cc-ua-panel.ui:671
 msgid "R_epeat Keys"
 msgstr "リピートキー(_E)"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/cc-ua-panel.ui:717
 msgid "Cursor _Blinking"
 msgstr "カーソルの点滅(_B)"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/cc-ua-panel.ui:763
 msgid "_Typing Assist (AccessX)"
 msgstr "タイピング支援 [AccessX](_T)"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/cc-ua-panel.ui:824
 msgid "Pointing & Clicking"
 msgstr "ポインター操作とクリック"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/cc-ua-panel.ui:870
 msgid "_Mouse Keys"
 msgstr "マウスキー(_M)"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/cc-ua-panel.ui:915
 msgid "_Click Assist"
 msgstr "クリック支援(_C)"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/cc-ua-panel.ui:961
 msgid "_Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔(_D)"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/cc-ua-panel.ui:981
 msgid "Double-Click Delay"
 msgstr "ダブルクリックと認識する間隔"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: panels/universal-access/cc-ua-panel.ui:1048
 msgid "Cursor Size"
 msgstr "カーソルの大きさ"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/cc-ua-panel.ui:1075
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "ズーム機能と組み合わせてカーソルの大きさを設定することでカーソルがより見やす"
 "くなります。"
 
-#: ../panels/universal-access/uap.ui.h:24
+#: panels/universal-access/cc-ua-panel.ui:1111
 msgid "Screen Reader"
 msgstr "スクリーンリーダー"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/cc-ua-panel.ui:1128
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr ""
 "スクリーンリーダーを有効にすると、フォーカスのある画面のテキストを音声で読み"
 "上げます。"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: panels/universal-access/cc-ua-panel.ui:1161
 msgid "_Screen Reader"
 msgstr "スクリーンリーダー(_S)"
 
@@ -5869,434 +6288,514 @@ msgstr "スクリーンリーダー(_S)"
 # 
「切り替えキー」もわかりやすいとは言いづらいが、Windows側の機能を知っているユーザーには類推できること、またWeb検索などで機能を特定しやすいこと、「サウンドキー」よりかは幾分ましであること、などを考慮し「切り替えキー」を採用する。
 # [1] http://windows.microsoft.com/en-us/Windows7/Make-the-keyboard-easier-to-use
 # [2] http://windows.microsoft.com/ja-JP/Windows7/Make-the-keyboard-easier-to-use
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/cc-ua-panel.ui:1200
 msgid "Sound Keys"
 msgstr "切り替えキー"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/cc-ua-panel.ui:1218
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Caps Lock と Num Lock のON/OFFが切り替わるとビープ音を鳴らします。"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: panels/universal-access/cc-ua-panel.ui:1288
 msgid "Visual Alerts"
 msgstr "視覚警告"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/cc-ua-panel.ui:1292
 msgid "_Test flash"
 msgstr "動作確認(_T)"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/cc-ua-panel.ui:1321
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "警告音が鳴った場合に視覚的に警告を表示します。"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: panels/universal-access/cc-ua-panel.ui:1372
 msgid "Flash the _window title"
 msgstr "ウィンドウのタイトルバーをひらめかせる(_W)"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: panels/universal-access/cc-ua-panel.ui:1390
 msgid "Flash the entire _screen"
 msgstr "画面全体をひらめかせる(_S)"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/cc-ua-panel.ui:1435
 msgid "Repeat Keys"
 msgstr "リピートキー"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/cc-ua-panel.ui:1465
 msgid "Key presses repeat when key is held down."
 msgstr "キーを長押しすると繰り返しキー入力を行う"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/cc-ua-panel.ui:1544
 msgid "Repeat keys delay"
 msgstr "リピートキーが行われるまでの時間です"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/cc-ua-panel.ui:1592
+#: panels/universal-access/cc-ua-panel.ui:1725
 msgid "Speed"
 msgstr "速度"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/cc-ua-panel.ui:1629
 msgid "Repeat keys speed"
 msgstr "押したキーをリピートする際の速さです"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/cc-ua-panel.ui:1653
 msgid "Cursor Blinking"
 msgstr "カーソルの点滅"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/cc-ua-panel.ui:1683
 msgid "Cursor blinks in text fields."
 msgstr "テキストフィールドでカーソルを点滅させる"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/cc-ua-panel.ui:1762
 msgid "Cursor blinking speed"
 msgstr "カーソルが点滅する速さです"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/cc-ua-panel.ui:1798
 msgid "Typing Assist"
 msgstr "タイピング支援"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/cc-ua-panel.ui:1837
 msgid "_Sticky Keys"
 msgstr "固定キー(_S)"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/cc-ua-panel.ui:1854
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr ""
 "修飾キーに続いてキーを押したらそのキーと修飾キーを同時に押したものと扱う"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: panels/universal-access/cc-ua-panel.ui:1878
 msgid "_Disable if two keys are pressed together"
 msgstr "同時に 2 つのキーを押したら無効にする(_D)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: panels/universal-access/cc-ua-panel.ui:1896
 msgid "Beep when a _modifier key is pressed"
 msgstr "修飾キーを押したらビープ音を鳴らす(_M)"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/cc-ua-panel.ui:1944
 msgid "S_low Keys"
 msgstr "スローキー(_L)"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/cc-ua-panel.ui:1961
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "キーを押下してから入力と認識されるまでに一定の間隔を設定する"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: panels/universal-access/cc-ua-panel.ui:1994
+#: panels/universal-access/cc-ua-panel.ui:2207
+#: panels/universal-access/cc-ua-panel.ui:2544
 msgid "A_cceptance delay:"
 msgstr "認識するまでの間隔(_C):"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/cc-ua-panel.ui:2016
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/cc-ua-panel.ui:2035
 msgid "Slow keys typing delay"
 msgstr "スローキーの入力間隔"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/cc-ua-panel.ui:2050
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/cc-ua-panel.ui:2077
 msgid "Beep when a key is pr_essed"
 msgstr "キーが押されたらビープ音を鳴らす(_E)"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/cc-ua-panel.ui:2094
 msgid "Beep when a key is _accepted"
 msgstr "キー入力が受け付けられたらビープ音を鳴らす(_A)"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/cc-ua-panel.ui:2111
+#: panels/universal-access/cc-ua-panel.ui:2290
 msgid "Beep when a key is _rejected"
 msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/cc-ua-panel.ui:2157
 msgid "_Bounce Keys"
 msgstr "バウンスキー(_B)"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/cc-ua-panel.ui:2174
 msgid "Ignores fast duplicate keypresses"
 msgstr "同じキーを繰り返し押した場合は無視する"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/cc-ua-panel.ui:2229
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/cc-ua-panel.ui:2248
 msgid "Bounce keys typing delay"
 msgstr "バウンスキーの入力間隔"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/cc-ua-panel.ui:2263
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/cc-ua-panel.ui:2376
 msgid "_Enable by Keyboard"
 msgstr "キーボードから有効化できるようにする(_E)"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/cc-ua-panel.ui:2393
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: panels/universal-access/cc-ua-panel.ui:2457
 msgid "Click Assist"
 msgstr "クリック支援"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/cc-ua-panel.ui:2493
 msgid "_Simulated Secondary Click"
 msgstr "副ボタンのクリックの代替(_S)"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/cc-ua-panel.ui:2511
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: panels/universal-access/cc-ua-panel.ui:2565
 msgctxt "secondary click"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/cc-ua-panel.ui:2584
 msgid "Secondary click delay"
 msgstr "副ボタンのクリックの間隔"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/cc-ua-panel.ui:2599
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "長い"
 
 # See also ja.po of mousetweak
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/cc-ua-panel.ui:2656
 msgid "_Hover Click"
 msgstr "ホバークリック(_H)"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/cc-ua-panel.ui:2674
 msgid "Trigger a click when the pointer hovers"
 msgstr "ポインターの移動を停止したらクリック動作を行う"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/cc-ua-panel.ui:2707
 msgid "D_elay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/cc-ua-panel.ui:2729
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/cc-ua-panel.ui:2760
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: panels/universal-access/cc-ua-panel.ui:2796
 msgid "Motion _threshold:"
 msgstr "ジェスチャーのしきい値(_T):"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: panels/universal-access/cc-ua-panel.ui:2818
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "小"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: panels/universal-access/cc-ua-panel.ui:2849
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "大"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+msgid "Make it easier to see, hear, type, point and click"
+msgstr ""
+"見る、聞く、タイピング、クリック操作など、コンピューターを簡単に使えるように"
+"します"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr ""
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
+"キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大鏡;スクリーンリー"
+"ダー;テキスト;文字;フォント;サイズ;大きさ;固定;キー;スロー;バウンス;マウス;ダ"
+"ブルクリック;ディレイ;ユーザー支援;リピート;点滅;Universal;ユニバーサルアクセ"
+"ス;"
+
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Short"
 msgstr "短い"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "画面の¼"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "画面の½"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "画面の¾"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:338
 msgctxt "Distance"
 msgid "Long"
 msgstr "長い"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "フルスクリーン"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "上半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "下半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "左半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "右半分"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:78
 msgid "Zoom Options"
 msgstr "ズームオプション"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:188
 msgid "_Magnification:"
 msgstr "拡大率(_M):"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:252
 msgid "_Follow mouse cursor"
 msgstr "マウスカーソルの動きを追う(_F)"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:272
 msgid "_Screen part:"
 msgstr "拡大部分(_S):"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:334
 msgid "Magnifier _extends outside of screen"
 msgstr "画面の外側も表示する(_E)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:353
 msgid "_Keep magnifier cursor centered"
 msgstr "カーソルを画面中央にキープする(中央)(_K)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:372
 msgid "Magnifier cursor _pushes contents around"
 msgstr "拡大領域を押し出すように移動する(プッシュ)(_P)"
 
 # 旧来のユーザーのために旧Orcaでの名称を括弧内に併記
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:391
 msgid "Magnifier cursor moves with _contents"
 msgstr "カーソルの動きに拡大領域を移動する (プロポーショナル)(_C)"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:425
 msgid "Magnifier Position:"
 msgstr "拡大領域の位置:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:446
 msgid "Magnifier"
 msgstr "拡大鏡"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:493
 msgid "_Thickness:"
 msgstr "太さ(_T):"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:519
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "細い"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:551
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "太い"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:577
 msgid "_Length:"
 msgstr "長さ(_L):"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:629
 msgid "Co_lor:"
 msgstr "色(_L):"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:693
 msgid "_Crosshairs:"
 msgstr "照準線(_C):"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:744
 msgid "_Overlaps mouse cursor"
 msgstr "マウスカーソルに重ねる(_O)"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:782
 msgid "Crosshairs"
 msgstr "照準線"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:831
 msgid "_White on black:"
 msgstr "反転(_W):"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:854
 msgid "_Brightness:"
 msgstr "明るさ(_B):"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:878
 msgid "_Contrast:"
 msgstr "コントラスト(_C):"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:901
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "色(_L)"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:929
 msgctxt "universal access, color"
 msgid "None"
 msgstr "白黒"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:961
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "カラー"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1027
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "暗い"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1060
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "明るい"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1091
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低い"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1124
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高い"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1160
 msgid "Color Effects:"
 msgstr "色の設定:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1185
 msgid "Color Effects"
 msgstr "色の設定"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/cc-add-user-dialog.c:34
+msgid "Should match the web address of your login provider."
+msgstr "ログイン提供者のウェブアドレスと一致させる必要があります。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:204
+msgid "Failed to add account"
+msgstr "アカウントの追加に失敗しました"
+
+#: panels/user-accounts/cc-add-user-dialog.c:652
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "パスワードが一致しません。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:874
+#: panels/user-accounts/cc-add-user-dialog.c:920
+#: panels/user-accounts/cc-add-user-dialog.c:941
+msgid "Failed to register account"
+msgstr "アカウントの登録に失敗しました"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1064
+msgid "No supported way to authenticate with this domain"
+msgstr "このドメインで認証を行う方法はサポートされていません"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1137
+msgid "Failed to join domain"
+msgstr "ドメインの参加に失敗しました"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1198
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"ログイン名に問題がありました。\n"
+"やり直してください。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1205
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"パスワードに問題がありました。\n"
+"やり直してください。"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1213
+msgid "Failed to log into domain"
+msgstr "ドメインへのログインに失敗しました"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1271
+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
 msgid "Add User"
 msgstr "ユーザーの追加"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: panels/user-accounts/cc-add-user-dialog.ui:179
 msgid "_Full Name"
 msgstr "フルネーム(_F)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/cc-add-user-dialog.ui:205
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Standard"
 msgstr "標準"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: panels/user-accounts/cc-add-user-dialog.ui:215
+#: panels/user-accounts/cc-user-panel.ui:161
 msgid "Administrator"
 msgstr "管理者"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: panels/user-accounts/cc-add-user-dialog.ui:231
+#: panels/user-accounts/cc-user-panel.ui:179
 msgid "Account _Type"
 msgstr "アカウントの種類(_T)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/cc-add-user-dialog.ui:268
 msgid "Allow user to set a password when they next _login"
 msgstr "次回ログイン時にユーザー自身でパスワードを設定させる(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: panels/user-accounts/cc-add-user-dialog.ui:282
 msgid "Set a password _now"
 msgstr "いまパスワードを設定する(_N)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/cc-add-user-dialog.ui:404
 msgid "_Confirm"
 msgstr "確認(_C)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/cc-add-user-dialog.ui:484
+#: panels/user-accounts/cc-add-user-dialog.ui:691
 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 "
@@ -6306,266 +6805,518 @@ msgstr ""
 "バイスで使用できます。このアカウントを使用して、インターネット上の企業内の各"
 "種リソースにアクセスすることができます。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/cc-add-user-dialog.ui:506
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/cc-add-user-dialog.ui:731
 msgid "You are Offline"
 msgstr "現在オフラインです"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/cc-add-user-dialog.ui:750
 msgid "You must be online in order to add enterprise users."
 msgstr ""
 "エンタープライズユーザーを追加するには、システムをオンラインにする必要があり"
 "ます。"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: panels/user-accounts/cc-add-user-dialog.ui:781
 msgid "_Enterprise Login"
 msgstr "エンタープライズのログイン(_E)"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
-msgid "Left thumb"
-msgstr "左の親指"
+#: panels/user-accounts/cc-avatar-chooser.c:269
+msgid "Browse for more pictures"
+msgstr "他の画像も参照"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
-msgid "Left middle finger"
-msgstr "左の中指"
+#: panels/user-accounts/cc-avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "写真を撮る…"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
-msgid "Left ring finger"
-msgstr "左の薬指"
+#: panels/user-accounts/cc-avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "ファイルの選択…"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
-msgid "Left little finger"
-msgstr "左の小指"
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "今週"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
-msgid "Right thumb"
-msgstr "右の親指"
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "先週"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
-msgid "Right middle finger"
-msgstr "右の中指"
+#. Translators: This is a date format string in the style of "Feb 18",
+#. 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
+msgctxt "login history week label"
+msgid "%b %e"
+msgstr "%m月%d日"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
-msgid "Right ring finger"
-msgstr "右の薬指"
+#. 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
+msgctxt "login history week label"
+msgid "%b %e, %Y"
+msgstr "%Y年%m月%d日"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
-msgid "Right little finger"
-msgstr "右の小指"
+#. 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
+#, c-format
+msgctxt "login history week label"
+msgid "%s — %s"
+msgstr "%s — %s"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:680
-msgid "Enable Fingerprint Login"
-msgstr "指紋認証を有効にする"
+#. 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:766
+msgctxt "login date-time"
+msgid "%k:%M"
+msgstr "%H:%M"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
-msgid "_Right index finger"
-msgstr "右の人差し指(_R)"
+#. 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:770
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s %s"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
-msgid "_Left index finger"
-msgstr "左の人差し指(_L)"
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "セッション終了"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
-msgid "_Other finger:"
-msgstr "別の指(_O):"
+#: panels/user-accounts/cc-login-history-dialog.c:249
+msgid "Session Started"
+msgstr "セッション開始"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
-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
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — アカウントのアクティビティ"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "Users"
-msgstr "ユーザー"
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "別のパスワードを選択してください。"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users and change your password"
-msgstr "ユーザーの追加と削除、パスワードの変更を行います"
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "現在のパスワードを再度入力してください。"
 
-#. Translators: those are keywords for the user accounts control-center panel
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
-msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr ""
-"Login;Name;Fingerprint;Avatar;Logo;Face;Password;ログイン;名前;指紋;アバター;"
-"ロゴ;顔;パスワード;Users;ユーザー;"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
-msgid "_Enroll"
-msgstr "登録(_E)"
-
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
-msgid "Domain Administrator Login"
-msgstr "ドメイン管理者のログイン"
-
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"エンタープライズのログインを使用するには、 このコンピューターを\n"
-"ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
-"パスワード入力を行ってもらってください。"
-
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
-msgid "Administrator _Name"
-msgstr "管理者名(_N)"
-
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
-msgid "Administrator Password"
-msgstr "管理者のパスワード"
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "パスワードが変更できません"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#: panels/user-accounts/cc-password-dialog.ui:7
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: panels/user-accounts/cc-password-dialog.ui:37
 msgid "Ch_ange"
 msgstr "変更(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
-msgid "_Verify New Password"
-msgstr "新しいパスワードの確認(_V)"
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "新しいパスワードの確認(_C)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: panels/user-accounts/cc-password-dialog.ui:162
 msgid "_New Password"
 msgstr "新しいパスワード(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
+#: panels/user-accounts/cc-password-dialog.ui:216
 msgid "Current _Password"
 msgstr "現在のパスワード(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: panels/user-accounts/cc-password-dialog.ui:254
 msgid "Allow user to change their password on next login"
 msgstr "次回ログイン時にユーザー自身でパスワードを設定させる"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
+#: panels/user-accounts/cc-password-dialog.ui:267
 msgid "Set a password now"
 msgstr "いまパスワードを設定する"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "このタイプのドメインは自動で参加できません"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "そのようなドメインやレルムは見つかりませんでした"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "%2$s ドメインに %1$s としてログインできません"
+
+#: panels/user-accounts/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "無効なパスワードです、やり直してください"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "%sドメインに接続できませんでした: %s"
+
+#: panels/user-accounts/cc-user-panel.c:212
+msgid "Your account"
+msgstr "あなたのアカウント"
+
+#: panels/user-accounts/cc-user-panel.c:384
+msgid "Failed to delete user"
+msgstr "ユーザーの削除に失敗しました"
+
+#: panels/user-accounts/cc-user-panel.c:442
+#: panels/user-accounts/cc-user-panel.c:501
+#: panels/user-accounts/cc-user-panel.c:553
+msgid "Failed to revoke remotely managed user"
+msgstr "リモート管理ユーザーの削除に失敗しました"
+
+#: panels/user-accounts/cc-user-panel.c:605
+msgid "You cannot delete your own account."
+msgstr "自分自身のアカウントは削除できません。"
+
+#: panels/user-accounts/cc-user-panel.c:614
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s はまだログインしています"
+
+#: panels/user-accounts/cc-user-panel.c:618
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr ""
+"ログイン中のユーザーを削除すると、システムが不整合な状態になることがありま"
+"す。"
+
+#: panels/user-accounts/cc-user-panel.c:627
+#, c-format
+msgid "Do you want to keep %s’s files?"
+msgstr "%s のファイルを残しますか?"
+
+#: panels/user-accounts/cc-user-panel.c:631
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+msgstr ""
+"ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールス"
+"プールおよび一時ファイルを残しておくことができます。"
+
+#: panels/user-accounts/cc-user-panel.c:634
+msgid "_Delete Files"
+msgstr "ファイルを削除(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:635
+msgid "_Keep Files"
+msgstr "ファイルを残す(_K)"
+
+#: panels/user-accounts/cc-user-panel.c:649
+#, c-format
+msgid "Are you sure you want to revoke remotely managed %s’s account?"
+msgstr "リモート管理の %s のアカウントを削除してもよろしいですか?"
+
+#: panels/user-accounts/cc-user-panel.c:653
+msgid "_Delete"
+msgstr "削除(_D)"
+
+#: panels/user-accounts/cc-user-panel.c:703
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "無効アカウント"
+
+#: panels/user-accounts/cc-user-panel.c:711
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "次のログイン時に設定"
+
+#: panels/user-accounts/cc-user-panel.c:714
+msgctxt "Password mode"
+msgid "None"
+msgstr "なし"
+
+#: panels/user-accounts/cc-user-panel.c:759
+msgid "Logged in"
+msgstr "ログイン中"
+
+#: panels/user-accounts/cc-user-panel.c:1089
+msgid "Failed to contact the accounts service"
+msgstr "アカウントサービスの接続に失敗しました"
+
+#: panels/user-accounts/cc-user-panel.c:1091
+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:1123
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr "変更するには、まず * アイコンをクリックしてください"
+
+#: panels/user-accounts/cc-user-panel.c:1196
+msgid "Create a user account"
+msgstr "ユーザーアカウントを作成します"
+
+#: panels/user-accounts/cc-user-panel.c:1207
+#: panels/user-accounts/cc-user-panel.c:1335
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"ユーザーアカウントを作成するには、\n"
+"まず * アイコンをクリックしてください"
+
+#: panels/user-accounts/cc-user-panel.c:1216
+msgid "Delete the selected user account"
+msgstr "選択したユーザーアカウントを削除します"
+
+#: panels/user-accounts/cc-user-panel.c:1228
+#: panels/user-accounts/cc-user-panel.c:1339
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"選択したユーザーアカウントを削除するには、\n"
+"まず * アイコンをクリックしてください"
+
+#: panels/user-accounts/cc-user-panel.ui:18
 msgid "_Add User…"
 msgstr "ユーザーの追加(_A)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#: panels/user-accounts/cc-user-panel.ui:70
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "変更内容を反映させるにはログインしなおす必要があります"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
+#: panels/user-accounts/cc-user-panel.ui:78
 msgid "Restart Now"
 msgstr "ログアウト"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: panels/user-accounts/cc-user-panel.ui:253
 msgid "A_utomatic Login"
 msgstr "自動ログイン(_U)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: panels/user-accounts/cc-user-panel.ui:295
 msgid "_Fingerprint Login"
 msgstr "指紋認証ログイン(_F)"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: panels/user-accounts/cc-user-panel.ui:321
+#: panels/user-accounts/cc-user-panel.ui:334
 msgid "User Icon"
 msgstr "ユーザーアイコン"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: panels/user-accounts/cc-user-panel.ui:398
 msgid "Last Login"
 msgstr "最終ログイン"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: panels/user-accounts/cc-user-panel.ui:447
 msgid "Remove User…"
 msgstr "ユーザーの削除…"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#. 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:480
+msgid "No Users Found"
+msgstr "ユーザーが見つかりません"
+
+#: panels/user-accounts/cc-user-panel.ui:490
+msgid "Unlock to add a user account."
+msgstr "ユーザーアカウントをアンロックします。"
+
+#: panels/user-accounts/data/account-fingerprint.ui:12
+msgid "Left thumb"
+msgstr "左の親指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:15
+msgid "Left middle finger"
+msgstr "左の中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:18
+msgid "Left ring finger"
+msgstr "左の薬指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:21
+msgid "Left little finger"
+msgstr "左の小指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:24
+msgid "Right thumb"
+msgstr "右の親指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:27
+msgid "Right middle finger"
+msgstr "右の中指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:30
+msgid "Right ring finger"
+msgstr "右の薬指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:33
+msgid "Right little finger"
+msgstr "右の小指"
+
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:677
+msgid "Enable Fingerprint Login"
+msgstr "指紋認証を有効にする"
+
+#: panels/user-accounts/data/account-fingerprint.ui:89
+msgid "_Right index finger"
+msgstr "右の人差し指(_R)"
+
+#: panels/user-accounts/data/account-fingerprint.ui:105
+msgid "_Left index finger"
+msgstr "左の人差し指(_L)"
+
+#: panels/user-accounts/data/account-fingerprint.ui:126
+msgid "_Other finger:"
+msgstr "別の指(_O):"
+
+#: panels/user-accounts/data/account-fingerprint.ui:262
+msgid ""
+"Your fingerprint was successfully saved. You should now be able to log in "
+"using your fingerprint reader."
+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 "ユーザーの追加と削除、パスワードの変更を行います"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:7
+msgid "system-users"
+msgstr ""
+
+#. Translators: Search terms to find the Users panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:20
+msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
+msgstr ""
+"Login;Name;Fingerprint;Avatar;Logo;Face;Password;ログイン;名前;指紋;アバター;"
+"ロゴ;顔;パスワード;Users;ユーザー;"
+
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: panels/user-accounts/data/join-dialog.ui:39
+msgid "_Enroll"
+msgstr "登録(_E)"
+
+#: panels/user-accounts/data/join-dialog.ui:75
+msgid "Domain Administrator Login"
+msgstr "ドメイン管理者のログイン"
+
+#: panels/user-accounts/data/join-dialog.ui:93
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"エンタープライズのログインを使用するには、 このコンピューターを\n"
+"ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
+"パスワード入力を行ってもらってください。"
+
+#: panels/user-accounts/data/join-dialog.ui:150
+msgid "Administrator _Name"
+msgstr "管理者名(_N)"
+
+#: panels/user-accounts/data/join-dialog.ui:185
+msgid "Administrator Password"
+msgstr "管理者のパスワード"
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "ユーザーアカウントの管理"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 msgid "Authentication is required to change user data"
 msgstr "ユーザーのデータを変更するには認証が必要になります"
 
-#: ../panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:94
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr ""
 "新しいパスワードは、現在のパスワードとは異なるものを指定する必要があります。"
 
-#: ../panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "いくつかの文字や数字を変更してください。"
 
-#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr ""
 "新しいパスワードが現在のものと似すぎています。もう少し異なるものを使用してく"
 "ださい。"
 
-#: ../panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "パスワードからユーザー名を取り除くともっと強くなるでしょう。"
 
-#: ../panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "パスワード中にユーザーの氏名を使うのは避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "パスワードにある一部の単語を使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "一般的な単語は避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "既存の単語の文字を並べ替えたものは使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "数字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "大文字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "小文字をもっと使うようにください。"
 
-#: ../panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "記号など特殊文字をもっと使うようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "アルファベット、数字、記号を混在させるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "同じ文字を連続して使わないようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6574,12 +7325,12 @@ msgstr ""
 "同じ種類の文字を繰り返しは避けるようにしてください。アルファベット、数字、記"
 "号を混ぜてください。"
 
-#: ../panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "1234 や abcd などの連続した並びは避けるようにしてください。"
 
-#: ../panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6588,475 +7339,81 @@ msgstr ""
 "パスワードが短すぎます。アルファベット、数字、記号をもっと追加するようにして"
 "ください。"
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
-msgstr "大文字、小文字を混在させ、さらに数字を 1 つか 2 つは使用してください。"
-
-#: ../panels/user-accounts/pw-utils.c:119
-msgctxt "Password hint"
-msgid ""
-"Adding more letters, numbers and punctuation will make the password stronger."
-msgstr "さらに文字や数字、記号を追加するともっと強くなります。"
-
-#: ../panels/user-accounts/run-passwd.c:422
-msgid "Authentication failed"
-msgstr "認証に失敗しました"
-
-#: ../panels/user-accounts/run-passwd.c:502
-#, c-format
-msgid "The new password is too short"
-msgstr "新しいパスワードは短すぎます"
-
-#: ../panels/user-accounts/run-passwd.c:508
-#, c-format
-msgid "The new password is too simple"
-msgstr "新しいパスワードは単純すぎます"
-
-#: ../panels/user-accounts/run-passwd.c:514
-#, c-format
-msgid "The old and new passwords are too similar"
-msgstr "新旧のパスワードが酷似しています"
-
-#: ../panels/user-accounts/run-passwd.c:517
-#, c-format
-msgid "The new password has already been used recently."
-msgstr "新しいパスワードは最近使用したものです。"
-
-#: ../panels/user-accounts/run-passwd.c:520
-#, c-format
-msgid "The new password must contain numeric or special characters"
-msgstr "新しいパスワードには数字または特殊文字を含めてください"
-
-#: ../panels/user-accounts/run-passwd.c:524
-#, c-format
-msgid "The old and new passwords are the same"
-msgstr "新旧のパスワードが同じです"
-
-#: ../panels/user-accounts/run-passwd.c:528
-#, c-format
-msgid "Your password has been changed since you initially authenticated!"
-msgstr "最初に認証を行った以降にパスワードが変更されています!"
-
-#: ../panels/user-accounts/run-passwd.c:532
-#, c-format
-msgid "The new password does not contain enough different characters"
-msgstr "新しいパスワードには十分な種類の文字が含まれていません"
-
-#: ../panels/user-accounts/run-passwd.c:536
-#, c-format
-msgid "Unknown error"
-msgstr "原因不明のエラー"
-
-#: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your login provider."
-msgstr "ログイン提供者のウェブアドレスと一致させる必要があります。"
-
-#: ../panels/user-accounts/um-account-dialog.c:229
-msgid "Failed to add account"
-msgstr "アカウントの追加に失敗しました"
-
-#: ../panels/user-accounts/um-account-dialog.c:462
-msgid "Passwords do not match."
-msgstr "パスワードが一致しません。"
-
-#: ../panels/user-accounts/um-account-dialog.c:717
-#: ../panels/user-accounts/um-account-dialog.c:763
-#: ../panels/user-accounts/um-account-dialog.c:784
-msgid "Failed to register account"
-msgstr "アカウントの登録に失敗しました"
-
-#: ../panels/user-accounts/um-account-dialog.c:907
-msgid "No supported way to authenticate with this domain"
-msgstr "このドメインで認証を行う方法はサポートされていません"
-
-#: ../panels/user-accounts/um-account-dialog.c:980
-msgid "Failed to join domain"
-msgstr "ドメインの参加に失敗しました"
-
-#: ../panels/user-accounts/um-account-dialog.c:1041
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr ""
-"ログイン名に問題がありました。\n"
-"やり直してください。"
-
-#: ../panels/user-accounts/um-account-dialog.c:1048
-msgid ""
-"That login password didn’t work.\n"
-"Please try again."
-msgstr ""
-"パスワードに問題がありました。\n"
-"やり直してください。"
-
-#: ../panels/user-accounts/um-account-dialog.c:1056
-msgid "Failed to log into domain"
-msgstr "ドメインへのログインに失敗しました"
-
-#: ../panels/user-accounts/um-account-dialog.c:1114
-msgid "Unable to find the domain. Maybe you misspelled it?"
-msgstr "ドメインを見つけられません。スペルミスがないか確認してください。"
-
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "標準"
-
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "管理者"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr ""
-"デバイスへのアクセスが許可されていません。システム管理者に連絡してください。"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:144
-msgid "The device is already in use."
-msgstr "そのデバイスは使用中です。"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:146
-msgid "An internal error occurred."
-msgstr "システム内部のエラーが発生しました。"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:217
-msgid "Enabled"
-msgstr "有効"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
-msgid "Delete registered fingerprints?"
-msgstr "登録した指紋情報を削除しますか?"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
-msgid "_Delete Fingerprints"
-msgstr "削除する(_D)"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
-msgid "Done!"
-msgstr "完了です!"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
-#, c-format
-msgid "Could not access “%s” device"
-msgstr "“%s” というデバイスにアクセスできません"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:587
-#, c-format
-msgid "Could not start finger capture on “%s” device"
-msgstr "“%s” デバイスで指紋を読み取れませんでした"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:631
-msgid "Could not access any fingerprint readers"
-msgstr "指紋リーダーにアクセスできませんでした"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:632
-msgid "Please contact your system administrator for help."
-msgstr "システム管理者に連絡してください。"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
-#. * 'Digital Persona U.are.U 4000/4000B' device."
-#.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:714
-#, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-msgstr ""
-"指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要がありま"
-"す。"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:721
-msgid "Selecting finger"
-msgstr "指の選択"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:722
-msgid "Enrolling fingerprints"
-msgstr "指紋の登録"
-
-#: ../panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "今週"
-
-#: ../panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "先週"
-
-#. Translators: This is a date format string in the style of "Feb 18",
-#. 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/um-history-dialog.c:79
-#: ../panels/user-accounts/um-history-dialog.c:83
-msgctxt "login history week label"
-msgid "%b %e"
-msgstr "%m月%d日"
-
-#. 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/um-history-dialog.c:88
-msgctxt "login history week label"
-msgid "%b %e, %Y"
-msgstr "%Y年%m月%d日"
-
-#. 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/um-history-dialog.c:93
-#, c-format
-msgctxt "login history week label"
-msgid "%s — %s"
-msgstr "%s — %s"
-
-#. Translators: This is a time format string in the style of "22:58".
-#. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:177
-#: ../panels/user-accounts/um-user-panel.c:776
-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/um-history-dialog.c:180
-#: ../panels/user-accounts/um-user-panel.c:780
-#, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s %s"
-
-#: ../panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "セッション終了"
-
-#: ../panels/user-accounts/um-history-dialog.c:256
-msgid "Session Started"
-msgstr "セッション開始"
-
-#. Translators: This is the title of the "Account Activity" dialog.
-#. The %s is the user real name.
-#: ../panels/user-accounts/um-history-dialog.c:299
-#, c-format
-msgid "%s — Account Activity"
-msgstr "%s — アカウントのアクティビティ"
-
-#: ../panels/user-accounts/um-password-dialog.c:144
-msgid "Please choose another password."
-msgstr "別のパスワードを選択してください。"
-
-#: ../panels/user-accounts/um-password-dialog.c:153
-msgid "Please type your current password again."
-msgstr "現在のパスワードを再度入力してください。"
-
-#: ../panels/user-accounts/um-password-dialog.c:159
-msgid "Password could not be changed"
-msgstr "パスワードが変更できません"
-
-#: ../panels/user-accounts/um-password-dialog.c:285
-msgid "The passwords do not match."
-msgstr "パスワードが一致しません。"
-
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "他の画像も参照"
-
-#: ../panels/user-accounts/um-photo-dialog.c:452
-msgid "Disable image"
-msgstr "画像を無効にする"
-
-#: ../panels/user-accounts/um-photo-dialog.c:470
-msgid "Take a photo…"
-msgstr "写真を撮る…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:488
-msgid "Browse for more pictures…"
-msgstr "他の画像も参照…"
-
-#: ../panels/user-accounts/um-photo-dialog.c:714
-#, c-format
-msgid "Used by %s"
-msgstr "%s に使用されています"
-
-#: ../panels/user-accounts/um-realm-manager.c:350
-msgid "Cannot automatically join this type of domain"
-msgstr "このタイプのドメインは自動で参加できません"
-
-#: ../panels/user-accounts/um-realm-manager.c:413
-#, c-format
-msgid "No such domain or realm found"
-msgstr "そのようなドメインやレルムは見つかりませんでした"
-
-#: ../panels/user-accounts/um-realm-manager.c:815
-#: ../panels/user-accounts/um-realm-manager.c:829
-#, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "%2$s ドメインに %1$s としてログインできません"
-
-#: ../panels/user-accounts/um-realm-manager.c:821
-msgid "Invalid password, please try again"
-msgstr "無効なパスワードです、やり直してください"
-
-#: ../panels/user-accounts/um-realm-manager.c:834
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "%sドメインに接続できませんでした: %s"
-
-#: ../panels/user-accounts/um-user-panel.c:195
-msgid "Your account"
-msgstr "あなたのアカウント"
-
-#: ../panels/user-accounts/um-user-panel.c:390
-msgid "Failed to delete user"
-msgstr "ユーザーの削除に失敗しました"
-
-#: ../panels/user-accounts/um-user-panel.c:448
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:559
-msgid "Failed to revoke remotely managed user"
-msgstr "リモート管理ユーザーの削除に失敗しました"
-
-#: ../panels/user-accounts/um-user-panel.c:613
-msgid "You cannot delete your own account."
-msgstr "自分自身のアカウントは削除できません。"
-
-#: ../panels/user-accounts/um-user-panel.c:622
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s はまだログインしています"
-
-#: ../panels/user-accounts/um-user-panel.c:626
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr ""
-"ログイン中のユーザーを削除すると、システムが不整合な状態になることがありま"
-"す。"
-
-#: ../panels/user-accounts/um-user-panel.c:635
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "%s のファイルを残しますか?"
-
-#: ../panels/user-accounts/um-user-panel.c:639
-msgid ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-msgstr ""
-"ユーザーアカウントを削除するときに、ユーザーのホームディレクトリ、メールス"
-"プールおよび一時ファイルを残しておくことができます。"
-
-#: ../panels/user-accounts/um-user-panel.c:642
-msgid "_Delete Files"
-msgstr "ファイルを削除(_D)"
-
-#: ../panels/user-accounts/um-user-panel.c:643
-msgid "_Keep Files"
-msgstr "ファイルを残す(_K)"
-
-#: ../panels/user-accounts/um-user-panel.c:657
-#, c-format
-msgid "Are you sure you want to revoke remotely managed %s’s account?"
-msgstr "リモート管理の %s のアカウントを削除してもよろしいですか?"
-
-#: ../panels/user-accounts/um-user-panel.c:661
-msgid "_Delete"
-msgstr "削除(_D)"
+msgstr "大文字、小文字を混在させ、さらに数字を 1 つか 2 つは使用してください。"
 
-#: ../panels/user-accounts/um-user-panel.c:711
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "無効アカウント"
+#: panels/user-accounts/pw-utils.c:132
+msgctxt "Password hint"
+msgid ""
+"Adding more letters, numbers and punctuation will make the password stronger."
+msgstr "さらに文字や数字、記号を追加するともっと強くなります。"
 
-#: ../panels/user-accounts/um-user-panel.c:719
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "次のログイン時に設定"
+#: panels/user-accounts/run-passwd.c:422
+msgid "Authentication failed"
+msgstr "認証に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:722
-msgctxt "Password mode"
-msgid "None"
-msgstr "なし"
+#: panels/user-accounts/run-passwd.c:502
+#, c-format
+msgid "The new password is too short"
+msgstr "新しいパスワードは短すぎます"
 
-#: ../panels/user-accounts/um-user-panel.c:769
-msgid "Logged in"
-msgstr "ログイン中"
+#: panels/user-accounts/run-passwd.c:508
+#, c-format
+msgid "The new password is too simple"
+msgstr "新しいパスワードは単純すぎます"
 
-#: ../panels/user-accounts/um-user-panel.c:1117
-msgid "Failed to contact the accounts service"
-msgstr "アカウントサービスの接続に失敗しました"
+#: panels/user-accounts/run-passwd.c:514
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "新旧のパスワードが酷似しています"
 
-#: ../panels/user-accounts/um-user-panel.c:1119
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr ""
-"AccountService がインストールされ、有効になっているか確認してください。"
+#: panels/user-accounts/run-passwd.c:517
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "新しいパスワードは最近使用したものです。"
 
-#. 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/um-user-panel.c:1155
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr "変更するには、まず * アイコンをクリックしてください"
+#: panels/user-accounts/run-passwd.c:520
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr "新しいパスワードには数字または特殊文字を含めてください"
 
-#: ../panels/user-accounts/um-user-panel.c:1195
-msgid "Create a user account"
-msgstr "ユーザーアカウントを作成します"
+#: panels/user-accounts/run-passwd.c:524
+#, c-format
+msgid "The old and new passwords are the same"
+msgstr "新旧のパスワードが同じです"
 
-#: ../panels/user-accounts/um-user-panel.c:1206
-#: ../panels/user-accounts/um-user-panel.c:1385
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"ユーザーアカウントを作成するには、\n"
-"まず * アイコンをクリックしてください"
+#: panels/user-accounts/run-passwd.c:528
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr "最初に認証を行った以降にパスワードが変更されています!"
 
-#: ../panels/user-accounts/um-user-panel.c:1216
-msgid "Delete the selected user account"
-msgstr "選択したユーザーアカウントを削除します"
+#: panels/user-accounts/run-passwd.c:532
+#, c-format
+msgid "The new password does not contain enough different characters"
+msgstr "新しいパスワードには十分な種類の文字が含まれていません"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
-#: ../panels/user-accounts/um-user-panel.c:1390
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"選択したユーザーアカウントを削除するには、\n"
-"まず * アイコンをクリックしてください"
+#: panels/user-accounts/run-passwd.c:536
+#, c-format
+msgid "Unknown error"
+msgstr "原因不明のエラー"
 
-#: ../panels/user-accounts/um-utils.c:507
+#: panels/user-accounts/user-utils.c:426
 msgid "Sorry, that user name isn’t available. Please try another."
 msgstr ""
 "申し訳ありませんが、そのユーザー名は使用できません。 もう一度お試しください。"
 
-#: ../panels/user-accounts/um-utils.c:510
+#: panels/user-accounts/user-utils.c:429
 #, c-format
 msgid "The username is too long."
 msgstr "ユーザー名が長すぎます。"
 
-#: ../panels/user-accounts/um-utils.c:513
+#: panels/user-accounts/user-utils.c:432
 msgid "The username cannot start with a “-”."
 msgstr "ユーザー名の先頭文字に “-” は使えません。"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: panels/user-accounts/user-utils.c:435
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -7064,25 +7421,108 @@ msgstr ""
 "ユーザー名には次の文字だけを使用してください。a から z の大文字・小文字、数"
 "字、'.'、'-'、および '_'。"
 
-#: ../panels/user-accounts/um-utils.c:520
+#: panels/user-accounts/user-utils.c:439
 msgid "This will be used to name your home folder and can’t be changed."
 msgstr ""
 "ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
 
-#: ../panels/wacom/button-mapping.ui.h:1
+#: panels/user-accounts/um-fingerprint-dialog.c:139
+msgid ""
+"You are not allowed to access the device. Contact your system administrator."
+msgstr ""
+"デバイスへのアクセスが許可されていません。システム管理者に連絡してください。"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:141
+msgid "The device is already in use."
+msgstr "そのデバイスは使用中です。"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:143
+msgid "An internal error occurred."
+msgstr "システム内部のエラーが発生しました。"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:214
+msgid "Enabled"
+msgstr "有効"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:260
+msgid "Delete registered fingerprints?"
+msgstr "登録した指紋情報を削除しますか?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:264
+msgid "_Delete Fingerprints"
+msgstr "削除する(_D)"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:270
+msgid ""
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:440
+msgid "Done!"
+msgstr "完了です!"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
+#, c-format
+msgid "Could not access “%s” device"
+msgstr "“%s” というデバイスにアクセスできません"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:584
+#, c-format
+msgid "Could not start finger capture on “%s” device"
+msgstr "“%s” デバイスで指紋を読み取れませんでした"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:628
+msgid "Could not access any fingerprint readers"
+msgstr "指紋リーダーにアクセスできませんでした"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:629
+msgid "Please contact your system administrator for help."
+msgstr "システム管理者に連絡してください。"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
+#. * 'Digital Persona U.are.U 4000/4000B' device."
+#.
+#: panels/user-accounts/um-fingerprint-dialog.c:711
+#, c-format
+msgid ""
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the “%s” device."
+msgstr ""
+"指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要がありま"
+"す。"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:718
+msgid "Selecting finger"
+msgstr "指の選択"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:719
+msgid "Enrolling fingerprints"
+msgstr "指紋の登録"
+
+#: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "ボタン割り当て"
 
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: panels/wacom/button-mapping.ui:71
 msgid "Map buttons to functions"
 msgstr "ボタンへ機能を割り当て"
 
-#: ../panels/wacom/button-mapping.ui.h:4
+#: panels/wacom/button-mapping.ui:119
 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."
@@ -7091,7 +7531,7 @@ msgstr ""
 "カットボタンを押して、新しいキー組み合わせを入力するか、[BS] キーで取り消して"
 "ください。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator.ui:60
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -7099,232 +7539,211 @@ msgstr ""
 "タブレットの位置調整を行いますので、画面に出現するマーカーをタップしてくださ"
 "い。"
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator.ui:77
 msgid "Mis-click detected, restarting…"
 msgstr "誤クリックを検出しました。再起動します..."
 
-#: ../panels/wacom/cc-wacom-button-row.c:266
+#: panels/wacom/cc-wacom-button-row.c:253
 #, c-format
 msgid "Button %d"
 msgstr "ボタン %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:53
+#: panels/wacom/cc-wacom-button-row.h:34
 msgctxt "Wacom action-type"
 msgid "Application defined"
 msgstr "アプリケーション定義"
 
-#: ../panels/wacom/cc-wacom-button-row.h:54
+#: panels/wacom/cc-wacom-button-row.h:35
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "キー入力の送信"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: panels/wacom/cc-wacom-button-row.h:36
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "モニターの切り替え"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: panels/wacom/cc-wacom-button-row.h:37
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "オンスクリーンヘルプの表示"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:260
+#: panels/wacom/cc-wacom-mapping-panel.c:256
 msgid "Output:"
 msgstr "出力:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:268
 msgid "Keep aspect ratio (letterbox):"
 msgstr "縦横比を保持 (レターボックス):"
 
 # 参考: intuos 5 のマニュアル p.57
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:283
+#: panels/wacom/cc-wacom-mapping-panel.c:279
 msgid "Map to single monitor"
 msgstr "単一画面にマッピング"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:86
+#: panels/wacom/cc-wacom-nav-button.c:84
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:544
+#: panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "画面のマッピング"
 
-#: ../panels/wacom/cc-wacom-panel.c:790
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: panels/wacom/cc-wacom-panel.c:826 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "ペン"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:347
+#: panels/wacom/cc-wacom-stylus-page.c:355
 msgid "Button"
 msgstr "ボタン"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Wa­com Tab­let"
+#: 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.h:3
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr ""
 "グラフィックスタブレットのボタン割り当てやスタイラスの感度の設定をします。"
 
-#. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:7
+msgid "input-tablet"
+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.h:1
+#: panels/wacom/gnome-wacom-properties.ui:15
 msgid "Tablet (absolute)"
 msgstr "タブレット(絶対座標)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
+#: panels/wacom/gnome-wacom-properties.ui:19
 msgid "Touchpad (relative)"
 msgstr "タッチパッド(相対座標)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
+#: panels/wacom/gnome-wacom-properties.ui:27
 msgid "Tablet Preferences"
 msgstr "タブレット設定"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#: panels/wacom/gnome-wacom-properties.ui:44
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: panels/wacom/gnome-wacom-properties.ui:125
 msgid "No tablet detected"
 msgstr "タブレットを検出できません"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: panels/wacom/gnome-wacom-properties.ui:141
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "ワコムタブレットを接続するか、電源を入れてください"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: panels/wacom/gnome-wacom-properties.ui:161
 msgid "Bluetooth Settings"
 msgstr "Bluetooth の設定"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "ワコムタブレット"
-
 # 参考: intuos 5 のマニュアル p.57
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: panels/wacom/gnome-wacom-properties.ui:233
 msgid "Map to Monitor…"
 msgstr "画面にマッピング…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: panels/wacom/gnome-wacom-properties.ui:249
 msgid "Map Buttons…"
 msgstr "ボタン割り当て…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: panels/wacom/gnome-wacom-properties.ui:265
 msgid "Calibrate…"
 msgstr "キャリブレート…"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: panels/wacom/gnome-wacom-properties.ui:286
 msgid "Adjust display resolution"
 msgstr "ディスプレイの解像度を調整"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: panels/wacom/gnome-wacom-properties.ui:302
 msgid "Adjust mouse settings"
 msgstr "マウス設定の調整"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
+#: panels/wacom/gnome-wacom-properties.ui:330
 msgid "Tracking Mode"
 msgstr "検出モード"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
+#: panels/wacom/gnome-wacom-properties.ui:358
 msgid "Left-Handed Orientation"
 msgstr "左手用"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "新しいショートカット…"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
+#: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "マウスの中ボタンクリック"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
+#: panels/wacom/wacom-stylus-page.ui:33
 msgid "Right Mouse Button Click"
 msgstr "マウスの右ボタンクリック"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: panels/wacom/wacom-stylus-page.ui:37
 msgid "Back"
 msgstr "戻る"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
+#: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "進む"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#: panels/wacom/wacom-stylus-page.ui:79
 msgid "No stylus found"
 msgstr "スタイラスペンが見つかりません"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
+#: 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.h:10
+#: panels/wacom/wacom-stylus-page.ui:159
 msgid "Eraser Pressure Feel"
 msgstr "消しゴムの感触"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
 msgid "Soft"
 msgstr "柔らかい"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
 msgid "Firm"
 msgstr "硬い"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: panels/wacom/wacom-stylus-page.ui:233
 msgid "Top Button"
 msgstr "上のサイドスイッチ"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: panels/wacom/wacom-stylus-page.ui:262
 msgid "Lower Button"
 msgstr "下のサイドスイッチ"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: panels/wacom/wacom-stylus-page.ui:291
+msgid "Lowest Button"
+msgstr "一番下のボタン"
+
+#: panels/wacom/wacom-stylus-page.ui:320
 msgid "Tip Pressure Feel"
 msgstr "ペン先の感触"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
-msgid "page 3"
-msgstr "ページ3"
-
-#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
-#: ../shell/cc-window.c:730
-msgid "All Settings"
-msgstr "すべての設定"
-
-#. Add categories
-#: ../shell/alt/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "パーソナル"
-
-#: ../shell/alt/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "ハードウェア"
-
-#: ../shell/alt/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "システム"
-
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
 msgid "GNOME Control Center"
 msgstr "GNOME コントロールセンター"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+#: shell/appdata/gnome-control-center.appdata.xml.in:8
 msgid "Utilities to configure the GNOME desktop"
 msgstr "GNOME デスクトップの設定ユーティリティー"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#: shell/appdata/gnome-control-center.appdata.xml.in:10
 msgid ""
 "The control center is GNOME’s main interface for configuration of various "
 "aspects of your desktop."
@@ -7332,89 +7751,265 @@ msgstr ""
 "コントロールセンターは、デスクトップの各種設定を行う GNOME のメインインター"
 "フェースです。"
 
-#: ../shell/cc-application.c:45
+#: shell/cc-application.c:58
 msgid "Display version number"
 msgstr "バージョン番号を表示する"
 
-#: ../shell/cc-application.c:46
+#: shell/cc-application.c:59
 msgid "Enable verbose mode"
 msgstr "冗長モードを有効にする"
 
-#: ../shell/cc-application.c:47
-msgid "Show the overview"
-msgstr "全体を表示する"
-
-#: ../shell/cc-application.c:48
+#: shell/cc-application.c:60
 msgid "Search for the string"
 msgstr "キーワードで検索する"
 
-#: ../shell/cc-application.c:49
+#: shell/cc-application.c:61
 msgid "List possible panel names and exit"
 msgstr "利用可能なパネル名をリスト表示して終了する"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:62
 msgid "Panel to display"
 msgstr "表示するパネル"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:62
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:113
+#: shell/cc-panel-list.ui:195
+msgid "No results found"
+msgstr "結果がありません"
+
+#: shell/cc-panel-loader.c:277
 msgid "Available panels:"
 msgstr "利用可能なパネル:"
 
-#: ../shell/cc-application.c:252
+#: shell/cc-window.ui:138
+msgid "All Settings"
+msgstr "すべての設定"
+
+#: shell/cc-window.ui:176
+msgid "Primary Menu"
+msgstr "プライマリメニュー"
+
+#: shell/cc-window.ui:247
+msgid "Warning: Development Version"
+msgstr ""
+
+#: shell/cc-window.ui:248
+msgid ""
+"This version of Settings should only be used for development purposes. You "
+"may experience incorrect system behavior, data loss, and other unexpected "
+"issues. "
+msgstr ""
+
+#: shell/cc-window.ui:259
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../shell/cc-application.c:253
-msgid "Quit"
-msgstr "終了"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: shell/gnome-control-center.desktop.in.in:5
+msgid "org.gnome.Settings"
+msgstr "org.gnome.Settings"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
+#. 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.h:1
+#: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "全般"
 
-#: ../shell/help-overlay.ui.h:2
+#: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "終了"
 
-#: ../shell/help-overlay.ui.h:3
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "検索"
 
-#: ../shell/help-overlay.ui.h:4
+#: shell/help-overlay.ui:35
 msgctxt "shortcut window"
 msgid "Panels"
 msgstr "パネル"
 
-#: ../shell/help-overlay.ui.h:5
+#: shell/help-overlay.ui:40
 msgctxt "shortcut window"
-msgid "Go back to the overview"
-msgstr "一覧画面に戻る"
+msgid "Go back to previous panel"
+msgstr "前の画面に戻る"
 
-#: ../shell/help-overlay.ui.h:6
+#: shell/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "検索をキャンセルする"
 
-#. translators: This is the default hotspot name, need to be less than 32-bytes
-#: ../shell/hostname-helper.c:189
-msgctxt "hotspot"
-msgid "Hotspot"
-msgstr "ホットスポット"
+#: shell/org.gnome.ControlCenter.gschema.xml:5
+msgid "The identifier for the last Settings panel to be opened"
+msgstr ""
 
-#: ../shell/panel-list.ui.h:3
-msgid "No results found"
-msgstr "結果がありません"
+#: shell/org.gnome.ControlCenter.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."
+msgstr ""
+
+#: shell/org.gnome.ControlCenter.gschema.xml:13
+msgid "Show warning when running a development build of Settings"
+msgstr ""
+
+#: shell/org.gnome.ControlCenter.gschema.xml:14
+msgid ""
+"Whether Settings should show a warning when running a development build."
+msgstr ""
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u 出力"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u 入力"
+
+#: subprojects/gvc/gvc-mixer-control.c:2738
+msgid "System Sounds"
+msgstr "システムのサウンド"
+
+#~ msgid "Back­ground"
+#~ msgstr "背景"
+
+#~ msgid "Blue­tooth"
+#~ msgstr "Blue­tooth"
+
+#~ msgid "Co­lor"
+#~ msgstr "色管理"
+
+#~ msgid "Section"
+#~ msgstr "セクション"
+
+#~ msgid "Overview"
+#~ msgstr "概要"
+
+#~ msgid "Defa­ult Applications"
+#~ msgstr "既定のアプリケーション"
+
+#~ msgid "Ab­out"
+#~ msgstr "情報"
+
+#~ msgid "De­tails"
+#~ msgstr "詳細"
+
+#~ msgid "Remo­vable Media"
+#~ msgstr "リムーバブルメディア"
+
+#~ msgctxt "keybinding"
+#~ msgid "Search"
+#~ msgstr "検索"
+
+#~ msgid "My Home Network"
+#~ msgstr "マイホームネットワーク"
+
+#~ msgid "Net­work"
+#~ msgstr "ネットワーク"
+
+#~ msgid "hardware"
+#~ msgstr "ハードウェア"
+
+#~ msgid "reset"
+#~ msgstr "リセット"
+
+#~ msgid "invalid EAP-TLS password: missing"
+#~ msgstr "無効なEAP-TLSパスワード: 見つかりません"
+
+#~ msgid "No­ti­fi­ca­tions"
+#~ msgstr "通知"
+
+#~ msgid "Po­wer"
+#~ msgstr "電源管理"
+
+#~ msgid "Pri­va­cy"
+#~ msgstr "プライバシー"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "前のソースへ切り替える"
+
+#~ msgid "Switch to next source"
+#~ msgstr "次のソースへ切り替える"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "次のソースへ切り替える (代替)"
+
+#~ msgid "English (United Kingdom)"
+#~ msgstr "英語 (UK)"
+
+#~ msgid "United Kingdom"
+#~ msgstr "UK"
+
+#~ msgid "_Options"
+#~ msgstr "オプション(_O)"
+
+#~ msgid "Sha­ring"
+#~ msgstr "共有"
+
+#~ msgid "Uni­ver­sal Access"
+#~ msgstr "ユニバーサルアクセス"
+
+#~ msgid "_Verify New Password"
+#~ msgstr "新しいパスワードの確認(_V)"
+
+#~ msgid "Passwords do not match."
+#~ msgstr "パスワードが一致しません。"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "標準"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "管理者"
+
+#~ msgid "Disable image"
+#~ msgstr "画像を無効にする"
+
+#~ msgid "Browse for more pictures…"
+#~ msgstr "他の画像も参照…"
+
+#~ msgid "Used by %s"
+#~ msgstr "%s に使用されています"
+
+#~ msgid "Wa­com Tab­let"
+#~ msgstr "ワコムタブレット"
+
+#~ msgid "page 3"
+#~ msgstr "ページ3"
+
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "パーソナル"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "ハードウェア"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "システム"
+
+#~ msgid "Show the overview"
+#~ msgstr "全体を表示する"
+
+#~ msgid "Quit"
+#~ msgstr "終了"
 
 #~ msgid "Lid Closed"
 #~ msgstr "蓋が閉じています"
@@ -7422,9 +8017,6 @@ msgstr "結果がありません"
 #~ msgid "Mirrored"
 #~ msgstr "ミラー済み"
 
-#~ msgid "Primary"
-#~ msgstr "プライマリ"
-
 #~ msgid "Secondary"
 #~ msgstr "セカンダリ"
 
@@ -7506,12 +8098,6 @@ msgstr "結果がありません"
 #~ msgid "_Method"
 #~ msgstr "メソッド(_M)"
 
-#~ msgid "Add Device"
-#~ msgstr "デバイスの追加"
-
-#~ msgid "Remove Device"
-#~ msgstr "デバイスの削除"
-
 #~ msgid "VPN Type"
 #~ msgstr "VPN の種類"
 
@@ -7621,15 +8207,9 @@ msgstr "結果がありません"
 #~ msgid "<small>Your account</small>"
 #~ msgstr "<small>あなたのアカウント</small>"
 
-#~ msgid "Color"
-#~ msgstr "色"
-
 #~ msgid "Wayland"
 #~ msgstr "Wayland"
 
-#~ msgid "_Name:"
-#~ msgstr "名前(_N):"
-
 #~ msgid ""
 #~ "To edit a shortcut, click the row and hold down the new keys or press "
 #~ "Backspace to clear."
@@ -7764,9 +8344,6 @@ msgstr "結果がありません"
 #~ msgid "Chat"
 #~ msgstr "チャット"
 
-#~ msgid "Resources"
-#~ msgstr "リソース"
-
 #~ msgid "Error logging into the account"
 #~ msgstr "アカウントのログインに失敗"
 
@@ -7816,9 +8393,6 @@ msgstr "結果がありません"
 #~ msgid "Add a New Printer"
 #~ msgstr "新しいプリンターの追加"
 
-#~ msgid "A_uthenticate"
-#~ msgstr "認証(_U)"
-
 #~ msgid "No printers detected."
 #~ msgstr "プリンターを検出できません"
 
@@ -7843,9 +8417,6 @@ msgstr "結果がありません"
 #~ msgid "Print _Test Page"
 #~ msgstr "テストページを印刷(_T)"
 
-#~ msgid "Privacy"
-#~ msgstr "プライバシー"
-
 #~ msgctxt "Search Location"
 #~ msgid "Other"
 #~ msgstr "その他"



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