[gnome-control-center] Update Persian Translation

From: Arash Mousavi <amousavi src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Update Persian Translation
Date: Thu, 28 Aug 2014 18:44:52 +0000 (UTC)
commit 2b6e64b8aa2a3cc8becdb1625bb04092fae70b04
Author: Arash Mousavi <mousavi arash gmail com>
Date:   Thu Aug 28 23:11:43 2014 +0430

    Update Persian Translation

 po/fa.po | 2415 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1233 insertions(+), 1182 deletions(-)
---
diff --git a/po/fa.po b/po/fa.po
index f67f066..494ddbc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,22 +8,22 @@
 # Elnaz Sarbar <elnaz farsiweb info>, 2005, 2006.
 # Farzaneh Sarafraz <farzaneh farsiweb info>, 2006.
 # Mahyar Moghimi <mahyar moqimi gmail com>, 2011.
-# Arash Mousavi <mousavi arash gmail com>, 2010, 2011, 2012, 2013.
+# Arash Mousavi <mousavi arash gmail com>, 2010, 2011, 2012, 2013, 2014.
 #
 msgid ""
 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: 2013-10-01 09:15+0000\n"
-"PO-Revision-Date: 2013-10-11 15:49+0330\n"
+"POT-Creation-Date: 2014-08-28 06:32+0000\n"
+"PO-Revision-Date: 2014-08-28 23:10+0430\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa_IR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -37,120 +37,127 @@ msgstr "پس‌زمینه"
 msgid "Changes throughout the day"
 msgstr "در طول روز تغییر می‌کند"
 
-#: ../panels/background/background.ui.h:4
-#| msgid "Lock screen"
+#. To translators: This is a noun, not a verb
+#: ../panels/background/background.ui.h:5
 msgid "Lock Screen"
 msgstr "قفل صفحه‌نمایش"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Tile"
 msgstr "کاشی"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "بزرگ‌نمایی"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Center"
 msgstr "مرکز"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Scale"
 msgstr "مقیاس کردن"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Fill"
 msgstr "پرکردن"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:11
 msgctxt "background, style"
 msgid "Span"
 msgstr "پوشش"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:293
+#: ../panels/background/cc-background-chooser-dialog.c:442
 msgid "Select Background"
 msgstr "انتخاب پس‌زمینه"
 
-#: ../panels/background/cc-background-chooser-dialog.c:312
+#: ../panels/background/cc-background-chooser-dialog.c:463
 msgid "Wallpapers"
 msgstr "کاغذدیواری‌ها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:321
+#: ../panels/background/cc-background-chooser-dialog.c:472
 msgid "Pictures"
 msgstr "تصویرها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:329
+#: ../panels/background/cc-background-chooser-dialog.c:481
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:338
-msgid "Flickr"
-msgstr "فلیکر"
-
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:393
-#| msgid "No input sources found"
+#: ../panels/background/cc-background-chooser-dialog.c:540
 msgid "No Pictures Found"
 msgstr "هیچ تصویری پیدا نشد"
 
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: ../panels/background/cc-background-chooser-dialog.c:558
+#: ../panels/search/cc-search-locations-dialog.c:274
+msgid "Home"
+msgstr "منزل"
+
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: ../panels/background/cc-background-chooser-dialog.c:408
+#: ../panels/background/cc-background-chooser-dialog.c:570
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr ""
 "شما می‌توانید تصاویر را به پوشه %s خود اضافه کنید آنها اینجا ظاهر می‌شوند"
 
-#: ../panels/background/cc-background-chooser-dialog.c:436
-#: ../panels/bluetooth/cc-bluetooth-panel.c:640
-#: ../panels/color/cc-color-panel.c:221 ../panels/color/cc-color-panel.c:958
-#: ../panels/display/cc-display-panel.c:1494
-#: ../panels/display/cc-display-panel.c:1909
+#: ../panels/background/cc-background-chooser-dialog.c:592
+#: ../panels/color/cc-color-panel.c:224 ../panels/color/cc-color-panel.c:961
+#: ../panels/common/language-chooser.ui.h:3
+#: ../panels/display/cc-display-panel.c:1537
+#: ../panels/display/cc-display-panel.c:1976
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 #: ../panels/network/connection-editor/vpn-helpers.c:245
 #: ../panels/network/connection-editor/vpn-helpers.c:374
-#: ../panels/network/net-device-wifi.c:1195
-#: ../panels/network/net-device-wifi.c:1403
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379
-#: ../panels/printers/cc-printers-panel.c:1946
+#: ../panels/network/net-device-wifi.c:1240
+#: ../panels/network/net-device-wifi.c:1448
+#: ../panels/printers/cc-printers-panel.c:1947
 #: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/privacy/cc-privacy-panel.c:470
-#: ../panels/search/cc-search-locations-dialog.c:682
-#: ../panels/sharing/cc-sharing-panel.c:421
-#: ../panels/user-accounts/um-fingerprint-dialog.c:269
-#: ../panels/user-accounts/um-photo-dialog.c:96
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/privacy/cc-privacy-panel.c:468
+#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/input-chooser.ui.h:2
+#: ../panels/search/cc-search-locations-dialog.c:681
+#: ../panels/sharing/cc-sharing-panel.c:491
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:2
+#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: ../panels/user-accounts/um-photo-dialog.c:95
+#: ../panels/user-accounts/um-photo-dialog.c:222
+#: ../panels/user-accounts/um-user-panel.c:513
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: ../panels/background/cc-background-chooser-dialog.c:437
+#: ../panels/background/cc-background-chooser-dialog.c:593
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:98
+#: ../panels/user-accounts/um-photo-dialog.c:97
 msgid "Select"
 msgstr "انتخاب"
 
-#: ../panels/background/cc-background-item.c:149
+#: ../panels/background/cc-background-item.c:197
 msgid "multiple sizes"
 msgstr "اندازه‌های چندگانه"
 
 #. translators: 100 × 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:153
+#: ../panels/background/cc-background-item.c:201
 #, c-format
 msgid "%d × %d"
 msgstr "%Id x %Id"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:327
 msgid "No Desktop Background"
 msgstr "بدون تصویر پس‌زمینه"
 
-#: ../panels/background/cc-background-panel.c:492
+#: ../panels/background/cc-background-panel.c:493
 msgid "Current background"
 msgstr "تصویر پس‌زمینه کنونی"
 
@@ -163,114 +170,23 @@ msgstr "تصویر پس‌زمینه‌ی خود را به یک کاغذ دیو
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "پس‌زمینه;صفحه‌نمایش;رومیزی;"
 
-#: ../panels/bluetooth/bluetooth.ui.h:1
-msgid "Set Up New Device"
-msgstr "تنظیم دستگاه جدید"
-
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
-msgid "Remove Device"
-msgstr "حذف دستگاه"
-
-#: ../panels/bluetooth/bluetooth.ui.h:3
-msgid "Connection"
-msgstr "اتصال"
-
-#: ../panels/bluetooth/bluetooth.ui.h:4
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "صفحه ۱"
-
-#: ../panels/bluetooth/bluetooth.ui.h:5
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "صفحه ۲"
-
-#: ../panels/bluetooth/bluetooth.ui.h:6
-msgid "Paired"
-msgstr "همگام شد"
-
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Type"
-msgstr "نوع"
-
-#: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:194
-#: ../panels/network/connection-editor/ce-page-ip4.c:456
-#: ../panels/network/connection-editor/ce-page-ip6.c:196
-#: ../panels/network/connection-editor/ce-page-ip6.c:460
-msgid "Address"
-msgstr "آدرس"
-
-#: ../panels/bluetooth/bluetooth.ui.h:9
-msgid "Mouse & Touchpad Settings"
-msgstr "تنظیمات موشی و صفحه‌لمسی"
-
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Sound Settings"
-msgstr "تنظیمات صدا"
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Keyboard Settings"
-msgstr "تنظیمات صفحه‌کلید"
-
-#: ../panels/bluetooth/bluetooth.ui.h:12
-msgid "Send Files…"
-msgstr "ارسال پرونده‌ها..."
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "بله"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:366
-#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "خیر"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:479
+#: ../panels/bluetooth/cc-bluetooth-panel.c:262
 msgid "Bluetooth is disabled"
 msgstr "بلوتوث غیرفعال است"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:484
-msgid "Bluetooth is disabled by hardware switch"
-msgstr "بلوتوث از طریق کلید سخت‌افزاری قطع شده است"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:488
+#: ../panels/bluetooth/cc-bluetooth-panel.c:263
 msgid "No Bluetooth adapters found"
 msgstr "هیچ آداپتور بلوتوثی پیدا نشد"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:587
-msgid "Visibility"
-msgstr "وضعیت نمایش"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:591
-#, c-format
-msgid "Visibility of “%s”"
-msgstr "وضعیت نمایش بودن «%s»"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:635
-#, c-format
-msgid "Remove '%s' from the list of devices?"
-msgstr "حذف «%s» از فهرست دستگاه‌ها؟"
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:637
-msgid ""
-"If you remove the device, you will have to set it up again before next use."
-msgstr ""
-"اگر دستگاه را حذف کنید، برای استفاده مجدد باید ابتدا آن را دوباره تنظیم کنید."
-
-#: ../panels/bluetooth/cc-bluetooth-panel.c:641
-#: ../panels/online-accounts/cc-online-accounts-panel.c:844
-msgid "_Remove"
-msgstr "_حذف"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:264
+msgid "Bluetooth is disabled by hardware switch"
+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:1688
 msgid "Bluetooth"
-msgstr "بلوتوس"
+msgstr "بلوتوث"
 
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
 msgid "Turn Bluetooth on and off and connect your devices"
@@ -410,90 +326,89 @@ msgstr "درجه‌بندی نشده"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:137
+#: ../panels/color/cc-color-panel.c:140
 msgid "Default: "
 msgstr "پیش‌فرض: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: ../panels/color/cc-color-panel.c:145
+#: ../panels/color/cc-color-panel.c:148
 msgid "Colorspace: "
 msgstr "فاصله‌رنگ (Colorspace): "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:152
+#: ../panels/color/cc-color-panel.c:155
 msgid "Test profile: "
 msgstr "آزمایش مجموعه‌تنظیمات: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:219
+#: ../panels/color/cc-color-panel.c:222
 msgid "Select ICC Profile File"
 msgstr "انتخاب پرونده‌ی مجموعه‌ی تنظیمات ICC"
 
-#: ../panels/color/cc-color-panel.c:222
+#: ../panels/color/cc-color-panel.c:225
 msgid "_Import"
 msgstr "_وارد کردن"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:233
+#: ../panels/color/cc-color-panel.c:236
 msgid "Supported ICC profiles"
 msgstr "مجموعه تنظیمات ICC پشتیبانی شده"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:240
-#: ../panels/network/wireless-security/eap-method-fast.c:410
+#: ../panels/color/cc-color-panel.c:243
+#: ../panels/network/wireless-security/eap-method-fast.c:420
 msgid "All files"
 msgstr "همه‌ی پرونده‌ها"
 
-#: ../panels/color/cc-color-panel.c:579
+#: ../panels/color/cc-color-panel.c:582
 msgid "Screen"
 msgstr "صفحه‌نمایش"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:903
+#: ../panels/color/cc-color-panel.c:906
 #, c-format
-#| msgid "Failed to apply configuration: %s"
 msgid "Failed to upload file: %s"
 msgstr "بارگذاری پروهده شکست خورد: %s"
 
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: ../panels/color/cc-color-panel.c:917
+#: ../panels/color/cc-color-panel.c:920
 msgid "The profile has been uploaded to:"
 msgstr "مجموعه‌تنظیمات بارگذاری شد:"
 
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:922
 msgid "Write down this URL."
 msgstr "این آدرس را یادداشت کنید."
 
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:923
 msgid "Restart this computer and boot your normal operating system."
 msgstr "این رایانه را مجددا راه‌اندازی کن پ با سیستم‌عامل معمول بالا بیا."
 
-#: ../panels/color/cc-color-panel.c:921
+#: ../panels/color/cc-color-panel.c:924
 msgid "Type the URL into your browser to download and install the profile."
 msgstr ""
 "آدرس را در مرورگر خود تایپ کنید تا مجموعه‌تنظیمات خود را بارگیری و نصب کنید."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: ../panels/color/cc-color-panel.c:955
+#: ../panels/color/cc-color-panel.c:958
 msgid "Save Profile"
 msgstr "ذخیره مجموعه‌تنظیمات"
 
-#: ../panels/color/cc-color-panel.c:959
+#: ../panels/color/cc-color-panel.c:962
 #: ../panels/network/connection-editor/vpn-helpers.c:375
 msgid "_Save"
 msgstr "_ذخیره"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:1315
+#: ../panels/color/cc-color-panel.c:1322
 msgid "Create a color profile for the selected device"
 msgstr "ایجاد یک مجموعه‌ی تنظیمات رنگ از دستگاه انتخاب شده"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
+#: ../panels/color/cc-color-panel.c:1337 ../panels/color/cc-color-panel.c:1361
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -501,24 +416,24 @@ msgstr ""
 "ابزار اندازه‌گیری پیدا نشد. لطفا بررسی کنید که روشن باشد و بدرستی نصب شده است."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1364
+#: ../panels/color/cc-color-panel.c:1371
 msgid "The measuring instrument does not support printer profiling."
 msgstr "ابزار اندازه‌گیری از profiling پشتیبانی نمی‌کند."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1375
+#: ../panels/color/cc-color-panel.c:1382
 msgid "The device type is not currently supported."
 msgstr "این نوع دستگاه در حال حاظر پشتیبانی نمی‌شود."
 
 #. TRANSLATORS: standard spaces are well known colorspaces like
 #. * sRGB, AdobeRGB and ProPhotoRGB
-#: ../panels/color/cc-color-profile.c:102
+#: ../panels/color/cc-color-profile.c:103
 msgid "Standard Space"
 msgstr "فضا استاندارد"
 
 #. TRANSLATORS: test profiles do things like changing the screen
 #. * a different color, or swap the red and green channels
-#: ../panels/color/cc-color-profile.c:108
+#: ../panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "آزمایش مجموعه‌تنظیمات"
 
@@ -526,7 +441,7 @@ msgstr "آزمایش مجموعه‌تنظیمات"
 #. * by the color management system based on manufacturing data,
 #. * for instance the default monitor profile is created from the
 #. * primaries specified in the monitor EDID
-#: ../panels/color/cc-color-profile.c:116
+#: ../panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "خودکار"
@@ -534,13 +449,13 @@ msgstr "خودکار"
 #. TRANSLATORS: the profile quality - low quality profiles take
 #. * much less time to generate but may be a poor reflection of the
 #. * device capability
-#: ../panels/color/cc-color-profile.c:126
+#: ../panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "کیفیت پایین"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:131
+#: ../panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "کیفیت متوسط"
@@ -548,41 +463,41 @@ msgstr "کیفیت متوسط"
 #. TRANSLATORS: the profile quality - high quality profiles take
 #. * a *long* time, and have the best calibration and
 #. * characterisation data.
-#: ../panels/color/cc-color-profile.c:138
+#: ../panels/color/cc-color-profile.c:139
 msgctxt "Profile quality"
 msgid "High Quality"
 msgstr "کیفیت بالا"
 
 #. TRANSLATORS: this default RGB space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:155
+#: ../panels/color/cc-color-profile.c:156
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "پیش‌فرض RGB"
 
 #. TRANSLATORS: this default CMYK space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:162
+#: ../panels/color/cc-color-profile.c:163
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "پیش‌فرض CMYK"
 
 #. TRANSLATORS: this default gray space is used for printers that
 #. * do not have additional printer profiles specified in the PPD
-#: ../panels/color/cc-color-profile.c:169
+#: ../panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "پیش‌فرض Gray"
 
-#: ../panels/color/cc-color-profile.c:193
+#: ../panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "اطلاعات درجه‌بندی کارخونه‌ای، فراهم شده توسط فروشنده"
 
-#: ../panels/color/cc-color-profile.c:202
+#: ../panels/color/cc-color-profile.c:203
 msgid "Full-screen display correction not possible with this profile"
 msgstr "اصلاح نمایش تمام‌صفحه با این مجموعه‌تنظیمات امکان‌پذیر نیست"
 
-#: ../panels/color/cc-color-profile.c:224
+#: ../panels/color/cc-color-profile.c:225
 msgid "This profile may no longer be accurate"
 msgstr "این مجموعه‌تنظیمات ممکن است دیگر دقیق نباشد"
 
@@ -593,7 +508,7 @@ msgstr "درجه‌بندی نمایشگر"
 #: ../panels/color/color-calibrate.ui.h:2
 #: ../panels/printers/authentication-dialog.ui.h:2
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1470
+#: ../panels/user-accounts/um-account-dialog.c:1468
 msgid "Cancel"
 msgstr "لغو"
 
@@ -613,10 +528,10 @@ msgid "Done"
 msgstr "انجام شد"
 
 #. Timeout parameters
-#. 5000 = 5 sec
+#. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "درجه‌بندی صفحه‌نمایش"
 
@@ -718,7 +633,6 @@ msgid "Profile successfully created!"
 msgstr "مجموعه‌تنظیمات با موفقیت ساخته شد!"
 
 #: ../panels/color/color.ui.h:22
-#| msgid "Copying files"
 msgid "Copy profile"
 msgstr "نسخه‌برداری از مجموعه‌تنظیمات"
 
@@ -727,12 +641,10 @@ msgid "Requires writable media"
 msgstr "نیاز به یک رسانه قابل نوشتن دارد"
 
 #: ../panels/color/color.ui.h:24
-#| msgid "Add profile"
 msgid "Upload profile"
 msgstr "بارگذاری مجموعه‌تنظیمات"
 
 #: ../panels/color/color.ui.h:25
-#| msgid "<b>Di_rect internet connection</b>"
 msgid "Requires Internet connection"
 msgstr "به اتصال اینترنت احتیاج دارد"
 
@@ -747,7 +659,7 @@ msgstr ""
 "\">مایکروسافت ویندوز</a> مفید باشند."
 
 #: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 msgid "Summary"
 msgstr "خلاصه"
 
@@ -917,33 +829,33 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "رنگ;ICC;مجموعه تنظیمات;درجه‌بندی;چاپگر;نمایشگر;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:685
+#: ../panels/common/cc-common-language.c:684
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../panels/common/cc-common-language.c:686
+#: ../panels/common/cc-common-language.c:685
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../panels/common/cc-common-language.c:687
+#: ../panels/common/cc-common-language.c:686
 msgid "France"
 msgstr "فرانسه"
 
-#: ../panels/common/cc-common-language.c:688
+#: ../panels/common/cc-common-language.c:687
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../panels/common/cc-common-language.c:689
+#: ../panels/common/cc-common-language.c:688
 msgid "China"
 msgstr "چین"
 
-#: ../panels/common/cc-common-language.c:759
+#: ../panels/common/cc-common-language.c:758
 msgid "Other…"
 msgstr "دیگر..."
 
 #: ../panels/common/cc-language-chooser.c:123
-#: ../panels/region/cc-format-chooser.c:268
-#: ../panels/region/cc-input-chooser.c:172
+#: ../panels/region/cc-format-chooser.c:267
+#: ../panels/region/cc-input-chooser.c:165
 msgid "More…"
 msgstr "بیشتر..."
 
@@ -956,37 +868,63 @@ msgid "Language"
 msgstr "زبان"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/mouse/cc-mouse-panel.c:111 ../panels/region/format-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
 msgid "_Done"
 msgstr "_انجام شد"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:358
-#| msgid "%b %d %l:%M %p"
+#: ../panels/datetime/cc-datetime-panel.c:340
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%Oe %B %OY, %Ol:%OM %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:363
+#: ../panels/datetime/cc-datetime-panel.c:345
 msgid "%e %B %Y, %R"
 msgstr "%Oe %B %OY, %OH:%OM"
 
+#. Translators: "city, country"
+#: ../panels/datetime/cc-datetime-panel.c:523
+#, c-format
+#| msgctxt "login date-time"
+#| msgid "%s, %s"
+msgctxt "timezone loc"
+msgid "%s, %s"
+msgstr "%s، %s"
+
+#. Update the timezone on the listbow row
+#. Translators: "timezone (details)"
+#: ../panels/datetime/cc-datetime-panel.c:553
+#, c-format
+#| msgid "%d x %d (%s)"
+msgctxt "timezone desc"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: ../panels/datetime/cc-datetime-panel.c:579
+#: ../panels/datetime/cc-datetime-panel.c:561
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:584
+#: ../panels/datetime/cc-datetime-panel.c:566
 msgid "%l:%M %p"
 msgstr "%Ol:%OM %p"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:589
+#: ../panels/datetime/cc-datetime-panel.c:571
 msgid "%R"
 msgstr "%OH:%OM"
 
+#. Update the text bubble in the timezone map
+#. Translators: "timezone (utc shift)"
+#: ../panels/datetime/cc-datetime-panel.c:576
+#, c-format
+#| msgid "%d x %d (%s)"
+msgctxt "timezone map"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../panels/datetime/datetime.ui.h:1
 msgid "January"
 msgstr "ژانویه"
