[gnome-control-center] [l10n] update Persian translations

[Arash Mousavi <amousavi src gnome org>]

commit 7ba7c450d6a17fc81d5bae41a7998eaef755a67f
Author: Arash Mousavi <mousavi arash gmail com>
Date:   Tue Sep 13 18:04:09 2016 +0430

    [l10n] update Persian translations

 po/fa.po | 2130 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1195 insertions(+), 935 deletions(-)
---
diff --git a/po/fa.po b/po/fa.po
index c1418de..f68f197 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-04-08 14:29+0000\n"
-"PO-Revision-Date: 2016-04-09 11:46+0430\n"
+"POT-Creation-Date: 2016-09-10 14:47+0000\n"
+"PO-Revision-Date: 2016-09-13 18:02+0430\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.9\n"
 
 #: ../panels/background/background.ui.h:1
 msgid "_Background"
@@ -97,7 +97,7 @@ msgstr "هیچ تصویری پیدا نشد"
 #. * directory in the string below when XDG_PICTURES_DIR is
 #. * undefined
 #: ../panels/background/cc-background-chooser-dialog.c:561
-#: ../panels/search/cc-search-locations-dialog.c:274
+#: ../panels/search/cc-search-locations-dialog.c:302
 msgid "Home"
 msgstr "منزل"
 
@@ -112,24 +112,23 @@ msgstr "شما می‌توانید تصاویر را به پوشه %s خود ا
 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:1563
-#: ../panels/display/cc-display-panel.c:2196
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/display/cc-display-panel.c:1561
+#: ../panels/display/cc-display-panel.c:2206
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:250
-#: ../panels/network/connection-editor/vpn-helpers.c:379
-#: ../panels/network/net-device-wifi.c:1281
-#: ../panels/network/net-device-wifi.c:1481 ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/cc-printers-panel.c:2052
+#: ../panels/network/connection-editor/vpn-helpers.c:181
+#: ../panels/network/connection-editor/vpn-helpers.c:310
+#: ../panels/network/net-device-wifi.c:1298
+#: ../panels/network/net-device-wifi.c:1535 ../panels/network/network-wifi.ui.h:1
+#: ../panels/printers/cc-printers-panel.c:2076
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:982 ../panels/region/format-chooser.ui.h:3
+#: ../panels/privacy/cc-privacy-panel.c:1048 ../panels/region/format-chooser.ui.h:3
 #: ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/search/cc-search-locations-dialog.c:637
 #: ../panels/sharing/cc-sharing-panel.c:372
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:2
+#: ../panels/user-accounts/data/join-dialog.ui.h:2
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1476
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
+#: ../panels/user-accounts/um-fingerprint-dialog.c:265
 #: ../panels/user-accounts/um-photo-dialog.c:94
 #: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/um-user-panel.c:705
@@ -160,16 +159,17 @@ msgstr "بدون تصویر پس‌زمینه"
 msgid "Current background"
 msgstr "تصویر پس‌زمینه کنونی"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+msgid "Back­ground"
 msgstr "پس‌زمینه"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
 msgid "Change your background image to a wallpaper or photo"
 msgstr "تصویر پس‌زمینه‌ی خود را به یک کاغذ دیواری یا عکس تغییر دهید"
 
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:4
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "پس‌زمینه;صفحه‌نمایش;رومیزی;"
 
@@ -209,18 +209,17 @@ msgstr "حالت هواپیمایی بصورت سخت‌افزاری روشن ا
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "برای فعال‌سازی بلوتوث حالت هواپیمایی را خاموش کنید."
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1676
-msgid "Bluetooth"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Blue­tooth"
 msgstr "بلوتوث"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "بلوتوث را خاموش و روشن کنید و به دستگاه‌های خود متصل شوید"
 
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;اشتراک;اشتراک‌گذاری;بلوتوث;"
 
@@ -387,7 +386,7 @@ msgstr "مجموعه تنظیمات ICC پشتیبانی شده"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:420
+#: ../panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "همه‌ی پرونده‌ها"
 
@@ -427,7 +426,7 @@ msgid "Save Profile"
 msgstr "ذخیره مجموعه‌تنظیمات"
 
 #: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:380
+#: ../panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_ذخیره"
 
@@ -680,7 +679,7 @@ msgstr ""
 "ویندوز</a> مفید باشند."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:729
+#: ../panels/user-accounts/um-fingerprint-dialog.c:730
 msgid "Summary"
 msgstr "خلاصه"
 
@@ -692,11 +691,11 @@ msgstr "اضافه‌کردن مجموعه‌ی تنظیمات"
 msgid "_Import File…"
 msgstr "واردکردن _پرونده…"
 
-#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3
-#: ../panels/network/connection-editor/net-connection-editor.c:518
+#: ../panels/color/color.ui.h:31
+#: ../panels/network/connection-editor/net-connection-editor.c:546
 #: ../panels/printers/new-printer-dialog.ui.h:3
 #: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1477
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Add"
 msgstr "ا_ضافه کردن"
 
@@ -844,17 +843,18 @@ msgstr "D65 (عکسبرداری و گرافیک)"
 msgid "D75"
 msgstr "D75"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid "Co­lor"
 msgstr "رنگ"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
 msgid "Calibrate the color of your devices, such as displays, cameras or printers"
 msgstr ""
 "دستگاه‌های خود را، نظیر صفحه‌نمایش‌ها، دوربین‌ها و یا چاپگرها را درجه‌بندی رنگ کنید"
 
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
 msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "رنگ;ICC;مجموعه تنظیمات;درجه‌بندی;چاپگر;نمایشگر;"
 
@@ -871,23 +871,23 @@ msgstr "بیشتر..."
 msgid "No languages found"
 msgstr "هیچ زبانی پیدا نشد"
 
-#: ../panels/common/cc-util.c:125
-#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/common/cc-util.c:127
+#: ../panels/network/connection-editor/ce-page-details.c:100
 msgid "Today"
 msgstr "امروز"
 
-#: ../panels/common/cc-util.c:129
-#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/common/cc-util.c:131
+#: ../panels/network/connection-editor/ce-page-details.c:102
 msgid "Yesterday"
 msgstr "دیروز"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:136
+#: ../panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%b %Oe"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:141
+#: ../panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%b %Oe، %OY"
 
@@ -1007,8 +1007,9 @@ msgstr "نوامبر"
 msgid "December"
 msgstr "دسامبر"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date & Time"
 msgstr "تاریخ و زمان"
 
@@ -1065,12 +1066,12 @@ msgstr "۲۴ ساعته"
 msgid "AM / PM"
 msgstr "AM / PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
 msgid "Change the date and time, including time zone"
 msgstr "تغییر ساعت و تاریخ، شامل منطقه زمانی"
 
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
 msgid "Clock;Timezone;Location;"
 msgstr "سایت;منطقه‌ی زمانی;مکان;"
 
@@ -1082,208 +1083,223 @@ msgstr "تغییر تنظیمات ناحیه و زبان سیستم"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "برای تغییر تنظیمات تاریخ و ساعت، احتیاج به تصدیق هویت دارید."
 
-#: ../panels/display/cc-display-panel.c:575
+#: ../panels/display/cc-display-panel.c:573
 msgid "Lid Closed"
 msgstr "در بسته شد"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:576
 msgid "Mirrored"
 msgstr "آیینه‌ای"
 
-#: ../panels/display/cc-display-panel.c:580
-#: ../panels/display/cc-display-panel.c:2390
+#: ../panels/display/cc-display-panel.c:578
+#: ../panels/display/cc-display-panel.c:2429
 msgid "Primary"
 msgstr "اصلی"
 
-#: ../panels/display/cc-display-panel.c:582
+#: ../panels/display/cc-display-panel.c:580
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "خاموش"
 
-#: ../panels/display/cc-display-panel.c:585
+#: ../panels/display/cc-display-panel.c:583
 msgid "Secondary"
 msgstr "ثانویه"
 
 #. Title of displays dialog when multiple monitors are present.
-#: ../panels/display/cc-display-panel.c:1560
+#: ../panels/display/cc-display-panel.c:1558
 msgid "Arrange Combined Displays"
 msgstr "چینش نمایشگرهای تلفیق شده"
 
-#: ../panels/display/cc-display-panel.c:1564
-#: ../panels/display/cc-display-panel.c:2197
+#: ../panels/display/cc-display-panel.c:1562
+#: ../panels/display/cc-display-panel.c:2207
 #: ../panels/network/connection-editor/connection-editor.ui.h:2
 #: ../panels/network/network-wifi.ui.h:2
 msgid "_Apply"
 msgstr "_اِعمال"
 
-#: ../panels/display/cc-display-panel.c:1588
+#: ../panels/display/cc-display-panel.c:1586
 msgid "Drag displays to rearrange them"
 msgstr "نمایشگرها را بکشید تا چینش آنها را تغییر دهید"
 
 #. translators: example string is "60 Hz (NTSC)"
 #. * NTSC is https://en.wikipedia.org/wiki/NTSC
-#: ../panels/display/cc-display-panel.c:1794
+#: ../panels/display/cc-display-panel.c:1793
 #, c-format
 msgid "%d Hz (NTSC)"
 msgstr "%Id Hz (NTSC)"
 
 #. translators: example string is "60 Hz"
-#: ../panels/display/cc-display-panel.c:1800
+#: ../panels/display/cc-display-panel.c:1799
 #, c-format
 msgid "%d Hz"
 msgstr "%Id هرتز"
 
-#: ../panels/display/cc-display-panel.c:2246
+#: ../panels/display/cc-display-panel.c:2259
 msgid "Rotate counterclockwise by 90°"
 msgstr "چرخش پادساعتگرد °۹۰"
 
-#: ../panels/display/cc-display-panel.c:2264
+#: ../panels/display/cc-display-panel.c:2277
 msgid "Rotate by 180°"
 msgstr "چرخش °۱۸۰"
 
-#: ../panels/display/cc-display-panel.c:2282
+#: ../panels/display/cc-display-panel.c:2295
 msgid "Rotate clockwise by 90°"
 msgstr "چرخش ساعتگرد °۹۰"
 
-#: ../panels/display/cc-display-panel.c:2303
+#: ../panels/display/cc-display-panel.c:2316
 msgid "Size"
 msgstr "اندازه"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2331
 msgid "Aspect Ratio"
 msgstr "نسبت طول به عرض"
 
-#: ../panels/display/cc-display-panel.c:2338
+#: ../panels/display/cc-display-panel.c:2354
 #: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "تفکیک‌پذیری"
 
-#: ../panels/display/cc-display-panel.c:2360
+#: ../panels/display/cc-display-panel.c:2374
+msgid "Adjust for TV"
+msgstr "تنظیم برای تلویزیون"
+
+#: ../panels/display/cc-display-panel.c:2398
 msgid "Refresh Rate"
 msgstr "آهنگ نوسازی:"
 
-#: ../panels/display/cc-display-panel.c:2391
+#: ../panels/display/cc-display-panel.c:2430
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "نمایش نوار بالایی و نمای‌کلی فعالیت‌ها در این نمایشگر"
 
-#: ../panels/display/cc-display-panel.c:2397
+#: ../panels/display/cc-display-panel.c:2436
 msgid "Secondary Display"
 msgstr "نمایشگر ثانویه"
 
-#: ../panels/display/cc-display-panel.c:2398
+#: ../panels/display/cc-display-panel.c:2437
 msgid "Join this display with another to create an extra workspace"
 msgstr "ادغام این نمایشگر با دیگری جهت ساخت "
 
-#: ../panels/display/cc-display-panel.c:2405
+#: ../panels/display/cc-display-panel.c:2444
 msgid "Presentation"
 msgstr "ارائه"
 
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2445
 msgid "Show slideshows and media only"
 msgstr "فقط نمایش اسلایدها و رسانه"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2411
+#: ../panels/display/cc-display-panel.c:2450
 msgid "Mirror"
 msgstr "آینه"
 
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2451
 msgid "Show your existing view on both displays"
 msgstr "نمایش نمای موجود در هر دو نمایشگر"
 
-#: ../panels/display/cc-display-panel.c:2418
+#: ../panels/display/cc-display-panel.c:2457
 msgid "Turn Off"
 msgstr "خاموش کردن"
 
-#: ../panels/display/cc-display-panel.c:2419
+#: ../panels/display/cc-display-panel.c:2458
 msgid "Don't use this display"
 msgstr "از این نمایشگر استفاده نکن"
 
-#: ../panels/display/cc-display-panel.c:2722
+#: ../panels/display/cc-display-panel.c:2769
 msgid "Could not get screen information"
 msgstr "نمی‌توان اطلاعات صفحه‌نمایش را دریافت کرد"
 
-#: ../panels/display/cc-display-panel.c:2753
+#: ../panels/display/cc-display-panel.c:2800
 msgid "_Arrange Combined Displays"
 msgstr "_چینش نمایشگرهای تلفیق شده"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:1
-msgid "Displays"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+msgid "Dis­plays"
 msgstr "نمایشگرها"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
 msgid "Choose how to use connected monitors and projectors"
 msgstr "نحوه استفاده از نمایشگرها و پروژکتورهای متصل شده را انتخاب کنید"
 
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:4
+#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr "تابلو;پروژکتور;xrandr;نمایشگر;تفکیک‌پذیری;نوسازی;"
 
-#: ../panels/info/cc-info-panel.c:385
+#: ../panels/info/cc-info-panel.c:345
 msgid "Wayland"
 msgstr "Wayland"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../panels/info/cc-info-panel.c:473
+#: ../panels/info/cc-info-panel.c:481
+#, c-format
+msgid "%s %d-bit (Build ID: %s)"
+msgstr "%s %d-bit (شناسه ساخت: %s)"
+
+#: ../panels/info/cc-info-panel.c:483
+#, c-format
+msgid "%d-bit (Build ID: %s)"
+msgstr "%d-bit (شناسه ساخت: %s)"
+
+#: ../panels/info/cc-info-panel.c:491
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %Id بیت"
 
-#: ../panels/info/cc-info-panel.c:475
+#: ../panels/info/cc-info-panel.c:493
 #, c-format
 msgid "%d-bit"
 msgstr "%Id بیت"
 
-#: ../panels/info/cc-info-panel.c:1155
+#: ../panels/info/cc-info-panel.c:1174
 msgid "Ask what to do"
 msgstr "بپرس چه باید کرد"
 
-#: ../panels/info/cc-info-panel.c:1159
+#: ../panels/info/cc-info-panel.c:1178
 msgid "Do nothing"
 msgstr "کاری نکن"
 
-#: ../panels/info/cc-info-panel.c:1163
+#: ../panels/info/cc-info-panel.c:1182
 msgid "Open folder"
 msgstr "پوشه‌ را باز کن"
 
