[gnome-control-center] Update Japanese translation



commit 9624b3fd0aeef6c9d0b6acdcbffdfb33d8768e82
Author: sujiniku <sujinikusityuu gmail com>
Date:   Wed Sep 6 15:19:24 2017 +0000

    Update Japanese translation

 po/ja.po | 1236 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 666 insertions(+), 570 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 64af1f5..3ede3d8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,23 +14,22 @@
 # 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-2017
 #
 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-03-15 16:43+0000\n"
-"PO-Revision-Date: 2017-03-17 09:46+0900\n"
-"Last-Translator: Hajime Taira <htaira redhat com>\n"
+"POT-Creation-Date: 2017-07-07 18:50+0000\n"
+"PO-Revision-Date: 2017-07-09 11:51+0900\n"
+"Last-Translator: sujiniku <sujinikusityuu gmail com>\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 1.8.11\n"
 
 #: ../panels/background/background.ui.h:1
 msgid "_Background"
@@ -117,26 +116,27 @@ msgstr "画像を %s フォルダーに追加すると、その画像がここ
 #: ../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:1580
-#: ../panels/display/cc-display-panel.c:2226
+#: ../panels/display/cc-display-panel.c:1437
+#: ../panels/display/cc-display-panel.c:2094
 #: ../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:1347
-#: ../panels/network/net-device-wifi.c:1586
+#: ../panels/network/net-device-wifi.c:1301
+#: ../panels/network/net-device-wifi.c:1381
+#: ../panels/network/net-device-wifi.c:1619
 #: ../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:637
+#: ../panels/search/cc-search-locations-dialog.c:642
 #: ../panels/sharing/cc-sharing-panel.c:375
 #: ../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:218
+#: ../panels/user-accounts/um-photo-dialog.c:221
 #: ../panels/user-accounts/um-user-panel.c:644
 #: ../panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
@@ -707,7 +707,7 @@ msgid "_Import File…"
 msgstr "ファイルを読み込む(_I)…"
 
 #: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:546
+#: ../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
@@ -882,7 +882,7 @@ msgid "Other…"
 msgstr "その他…"
 
 #: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:271
+#: ../panels/region/cc-format-chooser.c:269
 #: ../panels/region/cc-input-chooser.c:169
 msgid "More…"
 msgstr "さらに…"
@@ -892,12 +892,12 @@ msgid "No languages found"
 msgstr "言語が見つかりません"
 
 #: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:100
+#: ../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:102
+#: ../panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "昨日"
 
@@ -931,17 +931,17 @@ msgid "Year"
 msgstr "年"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:340
+#: ../panels/datetime/cc-datetime-panel.c:339
 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:345
+#: ../panels/datetime/cc-datetime-panel.c:344
 msgid "%e %B %Y, %R"
 msgstr "%Y年%B%d日 %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:523
+#: ../panels/datetime/cc-datetime-panel.c:522
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -949,7 +949,7 @@ msgstr "%2$s、%1$s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:553
+#: ../panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -957,23 +957,23 @@ 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:561
+#: ../panels/datetime/cc-datetime-panel.c:560
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:566
+#: ../panels/datetime/cc-datetime-panel.c:565
 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:571
+#: ../panels/datetime/cc-datetime-panel.c:570
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:576
+#: ../panels/datetime/cc-datetime-panel.c:575
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
@@ -1104,22 +1104,22 @@ msgstr "システムの時刻と日付の設定を変更"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: ../panels/display/cc-display-panel.c:592
+#: ../panels/display/cc-display-panel.c:579
 msgid "Lid Closed"
 msgstr "蓋が閉じています"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:595
+#: ../panels/display/cc-display-panel.c:582
 msgid "Mirrored"
 msgstr "ミラー済み"
 
-#: ../panels/display/cc-display-panel.c:597
-#: ../panels/display/cc-display-panel.c:2449
+#: ../panels/display/cc-display-panel.c:584
+#: ../panels/display/cc-display-panel.c:2348
 msgid "Primary"
 msgstr "プライマリ"
 
-#: ../panels/display/cc-display-panel.c:599
-#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/display/cc-display-panel.c:586
+#: ../panels/display/cc-display-panel.c:2690
 #: ../panels/notifications/cc-notifications-panel.c:293
 #: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
 #: ../panels/privacy/cc-privacy-panel.c:190
@@ -1133,112 +1133,112 @@ msgstr "プライマリ"
 msgid "Off"
 msgstr "オフ"
 
-#: ../panels/display/cc-display-panel.c:602
+#: ../panels/display/cc-display-panel.c:589
 msgid "Secondary"
 msgstr "セカンダリ"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1577
+#: ../panels/display/cc-display-panel.c:1434
 msgid "Arrange Combined Displays"
 msgstr "ディスプレイの配置の調整"
 
-#: ../panels/display/cc-display-panel.c:1581
-#: ../panels/display/cc-display-panel.c:2227
+#: ../panels/display/cc-display-panel.c:1438
+#: ../panels/display/cc-display-panel.c:2095
 #: ../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:1605
+#: ../panels/display/cc-display-panel.c:1462
 msgid "Drag displays to rearrange them"
 msgstr "ディスプレイをドラッグして位置を調整してください"
 
 #. translators: example string is "60 Hz (NTSC)"
 #. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1812
+#: ../panels/display/cc-display-panel.c:1668
 #, c-format
 msgid "%d Hz (NTSC)"
 msgstr "%d Hz (NTSC)"
 
 #. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1818
+#: ../panels/display/cc-display-panel.c:1674
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2147
 msgid "Rotate counterclockwise by 90°"
 msgstr "反時計周りに 90°回転します"
 
-#: ../panels/display/cc-display-panel.c:2297
+#: ../panels/display/cc-display-panel.c:2165
 msgid "Rotate by 180°"
 msgstr "180°回転します"
 
-#: ../panels/display/cc-display-panel.c:2315
+#: ../panels/display/cc-display-panel.c:2183
 msgid "Rotate clockwise by 90°"
 msgstr "時計周りに 90°回転します"
 
-#: ../panels/display/cc-display-panel.c:2336
+#: ../panels/display/cc-display-panel.c:2204
 msgid "Size"
 msgstr "サイズ"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2351
+#: ../panels/display/cc-display-panel.c:2219
 msgid "Aspect Ratio"
 msgstr "アスペクト比"
 
-#: ../panels/display/cc-display-panel.c:2374
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../panels/display/cc-display-panel.c:2394
+#: ../panels/display/cc-display-panel.c:2266
 msgid "Adjust for TV"
 msgstr "TV向けに調整"
 
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:2290
 msgid "Refresh Rate"
 msgstr "リフレッシュレート"
 
-#: ../panels/display/cc-display-panel.c:2450
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "トップバーとアクティビティ画面をこのディスプレイに表示する"
 
-#: ../panels/display/cc-display-panel.c:2456
+#: ../panels/display/cc-display-panel.c:2355
 msgid "Secondary Display"
 msgstr "セカンダリディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:2457
+#: ../panels/display/cc-display-panel.c:2356
 msgid "Join this display with another to create an extra workspace"
 msgstr "このディスプレイをつなげて拡張ワークスペースとして使用する"
 
-#: ../panels/display/cc-display-panel.c:2464
+#: ../panels/display/cc-display-panel.c:2363
 msgid "Presentation"
 msgstr "プレゼンテーション"
 
-#: ../panels/display/cc-display-panel.c:2465
+#: ../panels/display/cc-display-panel.c:2364
 msgid "Show slideshows and media only"
 msgstr "スライドショーやメディアだけを表示する"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2470