@@ -1050,8 +988,6 @@ msgid "∶"
 msgstr ":"
 
 #: ../panels/datetime/datetime.ui.h:17
-#| msgid "minute"
-#| msgid_plural "minutes"
 msgid "Minute"
 msgstr "دقیقه"
 
@@ -1068,17 +1004,14 @@ msgid "Year"
 msgstr "سال"
 
 #: ../panels/datetime/datetime.ui.h:21
-#| msgid "Time"
 msgid "Time Zone"
 msgstr "منطقه زمانی"
 
 #: ../panels/datetime/datetime.ui.h:22
-#| msgid "Search for the string"
 msgid "Search for a city"
 msgstr "جست‌وجو برای یک شهر"
 
 #: ../panels/datetime/datetime.ui.h:23
-#| msgid "Date & Time"
 msgid "Automatic _Date & Time"
 msgstr "_تاریخ و زمان خودکار"
 
@@ -1087,12 +1020,10 @@ msgid "Requires internet access"
 msgstr "احتیاج به دسترسی به اینترنت دارد"
 
 #: ../panels/datetime/datetime.ui.h:25
-#| msgid "Automatic _Connect"
 msgid "Automatic Time _Zone"
 msgstr "_منطقه زمانی خودکار"
 
 #: ../panels/datetime/datetime.ui.h:26
-#| msgid "Date & Time"
 msgid "Date & _Time"
 msgstr "تاریخ و _زمان"
 
@@ -1101,7 +1032,6 @@ msgid "Time _Zone"
 msgstr "_منطقه زمانی"
 
 #: ../panels/datetime/datetime.ui.h:28
-#| msgid "Formats"
 msgid "Time _Format"
 msgstr "_قالب زمان"
 
@@ -1130,119 +1060,106 @@ msgstr "تغییر تنظیمات ناحیه و زبان سیستم"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "برای تغییر تنظیمات تاریخ و ساعت، احتیاج به تصدیق هویت دارید."
 
-#: ../panels/display/cc-display-panel.c:472
-#| msgid "Close"
+#: ../panels/display/cc-display-panel.c:487
 msgid "Lid Closed"
 msgstr "در بسته شد"
 
 #. translators: "Mirrored" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:475
-#| msgid "Mirrored Displays"
+#: ../panels/display/cc-display-panel.c:490
 msgid "Mirrored"
 msgstr "آیینه‌ای"
 
-#: ../panels/display/cc-display-panel.c:477
-#: ../panels/display/cc-display-panel.c:2042
-#| msgid "Primary _button"
+#: ../panels/display/cc-display-panel.c:492
+#: ../panels/display/cc-display-panel.c:2145
 msgid "Primary"
 msgstr "اصلی"
 
-#: ../panels/display/cc-display-panel.c:479
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1729 ../panels/power/cc-power-panel.c:1740
-#: ../panels/privacy/cc-privacy-panel.c:80
-#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/display/cc-display-panel.c:494
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1684 ../panels/power/cc-power-panel.c:1695
+#: ../panels/privacy/cc-privacy-panel.c:84
+#: ../panels/privacy/cc-privacy-panel.c:124
 #: ../panels/universal-access/cc-ua-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:597
-#: ../panels/universal-access/cc-ua-panel.c:722
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 #: ../panels/universal-access/uap.ui.h:6
 msgid "Off"
 msgstr "خاموش"
 
-#: ../panels/display/cc-display-panel.c:482
-#| msgid "Secondary color"
+#: ../panels/display/cc-display-panel.c:497
 msgid "Secondary"
 msgstr "ثانویه"
 
-#: ../panels/display/cc-display-panel.c:1490
-#| msgid "Mirrored Displays"
+#: ../panels/display/cc-display-panel.c:1533
 msgid "Arrange Combined Displays"
 msgstr "چینش نمایشگرهای تلفیق شده"
 
-#: ../panels/display/cc-display-panel.c:1496
-#: ../panels/display/cc-display-panel.c:1912
+#: ../panels/display/cc-display-panel.c:1539
+#: ../panels/display/cc-display-panel.c:1979
 #: ../panels/network/connection-editor/connection-editor.ui.h:1
 msgid "_Apply"
 msgstr "_اِعمال"
 
-#: ../panels/display/cc-display-panel.c:1517
+#: ../panels/display/cc-display-panel.c:1560
 msgid "Drag displays to rearrange them"
 msgstr "نمایشگرها را بکشید تا چینش آنها را تغییر دهید"
 
-#. size
-#: ../panels/display/cc-display-panel.c:1976
-#| msgid "Size:"
+#: ../panels/display/cc-display-panel.c:2081
 msgid "Size"
 msgstr "اندازه"
 
 #. aspect ratio
-#: ../panels/display/cc-display-panel.c:1991
+#: ../panels/display/cc-display-panel.c:2094
 msgid "Aspect Ratio"
 msgstr "نسبت طول به عرض"
 
-#: ../panels/display/cc-display-panel.c:2012
-#: ../panels/printers/pp-options-dialog.c:86
+#: ../panels/display/cc-display-panel.c:2115
+#: ../panels/printers/pp-options-dialog.c:85
 msgid "Resolution"
 msgstr "تفکیک‌پذیری"
 
-#: ../panels/display/cc-display-panel.c:2043
+#: ../panels/display/cc-display-panel.c:2146
 msgid "Show the top bar and Activities Overview on this display"
 msgstr "نمایش نوار بالایی و نمای‌کلی فعالیت‌ها در این نمایشگر"
 
-#: ../panels/display/cc-display-panel.c:2049
-#| msgid "Secondary click delay"
+#: ../panels/display/cc-display-panel.c:2152
 msgid "Secondary Display"
 msgstr "نمایشگر ثانویه"
 
-#: ../panels/display/cc-display-panel.c:2050
+#: ../panels/display/cc-display-panel.c:2153
 msgid "Join this display with another to create an extra workspace"
 msgstr "ادغام این نمایشگر با دیگری جهت ساخت "
 
-#: ../panels/display/cc-display-panel.c:2057
-#| msgid "Orientation"
+#: ../panels/display/cc-display-panel.c:2160
 msgid "Presentation"
 msgstr "ارائه"
 
-#: ../panels/display/cc-display-panel.c:2058
+#: ../panels/display/cc-display-panel.c:2161
 msgid "Show slideshows and media only"
 msgstr "فقط نمایش اسلایدها و رسانه"
 
 #. translators: "Mirror" describes when both displays show the same view
-#: ../panels/display/cc-display-panel.c:2063
-#| msgid "Mirror Screens"
+#: ../panels/display/cc-display-panel.c:2166
 msgid "Mirror"
 msgstr "آینه"
 
-#: ../panels/display/cc-display-panel.c:2064
+#: ../panels/display/cc-display-panel.c:2167
 msgid "Show your existing view on both displays"
 msgstr "نمایش نمای موجود در هر دو نمایشگر"
 
-#: ../panels/display/cc-display-panel.c:2070
-#| msgid "_Turn On"
+#: ../panels/display/cc-display-panel.c:2173
 msgid "Turn Off"
 msgstr "خاموش کردن"
 
-#: ../panels/display/cc-display-panel.c:2071
-#| msgid "Panel to display"
+#: ../panels/display/cc-display-panel.c:2174
 msgid "Don't use this display"
 msgstr "از این نمایشگر استفاده نکن"
 
-#: ../panels/display/cc-display-panel.c:2286
+#: ../panels/display/cc-display-panel.c:2383
 msgid "Could not get screen information"
 msgstr "نمی‌توان اطلاعات صفحه‌نمایش را دریافت کرد"
 
-#: ../panels/display/cc-display-panel.c:2317
-#| msgid "Mirrored Displays"
+#: ../panels/display/cc-display-panel.c:2414
 msgid "_Arrange Combined Displays"
 msgstr "_چینش نمایشگرهای تلفیق شده"
 
@@ -1256,58 +1173,63 @@ msgstr "نحوه استفاده از نمایشگرها و پروژکتورها
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
-msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+#| msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
+msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;"
 msgstr "تابلو;پروژکتور;xrandr;نمایشگر;تفکیک‌پذیری;نوسازی;"
 
+#: ../panels/info/cc-info-panel.c:384
+msgid "Wayland"
+msgstr "Wayland"
+
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:387 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../panels/info/cc-info-panel.c:534
+#: ../panels/info/cc-info-panel.c:472
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %Id بیت"
 
-#: ../panels/info/cc-info-panel.c:536
+#: ../panels/info/cc-info-panel.c:474
 #, c-format
 msgid "%d-bit"
 msgstr "%Id بیت"
 
-#: ../panels/info/cc-info-panel.c:1216
+#: ../panels/info/cc-info-panel.c:1154
 msgid "Ask what to do"
 msgstr "بپرس چه باید کرد"
 
-#: ../panels/info/cc-info-panel.c:1220
+#: ../panels/info/cc-info-panel.c:1158
 msgid "Do nothing"
 msgstr "کاری نکن"
 
-#: ../panels/info/cc-info-panel.c:1224
+#: ../panels/info/cc-info-panel.c:1162
 msgid "Open folder"
 msgstr "پوشه‌ را باز کن"
 
-#: ../panels/info/cc-info-panel.c:1315
+#: ../panels/info/cc-info-panel.c:1253
 msgid "Other Media"
 msgstr "رسانه‌های دیگر"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1284
 msgid "Select an application for audio CDs"
 msgstr "یک برنامه‌ برای پخش سی‌دی‌های صوتی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1285
 msgid "Select an application for video DVDs"
 msgstr "یک برنامه‌ برای پخش دی‌وی‌دی‌های ویدیویی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1286
 msgid "Select an application to run when a music player is connected"
 msgstr ""
 "یک برنامه برای اجرا جهت زمانی که یک پخش‌کننده موسیقی متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1287
 msgid "Select an application to run when a camera is connected"
 msgstr "یک برنامه برای اجرا جهت زمانی که یک دوربین متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1288
 msgid "Select an application for software CDs"
 msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار انتخاب کن"
 
@@ -1316,92 +1238,76 @@ msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار 
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1362
+#: ../panels/info/cc-info-panel.c:1300
 msgid "audio DVD"
 msgstr "دی‌وی‌دی صوتی"
 
-#: ../panels/info/cc-info-panel.c:1363
+#: ../panels/info/cc-info-panel.c:1301
 msgid "blank Blu-ray disc"
 msgstr "دیسک بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1302
 msgid "blank CD disc"
 msgstr "دیسک سی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1303
 msgid "blank DVD disc"
 msgstr "دیسک دی‌وی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1304
 msgid "blank HD DVD disc"
 msgstr "دیسک دی‌وی‌دی اچ‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1305
 msgid "Blu-ray video disc"
 msgstr "دیسک ویدئویی بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1306
 msgid "e-book reader"
 msgstr "کتاب الکترونیکی خوان"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1307
 msgid "HD DVD video disc"
 msgstr "دیسک ویدئویی دی‌وی‌دی اچ‌دی"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1308
 msgid "Picture CD"
 msgstr "سی‌دی تصویر"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1309
 msgid "Super Video CD"
 msgstr "سی‌دی ویدئویی برتر"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1310
 msgid "Video CD"
 msgstr "سی‌دی ویدیویی"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1311
 msgid "Windows software"
 msgstr "نرم‌افزار ویندوز"
 
-#: ../panels/info/cc-info-panel.c:1374
-msgid "Software"
-msgstr "نرم‌افزار"
-
-#: ../panels/info/cc-info-panel.c:1497
-#: ../panels/keyboard/keyboard-shortcuts.c:1696
+#: ../panels/info/cc-info-panel.c:1434
+#: ../panels/keyboard/keyboard-shortcuts.c:1917
 msgid "Section"
 msgstr "بخش"
 
-#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1443 ../panels/info/info.ui.h:14
 msgid "Overview"
 msgstr "مرور کلی"
 
-#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1449 ../panels/info/info.ui.h:21
 msgid "Default Applications"
 msgstr "برنامه‌های پیش‌فرض"
 
-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1454 ../panels/info/info.ui.h:29
 msgid "Removable Media"
 msgstr "رسانه‌های جدا شدنی"
 
-#: ../panels/info/cc-info-panel.c:1542
+#: ../panels/info/cc-info-panel.c:1479
 #, c-format
 msgid "Version %s"
 msgstr "نسخه %s"
 
-#: ../panels/info/cc-info-panel.c:1592
-msgid "Install Updates"
-msgstr "نصب کردن بروزرسانی‌ها"
-
-#: ../panels/info/cc-info-panel.c:1596
-msgid "System Up-To-Date"
-msgstr "سیستم به روز"
-
-#: ../panels/info/cc-info-panel.c:1600
-msgid "Checking for Updates"
-msgstr "بررسی برای بروزرسانی‌ها"
-
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
 #: ../panels/network/connection-editor/ce-page-details.c:240
 #: ../panels/network/network-wifi.ui.h:44
@@ -1466,55 +1372,60 @@ msgstr "گرافیک‌ها"
 msgid "Virtualization"
 msgstr "مجازی‌سازی"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:13
+#| msgid "Checking for Updates"
+msgid "Check for updates"
+msgstr "بررسی برای بروزرسانی‌ها"
+
+#: ../panels/info/info.ui.h:15
 msgid "_Web"
 msgstr "_وب"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:16
 msgid "_Mail"
 msgstr "_پست‌الکترونیکی"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:17
 msgid "_Calendar"
 msgstr "_تقویم"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:18
 msgid "M_usic"
 msgstr "_موسیقی"
 
-#: ../panels/info/info.ui.h:18
+#: ../panels/info/info.ui.h:19
 msgid "_Video"
 msgstr "_ویدیو"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:20
 msgid "_Photos"
 msgstr "_عکس‌ها"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:22
 msgid "Select how media should be handled"
 msgstr "انتخاب کنید که چگونه باید با رسانه رفتار شود"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:23
 msgid "CD _audio"
 msgstr "_صوت سی‌دی"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:24
 msgid "_DVD video"
 msgstr "ویدئو _دی‌وی‌دی"
 
-#: ../panels/info/info.ui.h:24
+#: ../panels/info/info.ui.h:25
 msgid "_Music player"
 msgstr "پخش‌کننده‌ی _موسیقی"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:26
 msgid "_Software"
 msgstr "_برنامه"
 
-#: ../panels/info/info.ui.h:26
+#: ../panels/info/info.ui.h:27
 msgid "_Other Media…"
 msgstr "_رسانه‌های دیگر..."
 
-#: ../panels/info/info.ui.h:27
+#: ../panels/info/info.ui.h:28
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_هیچ‌وقت در زمان ورود رسانه، هشدار یا برنامه‌ای را اجرا نکن"
 
@@ -1563,7 +1474,7 @@ msgid "Eject"
 msgstr "بیرون دادن"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 #: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "تایپ"
@@ -1584,23 +1495,28 @@ msgstr "راه‌اندازها"
 msgid "Launch help browser"
 msgstr "راه‌اندازی مرورگر راهنما"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3
+#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1601
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: ../panels/keyboard/01-launchers.xml.in.h:4
 msgid "Launch calculator"
 msgstr "راه‌اندازی ماشین حساب"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: ../panels/keyboard/01-launchers.xml.in.h:5
 msgid "Launch email client"
 msgstr "راه‌اندازی کارگیر پست‌الکترونیکی"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
 msgstr "راه‌اندازی مرورگر وب"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
 msgstr "پوشه‌ آغازه"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: ../panels/keyboard/01-launchers.xml.in.h:8
 msgctxt "keybinding"
 msgid "Search"
 msgstr "جست‌وجو"
@@ -1691,13 +1607,13 @@ msgstr "روشن یا خاموش کردن سایه روشن"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:271
-#: ../panels/keyboard/cc-keyboard-option.c:390
-#: ../panels/keyboard/keyboard-shortcuts.c:1159
+#: ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:395
+#: ../panels/keyboard/keyboard-shortcuts.c:1217
 #: ../panels/network/network-wifi.ui.h:29
 #: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+#: ../panels/user-accounts/um-fingerprint-dialog.c:213
+#: ../panels/user-accounts/um-fingerprint-dialog.c:214
 msgid "Disabled"
 msgstr "از کار افتاده"
 
@@ -1705,7 +1621,7 @@ msgstr "از کار افتاده"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:349
+#: ../panels/keyboard/cc-keyboard-option.c:354
 msgid "Alternative Characters Key"
 msgstr "کلید نویسه‌های جانشین"
 
@@ -1713,11 +1629,11 @@ msgstr "کلید نویسه‌های جانشین"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:358
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Compose Key"
 msgstr "کلید‌های ایجاد"
 
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: ../panels/keyboard/cc-keyboard-option.c:368
 msgid "Modifiers-only switch to next source"
 msgstr "کلید Modifiers-only تعویض به منبع بعدی"
 
@@ -1739,87 +1655,95 @@ msgstr "میان‌بر;تکرار;چشمک;"
 msgid "Custom Shortcut"
 msgstr "میان‌بر سفارشی"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/network/connection-editor/net-connection-editor.c:512
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/region/input-chooser.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1469
+msgid "_Add"
+msgstr "ا_ضافه کردن"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "_Name:"
 msgstr "_نام:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "C_ommand:"
 msgstr "_فرمان:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "Repeat Keys"
 msgstr "تکرار کلیدها"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 msgid "Key presses _repeat when key is held down"
 msgstr "ت_کرار کلید وقتی کلید پایین نگه داشته شود"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgid "_Delay:"
 msgstr "_وفقه:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgid "_Speed:"
 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:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "کوتاه"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "آهسته"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgid "Repeat keys speed"
 msgstr "سرعت تکرار کلیدها"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "بلند"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "سریع"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "Cursor Blinking"
 msgstr "چشمک‌زدن مکان‌نما"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor _blinks in text fields"
 msgstr "مکان‌نما در جعبه‌های متنی _چشمک می‌زند"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 msgid "S_peed:"
 msgstr "سر‌_عت:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
 msgid "Cursor blink speed"
 msgstr "سرعت چشمک‌زدن مکان‌نما"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 #: ../panels/region/region.ui.h:5
 msgid "Input Sources"
 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:19
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid "Add Shortcut"
 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:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Remove Shortcut"
 msgstr "حذف میان‌بر"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1828,32 +1752,32 @@ 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:22
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:24
 msgid "Shortcuts"
 msgstr "میان‌برها"
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#: ../panels/keyboard/keyboard-shortcuts.c:585
-#: ../panels/keyboard/keyboard-shortcuts.c:593
+#: ../panels/keyboard/keyboard-shortcuts.c:634
+#: ../panels/keyboard/keyboard-shortcuts.c:642
 msgid "Custom Shortcuts"
 msgstr "میان‌برهای سفارشی"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:804
+#: ../panels/keyboard/keyboard-shortcuts.c:859
 msgid "<Unknown Action>"
 msgstr "<کنش ناشناخته>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1300
+#: ../panels/keyboard/keyboard-shortcuts.c:1356
 #, 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"
+"استفاده از میانبر «%s» به این دلیل که امکان تایپ به وسیله‌ی این کلید را "
+"غیرممکن می کند، امکان‌پذیر نیست.\n"
 "لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1332
+#: ../panels/keyboard/keyboard-shortcuts.c:1386
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1862,22 +1786,47 @@ msgstr ""
 "میان‌بر «%s» قبلاً استفاده شده است برای:\n"
 "‏ «%s»"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1337
+#: ../panels/keyboard/keyboard-shortcuts.c:1391
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1343
+#: ../panels/keyboard/keyboard-shortcuts.c:1397
 msgid "_Reassign"
 msgstr "_جای‌گذاری مجدد"
 
-#: ../panels/mouse/cc-mouse-panel.c:95
+#: ../panels/keyboard/keyboard-shortcuts.c:1429
+#, 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/keyboard-shortcuts.c:1435
+#, c-format
+#| msgid ""
+#| "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be "
+#| "disabled."
+msgid ""
+"\"%s\" is currently associated with \"%s\", this shortcut will be disabled "
+"if you move forward."
+msgstr ""
+"درحال حاضر «%s» به «%s» وابسته است، اگر پیشروی کنید این میان‌بر غیرفعال خواهد "
+"شد."
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1441
+#| msgid "_Reassign"
+msgid "_Assign"
+msgstr "_جای‌گذاری"
+
+#: ../panels/mouse/cc-mouse-panel.c:94
 msgid "Test Your _Settings"
 msgstr "آزمایش _تنظیمات شما"
 
-#: ../panels/mouse/cc-mouse-panel.c:108
-#| msgid "Test Your _Settings"
+#: ../panels/mouse/cc-mouse-panel.c:107
 msgid "Test Your Settings"
 msgstr "آزمایش تنظیمات شما"
 
@@ -1892,17 +1841,14 @@ msgstr "تغییر میزان حساسیت موشی یا صفحه‌لمسی و
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
-#| msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
-msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;توپ‌جهت;لغزش;"
+msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;صفحه ردیاب;لغزش;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
 msgid "General"
 msgstr "کلیات"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
-#| msgctxt "keyboard, speed"
-#| msgid "Slow"
 msgctxt "double click, speed"
 msgid "Slow"
 msgstr "آهسته"
