diff --git a/po/fa.po b/po/fa.po
index 9ef8c6daf..ac844f5c3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/issues\n"
-"POT-Creation-Date: 2019-10-14 20:20+0000\n"
-"PO-Revision-Date: 2019-10-19 15:02+0000\n"
+"POT-Creation-Date: 2019-10-28 21:19+0000\n"
+"PO-Revision-Date: 2019-11-03 12:32+0000\n"
 "Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -27,69 +27,69 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 2.2.4\n"
 
-#: panels/applications/cc-applications-panel.c:565
+#: panels/applications/cc-applications-panel.c:564
 msgid "System Bus"
 msgstr "گذرگاه سامانه"
 
-#: panels/applications/cc-applications-panel.c:565
-#: panels/applications/cc-applications-panel.c:567
-#: panels/applications/cc-applications-panel.c:580
-#: panels/applications/cc-applications-panel.c:585
+#: panels/applications/cc-applications-panel.c:564
+#: panels/applications/cc-applications-panel.c:566
+#: panels/applications/cc-applications-panel.c:579
+#: panels/applications/cc-applications-panel.c:584
 msgid "Full access"
 msgstr "دسترسی کامل"
 
-#: panels/applications/cc-applications-panel.c:567
+#: panels/applications/cc-applications-panel.c:566
 msgid "Session Bus"
 msgstr "گذرگاه نشست"
 
-#: panels/applications/cc-applications-panel.c:571
+#: panels/applications/cc-applications-panel.c:570
 #: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
 #: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
 #: shell/cc-window.c:281
 msgid "Devices"
 msgstr "دستگاه‌ها"
 
-#: panels/applications/cc-applications-panel.c:571
+#: panels/applications/cc-applications-panel.c:570
 msgid "Full access to /dev"
 msgstr "دسترسی کامل به ‪/dev"
 
-#: panels/applications/cc-applications-panel.c:575
+#: panels/applications/cc-applications-panel.c:574
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:253
 msgid "Network"
 msgstr "شبکه"
 
-#: panels/applications/cc-applications-panel.c:575
+#: panels/applications/cc-applications-panel.c:574
 msgid "Has network access"
 msgstr "دسترسی شبکه دارد"
 
-#: panels/applications/cc-applications-panel.c:580
-#: panels/applications/cc-applications-panel.c:582
+#: panels/applications/cc-applications-panel.c:579
+#: panels/applications/cc-applications-panel.c:581
 #: panels/search/cc-search-locations-dialog.c:293
 msgid "Home"
 msgstr "خانه"
 
-#: panels/applications/cc-applications-panel.c:582
-#: panels/applications/cc-applications-panel.c:587
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:586
 msgid "Read-only"
 msgstr "فقط‌خواندنی"
 
-#: panels/applications/cc-applications-panel.c:585
-#: panels/applications/cc-applications-panel.c:587
+#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:586
 msgid "File System"
 msgstr "سامانه پرونده"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:590
 #: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:285 shell/cc-window.c:965
 #: shell/cc-window.ui:125 shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:590
 msgid "Can change settings"
 msgstr "می‌تواند تنظیمات را تغییر دهد"
 
-#: panels/applications/cc-applications-panel.c:595
+#: panels/applications/cc-applications-panel.c:594
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you are "
@@ -98,66 +98,66 @@ msgstr ""
 "%s این اجازه‌ها را به صورت توکار دارد و نمی‌توان تغییرش داد. در صورتی که نگران این "
 "اجازه‌هایید، حذف این برنامه را در نظر بگیرید."
 
-#: panels/applications/cc-applications-panel.c:737
+#: panels/applications/cc-applications-panel.c:736
 msgid "Web Links"
 msgstr "پیوندهای وب"
 
-#: panels/applications/cc-applications-panel.c:747
+#: panels/applications/cc-applications-panel.c:746
 msgid "Git Links"
 msgstr "پیوندهای گیت"
 
-#: panels/applications/cc-applications-panel.c:753
+#: panels/applications/cc-applications-panel.c:752
 #, c-format
 msgid "%s Links"
 msgstr "پیوندهای %s"
 
-#: panels/applications/cc-applications-panel.c:761
-#: panels/applications/cc-applications-panel.c:797
+#: panels/applications/cc-applications-panel.c:760
+#: panels/applications/cc-applications-panel.c:796
 msgid "Unset"
 msgstr "ناتنظیم"
 
-#: panels/applications/cc-applications-panel.c:852
+#: panels/applications/cc-applications-panel.c:851
 msgid "Links"
 msgstr "پیوندها"
 
-#: panels/applications/cc-applications-panel.c:860
+#: panels/applications/cc-applications-panel.c:859
 msgid "Hypertext Files"
 msgstr "پرونده‌های ابرمتنی"
 
-#: panels/applications/cc-applications-panel.c:874
+#: panels/applications/cc-applications-panel.c:873
 msgid "Text Files"
 msgstr "پرونده‌های متنی"
 
-#: panels/applications/cc-applications-panel.c:888
+#: panels/applications/cc-applications-panel.c:887
 msgid "Image Files"
 msgstr "پرونده‌های تصویری"
 
-#: panels/applications/cc-applications-panel.c:904
+#: panels/applications/cc-applications-panel.c:903
 msgid "Font Files"
 msgstr "پرونده‌های قلم"
 
-#: panels/applications/cc-applications-panel.c:965
+#: panels/applications/cc-applications-panel.c:964
 msgid "Archive Files"
 msgstr "پرونده‌های بایگانی"
 
-#: panels/applications/cc-applications-panel.c:985
+#: panels/applications/cc-applications-panel.c:984
 msgid "Package Files"
 msgstr "پرونده‌های بسته"
 
-#: panels/applications/cc-applications-panel.c:1008
+#: panels/applications/cc-applications-panel.c:1007
 msgid "Audio Files"
 msgstr "پرونده‌های صوتی"
 
-#: panels/applications/cc-applications-panel.c:1025
+#: panels/applications/cc-applications-panel.c:1024
 msgid "Video Files"
 msgstr "پرونده‌های ویدیویی"
 
-#: panels/applications/cc-applications-panel.c:1033
+#: panels/applications/cc-applications-panel.c:1032
 msgid "Other Files"
 msgstr "دیگر پرونده‌ها"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1371
+#: panels/applications/cc-applications-panel.c:1370
 #: panels/applications/cc-applications-panel.ui:406
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
@@ -204,7 +204,6 @@ msgstr "دوربین"
 #: panels/keyboard/cc-keyboard-option.c:259 panels/keyboard/cc-keyboard-option.c:378
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:96
 #: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126
-#: panels/network/network-wifi.ui:760 panels/network/network-wifi.ui:1026
 #: panels/user-accounts/um-fingerprint-dialog.c:211
 #: subprojects/gvc/gvc-mixer-control.c:1876
 msgid "Disabled"
@@ -346,14 +345,15 @@ msgstr "گزینش یک عکس"
 #: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:241
 #: panels/color/cc-color-panel.c:894 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24 panels/display/cc-display-panel.c:950
+#: panels/info-overview/cc-info-overview-panel.ui:226
 #: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: panels/network/connection-editor/connection-editor.ui:17
 #: panels/network/connection-editor/vpn-helpers.c:176
 #: panels/network/connection-editor/vpn-helpers.c:299