-#: ../panels/info/cc-info-panel.c:1254
+#: ../panels/info/cc-info-panel.c:1273
 msgid "Other Media"
 msgstr "رسانه‌های دیگر"
 
-#: ../panels/info/cc-info-panel.c:1285
+#: ../panels/info/cc-info-panel.c:1304
 msgid "Select an application for audio CDs"
 msgstr "یک برنامه‌ برای پخش سی‌دی‌های صوتی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1286
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Select an application for video DVDs"
 msgstr "یک برنامه‌ برای پخش دی‌وی‌دی‌های ویدیویی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1287
+#: ../panels/info/cc-info-panel.c:1306
 msgid "Select an application to run when a music player is connected"
 msgstr ""
 "یک برنامه برای اجرا جهت زمانی که یک پخش‌کننده موسیقی متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1288
+#: ../panels/info/cc-info-panel.c:1307
 msgid "Select an application to run when a camera is connected"
 msgstr "یک برنامه برای اجرا جهت زمانی که یک دوربین متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1289
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Select an application for software CDs"
 msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار انتخاب کن"
 
@@ -1292,87 +1308,86 @@ msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار 
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1301
+#: ../panels/info/cc-info-panel.c:1320
 msgid "audio DVD"
 msgstr "دی‌وی‌دی صوتی"
 
-#: ../panels/info/cc-info-panel.c:1302
+#: ../panels/info/cc-info-panel.c:1321
 msgid "blank Blu-ray disc"
 msgstr "دیسک بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1303
+#: ../panels/info/cc-info-panel.c:1322
 msgid "blank CD disc"
 msgstr "دیسک سی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1304
+#: ../panels/info/cc-info-panel.c:1323
 msgid "blank DVD disc"
 msgstr "دیسک دی‌وی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1305
+#: ../panels/info/cc-info-panel.c:1324
 msgid "blank HD DVD disc"
 msgstr "دیسک دی‌وی‌دی اچ‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1306
+#: ../panels/info/cc-info-panel.c:1325
 msgid "Blu-ray video disc"
 msgstr "دیسک ویدئویی بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1307
+#: ../panels/info/cc-info-panel.c:1326
 msgid "e-book reader"
 msgstr "کتاب الکترونیکی خوان"
 
-#: ../panels/info/cc-info-panel.c:1308
+#: ../panels/info/cc-info-panel.c:1327
 msgid "HD DVD video disc"
 msgstr "دیسک ویدئویی دی‌وی‌دی اچ‌دی"
 
-#: ../panels/info/cc-info-panel.c:1309
+#: ../panels/info/cc-info-panel.c:1328
 msgid "Picture CD"
 msgstr "سی‌دی تصویر"
 
-#: ../panels/info/cc-info-panel.c:1310
+#: ../panels/info/cc-info-panel.c:1329
 msgid "Super Video CD"
 msgstr "سی‌دی ویدئویی برتر"
 
-#: ../panels/info/cc-info-panel.c:1311
+#: ../panels/info/cc-info-panel.c:1330
 msgid "Video CD"
 msgstr "سی‌دی ویدیویی"
 
-#: ../panels/info/cc-info-panel.c:1312
+#: ../panels/info/cc-info-panel.c:1331
 msgid "Windows software"
 msgstr "نرم‌افزار ویندوز"
 
-#: ../panels/info/cc-info-panel.c:1435 ../panels/keyboard/keyboard-shortcuts.c:1949
+#: ../panels/info/cc-info-panel.c:1454
 msgid "Section"
 msgstr "بخش"
 
-#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14
+#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "مرور کلی"
 
-#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21
+#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "برنامه‌های پیش‌فرض"
 
-#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29
+#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "رسانه‌های جدا شدنی"
 
-#: ../panels/info/cc-info-panel.c:1480
+#: ../panels/info/cc-info-panel.c:1499
 #, c-format
 msgid "Version %s"
 msgstr "نسخه %s"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#: ../panels/network/connection-editor/ce-page-details.c:240
-#: ../panels/network/network-wifi.ui.h:46
-msgid "Details"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "De­tails"
 msgstr "جزئیات"
 
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
 msgid "View information about your system"
 msgstr "نمایش اطلاعات مربوط به سیستم شما"
 
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
 msgid ""
 "device;system;information;memory;processor;version;default;application;preferred;"
 "cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1546,8 +1561,9 @@ msgstr "راه‌اندازها"
 msgid "Launch help browser"
 msgstr "راه‌اندازی مرورگر راهنما"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606
-#: ../shell/gnome-control-center.desktop.in.in.h:1
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274
+#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584
+#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
 msgid "Settings"
 msgstr "تنظیمات"
 
@@ -1620,7 +1636,6 @@ msgid "Lock screen"
 msgstr "قفل‌کردن صفحه‌نمایش"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:1
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1
 msgid "Universal Access"
 msgstr "دسترسی همگانی"
 
@@ -1656,12 +1671,22 @@ msgstr "کاهش اندازه متن"
 msgid "High contrast on or off"
 msgstr "روشن یا خاموش کردن سایه روشن"
 
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#: ../panels/keyboard/cc-keyboard-manager.c:514
+#: ../panels/keyboard/cc-keyboard-manager.c:522
+#: ../panels/keyboard/cc-keyboard-manager.c:830
+msgid "Custom Shortcuts"
+msgstr "میان‌برهای سفارشی"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/cc-keyboard-option.c:276
 #: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:1220
-#: ../panels/network/network-wifi.ui.h:31
+#: ../panels/keyboard/keyboard-shortcuts.c:440
+#: ../panels/keyboard/shortcut-editor.ui.h:2 ../panels/network/network-wifi.ui.h:31
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
 #: ../panels/user-accounts/um-fingerprint-dialog.c:213
 msgid "Disabled"
@@ -1687,125 +1712,132 @@ msgstr "کلید‌های ایجاد"
 msgid "Modifiers-only switch to next source"
 msgstr "کلید Modifiers-only تعویض به منبع بعدی"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-msgid "Keyboard"
-msgstr "صفحه‌کلید"
+#: ../panels/keyboard/cc-keyboard-panel.c:215
+msgid "Reset the shortcut to its default value"
+msgstr "تنظیم مجدد میان‌بر به مقدار پیش‌فرض"
+
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357
+#, c-format
+msgid ""
+"%s is already being used for <b>%s</b>. If you replace it, %s will be disabled"
+msgstr ""
+"مورد %s از قبل برای <b>%s</b> در حال استفاده بوده است. اگر آن را جایگزین کنید، "
+"%s غیرفعال خواهد شد"
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+msgid "Set Custom Shortcut"
+msgstr "تنظیم میان‌بر سفارشی"
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514
+#: ../panels/keyboard/shortcut-editor.ui.h:7
+msgid "Set Shortcut"
+msgstr "تنظیم میان‌بر"
 
+#. Setup the top label
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523
+#, c-format
+msgid "Enter new shortcut to change <b>%s</b>."
+msgstr "وارد کردن یک میان‌بر جدید برای تغییر <b>%s</b>."
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937
+msgid "Add Custom Shortcut"
+msgstr "اضافه کردن میان‌بر سفارشی"
+
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
+msgid "Key­board"
+msgstr "صفحه‌کلید"
+
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr "نمایش و تغییر میانبرهای صفحه‌کلید و تنظیم ترجیحات تایپ"
 
 #. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
 msgid "Shortcut;Repeat;Blink;"
 msgstr "میان‌بر;تکرار;چشمک;"
 
-# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "Custom Shortcut"
-msgstr "میان‌بر سفارشی"
-
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
-msgid "_Name:"
-msgstr "_نام:"
+msgid "No keyboard shortcut found"
+msgstr "هیچ میان‌بر صفحه‌کلیدی پیدا نشد"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
-msgid "C_ommand:"
-msgstr "_فرمان:"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+msgid "Try a different search"
+msgstr "یک جست‌وجو دیگر را امتحان کنید"
 
-# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
-msgid "Add Shortcut"
-msgstr "اضافه‌کردن میان‌بر"
+#: ../panels/keyboard/shortcut-editor.ui.h:1
+msgid "Press Esc to cancel."
+msgstr "برای لغو ESC را فشار دهید."
 
-# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
-msgid "Remove Shortcut"
-msgstr "حذف میان‌بر"
+#: ../panels/keyboard/shortcut-editor.ui.h:3
+#: ../panels/sound/gvc-mixer-dialog.c:1493
+#: ../panels/sound/gvc-sound-theme-chooser.c:564
+msgid "Name"
+msgstr "نام"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
-msgid ""
-"To edit a shortcut, click the row and hold down the new keys or press Backspace "
-"to clear."
-msgstr ""
-"برای ویرایش یک کلید میان‌بر، روی ردیف مربوط به آن کلیک کرده و یک ترکیب جدید تایپ "
-"کنید، و یا برای پاک‌کردن پس‌بر را فشار دهید."
+#: ../panels/keyboard/shortcut-editor.ui.h:4
+msgid "Command"
+msgstr "فرمان"
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#: ../panels/keyboard/keyboard-shortcuts.c:633
-#: ../panels/keyboard/keyboard-shortcuts.c:641
-msgid "Custom Shortcuts"
-msgstr "میان‌برهای سفارشی"
+#: ../panels/keyboard/shortcut-editor.ui.h:5
+msgid "Shortcut"
+msgstr "میان‌بر"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:858
-msgid "<Unknown Action>"
-msgstr "<کنش ناشناخته>"
+#: ../panels/keyboard/shortcut-editor.ui.h:6
+msgid "Edit"
+msgstr "ویرایش"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1359
-#, c-format
-msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time."
-msgstr ""
-"استفاده از میانبر «%s» به این دلیل که امکان تایپ به وسیله‌ی این کلید را غیرممکن "
-"می کند، امکان‌پذیر نیست.\n"
-"لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید."
+#: ../panels/keyboard/shortcut-editor.ui.h:8 ../panels/network/network-wifi.ui.h:20
+msgid "None"
+msgstr "هیچ‌کدام"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1389
-#, c-format
-msgid ""
-"The shortcut \"%s\" is already used for\n"
-"\"%s\""
-msgstr ""
-"میان‌بر «%s» قبلاً استفاده شده است برای:\n"
-"‏ «%s»"
+#: ../panels/keyboard/shortcut-editor.ui.h:9
+msgid "Remove"
+msgstr "حذف"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1394
-#, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد."
+#: ../panels/keyboard/shortcut-editor.ui.h:10
+msgid "Enter the new shortcut"
+msgstr "میان‌بر جدید را وارد کنید"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1400
-msgid "_Reassign"
-msgstr "_جای‌گذاری مجدد"
+#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+msgid "Cancel"
+msgstr "لغو"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1441
-#, c-format
-msgid ""
-"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
-"automatically set it to \"%s\"?"
-msgstr ""
-"میان‌بر «%s» یک میان‌بر مرتبط «%s» دارد. آیا مایلید به طور خودکار به «%s» تنظیم "
-"شود؟"
+#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: ../panels/network/connection-editor/ce-page-ip4.c:276
+#: ../panels/network/connection-editor/ce-page-ip6.c:277
+msgid "Add"
+msgstr "اضافه کردن"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1451
-#, c-format
-msgid ""
-"\"%s\" is currently associated with \"%s\", this shortcut will be disabled if "
-"you move forward."
-msgstr ""
-"درحال حاضر «%s» به «%s» وابسته است، اگر پیشروی کنید این میان‌بر غیرفعال خواهد شد."
+#: ../panels/keyboard/shortcut-editor.ui.h:13
+msgid "Replace"
+msgstr "جای‌گزینی"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1458
-msgid "_Assign"
-msgstr "_جای‌گذاری"
+#: ../panels/keyboard/shortcut-editor.ui.h:14
+msgid "Set"
+msgstr "تنظیم"
 
 #: ../panels/mouse/cc-mouse-panel.c:82
 msgid "Test Your _Settings"
 msgstr "آزمایش _تنظیمات شما"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse & Touchpad"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+msgid "Mouse & Touch­pad"
 msgstr "موشی و صفحه‌لمسی"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
 msgid "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr "تغییر میزان حساسیت موشی یا صفحه‌لمسی و انتخاب راست دست یا چپ دست بودن"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
+#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;صفحه ردیاب;لغزش;"
 
@@ -1863,6 +1895,10 @@ msgid "Tap to Click"
 msgstr "ضربه جهت کلیک"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
+msgid "Two-finger Scrolling"
+msgstr "لغزش دو-انگشتی"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Edge Scrolling"
 msgstr "لغزش در گوشه‌ها"
 
@@ -1900,11 +1936,11 @@ msgstr "یکبار کلیک، دکمه دومی"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:358
+#: ../panels/network/cc-network-panel.c:349
 msgid "Air_plane Mode"
 msgstr "حالت _هواپیمایی"
 
-#: ../panels/network/cc-network-panel.c:967
+#: ../panels/network/cc-network-panel.c:953
 msgid "Network proxy"
 msgstr "پیشکار شبکه"
 
@@ -1912,17 +1948,17 @@ msgstr "پیشکار شبکه"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
-#: ../panels/network/net-vpn.c:432
+#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283
+#: ../panels/network/net-vpn.c:440
 #, c-format
 msgid "%s VPN"
 msgstr "وی‌پی‌ان %s"
 
-#: ../panels/network/cc-network-panel.c:1300
+#: ../panels/network/cc-network-panel.c:1194
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "اوه، به نظر مشکلی پیش آمده.لطفا با تولید کننده نرم‌افزار خود تماس بگیرید."
 
-#: ../panels/network/cc-network-panel.c:1306
+#: ../panels/network/cc-network-panel.c:1200
 msgid "NetworkManager needs to be running."
 msgstr "لازم است NetworkManager در حال اجرا باشد."
 
@@ -1938,7 +1974,7 @@ msgstr "صفحه ۱"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:4
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
 msgid "Anony_mous identity"
@@ -1955,56 +1991,61 @@ msgstr "_تاییدهویت داخلی"
 msgid "page 2"
 msgstr "صفحه ۲"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
-#: ../panels/network/connection-editor/ce-page-security.c:469
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
+#: ../panels/network/connection-editor/ce-page-security.c:459
 #: ../panels/network/connection-editor/details-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:6
 msgid "Security"
 msgstr "امنیت"
 
-#: ../panels/network/connection-editor/ce-page.c:507
+#: ../panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "خودکار"
 