@@ -1912,8 +1858,6 @@ msgid "Double-click timeout"
 msgstr "پایان زمان دوبار کلیک"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:4
-#| msgctxt "keyboard, speed"
-#| msgid "Fast"
 msgctxt "double click, speed"
 msgid "Fast"
 msgstr "سریع"
@@ -1945,15 +1889,11 @@ msgid "_Pointer speed"
 msgstr "سرعت _اشاره‌گر"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:11
-#| msgctxt "keyboard, speed"
-#| msgid "Slow"
 msgctxt "mouse pointer, speed"
 msgid "Slow"
 msgstr "آهسته"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:12
-#| msgctxt "keyboard, speed"
-#| msgid "Fast"
 msgctxt "mouse pointer, speed"
 msgid "Fast"
 msgstr "سریع"
@@ -1963,15 +1903,11 @@ msgid "Touchpad"
 msgstr "صفحه‌ی ‌لمسی"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-#| msgctxt "keyboard, speed"
-#| msgid "Slow"
 msgctxt "touchpad pointer, speed"
 msgid "Slow"
 msgstr "آهسته"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-#| msgctxt "keyboard, speed"
-#| msgid "Fast"
 msgctxt "touchpad pointer, speed"
 msgid "Fast"
 msgstr "سریع"
@@ -1990,50 +1926,49 @@ msgstr "لغزش دو ا_نگشتی"
 
 #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
 #: ../panels/mouse/gnome-mouse-properties.ui.h:20
-#| msgid "_Edge scrolling"
 msgid "_Natural scrolling"
 msgstr "لغرش _طبیعی"
 
-#: ../panels/mouse/gnome-mouse-test.c:132
+#: ../panels/mouse/gnome-mouse-test.c:130
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
 msgid "Try clicking, double clicking, scrolling"
 msgstr "کلیک کردن، دوبار کلیک، لغزش را آزمایش کنید"
 
-#: ../panels/mouse/gnome-mouse-test.c:137
+#: ../panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "پنج کلیک، زمان GEGL است!"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "دوبار کلیک، دکمه اصلی"
 
-#: ../panels/mouse/gnome-mouse-test.c:142
+#: ../panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "یکبار کلیک، دکمه اصلی"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "دوبار کلیک، دکمه وسط"
 
-#: ../panels/mouse/gnome-mouse-test.c:145
+#: ../panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "یکبار کلیک، دکمه وسط"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "دوباره کلیک، دکمه دومی"
 
-#: ../panels/mouse/gnome-mouse-test.c:148
+#: ../panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 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:366
 msgid "Air_plane Mode"
 msgstr "حالت _هواپیمایی"
 
-#: ../panels/network/cc-network-panel.c:930
+#: ../panels/network/cc-network-panel.c:965
 msgid "Network proxy"
 msgstr "پیشکار شبکه"
 
@@ -2041,14 +1976,14 @@ msgstr "پیشکار شبکه"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: ../panels/network/cc-network-panel.c:1109 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278
 #: ../panels/network/net-vpn.c:431
 #, c-format
 msgid "%s VPN"
 msgstr "وی‌پی‌ان %s"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1244
+#: ../panels/network/cc-network-panel.c:1289
 msgid "The system network services are not compatible with this version."
 msgstr "سرویس‌های شبکه‌ی سیستم با این نسخه سازگار نیستند."
 
@@ -2056,6 +1991,12 @@ msgstr "سرویس‌های شبکه‌ی سیستم با این نسخه ساز
 msgid "802.1x _Security"
 msgstr "_امنیت 802.1x"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "صفحه ۱"
+
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:3
 #: ../panels/network/connection-editor/security-page.ui.h:3
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:1
@@ -2069,6 +2010,12 @@ msgstr "هویت _ناشناس"
 msgid "Inner _authentication"
 msgstr "_تاییدهویت داخلی"
 
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "صفحه ۲"
+
 #: ../panels/network/connection-editor/ce-page-8021x-security.c:108
 #: ../panels/network/connection-editor/ce-page-security.c:455
 #: ../panels/network/connection-editor/details-page.ui.h:3
@@ -2082,34 +2029,34 @@ msgstr "خودکار"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:216
-#: ../panels/network/net-device-wifi.c:377
+#: ../panels/network/net-device-wifi.c:217
+#: ../panels/network/net-device-wifi.c:378
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:220
-#: ../panels/network/net-device-wifi.c:382
+#: ../panels/network/net-device-wifi.c:221
+#: ../panels/network/net-device-wifi.c:383
 #: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:225
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:229
+#: ../panels/network/net-device-wifi.c:230
 msgid "Enterprise"
 msgstr "Enterprise"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:234
-#: ../panels/network/net-device-wifi.c:367
+#: ../panels/network/net-device-wifi.c:235
+#: ../panels/network/net-device-wifi.c:368
 msgctxt "Wifi security"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -2120,18 +2067,18 @@ msgid "Never"
 msgstr "هرگز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:803
+#: ../panels/user-accounts/um-utils.c:819
 msgid "Today"
 msgstr "امروز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:806
+#: ../panels/user-accounts/um-utils.c:822
 msgid "Yesterday"
 msgstr "دیروز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:471
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:472
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2140,121 +2087,128 @@ msgstr[1] "%Ii روز قبل"
 
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:53
-#: ../panels/network/net-device-wifi.c:528
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:529
 #, c-format
 msgid "%d Mb/s"
 msgstr "%Id مگابیت/ثانیه"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:557
+#: ../panels/network/net-device-wifi.c:558
 msgctxt "Signal strength"
 msgid "None"
 msgstr "هیچ‌کدام"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:559
+#: ../panels/network/net-device-wifi.c:560
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "ضعیف"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:561
+#: ../panels/network/net-device-wifi.c:562
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "کافی"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:563
+#: ../panels/network/net-device-wifi.c:564
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "خوب"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:565
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "عالی"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:213
+#: ../panels/network/connection-editor/ce-page-ethernet.c:226
 #: ../panels/network/connection-editor/ce-page-vpn.c:204
-#: ../panels/network/connection-editor/ce-page-wifi.c:255
+#: ../panels/network/connection-editor/ce-page-wifi.c:270
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Identity"
 msgstr "هویت"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:207
-#: ../panels/network/connection-editor/ce-page-ip4.c:469
+#: ../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
+msgid "Address"
+msgstr "آدرس"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:190
+#: ../panels/network/connection-editor/ce-page-ip4.c:452
 msgid "Netmask"
 msgstr "ماسک شبکه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:221
-#: ../panels/network/connection-editor/ce-page-ip4.c:482
-#: ../panels/network/connection-editor/ce-page-ip6.c:222
-#: ../panels/network/connection-editor/ce-page-ip6.c:490
+#: ../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/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "دروازه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:238
-#: ../panels/network/connection-editor/ce-page-ip6.c:239
+#: ../panels/network/connection-editor/ce-page-ip4.c:221
+#: ../panels/network/connection-editor/ce-page-ip6.c:222
 msgid "Delete Address"
 msgstr "حذف آدرس"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:292
-#: ../panels/network/connection-editor/ce-page-ip6.c:293
+#: ../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:360
-#: ../panels/network/connection-editor/ce-page-ip6.c:364
+#: ../panels/network/connection-editor/ce-page-ip4.c:343
+#: ../panels/network/connection-editor/ce-page-ip6.c:347
 msgid "Server"
 msgstr "کارگزار"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:377
-#: ../panels/network/connection-editor/ce-page-ip6.c:381
+#: ../panels/network/connection-editor/ce-page-ip4.c:360
+#: ../panels/network/connection-editor/ce-page-ip6.c:364
 msgid "Delete DNS Server"
 msgstr "حذف کارگزار دی‌ان‌اس"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:496
-#: ../panels/network/connection-editor/ce-page-ip6.c:504
+#: ../panels/network/connection-editor/ce-page-ip4.c:479
+#: ../panels/network/connection-editor/ce-page-ip6.c:487
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "متریک"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:517
-#: ../panels/network/connection-editor/ce-page-ip6.c:525
+#: ../panels/network/connection-editor/ce-page-ip4.c:500
+#: ../panels/network/connection-editor/ce-page-ip6.c:508
 msgid "Delete Route"
 msgstr "حذف مسیر"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:632
+#: ../panels/network/connection-editor/ce-page-ip4.c:615
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:636
-#: ../panels/network/connection-editor/ce-page-ip6.c:638
+#: ../panels/network/connection-editor/ce-page-ip4.c:619
+#: ../panels/network/connection-editor/ce-page-ip6.c:621
 #: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "دستی"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:640
-#: ../panels/network/connection-editor/ce-page-ip6.c:642
+#: ../panels/network/connection-editor/ce-page-ip4.c:623
+#: ../panels/network/connection-editor/ce-page-ip6.c:625
 msgid "Link-Local Only"
 msgstr "فقط Link-Local"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:942
+#: ../panels/network/connection-editor/ce-page-ip4.c:953
 #: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:209
-#: ../panels/network/connection-editor/ce-page-ip6.c:473
+#: ../panels/network/connection-editor/ce-page-ip6.c:192
+#: ../panels/network/connection-editor/ce-page-ip6.c:456
 msgid "Prefix"
 msgstr "پیشوند"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:630
+#: ../panels/network/connection-editor/ce-page-ip6.c:613
 #: ../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
@@ -2262,11 +2216,11 @@ msgstr "پیشوند"
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:634
+#: ../panels/network/connection-editor/ce-page-ip6.c:617
 msgid "Automatic, DHCP only"
 msgstr "خودکار، فقط DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:902
+#: ../panels/network/connection-editor/ce-page-ip6.c:919
 #: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
@@ -2317,15 +2271,15 @@ msgid "Link speed"
 msgstr "سرعت پیوند"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:155
+#: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:3
 #: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "نشانی آی‌پی ن۴"
 
 #: ../panels/network/connection-editor/details-page.ui.h:5
-#: ../panels/network/net-device-ethernet.c:156
 #: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
@@ -2333,14 +2287,14 @@ msgid "IPv6 Address"
 msgstr "نشانی آی‌پی ن۶"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:163
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-simple.ui.h:2
 #: ../panels/network/network-wifi.ui.h:7
 msgid "Hardware Address"
 msgstr "نشانی سخت‌افزار"
 
 #: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/net-device-ethernet.c:171
 #: ../panels/network/network-mobile.ui.h:5
 #: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
@@ -2350,7 +2304,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:169
+#: ../panels/network/net-device-ethernet.c:173
 #: ../panels/network/network-mobile.ui.h:6
 #: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
@@ -2435,7 +2389,6 @@ msgstr "_منطقه دیوارآتشین"
 
 #: ../panels/network/connection-editor/firewall-helpers.c:48
 #: ../panels/network/connection-editor/firewall-helpers.c:112
-#| msgid "Default"
 msgctxt "Firewall zone"
 msgid "Default"
 msgstr "پیش‌فرض"
@@ -2482,46 +2435,44 @@ msgstr "از این اتصال _تنها برای منابع روی شبکه‌
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:268
+#: ../panels/network/connection-editor/net-connection-editor.c:269
 msgid "Unable to open connection editor"
 msgstr "نمی‌توان ویرایشگر اتصال را باز کرد"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:286
+#: ../panels/network/connection-editor/net-connection-editor.c:287
 msgid "New Profile"
 msgstr "مجموعه‌تنظیمات جدید"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:511
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1471
-msgid "_Add"
-msgstr "ا_ضافه کردن"
-
-#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/connection-editor/net-connection-editor.c:577
 #: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "وی‌پی‌ان"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:596
+#: ../panels/network/connection-editor/net-connection-editor.c:578
 msgid "Bond"
 msgstr "Bond"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:597
+#: ../panels/network/connection-editor/net-connection-editor.c:580
+msgid "Team"
+msgstr "گروه"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:582
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:598
+#: ../panels/network/connection-editor/net-connection-editor.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:749
+#: ../panels/network/connection-editor/net-connection-editor.c:734
 msgid "Could not load VPN plugins"
 msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:818
+#: ../panels/network/connection-editor/net-connection-editor.c:803
 msgid "Import from file…"
 msgstr "وارد کردن از پرونده..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:889
+#: ../panels/network/connection-editor/net-connection-editor.c:874
 msgid "Add Network Connection"
 msgstr "اضافه کردن اتصال شبکه"
 
@@ -2531,7 +2482,7 @@ msgid "_Reset"
 msgstr "_تنظیم مجدد"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1449
 #: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "_فراموش کردن"
@@ -2577,10 +2528,9 @@ msgid "Select file to import"
 msgstr "برای وارد کردن یک پرونده انتخاب کنید"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:246
-#: ../panels/printers/cc-printers-panel.c:1947
-#: ../panels/sharing/cc-sharing-panel.c:422
-#: ../panels/user-accounts/um-photo-dialog.c:222
-#| msgid "Open"
+#: ../panels/printers/cc-printers-panel.c:1948
+#: ../panels/sharing/cc-sharing-panel.c:492
+#: ../panels/user-accounts/um-photo-dialog.c:223
 msgid "_Open"
 msgstr "_بازکردن"
 
@@ -2615,7 +2565,8 @@ msgstr ""
 "خطا: %s"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:371
-msgid "Export VPN connection..."
+#| msgid "Export VPN connection..."
+msgid "Export VPN connection"
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:4
@@ -2654,45 +2605,52 @@ msgstr "اینکه چطور به اینترنت متصل می‌شوید را ک
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
 #| msgid ""
 #| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| "vpn;vlan;bridge;bond;"
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;"
+"vlan;bridge;bond;DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
-"vlan;bridge;bond;شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;"
-"وی پی ان;"
+"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:108
-#: ../panels/network/net-device-wifi.c:457
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:458
 msgid "never"
 msgstr "هرگز"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:467
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:468
 msgid "today"
 msgstr "امروز"
 
-#: ../panels/network/net-device-ethernet.c:120
-#: ../panels/network/net-device-wifi.c:469
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:470
 msgid "yesterday"
 msgstr "دیروز"
 
-#: ../panels/network/net-device-ethernet.c:158
+#: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
 #: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "آی‌پی"
 
-#: ../panels/network/net-device-ethernet.c:174
+#: ../panels/network/net-device-ethernet.c:178
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "آخرین استفاده"
@@ -2702,14 +2660,14 @@ msgstr "آخرین استفاده"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:284
+#: ../panels/network/net-device-ethernet.c:288
 #: ../panels/network/network-ethernet.ui.h:1
 #: ../panels/network/network-simple.ui.h:1
 msgid "Wired"
 msgstr "سیمی"
 
-#: ../panels/network/net-device-ethernet.c:352
-#: ../panels/network/net-device-wifi.c:1545
+#: ../panels/network/net-device-ethernet.c:356
+#: ../panels/network/net-device-wifi.c:1604
 #: ../panels/network/network-ethernet.ui.h:3
 #: ../panels/network/network-mobile.ui.h:8
 #: ../panels/network/network-simple.ui.h:8
@@ -2717,7 +2675,7 @@ msgstr "سیمی"
 msgid "Options…"
 msgstr "گزینه‌ها..."
 
-#: ../panels/network/net-device-ethernet.c:489
+#: ../panels/network/net-device-ethernet.c:474
 #, c-format
 msgid "Profile %d"
 msgstr "مجموعه‌تنظیمات %Id"
@@ -2726,7 +2684,12 @@ msgstr "مجموعه‌تنظیمات %Id"
 msgid "Add new connection"
 msgstr "اضافه کردن اتصال جدید"
 
-#: ../panels/network/net-device-wifi.c:1111
+#: ../panels/network/net-device-team.c:77
+#| msgid "Bridge slaves"
+msgid "Team slaves"
+msgstr "برده‌های گروه"
+
+#: ../panels/network/net-device-wifi.c:1153
 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."
@@ -2734,12 +2697,12 @@ msgstr ""
 "اگر شما اتصالی به اینترنت غیر از اتصال بی‌سیم دارید، می‌توانید یک hotspot "
 "بی‌سیم راه‌اندازی کنید و آن را با دیگران به اشتراک بگذارید."
 
-#: ../panels/network/net-device-wifi.c:1115
+#: ../panels/network/net-device-wifi.c:1157
 #, 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:1119
+#: ../panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2747,23 +2710,23 @@ msgstr ""
 "امکان دسترسی به اینترنت از طریق بی‌سیم، هنگامی که hotspot فعال است، وجود "
 "ندارد."
 
-#: ../panels/network/net-device-wifi.c:1193
+#: ../panels/network/net-device-wifi.c:1238
 msgid "Stop hotspot and disconnect any users?"
 msgstr "توقع منبع اصلی و قطع ارتباط با کاربران؟"
 
-#: ../panels/network/net-device-wifi.c:1196
+#: ../panels/network/net-device-wifi.c:1241
 msgid "_Stop Hotspot"
 msgstr "_توقف منبع اصلی"
 
-#: ../panels/network/net-device-wifi.c:1268
+#: ../panels/network/net-device-wifi.c:1313
 msgid "System policy prohibits use as a Hotspot"
 msgstr "سیاست‌های سیستم استفاده از Hotspot را منع کرده است"
 
-#: ../panels/network/net-device-wifi.c:1271
+#: ../panels/network/net-device-wifi.c:1316
 msgid "Wireless device does not support Hotspot mode"
 msgstr "دستگاه بی‌سیم از حالت Hotspot پشتیبانی نمی‌کند"
 
-#: ../panels/network/net-device-wifi.c:1400
+#: ../panels/network/net-device-wifi.c:1445
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2771,19 +2734,18 @@ msgstr ""
 "جزئیات شبکه برای شبکه‌های انتخاب شده، شامل گذرواژه‌ها و هرگونه پیکربندی سفارشی "
 "حذف خواهند شد."
 
-#: ../panels/network/net-device-wifi.c:1710
+#: ../panels/network/net-device-wifi.c:1753
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
 msgid "History"
 msgstr "تاریخچه"
 
-#: ../panels/network/net-device-wifi.c:1714 ../panels/power/power.ui.h:21
-#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596
-#: ../panels/wacom/cc-wacom-page.c:525
+#: ../panels/network/net-device-wifi.c:1757
+#: ../panels/wacom/cc-wacom-page.c:533
 msgid "_Close"
 msgstr "_بستن"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1722
+#: ../panels/network/net-device-wifi.c:1765
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_فراموش کردن"
@@ -2886,6 +2848,10 @@ msgstr "خاموش کردن دستگاه"
 msgid "Add Device"
 msgstr "اضافه کردن دستگاه"
 
+#: ../panels/network/network.ui.h:6
+msgid "Remove Device"
+msgstr "حذف دستگاه"
+
 #: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "نوع وی‌پی‌ان"
@@ -3359,22 +3325,23 @@ msgstr "کلیدهای خصوصی DER، PEM یا PKCS#12 شامل ‪(*.der, *.p
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "گواهینامه‌های DER یا PEM شامل ‪(*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:261
+#: ../panels/network/wireless-security/eap-method-fast.c:271
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "یک پرونده PAC انتخاب کنید..."
+#: ../panels/network/wireless-security/eap-method-fast.c:409
+#| msgid "Choose a PAC file..."
+msgid "Choose a PAC file"
+msgstr "یک پرونده PAC انتخاب کنید"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: ../panels/network/wireless-security/eap-method-fast.c:416
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC شامل ‪(*.pac)"
 
@@ -3434,10 +3401,11 @@ msgid "MD5"
 msgstr "MD5"
 
 #: ../panels/network/wireless-security/eap-method-peap.c:350
-#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-tls.c:456
 #: ../panels/network/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "انتخاب یک گواهینامه‌ی مرجع گواهینامه (CA)..."
+#| msgid "Choose a Certificate Authority certificate..."
+msgid "Choose a Certificate Authority certificate"
+msgstr "یک گواهینامه‌ی مرجع گواهینامه (CA) انتخاب کنید"
 
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
@@ -3461,11 +3429,11 @@ msgstr "_نسخه PEAP"
 msgid "As_k for this password every time"
 msgstr "این گذرواژه را هربار _بپرس"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:260
+#: ../panels/network/wireless-security/eap-method-tls.c:282
 msgid "Unencrypted private keys are insecure"
 msgstr "کلیدهای خصوصی رمزنگاری نشده ناامن هستند"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:263
+#: ../panels/network/wireless-security/eap-method-tls.c:285
 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 "
@@ -3479,13 +3447,15 @@ msgstr ""
 "\n"
 "(شما می‌توانید به‌وسیله‌ی openssl برروی کلید خود گذرواژه بگذارید)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:428
-msgid "Choose your personal certificate..."
-msgstr "گواهینامه شخصی خود را انتخاب کنید..."
+#: ../panels/network/wireless-security/eap-method-tls.c:450
+#| msgid "Choose your personal certificate..."
+msgid "Choose your personal certificate"
+msgstr "گواهینامه شخصی خود را انتخاب کنید"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:440
-msgid "Choose your private key..."
-msgstr "کلید خصوصی خود را انتخاب کنید..."
+#: ../panels/network/wireless-security/eap-method-tls.c:462
+#| msgid "Choose your private key..."
+msgid "Choose your private key"
+msgstr "کلید خصوصی خود را انتخاب کنید"
 
 #: ../panels/network/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity"