+#: ../panels/display/cc-display-panel.c:2369
 msgid "Mirror"
 msgstr "ミラー"
 
-#: ../panels/display/cc-display-panel.c:2471
+#: ../panels/display/cc-display-panel.c:2370
 msgid "Show your existing view on both displays"
 msgstr "既存の画面をすべてのディスプレイに表示する"
 
-#: ../panels/display/cc-display-panel.c:2477
+#: ../panels/display/cc-display-panel.c:2376
 msgid "Turn Off"
 msgstr "オフ"
 
-#: ../panels/display/cc-display-panel.c:2478
+#: ../panels/display/cc-display-panel.c:2377
 msgid "Don’t use this display"
 msgstr "このディスプレイを使用しない"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:2786
+#: ../panels/display/cc-display-panel.c:2690
 #: ../panels/notifications/cc-notifications-panel.c:293
 #: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
 #: ../panels/privacy/cc-privacy-panel.c:190
@@ -1251,15 +1251,15 @@ msgstr "このディスプレイを使用しない"
 msgid "On"
 msgstr "オン"
 
-#: ../panels/display/cc-display-panel.c:2826
+#: ../panels/display/cc-display-panel.c:2795
 msgid "Could not get screen information"
 msgstr "スクリーンの情報を取得できませんでした"
 
-#: ../panels/display/cc-display-panel.c:2857
+#: ../panels/display/cc-display-panel.c:2833
 msgid "_Arrange Combined Displays"
 msgstr "ディスプレイの配置を調整(_A)"
 
-#: ../panels/display/cc-display-panel.c:2878
+#: ../panels/display/cc-display-panel.c:2854
 msgid "_Night Light"
 msgstr "ナイトライト(_N)"
 
@@ -1295,8 +1295,8 @@ msgid "Sunset to Sunrise"
 msgstr "日没から日の出まで"
 
 #: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:630
-#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
 #: ../panels/network/network-wifi.ui.h:26
 #: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
@@ -1345,70 +1345,90 @@ msgstr ""
 "日没;日の出;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
+#: ../panels/info/cc-info-overview-panel.c:381
+#: ../panels/info/cc-info-overview-panel.c:468
+#: ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "不明"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture and the build id, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or
-#. * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)"
-#: ../panels/info/cc-info-panel.c:517
-#, c-format
-msgid "%s %d-bit (Build ID: %s)"
-msgstr "%s %d-bit (Build ID: %s)"
-
-#: ../panels/info/cc-info-panel.c:519
-#, c-format
-msgid "%d-bit (Build ID: %s)"
+#. translators: This is the name of the OS, followed by the build ID, for
+#. * example:
+#. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
+#. * "Ubuntu 16.04 LTS; Build ID: jki"
+#: ../panels/info/cc-info-overview-panel.c:476
+#, fuzzy, c-format
+#| msgid "%d-bit (Build ID: %s)"
+msgid "%s; Build ID: %s"
 msgstr "%d-bit (Build ID: %s)"
 
-#. translators: This is the name of the OS, followed by the type
-#. * of architecture, for example:
-#. * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit"
-#: ../panels/info/cc-info-panel.c:527
-#, c-format
-msgid "%s %d-bit"
-msgstr "%s %d ビット"
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:493
+#, fuzzy, c-format
+#| msgid "%d-bit"
+msgid "64-bit"
+msgstr "%d ビット"
 
-#: ../panels/info/cc-info-panel.c:529
-#, c-format
-msgid "%d-bit"
+#. translators: This is the type of architecture for the OS
+#: ../panels/info/cc-info-overview-panel.c:496
+#, fuzzy, c-format
+#| msgid "%d-bit"
+msgid "32-bit"
 msgstr "%d ビット"
 
-#: ../panels/info/cc-info-panel.c:1175
+#: ../panels/info/cc-info-overview-panel.c:800
+#, c-format
+msgid "Version %s"
+msgstr "バージョン %s"
+
+#: ../panels/info/cc-info-panel.c:138
+msgid "Section"
+msgstr "セクション"
+
+#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
+msgid "Overview"
+msgstr "概要"
+
+#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
+msgid "Default Applications"
+msgstr "既定のアプリケーション"
+
+#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
+msgid "Removable Media"
+msgstr "リムーバブルメディア"
+
+#: ../panels/info/cc-info-removable-media-panel.c:312
 msgid "Ask what to do"
 msgstr "どうするか確認する"
 
-#: ../panels/info/cc-info-panel.c:1179
+#: ../panels/info/cc-info-removable-media-panel.c:316
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: ../panels/info/cc-info-panel.c:1183
+#: ../panels/info/cc-info-removable-media-panel.c:320
 msgid "Open folder"
 msgstr "フォルダーを開く"
 
-#: ../panels/info/cc-info-panel.c:1274
+#: ../panels/info/cc-info-removable-media-panel.c:411
 msgid "Other Media"
 msgstr "他のメディア"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-removable-media-panel.c:444
 msgid "Select an application for audio CDs"
 msgstr "オーディオCD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-removable-media-panel.c:445
 msgid "Select an application for video DVDs"
 msgstr "ビデオDVD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-removable-media-panel.c:446
 msgid "Select an application to run when a music player is connected"
 msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-removable-media-panel.c:447
 msgid "Select an application to run when a camera is connected"
 msgstr "カメラが接続された時に起動するアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-removable-media-panel.c:448
 msgid "Select an application for software CDs"
 msgstr "ソフトウェアの CD を開くアプリケーションを選択してください"
 
@@ -1417,75 +1437,54 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択し
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-removable-media-panel.c:460
 msgid "audio DVD"
 msgstr "オーディオ DVD"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-removable-media-panel.c:461
 msgid "blank Blu-ray disc"
 msgstr "空のブルーレイディスク"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-removable-media-panel.c:462
 msgid "blank CD disc"
 msgstr "空の CD"
 
-#: ../panels/info/cc-info-panel.c:1324
+#: ../panels/info/cc-info-removable-media-panel.c:463
 msgid "blank DVD disc"
 msgstr "空の DVD"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-removable-media-panel.c:464
 msgid "blank HD DVD disc"
 msgstr "空の HD DVD"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-removable-media-panel.c:465
 msgid "Blu-ray video disc"
 msgstr "ブルーレイビデオディスク"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-removable-media-panel.c:466
 msgid "e-book reader"
 msgstr "電子書籍リーダー"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-removable-media-panel.c:467
 msgid "HD DVD video disc"
 msgstr "HD DVD ビデオディスク"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-removable-media-panel.c:468
 msgid "Picture CD"
 msgstr "ピクチャーCD"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-removable-media-panel.c:469
 msgid "Super Video CD"
 msgstr "スーパービデオCD"
 
-#: ../panels/info/cc-info-panel.c:1331
+#: ../panels/info/cc-info-removable-media-panel.c:470
 msgid "Video CD"
 msgstr "ビデオCD"
 
-#: ../panels/info/cc-info-panel.c:1332
+#: ../panels/info/cc-info-removable-media-panel.c:471
 msgid "Windows software"
 msgstr "Windows ソフトウェア"
 
-#: ../panels/info/cc-info-panel.c:1455
-msgid "Section"
-msgstr "セクション"
-
-#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
-msgid "Overview"
-msgstr "概要"
-
-#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
-msgid "Default Applications"
-msgstr "既定のアプリケーション"
-
-#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
-msgid "Removable Media"
-msgstr "リムーバブルメディア"
-
-#: ../panels/info/cc-info-panel.c:1500
-#, c-format
-msgid "Version %s"
-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/info/gnome-info-panel.desktop.in.in.h:2
 msgid "De­tails"