+#: ../panels/network/connection-editor/ce-page.c:521
+#, c-format
+msgid "Profile %d"
+msgstr "مجموعه‌تنظیمات %Id"
+
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:219 ../panels/network/net-device-wifi.c:395
+#: ../panels/network/connection-editor/ce-page-details.c:50
+#: ../panels/network/net-device-wifi.c:214 ../panels/network/net-device-wifi.c:390
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:223 ../panels/network/net-device-wifi.c:400
+#: ../panels/network/connection-editor/ce-page-details.c:54
+#: ../panels/network/net-device-wifi.c:218 ../panels/network/net-device-wifi.c:395
 #: ../panels/network/network-wifi.ui.h:19
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:227
+#: ../panels/network/connection-editor/ce-page-details.c:58
+#: ../panels/network/net-device-wifi.c:222
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:232
+#: ../panels/network/connection-editor/ce-page-details.c:63
+#: ../panels/network/net-device-wifi.c:227
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:237 ../panels/network/net-device-wifi.c:385
+#: ../panels/network/connection-editor/ce-page-details.c:68
+#: ../panels/network/net-device-wifi.c:232 ../panels/network/net-device-wifi.c:380
 msgctxt "Wifi security"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/network/connection-editor/ce-page-details.c:89
 #: ../panels/power/power.ui.h:17
 msgid "Never"
 msgstr "هرگز"
 
-#: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:489
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:485
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2012,178 +2053,178 @@ msgstr[0] "%Ii روز قبل"
 msgstr[1] "%Ii روز قبل"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:546
+#: ../panels/network/connection-editor/ce-page-details.c:153
+#: ../panels/network/net-device-ethernet.c:50
+#: ../panels/network/net-device-wifi.c:542
 #, c-format
 msgid "%d Mb/s"
 msgstr "%Id مگابیت/ثانیه"
 
-#: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/connection-editor/ce-page-details.c:179
+#: ../panels/network/net-device-wifi.c:571
 msgctxt "Signal strength"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:577
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:573
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "ضعیف"
 
-#: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:579
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:575
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "کافی"
 
-#: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:581
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:577
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "خوب"
 
-#: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:583
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:579
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "عالی"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:226
-#: ../panels/network/connection-editor/ce-page-vpn.c:220
-#: ../panels/network/connection-editor/ce-page-wifi.c:262
+#: ../panels/network/connection-editor/ce-page-details.c:225
+#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266
+msgid "Details"
+msgstr "جزئیات"
+
+#: ../panels/network/connection-editor/ce-page-ethernet.c:215
+#: ../panels/network/connection-editor/ce-page-vpn.c:221
+#: ../panels/network/connection-editor/ce-page-wifi.c:227
 #: ../panels/network/network-wifi.ui.h:47
 msgid "Identity"
 msgstr "هویت"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:177
-#: ../panels/network/connection-editor/ce-page-ip4.c:439
-#: ../panels/network/connection-editor/ce-page-ip6.c:179
-#: ../panels/network/connection-editor/ce-page-ip6.c:443
+#: ../panels/network/connection-editor/ce-page-ip4.c:178
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:180
+#: ../panels/network/connection-editor/ce-page-ip6.c:427
 msgid "Address"
 msgstr "آدرس"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:190
-#: ../panels/network/connection-editor/ce-page-ip4.c:452
+#: ../panels/network/connection-editor/ce-page-ip4.c:191
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
 msgid "Netmask"
 msgstr "ماسک شبکه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:204
-#: ../panels/network/connection-editor/ce-page-ip4.c:465
-#: ../panels/network/connection-editor/ce-page-ip6.c:205
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip4.c:205
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:206
+#: ../panels/network/connection-editor/ce-page-ip6.c:453
 #: ../panels/network/network-vpn.ui.h:2
 msgid "Gateway"
 msgstr "دروازه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
+#: ../panels/network/connection-editor/ce-page-ip4.c:222
+#: ../panels/network/connection-editor/ce-page-ip6.c:223
 msgid "Delete Address"
 msgstr "حذف آدرس"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:275
-#: ../panels/network/connection-editor/ce-page-ip6.c:276
-msgid "Add"
-msgstr "اضافه کردن"
-
-#: ../panels/network/connection-editor/ce-page-ip4.c:343
-#: ../panels/network/connection-editor/ce-page-ip6.c:347
+#: ../panels/network/connection-editor/ce-page-ip4.c:339
+#: ../panels/network/connection-editor/ce-page-ip6.c:334
 msgid "Server"
 msgstr "کارگزار"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:356
+#: ../panels/network/connection-editor/ce-page-ip6.c:351
 msgid "Delete DNS Server"
 msgstr "حذف کارگزار دی‌ان‌اس"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:479
-#: ../panels/network/connection-editor/ce-page-ip6.c:487
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:467
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "متریک"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:500
-#: ../panels/network/connection-editor/ce-page-ip6.c:508
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:484
 msgid "Delete Route"
 msgstr "حذف مسیر"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:615
+#: ../panels/network/connection-editor/ce-page-ip4.c:597
 #: ../panels/network/network-wifi.ui.h:27
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:619
-#: ../panels/network/connection-editor/ce-page-ip6.c:621
-#: ../panels/network/network-wifi.ui.h:26 ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/network/connection-editor/ce-page-ip4.c:601
+#: ../panels/network/connection-editor/ce-page-ip6.c:592
+#: ../panels/network/network-wifi.ui.h:26 ../panels/privacy/cc-privacy-panel.c:217
 msgid "Manual"
 msgstr "دستی"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:623
-#: ../panels/network/connection-editor/ce-page-ip6.c:625
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
+#: ../panels/network/connection-editor/ce-page-ip6.c:596
 msgid "Link-Local Only"
 msgstr "فقط Link-Local"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:967
+#: ../panels/network/connection-editor/ce-page-ip4.c:935
 #: ../panels/network/network-wifi.ui.h:48
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:192
-#: ../panels/network/connection-editor/ce-page-ip6.c:456
+#: ../panels/network/connection-editor/ce-page-ip6.c:193
+#: ../panels/network/connection-editor/ce-page-ip6.c:440
 msgid "Prefix"
 msgstr "پیشوند"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:584
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:199
+#: ../panels/privacy/cc-privacy-panel.c:217
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:617
+#: ../panels/network/connection-editor/ce-page-ip6.c:588
 msgid "Automatic, DHCP only"
 msgstr "خودکار، فقط DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:937
+#: ../panels/network/connection-editor/ce-page-ip6.c:898
 #: ../panels/network/network-wifi.ui.h:49
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/connection-editor/ce-page-reset.c:78
 #: ../panels/network/network-wifi.ui.h:51
 msgid "Reset"
 msgstr "تنظیم مجدد"
 