@@ -3519,6 +3489,14 @@ msgstr "CHAP"
 msgid "Don't _warn me again"
 msgstr "دوباره به من _هشدار نده"
 
+#: ../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
 msgid "TLS"
 msgstr "TLS"
@@ -3582,45 +3560,45 @@ msgid "_Type"
 msgstr "_نوع"
 
 #. TRANSLATORS: this is the per application switch for message tray usage.
-#: ../panels/notifications/cc-edit-dialog.c:39
+#: ../panels/notifications/cc-edit-dialog.c:37
 msgctxt "notifications"
 msgid "Notifications"
 msgstr "اعلان‌ها"
 
 #. TRANSLATORS: this is the setting to configure sounds associated with notifications
-#: ../panels/notifications/cc-edit-dialog.c:41
+#: ../panels/notifications/cc-edit-dialog.c:39
 msgctxt "notifications"
 msgid "Sound Alerts"
 msgstr "هشدارهای صوتی"
 
-#: ../panels/notifications/cc-edit-dialog.c:42
+#: ../panels/notifications/cc-edit-dialog.c:40
 msgctxt "notifications"
 msgid "Show Popup Banners"
 msgstr "نمایش بنرهای واشو"
 
 #. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
-#: ../panels/notifications/cc-edit-dialog.c:44
+#: ../panels/notifications/cc-edit-dialog.c:42
 msgctxt "notifications"
 msgid "Show Details in Banners"
 msgstr "نمایش جزئیات در بنرها"
 
-#: ../panels/notifications/cc-edit-dialog.c:45
+#: ../panels/notifications/cc-edit-dialog.c:43
 msgctxt "notifications"
 msgid "View in Lock Screen"
 msgstr "نمایش در صفحه قفل"
 
-#: ../panels/notifications/cc-edit-dialog.c:46
+#: ../panels/notifications/cc-edit-dialog.c:44
 msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "نمایش جزئیات در صفحه قفل"
 
-#: ../panels/notifications/cc-notifications-panel.c:205
-#: ../panels/power/cc-power-panel.c:1735 ../panels/power/cc-power-panel.c:1742
-#: ../panels/privacy/cc-privacy-panel.c:80
-#: ../panels/privacy/cc-privacy-panel.c:120
+#: ../panels/notifications/cc-notifications-panel.c:185
+#: ../panels/power/cc-power-panel.c:1690 ../panels/power/cc-power-panel.c:1697
+#: ../panels/privacy/cc-privacy-panel.c:84
+#: ../panels/privacy/cc-privacy-panel.c:124
 #: ../panels/universal-access/cc-ua-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:597
-#: ../panels/universal-access/cc-ua-panel.c:722
+#: ../panels/universal-access/cc-ua-panel.c:572
+#: ../panels/universal-access/cc-ua-panel.c:695
 msgid "On"
 msgstr "روشن"
 
@@ -3645,66 +3623,69 @@ msgstr "نمایش بنرهای واشو"
 msgid "Show in Lock Screen"
 msgstr "نمایش در صفحه قفل"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
-#| msgid "Other"
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:169
 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:318
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:283
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "اضافه کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:322
 msgid "Mail"
 msgstr "پست‌الکترونیکی"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328
 msgid "Contacts"
 msgstr "آشناها"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334
 msgid "Chat"
 msgstr "گپ"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340
 msgid "Resources"
 msgstr "منابع"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:425
+#: ../panels/online-accounts/cc-online-accounts-panel.c:423
 msgid "Error logging into the account"
 msgstr "خطا در هنگاک ورود به حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:495
+#: ../panels/online-accounts/cc-online-accounts-panel.c:493
 msgid "Credentials have expired."
 msgstr "اعتبارنامه‌ها منقضی شده‌اند."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:499
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "Sign in to enable this account."
 msgstr "وارد شوید تا این حساب فعال شود."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:504
+#: ../panels/online-accounts/cc-online-accounts-panel.c:502
 msgid "_Sign In"
 msgstr "_ورود به سیستم"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:745
+#: ../panels/online-accounts/cc-online-accounts-panel.c:743
 msgid "Error creating account"
 msgstr "خطا در ایجاد حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:805
+#: ../panels/online-accounts/cc-online-accounts-panel.c:803
 msgid "Error removing account"
 msgstr "خطا در هنگام حذف کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:841
+#: ../panels/online-accounts/cc-online-accounts-panel.c:839
 msgid "Are you sure you want to remove the account?"
 msgstr "آیا مطمئنید که می‌خواهید حساب را حذف کنید؟"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:843
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
 msgid "This will not remove the account on the server."
 msgstr "این کار حساب را بر روی کارگزار پاک نخواهد کرد."
 
+#: ../panels/online-accounts/cc-online-accounts-panel.c:842
+msgid "_Remove"
+msgstr "_حذف"
+
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
 msgid "Online Accounts"
 msgstr "حساب‌های برخط"
@@ -3713,15 +3694,17 @@ msgstr "حساب‌های برخط"
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "به حساب‌های برخط خود متصل شوید و تصمیم بگیرد چه استفاده‌ای از آنها بکنید"
 
-#. Translators: those are keywords for the online-accounts control-center panel
+#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
-#| msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| msgid ""
+#| "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+#| "ownCloud;Kerberos;IMAP;SMTP;"
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
-"Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 msgstr ""
 "گوگل;فیس بوک;تویتر;یاهو;وب;برخط;گپ;تقویم;پست‌الکترونیکی;آشنا;ownCloud;"
-"Kerberos;IMAP;SMTP;"
+"Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3743,18 +3726,18 @@ msgstr ""
 "اضافه کردن یک حساب به برنامه‌های شما اجازه می‌دهد تا از آنها برای سندها، "
 "پست‌الکترونیکی، آشناها، تقویم، گپ و... استفاده کنند."
 
-#: ../panels/power/cc-power-panel.c:189
+#: ../panels/power/cc-power-panel.c:183
 msgid "Unknown time"
 msgstr "زمان نامعلوم"
 
-#: ../panels/power/cc-power-panel.c:195
+#: ../panels/power/cc-power-panel.c:189
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%Ii دقیقه"
 msgstr[1] "%Ii دقیقه"
 
-#: ../panels/power/cc-power-panel.c:207
+#: ../panels/power/cc-power-panel.c:201
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3763,234 +3746,226 @@ msgstr[1] "%Ii ساعت"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:215
+#: ../panels/power/cc-power-panel.c:209
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%Ii %s %Ii %s"
 
-#: ../panels/power/cc-power-panel.c:216
+#: ../panels/power/cc-power-panel.c:210
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ساعت"
 msgstr[1] "ساعت"
 
-#: ../panels/power/cc-power-panel.c:217
+#: ../panels/power/cc-power-panel.c:211
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "دقیقه"
 msgstr[1] "دقیقه"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:236
+#: ../panels/power/cc-power-panel.c:230
 #, c-format
 msgid "%s until fully charged"
 msgstr "‫%s تا شارژ کامل"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:243
+#: ../panels/power/cc-power-panel.c:237
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "هشدار: %s باقی‌مانده"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:248
+#: ../panels/power/cc-power-panel.c:242
 #, c-format
 msgid "%s remaining"
 msgstr "%s باقی‌مانده"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
+#: ../panels/power/cc-power-panel.c:247 ../panels/power/cc-power-panel.c:275
 msgid "Fully charged"
 msgstr "کاملا شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
+#: ../panels/power/cc-power-panel.c:251 ../panels/power/cc-power-panel.c:279
 msgid "Empty"
 msgstr "خالی"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:272
+#: ../panels/power/cc-power-panel.c:266
 msgid "Charging"
 msgstr "درحال شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:277
+#: ../panels/power/cc-power-panel.c:271
 msgid "Discharging"
 msgstr "درحال تخلیه"
 
-#: ../panels/power/cc-power-panel.c:395
+#: ../panels/power/cc-power-panel.c:396
 msgctxt "Battery name"
 msgid "Main"
 msgstr "اصلی"
 
-#: ../panels/power/cc-power-panel.c:397
+#: ../panels/power/cc-power-panel.c:398
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "اضافی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:470
 msgid "Wireless mouse"
 msgstr "موشی بی‌سیم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:473
 msgid "Wireless keyboard"
 msgstr "صفحه‌کلید بی‌سیم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:496
+#: ../panels/power/cc-power-panel.c:476
 msgid "Uninterruptible power supply"
 msgstr "تامین‌کننده‌ی انرژی غیرقابل وقفه‌اندازی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:479
 msgid "Personal digital assistant"
 msgstr "دستیار دیجیتال شخصی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:505
+#: ../panels/power/cc-power-panel.c:482
 msgid "Cellphone"
 msgstr "تلفن‌همراه"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:509
+#: ../panels/power/cc-power-panel.c:485
 msgid "Media player"
 msgstr "پخش‌کننده صوتی تصویری"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:513
+#: ../panels/power/cc-power-panel.c:488
 msgid "Tablet"
 msgstr "تبلت"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:517
+#: ../panels/power/cc-power-panel.c:491
 msgid "Computer"
 msgstr "رایانه"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:521 ../panels/power/cc-power-panel.c:731
-#: ../panels/power/cc-power-panel.c:2066
+#: ../panels/power/cc-power-panel.c:494 ../panels/power/cc-power-panel.c:717
+#: ../panels/power/cc-power-panel.c:2019
 msgid "Battery"
 msgstr "باتری"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:540
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "درحال شارژ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "هشدار"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Low"
 msgstr "کم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Good"
 msgstr "خوب"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:562
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "کاملا شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:556
+#: ../panels/power/cc-power-panel.c:566
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "خالی"
 
-#: ../panels/power/cc-power-panel.c:729
+#: ../panels/power/cc-power-panel.c:715
 msgid "Batteries"
 msgstr "باتری‌ها"
 
-#: ../panels/power/cc-power-panel.c:1135
+#: ../panels/power/cc-power-panel.c:1117
 msgid "When _idle"
 msgstr "هنگام _بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1504
+#: ../panels/power/cc-power-panel.c:1445
 msgid "Power Saving"
 msgstr "صرفه‌جویی انرژی"
 
-#: ../panels/power/cc-power-panel.c:1532
-#| msgid "_Screen Brightness"
+#: ../panels/power/cc-power-panel.c:1473
 msgid "_Screen brightness"
 msgstr "روشنایی _صفحه‌نمایش"
 
-#: ../panels/power/cc-power-panel.c:1538
-#| msgid "Keyboard Preferences"
+#: ../panels/power/cc-power-panel.c:1479
 msgid "_Keyboard brightness"
 msgstr "روشنایی _صفحه‌کلید"
 
-#: ../panels/power/cc-power-panel.c:1548
-#| msgid "_Dim Screen when Inactive"
+#: ../panels/power/cc-power-panel.c:1489
 msgid "_Dim screen when inactive"
 msgstr "_تیره کردن صفحه‌نمایش زمان بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1573
-#| msgid "_Blank Screen"
+#: ../panels/power/cc-power-panel.c:1514
 msgid "_Blank screen"
 msgstr "صفحه _خالی"
 
-#: ../panels/power/cc-power-panel.c:1610
+#: ../panels/power/cc-power-panel.c:1551
 msgid "_Wi-Fi"
 msgstr "_وای-فای"
 
-#: ../panels/power/cc-power-panel.c:1615
+#: ../panels/power/cc-power-panel.c:1556
 msgid "Turns off wireless devices"
 msgstr "دستگاه‌های بی‌سیم را خاموش می‌کند"
 
-#: ../panels/power/cc-power-panel.c:1640
-#| msgid "Mobile broadband"
+#: ../panels/power/cc-power-panel.c:1581
 msgid "_Mobile broadband"
 msgstr "پهن‌باند _موبایل"
 
-#: ../panels/power/cc-power-panel.c:1645
-#| msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+#: ../panels/power/cc-power-panel.c:1586
 msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "دستگاه‌های پهن‌باند همراه (3G، 4G، WiMax و...) را خاموش می‌کند"
 
-#: ../panels/power/cc-power-panel.c:1680
+#: ../panels/power/cc-power-panel.c:1635
 msgid "_Bluetooth"
 msgstr "_بلوتوث"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: ../panels/power/cc-power-panel.c:1686
 msgid "When on battery power"
 msgstr "هنگامی که روی انرژی باتری است"
 
-#: ../panels/power/cc-power-panel.c:1733
+#: ../panels/power/cc-power-panel.c:1688
 msgid "When plugged in"
 msgstr "زمان اتصال به برق"
 
-#: ../panels/power/cc-power-panel.c:1862
+#: ../panels/power/cc-power-panel.c:1818
 msgid "Suspend & Power Off"
 msgstr "تعلیق و خاموش کردن"
 
-#: ../panels/power/cc-power-panel.c:1895
-#| msgid "_Automatic Suspend"
+#: ../panels/power/cc-power-panel.c:1851
 msgid "_Automatic suspend"
 msgstr "_تعلیق خودکار"
 
-#: ../panels/power/cc-power-panel.c:1919
-#| msgid "When Battery Power is _Critical"
+#: ../panels/power/cc-power-panel.c:1875
 msgid "When battery power is _critical"
 msgstr "زمانی که انرژی _بحرانی است"
 
-#: ../panels/power/cc-power-panel.c:1976
+#: ../panels/power/cc-power-panel.c:1930
 msgid "Power Off"
 msgstr "خاموش کردن"
 
-#: ../panels/power/cc-power-panel.c:2113
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Devices"
 msgstr "‌دستگاه‌ها"
 
@@ -4078,15 +4053,15 @@ msgstr "۱۲ دقیقه"
 msgid "Automatic Suspend"
 msgstr "تعلیق خودکار"
 
-#: ../panels/power/power.ui.h:22
+#: ../panels/power/power.ui.h:21
 msgid "_Plugged In"
 msgstr "_متصل به برق"
 
-#: ../panels/power/power.ui.h:23
+#: ../panels/power/power.ui.h:22
 msgid "On _Battery Power"
 msgstr "بر روی انرژی _باتری"
 
-#: ../panels/power/power.ui.h:24
+#: ../panels/power/power.ui.h:23
 msgid "Delay"
 msgstr "وقفه"
 
@@ -4095,7 +4070,7 @@ msgid "Authenticate"
 msgstr "تایید هویت"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/sharing/sharing.ui.h:14
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "گذرواژه"
@@ -4105,143 +4080,143 @@ msgid "Authentication Required"
 msgstr "تصدیق هویت لازم است"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:590
 msgid "Low on toner"
 msgstr "جوهر کم است"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:593
+#: ../panels/printers/cc-printers-panel.c:592
 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:596
+#: ../panels/printers/cc-printers-panel.c:595
 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:599
+#: ../panels/printers/cc-printers-panel.c:598
 msgid "Out of developer"
 msgstr "عدم وجود سازنده"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:600
 msgid "Low on a marker supply"
 msgstr "کمبود ذخیره محفظه رنگ"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:602
 msgid "Out of a marker supply"
 msgstr "عدم وجود ذخیره محفظه رنگ"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:604
 msgid "Open cover"
 msgstr "بازکردن پوشش"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:606
 msgid "Open door"
 msgstr "در را باز کن"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:608
 msgid "Low on paper"
 msgstr "کمبود کاغذ"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:610
 msgid "Out of paper"
 msgstr "عدم وجود کاغذ"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:613
+#: ../panels/printers/cc-printers-panel.c:612
 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:615
-#: ../panels/printers/cc-printers-panel.c:806
+#: ../panels/printers/cc-printers-panel.c:614
+#: ../panels/printers/cc-printers-panel.c:805
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "توقف کرده"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:616
 msgid "Waste receptacle almost full"
 msgstr "محفظه مواد زائد تقریبا پُر است"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:618
 msgid "Waste receptacle full"
 msgstr "محفظه مواد زائد پُر است"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:620
 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:623
+#: ../panels/printers/cc-printers-panel.c:622
 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:733
+#: ../panels/printers/cc-printers-panel.c:732
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "درحال پیکربندی"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:792
+#: ../panels/printers/cc-printers-panel.c:791
 msgctxt "printer state"
 msgid "Ready"
 msgstr "آماده"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: ../panels/printers/cc-printers-panel.c:797
+#: ../panels/printers/cc-printers-panel.c:796
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "کاری قبول نمی‌کند"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:802
+#: ../panels/printers/cc-printers-panel.c:801
 msgctxt "printer state"
 msgid "Processing"
 msgstr "در حال پردازش"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:923
+#: ../panels/printers/cc-printers-panel.c:922
 msgid "Toner Level"
 msgstr "سطح تونر"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:926
+#: ../panels/printers/cc-printers-panel.c:925
 msgid "Ink Level"
 msgstr "سطح جوهر"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:929
+#: ../panels/printers/cc-printers-panel.c:928
 msgid "Supply Level"
 msgstr "سطح ذخیره"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:947
+#: ../panels/printers/cc-printers-panel.c:946
 msgctxt "printer state"
 msgid "Installing"
 msgstr "درحال نصب"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1124
+#: ../panels/printers/cc-printers-panel.c:1123
 msgid "No printers available"
 msgstr "هیچ چاپگری موجود نیست"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1432
+#: ../panels/printers/cc-printers-panel.c:1433
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -4249,45 +4224,45 @@ msgstr[0] "%Iu کار فعال"
 msgstr[1] "%Iu کار فعال"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1776
+#: ../panels/printers/cc-printers-panel.c:1777
 msgid "Failed to add new printer."
 msgstr "اضافه‌کردن چاپگر جدید شکست خورد."
 
-#: ../panels/printers/cc-printers-panel.c:1943
+#: ../panels/printers/cc-printers-panel.c:1944
 msgid "Select PPD File"
 msgstr "انتخاب پرونده‌ی PPD"
 
-#: ../panels/printers/cc-printers-panel.c:1952
+#: ../panels/printers/cc-printers-panel.c:1953
 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:2257
+#: ../panels/printers/cc-printers-panel.c:2258
 msgid "No suitable driver found"
 msgstr "هیچ راه‌انداز مناسبی پیدا نشد"
 
-#: ../panels/printers/cc-printers-panel.c:2326
+#: ../panels/printers/cc-printers-panel.c:2327
 msgid "Searching for preferred drivers…"
 msgstr "جست‌وجو برای راه‌اندازهای ترجیح داده..."
 
-#: ../panels/printers/cc-printers-panel.c:2341
+#: ../panels/printers/cc-printers-panel.c:2342
 msgid "Select from database…"
 msgstr "انتخاب از بانک اطلاعاتی..."
 
-#: ../panels/printers/cc-printers-panel.c:2350
+#: ../panels/printers/cc-printers-panel.c:2351
 msgid "Provide PPD File…"
 msgstr "فراهم کردن پرونده PPD..."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2501
-#: ../panels/printers/cc-printers-panel.c:2524
+#: ../panels/printers/cc-printers-panel.c:2502
+#: ../panels/printers/cc-printers-panel.c:2525
 msgid "Test page"
 msgstr "صفحه‌ی آزمایشی"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2932
+#: ../panels/printers/cc-printers-panel.c:2933
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ناتوان در باز کردن واسط کاربری: %s"
@@ -4314,7 +4289,6 @@ msgstr "کارهای فعال"
 
 #: ../panels/printers/jobs-dialog.ui.h:3
 #: ../panels/printers/options-dialog.ui.h:2
-#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "بستن"
 
@@ -4336,17 +4310,16 @@ msgstr "اضافه‌کردن یک چاپگر جدید"
 
 #. Translators: This button opens authentication dialog for selected server.
 #: ../panels/printers/new-printer-dialog.ui.h:5
-#| msgid "Authenticate"
 msgid "A_uthenticate"
 msgstr "_تایید هویت"
 
-#: ../panels/printers/new-printer-dialog.ui.h:6
-msgid "Search for network printers or filter result"
-msgstr "جست‌وجو برای چاپگرهای شبکه و یا صافی کردن نتیجه"
+#. Translators: No printers were found
+#: ../panels/printers/new-printer-dialog.ui.h:7
+msgid "No printers detected."
+msgstr "هیچ چاپگری پیدا نشد."
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:8
-#| msgid "Search for network printers or filter result"
+#: ../panels/printers/new-printer-dialog.ui.h:9
 msgid "Enter address of a printer or a text to filter results"
 msgstr "آدرس یک چاپگر را یا متنی وارد کنید تا نتایج صافی شوند"
 
@@ -4362,233 +4335,269 @@ msgstr "انتخاب راه‌انداز چاپگر"
 msgid "Loading drivers database..."
 msgstr "درحال بارگیری بانک اطلاعاتی راه‌اندازها"
 
+#. Translators: The found device is a JetDirect printer
+#: ../panels/printers/pp-host.c:506
+#| msgid "Remove Printer"
+msgid "JetDirect Printer"
+msgstr "چاپگر JetDirect"
+
+#. Translators: The found device is a Line Printer Daemon printer
+#: ../panels/printers/pp-host.c:756
+#| msgctxt "Device kind"
+#| msgid "Printer"
+msgid "LPD Printer"
+msgstr "چاپگر LPD"
+
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:66
+#: ../panels/printers/pp-ppd-option-widget.c:70
 msgid "One Sided"
 msgstr "یک طرفه"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:68