@@ -1507,108 +1506,116 @@ msgstr ""
 "ディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;"
 "自動起動;オートラン;Details;詳細;"
 
-#: ../panels/info/info.ui.h:1
-msgid "Select how other media should be handled"
-msgstr "他のメディアの処理を選択してください"
+#: ../panels/info/info-default-apps.ui.h:1
+msgid "_Web"
+msgstr "ウェブ(_W)"
 
-#: ../panels/info/info.ui.h:2
-msgid "_Action:"
-msgstr "アクション(_A):"
+#: ../panels/info/info-default-apps.ui.h:2
+msgid "_Mail"
+msgstr "メール(_M)"
 
-#: ../panels/info/info.ui.h:3
-msgid "_Type:"
-msgstr "種類(_T):"
+#: ../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.ui.h:4
+#: ../panels/info/info-overview.ui.h:1
 msgid "Device name"
 msgstr "デバイス名"
 
-#: ../panels/info/info.ui.h:5
+#: ../panels/info/info-overview.ui.h:2
 msgid "Memory"
 msgstr "メモリ"
 
-#: ../panels/info/info.ui.h:6
+#: ../panels/info/info-overview.ui.h:3
 msgid "Processor"
 msgstr "プロセッサ"
 
-#. To translators: this field contains the distro name, version and type
-#: ../panels/info/info.ui.h:8
-msgid "Base system"
-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 ""
+
+#. To translators: this field contains the distro type
+#: ../panels/info/info-overview.ui.h:8
+#, fuzzy
+#| msgid "Security type"
+msgid "OS type"
+msgstr "セキュリティタイプ"
+
+#: ../panels/info/info-overview.ui.h:9
+msgid "Virtualization"
+msgstr "仮想化"
 
-#: ../panels/info/info.ui.h:9
+#: ../panels/info/info-overview.ui.h:10
 msgid "Disk"
 msgstr "ディスク"
 
-#: ../panels/info/info.ui.h:10
+#: ../panels/info/info-overview.ui.h:11
 msgid "Calculating…"
 msgstr "計算中…"
 
-#: ../panels/info/info.ui.h:11
-msgid "Graphics"
-msgstr "グラフィック"
-
-#: ../panels/info/info.ui.h:12
-msgid "Virtualization"
-msgstr "仮想化"
-
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info-overview.ui.h:12
 msgid "Check for updates"
 msgstr "更新の確認"
 
-#: ../panels/info/info.ui.h:15
-msgid "_Web"
-msgstr "ウェブ(_W)"
-
-#: ../panels/info/info.ui.h:16
-msgid "_Mail"
-msgstr "メール(_M)"
-
-#: ../panels/info/info.ui.h:17
-msgid "_Calendar"
-msgstr "カレンダー(_C)"
-
-#: ../panels/info/info.ui.h:18
-msgid "M_usic"
-msgstr "音楽(_U)"
-
-#: ../panels/info/info.ui.h:19
-msgid "_Video"
-msgstr "ビデオ(_V)"
-
-#: ../panels/info/info.ui.h:20
-msgid "_Photos"
-msgstr "写真(_P)"
-
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info-removable-media.ui.h:1
 msgid "Select how media should be handled"
 msgstr "メディアの処理方法を選択してください"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info-removable-media.ui.h:2
 msgid "CD _audio"
 msgstr "CD オーディオ(_A)"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info-removable-media.ui.h:3
 msgid "_DVD video"
 msgstr "DVD ビデオ(_D)"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info-removable-media.ui.h:4
 msgid "_Music player"
 msgstr "音楽プレイヤー(_M)"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info-removable-media.ui.h:6
 msgid "_Software"
 msgstr "ソフトウェア(_S)"
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info-removable-media.ui.h:7
 msgid "_Other Media…"
 msgstr "他のメディア(_O)…"
 
-#: ../panels/info/info.ui.h:28
+#: ../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
 msgid "Sound and Media"
 msgstr "音とメディア"
@@ -1784,9 +1791,9 @@ msgstr "文字サイズを縮小"
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:522
-#: ../panels/keyboard/cc-keyboard-manager.c:830
+#: ../panels/keyboard/cc-keyboard-manager.c:518
+#: ../panels/keyboard/cc-keyboard-manager.c:526
+#: ../panels/keyboard/cc-keyboard-manager.c:834
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"
 
@@ -1800,7 +1807,7 @@ msgstr "独自のショートカット"
 #: ../panels/keyboard/keyboard-shortcuts.c:440
 #: ../panels/keyboard/shortcut-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/sound/gvc/gvc-mixer-control.c:1866
 #: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "無効"
@@ -1825,11 +1832,11 @@ msgstr "Compose キー"
 msgid "Modifiers-only switch to next source"
 msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
+#: ../panels/keyboard/cc-keyboard-panel.c:183
 msgid "Reset All Shortcuts?"
 msgstr "すべてのショートカットをリセットしますか?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: ../panels/keyboard/cc-keyboard-panel.c:186
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -1837,22 +1844,22 @@ msgstr ""
 "ショートカットをリセットするとカスタムショートカットが影響を受ける可能性があ"
 "ります。 この処理を元に戻すことはできません。"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: ../panels/keyboard/cc-keyboard-panel.c:190
+#: ../panels/keyboard/shortcut-editor.ui.h:9
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:189
+#: ../panels/keyboard/cc-keyboard-panel.c:191
 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:433
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:434
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1861,16 +1868,16 @@ msgstr ""
 "すでに %s は <b>%s</b> のために使われています。もし入れ替えなければ %s が無効"
 "化されます。"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:600
 msgid "Set Custom Shortcut"
 msgstr "独自のショートカットの設定"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:599
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:600
 msgid "Set Shortcut"
 msgstr "ショートカットの設定"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:608
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:609
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "<b>%s</b> の新しいショートカットを入力してください。"
@@ -1890,9 +1897,9 @@ msgstr "キーボードショートカットの表示や変更、タイピング
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
-msgid "Shortcut;Repeat;Blink;"
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Shortcut;Repeat;Blink;ショートカット;リピート;点滅;Keyboard;キーボード;"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
 #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
@@ -1916,8 +1923,8 @@ msgid "Try a different search"
 msgstr "別の検索を試す"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:1
-msgid "Press Esc to cancel."
-msgstr "Escキーでキャンセルします"
+msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
+msgstr ""
 
 #: ../panels/keyboard/shortcut-editor.ui.h:3
 #: ../panels/printers/details-dialog.ui.h:1
@@ -1944,16 +1951,16 @@ msgid "None"
 msgstr "何もしない"
 
 #: ../panels/keyboard/shortcut-editor.ui.h:8
-msgid "Remove"
-msgstr "削除"
-
-#: ../panels/keyboard/shortcut-editor.ui.h:9
 msgid "Enter the new shortcut"
 msgstr "新しいショートカットキーを入力してください"
 
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Remove"
+msgstr "削除"
+
 #: ../panels/keyboard/shortcut-editor.ui.h:11
-#: ../panels/network/connection-editor/ce-page-ip4.c:305
-#: ../panels/network/connection-editor/ce-page-ip6.c:277
+#: ../panels/network/connection-editor/ce-page-ip4.c:296
+#: ../panels/network/connection-editor/ce-page-ip6.c:267
 msgid "Add"
 msgstr "追加"
 
@@ -2084,11 +2091,11 @@ msgstr "シングルクリック、副ボタン"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:349
+#: ../panels/network/cc-network-panel.c:347
 msgid "Air_plane Mode"
 msgstr "機内モード(_P)"
 
