[gnome-control-center/gnome-3-8] [l10n] Update Japanese translation



commit 8010d5c60e9a3fd080a99c3d49cc94918d254c23
Author: Jiro Matsuzawa <jmatsuzawa gnome org>
Date:   Sat Mar 23 17:46:08 2013 +0900

    [l10n] Update Japanese translation

 po/ja.po | 5380 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 3761 insertions(+), 1619 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index d53b2cf..ca77aeb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@
 # 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-2012.
+# Jiro Matsuzawa <jmatsuzawa gnome org>, 2010-2013.
 # Hideki Yamnane <henrich debian org>, 2011.
 # Noriko Mizumoto <noriko fedoraproject org>, 2012.
 #
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2012-09-19 00:52+0000\n"
-"PO-Revision-Date: 2012-09-19 12:25+0000\n"
-"Last-Translator: Noriko Mizumoto <noriko fedoraproject org>\n"
+"POT-Creation-Date: 2013-03-22 21:14+0000\n"
+"PO-Revision-Date: 2013-03-04 00:49+0000\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -93,22 +93,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "選択"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 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:152
+#: ../panels/background/cc-background-item.c:154
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:283
 msgid "No Desktop Background"
 msgstr "デスクトップの背景ではありません"
 
-#: ../panels/background/cc-background-panel.c:387
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "現在の背景"
 
@@ -117,24 +117,14 @@ msgid "Background"
 msgstr "背景"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "背景を変更する"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "背景画像を変更します。"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;"
 
-#. TRANSLATORS: device type
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:102
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "Bluetooth の設定を調整する"
-
 #: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "新しいデバイスの設定"
@@ -148,465 +138,822 @@ msgid "Connection"
 msgstr "接続"
 
 #: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "ページ1"
+
+#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "ページ2"
+
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "ペアリング済"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "種類"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "アドレス"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Mouse and Touchpad Settings"
+#: ../panels/bluetooth/bluetooth.ui.h:9
+msgid "Mouse & Touchpad Settings"
 msgstr "マウスとタッチパッドの設定"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
+#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "サウンドの設定"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "キーボードの設定"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Send Files..."
-msgstr "ファイルを送信..."
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Browse Files..."
-msgstr "ファイルを参照..."
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:13
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../panels/bluetooth/bluetooth.ui.h:12
+msgid "Send Files…"
+msgstr "ファイルを送信…"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "はい"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "いいえ"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:405
+#: ../panels/bluetooth/cc-bluetooth-panel.c:469
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth は無効になっています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:410
+#: ../panels/bluetooth/cc-bluetooth-panel.c:474
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth はハードウェア側のスイッチで無効にされています"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:414
+#: ../panels/bluetooth/cc-bluetooth-panel.c:478
 msgid "No Bluetooth adapters found"
 msgstr "Bluetooth のアダプターが見つかりません"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:547
+#: ../panels/bluetooth/cc-bluetooth-panel.c:577
 msgid "Visibility"
 msgstr "検出可能にする"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:551
+#: ../panels/bluetooth/cc-bluetooth-panel.c:581
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "“%s” を検出可能にする"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:595
+#: ../panels/bluetooth/cc-bluetooth-panel.c:625
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "デバイスの一覧から '%s' を削除しますか?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:597
+#: ../panels/bluetooth/cc-bluetooth-panel.c:627
 msgid "If you remove the device, you will have to set it up again before next use."
 msgstr "デバイスを削除すると、次回利用時には再度設定が必要になります。"
 
-#. TRANSLATORS: this is where the user can click and import a profile
-#: ../panels/color/cc-color-panel.c:106
-msgid "Other profile…"
-msgstr "他のプロファイル…"
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "Bluetooth のオン/オフやデバイスへの接続を行います。"
+
+#. TRANSLATORS: The user has to attach the sensor to the screen
+#: ../panels/color/cc-color-calibrate.c:360
+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:366
+msgid "Move your calibration device to the calibrate position and press 'Continue'"
+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:372
+msgid "Move your calibration device to the surface position and press 'Continue'"
+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:378
+msgid "Shut the laptop lid"
+msgstr ""
+
+#. TRANSLATORS: We suck, the calibation failed and we have no
+#. * good idea why or any suggestions
+#: ../panels/color/cc-color-calibrate.c:409
+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:414
+msgid "Tools required for calibration are not installed."
+msgstr ""
+
+#. TRANSLATORS: The profile failed for some reason
+#: ../panels/color/cc-color-calibrate.c:420
+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:426
+msgid "The target whitepoint was not obtainable."
+msgstr ""
+
+#. TRANSLATORS: the display calibration process is finished
+#: ../panels/color/cc-color-calibrate.c:466
+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:474
+#, fuzzy
+#| msgid "Configuration failed"
+msgid "Calibration failed!"
+msgstr "設定に失敗しました"
+
+#. TRANSLATORS: The user can now remove the sensor from the screen
+#: ../panels/color/cc-color-calibrate.c:481
+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:552
+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
+msgid "Laptop Screen"
+msgstr "ラップトップ画面"
+
+#. TRANSLATORS: This refers to the embedded webcam on a laptop
+#: ../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
+#, c-format
+msgid "%s Monitor"
+msgstr "%s モニター"
+
+# FIXME
+#. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
+#: ../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
+#, c-format
+msgid "%s Camera"
+msgstr "%s カメラ"
+
+#. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
+#: ../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
+#, c-format
+msgid "%s Webcam"
+msgstr "%s ウェブカム"
+
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+msgid "Enable color management for %s"
+msgstr "%s のカラーマネージメントを有効にする"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "%s のカラープロファイルを表示する"
+
+#. not calibrated
+#: ../panels/color/cc-color-device.c:322
+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:119
+#: ../panels/color/cc-color-panel.c:133
 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:126
+#: ../panels/color/cc-color-panel.c:141
 msgid "Colorspace: "
 msgstr "色空間:"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:132
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "テスト用プロファイル: "
 
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:185 ../panels/color/color.ui.h:11
-msgid "Set for all users"
-msgstr "全ユーザー用に設定"
-
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:192
-msgid "Create virtual device"
-msgstr "仮想デバイスの作成"
-
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:227
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "ICC プロファイルの選択"
 
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "インポート(_I)"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "サポートする ICC プロファイル"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:248
+#: ../panels/color/cc-color-panel.c:237
+#: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "すべてのファイル"
 
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:522
-msgid "Available Profiles for Displays"
-msgstr "利用可能なディスプレイ用プロファイル"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:526
-msgid "Available Profiles for Scanners"
-msgstr "利用可能なスキャナー用プロファイル"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:530
-msgid "Available Profiles for Printers"
-msgstr "利用可能なプリンター用プロファイル"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:534
-msgid "Available Profiles for Cameras"
-msgstr "利用可能なカメラ用プロファイル"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:538
-msgid "Available Profiles for Webcams"
-msgstr "利用可能なウェブカム用プロファイル"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#. * where the device type is not recognised
-#. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
-msgid "Available Profiles"
-msgstr "利用可能なプロファイル"
-
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1525
-msgid "Device"
-msgstr "デバイス"
+#: ../panels/color/cc-color-panel.c:581
+#, fuzzy
+#| msgctxt "Distance"
+#| msgid "¼ Screen"
+msgid "Screen"
+msgstr "画面の¼"
 
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:859
-msgid "Calibration"
-msgstr "キャリブレーション"
+#. TRANSLATORS: this is the dialog to save the ICC profile
+#: ../panels/color/cc-color-panel.c:853
+#, fuzzy
+#| msgid "Remove profile"
+msgid "Save Profile"
+msgstr "プロファイルの削除"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:891
+#: ../panels/color/cc-color-panel.c:1214
 msgid "Create a color profile for the selected device"
 msgstr "選択したデバイスのカラープロファイルを作成"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:905 ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid "The measuring instrument is not detected. Please check it is turned on and correctly connected."
 msgstr "計測器が検出できません。電源が入っていること、正しく接続されていることを確認してください。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:938
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
 msgstr "計測器がプリンターのプロファイルをサポートしていません。"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:949
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "このデバイスの種類は現在サポートされていません。"
 
-#. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1022
-msgid "Cannot remove automatically added profile"
-msgstr "自動で追加されたプロファイルを削除できません"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: ../panels/color/cc-color-profile.c:101
+#, fuzzy
+#| msgctxt "Experience"
+#| msgid "Standard"
+msgid "Standard Space"
+msgstr "標準"
 
-#. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1359
-msgid "No profile"
-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:107
+#, fuzzy
+#| msgid "Test profile: "
+msgid "Test Profile"
+msgstr "テスト用プロファイル: "
 
-#: ../panels/color/cc-color-panel.c:1390
-#, c-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i 年"
+#. 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:115
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "自動"
 
-#: ../panels/color/cc-color-panel.c:1401
-#, c-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i か月"
+#. 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:125
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "画質"
 
-#: ../panels/color/cc-color-panel.c:1412
-#, c-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i 週間"
+#. TRANSLATORS: the profile quality
+#: ../panels/color/cc-color-profile.c:130
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "画質"
 
-#. fallback
-#: ../panels/color/cc-color-panel.c:1419
-#, c-format
-msgid "Less than 1 week"
-msgstr "1 週間以下"
+#. 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:137
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "画質"
 
-#: ../panels/color/cc-color-panel.c:1481
+#. 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:154
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "デフォルト RGB"
 
-#: ../panels/color/cc-color-panel.c:1486
+#. 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:161
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "デフォルト CMYK"
 
-#: ../panels/color/cc-color-panel.c:1491
+#. 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:168
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "デフォルトグレー"
 
-#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
-#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
-msgid "Uncalibrated"
-msgstr "未較正"
-
-#: ../panels/color/cc-color-panel.c:1612
-msgid "This device is not color managed."
-msgstr "このデバイスは色の管理が行われていません。"
-
-#: ../panels/color/cc-color-panel.c:1653
-msgid "This device is using manufacturing calibrated data."
-msgstr "このデバイスは製造時のキャリブレーションデータを使用しています。"
+#: ../panels/color/cc-color-profile.c:192
+msgid "Vendor supplied factory calibration data"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:1664
-msgid "This device does not have a profile suitable for whole-screen color correction."
-msgstr "このデバイスには画面全体の色補正に適したプロファイルがありません。"
+#: ../panels/color/cc-color-profile.c:201
+msgid "Full-screen display correction not possible with this profile"
+msgstr ""
 
-#: ../panels/color/cc-color-panel.c:1697
-msgid "This device has an old profile that may no longer be accurate."
+#: ../panels/color/cc-color-profile.c:223
+#, fuzzy
+#| msgid "This device has an old profile that may no longer be accurate."
+msgid "This profile may no longer be accurate"
 msgstr "このデバイスには、すでに正確でない可能性のある古いプロファイルがあります。"
 
-#. TRANSLATORS: this is when the calibration profile age is not
-#. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1725
-msgid "Not specified"
-msgstr "指定なし"
+#: ../panels/color/color-calibrate.ui.h:1
+#, fuzzy
+#| msgid "Calibration"
+msgid "Display Calibration"
+msgstr "キャリブレーション"
 
-#. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1910
-msgid "No devices supporting color management detected"
-msgstr "カラーマネージメントをサポートするデバイスがみつかりません"
+#: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1067
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: ../panels/color/cc-color-panel.c:2139
-msgctxt "Device kind"
-msgid "Display"
-msgstr "ディスプレイ"
+#. This starts the calibration process
+#: ../panels/color/color-calibrate.ui.h:4
+msgid "Start"
+msgstr "開始"
 
-# FIXME
-#: ../panels/color/cc-color-panel.c:2141
-msgctxt "Device kind"
-msgid "Scanner"
-msgstr "スキャナー"
-
-#: ../panels/color/cc-color-panel.c:2143
-msgctxt "Device kind"
-msgid "Printer"
-msgstr "プリンター"
+#. This resumes the calibration process
+#: ../panels/color/color-calibrate.ui.h:6
+msgid "Resume"
+msgstr "再開"
 
-#: ../panels/color/cc-color-panel.c:2145
-msgctxt "Device kind"
-msgid "Camera"
-msgstr "カメラ"
+#. This button returns the user back to the color control panel
+#: ../panels/color/color-calibrate.ui.h:8
+msgid "Done"
+msgstr "完了"
 
-#: ../panels/color/cc-color-panel.c:2147
-msgctxt "Device kind"
-msgid "Webcam"
-msgstr "ウェブカム"
+#. Text printed on screen
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "画面位置調整"
 
-#: ../panels/color/color.ui.h:3
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "色"
+#: ../panels/color/color.ui.h:2
+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 color profile."
+msgstr ""
 
-#: ../panels/color/color.ui.h:4
-msgid "Each device needs an up to date color profile to be color managed."
-msgstr "色の管理を行うには、各デバイスの最新のカラープロファイルが必要になります。"
+#: ../panels/color/color.ui.h:3
+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
-msgid "Learn more"
-msgstr "もっと詳しく"
-
-#: ../panels/color/color.ui.h:6
-msgid "Learn more about color management"
-msgstr "カラーマネージメントについてもっと詳しく知る"
+#, fuzzy
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgid "Quality"
+msgstr "画質"
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
-msgid "Add device"
-msgstr "デバイスの追加"
+msgid "Approximate Time"
+msgstr ""
 
 #: ../panels/color/color.ui.h:8
-msgid "Add a virtual device"
-msgstr "仮想デバイスの追加"
+msgid "Calibration Quality"
+msgstr "キャリブレーション品質"
 
 #: ../panels/color/color.ui.h:9
-msgid "Delete device"
-msgstr "デバイスの削除"
+msgid "Select the sensor device you want to use for calibration."
+msgstr "キャリブレーションに使用するセンサーデバイスを選択してください。"
 
 #: ../panels/color/color.ui.h:10
-msgid "Remove a device"
-msgstr "デバイスの削除"
+msgid "Calibration Device"
+msgstr "キャリブレーションデバイス"
+
+#: ../panels/color/color.ui.h:11
+msgid "Select the type of display that is connected."
+msgstr ""
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this profile for all users on this computer"
-msgstr "コンピューターのすべてのユーザーでプロファイルを利用"
+msgid "Display Type"
+msgstr "ディスプレイの種類"
 
 #: ../panels/color/color.ui.h:13
-msgid "Add profile"
-msgstr "プロファイルの追加"
+msgid "Select a display target white point. Most displays should be calibrated to a D65 illuminant."
+msgstr ""
 
 #: ../panels/color/color.ui.h:14
-msgid "Calibrate…"
-msgstr "キャリブレート…"
+msgid "Profile Whitepoint"
+msgstr ""
 
 #: ../panels/color/color.ui.h:15
-msgid "Calibrate the device"
-msgstr "デバイスのキャリブレート"
+msgid "Please set the display to a brightness that is typical for you. Color management will be most 
accurate at this brightness level."
+msgstr ""
 
 #: ../panels/color/color.ui.h:16
-msgid "Remove profile"
-msgstr "プロファイルの削除"
+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
-msgid "View details"
-msgstr "詳細を表示"
+msgid "Display Brightness"
+msgstr "ディスプレイの明るさ"
 
 #: ../panels/color/color.ui.h:18
+msgid "You can use a color profile on different computers, or even create profiles for different lighting 
conditions."
+msgstr ""
+
+#: ../panels/color/color.ui.h:19
+msgid "Profile Name:"
+msgstr "プロファイル名:"
+
+#: ../panels/color/color.ui.h:20
+msgid "Profile Name"
+msgstr "プロファイル名"
+
+#: ../panels/color/color.ui.h:21
+msgid "Profile successfully created!"
+msgstr "プロファイルが正常に作成されました!"
+
+#: ../panels/color/color.ui.h:22
+msgid "Export"
+msgstr "エクスポート"
+
+#: ../panels/color/color.ui.h:23
+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\">Microsoft Windows</a> systems useful."
+msgstr ""
+
+#: ../panels/color/color.ui.h:24
+#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+msgid "Summary"
+msgstr "概要"
+
+#: ../panels/color/color.ui.h:25
+msgid "Import File…"
+msgstr "ファイルを読み込む…"
+
+#: ../panels/color/color.ui.h:26
+msgid "Problems detected. The profile may not work correctly. <a href=\"\">Show details.</a>"
+msgstr "問題を検出。プロファイルは正しく動作しない可能性があります。<a href=\"\">詳細を表示する。</a>"
+
+#: ../panels/color/color.ui.h:27
 msgid "Device type:"
 msgstr "デバイスの種類:"
 
-#: ../panels/color/color.ui.h:19
+#: ../panels/color/color.ui.h:28
 msgid "Manufacturer:"
 msgstr "製造元:"
 
-#: ../panels/color/color.ui.h:20
+#: ../panels/color/color.ui.h:29
 msgid "Model:"
 msgstr "モデル:"
 
-#: ../panels/color/color.ui.h:21
+#: ../panels/color/color.ui.h:30
 msgid "Image files can be dragged on this window to auto-complete the above fields."
 msgstr "画像ファイルをこのウィンドウにドラッグすることで、上のフィールドを自動補完できます。"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "カラーマネージメントの設定"