+#: ../panels/printers/pp-ppd-option-widget.c:72
 msgid "Long Edge (Standard)"
 msgstr "گوشه بلند (استاندارد)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:71
-#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:70
+#: ../panels/printers/pp-ppd-option-widget.c:74
 msgid "Short Edge (Flip)"
 msgstr "گوشه کوتاه (معکوس)"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:72
 msgid "Portrait"
 msgstr "پرتره‌ای"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:74
 msgid "Landscape"
 msgstr "منظره‌ای"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:76
 msgid "Reverse landscape"
 msgstr "منظره‌ای برعکس"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:79
+#: ../panels/printers/pp-ipp-option-widget.c:78
 msgid "Reverse portrait"
 msgstr "پرتره‌ای برعکس"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:143
+#: ../panels/printers/pp-jobs-dialog.c:142
 msgctxt "print job"
 msgid "Pending"
 msgstr "معلق"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:147
+#: ../panels/printers/pp-jobs-dialog.c:146
 msgctxt "print job"
 msgid "Held"
 msgstr "نگه‌داشته شده"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:151
+#: ../panels/printers/pp-jobs-dialog.c:150
 msgctxt "print job"
 msgid "Processing"
 msgstr "در حال پردازش"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:155
+#: ../panels/printers/pp-jobs-dialog.c:154
 msgctxt "print job"
 msgid "Stopped"
 msgstr "متوقف شده"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:159
+#: ../panels/printers/pp-jobs-dialog.c:158
 msgctxt "print job"
 msgid "Canceled"
 msgstr "لغو شده"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:163
+#: ../panels/printers/pp-jobs-dialog.c:162
 msgctxt "print job"
 msgid "Aborted"
 msgstr "بی‌نتیجه‌مانده"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:167
+#: ../panels/printers/pp-jobs-dialog.c:166
 msgctxt "print job"
 msgid "Completed"
 msgstr "کامل شده"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:289
+#: ../panels/printers/pp-jobs-dialog.c:288
 msgid "Job Title"
 msgstr "عنوان کار"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:298
+#: ../panels/printers/pp-jobs-dialog.c:297
 msgid "Job State"
 msgstr "وضعیت کار"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/pp-jobs-dialog.c:304
+#: ../panels/printers/pp-jobs-dialog.c:303
 msgid "Time"
 msgstr "زمان"
 
-#: ../panels/printers/pp-jobs-dialog.c:496
+#: ../panels/printers/pp-jobs-dialog.c:495
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s کار فعال"
 
+#. Translators: The found device is a printer connected via USB
+#: ../panels/printers/pp-new-printer-dialog.c:1671
+msgid "USB"
+msgstr "USB"
+
+#. Translators: The found device is a printer connected via serial port
+#: ../panels/printers/pp-new-printer-dialog.c:1676
+msgid "Serial Port"
+msgstr "درگاه سریال"
+
+#. Translators: The found device is a printer connected via parallel port
+#: ../panels/printers/pp-new-printer-dialog.c:1683
+msgid "Parallel Port"
+msgstr "درگاه موازی"
+
+#. Translators: Location of found network printer (e.g. Kitchen, Reception)
+#: ../panels/printers/pp-new-printer-dialog.c:1739
+#, c-format
+#| msgid "Location"
+msgid "Location: %s"
+msgstr "مکان: %s"
+
+#. Translators: Network address of found printer
+#: ../panels/printers/pp-new-printer-dialog.c:1744
+#, c-format
+#| msgid "A_ddress:"
+msgid "Address: %s"
+msgstr "نشانی: %s"
+
 #. Translators: This item is a server which needs authentication to show its printers
-#: ../panels/printers/pp-new-printer-dialog.c:1669
-#| msgid "_Inner authentication"
+#: ../panels/printers/pp-new-printer-dialog.c:1768
 msgid "Server requires authentication"
 msgstr "کارگزار نیاز به تاییدهویت دارد"
 
-#. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1706
-msgid "No printers detected."
-msgstr "هیچ چاپگری پیدا نشد."
-
-#: ../panels/printers/pp-options-dialog.c:82
+#: ../panels/printers/pp-options-dialog.c:81
 msgid "Two Sided"
 msgstr "دو طرفه"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: ../panels/printers/pp-options-dialog.c:82
 msgid "Paper Type"
 msgstr "نوع کاغذ"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: ../panels/printers/pp-options-dialog.c:83
 msgid "Paper Source"
 msgstr "منبع کاغذ"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: ../panels/printers/pp-options-dialog.c:84
 msgid "Output Tray"
 msgstr "سینی خروجی"
 
-#: ../panels/printers/pp-options-dialog.c:87
+#: ../panels/printers/pp-options-dialog.c:86
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript pre-filtering"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: ../panels/printers/pp-options-dialog.c:532
+#: ../panels/printers/pp-options-dialog.c:531
 msgid "Pages per side"
 msgstr "صفحه‌ها در هر طرف"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:544
+#: ../panels/printers/pp-options-dialog.c:543
 msgid "Two-sided"
 msgstr "دو طرفه"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:556
+#: ../panels/printers/pp-options-dialog.c:555
 msgid "Orientation"
 msgstr "جهت"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:653
+#: ../panels/printers/pp-options-dialog.c:652
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "عمومی"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:656
+#: ../panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "تنطیمات صفحه"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:659
+#: ../panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "گزینه‌های قابل نصب"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:662
+#: ../panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "کارها"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:665
+#: ../panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "کیفیت تصویر"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:668
+#: ../panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "رنگ"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:671
+#: ../panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "درحال پایان بردن"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:674
+#: ../panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "پیشرفته"
 
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:79
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:76
+#: ../panels/printers/pp-ppd-option-widget.c:78
+#: ../panels/printers/pp-ppd-option-widget.c:86
 msgid "Auto Select"
 msgstr "انتخاب خودکار"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../panels/printers/pp-ppd-option-widget.c:81
-#: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:85
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:80
+#: ../panels/printers/pp-ppd-option-widget.c:82
+#: ../panels/printers/pp-ppd-option-widget.c:84
+#: ../panels/printers/pp-ppd-option-widget.c:88
 msgid "Printer Default"
 msgstr "پیش‌فرض چاپگر"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:90
 msgid "Embed GhostScript fonts only"
 msgstr "تنها توکار قراردادن قلم‌های GhostScript"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:93
+#: ../panels/printers/pp-ppd-option-widget.c:92
 msgid "Convert to PS level 1"
 msgstr "تبدیل به سطح ۱ PS"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:95
+#: ../panels/printers/pp-ppd-option-widget.c:94
 msgid "Convert to PS level 2"
 msgstr "تبدیل به سطح ۲ PS"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:97
+#: ../panels/printers/pp-ppd-option-widget.c:96
 msgid "No pre-filtering"
 msgstr "بدون صافی کردنِ قبلی"
 
@@ -4603,7 +4612,7 @@ msgid "Driver"
 msgstr "راه‌انداز"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:254
+#: ../panels/printers/pp-samba.c:248
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr ""
@@ -4629,8 +4638,9 @@ msgstr "مکان"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-msgid "_Default"
-msgstr "_پیش‌فرض"
+#| msgid "Default Route"
+msgid "_Default printer"
+msgstr "چاپگر _پیش‌فرض"
 
 #: ../panels/printers/printers.ui.h:9
 msgid "Jobs"
@@ -4681,43 +4691,47 @@ msgstr ""
 "متاسفم! سرویس چاپگر سیستم\n"
 "به نظر در دسترس نیست."
 
-#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:252 ../panels/privacy/privacy.ui.h:24
 msgid "Screen Lock"
 msgstr "صفحه‌قفل"
 
-#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/cc-privacy-panel.c:362 ../panels/privacy/privacy.ui.h:19
 msgid "Usage & History"
 msgstr "استفاده و تاریخچه"
 
-#: ../panels/privacy/cc-privacy-panel.c:489
+#: ../panels/privacy/cc-privacy-panel.c:487
 msgid "Empty all items from Trash?"
 msgstr "حذف تمام موارد از زباله‌دان؟"
 
-#: ../panels/privacy/cc-privacy-panel.c:490
+#: ../panels/privacy/cc-privacy-panel.c:488
 msgid "All items in the Trash will be permanently deleted."
 msgstr "تمام موارد موجود در زباله‌دان برای همیشه پاک می‌شوند."
 
-#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:489 ../panels/privacy/privacy.ui.h:34
 msgid "_Empty Trash"
 msgstr "_خالی کردن زباله‌دان"
 
-#: ../panels/privacy/cc-privacy-panel.c:514
-#| msgid "Purge Trash & Temporary Files"
+#: ../panels/privacy/cc-privacy-panel.c:512
 msgid "Delete all the temporary files?"
 msgstr "حذف تمام پرونده‌های موقت؟"
 
-#: ../panels/privacy/cc-privacy-panel.c:515
+#: ../panels/privacy/cc-privacy-panel.c:513
 msgid "All the temporary files will be permanently deleted."
 msgstr "تمام پرونده‌های موقت برای همیشه حذف خواهند شد."
 
-#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/cc-privacy-panel.c:514 ../panels/privacy/privacy.ui.h:35
 msgid "_Purge Temporary Files"
 msgstr "_پاکسازی پرونده‌های موقت"
 
-#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:536 ../panels/privacy/privacy.ui.h:29
 msgid "Purge Trash & Temporary Files"
 msgstr "پاکسازی زباله‌دان و پرونده‌های موقت"
 
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+#| msgid "Software"
+msgid "Software Usage"
+msgstr "طریقه استفاده نرم‌افزار"
+
 #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
 msgid "Privacy"
 msgstr "حریم‌خصوصی"
@@ -4746,50 +4760,46 @@ msgid "30 seconds"
 msgstr "۳۰ ثانیه"
 
 #: ../panels/privacy/privacy.ui.h:9
-msgid "Immediately"
-msgstr "فورا"
-
-#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "۱ روز"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: ../panels/privacy/privacy.ui.h:10
 msgid "2 days"
 msgstr "۲ روز"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: ../panels/privacy/privacy.ui.h:11
 msgid "3 days"
 msgstr "۳ روز"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: ../panels/privacy/privacy.ui.h:12
 msgid "4 days"
 msgstr "۴ روز"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: ../panels/privacy/privacy.ui.h:13
 msgid "5 days"
 msgstr "۵ روز"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:14
 msgid "6 days"
 msgstr "۶ روز"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:15
 msgid "7 days"
 msgstr "۷ روز"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:16
 msgid "14 days"
 msgstr "۱۴ روز"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:17
 msgid "30 days"
 msgstr "۳۰ روز"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:18
 msgid "Forever"
 msgstr "همیشه"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:20
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4797,36 +4807,35 @@ msgstr ""
 "به‌خاطر سپردن تاریخچه، پیدا کردن چیزها در آینده را راحت‌تر می‌کند. این موارد "
 "هیچ‌وقت در شبکه به‌اشتراک گذاشته نمی‌شوند."
 
-#: ../panels/privacy/privacy.ui.h:22
-msgid "Cl_ear Recent History"
-msgstr "_پاک کردن تاریخچه اخیر"
-
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:21
 msgid "_Recently Used"
 msgstr "_به‌تازگی استفاده شده"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Retain _History"
 msgstr "نگه‌داشتن _تاریخچه"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:23
+msgid "Cl_ear Recent History"
+msgstr "_پاک کردن تاریخچه اخیر"
+
+#: ../panels/privacy/privacy.ui.h:25
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "صفحه‌قفل از حریم‌خصوصی شما زمانی که پشت سیستم نیستید محافظت می‌کند."
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:26
 msgid "Automatic Screen _Lock"
 msgstr "_صفحه‌قفل خودکار"
 
-#: ../panels/privacy/privacy.ui.h:29
-#| msgid "Lock Screen _After Blank For"
+#: ../panels/privacy/privacy.ui.h:27
 msgid "Lock screen _after blank for"
 msgstr "قفل‌کردن صفحه‌نمایش _پس از خالی بودن برای"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Show _Notifications"
 msgstr "نمایش _اعلان‌ها"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:30
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -4834,70 +4843,98 @@ msgstr ""
 "به‌طور خودکار زباله‌دان و پرونده‌های موقت پاک‌سازی شوند تا رایانه خود را از "
 "اطلاعات حساس غیرضروری پاک نگاه دارید."
 
-#: ../panels/privacy/privacy.ui.h:35
-#| msgid "Automatically Empty _Trash"
+#: ../panels/privacy/privacy.ui.h:31
 msgid "Automatically empty _Trash"
 msgstr "خالی‌کردن خودکار _زباله‌دان"
 
-#: ../panels/privacy/privacy.ui.h:36
-#| msgid "Automatically Purge Temporary _Files"
+#: ../panels/privacy/privacy.ui.h:32
 msgid "Automatically purge Temporary _Files"
 msgstr "پاکسازی خودکار _پرونده‌های موقت"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Purge _After"
 msgstr "پاکسازی _بعدی"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: ../panels/privacy/privacy.ui.h:37
+msgid ""
+"Sending us information about which software you use helps us provide you "
+"with more accurate recommendations. It also helps us to improve our "
+"software.\n"
+"\n"
+"All the information we collect is made anonymous, and we will never share "
+"your data with third parties."
+msgstr ""
+"ارسال اطلاعات در مورد برنامه‌هایی که استفاده می‌کنید به ما امکان می‌دهد تا "
+"پیشنهادات دقیق‌تری به شما بدهیم. همچنین اینکار به ما کمک می‌کند تا برنامه را "
+"بهبود بدهیم.\n"
+"\n"
+"تمام اطلاعاتی که ما جمع می‌کنیم ناشناس خواهد بود، و هیچ زمان آنها را با اشخاص "
+"ثالث به اشتراک نمی‌گذاریم."
+
+#: ../panels/privacy/privacy.ui.h:40
+msgid "_Send software usage statistics"
+msgstr "_ارسال آمار استفاده از برنامه"
+
+#: ../panels/privacy/privacy.ui.h:41
+#| msgid "Privacy"
+msgid "Privacy Policy"
+msgstr "حریم‌خصوصی"
+
+#: ../panels/privacy/privacy.ui.h:42
+#| msgid "_Location name:"
+msgid "_Location Services"
+msgstr "خدمات _مکان"
+
+#: ../panels/privacy/privacy.ui.h:43
+msgid "Used to determine your geographical location"
+msgstr "برای تشخیص مکان جغرافیایی شما استفاده می‌شود"
+
+#: ../panels/region/cc-format-chooser.c:119
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "امپریال"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:121
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "متریک"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: ../panels/region/cc-format-chooser.c:284
 msgid "No regions found"
 msgstr "هیچ منطقه‌ای پیدا نشد"
 
-#: ../panels/region/cc-input-chooser.c:186
+#: ../panels/region/cc-input-chooser.c:179
 msgid "No input sources found"
 msgstr "هیچ منبع ورودی پیدا نشد"
 
-#: ../panels/region/cc-input-chooser.c:1070
-#| msgid "Other"
+#: ../panels/region/cc-input-chooser.c:1076
 msgctxt "Input Source"
 msgid "Other"
 msgstr "موارد دیگر"
 
 #: ../panels/region/cc-region-panel.c:239
+#: ../panels/user-accounts/um-user-panel.c:896
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "لازم است نشست شما مجددا راه‌اندازی شود تا تغییرات اعمال شوند"
 
 #: ../panels/region/cc-region-panel.c:240
+#: ../panels/user-accounts/um-user-panel.c:897
 msgid "Restart Now"
 msgstr "اکنون راه‌اندازی مجدد کن"
 
-#: ../panels/region/cc-region-panel.c:569
-msgctxt "Language"
-msgid "None"
-msgstr "هیچ‌کدام"
-
-#: ../panels/region/cc-region-panel.c:853
+#: ../panels/region/cc-region-panel.c:858
 msgid "No input source selected"
 msgstr "هیچ منبع ورودی‌ای انتخاب نشد"
 
-#: ../panels/region/cc-region-panel.c:1084
+#: ../panels/region/cc-region-panel.c:1088
 msgid "Sorry"
 msgstr "شرمنده"
 
-#: ../panels/region/cc-region-panel.c:1086
+#: ../panels/region/cc-region-panel.c:1090
 msgid "Input methods can't be used on the login screen"
 msgstr "روش‌های ورودی را نمی‌توان در صفحه‌ی ورود به سیستم استفاده کرد"
 
-#: ../panels/region/cc-region-panel.c:1716
+#: ../panels/region/cc-region-panel.c:1727
 msgid "Login Screen"
 msgstr "صفحه ورود به سیستم"
 
@@ -4905,27 +4942,27 @@ msgstr "صفحه ورود به سیستم"
 msgid "Formats"
 msgstr "قالب‌ها"
 
-#: ../panels/region/format-chooser.ui.h:3
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Dates"
 msgstr "تاریخ"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Times"
 msgstr "زمان"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Numbers"
 msgstr "عددها"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: ../panels/region/format-chooser.ui.h:8
 msgid "Measurement"
 msgstr "سنجش"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: ../panels/region/format-chooser.ui.h:9
 msgid "Paper"
 msgstr "کاغذ"
 
@@ -5007,38 +5044,30 @@ msgstr "گزینه‌ها"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "تنظیمات ورود به سیستم توسط تمام کاربران هنگام ورود استفاده می‌شود"
 
-#: ../panels/search/cc-search-locations-dialog.c:275
-msgid "Home"
-msgstr "منزل"
-
-#: ../panels/search/cc-search-locations-dialog.c:477
-#| msgid "Places"
+#: ../panels/search/cc-search-locations-dialog.c:476
 msgctxt "Search Location"
 msgid "Places"
 msgstr "محل‌ها"
 
-#: ../panels/search/cc-search-locations-dialog.c:479
-#| msgid "Bookmarks"
+#: ../panels/search/cc-search-locations-dialog.c:478
 msgctxt "Search Location"
 msgid "Bookmarks"
 msgstr "نشانک‌ها"
 
-#: ../panels/search/cc-search-locations-dialog.c:481
-#| msgid "Other"
+#: ../panels/search/cc-search-locations-dialog.c:480
 msgctxt "Search Location"
 msgid "Other"
 msgstr "موارد دیگر"
 
-#: ../panels/search/cc-search-locations-dialog.c:679
+#: ../panels/search/cc-search-locations-dialog.c:678
 msgid "Select Location"
 msgstr "انتخاب مکان"
 
-#: ../panels/search/cc-search-locations-dialog.c:683
-#| msgid "GOK"
+#: ../panels/search/cc-search-locations-dialog.c:682
 msgid "_OK"
 msgstr "_تایید"
 
-#: ../panels/search/cc-search-panel.c:177
+#: ../panels/search/cc-search-panel.c:176
 msgid "No applications found"
 msgstr "هیچ برنامه‌ای پیدا نشد"
 
@@ -5076,21 +5105,34 @@ msgstr "جابه‌جایی به پایین"
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:272
 msgctxt "service is enabled"
 msgid "On"
 msgstr "روشن"
 
-#: ../panels/sharing/cc-sharing-panel.c:276
+#: ../panels/sharing/cc-sharing-panel.c:274
+#: ../panels/sharing/cc-sharing-panel.c:301
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "خاموش"
 
-#: ../panels/sharing/cc-sharing-panel.c:418
+#: ../panels/sharing/cc-sharing-panel.c:304
+#| msgid "Enabled"
+msgctxt "service is enabled"
+msgid "Enabled"
+msgstr "فعال"
+
+#: ../panels/sharing/cc-sharing-panel.c:307
+#| msgid "Active Jobs"
+msgctxt "service is active"
+msgid "Active"
+msgstr "فعال"
+
+#: ../panels/sharing/cc-sharing-panel.c:488
 msgid "Choose a Folder"
 msgstr "انتخاب یک پوشه"
 
-#: ../panels/sharing/cc-sharing-panel.c:702
+#: ../panels/sharing/cc-sharing-panel.c:916
 msgid "Copy"
 msgstr "رونوشت"
 
@@ -5119,6 +5161,20 @@ msgstr "فعال یا غیرفعال کردن ورود به سیستم دورد
 msgid "Authentication is required to enable or disable remote login"
 msgstr "جهت فعال یا غیرفعال کردن ورود به سیستم دوردست، تصدیق‌هویت لازم است"
 
+#. Label
+#: ../panels/sharing/cc-sharing-networks.c:299
+#| msgid "List of keyboard layouts selected for usage"
+msgid "No networks selected for sharing"
+msgstr "هیچ شبکه‌ای برای اشتراک‌گذاری انتخاب نشده"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../panels/sharing/networks.ui.h:1
+#| msgid "Network"
+msgid "Networks"
+msgstr "شبکه‌ها"
+
 #: ../panels/sharing/sharing.ui.h:1
 msgid "Bluetooth Sharing"
 msgstr "اشتراک‌گذاری بلوتوث"
@@ -5132,70 +5188,38 @@ msgstr ""
 "بلوتوثی دیگر به‌اشتراک بگذارید"
 
 #: ../panels/sharing/sharing.ui.h:3