-#: ../panels/network/cc-network-panel.c:953
+#: ../panels/network/cc-network-panel.c:1028
 msgid "Network proxy"
 msgstr "ネットワークプロキシ"
 
@@ -2096,17 +2103,17 @@ msgstr "ネットワークプロキシ"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/cc-network-panel.c:1207 ../panels/network/net-vpn.c:283
 #: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:1194
+#: ../panels/network/cc-network-panel.c:1274
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
 
-#: ../panels/network/cc-network-panel.c:1200
+#: ../panels/network/cc-network-panel.c:1280
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManager が動作している必要があります。"
 
@@ -2115,13 +2122,13 @@ 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:3
+#: ../panels/network/connection-editor/security-page.ui.h:2
 #: ../panels/wacom/wacom-stylus-page.ui.h:8
 msgid "page 1"
 msgstr "ページ1"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: ../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
@@ -2129,18 +2136,18 @@ msgid "Anony_mous identity"
 msgstr "匿名の識別子(_M)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:4
 msgid "Inner _authentication"
 msgstr "内部認証(_A)"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:6
+#: ../panels/network/connection-editor/security-page.ui.h:5
 #: ../panels/wacom/wacom-stylus-page.ui.h:16
 msgid "page 2"
 msgstr "ページ2"
 
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:459
+#: ../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
 msgid "Security"
@@ -2156,220 +2163,211 @@ msgid "Profile %d"
 msgstr "プロファイル %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:50
-#: ../panels/network/net-device-wifi.c:215
-#: ../panels/network/net-device-wifi.c:392
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:214
+#: ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:54
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:397
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:218
+#: ../panels/network/net-device-wifi.c:395
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:58
-#: ../panels/network/net-device-wifi.c:223
+#: ../panels/network/connection-editor/ce-page-details.c:64
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:63
-#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/connection-editor/ce-page-details.c:69
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:68
-#: ../panels/network/net-device-wifi.c:233
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/connection-editor/ce-page-details.c:74
+#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:89
+#: ../panels/network/connection-editor/ce-page-details.c:95
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "しない"
 
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/connection-editor/ce-page-details.c:110
 #: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:487
+#: ../panels/network/net-device-wifi.c:488
 #, 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:153
+#: ../panels/network/connection-editor/ce-page-details.c:176
 #: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:543
+#: ../panels/network/net-device-wifi.c:544
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:572
+#: ../panels/network/connection-editor/ce-page-details.c:202
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:574
+#: ../panels/network/connection-editor/ce-page-details.c:204
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:576
+#: ../panels/network/connection-editor/ce-page-details.c:206
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:578
+#: ../panels/network/connection-editor/ce-page-details.c:208
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:580
+#: ../panels/network/connection-editor/ce-page-details.c:210
+#: ../panels/network/net-device-wifi.c:581
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/connection-editor/ce-page-details.c:248
+#, fuzzy
+#| msgid "Export VPN connection"
+msgid "Forget Connection"
+msgstr "VPN 接続をエクスポートする"
+
+#: ../panels/network/connection-editor/ce-page-details.c:250
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Remove Connection Profile"
+msgstr "接続失敗"
+
+#: ../panels/network/connection-editor/ce-page-details.c:252
+#, fuzzy
+#| msgid "Remove"
+msgid "Remove VPN"
+msgstr "削除"
+
+#: ../panels/network/connection-editor/ce-page-details.c:280
 #: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:269
 #: ../shell/panel-list.ui.h:2
 msgid "Details"
 msgstr "詳細"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:215
-#: ../panels/network/connection-editor/ce-page-vpn.c:221
-#: ../panels/network/connection-editor/ce-page-wifi.c:227
+#: ../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
 msgid "Identity"
 msgstr "Identity"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:461
-#: ../panels/network/connection-editor/ce-page-ip6.c:180
-#: ../panels/network/connection-editor/ce-page-ip6.c:427
+#: ../panels/network/connection-editor/ce-page-ip4.c:193
+#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip6.c:170
+#: ../panels/network/connection-editor/ce-page-ip6.c:417
 #: ../panels/printers/details-dialog.ui.h:3
 msgid "Address"
 msgstr "アドレス"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:215
-#: ../panels/network/connection-editor/ce-page-ip4.c:474
+#: ../panels/network/connection-editor/ce-page-ip4.c:206
+#: ../panels/network/connection-editor/ce-page-ip4.c:465
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:229
-#: ../panels/network/connection-editor/ce-page-ip4.c:487
-#: ../panels/network/connection-editor/ce-page-ip6.c:206
-#: ../panels/network/connection-editor/ce-page-ip6.c:453
+#: ../panels/network/connection-editor/ce-page-ip4.c:220
+#: ../panels/network/connection-editor/ce-page-ip4.c:478
+#: ../panels/network/connection-editor/ce-page-ip6.c:196
+#: ../panels/network/connection-editor/ce-page-ip6.c:443
 #: ../panels/network/network-vpn.ui.h:2
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:250
-#: ../panels/network/connection-editor/ce-page-ip6.c:223
+#: ../panels/network/connection-editor/ce-page-ip4.c:241
+#: ../panels/network/connection-editor/ce-page-ip6.c:213
 msgid "Delete Address"
 msgstr "アドレスを削除"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:368
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
+#: ../panels/network/connection-editor/ce-page-ip4.c:359
+#: ../panels/network/connection-editor/ce-page-ip6.c:324
 msgid "Server"
 msgstr "サーバー"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:385
-#: ../panels/network/connection-editor/ce-page-ip6.c:351
+#: ../panels/network/connection-editor/ce-page-ip4.c:376
+#: ../panels/network/connection-editor/ce-page-ip6.c:341
 msgid "Delete DNS Server"
 msgstr "DNS サーバーを削除"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:501
-#: ../panels/network/connection-editor/ce-page-ip6.c:467
+#: ../panels/network/connection-editor/ce-page-ip4.c:492
+#: ../panels/network/connection-editor/ce-page-ip6.c:457
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:522
-#: ../panels/network/connection-editor/ce-page-ip6.c:484
+#: ../panels/network/connection-editor/ce-page-ip4.c:513
+#: ../panels/network/connection-editor/ce-page-ip6.c:474
 msgid "Delete Route"
 msgstr "ルートを削除"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:626
-#: ../panels/network/network-wifi.ui.h:27
-msgid "Automatic (DHCP)"
-msgstr "自動 (DHCP)"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:634
-#: ../panels/network/connection-editor/ce-page-ip6.c:596
-msgid "Link-Local Only"
-msgstr "リンクローカルのみ"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:980
+#: ../panels/network/connection-editor/ce-page-ip4.c:977
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:193
-#: ../panels/network/connection-editor/ce-page-ip6.c:440
+#: ../panels/network/connection-editor/ce-page-ip6.c:183
+#: ../panels/network/connection-editor/ce-page-ip6.c:430
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:584
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
-msgid "Automatic"
-msgstr "自動"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:588
-msgid "Automatic, DHCP only"
-msgstr "自動、DHCP のみ"
-
-#: ../panels/network/connection-editor/ce-page-ip6.c:898
+#: ../panels/network/connection-editor/ce-page-ip6.c:896
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:78
-msgid "Reset"
-msgstr "リセット"
-
-#: ../panels/network/connection-editor/ce-page-security.c:248
+#: ../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:271
+#: ../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:281
+#: ../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:294
+#: ../panels/network/connection-editor/ce-page-security.c:291
 #: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:307