-#: panels/network/net-device-wifi.c:1078 panels/network/net-device-wifi.c:1292
-#: panels/network/network-wifi.ui:24 panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:252 panels/privacy/cc-privacy-panel.c:1056
-#: panels/region/cc-format-chooser.ui:24 panels/region/cc-input-chooser.ui:11
+#: panels/network/net-device-wifi.c:905 panels/network/net-device-wifi.c:1086
+#: panels/printers/new-printer-dialog.ui:45 panels/printers/pp-details-dialog.c:252
+#: panels/privacy/cc-privacy-panel.c:1056 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
 #: panels/search/cc-search-locations-dialog.c:614
 #: panels/sharing/cc-sharing-panel.c:428
 #: panels/user-accounts/cc-add-user-dialog.ui:28
@@ -662,7 +662,7 @@ msgstr "مجموعه تنظیمات ICC پشتیبانی شده"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:409
+#: panels/network/wireless-security/eap-method-fast.c:373
 msgid "All files"
 msgstr "همهٔ پرونده‌ها"
 
@@ -867,7 +867,7 @@ msgid "_Import File…"
 msgstr "درون‌ریزی _پرونده…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:489
+#: panels/network/connection-editor/net-connection-editor.c:487
 #: panels/printers/new-printer-dialog.ui:80 panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
@@ -1129,12 +1129,12 @@ msgid "_Select"
 msgstr "_انتخاب"
 
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:107
+#: panels/network/connection-editor/ce-page-details.c:105
 msgid "Today"
 msgstr "امروز"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:109
+#: panels/network/connection-editor/ce-page-details.c:107
 msgid "Yesterday"
 msgstr "دیروز"
 
@@ -1389,7 +1389,6 @@ msgstr "default;application;preferred;media;پیش‌گزیده;پیش‌گزی
 
 #: panels/display/cc-display-panel.c:961
 #: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_اِعمال"
 
@@ -1595,8 +1594,8 @@ msgstr ""
 #: panels/info-overview/cc-info-overview-panel.c:342
 #: panels/info-overview/cc-info-overview-panel.c:356
 #: panels/info-overview/cc-info-overview-panel.c:368
-#: panels/info-overview/cc-info-overview-panel.c:416
-#: panels/info-overview/cc-info-overview-panel.c:446
+#: panels/info-overview/cc-info-overview-panel.c:414
+#: panels/info-overview/cc-info-overview-panel.c:444
 msgid "Unknown"
 msgstr "ناشناخته"
 
@@ -1621,52 +1620,66 @@ msgstr "۶۴بیتی"
 msgid "32-bit"
 msgstr "۳۲بیتی"
 
-#: panels/info-overview/cc-info-overview-panel.c:609
-#, c-format
-msgid "Version %s"
-msgstr "نسخه %s"
-
-#: panels/info-overview/cc-info-overview-panel.ui:70
-msgid "Device name"
+#: panels/info-overview/cc-info-overview-panel.ui:54
+msgid "Device Name"
 msgstr "نام دستگاه"
 
-#: panels/info-overview/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "حافظه"
 
-#: panels/info-overview/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "پردازنده"
 
-#: panels/info-overview/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 msgid "Graphics"
 msgstr "گرافیک"
 
-#. To translators: this field contains the distro name and version
-#: panels/info-overview/cc-info-overview-panel.ui:133
-msgid "OS name"
-msgstr "نام سیستم‌عامل"
+#: panels/info-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr "ظرفیت دیسک"
 
-#. To translators: this field contains the distro type
-#: panels/info-overview/cc-info-overview-panel.ui:149
-msgid "OS type"
-msgstr "نوع سیستم‌عامل"
-
-#: panels/info-overview/cc-info-overview-panel.ui:165
-msgid "Virtualization"
-msgstr "مجازی‌سازی"
-
-#: panels/info-overview/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "دیسک"
-
-#: panels/info-overview/cc-info-overview-panel.ui:293
+#: panels/info-overview/cc-info-overview-panel.ui:104
 msgid "Calculating…"
 msgstr "درحال محاسبه…"
 
-#: panels/info-overview/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "بررسی برای به‌روز رسانی‌ها"
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+msgid "OS Name"
+msgstr "نام سیستم‌عامل"
+
+#: panels/info-overview/cc-info-overview-panel.ui:135
+msgid "OS Type"
+msgstr "گونهٔ سیستم‌عامل"
+
+#: panels/info-overview/cc-info-overview-panel.ui:144
+msgid "GNOME Version"
+msgstr "نگارش گنوم"
+
+#: panels/info-overview/cc-info-overview-panel.ui:153
+msgid "Virtualization"
+msgstr "مجازی‌سازی"
+
+#: panels/info-overview/cc-info-overview-panel.ui:162
+msgid "Software Updates"
+msgstr "به‌روز رسانی‌های نرم‌افزاری"
+
+#: panels/info-overview/cc-info-overview-panel.ui:183
+msgid "Rename Device"
+msgstr "تغییر نام دستگاه"
+
+#: panels/info-overview/cc-info-overview-panel.ui:200
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr ""
+"نام دستگاه برای تشخیص این دستگاه هنگام دیده شدن روی شبکه یا جفت شدن افزاره‌های "
+"بلوتوثی استفاده می‌شود."
+
+#: panels/info-overview/cc-info-overview-panel.ui:217
+msgid "_Rename"
+msgstr "_تغییرنام"
 
 #: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
 msgid "About"
@@ -1683,13 +1696,13 @@ msgstr "نمایش اطلاعات دربارهٔ سیستم شما"
 #. sure that you use the same "translation" for those keywords
 #: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
 msgid ""
-"device;system;information;memory;processor;version;default;application;preferred;"
-"cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"device;system;information;memory;processor;version;default;application;preferred;"
-"cd;dvd;usb;audio;video;disc;removable;media;autorun;دستگاه;سیستم;اطلاعات;حافظه;"
-"پردازشگر;نسخه;پیش‌گزیده;برنامه;یدکی;ترجیح‌شده;سی‌دی;دی‌وی‌دی;یواس‌بی;صوت;ویدئو;دیسک;"
-"قابل حذف;رسانه;اجرا خودکار;"
+"device;system;information;hostname;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;دستگاه;سیستم;"
+"اطلاعات;نام دامنه;حافظه;پردازشگر;نسخه;پیش‌گزیده;برنامه;یدکی;ترجیح‌شده;سی‌دی;دی‌وی‌دی;"
+"یواس‌بی;صوت;ویدئو;دیسک;قابل حذف;رسانه;اجرا خودکار;"
 
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
@@ -1981,7 +1994,6 @@ msgid "Set Shortcut…"
 msgstr "تنظیم میان‌بر…"
 
 #: panels/keyboard/cc-keyboard-shortcut-editor.ui:272
-#: panels/network/network-wifi.ui:583
 msgid "None"
 msgstr "هیچ‌کدام"
 
@@ -2135,28 +2147,28 @@ msgstr ""
 "ضربه;دوبار;دکمه;صفحه ردیاب;لغزش;"
 
 #. add proxy to device list
-#: panels/network/cc-network-panel.c:586
+#: panels/network/cc-network-panel.c:585
 msgid "Network proxy"
 msgstr "پیشکار شبکه"
 