+#: ../panels/color/color.ui.h:31
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "色"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr "Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレーション;プリンター;ディスプレイ;"
+#: ../panels/color/color.ui.h:32
+msgid "Each device needs an up to date color profile to be color managed."
+msgstr "色の管理を行うには、各デバイスの最新のカラープロファイルが必要になります。"
+
+#: ../panels/color/color.ui.h:33
+msgid "Learn more"
+msgstr "もっと詳しく"
+
+#: ../panels/color/color.ui.h:34
+msgid "Learn more about color management"
+msgstr "カラーマネージメントについてもっと詳しく知る"
+
+#: ../panels/color/color.ui.h:35
+msgid "Set for all users"
+msgstr "全ユーザー用に設定"
+
+#: ../panels/color/color.ui.h:36
+msgid "Set this profile for all users on this computer"
+msgstr "コンピューターのすべてのユーザーでプロファイルを利用"
+
+#: ../panels/color/color.ui.h:37
+msgid "Enable"
+msgstr "有効にする"
+
+#: ../panels/color/color.ui.h:38
+msgid "Add profile"
+msgstr "プロファイルの追加"
+
+#: ../panels/color/color.ui.h:39
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate…"
+msgstr "キャリブレート…"
+
+#: ../panels/color/color.ui.h:40
+msgid "Calibrate the device"
+msgstr "デバイスのキャリブレート"
+
+#: ../panels/color/color.ui.h:41
+msgid "Remove profile"
+msgstr "プロファイルの削除"
+
+#: ../panels/color/color.ui.h:42
+msgid "View details"
+msgstr "詳細を表示"
+
+#: ../panels/color/color.ui.h:43
+msgid "Unable to detect any devices that can be color managed"
+msgstr "カラーマネジメント対象のデバイスを検出できません"
+
+#: ../panels/color/color.ui.h:44
+msgid "LCD"
+msgstr "LCD"
+
+#: ../panels/color/color.ui.h:45
+msgid "LED"
+msgstr "LED"
+
+#: ../panels/color/color.ui.h:46
+msgid "CRT"
+msgstr "CRT"
+
+#: ../panels/color/color.ui.h:47
+msgid "Projector"
+msgstr "プロジェクター"
+
+#: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr "プラズマ"
+
+#: ../panels/color/color.ui.h:49
+#, fuzzy
+#| msgid "High"
+msgctxt "Calibration quality"
+msgid "High"
+msgstr "高い"
+
+#: ../panels/color/color.ui.h:50
+msgid "40 minutes"
+msgstr "40 分"
+
+#: ../panels/color/color.ui.h:51
+msgctxt "Calibration quality"
+msgid "Medium"
+msgstr ""
+
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/privacy/privacy.ui.h:7
+msgid "30 minutes"
+msgstr "30 分"
+
+#: ../panels/color/color.ui.h:53
+#, fuzzy
+#| msgid "Low"
+msgctxt "Calibration quality"
+msgid "Low"
+msgstr "低い"
 
-#. Add some common languages first
-#: ../panels/common/cc-common-language.c:523
-msgid "English"
-msgstr "英語"
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+msgid "15 minutes"
+msgstr "15 分"
 
-#: ../panels/common/cc-common-language.c:525
-msgid "British English"
-msgstr "イギリス英語"
+#: ../panels/color/color.ui.h:55
+#, fuzzy
+#| msgid "Panel to display"
+msgid "Native to display"
+msgstr "表示するパネル"
 
-#: ../panels/common/cc-common-language.c:528
-msgid "German"
-msgstr "ドイツ語"
+#: ../panels/color/color.ui.h:56
+#, fuzzy
+#| msgid "Pointing and Clicking"
+msgid "D50 (Printing and publishing)"
+msgstr "ポインター操作とクリック"
 
-#: ../panels/common/cc-common-language.c:531
-msgid "French"
-msgstr "フランス語"
+#: ../panels/color/color.ui.h:57
+msgid "D55"
+msgstr "D55"
 
-#: ../panels/common/cc-common-language.c:534
-msgid "Spanish"
-msgstr "スペイン語"
+#: ../panels/color/color.ui.h:58
+msgid "D65 (Photography and graphics)"
+msgstr "D65 (写真とグラフィック)"
 
-#: ../panels/common/cc-common-language.c:536
-msgid "Chinese (simplified)"
-msgstr "中国語 (簡体字)"
+#: ../panels/color/color.ui.h:59
+msgid "D75"
+msgstr "D75"
 
-#: ../panels/common/cc-common-language.c:539
-msgid "Russian"
-msgstr "ロシア語"
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr ""
 
-#: ../panels/common/cc-common-language.c:542
-msgid "Arabic"
-msgstr "アラビア語"
+#. Translators: those are keywords for the color control-center panel
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr "Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレーション;プリンター;ディスプレイ;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:571
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
-msgstr "米国"
+msgstr "US"
 
-#: ../panels/common/cc-common-language.c:572
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "ドイツ"
 
-#: ../panels/common/cc-common-language.c:573
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "フランス"
 
-#: ../panels/common/cc-common-language.c:574
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "スペイン"
 
-#: ../panels/common/cc-common-language.c:575
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "中国"
 
-#: ../panels/common/cc-language-chooser.c:122
-msgid "Other..."
-msgstr "その他..."
+#: ../panels/common/cc-common-language.c:747
+msgid "Other…"
+msgstr "その他…"
 
-#: ../panels/common/cc-language-chooser.c:296
-msgid "Select a region"
-msgstr "地域を選択してください"
+#: ../panels/common/cc-language-chooser.c:176
+#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/region/cc-input-chooser.c:172
+msgid "More…"
+msgstr "さらに…"
 
-#: ../panels/common/gdm-languages.c:781
-msgid "Unspecified"
-msgstr "未指定"
+#: ../panels/common/cc-language-chooser.c:193
+msgid "No languages found"
+msgstr "言語が見つかりません"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "言語を選択してください"
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "無効"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:462
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "左Shift"
+
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "左Alt"
+
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "左Ctrl"
+
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "右Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "右Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "右Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "左Alt+左Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "右Alt+右Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "左Ctrl+左Shift"
+
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "右Ctrl+右Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "左Shift+右Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "左Alt+右Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "左Ctrl+右Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "選択(_S)"
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "言語"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "完了(_D)"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -718,8 +1065,8 @@ msgid "Date & Time"
 msgstr "日付と時刻"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "日付と時刻の設定パネル"
+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:4
@@ -734,22 +1081,22 @@ msgstr "システムの時刻と日付の設定を変更"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "時刻と日付の設定を変更するには、認証が必要です。"
 
-#: ../panels/display/cc-display-panel.c:481
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "標準"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "反時計回り"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:485
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "時計回り"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:486
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180度"
@@ -760,56 +1107,53 @@ msgstr "180度"
 #. * used as an adjective.  For example, the Spanish translation could be
 #. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:623
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../panels/display/cc-display-panel.c:625
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "ミラーされたディスプレイ"
 
-#: ../panels/display/cc-display-panel.c:647
+#: ../panels/display/cc-display-panel.c:649
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "モニター"
 
-#: ../panels/display/cc-display-panel.c:748
-#, c-format
-msgid "%d x %d (%s)"
-msgstr "%d x %d (%s)"
-
-#: ../panels/display/cc-display-panel.c:750
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
-
-#: ../panels/display/cc-display-panel.c:1659
+#: ../panels/display/cc-display-panel.c:1669
 msgid "Drag to change primary display."
 msgstr "第 1 ディスプレイを変更するにはドラッグしてください。"
 
-#: ../panels/display/cc-display-panel.c:1717
+#: ../panels/display/cc-display-panel.c:1727
 msgid "Select a monitor to change its properties; drag it to rearrange its placement."
 msgstr "設定を変更するモニターを選んでください。ドラッグして位置を調整してください。"
 
-#: ../panels/display/cc-display-panel.c:2105
+#: ../panels/display/cc-display-panel.c:2115
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2107
+#: ../panels/display/cc-display-panel.c:2117
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../panels/display/cc-display-panel.c:2269
-#: ../panels/display/cc-display-panel.c:2321
+#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2331
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "設定の適用に失敗しました: %s"
 
-#: ../panels/display/cc-display-panel.c:2349
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "モニターの設定を保存できませんでした"
 
-#: ../panels/display/cc-display-panel.c:2409
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "ディスプレイを検出できませんでした"
 
-#: ../panels/display/cc-display-panel.c:2603
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "スクリーンの情報を取得できませんでした"
 
@@ -839,93 +1183,62 @@ msgid "Displays"
 msgstr "ディスプレイ"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "モニターやプロジェクターの解像度と位置を変更する"
+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:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;パネル;プロジェクター;画面;解像度;リフレッシュ;"
 
-#. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:413
-#, c-format
-msgid "VESA: %s"
-msgstr "VESA: %s"
-
-#. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
-#: ../panels/network/panel-common.c:162
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "不明"
 
-#. translators: This is the type of architecture, for example:
-#. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:593
+#: ../panels/info/cc-info-panel.c:541
+#, c-format
+msgid "%s %d-bit"
+msgstr "%s %d ビット"
+
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d ビット"
 
-#: ../panels/info/cc-info-panel.c:752
-msgid "Unknown model"
-msgstr "不明なモデル"
-
-#: ../panels/info/cc-info-panel.c:835
-msgid "The next login will attempt to use the standard experience."
-msgstr "次回ログインは標準モードの使用を試みます。"
-
-#: ../panels/info/cc-info-panel.c:837
-msgid "The next login will use the fallback mode intended for unsupported graphics hardware."
-msgstr "次回ログインは、サポート対象外のグラフィックハードウェア向けにフォールバックモードを使用します。"
-
-#. translators: The hardware is not able to run GNOME 3's
-#. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:879
-msgctxt "Experience"
-msgid "Fallback"
-msgstr "フォールバック"
-
-#. translators: The hardware is able to run GNOME 3's
-#. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:885
-msgctxt "Experience"
-msgid "Standard"
-msgstr "標準"
-
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "どうするか確認する"
 
-#: ../panels/info/cc-info-panel.c:1231
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: ../panels/info/cc-info-panel.c:1235
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "フォルダーを開く"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "他のメディア"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "オーディオCD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "ビデオDVD用のアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application to run when a music player is connected"
 msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application to run when a camera is connected"
 msgstr "カメラが接続された時に起動するアプリケーションを選択"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "ソフトウェアの CD を開くアプリケーションを選択してください"
 
@@ -934,108 +1247,106 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択し
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "オーディオ DVD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "空のブルーレイディスク"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "空の CD"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "空の DVD"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "空の HD DVD"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "ブルーレイビデオディスク"
 
-#: ../panels/info/cc-info-panel.c:1379
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "電子書籍リーダー"
 
-#: ../panels/info/cc-info-panel.c:1380
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD ビデオディスク"
 
-#: ../panels/info/cc-info-panel.c:1381
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "ピクチャーCD"
 
-#: ../panels/info/cc-info-panel.c:1382
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "スーパービデオCD"
 
-#: ../panels/info/cc-info-panel.c:1383
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "ビデオCD"
 
-#: ../panels/info/cc-info-panel.c:1384
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows ソフトウェア"
 
-#: ../panels/info/cc-info-panel.c:1385
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: ../panels/info/cc-info-panel.c:1508
-#: ../panels/keyboard/keyboard-shortcuts.c:1667
+#: ../panels/info/cc-info-panel.c:1499
+#: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "セクション"
 
-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "概要"
 
-#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "既定のアプリケーション"
 
-#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "リムーバブルメディア"
 
-#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
-msgid "Graphics"
-msgstr "グラフィック"
-
-#: ../panels/info/cc-info-panel.c:1735
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "バージョン %s"
 
-#: ../panels/info/cc-info-panel.c:1785
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "更新をインストール"
 
-#: ../panels/info/cc-info-panel.c:1789
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "システムは更新済み"
 
-#: ../panels/info/cc-info-panel.c:1793
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "更新を確認中"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+#: ../panels/network/connection-editor/ce-page-details.c:240
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "詳細"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "システム情報"
+msgid "View information about your system"
+msgstr "システム情報を表示します。"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
-msgid 
"device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
-msgstr 
"device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;デバイス;システム;情報;メモリ;プロセッサ;バージョン;デフォルト;アプリケーション;フォールバック;設定;CD;DVD;USB;オーディオ;ビデオ;ディスク;リムーバブルメディア;メディア;自動起動;"
+msgid 
"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+msgstr 
"device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;デバイス;システム;情報;メモリ;プロセッサ;バージョン;デフォルト;アプリケーション;設定;オーディオ;音声;音楽;ミュージック;ビデオ;動画;ディスク;リムーバブルメディア;媒体;自動起動;オートラン;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1061,83 +1372,79 @@ msgstr "メモリ"
 msgid "Processor"
 msgstr "プロセッサ"
 
-#: ../panels/info/info.ui.h:7
-msgid "OS type"
-msgstr "OS 種別"
-
+#. To translators: this field contains the distro name, version and type
 #: ../panels/info/info.ui.h:8
+msgid "Base system"
+msgstr "ベースシステム"
+
+#: ../panels/info/info.ui.h:9
 msgid "Disk"
 msgstr "ディスク"
 
-#: ../panels/info/info.ui.h:9
-msgid "Calculating..."
-msgstr "計算中..."
+#: ../panels/info/info.ui.h:10
+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:14
 msgid "_Web"
 msgstr "ウェブ(_W)"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:15
 msgid "_Mail"
 msgstr "メール(_M)"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:16
 msgid "_Calendar"
 msgstr "カレンダー(_C)"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:17
 msgid "M_usic"
 msgstr "音楽(_U)"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:18
 msgid "_Video"
 msgstr "ビデオ(_V)"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:19
 msgid "_Photos"
 msgstr "写真(_P)"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:21
 msgid "Select how media should be handled"
 msgstr "メディアの処理方法を選択してください"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:22
 msgid "CD _audio"
 msgstr "CD オーディオ(_A)"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:23
 msgid "_DVD video"
 msgstr "DVD ビデオ(_D)"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:24
 msgid "_Music player"
 msgstr "音楽プレイヤー(_M)"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:25
 msgid "_Software"
 msgstr "ソフトウェア(_S)"
 
-#: ../panels/info/info.ui.h:24
-msgid "_Other Media..."
-msgstr "他のメディア(_O)..."
+#: ../panels/info/info.ui.h:26
+msgid "_Other Media…"
+msgstr "他のメディア(_O)…"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:27
 msgid "_Never prompt or start programs on media insertion"
 msgstr "メディア挿入時にどう処理するか確認したり、プログラムを実行したりしない(_N)"
 
-#: ../panels/info/info.ui.h:27
-msgid "Driver"
-msgstr "ドライバー"
-
-#: ../panels/info/info.ui.h:28
-msgid "Experience"
-msgstr "モード"
-
-#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
-#: ../panels/info/info.ui.h:30
-msgid "Forced _Fallback Mode"
-msgstr "強制フォールバックモード(_F)"
-
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "音とメディア"
@@ -1184,19 +1491,17 @@ msgstr "取り出し"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Typing"
 msgstr "タイピング"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Switch to next source"
-msgstr "次のソースへ切り替える"
+msgid "Switch to next input source"
+msgstr "次の入力ソースへ切り替える"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Switch to previous source"
-msgstr "前のソースへ切り替える"
+msgid "Switch to previous input source"
+msgstr "前の入力ソースへ切り替える"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
@@ -1223,6 +1528,7 @@ msgid "Home folder"
 msgstr "ホームフォルダー"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
+msgctxt "keybinding"
 msgid "Search"
 msgstr "検索"
 
@@ -1230,20 +1536,20 @@ msgstr "検索"
 msgid "Screenshots"
 msgstr "スクリーンショット"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:3
-msgid "Save a screenshot to Pictures"
-msgstr "スクリーンショットを画像フォルダーに保存する"
+msgid "Save a screenshot to $PICTURES"
+msgstr "スクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:5
-msgid "Save a screenshot of a window to Pictures"
-msgstr "ウィンドウのスクリーンショットを画像フォルダーに保存する"
+msgid "Save a screenshot of a window to $PICTURES"
+msgstr "ウィンドウのスクリーンショットを$PICTURESフォルダーに保存する"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:7
-msgid "Save a screenshot of an area to Pictures"
-msgstr "選択領域のスクリーンショットを画像フォルダーに保存する"
+msgid "Save a screenshot of an area to $PICTURES"
+msgstr "選択領域のスクリーンショットを$PICTURESフォルダーに保存する"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:8
 msgid "Copy a screenshot to clipboard"
@@ -1258,7 +1564,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "選択領域のスクリーンショットをクリップボードにコピーする"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "システム"
 
@@ -1307,33 +1612,26 @@ msgstr "文字サイズを縮小"
 msgid "High contrast on or off"
 msgstr "ハイコントラストのオン/オフを切り替える"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:241
-#: ../panels/keyboard/cc-keyboard-option.c:347
-#: ../panels/keyboard/keyboard-shortcuts.c:1132
-#: ../panels/sound/gvc-mixer-control.c:1834
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "無効"
-
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "代替文字キー"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "Compose キー"
 
+#: ../panels/keyboard/cc-keyboard-option.c:371
+msgid "Modifiers-only switch to next source"
+msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "キーボード"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "キーボードの設定を変更する"
+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:4
@@ -1368,15 +1666,13 @@ msgstr "間隔(_D):"
 msgid "_Speed:"
 msgstr "速度(_S):"
 
-#. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:49
+msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "短い"
 
-#. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "遅い"
 
@@ -1384,15 +1680,13 @@ msgstr "遅い"
 msgid "Repeat keys speed"
 msgstr "押したキーをリピートする際の速さです"
 
-#. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:52
+msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "長い"
 
-#. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "速い"
 
@@ -1413,8 +1707,9 @@ msgid "Cursor blink speed"
 msgstr "カーソルが点滅する速さです"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "レイアウトの設定"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "入力ソース"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1430,20 +1725,19 @@ msgid "To edit a shortcut, click the row and hold down the new keys or press Bac
 msgstr "ショートカットを編集するには、対応する行をクリックし、新しいキーの組み合わせを押すか、[BS] キーで取り消してください。"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:557
-#: ../panels/keyboard/keyboard-shortcuts.c:565
+#: ../panels/keyboard/keyboard-shortcuts.c:585
+#: ../panels/keyboard/keyboard-shortcuts.c:593
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:776
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<不明な操作>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1273
+#: ../panels/keyboard/keyboard-shortcuts.c:1301
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
@@ -1452,7 +1746,7 @@ msgstr ""
 "このキーでは入力できないので \"%s\" というショートカットキーは利用できません。\n"
 "[Ctrl] や [Alt] や [Shift] といった修飾キーを併用するようにしてください。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1305
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1461,26 +1755,26 @@ msgstr ""
 "\"%s\" というショートカットはすでに登録済みです:\n"
 "\"%s\""
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1310
+#: ../panels/keyboard/keyboard-shortcuts.c:1338
 #, c-format
 msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "ショートカットを \"%s\" に変更すると、\"%s\" というショートカットが無効になります。"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1316
+#: ../panels/keyboard/keyboard-shortcuts.c:1344
 msgid "_Reassign"
 msgstr "割り当てる(_R)"
 
-#: ../panels/mouse/cc-mouse-panel.c:152
-msgid "_Test Your Settings"
-msgstr "設定を確認する(_T)"
+#: ../panels/mouse/cc-mouse-panel.c:123
+msgid "Test Your _Settings"
+msgstr "設定を確認する(_S)"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse & Touchpad"
 msgstr "マウスとタッチパッド"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "マウスとタッチパッドを設定します"
+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:4
@@ -1495,51 +1789,63 @@ msgstr "マウスの設定"
 msgid "General"
 msgstr "全般"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+msgctxt "mouse, speed"
+msgid "Slow"
+msgstr "遅い"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Double-click timeout"
 msgstr "ダブルクリックと認識される最長クリック間隔"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+msgctxt "mouse, speed"