+#: ../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:321
+#: ../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:335
+#: ../panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
@@ -2415,8 +2413,8 @@ msgid "Default Route"
 msgstr "デフォルトルート"
 
 #: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
 #: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
@@ -2428,6 +2426,22 @@ msgstr "DNS"
 msgid "Last Used"
 msgstr "前回の使用"
 
+#: ../panels/network/connection-editor/details-page.ui.h:10
+msgid "Connect _automatically"
+msgstr "自動接続する(_A)"
+
+#: ../panels/network/connection-editor/details-page.ui.h:11
+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:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/privacy/cc-privacy-panel.c:217
+msgid "Automatic"
+msgstr "自動"
+
 #: ../panels/network/connection-editor/ethernet-page.ui.h:2
 msgid "Twisted Pair (TP)"
 msgstr "ツイストペア (TP)"
@@ -2484,115 +2498,81 @@ msgstr "クローンしたアドレス(_C)"
 msgid "bytes"
 msgstr "バイト"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:15
-#: ../panels/network/connection-editor/vpn-page.ui.h:3
-msgid "Make available to other _users"
-msgstr "他のユーザーにも利用可能にする(_U)"
-
-#: ../panels/network/connection-editor/ethernet-page.ui.h:16
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
-msgid "Connect _automatically"
-msgstr "自動接続する(_A)"
-
-#: ../panels/network/connection-editor/ethernet-page.ui.h:17
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
-msgid "Firewall _Zone"
-msgstr "ファイアウォールゾーン(_Z)"
-
-#: ../panels/network/connection-editor/firewall-helpers.c:49
-#: ../panels/network/connection-editor/firewall-helpers.c:118
-msgctxt "Firewall zone"
-msgid "Default"
-msgstr "デフォルト"
-
-#: ../panels/network/connection-editor/firewall-helpers.c:50
-msgid "The zone defines the trust level of the connection"
-msgstr "ゾーンは接続の信頼レベルを定義します"
-
 #: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:24
-msgid "IPv_4"
-msgstr "IPv4(_4)"
+#, fuzzy
+#| msgid "_Method"
+msgid "IPv_4 Method"
+msgstr "メソッド(_M)"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:25
-msgid "_Addresses"
-msgstr "アドレス(_A)"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP)"
+msgstr "自動 (DHCP)"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+msgid "Link-Local Only"
+msgstr "リンクローカルのみ"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#, fuzzy
+#| msgid "Disabled"
+msgid "Disable"
+msgstr "無効"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
 msgid "Automatic DNS"
 msgstr "自動 DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:9
+#: ../panels/network/connection-editor/ip6-page.ui.h:9
 #: ../panels/network/network-wifi.ui.h:32
 msgid "Routes"
 msgstr "ルート"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: ../panels/network/connection-editor/ip4-page.ui.h:10
+#: ../panels/network/connection-editor/ip6-page.ui.h:10
 msgid "Automatic Routes"
 msgstr "自動ルート"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/connection-editor/ip4-page.ui.h:11
+#: ../panels/network/connection-editor/ip6-page.ui.h:11
 #: ../panels/network/network-wifi.ui.h:34
 msgid "Use this connection _only for resources on its network"
 msgstr "この接続はネットワーク上のリソースのためだけに使用(_O)"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:36
-msgid "IPv_6"
-msgstr "IPv6(_6)"
+#, fuzzy
+#| msgid "_Method"
+msgid "IPv_6 Method"
+msgstr "メソッド(_M)"
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+msgid "Automatic, DHCP only"
+msgstr "自動、DHCP のみ"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:296
+#: ../panels/network/connection-editor/net-connection-editor.c:273
 msgid "Unable to open connection editor"
 msgstr "接続エディターを起動できません"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:314
+#: ../panels/network/connection-editor/net-connection-editor.c:291
 msgid "New Profile"
 msgstr "新規プロファイル"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:635
+#: ../panels/network/connection-editor/net-connection-editor.c:603
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:783
+#: ../panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from file…"
 msgstr "ファイルからインポート…"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:817
+#: ../panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "VPNの追加"
 
-#: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:41
-msgid "_Reset"
-msgstr "リセット(_R)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1587
-#: ../panels/network/network-wifi.ui.h:42
-msgid "_Forget"
-msgstr "破棄(_F)"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:3
-msgid ""
-"Reset the settings for this network, including passwords, but remember it as "
-"a preferred network"
-msgstr ""
-"パスワードを含め、このネットワークの設定をリセットします。ただし、推奨ネット"
-"ワークであることは記憶"
-
-#: ../panels/network/connection-editor/reset-page.ui.h:4
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect"
-msgstr "このネットワークに関する詳細を削除し、自動的に接続しないようにします"
-
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:16
 msgid "S_ecurity"
@@ -2622,7 +2602,7 @@ msgstr "インポートするファイルを選択する"
 #: ../panels/network/connection-editor/vpn-helpers.c:182
 #: ../panels/printers/pp-details-dialog.c:320
 #: ../panels/sharing/cc-sharing-panel.c:376
-#: ../panels/user-accounts/um-photo-dialog.c:219
+#: ../panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -2659,7 +2639,7 @@ msgstr ""
 msgid "Export VPN connection"
 msgstr "VPN 接続をエクスポートする"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:4
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(エラー: VPN 接続エディターを読み込めません)"
 
@@ -2678,10 +2658,6 @@ msgstr "BSSID(_B)"
 msgid "My Home Network"
 msgstr "マイホームネットワーク"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Make available to _other users"
-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/network/gnome-network-panel.desktop.in.in.h:2
 msgid "Net­work"
@@ -2702,17 +2678,17 @@ msgstr ""
 "ロードバンド;モデム;ブルートゥース;VPN;ドメイン名;ドメインネームサーバー;"
 
 #: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-wifi.c:474
 msgid "never"
 msgstr "未接続"
 
 #: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:483
+#: ../panels/network/net-device-wifi.c:484
 msgid "today"
 msgstr "今日"
 
 #: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-wifi.c:486
 msgid "yesterday"
 msgstr "昨日"
 
@@ -2739,32 +2715,24 @@ msgid "Wired"
 msgstr "有線"
 
 #: ../panels/network/net-device-ethernet.c:348
-#: ../panels/network/net-device-wifi.c:1745
+#: ../panels/network/net-device-wifi.c:1778
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
 msgstr "オプション…"
 
-#: ../panels/network/net-device-mobile.c:223
+#: ../panels/network/net-device-mobile.c:238
 msgid "Add new connection"
 msgstr "新規の接続を追加"
 
-#: ../panels/network/net-device-wifi.c:1255
-msgid ""
-"If you have a connection to the Internet other than wireless, you can set up "
-"a wireless hotspot to share the connection with others."
-msgstr ""
-"ワイヤレス以外のインターネット接続がある場合には、 ワイヤレスホットスポットを"
-"設定し、他の人とインターネット接続を共有することができます。"
-
-#: ../panels/network/net-device-wifi.c:1259
+#: ../panels/network/net-device-wifi.c:1258
 #, 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:1263
+#: ../panels/network/net-device-wifi.c:1262
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2772,41 +2740,56 @@ msgstr ""
 "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできま"
 "せん。"
 
-#: ../panels/network/net-device-wifi.c:1345
+#: ../panels/network/net-device-wifi.c:1269
+#, fuzzy
+#| msgid "Wi-Fi Hotspot"
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Wi-Fi アクセスポイント"
+
+#: ../panels/network/net-device-wifi.c:1291
+msgid ""
+"Wi-Fi hotspots are usually used to share an additional Internet connection "
+"over Wi-Fi."
+msgstr ""
+
+#: ../panels/network/net-device-wifi.c:1302
+msgid "_Turn On"
+msgstr "オン(_T)"
+
+#: ../panels/network/net-device-wifi.c:1379
 msgid "Stop hotspot and disconnect any users?"
 msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
 