-#: ../panels/network/connection-editor/ce-page-security.c:253
+#: ../panels/network/connection-editor/ce-page-security.c:248
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/network/connection-editor/ce-page-security.c:276
+#: ../panels/network/connection-editor/ce-page-security.c:271
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید WEP 40/128 بیت (Hex یا ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:286
+#: ../panels/network/connection-editor/ce-page-security.c:281
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت‌رمز ۱۲۸ بیت WEP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:299
-#: ../panels/network/wireless-security/wireless-security.c:409
+#: ../panels/network/connection-editor/ce-page-security.c:294
+#: ../panels/network/wireless-security/wireless-security.c:463
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:312
+#: ../panels/network/connection-editor/ce-page-security.c:307
 msgid "Dynamic WEP (802.1x)"
 msgstr "‫WEP پویا (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:326
+#: ../panels/network/connection-editor/ce-page-security.c:321
 msgid "WPA & WPA2 Personal"
 msgstr "‫WPA و WPA2 شخصی"
 
-#: ../panels/network/connection-editor/ce-page-security.c:340
+#: ../panels/network/connection-editor/ce-page-security.c:335
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
@@ -2198,28 +2239,28 @@ msgid "Link speed"
 msgstr "سرعت پیوند"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:157
+#: ../panels/network/net-device-ethernet.c:153
 #: ../panels/network/network-simple.ui.h:3 ../panels/network/network-wifi.ui.h:7
-#: ../panels/network/panel-common.c:695
+#: ../panels/network/panel-common.c:644
 msgid "IPv4 Address"
 msgstr "نشانی آی‌پی ن۴"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:154
 #: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:4 ../panels/network/network-simple.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696
+#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
 msgid "IPv6 Address"
 msgstr "نشانی آی‌پی ن۶"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:165
+#: ../panels/network/net-device-ethernet.c:161
 #: ../panels/network/network-simple.ui.h:2 ../panels/network/network-wifi.ui.h:9
 msgid "Hardware Address"
 msgstr "نشانی سخت‌افزار"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:169
+#: ../panels/network/net-device-ethernet.c:165
 #: ../panels/network/network-mobile.ui.h:5 ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Default Route"
@@ -2228,7 +2269,7 @@ msgstr "مسیر پیش‌فرض"
 #: ../panels/network/connection-editor/details-page.ui.h:8
 #: ../panels/network/connection-editor/ip4-page.ui.h:3
 #: ../panels/network/connection-editor/ip6-page.ui.h:3
-#: ../panels/network/net-device-ethernet.c:171
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:6 ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:11
 msgid "DNS"
@@ -2310,13 +2351,13 @@ msgstr "اتصال _خودکار"
 msgid "Firewall _Zone"
 msgstr "_منطقه دیوارآتشین"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:48
-#: ../panels/network/connection-editor/firewall-helpers.c:113
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:118
 msgctxt "Firewall zone"
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: ../panels/network/connection-editor/firewall-helpers.c:49
+#: ../panels/network/connection-editor/firewall-helpers.c:50
 msgid "The zone defines the trust level of the connection"
 msgstr "منطقه سطح اعتماد به اتصال را تعیین می‌کند"
 
@@ -2358,45 +2399,25 @@ msgstr "از این اتصال _تنها برای منابع روی شبکه‌
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:275
+#: ../panels/network/connection-editor/net-connection-editor.c:296
 msgid "Unable to open connection editor"
 msgstr "نمی‌توان ویرایشگر اتصال را باز کرد"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:293
+#: ../panels/network/connection-editor/net-connection-editor.c:314
 msgid "New Profile"
 msgstr "مجموعه‌تنظیمات جدید"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:635
 msgid "VPN"
 msgstr "وی‌پی‌ان"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr "Bond"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-msgid "Team"
-msgstr "گروه"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "Bridge"
-msgstr "Bridge"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:589
-msgid "VLAN"
-msgstr "VLAN"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:740
-msgid "Could not load VPN plugins"
-msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:809
+#: ../panels/network/connection-editor/net-connection-editor.c:783
 msgid "Import from file…"
 msgstr "وارد کردن از پرونده..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:880
-msgid "Add Network Connection"
-msgstr "اضافه کردن اتصال شبکه"
+#: ../panels/network/connection-editor/net-connection-editor.c:817
+msgid "Add VPN"
+msgstr "اضافه کردن وی‌پی‌ان"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:41
@@ -2404,7 +2425,7 @@ msgid "_Reset"
 msgstr "_تنظیم مجدد"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1482 ../panels/network/network-wifi.ui.h:42
+#: ../panels/network/net-device-wifi.c:1536 ../panels/network/network-wifi.ui.h:42
 msgid "_Forget"
 msgstr "_فراموش کردن"
 
@@ -2427,11 +2448,11 @@ msgstr "حذف تمام جزئیات مرتبط به این شبکه و سعی 
 msgid "S_ecurity"
 msgstr "_امنیت"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:210
+#: ../panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "نمی‌توان اتصال وی‌پی‌ان را وارد کرد"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:212
+#: ../panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN connection "
@@ -2443,37 +2464,37 @@ msgstr ""
 "\n"
 "خطا: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:247
+#: ../panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "برای وارد کردن یک پرونده انتخاب کنید"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:251
-#: ../panels/printers/cc-printers-panel.c:2053
+#: ../panels/network/connection-editor/vpn-helpers.c:182
+#: ../panels/printers/cc-printers-panel.c:2077
 #: ../panels/sharing/cc-sharing-panel.c:373
 #: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "_Open"
 msgstr "_بازکردن"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:299
+#: ../panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "یک پرونده با نام «%s» از قبل وجود دارد."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:301
+#: ../panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_جای‌گزینی"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:303
+#: ../panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "آیا می‌خواهید که %s را با اتصال وی‌پی‌ان که درحال ذخیره آن هستید جای‌گزین کنید؟"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:339
+#: ../panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "نمی‌توان اتصال وی‌پی‌ان را صادر کرد"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:341
+#: ../panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2484,7 +2505,7 @@ msgstr ""
 "\n"
 "خطا: %s"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:376
+#: ../panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
@@ -2511,61 +2532,45 @@ msgstr "شبکه خانگی من"
 msgid "Make available to _other users"
 msgstr "در دسترس قراردادن برای کاربران _دیگر"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Net­work"
 msgstr "شبکه"
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:3
 msgid "Control how you connect to the Internet"
 msgstr "اینکه چطور به اینترنت متصل می‌شوید را کنترل کنید"
 
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
 msgid ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;"
-"bridge;bond;DNS;"
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
 msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;"
-"bridge;bond;DNS;شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;وی پی "
-"ان;دی ان اس;"
-
-#: ../panels/network/net-device-bond.c:77
-msgid "Bond slaves"
-msgstr "Bond slaves"
-
-#: ../panels/network/net-device-bond.c:102
-#: ../panels/network/net-device-bridge.c:102
-#: ../panels/network/net-device-team.c:102
-msgid "(none)"
-msgstr "(هیچ)"
-
-#: ../panels/network/net-device-bridge.c:77
-msgid "Bridge slaves"
-msgstr "Bridge slaves"
-
-#: ../panels/network/net-device-ethernet.c:110
-#: ../panels/network/net-device-wifi.c:475
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;"
+"شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;وی پی ان;دی ان اس;"
+
+#: ../panels/network/net-device-ethernet.c:106
+#: ../panels/network/net-device-wifi.c:471
 msgid "never"
 msgstr "هرگز"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/net-device-ethernet.c:116
+#: ../panels/network/net-device-wifi.c:481
 msgid "today"
 msgstr "امروز"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:487
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:483
 msgid "yesterday"
 msgstr "دیروز"
 
-#: ../panels/network/net-device-ethernet.c:160
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698
-#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13
+#: ../panels/network/net-device-ethernet.c:156
+#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
+#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "آی‌پی"
 
-#: ../panels/network/net-device-ethernet.c:176
+#: ../panels/network/net-device-ethernet.c:172
 #: ../panels/network/network-wifi.ui.h:12
 msgid "Last used"
 msgstr "آخرین استفاده"
@@ -2575,34 +2580,25 @@ msgstr "آخرین استفاده"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:286
+#: ../panels/network/net-device-ethernet.c:280
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "سیمی"
 
-#: ../panels/network/net-device-ethernet.c:354
-#: ../panels/network/net-device-wifi.c:1640
+#: ../panels/network/net-device-ethernet.c:348
+#: ../panels/network/net-device-wifi.c:1694
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8 ../panels/network/network-simple.ui.h:8
 #: ../panels/network/network-vpn.ui.h:7
 msgid "Options…"
 msgstr "گزینه‌ها..."
 
-#: ../panels/network/net-device-ethernet.c:473
-#, c-format
-msgid "Profile %d"
-msgstr "مجموعه‌تنظیمات %Id"
-
-#: ../panels/network/net-device-mobile.c:232
+#: ../panels/network/net-device-mobile.c:223
 msgid "Add new connection"
 msgstr "اضافه کردن اتصال جدید"
 
-#: ../panels/network/net-device-team.c:77
-msgid "Team slaves"
-msgstr "برده‌های گروه"
-
-#: ../panels/network/net-device-wifi.c:1188
+#: ../panels/network/net-device-wifi.c:1205
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up a "
 "wireless hotspot to share the connection with others."
@@ -2610,35 +2606,35 @@ msgstr ""
 "اگر شما اتصالی به اینترنت غیر از اتصال بی‌سیم دارید، می‌توانید یک hotspot بی‌سیم "
 "راه‌اندازی کنید و آن را با دیگران به اشتراک بگذارید."
 
-#: ../panels/network/net-device-wifi.c:1192
+#: ../panels/network/net-device-wifi.c:1209
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "روشن کردن بی‌سیم شما را از <b>%s</b> قطع خواهد کرد."
 
-#: ../panels/network/net-device-wifi.c:1196
+#: ../panels/network/net-device-wifi.c:1213
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
 msgstr ""
 "امکان دسترسی به اینترنت از طریق بی‌سیم، هنگامی که hotspot فعال است، وجود ندارد."
 
-#: ../panels/network/net-device-wifi.c:1279
+#: ../panels/network/net-device-wifi.c:1296
 msgid "Stop hotspot and disconnect any users?"
 msgstr "توقع منبع اصلی و قطع ارتباط با کاربران؟"
 
-#: ../panels/network/net-device-wifi.c:1282
+#: ../panels/network/net-device-wifi.c:1299
 msgid "_Stop Hotspot"
 msgstr "_توقف منبع اصلی"
 
-#: ../panels/network/net-device-wifi.c:1346
+#: ../panels/network/net-device-wifi.c:1397
 msgid "System policy prohibits use as a Hotspot"
 msgstr "سیاست‌های سیستم استفاده از Hotspot را منع کرده است"
 
-#: ../panels/network/net-device-wifi.c:1349
+#: ../panels/network/net-device-wifi.c:1400
 msgid "Wireless device does not support Hotspot mode"
 msgstr "دستگاه بی‌سیم از حالت Hotspot پشتیبانی نمی‌کند"
 
-#: ../panels/network/net-device-wifi.c:1478
+#: ../panels/network/net-device-wifi.c:1532
 msgid ""
 "Network details for the selected networks, including passwords and any custom "
 "configuration will be lost."
@@ -2646,11 +2642,11 @@ msgstr ""
 "جزئیات شبکه برای شبکه‌های انتخاب شده، شامل گذرواژه‌ها و هرگونه پیکربندی سفارشی حذف "
 "خواهند شد."
 
-#: ../panels/network/net-device-wifi.c:1793
+#: ../panels/network/net-device-wifi.c:1842
 msgid "History"
 msgstr "تاریخچه"
 
-#: ../panels/network/net-device-wifi.c:1797
+#: ../panels/network/net-device-wifi.c:1846
 #: ../panels/printers/options-dialog.ui.h:2 ../panels/wacom/button-mapping.ui.h:2
 #: ../panels/wacom/cc-wacom-page.c:525
 #: ../panels/wacom/gnome-wacom-properties.ui.h:5
@@ -2658,7 +2654,7 @@ msgid "_Close"
 msgstr "_بستن"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1805
+#: ../panels/network/net-device-wifi.c:1854
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_فراموش کردن"
@@ -2693,6 +2689,10 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "فراهم‌کننده"
 
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "شبکه"
+
 #: ../panels/network/network-proxy.ui.h:1
 msgctxt "proxy method"
 msgid "None"
@@ -2799,15 +2799,11 @@ msgstr "جزئیات"
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
 #: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
 msgid "_Password"
 msgstr "_گذرواژه"
 
-#: ../panels/network/network-wifi.ui.h:20
-msgid "None"
-msgstr "هیچ‌کدام"
-
 #: ../panels/network/network-wifi.ui.h:21
 msgid "Show P_assword"
 msgstr "نمایش گ_ذرواژه"
@@ -2899,7 +2895,6 @@ msgid "_Connect to Hidden Network…"
 msgstr "اتصال به شبکه مخفی..."
 
 #: ../panels/network/network-wifi.ui.h:58
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "_History"
 msgstr "_تاریخچه"
 
@@ -2921,359 +2916,336 @@ msgstr "نوع حفاظت"
 
 #: ../panels/network/network-wifi.ui.h:63
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "Password"
 msgstr "گذرواژه"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: ../panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:135
+#: ../panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "زیرساخت"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
+#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "وضعیت ناشناس"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: ../panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "مدیریت نشده"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:159
+#: ../panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "موجود نیست"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "درحال اتصال"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "تصدیق هویت شکست خورد"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "متصل شده"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:181
+#: ../panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "درحال قطع ارتباط"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
+#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "اتصال شکست خورد"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "وضعیت ناشناس (ناپیدا)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "متصل نشده"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: ../panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "پیکربندی شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "پیکربندی IP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "پیکربندی IP منقضی شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: ../panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "رمزها لازم بودند، اما فراهم نشدند"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: ../panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "درخواست کننده 802.1x قطع شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "تنظیمات پیکربندی درخواست کننده 802.1x شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "درخواست کننده 802.1x شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "تصدیق‌هویت دروخواست کننده 802.1x مدت زیادی طول کشید"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: ../panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "شروع کارگزار PPP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: ../panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "سرویس PPP قطع شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: ../panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: ../panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "شروع کردن کارگیر DHCP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "خطا کارگیر DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "کارگیر DHCP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: ../panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "شروع کردن سرویس اتصالِ اشتراک گذاشته شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "سرویس اتصال به‌اشتراک گذاشته شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: ../panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "شروع سرویس AutoIP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "خطا سرویس AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "سرویس AutoIP شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: ../panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "خطِ مشغول"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: ../panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "بوق شماره‌گیری وجود ندارد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: ../panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "اتصال به هیچ فراهم‌کننده‌ای امکان‌پذیر نبود"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: ../panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "مهلت درخواست شماره‌گیری تمام شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: ../panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "تلاش برای شماره‌گیری شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: ../panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "مقداردهی اولیه مودم شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: ../panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "انتخاب APN مشخص شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: ../panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "درحال جست‌وجو برای شبکه‌ها نیست"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: ../panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "ثبت شبکه رد شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: ../panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "مهلت ثبت شبکه تمام شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: ../panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "ثبت از طریق شبکه درخواست شده شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: ../panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "بررسی پین شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: ../panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "ممکن است میان‌افزار مربوط به دستگاه موجود نباشد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: ../panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "اتصال محو شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: ../panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "اتصال فعلی استفاده شد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: ../panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "مودم پیدا نشد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: ../panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "اتصال بلوتوث شکست خورد"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: ../panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "کارت SIM وارد نشده است"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: ../panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "کد پین SIM لازم است"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: ../panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "کد پاک SIM لازم است"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: ../panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM نادرست"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:412
-msgid "InfiniBand device does not support connected mode"
-msgstr "دستگاه InfiniBand از حالت متصل شده پشتیبانی نمی‌کند"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:416
+#: ../panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "نیازمندی‌های اتصال شکست خورد"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:440
+#: ../panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "میان‌افزار موجود نیست"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+#: ../panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "کابل قطع شد"
 
-#: ../panels/network/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "هیچ گواهینامه‌ای برای مرجع گواهینامه انتخاب نشد"
-
-#: ../panels/network/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections to "
-"insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"استفاده نکردن از گواهینامه‌ی مرجع گواهینامه (CA) می‌تواند باعث اتصال به یک شبکه‌ی "
-"وای‌فای خطرناک و ناامن شود. آیا مایلید یک گواهینامه‌ی مرجع گواهینامه انتخاب کنید؟"
+#: ../panels/network/wireless-security/eap-method.c:69
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "خطا تعریف نشده در 802.1x (‫wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:281
-msgid "Ignore"
-msgstr "نادیده گرفتن"
+#: ../panels/network/wireless-security/eap-method.c:245
+msgid "no file selected"
+msgstr "هیچ پرونده‌ای انتخاب نشد"
 
-#: ../panels/network/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "انتخاب گواهینامه CA"
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid "unspecified error validating eap-method file"
+msgstr "خطا مشخص نشده در تایید اعتبار پرونده eap-method"
 
-#: ../panels/network/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "کلیدهای خصوصی DER، PEM یا PKCS#12 شامل ‪(*.der, *.pem, *.p12)"
+#: ../panels/network/wireless-security/eap-method.c:480
+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:648
+#: ../panels/network/wireless-security/eap-method.c:483
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "گواهینامه‌های DER یا PEM شامل ‪(*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:271
-#: ../panels/network/wireless-security/eap-method-peap.c:280
+#: ../panels/network/wireless-security/eap-method-fast.c:72
+msgid "missing EAP-FAST PAC file"
+msgstr "پرونده EAP-FAST PAC فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:268
+#: ../panels/network/wireless-security/eap-method-peap.c:302
+#: ../panels/network/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:287
-#: ../panels/network/wireless-security/eap-method-peap.c:246
-#: ../panels/network/wireless-security/eap-method-ttls.c:263
+#: ../panels/network/wireless-security/eap-method-fast.c:283
+#: ../panels/network/wireless-security/eap-method-peap.c:272
+#: ../panels/network/wireless-security/eap-method-ttls.c:288
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:409
+#: ../panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "یک پرونده PAC انتخاب کنید"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:416
+#: ../panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC شامل ‪(*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
-msgid "PAC _file"
-msgstr "_پرونده PAC"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-msgid "_Inner authentication"
-msgstr "تایید هویت _داخلی"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-msgid "PAC pro_visioning"
-msgstr "_تامین PAC"
-
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
@@ -3282,41 +3254,73 @@ msgstr "_تامین PAC"
 msgid " "
 msgstr " "
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "ناشناس"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "تایید هویت شده"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "هردو"
 
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file"
+msgstr "_پرونده PAC"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Inner authentication"
+msgstr "تایید هویت _داخلی"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "اجازه دادن برای آ_ماده‌سازی خودکار PAC"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:65
+msgid "missing EAP-LEAP username"
+msgstr "نام‌کاربری EAP-LEAP فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-leap.c:74
+msgid "missing EAP-LEAP password"
+msgstr "گذرواژه EAP-LEAP فراهم نشده"
+
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:4
 msgid "_Username"
 msgstr "نا_م کاربری"
 
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:4
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
 #: ../panels/network/wireless-security/ws-leap.ui.h:3
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "_نمایش گذرواژه"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:263
-#: ../panels/network/wireless-security/wireless-security.c:385
+#: ../panels/network/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "گواهینامه EAP-PEAP CA نامعتبر است: %s"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "گواهینامه EAP-PEAP CA نامعتبر است: هیچ گواهینامه‌ای مشخص نشده"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:287
+#: ../panels/network/wireless-security/eap-method-ttls.c:318
+#: ../panels/network/wireless-security/wireless-security.c:439
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:456
-#: ../panels/network/wireless-security/eap-method-ttls.c:350
+#: ../panels/network/wireless-security/eap-method-peap.c:381
+#: ../panels/network/wireless-security/eap-method-tls.c:501
+#: ../panels/network/wireless-security/eap-method-ttls.c:412
 msgid "Choose a Certificate Authority certificate"
 msgstr "یک گواهینامه‌ی مرجع گواهینامه (CA) انتخاب کنید"
 
@@ -3334,19 +3338,57 @@ msgstr "نسخه ۱"
 msgid "C_A certificate"
 msgstr "گواهینامه C_A"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+msgid "No CA certificate is _required"
+msgstr "به گواهینامه CA _نیازی نیست"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version"
 msgstr "_نسخه PEAP"
 
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "این گذرواژه را هربار _بپرس"
+#: ../panels/network/wireless-security/eap-method-simple.c:74
+msgid "missing EAP username"
+msgstr "نام‌کاربری EAP فراهم نشده"
+
+# ../capplets/common/gconf-property-editor.:c:183
+#: ../panels/network/wireless-security/eap-method-simple.c:87
+msgid "missing EAP password"
+msgstr "گذرواژه EAP وارد نشده"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:68
+msgid "missing EAP-TLS identity"
+msgstr "شناسه EAP-TLS فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:77
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "گواهینامه EAP-TLS CA نامعتبر است: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:282
+#: ../panels/network/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "گواهینامه EAP-TLS CA نامعتبر است: هیچ گواهینامه‌ای فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:95
+msgid "invalid EAP-TLS password: missing"
+msgstr "گذرواژه EAP-TLS نامعتبر است: فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:109
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "کلید خصوصی EAP-TLS نامعتبر است: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:119
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "گواهینامه کاربر EAP-TLS نامعتبر است: %s"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:316
 msgid "Unencrypted private keys are insecure"
 msgstr "کلیدهای خصوصی رمزنگاری نشده ناامن هستند"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:285
+#: ../panels/network/wireless-security/eap-method-tls.c:319
 msgid ""
 "The selected private key does not appear to be protected by a password.  This "
 "could allow your security credentials to be compromised.  Please select a "
@@ -3360,11 +3402,11 @@ msgstr ""
 "\n"
 "(شما می‌توانید به‌وسیله‌ی openssl برروی کلید خود گذرواژه بگذارید)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:450
+#: ../panels/network/wireless-security/eap-method-tls.c:495
 msgid "Choose your personal certificate"
 msgstr "گواهینامه شخصی خود را انتخاب کنید"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:462
+#: ../panels/network/wireless-security/eap-method-tls.c:507
 msgid "Choose your private key"
 msgstr "کلید خصوصی خود را انتخاب کنید"
 
@@ -3376,51 +3418,56 @@ msgstr "_هویت"
 msgid "_User certificate"
 msgstr "گواهینامه‌ی _کاربر"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key"
 msgstr "_کلید خصوصی"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password"
 msgstr "گذرواژه کلید _خصوصی"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:230
+#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "گواهینامه EAP-TTLS CA نامعتبر است: %s"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "گواهینامه EAP-TTLS CA نامعتبر است: هیچ گواهینامه‌ای فراهم نشده"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:247
+#: ../panels/network/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:280
+#: ../panels/network/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "دوباره به من _هشدار نده"
+#: ../panels/network/wireless-security/wireless-security.c:87
+msgid "Unknown error validating 802.1x security"
+msgstr "خطا ناشناس در تایید اعتبار 802.1x"
 
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "خیر"
-
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "بله"
-
-#: ../panels/network/wireless-security/wireless-security.c:397
+#: ../panels/network/wireless-security/wireless-security.c:451
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:421
+#: ../panels/network/wireless-security/wireless-security.c:475
+msgid "PWD"
+msgstr "PWD"
+
+#: ../panels/network/wireless-security/wireless-security.c:486
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:432
+#: ../panels/network/wireless-security/wireless-security.c:497
 msgid "Tunneled TLS"
 msgstr "‫TLS تونل شده"
 
-#: ../panels/network/wireless-security/wireless-security.c:443
+#: ../panels/network/wireless-security/wireless-security.c:508
 msgid "Protected EAP (PEAP)"
 msgstr "‫EAP محافظت شده (PEAP)"
 
@@ -3430,6 +3477,48 @@ msgstr "‫EAP محافظت شده (PEAP)"
 msgid "Au_thentication"
 msgstr "تایید_هویت"
 
+#: ../panels/network/wireless-security/ws-leap.c:63
+msgid "missing leap-username"
+msgstr "گزینه leap-username فراهم نشده است"
+
+# ../capplets/common/gconf-property-editor.:c:183
+#: ../panels/network/wireless-security/ws-leap.c:74
+msgid "missing leap-password"
+msgstr "گذرواژه leap وارد نشده"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:107
+msgid "missing wep-key"
+msgstr "گزینه wep-key فراهم نشده است"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:116
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr "گزینه wep-key نامعتبر است: کلیدی با طول %zu تنها باید شامل hex-digit باشد"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:124
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"گزینه hex-digits نامعتبر است: کلیدی با طول %zu باید شامل نویسه‌های ascii باشد"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:130
+#, c-format
+msgid ""
+"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
+"(ascii) or 10/26 (hex)"
+msgstr ""
+"گزینه wep-key نامعتبر: طول کلید نامعتبر %zu. یک کلید یا باید طول 5/13 (ascii) یا "
+"10/26 (hex) داشته باشد."
+
+#: ../panels/network/wireless-security/ws-wep-key.c:137
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "گزینه wep-key نامعتبر: عبارت‌رمز نباید خالی باشد"
+
+#: ../panels/network/wireless-security/ws-wep-key.c:139
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "گزینه wep-key نامعتبر: عبارت‌رمز باید کمتر از ۶۴ نویسه باشد"
+
 #: ../panels/network/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "۱ (پیش‌فرض)"
@@ -3466,19 +3555,31 @@ msgstr "_نمایش کلید"
 msgid "WEP inde_x"
 msgstr "_فهرست WEP"
 
+#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex digits"
+msgstr ""
+"گزینه wpa-psk نامعتبر: طول کلید نامعتبر %zu.باید یا [8,63] باید یا ۶۴ رقم hex "
+"باشد"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr "گزینه wpa-psk نامعتبر است: نمی‌توان کلید ۶۴ بایتی را به عنوان hex تفسیر کرد"
+
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type"
 msgstr "_نوع"
 
 #: ../panels/notifications/cc-notifications-panel.c:257
-#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940
-#: ../panels/privacy/cc-privacy-panel.c:172
-#: ../panels/privacy/cc-privacy-panel.c:239
+#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973
+#: ../panels/privacy/cc-privacy-panel.c:190
+#: ../panels/privacy/cc-privacy-panel.c:257
 #: ../panels/universal-access/cc-ua-panel.c:269
-#: ../panels/universal-access/cc-ua-panel.c:582
-#: ../panels/universal-access/cc-ua-panel.c:595
-#: ../panels/universal-access/cc-ua-panel.c:607
-#: ../panels/universal-access/cc-ua-panel.c:778
+#: ../panels/universal-access/cc-ua-panel.c:590
+#: ../panels/universal-access/cc-ua-panel.c:603
+#: ../panels/universal-access/cc-ua-panel.c:615
+#: ../panels/universal-access/cc-ua-panel.c:786
 msgid "On"
 msgstr "روشن"
 
@@ -3515,16 +3616,17 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "نمایش م_حتویات پیام در صفحه‌ی قفل"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
-msgid "Notifications"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "No­ti­fi­ca­tions"
 msgstr "اعلان‌ها"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
 msgid "Control which notifications are displayed and what they show"
 msgstr "کنترل کنید که چه اعلان‌هایی نمایش داده می‌شوند و چه چیزی نمایش می‌دهند"
 
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr "Notifications;Banner;Message;Tray;Popup;اعلانها;بنر;پیام;سینی;واشو;"
 
@@ -3542,79 +3644,68 @@ msgstr "اعلان‌های صفحه _قفل"
 msgid "Applications"
 msgstr "برنامه‌ها"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170
 msgctxt "Online Account"
 msgid "Other"
 msgstr "موارد دیگر"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "اضافه کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Mail"
 msgstr "پست‌الکترونیکی"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
+msgid "Calendar"
+msgstr "تقویم"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Contacts"
 msgstr "آشناها"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346
 msgid "Chat"
 msgstr "گپ"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352
 msgid "Resources"
 msgstr "منابع"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:422
-msgid "Error logging into the account"
-msgstr "خطا در هنگاک ورود به حساب"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:492
-msgid "Credentials have expired."
-msgstr "اعتبارنامه‌ها منقضی شده‌اند."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:496
-msgid "Sign in to enable this account."
-msgstr "وارد شوید تا این حساب فعال شود."
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:501
-msgid "_Sign In"
-msgstr "_ورود به سیستم"
-
-#: ../panels/online-accounts/cc-online-accounts-panel.c:748
+#: ../panels/online-accounts/cc-online-accounts-panel.c:640
 msgid "Error creating account"
 msgstr "خطا در ایجاد حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:808
+#: ../panels/online-accounts/cc-online-accounts-panel.c:700
 msgid "Error removing account"
 msgstr "خطا در هنگام حذف کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
+#: ../panels/online-accounts/cc-online-accounts-panel.c:736
 msgid "Are you sure you want to remove the account?"
 msgstr "آیا مطمئنید که می‌خواهید حساب را حذف کنید؟"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:846
+#: ../panels/online-accounts/cc-online-accounts-panel.c:738
 msgid "This will not remove the account on the server."
 msgstr "این کار حساب را بر روی کارگزار پاک نخواهد کرد."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:847
+#: ../panels/online-accounts/cc-online-accounts-panel.c:739
 msgid "_Remove"
 msgstr "_حذف"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-msgid "Online Accounts"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "On­line Accounts"
 msgstr "حساب‌های برخط"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "به حساب‌های برخط خود متصل شوید و تصمیم بگیرد چه استفاده‌ای از آنها بکنید"
 
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3627,6 +3718,7 @@ msgid "No online accounts configured"
 msgstr "هیچ حساب برخطی پیکربندی نشده است"
 
 #: ../panels/online-accounts/online-accounts.ui.h:3
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Remove Account"
 msgstr "حذف حساب"
 
@@ -3769,7 +3861,7 @@ msgstr "رایانه"
 
 #. TRANSLATORS: secondary battery, misc
 #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2252
+#: ../panels/power/cc-power-panel.c:2358
 msgid "Battery"
 msgstr "باتری"
 
@@ -3817,102 +3909,103 @@ msgstr "باتری‌ها"
 msgid "When _idle"
 msgstr "هنگام _بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1640
+#: ../panels/power/cc-power-panel.c:1680
 msgid "Power Saving"
 msgstr "صرفه‌جویی انرژی"
 
-#: ../panels/power/cc-power-panel.c:1675
+#: ../panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "روشنایی _صفحه‌نمایش"
 
-#: ../panels/power/cc-power-panel.c:1694
+#: ../panels/power/cc-power-panel.c:1734
 msgid "Automatic brightness"
 msgstr "روشنایی خودکار"
 
-#: ../panels/power/cc-power-panel.c:1714
+#: ../panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "روشنایی _صفحه‌کلید"
 
-#: ../panels/power/cc-power-panel.c:1724
+#: ../panels/power/cc-power-panel.c:1764
 msgid "_Dim screen when inactive"
 msgstr "_تیره کردن صفحه‌نمایش زمان بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1749
+#: ../panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "صفحه _خالی"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: ../panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_وای-فای"
 
-#: ../panels/power/cc-power-panel.c:1791
+#: ../panels/power/cc-power-panel.c:1831
 msgid "Turn off Wi-Fi to save power."
 msgstr "برای ذخیره انرژی وای-فای را خاموش کنید."
 
-#: ../panels/power/cc-power-panel.c:1816
+#: ../panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "پهن‌باند _موبایل"
 
-#: ../panels/power/cc-power-panel.c:1821
+#: ../panels/power/cc-power-panel.c:1861
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr ""
 "جهت ذخیره انرژی دستگاه‌های پهن‌باند همراه (3G، 4G، WiMax و...) را خاموش کنید."
 
-#: ../panels/power/cc-power-panel.c:1873
+#: ../panels/power/cc-power-panel.c:1906
 msgid "_Bluetooth"
 msgstr "_بلوتوث"
 
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:1962
 msgid "When on battery power"
 msgstr "هنگامی که روی انرژی باتری است"
 
-#: ../panels/power/cc-power-panel.c:1931
+#: ../panels/power/cc-power-panel.c:1964
 msgid "When plugged in"
 msgstr "زمان اتصال به برق"
 
-#: ../panels/power/cc-power-panel.c:2023
+#: ../panels/power/cc-power-panel.c:2059
 msgid "Suspend"
 msgstr "تعلیق"
 
-#: ../panels/power/cc-power-panel.c:2024
+#: ../panels/power/cc-power-panel.c:2060
 msgid "Hibernate"
 msgstr "خواب زمستانی"
 
-#: ../panels/power/cc-power-panel.c:2025
+#: ../panels/power/cc-power-panel.c:2061
 msgid "Nothing"
 msgstr "هیچکدام"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2074
+#: ../panels/power/cc-power-panel.c:2175
 msgid "Suspend & Power Button"
 msgstr "تعلیق و دکمه روشن"
 
-#: ../panels/power/cc-power-panel.c:2115
+#: ../panels/power/cc-power-panel.c:2218
 msgid "_Automatic suspend"
 msgstr "_تعلیق خودکار"
 
-#: ../panels/power/cc-power-panel.c:2116
+#: ../panels/power/cc-power-panel.c:2219
 msgid "Automatic suspend"
 msgstr "تعلیق خودکار"
 
-#: ../panels/power/cc-power-panel.c:2180
+#: ../panels/power/cc-power-panel.c:2286
 msgid "_When the Power Button is pressed"
 msgstr "_زمانی که کلید خاموش/روشن فشرده شد"
 
-#: ../panels/power/cc-power-panel.c:2306
+#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270
 msgid "Devices"
 msgstr "‌دستگاه‌ها"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:1
-msgid "Power"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+msgid "Po­wer"
 msgstr "انرژی"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
 msgid "View your battery status and change power saving settings"
 msgstr "وضعیت باتری خود را ببینید و تنظیمات صرفه‌جویی در انرژی را تغییر دهید"
 
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:4
+#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
@@ -3991,11 +4084,6 @@ msgstr "بر روی انرژی _باتری"
 msgid "Delay"
 msgstr "وقفه"
 
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-msgid "Cancel"
-msgstr "لغو"
-
 #: ../panels/printers/authentication-dialog.ui.h:3
 msgid "Authenticate"
 msgstr "تایید هویت"
@@ -4005,138 +4093,138 @@ msgid "Authentication Required"
 msgstr "تصدیق هویت لازم است"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:678
+#: ../panels/printers/cc-printers-panel.c:683
 msgid "Low on toner"
 msgstr "جوهر کم است"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:680
+#: ../panels/printers/cc-printers-panel.c:685
 msgid "Out of toner"
 msgstr "عدم وجود تونر"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:683
+#: ../panels/printers/cc-printers-panel.c:688
 msgid "Low on developer"
 msgstr "کمبود در سازنده"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:686
+#: ../panels/printers/cc-printers-panel.c:691
 msgid "Out of developer"
 msgstr "عدم وجود سازنده"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:688
+#: ../panels/printers/cc-printers-panel.c:693
 msgid "Low on a marker supply"
 msgstr "کمبود ذخیره محفظه رنگ"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:690
+#: ../panels/printers/cc-printers-panel.c:695
 msgid "Out of a marker supply"
 msgstr "عدم وجود ذخیره محفظه رنگ"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:692
+#: ../panels/printers/cc-printers-panel.c:697
 msgid "Open cover"
 msgstr "بازکردن پوشش"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:694
+#: ../panels/printers/cc-printers-panel.c:699
 msgid "Open door"
 msgstr "در را باز کن"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:696
+#: ../panels/printers/cc-printers-panel.c:701
 msgid "Low on paper"
 msgstr "کمبود کاغذ"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:698
+#: ../panels/printers/cc-printers-panel.c:703
 msgid "Out of paper"
 msgstr "عدم وجود کاغذ"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:700
+#: ../panels/printers/cc-printers-panel.c:705
 msgctxt "printer state"
 msgid "Offline"
 msgstr "برون‌خط"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:702
-#: ../panels/printers/cc-printers-panel.c:893
+#: ../panels/printers/cc-printers-panel.c:707
+#: ../panels/printers/cc-printers-panel.c:897
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "توقف کرده"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:704
+#: ../panels/printers/cc-printers-panel.c:709
 msgid "Waste receptacle almost full"
 msgstr "محفظه مواد زائد تقریبا پُر است"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:706
+#: ../panels/printers/cc-printers-panel.c:711
 msgid "Waste receptacle full"
 msgstr "محفظه مواد زائد پُر است"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:708
+#: ../panels/printers/cc-printers-panel.c:713
 msgid "The optical photo conductor is near end of life"
 msgstr "راهنمایِ نوریِ تصویر، نزدیک به اتمام است"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:710
+#: ../panels/printers/cc-printers-panel.c:715
 msgid "The optical photo conductor is no longer functioning"
 msgstr "راهنمای نوری تصویر، دیگر عملکردی ندارد"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:820
+#: ../panels/printers/cc-printers-panel.c:824
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "درحال پیکربندی"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:879
+#: ../panels/printers/cc-printers-panel.c:883
 msgctxt "printer state"
 msgid "Ready"
 msgstr "آماده"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:884
+#: ../panels/printers/cc-printers-panel.c:888
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "کاری قبول نمی‌کند"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:893
 msgctxt "printer state"
 msgid "Processing"
 msgstr "در حال پردازش"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:1009
+#: ../panels/printers/cc-printers-panel.c:1013
 msgid "Toner Level"
 msgstr "سطح تونر"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:1012
+#: ../panels/printers/cc-printers-panel.c:1016
 msgid "Ink Level"
 msgstr "سطح جوهر"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:1015
+#: ../panels/printers/cc-printers-panel.c:1019
 msgid "Supply Level"
 msgstr "سطح ذخیره"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:1033
+#: ../panels/printers/cc-printers-panel.c:1037
 msgctxt "printer state"
 msgid "Installing"
 msgstr "درحال نصب"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1541
+#: ../panels/printers/cc-printers-panel.c:1551
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -4144,63 +4232,60 @@ msgstr[0] "%Iu کار فعال"
 msgstr[1] "%Iu کار فعال"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1882
+#: ../panels/printers/cc-printers-panel.c:1892
 msgid "Failed to add new printer."
 msgstr "اضافه‌کردن چاپگر جدید شکست خورد."
 
-#: ../panels/printers/cc-printers-panel.c:2049
+#: ../panels/printers/cc-printers-panel.c:2073
 msgid "Select PPD File"
 msgstr "انتخاب پرونده‌ی PPD"
 
-#: ../panels/printers/cc-printers-panel.c:2058
+#: ../panels/printers/cc-printers-panel.c:2082
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 msgstr "پرونده‌های تفسیری پست‌اسکریپت (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2365
+#: ../panels/printers/cc-printers-panel.c:2389
 msgid "No suitable driver found"
 msgstr "هیچ راه‌انداز مناسبی پیدا نشد"
 
-#: ../panels/printers/cc-printers-panel.c:2436
+#: ../panels/printers/cc-printers-panel.c:2460
 msgid "Searching for preferred drivers…"
 msgstr "جست‌وجو برای راه‌اندازهای ترجیح داده..."
 
-#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2481
 msgid "Select from database…"
 msgstr "انتخاب از بانک اطلاعاتی..."
 
-#: ../panels/printers/cc-printers-panel.c:2466
+#: ../panels/printers/cc-printers-panel.c:2490
 msgid "Provide PPD File…"
 msgstr "فراهم کردن پرونده PPD..."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2617
-#: ../panels/printers/cc-printers-panel.c:2640
+#: ../panels/printers/cc-printers-panel.c:2637
+#: ../panels/printers/cc-printers-panel.c:2660
 msgid "Test page"
 msgstr "صفحه‌ی آزمایشی"
 
-#: ../panels/printers/cc-printers-panel.c:2753
-msgid "No printers"
-msgstr "هیچ چاپگری موجود نیست"
-
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:3099
+#: ../panels/printers/cc-printers-panel.c:3115
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ناتوان در باز کردن واسط کاربری: %s"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-msgid "Printers"
-msgstr "چاپ‌گرها"
-
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Prin­ters"
+msgstr "چاپگرها"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr ""
 "چاپگر اضافه کنید، کارهای چاپگر را ببینید و تصمیم بگیرید که چگونه می‌خواهید چاپ "
 "کنید"
 
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "چاپگر;صف;چاپ;کاغذ;جوهر;Toner;"
 
@@ -4362,6 +4447,11 @@ msgstr "درگاه سریال"
 msgid "Parallel Port"
 msgstr "درگاه موازی"
 
+#. Translators: The found device is a printer connected via Bluetooth
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Bluetooth"
+msgstr "بلوتوث"
+
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
 #: ../panels/printers/pp-new-printer-dialog.c:1713
 #, c-format
@@ -4572,13 +4662,17 @@ msgstr "چاپ _صفحه آزمایشی"
 msgid "_Options"
 msgstr "_گزینه‌ها"
 
+#: ../panels/printers/printers.ui.h:23
+msgid "No printers"
+msgstr "هیچ چاپگری موجود نیست"
+
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/printers.ui.h:25
 msgid "Add a Printer"
 msgstr "اضافه‌کردن یک چاپگر"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:26
+#: ../panels/printers/printers.ui.h:27
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -4586,70 +4680,70 @@ msgstr ""
 "متاسفم! سرویس چاپگر سیستم\n"
 "به نظر در دسترس نیست."
 
-#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "صفحه‌قفل"
 
-#: ../panels/privacy/cc-privacy-panel.c:420
+#: ../panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "در حال استفاده"
 
-#: ../panels/privacy/cc-privacy-panel.c:425
+#: ../panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "روشن"
 
-#: ../panels/privacy/cc-privacy-panel.c:426
+#: ../panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "خاموش"
 
-#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
 msgid "Location Services"
 msgstr "خدمات مکان‌یابی"
 
-#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "استفاده و تاریخچه"
 
-#: ../panels/privacy/cc-privacy-panel.c:1001
+#: ../panels/privacy/cc-privacy-panel.c:1067
 msgid "Empty all items from Trash?"
 msgstr "حذف تمام موارد از زباله‌دان؟"
 
-#: ../panels/privacy/cc-privacy-panel.c:1002
+#: ../panels/privacy/cc-privacy-panel.c:1068
 msgid "All items in the Trash will be permanently deleted."
 msgstr "تمام موارد موجود در زباله‌دان برای همیشه پاک می‌شوند."
 
-#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "_خالی کردن زباله‌دان"
 
-#: ../panels/privacy/cc-privacy-panel.c:1026
+#: ../panels/privacy/cc-privacy-panel.c:1092
 msgid "Delete all the temporary files?"
 msgstr "حذف تمام پرونده‌های موقت؟"
 
-#: ../panels/privacy/cc-privacy-panel.c:1027
+#: ../panels/privacy/cc-privacy-panel.c:1093
 msgid "All the temporary files will be permanently deleted."
 msgstr "تمام پرونده‌های موقت برای همیشه حذف خواهند شد."
 
-#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "_پاکسازی پرونده‌های موقت"
 
-#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "پاکسازی زباله‌دان و پرونده‌های موقت"
 
-#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36
 msgid "Software Usage"
 msgstr "طریقه استفاده نرم‌افزار"
 
-#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46
+#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46
 msgid "Problem Reporting"
 msgstr "گزارش اشکال"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1145
+#: ../panels/privacy/cc-privacy-panel.c:1211
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4658,21 +4752,22 @@ msgstr ""
 "ارسال گزارش‌های مربوط به اشکالات تکنیکی %s به ما جهت گسترشش کمک می‌کند. گزارش‌ها به "
 "صورت ناشناس اراسل می‌شود و آری از اطلاعات شخصی است."
 
-#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41
 msgid "Privacy Policy"
 msgstr "حریم‌خصوصی"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
-msgid "Privacy"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Pri­va­cy"
 msgstr "حریم‌خصوصی"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
 msgid "Protect your personal information and control what others might see"
 msgstr ""
 "از اطلاعات شخصی خود محافظت کنید و چیزهایی که دیگران ممکن است ببیند را کنترل کنید"
 
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;"
 "identity;"
@@ -4842,21 +4937,21 @@ msgctxt "Input Source"
 msgid "Other"
 msgstr "موارد دیگر"
 
-#: ../panels/region/cc-region-panel.c:248
-#: ../panels/user-accounts/um-user-panel.c:1069
+#: ../panels/region/cc-region-panel.c:247
+#: ../panels/user-accounts/um-user-panel.c:1087
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "لازم است نشست شما مجددا راه‌اندازی شود تا تغییرات اعمال شوند"
 
-#: ../panels/region/cc-region-panel.c:252
-#: ../panels/user-accounts/um-user-panel.c:1073
+#: ../panels/region/cc-region-panel.c:251
+#: ../panels/user-accounts/um-user-panel.c:1091
 msgid "Restart Now"
 msgstr "اکنون راه‌اندازی مجدد کن"
 
-#: ../panels/region/cc-region-panel.c:889
+#: ../panels/region/cc-region-panel.c:888
 msgid "No input source selected"
 msgstr "هیچ منبع ورودی‌ای انتخاب نشد"
 
-#: ../panels/region/cc-region-panel.c:1807
+#: ../panels/region/cc-region-panel.c:1779
 msgid "Login _Screen"
 msgstr "_صفحه ورود به سیستم"
 
@@ -4888,16 +4983,17 @@ msgstr "سنجش"
 msgid "Paper"
 msgstr "کاغذ"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+msgid "Re­gion & Lan­guage"
 msgstr "ناحیه و زبان"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
 msgid "Select your display language, formats, keyboard layouts and input sources"
 msgstr "زبان نمایش، قالب‌ها، چیدمان صفحه‌کلید و منابع ورودی خود را انتخاب کنید"
 
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "زبان;چیدمان;صفحه‌کلید؛ورودی;Language;Layout;Keyboard;Input;"
 
@@ -4954,7 +5050,7 @@ msgid "Left+Right Alt"
 msgstr "چپ+دگرساز راست"
 
 #: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Language"
 msgstr "_زبان"
 
@@ -5002,26 +5098,11 @@ msgstr "نمایش چیدمان صفحه‌کلید منبع ورودی"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "تنظیمات ورود به سیستم توسط تمام کاربران هنگام ورود استفاده می‌شود"
 
-#: ../panels/search/cc-search-locations-dialog.c:476
-msgctxt "Search Location"
-msgid "Places"
-msgstr "محل‌ها"
-
-#: ../panels/search/cc-search-locations-dialog.c:478
-msgctxt "Search Location"
-msgid "Bookmarks"
-msgstr "نشانک‌ها"
-
-#: ../panels/search/cc-search-locations-dialog.c:480
-msgctxt "Search Location"
-msgid "Other"
-msgstr "موارد دیگر"
-
-#: ../panels/search/cc-search-locations-dialog.c:678
+#: ../panels/search/cc-search-locations-dialog.c:634
 msgid "Select Location"
 msgstr "انتخاب مکان"
 
-#: ../panels/search/cc-search-locations-dialog.c:682
+#: ../panels/search/cc-search-locations-dialog.c:638
 msgid "_OK"
 msgstr "_تایید"
 
@@ -5029,18 +5110,19 @@ msgstr "_تایید"
 msgid "No applications found"
 msgstr "هیچ برنامه‌ای پیدا نشد"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
 msgid "Search"
 msgstr "جستجو"
 
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
 msgid "Control which applications show search results in the Activities Overview"
 msgstr ""
 "اینکه کدام برنامه‌ها در نتایج جستجو نمای‌کلی فعالیت‌ها نمایش داده می‌شوند را کنترل "
 "کنید"
 
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;جستجو;پیدا;فهرست;مخفی;حریم خصوصی;نتایج;"
@@ -5049,6 +5131,18 @@ msgstr ""
 msgid "Search Locations"
 msgstr "مکان‌های جست‌وجو"
 
+#: ../panels/search/search-locations-dialog.ui.h:2
+msgid "Places"
+msgstr "مکان‌ها"
+
+#: ../panels/search/search-locations-dialog.ui.h:3
+msgid "Bookmarks"
+msgstr "نشانک‌ها"
+
+#: ../panels/search/search-locations-dialog.ui.h:4
+msgid "Other"
+msgstr "موارد دیگر"
+
 #: ../panels/search/search.ui.h:1
 msgid "Move Up"
 msgstr "جابه‌جایی به بالا"
@@ -5061,6 +5155,11 @@ msgstr "جابه‌جایی به پایین"
 msgid "Preferences"
 msgstr "ترجیحات"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:303
+msgid "No networks selected for sharing"
+msgstr "هیچ شبکه‌ای برای اشتراک‌گذاری انتخاب نشده"
+
 #: ../panels/sharing/cc-sharing-panel.c:263
 msgctxt "service is enabled"
 msgid "On"
@@ -5098,36 +5197,42 @@ msgstr ""
 #: ../panels/sharing/cc-sharing-panel.c:682
 #, c-format
 msgid ""
-"Allow remote users to connect using the Secure Shell command:\n"
+"When remote login is enabled, remote users can connect using the Secure Shell "
+"command:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 msgstr ""
-"به کاربران دوردست اجازه بده تا با استفاده از فرمان پوسته‌ی امن متصل شوند:\n"
+"هنگام فعال بودن ورود از دوردست، به کاربران دوردست اجازه می‌دهد تا با استفاده از "
+"فرمان پوسته‌ی امن متصل شوند:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
 #: ../panels/sharing/cc-sharing-panel.c:684
 #, c-format
 msgid ""
-"Allow remote users to view or control your screen by connecting to: <a href="
-"\"vnc://%s\">vnc://%s</a>"
+"Screen sharing allows remote users to view or control your screen by connecting "
+"to <a href=\"vnc://%s\">vnc://%s</a>"
 msgstr ""
-"به کاربران دوردست اجازه بده تا صفحه‌نمایش شما را با اتصال به‌وسیله‌ی <a href="
-"\"vnc://%s\">vnc://%s</a> کنترل کنند"
+"اشتراک‌گذاری صفحه به کاربران دوردست اجازه می‌دهد تا صفحه‌نمایش شما را با اتصال از "
+"طریق <a href=\"vnc://%s\">vnc://%s</a> کنترل کنند"
 
 #: ../panels/sharing/cc-sharing-panel.c:796
 msgid "Copy"
 msgstr "رونوشت"
 
 #: ../panels/sharing/cc-sharing-panel.c:1122
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
 msgid "Sharing"
 msgstr "اشتراک‌گذاری"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Sha­ring"
+msgstr "اشتراک‌گذاری"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
 msgid "Control what you want to share with others"
 msgstr "اینکه چه چیزهایی را می‌خواهید با دیگران به‌اشتراک بگذارید را انتخاب کنید"
 
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
@@ -5135,6 +5240,10 @@ msgstr ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
 
+#: ../panels/sharing/networks.ui.h:1
+msgid "Networks"
+msgstr "شبکه‌ها"
+
 #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
 msgid "Enable or disable remote login"
 msgstr "فعال یا غیرفعال کردن ورود به سیستم دوردست"
@@ -5143,25 +5252,13 @@ msgstr "فعال یا غیرفعال کردن ورود به سیستم دورد
 msgid "Authentication is required to enable or disable remote login"
 msgstr "جهت فعال یا غیرفعال کردن ورود به سیستم دوردست، تصدیق‌هویت لازم است"
 
-#. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
-msgid "No networks selected for sharing"
-msgstr "هیچ شبکه‌ای برای اشتراک‌گذاری انتخاب نشده"
-
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../panels/sharing/networks.ui.h:1
-msgid "Networks"
-msgstr "شبکه‌ها"
-
 #: ../panels/sharing/sharing.ui.h:1
 msgid "_Computer Name"
 msgstr "نام _رایانه"
 
 #: ../panels/sharing/sharing.ui.h:2
-msgid "_Personal File Sharing"
-msgstr "به‌اشتراک‌گذاری پرونده _شخصی"
+msgid "_File Sharing"
+msgstr "اشتراک‌گذاری _پرونده"
 
 #: ../panels/sharing/sharing.ui.h:3
 msgid "_Screen Sharing"
@@ -5180,8 +5277,8 @@ msgid "Some services are disabled because of no network access."
 msgstr "تعدادی از سرویس‌ها به‌دلیل در دسترس نبودن شبکه، غیرفعال شده‌اند."
 
 #: ../panels/sharing/sharing.ui.h:7
-msgid "Personal File Sharing"
-msgstr "به‌اشتراک‌گذاری پرونده شخصی"
+msgid "File Sharing"
+msgstr "اشتراک‌گذاری پرونده"
 
 #: ../panels/sharing/sharing.ui.h:8
 msgid "_Require Password"
@@ -5196,8 +5293,8 @@ msgid "Screen Sharing"
 msgstr "اشتراک‌گذاری صفحه‌نمایش"
 
 #: ../panels/sharing/sharing.ui.h:12
-msgid "_Allow Remote Control"
-msgstr "اجازه دادن برای _کنترل دوردست"
+msgid "_Allow connections to control the screen"
+msgstr "_اجازه دادن به اتصال‌ها برای کنترل صفحه"
 
 #: ../panels/sharing/sharing.ui.h:13
 msgid "_Password:"
@@ -5224,11 +5321,8 @@ msgid "Media Sharing"
 msgstr "اشتراک‌گذاری رسانه"
 
 #: ../panels/sharing/sharing.ui.h:19
-msgid ""
-"Media sharing allows you to share music, photos and videos over the network."
-msgstr ""
-"اشتراک‌گذاری رسانه به شما اجازه می‌دهد تا موسیقی، عکس و ویدئو را از طریق شبکه به "
-"اشتراک بگذارید."
+msgid "Share music, photos and videos over the network."
+msgstr "موسیقی، تصویر و ویدئو را از طریق شبکه به اشتراک بگذارید."
 
 #: ../panels/sharing/sharing.ui.h:20
 msgid "Folders"
@@ -5358,11 +5452,6 @@ msgstr "آزمایش _بلندگوها"
 msgid "Peak detect"
 msgstr "یافتن اوج"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1493
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
-msgid "Name"
-msgstr "نام"
-
 #: ../panels/sound/gvc-mixer-dialog.c:1512
 msgid "Device"
 msgstr "دستگاه"
@@ -5456,16 +5545,21 @@ msgstr "آزمایش"
 msgid "Subwoofer"
 msgstr "ساب ووفر"
 
-#: ../panels/sound/sound-theme-file-utils.c:290
+#: ../panels/sound/sound-theme-file-utils.c:304
 msgid "Custom"
 msgstr "سفارشی"
 
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
+msgid "Uni­ver­sal Access"
+msgstr "دسترسی فراگیر"
+
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "نگاه کردن، شنیدن، تایپ کردن، نشانه رفتن و کلیک کردن را ساده‌تر کنید"
 
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
@@ -5563,7 +5657,7 @@ msgid "Sound Keys"
 msgstr "کلید‌های صوتی"
 
 #: ../panels/universal-access/uap.ui.h:25
-msgid "Beep when Num Lock or Caps Lock are turned on."
+msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "هنگامی که قفل اعداد و قفل تبدیل روشن است، بوق بزن."
 
 #: ../panels/universal-access/uap.ui.h:26
@@ -5950,95 +6044,67 @@ msgid "Color Effects"
 msgstr "جلوه‌های رنگی"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
-#: ../panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
+#: ../panels/user-accounts/data/join-dialog.ui.h:1
+msgid "Add User"
+msgstr "اضافه کردن کاربر"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:5
+msgid "_Full Name"
+msgstr "_نام کامل"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
 msgid "Standard"
 msgstr "استاندارد"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Administrator"
 msgstr "مدیر"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Full Name"
-msgstr "_نام کامل"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account _Type"
 msgstr "_نوع حساب"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
 msgid "Allow user to set a password when they next _login"
 msgstr "اجازه می‌دهد تا کاربران در زمان _ورود بعدی یک گذرواژه انتخاب کنند"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
 msgid "Set a password _now"
 msgstr "_هم‌اکنون یک گذرواژه تنظیم کنید"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Verify"
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "_Confirm"
 msgstr "_تایید"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be used on "
-"this device."
+"this device. You can also use this account to access company resources on the "
+"internet."
 msgstr ""
-"ورود به سیستم تجاری اجازه می‌دهد تا یک حساب کاربری مدیریت شده‌ی متمرکز در این "
-"دستگاه استفاده شود."
+"امکان «ورود به سیستم سازمانی» اجازه می‌دهد تا یک حساب کاربری مدیریت شدهٔ متمرکز در "
+"این دستگاه استفاده شود. شما همچنین از این حساب می‌توانید برای دسترسی به منابع "
+"شرکت در اینترنت استفاده کنید."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/join-dialog.ui.h:9
 msgid "_Domain"
 msgstr "_دامنه"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid ""
-"Go online to add\n"
-"enterprise login accounts."
-msgstr ""
-"برای اضافه کردن حساب‌های ورود\n"
-"به سیستم تجاری برخط شوید."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
-msgid "_Enterprise Login"
-msgstr "ورود به سیستم _تجاری"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:16
-#: ../panels/user-accounts/um-account-dialog.c:1466
-msgid "Add User"
-msgstr "اضافه کردن کاربر"
-
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
-msgid "_Enroll"
-msgstr "_ثبت"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:20
-msgid "Domain Administrator Login"
-msgstr "ورود مدیر دامنه"
+msgid "You are Offline"
+msgstr "شما برون‌خط هستید"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
-msgid ""
-"In order to use enterprise logins, this computer needs to be\n"
-"enrolled in the domain. Please have your network administrator\n"
-"type their domain password here."
-msgstr ""
-"جهت استفاده از ورود به سیستم تجاری، این رایانه لازم است\n"
-"در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n"
-"خود را اینجا بنویسند."
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:24
-msgid "Administrator _Name"
-msgstr "_نام مدیر"
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+msgid "You must be online in order to add enterprise users."
+msgstr "برای ایجاد کاربران سازمانی، باید برخط باشید."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:25
-msgid "Administrator Password"
-msgstr "گذرواژه مدیر"
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+msgid "_Enterprise Login"
+msgstr "ورود به سیستم _تجاری"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -6073,7 +6139,7 @@ msgid "Right little finger"
 msgstr "انگشت کوچک راست"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:686
+#: ../panels/user-accounts/um-fingerprint-dialog.c:687
 msgid "Enable Fingerprint Login"
 msgstr "به‌کارانداختن امکان ورود به سیستم از طریق اثرانگشت"
 
@@ -6110,9 +6176,32 @@ msgstr "افزودن و یا حذف کاربرها و عوض کردن گذروا
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "نام ورود;نام;اثرانگشت;آواتار;نشان;تصویرصورت;گذرواژه;"
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:1
-msgid "Login History"
-msgstr "تاریخچه ورود به سیستم"
+#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../panels/user-accounts/data/join-dialog.ui.h:4
+msgid "_Enroll"
+msgstr "_ثبت"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:5
+msgid "Domain Administrator Login"
+msgstr "ورود مدیر دامنه"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:6
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+"جهت استفاده از ورود به سیستم سازمانی، این رایانه لازم است\n"
+"در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n"
+"خود را اینجا بنویسند."
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:10
+msgid "Administrator _Name"
+msgstr "_نام مدیر"
+
+#: ../panels/user-accounts/data/join-dialog.ui.h:11
+msgid "Administrator Password"
+msgstr "گذرواژه مدیر"
 
 # ../capplets/common/gconf-property-editor.:c:183
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
@@ -6137,38 +6226,30 @@ msgid "Current _Password"
 msgstr "گذرواژه‌ی _فعلی"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "Allow user to set a password when they next login"
-msgstr "اجازه می‌دهد تا کاربران در زمان ورود بعدی یک گذرواژه انتخاب کنند"
+msgid "Allow user to change their password on next login"
+msgstr "اجازه می‌دهد تا کاربران در زمان ورود بعدی گذرواژه خود را تغییر دهند"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "هم‌اکنون یک گذرواژه تنظیم کنید"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Add User Account"
-msgstr "اضافه‌کردن حساب کاربر"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-msgid "Remove User Account"
-msgstr "حذف حساب کاربر"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
+msgid "_Add User…"
+msgstr "ا_ضافه کردن کاربر…"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Login Options"
-msgstr "گزینه‌های ورود به سیستم"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "ورود _خودکار"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Fingerprint Login"
 msgstr "ورود به سیستم از طریق اثر _انگشت"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "User Icon"
 msgstr "شمایل کاربر"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "Last Login"
 msgstr "آخرین ورود"
 
@@ -6272,7 +6353,7 @@ msgstr "سعی کنید از تعداد بیشتری حروف، اعداد و س
 
 #: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
-msgid "Mix uppercase and lowercase and use a number or two."
+msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "حروف بزرگ و کوچک را ادغام کنید و از یک یا چند عدد هم استفاده کنید."
 
 #: ../panels/user-accounts/pw-utils.c:119
@@ -6358,32 +6439,32 @@ msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
 #: ../panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your account provider."
-msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ حساب شما یکسان باشد."
+msgid "Should match the web address of your login provider."
+msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ٔ حساب شما یکسان باشد."
 
 #: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "اضافه کردن حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:452
+#: ../panels/user-accounts/um-account-dialog.c:448
 msgid "Passwords do not match."
 msgstr "گذرواژه‌ها برابر نیستند."
 
-#: ../panels/user-accounts/um-account-dialog.c:733
-#: ../panels/user-accounts/um-account-dialog.c:779
-#: ../panels/user-accounts/um-account-dialog.c:800
+#: ../panels/user-accounts/um-account-dialog.c:702
+#: ../panels/user-accounts/um-account-dialog.c:748
+#: ../panels/user-accounts/um-account-dialog.c:769
 msgid "Failed to register account"
 msgstr "ثبت حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:923
+#: ../panels/user-accounts/um-account-dialog.c:892
 msgid "No supported way to authenticate with this domain"
 msgstr "هیچ راه پیشتیبانی شده‌ای برای تصدیق‌هویت با این دامنه وجود ندارد"
 
-#: ../panels/user-accounts/um-account-dialog.c:982
+#: ../panels/user-accounts/um-account-dialog.c:965
 msgid "Failed to join domain"
 msgstr "پیوستن به دامنه شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:1043
+#: ../panels/user-accounts/um-account-dialog.c:1026
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6391,7 +6472,7 @@ msgstr ""
 "نام ورود به سیستم اشتباه بود.\n"
 "لطفا دوباره تلاش کنید."
 
-#: ../panels/user-accounts/um-account-dialog.c:1050
+#: ../panels/user-accounts/um-account-dialog.c:1033
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6399,14 +6480,24 @@ msgstr ""
 "گذواژه‌ی ورود به سیستم اشتباه بود.\n"
 "لطفا دوباره تلاش کنید."
 
-#: ../panels/user-accounts/um-account-dialog.c:1058
+#: ../panels/user-accounts/um-account-dialog.c:1041
 msgid "Failed to log into domain"
 msgstr "ورود به دامنه شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:1116
+#: ../panels/user-accounts/um-account-dialog.c:1099
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "امکان پیدا کردن دامنه نیست. شاید اشتباه نوشته‌اید؟"
 
+#: ../panels/user-accounts/um-account-type.c:34
+msgctxt "Account type"
+msgid "Standard"
+msgstr "استاندارد"
+
+#: ../panels/user-accounts/um-account-type.c:36
+msgctxt "Account type"
+msgid "Administrator"
+msgstr "مدیر"
+
 #: ../panels/user-accounts/um-fingerprint-dialog.c:138
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -6424,15 +6515,15 @@ msgstr "یک خطای داخلی رخ داد."
 msgid "Enabled"
 msgstr "به‌کارافتاده"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: ../panels/user-accounts/um-fingerprint-dialog.c:264
 msgid "Delete registered fingerprints?"
 msgstr "اثرانگشت‌های ثبت شده پاک شوند؟"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "_Delete Fingerprints"
 msgstr "_حذف اثرانگشت‌ها"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: ../panels/user-accounts/um-fingerprint-dialog.c:274
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6440,15 +6531,15 @@ msgstr ""
 "آیا مایلید که تمام اثرانگشت‌های ثبت شده را حذف کنید تا در نتیجه امکان ورود به "
 "سیستم از طریق اثرانگشت غیرفعال شود؟"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: ../panels/user-accounts/um-fingerprint-dialog.c:444
 msgid "Done!"
 msgstr "انجام شد!"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: ../panels/user-accounts/um-fingerprint-dialog.c:505
+#: ../panels/user-accounts/um-fingerprint-dialog.c:547
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "نمی‌توان به دستگاه «%s» دسترسی داشت"
@@ -6456,16 +6547,16 @@ msgstr "نمی‌توان به دستگاه «%s» دسترسی داشت"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:587
+#: ../panels/user-accounts/um-fingerprint-dialog.c:588
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "نمی‌توان شروع به انگشت‌نگاری با استفاده از دستگاه «%s» کرد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:637
+#: ../panels/user-accounts/um-fingerprint-dialog.c:638
 msgid "Could not access any fingerprint readers"
 msgstr "نمی‌توان به هیچ دستگاه انگشت‌نگاری متصل شد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:638
+#: ../panels/user-accounts/um-fingerprint-dialog.c:639
 msgid "Please contact your system administrator for help."
 msgstr "لطفا جهت دریافت کمک به مدیر سیستم خود مراجعه کنید."
 
@@ -6474,7 +6565,7 @@ msgstr "لطفا جهت دریافت کمک به مدیر سیستم خود مر
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:720
+#: ../panels/user-accounts/um-fingerprint-dialog.c:721
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, using "
@@ -6483,11 +6574,11 @@ msgstr ""
 "برای به‌کارانداختن امکان ورود با استفاده از اثرانگشت، شما باید یکی از اثرانگشت‌های "
 "خود را با استفاده از دستگاه «%s» ذخیره کنید."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:727
+#: ../panels/user-accounts/um-fingerprint-dialog.c:728
 msgid "Selecting finger"
 msgstr "در حال انتخاب انگشت"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:728
+#: ../panels/user-accounts/um-fingerprint-dialog.c:729
 msgid "Enrolling fingerprints"
 msgstr "در حال ثبت اثر انگشت‌ها"
 
@@ -6541,14 +6632,21 @@ msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s، %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:249
+#: ../panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "نشست پایان یافت"
 
-#: ../panels/user-accounts/um-history-dialog.c:255
+#: ../panels/user-accounts/um-history-dialog.c:256
 msgid "Session Started"
 msgstr "نشست آغاز شد"
 
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: ../panels/user-accounts/um-history-dialog.c:299
+#, c-format
+msgid "%s - Account Activity"
+msgstr "%s - فعالیت حساب"
+
 #: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "لطفاً گذرواژه‌ی دیگری انتخاب کنید."
@@ -6610,7 +6708,7 @@ msgstr "گذرواژه‌ی نادرست، لطفا مجددا تلاش کنید
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "نمی‌توان به دامنه %s متصل شد: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:237
+#: ../panels/user-accounts/um-user-panel.c:239
 msgid "Other Accounts"
 msgstr "حساب‌های دیگر"
 
@@ -6690,15 +6788,15 @@ msgstr "هیچ‌کدام"
 msgid "Logged in"
 msgstr "وارد شده"
 
-#: ../panels/user-accounts/um-user-panel.c:1272
+#: ../panels/user-accounts/um-user-panel.c:1290
 msgid "Failed to contact the accounts service"
 msgstr "ارتباط با سرویس حساب شکست خورد"
 
-#: ../panels/user-accounts/um-user-panel.c:1274
+#: ../panels/user-accounts/um-user-panel.c:1292
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "لطفا مطمئن شوید که AccountService نصب و فعال است."
 
-#: ../panels/user-accounts/um-user-panel.c:1315
+#: ../panels/user-accounts/um-user-panel.c:1334
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6706,12 +6804,12 @@ msgstr ""
 "برای ایجاد تغییرات،\n"
 "ابتدا بر روی نقشک * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1353
+#: ../panels/user-accounts/um-user-panel.c:1374
 msgid "Create a user account"
 msgstr "ساخت یک حساب کاربری"
 
-#: ../panels/user-accounts/um-user-panel.c:1364
-#: ../panels/user-accounts/um-user-panel.c:1676
+#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1677
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6719,12 +6817,12 @@ msgstr ""
 "برای ساختن یک حساب کاربر،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1374
+#: ../panels/user-accounts/um-user-panel.c:1395
 msgid "Delete the selected user account"
 msgstr "حذف حساب کاربر انتخاب شده"
 
-#: ../panels/user-accounts/um-user-panel.c:1386
-#: ../panels/user-accounts/um-user-panel.c:1681
+#: ../panels/user-accounts/um-user-panel.c:1407
+#: ../panels/user-accounts/um-user-panel.c:1682
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6732,33 +6830,32 @@ msgstr ""
 "برای حذف حساب کاربر انتخاب شده،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1590
+#: ../panels/user-accounts/um-user-panel.c:1591
 msgid "My Account"
 msgstr "حساب من"
 
 #: ../panels/user-accounts/um-utils.c:563
-#, c-format
-msgid "A user with the username '%s' already exists."
-msgstr "یک کاربر با نام «%s» از پیش وجود دارد."
+msgid "Sorry, that user name isn't available. Please try another."
+msgstr "متاسفیم، نام‌کاربری انتخاب شده موجود نیست. لطفا یک نام دیگر امتحان کنید."
 
-#: ../panels/user-accounts/um-utils.c:567
+#: ../panels/user-accounts/um-utils.c:566
 #, c-format
 msgid "The username is too long."
 msgstr "نام کاربری خیلی بلند است."
 
-#: ../panels/user-accounts/um-utils.c:570
+#: ../panels/user-accounts/um-utils.c:569
 msgid "The username cannot start with a '-'."
 msgstr "نام کاربری نمیتواند با یک «-» شروع شود."
 
-#: ../panels/user-accounts/um-utils.c:573
+#: ../panels/user-accounts/um-utils.c:572
 msgid ""
-"The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'."
+"The username should only consist of upper and lower case letters from a-z, "
+"digits and the following characters: . - _"
 msgstr ""
-"نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و هر کدام از "
-"نویسه‌های «.» «-» و «_» باشد."
+"نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و نویسه‌های مقابل "
+"باشد: . - _"
 
-#: ../panels/user-accounts/um-utils.c:577
+#: ../panels/user-accounts/um-utils.c:576
 msgid "This will be used to name your home folder and can't be changed."
 msgstr "این برای نام‌گذاری پوشه خانگی شما استفاده می‌شود و قابل تغییر نیست."
 
@@ -6847,17 +6944,17 @@ msgstr "هدایت نمایشگر"
 msgid "Button"
 msgstr "دکمه"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
+#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+msgid "Wa­com Tab­let"
 msgstr "تبلت Wacom"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "تنظیم هدایت کلیدها و تنظیم حساسیت قلم برای تبلت‌های گرافیکی"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "تبلت;Wacom;Stylus;Eraser;موشی;"
 
@@ -6889,6 +6986,10 @@ msgstr "لطفا تبلت Wacom را روشن یا به رایانه متصل ک
 msgid "Bluetooth Settings"
 msgstr "تنظیمات بلوتوث"
 
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+msgid "Wacom Tablet"
+msgstr "تبلت Wacom"
+
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Map to Monitor…"
 msgstr "هدایت به صفحه‌نمایش..."
@@ -7075,6 +7176,10 @@ msgstr "دکمه پایینی"
 msgid "Tip Pressure Feel"
 msgstr "حساسیت فشار ضربه"
 
+#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 ../shell/cc-window.c:1478
+msgid "All Settings"
+msgstr "همه‌ی تنظیمات"
+
 #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
 msgid "GNOME Control Center"
 msgstr "مرکز کنترل گنوم"
@@ -7129,22 +7234,18 @@ msgstr "راهنما"
 msgid "Quit"
 msgstr "خروج"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495
-msgid "All Settings"
-msgstr "همه‌ی تنظیمات"
-
 #. Add categories
-#: ../shell/cc-window.c:881
+#: ../shell/cc-window.c:871
 msgctxt "category"
 msgid "Personal"
 msgstr "شخصی"
 
-#: ../shell/cc-window.c:882
+#: ../shell/cc-window.c:872
 msgctxt "category"
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../shell/cc-window.c:883
+#: ../shell/cc-window.c:873
 msgctxt "category"
 msgid "System"
 msgstr "سیستم"
@@ -7183,6 +7284,188 @@ msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "لغو جست‌وجو"
 
+#. translators: This is the default hotspot name, need to be less than 32-bytes
+#: ../shell/hostname-helper.c:189
+msgctxt "hotspot"
+msgid "Hotspot"
+msgstr "کانون فعال"
+
+#~ msgid "Color"
+#~ msgstr "رنگ"
+
+#~ msgid "_Name:"
+#~ msgstr "_نام:"
+
+#~ msgid "C_ommand:"
+#~ msgstr "_فرمان:"
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#~ msgid "Add Shortcut"
+#~ msgstr "اضافه‌کردن میان‌بر"
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#~ msgid "Remove Shortcut"
+#~ msgstr "حذف میان‌بر"
+
+#~ msgid ""
+#~ "To edit a shortcut, click the row and hold down the new keys or press "
+#~ "Backspace to clear."
+#~ msgstr ""
+#~ "برای ویرایش یک کلید میان‌بر، روی ردیف مربوط به آن کلیک کرده و یک ترکیب جدید "
+#~ "تایپ کنید، و یا برای پاک‌کردن پس‌بر را فشار دهید."
+
+#~ msgid "<Unknown Action>"
+#~ msgstr "<کنش ناشناخته>"
+
+#~ msgid ""
+#~ "The shortcut \"%s\" cannot be used because it will become impossible to type "
+#~ "using this key.\n"
+#~ "Please try with a key such as Control, Alt or Shift at the same time."
+#~ msgstr ""
+#~ "استفاده از میانبر «%s» به این دلیل که امکان تایپ به وسیله‌ی این کلید را "
+#~ "غیرممکن می کند، امکان‌پذیر نیست.\n"
+#~ "لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید."
+
+#~ msgid ""
+#~ "The shortcut \"%s\" is already used for\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "میان‌بر «%s» قبلاً استفاده شده است برای:\n"
+#~ "‏ «%s»"
+
+#~ msgid ""
+#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+#~ msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد."
+
+#~ msgid "_Reassign"
+#~ msgstr "_جای‌گذاری مجدد"
+
+#~ msgid ""
+#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to "
+#~ "automatically set it to \"%s\"?"
+#~ msgstr ""
+#~ "میان‌بر «%s» یک میان‌بر مرتبط «%s» دارد. آیا مایلید به طور خودکار به «%s» تنظیم "
+#~ "شود؟"
+
+#~ msgid ""
+#~ "\"%s\" is currently associated with \"%s\", this shortcut will be disabled if "
+#~ "you move forward."
+#~ msgstr ""
+#~ "درحال حاضر «%s» به «%s» وابسته است، اگر پیشروی کنید این میان‌بر غیرفعال خواهد "
+#~ "شد."
+
+#~ msgid "_Assign"
+#~ msgstr "_جای‌گذاری"
+
+#~ msgid "Bond"
+#~ msgstr "Bond"
+
+#~ msgid "Team"
+#~ msgstr "گروه"
+
+#~ msgid "Bridge"
+#~ msgstr "Bridge"
+
+#~ msgid "VLAN"
+#~ msgstr "VLAN"
+
+#~ msgid "Could not load VPN plugins"
+#~ msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد"
+
+#~ msgid "Add Network Connection"
+#~ msgstr "اضافه کردن اتصال شبکه"
+
+#~ msgid "Bond slaves"
+#~ msgstr "Bond slaves"
+
+#~ msgid "(none)"
+#~ msgstr "(هیچ)"
+
+#~ msgid "Bridge slaves"
+#~ msgstr "Bridge slaves"
+
+#~ msgid "Team slaves"
+#~ msgstr "برده‌های گروه"
+
+#~ msgid "InfiniBand device does not support connected mode"
+#~ msgstr "دستگاه InfiniBand از حالت متصل شده پشتیبانی نمی‌کند"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "هیچ گواهینامه‌ای برای مرجع گواهینامه انتخاب نشد"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in connections "
+#~ "to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+#~ "Authority certificate?"
+#~ msgstr ""
+#~ "استفاده نکردن از گواهینامه‌ی مرجع گواهینامه (CA) می‌تواند باعث اتصال به یک "
+#~ "شبکه‌ی وای‌فای خطرناک و ناامن شود. آیا مایلید یک گواهینامه‌ی مرجع گواهینامه "
+#~ "انتخاب کنید؟"
+
+#~ msgid "Ignore"
+#~ msgstr "نادیده گرفتن"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "انتخاب گواهینامه CA"
+
+#~ msgid "As_k for this password every time"
+#~ msgstr "این گذرواژه را هربار _بپرس"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "دوباره به من _هشدار نده"
+
+#~ msgid "No"
+#~ msgstr "خیر"
+
+#~ msgid "Yes"
+#~ msgstr "بله"
+
+#~ msgid "Error logging into the account"
+#~ msgstr "خطا در هنگاک ورود به حساب"
+
+#~ msgid "Credentials have expired."
+#~ msgstr "اعتبارنامه‌ها منقضی شده‌اند."
+
+#~ msgid "Sign in to enable this account."
+#~ msgstr "وارد شوید تا این حساب فعال شود."
+
+#~ msgid "_Sign In"
+#~ msgstr "_ورود به سیستم"
+
+#~ msgid "Power"
+#~ msgstr "انرژی"
+
+#~ msgid "Privacy"
+#~ msgstr "حریم‌خصوصی"
+
+#~ msgctxt "Search Location"
+#~ msgid "Other"
+#~ msgstr "موارد دیگر"
+
+#~ msgid "Personal File Sharing"
+#~ msgstr "به‌اشتراک‌گذاری پرونده شخصی"
+
+#~ msgid "_Allow Remote Control"
+#~ msgstr "اجازه دادن برای _کنترل دوردست"
+
+#~ msgid "_Verify"
+#~ msgstr "_تایید"
+
+#~ msgid "Login History"
+#~ msgstr "تاریخچه ورود به سیستم"
+
+#~ msgid "Add User Account"
+#~ msgstr "اضافه‌کردن حساب کاربر"
+
+#~ msgid "Remove User Account"
+#~ msgstr "حذف حساب کاربر"
+
+#~ msgid "Login Options"
+#~ msgstr "گزینه‌های ورود به سیستم"
+
+#~ msgid "A user with the username '%s' already exists."
+#~ msgstr "یک کاربر با نام «%s» از پیش وجود دارد."
+
 #~ msgid "Done"
 #~ msgstr "انجام شد"
 
@@ -7257,9 +7540,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "Fast"
 #~ msgstr "سریع"
 
-#~ msgid "Two _finger scroll"
-#~ msgstr "لغزش دو ا_نگشتی"
-
 #~ msgid "No printers available"
 #~ msgstr "هیچ چاپگری موجود نیست"
 
@@ -7947,10 +8227,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "The current password is not correct"
 #~ msgstr "گذرواژه فعلی صحیح نیست"
 
-# ../capplets/common/gconf-property-editor.:c:183
-#~ msgid "Wrong password"
-#~ msgstr "گذرواژه اشتباه"
-
 #~ msgid "Switch Modes"
 #~ msgstr "حالت‌های معاوضه"
 
@@ -8136,9 +8412,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "C_reate..."
 #~ msgstr "_ایجاد..."
 
-#~ msgid "_Configure..."
-#~ msgstr "_پیکربندی"
-
 #~| msgid "Wireless mouse"
 #~ msgid "Wireless Hotspot"
 #~ msgstr "نقطه داغ بی‌سیم"
@@ -8450,10 +8723,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "Take a screenshot"
 #~ msgstr "یک عکس‌صفحه بگیرید"
 
-# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#~ msgid "Shortcut"
-#~ msgstr "میان‌بر"
-
 #~ msgid "_Right-handed"
 #~ msgstr "_راست دست"
 
@@ -8725,9 +8994,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "The type of accelerator."
 #~ msgstr "نوع شتاب‌ده."
 
-#~ msgid "Error saving the new shortcut"
-#~ msgstr "خطا در هنگام ذخیره‌ی میان‌بر جدید"
-
 #~ msgid "Too many custom shortcuts"
 #~ msgstr "تعداد زیادی میان‌بر سفارشی"
 
@@ -11101,9 +11367,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "_Detachable toolbars"
 #~ msgstr "نوار ابزارهای _جداشدنی"
 
-#~ msgid "_Edit"
-#~ msgstr "_ویرایش"
-
 #~ msgid "_Editable menu accelerators"
 #~ msgstr "شتاب‌دهنده‌های منوی _قابل ویرایش"
 
@@ -11513,9 +11776,6 @@ msgstr "لغو جست‌وجو"
 #~ msgid "Window Manager"
 #~ msgstr "مدیر پنجره‌ها"
 
-#~ msgid "_Command:"
-#~ msgstr "_فرمان:"
-
 #~ msgid "_Select:"
 #~ msgstr "_انتخاب"