-#: panels/network/cc-network-panel.c:781 panels/network/cc-wifi-panel.ui:306
+#: panels/network/cc-network-panel.c:775 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "آخ، مشکلی پیش آمد. لطفاً با تولید کننده نرم‌افزار خود تماس بگیرید."
 
-#: panels/network/cc-network-panel.c:787
+#: panels/network/cc-network-panel.c:781
 msgid "NetworkManager needs to be running."
 msgstr "باید NetworkManager در حال اجرا باشد."
 
-#: panels/network/cc-network-panel.ui:92
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "دیگر دستگاه‌ها"
 
-#: panels/network/cc-network-panel.ui:133
-#: panels/network/connection-editor/net-connection-editor.c:572
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:570
 msgid "VPN"
 msgstr "وی‌پی‌ان"
 
-#: panels/network/cc-network-panel.ui:177
+#: panels/network/cc-network-panel.ui:153
 msgid "Not set up"
 msgstr "برپا نشده"
 
@@ -2184,8 +2196,8 @@ msgid "Secure network"
 msgstr "شبکهٔ امن"
 
 #: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:347 panels/network/network-ethernet.ui:94
-#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
+#: panels/network/net-device-ethernet.c:352 panels/network/network-ethernet.ui:94
+#: panels/network/network-mobile.ui:406 panels/network/network-simple.ui:75
 #: panels/network/network-vpn.ui:79
 msgid "Options…"
 msgstr "گزینه‌ها…"
@@ -2217,7 +2229,7 @@ msgstr ""
 "نقطهٔ داغ وای‌فای با ایجاد یک شبکهٔ وای‌فای، به دیگران اجازهٔ هم‌رسانی اتّصال اینترنتتان "
 "را می‌دهد. برای این کار باید اتّصال اینترنتی از منبعی غیر از وای‌فای داشته باشید."
 
-#: panels/network/cc-wifi-hotspot-dialog.ui:44 panels/network/network-wifi.ui:1519
+#: panels/network/cc-wifi-hotspot-dialog.ui:44 panels/network/network-wifi.ui:108
 msgid "Network Name"
 msgstr "نام شبکه"
 
@@ -2241,9 +2253,9 @@ msgstr "گذرواژهٔ ایجاد شده به صورت خودکار"
 msgid "_Turn On"
 msgstr "_روشن کردن"
 
-#: panels/network/cc-wifi-panel.c:281
+#: panels/network/cc-wifi-panel.c:280
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1674
+#: panels/network/network-wifi.ui:236
 msgid "Wi-Fi"
 msgstr "وای‌فای"
 
@@ -2285,9 +2297,9 @@ msgstr "_امنیت 802.1x"
 
 #: panels/network/connection-editor/8021x-security-page.ui:214
 #: panels/network/connection-editor/security-page.ui:213
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
+#: panels/network/wireless-security/eap-method-fast.ui:43
+#: panels/network/wireless-security/eap-method-peap.ui:42
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "Anony_mous identity"
 msgstr "هویت _ناشناس"
 
@@ -2296,10 +2308,9 @@ msgstr "هویت _ناشناس"
 msgid "Inner _authentication"
 msgstr "_تاییدهویت داخلی"
 
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-8021x-security.c:95
 #: panels/network/connection-editor/ce-page-security.c:441
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "امنیت"
 
@@ -2329,52 +2340,45 @@ msgstr ""
 "اتّصال رویش فعّال است استفاده خواهد شد. این ویژگی به نام MAC cloning یا spoofing "
 "شناخته می‌شود. مثال: 00:11:22:33:44:55"
 
-#: panels/network/connection-editor/ce-page.c:530
-msgid "automatic"
-msgstr "خودکار"
-
-#: panels/network/connection-editor/ce-page.c:569
+#: panels/network/connection-editor/ce-page.c:550
 #, c-format
 msgid "Profile %d"
 msgstr "نمایهٔ %Id"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:139 panels/network/net-device-wifi.c:317
+#: panels/network/connection-editor/ce-page-details.c:55
+#: panels/network/net-device-wifi.c:281
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:143 panels/network/net-device-wifi.c:322
-#: panels/network/network-wifi.ui:582
+#: panels/network/connection-editor/ce-page-details.c:59
+#: panels/network/net-device-wifi.c:286
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:63
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:152
+#: panels/network/connection-editor/ce-page-details.c:68
 msgid "Enterprise"
 msgstr "تجاری"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:157 panels/network/net-device-wifi.c:307
+#: panels/network/connection-editor/ce-page-details.c:73
+#: panels/network/net-device-wifi.c:271
 msgctxt "Wifi security"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: panels/network/connection-editor/ce-page-details.c:96
+#: panels/network/connection-editor/ce-page-details.c:94
 msgid "Never"
 msgstr "هرگز"
 
-#: panels/network/connection-editor/ce-page-details.c:111
-#: panels/network/net-device-ethernet.c:135 panels/network/net-device-wifi.c:414
+#: panels/network/connection-editor/ce-page-details.c:109
+#: panels/network/net-device-ethernet.c:137
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2382,246 +2386,197 @@ msgstr[0] "%Ii روز پیش"
 msgstr[1] "%Ii روز پیش"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:226
-#: panels/network/net-device-ethernet.c:67 panels/network/net-device-wifi.c:535
+#: panels/network/connection-editor/ce-page-details.c:223
+#: panels/network/net-device-ethernet.c:71
 #, c-format
 msgid "%d Mb/s"
 msgstr "%Id مب/ث"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:562
+#: panels/network/connection-editor/ce-page-details.c:250
 msgctxt "Signal strength"
 msgid "None"
 msgstr "هیچ"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:564
+#: panels/network/connection-editor/ce-page-details.c:252
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "ضعیف"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:566
+#: panels/network/connection-editor/ce-page-details.c:254
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "کافی"
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:568
+#: panels/network/connection-editor/ce-page-details.c:256
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "خوب"
 
-#: panels/network/connection-editor/ce-page-details.c:261
-#: panels/network/net-device-wifi.c:570
+#: panels/network/connection-editor/ce-page-details.c:258
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "عالی"
 
-#: panels/network/connection-editor/ce-page-details.c:309
+#: panels/network/connection-editor/ce-page-details.c:316
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:172 panels/network/net-device-mobile.c:471
+msgid "IPv4 Address"
+msgstr "نشانی IPv4"
+
+#: panels/network/connection-editor/ce-page-details.c:317
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:173 panels/network/net-device-ethernet.c:177
+#: panels/network/net-device-mobile.c:472 panels/network/network-mobile.ui:201
+msgid "IPv6 Address"
+msgstr "نشانی IPv6"
+
+#: panels/network/connection-editor/ce-page-details.c:320
+#: panels/network/connection-editor/ce-page-details.c:321
+#: panels/network/net-device-ethernet.c:175 panels/network/net-device-mobile.c:475
+#: panels/network/net-device-mobile.c:476 panels/network/network-mobile.ui:184
+msgid "IP Address"
+msgstr "نشانی IP"
+
+#: panels/network/connection-editor/ce-page-details.c:355
 msgid "Forget Connection"
 msgstr "فراموشی اتّصال"
 
-#: panels/network/connection-editor/ce-page-details.c:311
+#: panels/network/connection-editor/ce-page-details.c:357
 msgid "Remove Connection Profile"
 msgstr "برداشتن نمایهٔ اتّصال"
 