+msgid "Fast"
+msgstr "速い"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "_Double-click"
 msgstr "ダブルクリック(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Primary _button"
 msgstr "主ボタン(_B)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "左(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "右(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "Mouse"
 msgstr "マウス"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "_Pointer speed"
 msgstr "ポインターの速度(_P)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgid "Touchpad"
 msgstr "タッチパッド"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Disable while _typing"
 msgstr "タイプ中は無効にする(_T)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Tap to _click"
 msgstr "タップでクリックする(_C)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgid "Two _finger scroll"
 msgstr "二指でのスクロール(_F)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "C_ontent sticks to fingers"
 msgstr "指を動かす方向にコンテンツが移動 (ナチュラル)(_O)"
 
@@ -1576,224 +1882,809 @@ msgstr "ダブルクリック、副ボタン"
 msgid "Single click, secondary button"
 msgstr "シングルクリック、副ボタン"
 
-#: ../panels/network/cc-network-panel.c:615
+#. TRANSLATORS: this is to disable the radio hardware in the
+#. * network panel
+#: ../panels/network/cc-network-panel.c:347
+msgid "Air_plane Mode"
+msgstr "機内モード(_P)"
+
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "ネットワークプロキシ"
 
-#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:866
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr "システムのネットワークサービスはこのバージョンと互換性がありません。"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:1001
-msgid "Air_plane Mode"
-msgstr "機内モード(_P)"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "ネットワーク"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "ネットワークの設定"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#, fuzzy
+#| msgid "Security"
+msgid "802.1x _Security"
+msgstr "セキュリティ"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;IP;LAN;Proxy;"
-msgstr "Network;Wireless;IP;LAN;Proxy;ネットワーク;無線;プロキシ;"
+#: ../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:1
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity"
+msgstr ""
 
-#: ../panels/network/net-device-mobile.c:222
-msgid "Add new connection"
-msgstr "新規の接続を追加"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Inner _authentication"
+msgstr "認証に失敗しました"
 
-#. Translators: network device speed
-#: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:770
-#: ../panels/network/net-device-wired.c:126
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
+#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/details-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:4
+msgid "Security"
+msgstr "セキュリティ"
 
-#. TRANSLATORS: this is when the access point is not shown
-#. * in the list and the user has to enter the SSID manually
-#.
-#: ../panels/network/net-device-wifi.c:203
-msgid "Connect to a Hidden Network"
-msgstr "非表示のネットワークに接続"
+#: ../panels/network/connection-editor/ce-page.c:502
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "automatic"
+msgstr "自動"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:302
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/connection-editor/ce-page-details.c:52
+#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:385
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:306
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:310
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:232
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:315
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/net-device-wifi.c:320
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/connection-editor/ce-page-details.c:70
+#: ../panels/network/net-device-wifi.c:242
+#: ../panels/network/net-device-wifi.c:375
 msgctxt "Wifi security"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/net-device-wifi.c:697
-msgid "never"
-msgstr "まったくない"
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+msgid "Never"
+msgstr "しない"
 
-#: ../panels/network/net-device-wifi.c:707
-msgid "today"
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+msgid "Today"
 msgstr "今日"
 
-#: ../panels/network/net-device-wifi.c:709
-msgid "yesterday"
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+msgid "Yesterday"
 msgstr "昨日"
 
-#: ../panels/network/net-device-wifi.c:711
+#: ../panels/network/connection-editor/ce-page-details.c:106
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:479
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i 日前"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/net-device-wifi.c:780
-#: ../panels/network/panel-common.c:277
-msgid "Not connected"
-msgstr "接続していない"
-
-#: ../panels/network/net-device-wifi.c:782
-#: ../panels/network/net-device-wifi.c:2086
-msgid "Out of range"
-msgstr "範囲外"
+#. Translators: network device speed
+#: ../panels/network/connection-editor/ce-page-details.c:155
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:537
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#: ../panels/network/net-device-wifi.c:813
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/network/net-device-wifi.c:815
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "弱い"
 
-#: ../panels/network/net-device-wifi.c:817
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/net-device-wifi.c:819
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "良い"
 
-#: ../panels/network/net-device-wifi.c:821
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "非常に良い"
 
-#: ../panels/network/net-device-wifi.c:1005
-#, c-format
-msgid "Network details for %s including password and any custom configuration will be lost."
-msgstr "パスワードや独自の設定など、 %s のネットワーク詳細はすべて失われることになります。"
+#: ../panels/network/connection-editor/ce-page-ethernet.c:200
+#: ../panels/network/connection-editor/ce-page-vpn.c:172
+#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Identity"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:1016
-msgid "Forget"
-msgstr "破棄"
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:1552
-msgid "If you have a connection to the Internet other than wireless, you can use it to share your internet 
connection with others."
-msgstr "ワイヤレス以外のインターネット接続がある場合には、 他の人とそのインターネット接続を共有することができます。"
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../panels/network/network-vpn.ui.h:3
+msgid "Gateway"
+msgstr "ゲートウェイ"
 
-#: ../panels/network/net-device-wifi.c:1556
-#, c-format
-msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr "ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
+#: ../panels/network/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+#, fuzzy
+#| msgid "IP Address"
+msgid "Delete Address"
+msgstr "IP アドレス"
 
-#: ../panels/network/net-device-wifi.c:1560
-msgid "It is not possible to access the internet through your wireless while the hotspot is active."
-msgstr "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続は できません。"
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "追加(_A)"
 
-#: ../panels/network/net-device-wifi.c:1626
-msgid "Stop hotspot and disconnect any users?"
-msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr ""
 
-#: ../panels/network/net-device-wifi.c:1629
-msgid "_Stop Hotspot"
-msgstr "停止(_S)"
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+#, fuzzy
+#| msgid "Delete device"
+msgid "Delete DNS Server"
+msgstr "デバイスの削除"
 
-#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
-msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr "設定ファイルの URL が指定されていない場合 Web Proxy Autodiscovery が使用されます。"
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
+#, fuzzy
+#| msgid "Metric"
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "メートル法"
 
-#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
-#. * 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:75
-msgid "This is not recommended for untrusted public networks."
-msgstr "信頼できない公衆ネットワークでは推奨されません。"
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+#, fuzzy
+#| msgid "Default Route"
+msgid "Delete Route"
+msgstr "デフォルトルート"
 
-#: ../panels/network/net-proxy.c:367
-msgid "Proxy"
-msgstr "プロキシ"
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic (DHCP)"
+msgstr "自動"
 
-#: ../panels/network/network-mobile.ui.h:1
-msgid "IMEI"
-msgstr "IMEI"
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
+#: ../panels/network/network-wifi.ui.h:25
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Manual"
+msgid "Manual"
+msgstr "手動"
 
-#: ../panels/network/network-mobile.ui.h:2
-msgid "Provider"
-msgstr "プロバイダー"
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr ""
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "IP アドレス"
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr ""
 
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:13
-#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
-msgid "IPv6 Address"
-msgstr "IPv6 アドレス"
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr ""
 
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:14
-#: ../panels/network/network-wired.ui.h:4
-msgid "Default Route"
-msgstr "デフォルトルート"
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../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:2
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic"
+msgstr "自動"
 
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:15
-#: ../panels/network/network-wired.ui.h:5
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Automatic, DHCP only"
+msgstr "自動ログイン(_U)"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+msgid "Reset"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:250
+#, fuzzy
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "何もしない"
+
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+#, fuzzy
+#| msgid "Enterprise"
+msgid "WPA & WPA2 Enterprise"
+msgstr "Enterprise"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#, fuzzy
+#| msgid "Supply"
+msgid "_Apply"
+msgstr "サプライ"
+
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+#, fuzzy
+#| msgid "Strength"
+msgid "Signal Strength"
+msgstr "長さ:"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "リンクの速度"
+
+#: ../panels/network/connection-editor/details-page.ui.h:4
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+msgid "IPv4 Address"
+msgstr "IPv4 アドレス"
+
+#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
+msgid "IPv6 Address"
+msgstr "IPv6 アドレス"
+
+#: ../panels/network/connection-editor/details-page.ui.h:6
+#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/network-simple.ui.h:1
+#: ../panels/network/network-wifi.ui.h:7
+msgid "Hardware Address"
+msgstr "ハードウェア・アドレス"
+
+#: ../panels/network/connection-editor/details-page.ui.h:7
+#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h: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/net-device-ethernet.c:173
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
 msgid "DNS"
 msgstr "DNS"
 
+#: ../panels/network/connection-editor/details-page.ui.h:9
+#, fuzzy
+#| msgid "Last used"
+msgid "Last Used"
+msgstr "最後の利用"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#, fuzzy
+#| msgid "%d Mb/s"
+msgid "10 Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#, fuzzy
+#| msgid "%d Mb/s"
+msgid "100 Mb/s"
+msgstr "%d Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:10
+#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#, fuzzy
+#| msgid "_Name:"
+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:49
+#, fuzzy
+#| msgid "Address"
+msgid "_MAC Address"
+msgstr "アドレス"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#, fuzzy
+#| msgid "IP Address"
+msgid "_Cloned Address"
+msgstr "IP アドレス"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr ""
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+msgid "bytes"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:24
+#, fuzzy
+#| msgid "Address"
+msgid "_Addresses"
+msgstr "アドレス"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic DNS"
+msgstr "自動"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/network-wifi.ui.h:39
+msgid "Routes"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#, fuzzy
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Routes"
+msgstr "自動"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/network-wifi.ui.h:45
+msgid "Use this connection _only for resources on its network"
+msgstr ""
+
+#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+#, fuzzy
+#| msgid "Bluetooth connection failed"
+msgid "Unable to open connection editor"
+msgstr "Bluetooth接続に失敗しました"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+#, fuzzy
+#| msgid "No profile"
+msgid "New Profile"
+msgstr "プロファイルなし"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1068
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+#, fuzzy
+#| msgid "Could not load ui: %s"
+msgid "Could not load VPN plugins"
+msgstr "ui ファイルを読み込めませんでした: %s"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+#, fuzzy
+#| msgid "Other profile…"
+msgid "Import from file…"
+msgstr "他のプロファイル…"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+#, fuzzy
+#| msgid "Add new connection"
+msgid "Add Network Connection"
+msgstr "新規の接続を追加"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr ""
+
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+#, fuzzy
+#| msgid "Forget"
+msgid "_Forget"
+msgstr "破棄"
+
+#: ../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:14
+#, fuzzy
+#| msgid "Security"
+msgid "S_ecurity"
+msgstr "セキュリティ"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:207
+#, c-format
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+msgid "Select file to import"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+#, fuzzy, c-format
+#| msgid "A user with name '%s' already exists."
+msgid "A file named \"%s\" already exists."
+msgstr "'%s' という名前のユーザーはすでに存在します。"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:298
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:334
+msgid "Cannot export VPN connection"
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:336
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+msgid "(Error: unable to load VPN connection editor)"
+msgstr ""
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:12
+msgid "_SSID"
+msgstr ""
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr ""
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+#, fuzzy
+#| msgid "_Forget Network"
+msgid "My Home Network"
+msgstr "ネットワークを破棄(_F)"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr ""
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "ネットワーク"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Not connected to the internet."
+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:4
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgstr ""
+
+#: ../panels/network/net-device-bond.c:77
+msgid "Bond slaves"
+msgstr ""
+
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr ""
+
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr "まったくない"
+
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr "今日"
+
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr "昨日"
+
+#: ../panels/network/net-device-ethernet.c:162
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "IP アドレス"
+
+#: ../panels/network/net-device-ethernet.c:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "最後の利用"
+
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "オプション…"
+
+#: ../panels/network/net-device-ethernet.c:472
+#, fuzzy, c-format
+#| msgid "_Profile:"
+msgid "Profile %d"
+msgstr "プロファイル(_P):"
+
+#: ../panels/network/net-device-mobile.c:241
+msgid "Add new connection"
+msgstr "新規の接続を追加"
+
+#: ../panels/network/net-device-wifi.c:1120
+#, fuzzy
+#| msgid "If you have a connection to the Internet other than wireless, you can use it to share your 
internet connection with others."
+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:1124
+#, 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:1128
+#, fuzzy
+#| msgid "It is not possible to access the internet through your wireless while the hotspot is active."
+msgid "It is not possible to access the Internet through your wireless while the hotspot is active."
+msgstr "ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続は できません。"
+
+#: ../panels/network/net-device-wifi.c:1202
+msgid "Stop hotspot and disconnect any users?"
+msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
+
+#: ../panels/network/net-device-wifi.c:1205
+msgid "_Stop Hotspot"
+msgstr "停止(_S)"
+
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr ""
+
+#: ../panels/network/net-device-wifi.c:1280
+#, fuzzy
+#| msgid "InfiniBand device does not support connected mode"
+msgid "Wireless device does not support Hotspot mode"
+msgstr "InfiniBandデバイスは接続モードに対応していません"
+
+#: ../panels/network/net-device-wifi.c:1407
+#, fuzzy
+#| msgid "Network details for %s including password and any custom configuration will be lost."
+msgid "Network details for the selected networks, including passwords and any custom configuration will be 
lost."
+msgstr "パスワードや独自の設定など、 %s のネットワーク詳細はすべて失われることになります。"
+
+#: ../panels/network/net-device-wifi.c:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr "履歴"
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+#, fuzzy
+#| msgid "Forget"
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "破棄"
+
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/net-proxy.c:67
+msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgstr "設定ファイルの URL が指定されていない場合 Web Proxy Autodiscovery が使用されます。"
+
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * 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:75
+msgid "This is not recommended for untrusted public networks."
+msgstr "信頼できない公衆ネットワークでは推奨されません。"
+
+#: ../panels/network/net-proxy.c:408
+msgid "Proxy"
+msgstr "プロキシ"
+
+#: ../panels/network/network-ethernet.ui.h:1
+#, fuzzy
+#| msgid "Add profile"
+msgid "_Add Profile…"
+msgstr "プロファイルの追加"
+
+#: ../panels/network/network-mobile.ui.h:1
+msgid "IMEI"
+msgstr "IMEI"
+
+#: ../panels/network/network-mobile.ui.h:2
+msgid "Provider"
+msgstr "プロバイダー"
+
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-wired.ui.h:6
-msgid "_Options..."
-msgstr "オプション(_O)..."
+#: ../panels/network/network-simple.ui.h:7
+#, fuzzy
+#| msgid "_Options"
+msgid "_Options…"
+msgstr "オプション(_O)"
 
 #: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
@@ -1834,467 +2725,946 @@ msgstr "FTP プロキシ(_F)"
 msgid "_Socks Host"
 msgstr "Socks ホスト(_S)"
 
+#: ../panels/network/network-proxy.ui.h:10
+msgid "_Ignore Hosts"
+msgstr ""
+
+#: ../panels/network/network-proxy.ui.h:11
+#, fuzzy
+#| msgid "_HTTP Proxy"
+msgid "HTTP proxy port"
+msgstr "HTTP プロキシ(_H)"
+
+#: ../panels/network/network-proxy.ui.h:12
+#, fuzzy
+#| msgid "H_TTPS Proxy"
+msgid "HTTPS proxy port"
+msgstr "HTTPS プロキシ(_T)"
+
+#: ../panels/network/network-proxy.ui.h:13
+#, fuzzy
+#| msgid "_FTP Proxy"
+msgid "FTP proxy port"
+msgstr "FTP プロキシ(_F)"
+
+#: ../panels/network/network-proxy.ui.h:14
+#, fuzzy
+#| msgid "Socks Port"
+msgid "Socks proxy port"
+msgstr "Socks ポート"
+
+#: ../panels/network/network-simple.ui.h:6
+#, fuzzy
+#| msgid "Device Off"
+msgid "Turn device off"
+msgstr "デバイスをオフ"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "新しいサービスに使用するインターフェースを選択"
 
-#: ../panels/network/network.ui.h:2
-msgid "C_reate..."
-msgstr "作成する(_R)..."
+#: ../panels/network/network.ui.h:2
+#, fuzzy
+#| msgid "Calibrate…"
+msgid "C_reate…"
+msgstr "キャリブレート…"
+
+#: ../panels/network/network.ui.h:3
+msgid "_Interface"
+msgstr "インターフェース(_I)"
+
+#: ../panels/network/network.ui.h:8
+msgid "Add Device"
+msgstr "デバイスの追加"
+
+#: ../panels/network/network-vpn.ui.h:2
+msgid "VPN Type"
+msgstr "VPN の種類"
+
+#: ../panels/network/network-vpn.ui.h:4
+msgid "Group Name"
+msgstr "グループ名"
+
+#: ../panels/network/network-vpn.ui.h:5
+msgid "Group Password"
+msgstr "グループのパスワード"
+
+#: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
+msgid "Username"
+msgstr "ユーザー名"
+
+#: ../panels/network/network-vpn.ui.h:7
+#, fuzzy
+#| msgid "Turn on or off:"
+msgid "Turn VPN connection off"
+msgstr "オン/オフ の切り替え:"
+
+#: ../panels/network/network-wifi.ui.h:1
+#, fuzzy
+#| msgid "A_utomatic Login"
+msgid "Automatic _Connect"
+msgstr "自動ログイン(_U)"
+
+#: ../panels/network/network-wifi.ui.h:11
+#, fuzzy
+#| msgid "Details"
+msgid "details"
+msgstr "詳細"
+
+#: ../panels/network/network-wifi.ui.h:15
+#: ../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/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "パスワード(_P)"
+
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "何もしない"
+
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:20
+#, fuzzy
+#| msgid "_Show password"
+msgid "Show P_assword"
+msgstr "パスワードを表示(_S)"
+
+#: ../panels/network/network-wifi.ui.h:21
+#, fuzzy
+#| msgid "Failed to delete user"
+msgid "Make available to other users"
+msgstr "ユーザーの削除に失敗しました"
 
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "インターフェース(_I)"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr ""
 
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
-msgid "VPN"
-msgstr "VPN"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
 
-#: ../panels/network/network.ui.h:8
-msgid "Add Device"
-msgstr "デバイスの追加"
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr ""
 
-#: ../panels/network/network-vpn.ui.h:2
-msgid "VPN Type"
-msgstr "VPN の種類"
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr ""
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "ゲートウェイ"
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
 
-#: ../panels/network/network-vpn.ui.h:4
-msgid "Group Name"
-msgstr "グループ名"
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
 
-#: ../panels/network/network-vpn.ui.h:5
-msgid "Group Password"
-msgstr "グループのパスワード"
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
 
-#: ../panels/network/network-vpn.ui.h:6
-msgid "Username"
-msgstr "ユーザー名"
+#: ../panels/network/network-wifi.ui.h:44
+#, fuzzy
+#| msgid "Cannot remove automatically added profile"
+msgid "_Ignore automatically obtained routes"
+msgstr "自動で追加されたプロファイルを削除できません"
 
-#: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure..."
-msgstr "設定(_C)..."
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:1
-msgid "Wireless Hotspot"
-msgstr "ワイヤレスホットスポット"
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Turn On"
-msgstr "オン(_T)"
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr ""
 
-#. TRANSLATORS: device type
-#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
-msgid "Wireless"
-msgstr "無線"
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:4
-msgid "_Use as Hotspot..."
-msgstr "アクセスポイントとして使用(_U)..."
+#: ../panels/network/network-wifi.ui.h:52
+#, fuzzy
+#| msgid "Hardware"
+msgid "hardware"
+msgstr "ハードウェア"
 
-#: ../panels/network/network-wifi.ui.h:5
-msgid "_Disconnect"
-msgstr "切断(_D)"
+#: ../panels/network/network-wifi.ui.h:55
+msgid "Reset the settings for this connection to their defaults, but remember as a preferred connection."
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:6
-msgid "_Connect"
-msgstr "接続(_C)"
+#: ../panels/network/network-wifi.ui.h:56
+msgid "Remove all details relating to this network and do not try to automatically connect to it."
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:7
-msgid "Last used"
-msgstr "最後の利用"
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:8
-#: ../panels/network/network-wired.ui.h:1
-msgid "Hardware Address"
-msgstr "ハードウェア・アドレス"
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "ハードウェア"
 
-#: ../panels/network/network-wifi.ui.h:9
-msgid "Security"
-msgstr "セキュリティ"
+#: ../panels/network/network-wifi.ui.h:64
+#, fuzzy
+#| msgid "Hotspot"
+msgid "Wi-Fi Hotspot"
+msgstr "アクセスポイント"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Strength"
-msgstr "長さ:"
+#: ../panels/network/network-wifi.ui.h:65
+msgid "_Turn On"
+msgstr "オン(_T)"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Link speed"
-msgstr "リンクの速度"
+#: ../panels/network/network-wifi.ui.h:66
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:12
-#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
-msgid "IPv4 Address"
-msgstr "IPv4 アドレス"
+#: ../panels/network/network-wifi.ui.h:67
+#, fuzzy
+#| msgid "Turn on or off:"
+msgid "Turn Wi-Fi off"
+msgstr "オン/オフ の切り替え:"
 
-#: ../panels/network/network-wifi.ui.h:16
-msgid "_Forget Network"
-msgstr "ネットワークを破棄(_F)"
+#: ../panels/network/network-wifi.ui.h:68
+#, fuzzy
+#| msgid "_Use as Hotspot..."
+msgid "_Use as Hotspot…"
+msgstr "アクセスポイントとして使用(_U)..."
 
-#: ../panels/network/network-wifi.ui.h:17
-msgid "_Settings..."
-msgstr "設定(_S)..."
+#: ../panels/network/network-wifi.ui.h:69
+#, fuzzy
+#| msgid "Connect to a Hidden Network"
+msgid "_Connect to Hidden Network…"
+msgstr "非表示のネットワークに接続"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "Switch off to connect to a wireless network"
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:71
+#, fuzzy
+#| msgid "Switch off to connect to a wireless network"
+msgid "Switch off to connect to a Wi-Fi network"
 msgstr "ワイヤレスネットワークへの接続をオフにする"
 
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "ネットワーク名"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "接続しているデバイス"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "セキュリティタイプ"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "セキュリティキー"
 
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
-msgid "Wired"
-msgstr "有線"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:97
-msgid "Mobile broadband"
-msgstr "モバイルブロードバンド"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:106
-msgid "Mesh"
-msgstr "メッシュ"
-
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "アドホック"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:170
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "インフラストラクチャ"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "ステータス不明"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "管理対象外"
 
-#: ../panels/network/panel-common.c:203
-msgid "Firmware missing"
-msgstr "ファームウェア未検出"
-
-#: ../panels/network/panel-common.c:206
-msgid "Cable unplugged"
-msgstr "ケーブル抜け"
-
-#: ../panels/network/panel-common.c:208
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "利用不可"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:212
-msgid "Disconnected"
-msgstr "切断"
-
-#. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "接続中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "認証が要求されました"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "接続"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "切断中"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "接続失敗"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "ステータス不明 (見つからない)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:227
+msgid "Not connected"
+msgstr "接続していない"
+
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP設定の期限切れ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "秘密の情報が必要でしたが入力されませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:317
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x サプリカントが切断されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x サプリカントの設定に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:325
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "802.1x サプリカントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:329
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x サプリカントの認証に時間がかかりすぎました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:333
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "PPPサービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPPサービスの接続を切断しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:341
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP が失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCPクライアントの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:349
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCPクライアントにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCPクライアントが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:361
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "共有接続サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:365
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービスの起動に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:369
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "AutoIP サービスにエラーが発生しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP サービスが失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "回線が使用中です"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "発信音がありません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "キャリアの確立ができませんでした"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "発信要求がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:393
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "発信の試行に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "モデムの初期化に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "指定されたAPNの選択に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "ネットワーク検索をしていません"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "ネットワーク登録が拒否されました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "ネットワーク登録がタイムアウトしました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:417
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "要求されたネットワークへの登録に失敗しました"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:421
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "PINチェックに失敗しました"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:425
-msgid "Firmware for the device may be missing"
-msgstr "このデバイスのファームウェアがないようです"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:376
+msgid "Firmware for the device may be missing"
+msgstr "このデバイスのファームウェアがないようです"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:380
+msgid "Connection disappeared"
+msgstr "接続が消失しました"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:384
+msgid "Existing connection was assumed"
+msgstr "既存の接続とみなされました"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:388
+msgid "Modem not found"
+msgstr "モデムが見つかりませんでした"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:392
+msgid "Bluetooth connection failed"
+msgstr "Bluetooth接続に失敗しました"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:396
+msgid "SIM Card not inserted"
+msgstr "SIMカードが挿入されていません"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:400
+msgid "SIM Pin required"
+msgstr "SIMのPIN番号が必要です"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:404
+msgid "SIM Puk required"
+msgstr "SIMのPUKが必要です"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:408
+msgid "SIM wrong"
+msgstr "SIMが違います"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:412
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBandデバイスは接続モードに対応していません"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:416
+msgid "Connection dependency failed"
+msgstr "接続が依存するデバイス等の準備ができません"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "ファームウェア未検出"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "ケーブル抜け"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi 
networks.  Would you like to choose a Certificate Authority certificate?"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method.c:648
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../panels/network/wireless-security/eap-method-peap.c:246
+#: ../panels/network/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+#| msgid "All files"
+msgid "PAC _file"
+msgstr "すべてのファイル"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "_Inner authentication"
+msgstr "認証に失敗しました"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "Anonymous"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authenticated"
+msgstr "認証に失敗しました"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr ""
+
+#: ../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:6
+msgid "_Username"
+msgstr "ユーザー名(_U)"
+
+#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/ws-leap.ui.h:3
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#, fuzzy
+#| msgid "_Show password"
+msgid "Sho_w password"
+msgstr "パスワードを表示(_S)"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:263
+#: ../panels/network/wireless-security/wireless-security.c:385
+msgid "MD5"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:350
+#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#, fuzzy
+#| msgid "Version %s"
+msgid "Version 0"
+msgstr "バージョン %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+#, fuzzy
+#| msgid "Version %s"
+msgid "Version 1"
+msgstr "バージョン %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:263
+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 password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#, fuzzy
+#| msgid "_Generate a password"
+msgid "_Private key password"
+msgstr "パスワードの生成(_G)"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#, fuzzy
+#| msgid "WPA"
+msgid "PAP"
+msgstr "WPA"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr ""
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:429
-msgid "Connection disappeared"
-msgstr "接続が消失しました"
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Au_thentication"
+msgstr "認証に失敗しました"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:433
-msgid "Carrier/link changed"
-msgstr "キャリア/リンクが変更されました"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#, fuzzy
+#| msgid "Default"
+msgid "1 (Default)"
+msgstr "デフォルト"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:437
-msgid "Existing connection was assumed"
-msgstr "既存の接続とみなされました"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:441
-msgid "Modem not found"
-msgstr "モデムが見つかりませんでした"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:445
-msgid "Bluetooth connection failed"
-msgstr "Bluetooth接続に失敗しました"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:449
-msgid "SIM Card not inserted"
-msgstr "SIMカードが挿入されていません"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#, fuzzy
+#| msgid "System"
+msgid "Open System"
+msgstr "システム"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:453
-msgid "SIM Pin required"
-msgstr "SIMのPIN番号が必要です"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:457
-msgid "SIM Puk required"
-msgstr "SIMのPUKが必要です"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:461
-msgid "SIM wrong"
-msgstr "SIMが違います"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:465
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBandデバイスは接続モードに対応していません"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:469
-msgid "Connection dependency failed"
-msgstr "接続が依存するデバイス等の準備ができません"
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+#| msgid "_Type:"
+msgid "_Type"
+msgstr "種類(_T):"
+
+#. TRANSLATORS: this is the per application switch for message tray usage.
+#: ../panels/notifications/cc-edit-dialog.c:39
+msgctxt "notifications"
+msgid "Notifications"
+msgstr "通知"
+
+#. TRANSLATORS: this is the setting to configure sounds associated with notifications
+#: ../panels/notifications/cc-edit-dialog.c:41
+msgctxt "notifications"
+msgid "Sound Alerts"
+msgstr "サウンドアラート"
+
+#: ../panels/notifications/cc-edit-dialog.c:42
+msgctxt "notifications"
+msgid "Show Popup Banners"
+msgstr "ポップアップバナーを表示する"
+
+#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
+#: ../panels/notifications/cc-edit-dialog.c:44
+msgctxt "notifications"
+msgid "Show Details in Banners"
+msgstr "バナーに詳細を表示する"
+
+#: ../panels/notifications/cc-edit-dialog.c:45
+msgctxt "notifications"
+msgid "View in Lock Screen"
+msgstr "ロック画面で表示する"
+
+#: ../panels/notifications/cc-edit-dialog.c:46
+msgctxt "notifications"
+msgid "Show Details in Lock Screen"
+msgstr "ロック画面で詳細を表示する"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "On"
+msgstr "オン"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "Off"
+msgstr "オフ"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+msgid "Notifications"
+msgstr "通知"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+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:4
+msgid "Notifications;Banner;Message;Tray;Popup;"
+msgstr "Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップアップ;"
+
+#: ../panels/notifications/notifications.ui.h:1
+msgid "Show Pop Up Banners"
+msgstr "ポップアップバナーを表示する"
+
+#: ../panels/notifications/notifications.ui.h:2
+msgid "Show in Lock Screen"
+msgstr "ロック画面で表示する"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
+#: ../panels/region/cc-input-chooser.c:1073
+#: ../panels/search/cc-search-locations-dialog.c:480
+msgid "Other"
+msgstr "その他"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:249
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "アカウントの追加"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:383
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:330
+#, fuzzy
+#| msgid "_Mail"
+msgid "Mail"
+msgstr "メール(_M)"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:336
+#, fuzzy
+#| msgid "Contrast:"
+msgid "Contacts"
+msgstr "コントラスト:"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:342
+msgid "Resources"
+msgstr ""
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:358
 msgid "Error logging into the account"
 msgstr "アカウントのログインに失敗"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:437
-msgid "Expired credentials. Please log in again."
-msgstr "認証の有効期限が切れています。ログインしなおしてください。"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+msgid "Credentials have expired."
+msgstr ""
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+#, fuzzy
+#| msgid "Enable this account"
+msgid "Sign in to enable this account."
+msgstr "アカウントを有効にする"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:440
-msgid "_Log In"
-msgstr "ログイン(_L)"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+msgid "_Sign In"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:676
+#: ../panels/online-accounts/cc-online-accounts-panel.c:684
 msgid "Error creating account"
 msgstr "アカウント作成に失敗"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:718
+#: ../panels/online-accounts/cc-online-accounts-panel.c:726
 msgid "Error removing account"
 msgstr "アカウント削除に失敗"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:754
+#: ../panels/online-accounts/cc-online-accounts-panel.c:762
 msgid "Are you sure you want to remove the account?"
 msgstr "本当にアカウントを削除しますか?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:756
+#: ../panels/online-accounts/cc-online-accounts-panel.c:764
 msgid "This will not remove the account on the server."
 msgstr "サービス提供元のアカウントは削除されません。"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:757
+#: ../panels/online-accounts/cc-online-accounts-panel.c:765
 msgid "_Remove"
 msgstr "削除(_R)"
 
@@ -2303,8 +3673,8 @@ msgid "Online Accounts"
 msgstr "オンラインアカウント"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "オンラインアカウント管理"
+msgid "Connect to your online accounts and decide what to use them for"
+msgstr ""
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -2327,17 +3697,17 @@ msgstr "オンラインアカウントの追加"
 msgid "Adding an account allows your applications to access it for documents, mail, contacts, calendar, chat 
and more."
 msgstr "アカウントを追加すると、お使いのアプリケーションがそのアカウントのドキュメントやメール、連絡先、カレンダー、チャットなどにアクセスできるようになります。"
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:184
 msgid "Unknown time"
 msgstr "不明"
 
-#: ../panels/power/cc-power-panel.c:163
+#: ../panels/power/cc-power-panel.c:190
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i 分"
 
-#: ../panels/power/cc-power-panel.c:175
+#: ../panels/power/cc-power-panel.c:202
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2345,188 +3715,232 @@ 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:183
+#: ../panels/power/cc-power-panel.c:210
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:184
+#: ../panels/power/cc-power-panel.c:211
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../panels/power/cc-power-panel.c:185
+#: ../panels/power/cc-power-panel.c:212
 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:228
+#: ../panels/power/cc-power-panel.c:231
 #, c-format
-msgid "Charging - %s until fully charged"
-msgstr "充電中 - フル充電まで %s"
+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:236
+#: ../panels/power/cc-power-panel.c:238
 #, c-format
-msgid "Caution low battery, %s remaining"
-msgstr "バッテリー残量が少ないので注意 - 残り %s"
+msgid "Caution: %s remaining"
+msgstr "注意: 残り %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:244
+#: ../panels/power/cc-power-panel.c:243
 #, c-format
-msgid "Using battery power - %s remaining"
-msgstr "バッテリー電源の使用中 - 残り %s"
+msgid "%s remaining"
+msgstr "残り %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:261
-msgid "Charging"
-msgstr "充電中"
+#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+msgid "Fully charged"
+msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:266
-msgid "Using battery power"
-msgstr "バッテリー電源の使用中"
+#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+msgid "Empty"
+msgstr "空"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
-msgid "Charging - fully charged"
-msgstr "充電中 - フル充電されています"
+#: ../panels/power/cc-power-panel.c:267
+msgid "Charging"
+msgstr "充電中"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
-msgid "Empty"
-msgstr "空"
-
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:342
-#, c-format
-msgid "Caution low UPS, %s remaining"
-msgstr "UPS 電源の残量低下に注意 - 残り %s"
+#: ../panels/power/cc-power-panel.c:272
+msgid "Discharging"
+msgstr "放電中"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:348
+#: ../panels/power/cc-power-panel.c:324
 #, c-format
-msgid "Using UPS power - %s remaining"
-msgstr "UPS 電源の使用中 - 残り %s"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:366
-msgid "Caution low UPS"
-msgstr "UPS 電源の残量低下に注意"
+msgid "Estimated battery capacity: %s"
+msgstr "推計バッテリー残り時間: %s"
 
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
-msgid "Using UPS power"
-msgstr "UPS 電源の使用中"
+#: ../panels/power/cc-power-panel.c:404
+msgctxt "Battery name"
+msgid "Main"
+msgstr "主"
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:423
-msgid "Your secondary battery is fully charged"
-msgstr "第2バッテリーはフル充電されています"
-
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:427
-msgid "Your secondary battery is empty"
-msgstr "第2バッテリーは空です"
+#: ../panels/power/cc-power-panel.c:406
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "予備"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "ワイヤレスマウス"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "ワイヤレスキーボード"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "無停電電源装置"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "携帯情報端末"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "携帯電話"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "音楽プレイヤー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:534
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "タブレット"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "コンピューター"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "バッテリー"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "充電中"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:560
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "注意"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "少ない"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:570
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "充分"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
-msgid "Charging - fully charged"
-msgstr "充電中 - フル充電されています"
+msgid "Fully charged"
+msgstr "フル充電"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "空"
 
-#: ../panels/power/cc-power-panel.c:1075
-msgid "Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
-msgstr "ヒント: <a href=\"screen\">画面の明るさ</a> は使用する電力量に影響します。"
+#: ../panels/power/cc-power-panel.c:732
+msgid "Batteries"
+msgstr "バッテリー"
+
+#: ../panels/power/cc-power-panel.c:1074
+msgid "When _idle"
+msgstr "アイドル時(_I)"
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Power Saving"
+msgstr "省電力"
+
+#: ../panels/power/cc-power-panel.c:1430
+msgid "_Screen Brightness"
+msgstr "画面の明るさ(_S)"
+
+#: ../panels/power/cc-power-panel.c:1458
+msgid "_Dim Screen when Inactive"
+msgstr "操作していないときに画面を暗くする(_D)"
+
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "ブランクスクリーン(_B)"
+
+#: ../panels/power/cc-power-panel.c:1516
+msgid "_Wi-Fi"
+msgstr "Wi-Fi(_W)"
+
+#: ../panels/power/cc-power-panel.c:1544
+msgid "_Mobile Broadband"
+msgstr "モバイルブロードバンド(_M)"
+
+#: ../panels/power/cc-power-panel.c:1582
+msgid "_Bluetooth"
+msgstr "Bluetooth(_B)"
+
+#: ../panels/power/cc-power-panel.c:1633
+msgid "When on battery power"
+msgstr "バッテリー動作時"
+
+#: ../panels/power/cc-power-panel.c:1635
+msgid "When plugged in"
+msgstr "電源接続時"
+
+#: ../panels/power/cc-power-panel.c:1762
+msgid "Suspend & Power Off"
+msgstr "サスペンドと電源オフ"
+
+#: ../panels/power/cc-power-panel.c:1793
+msgid "_Automatic Suspend"
+msgstr "自動サスペンド(_A)"
+
+#: ../panels/power/cc-power-panel.c:1815
+msgid "When Battery Power is _Critical"
+msgstr "バッテリーがひどく低下したときの動作(_C)"
+
+#: ../panels/power/cc-power-panel.c:1848
+msgid "Power Off"
+msgstr "電源オフ"
+
+#: ../panels/power/cc-power-panel.c:1990
+msgid "Devices"
+msgstr "デバイス"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "電源"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "電源管理の設定"
+msgid "View your battery status and change power saving settings"
+msgstr "バッテリー状態の表示、省電力の設定をします"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
-msgid "Power;Sleep;Suspend;Hibernate;Battery;"
-msgstr "Power;Sleep;Suspend;Hibernate;Battery;電源;スリープ;サスペンド;ハイバネート;バッテリー;"
+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/power/power.ui.h:1
 msgid "Hibernate"
@@ -2536,220 +3950,285 @@ msgstr "ハイバーネート"
 msgid "Power off"
 msgstr "電源を落とす"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
-msgid "5 minutes"
-msgstr "5 分"
-
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
-msgid "10 minutes"
-msgstr "10 分"
-
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
-msgid "30 minutes"
-msgstr "30 分"
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 分"
 
-#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:9
+#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 時間"
 
 #: ../panels/power/power.ui.h:7
-msgid "Don't suspend"
-msgstr "サスペンドしない"
+msgid "80 minutes"
+msgstr "80 分"
 
 #: ../panels/power/power.ui.h:8
-msgid "On battery power"
-msgstr "バッテリー動作時"
+msgid "90 minutes"
+msgstr "90 分"
 
 #: ../panels/power/power.ui.h:9
-msgid "When plugged in"
-msgstr "電源接続時"
+msgid "100 minutes"
+msgstr "100 分"
 
 #: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for"
-msgstr "次の時間アイドル状態が続けばサスペンドする"
+msgid "2 hours"
+msgstr "2 時間"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 分"
+
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 分"
+
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 分"
+
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 分"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 分"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 分"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 分"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 分"
+
+#: ../panels/power/power.ui.h:20
+msgid "Automatic Suspend"
+msgstr "自動サスペンド"
+
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+msgid "_Close"
+msgstr "閉じる(_C)"
 
-#: ../panels/power/power.ui.h:11
-msgid "When power is _critically low"
-msgstr "電力がひどく低下したときの動作(_C)"
+#: ../panels/power/power.ui.h:22
+msgid "_Plugged In"
+msgstr "電源接続時(_P)"
+
+#: ../panels/power/power.ui.h:23
+msgid "On _Battery Power"
+msgstr "バッテリー動作時(_B)"
+
+#: ../panels/power/power.ui.h:24
+msgid "Delay"
+msgstr "時間"
+
+#: ../panels/printers/authentication-dialog.ui.h:3
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authenticate"
+msgstr "認証に失敗しました"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "パスワード"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "認証が要求されました"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:593
 msgid "Out of toner"
 msgstr "トナーが空です"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:594
+#: ../panels/printers/cc-printers-panel.c:596
 msgid "Low on developer"
 msgstr "現像液が少ないです"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:597
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Out of developer"
 msgstr "現像液が空です"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Out of a marker supply"
 msgstr "インクが切れています"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open cover"
 msgstr "カバーが開いています"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Open door"
 msgstr "扉が開いています"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Low on paper"
 msgstr "紙が少なくなっています"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgid "Out of paper"
 msgstr "紙が空です"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Offline"
 msgstr "オフライン"
 
-#. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:613
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:806
 msgctxt "printer state"
-msgid "Paused"
-msgstr "一時停止中"
+msgid "Stopped"
+msgstr "停止中"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is near end of life"
 msgstr "感光体の寿命が近づいています"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:623
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光体の寿命です"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:724
+#: ../panels/printers/cc-printers-panel.c:733
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "設定中"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:781
+#: ../panels/printers/cc-printers-panel.c:792
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備完了"
 
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: ../panels/printers/cc-printers-panel.c:797
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr ""
+
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:785
+#: ../panels/printers/cc-printers-panel.c:802
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"
 
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "停止中"
-
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:906
+#: ../panels/printers/cc-printers-panel.c:923
 msgid "Toner Level"
 msgstr "トナーの量"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:909
+#: ../panels/printers/cc-printers-panel.c:926
 msgid "Ink Level"
 msgstr "インクの量"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:912
+#: ../panels/printers/cc-printers-panel.c:929
 msgid "Supply Level"
 msgstr "サプライの量"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:930
+#: ../panels/printers/cc-printers-panel.c:947
 msgctxt "printer state"
 msgid "Installing"
 msgstr "インストール中"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1107
+#: ../panels/printers/cc-printers-panel.c:1124
 msgid "No printers available"
 msgstr "利用できるプリンターがありません"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1411
+#: ../panels/printers/cc-printers-panel.c:1429
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 個がアクティブ"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1731
+#: ../panels/printers/cc-printers-panel.c:1773
 msgid "Failed to add new printer."
 msgstr "新しいプリンターを追加できませんでした。"
 
-#: ../panels/printers/cc-printers-panel.c:1896
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "PPDファイルの選択"
 
-#: ../panels/printers/cc-printers-panel.c:1905
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 msgstr "PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2210
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "適切なドライバーが見つかりませんでした"
 
-#: ../panels/printers/cc-printers-panel.c:2279
-msgid "Searching for preferred drivers..."
+#: ../panels/printers/cc-printers-panel.c:2323
+#, fuzzy
+#| msgid "Searching for preferred drivers..."
+msgid "Searching for preferred drivers…"
 msgstr "推奨ドライバーの検索中..."
 
-#: ../panels/printers/cc-printers-panel.c:2294
-msgid "Select from database..."
+#: ../panels/printers/cc-printers-panel.c:2338
+#, fuzzy
+#| msgid "Select from database..."
+msgid "Select from database…"
 msgstr "データベースから選択..."
 
-#: ../panels/printers/cc-printers-panel.c:2303
-msgid "Provide PPD File..."
+#: ../panels/printers/cc-printers-panel.c:2347
+#, fuzzy
+#| msgid "Provide PPD File..."
+msgid "Provide PPD File…"
 msgstr "PPDファイルを指定..."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2454
-#: ../panels/printers/cc-printers-panel.c:2477
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "テストページ"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2880
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
@@ -2759,112 +4238,99 @@ msgid "Printers"
 msgstr "プリンター"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "プリンターの設定を変更する"
+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:4
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
 
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
-
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "アクティブなジョブ"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "閉じる"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "アクティブなジョブ"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "印刷を再開"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "印刷を一時停止"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "印刷ジョブをキャンセル"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1044
-msgid "_Add"
-msgstr "追加(_A)"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "新しいプリンターの追加"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "ネットワークプリンターの検索または結果をフィルター"
 
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Options"
-msgstr "オプション"
-
-#: ../panels/printers/options-dialog.ui.h:3
-msgid "Loading options..."
+#: ../panels/printers/options-dialog.ui.h:1
+#, fuzzy
+#| msgid "Loading options..."
+msgid "Loading options…"
 msgstr "オプションをロード中..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1043
-msgid "Cancel"
-msgstr "キャンセル"
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "プリンタードライバーの選択"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "ドライバーのデータベースをロード中..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "プリンタードライバーの選択"
-
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:65
-#: ../panels/printers/pp-ppd-option-widget.c:69
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
 msgid "One Sided"
 msgstr "片面"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
 msgid "Long Edge (Standard)"
 msgstr "長辺とじ(標準)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ppd-option-widget.c:75
 msgid "Short Edge (Flip)"
 msgstr "短辺とじ(フリップ)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:73
 msgid "Portrait"
 msgstr "縦方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:75
 msgid "Landscape"
 msgstr "横方向"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse landscape"
 msgstr "横方向(逆向き)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:79
 msgid "Reverse portrait"
 msgstr "縦方向(逆向き)"
 
@@ -2926,13 +4392,13 @@ msgstr "ジョブの状態"
 msgid "Time"
 msgstr "時刻"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s個のアクティブなジョブ"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "プリンターを検出できません"
 
@@ -3021,60 +4487,62 @@ msgstr "表面処理"
 #: ../panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Advanced"
-msgstr "高度"
-
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s個のオプション"
+msgstr "高度"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:87
 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:79
 #: ../panels/printers/pp-ppd-option-widget.c:81
 #: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:89
 msgid "Printer Default"
 msgstr "プリンターのデフォルト"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:91
 msgid "Embed GhostScript fonts only"
 msgstr "内蔵GhostScriptフォントのみ"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 1"
 msgstr "PSレベル1に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:95
 msgid "Convert to PS level 2"
 msgstr "PSレベル2に変換"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:97
 msgid "No pre-filtering"
 msgstr "プレフィルタリングなし"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
-msgstr "製造元"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#, fuzzy
+#| msgid "Manufacturer:"
+msgid "Manufacturer"
+msgstr "製造元:"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
 msgstr "ドライバー"
 
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr ""
+
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
 msgstr "プリンターの追加"
@@ -3102,30 +4570,22 @@ msgstr "デフォルト(_D)"
 msgid "Jobs"
 msgstr "ジョブ"
 
-#. Tanslators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
-msgid "_Show"
-msgstr "表示(_S)"
+msgid "Show _Jobs"
+msgstr ""
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
 msgstr "型式"
 
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "ページ1"
-
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "ラベル"
 
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "ページ2"
-
 #: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver..."
-msgstr "新規ドライバーの設定中..."
+msgid "Setting new driver…"
+msgstr "新規ドライバーの設定中…"
 
 #: ../panels/printers/printers.ui.h:18
 msgid "page 3"
@@ -3155,276 +4615,526 @@ msgstr ""
 "申し訳ありません! システムの印刷サービスは\n"
 "利用できないようです。"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "地域と言語"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Hidden"
+msgstr "非表示"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "地域と言語に関する設定の変更"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Visible"
+msgstr "表示する"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;"
-msgstr "Language;Layout;Keyboard;言語;レイアウト;キーボード;"
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+msgid "Screen Lock"
+msgstr "画面ロック"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
-msgid "Imperial"
-msgstr "ヤード・ポンド法"
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+msgid "Name & Visibility"
+msgstr "名前と表示方法"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
-msgid "Metric"
-msgstr "メートル法"
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+msgid "Usage & History"
+msgstr "使用と履歴"
+
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+msgid "Purge Trash & Temporary Files"
+msgstr "ゴミ箱と一時ファイルの削除"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Choose an input source"
-msgstr "入力ソースの選択"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
+msgid "Privacy"
+msgstr "プライバシー"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
-msgid "Select an input source to add"
-msgstr "追加する入力ソースを選択"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Protect your personal information and control what others might see"
+msgstr "個人情報の保護と外部からの見え方を設定します"
 
-#: ../panels/region/gnome-region-panel-system.c:470
-msgid "The login screen, system accounts and new user accounts use the system-wide Region and Language 
settings."
-msgstr "ログイン画面、システムアカウント、および新規のユーザーアカウントでは、システムワイドの地域と言語の設定が使用されます。"
+#. Translators: those are keywords for the privacy control-center panel
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+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;画面;スクリーン;ロック;診断;クラッシュ;プライベート;最近;テンポラリー;一時;インデックス;索引;名前;ネットワーク;"
 
-#: ../panels/region/gnome-region-panel-system.c:475
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "The login screen, system accounts and new user accounts use the system-wide Region and Language 
settings. You may change the system settings to match yours."
-msgstr "ログイン画面、システムアカウント、および新規のユーザーアカウントでは、システムワイドの地域と言語の設定が使用されます。システム設定をユーザー設定に合わせることができます。"
+#: ../panels/privacy/privacy.ui.h:1
+msgid "Screen Turns Off"
+msgstr "画面オフのとき"
 
-#: ../panels/region/gnome-region-panel-system.c:478
-msgid "Copy Settings"
-msgstr "設定のコピー"
+#: ../panels/privacy/privacy.ui.h:2
+msgid "30 seconds"
+msgstr "30 秒"
 
-#: ../panels/region/gnome-region-panel-system.c:481
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Copy Settings..."
-msgstr "設定のコピー..."
+#: ../panels/privacy/privacy.ui.h:11
+msgid "Control how you appear on the screen and the network."
+msgstr "画面やネットワークにあなたの情報がどう表示されるか設定します。"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "地域と言語"
+#: ../panels/privacy/privacy.ui.h:12
+msgid "Display _full name in top bar"
+msgstr "トップバーにフルネームを表示する(_F)"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language (change will be applied next time you log in)"
-msgstr "表示言語を選択 (変更内容は次回ログイン時に適用されます)"
+#: ../panels/privacy/privacy.ui.h:13
+msgid "Display full name in _lock screen"
+msgstr "ロック画面にフルネームを表示する(_L)"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Add Language"
-msgstr "言語の追加"
+#: ../panels/privacy/privacy.ui.h:14
+msgid "_Stealth Mode"
+msgstr "ステルスモード(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Remove Language"
-msgstr "言語の削除"
+#: ../panels/privacy/privacy.ui.h:15
+msgid "Immediately"
+msgstr "すぐに"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Install languages..."
-msgstr "言語をインストール..."
+#: ../panels/privacy/privacy.ui.h:16
+msgid "1 day"
+msgstr "1 日"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Language"
-msgstr "言語"
+#: ../panels/privacy/privacy.ui.h:17
+msgid "2 days"
+msgstr "2 日"
+
+#: ../panels/privacy/privacy.ui.h:18
+msgid "3 days"
+msgstr "3 日"
+
+#: ../panels/privacy/privacy.ui.h:19
+msgid "4 days"
+msgstr "4 日"
+
+#: ../panels/privacy/privacy.ui.h:20
+msgid "5 days"
+msgstr "5 日"
+
+#: ../panels/privacy/privacy.ui.h:21
+msgid "6 days"
+msgstr "6 日"
+
+#: ../panels/privacy/privacy.ui.h:22
+msgid "7 days"
+msgstr "7 日"
+
+#: ../panels/privacy/privacy.ui.h:23
+msgid "14 days"
+msgstr "14 日"
+
+#: ../panels/privacy/privacy.ui.h:24
+msgid "30 days"
+msgstr "30 日"
+
+#: ../panels/privacy/privacy.ui.h:25
+msgid "Forever"
+msgstr "無期限"
+
+#: ../panels/privacy/privacy.ui.h:27
+msgid "Remembering your history makes things easier to find again. These items are never shared over the 
network."
+msgstr "履歴を記憶しておくと、以前の作業を探し出すのが簡単になります。これらの項目はネットワークを越えて共有されることはありません。"
+
+#: ../panels/privacy/privacy.ui.h:28
+msgid "Cl_ear Recent History"
+msgstr "履歴をクリアする(_E)"
+
+#: ../panels/privacy/privacy.ui.h:29
+msgid "_Recently Used"
+msgstr "最近使用したファイル(_R)"
+
+#: ../panels/privacy/privacy.ui.h:30
+msgid "Retain _History"
+msgstr "記憶する期間(_H)"
+
+#: ../panels/privacy/privacy.ui.h:32
+msgid "The Screen Lock protects your privacy when you are away."
+msgstr "画面をロックして離席中もプライバシーを保護します。"
+
+#: ../panels/privacy/privacy.ui.h:33
+msgid "Automatic Screen _Lock"
+msgstr "自動画面ロック(_L)"
+
+#: ../panels/privacy/privacy.ui.h:34
+msgid "Lock Screen _After Blank For"
+msgstr "画面オフ後にロックするまでの時間(_A)"
+
+#: ../panels/privacy/privacy.ui.h:35
+msgid "Show _Notifications"
+msgstr "ロック画面に通知を表示する(_N)"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "地域を選択してください (変更内容は次回ログイン時に適用されます)"
+#: ../panels/privacy/privacy.ui.h:37
+msgid "_Empty Trash"
+msgstr "ゴミ箱を空にする(_E)"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Add Region"
-msgstr "地域の追加"
+#: ../panels/privacy/privacy.ui.h:38
+msgid "_Purge Temporary Files"
+msgstr "一時ファイルを削除する(_P)"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Remove Region"
-msgstr "地域の削除"
+#: ../panels/privacy/privacy.ui.h:39
+msgid "Automatically purge the Trash and temporary files to help keep your computer free of unnecessary 
sensitive information."
+msgstr "ゴミ箱や一時ファイルを自動的に削除することで、不要になった機密情報が残ったままにならないようにします。"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/privacy/privacy.ui.h:40
+msgid "Automatically Empty _Trash"
+msgstr "ゴミ箱を自動で空にする(_T)"
+
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Automatically Purge Temporary _Files"
+msgstr "一時ファイルを自動で削除する(_F)"
+
+#: ../panels/privacy/privacy.ui.h:42
+msgid "Purge _After"
+msgstr "次の時間経過後に削除する(_A)"
+
+#: ../panels/region/cc-format-chooser.c:122
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "ヤード・ポンド法"
+
+#: ../panels/region/cc-format-chooser.c:124
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "メートル法"
+
+#: ../panels/region/cc-format-chooser.c:283
+msgid "No regions found"
+msgstr "地域が見つかりません"
+
+#: ../panels/region/cc-input-chooser.c:186
+msgid "No input sources found"
+msgstr "入力ソースが見つかりません"
+
+#: ../panels/region/cc-region-panel.c:239
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "変更内容を反映させるにはログインしなおす必要があります"
+
+#: ../panels/region/cc-region-panel.c:240
+msgid "Restart Now"
+msgstr "ログアウト"
+
+#: ../panels/region/cc-region-panel.c:550
+msgctxt "Language"
+msgid "None"
+msgstr "なし"
+
+#: ../panels/region/cc-region-panel.c:1040
+msgid "Sorry"
+msgstr ""
+
+#: ../panels/region/cc-region-panel.c:1042
+msgid "Input methods can't be used on the login screen"
+msgstr "インプットメソッドはログイン画面で使用できません"
+
+#: ../panels/region/cc-region-panel.c:1491
+msgid "No input source selected"
+msgstr "入力ソースが選択されていません"
+
+#: ../panels/region/cc-region-panel.c:1652
+msgid "Login Screen"
+msgstr "ログイン画面"
+
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "フォーマット"
+
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "プレビュー"
+
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Dates"
 msgstr "日付"
 
 # FIXME
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Times"
 msgstr "時刻"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Numbers"
 msgstr "数字"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "Currency"
-msgstr "通貨"
-
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Measurement"
 msgstr "計量単位"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
-msgid "Examples"
-msgstr "例"
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "用紙サイズ"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Formats"
-msgstr "フォーマット"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "地域と言語"
 
-#: ../panels/region/gnome-region-panel.ui.h:17
-msgid "Select keyboards or other input sources"
-msgstr "キーボードあるいは他の入力ソースを選択"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Select your display language, formats, keyboard layouts and input sources"
+msgstr "表示言語、フォーマット、キーボードレイアウト、入力ソースを設定します"
+
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Add Input Source"
+#: ../panels/region/input-chooser.ui.h:1
+msgid "Add an Input Source"
 msgstr "入力ソースの追加"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Remove Input Source"
-msgstr "入力ソースの削除"
+#: ../panels/region/input-options.ui.h:1
+msgid "Input Source Options"
+msgstr "入力ソースのオプション"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Input Source Up"
-msgstr "入力ソースを上へ移動"
+#: ../panels/region/input-options.ui.h:2
+msgid "Use the _same source for all windows"
+msgstr "すべてのウィンドウで同じソースを使う(_S)"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Down"
-msgstr "入力ソースを下へ移動"
+#: ../panels/region/input-options.ui.h:3
+msgid "Allow _different sources for each window"
+msgstr "ウィンドウ毎に別のソースを使用可能にする(_D)"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Input Source Settings"
-msgstr "入力ソースの設定"
+#: ../panels/region/input-options.ui.h:4
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Show Keyboard Layout"
-msgstr "キーボードレイアウトを表示"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "前のソースへ切り替える"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Space"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Space"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "次のソースへ切り替える"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Shortcut Settings"
-msgstr "ショートカットの設定"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Space"
 
-#: ../panels/region/gnome-region-panel.ui.h:30
-msgid "Input Sources"
-msgstr "入力ソース"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "キーボード設定でショートカットを変更できます"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Display language:"
-msgstr "表示言語:"
+#: ../panels/region/input-options.ui.h:10
+msgid "Alternative switch to next source"
+msgstr "次のソースへ切り替える (代替)"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input source:"
-msgstr "入力ソース:"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "英語 (UK)"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid "Format:"
-msgstr "フォーマット:"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "UK"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-msgid "Your settings"
-msgstr "ユーザー設定"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "オプション"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "System settings"
-msgstr "システム設定"
+#: ../panels/region/region.ui.h:7
+msgid "Login settings are used by all users when logging into the system"
+msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "画面の明るさとロック"
+#: ../panels/search/cc-search-locations-dialog.c:276
+msgid "Home"
+msgstr "ホーム"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "画面の明るさとロックの設定"
+#: ../panels/search/cc-search-locations-dialog.c:476
+msgid "Places"
+msgstr "場所"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "Brightness;Lock;Dim;Blank;Monitor;明るさ;ロック;暗い;ブランク;モニター;"
+#: ../panels/search/cc-search-locations-dialog.c:478
+msgid "Bookmarks"
+msgstr "ブックマーク"
 
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "画面オフのとき"
+#: ../panels/search/cc-search-locations-dialog.c:676
+msgid "Select Location"
+msgstr "場所の選択"
 
-#: ../panels/screen/screen.ui.h:2
-msgid "30 seconds"
-msgstr "30 秒"
+#: ../panels/search/cc-search-panel.c:193
+msgid "No applications found"
+msgstr "アプリケーションが見つかりません"
 
-#: ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 分"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+msgid "Search"
+msgstr "検索"
 
-#: ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 分"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+msgid "Control which applications show search results in the Activities Overview"
+msgstr "アクティビティ画面で検索結果を表示するアプリケーションを設定します"
 
-#: ../panels/screen/screen.ui.h:5
-msgid "3 minutes"
-msgstr "3 分"
+#. Translators: those are keywords for the search control-center panel
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+msgid "Search;Find;Index;Hide;Privacy;Results;"
+msgstr "Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;プライバシー;結果;"
+
+#: ../panels/search/search-locations-dialog.ui.h:1
+msgid "Search Locations"
+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 "設定"
+
+#: ../panels/sharing/cc-sharing-panel.c:259
+msgctxt "service is enabled"
+msgid "On"
+msgstr "オン"
+
+#: ../panels/sharing/cc-sharing-panel.c:261
+msgctxt "service is disabled"
+msgid "Off"
+msgstr "オフ"
+
+#: ../panels/sharing/cc-sharing-panel.c:407
+msgid "Choose a Folder"
+msgstr "フォルダーの選択"
+
+#: ../panels/sharing/cc-sharing-panel.c:585
+msgid "Copy"
+msgstr "コピー"
 
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "画面を暗くして節電する(_D)"
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+msgid "Sharing"
+msgstr "共有"
 
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "明るさ"
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "他のユーザーと共有するものを設定します"
 
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "次の時間アイドル状態が続けば画面をオフにする(_T):"
+#. Translators: those are keywords for the sharing control-center panel
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+msgid 
"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;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/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "画面ロックまでの時間(_L):"
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+msgid "Enable or disable remote login"
+msgstr "リモートログインの有効化/無効化"
 
-#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're 
detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:15
-msgid "Don't lock when at home"
-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/screen/screen.ui.h:16
-msgid "Locations..."
-msgstr "場所..."
+#: ../panels/sharing/sharing.ui.h:1
+msgid "Bluetooth Sharing"
+msgstr "Bluetooth 共有"
 
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "ロック時に通知を表示する(_N)"
+#: ../panels/sharing/sharing.ui.h:2
+msgid "Bluetooth Sharing allows you to share files with other Bluetooth enabled devices"
+msgstr "Bluetooth 共有を利用して、他の Bluetooth デバイスとファイルを共有できるようにします。"
 
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "ロック"
+#: ../panels/sharing/sharing.ui.h:3
+msgid "Share Public Folder"
+msgstr "公開をフォルダーを共有する"
 
-#: ../panels/sound/applet-main.c:49
-msgid "Enable debugging code"
-msgstr "デバッグモードにする"
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only Receive From Trusted Devices"
+msgstr "信頼するデバイスからの受信だけ許可する"
 
-#: ../panels/sound/applet-main.c:50
-msgid "Version of this application"
-msgstr "このアプリケーションのバージョン"
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Save Received Files to Downloads Folder"
+msgstr "受信したファイルをダウンロードフォルダーに保存する"
 
-#: ../panels/sound/applet-main.c:62
-msgid " — GNOME Volume Control Applet"
-msgstr " — GNOME 音量調節アプレット"
+#: ../panels/sharing/sharing.ui.h:6
+msgid "Only share with Trusted Devices"
+msgstr "信頼するデバイスだけ共有を許可する"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
-msgid "Volume Control"
-msgstr "音量 コントロール"
+#: ../panels/sharing/sharing.ui.h:7
+msgid "Computer Name"
+msgstr "コンピューター名"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-msgid "Show desktop volume control"
-msgstr "デスクトップの音量を調節するアプレットです"
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
+msgstr "ネットワークに接続していないため無効となっているサービスがあります。"
+
+#: ../panels/sharing/sharing.ui.h:9
+msgid "Media Sharing"
+msgstr "メディア共有"
+
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr "現在のネットワーク上の他ユーザーと音楽、写真、ビデオを共有します。"
+
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Share Media On This Network"
+msgstr "このネットワーク上のメディアコンテンツを共有する"
+
+#: ../panels/sharing/sharing.ui.h:12
+msgid "Shared Folders"
+msgstr "共有するフォルダー"
+
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr "列"
+
+#: ../panels/sharing/sharing.ui.h:14
+msgid "Add Folder"
+msgstr "フォルダーの追加"
+
+#: ../panels/sharing/sharing.ui.h:15
+msgid "Remove Folder"
+msgstr "フォルダーの削除"
+
+#: ../panels/sharing/sharing.ui.h:16
+msgid "Personal File Sharing"
+msgstr "パーソナルファイル共有"
+
+#: ../panels/sharing/sharing.ui.h:18
+#, no-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>"
+msgstr "パーソナルファイル共有を利用して、現在のネットワークの他ユーザーが次の URI に接続し、あなたの公開フォルダーを共有できるようにします: <a 
href=\"dav://%s\">dav://%s</a>"
+
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share Public Folder On This Network"
+msgstr "このネットワークの公開フォルダーを共有する"
+
+#: ../panels/sharing/sharing.ui.h:20
+msgid "Require Password"
+msgstr "パスワードを要求する"
+
+#: ../panels/sharing/sharing.ui.h:22
+msgid "Remote Login"
+msgstr "リモートログイン"
+
+#: ../panels/sharing/sharing.ui.h:24
+#, no-c-format
+msgid ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"リモートユーザーによる Secure Shell コマンドを使用した接続を許可します:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/sharing.ui.h:26
+msgid "Screen Sharing"
+msgstr "画面共有"
+
+#: ../panels/sharing/sharing.ui.h:28
+#, no-c-format
+msgid "Allow remote users to view or control your screen by connecting to: <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr "リモートユーザーが次の URI に接続して画面の表示または操作を行うことを許可します: <a href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/sharing.ui.h:29
+msgid "Remote View"
+msgstr "リモート表示"
+
+#: ../panels/sharing/sharing.ui.h:30
+msgid "Remote Control"
+msgstr "リモート操作"
+
+#: ../panels/sharing/sharing.ui.h:31
+msgid "Approve All Connections"
+msgstr "すべての接続を許可する"
+
+#: ../panels/sharing/sharing.ui.h:32
+msgid "Show Password"
+msgstr "パスワードを表示"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "サウンド"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and sound events"
-msgstr "音量や音のイベントを変更します"
+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
@@ -3455,61 +5165,45 @@ msgstr "ガラスを叩く音"
 msgid "Sonar"
 msgstr "ソナーのピング音"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
-msgid "Output"
-msgstr "出力"
-
-#: ../panels/sound/gvc-applet.c:272
-msgid "Sound Output Volume"
-msgstr "サウンド出力の音量"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input"
-msgstr "入力"
-
-#: ../panels/sound/gvc-applet.c:278
-msgid "Microphone Volume"
-msgstr "マイクの音量"
-
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "左"
 
-#: ../panels/sound/gvc-balance-bar.c:112
+#: ../panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "右"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "リア"
 
-#: ../panels/sound/gvc-balance-bar.c:116
+#: ../panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "フロント"
 
-#: ../panels/sound/gvc-balance-bar.c:119
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "最小"
 
-#: ../panels/sound/gvc-balance-bar.c:120
+#: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "最大"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:290
 msgid "_Balance:"
 msgstr "バランス(_B):"
 
-#: ../panels/sound/gvc-balance-bar.c:298
+#: ../panels/sound/gvc-balance-bar.c:293
 msgid "_Fade:"
 msgstr "フェード(_F):"
 
-#: ../panels/sound/gvc-balance-bar.c:301
+#: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Subwoofer:"
 msgstr "サブウーファー(_S):"
 
@@ -3524,13 +5218,13 @@ msgid "Unamplified"
 msgstr "非増幅"
 
 #: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:521
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "プロファイル(_P):"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1841
+#: ../panels/sound/gvc/gvc-mixer-control.c:1837
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3538,13 +5232,13 @@ msgstr[0] "%u 出力"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1851
+#: ../panels/sound/gvc/gvc-mixer-control.c:1847
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 入力"
 
-#: ../panels/sound/gvc-mixer-control.c:2375
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "システムのサウンド"
 
@@ -3552,57 +5246,69 @@ msgstr "システムのサウンド"
 msgid "_Test Speakers"
 msgstr "スピーカーのテスト(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:426
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "ピークの検出"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "名前"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-mixer-dialog.c:1527
+msgid "Device"
+msgstr "デバイス"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s のスピーカーテスト"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "出力の音量(_O):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
+msgid "Output"
+msgstr "出力"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "サウンド出力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1686
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "選択したデバイスの設定:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1699
+msgid "Input"
+msgstr "入力"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "入力の音量(_I):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "入力レベル:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1755
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "サウンド入力デバイスの選択(_H):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "音響効果"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "警告音の音量(_A):"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "音声の再生または録音を実行しているアプリケーションはありません。"
 
@@ -3647,42 +5353,26 @@ msgstr "テスト"
 msgid "Subwoofer"
 msgstr "サブウーファー"
 
-#: ../panels/sound/gvc-stream-status-icon.c:236
-#, c-format
-msgid "Failed to start Sound Preferences: %s"
-msgstr "サウンドの設定を起動できませんでした: %s"
-
-#: ../panels/sound/gvc-stream-status-icon.c:262
-msgid "_Mute"
-msgstr "ミュート(_M)"
-
-#: ../panels/sound/gvc-stream-status-icon.c:271
-msgid "_Sound Preferences"
-msgstr "サウンドの設定(_S)"
-
-#: ../panels/sound/gvc-stream-status-icon.c:416
-msgid "Muted"
-msgstr "ミュート"
-
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "その他"
 
-#: ../panels/universal-access/cc-ua-panel.c:286
-#: ../panels/universal-access/cc-ua-panel.c:292
+#: ../panels/universal-access/cc-ua-panel.c:281
+#: ../panels/universal-access/cc-ua-panel.c:287
 msgid "No shortcut set"
 msgstr "ショートカット未設定"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "ユニバーサルアクセスの設定"
+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:4
 msgid "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow 
Keys;Bounce Keys;Mouse Keys;"
-msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky 
Keys;Slow Keys;Bounce Keys;Mouse 
Keys;キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大;スクリーンリーダー;テキスト;文字;フォント;サイズ;大きさ;固定キー;スローキー;バウンスキー;マウスキー;"
+msgstr "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky 
Keys;Slow Keys;Bounce Keys;Mouse 
Keys;キーボード;マウス;アクセシビリティ;コントラスト;ズーム;拡大鏡;スクリーンリーダー;テキスト;文字;フォント;サイズ;大きさ;固定キー;スローキー;バウンスキー;マウスキー;"
 
 #: ../panels/universal-access/uap.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "低い"
@@ -3693,6 +5383,7 @@ msgid "Normal"
 msgstr "標準"
 
 #: ../panels/universal-access/uap.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "高い"
@@ -3714,10 +5405,6 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "何もしない"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3766,10 +5453,6 @@ msgstr "ハイコントラスト"
 msgid "Beep on Caps and Num Lock"
 msgstr "Caps Lock と Num Lock を切り替えるとビープ音を鳴らす"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options..."
-msgstr "オプション..."
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "スクリーンリーダー"
@@ -3797,7 +5480,7 @@ msgstr "大きな文字"
 
 #: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
-msgstr "視覚"
+msgstr "見る"
 
 #: ../panels/universal-access/uap.ui.h:31
 msgid "Visual Alerts"
@@ -3829,7 +5512,7 @@ msgstr "動作確認(_T)"
 
 #: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
-msgstr "聴覚"
+msgstr "聞く"
 
 #: ../panels/universal-access/uap.ui.h:40
 msgid "On Screen Keyboard"
@@ -3863,118 +5546,128 @@ msgstr "キーを押下してから入力と認識されるまでに一定の間
 msgid "A_cceptance delay:"
 msgstr "認識するまでの間隔(_C):"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:48
+msgctxt "universal access, delay"
+msgid "Short"
+msgstr "短い"
+
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "スローキーの入力間隔"
 
+#: ../panels/universal-access/uap.ui.h:50
+msgctxt "universal access, delay"
+msgid "Long"
+msgstr "長い"
+
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Beep when a key is"
 msgstr "キーが次のときビープ音を鳴らす: "
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:54
 msgid "pressed"
 msgstr "押された"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:56
 msgid "accepted"
 msgstr "認識された"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:58
 msgid "rejected"
 msgstr "拒否された"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Bounce Keys"
 msgstr "バウンスキー"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Ignores fast duplicate keypresses"
 msgstr "同じキーを繰り返し押した場合は無視する"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Acc_eptance delay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Bounce keys typing delay"
 msgstr "バウンスキーの入力間隔"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Beep when a key is _rejected"
 msgstr "キー入力が拒否されたらビープ音を鳴らす(_R)"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Enable by Keyboard"
 msgstr "キーボードによる有効化"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "アクセシビリティ機能のオン/オフをキーボードで切り替える"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Mouse Keys"
 msgstr "マウスキー"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Control the pointer using the keypad"
 msgstr "キーパッドでポインターを制御する"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Video Mouse"
 msgstr "ビデオマウス"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the video camera."
 msgstr "ビデオカメラでポインターを制御する。"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Simulated Secondary Click"
 msgstr "副ボタンのクリックの代替"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "主ボタンを押したままにすると副ボタンのクリックとみなす"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Secondary click delay"
 msgstr "副ボタンのクリックの間隔"
 
 # See also ja.po of mousetweak
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Hover Click"
 msgstr "ホバークリック"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Trigger a click when the pointer hovers"
 msgstr "ポインターの移動を停止したらクリック動作を行う"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "D_elay:"
 msgstr "認識するまでの間隔(_E):"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Motion _threshold:"
 msgstr "ジェスチャーのしきい値(_T):"
 
-#. small threshold
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
+msgctxt "universal access, threshold"
 msgid "Small"
 msgstr "小さい"
 
-#. large threshold
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:79
+msgctxt "universal access, threshold"
 msgid "Large"
 msgstr "大きい"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Mouse Settings"
 msgstr "マウスの設定"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Pointing and Clicking"
 msgstr "ポインター操作とクリック"
 
@@ -4074,72 +5767,74 @@ msgstr "拡大鏡"
 msgid "Thickness:"
 msgstr "太さ:"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: ../panels/universal-access/zoom-options.ui.h:18
+msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "細い"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:21
+#: ../panels/universal-access/zoom-options.ui.h:19
+msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "太い"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:20
 msgid "Length:"
 msgstr "長さ:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#. The color of the accessibility crosshair
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Color:"
 msgstr "色:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Crosshairs:"
 msgstr "照準線:"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Overlaps mouse cursor"
 msgstr "マウスカーソルに重ねる"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
 msgstr "照準線"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: ../panels/universal-access/zoom-options.ui.h:26
 msgid "White on black:"
 msgstr "反転:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: ../panels/universal-access/zoom-options.ui.h:27
 msgid "Brightness:"
 msgstr "明るさ:"
 
-#: ../panels/universal-access/zoom-options.ui.h:29
+#: ../panels/universal-access/zoom-options.ui.h:28
 msgid "Contrast:"
 msgstr "コントラスト:"
 
+#. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:30
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, contrast"
 msgid "Color"
 msgstr "色"
 
 #: ../panels/universal-access/zoom-options.ui.h:31
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, color"
 msgid "None"
 msgstr "白黒"
 
 #: ../panels/universal-access/zoom-options.ui.h:32
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, color"
 msgid "Full"
 msgstr "カラー"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:33
+msgctxt "universal access, brightness"
 msgid "Low"
-msgstr "低い"
+msgstr "暗い"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:34
+msgctxt "universal access, brightness"
 msgid "High"
-msgstr "高い"
+msgstr "明るい"
 
 #: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects:"
@@ -4175,10 +5870,6 @@ msgstr "ローカルのアカウント(_L)"
 msgid "_Enterprise Login"
 msgstr "エンタープライズのログイン(_E)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "ユーザー名(_U)"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "フルネーム(_F)"
@@ -4196,11 +5887,6 @@ msgstr "ドメイン(_D)"
 msgid "_Login Name"
 msgstr "ログイン名(_L)"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "パスワード(_P)"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "ヒント: エンタープライズドメイン名または領域名"
@@ -4264,7 +5950,7 @@ msgid "Right little finger"
 msgstr "右の小指"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:706
+#: ../panels/user-accounts/um-fingerprint-dialog.c:700
 msgid "Enable Fingerprint Login"
 msgstr "指紋認証を有効にする"
 
@@ -4285,18 +5971,34 @@ msgid "Your fingerprint was successfully saved. You should now be able to log in
 msgstr "あなたの指紋を登録しました。今から指紋リーダーを使ってログインできるようになりました。"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "User Accounts"
-msgstr "ユーザーアカウント"
+msgid "Users"
+msgstr "ユーザー"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "ユーザーの追加と削除"
+msgid "Add or remove users and change your password"
+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;ログイン;名前;指紋;アバター;ロゴ;顔;パスワード;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:1
+msgid "Login History"
+msgstr "ログイン履歴"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Previous Week"
+msgstr "前の週へ"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next Week"
+msgstr "次の週へ"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:5
+msgid "Next week"
+msgstr "次の週へ"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "いまパスワードを設定する"
@@ -4318,50 +6020,38 @@ msgid "Enable this account"
 msgstr "アカウントを有効にする"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "ヒント(_H)"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "This hint may be displayed at the login screen.  It will be visible to all users of this system.  Do 
<b>not</b> include the password here."
-msgstr "このヒントはログイン画面に表示されます。このシステムのユーザー全員に見えることになります。ここにパスワードを含め<b>ない</b>でください。"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "パスワードの確認(_O)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "新しいパスワード(_N)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "パスワードの生成"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "まあまあ"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "現在のパスワード(_P)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "アクション(_A)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "パスワードの変更"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "パスワードを表示(_S)"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "強力なパスワードの選び方"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "変更(_A)"
 
@@ -4426,6 +6116,10 @@ msgstr "ユーザーアイコン"
 msgid "_Language"
 msgstr "言語(_L)"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+msgid "Last Login"
+msgstr "最終ログイン"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "ユーザーアカウントの管理"
@@ -4435,7 +6129,7 @@ msgid "Authentication is required to change user data"
 msgstr "ユーザーのデータを変更するには認証が必要になります"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:569
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "短すぎる"
@@ -4446,25 +6140,25 @@ msgid "Not good enough"
 msgstr "不十分"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:570
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "弱い"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:571
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "まあまあ"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:572
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "良"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:573
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "強い"
@@ -4474,7 +6168,6 @@ msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "新しいパスワードは短すぎます"
@@ -4519,24 +6212,24 @@ msgstr "新しいパスワードには十分な種類の文字が含まれてい
 msgid "Unknown error"
 msgstr "原因不明のエラー"
 
-#: ../panels/user-accounts/um-account-dialog.c:180
+#: ../panels/user-accounts/um-account-dialog.c:182
 msgid "Failed to add account"
 msgstr "アカウントの追加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:378
-#: ../panels/user-accounts/um-account-dialog.c:419
+#: ../panels/user-accounts/um-account-dialog.c:403
+#: ../panels/user-accounts/um-account-dialog.c:444
 msgid "Failed to register account"
 msgstr "アカウントの登録に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:551
+#: ../panels/user-accounts/um-account-dialog.c:577
 msgid "No supported way to authenticate with this domain"
 msgstr "このドメインで認証を行う方法はサポートされていません"
 
-#: ../panels/user-accounts/um-account-dialog.c:605
+#: ../panels/user-accounts/um-account-dialog.c:631
 msgid "Failed to join domain"
 msgstr "ドメインの参加に失敗しました"
 
-#: ../panels/user-accounts/um-account-dialog.c:662
+#: ../panels/user-accounts/um-account-dialog.c:688
 msgid "Failed to log into domain"
 msgstr "ドメインへのログインに失敗しました"
 
@@ -4585,16 +6278,16 @@ msgstr "'%s' というデバイスにアクセスできません"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:603
+#: ../panels/user-accounts/um-fingerprint-dialog.c:599
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "'%s' で指紋を読み取れませんでした"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:655
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 msgid "Could not access any fingerprint readers"
 msgstr "指紋リーダーにアクセスできませんでした"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:656
+#: ../panels/user-accounts/um-fingerprint-dialog.c:651
 msgid "Please contact your system administrator for help."
 msgstr "システム管理者に連絡してください。"
 
@@ -4603,64 +6296,72 @@ msgstr "システム管理者に連絡してください。"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:734
 #, 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:747
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Selecting finger"
 msgstr "指の選択"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:748
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Enrolling fingerprints"
 msgstr "指紋の登録"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:749
-msgid "Summary"
-msgstr "概要"
+#: ../panels/user-accounts/um-history-dialog.c:88
+msgid "This Week"
+msgstr "今週"
+
+#: ../panels/user-accounts/um-history-dialog.c:91
+msgid "Last Week"
+msgstr "先週"
 
-#: ../panels/user-accounts/um-password-dialog.c:96
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "パスワードの生成(_G)"
 
-#: ../panels/user-accounts/um-password-dialog.c:150
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "別のパスワードを選択してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "現在のパスワードを再度入力してください。"
 
-#: ../panels/user-accounts/um-password-dialog.c:165
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "パスワードが変更できません"
 
-#: ../panels/user-accounts/um-password-dialog.c:236
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "新しいパスワードを入力してください"
 
-#: ../panels/user-accounts/um-password-dialog.c:245
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "新しいパスワードは強度が不十分です"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "確認のために新しいパスワードを入力してください"
 
-#: ../panels/user-accounts/um-password-dialog.c:248
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../panels/user-accounts/um-password-dialog.c:254
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "現在のパスワードを入力してください"
 
-#: ../panels/user-accounts/um-password-dialog.c:257
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "パスワードが間違っています"
 
-#: ../panels/user-accounts/um-password-dialog.c:347
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
-msgstr "パスワードが一致しない"
+msgstr "パスワードが一致しません"
 
-#: ../panels/user-accounts/um-password-dialog.c:409
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "間違ったパスワード"
 
@@ -4669,120 +6370,114 @@ msgid "Disable image"
 msgstr "画像を無効にする"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-msgid "Take a photo..."
-msgstr "写真を撮る..."
+msgid "Take a photo…"
+msgstr "写真を撮る…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-msgid "Browse for more pictures..."
-msgstr "他の画像も参照..."
+msgid "Browse for more pictures…"
+msgstr "他の画像も参照…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:704
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "%s に使用されています"
 
-#: ../panels/user-accounts/um-realm-manager.c:379
+#: ../panels/user-accounts/um-realm-manager.c:351
+msgid "Cannot automatically join this type of domain"
+msgstr "このタイプのドメインは自動で参加できません"
+
+#: ../panels/user-accounts/um-realm-manager.c:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "そのようなドメインや領域は見つかりませんでした"
 
-#: ../panels/user-accounts/um-realm-manager.c:780
+#: ../panels/user-accounts/um-realm-manager.c:815
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "%2$s ドメインに %1$s としてログインできません"
 
-#: ../panels/user-accounts/um-realm-manager.c:785
+#: ../panels/user-accounts/um-realm-manager.c:820
 msgid "Invalid password, please try again"
 msgstr "無効なパスワードです、やり直してください"
 
-#: ../panels/user-accounts/um-realm-manager.c:789
+#: ../panels/user-accounts/um-realm-manager.c:824
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "%sドメインに接続できませんでした: %s"
 
-#: ../panels/user-accounts/um-user-manager.c:466
-#, c-format
-msgid "A user with name '%s' already exists."
-msgstr "'%s' という名前のユーザーはすでに存在します。"
-
-#: ../panels/user-accounts/um-user-manager.c:473
-#, c-format
-msgid "No user with the name '%s' exists."
-msgstr "'%s' という名前のユーザーは存在しません。"
-
-#: ../panels/user-accounts/um-user-manager.c:631
-msgid "This user does not exist."
-msgstr "このユーザーは存在しません。"
-
-#: ../panels/user-accounts/um-user-panel.c:371
+#: ../panels/user-accounts/um-user-panel.c:376
 msgid "Failed to delete user"
 msgstr "ユーザーの削除に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:436
 msgid "You cannot delete your own account."
 msgstr "自分自身のアカウントは削除できません。"
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:445
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s はまだログインしています"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:449
 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:453
+#: ../panels/user-accounts/um-user-panel.c:458
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "'%s' のファイルを残しますか?"
 
-#: ../panels/user-accounts/um-user-panel.c:457
+#: ../panels/user-accounts/um-user-panel.c:462
 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:460
+#: ../panels/user-accounts/um-user-panel.c:465
 msgid "_Delete Files"
 msgstr "ファイルを削除(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:461
+#: ../panels/user-accounts/um-user-panel.c:466
 msgid "_Keep Files"
 msgstr "ファイルを残す(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:513
+#: ../panels/user-accounts/um-user-panel.c:518
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "無効アカウント"
 
-#: ../panels/user-accounts/um-user-panel.c:521
+#: ../panels/user-accounts/um-user-panel.c:526
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "次のログイン時に設定"
 
-#: ../panels/user-accounts/um-user-panel.c:524
+#: ../panels/user-accounts/um-user-panel.c:529
 msgctxt "Password mode"
 msgid "None"
 msgstr "なし"
 
-#: ../panels/user-accounts/um-user-panel.c:871
+#: ../panels/user-accounts/um-user-panel.c:578
+msgid "Logged in"
+msgstr "ログイン中"
+
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "アカウントサービスの接続に失敗しました"
 
-#: ../panels/user-accounts/um-user-panel.c:873
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "AccountService がインストールされ、有効になっているか確認してください。"
 
-#: ../panels/user-accounts/um-user-panel.c:913
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
 msgstr "変更するには、まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-user-panel.c:951
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "新規ユーザーアカウントの作成"
 
-#: ../panels/user-accounts/um-user-panel.c:962
-#: ../panels/user-accounts/um-user-panel.c:1273
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4790,12 +6485,12 @@ msgstr ""
 "ユーザーアカウントを作成するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-user-panel.c:971
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "選択したユーザーアカウントを削除します"
 
-#: ../panels/user-accounts/um-user-panel.c:983
-#: ../panels/user-accounts/um-user-panel.c:1278
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4803,29 +6498,29 @@ msgstr ""
 "選択したユーザーアカウントを削除するには、\n"
 "まず * アイコンをクリックしてください"
 
-#: ../panels/user-accounts/um-user-panel.c:1176
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "自分のアカウント"
 
-#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "他のアカウント"
 
-#: ../panels/user-accounts/um-utils.c:512
+#: ../panels/user-accounts/um-utils.c:516
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "'%s' というユーザーはすでに存在します"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:520
 #, c-format
 msgid "The username is too long"
 msgstr "ユーザー名が長すぎます"
 
-#: ../panels/user-accounts/um-utils.c:519
+#: ../panels/user-accounts/um-utils.c:523
 msgid "The username cannot start with a '-'"
 msgstr "ユーザー名の先頭文字に '-' は使えません"
 
-#: ../panels/user-accounts/um-utils.c:522
+#: ../panels/user-accounts/um-utils.c:526
 msgid ""
 "The username must only consist of:\n"
 " ➣ letters from the English alphabet\n"
@@ -4845,11 +6540,6 @@ msgstr "ボタン割り当て"
 msgid "Map buttons to functions"
 msgstr "ボタンへ機能を割り当て"
 
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:78
-msgid "Screen Calibration"
-msgstr "画面位置調整"
-
 #: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid "Please tap the target markers as they appear on screen to calibrate the tablet."
 msgstr "タブレットの位置調整を行いますので、画面に出現するマーカーをタップしてください。"
@@ -4878,7 +6568,7 @@ msgstr "単一画面にマッピング"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "なし"
@@ -4893,28 +6583,35 @@ msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "モニターの切り替え"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:121
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "オンスクリーンヘルプの表示"
+
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "上"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "下"
 
-#: ../panels/wacom/cc-wacom-page.c:638
+#: ../panels/wacom/cc-wacom-page.c:662
 msgid "Switch Modes"
 msgstr "スイッチモード"
 
-#: ../panels/wacom/cc-wacom-page.c:724
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
+#: ../panels/wacom/cc-wacom-page.c:752
+#: ../panels/wacom/cc-wacom-stylus-page.c:373
 msgid "Button"
 msgstr "ボタン"
 
-#: ../panels/wacom/cc-wacom-page.c:777
+#: ../panels/wacom/cc-wacom-page.c:810
 msgid "Action"
 msgstr "操作"
 
-#: ../panels/wacom/cc-wacom-page.c:886
+#: ../panels/wacom/cc-wacom-page.c:920
 msgid "Display Mapping"
 msgstr "画面のマッピング"
 
@@ -4924,8 +6621,8 @@ msgid "Wacom Tablet"
 msgstr "ワコムタブレット"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "ワコムタブレットを設定します"
+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:4
@@ -4958,17 +6655,12 @@ msgstr "Bluetooth の設定"
 
 # 参考: intuos 5 のマニュアル p.57
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
-msgstr "画面にマッピング..."
+msgid "Map to Monitor…"
+msgstr "画面にマッピング…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
-msgstr "ボタンの割り当て..."
-
-# Cintiq 21UX の日英のマニュアルを参照。calibrate は位置調整、に対応している
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "位置調整..."
+msgid "Map Buttons…"
+msgstr "ボタン割り当て…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Adjust display resolution"
@@ -4984,69 +6676,92 @@ msgstr "左手用"
 
 # この Ring は Intuos 4 や Cintiq 24HD の Touch Ring のこと。日本版ではタッチホイール。
 # libwacom のソースコードも参照のこと。
-#: ../panels/wacom/gsd-wacom-device.c:1010
+#. If no mode is available, we use "left-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1076
+msgid "Left Ring"
+msgstr "左タッチホイール"
+
+# この Ring は Intuos 4 や Cintiq 24HD の Touch Ring のこと。日本版ではタッチホイール。
+# libwacom のソースコードも参照のこと。
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "左タッチホイールのモード #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1019
+#. If no mode is available, we use "right-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1105
+msgid "Right Ring"
+msgstr "右タッチホイール"
+
+#: ../panels/wacom/gsd-wacom-device.c:1115
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "右タッチホイールのモード #%d"
 
 # Touch Strip はトラックパッド。Cintiq の日英のマニュアルを参照
-#: ../panels/wacom/gsd-wacom-device.c:1049
+#. If no mode is available, we use "left-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1156
+msgid "Left Touchstrip"
+msgstr "左トラックパッド"
+
+# Touch Strip はトラックパッド。Cintiq の日英のマニュアルを参照
+#: ../panels/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "左トラックパッドのモード #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1058
+#. If no mode is available, we use "right-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1185
+msgid "Right Touchstrip"
+msgstr "右トラックパッド"
+
+#: ../panels/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "右トラックパッドのモード #%d"
 
 # Touch Ring はタッチホイール。Intuos 4 の日英のマニュアルを参照
-#: ../panels/wacom/gsd-wacom-device.c:1075
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "左タッチホイールのモードスイッチ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1077
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "右タッチホイールのモードスイッチ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1080
+#: ../panels/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "左トラックパッドのモードスイッチ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1082
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "右トラックパッドのモードスイッチ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "モードスイッチ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1159
+#: ../panels/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "左ボタン #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "右ボタン #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1165
+#: ../panels/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "上ボタン #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1168
+#: ../panels/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "下ボタン #%d"
@@ -5119,28 +6834,40 @@ msgstr "下のサイドスイッチ"
 msgid "Tip Pressure Feel"
 msgstr "ペン先の感触"
 
-#: ../shell/control-center.c:58
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
 msgstr "冗長モードを有効にする"
 
-#: ../shell/control-center.c:59
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "全体を表示する"
 
-#: ../shell/control-center.c:60 ../shell/control-center.c:61
-#: ../shell/control-center.c:62
+#: ../shell/cc-application.c:69
+msgid "Search for the string"
+msgstr "キーワードで検索する"
+
+#: ../shell/cc-application.c:70
+msgid "List possible panel names and exit"
+msgstr "利用可能なパネル名をリスト表示して終了する"
+
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "ヘルプのオプションを表示する"
 
-#: ../shell/control-center.c:63
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "表示するパネル"
 
-#: ../shell/control-center.c:85
-msgid "- System Settings"
-msgstr "- システム設定"
+#: ../shell/cc-application.c:74
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[PANEL] [ARGUMENT…]"
+
+#: ../shell/cc-application.c:116
+msgid "- Settings"
+msgstr "- 設定"
 
-#: ../shell/control-center.c:93
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5149,29 +6876,503 @@ msgstr ""
 "%s\n"
 "利用可能なすべてのコマンドラインオプションを表示するには '%s --help' を実行してください。\n"
 
-#: ../shell/control-center.c:211
+#: ../shell/cc-application.c:154
+msgid "Available panels:"
+msgstr "利用可能なパネル:"
+
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../shell/control-center.c:212
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "終了"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "コントロールセンター"
+#: ../shell/cc-window.c:62 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "設定"
+
+#. Add categories
+#: ../shell/cc-window.c:858
+msgctxt "category"
+msgid "Personal"
+msgstr "パーソナル"
+
+#: ../shell/cc-window.c:859
+msgctxt "category"
+msgid "Hardware"
+msgstr "ハードウェア"
+
+#: ../shell/cc-window.c:860
+msgctxt "category"
+msgid "System"
+msgstr "システム"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "System Settings"
-msgstr "システム設定"
+#: ../shell/cc-window.c:1411
+msgid "All Settings"
+msgstr "すべての設定"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Preferences;Settings;設定;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "すべての設定"
+#~ msgctxt "Input source"
+#~ msgid "None"
+#~ msgstr "なし"
+
+#~ msgid "Change the background"
+#~ msgstr "背景を変更する"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "Bluetooth の設定を調整する"
+
+#~ msgid "Browse Files..."
+#~ msgstr "ファイルを参照..."
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "Create virtual device"
+#~ msgstr "仮想デバイスの作成"
+
+#~ msgid "Available Profiles for Displays"
+#~ msgstr "利用可能なディスプレイ用プロファイル"
+
+#~ msgid "Available Profiles for Scanners"
+#~ msgstr "利用可能なスキャナー用プロファイル"
+
+#~ msgid "Available Profiles for Printers"
+#~ msgstr "利用可能なプリンター用プロファイル"
+
+#~ msgid "Available Profiles for Cameras"
+#~ msgstr "利用可能なカメラ用プロファイル"
+
+#~ msgid "Available Profiles for Webcams"
+#~ msgstr "利用可能なウェブカム用プロファイル"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i 年"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i か月"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i 週間"
+
+#~ msgid "Less than 1 week"
+#~ msgstr "1 週間以下"
+
+#~ msgid "This device is not color managed."
+#~ msgstr "このデバイスは色の管理が行われていません。"
+
+#~ msgid "This device is using manufacturing calibrated data."
+#~ msgstr "このデバイスは製造時のキャリブレーションデータを使用しています。"
+
+#~ msgid "This device does not have a profile suitable for whole-screen color correction."
+#~ msgstr "このデバイスには画面全体の色補正に適したプロファイルがありません。"
+
+#~ msgid "Not specified"
+#~ msgstr "指定なし"
+
+#~ msgid "No devices supporting color management detected"
+#~ msgstr "カラーマネージメントをサポートするデバイスがみつかりません"
+
+#~ msgid "Add device"
+#~ msgstr "デバイスの追加"
+
+#~ msgid "Add a virtual device"
+#~ msgstr "仮想デバイスの追加"
+
+#~ msgid "Remove a device"
+#~ msgstr "デバイスの削除"
+
+#~ msgid "Color management settings"
+#~ msgstr "カラーマネージメントの設定"
+
+#~ msgid "English"
+#~ msgstr "英語"
+
+#~ msgid "British English"
+#~ msgstr "イギリス英語"
+
+#~ msgid "German"
+#~ msgstr "ドイツ語"
+
+#~ msgid "French"
+#~ msgstr "フランス語"
+
+#~ msgid "Spanish"
+#~ msgstr "スペイン語"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "中国語 (簡体字)"
+
+#~ msgid "Russian"
+#~ msgstr "ロシア語"
+
+#~ msgid "Arabic"
+#~ msgstr "アラビア語"
+
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
+
+#~ msgid "Select a language"
+#~ msgstr "言語を選択してください"
+
+#~ msgid "_Select"
+#~ msgstr "選択(_S)"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "日付と時刻の設定パネル"
+
+#~ msgid "%d x %d (%s)"
+#~ msgstr "%d x %d (%s)"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d x %d"
+
+#~ msgid "VESA: %s"
+#~ msgstr "VESA: %s"
+
+#~ msgid "Unknown model"
+#~ msgstr "不明なモデル"
+
+#~ msgid "The next login will attempt to use the standard experience."
+#~ msgstr "次回ログインは標準モードの使用を試みます。"
+
+#~ msgid "The next login will use the fallback mode intended for unsupported graphics hardware."
+#~ msgstr "次回ログインは、サポート対象外のグラフィックハードウェア向けにフォールバックモードを使用します。"
+
+#~ msgctxt "Experience"
+#~ msgid "Fallback"
+#~ msgstr "フォールバック"
+
+#~ msgid "System Information"
+#~ msgstr "システム情報"
+
+#~ msgid "OS type"
+#~ msgstr "OS 種別"
+
+#~ msgid "_Other Media..."
+#~ msgstr "他のメディア(_O)..."
+
+#~ msgid "Experience"
+#~ msgstr "モード"
+
+#~ msgid "Forced _Fallback Mode"
+#~ msgstr "強制フォールバックモード(_F)"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "キーボードの設定を変更する"
+
+#~ msgid "Layout Settings"
+#~ msgstr "レイアウトの設定"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "マウスとタッチパッドを設定します"
+
+#~ msgid "Network settings"
+#~ msgstr "ネットワークの設定"
+
+#~ msgid "Network;Wireless;IP;LAN;Proxy;"
+#~ msgstr "Network;Wireless;IP;LAN;Proxy;ネットワーク;無線;プロキシ;"
+
+#~ msgid "Out of range"
+#~ msgstr "範囲外"
+
+#~ msgid "_Options..."
+#~ msgstr "オプション(_O)..."
+
+#~ msgid "C_reate..."
+#~ msgstr "作成する(_R)..."
+
+#~ msgid "_Configure..."
+#~ msgstr "設定(_C)..."
+
+#~ msgid "Wireless Hotspot"
+#~ msgstr "ワイヤレスホットスポット"
+
+#~ msgid "Wireless"
+#~ msgstr "無線"
+
+#~ msgid "_Disconnect"
+#~ msgstr "切断(_D)"
+
+#~ msgid "_Connect"
+#~ msgstr "接続(_C)"
+
+#~ msgid "Wired"
+#~ msgstr "有線"
+
+#~ msgid "Mesh"
+#~ msgstr "メッシュ"
+
+#~ msgid "Disconnected"
+#~ msgstr "切断"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "キャリア/リンクが変更されました"
+
+#~ msgid "Expired credentials. Please log in again."
+#~ msgstr "認証の有効期限が切れています。ログインしなおしてください。"
+
+#~ msgid "_Log In"
+#~ msgstr "ログイン(_L)"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "オンラインアカウント管理"
+
+#~ msgid "Caution low battery, %s remaining"
+#~ msgstr "バッテリー残量が少ないので注意 - 残り %s"
+
+#~ msgid "Using battery power - %s remaining"
+#~ msgstr "バッテリー電源の使用中 - 残り %s"
+
+#~ msgid "Using battery power"
+#~ msgstr "バッテリー電源の使用中"
+
+#~ msgid "Charging - fully charged"
+#~ msgstr "充電中 - フル充電されています"
+
+#~ msgid "Using UPS power - %s remaining"
+#~ msgstr "UPS 電源の使用中 - 残り %s"
+
+#~ msgid "Caution low UPS"
+#~ msgstr "UPS 電源の残量低下に注意"
+
+#~ msgid "Using UPS power"
+#~ msgstr "UPS 電源の使用中"
+
+#~ msgid "Your secondary battery is fully charged"
+#~ msgstr "第2バッテリーはフル充電されています"
+
+#~ msgid "Your secondary battery is empty"
+#~ msgstr "第2バッテリーは空です"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging - fully charged"
+#~ msgstr "充電中 - フル充電されています"
+
+#~ msgid "Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
+#~ msgstr "ヒント: <a href=\"screen\">画面の明るさ</a> は使用する電力量に影響します。"
+
+#~ msgid "Power management settings"
+#~ msgstr "電源管理の設定"
+
+#~ msgid "Don't suspend"
+#~ msgstr "サスペンドしない"
+
+#~ msgid "Suspend when inactive for"
+#~ msgstr "次の時間アイドル状態が続けばサスペンドする"
+
+#~ msgctxt "printer state"
+#~ msgid "Paused"
+#~ msgstr "一時停止中"
+
+#~ msgid "Change printer settings"
+#~ msgstr "プリンターの設定を変更する"
+
+#~ msgid "%s Options"
+#~ msgstr "%s個のオプション"
+
+#~ msgid "Manufacturers"
+#~ msgstr "製造元"
+
+#~ msgid "Drivers"
+#~ msgstr "ドライバー"
+
+#~ msgid "_Show"
+#~ msgstr "表示(_S)"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "地域と言語に関する設定の変更"
+
+#~ msgid "Choose an input source"
+#~ msgstr "入力ソースの選択"
+
+#~ msgid "Select an input source to add"
+#~ msgstr "追加する入力ソースを選択"
+
+#~ msgid "The login screen, system accounts and new user accounts use the system-wide Region and Language 
settings."
+#~ msgstr "ログイン画面、システムアカウント、および新規のユーザーアカウントでは、システムワイドの地域と言語の設定が使用されます。"
+
+#~ msgid "The login screen, system accounts and new user accounts use the system-wide Region and Language 
settings. You may change the system settings to match yours."
+#~ msgstr "ログイン画面、システムアカウント、および新規のユーザーアカウントでは、システムワイドの地域と言語の設定が使用されます。システム設定をユーザー設定に合わせることができます。"
+
+#~ msgid "Copy Settings"
+#~ msgstr "設定のコピー"
+
+#~ msgid "Copy Settings..."
+#~ msgstr "設定のコピー..."
+
+#~ msgid "Region and Language"
+#~ msgstr "地域と言語"
+
+#~ msgid "Select a display language (change will be applied next time you log in)"
+#~ msgstr "表示言語を選択 (変更内容は次回ログイン時に適用されます)"
+
+#~ msgid "Add Language"
+#~ msgstr "言語の追加"
+
+#~ msgid "Remove Language"
+#~ msgstr "言語の削除"
+
+#~ msgid "Install languages..."
+#~ msgstr "言語をインストール..."
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "地域を選択してください (変更内容は次回ログイン時に適用されます)"
+
+#~ msgid "Add Region"
+#~ msgstr "地域の追加"
+
+#~ msgid "Currency"
+#~ msgstr "通貨"
+
+#~ msgid "Examples"
+#~ msgstr "例"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "キーボードあるいは他の入力ソースを選択"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "入力ソースの削除"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "入力ソースを上へ移動"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "キーボードレイアウトを表示"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Space"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "ショートカットの設定"
+
+#~ msgid "Display language:"
+#~ msgstr "表示言語:"
+
+#~ msgid "Input source:"
+#~ msgstr "入力ソース:"
+
+#~ msgid "Format:"
+#~ msgstr "フォーマット:"
+
+#~ msgid "Your settings"
+#~ msgstr "ユーザー設定"
+
+#~ msgid "System settings"
+#~ msgstr "システム設定"
+
+#~ msgid "Brightness & Lock"
+#~ msgstr "画面の明るさとロック"
+
+#~ msgid "Screen brightness and lock settings"
+#~ msgstr "画面の明るさとロックの設定"
+
+#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#~ msgstr "Brightness;Lock;Dim;Blank;Monitor;明るさ;ロック;暗い;ブランク;モニター;"
+
+#~ msgid "_Dim screen to save power"
+#~ msgstr "画面を暗くして節電する(_D)"
+
+#~ msgid "Don't lock when at home"
+#~ msgstr "家にいるときは画面をロックしない"
+
+#~ msgid "Locations..."
+#~ msgstr "場所..."
+
+#~ msgid "Lock"
+#~ msgstr "ロック"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "デバッグモードにする"
+
+#~ msgid "Version of this application"
+#~ msgstr "このアプリケーションのバージョン"
+
+#~ msgid " — GNOME Volume Control Applet"
+#~ msgstr " — GNOME 音量調節アプレット"
+
+#~ msgid "Show desktop volume control"
+#~ msgstr "デスクトップの音量を調節するアプレットです"
+
+#~ msgid "Sound Output Volume"
+#~ msgstr "サウンド出力の音量"
+
+#~ msgid "Microphone Volume"
+#~ msgstr "マイクの音量"
+
+#~ msgid "Failed to start Sound Preferences: %s"
+#~ msgstr "サウンドの設定を起動できませんでした: %s"
+
+#~ msgid "_Mute"
+#~ msgstr "ミュート(_M)"
+
+#~ msgid "_Sound Preferences"
+#~ msgstr "サウンドの設定(_S)"
+
+#~ msgid "Muted"
+#~ msgstr "ミュート"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "ユニバーサルアクセスの設定"
+
+#~ msgid "Options..."
+#~ msgstr "オプション..."
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "Color"
+#~ msgstr "色"
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "None"
+#~ msgstr "白黒"
+
+#~ msgid "User Accounts"
+#~ msgstr "ユーザーアカウント"
+
+#~ msgid "_Hint"
+#~ msgstr "ヒント(_H)"
+
+#~ msgid "This hint may be displayed at the login screen.  It will be visible to all users of this system.  
Do <b>not</b> include the password here."
+#~ msgstr "このヒントはログイン画面に表示されます。このシステムのユーザー全員に見えることになります。ここにパスワードを含め<b>ない</b>でください。"
+
+#~ msgid "Fair"
+#~ msgstr "まあまあ"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "他の画像も参照..."
+
+#~ msgid "No user with the name '%s' exists."
+#~ msgstr "'%s' という名前のユーザーは存在しません。"
+
+#~ msgid "This user does not exist."
+#~ msgstr "このユーザーは存在しません。"
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "ワコムタブレットを設定します"
+
+#~ msgid "Map Buttons..."
+#~ msgstr "ボタンの割り当て..."
+
+# Cintiq 21UX の日英のマニュアルを参照。calibrate は位置調整、に対応している
+#~ msgid "Calibrate..."
+#~ msgstr "位置調整..."
+
+#~ msgid "- System Settings"
+#~ msgstr "- システム設定"
+
+#~ msgid "Control Center"
+#~ msgstr "コントロールセンター"
+
+#~ msgid "System Settings"
+#~ msgstr "システム設定"
 
 #~ msgid "Security Key"
 #~ msgstr "セキュリティキー"
@@ -5188,15 +7389,9 @@ msgstr "すべての設定"
 #~ msgid "Getting devices..."
 #~ msgstr "デバイスの取得中..."
 
-#~ msgid "No local printers found"
-#~ msgstr "接続されているプリンターが見つかりませんでした"
-
 #~ msgid "FirewallD is not running. Network printer detection needs services mdns, ipp, ipp-client and 
samba-client enabled on firewall."
 #~ msgstr "ファイアウォールデーモンが起動していません。ネットワークプリンターを検出するには、mDNS、IPP、IPP クライアント、SMB クライアントがファイアウォールで利用可能でなければなりません。"
 
-#~ msgid "Devices"
-#~ msgstr "デバイス"
-
 #~ msgctxt "printer type"
 #~ msgid "Local"
 #~ msgstr "ローカル"
@@ -5232,12 +7427,6 @@ msgstr "すべての設定"
 #~ msgid "Caribou"
 #~ msgstr "Caribou"
 
-#~ msgid "Co_nnector:"
-#~ msgstr "コネクター(_N):"
-
-#~ msgid "Hardware"
-#~ msgstr "ハードウェア"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "設定するデバイスの選択(_H):"
 
@@ -5262,9 +7451,6 @@ msgstr "すべての設定"
 #~ msgid "Solid Color"
 #~ msgstr "単色"
 
-#~ msgid "Pictures Folder"
-#~ msgstr "画像フォルダー"
-
 #~ msgid "Colors & Gradients"
 #~ msgstr "色とグラデーション"
 
@@ -5319,19 +7505,10 @@ msgstr "すべての設定"
 #~ msgid "_Edge scrolling"
 #~ msgstr "エッジスクロール(_E)"
 
-#~ msgid "Enable h_orizontal scrolling"
-#~ msgstr "水平スクロールを有効にする(_O)"
-
 #~ msgctxt "Wireless access point"
 #~ msgid "Other..."
 #~ msgstr "その他..."
 
-#~ msgid "Hotspot"
-#~ msgstr "アクセスポイント"
-
-#~ msgid "Not connected to the internet."
-#~ msgstr "インターネットに接続していません。"
-
 #~ msgid "Create the hotspot anyway?"
 #~ msgstr "とにかくアクセスポイントを作成しますか?"
 
@@ -5359,18 +7536,12 @@ msgstr "すべての設定"
 #~ msgid "Add User"
 #~ msgstr "ユーザーの追加"
 
-#~ msgid "Remove User"
-#~ msgstr "ユーザーの削除"
-
 #~ msgid "Allowed users"
 #~ msgstr "許可されたユーザー"
 
 #~ msgid "Account _type"
 #~ msgstr "アカウントの種類(_T)"
 
-#~ msgid "Device Off"
-#~ msgstr "デバイスをオフ"
-
 #~ msgid "Disable VPN"
 #~ msgstr "VPN を無効化"
 
@@ -5383,9 +7554,6 @@ msgstr "すべての設定"
 #~ msgid "FTP Port"
 #~ msgstr "FTP ポート"
 
-#~ msgid "Socks Port"
-#~ msgstr "Socks ポート"
-
 #~ msgid "To add a new account, first select the account type"
 #~ msgstr "新規アカウントを追加するには、まずアカウントの種類を選択してください"
 
@@ -5402,33 +7570,15 @@ msgstr "すべての設定"
 #~ msgid "affect how much power is used"
 #~ msgstr "どのくらい電力を使うのかに影響します"
 
-#~ msgid "Choose a Layout"
-#~ msgstr "レイアウトの選択"
-
-#~ msgid "Preview"
-#~ msgstr "プレビュー"
-
 #~ msgid "Add Layout"
 #~ msgstr "レイアウトの追加"
 
 #~ msgid "Remove Layout"
 #~ msgstr "レイアウトの削除"
 
-#~ msgid "Move Up"
-#~ msgstr "上へ"
-
-#~ msgid "Move Down"
-#~ msgstr "下へ"
-
 #~ msgid "Preview Layout"
 #~ msgstr "レイアウトのプレビュー"
 
-#~ msgid "Use the same layout for all windows"
-#~ msgstr "すべてのウィンドウで同じレイアウトを使う"
-
-#~ msgid "Allow different layouts for individual windows"
-#~ msgstr "ウィンドウ毎に別のレイアウトを使用可能にする"
-
 #~ msgid "New windows use the default layout"
 #~ msgstr "新しいウィンドウでデフォルトのレイアウトを使う"
 
@@ -5508,20 +7658,12 @@ msgstr "すべての設定"
 #~ msgid "Wacom Graphics Tablet"
 #~ msgstr "ワコム グラフィックスタブレット"
 
-#, fuzzy
-#~| msgid "Sound Settings"
-#~ msgid "Screen Settings"
-#~ msgstr "サウンドの設定"
-
 #~ msgid "Unlock"
 #~ msgstr "ロック解除"
 
 #~ msgid "Battery discharging"
 #~ msgstr "バッテリーの放電中"
 
-#~ msgid "UPS discharging"
-#~ msgstr "UPS の放電中"
-
 #~ msgid "%s until charged (%.0lf%%)"
 #~ msgstr "充電完了まで %s (%.0lf%%)"
 


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