-msgid "Share Public Folder"
-msgstr "به‌اشتراک‌گذاری پوشه عمومی"
-
-#: ../panels/sharing/sharing.ui.h:4
 msgid "Only Receive From Trusted Devices"
 msgstr "تنها از دستگاه‌های قابل اطمینان دریافت کن"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: ../panels/sharing/sharing.ui.h:4
 msgid "Save Received Files to Downloads Folder"
 msgstr "ذخیره پرونده‌های دریافت شده در پوشه‌ی بارگیری‌ها"
 
-#: ../panels/sharing/sharing.ui.h:6
-msgid "Only share with Trusted Devices"
-msgstr "تنها با دستگاه‌های قابل اطمینان به‌اشتراک بگذار"
-
-#: ../panels/sharing/sharing.ui.h:7
+#: ../panels/sharing/sharing.ui.h:5
 msgid "Computer Name"
 msgstr "نام رایانه"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: ../panels/sharing/sharing.ui.h:6
 msgid "Personal File Sharing"
 msgstr "به‌اشتراک‌گذاری پرونده شخصی"
 
-#: ../panels/sharing/sharing.ui.h:9
+#: ../panels/sharing/sharing.ui.h:7
 msgid "Screen Sharing"
 msgstr "اشتراک‌گذاری صفحه‌نمایش"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:8
 msgid "Media Sharing"
 msgstr "اشتراک‌گذاری رسانه"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: ../panels/sharing/sharing.ui.h:9
 msgid "Remote Login"
 msgstr "ورود به سیستم دوردست"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Some services are disabled because of no network access."
 msgstr "تعدادی از سرویس‌ها به‌دلیل در دسترس نبودن شبکه، غیرفعال شده‌اند."
 
-#: ../panels/sharing/sharing.ui.h:13
-msgid "Share Music, Photos and Videos with others on the current network."
-msgstr "به‌اشتراک‌گذاری موسیقی‌ها، عکس‌ها و ویدئوها با دیگران در این شبکه."
-
-#: ../panels/sharing/sharing.ui.h:14
-msgid "Share Media On This Network"
-msgstr "به‌اشتراک‌گذاری رسانه در این شبکه"
-
-#: ../panels/sharing/sharing.ui.h:15
-msgid "Shared Folders"
-msgstr "پوشه‌های به‌اشتراک گذاشته شده"
-
-#: ../panels/sharing/sharing.ui.h:16
-msgid "column"
-msgstr "ستون"
-
-#: ../panels/sharing/sharing.ui.h:17
-msgid "Add Folder"
-msgstr "اضافه‌کردن پوشه"
-
-#: ../panels/sharing/sharing.ui.h:18
-msgid "Remove Folder"
-msgstr "حذف پوشه"
-
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:12
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5205,15 +5229,11 @@ msgstr ""
 "در شبکه فعلی خود با استفاده از <a href=\"dav://%s\">dav://%s</a> به‌اشتراک "
 "بگذارید"
 
-#: ../panels/sharing/sharing.ui.h:21
-msgid "Share Public Folder On This Network"
-msgstr "به‌اشتراک‌گذاری پوشه عمومی در این شبکه"
-
-#: ../panels/sharing/sharing.ui.h:22
+#: ../panels/sharing/sharing.ui.h:13
 msgid "Require Password"
 msgstr "گذرواژه لازم است"
 
-#: ../panels/sharing/sharing.ui.h:25
+#: ../panels/sharing/sharing.ui.h:16
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5222,7 +5242,7 @@ msgstr ""
 "به کاربران دوردست اجازه بده تا با استفاده از فرمان پوسته‌ی امن متصل شوند:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:28
+#: ../panels/sharing/sharing.ui.h:19
 #, no-c-format
 msgid ""
 "Allow remote users to view or control your screen by connecting to: <a href="
@@ -5231,22 +5251,44 @@ msgstr ""
 "به کاربران دوردست اجازه بده تا صفحه‌نمایش شما را با اتصال به‌وسیله‌ی <a href="
 "\"vnc://%s\">vnc://%s</a> کنترل کنند"
 
-#: ../panels/sharing/sharing.ui.h:29
-msgid "Remote View"
-msgstr "نمایش دوردست"
-
-#: ../panels/sharing/sharing.ui.h:30
-msgid "Remote Control"
-msgstr "کنترل دوردست"
+#: ../panels/sharing/sharing.ui.h:20
+#| msgid "Remote Control"
+msgid "Allow Remote Control"
+msgstr "اجازه دادن به کنترل دوردست"
 
-#: ../panels/sharing/sharing.ui.h:31
-msgid "Approve All Connections"
-msgstr "موافقت با تمام اتصال‌ها"
+#: ../panels/sharing/sharing.ui.h:21
+#| msgid "Password"
+msgid "Password:"
+msgstr "گذرواژه:"
 
-#: ../panels/sharing/sharing.ui.h:32
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Show Password"
 msgstr "نمایش گذرواژه"
 
+#: ../panels/sharing/sharing.ui.h:23
+#| msgid "%s Options"
+msgid "Access Options"
+msgstr "گزینه‌های دسترسی"
+
+#: ../panels/sharing/sharing.ui.h:24
+msgid "New connections must ask for access"
+msgstr "اتصال‌های جدید باید برای دسترسی اجازه بگیرند"
+
+#: ../panels/sharing/sharing.ui.h:25
+#| msgid "Require Password"
+msgid "Require a password"
+msgstr "گذرواژه لازم است"
+
+#: ../panels/sharing/sharing.ui.h:26
+#| msgid "Share Music, Photos and Videos with others on the current network."
+msgid "Share music, photos and videos over the network."
+msgstr "به‌اشتراک‌گذاری موسیقی‌ها، عکس‌ها و ویدئوها در شبکه."
+
+#: ../panels/sharing/sharing.ui.h:27
+#| msgid "Add Folder"
+msgid "Folders"
+msgstr "پوشه‌ها"
+
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "صدا"
@@ -5284,60 +5326,60 @@ msgstr "شیشه"
 msgid "Sonar"
 msgstr "سونار"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: ../panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Left"
 msgstr "چپ"
 
-#: ../panels/sound/gvc-balance-bar.c:107
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Right"
 msgstr "راست"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: ../panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Rear"
 msgstr "پشت"
 
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Front"
 msgstr "پیش‌ رو"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: ../panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Minimum"
 msgstr "کمینه"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Maximum"
 msgstr "بیشینه"
 
-#: ../panels/sound/gvc-balance-bar.c:290
+#: ../panels/sound/gvc-balance-bar.c:289
 msgid "_Balance:"
 msgstr "_بالانس:"
 
-#: ../panels/sound/gvc-balance-bar.c:293
+#: ../panels/sound/gvc-balance-bar.c:292
 msgid "_Fade:"
 msgstr "_محو شدن:"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Subwoofer:"
 msgstr "_ساب ووفر:"
 
-#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
+#: ../panels/sound/gvc-channel-bar.c:612 ../panels/sound/gvc-channel-bar.c:621
 msgctxt "volume"
 msgid "100%"
 msgstr "۱۰۰٪"
 
-#: ../panels/sound/gvc-channel-bar.c:617
+#: ../panels/sound/gvc-channel-bar.c:616
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "تضعیف شد"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
-#: ../panels/sound/gvc-mixer-dialog.c:527
+#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "_مجموعه تنظیمات:"
 
@@ -5363,24 +5405,24 @@ msgstr[1] "%Iu ورودی"
 msgid "System Sounds"
 msgstr "صداهای سیستم"
 
-#: ../panels/sound/gvc-mixer-dialog.c:263
+#: ../panels/sound/gvc-mixer-dialog.c:262
 msgid "_Test Speakers"
 msgstr "آزمایش _بلندگوها"
 
-#: ../panels/sound/gvc-mixer-dialog.c:432
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "یافتن اوج"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1510
-#: ../panels/sound/gvc-sound-theme-chooser.c:595
+#: ../panels/sound/gvc-mixer-dialog.c:1509
+#: ../panels/sound/gvc-sound-theme-chooser.c:594
 msgid "Name"
 msgstr "نام"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1529
+#: ../panels/sound/gvc-mixer-dialog.c:1528
 msgid "Device"
 msgstr "دستگاه"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1592
+#: ../panels/sound/gvc-mixer-dialog.c:1591
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "آزمایش بلندگو برای %s"
@@ -5433,48 +5475,48 @@ msgstr "برنامه‌ها"
 msgid "No application is currently playing or recording audio."
 msgstr "هیچ برنامه‌ای در حال حاضر در حال پخش یا ضبط صدا نیست."
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:189
+#: ../panels/sound/gvc-sound-theme-chooser.c:188
 msgid "Built-in"
 msgstr "توکار"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:455
-#: ../panels/sound/gvc-sound-theme-chooser.c:467
-#: ../panels/sound/gvc-sound-theme-chooser.c:479
+#: ../panels/sound/gvc-sound-theme-chooser.c:454
+#: ../panels/sound/gvc-sound-theme-chooser.c:466
+#: ../panels/sound/gvc-sound-theme-chooser.c:478
 msgid "Sound Preferences"
 msgstr "ترجیحات صدا"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:458
-#: ../panels/sound/gvc-sound-theme-chooser.c:469
-#: ../panels/sound/gvc-sound-theme-chooser.c:481
+#: ../panels/sound/gvc-sound-theme-chooser.c:457
+#: ../panels/sound/gvc-sound-theme-chooser.c:468
+#: ../panels/sound/gvc-sound-theme-chooser.c:480
 msgid "Testing event sound"
 msgstr "درحال آزمایش صدای رویداد"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
+#: ../panels/sound/gvc-sound-theme-chooser.c:584
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:586
+#: ../panels/sound/gvc-sound-theme-chooser.c:585
 msgid "From theme"
 msgstr "از تم"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:770
+#: ../panels/sound/gvc-sound-theme-chooser.c:769
 msgid "C_hoose an alert sound:"
 msgstr "ا_نتخاب یک صوت هشداری:"
 
-#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:219
 msgid "Stop"
 msgstr "توقف"
 
-#: ../panels/sound/gvc-speaker-test.c:220
-#: ../panels/sound/gvc-speaker-test.c:332
+#: ../panels/sound/gvc-speaker-test.c:219
+#: ../panels/sound/gvc-speaker-test.c:331
 msgid "Test"
 msgstr "آزمایش"
 
-#: ../panels/sound/gvc-speaker-test.c:228
+#: ../panels/sound/gvc-speaker-test.c:227
 msgid "Subwoofer"
 msgstr "ساب ووفر"
 
-#: ../panels/sound/sound-theme-file-utils.c:292
+#: ../panels/sound/sound-theme-file-utils.c:290
 msgid "Custom"
 msgstr "سفارشی"
 
@@ -5484,15 +5526,17 @@ msgstr "نگاه کردن، شنیدن، تایپ کردن، نشانه رفتن
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
+#| msgid ""
+#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;"
+#| "size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
-"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
+"AccessX;Sticky;Keys;Slow;Bounce;Mouse;"
 msgstr ""
 "صفحه‌کلید;موشی;a11y;دسترسی‌پذیری;سایه روشن;زوم;صفحه‌نمایش خوان;متن;قلم;اندازه;"
 "AccessX;کلیدهای چسبان;کلیدهای آرام;کلیدهای پرشی;کلیدهای موشی;"
 
 #: ../panels/universal-access/uap.ui.h:1
-#| msgid "Show Universal Access status"
 msgid "_Always Show Universal Access Menu"
 msgstr "نمایش _همیشگی وضعیت دسترسی فراگیر"
 
@@ -5501,27 +5545,22 @@ msgid "Seeing"
 msgstr "دیداری"
 
 #: ../panels/universal-access/uap.ui.h:3
-#| msgid "High Contrast"
 msgid "_High Contrast"
 msgstr "سایه روشن _بالا"
 
 #: ../panels/universal-access/uap.ui.h:4
-#| msgid "Large Text"
 msgid "_Large Text"
 msgstr "متن _بزرگ"
 
 #: ../panels/universal-access/uap.ui.h:5
-#| msgid "Zoom"
 msgid "_Zoom"
 msgstr "_بزرگ‌نمایی"
 
 #: ../panels/universal-access/uap.ui.h:7
-#| msgid "Screen Reader"
 msgid "Screen _Reader"
 msgstr "_صفحه‌نمایش‌خوان"
 
 #: ../panels/universal-access/uap.ui.h:8
-#| msgid "_Sounds:"
 msgid "_Sound Keys"
 msgstr "کلیدهای _صوتی"
 
@@ -5530,26 +5569,23 @@ msgid "Hearing"
 msgstr "شنوایی"
 
 #: ../panels/universal-access/uap.ui.h:10
-#| msgid "Visual Alerts"
 msgid "_Visual Alerts"
 msgstr "خطاهای _دیداری"
 
 #: ../panels/universal-access/uap.ui.h:12
-#| msgid "Screen keyboard"
 msgid "Screen _Keyboard"
 msgstr "_صفحه‌کلید مجازی"
 
 #: ../panels/universal-access/uap.ui.h:13
-#| msgid "Typing Assistant"
 msgid "_Typing Assist (AccessX)"
 msgstr "همکار _تایپ (AccessX)"
 
 #: ../panels/universal-access/uap.ui.h:14
-msgid "Pointing and Clicking"
+#| msgid "Pointing and Clicking"
+msgid "Pointing & Clicking"
 msgstr "نشانه و کلیک"
 
 #: ../panels/universal-access/uap.ui.h:15
-#| msgid "Mouse Keys"
 msgid "_Mouse Keys"
 msgstr "کلید‌های _موشی"
 
@@ -5566,12 +5602,10 @@ msgid "The screen reader reads displayed text as you move the focus."
 msgstr "صفحه‌نمایش خوان همینطور که شما تمرکز را تغییر می‌دهید، متن‌ها را می‌خواند."
 
 #: ../panels/universal-access/uap.ui.h:19
-#| msgid "Screen Reader"
 msgid "_Screen Reader"
 msgstr "_صفحه‌نمایش‌خوان"
 
 #: ../panels/universal-access/uap.ui.h:20
-#| msgid "Bounce Keys"
 msgid "Sound Keys"
 msgstr "کلید‌های صوتی"
 
@@ -5584,31 +5618,26 @@ msgid "Visual Alerts"
 msgstr "خطاهای دیداری"
 
 #: ../panels/universal-access/uap.ui.h:23
-#| msgid "Use a visual indication when an alert sound occurs"
-msgid "Use a visual indication when an alert sound occurs."
-msgstr "نمایش یک نشانه‌ی تصویری، هنگامی که یک هشدار صوتی رخ می‌دهد."
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "_Test flash"
 msgstr "آزمایشِ _خاموش روشن"
 
+#: ../panels/universal-access/uap.ui.h:24
+msgid "Use a visual indication when an alert sound occurs."
+msgstr "نمایش یک نشانه‌ی تصویری، هنگامی که یک هشدار صوتی رخ می‌دهد."
+
 #: ../panels/universal-access/uap.ui.h:25
-#| msgid "Flash the window title"
 msgid "Flash the _window title"
 msgstr "چشمک زدن عنوان _پنجره"
 
 #: ../panels/universal-access/uap.ui.h:26
-#| msgid "Flash the entire screen"
 msgid "Flash the entire _screen"
 msgstr "خاموش و روشن کردن _صفحه‌نمایش برای یک لحظه"
 
 #: ../panels/universal-access/uap.ui.h:27
-#| msgid "Typing Assistant"
 msgid "Typing Assist"
 msgstr "همکار تایپ"
 
 #: ../panels/universal-access/uap.ui.h:28
-#| msgid "Sticky Keys"
 msgid "_Sticky Keys"
 msgstr "کلیدهای _چسبان"
 
@@ -5625,7 +5654,6 @@ msgid "Beep when a _modifer key is pressed"
 msgstr "هنگام فشرده شدن کلید _تغییر‌دهنده بوق زده شود"
 
 #: ../panels/universal-access/uap.ui.h:32
-#| msgid "Slow Keys"
 msgid "S_low Keys"
 msgstr "کلیدهای آ_هسته"
 
@@ -5639,8 +5667,6 @@ msgstr "وقفه _پذیرش:"
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
 #: ../panels/universal-access/uap.ui.h:35
-#| msgctxt "keyboard, delay"
-#| msgid "Short"
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "کوتاه"
@@ -5650,8 +5676,6 @@ msgid "Slow keys typing delay"
 msgstr "وقفه تایپ کلیدهای آرام"
 
 #: ../panels/universal-access/uap.ui.h:37
-#| msgctxt "keyboard, delay"
-#| msgid "Long"
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "بلند"
@@ -5661,7 +5685,6 @@ msgid "Beep when a key is pr_essed"
 msgstr "هنگام _فشرده شدن یک کلید بوق بزن"
 
 #: ../panels/universal-access/uap.ui.h:39
-#| msgid "Beep when key is _accepted"
 msgid "Beep when a key is _accepted"
 msgstr "هنگام _پذیرفتن کلید، بوق بزن"
 
@@ -5670,7 +5693,6 @@ msgid "Beep when a key is _rejected"
 msgstr "هنگام _نپذیرفتن یک کلید بوق بزن"
 
 #: ../panels/universal-access/uap.ui.h:41
-#| msgid "Bounce Keys"
 msgid "_Bounce Keys"
 msgstr "کلید‌های _پرشی"
 
@@ -5680,8 +5702,6 @@ msgstr "نادیده گرفتن دوبار فشرده شدن یک کلید، د
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
 #: ../panels/universal-access/uap.ui.h:43
-#| msgctxt "keyboard, delay"
-#| msgid "Short"
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "کوتاه"
@@ -5691,14 +5711,11 @@ msgid "Bounce keys typing delay"
 msgstr "وقفه بین کلیدها جهشی"
 
 #: ../panels/universal-access/uap.ui.h:45
-#| msgctxt "keyboard, delay"
-#| msgid "Long"
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "بلند"
 
 #: ../panels/universal-access/uap.ui.h:46
-#| msgid "Enable by Keyboard"
 msgid "_Enable by Keyboard"
 msgstr "_فعال‌سازی توسط صفحه‌کلید"
 
@@ -5711,7 +5728,6 @@ msgid "Click Assist"
 msgstr "همکار کلیک"
 
 #: ../panels/universal-access/uap.ui.h:49
-#| msgid "Simulated Secondary Click"
 msgid "_Simulated Secondary Click"
 msgstr "کلیک دومین _شبیه‌سازی شده"
 
@@ -5721,8 +5737,6 @@ msgstr "راه‌انداختن کلیک دوم با نگاه داشتن کلی
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
 #: ../panels/universal-access/uap.ui.h:51
-#| msgctxt "keyboard, delay"
-#| msgid "Short"
 msgctxt "secondary click"
 msgid "Short"
 msgstr "کوتاه"
@@ -5732,14 +5746,11 @@ msgid "Secondary click delay"
 msgstr "وقفه کلیک دوم"
 
 #: ../panels/universal-access/uap.ui.h:53
-#| msgctxt "keyboard, delay"
-#| msgid "Long"
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "بلند"
 
 #: ../panels/universal-access/uap.ui.h:54
-#| msgid "Hover Click"
 msgid "_Hover Click"
 msgstr "کلیک _شناور"
 
@@ -5753,15 +5764,11 @@ msgstr "تأ_خیر:"
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
 #: ../panels/universal-access/uap.ui.h:57
-#| msgctxt "keyboard, delay"
-#| msgid "Short"
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "کوتاه"
 
 #: ../panels/universal-access/uap.ui.h:58
-#| msgctxt "keyboard, delay"
-#| msgid "Long"
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "بلند"
@@ -5771,41 +5778,37 @@ msgid "Motion _threshold:"
 msgstr "آ_ستانه‌ی حرکت:"
 
 #: ../panels/universal-access/uap.ui.h:60
-#| msgctxt "universal access, text size"
-#| msgid "Small"
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "کوچک"
 
 #: ../panels/universal-access/uap.ui.h:61
-#| msgctxt "universal access, text size"
-#| msgid "Large"
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "بزرگ"
 
 # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
-#: ../panels/universal-access/zoom-options.c:357
+#: ../panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "کوتاه"
 
-#: ../panels/universal-access/zoom-options.c:358
+#: ../panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "¼ Screen"
 msgstr "¼ صفحه‌نمایش"
 
-#: ../panels/universal-access/zoom-options.c:359
+#: ../panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "½ Screen"
 msgstr "½ صفحه‌نمایش"
 
-#: ../panels/universal-access/zoom-options.c:360
+#: ../panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "¾ Screen"
 msgstr "¾ صفحه‌نمایش"
 
-#: ../panels/universal-access/zoom-options.c:361
+#: ../panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "بلند"
@@ -5967,20 +5970,19 @@ 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:35
+#: ../panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 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:37
+#: ../panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "مدیر"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-#| msgid "_Full name"
 msgid "_Full Name"
 msgstr "_نام کامل"
 
@@ -5990,13 +5992,12 @@ msgid "Account _Type"
 msgstr "_نوع حساب"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
-#| msgid "Choose password at next login"
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 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/password-dialog.ui.h:5
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Set a password now"
 msgstr "هم‌اکنون یک گذرواژه تنظیم کنید"
 
