[gnome-control-center/gnome-3-22] Updated Japanese translation
- From: Jiro Matsuzawa <jmatsuzawa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-22] Updated Japanese translation
- Date: Mon, 17 Apr 2017 14:35:41 +0000 (UTC)
commit efee15c079034901b6594ddd664c8158a110f5c8
Author: Hideki Yamnane <henrich debian org>
Date: Mon Apr 17 23:35:12 2017 +0900
Updated Japanese translation
po/ja.po | 2043 +++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 1081 insertions(+), 962 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 4372845..4668d62 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,18 +11,18 @@
# Yasumichi Akahoshi <yasumichi vinelinux org>, 2010.
# Kiyotaka NISHIBORI <ml nishibori kiyotaka gmail com>, 2011.
# Jiro Matsuzawa <jmatsuzawa gnome org>, 2010-2016.
-# Hideki Yamnane <henrich debian org>, 2011.
+# Hideki Yamnane <henrich debian org>, 2011, 2017
# Noriko Mizumoto <noriko fedoraproject org>, 2012.
# Ikuya Awashiro <ikuya fruitsbasket info>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-control-center master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-17 13:52+0000\n"
+"POT-Creation-Date: 2017-04-10 12:26+0000\n"
"PO-Revision-Date: 2016-03-21 11:46+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
+"Last-Translator: Hideki Yamnane <henrich debian org>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -100,7 +100,7 @@ msgstr "画像が見つかりません"
#. * directory in the string below when XDG_PICTURES_DIR is
#. * undefined
#: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
msgid "Home"
msgstr "ホーム"
@@ -115,25 +115,24 @@ msgstr "画像を %s フォルダーに追加すると、その画像がここ
#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1563
-#: ../panels/display/cc-display-panel.c:2196
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2207
#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:245
-#: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1269
-#: ../panels/network/net-device-wifi.c:1462
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1346
+#: ../panels/network/net-device-wifi.c:1585
#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
+#: ../panels/printers/cc-printers-panel.c:2100
#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:982
+#: ../panels/privacy/cc-privacy-panel.c:1048
#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
-#: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/search/cc-search-locations-dialog.c:637
+#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
#: ../panels/user-accounts/um-photo-dialog.c:94
#: ../panels/user-accounts/um-photo-dialog.c:217
#: ../panels/user-accounts/um-user-panel.c:705
@@ -164,16 +163,17 @@ msgstr "デスクトップの背景が見つかりません"
msgid "Current background"
msgstr "現在の背景"
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Background"
msgstr "背景"
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
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
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
msgid "Wallpaper;Screen;Desktop;"
msgstr "Wallpaper;Screen;Desktop;壁紙;スクリーン;デスクトップ;Background;背景;"
@@ -214,18 +214,17 @@ msgstr "ハードウェア機内モードがオンになっています"
msgid "Turn off the Airplane mode switch to enable Bluetooth."
msgstr "Bluetooth を使用するには機内モードスイッチをオフにしてください。"
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Bluetooth"
msgstr "Bluetooth"
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
msgid "Turn Bluetooth on and off and connect your devices"
msgstr "Bluetooth のオン/オフやデバイスへの接続を行います。"
#. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
msgid "share;sharing;bluetooth;obex;"
msgstr "share;sharing;bluetooth;obex;共有;シェアリング;ブルートゥース;"
@@ -395,7 +394,7 @@ msgstr "サポートする ICC プロファイル"
#. TRANSLATORS: filter name on the file->open dialog
#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
msgid "All files"
msgstr "すべてのファイル"
@@ -438,7 +437,7 @@ msgid "Save Profile"
msgstr "プロファイルの保存"
#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:375
+#: ../panels/network/connection-editor/vpn-helpers.c:311
msgid "_Save"
msgstr "保存(_S)"
@@ -693,7 +692,7 @@ msgstr ""
"かもしません。"
#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
msgid "Summary"
msgstr "概要"
@@ -705,11 +704,11 @@ msgstr "プロファイルの追加"
msgid "_Import File…"
msgstr "ファイルを読み込む(_I)…"
-#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
#: ../panels/printers/new-printer-dialog.ui.h:3
#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
msgid "_Add"
msgstr "追加(_A)"
@@ -859,17 +858,18 @@ msgstr "D65 (写真とグラフィック)"
msgid "D75"
msgstr "D75"
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "色"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Color"
+msgstr "カラー"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
msgid ""
"Calibrate the color of your devices, such as displays, cameras or printers"
msgstr "ディスプレイやカメラ、プリンター等のデバイスのキャリブレート"
#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
msgstr ""
"Color;ICC;Profile;Calibrate;Printer;Display;色;ICC;プロファイル;キャリブレー"
@@ -889,23 +889,23 @@ msgstr "さらに…"
msgid "No languages found"
msgstr "言語が見つかりません"
-#: ../panels/common/cc-util.c:125
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
msgid "Today"
msgstr "今日"
-#: ../panels/common/cc-util.c:129
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
msgid "Yesterday"
msgstr "昨日"
#. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:136
+#: ../panels/common/cc-util.c:138
msgid "%b %e"
msgstr "%m月%d日"
#. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:141
+#: ../panels/common/cc-util.c:143
msgid "%b %e, %Y"
msgstr "%Y年%m月%d日"
@@ -1025,8 +1025,9 @@ msgstr "11月"
msgid "December"
msgstr "12月"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
msgid "Date & Time"
msgstr "日付と時刻"
@@ -1083,12 +1084,12 @@ msgstr "24時制"
msgid "AM / PM"
msgstr "午前/午後"
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
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
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
msgid "Clock;Timezone;Location;"
msgstr ""
"Clock;Timezone;Location;時計;日付;時刻;時間;日時;タイムゾーン;場所;Date;Time;"
@@ -1101,209 +1102,220 @@ msgstr "システムの時刻と日付の設定を変更"
msgid "To change time or date settings, you need to authenticate."
msgstr "時刻と日付の設定を変更するには、認証が必要です。"
-#: ../panels/display/cc-display-panel.c:575
+#: ../panels/display/cc-display-panel.c:573
msgid "Lid Closed"
msgstr "蓋が閉じています"
#. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:576
msgid "Mirrored"
msgstr "ミラー済み"
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/display/cc-display-panel.c:2390
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2430
msgid "Primary"
msgstr "プライマリ"
-#: ../panels/display/cc-display-panel.c:582
+#: ../panels/display/cc-display-panel.c:580
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
#: ../panels/universal-access/uap.ui.h:6
msgid "Off"
msgstr "オフ"
-#: ../panels/display/cc-display-panel.c:585
+#: ../panels/display/cc-display-panel.c:583
msgid "Secondary"
msgstr "セカンダリ"
#. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1560
+#: ../panels/display/cc-display-panel.c:1558
msgid "Arrange Combined Displays"
msgstr "ディスプレイの配置の調整"
-#: ../panels/display/cc-display-panel.c:1564
-#: ../panels/display/cc-display-panel.c:2197
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2208
#: ../panels/network/connection-editor/connection-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:2
msgid "_Apply"
msgstr "適用(_A)"
-#: ../panels/display/cc-display-panel.c:1588
+#: ../panels/display/cc-display-panel.c:1586
msgid "Drag displays to rearrange them"
msgstr "ディスプレイをドラッグして位置を調整してください"
#. translators: example string is "60 Hz (NTSC)"
#. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1794
+#: ../panels/display/cc-display-panel.c:1793
#, c-format
msgid "%d Hz (NTSC)"
msgstr "%d Hz (NTSC)"
#. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1800
+#: ../panels/display/cc-display-panel.c:1799
#, c-format
msgid "%d Hz"
msgstr "%d Hz"
-#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/display/cc-display-panel.c:2260
msgid "Rotate counterclockwise by 90°"
msgstr "反時計周りに 90°回転します"
-#: ../panels/display/cc-display-panel.c:2264
+#: ../panels/display/cc-display-panel.c:2278
msgid "Rotate by 180°"
msgstr "180°回転します"
-#: ../panels/display/cc-display-panel.c:2282
+#: ../panels/display/cc-display-panel.c:2296
msgid "Rotate clockwise by 90°"
msgstr "時計周りに 90°回転します"
-#: ../panels/display/cc-display-panel.c:2303
+#: ../panels/display/cc-display-panel.c:2317
msgid "Size"
msgstr "サイズ"
#. aspect ratio
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2332
msgid "Aspect Ratio"
msgstr "アスペクト比"
-#: ../panels/display/cc-display-panel.c:2338
+#: ../panels/display/cc-display-panel.c:2355
#: ../panels/printers/pp-options-dialog.c:85
msgid "Resolution"
msgstr "解像度"
-#: ../panels/display/cc-display-panel.c:2360
+#: ../panels/display/cc-display-panel.c:2375
+msgid "Adjust for TV"
+msgstr ""
+
+#: ../panels/display/cc-display-panel.c:2399
msgid "Refresh Rate"
msgstr "リフレッシュレート"
-#: ../panels/display/cc-display-panel.c:2391
+#: ../panels/display/cc-display-panel.c:2431
msgid "Show the top bar and Activities Overview on this display"
msgstr "トップバーとアクティビティ画面をこのディスプレイに表示する"
-#: ../panels/display/cc-display-panel.c:2397
+#: ../panels/display/cc-display-panel.c:2437
msgid "Secondary Display"
msgstr "セカンダリディスプレイ"
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2438
msgid "Join this display with another to create an extra workspace"
msgstr "このディスプレイをつなげて拡張ワークスペースとして使用する"
-#: ../panels/display/cc-display-panel.c:2405
+#: ../panels/display/cc-display-panel.c:2445
msgid "Presentation"
msgstr "プレゼンテーション"
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2446
msgid "Show slideshows and media only"
msgstr "スライドショーやメディアだけを表示する"
#. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2411
+#: ../panels/display/cc-display-panel.c:2451
msgid "Mirror"
msgstr "ミラー"
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2452
msgid "Show your existing view on both displays"
msgstr "既存の画面をすべてのディスプレイに表示する"
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:2458
msgid "Turn Off"
msgstr "オフ"
-#: ../panels/display/cc-display-panel.c:2419
+#: ../panels/display/cc-display-panel.c:2459
msgid "Don't use this display"
msgstr "このディスプレイを使用しない"
-#: ../panels/display/cc-display-panel.c:2722
+#: ../panels/display/cc-display-panel.c:2770
msgid "Could not get screen information"
msgstr "スクリーンの情報を取得できませんでした"
-#: ../panels/display/cc-display-panel.c:2753
+#: ../panels/display/cc-display-panel.c:2801
msgid "_Arrange Combined Displays"
msgstr "ディスプレイの配置を調整(_A)"
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Displays"
msgstr "ディスプレイ"
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
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
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
msgstr ""
"Panel;Projector;xrandr;Screen;Resolution;Refresh;パネル;プロジェクター;画面;"
"解像度;リフレッシュ;モニター;ディスプレイ;ディスプレー;Displays;ディスプレイ;"
-#: ../panels/info/cc-info-panel.c:385
-msgid "Wayland"
-msgstr "Wayland"
-
#. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:384 ../panels/network/panel-common.c:123
msgid "Unknown"
msgstr "不明"
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:517
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr ""
+
+#: ../panels/info/cc-info-panel.c:519
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr ""
+
+#: ../panels/info/cc-info-panel.c:527
#, c-format
msgid "%s %d-bit"
msgstr "%s %d ビット"
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:529
#, c-format
msgid "%d-bit"
msgstr "%d ビット"
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1175
msgid "Ask what to do"
msgstr "どうするか確認する"
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1179
msgid "Do nothing"
msgstr "なにもしない"
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1183
msgid "Open folder"
msgstr "フォルダーを開く"
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1274
msgid "Other Media"
msgstr "他のメディア"
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1305
msgid "Select an application for audio CDs"
msgstr "オーディオCD用のアプリケーションを選択"
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-panel.c:1306
msgid "Select an application for video DVDs"
msgstr "ビデオDVD用のアプリケーションを選択"
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1307
msgid "Select an application to run when a music player is connected"
msgstr "ミュージックプレイヤーが接続された時に実行するアプリケーションを選択"
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-panel.c:1308
msgid "Select an application to run when a camera is connected"
msgstr "カメラが接続された時に起動するアプリケーションを選択"
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-panel.c:1309
msgid "Select an application for software CDs"
msgstr "ソフトウェアの CD を開くアプリケーションを選択してください"
@@ -1312,88 +1324,86 @@ msgstr "ソフトウェアの CD を開くアプリケーションを選択し
#. * If the shared-mime-info translation works for your language,
#. * simply leave these untranslated.
#.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1321
msgid "audio DVD"
msgstr "オーディオ DVD"
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1322
msgid "blank Blu-ray disc"
msgstr "空のブルーレイディスク"
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1323
msgid "blank CD disc"
msgstr "空の CD"
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1324
msgid "blank DVD disc"
msgstr "空の DVD"
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1325
msgid "blank HD DVD disc"
msgstr "空の HD DVD"
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1326
msgid "Blu-ray video disc"
msgstr "ブルーレイビデオディスク"
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1327
msgid "e-book reader"
msgstr "電子書籍リーダー"
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1328
msgid "HD DVD video disc"
msgstr "HD DVD ビデオディスク"
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1329
msgid "Picture CD"
msgstr "ピクチャーCD"
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1330
msgid "Super Video CD"
msgstr "スーパービデオCD"
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1331
msgid "Video CD"
msgstr "ビデオCD"
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1332
msgid "Windows software"
msgstr "Windows ソフトウェア"
-#: ../panels/info/cc-info-panel.c:1435
-#: ../panels/keyboard/keyboard-shortcuts.c:1949
+#: ../panels/info/cc-info-panel.c:1455
msgid "Section"
msgstr "セクション"
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1464 ../panels/info/info.ui.h:14
msgid "Overview"
msgstr "概要"
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1470 ../panels/info/info.ui.h:21
msgid "Default Applications"
msgstr "既定のアプリケーション"
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1475 ../panels/info/info.ui.h:29
msgid "Removable Media"
msgstr "リムーバブルメディア"
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1500
#, c-format
msgid "Version %s"
msgstr "バージョン %s"
-#: ../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:46
-msgid "Details"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "Details"
msgstr "詳細"
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
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
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
msgid ""
"device;system;information;memory;processor;version;default;application;"
"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1571,8 +1581,9 @@ msgstr "ランチャー"
msgid "Launch help browser"
msgstr "ヘルプブラウザーを起動"
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
msgid "Settings"
msgstr "設定"
@@ -1645,7 +1656,6 @@ msgid "Lock screen"
msgstr "画面をロック"
#: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
msgid "Universal Access"
msgstr "ユニバーサルアクセス"
@@ -1681,11 +1691,21 @@ msgstr "文字サイズを縮小"
msgid "High contrast on or off"
msgstr "ハイコントラストのオン/オフを切り替える"
+#: ../panels/keyboard/cc-keyboard-manager.c:512
+#: ../panels/keyboard/cc-keyboard-manager.c:520
+#: ../panels/keyboard/cc-keyboard-manager.c:828
+msgid "Custom Shortcuts"
+msgstr "独自のショートカット"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
#. translators:
#. * The device has been disabled
#: ../panels/keyboard/cc-keyboard-option.c:276
#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
+#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/shortcut-editor.ui.h:2
#: ../panels/network/network-wifi.ui.h:31
#: ../panels/sound/gvc/gvc-mixer-control.c:1830
#: ../panels/user-accounts/um-fingerprint-dialog.c:213
@@ -1712,127 +1732,137 @@ msgstr "Compose キー"
msgid "Modifiers-only switch to next source"
msgstr "次の入力ソースへ切り替える (修飾キーのみ)"
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "キーボード"
+#: ../panels/keyboard/cc-keyboard-panel.c:217
+msgid "Reset the shortcut to its default value"
+msgstr ""
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be "
+"disabled"
+msgstr ""
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#, fuzzy
+msgid "Set Custom Shortcut"
+msgstr "独自のショートカット"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+#, fuzzy
+msgid "Set Shortcut"
+msgstr "ショートカットの追加"
+
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr ""
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:949
+#, fuzzy
+msgid "Add Custom Shortcut"
+msgstr "独自のショートカット"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Keyboard"
+msgstr "キーボード"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
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
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
msgid "Shortcut;Repeat;Blink;"
msgstr ""
"Shortcut;Repeat;Blink;ショートカット;リピート;点滅;Keyboard;キーボード;"
#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "独自のショートカット"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "名前(_N):"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "コマンド(_O):"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "ショートカットの追加"
+#, fuzzy
+msgid "No keyboard shortcut found"
+msgstr "キーボードショートカット"
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "ショートカットの削除"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../shell/panel-list.ui.h:4
+msgid "Try a different search"
+msgstr ""
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press "
-"Backspace to clear."
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel."
msgstr ""
-"ショートカットを編集するには、対応する行をクリックし、新しいキーの組み合わせ"
-"を押すか、[BS] キーで取り消してください。"
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "独自のショートカット"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "名前"
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<不明な操作>"
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "コマンド"
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"このキーでは入力できないので \"%s\" というショートカットキーは利用できませ"
-"ん。\n"
-"[Ctrl] や [Alt] や [Shift] といった修飾キーを併用するようにしてください。"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+#, fuzzy
+msgid "Shortcut"
+msgstr "ショートカットの追加"
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
msgstr ""
-"\"%s\" というショートカットはすでに登録済みです:\n"
-"\"%s\""
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr ""
-"このショートカットを \"%s\" 用に変更すると、\"%s\" 用のショートカットが無効に"
-"なります。"
+#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "何もしない"
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "割り当てる(_R)"
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+msgid "Remove"
+msgstr "削除"
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Enter the new shortcut"
msgstr ""
-"\"%s\" 用のショートカットは \"%s\" 用のショートカットと関連付けられていま"
-"す。\"%s\" を後者のショートカットに設定しますか。"
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
-"if you move forward."
-msgstr ""
-"\"%s\" はすでに \"%s\" 用に設定済みです。新規割り当てを行うと、設定済みの"
-"ショートカットは取り消されます。"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: ../panels/network/connection-editor/ce-page-ip4.c:305
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "追加"
+
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+msgid "Replace"
+msgstr "入れ替え"
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "割り当てる(_A)"
+#: ../panels/keyboard/shortcut-editor.ui.h:14
+#, fuzzy
+msgid "Set"
+msgstr "選択"
# Button Label
#: ../panels/mouse/cc-mouse-panel.c:82
msgid "Test Your _Settings"
msgstr "設定を確認する(_S)"
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touchpad"
msgstr "マウスとタッチパッド"
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
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
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
msgstr ""
"Trackpad;Pointer;Click;Tap;Double;Button;Trackball;トラックパッド;ポインター;"
@@ -1893,6 +1923,11 @@ msgid "Tap to Click"
msgstr "タップでクリックする"
#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#, fuzzy
+msgid "Two-finger Scrolling"
+msgstr "エッジスクロール"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
msgid "Edge Scrolling"
msgstr "エッジスクロール"
@@ -1931,11 +1966,11 @@ msgstr "シングルクリック、副ボタン"
#. TRANSLATORS: this is to disable the radio hardware in the
#. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
msgid "Air_plane Mode"
msgstr "機内モード(_P)"
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
msgid "Network proxy"
msgstr "ネットワークプロキシ"
@@ -1943,17 +1978,17 @@ msgstr "ネットワークプロキシ"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
#, c-format
msgid "%s VPN"
msgstr "%s VPN"
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr "問題に遭遇しました。ソフトウェアベンダーに報告してください。"
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
msgid "NetworkManager needs to be running."
msgstr "NetworkManager が動作している必要があります。"
@@ -1969,7 +2004,7 @@ msgstr "ページ1"
#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
#: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
msgid "Anony_mous identity"
@@ -1986,238 +2021,244 @@ msgstr "内部認証(_A)"
msgid "page 2"
msgstr "ページ2"
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
#: ../panels/network/connection-editor/details-page.ui.h:3
#: ../panels/network/network-wifi.ui.h:6
msgid "Security"
msgstr "セキュリティ"
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
msgid "automatic"
msgstr "自動"
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "プロファイル %d"
+
#. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219
-#: ../panels/network/net-device-wifi.c:383
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:215
+#: ../panels/network/net-device-wifi.c:391
msgid "WEP"
msgstr "WEP"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223
-#: ../panels/network/net-device-wifi.c:388
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:219
+#: ../panels/network/net-device-wifi.c:396
#: ../panels/network/network-wifi.ui.h:19
msgid "WPA"
msgstr "WPA"
#. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:223
msgid "WPA2"
msgstr "WPA2"
#. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:228
msgid "Enterprise"
msgstr "Enterprise"
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237
-#: ../panels/network/net-device-wifi.c:373
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:233
+#: ../panels/network/net-device-wifi.c:381
msgctxt "Wifi security"
msgid "None"
msgstr "なし"
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
#: ../panels/power/power.ui.h:17
msgid "Never"
msgstr "しない"
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:486
#, c-format
msgid "%i day ago"
msgid_plural "%i days ago"
msgstr[0] "%i 日前"
#. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:534
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:544
#, c-format
msgid "%d Mb/s"
msgstr "%d Mb/s"
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:573
msgctxt "Signal strength"
msgid "None"
msgstr "なし"
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:575
msgctxt "Signal strength"
msgid "Weak"
msgstr "弱い"
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:577
msgctxt "Signal strength"
msgid "Ok"
msgstr "OK"
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:579
msgctxt "Signal strength"
msgid "Good"
msgstr "良い"
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:581
msgctxt "Signal strength"
msgid "Excellent"
msgstr "非常に良い"
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+#: ../shell/panel-list.ui.h:2
+msgid "Details"
+msgstr "詳細"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
#: ../panels/network/network-wifi.ui.h:47
msgid "Identity"
msgstr "Identity"
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:461
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
msgid "Address"
msgstr "アドレス"
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:215
+#: ../panels/network/connection-editor/ce-page-ip4.c:474
msgid "Netmask"
msgstr "ネットマスク"
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:229
+#: ../panels/network/connection-editor/ce-page-ip4.c:487
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
#: ../panels/network/network-vpn.ui.h:2
msgid "Gateway"
msgstr "ゲートウェイ"
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:250
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
msgid "Delete Address"
msgstr "アドレスを削除"
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "追加"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:368
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
msgid "Server"
msgstr "サーバー"
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:385
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
msgid "Delete DNS Server"
msgstr "DNS サーバーを削除"
#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:501
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
msgctxt "network parameters"
msgid "Metric"
msgstr "メトリック"
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:522
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
msgid "Delete Route"
msgstr "ルートを削除"
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:626
#: ../panels/network/network-wifi.ui.h:27
msgid "Automatic (DHCP)"
msgstr "自動 (DHCP)"
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
+#: ../panels/network/connection-editor/ce-page-ip4.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Manual"
msgstr "手動"
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
msgid "Link-Local Only"
msgstr "リンクローカルのみ"
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:979
#: ../panels/network/network-wifi.ui.h:48
msgid "IPv4"
msgstr "IPv4"
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
msgid "Prefix"
msgstr "プレフィックス"
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
#: ../panels/network/connection-editor/ethernet-page.ui.h:1
#: ../panels/network/connection-editor/ip4-page.ui.h:4
#: ../panels/network/connection-editor/ip6-page.ui.h:4
#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
msgid "Automatic"
msgstr "自動"
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
msgid "Automatic, DHCP only"
msgstr "自動、DHCP のみ"
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
#: ../panels/network/network-wifi.ui.h:49
msgid "IPv6"
msgstr "IPv6"
-#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/connection-editor/ce-page-reset.c:78
#: ../panels/network/network-wifi.ui.h:51
msgid "Reset"
msgstr "リセット"
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
msgctxt "Wi-Fi/Ethernet security"
msgid "None"
msgstr "なし"
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
msgid "WEP 40/128-bit Key (Hex or ASCII)"
msgstr "WEP 40/128-bit キー (HEX または ASCII)"
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
msgid "WEP 128-bit Passphrase"
msgstr "WEP 128-bit パスフレーズ"
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
msgid "LEAP"
msgstr "LEAP"
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
msgid "Dynamic WEP (802.1x)"
msgstr "動的 WEP (802.1x)"
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
msgid "WPA & WPA2 Personal"
msgstr "WPA & WPA2 Personal"
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
msgid "WPA & WPA2 Enterprise"
msgstr "WPA & WPA2 Enterprise"
@@ -2232,30 +2273,30 @@ msgid "Link speed"
msgstr "リンクの速度"
#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
#: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695
+#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
msgid "IPv4 Address"
msgstr "IPv4 アドレス"
#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
#: ../panels/network/network-mobile.ui.h:4
#: ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
msgid "IPv6 Address"
msgstr "IPv6 アドレス"
#: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
#: ../panels/network/network-simple.ui.h:2
#: ../panels/network/network-wifi.ui.h:9
msgid "Hardware Address"
msgstr "ハードウェアアドレス"
#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
#: ../panels/network/network-mobile.ui.h:5
#: ../panels/network/network-simple.ui.h:5
#: ../panels/network/network-wifi.ui.h:10
@@ -2265,7 +2306,7 @@ 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:171
+#: ../panels/network/net-device-ethernet.c:167
#: ../panels/network/network-mobile.ui.h:6
#: ../panels/network/network-simple.ui.h:6
#: ../panels/network/network-wifi.ui.h:11
@@ -2348,13 +2389,13 @@ msgstr "自動接続する(_A)"
msgid "Firewall _Zone"
msgstr "ファイアウォールゾーン(_Z)"
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
msgctxt "Firewall zone"
msgid "Default"
msgstr "デフォルト"
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
msgid "The zone defines the trust level of the connection"
msgstr "ゾーンは接続の信頼レベルを定義します"
@@ -2396,45 +2437,26 @@ msgstr "この接続はネットワーク上のリソースのためだけに使
msgid "IPv_6"
msgstr "IPv6(_6)"
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
msgid "Unable to open connection editor"
msgstr "接続エディターを起動できません"
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
msgid "New Profile"
msgstr "新規プロファイル"
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
msgid "VPN"
msgstr "VPN"
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Bond"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "Team"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Bridge"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "VPN プラグインを読み込めませんでした"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:783
msgid "Import from file…"
msgstr "ファイルからインポート…"
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "新規の接続を追加"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+#, fuzzy
+msgid "Add VPN"
+msgstr "VPN"
#: ../panels/network/connection-editor/reset-page.ui.h:1
#: ../panels/network/network-wifi.ui.h:41
@@ -2442,7 +2464,7 @@ msgid "_Reset"
msgstr "リセット(_R)"
#: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1463
+#: ../panels/network/net-device-wifi.c:1586
#: ../panels/network/network-wifi.ui.h:42
msgid "_Forget"
msgstr "破棄(_F)"
@@ -2466,11 +2488,11 @@ msgstr "このネットワークに関する詳細を削除し、自動的に接
msgid "S_ecurity"
msgstr "セキュリティ(_E)"
-#: ../panels/network/connection-editor/vpn-helpers.c:205
+#: ../panels/network/connection-editor/vpn-helpers.c:141
msgid "Cannot import VPN connection"
msgstr "VPN 接続をインポートできません"
-#: ../panels/network/connection-editor/vpn-helpers.c:207
+#: ../panels/network/connection-editor/vpn-helpers.c:143
#, c-format
msgid ""
"The file '%s' could not be read or does not contain recognized VPN "
@@ -2483,36 +2505,36 @@ msgstr ""
"\n"
"エラー: %s"
-#: ../panels/network/connection-editor/vpn-helpers.c:242
+#: ../panels/network/connection-editor/vpn-helpers.c:178
msgid "Select file to import"
msgstr "インポートするファイルを選択する"
-#: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:2053
-#: ../panels/sharing/cc-sharing-panel.c:373
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2101
+#: ../panels/sharing/cc-sharing-panel.c:376
#: ../panels/user-accounts/um-photo-dialog.c:218
msgid "_Open"
msgstr "開く(_O)"
-#: ../panels/network/connection-editor/vpn-helpers.c:294
+#: ../panels/network/connection-editor/vpn-helpers.c:230
#, c-format
msgid "A file named \"%s\" already exists."
msgstr "'%s' というファイルはすでに存在します。"
-#: ../panels/network/connection-editor/vpn-helpers.c:296
+#: ../panels/network/connection-editor/vpn-helpers.c:232
msgid "_Replace"
msgstr "入れ替え(_R)"
-#: ../panels/network/connection-editor/vpn-helpers.c:298
+#: ../panels/network/connection-editor/vpn-helpers.c:234
#, c-format
msgid "Do you want to replace %s with the VPN connection you are saving?"
msgstr "%s を、保存している VPN 接続に入れ替えますか?"
-#: ../panels/network/connection-editor/vpn-helpers.c:334
+#: ../panels/network/connection-editor/vpn-helpers.c:270
msgid "Cannot export VPN connection"
msgstr "VPN 接続をエクスポートできません"
-#: ../panels/network/connection-editor/vpn-helpers.c:336
+#: ../panels/network/connection-editor/vpn-helpers.c:272
#, c-format
msgid ""
"The VPN connection '%s' could not be exported to %s.\n"
@@ -2523,7 +2545,7 @@ msgstr ""
"\n"
"エラー: %s"
-#: ../panels/network/connection-editor/vpn-helpers.c:371
+#: ../panels/network/connection-editor/vpn-helpers.c:307
msgid "Export VPN connection"
msgstr "VPN 接続をエクスポートする"
@@ -2550,62 +2572,46 @@ msgstr "マイホームネットワーク"
msgid "Make available to _other users"
msgstr "他のユーザーも利用可能(_O)"
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Network"
msgstr "ネットワーク"
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
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
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
msgid ""
"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;"
+"DNS;"
msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;DNS;ネットワーク;インターネット;無線;ワイヤレス;有線;プロキ"
-"シー;プロクシー;ブロードバンド;モデム;ブルートゥース;ブリッジ;ボンディング;ド"
-"メイン名;ドメインネームサーバー;"
-
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Bond のスレーブ"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(なし)"
-
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "ブリッジのスレーブ"
-
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:463
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
+"ネットワーク;無線;有線;プロキシ;ブロードバンド;モデム;ブルートゥース;"
+
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:472
msgid "never"
msgstr "未接続"
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:473
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:482
msgid "today"
msgstr "今日"
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:484
msgid "yesterday"
msgstr "昨日"
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
msgid "IP Address"
msgstr "IP アドレス"
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
#: ../panels/network/network-wifi.ui.h:12
msgid "Last used"
msgstr "最後の利用"
@@ -2615,34 +2621,25 @@ msgstr "最後の利用"
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
#: ../panels/network/network-ethernet.ui.h:1
#: ../panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr "有線"
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1621
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1744
#: ../panels/network/network-ethernet.ui.h:3
#: ../panels/network/network-mobile.ui.h:8
#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7
msgid "Options…"
msgstr "オプション…"
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "プロファイル %d"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
msgid "Add new connection"
msgstr "新規の接続を追加"
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "チームのスレーブ"
-
-#: ../panels/network/net-device-wifi.c:1176
+#: ../panels/network/net-device-wifi.c:1254
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."
@@ -2650,13 +2647,13 @@ msgstr ""
"ワイヤレス以外のインターネット接続がある場合には、 ワイヤレスホットスポットを"
"設定し、他の人とインターネット接続を共有することができます。"
-#: ../panels/network/net-device-wifi.c:1180
+#: ../panels/network/net-device-wifi.c:1258
#, c-format
msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
msgstr ""
"ワイヤレスホットスポットをオンにすると <b>%s</b> の接続が切断されます。"
-#: ../panels/network/net-device-wifi.c:1184
+#: ../panels/network/net-device-wifi.c:1262
msgid ""
"It is not possible to access the Internet through your wireless while the "
"hotspot is active."
@@ -2664,33 +2661,33 @@ msgstr ""
"ホットスポットがアクティブな場合、ワイヤレスによるインターネット接続はできま"
"せん。"
-#: ../panels/network/net-device-wifi.c:1267
+#: ../panels/network/net-device-wifi.c:1344
msgid "Stop hotspot and disconnect any users?"
msgstr "アクセスポイントを停止し、ユーザーを切断しますか?"
-#: ../panels/network/net-device-wifi.c:1270
+#: ../panels/network/net-device-wifi.c:1347
msgid "_Stop Hotspot"
msgstr "停止(_S)"
-#: ../panels/network/net-device-wifi.c:1327
+#: ../panels/network/net-device-wifi.c:1447
msgid "System policy prohibits use as a Hotspot"
msgstr "システムのポリシーによりホットスポットとしての利用は禁止されています"
-#: ../panels/network/net-device-wifi.c:1330
+#: ../panels/network/net-device-wifi.c:1450
msgid "Wireless device does not support Hotspot mode"
msgstr "ワイヤレスデバイスがホットスポットモードに対応していません"
-#: ../panels/network/net-device-wifi.c:1459
+#: ../panels/network/net-device-wifi.c:1582
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
msgstr "パスワードや独自の設定など、 選択したネットワークの詳細は失われます。"
-#: ../panels/network/net-device-wifi.c:1774
+#: ../panels/network/net-device-wifi.c:1892
msgid "History"
msgstr "履歴"
-#: ../panels/network/net-device-wifi.c:1778
+#: ../panels/network/net-device-wifi.c:1896
#: ../panels/printers/options-dialog.ui.h:2
#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525
#: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2698,7 +2695,7 @@ msgid "_Close"
msgstr "閉じる(_C)"
#. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1786
+#: ../panels/network/net-device-wifi.c:1904
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr "破棄(_F)"
@@ -2735,6 +2732,10 @@ msgstr "IMEI"
msgid "Provider"
msgstr "プロバイダー"
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "ネットワーク"
+
#: ../panels/network/network-proxy.ui.h:1
msgctxt "proxy method"
msgid "None"
@@ -2840,16 +2841,12 @@ msgstr "詳細"
#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
#: ../panels/network/wireless-security/ws-leap.ui.h:2
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:11
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
msgid "_Password"
msgstr "パスワード(_P)"
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "何もしない"
-
#: ../panels/network/network-wifi.ui.h:21
msgid "Show P_assword"
msgstr "パスワードを表示(_A)"
@@ -2943,7 +2940,6 @@ msgid "_Connect to Hidden Network…"
msgstr "非表示のネットワークに接続(_C)…"
#: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
msgid "_History"
msgstr "履歴(_H)"
@@ -2965,359 +2961,338 @@ msgstr "セキュリティタイプ"
#: ../panels/network/network-wifi.ui.h:63
#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
msgid "Password"
msgstr "パスワード"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
msgid "Ad-hoc"
msgstr "アドホック"
#. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
msgid "Infrastructure"
msgstr "インフラストラクチャ"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
msgid "Status unknown"
msgstr "ステータス不明"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
msgid "Unmanaged"
msgstr "管理対象外"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
msgid "Unavailable"
msgstr "利用不可"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
msgid "Connecting"
msgstr "接続中"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
msgid "Authentication required"
msgstr "認証が要求されました"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
msgid "Connected"
msgstr "接続済み"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
msgid "Disconnecting"
msgstr "切断中"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
msgid "Connection failed"
msgstr "接続失敗"
#. TRANSLATORS: device status
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
msgid "Status unknown (missing)"
msgstr "ステータス不明 (見つからない)"
#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
msgid "Not connected"
msgstr "接続していない"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
msgid "Configuration failed"
msgstr "設定に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
msgid "IP configuration failed"
msgstr "IP設定に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
msgid "IP configuration expired"
msgstr "IP設定の期限切れ"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
msgid "Secrets were required, but not provided"
msgstr "秘密の情報が必要でしたが入力されませんでした"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
msgid "802.1x supplicant disconnected"
msgstr "802.1x サプリカントが切断されました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
msgid "802.1x supplicant configuration failed"
msgstr "802.1x サプリカントの設定に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
msgid "802.1x supplicant failed"
msgstr "802.1x サプリカントが失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
msgid "802.1x supplicant took too long to authenticate"
msgstr "802.1x サプリカントの認証に時間がかかりすぎました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
msgid "PPP service failed to start"
msgstr "PPPサービスの起動に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
msgid "PPP service disconnected"
msgstr "PPPサービスの接続を切断しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
msgid "PPP failed"
msgstr "PPP が失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
msgid "DHCP client failed to start"
msgstr "DHCPクライアントの起動に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
msgid "DHCP client error"
msgstr "DHCPクライアントにエラーが発生しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
msgid "DHCP client failed"
msgstr "DHCPクライアントが失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
msgid "Shared connection service failed to start"
msgstr "共有接続サービスの起動に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
msgid "Shared connection service failed"
msgstr "共有接続サービスが失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
msgid "AutoIP service failed to start"
msgstr "AutoIP サービスの起動に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
msgid "AutoIP service error"
msgstr "AutoIP サービスにエラーが発生しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
msgid "AutoIP service failed"
msgstr "AutoIP サービスが失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
msgid "Line busy"
msgstr "回線が使用中です"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
msgid "No dial tone"
msgstr "発信音がありません"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
msgid "No carrier could be established"
msgstr "キャリアの確立ができませんでした"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
msgid "Dialing request timed out"
msgstr "発信要求がタイムアウトしました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
msgid "Dialing attempt failed"
msgstr "発信の試行に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
msgid "Modem initialization failed"
msgstr "モデムの初期化に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
msgid "Failed to select the specified APN"
msgstr "指定されたAPNの選択に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
msgid "Not searching for networks"
msgstr "ネットワーク検索をしていません"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
msgid "Network registration denied"
msgstr "ネットワーク登録が拒否されました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
msgid "Network registration timed out"
msgstr "ネットワーク登録がタイムアウトしました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
msgid "Failed to register with the requested network"
msgstr "要求されたネットワークへの登録に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
msgid "PIN check failed"
msgstr "PINチェックに失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
msgid "Firmware for the device may be missing"
msgstr "このデバイスのファームウェアがないようです"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
msgid "Connection disappeared"
msgstr "接続が消失しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
msgid "Existing connection was assumed"
msgstr "既存の接続とみなされました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
msgid "Modem not found"
msgstr "モデムが見つかりませんでした"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
msgid "Bluetooth connection failed"
msgstr "Bluetooth接続に失敗しました"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
msgid "SIM Card not inserted"
msgstr "SIMカードが挿入されていません"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
msgid "SIM Pin required"
msgstr "SIMのPIN番号が必要です"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
msgid "SIM Puk required"
msgstr "SIMのPUKが必要です"
#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
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
+#: ../panels/network/panel-common.c:408
msgid "Connection dependency failed"
msgstr "接続が依存するデバイス等の準備ができません"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
msgid "Firmware missing"
msgstr "ファームウェア未検出"
#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
msgid "Cable unplugged"
msgstr "ケーブル抜け"
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "認証局(CA)の証明書が選択されていません"
-
-#: ../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?"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
msgstr ""
-"認証局(CA)証明書を使用しなければ接続は安全でなく、危険な W-Fi ネットワークに"
-"なってしまいます。認証局証明書を選択しますか?"
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "無視する"
+#: ../panels/network/wireless-security/eap-method.c:245
+#, fuzzy
+msgid "no file selected"
+msgstr "入力ソースが選択されていません"
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "CA 証明書を選択する"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr ""
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+#, fuzzy
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
msgstr "DER, PEM, PKCS#12 のプライベートキー (*.der, *.pem, *.p12)"
-#: ../panels/network/wireless-security/eap-method.c:648
+#: ../panels/network/wireless-security/eap-method.c:483
msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
msgstr "DER か PEM の証明書 (*.der, *.pem, *.crt, *.cer)"
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
msgid "GTC"
msgstr "GTC"
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
msgid "Choose a PAC file"
msgstr "PAC ファイルを選択"
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
msgid "PAC files (*.pac)"
msgstr "PAC ファイル (*.pac)"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "PAC ファイル(_F)"
-
-#: ../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
-msgid "_Inner authentication"
-msgstr "内部認証(_I)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "PACプロビジョニング(_V)"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
#: ../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
@@ -3326,41 +3301,74 @@ msgstr "PACプロビジョニング(_V)"
msgid " "
msgstr " "
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
msgid "Anonymous"
msgstr "匿名"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
msgid "Authenticated"
msgstr "認証"
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
msgid "Both"
msgstr "両方"
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "PAC ファイル(_F)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "内部認証(_I)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#, fuzzy
+msgid "Allow automatic PAC pro_visioning"
+msgstr "PACプロビジョニング(_V)"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+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:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
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/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
#: ../panels/network/wireless-security/ws-leap.ui.h:3
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
msgid "Sho_w password"
msgstr "パスワードを表示(_W)"
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
msgid "MD5"
msgstr "MD5"
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
msgid "Choose a Certificate Authority certificate"
msgstr "認証局(CA)証明書を選択"
@@ -3378,19 +3386,58 @@ msgstr "バージョン 1"
msgid "C_A certificate"
msgstr "CA証明書(_A)"
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "認証が要求されました"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
msgid "PEAP _version"
msgstr "PEAPバージョン(_V)"
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "毎回このパスワードを要求する(_K)"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+#, fuzzy
+msgid "missing EAP password"
+msgstr "パスワードの変更"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
msgid "Unencrypted private keys are insecure"
msgstr "暗号化のないプライベートキーは安全ではありません"
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
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 "
@@ -3404,11 +3451,11 @@ msgstr ""
"\n"
"(プライベートキーは openssl を使用してパスワード保護ができます)"
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
msgid "Choose your personal certificate"
msgstr "個人用証明書を選択する"
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
msgid "Choose your private key"
msgstr "プライベートキーを選択する"
@@ -3420,51 +3467,56 @@ msgstr "アイデンティティ(_D)"
msgid "_User certificate"
msgstr "ユーザー証明書(_U)"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
msgid "Private _key"
msgstr "プライベートキー(_K)"
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
msgid "_Private key password"
msgstr "プライベートキーのパスワード(_P)"
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
msgid "PAP"
msgstr "PAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
msgid "MSCHAP"
msgstr "MSCHAP"
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
msgid "CHAP"
msgstr "CHAP"
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "二度と警告しない(_W)"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "いいえ"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "はい"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr ""
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
msgid "TLS"
msgstr "TLS"
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr ""
+
+#: ../panels/network/wireless-security/wireless-security.c:486
msgid "FAST"
msgstr "FAST"
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
msgid "Tunneled TLS"
msgstr "トンネル化 TLS"
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
msgid "Protected EAP (PEAP)"
msgstr "保護つき EAP (PEAP)"
@@ -3474,6 +3526,44 @@ msgstr "保護つき EAP (PEAP)"
msgid "Au_thentication"
msgstr "認証(_T)"
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr ""
+
#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
msgid "1 (Default)"
msgstr "1 (デフォルト)"
@@ -3510,19 +3600,30 @@ msgstr "キーを表示(_W)"
msgid "WEP inde_x"
msgstr "WEPインデックス(_X)"
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
msgid "_Type"
msgstr "種類(_T)"
#: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
#: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
msgid "On"
msgstr "オン"
@@ -3559,16 +3660,17 @@ msgctxt "notifications"
msgid "Show Message C_ontent on Lock Screen"
msgstr "ロック画面にメッセージの内容を表示する(_O)"
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Notifications"
msgstr "通知"
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
msgid "Control which notifications are displayed and what they show"
msgstr "表示する通知およびその表示方法について設定します"
#. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
msgid "Notifications;Banner;Message;Tray;Popup;"
msgstr ""
"Notifications;Banner;Message;Tray;Popup;通知;バナー;メッセージ;トレイ;ポップ"
@@ -3588,79 +3690,68 @@ msgstr "ロック画面での通知(_L)"
msgid "Applications"
msgstr "アプリケーション"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
msgctxt "Online Account"
msgid "Other"
msgstr "その他"
#. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../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-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
msgid "Mail"
msgstr "メール"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
msgid "Contacts"
msgstr "連絡先"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
msgid "Chat"
msgstr "チャット"
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
msgid "Resources"
msgstr "リソース"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "アカウントのログインに失敗"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "認証情報の有効期限が切れました。"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "アカウントを有効にするにはサインインしてください"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "サインイン(_S)"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
msgid "Error creating account"
msgstr "アカウント作成に失敗"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
msgid "Error removing account"
msgstr "アカウント削除に失敗"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
msgid "Are you sure you want to remove the account?"
msgstr "本当にアカウントを削除しますか?"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
msgid "This will not remove the account on the server."
msgstr "サービス提供元のアカウントは削除されません。"
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
msgid "_Remove"
msgstr "削除(_R)"
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "Online Accounts"
msgstr "オンラインアカウント"
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
msgid "Connect to your online accounts and decide what to use them for"
msgstr "オンラインアカウントへの接続や利用方法を設定します。"
#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
msgid ""
"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3675,6 +3766,7 @@ msgid "No online accounts configured"
msgstr "設定済みのオンラインアカウントはありません"
#: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
msgid "Remove Account"
msgstr "アカウントの削除"
@@ -3813,7 +3905,7 @@ msgstr "コンピューター"
#. TRANSLATORS: secondary battery, misc
#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2252
+#: ../panels/power/cc-power-panel.c:2366
msgid "Battery"
msgstr "バッテリー"
@@ -3861,101 +3953,103 @@ msgstr "バッテリー"
msgid "When _idle"
msgstr "アイドル時(_I)"
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1681
msgid "Power Saving"
msgstr "省電力"
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1716
msgid "_Screen brightness"
msgstr "画面の明るさ(_S)"
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1735
msgid "Automatic brightness"
msgstr "明るさ自動調整"
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1755
msgid "_Keyboard brightness"
msgstr "キーボードの明るさ(_K)"
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1765
msgid "_Dim screen when inactive"
msgstr "操作していないときに画面を暗くする(_D)"
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1790
msgid "_Blank screen"
msgstr "ブランクスクリーン(_B)"
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1827
msgid "_Wi-Fi"
msgstr "Wi-Fi(_W)"
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1832
msgid "Turn off Wi-Fi to save power."
msgstr "Wi-Fi をオフにして節電します。"
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1857
msgid "_Mobile broadband"
msgstr "モバイルブロードバンド(_M)"
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1862
msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
msgstr "モバイルブロードバンド (3G、4G、LTE など) をオフにして節電します。"
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1907
msgid "_Bluetooth"
msgstr "Bluetooth(_B)"
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1970
msgid "When on battery power"
msgstr "バッテリー動作時"
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1972
msgid "When plugged in"
msgstr "電源接続時"
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2067
msgid "Suspend"
msgstr "サスペンド"
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2068
msgid "Hibernate"
msgstr "ハイバーネート"
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2069
msgid "Nothing"
msgstr "なにもしない"
#. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2183
msgid "Suspend & Power Button"
msgstr "サスペンド, 電源ボタン"
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2226
msgid "_Automatic suspend"
msgstr "自動サスペンド(_A)"
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2227
msgid "Automatic suspend"
msgstr "自動サスペンド"
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2294
msgid "_When the Power Button is pressed"
msgstr "電源ボタンを押した時の動作(_W)"
-#: ../panels/power/cc-power-panel.c:2306
+#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270
+#: ../shell/panel-list.ui.h:1
msgid "Devices"
msgstr "デバイス"
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Power"
msgstr "電源"
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
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
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
msgid ""
"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
msgstr ""
@@ -4035,11 +4129,6 @@ msgstr "バッテリー動作時(_B)"
msgid "Delay"
msgstr "時間"
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "キャンセル"
-
#: ../panels/printers/authentication-dialog.ui.h:3
msgid "Authenticate"
msgstr "認証"
@@ -4049,153 +4138,153 @@ msgid "Authentication Required"
msgstr "認証が要求されました"
#. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:688
msgid "Low on toner"
msgstr "トナーの残量が少ないです"
#. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:690
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:683
+#: ../panels/printers/cc-printers-panel.c:693
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:686
+#: ../panels/printers/cc-printers-panel.c:696
msgid "Out of developer"
msgstr "現像液が空です"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:698
msgid "Low on a marker supply"
msgstr "インクが少なくなっています"
#. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:700
msgid "Out of a marker supply"
msgstr "インクが切れています"
#. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:702
msgid "Open cover"
msgstr "カバーが開いています"
#. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:704
msgid "Open door"
msgstr "扉が開いています"
#. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:706
msgid "Low on paper"
msgstr "紙が少なくなっています"
#. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:708
msgid "Out of paper"
msgstr "紙が空です"
#. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:710
msgctxt "printer state"
msgid "Offline"
msgstr "オフライン"
#. Translators: Someone has stopped the Printer
#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:712
+#: ../panels/printers/cc-printers-panel.c:902
msgctxt "printer state"
msgid "Stopped"
msgstr "停止中"
#. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:714
msgid "Waste receptacle almost full"
msgstr "廃インクタンクがもう少しでいっぱいです"
#. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:716
msgid "Waste receptacle full"
msgstr "廃インクタンクがいっぱいです"
#. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:718
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:710
+#: ../panels/printers/cc-printers-panel.c:720
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:820
+#: ../panels/printers/cc-printers-panel.c:829
msgctxt "printer state"
msgid "Configuring"
msgstr "設定中"
#. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:888
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:884
+#: ../panels/printers/cc-printers-panel.c:893
msgctxt "printer state"
msgid "Does not accept jobs"
msgstr "ジョブ受付不可"
#. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:898
msgctxt "printer state"
msgid "Processing"
msgstr "処理中"
#. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1018
msgid "Toner Level"
msgstr "トナーの量"
#. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1021
msgid "Ink Level"
msgstr "インクの量"
#. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1024
msgid "Supply Level"
msgstr "サプライの量"
#. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1042
msgctxt "printer state"
msgid "Installing"
msgstr "インストール中"
#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1575
#, 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:1882
+#: ../panels/printers/cc-printers-panel.c:1916
msgid "Failed to add new printer."
msgstr "新しいプリンターを追加できませんでした。"
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2097
msgid "Select PPD File"
msgstr "PPDファイルの選択"
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2106
msgid ""
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
@@ -4203,48 +4292,45 @@ msgstr ""
"PostScript Printer Description ファイル(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2413
msgid "No suitable driver found"
msgstr "適切なドライバーが見つかりませんでした"
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2484
msgid "Searching for preferred drivers…"
msgstr "推奨ドライバーの検索中…"
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2505
msgid "Select from database…"
msgstr "データベースから選択…"
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2514
msgid "Provide PPD File…"
msgstr "PPDファイルを指定…"
#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2617
-#: ../panels/printers/cc-printers-panel.c:2640
+#: ../panels/printers/cc-printers-panel.c:2661
+#: ../panels/printers/cc-printers-panel.c:2684
msgid "Test page"
msgstr "テストページ"
-#: ../panels/printers/cc-printers-panel.c:2753
-msgid "No printers"
-msgstr "プリンターが見つかりません"
-
#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3099
+#: ../panels/printers/cc-printers-panel.c:3141
#, c-format
msgid "Could not load ui: %s"
msgstr "ui ファイルを読み込めませんでした: %s"
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Printers"
msgstr "プリンター"
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
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
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
msgid "Printer;Queue;Print;Paper;Ink;Toner;"
msgstr ""
"Printer;Queue;Print;Paper;Ink;Toner;プリンター;キュー;印刷;紙;インク;トナー;"
@@ -4407,6 +4493,11 @@ msgstr "シリアルポート"
msgid "Parallel Port"
msgstr "パラレルポート"
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
#. Translators: Location of found network printer (e.g. Kitchen, Reception)
#: ../panels/printers/pp-new-printer-dialog.c:1713
#, c-format
@@ -4619,13 +4710,17 @@ msgstr "テストページを印刷(_T)"
msgid "_Options"
msgstr "オプション(_O)"
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "プリンターが見つかりません"
+
#. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
msgid "Add a Printer"
msgstr "プリンターの追加"
#. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
msgid ""
"Sorry! The system printing service\n"
"doesn't seem to be available."
@@ -4633,70 +4728,70 @@ msgstr ""
"申し訳ありません! システムの印刷サービスは\n"
"利用できないようです。"
-#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
msgid "Screen Lock"
msgstr "画面ロック"
-#: ../panels/privacy/cc-privacy-panel.c:420
+#: ../panels/privacy/cc-privacy-panel.c:438
msgid "In use"
msgstr "使用中"
-#: ../panels/privacy/cc-privacy-panel.c:425
+#: ../panels/privacy/cc-privacy-panel.c:443
msgctxt "Location services status"
msgid "On"
msgstr "オン"
-#: ../panels/privacy/cc-privacy-panel.c:426
+#: ../panels/privacy/cc-privacy-panel.c:444
msgctxt "Location services status"
msgid "Off"
msgstr "オフ"
-#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
msgid "Location Services"
msgstr "位置情報サービス"
-#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
msgid "Usage & History"
msgstr "使用と履歴"
-#: ../panels/privacy/cc-privacy-panel.c:1001
+#: ../panels/privacy/cc-privacy-panel.c:1067
msgid "Empty all items from Trash?"
msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?"
-#: ../panels/privacy/cc-privacy-panel.c:1002
+#: ../panels/privacy/cc-privacy-panel.c:1068
msgid "All items in the Trash will be permanently deleted."
msgstr "ここでアイテムを削除すると元に戻すことはできません。"
-#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
msgid "_Empty Trash"
msgstr "ゴミ箱を空にする(_E)"
-#: ../panels/privacy/cc-privacy-panel.c:1026
+#: ../panels/privacy/cc-privacy-panel.c:1092
msgid "Delete all the temporary files?"
msgstr "一時ファイルをすべて削除しますか?"
-#: ../panels/privacy/cc-privacy-panel.c:1027
+#: ../panels/privacy/cc-privacy-panel.c:1093
msgid "All the temporary files will be permanently deleted."
msgstr "一時ファイルは完全に削除されます。"
-#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
msgid "_Purge Temporary Files"
msgstr "一時ファイルを削除する(_P)"
-#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
msgid "Purge Trash & Temporary Files"
msgstr "ゴミ箱と一時ファイルの削除"
-#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
msgid "Software Usage"
msgstr "ソフトウェアの使用状況"
-#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
msgid "Problem Reporting"
msgstr "問題報告"
#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1145
+#: ../panels/privacy/cc-privacy-panel.c:1211
#, c-format
msgid ""
"Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4706,20 +4801,21 @@ msgstr ""
"役立てることができます。レポートは匿名で送信され、個人データは取り除かれま"
"す。"
-#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
msgid "Privacy Policy"
msgstr "プライバシーポリシー"
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
-msgstr "プライバシー"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Privacy"
+msgstr ""
+
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
msgid "Protect your personal information and control what others might see"
msgstr "個人情報の保護と外部からの見え方を設定します"
#. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
msgid ""
"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
"network;identity;"
@@ -4891,21 +4987,21 @@ msgctxt "Input Source"
msgid "Other"
msgstr "その他"
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
msgid "Your session needs to be restarted for changes to take effect"
msgstr "変更内容を反映させるにはログインしなおす必要があります"
-#: ../panels/region/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
msgid "Restart Now"
msgstr "ログアウト"
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
msgid "No input source selected"
msgstr "入力ソースが選択されていません"
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
msgid "Login _Screen"
msgstr "ログイン画面(_S)"
@@ -4937,17 +5033,18 @@ msgstr "計量単位"
msgid "Paper"
msgstr "用紙サイズ"
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Region & Language"
msgstr "地域と言語"
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
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
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
msgid "Language;Layout;Keyboard;Input;"
msgstr ""
"Language;Layout;Keyboard;Input;言語;レイアウト;キーボード;入力;インプット;"
@@ -5006,7 +5103,7 @@ msgid "Left+Right Alt"
msgstr "左Alt+右Alt"
#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
msgid "_Language"
msgstr "言語(_L)"
@@ -5054,26 +5151,11 @@ msgstr "入力ソースのキーボードレイアウトを表示する"
msgid "Login settings are used by all users when logging into the system"
msgstr "ログイン画面の設定はすべてのユーザーがログイン時に使用します"
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "場所"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "ブックマーク"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "その他"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
msgid "Select Location"
msgstr "場所の選択"
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
msgid "_OK"
msgstr "OK(_O)"
@@ -5081,17 +5163,18 @@ msgstr "OK(_O)"
msgid "No applications found"
msgstr "アプリケーションが見つかりません"
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
msgid "Search"
msgstr "検索"
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
msgid ""
"Control which applications show search results in the Activities Overview"
msgstr "アクティビティ画面で検索結果を表示するアプリケーションを設定します"
#. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
msgid "Search;Find;Index;Hide;Privacy;Results;"
msgstr ""
"Search;Find;Index;Hide;Privacy;Results;サーチ;検索;インデックス;索引;非表示;"
@@ -5101,6 +5184,18 @@ msgstr ""
msgid "Search Locations"
msgstr "検索する場所"
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "場所"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "ブックマーク"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "その他"
+
#: ../panels/search/search.ui.h:1
msgid "Move Up"
msgstr "上へ"
@@ -5113,46 +5208,84 @@ msgstr "下へ"
msgid "Preferences"
msgstr "設定"
-#: ../panels/sharing/cc-sharing-panel.c:263
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "共有するネットワークが選択されていません"
+
+#: ../panels/sharing/cc-sharing-panel.c:266
msgctxt "service is enabled"
msgid "On"
msgstr "オン"
-#: ../panels/sharing/cc-sharing-panel.c:265
-#: ../panels/sharing/cc-sharing-panel.c:292
+#: ../panels/sharing/cc-sharing-panel.c:268
+#: ../panels/sharing/cc-sharing-panel.c:295
msgctxt "service is disabled"
msgid "Off"
msgstr "オフ"
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:298
msgctxt "service is enabled"
msgid "Enabled"
msgstr "有効"
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:301
msgctxt "service is active"
msgid "Active"
msgstr "アクティブ"
-#: ../panels/sharing/cc-sharing-panel.c:369
+#: ../panels/sharing/cc-sharing-panel.c:372
msgid "Choose a Folder"
msgstr "フォルダーの選択"
-#: ../panels/sharing/cc-sharing-panel.c:798
+#: ../panels/sharing/cc-sharing-panel.c:683
+#, 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/cc-sharing-panel.c:685
+#, fuzzy, c-format
+msgid ""
+"When remote login is enabled, remote users can connect using the Secure "
+"Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"リモートユーザーによる Secure Shell コマンドを使用した接続を許可します:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:687
+#, fuzzy, c-format
+msgid ""
+"Screen sharing allows remote users to view or control your screen by "
+"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"リモートユーザーが次の URI に接続して画面の表示または操作を行うことを許可しま"
+"す: <a href=\"vnc://%s\">vnc://%s</a>"
+
+#: ../panels/sharing/cc-sharing-panel.c:799
msgid "Copy"
msgstr "コピー"
-#: ../panels/sharing/cc-sharing-panel.c:1124
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+#: ../panels/sharing/cc-sharing-panel.c:1125
msgid "Sharing"
msgstr "共有"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sharing"
+msgstr "共有"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
msgid "Control what you want to share with others"
msgstr "他のユーザーと共有するものを設定します"
#. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
msgid ""
"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
"movies;server;renderer;"
@@ -5163,6 +5296,10 @@ msgstr ""
"ディオ;音声;音楽;楽曲;ミュージック;ビデオ;動画;映像;画像;静止画;写真;フォト;"
"ムービー;映画;サーバー;レンダラー;"
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "ネットワーク"
+
#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
msgid "Enable or disable remote login"
msgstr "リモートログインの有効化/無効化"
@@ -5171,25 +5308,13 @@ msgstr "リモートログインの有効化/無効化"
msgid "Authentication is required to enable or disable remote login"
msgstr "リモートログインを有効化または無効化するには認証が必要になります"
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "共有するネットワークが選択されていません"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "ネットワーク"
-
#: ../panels/sharing/sharing.ui.h:1
msgid "_Computer Name"
msgstr "コンピューター名(_C)"
#: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "パーソナルファイル共有(_P)"
+msgid "_File Sharing"
+msgstr "ファイル共有(_F)"
#: ../panels/sharing/sharing.ui.h:3
msgid "_Screen Sharing"
@@ -5208,85 +5333,54 @@ msgid "Some services are disabled because of no network access."
msgstr "ネットワークに接続していないため無効となっているサービスがあります。"
#: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "パーソナルファイル共有"
+msgid "File Sharing"
+msgstr "ファイル共有"
-#: ../panels/sharing/sharing.ui.h:9
-#, 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:10
+#: ../panels/sharing/sharing.ui.h:8
msgid "_Require Password"
msgstr "パスワードを要求する(_R)"
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
msgid "Remote Login"
msgstr "リモートログイン"
-#: ../panels/sharing/sharing.ui.h:14
-#, 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:16
+#: ../panels/sharing/sharing.ui.h:11
msgid "Screen Sharing"
msgstr "画面共有"
-#: ../panels/sharing/sharing.ui.h:18
-#, no-c-format
-msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
+#: ../panels/sharing/sharing.ui.h:12
+msgid "_Allow connections to control the screen"
msgstr ""
-"リモートユーザーが次の URI に接続して画面の表示または操作を行うことを許可しま"
-"す: <a href=\"vnc://%s\">vnc://%s</a>"
-#: ../panels/sharing/sharing.ui.h:19
-msgid "_Allow Remote Control"
-msgstr "リモート操作を許可(_A)"
-
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:13
msgid "_Password:"
msgstr "パスワード(_P):"
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:14
msgid "_Show Password"
msgstr "パスワードを表示(_S)"
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:15
msgid "Access Options"
msgstr "アクセスオプション"
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:16
msgid "_New connections must ask for access"
msgstr "新規接続の場合アクセス要求を必要とする(_N)"
-#: ../panels/sharing/sharing.ui.h:24
+#: ../panels/sharing/sharing.ui.h:17
msgid "_Require a password"
msgstr "パスワードを要求する(_R)"
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:18
msgid "Media Sharing"
msgstr "メディア共有"
-#: ../panels/sharing/sharing.ui.h:26
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr ""
-"メディア共有機能を使用して、音楽や写真、ビデオをネットワーク上で共有できま"
-"す。"
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share music, photos and videos over the network."
+msgstr "音楽・写真・ビデオをネットワークを通じて共有できます。"
-#: ../panels/sharing/sharing.ui.h:27
+#: ../panels/sharing/sharing.ui.h:20
msgid "Folders"
msgstr "フォルダー"
@@ -5414,11 +5508,6 @@ msgstr "スピーカーのテスト(_T)"
msgid "Peak detect"
msgstr "ピークの検出"
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "名前"
-
#: ../panels/sound/gvc-mixer-dialog.c:1512
msgid "Device"
msgstr "デバイス"
@@ -5513,18 +5602,23 @@ msgstr "テスト"
msgid "Subwoofer"
msgstr "サブウーファー"
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
msgid "Custom"
msgstr "その他"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Universal Access"
+msgstr "ユニバーサルアクセス"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
msgid "Make it easier to see, hear, type, point and click"
msgstr ""
"見る、聞く、タイピング、クリック操作など、コンピューターを簡単に使えるように"
"します"
#. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
msgid ""
"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
@@ -5631,7 +5725,8 @@ msgid "Sound Keys"
msgstr "切り替えキー"
#: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
+#, fuzzy
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
msgstr "Caps Lock と Num Lock を切り替えるとビープ音を鳴らします。"
#: ../panels/universal-access/uap.ui.h:26
@@ -6018,95 +6113,70 @@ msgid "Color Effects"
msgstr "色の設定"
#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "ユーザーの追加"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "フルネーム(_F)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
+#, fuzzy
msgid "Standard"
msgstr "標準"
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
msgid "Administrator"
msgstr "管理者"
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "フルネーム(_F)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
msgid "Account _Type"
msgstr "アカウントの種類(_T)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
msgid "Allow user to set a password when they next _login"
msgstr "次回ログイン時にユーザー自身でパスワードを設定させる(_L)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
msgid "Set a password _now"
msgstr "いまパスワードを設定する(_N)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
-msgstr "確認(_V)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#, fuzzy
+msgid "_Confirm"
+msgstr "設定中"
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#, fuzzy
msgid ""
"Enterprise login allows an existing centrally managed user account to be "
-"used on this device."
+"used on this device. You can also use this account to access company "
+"resources on the internet."
msgstr ""
"エンタープライズログインでは、中央管理された既存のユーザーアカウントをこのデ"
"バイスで使用できます。"
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
msgid "_Domain"
msgstr "ドメイン(_D)"
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"オンラインになって\n"
-"エンタープライズログインアカウントを追加する。"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "エンタープライズのログイン(_E)"
-
#: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "ユーザーの追加"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "登録(_E)"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "ドメイン管理者のログイン"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"エンタープライズのログインを使用するには、 このコンピューターを\n"
-"ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
-"パスワード入力を行ってもらってください。"
+#, fuzzy
+msgid "You are Offline"
+msgstr "オフライン"
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "管理者名(_N)"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
+msgstr "エンタープライズユーザーを追加するにはオンラインになる必要があります。"
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "管理者のパスワード"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "エンタープライズのログイン(_E)"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
msgid "Left thumb"
@@ -6141,7 +6211,7 @@ msgid "Right little finger"
msgstr "右の小指"
#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
msgid "Enable Fingerprint Login"
msgstr "指紋認証を有効にする"
@@ -6180,9 +6250,32 @@ msgstr ""
"Login;Name;Fingerprint;Avatar;Logo;Face;Password;ログイン;名前;指紋;アバター;"
"ロゴ;顔;パスワード;Users;ユーザー;"
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "ログイン履歴"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "登録(_E)"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "ドメイン管理者のログイン"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"エンタープライズのログインを使用するには、 このコンピューターを\n"
+"ドメインに登録する必要があります。ネットワーク管理者にドメインの\n"
+"パスワード入力を行ってもらってください。"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "管理者名(_N)"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "管理者のパスワード"
#: ../panels/user-accounts/data/password-dialog.ui.h:1
msgid "Change Password"
@@ -6205,38 +6298,32 @@ msgid "Current _Password"
msgstr "現在のパスワード(_P)"
#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
+#, fuzzy
+msgid "Allow user to change their password on next login"
msgstr "次回ログイン時にユーザー自身でパスワードを設定させる"
#: ../panels/user-accounts/data/password-dialog.ui.h:8
msgid "Set a password now"
msgstr "いまパスワードを設定する"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "ユーザーアカウントの追加"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "ユーザーアカウントの削除"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+#, fuzzy
+msgid "_Add User…"
+msgstr "ユーザーの追加"
#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "ログインオプション"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "A_utomatic Login"
msgstr "自動ログイン(_U)"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
msgid "_Fingerprint Login"
msgstr "指紋認証ログイン(_F)"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
msgid "User Icon"
msgstr "ユーザーアイコン"
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
msgid "Last Login"
msgstr "最終ログイン"
@@ -6341,8 +6428,9 @@ msgid "Try to add more letters, numbers and symbols."
msgstr "文字、数字、記号をもっと追加するようにしてください。"
#: ../panels/user-accounts/pw-utils.c:117
+#, fuzzy
msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
+msgid "Mix uppercase and lowercase and try to use a number or two."
msgstr "大文字、小文字を混在させ、さらに数字を 1 つか 2 つは使用してください。"
#: ../panels/user-accounts/pw-utils.c:119
@@ -6433,32 +6521,33 @@ msgid "Unknown error"
msgstr "原因不明のエラー"
#: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
+#, fuzzy
+msgid "Should match the web address of your login provider."
msgstr "アカウント提供者のウェブアドレスと一致するはずです。"
#: ../panels/user-accounts/um-account-dialog.c:228
msgid "Failed to add account"
msgstr "アカウントの追加に失敗しました"
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:453
msgid "Passwords do not match."
msgstr "パスワードが一致しません。"
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:707
+#: ../panels/user-accounts/um-account-dialog.c:753
+#: ../panels/user-accounts/um-account-dialog.c:774
msgid "Failed to register account"
msgstr "アカウントの登録に失敗しました"
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:897
msgid "No supported way to authenticate with this domain"
msgstr "このドメインで認証を行う方法はサポートされていません"
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:970
msgid "Failed to join domain"
msgstr "ドメインの参加に失敗しました"
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1031
msgid ""
"That login name didn't work.\n"
"Please try again."
@@ -6466,7 +6555,7 @@ msgstr ""
"ログイン名に問題がありました。\n"
"やり直してください。"
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1038
msgid ""
"That login password didn't work.\n"
"Please try again."
@@ -6474,14 +6563,24 @@ msgstr ""
"パスワードに問題がありました。\n"
"やり直してください。"
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1046
msgid "Failed to log into domain"
msgstr "ドメインへのログインに失敗しました"
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1104
msgid "Unable find the domain. Maybe you misspelled it?"
msgstr "ドメインを見つけられません。スペルミスがないか確認してください。"
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "標準"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "管理者"
+
#: ../panels/user-accounts/um-fingerprint-dialog.c:138
msgid ""
"You are not allowed to access the device. Contact your system administrator."
@@ -6500,29 +6599,29 @@ msgstr "システム内部のエラーが発生しました。"
msgid "Enabled"
msgstr "有効"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
msgid "Delete registered fingerprints?"
msgstr "登録した指紋情報を削除しますか?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
msgid "_Delete Fingerprints"
msgstr "削除する(_D)"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
msgid ""
"Do you want to delete your registered fingerprints so fingerprint login is "
"disabled?"
msgstr "登録済みの指紋情報を削除して指紋認証を無効にしますか?"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
msgid "Done!"
msgstr "完了です!"
#. translators:
#. * The variable is the name of the device, for example:
#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
#, c-format
msgid "Could not access '%s' device"
msgstr "'%s' というデバイスにアクセスできません"
@@ -6530,16 +6629,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:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
#, c-format
msgid "Could not start finger capture on '%s' device"
msgstr "'%s' で指紋を読み取れませんでした"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
msgid "Could not access any fingerprint readers"
msgstr "指紋リーダーにアクセスできませんでした"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
msgid "Please contact your system administrator for help."
msgstr "システム管理者に連絡してください。"
@@ -6548,7 +6647,7 @@ msgstr "システム管理者に連絡してください。"
#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
#. * 'Digital Persona U.are.U 4000/4000B' device."
#.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
#, c-format
msgid ""
"To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6557,11 +6656,11 @@ msgstr ""
"指紋認証を有効にするには、'%s' のデバイスを使って、あなたの指紋を登録する必要"
"があります。"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
msgid "Selecting finger"
msgstr "指の選択"
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
msgid "Enrolling fingerprints"
msgstr "指紋の登録"
@@ -6615,14 +6714,21 @@ msgctxt "login date-time"
msgid "%s, %s"
msgstr "%s %s"
-#: ../panels/user-accounts/um-history-dialog.c:249
+#: ../panels/user-accounts/um-history-dialog.c:250
msgid "Session Ended"
msgstr "セッション終了"
-#: ../panels/user-accounts/um-history-dialog.c:255
+#: ../panels/user-accounts/um-history-dialog.c:256
msgid "Session Started"
msgstr "セッション開始"
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr ""
+
#: ../panels/user-accounts/um-password-dialog.c:145
msgid "Please choose another password."
msgstr "別のパスワードを選択してください。"
@@ -6684,7 +6790,7 @@ msgstr "無効なパスワードです、やり直してください"
msgid "Couldn't connect to the %s domain: %s"
msgstr "%sドメインに接続できませんでした: %s"
-#: ../panels/user-accounts/um-user-panel.c:237
+#: ../panels/user-accounts/um-user-panel.c:239
msgid "Other Accounts"
msgstr "他のアカウント"
@@ -6764,27 +6870,27 @@ msgstr "なし"
msgid "Logged in"
msgstr "ログイン中"
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1290
msgid "Failed to contact the accounts service"
msgstr "アカウントサービスの接続に失敗しました"
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1292
msgid "Please make sure that the AccountService is installed and enabled."
msgstr ""
"AccountService がインストールされ、有効になっているか確認してください。"
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1334
msgid ""
"To make changes,\n"
"click the * icon first"
msgstr "変更するには、まず * アイコンをクリックしてください"
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1374
msgid "Create a user account"
msgstr "ユーザーアカウントを作成します"
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
msgid ""
"To create a user account,\n"
"click the * icon first"
@@ -6792,12 +6898,12 @@ msgstr ""
"ユーザーアカウントを作成するには、\n"
"まず * アイコンをクリックしてください"
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1395
msgid "Delete the selected user account"
msgstr "選択したユーザーアカウントを削除します"
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
msgid ""
"To delete the selected user account,\n"
"click the * icon first"
@@ -6805,33 +6911,33 @@ msgstr ""
"選択したユーザーアカウントを削除するには、\n"
"まず * アイコンをクリックしてください"
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1591
msgid "My Account"
msgstr "自分のアカウント"
#: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "'%s' というユーザーはすでに存在します。"
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr ""
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
#, c-format
msgid "The username is too long."
msgstr "ユーザー名が長すぎます。"
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
msgid "The username cannot start with a '-'."
msgstr "ユーザー名の先頭文字に '-' は使えません。"
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
+#, fuzzy
msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
msgstr ""
"ユーザー名には次の文字だけを使用してください。a から z の大文字・小文字、数"
"字、'.'、'-'、および '_'。"
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
msgid "This will be used to name your home folder and can't be changed."
msgstr ""
"ユーザー名はホームフォルダーの名前に使用されます。これは変更できません。"
@@ -6923,18 +7029,18 @@ msgstr "画面のマッピング"
msgid "Button"
msgstr "ボタン"
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations.
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wacom Tablet"
msgstr "ワコムタブレット"
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
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
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
msgstr ""
"Tablet;Wacom;Stylus;Eraser;Mouse;タブレット;スタイラスペン;ペン;消しゴム;マウ"
@@ -6968,6 +7074,10 @@ msgstr "ワコムタブレットを接続するか、電源を入れてくださ
msgid "Bluetooth Settings"
msgstr "Bluetooth の設定"
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "ワコムタブレット"
+
# 参考: intuos 5 のマニュアル p.57
#: ../panels/wacom/gnome-wacom-properties.ui.h:10
msgid "Map to Monitor…"
@@ -7069,22 +7179,22 @@ msgstr "右トラックパッドのモードスイッチ"
msgid "Mode Switch #%d"
msgstr "モードスイッチ #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1300
+#: ../panels/wacom/gsd-wacom-device.c:1238
#, c-format
msgid "Left Button #%d"
msgstr "左ボタン #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1303
+#: ../panels/wacom/gsd-wacom-device.c:1241
#, c-format
msgid "Right Button #%d"
msgstr "右ボタン #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1306
+#: ../panels/wacom/gsd-wacom-device.c:1244
#, c-format
msgid "Top Button #%d"
msgstr "上ボタン #%d"
-#: ../panels/wacom/gsd-wacom-device.c:1309
+#: ../panels/wacom/gsd-wacom-device.c:1247
#, c-format
msgid "Bottom Button #%d"
msgstr "下ボタン #%d"
@@ -7161,6 +7271,11 @@ msgstr "下のサイドスイッチ"
msgid "Tip Pressure Feel"
msgstr "ペン先の感触"
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53
+#: ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "すべての設定"
+
#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
msgid "GNOME Control Center"
msgstr "GNOME コントロールセンター"
@@ -7217,22 +7332,18 @@ msgstr "ヘルプ"
msgid "Quit"
msgstr "終了"
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "すべての設定"
-
#. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
msgctxt "category"
msgid "Personal"
msgstr "パーソナル"
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
msgctxt "category"
msgid "Hardware"
msgstr "ハードウェア"
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
msgctxt "category"
msgid "System"
msgstr "システム"
@@ -7271,5 +7382,13 @@ msgctxt "shortcut window"
msgid "Cancel search"
msgstr "検索をキャンセルする"
-#~ msgid "Used to determine your geographical location"
-#~ msgstr "あなたの地理的位置を特定するのに使用されます"
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: ../shell/panel-list.ui.h:3
+#, fuzzy
+msgid "No results found"
+msgstr "地域が見つかりません"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