-#: ../panels/network/net-device-wifi.c:1348
+#: ../panels/network/net-device-wifi.c:1382
 msgid "_Stop Hotspot"
 msgstr "停止(_S)"
 
-#: ../panels/network/net-device-wifi.c:1448
+#: ../panels/network/net-device-wifi.c:1482
 msgid "System policy prohibits use as a Hotspot"
 msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
 
-#: ../panels/network/net-device-wifi.c:1451
+#: ../panels/network/net-device-wifi.c:1485
 msgid "Wireless device does not support Hotspot mode"
 msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
 
-#: ../panels/network/net-device-wifi.c:1583
+#: ../panels/network/net-device-wifi.c:1616
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr "パスワードや独自の設定など、 選択したネットワークの詳細は失われます。"
 
-#: ../panels/network/net-device-wifi.c:1893
-msgid "History"
-msgstr "履歴"
+#: ../panels/network/net-device-wifi.c:1620
+#: ../panels/network/network-wifi.ui.h:42
+msgid "_Forget"
+msgstr "破棄(_F)"
 
-#: ../panels/network/net-device-wifi.c:1897
-#: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:505
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
-msgid "_Close"
-msgstr "閉じる(_C)"
+#: ../panels/network/net-device-wifi.c:1929
+#: ../panels/network/net-device-wifi.c:1936
+msgid "Known Wi-Fi Networks"
+msgstr ""
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1905
+#: ../panels/network/net-device-wifi.c:1969
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "破棄(_F)"
@@ -2971,6 +2954,14 @@ msgstr "他のユーザーに利用可能にする"
 msgid "identity"
 msgstr "識別情報"
 
+#: ../panels/network/network-wifi.ui.h:24
+msgid "IPv_4"
+msgstr "IPv4(_4)"
+
+#: ../panels/network/network-wifi.ui.h:25
+msgid "_Addresses"
+msgstr "アドレス(_A)"
+
 #: ../panels/network/network-wifi.ui.h:28
 msgid "Automatic (DHCP) addresses only"
 msgstr "自動 (DHCP) アドレスのみ"
@@ -2991,6 +2982,10 @@ msgstr "自動的に得られたルートを無視する(_I)"
 msgid "ipv4"
 msgstr "ipv4"
 
+#: ../panels/network/network-wifi.ui.h:36
+msgid "IPv_6"
+msgstr "IPv6(_6)"
+
 #: ../panels/network/network-wifi.ui.h:37
 msgid "ipv6"
 msgstr "ipv6"
@@ -3003,6 +2998,10 @@ msgstr "クローンしたMACアドレス(_C)"
 msgid "hardware"
 msgstr "ハードウェア"
 
+#: ../panels/network/network-wifi.ui.h:41
+msgid "_Reset"
+msgstr "リセット(_R)"
+
 #: ../panels/network/network-wifi.ui.h:43
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
@@ -3033,50 +3032,46 @@ msgid "Reset"
 msgstr "リセット"
 
 #: ../panels/network/network-wifi.ui.h:52
-msgid "Wi-Fi Hotspot"
-msgstr "Wi-Fi アクセスポイント"
-
-#: ../panels/network/network-wifi.ui.h:53
-msgid "_Turn On"
-msgstr "オン(_T)"
-
-#: ../panels/network/network-wifi.ui.h:54
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: ../panels/network/network-wifi.ui.h:53
 msgid "Turn Wi-Fi off"
 msgstr "Wi-Fi をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: ../panels/network/network-wifi.ui.h:54
 msgid "_Use as Hotspot…"
 msgstr "アクセスポイントとして使用(_U)…"
 
-#: ../panels/network/network-wifi.ui.h:57
+#: ../panels/network/network-wifi.ui.h:55
 msgid "_Connect to Hidden Network…"
 msgstr "非表示のネットワークに接続(_C)…"
 
-#: ../panels/network/network-wifi.ui.h:58
+#: ../panels/network/network-wifi.ui.h:56
 msgid "_History"
 msgstr "履歴(_H)"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: ../panels/network/network-wifi.ui.h:57
+msgid "Wi-Fi Hotspot"
+msgstr "Wi-Fi アクセスポイント"
+
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Wi-Fiネットワークへ接続するためスイッチをオフ"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/network-wifi.ui.h:59
 msgid "Network Name"
 msgstr "ネットワーク名"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/network-wifi.ui.h:60
 msgid "Connected Devices"
 msgstr "接続しているデバイス"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:61
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:62
 #: ../panels/printers/authentication-dialog.ui.h:5
 #: ../panels/printers/new-printer-dialog.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
@@ -3678,9 +3673,8 @@ msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
-"無効なWEPキー: キーの長さ %zu は使用できません。WEPキーは長"
-"さ5文字か13文字のアスキー文字、または10文字か26文字の十六進数字のどちらかでなければなりま"
-"せん"
+"無効なWEPキー: キーの長さ %zu は使用できません。WEPキーは長さ5文字か13文字の"
+"アスキー文字、または10文字か26文字の十六進数字のどちらかでなければなりません"
 
 #: ../panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3720,8 +3714,8 @@ msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
-"無効なWPA PSK: キーの長さ %zu は無効です。8文字以上〜63文字以下、もしくは十六進数表"
-"記で64文字でなければなりません"
+"無効なWPA PSK: キーの長さ %zu は無効です。8文字以上〜63文字以下、もしくは十六"
+"進数表記で64文字でなければなりません"
 
 #: ../panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
@@ -3844,7 +3838,9 @@ msgstr ""
 "フー;ウェブ;オンライン;チャット;カレンダー;メール;連絡先;Flickr;"
 "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
 msgid "Undo"
 msgstr "元に戻す"
 
@@ -4226,19 +4222,25 @@ msgstr "認証"
 msgid "Authentication Required"
 msgstr "認証が要求されました"
 
+#. Translators: %s is the printer name
+#: ../panels/printers/cc-printers-panel.c:717
+#, c-format
+msgid "Printer “%s” has been deleted"
+msgstr ""
+
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:713
+#: ../panels/printers/cc-printers-panel.c:908
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:959
+#: ../panels/printers/cc-printers-panel.c:1220
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
 
 #: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:6
+#: ../panels/printers/printer-entry.ui.h:8
 msgid "Location"
 msgstr "場所"
 
@@ -4317,9 +4319,14 @@ msgstr ""
 "プリンターサーバーで利用可能なプリンターを表示するにはユーザー名とパスワード"
 "を入力してください。"
 
-#: ../panels/printers/options-dialog.ui.h:1
-msgid "Loading options…"
-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
+#, fuzzy
+#| msgid "Test page"
+msgid "Test Page"
+msgstr "テストページ"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
 #: ../panels/printers/pp-details-dialog.c:123
@@ -4513,89 +4520,94 @@ msgstr "アドレス: %s"
 msgid "Server requires authentication"
 msgstr "サーバーが認証を要求しています"
 
-#: ../panels/printers/pp-options-dialog.c:81
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "両面"
 
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "用紙の種類"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "給紙元"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "出力トレイ"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../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:533
+#: ../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:545
+#: ../panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "両面"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
+#: ../panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "向き"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../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:657
+#: ../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:660
+#: ../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:663
+#: ../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:666
+#: ../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:669
+#: ../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:672
+#: ../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:675
+#: ../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
+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
@@ -4638,121 +4650,126 @@ msgid "Manufacturer"
 msgstr "製造元"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:443