@@ -6024,16 +6025,25 @@ msgstr ""
 "برای اضافه کردن حساب‌های ورود\n"
 "به سیستم تجاری برخط شوید."
 
-#. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
+#: ../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:1458
+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:17
+#: ../panels/user-accounts/data/account-dialog.ui.h:20
 msgid "Domain Administrator Login"
 msgstr "ورود مدیر دامنه"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../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"
@@ -6043,11 +6053,11 @@ msgstr ""
 "در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n"
 "خود را اینجا بنویسند."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:21
+#: ../panels/user-accounts/data/account-dialog.ui.h:24
 msgid "Administrator _Name"
 msgstr "_نام مدیر"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:22
+#: ../panels/user-accounts/data/account-dialog.ui.h:25
 msgid "Administrator Password"
 msgstr "گذرواژه مدیر"
 
@@ -6084,7 +6094,7 @@ msgid "Right little finger"
 msgstr "انگشت کوچک راست"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:699
+#: ../panels/user-accounts/um-fingerprint-dialog.c:697
 msgid "Enable Fingerprint Login"
 msgstr "به‌کارانداختن امکان ورود به سیستم از طریق اثرانگشت"
 
@@ -6125,26 +6135,29 @@ msgstr "نام ورود;نام;اثرانگشت;آواتار;نشان;تصویر
 msgid "Login History"
 msgstr "تاریخچه ورود به سیستم"
 
+# ../capplets/common/gconf-property-editor.:c:183
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-#| msgid "_New password"
+#| msgid "Change pa_ssword"
+msgid "Change Password"
+msgstr "تغییر گذرواژه"
+
+# ../capplets/common/gconf-property-editor.:c:183
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+msgid "Ch_ange"
+msgstr "تع_ویض"
+
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
 msgid "_Verify New Password"
 msgstr "تایید گذرواژه‌ی _جدید"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#| msgid "_New password"
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
 msgid "_New Password"
 msgstr "گذرواژه‌ی _جدید"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
-#| msgid "Current _password"
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Current _Password"
 msgstr "گذرواژه‌ی _فعلی"
 
-# ../capplets/common/gconf-property-editor.:c:183
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "Ch_ange"
-msgstr "تع_ویض"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Add User Account"
 msgstr "اضافه‌کردن حساب کاربر"
@@ -6185,80 +6198,78 @@ msgstr "مدیریت حساب‌های کاربر"
 msgid "Authentication is required to change user data"
 msgstr "جهت تغییر اطلاعات کاربر تصدیق‌هویت لازم است"
 
-#: ../panels/user-accounts/pw-utils.c:82
-#| msgid "The new password does not contain enough different characters"
+#: ../panels/user-accounts/pw-utils.c:81
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "لازم گذرواژه‌ی جدید با گذرواژه‌ی قبلی تفاوت داشته باشد."
 
-#: ../panels/user-accounts/pw-utils.c:84
+#: ../panels/user-accounts/pw-utils.c:83
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "سعی کنید تعداد بیشتری از اعداد و حروف را عوض کنید."
 
 # ../capplets/common/gconf-property-editor.:c:183
-#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94
-#| msgid "Changing password for"
+#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "سعی کنید گذرواژه را کمی بیشتر تغییر دهید."
 
-#: ../panels/user-accounts/pw-utils.c:88
+#: ../panels/user-accounts/pw-utils.c:87
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "یک گذرواژه بدون استفاده از نام کاربری قوی‌تر خواهد بود."
 
-#: ../panels/user-accounts/pw-utils.c:90
+#: ../panels/user-accounts/pw-utils.c:89
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "سعی کنید از استفاده از نام خود در گذرواژه خودداری کنید."
 
-#: ../panels/user-accounts/pw-utils.c:92
+#: ../panels/user-accounts/pw-utils.c:91
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "سعی کنید از تعدادی از کلمه‌های موجود در گذرواژه خودداری کنید."
 
-#: ../panels/user-accounts/pw-utils.c:96
+#: ../panels/user-accounts/pw-utils.c:95
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "سعی کنید از انتخاب کلمه‌های عمومی خودداری کنید."
 
-#: ../panels/user-accounts/pw-utils.c:98
+#: ../panels/user-accounts/pw-utils.c:97
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "سعی کنید از تغییر چینش کلمه‌های موجود خودداری کنید."
 
-#: ../panels/user-accounts/pw-utils.c:100
+#: ../panels/user-accounts/pw-utils.c:99
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "سعی کنید تعداد بیشتری عدد استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:102
+#: ../panels/user-accounts/pw-utils.c:101
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "سعی کنید تعداد بیشتری حروف بزرگ استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:104
+#: ../panels/user-accounts/pw-utils.c:103
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "سعی کنید تعداد بیشتری حروف کوچک استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:106
+#: ../panels/user-accounts/pw-utils.c:105
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "سعی کنید از تعداد بیشتری نویسه خاص، مثل نقطه‌گذاری‌ها استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/pw-utils.c:107
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "سعی کنید از تلفیق تعدادی حرف، عدد و نقطه‌گذاری استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:110
+#: ../panels/user-accounts/pw-utils.c:109
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "سعی کنید از تکرار یک نویسه خودداری کنید."
 
-#: ../panels/user-accounts/pw-utils.c:112
+#: ../panels/user-accounts/pw-utils.c:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6267,22 +6278,22 @@ msgstr ""
 "سعی کنید از تکرار یک نوع نویسه خودداری کنید: شما باید تلفیقی از حروف، اعداد "
 "و نقطه‌گذاری‌ها را بکار ببرید."
 
-#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/pw-utils.c:113
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "سعی کنید از رشته‌های متوالی مثل ۱۲۳۴ یا abcd استفاده نکنید."
 
-#: ../panels/user-accounts/pw-utils.c:116
+#: ../panels/user-accounts/pw-utils.c:115
 msgctxt "Password hint"
 msgid "Try to add more letters, numbers and symbols."
 msgstr "سعی کنید از تعداد بیشتری حروف، اعداد و سمبل استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:118
+#: ../panels/user-accounts/pw-utils.c:117
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and use a number or two."
 msgstr "حروف بزرگ و کوچک را ادغام کنید و از یک یا چند عدد هم استفاده کنید."
 
-#: ../panels/user-accounts/pw-utils.c:120
+#: ../panels/user-accounts/pw-utils.c:119
 msgctxt "Password hint"
 msgid ""
 "Good password! Adding more letters, numbers and punctuation will make it "
@@ -6291,117 +6302,111 @@ msgstr ""
 "گذرواژه‌ی خوبیست! اضافه کردن حروف بیشتر، اعداد و نقطه‌گذاری‌ها آن را قوی‌تر "
 "می‌کند."
 
-#: ../panels/user-accounts/pw-utils.c:142
-#: ../panels/user-accounts/pw-utils.c:172
+#: ../panels/user-accounts/pw-utils.c:141
+#: ../panels/user-accounts/pw-utils.c:171
 msgctxt "Password strength"
 msgid "Strength: Weak"
 msgstr "قدرت: ضعیف "
 
-#: ../panels/user-accounts/pw-utils.c:146
-#: ../panels/user-accounts/pw-utils.c:173
-#| msgid "Length:"
+#: ../panels/user-accounts/pw-utils.c:145
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
 msgid "Strength: Low"
 msgstr "قدرت: پایین"
 
-#: ../panels/user-accounts/pw-utils.c:149
-#: ../panels/user-accounts/pw-utils.c:174
+#: ../panels/user-accounts/pw-utils.c:148
+#: ../panels/user-accounts/pw-utils.c:173
 msgctxt "Password strength"
 msgid "Strength: Medium"
 msgstr "قدرت: متوسط"
 
-#: ../panels/user-accounts/pw-utils.c:152
-#: ../panels/user-accounts/pw-utils.c:175
+#: ../panels/user-accounts/pw-utils.c:151
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
 msgid "Strength: Good"
 msgstr "قدرت: خوب"
 
-#: ../panels/user-accounts/pw-utils.c:155
-#: ../panels/user-accounts/pw-utils.c:176
+#: ../panels/user-accounts/pw-utils.c:154
+#: ../panels/user-accounts/pw-utils.c:175
 msgctxt "Password strength"
 msgid "Strength: High"
 msgstr "قدرت: بالا"
 
-#: ../panels/user-accounts/run-passwd.c:424
+#: ../panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "تصدیق شکست خورد"
 
-#: ../panels/user-accounts/run-passwd.c:504
+#: ../panels/user-accounts/run-passwd.c:502
 #, c-format
 msgid "The new password is too short"
 msgstr "گذرواژه خیلی کوتاه است"
 
-#: ../panels/user-accounts/run-passwd.c:510
+#: ../panels/user-accounts/run-passwd.c:508
 #, c-format
 msgid "The new password is too simple"
 msgstr "گذرواژه خیلی ساده است"
 
-#: ../panels/user-accounts/run-passwd.c:516
+#: ../panels/user-accounts/run-passwd.c:514
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "گذرواژه‌های قدیمی و جدید خیلی شبیه هم هستند"
 
-#: ../panels/user-accounts/run-passwd.c:519
+#: ../panels/user-accounts/run-passwd.c:517
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "گذرواژه‌ی جدید تازگی مورد استفاده قرار گرفته است."
 
-#: ../panels/user-accounts/run-passwd.c:522
+#: ../panels/user-accounts/run-passwd.c:520
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "گذرواژه‌ی جدید باید شامل اعداد و نویسه‌های خاص باشد"
 
-#: ../panels/user-accounts/run-passwd.c:526
+#: ../panels/user-accounts/run-passwd.c:524
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "گذرواژه‌های قدیمی و جدید همانند هستند"
 
-#: ../panels/user-accounts/run-passwd.c:530
+#: ../panels/user-accounts/run-passwd.c:528
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "گذرواژه شما از زمانی تایید هویت شده‌اید، تغییر کرده است!"
 
-#: ../panels/user-accounts/run-passwd.c:534
+#: ../panels/user-accounts/run-passwd.c:532
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "گذرواژه‌ی جدید به اندازه کافی شامل نویسه‌های متفاوت نیست"
 
-#: ../panels/user-accounts/run-passwd.c:538
+#: ../panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
-#: ../panels/user-accounts/um-account-dialog.c:35
+#: ../panels/user-accounts/um-account-dialog.c:34
 msgid "Should match the web address of your account provider."
 msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ حساب شما یکسان باشد."
 
-#: ../panels/user-accounts/um-account-dialog.c:222
+#: ../panels/user-accounts/um-account-dialog.c:228
 msgid "Failed to add account"
 msgstr "اضافه کردن حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:316
-msgid "This will be used to name your home folder and can't be changed."
-msgstr "این برای نام‌گذاری پوشه خانگی شما استفاده می‌شود و قابل تغییر نیست."
-
-#: ../panels/user-accounts/um-account-dialog.c:449
-#| msgid "Passwords do not match"
+#: ../panels/user-accounts/um-account-dialog.c:452
 msgid "Passwords do not match."
 msgstr "گذرواژه‌ها برابر نیستند."
 
-#: ../panels/user-accounts/um-account-dialog.c:719
-#: ../panels/user-accounts/um-account-dialog.c:765
+#: ../panels/user-accounts/um-account-dialog.c:731
+#: ../panels/user-accounts/um-account-dialog.c:777
 msgid "Failed to register account"
 msgstr "ثبت حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:903
+#: ../panels/user-accounts/um-account-dialog.c:915
 msgid "No supported way to authenticate with this domain"
 msgstr "هیچ راه پیشتیبانی شده‌ای برای تصدیق‌هویت با این دامنه وجود ندارد"
 
-#: ../panels/user-accounts/um-account-dialog.c:962
+#: ../panels/user-accounts/um-account-dialog.c:974
 msgid "Failed to join domain"
 msgstr "پیوستن به دامنه شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:1023
+#: ../panels/user-accounts/um-account-dialog.c:1035
 msgid ""
 "That login name didn't work.\n"
 "Please try again."
@@ -6409,8 +6414,7 @@ msgstr ""
 "نام ورود به سیستم اشتباه بود.\n"
 "لطفا دوباره تلاش کنید."
 
-#: ../panels/user-accounts/um-account-dialog.c:1030
-#| msgid "Invalid password, please try again"
+#: ../panels/user-accounts/um-account-dialog.c:1042
 msgid ""
 "That login password didn't work.\n"
 "Please try again."
@@ -6418,50 +6422,41 @@ msgstr ""
 "گذواژه‌ی ورود به سیستم اشتباه بود.\n"
 "لطفا دوباره تلاش کنید."
 
-#: ../panels/user-accounts/um-account-dialog.c:1038
+#: ../panels/user-accounts/um-account-dialog.c:1050
 msgid "Failed to log into domain"
 msgstr "ورود به دامنه شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:1096
+#: ../panels/user-accounts/um-account-dialog.c:1108
 msgid "Unable find the domain. Maybe you misspelled it?"
 msgstr "امکان پیدا کردن دامنه نیست. شاید اشتباه نوشته‌اید؟"
 
-#: ../panels/user-accounts/um-account-dialog.c:1446
-msgid "Add User"
-msgstr "اضافه کردن کاربر"
-
-#. Create enterprise toggle button.
-#: ../panels/user-accounts/um-account-dialog.c:1459
-msgid "_Enterprise Login"
-msgstr "ورود به سیستم _تجاری"
-
-#: ../panels/user-accounts/um-fingerprint-dialog.c:139
+#: ../panels/user-accounts/um-fingerprint-dialog.c:137
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "شما اجازه‌ی دسترسی به این دستگاه را ندارید. با مدیر سیستم تماس بگیرید."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:141
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid "The device is already in use."
 msgstr "دستگاه پیشاپیش درحال استفاده است."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:143
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "An internal error occurred."
 msgstr "یک خطای داخلی رخ داد."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:219
-#: ../panels/user-accounts/um-fingerprint-dialog.c:220
+#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: ../panels/user-accounts/um-fingerprint-dialog.c:218
 msgid "Enabled"
 msgstr "به‌کارافتاده"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:268
+#: ../panels/user-accounts/um-fingerprint-dialog.c:266
 msgid "Delete registered fingerprints?"
 msgstr "اثرانگشت‌های ثبت شده پاک شوند؟"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:272
+#: ../panels/user-accounts/um-fingerprint-dialog.c:270
 msgid "_Delete Fingerprints"
 msgstr "_حذف اثرانگشت‌ها"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:278
+#: ../panels/user-accounts/um-fingerprint-dialog.c:276
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6469,15 +6464,15 @@ msgstr ""
 "آیا مایلید که تمام اثرانگشت‌های ثبت شده را حذف کنید تا در نتیجه امکان ورود به "
 "سیستم از طریق اثرانگشت غیرفعال شود؟"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:454
+#: ../panels/user-accounts/um-fingerprint-dialog.c:452
 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:515
-#: ../panels/user-accounts/um-fingerprint-dialog.c:557
+#: ../panels/user-accounts/um-fingerprint-dialog.c:513
+#: ../panels/user-accounts/um-fingerprint-dialog.c:555
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "نمی‌توان به دستگاه «%s» دسترسی داشت"
@@ -6485,16 +6480,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:598
+#: ../panels/user-accounts/um-fingerprint-dialog.c:596
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "نمی‌توان شروع به انگشت‌نگاری با استفاده از دستگاه «%s» کرد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:649
+#: ../panels/user-accounts/um-fingerprint-dialog.c:647
 msgid "Could not access any fingerprint readers"
 msgstr "نمی‌توان به هیچ دستگاه انگشت‌نگاری متصل شد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+#: ../panels/user-accounts/um-fingerprint-dialog.c:648
 msgid "Please contact your system administrator for help."
 msgstr "لطفا جهت دریافت کمک به مدیر سیستم خود مراجعه کنید."
 
@@ -6503,7 +6498,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:733
+#: ../panels/user-accounts/um-fingerprint-dialog.c:731
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6512,19 +6507,19 @@ msgstr ""
 "برای به‌کارانداختن امکان ورود با استفاده از اثرانگشت، شما باید یکی از "
 "اثرانگشت‌های خود را با استفاده از دستگاه «%s» ذخیره کنید."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:738
 msgid "Selecting finger"
 msgstr "در حال انتخاب انگشت"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+#: ../panels/user-accounts/um-fingerprint-dialog.c:739
 msgid "Enrolling fingerprints"
 msgstr "در حال ثبت اثر انگشت‌ها"
 
-#: ../panels/user-accounts/um-history-dialog.c:88
+#: ../panels/user-accounts/um-history-dialog.c:68
 msgid "This Week"
 msgstr "این هفته"
 
-#: ../panels/user-accounts/um-history-dialog.c:91
+#: ../panels/user-accounts/um-history-dialog.c:71
 msgid "Last Week"
 msgstr "هفته پیش"
 
@@ -6532,24 +6527,22 @@ msgstr "هفته پیش"
 #. shown as the first day of a week on login history dialog.
 #. Translators: This is a date format string in the style of "Feb 24",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:97
-#: ../panels/user-accounts/um-history-dialog.c:101
-#| msgid "%b %d %Y"
+#: ../panels/user-accounts/um-history-dialog.c:77
+#: ../panels/user-accounts/um-history-dialog.c:81
 msgctxt "login history week label"
 msgid "%b %e"
 msgstr "%b %Oe"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013",
 #. shown as the last day of a week on login history dialog.
-#: ../panels/user-accounts/um-history-dialog.c:106
-#| msgid "%b %d %Y"
+#: ../panels/user-accounts/um-history-dialog.c:86
 msgctxt "login history week label"
 msgid "%b %e, %Y"
 msgstr "%b %Oe %OY"
 
 #. Translators: This indicates a week label on a login history.
 #. The first %s is the first day of a week, and the second %s the last day.
-#: ../panels/user-accounts/um-history-dialog.c:111
+#: ../panels/user-accounts/um-history-dialog.c:91
 #, c-format
 msgctxt "login history week label"
 msgid "%s - %s"
@@ -6557,109 +6550,108 @@ msgstr "%s - %s"
 
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
-#: ../panels/user-accounts/um-history-dialog.c:195
-#: ../panels/user-accounts/um-user-panel.c:626
+#: ../panels/user-accounts/um-history-dialog.c:175
+#: ../panels/user-accounts/um-user-panel.c:631
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%OH:%OM"
 
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
-#: ../panels/user-accounts/um-history-dialog.c:198
-#: ../panels/user-accounts/um-user-panel.c:630
+#: ../panels/user-accounts/um-history-dialog.c:178
+#: ../panels/user-accounts/um-user-panel.c:635
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s، %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:267
+#: ../panels/user-accounts/um-history-dialog.c:247
 msgid "Session Ended"
 msgstr "نشست پایان یافت"
 
-#: ../panels/user-accounts/um-history-dialog.c:273
+#: ../panels/user-accounts/um-history-dialog.c:253
 msgid "Session Started"
 msgstr "نشست آغاز شد"
 
-#: ../panels/user-accounts/um-password-dialog.c:146
+#: ../panels/user-accounts/um-password-dialog.c:145
 msgid "Please choose another password."
 msgstr "لطفاً گذرواژه‌ی دیگری انتخاب کنید."
 
-#: ../panels/user-accounts/um-password-dialog.c:155
+#: ../panels/user-accounts/um-password-dialog.c:154
 msgid "Please type your current password again."
 msgstr "لطفاً گذرواژه‌ی فعلی خود را دوباره وارد کنید."
 
-#: ../panels/user-accounts/um-password-dialog.c:161
+#: ../panels/user-accounts/um-password-dialog.c:160
 msgid "Password could not be changed"
 msgstr "گذرواژه قابل تغییر نبود"
 
-#: ../panels/user-accounts/um-password-dialog.c:287
-#| msgid "The passwords do not match"
+#: ../panels/user-accounts/um-password-dialog.c:286
 msgid "The passwords do not match."
 msgstr "گذرواژه‌ها برابر نیستند."
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: ../panels/user-accounts/um-photo-dialog.c:219
 msgid "Browse for more pictures"
 msgstr "مرور برای عکس‌های بیشتر"
 
-#: ../panels/user-accounts/um-photo-dialog.c:443
+#: ../panels/user-accounts/um-photo-dialog.c:453
 msgid "Disable image"
 msgstr "غیرفعال کردن عکس"
 
-#: ../panels/user-accounts/um-photo-dialog.c:461
+#: ../panels/user-accounts/um-photo-dialog.c:471
 msgid "Take a photo…"
 msgstr "یک عکس بگیرید..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:479
+#: ../panels/user-accounts/um-photo-dialog.c:489
 msgid "Browse for more pictures…"
 msgstr "مرور برای عکس‌های بیشتر..."
 
-#: ../panels/user-accounts/um-photo-dialog.c:703
+#: ../panels/user-accounts/um-photo-dialog.c:713
 #, c-format
 msgid "Used by %s"
 msgstr "استفاده شده توسط %s"
 
-#: ../panels/user-accounts/um-realm-manager.c:351
+#: ../panels/user-accounts/um-realm-manager.c:350
 msgid "Cannot automatically join this type of domain"
 msgstr "نمی‌توان به‌طور خودکار به این نوع از دامنه پیوست"
 
-#: ../panels/user-accounts/um-realm-manager.c:414
+#: ../panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "چنین دامنه یا محدوده‌ای پیدا نشد"
 