-#: panels/network/connection-editor/ce-page-details.c:313
+#: panels/network/connection-editor/ce-page-details.c:359
 msgid "Remove VPN"
 msgstr "برداشتن وی‌پی‌ان"
 
-#: panels/network/connection-editor/ce-page-details.c:341
-#: panels/network/network-wifi.ui:1390 shell/cc-panel-list.ui:103
+#: panels/network/connection-editor/ce-page-details.c:387 shell/cc-panel-list.ui:103
 #: shell/cc-window.c:277
 msgid "Details"
 msgstr "جزئیات"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:174
-#: panels/network/connection-editor/ce-page-vpn.c:187
-#: panels/network/connection-editor/ce-page-wifi.c:191
-#: panels/network/network-wifi.ui:1394
+#: panels/network/connection-editor/ce-page-ethernet.c:55
+msgid "automatic"
+msgstr "خودکار"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:187
+#: panels/network/connection-editor/ce-page-vpn.c:185
+#: panels/network/connection-editor/ce-page-wifi.c:175
 msgid "Identity"
 msgstr "هویت"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:238
+#: panels/network/connection-editor/ce-page-ip6.c:217
 msgid "Delete Address"
 msgstr "حذف آدرس"
 
-#: panels/network/connection-editor/ce-page-ip4.c:421
-#: panels/network/connection-editor/ce-page-ip6.c:389
+#: panels/network/connection-editor/ce-page-ip4.c:398
+#: panels/network/connection-editor/ce-page-ip6.c:366
 msgid "Delete Route"
 msgstr "حذف مسیر"
 
