[network-manager-applet/nma-0-9-8] l10n: Update Japanese translation
- From: Jiro Matsuzawa <jmatsuzawa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/nma-0-9-8] l10n: Update Japanese translation
- Date: Mon, 25 Mar 2013 13:38:45 +0000 (UTC)
commit 98a4b9ce40609780438ddcc1c71199d5ec735064
Author: OKANO Takayoshi <kano na rim or jp>
Date: Mon Mar 25 22:38:19 2013 +0900
l10n: Update Japanese translation
po/ja.po | 953 +++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 545 insertions(+), 408 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 8674e05..b8faa9e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: network-manager-applet master\n"
"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n";
-"POT-Creation-Date: 2012-10-19 22:16+0000\n"
-"PO-Revision-Date: 2012-10-12 13:35+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
+"POT-Creation-Date: 2013-03-24 08:39+0000\n"
+"PO-Revision-Date: 2013-03-25 22:19+0900\n"
+"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -112,37 +112,37 @@ msgstr "有線 802.1X ã®èªè¨¼"
msgid "_Network name:"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å(_N):"
-#: ../src/applet.c:513
+#: ../src/applet.c:541
msgid "Failed to add/activate connection"
msgstr "接続ã®è¿½åŠ ã€ã‚ã‚‹ã„ã¯æœ‰åŠ¹ã«ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/applet.c:515 ../src/applet.c:559 ../src/applet.c:585
+#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
msgid "Unknown error"
msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼"
-#: ../src/applet.c:518 ../src/applet.c:588 ../src/applet-device-wifi.c:1379
+#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
#: ../src/applet-device-wifi.c:1398
msgid "Connection failure"
msgstr "接続ã«å¤±æ•—"
-#: ../src/applet.c:557
+#: ../src/applet.c:585
msgid "Device disconnect failed"
msgstr "デãƒã‚¤ã‚¹ã®åˆ‡æ–ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/applet.c:562
+#: ../src/applet.c:590
msgid "Disconnect failure"
msgstr "切æ–失敗"
-#: ../src/applet.c:583
+#: ../src/applet.c:611
msgid "Connection activation failed"
msgstr "接続を有効ã«ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/applet.c:953 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
msgid "Don't show this message again"
msgstr "二度ã¨ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ãªã„"
-#: ../src/applet.c:1042
+#: ../src/applet.c:1071
#, c-format
msgid ""
"\n"
@@ -151,7 +151,7 @@ msgstr ""
"\n"
"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒå‰²ã‚Šè¾¼ã¿ã•ã‚ŒãŸç‚ºã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1045
+#: ../src/applet.c:1074
#, c-format
msgid ""
"\n"
@@ -160,7 +160,7 @@ msgstr ""
"\n"
"VPN サービスãŒä¸æ„ã«åœæ¢ã—ãŸç‚ºã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1048
+#: ../src/applet.c:1077
#, c-format
msgid ""
"\n"
@@ -169,7 +169,7 @@ msgstr ""
"\n"
"VPN サービスãŒç„¡åŠ¹ãªè¨å®šã‚’è¿”ã—ãŸãŸã‚ã€VPN 接続 '%s'ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1051
+#: ../src/applet.c:1080
#, c-format
msgid ""
"\n"
@@ -178,7 +178,7 @@ msgstr ""
"\n"
"接続試行ãŒã‚¿ã‚¤ãƒ アウトã—ãŸãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1054
+#: ../src/applet.c:1083
#, c-format
msgid ""
"\n"
@@ -187,7 +187,7 @@ msgstr ""
"\n"
"VPN サービスãŒæ™‚間内ã«é–‹å§‹ã—ãªã‹ã£ãŸãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1057
+#: ../src/applet.c:1086
#, c-format
msgid ""
"\n"
@@ -196,7 +196,7 @@ msgstr ""
"\n"
"VPN サービスãŒé–‹å§‹ã«å¤±æ•—ã—ãŸãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1060
+#: ../src/applet.c:1089
#, c-format
msgid ""
"\n"
@@ -205,7 +205,7 @@ msgstr ""
"\n"
"有効㪠VPN secret ãŒãªã„ãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1063
+#: ../src/applet.c:1092
#, c-format
msgid ""
"\n"
@@ -214,7 +214,7 @@ msgstr ""
"\n"
"VPN secret ãŒç„¡åŠ¹ãªãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1070
+#: ../src/applet.c:1099
#, c-format
msgid ""
"\n"
@@ -223,7 +223,7 @@ msgstr ""
"\n"
"VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/applet.c:1088
+#: ../src/applet.c:1117
#, c-format
msgid ""
"\n"
@@ -232,7 +232,7 @@ msgstr ""
"\n"
"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒå‰²ã‚Šè¾¼ã¿ã•ã‚ŒãŸãŸã‚ã€VPN 接続 '%s' ã¯åˆ‡æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/applet.c:1091
+#: ../src/applet.c:1120
#, c-format
msgid ""
"\n"
@@ -241,7 +241,7 @@ msgstr ""
"\n"
"VPN サービスãŒåœæ¢ã—ãŸãŸã‚ã€VPN 接続 '%s' ã¯åˆ‡æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/applet.c:1097
+#: ../src/applet.c:1126
#, c-format
msgid ""
"\n"
@@ -250,7 +250,7 @@ msgstr ""
"\n"
"VPN 接続 '%s' ãŒåˆ‡æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/applet.c:1127
+#: ../src/applet.c:1156
#, c-format
msgid ""
"VPN connection has been successfully established.\n"
@@ -261,19 +261,19 @@ msgstr ""
"\n"
"%s\n"
-#: ../src/applet.c:1129
+#: ../src/applet.c:1158
msgid "VPN connection has been successfully established.\n"
msgstr "VPN 接続ã®ç¢ºç«‹ã«æˆåŠŸã—ã¾ã—ãŸã€‚\n"
-#: ../src/applet.c:1131
+#: ../src/applet.c:1160
msgid "VPN Login Message"
msgstr "VPN ãƒã‚°ã‚¤ãƒ³ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
-#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
+#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
msgid "VPN Connection Failed"
msgstr "VPN 接続ã¯å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/applet.c:1202
+#: ../src/applet.c:1231
#, c-format
msgid ""
"\n"
@@ -285,7 +285,7 @@ msgstr ""
"VPN サービスãŒé–‹å§‹ã«å¤±æ•—ã—ãŸãŸã‚ã€VPN 接続 '%s' ã¯å¤±æ•—ã—ã¾ã—ãŸã€‚n\n"
"%s"
-#: ../src/applet.c:1205
+#: ../src/applet.c:1234
#, c-format
msgid ""
"\n"
@@ -298,171 +298,172 @@ msgstr ""
"\n"
"%s"
-#: ../src/applet.c:1520
+#: ../src/applet.c:1549
msgid "device not ready (firmware missing)"
msgstr "デãƒã‚¤ã‚¹ã®æº–å‚™ãŒã§ãã¦ã„ã¾ã›ã‚“ (ファームウェア未検出)"
-#: ../src/applet.c:1522
+#: ../src/applet.c:1551
msgid "device not ready"
msgstr "デãƒã‚¤ã‚¹ã®æº–å‚™ãŒã§ãã¦ã„ã¾ã›ã‚“"
#. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1532 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
msgid "disconnected"
msgstr "切æ–ã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/applet.c:1548
+#: ../src/applet.c:1577
msgid "Disconnect"
msgstr "切æ–ã™ã‚‹"
-#: ../src/applet.c:1562
+#: ../src/applet.c:1591
msgid "device not managed"
msgstr "デãƒã‚¤ã‚¹ã¯ç®¡ç†ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/applet.c:1606
+#: ../src/applet.c:1635
msgid "No network devices available"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ‡ãƒã‚¤ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/applet.c:1694
+#: ../src/applet.c:1723
msgid "_VPN Connections"
msgstr "VPN 接続(_V)"
-#: ../src/applet.c:1751
+#: ../src/applet.c:1780
msgid "_Configure VPN..."
msgstr "VPN ã‚’è¨å®š(_C)..."
-#: ../src/applet.c:1755
+#: ../src/applet.c:1784
msgid "_Disconnect VPN"
msgstr "VPN を切æ–ã™ã‚‹(_D)"
-#: ../src/applet.c:1849
+#: ../src/applet.c:1878
msgid "NetworkManager is not running..."
msgstr "NetworkManager ã¯å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã›ã‚“..."
-#: ../src/applet.c:1854 ../src/applet.c:2656
+#: ../src/applet.c:1883 ../src/applet.c:2735
msgid "Networking disabled"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™"
#. 'Enable Networking' item
-#: ../src/applet.c:2075
+#: ../src/applet.c:2104
msgid "Enable _Networking"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’有効ã«ã™ã‚‹(_N)"
#. 'Enable Wi-Fi' item
-#: ../src/applet.c:2084
+#: ../src/applet.c:2113
#, fuzzy
msgid "Enable _Wi-Fi"
msgstr "無線を有効ã«ã™ã‚‹(_W)"
#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2093
+#: ../src/applet.c:2122
msgid "Enable _Mobile Broadband"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ã‚’有効ã«ã™ã‚‹(_M)"
#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2102
+#: ../src/applet.c:2131
msgid "Enable WiMA_X Mobile Broadband"
msgstr "WiMAX モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ã‚’有効ã«ã™ã‚‹(_X)"
#. Toggle notifications item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2142
msgid "Enable N_otifications"
msgstr "通知を有効ã«ã™ã‚‹(_O)"
#. 'Connection Information' item
-#: ../src/applet.c:2124
+#: ../src/applet.c:2153
msgid "Connection _Information"
msgstr "æŽ¥ç¶šæƒ…å ±(_I)"
#. 'Edit Connections...' item
-#: ../src/applet.c:2134
+#: ../src/applet.c:2163
msgid "Edit Connections..."
msgstr "接続を編集ã™ã‚‹..."
#. Help item
-#: ../src/applet.c:2148
+#: ../src/applet.c:2177
msgid "_Help"
msgstr "ヘルプ(_H)"
#. About item
-#: ../src/applet.c:2157
+#: ../src/applet.c:2186
msgid "_About"
msgstr "ã“ã®ã‚¢ãƒ—リケーションã«ã¤ã„ã¦(_A)"
-#: ../src/applet.c:2335
+#: ../src/applet.c:2364
msgid "Disconnected"
msgstr "切æ–ã•ã‚Œã¾ã—ãŸ"
-#: ../src/applet.c:2336
+#: ../src/applet.c:2365
msgid "The network connection has been disconnected."
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒåˆ‡æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/applet.c:2519
+#: ../src/applet.c:2598
#, c-format
msgid "Preparing network connection '%s'..."
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š '%s' を準備ä¸..."
-#: ../src/applet.c:2522
+#: ../src/applet.c:2601
#, c-format
msgid "User authentication required for network connection '%s'..."
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š '%s' ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼èªè¨¼ãŒå¿…è¦ã§ã™..."
-#: ../src/applet.c:2525 ../src/applet-device-bt.c:235
-#: ../src/applet-device-cdma.c:484 ../src/applet-device-gsm.c:538
-#: ../src/applet-device-wimax.c:469
+#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
+#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
#, c-format
msgid "Requesting a network address for '%s'..."
msgstr "'%s' ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¦æ±‚ã—ã¦ã„ã¾ã™..."
-#: ../src/applet.c:2528
+#: ../src/applet.c:2607
#, c-format
msgid "Network connection '%s' active"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š '%s' ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã§ã™ã€‚"
-#: ../src/applet.c:2611
+#: ../src/applet.c:2690
#, c-format
msgid "Starting VPN connection '%s'..."
msgstr "VPN 接続 '%s' を開始ã—ã¦ã„ã¾ã™..."
-#: ../src/applet.c:2614
+#: ../src/applet.c:2693
#, c-format
msgid "User authentication required for VPN connection '%s'..."
msgstr "VPN 接続 '%s' ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼èªè¨¼ãŒå¿…è¦ã§ã™..."
-#: ../src/applet.c:2617
+#: ../src/applet.c:2696
#, c-format
msgid "Requesting a VPN address for '%s'..."
msgstr "'%s' ã® VPN アドレスをè¦æ±‚ã—ã¦ã„ã¾ã™..."
-#: ../src/applet.c:2620
+#: ../src/applet.c:2699
#, c-format
msgid "VPN connection '%s' active"
msgstr "VPN 接続 '%s' ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã§ã™"
-#: ../src/applet.c:2661
+#: ../src/applet.c:2740
msgid "No network connection"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/applet.c:3362
+#: ../src/applet.c:3441
msgid "NetworkManager Applet"
msgstr "NetworkManager アプレット"
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:393
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-gsm.c:447
-#: ../src/applet-device-wifi.c:859 ../src/applet-device-wimax.c:275
+#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
+#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
+#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
+#: ../src/applet-device-wimax.c:275
msgid "Available"
msgstr "利用å¯èƒ½"
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:435
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-gsm.c:489
-#: ../src/applet-device-wimax.c:419
+#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
+#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
+#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
#, c-format
msgid "You are now connected to '%s'."
msgstr "ç¾åœ¨'%s' ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:439
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-gsm.c:493
-#: ../src/applet-device-wifi.c:1261 ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
+#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
+#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
+#: ../src/applet-device-wimax.c:423
msgid "Connection Established"
msgstr "接続を確立ã—ã¾ã—ãŸ"
@@ -470,77 +471,63 @@ msgstr "接続を確立ã—ã¾ã—ãŸ"
msgid "You are now connected to the mobile broadband network."
msgstr "ç¾åœ¨ã€ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/applet-device-bt.c:226 ../src/applet-device-cdma.c:475
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:460
+#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
+#: ../src/mobile-helpers.c:585
#, c-format
msgid "Preparing mobile broadband connection '%s'..."
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' を準備ä¸ã§ã™..."
-#: ../src/applet-device-bt.c:229 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:463
+#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
+#: ../src/mobile-helpers.c:588
#, c-format
msgid "Configuring mobile broadband connection '%s'..."
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' ã‚’è¨å®šä¸ã§ã™..."
-#: ../src/applet-device-bt.c:232 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:466
+#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
+#: ../src/mobile-helpers.c:591
#, c-format
msgid "User authentication required for mobile broadband connection '%s'..."
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' ã«ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼èªè¨¼ãŒå¿…è¦ã§ã™..."
-#: ../src/applet-device-bt.c:239 ../src/applet-device-cdma.c:502
-#: ../src/applet-device-gsm.c:556
+#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
#, c-format
msgid "Mobile broadband connection '%s' active"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã§ã™ã€‚"
-#: ../src/applet-device-cdma.c:182 ../src/connection-editor/page-mobile.c:715
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
-
-#: ../src/applet-device-cdma.c:339 ../src/applet-device-gsm.c:393
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
+#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
#, c-format
msgid "Mobile Broadband (%s)"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ (%s)"
-#: ../src/applet-device-cdma.c:341 ../src/applet-device-gsm.c:395
-#: ../src/connection-editor/new-connection.c:112
+#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
+#: ../src/applet-device-gsm.c:307
+#: ../src/connection-editor/new-connection.c:113
#: ../src/connection-editor/page-mobile.c:389
#: ../src/libnm-gtk/nm-ui-utils.c:333
msgid "Mobile Broadband"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰"
#. Default connection item
-#: ../src/applet-device-cdma.c:406
+#: ../src/applet-device-cdma.c:316
msgid "New Mobile Broadband (CDMA) connection..."
msgstr "æ–°è¦ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ (CDMA) 接続..."
-#: ../src/applet-device-cdma.c:440
+#: ../src/applet-device-cdma.c:350
msgid "You are now connected to the CDMA network."
msgstr "ç¾åœ¨ CDMA ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/applet-device-cdma.c:497 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:478
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' アクティブã§ã™: (%d%%%s%s)"
-
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:554
-#: ../src/applet-device-wimax.c:481
-msgid "roaming"
-msgstr "ãƒãƒ¼ãƒŸãƒ³ã‚°"
-
-#: ../src/applet-device-cdma.c:641 ../src/applet-device-cdma.c:647
+#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
msgid "CDMA network."
msgstr "CDMA ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: ../src/applet-device-cdma.c:642 ../src/applet-device-gsm.c:1199
+#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
+#: ../src/applet-device-gsm.c:678
msgid "You are now registered on the home network."
msgstr "ホームãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¾ã—ãŸã€‚"
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1205
+#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-gsm.c:684
msgid "You are now registered on a roaming network."
msgstr "ãƒãƒ¼ãƒŸãƒ³ã‚°ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¾ã—ãŸã€‚"
@@ -602,105 +589,48 @@ msgstr "有線ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š '%s' ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã§ã™"
msgid "DSL authentication"
msgstr "DSL èªè¨¼"
-#: ../src/applet-device-gsm.c:214 ../src/connection-editor/page-mobile.c:718
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:460
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "æ–°è¦ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ (GSM) 接続..."
-
-#: ../src/applet-device-gsm.c:494
-msgid "You are now connected to the GSM network."
-msgstr "ç¾åœ¨ GSM ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-
-#: ../src/applet-device-gsm.c:655
-msgid "PIN code required"
-msgstr "PIN コードãŒå¿…è¦ã§ã™"
-
-#: ../src/applet-device-gsm.c:663
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ã«ã¯ PIN コードãŒå¿…è¦ã§ã™"
-
-#: ../src/applet-device-gsm.c:784
-#, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "'%2$s' 上㮠SIM カード '%1$s' 㮠PIN コード"
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK ãŒé•ã„ã¾ã™; プãƒãƒã‚¤ãƒ€ãƒ¼ã«é€£çµ¡ã—ã¦ãã ã•ã„。"
-#: ../src/applet-device-gsm.c:876
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
msgid "Wrong PIN code; please contact your provider."
msgstr "PIN ãŒé•ã„ã¾ã™; プãƒãƒã‚¤ãƒ€ãƒ¼ã«é€£çµ¡ã—ã¦ãã ã•ã„。"
-#: ../src/applet-device-gsm.c:899
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK ãŒé•ã„ã¾ã™; プãƒãƒã‚¤ãƒ€ãƒ¼ã«é€£çµ¡ã—ã¦ãã ã•ã„。"
-
#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:926
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
msgid "Sending unlock code..."
msgstr "é–‹éŒ ã‚³ãƒ¼ãƒ‰ã‚’é€ä¿¡ä¸..."
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN ã®é–‹éŒ ãŒå¿…è¦ã§ã™"
-
-#: ../src/applet-device-gsm.c:990
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN ã®é–‹éŒ ãŒå¿…è¦ã§ã™"
-
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:992
-#, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ %s' を使用ã™ã‚‹ã«ã¯ SIM PIN ピンコードãŒå¿…è¦ã§ã™ã€‚"
-
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:994
-msgid "PIN code:"
-msgstr "PIN コード:"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:998
-msgid "Show PIN code"
-msgstr "PIN コードを表示"
-
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK ã®ã‚¢ãƒ³ãƒãƒƒã‚¯ãŒå¿…è¦ã§ã™"
-
-#: ../src/applet-device-gsm.c:1002
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK ã®ã‚¢ãƒ³ãƒãƒƒã‚¯ãŒå¿…è¦ã§ã™"
-
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1004
-#, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ '%s' を使用ã™ã‚‹ã«ã¯ SIM PUK コードãŒå¿…è¦ã§ã™ã€‚"
+#. Default connection item
+#: ../src/applet-device-broadband.c:785
+#, fuzzy
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection..."
+msgstr "æ–°è¦ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š"
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "PUK code:"
-msgstr "PUK コード:"
+#: ../src/applet-device-broadband.c:821
+#, fuzzy
+#| msgid "You are now connected to the mobile broadband network."
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "ç¾åœ¨ã€ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1009
-msgid "New PIN code:"
-msgstr "æ–°è¦ã® PIN コード:"
+#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
+#, fuzzy
+#| msgid "Mobile broadband network password"
+msgid "Mobile Broadband network."
+msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ãƒ‘スワード"
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1011
-msgid "Re-enter new PIN code:"
-msgstr "æ–°è¦ã® PIN コードをå†å…¥åŠ›:"
+#. Default connection item
+#: ../src/applet-device-gsm.c:372
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "æ–°è¦ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ (GSM) 接続..."
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1016
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK コードを表示"
+#: ../src/applet-device-gsm.c:406
+msgid "You are now connected to the GSM network."
+msgstr "ç¾åœ¨ GSM ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
-#: ../src/applet-device-gsm.c:1198 ../src/applet-device-gsm.c:1204
+#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
msgid "GSM network."
msgstr "GSM ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
@@ -822,6 +752,15 @@ msgstr "WiMAX ã¯ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¹ã‚¤ãƒƒãƒã§ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™
msgid "You are now connected to the WiMAX network."
msgstr "ç¾åœ¨ WiMAX ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
+#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š '%s' アクティブã§ã™: (%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+msgid "roaming"
+msgstr "ãƒãƒ¼ãƒŸãƒ³ã‚°"
+
#: ../src/applet-dialogs.c:57
msgid "Error displaying connection information:"
msgstr "æŽ¥ç¶šæƒ…å ±ã®è¡¨ç¤ºä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸ:"
@@ -909,6 +848,7 @@ msgstr "WiMAX (%s)"
#. --- General ---
#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/connection-editor/page-general.c:345
msgid "General"
msgstr "全般"
@@ -1015,7 +955,7 @@ msgstr "VPN ãƒãƒŠãƒ¼:"
msgid "Base Connection:"
msgstr "ベース接続:"
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
msgid "Unknown"
msgstr "ä¸æ˜Ž"
@@ -1059,6 +999,64 @@ msgstr "'%s' ã¸ã®æŽ¥ç¶šã«ãƒ‘スワードãŒå¿…è¦ã§ã™ã€‚"
msgid "Password:"
msgstr "パスワード:"
+#: ../src/applet-dialogs.c:1310
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN ã®é–‹éŒ ãŒå¿…è¦ã§ã™"
+
+#: ../src/applet-dialogs.c:1311
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN ã®é–‹éŒ ãŒå¿…è¦ã§ã™"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1313
+#, c-format
+msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
+msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ %s' を使用ã™ã‚‹ã«ã¯ SIM PIN ピンコードãŒå¿…è¦ã§ã™ã€‚"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1315
+msgid "PIN code:"
+msgstr "PIN コード:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1319
+msgid "Show PIN code"
+msgstr "PIN コードを表示"
+
+#: ../src/applet-dialogs.c:1321
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK ã®ã‚¢ãƒ³ãƒãƒƒã‚¯ãŒå¿…è¦ã§ã™"
+
+#: ../src/applet-dialogs.c:1322
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK ã®ã‚¢ãƒ³ãƒãƒƒã‚¯ãŒå¿…è¦ã§ã™"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1324
+#, c-format
+msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
+msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ '%s' を使用ã™ã‚‹ã«ã¯ SIM PUK コードãŒå¿…è¦ã§ã™ã€‚"
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1326
+msgid "PUK code:"
+msgstr "PUK コード:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1329
+msgid "New PIN code:"
+msgstr "æ–°è¦ã® PIN コード:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1331
+msgid "Re-enter new PIN code:"
+msgstr "æ–°è¦ã® PIN コードをå†å…¥åŠ›:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1336
+msgid "Show PIN/PUK codes"
+msgstr "PIN/PUK コードを表示"
+
#: ../src/connection-editor/ce-ip4-routes.ui.h:1
#: ../src/connection-editor/ce-ip6-routes.ui.h:1
#: ../src/connection-editor/ce-page-ip4.ui.h:8
@@ -1108,14 +1106,6 @@ msgstr "æ–°è¦æŽ¥ç¶šã§ä½¿ç”¨ã—ãŸã„ VPN ã®ã‚¿ã‚¤ãƒ—ã‚’é¸æŠžã—ã¦ãã ã•
msgid "Create…"
msgstr "作æˆâ€¦"
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "自動"
-
-#: ../src/connection-editor/ce-page.c:356
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã®ãŸã‚接続 secret ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-
#: ../src/connection-editor/ce-page-bond.ui.h:1
msgid "Round-robin"
msgstr ""
@@ -1166,13 +1156,15 @@ msgstr "モード(_O):"
#. Edit
#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/nm-connection-list.c:685
msgid "_Edit"
msgstr "編集(_E)"
#. Delete
#: ../src/connection-editor/ce-page-bond.ui.h:13
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/nm-connection-list.c:702
msgid "_Delete"
msgstr "削除(_D)"
@@ -1185,6 +1177,7 @@ msgid "ms"
msgstr ""
#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
#, fuzzy
msgid "_Interface name:"
msgstr "インターフェース:"
@@ -1209,6 +1202,58 @@ msgstr ""
msgid "Link _down delay:"
msgstr ""
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#, fuzzy
+#| msgid "S_ecurity:"
+msgid "_Priority:"
+msgstr "ã‚»ã‚ュリティ(_E):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "ベース接続:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:72
+msgid "automatic"
+msgstr "自動"
+
+#: ../src/connection-editor/ce-page.c:356
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã®ãŸã‚接続 secret ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+
#: ../src/connection-editor/ce-page-dsl.ui.h:1
#: ../src/connection-editor/ce-page-mobile.ui.h:10
#: ../src/wireless-security/eap-method-leap.ui.h:1
@@ -1327,6 +1372,24 @@ msgstr "MTU(_M):"
msgid "bytes"
msgstr "ãƒã‚¤ãƒˆ"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, fuzzy
+#| msgid "You are now connected to the WiMAX network."
+msgid "All _users may connect to this network"
+msgstr "ç¾åœ¨ WiMAX ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "_Automatically connect to this network when it is available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr ""
+
#: ../src/connection-editor/ce-page-infiniband.ui.h:1
msgid "_Transport mode:"
msgstr ""
@@ -1401,7 +1464,7 @@ msgstr "ドメインを検索(_E):"
#: ../src/connection-editor/page-ip4.c:299
#: ../src/connection-editor/page-ip6.c:298
msgid "DNS ser_vers:"
-msgstr "DNS サーãƒãƒ¼(_D):"
+msgstr "DNS サーãƒãƒ¼(_V):"
#: ../src/connection-editor/ce-page-ip4.ui.h:14
#: ../src/connection-editor/ce-page-ip6.ui.h:12
@@ -1683,169 +1746,177 @@ msgstr "Microsoft ãƒãƒ£ãƒ¬ãƒ³ã‚¸ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯èªè¨¼ãƒ—ãƒãƒˆã‚³ãƒ« ãƒ
msgid "In most cases, the provider's PPP servers will support all authentication methods. If connections
fail, try disabling support for some methods."
msgstr "ã»ã¨ã‚“ã©ã®å ´åˆã€ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã® PPP サーãƒãƒ¼ã¯ã™ã¹ã¦ã®èªè¨¼æ–¹æ³•ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚ 接続ãŒå¤±æ•—ã™ã‚‹å ´åˆã¯ã€ä¸€éƒ¨ã®èªè¨¼æ–¹æ³•ã‚’無効ã«ã—ã¦ã¿ã¦ãã ã•ã„。"
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/ip4-routes-dialog.c:762
+#: ../src/connection-editor/ip6-routes-dialog.c:704
+#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/page-ip6.c:894
msgid "Address"
msgstr "アドレス"
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:779
+#: ../src/connection-editor/page-ip4.c:945
msgid "Netmask"
msgstr "ãƒãƒƒãƒˆãƒžã‚¹ã‚¯"
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip4-routes-dialog.c:796
+#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/page-ip4.c:962
+#: ../src/connection-editor/page-ip6.c:928
msgid "Gateway"
msgstr "ゲートウェイ"
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:813
+#: ../src/connection-editor/ip6-routes-dialog.c:755
msgid "Metric"
msgstr "メトリック"
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:721
+#: ../src/connection-editor/page-ip6.c:911
msgid "Prefix"
msgstr "プレフィックス"
-#: ../src/connection-editor/new-connection.c:100
+#: ../src/connection-editor/new-connection.c:101
#: ../src/connection-editor/page-ethernet.c:251
#: ../src/libnm-gtk/nm-ui-utils.c:323
#, fuzzy
msgid "Ethernet"
msgstr "自動イーサãƒãƒƒãƒˆ"
-#: ../src/connection-editor/new-connection.c:106
-#: ../src/connection-editor/page-wifi.c:470 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/new-connection.c:107
+#: ../src/connection-editor/page-wifi.c:483 ../src/libnm-gtk/nm-ui-utils.c:325
msgid "Wi-Fi"
msgstr ""
-#: ../src/connection-editor/new-connection.c:118
+#: ../src/connection-editor/new-connection.c:119
#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:75
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
msgid "WiMAX"
msgstr "WiMAX"
-#: ../src/connection-editor/new-connection.c:124
+#: ../src/connection-editor/new-connection.c:125
#: ../src/connection-editor/page-dsl.c:141
msgid "DSL"
msgstr "DSL"
-#: ../src/connection-editor/new-connection.c:130
+#: ../src/connection-editor/new-connection.c:131
#: ../src/connection-editor/page-infiniband.c:168
#: ../src/libnm-gtk/nm-ui-utils.c:335
msgid "InfiniBand"
msgstr ""
-#: ../src/connection-editor/new-connection.c:136
-#: ../src/connection-editor/page-bond.c:747 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/connection-editor/new-connection.c:137
+#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:559
msgid "Bond"
msgstr ""
-#: ../src/connection-editor/new-connection.c:142
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/page-bridge.c:212
+#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+msgid "Bridge"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:149
+#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
+#: ../src/libnm-gtk/nm-ui-utils.c:563
msgid "VLAN"
msgstr ""
-#: ../src/connection-editor/new-connection.c:155
-#: ../src/connection-editor/new-connection.c:295
+#: ../src/connection-editor/new-connection.c:162
+#: ../src/connection-editor/new-connection.c:302
#: ../src/connection-editor/page-vpn.c:113
msgid "VPN"
msgstr "VPN"
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/new-connection.c:252
#, fuzzy
msgid "Hardware"
msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ãƒ‰ãƒ¬ã‚¹:"
-#: ../src/connection-editor/new-connection.c:265
+#: ../src/connection-editor/new-connection.c:272
msgid "Virtual"
msgstr ""
-#: ../src/connection-editor/new-connection.c:333
-#: ../src/connection-editor/new-connection.c:335
+#: ../src/connection-editor/new-connection.c:340
+#: ../src/connection-editor/new-connection.c:342
#, fuzzy
msgid "Import a saved VPN configuration..."
msgstr "VPN 接続をエクスãƒãƒ¼ãƒˆã™ã‚‹..."
-#: ../src/connection-editor/new-connection.c:364
+#: ../src/connection-editor/new-connection.c:371
msgid "The connection editor dialog could not be initialized due to an unknown error."
msgstr "接続エディターã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã¯ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã«åˆæœŸåŒ–出æ¥ã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../src/connection-editor/new-connection.c:373
+#: ../src/connection-editor/new-connection.c:380
msgid "Could not create new connection"
msgstr "æ–°ã—ã„接続を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/connection-editor/new-connection.c:508
+#: ../src/connection-editor/new-connection.c:515
msgid "Connection delete failed"
msgstr "接続ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ../src/connection-editor/new-connection.c:555
+#: ../src/connection-editor/new-connection.c:562
#, c-format
msgid "Are you sure you wish to delete the connection %s?"
msgstr "本当㫠接続 %s を削除ã—ãŸã„ã®ã§ã™ã‹ ?"
-#: ../src/connection-editor/nm-connection-editor.c:111
+#: ../src/connection-editor/nm-connection-editor.c:118
#, c-format
msgid "Editing %s"
msgstr "%s ã®ç·¨é›†"
-#: ../src/connection-editor/nm-connection-editor.c:115
+#: ../src/connection-editor/nm-connection-editor.c:122
msgid "Editing un-named connection"
msgstr "ç„¡åã®æŽ¥ç¶šã‚’編集"
-#: ../src/connection-editor/nm-connection-editor.c:302
+#: ../src/connection-editor/nm-connection-editor.c:282
msgid "The connection editor could not find some required resources (the .ui file was not found)."
msgstr "接続エディターã¯å¿…è¦ãªã„ãã¤ã‹ã®ãƒªã‚½ãƒ¼ã‚¹ã‚’ã¿ã¤ã‘られã¾ã›ã‚“ã§ã—㟠(.ui ファイルãŒã¿ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ)。"
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:408
msgid "_Save"
msgstr "ä¿å˜(_S)"
-#: ../src/connection-editor/nm-connection-editor.c:430
+#: ../src/connection-editor/nm-connection-editor.c:409
msgid "Save any changes made to this connection."
msgstr "ã“ã®æŽ¥ç¶šã«å¯¾ã—ã¦ã®å¤‰æ›´ã‚’ã™ã¹ã¦ä¿å˜ã—ã¾ã™ã€‚"
-#: ../src/connection-editor/nm-connection-editor.c:431
+#: ../src/connection-editor/nm-connection-editor.c:410
msgid "_Save..."
msgstr "ä¿å˜(_S)..."
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:411
msgid "Authenticate to save this connection for all users of this machine."
msgstr "ã“ã®ãƒžã‚·ãƒ³ã®ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ç”¨æŽ¥ç¶šã®ä¿å˜ã‚’èªè¨¼ã™ã‚‹ã€‚"
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: ../src/connection-editor/nm-connection-editor.c:427
#, fuzzy
msgid "Could not create connection"
msgstr "æ–°ã—ã„接続を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: ../src/connection-editor/nm-connection-editor.c:427
msgid "Could not edit connection"
msgstr "接続を編集ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:429
#, fuzzy
msgid "Unknown error creating connection editor dialog."
msgstr "接続エディターダイアãƒã‚°ã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚"
-#: ../src/connection-editor/nm-connection-editor.c:556
+#: ../src/connection-editor/nm-connection-editor.c:536
msgid "Error saving connection"
msgstr "æŽ¥ç¶šæƒ…å ±ã®ä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼"
-#: ../src/connection-editor/nm-connection-editor.c:557
+#: ../src/connection-editor/nm-connection-editor.c:537
#, c-format
msgid "The property '%s' / '%s' is invalid: %d"
msgstr "プãƒãƒ‘ティ '%s' / '%s' ã¯ç„¡åŠ¹ã§ã™: %d"
-#: ../src/connection-editor/nm-connection-editor.c:659
+#: ../src/connection-editor/nm-connection-editor.c:631
msgid "Error initializing editor"
msgstr "エディターã®åˆæœŸåŒ–ä¸ã«ã‚¨ãƒ©ãƒ¼ã§ã™"
-#: ../src/connection-editor/nm-connection-editor.c:973
+#: ../src/connection-editor/nm-connection-editor.c:952
msgid "Connection add failed"
msgstr "接続ã®è¿½åŠ ã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -1854,14 +1925,6 @@ msgid "Connection _name:"
msgstr "接続å(_N):"
#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connect _automatically"
-msgstr "自動接続ã™ã‚‹(_A) "
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "A_vailable to all users"
-msgstr "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«åˆ©ç”¨å¯èƒ½(_V)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
#, fuzzy
msgid "_Export..."
msgstr "エクスãƒãƒ¼ãƒˆ(_X)"
@@ -1906,52 +1969,52 @@ msgid "%d year ago"
msgid_plural "%d years ago"
msgstr[0] "%d å¹´å‰"
-#: ../src/connection-editor/nm-connection-list.c:628
+#: ../src/connection-editor/nm-connection-list.c:631
msgid "Name"
msgstr "åå‰"
-#: ../src/connection-editor/nm-connection-list.c:641
+#: ../src/connection-editor/nm-connection-list.c:644
msgid "Last Used"
msgstr "å‰å›žã®ä½¿ç”¨"
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:686
msgid "Edit the selected connection"
msgstr "é¸æŠžã—ãŸæŽ¥ç¶šã‚’編集ã™ã‚‹"
-#: ../src/connection-editor/nm-connection-list.c:684
+#: ../src/connection-editor/nm-connection-list.c:687
msgid "_Edit..."
msgstr "編集(_E)..."
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:688
msgid "Authenticate to edit the selected connection"
msgstr "é¸æŠžã—ãŸæŽ¥ç¶šã®ç·¨é›†ã‚’èªè¨¼ã™ã‚‹"
-#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:703
msgid "Delete the selected connection"
msgstr "é¸æŠžã—ãŸæŽ¥ç¶šã‚’削除ã™ã‚‹"
-#: ../src/connection-editor/nm-connection-list.c:701
+#: ../src/connection-editor/nm-connection-list.c:704
msgid "_Delete..."
msgstr "削除(_D)..."
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/nm-connection-list.c:705
msgid "Authenticate to delete the selected connection"
msgstr "é¸æŠžã—ãŸæŽ¥ç¶šã®å‰Šé™¤ã‚’èªè¨¼ã™ã‚‹"
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:942
msgid "Error creating connection"
msgstr "接続ã®ä½œæˆä¸ã«ã‚¨ãƒ©ãƒ¼"
-#: ../src/connection-editor/nm-connection-list.c:940
+#: ../src/connection-editor/nm-connection-list.c:943
#, c-format
msgid "Don't know how to create '%s' connections"
msgstr "接続 '%s' ã®ä½œæˆæ–¹æ³•ãŒã‚ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:998
msgid "Error editing connection"
msgstr "接続を編集ã—よã†ã¨ã—ã¦ã‚¨ãƒ©ãƒ¼"
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:999
#, c-format
msgid "Did not find a connection with UUID '%s'"
msgstr "UUID '%s' ã®æŽ¥ç¶šã‚’発見ã§ãã¾ã›ã‚“ã§ã—ãŸ"
@@ -1969,21 +2032,38 @@ msgstr "WiFi ã‚»ã‚ュリティユーザーインターフェースをèªã¿è¾¼
msgid "Use 802.1_X security for this connection"
msgstr "ã“ã®æŽ¥ç¶šã« 802.1x ã‚»ã‚ュリティを使用ã™ã‚‹(_X)"
-#: ../src/connection-editor/page-bond.c:559
-#, c-format
-msgid "%s slave %d"
-msgstr ""
-
-#: ../src/connection-editor/page-bond.c:750
+#: ../src/connection-editor/page-bond.c:422
#, fuzzy
msgid "Could not load bond user interface."
msgstr "有線ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。"
-#: ../src/connection-editor/page-bond.c:910
+#: ../src/connection-editor/page-bond.c:561
#, fuzzy, c-format
msgid "Bond connection %d"
msgstr "有線接続 %d"
+#: ../src/connection-editor/page-bridge.c:215
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "有線ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。"
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "有線接続 %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:117
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "有線ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。"
+
#: ../src/connection-editor/page-dsl.c:143
msgid "Could not load DSL user interface."
msgstr "DSL ユーザーインターフェースをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
@@ -2010,6 +2090,27 @@ msgstr "有線ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。
msgid "Ethernet connection %d"
msgstr "有線接続 %d"
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:59
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../src/connection-editor/page-general.c:60
+msgid "The zone defines the trust level of the connection. Default is not a regular zone, selecting it
results in the use of the default zone set in the firewall. Only usable if firewalld is active."
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:61
+#, fuzzy
+#| msgid "NetworkManager is not running..."
+msgid "FirewallD is not running."
+msgstr "NetworkManager ã¯å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã›ã‚“..."
+
+#: ../src/connection-editor/page-general.c:348
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "有線ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。"
+
#: ../src/connection-editor/page-infiniband.c:171
#, fuzzy
msgid "Could not load InfiniBand user interface."
@@ -2070,23 +2171,23 @@ msgstr "無効ã«ãªã£ã¦ã„ã¾ã™"
#: ../src/connection-editor/page-ip4.c:297
#: ../src/connection-editor/page-ip6.c:296
msgid "Additional DNS ser_vers:"
-msgstr "è¿½åŠ ã® DNS サーãƒãƒ¼(_D):"
+msgstr "è¿½åŠ ã® DNS サーãƒãƒ¼(_V):"
#: ../src/connection-editor/page-ip4.c:306
#: ../src/connection-editor/page-ip6.c:305
msgid "Additional s_earch domains:"
msgstr "è¿½åŠ ã®æ¤œç´¢ãƒ‰ãƒ¡ã‚¤ãƒ³(_E):"
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:860
#, c-format
msgid "Editing IPv4 routes for %s"
msgstr "%s 用㮠IPv4 ルートを編集"
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1011
msgid "IPv4 Settings"
msgstr "IPv4 ã®ã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°"
-#: ../src/connection-editor/page-ip4.c:996
+#: ../src/connection-editor/page-ip4.c:1013
msgid "Could not load IPv4 user interface."
msgstr "IPv4 ユーザーインターフェースをèªã¿è¾¼ã‚ã¾ã›ã‚“。"
@@ -2103,19 +2204,24 @@ msgstr "無視ã™ã‚‹"
msgid "Automatic, DHCP only"
msgstr "自動ã€DHCP ã®ã¿"
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:826
#, c-format
msgid "Editing IPv6 routes for %s"
msgstr "%s 用㮠IPv6 ルートを編集"
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:975
msgid "IPv6 Settings"
msgstr "IPv6 ã®ã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°"
-#: ../src/connection-editor/page-ip6.c:960
+#: ../src/connection-editor/page-ip6.c:977
msgid "Could not load IPv6 user interface."
msgstr "IPv6 ユーザーインターフェースをèªã¿è¾¼ã‚ã¾ã›ã‚“。"
+#: ../src/connection-editor/page-master.c:284
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
#: ../src/connection-editor/page-mobile.c:391
msgid "Could not load mobile broadband user interface."
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“。"
@@ -2141,47 +2247,57 @@ msgstr "ç§ã®ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã¯ GSM ベースã®æŠ€è¡“ (例ãˆã°ã€ GPRS, E
msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
msgstr "ç§ã®ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã¯ CDMA ベースã®æŠ€è¡“ (例ãˆã°ã€1xRTT, EVDO)を使用ã—ã¾ã™(_D)"
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:270
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:268
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:137
msgid "EAP"
msgstr "EAP"
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:138
#: ../src/wireless-security/eap-method-ttls.c:230
msgid "PAP"
msgstr "PAP"
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:139
#: ../src/wireless-security/eap-method-ttls.c:280
msgid "CHAP"
msgstr "CHAP"
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:140
#: ../src/wireless-security/eap-method-fast.c:277
#: ../src/wireless-security/eap-method-peap.c:246
#: ../src/wireless-security/eap-method-ttls.c:263
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
-#: ../src/connection-editor/page-ppp.c:138
+#: ../src/connection-editor/page-ppp.c:141
#: ../src/wireless-security/eap-method-ttls.c:247
msgid "MSCHAP"
msgstr "MSCHAP"
#. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
msgid "none"
msgstr "ãªã—"
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
#, c-format
msgid "Editing PPP authentication methods for %s"
msgstr "%s 用㮠PPP èªè¨¼æ–¹æ³•ã‚’編集"
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:287
msgid "PPP Settings"
msgstr "PPP ã®è¨å®š"
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:289
msgid "Could not load PPP user interface."
msgstr "PPP ユーザーインターフェースをèªã¿è¾¼ã‚ã¾ã›ã‚“。"
@@ -2245,12 +2361,12 @@ msgstr "デフォルト"
msgid "%u (%u MHz)"
msgstr "%u (%u MHz)"
-#: ../src/connection-editor/page-wifi.c:472
+#: ../src/connection-editor/page-wifi.c:485
#, fuzzy
msgid "Could not load Wi-Fi user interface."
msgstr "WiFi ユーザーインターフェースをãƒãƒ¼ãƒ‰å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ../src/connection-editor/page-wifi.c:649
+#: ../src/connection-editor/page-wifi.c:663
#, fuzzy, c-format
msgid "Wi-Fi connection %d"
msgstr "有線接続 %d"
@@ -2386,60 +2502,66 @@ msgstr "モãƒã‚¤ãƒ«é›»è©±ã‚’ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ‡ãƒã‚¤ã‚¹ (PAN/NAP) ã¨ã—ã¦
msgid "Access the Internet using your mobile phone (DUN)"
msgstr "モãƒã‚¤ãƒ«é›»è©± (DUN) を使用ã—ã¦ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹"
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
+#: ../src/gnome-bluetooth/nma-bt-device.c:336
#, c-format
msgid "Error: %s"
msgstr "エラー: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
+#: ../src/gnome-bluetooth/nma-bt-device.c:443
#, c-format
msgid "Failed to create DUN connection: %s"
msgstr "DUN 接続ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
+#: ../src/gnome-bluetooth/nma-bt-device.c:445
+#: ../src/gnome-bluetooth/nma-bt-device.c:985
msgid "Your phone is now ready to use!"
msgstr "ã”使用ã®é›»è©±ã¯ä»Šã€ä½¿ç”¨æº–å‚™ãŒã§ãã¾ã—ãŸ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
+#: ../src/gnome-bluetooth/nma-bt-device.c:468
msgid "Mobile wizard was canceled"
msgstr "モãƒã‚¤ãƒ«ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯å–り消ã•ã‚Œã¾ã—ãŸ"
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
+#: ../src/gnome-bluetooth/nma-bt-device.c:477
msgid "Unknown phone device type (not GSM or CDMA)"
msgstr "ä¸æ˜Žãªé›»è©±ã®ãƒ‡ãƒã‚¤ã‚¹ã‚¿ã‚¤ãƒ—ã§ã™ (GSM ã‚„ CDMA ã§ã¯ãªã„)"
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
+#: ../src/gnome-bluetooth/nma-bt-device.c:513
msgid "unknown modem type."
msgstr "ä¸æ˜Žãªãƒ¢ãƒ‡ãƒ ã®ã‚¿ã‚¤ãƒ—ã§ã™ã€‚"
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
+#: ../src/gnome-bluetooth/nma-bt-device.c:733
+#: ../src/gnome-bluetooth/nma-bt-device.c:739
msgid "failed to connect to the phone."
msgstr "電話ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
+#: ../src/gnome-bluetooth/nma-bt-device.c:770
msgid "unexpectedly disconnected from the phone."
msgstr "電話ãŒä¸æ„ã«åˆ‡æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
+#: ../src/gnome-bluetooth/nma-bt-device.c:780
msgid "timed out detecting phone details."
msgstr "電話ã®è©³ç´°æ¤œå‡ºãŒã‚¿ã‚¤ãƒ アウトã§ã™ã€‚"
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
+#: ../src/gnome-bluetooth/nma-bt-device.c:816
msgid "Detecting phone configuration..."
msgstr "電話ã®è¨å®šã‚’検出ä¸ã§ã™..."
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gnome-bluetooth/nma-bt-device.c:869
+#, fuzzy
+#| msgid "NetworkManager is not running..."
+msgid "ModemManager is not running"
+msgstr "NetworkManager ã¯å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã›ã‚“..."
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:946
msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
msgstr "デフォルト㮠Bluetooth アダプターを有効ã«ã—ã¦ã‹ã‚‰å¾Œã«ã€ãƒ€ã‚¤ã‚¢ãƒ«ã‚¢ãƒƒãƒ—ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’セットアップã—ã¦ãã ã•ã„。"
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
+#: ../src/gnome-bluetooth/nma-bt-device.c:983
#, c-format
msgid "Failed to create PAN connection: %s"
msgstr "PAN 接続ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
+#: ../src/gnome-bluetooth/nma-bt-device.c:1004
#, c-format
msgid "%s Network"
msgstr "%s ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
@@ -2460,46 +2582,46 @@ msgstr "æŽ¥ç¶šæƒ…å ±"
msgid "Active Network Connections"
msgstr "有効ãªãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:207
+#: ../src/libnm-gtk/nm-mobile-wizard.c:208
msgid "Your mobile broadband connection is configured with the following settings:"
msgstr "ã”使用ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶šã¯ä»¥ä¸‹ã®ã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°ã§è¨å®šã•ã‚Œã¦ã„ã¾ã™:"
#. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:214
+#: ../src/libnm-gtk/nm-mobile-wizard.c:215
msgid "Your Device:"
msgstr "使用デãƒã‚¤ã‚¹:"
#. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:225
+#: ../src/libnm-gtk/nm-mobile-wizard.c:226
msgid "Your Provider:"
msgstr "使用プãƒãƒã‚¤ãƒ€ãƒ¼:"
#. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:236
+#: ../src/libnm-gtk/nm-mobile-wizard.c:237
msgid "Your Plan:"
msgstr "使用プラン:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
msgid "A connection will now be made to your mobile broadband provider using the settings you selected. If
the connection fails or you cannot access network resources, double-check your settings. To modify your
mobile broadband connection settings, choose \"Network Connections\" from the System >> Preferences menu."
msgstr "é¸æŠžã—ãŸã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°ã‚’使用ã—ã¦ã”使用ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã¸ 接続を今ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚接続ãŒå¤±æ•—ã—ãŸã‚Šã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒªã‚½ãƒ¼ã‚¹ã«ã‚¢ã‚¯ã‚»ã‚¹ãŒ
ã§ããªã„å ´åˆã¯ã€ãã®ã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°ã‚’ダブルクリックã—ã¦ãã ã•ã„。モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ セッティングを変更ã™ã‚‹ã«ã¯ã€ã‚·ã‚¹ãƒ†ãƒ >> 個人è¨å®šãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ \"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶š\"ã‚’ é¸æŠžã—ã¾ã™ã€‚"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:273
+#: ../src/libnm-gtk/nm-mobile-wizard.c:274
msgid "Confirm Mobile Broadband Settings"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ã‚»ãƒƒãƒ†ã‚£ãƒ³ã‚°ã‚’確定ã™ã‚‹"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:337
+#: ../src/libnm-gtk/nm-mobile-wizard.c:338
msgid "Unlisted"
msgstr "一覧ã«ç„¡ã„"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:492
+#: ../src/libnm-gtk/nm-mobile-wizard.c:493
msgid "_Select your plan:"
msgstr "使用プランã®é¸æŠž(_S):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnm-gtk/nm-mobile-wizard.c:517
msgid "Selected plan _APN (Access Point Name):"
msgstr "é¸æŠžã—㟠APN (Access Point Name)(_A):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:540
+#: ../src/libnm-gtk/nm-mobile-wizard.c:541
msgid ""
"Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent
connectivity.\n"
"\n"
@@ -2509,102 +2631,138 @@ msgstr ""
"\n"
"ã”自分ã®ãƒ—ランãŒä¸æ˜Žãªå ´åˆã¯ã€ãã®ãƒ—ラン㮠APN ã«ã¤ã„ã¦ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã«ãŠå°‹ããã ã•ã„。"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:547
+#: ../src/libnm-gtk/nm-mobile-wizard.c:548
msgid "Choose your Billing Plan"
msgstr "使用ã™ã‚‹è«‹æ±‚書プランをé¸æŠž"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:596
+#: ../src/libnm-gtk/nm-mobile-wizard.c:597
msgid "My plan is not listed..."
msgstr "ç§ã®ãƒ—ランã¯ä¸€è¦§ã«æœ‰ã‚Šã¾ã›ã‚“..."
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:754
msgid "Select your provider from a _list:"
msgstr "ã”使用ã®ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã‚’一覧ã‹ã‚‰é¸æŠž(_L):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:766
+#: ../src/libnm-gtk/nm-mobile-wizard.c:767
msgid "Provider"
msgstr "プãƒãƒã‚¤ãƒ€ãƒ¼"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
msgid "I can't find my provider and I wish to enter it _manually:"
msgstr "プãƒãƒã‚¤ãƒ€ãƒ¼ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ããªã„ã®ã§æ‰‹å‹•ã§å…¥åŠ›ã—ã¾ã™(_M):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../src/libnm-gtk/nm-mobile-wizard.c:803
msgid "Provider:"
msgstr "プãƒãƒã‚¤ãƒ€ãƒ¼:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:826
+#: ../src/libnm-gtk/nm-mobile-wizard.c:827
msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
msgstr "ç§ã®ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã¯ GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用ã—ã¾ã™"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:832
+#: ../src/libnm-gtk/nm-mobile-wizard.c:833
msgid "My provider uses CDMA technology (1xRTT, EVDO)"
msgstr "ç§ã®ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼ã¯ CDMA 技術 (1xRTT, EVDO) を使用ã—ã¾ã™"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:843
+#: ../src/libnm-gtk/nm-mobile-wizard.c:844
msgid "Choose your Provider"
msgstr "使用プãƒãƒã‚¤ãƒ€ãƒ¼ã‚’é¸æŠž"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1094
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
msgid "Country or Region List:"
msgstr "国や地域ã®ä¸€è¦§:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1106
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
msgid "Country or region"
msgstr "国や地域"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
msgid "My country is not listed"
msgstr "ç§ã®å›½ã¯ä¸€è¦§ã«æœ‰ã‚Šã¾ã›ã‚“"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1159
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
msgid "Choose your Provider's Country or Region"
msgstr "使用プãƒãƒã‚¤ãƒ€ãƒ¼ã®å›½ã‚„地域をé¸æŠž"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1213
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
msgid "Installed GSM device"
msgstr "GSM デãƒã‚¤ã‚¹ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
msgid "Installed CDMA device"
msgstr "CDMA デãƒã‚¤ã‚¹ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1388
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
msgstr "ã“ã®ã‚¢ã‚·ã‚¹ã‚¿ãƒ³ãƒˆã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒç°¡å˜ã«æºå¸¯ (3G) ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶šãŒã§ãるよã†ã«æ‰‹ä¼ã„ã¾ã™ã€‚"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
msgid "You will need the following information:"
msgstr "以下ã®æƒ…å ±ãŒå¿…è¦ã§ã™:"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
msgid "Your broadband provider's name"
msgstr "使用ã™ã‚‹ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ—ãƒãƒã‚¤ãƒ€ãƒ¼å"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
msgid "Your broadband billing plan name"
msgstr "使用ã™ã‚‹ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰è«‹æ±‚書プランå"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
msgstr "(一部ã®ã‚±ãƒ¼ã‚¹ã§) ブãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰è«‹æ±‚書プラン APN (Access Point Name)"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1447
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
msgid "Create a connection for _this mobile broadband device:"
msgstr "ã“ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ç”¨ã®æŽ¥ç¶šã‚’作æˆ(_T):"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
msgid "Any device"
msgstr "ã™ã¹ã¦ã®ãƒ‡ãƒã‚¤ã‚¹"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1475
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
msgid "Set up a Mobile Broadband Connection"
msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶šã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—"
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1643
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
msgid "New Mobile Broadband Connection"
msgstr "æ–°è¦ã®ãƒ¢ãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰æŽ¥ç¶š"
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+msgid "Wired"
+msgstr "有線"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:405
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:407
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
#: ../src/libnm-gtk/nm-wifi-dialog.c:437
msgid "New..."
msgstr "æ–°è¦..."
@@ -2658,42 +2816,6 @@ msgstr "éžè¡¨ç¤ºç„¡ç·šãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
msgstr "接続ã—ãŸã„ç„¡ç·šãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®åå‰ã¨ã‚»ã‚ュリティ詳細を入力ã—ã¦ãã ã•ã„。"
-#: ../src/libnm-gtk/nm-ui-utils.c:304
-msgid "Wired"
-msgstr "有線"
-
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr ""
-
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr ""
-
-#: ../src/libnm-gtk/nm-ui-utils.c:341
-msgid "ADSL"
-msgstr ""
-
-#: ../src/libnm-gtk/nm-ui-utils.c:376
-msgid "PCI"
-msgstr ""
-
-#: ../src/libnm-gtk/nm-ui-utils.c:378
-msgid "USB"
-msgstr ""
-
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:452 ../src/libnm-gtk/nm-ui-utils.c:470
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr ""
-
#: ../src/libnm-gtk/wifi.ui.h:2
#, fuzzy
msgid "Wi-Fi _security:"
@@ -2720,92 +2842,101 @@ msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ 㯠NetworkManager (http://projects.gnome.org/Netwo
msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
msgstr "コマンドラインã§ã®åˆ©ç”¨ã¯æ„図ã•ã‚Œã¦ã„ã¾ã›ã‚“ãŒã€ãã®ä»£ã‚ã‚Šã« GNOME デスクトップ環境ã§å®Ÿè¡Œã—ã¾ã™ã€‚"
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
msgid "EVDO"
msgstr "EVDO"
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
msgid "GPRS"
msgstr "GPRS"
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
msgid "EDGE"
msgstr "EDGE"
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
msgid "UMTS"
msgstr "UMTS"
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
msgid "HSDPA"
msgstr "HSDPA"
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
msgid "HSUPA"
msgstr "HSUPA"
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
msgid "HSPA"
msgstr "HSPA"
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:72
#, fuzzy
msgid "HSPA+"
msgstr "HSPA"
-#: ../src/mb-menu-item.c:77
+#: ../src/mb-menu-item.c:76
msgid "LTE"
msgstr ""
-#: ../src/mb-menu-item.c:113
+#: ../src/mb-menu-item.c:112
msgid "not enabled"
msgstr "有効ã«ãªã£ã¦ã„ã¾ã›ã‚“"
-#: ../src/mb-menu-item.c:119
+#: ../src/mb-menu-item.c:118
msgid "not registered"
msgstr "登録ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/mb-menu-item.c:137
+#: ../src/mb-menu-item.c:136
#, c-format
msgid "Home network (%s)"
msgstr "ホームãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (%s)"
-#: ../src/mb-menu-item.c:139
+#: ../src/mb-menu-item.c:138
#, c-format
msgid "Home network"
msgstr "ホームãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: ../src/mb-menu-item.c:147
+#: ../src/mb-menu-item.c:146
msgid "searching"
msgstr "検索ä¸"
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:149
msgid "registration denied"
msgstr "登録ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸ"
-#: ../src/mb-menu-item.c:155 ../src/mb-menu-item.c:161
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
#, c-format
msgid "%s (%s roaming)"
msgstr "%s (%s ãƒãƒ¼ãƒŸãƒ³ã‚°)"
-#: ../src/mb-menu-item.c:157 ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
#, c-format
msgid "%s (roaming)"
msgstr "%s (ãƒãƒ¼ãƒŸãƒ³ã‚°)"
-#: ../src/mb-menu-item.c:166
+#: ../src/mb-menu-item.c:165
#, c-format
msgid "Roaming network (%s)"
msgstr "ãƒãƒ¼ãƒŸãƒ³ã‚°ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (%s)"
-#: ../src/mb-menu-item.c:168
+#: ../src/mb-menu-item.c:167
#, c-format
msgid "Roaming network"
msgstr "ãƒãƒ¼ãƒŸãƒ³ã‚°ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "デフォルト"
+#: ../src/mobile-helpers.c:317
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "'%2$s' 上㮠SIM カード '%1$s' 㮠PIN コード"
+
+#: ../src/mobile-helpers.c:450
+msgid "PIN code required"
+msgstr "PIN コードãŒå¿…è¦ã§ã™"
+
+#: ../src/mobile-helpers.c:458
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "モãƒã‚¤ãƒ«ãƒ–ãƒãƒ¼ãƒ‰ãƒãƒ³ãƒ‰ãƒ‡ãƒã‚¤ã‚¹ã«ã¯ PIN コードãŒå¿…è¦ã§ã™"
#. The %s is a mobile provider name, eg "T-Mobile"
#: ../src/utils/utils.c:174
@@ -2890,7 +3021,7 @@ msgid "MD5"
msgstr "MD5"
#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
+#: ../src/wireless-security/eap-method-tls.c:434
#: ../src/wireless-security/eap-method-ttls.c:350
msgid "Choose a Certificate Authority certificate..."
msgstr "証明書権é™(CA)証明書をé¸æŠž..."
@@ -2917,11 +3048,11 @@ msgstr "PEAP ãƒãƒ¼ã‚¸ãƒ§ãƒ³(_V):"
msgid "As_k for this password every time"
msgstr "毎回ã“ã®ãƒ‘スワードをè¦æ±‚ã™ã‚‹(_K)"
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:260
msgid "Unencrypted private keys are insecure"
msgstr "æš—å·åŒ–ã®ãªã„プライベートã‚ーã¯å®‰å…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:263
msgid ""
"The selected private key does not appear to be protected by a password. This could allow your security
credentials to be compromised. Please select a password-protected private key.\n"
"\n"
@@ -2931,11 +3062,11 @@ msgstr ""
"\n"
"(プライベートã‚ー㯠openssl を使用ã—ã¦ãƒ‘スワードä¿è·ãŒã§ãã¾ã™)"
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:428
msgid "Choose your personal certificate..."
msgstr "個人用証明書をé¸æŠžã™ã‚‹..."
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:440
msgid "Choose your private key..."
msgstr "プライベートã‚ーをé¸æŠžã™ã‚‹..."
@@ -3027,6 +3158,12 @@ msgstr "ã‚ーを表示(_W)"
msgid "WEP inde_x:"
msgstr "WEP インデックス(_X):"
+#~ msgid "Connect _automatically"
+#~ msgstr "自動接続ã™ã‚‹(_A) "
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«åˆ©ç”¨å¯èƒ½(_V)"
+
#~ msgid "Wireless Networks (%s)"
#~ msgstr "ç„¡ç·šãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (%s)"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]