+#: ../panels/printers/pp-printer-entry.c:577
 msgid "No Active Jobs"
 msgstr "アクティブなジョブがありません"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:448
+#: ../panels/printers/pp-printer-entry.c:582
 #, 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:584
+#: ../panels/printers/pp-printer-entry.c:730
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:586
+#: ../panels/printers/pp-printer-entry.c:732
 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:589
+#: ../panels/printers/pp-printer-entry.c:735
 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:592
+#: ../panels/printers/pp-printer-entry.c:738
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:594
+#: ../panels/printers/pp-printer-entry.c:740
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:596
+#: ../panels/printers/pp-printer-entry.c:742
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/pp-printer-entry.c:598
+#: ../panels/printers/pp-printer-entry.c:744
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:600
+#: ../panels/printers/pp-printer-entry.c:746
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:602
+#: ../panels/printers/pp-printer-entry.c:748
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:604
+#: ../panels/printers/pp-printer-entry.c:750
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:606
+#: ../panels/printers/pp-printer-entry.c:752
 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:608
-#: ../panels/printers/pp-printer-entry.c:738
+#: ../panels/printers/pp-printer-entry.c:754
+#: ../panels/printers/pp-printer-entry.c:884
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:610
+#: ../panels/printers/pp-printer-entry.c:756
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/pp-printer-entry.c:612
+#: ../panels/printers/pp-printer-entry.c:758
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/pp-printer-entry.c:614
+#: ../panels/printers/pp-printer-entry.c:760
 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:616
+#: ../panels/printers/pp-printer-entry.c:762
 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:724
+#: ../panels/printers/pp-printer-entry.c:870
 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:729
+#: ../panels/printers/pp-printer-entry.c:875
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "ジョブ受付不可"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/pp-printer-entry.c:734
+#: ../panels/printers/pp-printer-entry.c:880
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
+#. Translators: Name of job which makes printer to clean its heads
+#: ../panels/printers/pp-printer-entry.c:904
+msgid "Clean print heads"
+msgstr ""
+
 #: ../panels/printers/printer-entry.ui.h:1
 msgid "Printing Options"
 msgstr "プリンターのオプション"
@@ -4765,25 +4782,30 @@ msgstr "プリンターの詳細"
 msgid "Use Printer by Default"
 msgstr "デフォルトプリンター"
 
-#: ../panels/printers/printer-entry.ui.h:4
+#. Translators: This button executes command which cleans print heads of the printer.
+#: ../panels/printers/printer-entry.ui.h:5
+msgid "Clean Print Heads"
+msgstr ""
+
+#: ../panels/printers/printer-entry.ui.h:6
 msgid "Remove Printer"
 msgstr "プリンターの削除"
 
-#: ../panels/printers/printer-entry.ui.h:5
+#: ../panels/printers/printer-entry.ui.h:7
 msgid "Model"
 msgstr "型式"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: ../panels/printers/printer-entry.ui.h:9
 msgid "Ink Level"
 msgstr "インクの量"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:9
+#: ../panels/printers/printer-entry.ui.h:11
 msgid "Please restart when the problem is resolved."
 msgstr "問題が解決した場合、再起動してください。"
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:11
+#: ../panels/printers/printer-entry.ui.h:13
 msgid "Restart"
 msgstr "再起動"
 
@@ -4792,17 +4814,17 @@ msgstr "再起動"
 msgid "Add…"
 msgstr "追加…"
 
-#: ../panels/printers/printers.ui.h:3
+#: ../panels/printers/printers.ui.h:5
 msgid "No printers"
 msgstr "プリンターが見つかりません"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:5
+#: ../panels/printers/printers.ui.h:7
 msgid "Add a Printer…"
 msgstr "プリンターの追加…"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:7
+#: ../panels/printers/printers.ui.h:9
 msgid ""
 "Sorry! The system printing service\n"
 "doesn’t seem to be available."
@@ -5054,17 +5076,17 @@ msgstr "位置情報サービス(_L)"
 msgid "_Automatic Problem Reporting"
 msgstr "問題のレポートを自動で送信する(_A)"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "ヤード・ポンド法"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "メートル法"
 
-#: ../panels/region/cc-format-chooser.c:287
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "地域が見つかりません"
 
@@ -5072,7 +5094,7 @@ msgstr "地域が見つかりません"
 msgid "No input sources found"
 msgstr "入力ソースが見つかりません"
 
-#: ../panels/region/cc-input-chooser.c:992
+#: ../panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "その他"
@@ -5081,7 +5103,7 @@ msgstr "その他"
 msgid "No input source selected"
 msgstr "入力ソースが選択されていません"
 
-#: ../panels/region/cc-region-panel.c:1757
+#: ../panels/region/cc-region-panel.c:1758
 msgid "Login _Screen"
 msgstr "ログイン画面(_S)"
 
@@ -5102,14 +5124,20 @@ msgid "Times"
 msgstr "時刻"
 
 #: ../panels/region/format-chooser.ui.h:7
+#, fuzzy
+#| msgid "Date & Time"
+msgid "Dates & Times"
+msgstr "日付と時刻"
+
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Measurement"
 msgstr "計量単位"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: ../panels/region/format-chooser.ui.h:10
 msgid "Paper"
 msgstr "用紙サイズ"
 
@@ -5241,15 +5269,15 @@ msgstr "入力ソースのキーボードレイアウトを表示する"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
 
-#: ../panels/search/cc-search-locations-dialog.c:634
+#: ../panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "場所の選択"
 
-#: ../panels/search/cc-search-locations-dialog.c:638
+#: ../panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "アプリケーションが見つかりません"
 
@@ -5573,7 +5601,7 @@ msgstr "プロファイル(_P):"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1837
+#: ../panels/sound/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -5581,13 +5609,13 @@ msgstr[0] "%u 出力"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1847
+#: ../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:2373
+#: ../panels/sound/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "システムのサウンド"
 
@@ -5758,9 +5786,13 @@ msgstr ""
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;"
+#| "size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;"
+"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;キーボード;マ"
@@ -6385,8 +6417,8 @@ 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.h:1
 msgid "Users"
@@ -6578,9 +6610,14 @@ msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "1234 や abcd などの連続した並びは避けるようにしてください。"
 
 #: ../panels/user-accounts/pw-utils.c:115
+#, fuzzy
+#| msgctxt "Password hint"
+#| msgid "Try to use a mixture of letters, numbers and punctuation."
 msgctxt "Password hint"
-msgid "Try to add more letters, numbers and symbols."
-msgstr "文字、数字、記号をもっと追加するようにしてください。"
+msgid ""
+"Password needs to be longer. Try to add more letters, numbers and "
+"punctuation."
+msgstr "アルファベット、数字、記号を混在させるようにしてください。"
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
@@ -6588,43 +6625,17 @@ msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "大文字、小文字を混在させ、さらに数字を 1 つか 2 つは使用してください。"
 
 #: ../panels/user-accounts/pw-utils.c:119
+#, fuzzy
+#| msgctxt "Password hint"
+#| msgid ""
+#| "Good password! Adding more letters, numbers and punctuation will make it "
+#| "stronger."
 msgctxt "Password hint"
 msgid ""
-"Good password! Adding more letters, numbers and punctuation will make it "
-"stronger."
+"Adding more letters, numbers and punctuation will make the password stronger."
 msgstr ""
 "良いパスワードです! さらに文字や数字、記号を追加するともっと強くなります。"
 