-#: panels/network/connection-editor/ce-page-ip4.c:895
-#: panels/network/network-wifi.ui:1398
+#: panels/network/connection-editor/ce-page-ip4.c:872
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:826
-#: panels/network/network-wifi.ui:1402
+#: panels/network/connection-editor/ce-page-ip6.c:794
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:244
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: panels/network/connection-editor/ce-page-security.c:267
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید WEP ۴۰/۱۲۸بیتی(Hex یا ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:277
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت‌عبور ۱۲۸بیتی WEP"
 
-#: panels/network/connection-editor/ce-page-security.c:290
-#: panels/network/wireless-security/wireless-security.c:458
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:517
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:303
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "‫WEP پویا (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:317
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "‫WPA و WPA2 شخصی"
 
-#: panels/network/connection-editor/ce-page-security.c:331
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA و WPA2 تجاری"
 
 #: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "قدرت سیگنال"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "سرعت پیوند"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:161 panels/network/network-wifi.ui:256
-#: panels/network/panel-common.c:419
-msgid "IPv4 Address"
-msgstr "نشانی IPv4"
-
-#: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:162 panels/network/net-device-ethernet.c:166
-#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
-#: panels/network/panel-common.c:420
-msgid "IPv6 Address"
-msgstr "نشانی IPv6"
-
-#: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:169 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:180
 msgid "Hardware Address"
 msgstr "نشانی سخت‌افزاری"
 
-#: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:173 panels/network/network-mobile.ui:206
-#: panels/network/network-wifi.ui:307
+#: panels/network/connection-editor/details-page.ui:162
+#: panels/network/net-device-ethernet.c:184 panels/network/network-mobile.ui:218
 msgid "Default Route"
 msgstr "مسیر پیش‌گزیده"
 
-#: panels/network/connection-editor/details-page.ui:177
+#: panels/network/connection-editor/details-page.ui:181
 #: panels/network/connection-editor/ip4-page.ui:197
 #: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:175 panels/network/network-mobile.ui:224
-#: panels/network/network-wifi.ui:325 panels/network/network-wifi.ui:810
-#: panels/network/network-wifi.ui:1076
+#: panels/network/net-device-ethernet.c:186 panels/network/network-mobile.ui:236
 msgid "DNS"
 msgstr "دی‌ان‌اس"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:199
 msgid "Last Used"
 msgstr "آخرین استفاده"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:342
 msgid "Connect _automatically"
 msgstr "اتصال _خودکار"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:361
 msgid "Make available to _other users"
 msgstr "در دسترس قراردادن برای _دیگر کاربران"
 
-#: panels/network/connection-editor/details-page.ui:376
+#: panels/network/connection-editor/details-page.ui:394
 msgid "Restrict _background data usage"
 msgstr "محدودیت استفاده از داده در _پس‌زمینه"
 
-#: panels/network/connection-editor/details-page.ui:387
+#: panels/network/connection-editor/details-page.ui:405
 msgid "Appropriate for connections that have data charges or limits."
 msgstr "مناسب برای اتّصال‌هایی که محدودیت یا هزینهٔ داده دارند."
 
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291 panels/network/net-proxy.c:58
-#: panels/network/network-proxy.ui:106
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:158
-msgid "Automatic"
-msgstr "خودکار"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "جفت‌سیم تابیده (TP)"
-
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "واسط واحد پیوست (AUI)"
-
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
-
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "واسط مستقل از رسانه (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "۱۰ مب/ث"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "۱۰۰ مب/ث"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "۱ گب/ث"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "۱۰ گب/ث"
-
-#: panels/network/connection-editor/ethernet-page.ui:71
 #: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "_نام"
 
-#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: panels/network/connection-editor/wifi-page.ui:67
-#: panels/network/network-wifi.ui:1217
 msgid "_MAC Address"
 msgstr "نشانی _مک"
 
-#: panels/network/connection-editor/ethernet-page.ui:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "آدرس _کلون شده"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "بایت"
 
@@ -2630,7 +2585,6 @@ msgid "IPv_4 Method"
 msgstr "_روش IPv4"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:756 panels/network/network-wifi.ui:1022
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
@@ -2640,9 +2594,8 @@ msgid "Link-Local Only"
 msgstr "فقط Link-Local"
 
 #: panels/network/connection-editor/ip4-page.ui:69
-#: panels/network/connection-editor/ip6-page.ui:83 panels/network/net-proxy.c:56
-#: panels/network/network-proxy.ui:116 panels/network/network-wifi.ui:755
-#: panels/network/network-wifi.ui:1021 panels/privacy/cc-privacy-panel.c:158
+#: panels/network/connection-editor/ip6-page.ui:83 panels/network/net-proxy.c:74
+#: panels/network/network-proxy.ui:116 panels/privacy/cc-privacy-panel.c:158
 msgid "Manual"
 msgstr "دستی"
 
@@ -2676,6 +2629,17 @@ msgstr "ماسک شبکه"
 msgid "Gateway"
 msgstr "دروازه"
 
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:291 panels/network/net-proxy.c:76
+#: panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:22
+#: panels/privacy/cc-privacy-panel.c:158
+msgid "Automatic"
+msgstr "خودکار"
+
 #: panels/network/connection-editor/ip4-page.ui:220
 #: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
@@ -2688,7 +2652,6 @@ msgstr "نشانی‌های IP را با , جدا کنید"
 
 #: panels/network/connection-editor/ip4-page.ui:265
 #: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:855 panels/network/network-wifi.ui:1121
 msgid "Routes"
 msgstr "مسیرها"
 
@@ -2705,7 +2668,6 @@ msgstr "متریک"
 
 #: panels/network/connection-editor/ip4-page.ui:384
 #: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:911 panels/network/network-wifi.ui:1177
 msgid "Use this connection _only for resources on its network"
 msgstr "استفاده از این اتّصال _تنها برای منابع روی شبکه‌اش"
 
@@ -2730,16 +2692,15 @@ msgstr "نمی‌توان ویرایشگر اتّصال را باز کرد"
 msgid "New Profile"
 msgstr "نمایهٔ جدید"
 
-#: panels/network/connection-editor/net-connection-editor.c:716
+#: panels/network/connection-editor/net-connection-editor.c:714
 msgid "Import from file…"
 msgstr "درون ریزی از پرونده…"
 
-#: panels/network/connection-editor/net-connection-editor.c:748
+#: panels/network/connection-editor/net-connection-editor.c:746
 msgid "Add VPN"
 msgstr "افزودن وی‌پی‌ان"
 
 #: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:519
 msgid "S_ecurity"
 msgstr "_امنیت"
 
@@ -2801,12 +2762,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(خطا: نمی‌توان ویرایشگر اتّصال وی‌پی‌ان را بار کرد)"
 
 #: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:487
 msgid "_SSID"
 msgstr "_SSID"
 
 #: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:503
 msgid "_BSSID"
 msgstr "_BSSID"
 
@@ -2832,24 +2791,19 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;شبکه;بی سیم;وای فای;آی "
 "پی;لن;پروکسی;پهن‌باند;دی ان اس;ساناد;هات اسپات;"
 
-#: panels/network/net-device-ethernet.c:123 panels/network/net-device-wifi.c:400
+#: panels/network/net-device-ethernet.c:125
 msgid "never"
 msgstr "هرگز"
 
-#: panels/network/net-device-ethernet.c:131 panels/network/net-device-wifi.c:410
+#: panels/network/net-device-ethernet.c:133
 msgid "today"
 msgstr "امروز"
 
-#: panels/network/net-device-ethernet.c:133 panels/network/net-device-wifi.c:412
+#: panels/network/net-device-ethernet.c:135
 msgid "yesterday"
 msgstr "دیروز"
 
-#: panels/network/net-device-ethernet.c:164 panels/network/network-mobile.ui:172
-#: panels/network/panel-common.c:422 panels/network/panel-common.c:424
-msgid "IP Address"
-msgstr "نشانی IP"
-
-#: panels/network/net-device-ethernet.c:180 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:191
 msgid "Last used"
 msgstr "آخرین استفاده"
 
@@ -2858,53 +2812,53 @@ msgstr "آخرین استفاده"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:279 panels/network/network-ethernet.ui:19
+#: panels/network/net-device-ethernet.c:284 panels/network/network-ethernet.ui:19
 #: panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "سیمی"
 
-#: panels/network/net-device-mobile.c:233
+#: panels/network/net-device-mobile.c:242
 msgid "Add new connection"
 msgstr "افزودن اتّصال جدید"
 
-#: panels/network/net-device-wifi.c:1076
+#: panels/network/net-device-wifi.c:903
 msgid "Stop hotspot and disconnect any users?"
 msgstr "توقع نقطهٔ داغ و قطع ارتباط همهٔ کاربران؟"
 
-#: panels/network/net-device-wifi.c:1079
+#: panels/network/net-device-wifi.c:906
 msgid "_Stop Hotspot"
 msgstr "_توقف نقطهٔ داغ"
 
-#: panels/network/net-device-wifi.c:1135
+#: panels/network/net-device-wifi.c:955
 msgid "System policy prohibits use as a Hotspot"
 msgstr "سیاست‌های سیستم استفاده از نقطهٔ داغ را منع کرده است"
 
-#: panels/network/net-device-wifi.c:1138
+#: panels/network/net-device-wifi.c:958
 msgid "Wireless device does not support Hotspot mode"
 msgstr "افزارهٔ بی‌سیم از حالت نقطهٔ داغ پشتیبانی نمی‌کند"
 
-#: panels/network/net-device-wifi.c:1289
+#: panels/network/net-device-wifi.c:1083
 msgid ""
 "Network details for the selected networks, including passwords and any custom "
 "configuration will be lost."
 msgstr ""
 "جزئیات شبکه‌های گزیده، شامل گذرواژه‌ها و هر پیکربندی سفارشی‌ای از دست خواهند رفت."
 
-#: panels/network/net-device-wifi.c:1293 panels/network/network-wifi.ui:1307
+#: panels/network/net-device-wifi.c:1087
 msgid "_Forget"
 msgstr "_فراموشی"
 
-#: panels/network/net-device-wifi.c:1456 panels/network/net-device-wifi.c:1463
+#: panels/network/net-device-wifi.c:1250 panels/network/net-device-wifi.c:1257
 msgid "Known Wi-Fi Networks"
 msgstr "شبکه‌های وای‌فای آشنا"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:1500
+#: panels/network/net-device-wifi.c:1294
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_فراموشی"
 
-#: panels/network/net-proxy.c:54 panels/notifications/cc-notifications-panel.c:270
+#: panels/network/net-proxy.c:72 panels/notifications/cc-notifications-panel.c:270
 #: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
 #: panels/privacy/cc-privacy-panel.c:131 panels/privacy/cc-privacy-panel.c:208
 #: panels/universal-access/cc-ua-panel.c:477
@@ -2924,7 +2878,7 @@ msgid "Off"
 msgstr "خاموش"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:115
 msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "کشف خودکار پیشکار وب زمانی که URL فراهم نشده باشد استفاده می‌شود."
 
@@ -2932,15 +2886,16 @@ msgstr "کشف خودکار پیشکار وب زمانی که URL فراهم ن
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:123
 msgid "This is not recommended for untrusted public networks."
 msgstr "برای شبکه‌های عمومی نامطمين توصیه نمی‌شود."
 
+#. update title
 #. Translators: this is the title of the connection details
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/net-vpn.c:167 panels/network/net-vpn.c:294
+#: panels/network/net-vpn.c:152 panels/network/net-vpn.c:265
 #, c-format
 msgid "%s VPN"
 msgstr "وی‌پی‌ان %s"
@@ -3005,381 +2960,296 @@ msgstr "خاموش کردن دستگاه"
 msgid "Turn VPN connection off"
 msgstr "خاموش کردن اتّصال وی‌پی‌ان"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "اتصال _خودکار"
-
-#: panels/network/network-wifi.ui:535
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/cc-sharing-panel.ui:351
-#: panels/user-accounts/cc-add-user-dialog.ui:310
-#: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:216
-msgid "_Password"
-msgstr "_گذرواژه"
-
-#: panels/network/network-wifi.ui:611
-msgid "Show P_assword"
-msgstr "نمایش گ_ذرواژه"
-
-#: panels/network/network-wifi.ui:641
-msgid "Make available to other users"
-msgstr "در دسترس قرار گرفتن برای دیگر کاربران"
-
-#: panels/network/network-wifi.ui:692
-msgid "IPv_4"
-msgstr "IPv_4"
-
-#: panels/network/network-wifi.ui:733 panels/network/network-wifi.ui:999
-msgid "_Addresses"
-msgstr "نشانی‌ها"
-
-#: panels/network/network-wifi.ui:757 panels/network/network-wifi.ui:1023
-msgid "Automatic (DHCP) addresses only"
-msgstr "فقط نشانی‌های خودکار (DHCP)"
-
-#: panels/network/network-wifi.ui:758 panels/network/network-wifi.ui:1024
-msgid "Link-local only"
-msgstr "فقط Link-local"
-
-#: panels/network/network-wifi.ui:759 panels/network/network-wifi.ui:1025
-msgid "Shared with other computers"
-msgstr "هم‌رسانی شده با دیگر رایانه‌ها"
-
-#: panels/network/network-wifi.ui:895 panels/network/network-wifi.ui:1161
-msgid "_Ignore automatically obtained routes"
-msgstr "_نادیده گرفتن مسیرهای به‌دست آمده به صورت خودکار"
-
-#: panels/network/network-wifi.ui:958
-msgid "IPv_6"
-msgstr "IPv_6"
-
-#: panels/network/network-wifi.ui:1233
-msgid "_Cloned MAC Address"
-msgstr "نشانی مک _کلون شده"
-
-#: panels/network/network-wifi.ui:1291
-msgid "_Reset"
-msgstr "بازنشانی"
-
-#: panels/network/network-wifi.ui:1327
-msgid ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-msgstr "بازنشانی تنظیمات این اتّصال به پیش‌گزیده و باقی گذاشتن به عنوان اتّصال ترجیحی."
-
-#: panels/network/network-wifi.ui:1344
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr "حذف تمام جزئیات مربوط به این شبکه و وصل نشدن خودکار به آن."
-
-#: panels/network/network-wifi.ui:1406
-msgid "Hardware"
-msgstr "سخت‌افزار"
-
-#: panels/network/network-wifi.ui:1410
-msgctxt "tab"
-msgid "Reset"
-msgstr "بازنشانی"
-
-#: panels/network/network-wifi.ui:1452
+#: panels/network/network-wifi.ui:41
 msgid "Wi-Fi Hotspot"
 msgstr "نقطهٔ داغ وای‌فای"
 
-#: panels/network/network-wifi.ui:1470
+#: panels/network/network-wifi.ui:59
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "برای وصل شدن به یک شبکهٔ وای‌فای، خاموش کنید"
 
-#: panels/network/network-wifi.ui:1537
-msgid "Connected Devices"
-msgstr "دستگاه‌های وصل شده"
-
-#: panels/network/network-wifi.ui:1555
+#: panels/network/network-wifi.ui:126
 msgid "Security type"
 msgstr "نوع حفاظت"
 
-#: panels/network/network-wifi.ui:1618
+#: panels/network/network-wifi.ui:178
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "گذرواژه"
 
-#: panels/network/network-wifi.ui:1704
+#: panels/network/network-wifi.ui:266
 msgid "Turn Wi-Fi off"
 msgstr "خاموش کردن وای‌فای"
 
-#: panels/network/network-wifi.ui:1736
+#: panels/network/network-wifi.ui:298
 msgid "_Connect to Hidden Network…"
 msgstr "وصل شدن به شبکهٔ مخفی…"
 
-#: panels/network/network-wifi.ui:1746
+#: panels/network/network-wifi.ui:308
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "روشن کردن نقطهٔ داغ بی‌سیم…"
 
-#: panels/network/network-wifi.ui:1756
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "شبکه‌های آشنا"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:42
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "وضعیت ناشناس"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:46
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "مدیریت نشده"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:50
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "موجود نیست"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:60
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "درحال اتصال"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:64
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "تصدیق هویت شکست خورد"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:68
+#: panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "متّصل"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:72
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "درحال قطع ارتباط"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:76
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "اتصال شکست خورد"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:80
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "وضعیت ناشناس (ناپیدا)"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:101
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "پیکربندی شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:105
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "پیکربندی IP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:109
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "پیکربندی IP منقضی شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:113
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "رمزها لازم بودند، اما فراهم نشدند"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:117
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "درخواست کننده 802.1x قطع شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:121
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "تنظیمات پیکربندی درخواست کننده 802.1x شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:125
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "درخواست کننده 802.1x شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:129
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "تصدیق‌هویت دروخواست کننده 802.1x مدت زیادی طول کشید"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:133
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "شروع کارساز PPP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:137
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "سرویس PPP قطع شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:141
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:145
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "شکست در شروع کارخواه DHCP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:149
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "خطا کارخواه DHCP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:153
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "کارخواه DHCP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:157
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "شکست در شروع خدمت اتصالِ هم‌رسانده"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:161
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "سرویس اتصال هم‌رسانی شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:165
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "شروع سرویس AutoIP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:169
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "خطا سرویس AutoIP"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:173
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "سرویس AutoIP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "خطِ مشغول"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:181
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "بوق شماره‌گیری وجود ندارد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:185
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "اتصال به هیچ فراهم‌کننده‌ای امکان‌پذیر نبود"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:189
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "مهلت درخواست شماره‌گیری تمام شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:193
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "تلاش برای شماره‌گیری شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:197
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "مقداردهی اولیه مودم شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:201
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "انتخاب APN مشخص شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:205
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "درحال جست‌وجو برای شبکه‌ها نیست"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:209
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "ثبت شبکه رد شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:213
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "مهلت ثبت شبکه تمام شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:217
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "ثبت از طریق شبکه درخواست شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:221
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "بررسی پین شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:225
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "ممکن است میان‌افزار مربوط به دستگاه موجود نباشد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:229
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "اتصال محو شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:233
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "اتصال فعلی استفاده شد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:237
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "مودم پیدا نشد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:241
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "اتصال بلوتوث شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:245
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "کارت SIM وارد نشده است"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:249
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "کد پین SIM لازم است"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:253
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "کد پاک SIM لازم است"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:257
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIM نادرست"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:261
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "نیازمندی‌های اتصال شکست خورد"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:286
+#: panels/network/panel-common.c:281
 msgid "Firmware missing"
 msgstr "میان‌افزار موجود نیست"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:290
+#: panels/network/panel-common.c:285
 msgid "Cable unplugged"
 msgstr "کابل قطع شد"
 
@@ -3387,43 +3257,43 @@ msgstr "کابل قطع شد"
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "خطای تعریف نشده در امنیت 802.1x (‫wpa-eap)"
 
-#: panels/network/wireless-security/eap-method.c:240
+#: panels/network/wireless-security/eap-method.c:232
 msgid "no file selected"
 msgstr "هیچ پرونده‌ای انتخاب نشد"
 
-#: panels/network/wireless-security/eap-method.c:267
+#: panels/network/wireless-security/eap-method.c:259
 msgid "unspecified error validating eap-method file"
 msgstr "خطای نامشخّص در تایید اعتبار پروندهٔ eap-method"
 
-#: panels/network/wireless-security/eap-method.c:442
+#: panels/network/wireless-security/eap-method.c:434
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "کلیدهای خصوصی DER، PEM یا PKCS#12 شامل (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:445
+#: panels/network/wireless-security/eap-method.c:437
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "گواهینامه‌های DER یا PEM شامل ‪(*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:78
 msgid "missing EAP-FAST PAC file"
 msgstr "پرونده EAP-FAST PAC فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-fast.c:263
-#: panels/network/wireless-security/eap-method-peap.c:292
-#: panels/network/wireless-security/eap-method-ttls.c:347
+#: panels/network/wireless-security/eap-method-fast.c:237
+#: panels/network/wireless-security/eap-method-peap.c:271
+#: panels/network/wireless-security/eap-method-ttls.c:324
 msgid "GTC"
 msgstr "GTC"
 
-#: panels/network/wireless-security/eap-method-fast.c:277
-#: panels/network/wireless-security/eap-method-peap.c:264
-#: panels/network/wireless-security/eap-method-ttls.c:289
+#: panels/network/wireless-security/eap-method-fast.c:251
+#: panels/network/wireless-security/eap-method-peap.c:243
+#: panels/network/wireless-security/eap-method-ttls.c:266
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: panels/network/wireless-security/eap-method-fast.c:398
+#: panels/network/wireless-security/eap-method-fast.c:364
 msgid "Choose a PAC file"
 msgstr "یک پرونده PAC انتخاب کنید"
 
-#: panels/network/wireless-security/eap-method-fast.c:405
+#: panels/network/wireless-security/eap-method-fast.c:369
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC شامل ‪(*.pac)"
 
@@ -3439,62 +3309,73 @@ msgstr "تایید هویت شده"
 msgid "Both"
 msgstr "هردو"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:69
 msgid "PAC _file"
 msgstr "_پرونده PAC"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:123
+#: panels/network/wireless-security/eap-method-fast.ui:109
+#: panels/network/wireless-security/eap-method-peap.ui:140
+#: panels/network/wireless-security/eap-method-ttls.ui:117
 msgid "_Inner authentication"
 msgstr "تایید هویت _داخلی"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:138
 msgid "Allow automatic PAC pro_visioning"
 msgstr "اجازه دادن برای آ_ماده‌سازی خودکار PAC"
 
-#: panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:67
 msgid "missing EAP-LEAP username"
 msgstr "نام‌کاربری EAP-LEAP فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:76
 msgid "missing EAP-LEAP password"
 msgstr "گذرواژه EAP-LEAP فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-leap.ui:26
-#: panels/network/wireless-security/eap-method-simple.ui:26
-#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/network/wireless-security/eap-method-leap.ui:18
+#: panels/network/wireless-security/eap-method-simple.ui:18
+#: panels/network/wireless-security/ws-leap.ui:18
 #: panels/user-accounts/cc-add-user-dialog.ui:146
 #: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "نام _کاربری"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:32
+#: panels/network/wireless-security/eap-method-simple.ui:32
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:216
+msgid "_Password"
+msgstr "_گذرواژه"
+
+#: panels/network/wireless-security/eap-method-leap.ui:56
+#: panels/network/wireless-security/eap-method-simple.ui:74
+#: panels/network/wireless-security/eap-method-tls.ui:158
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "_نمایش گذرواژه"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:75
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "گواهینامه EAP-PEAP CA نامعتبر است: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:67
+#: panels/network/wireless-security/eap-method-peap.c:80
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "گواهینامه EAP-PEAP CA نامعتبر است: هیچ گواهینامه‌ای مشخص نشده"
 
-#: panels/network/wireless-security/eap-method-peap.c:278
-#: panels/network/wireless-security/eap-method-ttls.c:333
-#: panels/network/wireless-security/wireless-security.c:434
+#: panels/network/wireless-security/eap-method-peap.c:257
+#: panels/network/wireless-security/eap-method-ttls.c:310
+#: panels/network/wireless-security/wireless-security.c:493
 msgid "MD5"
 msgstr "MD5"
 
-#: panels/network/wireless-security/eap-method-peap.c:369
-#: panels/network/wireless-security/eap-method-tls.c:484
-#: panels/network/wireless-security/eap-method-ttls.c:424
+#: panels/network/wireless-security/eap-method-peap.c:349
+#: panels/network/wireless-security/eap-method-tls.c:457
+#: panels/network/wireless-security/eap-method-ttls.c:402
 msgid "Choose a Certificate Authority certificate"
 msgstr "یک گواهینامهٔ مرجع گواهینامه (CA) انتخاب کنید"
 
@@ -3506,59 +3387,59 @@ msgstr "نسخه ۰"
 msgid "Version 1"
 msgstr "نسخه ۱"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:82
+#: panels/network/wireless-security/eap-method-peap.ui:68
+#: panels/network/wireless-security/eap-method-tls.ui:69
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 msgid "C_A certificate"
 msgstr "گواهینامه C_A"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:105
+#: panels/network/wireless-security/eap-method-peap.ui:90
+#: panels/network/wireless-security/eap-method-tls.ui:91
+#: panels/network/wireless-security/eap-method-ttls.ui:99
 msgid "No CA certificate is _required"
 msgstr "به گواهینامه CA _نیازی نیست"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:108
 msgid "PEAP _version"
 msgstr "_نسخه PEAP"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:78
 msgid "missing EAP username"
 msgstr "نام‌کاربری EAP فراهم نشده"
 
 # ../capplets/common/gconf-property-editor.:c:183
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:91
 msgid "missing EAP password"
 msgstr "گذرواژه EAP وارد نشده"
 
-#: panels/network/wireless-security/eap-method-tls.c:70
+#: panels/network/wireless-security/eap-method-tls.c:78
 msgid "missing EAP-TLS identity"
 msgstr "شناسه EAP-TLS فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-tls.c:79
+#: panels/network/wireless-security/eap-method-tls.c:88
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "گواهینامه EAP-TLS CA نامعتبر است: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:85
+#: panels/network/wireless-security/eap-method-tls.c:95
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "گواهینامه EAP-TLS CA نامعتبر است: هیچ گواهینامه‌ای فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-tls.c:101
+#: panels/network/wireless-security/eap-method-tls.c:108
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "کلید خصوصی EAP-TLS نامعتبر است: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:118
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "گواهینامه کاربر EAP-TLS نامعتبر است: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:300
+#: panels/network/wireless-security/eap-method-tls.c:275
 msgid "Unencrypted private keys are insecure"
 msgstr "کلیدهای خصوصی رمزنگاری نشده ناامن هستند"
 
-#: panels/network/wireless-security/eap-method-tls.c:303
+#: panels/network/wireless-security/eap-method-tls.c:278
 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-"
@@ -3572,116 +3453,116 @@ msgstr ""
 "\n"
 "(می‌توانید با openssl روی کلیدتان گذرواژه بگذارید)"
 
-#: panels/network/wireless-security/eap-method-tls.c:478
+#: panels/network/wireless-security/eap-method-tls.c:451
 msgid "Choose your personal certificate"
 msgstr "گواهینامهٔ شخصی خود را انتخاب کنید"
 
-#: panels/network/wireless-security/eap-method-tls.c:490
+#: panels/network/wireless-security/eap-method-tls.c:463
 msgid "Choose your private key"
 msgstr "کلید خصوصی خود را انتخاب کنید"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:18
 msgid "I_dentity"
 msgstr "_هویت"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:44
 msgid "_User certificate"
 msgstr "گواهینامهٔ _کاربر"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:109
 msgid "Private _key"
 msgstr "_کلید خصوصی"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:134
 msgid "_Private key password"
 msgstr "گذرواژهٔ کلید _خصوصی"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:75
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "گواهینامهٔ EAP-TTLS CA نامعتبر: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:67
+#: panels/network/wireless-security/eap-method-ttls.c:80
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "گواهینامهٔ EAP-TTLS CA نامعتبر: هیچ گواهینامه‌ای فراهم نشده"
 
-#: panels/network/wireless-security/eap-method-ttls.c:261
+#: panels/network/wireless-security/eap-method-ttls.c:238
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:275
+#: panels/network/wireless-security/eap-method-ttls.c:252
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:304
+#: panels/network/wireless-security/eap-method-ttls.c:281
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:319
+#: panels/network/wireless-security/eap-method-ttls.c:296
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:50
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "_دامنه"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:109
 msgid "Unknown error validating 802.1X security"
 msgstr "خطای ناشناخته در تایید اعتبار امنیت 802.1x"
 
-#: panels/network/wireless-security/wireless-security.c:445
+#: panels/network/wireless-security/wireless-security.c:504
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:469
+#: panels/network/wireless-security/wireless-security.c:528
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:479
+#: panels/network/wireless-security/wireless-security.c:538
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:489
+#: panels/network/wireless-security/wireless-security.c:548
 msgid "Tunneled TLS"
 msgstr "‫TLS تونل شده"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/wireless-security.c:558
 msgid "Protected EAP (PEAP)"
 msgstr "‫EAP محافظت شده (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "Au_thentication"
 msgstr "تایید_هویت"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:73
 msgid "missing leap-username"
 msgstr "گزینه leap-username فراهم نشده است"
 
 # ../capplets/common/gconf-property-editor.:c:183
-#: panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "گذرواژه leap وارد نشده"
 
-#: panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "گزینه wep-key فراهم نشده است"
 
-#: panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:122
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "گزینه wep-key نامعتبر است: کلیدی با طول %zu تنها باید شامل hex-digit باشد"
 
-#: panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "گزینه hex-digits نامعتبر است: کلیدی با طول %zu باید شامل نویسه‌های ascii باشد"
 
-#: panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:136
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3690,11 +3571,11 @@ msgstr ""
 "گزینه wep-key نامعتبر: طول کلید نامعتبر %zu. یک کلید یا باید طول 5/13 (ascii) یا "
 "10/26 (hex) داشته باشد."
 
-#: panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "گزینه wep-key نامعتبر: عبارت‌رمز نباید خالی باشد"
 
-#: panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:145
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "گزینه wep-key نامعتبر: عبارت‌رمز باید کمتر از ۶۴ نویسه باشد"
 
@@ -3710,30 +3591,30 @@ msgstr "گشودن سیستم"
 msgid "Shared Key"
 msgstr "کلید مشترک"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_کلید"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "_نمایش کلید"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "_فهرست WEP"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:78
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex digits"
 msgstr ""
 "گزینه wpa-psk نامعتبر: طول کلید نامعتبر %zu.باید یا [8,63] باید یا ۶۴ رقم hex باشد"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "گزینه wpa-psk نامعتبر است: نمی‌توان کلید ۶۴ بایتی را به عنوان hex تفسیر کرد"
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "_نوع"
 
@@ -5422,7 +5303,7 @@ msgstr "افزودن یک منبع ورودی"
 msgid "Input methods can’t be used on the login screen"
 msgstr "روش‌های ورودی نمی‌توانند در صفحهٔ ورود استفاده شوند"
 
-#: panels/region/cc-region-panel.c:1512
+#: panels/region/cc-region-panel.c:1511
 msgid "Login _Screen"
 msgstr "_صفحه ورود به سیستم"
 
@@ -7862,6 +7743,102 @@ msgstr[1] "%Iu ورودی"
 msgid "System Sounds"
 msgstr "صداهای سامانه"
 
+#~ msgid "Version %s"
+#~ msgstr "نسخه %s"
+
+#~ msgid "OS name"
+#~ msgstr "نام سیستم‌عامل"
+
+#~ msgid "OS type"
+#~ msgstr "نوع سیستم‌عامل"
+
+#~ msgid "Disk"
+#~ msgstr "دیسک"
+
+#~ msgid "Check for updates"
+#~ msgstr "بررسی برای به‌روز رسانی‌ها"
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "جفت‌سیم تابیده (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "واسط واحد پیوست (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "واسط مستقل از رسانه (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "۱۰ مب/ث"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "۱۰۰ مب/ث"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "۱ گب/ث"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "۱۰ گب/ث"
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "اتصال _خودکار"
+
+#~ msgid "Show P_assword"
+#~ msgstr "نمایش گ_ذرواژه"
+
+#~ msgid "Make available to other users"
+#~ msgstr "در دسترس قرار گرفتن برای دیگر کاربران"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "نشانی‌ها"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "فقط نشانی‌های خودکار (DHCP)"
+
+#~ msgid "Link-local only"
+#~ msgstr "فقط Link-local"
+
+#~ msgid "Shared with other computers"
+#~ msgstr "هم‌رسانی شده با دیگر رایانه‌ها"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "_نادیده گرفتن مسیرهای به‌دست آمده به صورت خودکار"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "نشانی مک _کلون شده"
+
+#~ msgid "_Reset"
+#~ msgstr "بازنشانی"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as a "
+#~ "preferred connection."
+#~ msgstr ""
+#~ "بازنشانی تنظیمات این اتّصال به پیش‌گزیده و باقی گذاشتن به عنوان اتّصال ترجیحی."
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to automatically "
+#~ "connect to it."
+#~ msgstr "حذف تمام جزئیات مربوط به این شبکه و وصل نشدن خودکار به آن."
+
+#~ msgid "Hardware"
+#~ msgstr "سخت‌افزار"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "بازنشانی"
+
+#~ msgid "Connected Devices"
+#~ msgstr "دستگاه‌های وصل شده"
+
 #~ msgid "<big><b>Turn On Wi-Fi Hotspot?</b></big>"
 #~ msgstr "<big><b>روشن کردن نقطهٔ داغ وای‌فای؟</b></big>"
 
@@ -8931,9 +8908,6 @@ msgstr "صداهای سامانه"
 #~ msgid "Paired"
 #~ msgstr "همگام شد"
 
-#~ msgid "Type"
-#~ msgstr "نوع"
-
 #~ msgid "Mouse & Touchpad Settings"
 #~ msgstr "تنظیمات موشی و صفحه‌لمسی"
 
@@ -9524,9 +9498,6 @@ msgstr "صداهای سامانه"
 #~ msgid "Add a virtual device"
 #~ msgstr "اضافه کردن یک دستگاه مجازی"
 
-#~ msgid "Remove a device"
-#~ msgstr "جداکردن یک دستگاه"
-
 #~ msgid "Color management settings"
 #~ msgstr "تنظیمات مدیریت رنگ"
 
@@ -10606,9 +10577,6 @@ msgstr "صداهای سامانه"
 #~ msgid "GNOME OnScreen Keyboard"
 #~ msgstr "صفحه‌کلید مجازی گنوم"
 
-#~ msgid "GNOME Terminal"
-#~ msgstr "پایانه‌ی گنوم"
-
 #~ msgid "Gnopernicus"
 #~ msgstr "Gnopernicus"
 
@@ -12011,9 +11979,6 @@ msgstr "صداهای سامانه"
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>بازکردن</b>"
 
-#~ msgid "Rename..."
-#~ msgstr "تغییرنام..."
-
 #~ msgid "Move to Trash"
 #~ msgstr "انداختن در زباله‌دان"