-#: ../panels/user-accounts/um-realm-manager.c:814
-#: ../panels/user-accounts/um-realm-manager.c:828
+#: ../panels/user-accounts/um-realm-manager.c:813
+#: ../panels/user-accounts/um-realm-manager.c:827
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "نمی توان از طریق %s بر اساس دامنه %s وارد سیستم شد"
 
-#: ../panels/user-accounts/um-realm-manager.c:820
+#: ../panels/user-accounts/um-realm-manager.c:819
 msgid "Invalid password, please try again"
 msgstr "گذرواژه‌ی نادرست، لطفا مجددا تلاش کنید"
 
-#: ../panels/user-accounts/um-realm-manager.c:833
+#: ../panels/user-accounts/um-realm-manager.c:832
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "نمی‌توان به دامنه %s متصل شد: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:193
+#: ../panels/user-accounts/um-user-panel.c:198
 msgid "Other Accounts"
 msgstr "حساب‌های دیگر"
 
-#: ../panels/user-accounts/um-user-panel.c:412
+#: ../panels/user-accounts/um-user-panel.c:417
 msgid "Failed to delete user"
 msgstr "پاک‌کردن کاربر شکست خورد"
 
-#: ../panels/user-accounts/um-user-panel.c:477
+#: ../panels/user-accounts/um-user-panel.c:482
 msgid "You cannot delete your own account."
 msgstr "شما نمی‌توانید حساب خودتان را حذف کنید."
 
-#: ../panels/user-accounts/um-user-panel.c:486
+#: ../panels/user-accounts/um-user-panel.c:491
 #, c-format
 msgid "%s is still logged in"
 msgstr "کاربر %s هنوز وارد سیستم است"
 
-#: ../panels/user-accounts/um-user-panel.c:490
+#: ../panels/user-accounts/um-user-panel.c:495
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6667,12 +6659,12 @@ msgstr ""
 "حذف یک کاربر در حالی که وارد سیستم هستند ممکن است سیستم را در حالتی ناجور "
 "قرار دهد."
 
-#: ../panels/user-accounts/um-user-panel.c:499
+#: ../panels/user-accounts/um-user-panel.c:504
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "آیا می‌خواهید پرونده‌های «%s» را نگاه دارید؟"
 
-#: ../panels/user-accounts/um-user-panel.c:503
+#: ../panels/user-accounts/um-user-panel.c:508
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -6680,42 +6672,42 @@ msgstr ""
 " در زمان پاک کردن یک کاربر، نگهداری از شاخه آغازه، پست‌الکترونیکی و پرونده‌های "
 "موقت او امکان‌پذیر است."
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:511
 msgid "_Delete Files"
 msgstr "_حذف پرونده‌ها"
 
-#: ../panels/user-accounts/um-user-panel.c:507
+#: ../panels/user-accounts/um-user-panel.c:512
 msgid "_Keep Files"
 msgstr "_نگهداری پرونده‌ها"
 
-#: ../panels/user-accounts/um-user-panel.c:559
+#: ../panels/user-accounts/um-user-panel.c:564
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "حساب غیرفعال شد"
 
-#: ../panels/user-accounts/um-user-panel.c:567
+#: ../panels/user-accounts/um-user-panel.c:572
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "در ورود بعدی تنظیم می‌شود"
 
-#: ../panels/user-accounts/um-user-panel.c:570
+#: ../panels/user-accounts/um-user-panel.c:575
 msgctxt "Password mode"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/user-accounts/um-user-panel.c:619
+#: ../panels/user-accounts/um-user-panel.c:624
 msgid "Logged in"
 msgstr "وارد شده"
 
-#: ../panels/user-accounts/um-user-panel.c:999
+#: ../panels/user-accounts/um-user-panel.c:1072
 msgid "Failed to contact the accounts service"
 msgstr "ارتباط با سرویس حساب شکست خورد"
 
-#: ../panels/user-accounts/um-user-panel.c:1001
+#: ../panels/user-accounts/um-user-panel.c:1074
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "لطفا مطمئن شوید که AccountService نصب و فعال است."
 
-#: ../panels/user-accounts/um-user-panel.c:1042
+#: ../panels/user-accounts/um-user-panel.c:1115
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6723,12 +6715,12 @@ msgstr ""
 "برای ایجاد تغییرات،\n"
 "ابتدا بر روی نقشک * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1080
+#: ../panels/user-accounts/um-user-panel.c:1153
 msgid "Create a user account"
 msgstr "ساخت یک حساب کاربری"
 
-#: ../panels/user-accounts/um-user-panel.c:1091
-#: ../panels/user-accounts/um-user-panel.c:1380
+#: ../panels/user-accounts/um-user-panel.c:1164
+#: ../panels/user-accounts/um-user-panel.c:1453
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6736,12 +6728,12 @@ msgstr ""
 "برای ساختن یک حساب کاربر،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1101
+#: ../panels/user-accounts/um-user-panel.c:1174
 msgid "Delete the selected user account"
 msgstr "حذف حساب کاربر انتخاب شده"
 
-#: ../panels/user-accounts/um-user-panel.c:1113
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1458
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6749,46 +6741,49 @@ msgstr ""
 "برای حذف حساب کاربر انتخاب شده،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1295
+#: ../panels/user-accounts/um-user-panel.c:1368
 msgid "My Account"
 msgstr "حساب من"
 
-#: ../panels/user-accounts/um-utils.c:551
+#: ../panels/user-accounts/um-utils.c:567
 #, c-format
-msgid "A user with the username '%s' already exists"
-msgstr "یک کاربر با نام «%s» پیشاپیش وجود دارد"
+#| msgid "A user with the username '%s' already exists"
+msgid "A user with the username '%s' already exists."
+msgstr "یک کاربر با نام «%s» از پیش وجود دارد."
 
-#: ../panels/user-accounts/um-utils.c:555
+#: ../panels/user-accounts/um-utils.c:571
 #, c-format
-msgid "The username is too long"
-msgstr "نام کاربری خیلی بلند است"
+#| msgid "The username is too long"
+msgid "The username is too long."
+msgstr "نام کاربری خیلی بلند است."
 
-#: ../panels/user-accounts/um-utils.c:558
-msgid "The username cannot start with a '-'"
-msgstr "نام کاربری نمیتواند با یک «-» شروع شود"
+#: ../panels/user-accounts/um-utils.c:574
+#| msgid "The username cannot start with a '-'"
+msgid "The username cannot start with a '-'."
+msgstr "نام کاربری نمیتواند با یک «-» شروع شود."
 
-#: ../panels/user-accounts/um-utils.c:561
+#: ../panels/user-accounts/um-utils.c:577
 #| msgid ""
-#| "The username must only consist of:\n"
-#| " ➣ letters from the English alphabet\n"
-#| " ➣ digits\n"
-#| " ➣ any of the characters '.', '-' and '_'"
+#| "The username should only consist of lower and upper case letters from a-"
+#| "z, digits and any of characters '.', '-' and '_'"
 msgid ""
 "The username should only consist of lower and upper case letters from a-z, "
-"digits and any of characters '.', '-' and '_'"
+"digits and any of characters '.', '-' and '_'."
 msgstr ""
 "نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و هر کدام از "
-"نویسه‌های «.» «-» و «_» باشد"
+"نویسه‌های «.» «-» و «_» باشد."
+
+#: ../panels/user-accounts/um-utils.c:581
+msgid "This will be used to name your home folder and can't be changed."
+msgstr "این برای نام‌گذاری پوشه خانگی شما استفاده می‌شود و قابل تغییر نیست."
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/user-accounts/um-utils.c:811
-#| msgid "%b %d %Y"
+#: ../panels/user-accounts/um-utils.c:827
 msgid "%b %e"
 msgstr "%b %Oe"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/user-accounts/um-utils.c:815
-#| msgid "%b %d %Y"
+#: ../panels/user-accounts/um-utils.c:831
 msgid "%b %e, %Y"
 msgstr "%b %Oe، %OY"
 
@@ -6801,9 +6796,6 @@ msgid "Map buttons to functions"
 msgstr "هدایت دکمه‌ها به تابع‌ها"
 
 #: ../panels/wacom/button-mapping.ui.h:3
-#| msgid ""
-#| "To edit a shortcut, click the row and hold down the new keys or press "
-#| "Backspace to clear."
 msgid ""
 "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
@@ -6812,7 +6804,7 @@ msgstr ""
 "میان‌بر را فشار دهید و کلیدهای جدید را بگیرید یا اینکه کلید پس‌بر را برای پاک "
 "کردن فشار دهید."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:82
+#: ../panels/wacom/calibrator/calibrator-gui.c:83
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -6820,64 +6812,64 @@ msgstr ""
 "همانطور که نشانه‌ها بر روی صفحه‌نمایش نمایش داده می‌شود بر روی اهدف ضربه بزنید "
 "تا تبلت درجه‌بندی شود."
 
-#: ../panels/wacom/calibrator/calibrator-gui.c:86
+#: ../panels/wacom/calibrator/calibrator-gui.c:87
 msgid "Mis-click detected, restarting..."
 msgstr "Mis-click شناسایی شد، راه‌اندازی مجدد..."
 
-#: ../panels/wacom/cc-wacom-button-row.c:443
+#: ../panels/wacom/cc-wacom-button-row.c:442
 msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "بالا"
 
-#: ../panels/wacom/cc-wacom-button-row.c:444
+#: ../panels/wacom/cc-wacom-button-row.c:443
 msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "پایین"
 
-#: ../panels/wacom/cc-wacom-button-row.h:55
+#: ../panels/wacom/cc-wacom-button-row.h:54
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/wacom/cc-wacom-button-row.h:56
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "ارسال ضربه کلید"
 
-#: ../panels/wacom/cc-wacom-button-row.h:57
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "تعویض نمایشگر"
 
-#: ../panels/wacom/cc-wacom-button-row.h:58
+#: ../panels/wacom/cc-wacom-button-row.h:57
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "نمایش راهنمای روی-صفحه"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:264
+#: ../panels/wacom/cc-wacom-mapping-panel.c:263
 msgid "Output:"
 msgstr "خروجی:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:276
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Keep aspect ratio (letterbox):"
 msgstr "نگاه‌داشتن نسبت عرض به ارتفاع (letterbox):"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+#: ../panels/wacom/cc-wacom-mapping-panel.c:286
 msgid "Map to single monitor"
 msgstr "هدایت به صفحه‌نمایش انفرادی"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:89
+#: ../panels/wacom/cc-wacom-nav-button.c:88
 #, c-format
 msgid "%d of %d"
 msgstr "%Id از %Id"
 
-#: ../panels/wacom/cc-wacom-page.c:522
+#: ../panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "هدایت نمایشگر"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:373
+#: ../panels/wacom/cc-wacom-stylus-page.c:372
 msgid "Button"
 msgstr "دکمه"
 
@@ -6932,7 +6924,6 @@ msgid "Adjust display resolution"
 msgstr "تنظیم تفکیک‌پذیری نمایشگر"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
-#| msgid "Mouse Settings"
 msgid "Adjust mouse settings"
 msgstr "تنظیم تنظیمات موشی"
 
@@ -6945,92 +6936,91 @@ msgid "Left-Handed Orientation"
 msgstr "جهت چپ دست"
 
 #. If no mode is available, we use "left-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1063
+#: ../panels/wacom/gsd-wacom-device.c:1062
 msgid "Left Ring"
 msgstr "حلقه‌ی راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1074
+#: ../panels/wacom/gsd-wacom-device.c:1073
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "حالت انگشت حلقه‌ی راست #%Id"
 
 #. If no mode is available, we use "right-ring-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1094
+#: ../panels/wacom/gsd-wacom-device.c:1093
 msgid "Right Ring"
 msgstr "حلقه راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1105
+#: ../panels/wacom/gsd-wacom-device.c:1104
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "حالت انگشت حلقه راست #%Id"
 
 #. If no mode is available, we use "left-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1147
+#: ../panels/wacom/gsd-wacom-device.c:1146
 msgid "Left Touchstrip"
 msgstr "نوارلمسی چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1158
+#: ../panels/wacom/gsd-wacom-device.c:1157
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "حالت نوارلمسی چپ #%Id"
 
 #. If no mode is available, we use "right-strip-mode-1" for backward compat
-#: ../panels/wacom/gsd-wacom-device.c:1178
+#: ../panels/wacom/gsd-wacom-device.c:1177
 msgid "Right Touchstrip"
 msgstr "نوارلمسی راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1189
+#: ../panels/wacom/gsd-wacom-device.c:1188
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "حالت نوارلمسی راست #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1215
+#: ../panels/wacom/gsd-wacom-device.c:1214
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "کلید حالت Touchring چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1217
+#: ../panels/wacom/gsd-wacom-device.c:1216
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "کلید حالت Touchring راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1219
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "کلید حالت Touchring چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1221
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "کلید حالت Touchring راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1226
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "معاوضه حالت #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1336
+#: ../panels/wacom/gsd-wacom-device.c:1334
 #, c-format
 msgid "Left Button #%d"
 msgstr "دکمه پایین #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1339
+#: ../panels/wacom/gsd-wacom-device.c:1337
 #, c-format
 msgid "Right Button #%d"
 msgstr "دکمه راست #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1342
+#: ../panels/wacom/gsd-wacom-device.c:1340
 #, c-format
 msgid "Top Button #%d"
 msgstr "دکمه بالا #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1345
+#: ../panels/wacom/gsd-wacom-device.c:1343
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "دکمه پایین #%Id"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
-#| msgid "New shortcut..."
+#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcut…"
 msgstr "میان‌بر جدید..."
 
@@ -7132,11 +7122,11 @@ msgstr "تابلو برای نمایش"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:142
+#: ../shell/cc-application.c:145
 msgid "- Settings"
 msgstr "- تنظیمات"
 
-#: ../shell/cc-application.c:160
+#: ../shell/cc-application.c:163
 #, c-format
 msgid ""
 "%s\n"
@@ -7145,46 +7135,131 @@ msgstr ""
 "%s\n"
 "«%s --help» را برای دیدن تمام گزینه‌های خط فرمان اجرا کنید.\n"
 
-#: ../shell/cc-application.c:190
+#: ../shell/cc-application.c:193
 msgid "Available panels:"
 msgstr "تابلوهای موجود:"
 
-#: ../shell/cc-application.c:325
+#: ../shell/cc-application.c:328
 msgid "Help"
 msgstr "راهنما"
 
-#: ../shell/cc-application.c:326
+#: ../shell/cc-application.c:329
 msgid "Quit"
 msgstr "خروج"
 
-#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1490
 msgid "All Settings"
 msgstr "همه‌ی تنظیمات"
 
 #. Add categories
-#: ../shell/cc-window.c:868
+#: ../shell/cc-window.c:876
 msgctxt "category"
 msgid "Personal"
 msgstr "شخصی"
 
-#: ../shell/cc-window.c:869
+#: ../shell/cc-window.c:877
 msgctxt "category"
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../shell/cc-window.c:870
+#: ../shell/cc-window.c:878
 msgctxt "category"
 msgid "System"
 msgstr "سیستم"
 
-#: ../shell/cc-window.c:1597 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "تنظیمات"
-
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "ترجیحات;تنظیمات;"
 
+#~ msgid "Flickr"
+#~ msgstr "فلیکر"
+
+#~ msgid "Set Up New Device"
+#~ msgstr "تنظیم دستگاه جدید"
+
+#~ msgid "Connection"
+#~ msgstr "اتصال"
+
+#~ msgid "Paired"
+#~ msgstr "همگام شد"
+
+#~ msgid "Type"
+#~ msgstr "نوع"
+
+#~ msgid "Mouse & Touchpad Settings"
+#~ msgstr "تنظیمات موشی و صفحه‌لمسی"
+
+#~ msgid "Sound Settings"
+#~ msgstr "تنظیمات صدا"
+
+#~ msgid "Keyboard Settings"
+#~ msgstr "تنظیمات صفحه‌کلید"
+
+#~ msgid "Send Files…"
+#~ msgstr "ارسال پرونده‌ها..."
+
+#~ msgid "Visibility"
+#~ msgstr "وضعیت نمایش"
+
+#~ msgid "Visibility of “%s”"
+#~ msgstr "وضعیت نمایش بودن «%s»"
+
+#~ msgid "Remove '%s' from the list of devices?"
+#~ msgstr "حذف «%s» از فهرست دستگاه‌ها؟"
+
+#~ msgid ""
+#~ "If you remove the device, you will have to set it up again before next "
+#~ "use."
+#~ msgstr ""
+#~ "اگر دستگاه را حذف کنید، برای استفاده مجدد باید ابتدا آن را دوباره تنظیم "
+#~ "کنید."
+
+#~ msgid "Install Updates"
+#~ msgstr "نصب کردن بروزرسانی‌ها"
+
+#~ msgid "System Up-To-Date"
+#~ msgstr "سیستم به روز"
+
+#~ msgid "Search for network printers or filter result"
+#~ msgstr "جست‌وجو برای چاپگرهای شبکه و یا صافی کردن نتیجه"
+
+#~ msgid "_Default"
+#~ msgstr "_پیش‌فرض"
+
+#~ msgid "Immediately"
+#~ msgstr "فورا"
+
+#~ msgctxt "Language"
+#~ msgid "None"
+#~ msgstr "هیچ‌کدام"
+
+#~ msgid "Share Public Folder"
+#~ msgstr "به‌اشتراک‌گذاری پوشه عمومی"
+
+#~ msgid "Only share with Trusted Devices"
+#~ msgstr "تنها با دستگاه‌های قابل اطمینان به‌اشتراک بگذار"
+
+#~ msgid "Share Media On This Network"
+#~ msgstr "به‌اشتراک‌گذاری رسانه در این شبکه"
+
+#~ msgid "Shared Folders"
+#~ msgstr "پوشه‌های به‌اشتراک گذاشته شده"
+
+#~ msgid "column"
+#~ msgstr "ستون"
+
+#~ msgid "Remove Folder"
+#~ msgstr "حذف پوشه"
+
+#~ msgid "Share Public Folder On This Network"
+#~ msgstr "به‌اشتراک‌گذاری پوشه عمومی در این شبکه"
+
+#~ msgid "Remote View"
+#~ msgstr "نمایش دوردست"
+
+#~ msgid "Approve All Connections"
+#~ msgstr "موافقت با تمام اتصال‌ها"
+
 #~ msgid "Export"
 #~ msgstr "صادر کردن"
 
@@ -7736,10 +7811,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "No devices supporting color management detected"
 #~ msgstr "هیچ دستگاهی که از مدیریت رنگ پشتیبانی کند پیدا نشد"
 
-#~ msgctxt "Device kind"
-#~ msgid "Printer"
-#~ msgstr "چاپگر"
-
 #~ msgid "Add device"
 #~ msgstr "اضافه کردن دستگاه"
 
@@ -7791,9 +7862,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Date and Time preferences panel"
 #~ msgstr "ترجیحات تاریخ و زمان تابلو"
 
-#~ msgid "%d x %d (%s)"
-#~ msgstr "%Id x %Id (%s)"
-
 #~ msgid "%d x %d"
 #~ msgstr "%Id x %Id"
 
@@ -7946,9 +8014,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Change printer settings"
 #~ msgstr "تغییر تنظیمات چاپ‌گر"
 
-#~ msgid "%s Options"
-#~ msgstr "گزینه‌ها %s"
-
 #~ msgid "Manufacturers"
 #~ msgstr "تولید کننده"
 
@@ -8301,9 +8366,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "affect how much power is used"
 #~ msgstr "بر روی میزان مصرف انرژی تاثیر می‌گذارد"
 
-#~ msgid "A_ddress:"
-#~ msgstr "_نشانی:"
-
 #~ msgid "_Search by Address"
 #~ msgstr "_جستجو از طریق آدرس"
 
@@ -9012,9 +9074,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Keyboard _model:"
 #~ msgstr "_مدل صفحه‌کلید:"
 
-#~ msgid "List of keyboard layouts selected for usage"
-#~ msgstr "فهرست چیدمان‌های صفحه‌کلید انتخاب شده برای استفاده"
-
 #~ msgid "Move the selected keyboard layout down in the list"
 #~ msgstr "انتقال چیدمان صفحه‌کلید انتخاب شده در فهرست به پایین"
 
@@ -9114,9 +9173,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "The location already exists."
 #~ msgstr "محل از قبل وجود دارد."
 
-#~ msgid "_Location name:"
-#~ msgstr "_نام مکان:"
-
 #~ msgid "_Use the same proxy for all protocols"
 #~ msgstr "_استفاده از پروکسی مشابه برای تمام پروتکل‌ها"
 
@@ -9659,11 +9715,6 @@ msgstr "ترجیحات;تنظیمات;"
 
 # ../capplets/common/gconf-property-editor.:c:183
 #~| msgid "Change Password"
-#~ msgid "Change pa_ssword"
-#~ msgstr "تغییر _گذرواژه"
-
-# ../capplets/common/gconf-property-editor.:c:183
-#~| msgid "Change Password"
 #~ msgid "Change your password"
 #~ msgstr "گذرواژه‌ی خود را تغییر دهید"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]