-#: ../panels/user-accounts/pw-utils.c:141
-#: ../panels/user-accounts/pw-utils.c:171
-msgctxt "Password strength"
-msgid "Strength: Weak"
-msgstr "強度: 弱"
-
-#: ../panels/user-accounts/pw-utils.c:145
-#: ../panels/user-accounts/pw-utils.c:172
-msgctxt "Password strength"
-msgid "Strength: Low"
-msgstr "強度: 低"
-
-#: ../panels/user-accounts/pw-utils.c:148
-#: ../panels/user-accounts/pw-utils.c:173
-msgctxt "Password strength"
-msgid "Strength: Medium"
-msgstr "強度: 中"
-
-#: ../panels/user-accounts/pw-utils.c:151
-#: ../panels/user-accounts/pw-utils.c:174
-msgctxt "Password strength"
-msgid "Strength: Good"
-msgstr "強度: 良"
-
-#: ../panels/user-accounts/pw-utils.c:154
-#: ../panels/user-accounts/pw-utils.c:175
-msgctxt "Password strength"
-msgid "Strength: High"
-msgstr "強度: 高"
-
 #: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
@@ -6682,25 +6693,25 @@ msgstr "ログイン提供者のウェブアドレスと一致させる必要が
 msgid "Failed to add account"
 msgstr "アカウントの追加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:463
+#: ../panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: ../panels/user-accounts/um-account-dialog.c:718
-#: ../panels/user-accounts/um-account-dialog.c:764
-#: ../panels/user-accounts/um-account-dialog.c:785
+#: ../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:908
+#: ../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:981
+#: ../panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "ドメインの参加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:1042
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didn’t work.\n"
 "Please try again."
@@ -6708,7 +6719,7 @@ msgstr ""
 "ログイン名に問題がありました。\n"
 "やり直してください。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1049
+#: ../panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didn’t work.\n"
 "Please try again."
@@ -6716,12 +6727,14 @@ msgstr ""
 "パスワードに問題がありました。\n"
 "やり直してください。"
 
-#: ../panels/user-accounts/um-account-dialog.c:1057
+#: ../panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "ドメインへのログインに失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:1115
-msgid "Unable find the domain. Maybe you misspelled it?"
+#: ../panels/user-accounts/um-account-dialog.c:1114
+#, fuzzy
+#| msgid "Unable find the domain. Maybe you misspelled it?"
+msgid "Unable to find the domain. Maybe you misspelled it?"
 msgstr "ドメインを見つけられません。スペルミスがないか確認してください。"
 
 #: ../panels/user-accounts/um-account-type.c:34
@@ -6806,8 +6819,8 @@ msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the “%s” device."
 msgstr ""
-"指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要"
-"があります。"
+"指紋認証を有効にするには、“%s” のデバイスを使って、指紋を登録する必要がありま"
+"す。"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
@@ -6882,39 +6895,39 @@ msgstr "セッション開始"
 msgid "%s — Account Activity"
 msgstr "%s — アカウントのアクティビティ"
 
-#: ../panels/user-accounts/um-password-dialog.c:145
+#: ../panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "別のパスワードを選択してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:154
+#: ../panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "現在のパスワードを再度入力してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:160
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "パスワードが変更できません"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: ../panels/user-accounts/um-photo-dialog.c:215
+#: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "他の画像も参照"
 
-#: ../panels/user-accounts/um-photo-dialog.c:449
+#: ../panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "画像を無効にする"
 
-#: ../panels/user-accounts/um-photo-dialog.c:467
+#: ../panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photo…"
 msgstr "写真を撮る…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:485
+#: ../panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more pictures…"
 msgstr "他の画像も参照…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "%s に使用されています"
@@ -6944,10 +6957,9 @@ msgid "Couldn’t connect to the %s domain: %s"
 msgstr "%sドメインに接続できませんでした: %s"
 
 #: ../panels/user-accounts/um-user-panel.c:195
-#, fuzzy
 #| msgid "%s Account"
 msgid "Your account"
-msgstr "%s アカウント"
+msgstr "あなたのアカウント"
 
 #: ../panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
@@ -7101,6 +7113,11 @@ msgstr ""
 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
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #: ../panels/wacom/button-mapping.ui.h:3
 msgid "Map buttons to functions"
 msgstr "ボタンへ機能を割り当て"
@@ -7171,7 +7188,7 @@ msgstr "単一画面にマッピング"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:502
+#: ../panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "画面のマッピング"
 
@@ -7439,6 +7456,88 @@ msgstr "ホットスポット"
 msgid "No results found"
 msgstr "結果がありません"
 
+#~ msgid "%s %d-bit (Build ID: %s)"
+#~ msgstr "%s %d-bit (Build ID: %s)"
+
+#~ msgid "%s %d-bit"
+#~ msgstr "%s %d ビット"
+
+#~ msgid "Base system"
+#~ msgstr "ベースシステム"
+
+#~ msgid "Shortcut;Repeat;Blink;"
+#~ msgstr ""
+#~ "Shortcut;Repeat;Blink;ショートカット;リピート;点滅;Keyboard;キーボード;"
+
+#~ msgid "Press Esc to cancel."
+#~ msgstr "Escキーでキャンセルします"
+
+#~ msgid "Reset"
+#~ msgstr "リセット"
+
+#~ msgid "Make available to other _users"
+#~ msgstr "他のユーザーにも利用可能にする(_U)"
+
+#~ msgid "Firewall _Zone"
+#~ msgstr "ファイアウォールゾーン(_Z)"
+
+#~ msgctxt "Firewall zone"
+#~ msgid "Default"
+#~ msgstr "デフォルト"
+
+#~ msgid "The zone defines the trust level of the connection"
+#~ msgstr "ゾーンは接続の信頼レベルを定義します"
+
+#~ msgid ""
+#~ "Reset the settings for this network, including passwords, but remember it "
+#~ "as a preferred network"
+#~ msgstr ""
+#~ "パスワードを含め、このネットワークの設定をリセットします。ただし、推奨ネッ"
+#~ "トワークであることは記憶"
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect"
+#~ msgstr ""
+#~ "このネットワークに関する詳細を削除し、自動的に接続しないようにします"
+
+#~ msgid ""
+#~ "If you have a connection to the Internet other than wireless, you can set "
+#~ "up a wireless hotspot to share the connection with others."
+#~ msgstr ""
+#~ "ワイヤレス以外のインターネット接続がある場合には、 ワイヤレスホットスポッ"
+#~ "トを設定し、他の人とインターネット接続を共有することができます。"
+
+#~ msgid "History"
+#~ msgstr "履歴"
+
+#~ msgid "Loading options…"
+#~ msgstr "オプションをロード中…"
+
+#~ msgctxt "Password hint"
+#~ msgid "Try to add more letters, numbers and symbols."
+#~ msgstr "文字、数字、記号をもっと追加するようにしてください。"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Weak"
+#~ msgstr "強度: 弱"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Low"
+#~ msgstr "強度: 低"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Medium"
+#~ msgstr "強度: 中"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: Good"
+#~ msgstr "強度: 良"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strength: High"
+#~ msgstr "強度: 高"
+
 #~ msgid "2"
 #~ msgstr "2"
 
@@ -7646,9 +7745,6 @@ msgstr "結果がありません"
 #~ msgid_plural "%u active"
 #~ msgstr[0] "%u 個がアクティブ"
 
-#~ msgid "Test page"
-#~ msgstr "テストページ"
-
 #~ msgid "Add a New Printer"
 #~ msgstr "新しいプリンターの追加"
 



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