[gnome-control-center] L10N: Updated Persian translations



commit 8d838c8396e140b9f7651a2e7bc4be87711ed07e
Author: Arash Mousavi <mousavi arash gmail com>
Date:   Fri Oct 11 13:58:13 2013 +0330

    L10N: Updated Persian translations

 po/fa.po | 3804 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2238 insertions(+), 1566 deletions(-)
---
diff --git a/po/fa.po b/po/fa.po
index a1004cb..25791dc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -15,105 +15,145 @@ 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-03-26 23:39+0000\n"
-"PO-Revision-Date: 2013-03-27 14:03+0330\n"
+"POT-Creation-Date: 2013-10-01 09:15+0000\n"
+"PO-Revision-Date: 2013-10-11 13:53+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
-"Language-Team: Persian\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"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Bookmarks: -1,-1,445,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: ../panels/background/background.ui.h:1
+#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
+msgid "Background"
+msgstr "پس‌زمینه"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:2
+#: ../panels/background/background.ui.h:3
 msgid "Changes throughout the day"
 msgstr "در طول روز تغییر می‌کند"
 
-#: ../panels/background/background.ui.h:3
+#: ../panels/background/background.ui.h:4
+#| msgid "Lock screen"
+msgid "Lock Screen"
+msgstr "قفل صفحه‌نمایش"
+
+#: ../panels/background/background.ui.h:5
 msgctxt "background, style"
 msgid "Tile"
 msgstr "کاشی"
 
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "بزرگ‌نمایی"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Center"
 msgstr "مرکز"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Scale"
 msgstr "مقیاس کردن"
 
-#: ../panels/background/background.ui.h:7
+#: ../panels/background/background.ui.h:9
 msgctxt "background, style"
 msgid "Fill"
 msgstr "پرکردن"
 
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:10
 msgctxt "background, style"
 msgid "Span"
 msgstr "پوشش"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:199
+#: ../panels/background/cc-background-chooser-dialog.c:293
 msgid "Select Background"
 msgstr "انتخاب پس‌زمینه"
 
-#: ../panels/background/cc-background-chooser-dialog.c:218
+#: ../panels/background/cc-background-chooser-dialog.c:312
 msgid "Wallpapers"
 msgstr "کاغذدیواری‌ها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:227
+#: ../panels/background/cc-background-chooser-dialog.c:321
 msgid "Pictures"
 msgstr "تصویرها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:235
+#: ../panels/background/cc-background-chooser-dialog.c:329
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: ../panels/background/cc-background-chooser-dialog.c:244
+#: ../panels/background/cc-background-chooser-dialog.c:338
 msgid "Flickr"
 msgstr "فلیکر"
 
-#: ../panels/background/cc-background-chooser-dialog.c:286
+#. translators: No pictures were found
+#: ../panels/background/cc-background-chooser-dialog.c:393
+#| msgid "No input sources found"
+msgid "No Pictures Found"
+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
+#, 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/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/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
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: ../panels/background/cc-background-chooser-dialog.c:437
 #: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
 msgstr "انتخاب"
 
-#: ../panels/background/cc-background-item.c:150
+#: ../panels/background/cc-background-item.c:149
 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:154
+#: ../panels/background/cc-background-item.c:153
 #, c-format
 msgid "%d × %d"
 msgstr "%Id x %Id"
 
-#: ../panels/background/cc-background-item.c:283
+#: ../panels/background/cc-background-item.c:281
 msgid "No Desktop Background"
 msgstr "بدون تصویر پس‌زمینه"
 
-#: ../panels/background/cc-background-panel.c:453
+#: ../panels/background/cc-background-panel.c:492
 msgid "Current background"
 msgstr "تصویر پس‌زمینه کنونی"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:1
-msgid "Background"
-msgstr "پس‌زمینه"
-
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
 msgid "Change your background image to a wallpaper or photo"
 msgstr "تصویر پس‌زمینه‌ی خود را به یک کاغذ دیواری یا عکس تغییر دهید"
@@ -127,7 +167,7 @@ msgstr "پس‌زمینه;صفحه‌نمایش;رومیزی;"
 msgid "Set Up New Device"
 msgstr "تنظیم دستگاه جدید"
 
-#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:6
 msgid "Remove Device"
 msgstr "حذف دستگاه"
 
@@ -153,15 +193,15 @@ msgstr "صفحه ۲"
 msgid "Paired"
 msgstr "همگام شد"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
+#: ../panels/bluetooth/bluetooth.ui.h:7
 msgid "Type"
 msgstr "نوع"
 
 #: ../panels/bluetooth/bluetooth.ui.h:8
-#: ../panels/network/connection-editor/ce-page-ip4.c:189
-#: ../panels/network/connection-editor/ce-page-ip4.c:441
-#: ../panels/network/connection-editor/ce-page-ip6.c:191
-#: ../panels/network/connection-editor/ce-page-ip6.c:445
+#: ../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 "آدرس"
 
@@ -170,7 +210,6 @@ msgid "Mouse & Touchpad Settings"
 msgstr "تنظیمات موشی و صفحه‌لمسی"
 
 #: ../panels/bluetooth/bluetooth.ui.h:10
-#: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "تنظیمات صدا"
 
@@ -182,48 +221,53 @@ msgstr "تنظیمات صفحه‌کلید"
 msgid "Send Files…"
 msgstr "ارسال پرونده‌ها..."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../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:355
+#: ../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:469
+#: ../panels/bluetooth/cc-bluetooth-panel.c:479
 msgid "Bluetooth is disabled"
 msgstr "بلوتوث غیرفعال است"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:474
+#: ../panels/bluetooth/cc-bluetooth-panel.c:484
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "بلوتوث از طریق کلید سخت‌افزاری قطع شده است"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:478
+#: ../panels/bluetooth/cc-bluetooth-panel.c:488
 msgid "No Bluetooth adapters found"
 msgstr "هیچ آداپتور بلوتوثی پیدا نشد"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:577
+#: ../panels/bluetooth/cc-bluetooth-panel.c:587
 msgid "Visibility"
 msgstr "وضعیت نمایش"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:581
+#: ../panels/bluetooth/cc-bluetooth-panel.c:591
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "وضعیت نمایش بودن «%s»"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:625
+#: ../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:627
+#: ../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/gnome-bluetooth-panel.desktop.in.in.h:1
 msgid "Bluetooth"
 msgstr "بلوتوس"
@@ -233,14 +277,14 @@ msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "بلوتوث را خاموش و روشن کنید و به دستگاه‌های خود متصل شوید"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: ../panels/color/cc-color-calibrate.c:360
+#: ../panels/color/cc-color-calibrate.c:361
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr "دستگاه درجه‌بندی خود را بر روی مربع قرار داده و دکمه «شروع» را بزنید"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:366
+#: ../panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr ""
@@ -249,7 +293,7 @@ msgstr ""
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: ../panels/color/cc-color-calibrate.c:372
+#: ../panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr "دستگاه درجه‌بندی خود را به سطح منتفل کنید و دکمه «ادامه» را فشار دهید"
@@ -257,54 +301,54 @@ msgstr "دستگاه درجه‌بندی خود را به سطح منتفل کن
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: ../panels/color/cc-color-calibrate.c:378
+#: ../panels/color/cc-color-calibrate.c:379
 msgid "Shut the laptop lid"
 msgstr "در لب‌تاپ را ببندید"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: ../panels/color/cc-color-calibrate.c:409
+#: ../panels/color/cc-color-calibrate.c:410
 msgid "An internal error occurred that could not be recovered."
 msgstr "یک خطای داخلی رخ داد و امکان بازسازی وجود ندارد."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: ../panels/color/cc-color-calibrate.c:414
+#: ../panels/color/cc-color-calibrate.c:415
 msgid "Tools required for calibration are not installed."
 msgstr "ابزارهای مورد نیاز برای درجه‌بندی نصب نشده‌اند."
 
 #. TRANSLATORS: The profile failed for some reason
-#: ../panels/color/cc-color-calibrate.c:420
+#: ../panels/color/cc-color-calibrate.c:421
 msgid "The profile could not be generated."
 msgstr "مجموعه‌تنظیمات نمی‌تواند ایجاد شود."
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: ../panels/color/cc-color-calibrate.c:426
+#: ../panels/color/cc-color-calibrate.c:427
 msgid "The target whitepoint was not obtainable."
 msgstr "نقطه‌ی سفید هدف قابل دسترسی نبود."
 
 #. TRANSLATORS: the display calibration process is finished
-#: ../panels/color/cc-color-calibrate.c:466
+#: ../panels/color/cc-color-calibrate.c:467
 msgid "Complete!"
 msgstr "تمام!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: ../panels/color/cc-color-calibrate.c:474
+#: ../panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "درجه‌بندی شکست خورد!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:481
+#: ../panels/color/cc-color-calibrate.c:482
 msgid "You can remove the calibration device."
 msgstr "شما می‌توانید دستگاه درجه‌بندی را بردارید."
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: ../panels/color/cc-color-calibrate.c:552
+#: ../panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "مزاحم دستگاه درجه‌بندی در هنگام کار نشوید"
 
@@ -366,58 +410,90 @@ msgstr "درجه‌بندی نشده"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: ../panels/color/cc-color-panel.c:133
+#: ../panels/color/cc-color-panel.c:137
 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:141
+#: ../panels/color/cc-color-panel.c:145
 msgid "Colorspace: "
 msgstr "فاصله‌رنگ (Colorspace): "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: ../panels/color/cc-color-panel.c:148
+#: ../panels/color/cc-color-panel.c:152
 msgid "Test profile: "
 msgstr "آزمایش مجموعه‌تنظیمات: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:216
+#: ../panels/color/cc-color-panel.c:219
 msgid "Select ICC Profile File"
 msgstr "انتخاب پرونده‌ی مجموعه‌ی تنظیمات ICC"
 
-#: ../panels/color/cc-color-panel.c:219
+#: ../panels/color/cc-color-panel.c:222
 msgid "_Import"
 msgstr "_وارد کردن"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:233
 msgid "Supported ICC profiles"
 msgstr "مجموعه تنظیمات ICC پشتیبانی شده"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: ../panels/color/cc-color-panel.c:240
 #: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "همه‌ی پرونده‌ها"
 
-#: ../panels/color/cc-color-panel.c:581
+#: ../panels/color/cc-color-panel.c:579
 msgid "Screen"
 msgstr "صفحه‌نمایش"
 
+#. TRANSLATORS: this is when the upload of the profile failed
+#: ../panels/color/cc-color-panel.c:903
+#, 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
+msgid "The profile has been uploaded to:"
+msgstr "مجموعه‌تنظیمات بارگذاری شد:"
+
+#: ../panels/color/cc-color-panel.c:919
+msgid "Write down this URL."
+msgstr "این آدرس را یادداشت کنید."
+
+#: ../panels/color/cc-color-panel.c:920
+msgid "Restart this computer and boot your normal operating system."
+msgstr "این رایانه را مجددا راه‌اندازی کن پ با سیستم‌عامل معمول بالا بیا."
+
+#: ../panels/color/cc-color-panel.c:921
+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:853
+#: ../panels/color/cc-color-panel.c:955
 msgid "Save Profile"
 msgstr "ذخیره مجموعه‌تنظیمات"
 
+#: ../panels/color/cc-color-panel.c:959
+#: ../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:1214
+#: ../panels/color/cc-color-panel.c:1315
 msgid "Create a color profile for the selected device"
 msgstr "ایجاد یک مجموعه‌ی تنظیمات رنگ از دستگاه انتخاب شده"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
+#: ../panels/color/cc-color-panel.c:1330 ../panels/color/cc-color-panel.c:1354
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -425,24 +501,24 @@ msgstr ""
 "ابزار اندازه‌گیری پیدا نشد. لطفا بررسی کنید که روشن باشد و بدرستی نصب شده است."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1263
+#: ../panels/color/cc-color-panel.c:1364
 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:1274
+#: ../panels/color/cc-color-panel.c:1375
 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:101
+#: ../panels/color/cc-color-profile.c:102
 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:107
+#: ../panels/color/cc-color-profile.c:108
 msgid "Test Profile"
 msgstr "آزمایش مجموعه‌تنظیمات"
 
@@ -450,7 +526,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:115
+#: ../panels/color/cc-color-profile.c:116
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "خودکار"
@@ -458,13 +534,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:125
+#: ../panels/color/cc-color-profile.c:126
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "کیفیت پایین"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:130
+#: ../panels/color/cc-color-profile.c:131
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "کیفیت متوسط"
@@ -472,41 +548,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:137
+#: ../panels/color/cc-color-profile.c:138
 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:154
+#: ../panels/color/cc-color-profile.c:155
 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:161
+#: ../panels/color/cc-color-profile.c:162
 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:168
+#: ../panels/color/cc-color-profile.c:169
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "پیش‌فرض Gray"
 
-#: ../panels/color/cc-color-profile.c:192
+#: ../panels/color/cc-color-profile.c:193
 msgid "Vendor supplied factory calibration data"
 msgstr "اطلاعات درجه‌بندی کارخونه‌ای، فراهم شده توسط فروشنده"
 
-#: ../panels/color/cc-color-profile.c:201
+#: ../panels/color/cc-color-profile.c:202
 msgid "Full-screen display correction not possible with this profile"
 msgstr "اصلاح نمایش تمام‌صفحه با این مجموعه‌تنظیمات امکان‌پذیر نیست"
 
-#: ../panels/color/cc-color-profile.c:223
+#: ../panels/color/cc-color-profile.c:224
 msgid "This profile may no longer be accurate"
 msgstr "این مجموعه‌تنظیمات ممکن است دیگر دقیق نباشد"
 
@@ -517,8 +593,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/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1067
+#: ../panels/user-accounts/um-account-dialog.c:1470
 msgid "Cancel"
 msgstr "لغو"
 
@@ -537,8 +612,11 @@ msgstr "از سر گیری"
 msgid "Done"
 msgstr "انجام شد"
 
+#. Timeout parameters
+#. 5000 = 5 sec
+#. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81
 msgid "Screen Calibration"
 msgstr "درجه‌بندی صفحه‌نمایش"
 
@@ -640,10 +718,25 @@ msgid "Profile successfully created!"
 msgstr "مجموعه‌تنظیمات با موفقیت ساخته شد!"
 
 #: ../panels/color/color.ui.h:22
-msgid "Export"
-msgstr "صادر کردن"
+#| msgid "Copying files"
+msgid "Copy profile"
+msgstr "نسخه‌برداری از مجموعه‌تنظیمات"
 
 #: ../panels/color/color.ui.h:23
+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 "به اتصال اینترنت احتیاج دارد"
+
+#: ../panels/color/color.ui.h:26
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -653,16 +746,16 @@ msgstr ""
 "\">گنو/لینوکس</a>، <a href=\"osx\">Apple OS X</a> و <a href=\"windows"
 "\">مایکروسافت ویندوز</a> مفید باشند."
 
-#: ../panels/color/color.ui.h:24
-#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+#: ../panels/color/color.ui.h:27
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Summary"
 msgstr "خلاصه"
 
-#: ../panels/color/color.ui.h:25
+#: ../panels/color/color.ui.h:28
 msgid "Import File…"
 msgstr "واردکردن پرونده..."
 
-#: ../panels/color/color.ui.h:26
+#: ../panels/color/color.ui.h:29
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -670,147 +763,147 @@ msgstr ""
 "اشکالات شناسایی شدند. مجموعه‌تنظیمات ممکن است درست کار نکند. <a href="
 "\"\">نمایش جزئیات.</a>"
 
-#: ../panels/color/color.ui.h:27
-msgid "Device type:"
-msgstr "نوع دستگاه:"
-
-#: ../panels/color/color.ui.h:28
-msgid "Manufacturer:"
-msgstr "تولید کننده:"
-
-#: ../panels/color/color.ui.h:29
-msgid "Model:"
-msgstr "مدل:"
-
 #: ../panels/color/color.ui.h:30
-msgid ""
-"Image files can be dragged on this window to auto-complete the above fields."
-msgstr ""
-"پرونده‌های تصاویر می‌توانند بر روی این پنجره کشیده شوند تا فیلدهای بالا تکمیل "
-"خودکار گردند."
-
-#: ../panels/color/color.ui.h:31
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "رنگ"
-
-#: ../panels/color/color.ui.h:32
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr "هر دستگاه احتیاج به یک مجموعه تنظیمات رنگ دارد تا مدیریت رنگ بشود."
 
-#: ../panels/color/color.ui.h:33
+#: ../panels/color/color.ui.h:31
 msgid "Learn more"
 msgstr "بیشتر بدانید"
 
-#: ../panels/color/color.ui.h:34
+#: ../panels/color/color.ui.h:32
 msgid "Learn more about color management"
 msgstr "درباره مدیریت رنگ بیشتر بدانید"
 
-#: ../panels/color/color.ui.h:35
+#: ../panels/color/color.ui.h:33
 msgid "Set for all users"
 msgstr "تنظیم برای تمام کاربران"
 
-#: ../panels/color/color.ui.h:36
+#: ../panels/color/color.ui.h:34
 msgid "Set this profile for all users on this computer"
 msgstr "تنظیم این مجموعه‌تنظیمات برای تمام کاربرانِ روی این رایانه"
 
-#: ../panels/color/color.ui.h:37
+#: ../panels/color/color.ui.h:35
 msgid "Enable"
 msgstr "فعال"
 
-#: ../panels/color/color.ui.h:38
+#: ../panels/color/color.ui.h:36
 msgid "Add profile"
 msgstr "اضافه‌کردن مجموعه‌ی تنظیمات"
 
-#: ../panels/color/color.ui.h:39
+#: ../panels/color/color.ui.h:37
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Calibrate…"
 msgstr "درجه‌بندی..."
 
-#: ../panels/color/color.ui.h:40
+#: ../panels/color/color.ui.h:38
 msgid "Calibrate the device"
 msgstr "درجه‌بندی دستگاه"
 
-#: ../panels/color/color.ui.h:41
+#: ../panels/color/color.ui.h:39
 msgid "Remove profile"
 msgstr "حذف مجموعه تنظیمات"
 
-#: ../panels/color/color.ui.h:42
+#: ../panels/color/color.ui.h:40
 msgid "View details"
 msgstr "نمایش جزئیات"
 
-#: ../panels/color/color.ui.h:43
+#: ../panels/color/color.ui.h:41
 msgid "Unable to detect any devices that can be color managed"
 msgstr "هیچگونه دستگاهی که بتواند مدیریت رنگ شود پیدا نشد"
 
-#: ../panels/color/color.ui.h:44
+#: ../panels/color/color.ui.h:42
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:45
+#: ../panels/color/color.ui.h:43
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:46
+#: ../panels/color/color.ui.h:44
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:47
+#: ../panels/color/color.ui.h:45
 msgid "Projector"
 msgstr "پروژکتور"
 
-#: ../panels/color/color.ui.h:48
+#: ../panels/color/color.ui.h:46
 msgid "Plasma"
 msgstr "پلاسما"
 
+#: ../panels/color/color.ui.h:47
+msgid "LCD (CCFL backlight)"
+msgstr "LCD (CCFL backlight)"
+
+#: ../panels/color/color.ui.h:48
+msgid "LCD (RGB LED backlight)"
+msgstr "LCD (RGB LED backlight)"
+
 #: ../panels/color/color.ui.h:49
+msgid "LCD (white LED backlight)"
+msgstr "LCD (white LED backlight)"
+
+#: ../panels/color/color.ui.h:50
+msgid "Wide gamut LCD (CCFL backlight)"
+msgstr "Wide gamut LCD (CCFL backlight)"
+
+#: ../panels/color/color.ui.h:51
+msgid "Wide gamut LCD (RGB LED backlight)"
+msgstr "Wide gamut LCD (RGB LED backlight)"
+
+#: ../panels/color/color.ui.h:52
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "بالا"
 
-#: ../panels/color/color.ui.h:50
+#: ../panels/color/color.ui.h:53
 msgid "40 minutes"
 msgstr "۴۰ دقیقه"
 
-#: ../panels/color/color.ui.h:51
+#: ../panels/color/color.ui.h:54
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "متوسط"
 
-#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/color/color.ui.h:55 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "۳۰ دقیقه"
 
-#: ../panels/color/color.ui.h:53
+#: ../panels/color/color.ui.h:56
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "کم"
 
-#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "۱۵ دقیقه"
 
-#: ../panels/color/color.ui.h:55
+#: ../panels/color/color.ui.h:58
 msgid "Native to display"
 msgstr "محلی برای نمایشگر"
 
-#: ../panels/color/color.ui.h:56
+#: ../panels/color/color.ui.h:59
 msgid "D50 (Printing and publishing)"
 msgstr "‫D50 (چاپ و انتشار)"
 
-#: ../panels/color/color.ui.h:57
+#: ../panels/color/color.ui.h:60
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:58
+#: ../panels/color/color.ui.h:61
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (عکسبرداری و گرافیک)"
 
-#: ../panels/color/color.ui.h:59
+#: ../panels/color/color.ui.h:62
 msgid "D75"
 msgstr "D75"
 
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "رنگ"
+
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
 msgid ""
 "Calibrate the color of your devices, such as displays, cameras or printers"
@@ -824,249 +917,201 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "رنگ;ICC;مجموعه تنظیمات;درجه‌بندی;چاپگر;نمایشگر;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:677
+#: ../panels/common/cc-common-language.c:685
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../panels/common/cc-common-language.c:678
+#: ../panels/common/cc-common-language.c:686
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../panels/common/cc-common-language.c:679
+#: ../panels/common/cc-common-language.c:687
 msgid "France"
 msgstr "فرانسه"
 
-#: ../panels/common/cc-common-language.c:680
+#: ../panels/common/cc-common-language.c:688
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../panels/common/cc-common-language.c:681
+#: ../panels/common/cc-common-language.c:689
 msgid "China"
 msgstr "چین"
 
-#: ../panels/common/cc-common-language.c:747
+#: ../panels/common/cc-common-language.c:759
 msgid "Other…"
 msgstr "دیگر..."
 
-#: ../panels/common/cc-language-chooser.c:176
-#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/common/cc-language-chooser.c:123
+#: ../panels/region/cc-format-chooser.c:268
 #: ../panels/region/cc-input-chooser.c:172
 msgid "More…"
 msgstr "بیشتر..."
 
-#: ../panels/common/cc-language-chooser.c:193
+#: ../panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "هیچ زبانی پیدا نشد"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:408
-#: ../panels/keyboard/keyboard-shortcuts.c:1160
-#: ../panels/network/network-wifi.ui.h:30
-#: ../panels/sound/gvc/gvc-mixer-control.c:1830
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "از کار افتاده"
-
-#: ../panels/common/cc-util.c:29
-msgid "Left Shift"
-msgstr "تبدیل چپ"
-
-#: ../panels/common/cc-util.c:30
-msgid "Left Alt"
-msgstr "دگرساز چپ"
-
-#: ../panels/common/cc-util.c:31
-msgid "Left Ctrl"
-msgstr "مهار چپ"
-
-#: ../panels/common/cc-util.c:32
-msgid "Right Shift"
-msgstr "تبدیل راست"
-
-#: ../panels/common/cc-util.c:33
-msgid "Right Alt"
-msgstr "دگرساز راست"
-
-#: ../panels/common/cc-util.c:34
-msgid "Right Ctrl"
-msgstr "مهار راست"
-
-#: ../panels/common/cc-util.c:35
-msgid "Left Alt+Shift"
-msgstr "دگرساز+تبدیل چپ"
-
-#: ../panels/common/cc-util.c:36
-msgid "Right Alt+Shift"
-msgstr "دگرساز+تبدیل راست"
-
-#: ../panels/common/cc-util.c:37
-msgid "Left Ctrl+Shift"
-msgstr "مهار+تبدیل چپ"
-
-#: ../panels/common/cc-util.c:38
-msgid "Right Ctrl+Shift"
-msgstr "مهار+تبدیل راست"
-
-#: ../panels/common/cc-util.c:39
-msgid "Left+Right Shift"
-msgstr "چپ+تبدیل راست"
-
-#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
-msgid "Left+Right Alt"
-msgstr "چپ+دگرساز راست"
-
-#: ../panels/common/cc-util.c:41
-msgid "Left+Right Ctrl"
-msgstr "چپ+مهار راست"
-
-#: ../panels/common/cc-util.c:42
-msgid "Alt+Shift"
-msgstr "دگرساز+تبدیل"
-
-#: ../panels/common/cc-util.c:43
-msgid "Ctrl+Shift"
-msgstr "مهار+تبدیل"
-
-#: ../panels/common/cc-util.c:44
-msgid "Alt+Ctrl"
-msgstr "دگرساز+مهار"
-
-#: ../panels/common/cc-util.c:45
-msgid "Caps"
-msgstr "قفل‌تبدیل"
-
-#: ../panels/common/cc-util.c:46
-msgid "Shift+Caps"
-msgstr "تبدیل+قفل‌تبدیل"
-
-#: ../panels/common/cc-util.c:47
-msgid "Alt+Caps"
-msgstr "دگرساز+قفل‌تبدیل"
-
-#: ../panels/common/cc-util.c:48
-msgid "Ctrl+Caps"
-msgstr "مهار+قفل‌تبدیل"
-
 #: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
 msgid "Language"
 msgstr "زبان"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: ../panels/mouse/cc-mouse-panel.c:111 ../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"
+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
+msgid "%e %B %Y, %R"
+msgstr "%Oe %B %OY, %OH:%OM"
+
+#. 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
+msgid "UTC%:::z"
+msgstr "UTC%:::z"
+
+#. Translators: This is the time format used in 12-hour mode.
+#: ../panels/datetime/cc-datetime-panel.c:584
+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
+msgid "%R"
+msgstr "%OH:%OM"
+
 #: ../panels/datetime/datetime.ui.h:1
-msgid "_Region:"
-msgstr "_منطقه:"
+msgid "January"
+msgstr "ژانویه"
 
 #: ../panels/datetime/datetime.ui.h:2
-msgid "_City:"
-msgstr "_شهر:"
+msgid "February"
+msgstr "فوریه"
 
 #: ../panels/datetime/datetime.ui.h:3
-msgid "_Network Time"
-msgstr "_زمان شبکه"
+msgid "March"
+msgstr "مارس"
+
+#: ../panels/datetime/datetime.ui.h:4
+msgid "April"
+msgstr "آوریل"
 
-#. Translator: this is the separator between hours and minutes, like in HH:MM
 #: ../panels/datetime/datetime.ui.h:5
-msgid ":"
-msgstr ":"
+msgid "May"
+msgstr "می"
 
 #: ../panels/datetime/datetime.ui.h:6
-msgid "Set the time one hour ahead."
-msgstr "تنظیم زمان به یک ساعت جلو."
+msgid "June"
+msgstr "ژوئن"
 
 #: ../panels/datetime/datetime.ui.h:7
-msgid "Set the time one hour back."
-msgstr "تنظیم زمان به یک ساعت عقب."
+msgid "July"
+msgstr "ژوئیه"
 
 #: ../panels/datetime/datetime.ui.h:8
-msgid "Set the time one minute ahead."
-msgstr "تنظیم زمان یک دقیقه به جلو."
+msgid "August"
+msgstr "اوت"
 
 #: ../panels/datetime/datetime.ui.h:9
-msgid "Set the time one minute back."
-msgstr "تنظیم زمان به یک ساعت عقب."
+msgid "September"
+msgstr "سپتامبر"
 
 #: ../panels/datetime/datetime.ui.h:10
-msgid "Switch between AM and PM."
-msgstr "تعویض بین AM و PM."
+msgid "October"
+msgstr "اکتبر"
 
 #: ../panels/datetime/datetime.ui.h:11
-msgid "Month"
-msgstr "ماه"
+msgid "November"
+msgstr "نوامبر"
 
 #: ../panels/datetime/datetime.ui.h:12
-msgid "Day"
-msgstr "روز"
+msgid "December"
+msgstr "دسامبر"
 
 #: ../panels/datetime/datetime.ui.h:13
-msgid "Year"
-msgstr "سال"
+#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
+msgid "Date & Time"
+msgstr "تاریخ و زمان"
 
 #: ../panels/datetime/datetime.ui.h:14
-msgid "24-hour"
-msgstr "۲۴ ساعته"
-
-#: ../panels/datetime/datetime.ui.h:15
-msgid "AM/PM"
-msgstr "ق‌ظ/ب‌ظ"
+msgid "Hour"
+msgstr "ساعت"
 
+#. Translator: this is the separator between hours and minutes, like in HH∶MM
 #: ../panels/datetime/datetime.ui.h:16
-msgid "January"
-msgstr "ژانویه"
+msgid "∶"
+msgstr ":"
 
 #: ../panels/datetime/datetime.ui.h:17
-msgid "February"
-msgstr "فوریه"
+#| msgid "minute"
+#| msgid_plural "minutes"
+msgid "Minute"
+msgstr "دقیقه"
 
 #: ../panels/datetime/datetime.ui.h:18
-msgid "March"
-msgstr "مارس"
+msgid "Day"
+msgstr "روز"
 
 #: ../panels/datetime/datetime.ui.h:19
-msgid "April"
-msgstr "آوریل"
+msgid "Month"
+msgstr "ماه"
 
 #: ../panels/datetime/datetime.ui.h:20
-msgid "May"
-msgstr "می"
+msgid "Year"
+msgstr "سال"
 
 #: ../panels/datetime/datetime.ui.h:21
-msgid "June"
-msgstr "ژوئن"
+#| msgid "Time"
+msgid "Time Zone"
+msgstr "منطقه زمانی"
 
 #: ../panels/datetime/datetime.ui.h:22
-msgid "July"
-msgstr "ژوئیه"
+#| msgid "Search for the string"
+msgid "Search for a city"
+msgstr "جست‌وجو برای یک شهر"
 
 #: ../panels/datetime/datetime.ui.h:23
-msgid "August"
-msgstr "اوت"
+#| msgid "Date & Time"
+msgid "Automatic _Date & Time"
+msgstr "_تاریخ و زمان خودکار"
 
 #: ../panels/datetime/datetime.ui.h:24
-msgid "September"
-msgstr "سپتامبر"
+msgid "Requires internet access"
+msgstr "احتیاج به دسترسی به اینترنت دارد"
 
 #: ../panels/datetime/datetime.ui.h:25
-msgid "October"
-msgstr "اکتبر"
+#| msgid "Automatic _Connect"
+msgid "Automatic Time _Zone"
+msgstr "_منطقه زمانی خودکار"
 
 #: ../panels/datetime/datetime.ui.h:26
-msgid "November"
-msgstr "نوامبر"
+#| msgid "Date & Time"
+msgid "Date & _Time"
+msgstr "تاریخ و _زمان"
 
 #: ../panels/datetime/datetime.ui.h:27
-msgid "December"
-msgstr "دسامبر"
+msgid "Time _Zone"
+msgstr "_منطقه زمانی"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
-msgid "Date & Time"
-msgstr "تاریخ و زمان"
+#: ../panels/datetime/datetime.ui.h:28
+#| msgid "Formats"
+msgid "Time _Format"
+msgstr "_قالب زمان"
+
+#: ../panels/datetime/datetime.ui.h:29
+msgid "24-hour"
+msgstr "۲۴ ساعته"
+
+#: ../panels/datetime/datetime.ui.h:30
+msgid "AM / PM"
+msgstr "AM / PM"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Change the date and time, including time zone"
@@ -1085,106 +1130,121 @@ msgstr "تغییر تنظیمات ناحیه و زبان سیستم"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "برای تغییر تنظیمات تاریخ و ساعت، احتیاج به تصدیق هویت دارید."
 
-#: ../panels/display/cc-display-panel.c:483
-msgctxt "display panel, rotation"
-msgid "Normal"
-msgstr "عادی"
-
-#: ../panels/display/cc-display-panel.c:484
-msgctxt "display panel, rotation"
-msgid "Counterclockwise"
-msgstr "خلاف جهت عقربه‌های ساعت"
-
-#: ../panels/display/cc-display-panel.c:485
-msgctxt "display panel, rotation"
-msgid "Clockwise"
-msgstr "جهت چرخش عقربه‌های ساعت"
-
-#: ../panels/display/cc-display-panel.c:486
-msgctxt "display panel, rotation"
-msgid "180 Degrees"
-msgstr "۱۸۰ درجه"
-
-#. Keep this string in sync with gnome-desktop/libgnome-desktop/gnome-rr-labeler.c
-#. Translators:  this is the feature where what you see on your laptop's
-#. * screen is the same as your external projector.  Here, "Mirrored" is being
-#. * used as an adjective.  For example, the Spanish translation could be
-#. * "Pantallas en Espejo".
-#.
-#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
-#. Translators:  this is the feature where what you see on your
-#. * laptop's screen is the same as your external projector.
-#. * Here, "Mirrored" is being used as an adjective.  For example,
-#. * the Spanish translation could be "Pantallas en Espejo".
-#.
-#: ../panels/display/cc-display-panel.c:625
-#: ../panels/display/cc-rr-labeler.c:418
-msgid "Mirrored Displays"
-msgstr "نمایشگرهای آیینه‌ای"
-
-#: ../panels/display/cc-display-panel.c:649
-#: ../panels/display/display-capplet.ui.h:1
-msgid "Monitor"
-msgstr "صفحه‌نمایش"
-
-#: ../panels/display/cc-display-panel.c:1669
-msgid "Drag to change primary display."
-msgstr "بکشید تا نمایشگر اصلی را تغییر دهید."
+#: ../panels/display/cc-display-panel.c:472
+#| msgid "Close"
+msgid "Lid Closed"
+msgstr "در بسته شد"
+
+#. translators: "Mirrored" describes when both displays show the same view
+#: ../panels/display/cc-display-panel.c:475
+#| msgid "Mirrored Displays"
+msgid "Mirrored"
+msgstr "آیینه‌ای"
+
+#: ../panels/display/cc-display-panel.c:477
+#: ../panels/display/cc-display-panel.c:2042
+#| msgid "Primary _button"
+msgid "Primary"
+msgstr "اصلی"
 
-#: ../panels/display/cc-display-panel.c:1727
-msgid ""
-"Select a monitor to change its properties; drag it to rearrange its "
-"placement."
-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/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/uap.ui.h:6
+msgid "Off"
+msgstr "خاموش"
 
-#: ../panels/display/cc-display-panel.c:2115
-msgid "%a %R"
-msgstr "%a %OH:OM"
+#: ../panels/display/cc-display-panel.c:482
+#| msgid "Secondary color"
+msgid "Secondary"
+msgstr "ثانویه"
 
-#: ../panels/display/cc-display-panel.c:2117
-msgid "%a %l:%M %p"
-msgstr "%a %Ol:%OM %p"
+#: ../panels/display/cc-display-panel.c:1490
+#| msgid "Mirrored Displays"
+msgid "Arrange Combined Displays"
+msgstr "چینش نمایشگرهای تلفیق شده"
 
-#: ../panels/display/cc-display-panel.c:2279
-#: ../panels/display/cc-display-panel.c:2331
-#, c-format
-msgid "Failed to apply configuration: %s"
-msgstr "اعمال پیکربندی شکست خورد: %s"
+#: ../panels/display/cc-display-panel.c:1496
+#: ../panels/display/cc-display-panel.c:1912
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+msgid "_Apply"
+msgstr "_اِعمال"
 
-#: ../panels/display/cc-display-panel.c:2359
-msgid "Could not save the monitor configuration"
-msgstr "نمی‌توان پیکربندی صفحه‌نمایش را ذخیره کرد"
+#: ../panels/display/cc-display-panel.c:1517
+msgid "Drag displays to rearrange them"
+msgstr "نمایشگرها را بکشید تا چینش آنها را تغییر دهید"
 
-#: ../panels/display/cc-display-panel.c:2419
-msgid "Could not detect displays"
-msgstr "نمي‌توان نمایشگرها را شناسایی کرد"
+#. size
+#: ../panels/display/cc-display-panel.c:1976
+#| msgid "Size:"
+msgid "Size"
+msgstr "اندازه"
 
-#: ../panels/display/cc-display-panel.c:2614
-msgid "Could not get screen information"
-msgstr "نمی‌توان اطلاعات صفحه‌نمایش را دریافت کرد"
+#. aspect ratio
+#: ../panels/display/cc-display-panel.c:1991
+msgid "Aspect Ratio"
+msgstr "نسبت طول به عرض"
 
-#: ../panels/display/display-capplet.ui.h:2
-msgid "_Resolution"
-msgstr "_تفکیک‌پذیری"
+#: ../panels/display/cc-display-panel.c:2012
+#: ../panels/printers/pp-options-dialog.c:86
+msgid "Resolution"
+msgstr "تفکیک‌پذیری"
 
-#: ../panels/display/display-capplet.ui.h:3
-msgid "R_otation"
-msgstr "_چرخش"
+#: ../panels/display/cc-display-panel.c:2043
+msgid "Show the top bar and Activities Overview on this display"
+msgstr "نمایش نوار بالایی و نمای‌کلی فعالیت‌ها در این نمایشگر"
+
+#: ../panels/display/cc-display-panel.c:2049
+#| msgid "Secondary click delay"
+msgid "Secondary Display"
+msgstr "نمایشگر ثانویه"
+
+#: ../panels/display/cc-display-panel.c:2050
+msgid "Join this display with another to create an extra workspace"
+msgstr "ادغام این نمایشگر با دیگری جهت ساخت "
+
+#: ../panels/display/cc-display-panel.c:2057
+#| msgid "Orientation"
+msgid "Presentation"
+msgstr "ارائه"
+
+#: ../panels/display/cc-display-panel.c:2058
+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"
+msgid "Mirror"
+msgstr "آینه"
+
+#: ../panels/display/cc-display-panel.c:2064
+msgid "Show your existing view on both displays"
+msgstr "نمایش نمای موجود در هر دو نمایشگر"
+
+#: ../panels/display/cc-display-panel.c:2070
+#| msgid "_Turn On"
+msgid "Turn Off"
+msgstr "خاموش کردن"
 
-#. Note that mirror is a verb in this string
-#: ../panels/display/display-capplet.ui.h:5
-msgid "_Mirror displays"
-msgstr "نمایشگرهای آ_ینه‌ای"
+#: ../panels/display/cc-display-panel.c:2071
+#| msgid "Panel to display"
+msgid "Don't use this display"
+msgstr "از این نمایشگر استفاده نکن"
 
-#: ../panels/display/display-capplet.ui.h:6
-msgid "Note: may limit resolution options"
-msgstr "نکته: ممکن است گزینه‌های تفکیک‌پذیری را محدود کند"
+#: ../panels/display/cc-display-panel.c:2286
+msgid "Could not get screen information"
+msgstr "نمی‌توان اطلاعات صفحه‌نمایش را دریافت کرد"
 
-#: ../panels/display/display-capplet.ui.h:7
-msgid "_Detect Displays"
-msgstr "_نمایش‌گرها"
+#: ../panels/display/cc-display-panel.c:2317
+#| msgid "Mirrored Displays"
+msgid "_Arrange Combined Displays"
+msgstr "_چینش نمایشگرهای تلفیق شده"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:1
 msgid "Displays"
@@ -1200,54 +1260,54 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "تابلو;پروژکتور;xrandr;نمایشگر;تفکیک‌پذیری;نوسازی;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
+#: ../panels/info/cc-info-panel.c:451 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../panels/info/cc-info-panel.c:541
+#: ../panels/info/cc-info-panel.c:534
 #, c-format
 msgid "%s %d-bit"
 msgstr "%s %Id بیت"
 
-#: ../panels/info/cc-info-panel.c:543
+#: ../panels/info/cc-info-panel.c:536
 #, c-format
 msgid "%d-bit"
 msgstr "%Id بیت"
 
-#: ../panels/info/cc-info-panel.c:1218
+#: ../panels/info/cc-info-panel.c:1216
 msgid "Ask what to do"
 msgstr "بپرس چه باید کرد"
 
-#: ../panels/info/cc-info-panel.c:1222
+#: ../panels/info/cc-info-panel.c:1220
 msgid "Do nothing"
 msgstr "کاری نکن"
 
-#: ../panels/info/cc-info-panel.c:1226
+#: ../panels/info/cc-info-panel.c:1224
 msgid "Open folder"
 msgstr "پوشه‌ را باز کن"
 
-#: ../panels/info/cc-info-panel.c:1317
+#: ../panels/info/cc-info-panel.c:1315
 msgid "Other Media"
 msgstr "رسانه‌های دیگر"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1346
 msgid "Select an application for audio CDs"
 msgstr "یک برنامه‌ برای پخش سی‌دی‌های صوتی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1347
 msgid "Select an application for video DVDs"
 msgstr "یک برنامه‌ برای پخش دی‌وی‌دی‌های ویدیویی انتخاب کن"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application to run when a music player is connected"
 msgstr ""
 "یک برنامه برای اجرا جهت زمانی که یک پخش‌کننده موسیقی متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application to run when a camera is connected"
 msgstr "یک برنامه برای اجرا جهت زمانی که یک دوربین متصل می‌شود، انتخاب کنید"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application for software CDs"
 msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار انتخاب کن"
 
@@ -1256,95 +1316,95 @@ msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار 
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1364
+#: ../panels/info/cc-info-panel.c:1362
 msgid "audio DVD"
 msgstr "دی‌وی‌دی صوتی"
 
-#: ../panels/info/cc-info-panel.c:1365
+#: ../panels/info/cc-info-panel.c:1363
 msgid "blank Blu-ray disc"
 msgstr "دیسک بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1366
+#: ../panels/info/cc-info-panel.c:1364
 msgid "blank CD disc"
 msgstr "دیسک سی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1367
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank DVD disc"
 msgstr "دیسک دی‌وی‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1368
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank HD DVD disc"
 msgstr "دیسک دی‌وی‌دی اچ‌دی خالی"
 
-#: ../panels/info/cc-info-panel.c:1369
+#: ../panels/info/cc-info-panel.c:1367
 msgid "Blu-ray video disc"
 msgstr "دیسک ویدئویی بلو-ری خالی"
 
-#: ../panels/info/cc-info-panel.c:1370
+#: ../panels/info/cc-info-panel.c:1368
 msgid "e-book reader"
 msgstr "کتاب الکترونیکی خوان"
 
-#: ../panels/info/cc-info-panel.c:1371
+#: ../panels/info/cc-info-panel.c:1369
 msgid "HD DVD video disc"
 msgstr "دیسک ویدئویی دی‌وی‌دی اچ‌دی"
 
-#: ../panels/info/cc-info-panel.c:1372
+#: ../panels/info/cc-info-panel.c:1370
 msgid "Picture CD"
 msgstr "سی‌دی تصویر"
 
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1371
 msgid "Super Video CD"
 msgstr "سی‌دی ویدئویی برتر"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Video CD"
 msgstr "سی‌دی ویدیویی"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Windows software"
 msgstr "نرم‌افزار ویندوز"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Software"
 msgstr "نرم‌افزار"
 
-#: ../panels/info/cc-info-panel.c:1499
-#: ../panels/keyboard/keyboard-shortcuts.c:1697
+#: ../panels/info/cc-info-panel.c:1497
+#: ../panels/keyboard/keyboard-shortcuts.c:1696
 msgid "Section"
 msgstr "بخش"
 
-#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
+#: ../panels/info/cc-info-panel.c:1506 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "مرور کلی"
 
-#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
+#: ../panels/info/cc-info-panel.c:1512 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "برنامه‌های پیش‌فرض"
 
-#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "رسانه‌های جدا شدنی"
 
-#: ../panels/info/cc-info-panel.c:1544
+#: ../panels/info/cc-info-panel.c:1542
 #, c-format
 msgid "Version %s"
 msgstr "نسخه %s"
 
-#: ../panels/info/cc-info-panel.c:1594
+#: ../panels/info/cc-info-panel.c:1592
 msgid "Install Updates"
 msgstr "نصب کردن بروزرسانی‌ها"
 
-#: ../panels/info/cc-info-panel.c:1598
+#: ../panels/info/cc-info-panel.c:1596
 msgid "System Up-To-Date"
 msgstr "سیستم به روز"
 
-#: ../panels/info/cc-info-panel.c:1602
+#: ../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:58
+#: ../panels/network/network-wifi.ui.h:44
 msgid "Details"
 msgstr "جزئیات"
 
@@ -1503,8 +1563,8 @@ msgid "Eject"
 msgstr "بیرون دادن"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/universal-access/uap.ui.h:11
 msgid "Typing"
 msgstr "تایپ"
 
@@ -1576,6 +1636,10 @@ msgstr "رونوشت از عکس‌صفحه‌ی یک پنجره در تخته
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "رونوشت از عکس‌صفحه‌ی یک محدوده در تخته‌گیره"
 
+#: ../panels/keyboard/01-screenshot.xml.in.h:11
+msgid "Record a short screencast"
+msgstr "ضبط یک فیلم کوتاه از صفحه‌نمایش"
+
 #: ../panels/keyboard/01-system.xml.in.h:1
 msgid "System"
 msgstr "سیستم"
@@ -1625,20 +1689,39 @@ msgstr "کاهش اندازه متن"
 msgid "High contrast on or off"
 msgstr "روشن یا خاموش کردن سایه روشن"
 
-#: ../panels/keyboard/cc-keyboard-option.c:362
+#. 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/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
+msgid "Disabled"
+msgstr "از کار افتاده"
+
+#. Translators: This key is also known as 'third level
+#. * chooser'. AltGr is often used for this purpose. See
+#. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
+#.
+#: ../panels/keyboard/cc-keyboard-option.c:349
 msgid "Alternative Characters Key"
 msgstr "کلید نویسه‌های جانشین"
 
-#: ../panels/keyboard/cc-keyboard-option.c:367
+#. Translators: The Compose key is used to initiate key
+#. * sequences that are combined to form a single character.
+#. * See http://en.wikipedia.org/wiki/Compose_key
+#.
+#: ../panels/keyboard/cc-keyboard-option.c:358
 msgid "Compose Key"
 msgstr "کلید‌های ایجاد"
 
-#: ../panels/keyboard/cc-keyboard-option.c:371
+#: ../panels/keyboard/cc-keyboard-option.c:363
 msgid "Modifiers-only switch to next source"
 msgstr "کلید Modifiers-only تعویض به منبع بعدی"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "صفحه‌کلید"
 
@@ -1664,80 +1747,79 @@ msgstr "_نام:"
 msgid "C_ommand:"
 msgstr "_فرمان:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Repeat Keys"
 msgstr "تکرار کلیدها"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5
 msgid "Key presses _repeat when key is held down"
 msgstr "ت_کرار کلید وقتی کلید پایین نگه داشته شود"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6
 msgid "_Delay:"
 msgstr "_وفقه:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7
 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:9
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8
 msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "کوتاه"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
 msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "آهسته"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
 msgid "Repeat keys speed"
 msgstr "سرعت تکرار کلیدها"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11
 msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "بلند"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
 msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "سریع"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
 msgid "Cursor Blinking"
 msgstr "چشمک‌زدن مکان‌نما"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14
 msgid "Cursor _blinks in text fields"
 msgstr "مکان‌نما در جعبه‌های متنی _چشمک می‌زند"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15
 msgid "S_peed:"
 msgstr "سر‌_عت:"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16
 msgid "Cursor blink speed"
 msgstr "سرعت چشمک‌زدن مکان‌نما"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
 #: ../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:20
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
 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:21
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Remove Shortcut"
 msgstr "حذف میان‌بر"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
-#: ../panels/wacom/button-mapping.ui.h:3
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1746,7 +1828,7 @@ 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:23
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
 msgid "Shortcuts"
 msgstr "میان‌برها"
 
@@ -1760,7 +1842,7 @@ msgstr "میان‌برهای سفارشی"
 msgid "<Unknown Action>"
 msgstr "<کنش ناشناخته>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1301
+#: ../panels/keyboard/keyboard-shortcuts.c:1300
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1771,7 +1853,7 @@ msgstr ""
 "امکان‌پذیر نیست.\n"
 "لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1333
+#: ../panels/keyboard/keyboard-shortcuts.c:1332
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1780,20 +1862,25 @@ msgstr ""
 "میان‌بر «%s» قبلاً استفاده شده است برای:\n"
 "‏ «%s»"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1338
+#: ../panels/keyboard/keyboard-shortcuts.c:1337
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1344
+#: ../panels/keyboard/keyboard-shortcuts.c:1343
 msgid "_Reassign"
 msgstr "_جای‌گذاری مجدد"
 
-#: ../panels/mouse/cc-mouse-panel.c:123
+#: ../panels/mouse/cc-mouse-panel.c:95
 msgid "Test Your _Settings"
 msgstr "آزمایش _تنظیمات شما"
 
+#: ../panels/mouse/cc-mouse-panel.c:108
+#| msgid "Test Your _Settings"
+msgid "Test Your Settings"
+msgstr "آزمایش تنظیمات شما"
+
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse & Touchpad"
 msgstr "موشی و صفحه‌لمسی"
@@ -1805,127 +1892,163 @@ 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;"
-msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;توپ‌جهت;"
+#| msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;توپ‌جهت;لغزش;"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Mouse Preferences"
-msgstr "ترجیحات موشی"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "General"
 msgstr "کلیات"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgctxt "mouse, speed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#| msgctxt "keyboard, speed"
+#| msgid "Slow"
+msgctxt "double click, speed"
 msgid "Slow"
 msgstr "آهسته"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
 msgid "Double-click timeout"
 msgstr "پایان زمان دوبار کلیک"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgctxt "mouse, speed"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#| msgctxt "keyboard, speed"
+#| msgid "Fast"
+msgctxt "double click, speed"
 msgid "Fast"
 msgstr "سریع"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "_Double-click"
 msgstr "د_وبار کلیک"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "Primary _button"
 msgstr "_دکمه اصلی"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "_چپ"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
 msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "_راست"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
 msgid "Mouse"
 msgstr "موشی"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 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 "سریع"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Touchpad"
 msgstr "صفحه‌ی ‌لمسی"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../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 "سریع"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "Disable while _typing"
 msgstr "غیرفعال کردن در هنگام _تایپ"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
 msgid "Tap to _click"
 msgstr "ضربه جهت _کلیک"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
 msgid "Two _finger scroll"
 msgstr "لغزش دو ا_نگشتی"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "C_ontent sticks to fingers"
-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:134
+#: ../panels/mouse/gnome-mouse-test.c:132
 #: ../panels/mouse/gnome-mouse-test.ui.h:1
 msgid "Try clicking, double clicking, scrolling"
 msgstr "کلیک کردن، دوبار کلیک، لغزش را آزمایش کنید"
 
-#: ../panels/mouse/gnome-mouse-test.c:139
+#: ../panels/mouse/gnome-mouse-test.c:137
 msgid "Five clicks, GEGL time!"
 msgstr "پنج کلیک، زمان GEGL است!"
 
-#: ../panels/mouse/gnome-mouse-test.c:144
+#: ../panels/mouse/gnome-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "دوبار کلیک، دکمه اصلی"
 
-#: ../panels/mouse/gnome-mouse-test.c:144
+#: ../panels/mouse/gnome-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "یکبار کلیک، دکمه اصلی"
 
-#: ../panels/mouse/gnome-mouse-test.c:147
+#: ../panels/mouse/gnome-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "دوبار کلیک، دکمه وسط"
 
-#: ../panels/mouse/gnome-mouse-test.c:147
+#: ../panels/mouse/gnome-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "یکبار کلیک، دکمه وسط"
 
-#: ../panels/mouse/gnome-mouse-test.c:150
+#: ../panels/mouse/gnome-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "دوباره کلیک، دکمه دومی"
 
-#: ../panels/mouse/gnome-mouse-test.c:150
+#: ../panels/mouse/gnome-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "یکبار کلیک، دکمه دومی"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:347
+#: ../panels/network/cc-network-panel.c:358
 msgid "Air_plane Mode"
 msgstr "حالت _هواپیمایی"
 
-#: ../panels/network/cc-network-panel.c:912
+#: ../panels/network/cc-network-panel.c:930
 msgid "Network proxy"
 msgstr "پیشکار شبکه"
 
-#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: ../panels/network/cc-network-panel.c:1109 ../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:1225
+#: ../panels/network/cc-network-panel.c:1244
 msgid "The system network services are not compatible with this version."
 msgstr "سرویس‌های شبکه‌ی سیستم با این نسخه سازگار نیستند."
 
@@ -1953,40 +2076,40 @@ msgstr "_تاییدهویت داخلی"
 msgid "Security"
 msgstr "امنیت"
 
-#: ../panels/network/connection-editor/ce-page.c:502
+#: ../panels/network/connection-editor/ce-page.c:507
 msgid "automatic"
 msgstr "خودکار"
 
 #. TRANSLATORS: this WEP WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:52
-#: ../panels/network/net-device-wifi.c:224
-#: ../panels/network/net-device-wifi.c:385
+#: ../panels/network/net-device-wifi.c:216
+#: ../panels/network/net-device-wifi.c:377
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:228
-#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/net-device-wifi.c:220
+#: ../panels/network/net-device-wifi.c:382
 #: ../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:232
+#: ../panels/network/net-device-wifi.c:224
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: ../panels/network/connection-editor/ce-page-details.c:65
-#: ../panels/network/net-device-wifi.c:237
+#: ../panels/network/net-device-wifi.c:229
 msgid "Enterprise"
 msgstr "Enterprise"
 
 #: ../panels/network/connection-editor/ce-page-details.c:70
-#: ../panels/network/net-device-wifi.c:242
-#: ../panels/network/net-device-wifi.c:375
+#: ../panels/network/net-device-wifi.c:234
+#: ../panels/network/net-device-wifi.c:367
 msgctxt "Wifi security"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -1997,18 +2120,18 @@ msgid "Never"
 msgstr "هرگز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:102
-#: ../panels/user-accounts/um-utils.c:770
+#: ../panels/user-accounts/um-utils.c:803
 msgid "Today"
 msgstr "امروز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:104
-#: ../panels/user-accounts/um-utils.c:773
+#: ../panels/user-accounts/um-utils.c:806
 msgid "Yesterday"
 msgstr "دیروز"
 
 #: ../panels/network/connection-editor/ce-page-details.c:106
-#: ../panels/network/net-device-ethernet.c:126
-#: ../panels/network/net-device-wifi.c:479
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:471
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2017,121 +2140,121 @@ msgstr[1] "%Ii روز قبل"
 
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
-#: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-wifi.c:537
+#: ../panels/network/net-device-ethernet.c:53
+#: ../panels/network/net-device-wifi.c:528
 #, c-format
 msgid "%d Mb/s"
 msgstr "%Id مگابیت/ثانیه"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:566
+#: ../panels/network/net-device-wifi.c:557
 msgctxt "Signal strength"
 msgid "None"
 msgstr "هیچ‌کدام"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:568
+#: ../panels/network/net-device-wifi.c:559
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "ضعیف"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:570
+#: ../panels/network/net-device-wifi.c:561
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "کافی"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:572
+#: ../panels/network/net-device-wifi.c:563
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "خوب"
 
 #: ../panels/network/connection-editor/ce-page-details.c:189
-#: ../panels/network/net-device-wifi.c:574
+#: ../panels/network/net-device-wifi.c:565
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "عالی"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:200
-#: ../panels/network/connection-editor/ce-page-vpn.c:172
-#: ../panels/network/connection-editor/ce-page-wifi.c:243
-#: ../panels/network/network-wifi.ui.h:59
+#: ../panels/network/connection-editor/ce-page-ethernet.c:213
+#: ../panels/network/connection-editor/ce-page-vpn.c:204
+#: ../panels/network/connection-editor/ce-page-wifi.c:255
+#: ../panels/network/network-wifi.ui.h:45
 msgid "Identity"
 msgstr "هویت"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:202
-#: ../panels/network/connection-editor/ce-page-ip4.c:454
+#: ../panels/network/connection-editor/ce-page-ip4.c:207
+#: ../panels/network/connection-editor/ce-page-ip4.c:469
 msgid "Netmask"
 msgstr "ماسک شبکه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:216
-#: ../panels/network/connection-editor/ce-page-ip4.c:467
-#: ../panels/network/connection-editor/ce-page-ip6.c:217
-#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../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/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "دروازه"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:233
-#: ../panels/network/connection-editor/ce-page-ip6.c:234
+#: ../panels/network/connection-editor/ce-page-ip4.c:238
+#: ../panels/network/connection-editor/ce-page-ip6.c:239
 msgid "Delete Address"
 msgstr "حذف آدرس"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:285
-#: ../panels/network/connection-editor/ce-page-ip6.c:286
+#: ../panels/network/connection-editor/ce-page-ip4.c:292
+#: ../panels/network/connection-editor/ce-page-ip6.c:293
 msgid "Add"
 msgstr "اضافه کردن"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:350
-#: ../panels/network/connection-editor/ce-page-ip6.c:354
+#: ../panels/network/connection-editor/ce-page-ip4.c:360
+#: ../panels/network/connection-editor/ce-page-ip6.c:364
 msgid "Server"
 msgstr "کارگزار"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:367
-#: ../panels/network/connection-editor/ce-page-ip6.c:371
+#: ../panels/network/connection-editor/ce-page-ip4.c:377
+#: ../panels/network/connection-editor/ce-page-ip6.c:381
 msgid "Delete DNS Server"
 msgstr "حذف کارگزار دی‌ان‌اس"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:481
-#: ../panels/network/connection-editor/ce-page-ip6.c:489
+#: ../panels/network/connection-editor/ce-page-ip4.c:496
+#: ../panels/network/connection-editor/ce-page-ip6.c:504
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "متریک"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:502
-#: ../panels/network/connection-editor/ce-page-ip6.c:510
+#: ../panels/network/connection-editor/ce-page-ip4.c:517
+#: ../panels/network/connection-editor/ce-page-ip6.c:525
 msgid "Delete Route"
 msgstr "حذف مسیر"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:616
-#: ../panels/network/network-wifi.ui.h:26
+#: ../panels/network/connection-editor/ce-page-ip4.c:632
+#: ../panels/network/network-wifi.ui.h:25
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:620
-#: ../panels/network/connection-editor/ce-page-ip6.c:622
-#: ../panels/network/network-wifi.ui.h:25
+#: ../panels/network/connection-editor/ce-page-ip4.c:636
+#: ../panels/network/connection-editor/ce-page-ip6.c:638
+#: ../panels/network/network-wifi.ui.h:24
 msgid "Manual"
 msgstr "دستی"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:624
-#: ../panels/network/connection-editor/ce-page-ip6.c:626
+#: ../panels/network/connection-editor/ce-page-ip4.c:640
+#: ../panels/network/connection-editor/ce-page-ip6.c:642
 msgid "Link-Local Only"
 msgstr "فقط Link-Local"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:925
-#: ../panels/network/network-wifi.ui.h:60
+#: ../panels/network/connection-editor/ce-page-ip4.c:942
+#: ../panels/network/network-wifi.ui.h:46
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:204
-#: ../panels/network/connection-editor/ce-page-ip6.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:209
+#: ../panels/network/connection-editor/ce-page-ip6.c:473
 msgid "Prefix"
 msgstr "پیشوند"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../panels/network/connection-editor/ce-page-ip6.c:630
 #: ../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
@@ -2139,17 +2262,17 @@ msgstr "پیشوند"
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:618
+#: ../panels/network/connection-editor/ce-page-ip6.c:634
 msgid "Automatic, DHCP only"
 msgstr "خودکار، فقط DHCP"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:886
-#: ../panels/network/network-wifi.ui.h:61
+#: ../panels/network/connection-editor/ce-page-ip6.c:902
+#: ../panels/network/network-wifi.ui.h:47
 msgid "IPv6"
 msgstr "IPv6"
 
 #: ../panels/network/connection-editor/ce-page-reset.c:91
-#: ../panels/network/network-wifi.ui.h:63
+#: ../panels/network/network-wifi.ui.h:49
 msgid "Reset"
 msgstr "تنظیم مجدد"
 
@@ -2183,10 +2306,6 @@ msgstr "‫WPA و WPA2 شخصی"
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-msgid "_Apply"
-msgstr "_اِعمال"
-
 #: ../panels/network/connection-editor/details-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:2
 msgid "Signal Strength"
@@ -2198,32 +2317,32 @@ msgid "Link speed"
 msgstr "سرعت پیوند"
 
 #: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:159
-#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/net-device-ethernet.c:155
+#: ../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:3
+#: ../panels/network/network-simple.ui.h:4
 #: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "نشانی آی‌پی ن۶"
 
 #: ../panels/network/connection-editor/details-page.ui.h:6
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-simple.ui.h:1
+#: ../panels/network/net-device-ethernet.c:163
+#: ../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:171
+#: ../panels/network/net-device-ethernet.c:167
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-simple.ui.h:5
 #: ../panels/network/network-wifi.ui.h:8
 msgid "Default Route"
 msgstr "مسیر پیش‌فرض"
@@ -2231,9 +2350,9 @@ 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:173
+#: ../panels/network/net-device-ethernet.c:169
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-simple.ui.h:6
 #: ../panels/network/network-wifi.ui.h:9
 msgid "DNS"
 msgstr "دی‌ان‌اس"
@@ -2281,7 +2400,7 @@ msgstr "_نام"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:11
 #: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:49
+#: ../panels/network/network-wifi.ui.h:36
 msgid "_MAC Address"
 msgstr "_مک آدرس"
 
@@ -2295,26 +2414,44 @@ msgid "_Cloned Address"
 msgstr "آدرس _کلون شده"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:14
-#: ../panels/network/connection-editor/wifi-page.ui.h:6
-msgid "Connect _automatically"
-msgstr "اتصال _خودکار"
+msgid "bytes"
+msgstr "بایت"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:15
+#: ../panels/network/connection-editor/vpn-page.ui.h:3
 msgid "Make available to other _users"
 msgstr "برای دیگر _کاربران در دسترس باشد"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:16
-msgid "bytes"
-msgstr "بایت"
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Connect _automatically"
+msgstr "اتصال _خودکار"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:17
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: ../panels/network/connection-editor/wifi-page.ui.h:8
+msgid "Firewall _Zone"
+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 "پیش‌فرض"
+
+#: ../panels/network/connection-editor/firewall-helpers.c:49
+msgid "The zone defines the trust level of the connection"
+msgstr "منطقه سطح اعتماد به اتصال را تعیین می‌کند"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:23
+#: ../panels/network/network-wifi.ui.h:22
 msgid "IPv_4"
 msgstr "IPv_4"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:2
 #: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:24
+#: ../panels/network/network-wifi.ui.h:23
 msgid "_Addresses"
 msgstr "آ_درس‌ها"
 
@@ -2325,7 +2462,7 @@ msgstr "دی‌ان‌اس خودکار"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:6
 #: ../panels/network/connection-editor/ip6-page.ui.h:6
-#: ../panels/network/network-wifi.ui.h:39
+#: ../panels/network/network-wifi.ui.h:30
 msgid "Routes"
 msgstr "مسیرها"
 
@@ -2336,66 +2473,66 @@ msgstr "مسیرهای خودکار"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:8
 #: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/network/network-wifi.ui.h:45
+#: ../panels/network/network-wifi.ui.h:32
 msgid "Use this connection _only for resources on its network"
 msgstr "از این اتصال _تنها برای منابع روی شبکه‌اش استفاده کن"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:47
+#: ../panels/network/network-wifi.ui.h:34
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:267
+#: ../panels/network/connection-editor/net-connection-editor.c:268
 msgid "Unable to open connection editor"
 msgstr "نمی‌توان ویرایشگر اتصال را باز کرد"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:282
+#: ../panels/network/connection-editor/net-connection-editor.c:286
 msgid "New Profile"
 msgstr "مجموعه‌تنظیمات جدید"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/network/connection-editor/net-connection-editor.c:511
 #: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/user-accounts/um-account-dialog.c:1068
+#: ../panels/user-accounts/um-account-dialog.c:1471
 msgid "_Add"
 msgstr "ا_ضافه کردن"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:586
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+#: ../panels/network/connection-editor/net-connection-editor.c:595
+#: ../panels/network/network.ui.h:1 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "وی‌پی‌ان"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:587
+#: ../panels/network/connection-editor/net-connection-editor.c:596
 msgid "Bond"
 msgstr "Bond"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:588
+#: ../panels/network/connection-editor/net-connection-editor.c:597
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:589
+#: ../panels/network/connection-editor/net-connection-editor.c:598
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:739
+#: ../panels/network/connection-editor/net-connection-editor.c:749
 msgid "Could not load VPN plugins"
 msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:803
+#: ../panels/network/connection-editor/net-connection-editor.c:818
 msgid "Import from file…"
 msgstr "وارد کردن از پرونده..."
 
-#: ../panels/network/connection-editor/net-connection-editor.c:870
+#: ../panels/network/connection-editor/net-connection-editor.c:889
 msgid "Add Network Connection"
 msgstr "اضافه کردن اتصال شبکه"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:53
+#: ../panels/network/network-wifi.ui.h:39
 msgid "_Reset"
 msgstr "_تنظیم مجدد"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1411
-#: ../panels/network/network-wifi.ui.h:54
+#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/network-wifi.ui.h:40
 msgid "_Forget"
 msgstr "_فراموش کردن"
 
@@ -2439,6 +2576,14 @@ msgstr ""
 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"
+msgid "_Open"
+msgstr "_بازکردن"
+
 #: ../panels/network/connection-editor/vpn-helpers.c:294
 #, c-format
 msgid "A file named \"%s\" already exists."
@@ -2473,7 +2618,7 @@ msgstr ""
 msgid "Export VPN connection..."
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: ../panels/network/connection-editor/vpn-page.ui.h:4
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(خطا: نمی‌توان ویرایشگر اتصال وی‌پی‌ان را بار کرد)"
 
@@ -2492,7 +2637,7 @@ msgstr "_BSSID"
 msgid "My Home Network"
 msgstr "شبکه خانگی من"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:7
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
 msgid "Make available to _other users"
 msgstr "در دسترس قراردادن برای کاربران _دیگر"
 
@@ -2507,10 +2652,15 @@ msgstr "اینکه چطور به اینترنت متصل می‌شوید را ک
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+#| msgid ""
+#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgid ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
+"vlan;bridge;bond;"
 msgstr ""
-"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;شبکه;"
-"بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;"
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
+"vlan;bridge;bond;شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;"
+"وی پی ان;"
 
 #: ../panels/network/net-device-bond.c:77
 msgid "Bond slaves"
@@ -2520,50 +2670,63 @@ msgstr "Bond slaves"
 msgid "Bridge slaves"
 msgstr "Bridge slaves"
 
-#: ../panels/network/net-device-ethernet.c:112
-#: ../panels/network/net-device-wifi.c:465
+#: ../panels/network/net-device-ethernet.c:108
+#: ../panels/network/net-device-wifi.c:457
 msgid "never"
 msgstr "هرگز"
 
-#: ../panels/network/net-device-ethernet.c:122
-#: ../panels/network/net-device-wifi.c:475
+#: ../panels/network/net-device-ethernet.c:118
+#: ../panels/network/net-device-wifi.c:467
 msgid "today"
 msgstr "امروز"
 
-#: ../panels/network/net-device-ethernet.c:124
-#: ../panels/network/net-device-wifi.c:477
+#: ../panels/network/net-device-ethernet.c:120
+#: ../panels/network/net-device-wifi.c:469
 msgid "yesterday"
 msgstr "دیروز"
 
-#: ../panels/network/net-device-ethernet.c:162
+#: ../panels/network/net-device-ethernet.c:158
 #: ../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:178
+#: ../panels/network/net-device-ethernet.c:174
 #: ../panels/network/network-wifi.ui.h:10
 msgid "Last used"
 msgstr "آخرین استفاده"
 
-#: ../panels/network/net-device-ethernet.c:337
-#: ../panels/network/net-device-wifi.c:1549
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+#. Translators: This is used as the title of the connection
+#. * details window for ethernet, if there is only a single
+#. * profile. It is also used to display ethernet in the
+#. * device list.
+#.
+#: ../panels/network/net-device-ethernet.c:284
+#: ../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/network-ethernet.ui.h:3
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-simple.ui.h:8
+#: ../panels/network/network-vpn.ui.h:8
 msgid "Options…"
 msgstr "گزینه‌ها..."
 
-#: ../panels/network/net-device-ethernet.c:472
+#: ../panels/network/net-device-ethernet.c:489
 #, c-format
 msgid "Profile %d"
 msgstr "مجموعه‌تنظیمات %Id"
 
-#: ../panels/network/net-device-mobile.c:241
+#: ../panels/network/net-device-mobile.c:232
 msgid "Add new connection"
 msgstr "اضافه کردن اتصال جدید"
 
-#: ../panels/network/net-device-wifi.c:1120
+#: ../panels/network/net-device-wifi.c:1111
 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."
@@ -2571,12 +2734,12 @@ msgstr ""
 "اگر شما اتصالی به اینترنت غیر از اتصال بی‌سیم دارید، می‌توانید یک hotspot "
 "بی‌سیم راه‌اندازی کنید و آن را با دیگران به اشتراک بگذارید."
 
-#: ../panels/network/net-device-wifi.c:1124
+#: ../panels/network/net-device-wifi.c:1115
 #, 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:1128
+#: ../panels/network/net-device-wifi.c:1119
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2584,23 +2747,23 @@ msgstr ""
 "امکان دسترسی به اینترنت از طریق بی‌سیم، هنگامی که hotspot فعال است، وجود "
 "ندارد."
 
-#: ../panels/network/net-device-wifi.c:1202
+#: ../panels/network/net-device-wifi.c:1193
 msgid "Stop hotspot and disconnect any users?"
 msgstr "توقع منبع اصلی و قطع ارتباط با کاربران؟"
 
-#: ../panels/network/net-device-wifi.c:1205
+#: ../panels/network/net-device-wifi.c:1196
 msgid "_Stop Hotspot"
 msgstr "_توقف منبع اصلی"
 
-#: ../panels/network/net-device-wifi.c:1277
+#: ../panels/network/net-device-wifi.c:1268
 msgid "System policy prohibits use as a Hotspot"
 msgstr "سیاست‌های سیستم استفاده از Hotspot را منع کرده است"
 
-#: ../panels/network/net-device-wifi.c:1280
+#: ../panels/network/net-device-wifi.c:1271
 msgid "Wireless device does not support Hotspot mode"
 msgstr "دستگاه بی‌سیم از حالت Hotspot پشتیبانی نمی‌کند"
 
-#: ../panels/network/net-device-wifi.c:1407
+#: ../panels/network/net-device-wifi.c:1400
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2608,13 +2771,19 @@ msgstr ""
 "جزئیات شبکه برای شبکه‌های انتخاب شده، شامل گذرواژه‌ها و هرگونه پیکربندی سفارشی "
 "حذف خواهند شد."
 
-#: ../panels/network/net-device-wifi.c:1712
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+#: ../panels/network/net-device-wifi.c:1710
+#: ../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
+msgid "_Close"
+msgstr "_بستن"
+
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1724
+#: ../panels/network/net-device-wifi.c:1722
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_فراموش کردن"
@@ -2634,11 +2803,11 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "این برای شبکه‌های عمومیِ غیرقابل اعتماد توصیه نمی‌شود."
 
-#: ../panels/network/net-proxy.c:408
+#: ../panels/network/net-proxy.c:410
 msgid "Proxy"
 msgstr "پیشکار"
 
-#: ../panels/network/network-ethernet.ui.h:1
+#: ../panels/network/network-ethernet.ui.h:2
 msgid "_Add Profile…"
 msgstr "اضافه‌کردن مجموعه‌تنظیمات..."
 
@@ -2650,22 +2819,17 @@ msgstr "IMEI"
 msgid "Provider"
 msgstr "فراهم‌کننده"
 
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:7
-msgid "_Options…"
-msgstr "_گزینه‌ها..."
-
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:2
 msgctxt "proxy method"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:3
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "دستی"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:4
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "خودکار"
@@ -2714,23 +2878,11 @@ msgstr "پورت پیشکار FTP"
 msgid "Socks proxy port"
 msgstr "پورت پیشکار Socks"
 
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "Turn device off"
 msgstr "خاموش کردن دستگاه"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "واسطی را برای استفاده در سرویس جدید انتخاب کنید"
-
-#: ../panels/network/network.ui.h:2
-msgid "C_reate…"
-msgstr "_ایجاد..."
-
-#: ../panels/network/network.ui.h:3
-msgid "_Interface"
-msgstr "_واسط"
-
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:5
 msgid "Add Device"
 msgstr "اضافه کردن دستگاه"
 
@@ -2768,105 +2920,60 @@ msgstr "جزئیات"
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:2
 #: ../panels/network/wireless-security/ws-leap.ui.h:2
 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "_Password"
 msgstr "_گذرواژه"
 
 #: ../panels/network/network-wifi.ui.h:18
-#: ../panels/universal-access/uap.ui.h:8
 msgid "None"
 msgstr "هیچ‌کدام"
 
 #: ../panels/network/network-wifi.ui.h:19
-msgid "blablabla"
-msgstr "چیزچیزچیز"
-
-#: ../panels/network/network-wifi.ui.h:20
 msgid "Show P_assword"
 msgstr "نمایش گ_ذرواژه"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:20
 msgid "Make available to other users"
 msgstr "در دسترس کاربران دیگر هم قرار بده"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:21
 msgid "identity"
 msgstr "هویت"
 
-#: ../panels/network/network-wifi.ui.h:27
+#: ../panels/network/network-wifi.ui.h:26
 msgid "Automatic (DHCP) addresses only"
 msgstr "فقط آدرس‌های خودکار (DHCP)"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: ../panels/network/network-wifi.ui.h:27
 msgid "Link-local only"
 msgstr "فقط Link-local"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: ../panels/network/network-wifi.ui.h:28
 msgid "Shared with other computers"
 msgstr "به‌اشتراک گذاشته شده با رایانه‌های دیگر"
 
 #: ../panels/network/network-wifi.ui.h:31
-msgid ""
-"Address\n"
-"section\n"
-"goes\n"
-"here"
-msgstr ""
-"جای\n"
-"قسمت\n"
-"آدرس\n"
-"اینجاست"
-
-#: ../panels/network/network-wifi.ui.h:35
-msgid ""
-"DNS\n"
-"section\n"
-"goes\n"
-"here"
-msgstr ""
-"جای\n"
-"قسمت\n"
-"دی‌ان‌اس\n"
-"اینجاست"
-
-#: ../panels/network/network-wifi.ui.h:40
-msgid ""
-"Routes\n"
-"section\n"
-"goes\n"
-"here"
-msgstr ""
-"جای\n"
-"قسمت\n"
-"مسیرها\n"
-"اینجاست"
-
-#: ../panels/network/network-wifi.ui.h:44
 msgid "_Ignore automatically obtained routes"
 msgstr "به‌طور خودکار مسیرهای به‌دست آمده را _نادیده بگیر"
 
-#: ../panels/network/network-wifi.ui.h:46
+#: ../panels/network/network-wifi.ui.h:33
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:48
+#: ../panels/network/network-wifi.ui.h:35
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: ../panels/network/network-wifi.ui.h:37
 msgid "_Cloned MAC Address"
 msgstr "مک آدرس _کلون شده"
 
-#: ../panels/network/network-wifi.ui.h:51
-msgid "00:24:16:31:8G:7A"
-msgstr "00:24:16:31:8G:7A"
-
-#: ../panels/network/network-wifi.ui.h:52
+#: ../panels/network/network-wifi.ui.h:38
 msgid "hardware"
 msgstr "سخت‌افزار"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: ../panels/network/network-wifi.ui.h:41
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -2874,65 +2981,65 @@ msgstr ""
 "تنظیم مجدد تنظیمات به پیش‌فرض برای این اتصال، اما به عنوان اتصال ترجیح داده "
 "شده باقی بماند."
 
-#: ../panels/network/network-wifi.ui.h:56
+#: ../panels/network/network-wifi.ui.h:42
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
 msgstr "حذف تمام جزئیات مربوط به این شبکه و به‌طور خودکار به آن متصل نشو."
 
-#: ../panels/network/network-wifi.ui.h:57
+#: ../panels/network/network-wifi.ui.h:43
 msgid "reset"
 msgstr "تنظیم مجدد"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: ../panels/network/network-wifi.ui.h:48
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../panels/network/network-wifi.ui.h:64
+#: ../panels/network/network-wifi.ui.h:50
 msgid "Wi-Fi Hotspot"
 msgstr "منبع اصلی (hotspot) بی‌سیم"
 
-#: ../panels/network/network-wifi.ui.h:65
+#: ../panels/network/network-wifi.ui.h:51
 msgid "_Turn On"
 msgstr "_روشن کردن"
 
-#: ../panels/network/network-wifi.ui.h:66
+#: ../panels/network/network-wifi.ui.h:52
 msgid "Wi-Fi"
 msgstr "وای-فای"
 
-#: ../panels/network/network-wifi.ui.h:67
+#: ../panels/network/network-wifi.ui.h:53
 msgid "Turn Wi-Fi off"
 msgstr "خاموش کردن بی‌سیم"
 
-#: ../panels/network/network-wifi.ui.h:68
+#: ../panels/network/network-wifi.ui.h:54
 msgid "_Use as Hotspot…"
 msgstr "_استفاده از یک منبع اصلی(Hotspot)..."
 
-#: ../panels/network/network-wifi.ui.h:69
+#: ../panels/network/network-wifi.ui.h:55
 msgid "_Connect to Hidden Network…"
 msgstr "اتصال به شبکه مخفی..."
 
-#: ../panels/network/network-wifi.ui.h:70
+#: ../panels/network/network-wifi.ui.h:56
 msgid "_History"
 msgstr "_تاریخچه"
 
-#: ../panels/network/network-wifi.ui.h:71
+#: ../panels/network/network-wifi.ui.h:57
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "جهت اتصال به شبکه بی‌سیم، خاموش کنید"
 
-#: ../panels/network/network-wifi.ui.h:72
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Network Name"
 msgstr "نام شبکه"
 
-#: ../panels/network/network-wifi.ui.h:73
+#: ../panels/network/network-wifi.ui.h:59
 msgid "Connected Devices"
 msgstr "دستگاه‌های متصل شده"
 
-#: ../panels/network/network-wifi.ui.h:74
+#: ../panels/network/network-wifi.ui.h:60
 msgid "Security type"
 msgstr "نوع حفاظت"
 
-#: ../panels/network/network-wifi.ui.h:75
+#: ../panels/network/network-wifi.ui.h:61
 msgid "Security key"
 msgstr "کلید امنیتی"
 
@@ -3309,7 +3416,7 @@ msgstr "هردو"
 #: ../panels/network/wireless-security/eap-method-leap.ui.h:1
 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1
 #: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
+#: ../panels/user-accounts/data/account-dialog.ui.h:3
 msgid "_Username"
 msgstr "نا_م کاربری"
 
@@ -3507,20 +3614,16 @@ msgctxt "notifications"
 msgid "Show Details in Lock Screen"
 msgstr "نمایش جزئیات در صفحه قفل"
 
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
-#: ../panels/privacy/cc-privacy-panel.c:78
-#: ../panels/privacy/cc-privacy-panel.c:145
+#: ../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/universal-access/cc-ua-panel.c:257
+#: ../panels/universal-access/cc-ua-panel.c:597
+#: ../panels/universal-access/cc-ua-panel.c:722
 msgid "On"
 msgstr "روشن"
 
-#: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
-#: ../panels/privacy/cc-privacy-panel.c:78
-#: ../panels/privacy/cc-privacy-panel.c:145
-msgid "Off"
-msgstr "خاموش"
-
 #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
 msgid "Notifications"
 msgstr "اعلان‌ها"
@@ -3542,66 +3645,66 @@ msgstr "نمایش بنرهای واشو"
 msgid "Show in Lock Screen"
 msgstr "نمایش در صفحه قفل"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
-#: ../panels/region/cc-input-chooser.c:1073
-#: ../panels/search/cc-search-locations-dialog.c:480
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200
+#| msgid "Other"
+msgctxt "Online Account"
 msgid "Other"
-msgstr "دیگر"
+msgstr "موارد دیگر"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "اضافه کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:330
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357
 msgid "Mail"
 msgstr "پست‌الکترونیکی"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:336
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363
 msgid "Contacts"
 msgstr "آشناها"
 
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:342
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369
+msgid "Chat"
+msgstr "گپ"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375
 msgid "Resources"
 msgstr "منابع"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:358
+#: ../panels/online-accounts/cc-online-accounts-panel.c:425
 msgid "Error logging into the account"
 msgstr "خطا در هنگاک ورود به حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+#: ../panels/online-accounts/cc-online-accounts-panel.c:495
 msgid "Credentials have expired."
 msgstr "اعتبارنامه‌ها منقضی شده‌اند."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+#: ../panels/online-accounts/cc-online-accounts-panel.c:499
 msgid "Sign in to enable this account."
 msgstr "وارد شوید تا این حساب فعال شود."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+#: ../panels/online-accounts/cc-online-accounts-panel.c:504
 msgid "_Sign In"
 msgstr "_ورود به سیستم"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:684
+#: ../panels/online-accounts/cc-online-accounts-panel.c:745
 msgid "Error creating account"
 msgstr "خطا در ایجاد حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:726
+#: ../panels/online-accounts/cc-online-accounts-panel.c:805
 msgid "Error removing account"
 msgstr "خطا در هنگام حذف کردن حساب"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:762
+#: ../panels/online-accounts/cc-online-accounts-panel.c:841
 msgid "Are you sure you want to remove the account?"
 msgstr "آیا مطمئنید که می‌خواهید حساب را حذف کنید؟"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:764
+#: ../panels/online-accounts/cc-online-accounts-panel.c:843
 msgid "This will not remove the account on the server."
 msgstr "این کار حساب را بر روی کارگزار پاک نخواهد کرد."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:765
-msgid "_Remove"
-msgstr "_حذف"
-
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
 msgid "Online Accounts"
 msgstr "حساب‌های برخط"
@@ -3612,8 +3715,13 @@ msgstr "به حساب‌های برخط خود متصل شوید و تصمیم 
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
-msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
-msgstr "گوگل;فیس بوک;تویتر;یاهو;وب;برخط;گپ;تقویم;پست‌الکترونیکی;آشنا;"
+#| 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;"
+msgstr ""
+"گوگل;فیس بوک;تویتر;یاهو;وب;برخط;گپ;تقویم;پست‌الکترونیکی;آشنا;ownCloud;"
+"Kerberos;IMAP;SMTP;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -3635,18 +3743,18 @@ msgstr ""
 "اضافه کردن یک حساب به برنامه‌های شما اجازه می‌دهد تا از آنها برای سندها، "
 "پست‌الکترونیکی، آشناها، تقویم، گپ و... استفاده کنند."
 
-#: ../panels/power/cc-power-panel.c:184
+#: ../panels/power/cc-power-panel.c:189
 msgid "Unknown time"
 msgstr "زمان نامعلوم"
 
-#: ../panels/power/cc-power-panel.c:190
+#: ../panels/power/cc-power-panel.c:195
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%Ii دقیقه"
 msgstr[1] "%Ii دقیقه"
 
-#: ../panels/power/cc-power-panel.c:202
+#: ../panels/power/cc-power-panel.c:207
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3655,227 +3763,234 @@ 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:210
+#: ../panels/power/cc-power-panel.c:215
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%Ii %s %Ii %s"
 
-#: ../panels/power/cc-power-panel.c:211
+#: ../panels/power/cc-power-panel.c:216
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ساعت"
 msgstr[1] "ساعت"
 
-#: ../panels/power/cc-power-panel.c:212
+#: ../panels/power/cc-power-panel.c:217
 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:231
+#: ../panels/power/cc-power-panel.c:236
 #, 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:238
+#: ../panels/power/cc-power-panel.c:243
 #, 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:243
+#: ../panels/power/cc-power-panel.c:248
 #, c-format
 msgid "%s remaining"
 msgstr "%s باقی‌مانده"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+#: ../panels/power/cc-power-panel.c:253 ../panels/power/cc-power-panel.c:281
 msgid "Fully charged"
 msgstr "کاملا شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+#: ../panels/power/cc-power-panel.c:257 ../panels/power/cc-power-panel.c:285
 msgid "Empty"
 msgstr "خالی"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:267
+#: ../panels/power/cc-power-panel.c:272
 msgid "Charging"
 msgstr "درحال شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:272
+#: ../panels/power/cc-power-panel.c:277
 msgid "Discharging"
 msgstr "درحال تخلیه"
 
-#: ../panels/power/cc-power-panel.c:324
-#, c-format
-msgid "Estimated battery capacity: %s"
-msgstr "گنجایش تقریبی باتری: %s"
-
-#: ../panels/power/cc-power-panel.c:404
+#: ../panels/power/cc-power-panel.c:395
 msgctxt "Battery name"
 msgid "Main"
 msgstr "اصلی"
 
-#: ../panels/power/cc-power-panel.c:406
+#: ../panels/power/cc-power-panel.c:397
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "اضافی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:493
+#: ../panels/power/cc-power-panel.c:488
 msgid "Wireless mouse"
 msgstr "موشی بی‌سیم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:492
 msgid "Wireless keyboard"
 msgstr "صفحه‌کلید بی‌سیم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:496
 msgid "Uninterruptible power supply"
 msgstr "تامین‌کننده‌ی انرژی غیرقابل وقفه‌اندازی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:506
+#: ../panels/power/cc-power-panel.c:501
 msgid "Personal digital assistant"
 msgstr "دستیار دیجیتال شخصی"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:505
 msgid "Cellphone"
 msgstr "تلفن‌همراه"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:509
 msgid "Media player"
 msgstr "پخش‌کننده صوتی تصویری"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:513
 msgid "Tablet"
 msgstr "تبلت"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:517
 msgid "Computer"
 msgstr "رایانه"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
-#: ../panels/power/cc-power-panel.c:1938
+#: ../panels/power/cc-power-panel.c:521 ../panels/power/cc-power-panel.c:731
+#: ../panels/power/cc-power-panel.c:2066
 msgid "Battery"
 msgstr "باتری"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:530
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "درحال شارژ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:537
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "هشدار"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Low"
 msgstr "کم"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Good"
 msgstr "خوب"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:557
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "کاملا شارژ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:561
+#: ../panels/power/cc-power-panel.c:556
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "خالی"
 
-#: ../panels/power/cc-power-panel.c:732
+#: ../panels/power/cc-power-panel.c:729
 msgid "Batteries"
 msgstr "باتری‌ها"
 
-#: ../panels/power/cc-power-panel.c:1074
+#: ../panels/power/cc-power-panel.c:1135
 msgid "When _idle"
 msgstr "هنگام _بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1401
+#: ../panels/power/cc-power-panel.c:1504
 msgid "Power Saving"
 msgstr "صرفه‌جویی انرژی"
 
-#: ../panels/power/cc-power-panel.c:1430
-msgid "_Screen Brightness"
+#: ../panels/power/cc-power-panel.c:1532
+#| msgid "_Screen Brightness"
+msgid "_Screen brightness"
 msgstr "روشنایی _صفحه‌نمایش"
 
-#: ../panels/power/cc-power-panel.c:1458
-msgid "_Dim Screen when Inactive"
+#: ../panels/power/cc-power-panel.c:1538
+#| msgid "Keyboard Preferences"
+msgid "_Keyboard brightness"
+msgstr "روشنایی _صفحه‌کلید"
+
+#: ../panels/power/cc-power-panel.c:1548
+#| msgid "_Dim Screen when Inactive"
+msgid "_Dim screen when inactive"
 msgstr "_تیره کردن صفحه‌نمایش زمان بیکاری"
 
-#: ../panels/power/cc-power-panel.c:1481
-msgid "_Blank Screen"
+#: ../panels/power/cc-power-panel.c:1573
+#| msgid "_Blank Screen"
+msgid "_Blank screen"
 msgstr "صفحه _خالی"
 
-#: ../panels/power/cc-power-panel.c:1516
+#: ../panels/power/cc-power-panel.c:1610
 msgid "_Wi-Fi"
 msgstr "_وای-فای"
 
-#: ../panels/power/cc-power-panel.c:1521
+#: ../panels/power/cc-power-panel.c:1615
 msgid "Turns off wireless devices"
 msgstr "دستگاه‌های بی‌سیم را خاموش می‌کند"
 
-#: ../panels/power/cc-power-panel.c:1544
-msgid "_Mobile Broadband"
-msgstr "پهن‌باند _همراه"
+#: ../panels/power/cc-power-panel.c:1640
+#| msgid "Mobile broadband"
+msgid "_Mobile broadband"
+msgstr "پهن‌باند _موبایل"
 
-#: ../panels/power/cc-power-panel.c:1549
-msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+#: ../panels/power/cc-power-panel.c:1645
+#| msgid "Turns off Mobile Broadband (3G, 4G, WiMax, etc.) devices"
+msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices"
 msgstr "دستگاه‌های پهن‌باند همراه (3G، 4G، WiMax و...) را خاموش می‌کند"
 
-#: ../panels/power/cc-power-panel.c:1582
+#: ../panels/power/cc-power-panel.c:1680
 msgid "_Bluetooth"
 msgstr "_بلوتوث"
 
-#: ../panels/power/cc-power-panel.c:1633
+#: ../panels/power/cc-power-panel.c:1731
 msgid "When on battery power"
 msgstr "هنگامی که روی انرژی باتری است"
 
-#: ../panels/power/cc-power-panel.c:1635
+#: ../panels/power/cc-power-panel.c:1733
 msgid "When plugged in"
 msgstr "زمان اتصال به برق"
 
-#: ../panels/power/cc-power-panel.c:1762
+#: ../panels/power/cc-power-panel.c:1862
 msgid "Suspend & Power Off"
 msgstr "تعلیق و خاموش کردن"
 
-#: ../panels/power/cc-power-panel.c:1793
-msgid "_Automatic Suspend"
+#: ../panels/power/cc-power-panel.c:1895
+#| msgid "_Automatic Suspend"
+msgid "_Automatic suspend"
 msgstr "_تعلیق خودکار"
 
-#: ../panels/power/cc-power-panel.c:1815
-msgid "When Battery Power is _Critical"
+#: ../panels/power/cc-power-panel.c:1919
+#| msgid "When Battery Power is _Critical"
+msgid "When battery power is _critical"
 msgstr "زمانی که انرژی _بحرانی است"
 
-#: ../panels/power/cc-power-panel.c:1848
+#: ../panels/power/cc-power-panel.c:1976
 msgid "Power Off"
 msgstr "خاموش کردن"
 
-#: ../panels/power/cc-power-panel.c:1990
+#: ../panels/power/cc-power-panel.c:2113
 msgid "Devices"
 msgstr "‌دستگاه‌ها"
 
@@ -3963,10 +4078,6 @@ msgstr "۱۲ دقیقه"
 msgid "Automatic Suspend"
 msgstr "تعلیق خودکار"
 
-#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
-msgid "_Close"
-msgstr "_بستن"
-
 #: ../panels/power/power.ui.h:22
 msgid "_Plugged In"
 msgstr "_متصل به برق"
@@ -3984,7 +4095,8 @@ msgid "Authenticate"
 msgstr "تایید هویت"
 
 #: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/sharing/sharing.ui.h:21
+#: ../panels/sharing/sharing.ui.h:23
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -4129,7 +4241,7 @@ msgid "No printers available"
 msgstr "هیچ چاپگری موجود نیست"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1429
+#: ../panels/printers/cc-printers-panel.c:1432
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -4137,45 +4249,45 @@ msgstr[0] "%Iu کار فعال"
 msgstr[1] "%Iu کار فعال"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1773
+#: ../panels/printers/cc-printers-panel.c:1776
 msgid "Failed to add new printer."
 msgstr "اضافه‌کردن چاپگر جدید شکست خورد."
 
-#: ../panels/printers/cc-printers-panel.c:1940
+#: ../panels/printers/cc-printers-panel.c:1943
 msgid "Select PPD File"
 msgstr "انتخاب پرونده‌ی PPD"
 
-#: ../panels/printers/cc-printers-panel.c:1949
+#: ../panels/printers/cc-printers-panel.c:1952
 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:2254
+#: ../panels/printers/cc-printers-panel.c:2257
 msgid "No suitable driver found"
 msgstr "هیچ راه‌انداز مناسبی پیدا نشد"
 
-#: ../panels/printers/cc-printers-panel.c:2323
+#: ../panels/printers/cc-printers-panel.c:2326
 msgid "Searching for preferred drivers…"
 msgstr "جست‌وجو برای راه‌اندازهای ترجیح داده..."
 
-#: ../panels/printers/cc-printers-panel.c:2338
+#: ../panels/printers/cc-printers-panel.c:2341
 msgid "Select from database…"
 msgstr "انتخاب از بانک اطلاعاتی..."
 
-#: ../panels/printers/cc-printers-panel.c:2347
+#: ../panels/printers/cc-printers-panel.c:2350
 msgid "Provide PPD File…"
 msgstr "فراهم کردن پرونده PPD..."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2498
-#: ../panels/printers/cc-printers-panel.c:2521
+#: ../panels/printers/cc-printers-panel.c:2501
+#: ../panels/printers/cc-printers-panel.c:2524
 msgid "Test page"
 msgstr "صفحه‌ی آزمایشی"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2929
+#: ../panels/printers/cc-printers-panel.c:2932
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ناتوان در باز کردن واسط کاربری: %s"
@@ -4222,15 +4334,22 @@ msgstr "لغو چاپ فعلی"
 msgid "Add a New Printer"
 msgstr "اضافه‌کردن یک چاپگر جدید"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-user-panel.c:467
-msgid "_Cancel"
-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:4
+#: ../panels/printers/new-printer-dialog.ui.h:6
 msgid "Search for network printers or filter result"
 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"
+msgid "Enter address of a printer or a text to filter results"
+msgstr "آدرس یک چاپگر را یا متنی وارد کنید تا نتایج صافی شوند"
+
 #: ../panels/printers/options-dialog.ui.h:1
 msgid "Loading options…"
 msgstr "بارگیری گزینه‌ها..."
@@ -4343,8 +4462,14 @@ msgstr "زمان"
 msgid "%s Active Jobs"
 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"
+msgid "Server requires authentication"
+msgstr "کارگزار نیاز به تاییدهویت دارد"
+
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1465
+#: ../panels/printers/pp-new-printer-dialog.c:1706
 msgid "No printers detected."
 msgstr "هیچ چاپگری پیدا نشد."
 
@@ -4364,73 +4489,69 @@ msgstr "منبع کاغذ"
 msgid "Output Tray"
 msgstr "سینی خروجی"
 
-#: ../panels/printers/pp-options-dialog.c:86
-msgid "Resolution"
-msgstr "تفکیک‌پذیری"
-
 #: ../panels/printers/pp-options-dialog.c:87
 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:533
+#: ../panels/printers/pp-options-dialog.c:532
 msgid "Pages per side"
 msgstr "صفحه‌ها در هر طرف"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:545
+#: ../panels/printers/pp-options-dialog.c:544
 msgid "Two-sided"
 msgstr "دو طرفه"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: ../panels/printers/pp-options-dialog.c:557
+#: ../panels/printers/pp-options-dialog.c:556
 msgid "Orientation"
 msgstr "جهت"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:654
+#: ../panels/printers/pp-options-dialog.c:653
 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:657
+#: ../panels/printers/pp-options-dialog.c:656
 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:660
+#: ../panels/printers/pp-options-dialog.c:659
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "گزینه‌های قابل نصب"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:663
+#: ../panels/printers/pp-options-dialog.c:662
 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:666
+#: ../panels/printers/pp-options-dialog.c:665
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "کیفیت تصویر"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:669
+#: ../panels/printers/pp-options-dialog.c:668
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "رنگ"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:672
+#: ../panels/printers/pp-options-dialog.c:671
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "درحال پایان بردن"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:675
+#: ../panels/printers/pp-options-dialog.c:674
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "پیشرفته"
@@ -4482,7 +4603,7 @@ msgid "Driver"
 msgstr "راه‌انداز"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: ../panels/printers/pp-samba.c:247
+#: ../panels/printers/pp-samba.c:254
 #, c-format
 msgid "Enter your username and password to view printers available on %s."
 msgstr ""
@@ -4560,27 +4681,40 @@ msgstr ""
 "متاسفم! سرویس چاپگر سیستم\n"
 "به نظر در دسترس نیست."
 
-#: ../panels/privacy/cc-privacy-panel.c:105
-msgid "Hidden"
-msgstr "مخفی"
-
-#: ../panels/privacy/cc-privacy-panel.c:105
-msgid "Visible"
-msgstr "نمایان"
-
-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/cc-privacy-panel.c:248 ../panels/privacy/privacy.ui.h:26
 msgid "Screen Lock"
 msgstr "صفحه‌قفل"
 
-#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
-msgid "Name & Visibility"
-msgstr "نام و وضعیت نمایش"
-
-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+#: ../panels/privacy/cc-privacy-panel.c:361 ../panels/privacy/privacy.ui.h:20
 msgid "Usage & History"
 msgstr "استفاده و تاریخچه"
 
-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/cc-privacy-panel.c:489
+msgid "Empty all items from Trash?"
+msgstr "حذف تمام موارد از زباله‌دان؟"
+
+#: ../panels/privacy/cc-privacy-panel.c:490
+msgid "All items in the Trash will be permanently deleted."
+msgstr "تمام موارد موجود در زباله‌دان برای همیشه پاک می‌شوند."
+
+#: ../panels/privacy/cc-privacy-panel.c:491 ../panels/privacy/privacy.ui.h:32
+msgid "_Empty Trash"
+msgstr "_خالی کردن زباله‌دان"
+
+#: ../panels/privacy/cc-privacy-panel.c:514
+#| msgid "Purge Trash & Temporary Files"
+msgid "Delete all the temporary files?"
+msgstr "حذف تمام پرونده‌های موقت؟"
+
+#: ../panels/privacy/cc-privacy-panel.c:515
+msgid "All the temporary files will be permanently deleted."
+msgstr "تمام پرونده‌های موقت برای همیشه حذف خواهند شد."
+
+#: ../panels/privacy/cc-privacy-panel.c:516 ../panels/privacy/privacy.ui.h:33
+msgid "_Purge Temporary Files"
+msgstr "_پاکسازی پرونده‌های موقت"
+
+#: ../panels/privacy/cc-privacy-panel.c:538 ../panels/privacy/privacy.ui.h:31
 msgid "Purge Trash & Temporary Files"
 msgstr "پاکسازی زباله‌دان و پرونده‌های موقت"
 
@@ -4611,67 +4745,51 @@ msgstr "خاموش شدن صفحه‌نمایش"
 msgid "30 seconds"
 msgstr "۳۰ ثانیه"
 
-#: ../panels/privacy/privacy.ui.h:11
-msgid "Control how you appear on the screen and the network."
-msgstr "نحوه‌ی نمایش خود را در شبکه و نمایشگر کنترل کنید."
-
-#: ../panels/privacy/privacy.ui.h:12
-msgid "Display _full name in top bar"
-msgstr "نمایش _نام کامل، در نوار بالا"
-
-#: ../panels/privacy/privacy.ui.h:13
-msgid "Display full name in _lock screen"
-msgstr "نمایش نام کامل در صفحه‌ی _قفل"
-
-#: ../panels/privacy/privacy.ui.h:14
-msgid "_Stealth Mode"
-msgstr "حالت _مخفی"
-
-#: ../panels/privacy/privacy.ui.h:15
+#: ../panels/privacy/privacy.ui.h:9
 msgid "Immediately"
 msgstr "فورا"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: ../panels/privacy/privacy.ui.h:10
 msgid "1 day"
 msgstr "۱ روز"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: ../panels/privacy/privacy.ui.h:11
 msgid "2 days"
 msgstr "۲ روز"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: ../panels/privacy/privacy.ui.h:12
 msgid "3 days"
 msgstr "۳ روز"
 
-#: ../panels/privacy/privacy.ui.h:19
+#: ../panels/privacy/privacy.ui.h:13
 msgid "4 days"
 msgstr "۴ روز"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: ../panels/privacy/privacy.ui.h:14
 msgid "5 days"
 msgstr "۵ روز"
 
-#: ../panels/privacy/privacy.ui.h:21
+#: ../panels/privacy/privacy.ui.h:15
 msgid "6 days"
 msgstr "۶ روز"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: ../panels/privacy/privacy.ui.h:16
 msgid "7 days"
 msgstr "۷ روز"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: ../panels/privacy/privacy.ui.h:17
 msgid "14 days"
 msgstr "۱۴ روز"
 
-#: ../panels/privacy/privacy.ui.h:24
+#: ../panels/privacy/privacy.ui.h:18
 msgid "30 days"
 msgstr "۳۰ روز"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: ../panels/privacy/privacy.ui.h:19
 msgid "Forever"
 msgstr "همیشه"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/privacy.ui.h:21
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4679,43 +4797,36 @@ msgstr ""
 "به‌خاطر سپردن تاریخچه، پیدا کردن چیزها در آینده را راحت‌تر می‌کند. این مواد "
 "هیچ‌وقت در شبکه به‌اشتراک گذاشته نمی‌شوند."
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:22
 msgid "Cl_ear Recent History"
 msgstr "_پاک کردن تاریخچه اخیر"
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:24
 msgid "_Recently Used"
 msgstr "_به‌تازگی استفاده شده"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:25
 msgid "Retain _History"
 msgstr "نگه‌داشتن _تاریخچه"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/privacy.ui.h:27
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "صفحه‌قفل از حریم‌خصوصی شما زمانی که پشت سیستم نیستید محافظت می‌کند."
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Automatic Screen _Lock"
 msgstr "_صفحه‌قفل خودکار"
 
-#: ../panels/privacy/privacy.ui.h:34
-msgid "Lock Screen _After Blank For"
+#: ../panels/privacy/privacy.ui.h:29
+#| msgid "Lock Screen _After Blank For"
+msgid "Lock screen _after blank for"
 msgstr "قفل‌کردن صفحه‌نمایش _پس از خالی بودن برای"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Show _Notifications"
 msgstr "نمایش _اعلان‌ها"
 
-#: ../panels/privacy/privacy.ui.h:37
-msgid "_Empty Trash"
-msgstr "_خالی کردن زباله‌دان"
-
-#: ../panels/privacy/privacy.ui.h:38
-msgid "_Purge Temporary Files"
-msgstr "_پاکسازی پرونده‌های موقت"
-
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:34
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -4723,29 +4834,31 @@ msgstr ""
 "به‌طور خودکار زباله‌دان و پرونده‌های موقت پاک‌سازی شوند تا رایانه خود را از "
 "اطلاعات حساس غیرضروری پاک نگاه دارید."
 
-#: ../panels/privacy/privacy.ui.h:40
-msgid "Automatically Empty _Trash"
+#: ../panels/privacy/privacy.ui.h:35
+#| msgid "Automatically Empty _Trash"
+msgid "Automatically empty _Trash"
 msgstr "خالی‌کردن خودکار _زباله‌دان"
 
-#: ../panels/privacy/privacy.ui.h:41
-msgid "Automatically Purge Temporary _Files"
+#: ../panels/privacy/privacy.ui.h:36
+#| msgid "Automatically Purge Temporary _Files"
+msgid "Automatically purge Temporary _Files"
 msgstr "پاکسازی خودکار _پرونده‌های موقت"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:37
 msgid "Purge _After"
 msgstr "پاکسازی _بعدی"
 
-#: ../panels/region/cc-format-chooser.c:122
+#: ../panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "امپریال"
 
-#: ../panels/region/cc-format-chooser.c:124
+#: ../panels/region/cc-format-chooser.c:122
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "متریک"
 
-#: ../panels/region/cc-format-chooser.c:283
+#: ../panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "هیچ منطقه‌ای پیدا نشد"
 
@@ -4753,6 +4866,12 @@ msgstr "هیچ منطقه‌ای پیدا نشد"
 msgid "No input sources found"
 msgstr "هیچ منبع ورودی پیدا نشد"
 
+#: ../panels/region/cc-input-chooser.c:1070
+#| msgid "Other"
+msgctxt "Input Source"
+msgid "Other"
+msgstr "موارد دیگر"
+
 #: ../panels/region/cc-region-panel.c:239
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "لازم است نشست شما مجددا راه‌اندازی شود تا تغییرات اعمال شوند"
@@ -4761,24 +4880,24 @@ msgstr "لازم است نشست شما مجددا راه‌اندازی شود
 msgid "Restart Now"
 msgstr "اکنون راه‌اندازی مجدد کن"
 
-#: ../panels/region/cc-region-panel.c:550
+#: ../panels/region/cc-region-panel.c:569
 msgctxt "Language"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/region/cc-region-panel.c:1040
+#: ../panels/region/cc-region-panel.c:853
+msgid "No input source selected"
+msgstr "هیچ منبع ورودی‌ای انتخاب نشد"
+
+#: ../panels/region/cc-region-panel.c:1084
 msgid "Sorry"
 msgstr "شرمنده"
 
-#: ../panels/region/cc-region-panel.c:1042
+#: ../panels/region/cc-region-panel.c:1086
 msgid "Input methods can't be used on the login screen"
 msgstr "روش‌های ورودی را نمی‌توان در صفحه‌ی ورود به سیستم استفاده کرد"
 
-#: ../panels/region/cc-region-panel.c:1491
-msgid "No input source selected"
-msgstr "هیچ منبع ورودی‌ای انتخاب نشد"
-
-#: ../panels/region/cc-region-panel.c:1652
+#: ../panels/region/cc-region-panel.c:1716
 msgid "Login Screen"
 msgstr "صفحه ورود به سیستم"
 
@@ -4868,6 +4987,10 @@ msgstr "شما می‌توانید این میانبرها را در تنظیم
 msgid "Alternative switch to next source"
 msgstr "کلید جایگزین جهت رفتن به منبع بعدی"
 
+#: ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "چپ+دگرساز راست"
+
 #: ../panels/region/region.ui.h:2
 msgid "English (United Kingdom)"
 msgstr "انگلیسی (انگلستان)"
@@ -4884,23 +5007,38 @@ msgstr "گزینه‌ها"
 msgid "Login settings are used by all users when logging into the system"
 msgstr "تنظیمات ورود به سیستم توسط تمام کاربران هنگام ورود استفاده می‌شود"
 
-#: ../panels/search/cc-search-locations-dialog.c:276
+#: ../panels/search/cc-search-locations-dialog.c:275
 msgid "Home"
 msgstr "منزل"
 
-#: ../panels/search/cc-search-locations-dialog.c:476
+#: ../panels/search/cc-search-locations-dialog.c:477
+#| msgid "Places"
+msgctxt "Search Location"
 msgid "Places"
 msgstr "محل‌ها"
 
-#: ../panels/search/cc-search-locations-dialog.c:478
+#: ../panels/search/cc-search-locations-dialog.c:479
+#| msgid "Bookmarks"
+msgctxt "Search Location"
 msgid "Bookmarks"
 msgstr "نشانک‌ها"
 
-#: ../panels/search/cc-search-locations-dialog.c:676
+#: ../panels/search/cc-search-locations-dialog.c:481
+#| msgid "Other"
+msgctxt "Search Location"
+msgid "Other"
+msgstr "موارد دیگر"
+
+#: ../panels/search/cc-search-locations-dialog.c:679
 msgid "Select Location"
 msgstr "انتخاب مکان"
 
-#: ../panels/search/cc-search-panel.c:193
+#: ../panels/search/cc-search-locations-dialog.c:683
+#| msgid "GOK"
+msgid "_OK"
+msgstr "_تایید"
+
+#: ../panels/search/cc-search-panel.c:177
 msgid "No applications found"
 msgstr "هیچ برنامه‌ای پیدا نشد"
 
@@ -4938,21 +5076,21 @@ msgstr "جابه‌جایی به پایین"
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../panels/sharing/cc-sharing-panel.c:259
+#: ../panels/sharing/cc-sharing-panel.c:274
 msgctxt "service is enabled"
 msgid "On"
 msgstr "روشن"
 
-#: ../panels/sharing/cc-sharing-panel.c:261
+#: ../panels/sharing/cc-sharing-panel.c:276
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "خاموش"
 
-#: ../panels/sharing/cc-sharing-panel.c:407
+#: ../panels/sharing/cc-sharing-panel.c:418
 msgid "Choose a Folder"
 msgstr "انتخاب یک پوشه"
 
-#: ../panels/sharing/cc-sharing-panel.c:585
+#: ../panels/sharing/cc-sharing-panel.c:702
 msgid "Copy"
 msgstr "رونوشت"
 
@@ -5014,42 +5152,50 @@ msgid "Computer Name"
 msgstr "نام رایانه"
 
 #: ../panels/sharing/sharing.ui.h:8
-msgid "Some services are disabled because of no network access."
-msgstr "تعدادی از سرویس‌ها به‌دلیل در دسترس نبودن شبکه، غیرفعال شده‌اند."
+msgid "Personal File Sharing"
+msgstr "به‌اشتراک‌گذاری پرونده شخصی"
 
 #: ../panels/sharing/sharing.ui.h:9
+msgid "Screen Sharing"
+msgstr "اشتراک‌گذاری صفحه‌نمایش"
+
+#: ../panels/sharing/sharing.ui.h:10
 msgid "Media Sharing"
 msgstr "اشتراک‌گذاری رسانه"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Remote Login"
+msgstr "ورود به سیستم دوردست"
+
+#: ../panels/sharing/sharing.ui.h:12
+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:11
+#: ../panels/sharing/sharing.ui.h:14
 msgid "Share Media On This Network"
 msgstr "به‌اشتراک‌گذاری رسانه در این شبکه"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: ../panels/sharing/sharing.ui.h:15
 msgid "Shared Folders"
 msgstr "پوشه‌های به‌اشتراک گذاشته شده"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: ../panels/sharing/sharing.ui.h:16
 msgid "column"
 msgstr "ستون"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: ../panels/sharing/sharing.ui.h:17
 msgid "Add Folder"
 msgstr "اضافه‌کردن پوشه"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: ../panels/sharing/sharing.ui.h:18
 msgid "Remove Folder"
 msgstr "حذف پوشه"
 
-#: ../panels/sharing/sharing.ui.h:16
-msgid "Personal File Sharing"
-msgstr "به‌اشتراک‌گذاری پرونده شخصی"
-
-#: ../panels/sharing/sharing.ui.h:18
+#: ../panels/sharing/sharing.ui.h:20
 #, no-c-format
 msgid ""
 "Personal File Sharing allows you to share your Public folder with others on "
@@ -5059,19 +5205,15 @@ msgstr ""
 "در شبکه فعلی خود با استفاده از <a href=\"dav://%s\">dav://%s</a> به‌اشتراک "
 "بگذارید"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: ../panels/sharing/sharing.ui.h:21
 msgid "Share Public Folder On This Network"
 msgstr "به‌اشتراک‌گذاری پوشه عمومی در این شبکه"
 
-#: ../panels/sharing/sharing.ui.h:20
+#: ../panels/sharing/sharing.ui.h:22
 msgid "Require Password"
 msgstr "گذرواژه لازم است"
 
-#: ../panels/sharing/sharing.ui.h:22
-msgid "Remote Login"
-msgstr "ورود به سیستم دوردست"
-
-#: ../panels/sharing/sharing.ui.h:24
+#: ../panels/sharing/sharing.ui.h:25
 #, no-c-format
 msgid ""
 "Allow remote users to connect using the Secure Shell command:\n"
@@ -5080,10 +5222,6 @@ msgstr ""
 "به کاربران دوردست اجازه بده تا با استفاده از فرمان پوسته‌ی امن متصل شوند:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/sharing.ui.h:26
-msgid "Screen Sharing"
-msgstr "اشتراک‌گذاری صفحه‌نمایش"
-
 #: ../panels/sharing/sharing.ui.h:28
 #, no-c-format
 msgid ""
@@ -5198,8 +5336,8 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "تضعیف شد"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:526
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261
+#: ../panels/sound/gvc-mixer-dialog.c:527
 msgid "_Profile:"
 msgstr "_مجموعه تنظیمات:"
 
@@ -5225,73 +5363,73 @@ msgstr[1] "%Iu ورودی"
 msgid "System Sounds"
 msgstr "صداهای سیستم"
 
-#: ../panels/sound/gvc-mixer-dialog.c:262
+#: ../panels/sound/gvc-mixer-dialog.c:263
 msgid "_Test Speakers"
 msgstr "آزمایش _بلندگوها"
 
-#: ../panels/sound/gvc-mixer-dialog.c:431
+#: ../panels/sound/gvc-mixer-dialog.c:432
 msgid "Peak detect"
 msgstr "یافتن اوج"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1508
+#: ../panels/sound/gvc-mixer-dialog.c:1510
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "نام"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1527
+#: ../panels/sound/gvc-mixer-dialog.c:1529
 msgid "Device"
 msgstr "دستگاه"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1590
+#: ../panels/sound/gvc-mixer-dialog.c:1592
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "آزمایش بلندگو برای %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1644
+#: ../panels/sound/gvc-mixer-dialog.c:1649
 msgid "_Output volume:"
 msgstr "بلندی صدا _خروجی:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1658
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "Output"
 msgstr "خروجی"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1663
+#: ../panels/sound/gvc-mixer-dialog.c:1668
 msgid "C_hoose a device for sound output:"
 msgstr "یک _دستگاه را برای خروجی صدا انتخاب کنید:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1688
+#: ../panels/sound/gvc-mixer-dialog.c:1693
 msgid "Settings for the selected device:"
 msgstr "تنظیمات برای دستگاه انتخاب شده:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1699
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "Input"
 msgstr "ورودی"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1706
+#: ../panels/sound/gvc-mixer-dialog.c:1711
 msgid "_Input volume:"
 msgstr "بلتدی صدای _ورودی:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1729
+#: ../panels/sound/gvc-mixer-dialog.c:1734
 msgid "Input level:"
 msgstr "سطح ورودی:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1757
+#: ../panels/sound/gvc-mixer-dialog.c:1762
 msgid "C_hoose a device for sound input:"
 msgstr "یک _دستگاه را برای ورودی صدا انتخاب کنید:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1784
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "Sound Effects"
 msgstr "جلوه‌های صوتی"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1791
+#: ../panels/sound/gvc-mixer-dialog.c:1796
 msgid "_Alert volume:"
 msgstr "بلندی صدای _هشدار:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1804
+#: ../panels/sound/gvc-mixer-dialog.c:1809
 msgid "Applications"
 msgstr "برنامه‌ها"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-mixer-dialog.c:1813
 msgid "No application is currently playing or recording audio."
 msgstr "هیچ برنامه‌ای در حال حاضر در حال پخش یا ضبط صدا نیست."
 
@@ -5340,11 +5478,6 @@ msgstr "ساب ووفر"
 msgid "Custom"
 msgstr "سفارشی"
 
-#: ../panels/universal-access/cc-ua-panel.c:281
-#: ../panels/universal-access/cc-ua-panel.c:287
-msgid "No shortcut set"
-msgstr "هیچ میان‌بری تنظیم نشده"
-
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
 msgid "Make it easier to see, hear, type, point and click"
 msgstr "نگاه کردن، شنیدن، تایپ کردن، نشانه رفتن و کلیک کردن را ساده‌تر کنید"
@@ -5359,304 +5492,297 @@ msgstr ""
 "AccessX;کلیدهای چسبان;کلیدهای آرام;کلیدهای پرشی;کلیدهای موشی;"
 
 #: ../panels/universal-access/uap.ui.h:1
-#: ../panels/universal-access/zoom-options.ui.h:35
-msgctxt "universal access, contrast"
-msgid "Low"
-msgstr "کم"
+#| msgid "Show Universal Access status"
+msgid "_Always Show Universal Access Menu"
+msgstr "نمایش _همیشگی وضعیت دسترسی فراگیر"
 
 #: ../panels/universal-access/uap.ui.h:2
-msgctxt "universal access, contrast"
-msgid "Normal"
-msgstr "عادی"
+msgid "Seeing"
+msgstr "دیداری"
 
 #: ../panels/universal-access/uap.ui.h:3
-#: ../panels/universal-access/zoom-options.ui.h:36
-msgctxt "universal access, contrast"
-msgid "High"
-msgstr "زیاد"
+#| msgid "High Contrast"
+msgid "_High Contrast"
+msgstr "سایه روشن _بالا"
 
 #: ../panels/universal-access/uap.ui.h:4
-msgctxt "universal access, contrast"
-msgid "High/Inverse"
-msgstr "بلند/معکوس"
+#| msgid "Large Text"
+msgid "_Large Text"
+msgstr "متن _بزرگ"
 
 #: ../panels/universal-access/uap.ui.h:5
-msgid "On screen keyboard"
-msgstr "صفحه‌کلید مجازی"
-
-#: ../panels/universal-access/uap.ui.h:6
-msgid "GOK"
-msgstr "GOK"
+#| msgid "Zoom"
+msgid "_Zoom"
+msgstr "_بزرگ‌نمایی"
 
 #: ../panels/universal-access/uap.ui.h:7
-msgid "OnBoard"
-msgstr "OnBoard"
+#| msgid "Screen Reader"
+msgid "Screen _Reader"
+msgstr "_صفحه‌نمایش‌خوان"
+
+#: ../panels/universal-access/uap.ui.h:8
+#| msgid "_Sounds:"
+msgid "_Sound Keys"
+msgstr "کلیدهای _صوتی"
+
+#: ../panels/universal-access/uap.ui.h:9
+msgid "Hearing"
+msgstr "شنوایی"
 
 #: ../panels/universal-access/uap.ui.h:10
-#, no-c-format
-msgid "75%"
-msgstr "۷۵٪"
+#| msgid "Visual Alerts"
+msgid "_Visual Alerts"
+msgstr "خطاهای _دیداری"
 
-#: ../panels/universal-access/uap.ui.h:11
-msgctxt "universal access, text size"
-msgid "Small"
-msgstr "کوچک"
+#: ../panels/universal-access/uap.ui.h:12
+#| msgid "Screen keyboard"
+msgid "Screen _Keyboard"
+msgstr "_صفحه‌کلید مجازی"
 
 #: ../panels/universal-access/uap.ui.h:13
-#, no-c-format
-msgid "100%"
-msgstr "۱۰۰٪"
+#| msgid "Typing Assistant"
+msgid "_Typing Assist (AccessX)"
+msgstr "همکار _تایپ (AccessX)"
 
 #: ../panels/universal-access/uap.ui.h:14
-msgctxt "universal access, text size"
-msgid "Normal"
-msgstr "عادی"
+msgid "Pointing and Clicking"
+msgstr "نشانه و کلیک"
+
+#: ../panels/universal-access/uap.ui.h:15
+#| msgid "Mouse Keys"
+msgid "_Mouse Keys"
+msgstr "کلید‌های _موشی"
 
 #: ../panels/universal-access/uap.ui.h:16
-#, no-c-format
-msgid "125%"
-msgstr "۱۲۵٪"
+msgid "_Click Assist"
+msgstr "_همکار کلیک"
 
 #: ../panels/universal-access/uap.ui.h:17
-msgctxt "universal access, text size"
-msgid "Large"
-msgstr "بزرگ"
+msgid "Screen Reader"
+msgstr "صفحه‌نمایش‌خوان"
+
+#: ../panels/universal-access/uap.ui.h:18
+msgid "The screen reader reads displayed text as you move the focus."
+msgstr "صفحه‌نمایش خوان همینطور که شما تمرکز را تغییر می‌دهید، متن‌ها را می‌خواند."
 
 #: ../panels/universal-access/uap.ui.h:19
-#, no-c-format
-msgid "150%"
-msgstr "۱۵۰٪"
+#| msgid "Screen Reader"
+msgid "_Screen Reader"
+msgstr "_صفحه‌نمایش‌خوان"
 
 #: ../panels/universal-access/uap.ui.h:20
-msgctxt "universal access, text size"
-msgid "Larger"
-msgstr "بزرگ‌تر"
+#| msgid "Bounce Keys"
+msgid "Sound Keys"
+msgstr "کلید‌های صوتی"
 
 #: ../panels/universal-access/uap.ui.h:21
-msgid "High Contrast"
-msgstr "سایه روشن بالا"
+msgid "Beep when Num Lock or Caps Lock are turned on."
+msgstr "هنگامی که قفل اعداد و قفل تبدیل روشن است، بوق بزن."
 
 #: ../panels/universal-access/uap.ui.h:22
-msgid "Beep on Caps and Num Lock"
-msgstr "هنگام استفاده از قفل تبدیل و قفل اعداد بوق زده شود"
+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 "Screen Reader"
-msgstr "صفحه‌نمایش‌خوان"
+msgid "_Test flash"
+msgstr "آزمایشِ _خاموش روشن"
 
 #: ../panels/universal-access/uap.ui.h:25
-msgid "Turn on or off:"
-msgstr "خاموش یا روشن کردن:"
+#| msgid "Flash the window title"
+msgid "Flash the _window title"
+msgstr "چشمک زدن عنوان _پنجره"
 
 #: ../panels/universal-access/uap.ui.h:26
-msgctxt "universal access, zoom"
-msgid "Zoom"
-msgstr "بزرگ‌نمایی"
+#| msgid "Flash the entire screen"
+msgid "Flash the entire _screen"
+msgstr "خاموش و روشن کردن _صفحه‌نمایش برای یک لحظه"
 
 #: ../panels/universal-access/uap.ui.h:27
-msgid "Zoom in:"
-msgstr "بزرگ‌نمایی:"
+#| msgid "Typing Assistant"
+msgid "Typing Assist"
+msgstr "همکار تایپ"
 
 #: ../panels/universal-access/uap.ui.h:28
-msgid "Zoom out:"
-msgstr "کوچک‌نمایی:"
+#| msgid "Sticky Keys"
+msgid "_Sticky Keys"
+msgstr "کلیدهای _چسبان"
 
 #: ../panels/universal-access/uap.ui.h:29
-msgid "Large Text"
-msgstr "متن بزرگ"
-
-#: ../panels/universal-access/uap.ui.h:30
-msgid "Seeing"
-msgstr "دیداری"
-
-#: ../panels/universal-access/uap.ui.h:31
-msgid "Visual Alerts"
-msgstr "خطاهای دیداری"
-
-#: ../panels/universal-access/uap.ui.h:32
-msgid "Use a visual indication when an alert sound occurs"
-msgstr "نمایش یک نشانه‌ی تصویری، هنگامی که یک هشدار صوتی رخ می‌دهد"
-
-#: ../panels/universal-access/uap.ui.h:33
-msgid "Flash the window title"
-msgstr "چشمک زدن عنوان پنجره"
-
-#: ../panels/universal-access/uap.ui.h:34
-msgid "Flash the entire screen"
-msgstr "خاموش و روشن کردن صفحه‌نمایش برای یک لحظه"
-
-#: ../panels/universal-access/uap.ui.h:35
-msgid "Closed Captioning"
-msgstr "عنوان‌بندی‌های بسته شده"
-
-#: ../panels/universal-access/uap.ui.h:36
-msgid "Display a textual description of speech and sounds"
-msgstr "نمایش یک توضیح متنی از گفتارها و صداها"
-
-#: ../panels/universal-access/uap.ui.h:37
-msgid "_Test flash"
-msgstr "آزمایشِ _خاموش روشن"
-
-#: ../panels/universal-access/uap.ui.h:39
-msgid "Hearing"
-msgstr "شنوایی"
-
-#: ../panels/universal-access/uap.ui.h:40
-msgid "On Screen Keyboard"
-msgstr "صفحه‌کلید مجازی"
-
-#: ../panels/universal-access/uap.ui.h:41
-msgid "Sticky Keys"
-msgstr "کلیدهای چسبان"
-
-#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "تلقی کردن رشته‌ای از کلیدهای تغییردهنده به عنوان یک کلید ترکیبی"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:30
 msgid "_Disable if two keys are pressed together"
 msgstr "_از کار افتادن در صورت فشردن همزمان دو کلید با هم"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Beep when a _modifer key is pressed"
 msgstr "هنگام فشرده شدن کلید _تغییر‌دهنده بوق زده شود"
 
-#: ../panels/universal-access/uap.ui.h:45
-msgid "Slow Keys"
-msgstr "کلیدهای آهسته"
+#: ../panels/universal-access/uap.ui.h:32
+#| msgid "Slow Keys"
+msgid "S_low Keys"
+msgstr "کلیدهای آ_هسته"
 
-#: ../panels/universal-access/uap.ui.h:46
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "یک وقفه بین زمان فشردن کلید تا زمان پذیرفتن آن قرار می‌دهد"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:34
 msgid "A_cceptance delay:"
 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:48
-msgctxt "universal access, delay"
+#: ../panels/universal-access/uap.ui.h:35
+#| msgctxt "keyboard, delay"
+#| msgid "Short"
+msgctxt "slow keys delay"
 msgid "Short"
 msgstr "کوتاه"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Slow keys typing delay"
 msgstr "وقفه تایپ کلیدهای آرام"
 
-#: ../panels/universal-access/uap.ui.h:50
-msgctxt "universal access, delay"
+#: ../panels/universal-access/uap.ui.h:37
+#| msgctxt "keyboard, delay"
+#| msgid "Long"
+msgctxt "slow keys delay"
 msgid "Long"
 msgstr "بلند"
 
-#. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:52
-msgid "Beep when a key is"
-msgstr "بوق زدن هنگامی که یک کلید"
-
-#. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:54
-msgid "pressed"
-msgstr "فشار داده شد"
+#: ../panels/universal-access/uap.ui.h:38
+msgid "Beep when a key is pr_essed"
+msgstr "هنگام _فشرده شدن یک کلید بوق بزن"
 
-#. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:56
-msgid "accepted"
-msgstr "پذیرفته شد"
+#: ../panels/universal-access/uap.ui.h:39
+#| msgid "Beep when key is _accepted"
+msgid "Beep when a key is _accepted"
+msgstr "هنگام _پذیرفتن کلید، بوق بزن"
 
-#. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:58
-msgid "rejected"
-msgstr "رد شد"
+#: ../panels/universal-access/uap.ui.h:40
+msgid "Beep when a key is _rejected"
+msgstr "هنگام _نپذیرفتن یک کلید بوق بزن"
 
-#: ../panels/universal-access/uap.ui.h:59
-msgid "Bounce Keys"
-msgstr "کلید‌های پرشی"
+#: ../panels/universal-access/uap.ui.h:41
+#| msgid "Bounce Keys"
+msgid "_Bounce Keys"
+msgstr "کلید‌های _پرشی"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Ignores fast duplicate keypresses"
 msgstr "نادیده گرفتن دوبار فشرده شدن یک کلید، در زمان کوتاه"
 
-#: ../panels/universal-access/uap.ui.h:61
-msgid "Acc_eptance delay:"
-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 "کوتاه"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Bounce keys typing delay"
 msgstr "وقفه بین کلیدها جهشی"
 
-#: ../panels/universal-access/uap.ui.h:63
-msgid "Beep when a key is _rejected"
-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:64
-msgid "Enable by Keyboard"
-msgstr "فعال‌سازی توسط صفحه‌کلید"
+#: ../panels/universal-access/uap.ui.h:46
+#| msgid "Enable by Keyboard"
+msgid "_Enable by Keyboard"
+msgstr "_فعال‌سازی توسط صفحه‌کلید"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:47
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "روشن و خاموش کردن امکانات دسترسی‌پذیری از طریق صفحه‌کلید"
 
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Mouse Keys"
-msgstr "کلید‌های موشی"
-
-#: ../panels/universal-access/uap.ui.h:68
-msgid "Control the pointer using the keypad"
-msgstr "کنترل اشاره‌گر از طریق صفحه‌ی شماره‌ها"
-
-#: ../panels/universal-access/uap.ui.h:69
-msgid "Video Mouse"
-msgstr "موشی تصویری"
-
-#: ../panels/universal-access/uap.ui.h:70
-msgid "Control the pointer using the video camera."
-msgstr "کنترل اشاره‌گر از طریق دوربین ویدئویی."
+#: ../panels/universal-access/uap.ui.h:48
+msgid "Click Assist"
+msgstr "همکار کلیک"
 
-#: ../panels/universal-access/uap.ui.h:71
-msgid "Simulated Secondary Click"
-msgstr "کلیک دومین شبیه‌سازی شده"
+#: ../panels/universal-access/uap.ui.h:49
+#| msgid "Simulated Secondary Click"
+msgid "_Simulated Secondary Click"
+msgstr "کلیک دومین _شبیه‌سازی شده"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "راه‌انداختن کلیک دوم با نگاه داشتن کلید اصلی"
 
-#: ../panels/universal-access/uap.ui.h:73
+# ../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 "کوتاه"
+
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Secondary click delay"
 msgstr "وقفه کلیک دوم"
 
-#: ../panels/universal-access/uap.ui.h:74
-msgid "Hover Click"
-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 "کلیک _شناور"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:55
 msgid "Trigger a click when the pointer hovers"
 msgstr "راه‌انداختن یک کلیک در زمان شناور شدن نشانگر"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:56
 msgid "D_elay:"
 msgstr "تأ_خیر:"
 
-#: ../panels/universal-access/uap.ui.h:77
+# ../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 "بلند"
+
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Motion _threshold:"
 msgstr "آ_ستانه‌ی حرکت:"
 
-#: ../panels/universal-access/uap.ui.h:78
-msgctxt "universal access, threshold"
+#: ../panels/universal-access/uap.ui.h:60
+#| msgctxt "universal access, text size"
+#| msgid "Small"
+msgctxt "dwell click threshold"
 msgid "Small"
-msgstr "کوتاه"
+msgstr "کوچک"
 
-#: ../panels/universal-access/uap.ui.h:79
-msgctxt "universal access, threshold"
+#: ../panels/universal-access/uap.ui.h:61
+#| msgctxt "universal access, text size"
+#| msgid "Large"
+msgctxt "dwell click threshold"
 msgid "Large"
-msgstr "بلند"
-
-#: ../panels/universal-access/uap.ui.h:80
-msgid "Mouse Settings"
-msgstr "تنظیمات موشی"
-
-#: ../panels/universal-access/uap.ui.h:81
-msgid "Pointing and Clicking"
-msgstr "نشانه و کلیک"
+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
@@ -5821,6 +5947,16 @@ msgctxt "universal access, brightness"
 msgid "High"
 msgstr "زیاد"
 
+#: ../panels/universal-access/zoom-options.ui.h:35
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "کم"
+
+#: ../panels/universal-access/zoom-options.ui.h:36
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "زیاد"
+
 #: ../panels/universal-access/zoom-options.ui.h:37
 msgid "Color Effects:"
 msgstr "جلوه‌های رنگی:"
@@ -5843,48 +5979,61 @@ msgctxt "Account type"
 msgid "Administrator"
 msgstr "مدیر"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
-msgid "Add account"
-msgstr "اضافه کردن حساب"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "_Local Account"
-msgstr "حساب _محلی"
+#| msgid "_Full name"
+msgid "_Full Name"
+msgstr "_نام کامل"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-msgid "_Enterprise Login"
-msgstr "ورود به سیستم _تجاری"
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+msgid "Account _Type"
+msgstr "_نوع حساب"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "_Full name"
-msgstr "_نام و نام‌خانوادگی"
+#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#| msgid "Choose password at next login"
+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/user-accounts-dialog.ui.h:6
-msgid "Account _Type"
-msgstr "_نوع حساب"
-
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
-msgid "_Domain"
-msgstr "_دامنه"
+#: ../panels/user-accounts/data/password-dialog.ui.h:5
+msgid "Set a password now"
+msgstr "هم‌اکنون یک گذرواژه تنظیم کنید"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:10
-msgid "_Login Name"
-msgstr "نام _ورود به سیستم"
+msgid "_Verify"
+msgstr "_تایید"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+msgid ""
+"Enterprise login allows an existing centrally managed user account to be "
+"used on this device."
+msgstr ""
+"ورود به سیستم تجاری اجازه می‌دهد تا یک حساب کاربری مدیریت شده‌ی متمرکز در این "
+"دستگاه استفاده شود."
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
-msgid "Tip: Enterprise domain or realm name"
-msgstr "نکته: نام دامنه یا محدوده تجاری"
+msgid "_Domain"
+msgstr "_دامنه"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:13
-msgid "C_ontinue"
-msgstr "_ادامه"
+msgid ""
+"Go online to add\n"
+"enterprise login accounts."
+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:16
+msgid "_Enroll"
+msgstr "_ثبت"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: ../panels/user-accounts/data/account-dialog.ui.h:17
 msgid "Domain Administrator Login"
 msgstr "ورود مدیر دامنه"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:15
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -5894,11 +6043,11 @@ msgstr ""
 "در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n"
 "خود را اینجا بنویسند."
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#: ../panels/user-accounts/data/account-dialog.ui.h:21
 msgid "Administrator _Name"
 msgstr "_نام مدیر"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:19
+#: ../panels/user-accounts/data/account-dialog.ui.h:22
 msgid "Administrator Password"
 msgstr "گذرواژه مدیر"
 
@@ -5935,7 +6084,7 @@ msgid "Right little finger"
 msgstr "انگشت کوچک راست"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:700
+#: ../panels/user-accounts/um-fingerprint-dialog.c:699
 msgid "Enable Fingerprint Login"
 msgstr "به‌کارانداختن امکان ورود به سیستم از طریق اثرانگشت"
 
@@ -5976,141 +6125,55 @@ msgstr "نام ورود;نام;اثرانگشت;آواتار;نشان;تصویر
 msgid "Login History"
 msgstr "تاریخچه ورود به سیستم"
 
-#: ../panels/user-accounts/data/history-dialog.ui.h:3
-msgid "Previous Week"
-msgstr "هفته قبل"
-
-#: ../panels/user-accounts/data/history-dialog.ui.h:4
-msgid "Next Week"
-msgstr "هفته بعد"
-
-#: ../panels/user-accounts/data/history-dialog.ui.h:5
-msgid "Next week"
-msgstr "هفته بعد"
-
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
-msgid "Set a password now"
-msgstr "هم‌اکنون یک گذرواژه تنظیم کنید"
+#| msgid "_New password"
+msgid "_Verify New Password"
+msgstr "تایید گذرواژه‌ی _جدید"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
-msgid "Choose password at next login"
-msgstr "انتخاب گذرواژه در زمان ورود بعدی"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
-msgid "Log in without a password"
-msgstr "ورود به سیستم بدون گذرواژه"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
-msgid "Disable this account"
-msgstr "غیرفعال کردن این حساب"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
-msgid "Enable this account"
-msgstr "فعال کردن این حساب"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "C_onfirm password"
-msgstr "_تایید گذرواژه"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid "_New password"
+#| msgid "_New password"
+msgid "_New Password"
 msgstr "گذرواژه‌ی _جدید"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
-msgid "Generate a password"
-msgstr "تولید یک گذرواژه"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
-msgid "Current _password"
+#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#| msgid "Current _password"
+msgid "Current _Password"
 msgstr "گذرواژه‌ی _فعلی"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
-msgid "_Action"
-msgstr "_کنش"
-
 # ../capplets/common/gconf-property-editor.:c:183
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Changing password for"
-msgstr "تغییر گذر واژه برای"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
-msgid "_Show password"
-msgstr "_نمایش گذرواژه"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
-msgid "How to choose a strong password"
-msgstr "چگونه یک گذرواژه‌ی قوی انتخاب کنیم"
-
-# ../capplets/common/gconf-property-editor.:c:183
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:6
 msgid "Ch_ange"
 msgstr "تع_ویض"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:1
-msgid "Changing photo for:"
-msgstr "درحال تغییر عکس برای:"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:2
-msgid ""
-"Choose a picture that will be shown at the login screen for this account."
-msgstr ""
-"عکسی انتخاب کنید تا برای این کاربر، در صفحه نمایش ورود به سیستم نمایش داده "
-"شود."
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:3
-msgid "Gallery"
-msgstr "گالری"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "مرور برای عکس‌های بیشتر"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Take a photograph"
-msgstr "یک عکس بگیرید"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:6
-msgid "Browse"
-msgstr "مرور"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:7
-msgid "Photograph"
-msgstr "عکس‌برداری"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
-msgid "Account Information"
-msgstr "اطلاعات حساب"
-
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Add User Account"
 msgstr "اضافه‌کردن حساب کاربر"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Remove User Account"
 msgstr "حذف حساب کاربر"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Login Options"
 msgstr "گزینه‌های ورود به سیستم"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "A_utomatic Login"
 msgstr "ورود _خودکار"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
 msgid "_Fingerprint Login"
 msgstr "ورود به سیستم از طریق اثر _انگشت"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
 msgid "User Icon"
 msgstr "شمایل کاربر"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "_Language"
 msgstr "_زبان"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Last Login"
 msgstr "آخرین ورود"
 
@@ -6122,40 +6185,142 @@ msgstr "مدیریت حساب‌های کاربر"
 msgid "Authentication is required to change user data"
 msgstr "جهت تغییر اطلاعات کاربر تصدیق‌هویت لازم است"
 
-#: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:597
-msgctxt "Password strength"
-msgid "Too short"
-msgstr "خیلی کوتاه"
+#: ../panels/user-accounts/pw-utils.c:82
+#| msgid "The new password does not contain enough different characters"
+msgctxt "Password hint"
+msgid "The new password needs to be different from the old one."
+msgstr "لازم گذرواژه‌ی جدید با گذرواژه‌ی قبلی تفاوت داشته باشد."
 
-#: ../panels/user-accounts/pw-utils.c:99
-msgctxt "Password strength"
-msgid "Not good enough"
-msgstr "به اندازه کافی خوب نیست"
+#: ../panels/user-accounts/pw-utils.c:84
+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"
+msgctxt "Password hint"
+msgid "Try changing the password a bit more."
+msgstr "سعی کنید گذرواژه را کمی بیشتر تغییر دهید."
+
+#: ../panels/user-accounts/pw-utils.c:88
+msgctxt "Password hint"
+msgid "A password without your user name would be stronger."
+msgstr "یک گذرواژه بدون استفاده از نام کاربری قوی‌تر خواهد بود."
+
+#: ../panels/user-accounts/pw-utils.c:90
+msgctxt "Password hint"
+msgid "Try to avoid using your name in the password."
+msgstr "سعی کنید از استفاده از نام خود در گذرواژه خودداری کنید."
+
+#: ../panels/user-accounts/pw-utils.c:92
+msgctxt "Password hint"
+msgid "Try to avoid some of the words included in the password."
+msgstr "سعی کنید از تعدادی از کلمه‌های موجود در گذرواژه خودداری کنید."
+
+#: ../panels/user-accounts/pw-utils.c:96
+msgctxt "Password hint"
+msgid "Try to avoid common words."
+msgstr "سعی کنید از انتخاب کلمه‌های عمومی خودداری کنید."
+
+#: ../panels/user-accounts/pw-utils.c:98
+msgctxt "Password hint"
+msgid "Try to avoid reordering existing words."
+msgstr "سعی کنید از تغییر چینش کلمه‌های موجود خودداری کنید."
+
+#: ../panels/user-accounts/pw-utils.c:100
+msgctxt "Password hint"
+msgid "Try to use more numbers."
+msgstr "سعی کنید تعداد بیشتری عدد استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:102
+msgctxt "Password hint"
+msgid "Try to use more uppercase letters."
+msgstr "سعی کنید تعداد بیشتری حروف بزرگ استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:104
+msgctxt "Password hint"
+msgid "Try to use more lowercase letters."
+msgstr "سعی کنید تعداد بیشتری حروف کوچک استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:106
+msgctxt "Password hint"
+msgid "Try to use more special characters, like punctuation."
+msgstr "سعی کنید از تعداد بیشتری نویسه خاص، مثل نقطه‌گذاری‌ها استفاده کنید."
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:598
+msgctxt "Password hint"
+msgid "Try to use a mixture of letters, numbers and punctuation."
+msgstr "سعی کنید از تلفیق تعدادی حرف، عدد و نقطه‌گذاری استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:110
+msgctxt "Password hint"
+msgid "Try to avoid repeating the same character."
+msgstr "سعی کنید از تکرار یک نویسه خودداری کنید."
+
+#: ../panels/user-accounts/pw-utils.c:112
+msgctxt "Password hint"
+msgid ""
+"Try to avoid repeating the same type of character: you need to mix up "
+"letters, numbers and punctuation."
+msgstr ""
+"سعی کنید از تکرار یک نوع نویسه خودداری کنید: شما باید تلفیقی از حروف، اعداد "
+"و نقطه‌گذاری‌ها را بکار ببرید."
+
+#: ../panels/user-accounts/pw-utils.c:114
+msgctxt "Password hint"
+msgid "Try to avoid sequences like 1234 or abcd."
+msgstr "سعی کنید از رشته‌های متوالی مثل ۱۲۳۴ یا abcd استفاده نکنید."
+
+#: ../panels/user-accounts/pw-utils.c:116
+msgctxt "Password hint"
+msgid "Try to add more letters, numbers and symbols."
+msgstr "سعی کنید از تعداد بیشتری حروف، اعداد و سمبل استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:118
+msgctxt "Password hint"
+msgid "Mix uppercase and lowercase and use a number or two."
+msgstr "حروف بزرگ و کوچک را ادغام کنید و از یک یا چند عدد هم استفاده کنید."
+
+#: ../panels/user-accounts/pw-utils.c:120
+msgctxt "Password hint"
+msgid ""
+"Good password! Adding more letters, numbers and punctuation will make it "
+"stronger."
+msgstr ""
+"گذرواژه‌ی خوبیست! اضافه کردن حروف بیشتر، اعداد و نقطه‌گذاری‌ها آن را قوی‌تر "
+"می‌کند."
+
+#: ../panels/user-accounts/pw-utils.c:142
+#: ../panels/user-accounts/pw-utils.c:172
 msgctxt "Password strength"
-msgid "Weak"
-msgstr "ضعیف"
+msgid "Strength: Weak"
+msgstr "قدرت: ضعیف "
 
-#: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:599
+#: ../panels/user-accounts/pw-utils.c:146
+#: ../panels/user-accounts/pw-utils.c:173
+#| msgid "Length:"
 msgctxt "Password strength"
-msgid "Fair"
-msgstr "نسبتا خوب"
+msgid "Strength: Low"
+msgstr "قدرت: پایین"
 
-#: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:600
+#: ../panels/user-accounts/pw-utils.c:149
+#: ../panels/user-accounts/pw-utils.c:174
 msgctxt "Password strength"
-msgid "Good"
-msgstr "خوب"
+msgid "Strength: Medium"
+msgstr "قدرت: متوسط"
+
+#: ../panels/user-accounts/pw-utils.c:152
+#: ../panels/user-accounts/pw-utils.c:175
+msgctxt "Password strength"
+msgid "Strength: Good"
+msgstr "قدرت: خوب"
 
-#: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/pw-utils.c:155
+#: ../panels/user-accounts/pw-utils.c:176
 msgctxt "Password strength"
-msgid "Strong"
-msgstr "قوی"
+msgid "Strength: High"
+msgstr "قدرت: بالا"
 
 #: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
@@ -6206,27 +6371,70 @@ msgstr "گذرواژه‌ی جدید به اندازه کافی شامل نوی
 msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
-#: ../panels/user-accounts/um-account-dialog.c:182
+#: ../panels/user-accounts/um-account-dialog.c:35
+msgid "Should match the web address of your account provider."
+msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ حساب شما یکسان باشد."
+
+#: ../panels/user-accounts/um-account-dialog.c:222
 msgid "Failed to add account"
 msgstr "اضافه کردن حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:403
-#: ../panels/user-accounts/um-account-dialog.c:444
+#: ../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"
+msgid "Passwords do not match."
+msgstr "گذرواژه‌ها برابر نیستند."
+
+#: ../panels/user-accounts/um-account-dialog.c:719
+#: ../panels/user-accounts/um-account-dialog.c:765
 msgid "Failed to register account"
 msgstr "ثبت حساب شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:577
+#: ../panels/user-accounts/um-account-dialog.c:903
 msgid "No supported way to authenticate with this domain"
 msgstr "هیچ راه پیشتیبانی شده‌ای برای تصدیق‌هویت با این دامنه وجود ندارد"
 
-#: ../panels/user-accounts/um-account-dialog.c:631
+#: ../panels/user-accounts/um-account-dialog.c:962
 msgid "Failed to join domain"
 msgstr "پیوستن به دامنه شکست خورد"
 
-#: ../panels/user-accounts/um-account-dialog.c:688
+#: ../panels/user-accounts/um-account-dialog.c:1023
+msgid ""
+"That login name didn't work.\n"
+"Please try again."
+msgstr ""
+"نام ورود به سیستم اشتباه بود.\n"
+"لطفا دوباره تلاش کنید."
+
+#: ../panels/user-accounts/um-account-dialog.c:1030
+#| msgid "Invalid password, please try again"
+msgid ""
+"That login password didn't work.\n"
+"Please try again."
+msgstr ""
+"گذواژه‌ی ورود به سیستم اشتباه بود.\n"
+"لطفا دوباره تلاش کنید."
+
+#: ../panels/user-accounts/um-account-dialog.c:1038
 msgid "Failed to log into domain"
 msgstr "ورود به دامنه شکست خورد"
 
+#: ../panels/user-accounts/um-account-dialog.c:1096
+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
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -6253,7 +6461,7 @@ msgstr "اثرانگشت‌های ثبت شده پاک شوند؟"
 msgid "_Delete Fingerprints"
 msgstr "_حذف اثرانگشت‌ها"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:279
+#: ../panels/user-accounts/um-fingerprint-dialog.c:278
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6261,15 +6469,15 @@ msgstr ""
 "آیا مایلید که تمام اثرانگشت‌های ثبت شده را حذف کنید تا در نتیجه امکان ورود به "
 "سیستم از طریق اثرانگشت غیرفعال شود؟"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:455
+#: ../panels/user-accounts/um-fingerprint-dialog.c:454
 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:516
-#: ../panels/user-accounts/um-fingerprint-dialog.c:558
+#: ../panels/user-accounts/um-fingerprint-dialog.c:515
+#: ../panels/user-accounts/um-fingerprint-dialog.c:557
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "نمی‌توان به دستگاه «%s» دسترسی داشت"
@@ -6277,16 +6485,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:599
+#: ../panels/user-accounts/um-fingerprint-dialog.c:598
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "نمی‌توان شروع به انگشت‌نگاری با استفاده از دستگاه «%s» کرد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:650
+#: ../panels/user-accounts/um-fingerprint-dialog.c:649
 msgid "Could not access any fingerprint readers"
 msgstr "نمی‌توان به هیچ دستگاه انگشت‌نگاری متصل شد"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:651
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 msgid "Please contact your system administrator for help."
 msgstr "لطفا جهت دریافت کمک به مدیر سیستم خود مراجعه کنید."
 
@@ -6295,7 +6503,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:734
+#: ../panels/user-accounts/um-fingerprint-dialog.c:733
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6304,11 +6512,11 @@ msgstr ""
 "برای به‌کارانداختن امکان ورود با استفاده از اثرانگشت، شما باید یکی از "
 "اثرانگشت‌های خود را با استفاده از دستگاه «%s» ذخیره کنید."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:741
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 msgid "Selecting finger"
 msgstr "در حال انتخاب انگشت"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:742
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Enrolling fingerprints"
 msgstr "در حال ثبت اثر انگشت‌ها"
 
@@ -6320,54 +6528,78 @@ msgstr "این هفته"
 msgid "Last Week"
 msgstr "هفته پیش"
 
-#: ../panels/user-accounts/um-password-dialog.c:128
-msgid "_Generate a password"
-msgstr "_تولید یک گذرواژه"
+#. Translators: This is a date format string in the style of "Feb 18",
+#. 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"
+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"
+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
+#, c-format
+msgctxt "login history week label"
+msgid "%s - %s"
+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
+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
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s، %s"
+
+#: ../panels/user-accounts/um-history-dialog.c:267
+msgid "Session Ended"
+msgstr "نشست پایان یافت"
+
+#: ../panels/user-accounts/um-history-dialog.c:273
+msgid "Session Started"
+msgstr "نشست آغاز شد"
 
-#: ../panels/user-accounts/um-password-dialog.c:181
+#: ../panels/user-accounts/um-password-dialog.c:146
 msgid "Please choose another password."
 msgstr "لطفاً گذرواژه‌ی دیگری انتخاب کنید."
 
-#: ../panels/user-accounts/um-password-dialog.c:190
+#: ../panels/user-accounts/um-password-dialog.c:155
 msgid "Please type your current password again."
 msgstr "لطفاً گذرواژه‌ی فعلی خود را دوباره وارد کنید."
 
-#: ../panels/user-accounts/um-password-dialog.c:196
+#: ../panels/user-accounts/um-password-dialog.c:161
 msgid "Password could not be changed"
 msgstr "گذرواژه قابل تغییر نبود"
 
-#: ../panels/user-accounts/um-password-dialog.c:301
-msgid "You need to enter a new password"
-msgstr "شما باید گذرواژه‌ی جدیدی وارد کنید"
-
-#: ../panels/user-accounts/um-password-dialog.c:304
-msgid "The new password is not strong enough"
-msgstr "گذرواژه جدید به اندازه کافی قوی نیست"
-
-#: ../panels/user-accounts/um-password-dialog.c:310
-msgid "You need to confirm the password"
-msgstr "شما باید گذرواژه را تایید کنید"
+#: ../panels/user-accounts/um-password-dialog.c:287
+#| msgid "The passwords do not match"
+msgid "The passwords do not match."
+msgstr "گذرواژه‌ها برابر نیستند."
 
-#: ../panels/user-accounts/um-password-dialog.c:313
-msgid "The passwords do not match"
-msgstr "گذرواژه‌ها برابر نیستند"
-
-#: ../panels/user-accounts/um-password-dialog.c:319
-msgid "You need to enter your current password"
-msgstr "شما باید گذرواژه فعلی خود را وارد کنید"
-
-#: ../panels/user-accounts/um-password-dialog.c:322
-msgid "The current password is not correct"
-msgstr "گذرواژه فعلی صحیح نیست"
-
-#: ../panels/user-accounts/um-password-dialog.c:385
-msgid "Passwords do not match"
-msgstr "گذرواژه‌ها برابر نیستند"
-
-# ../capplets/common/gconf-property-editor.:c:183
-#: ../panels/user-accounts/um-password-dialog.c:439
-msgid "Wrong password"
-msgstr "گذرواژه اشتباه"
+#: ../panels/user-accounts/um-photo-dialog.c:218
+msgid "Browse for more pictures"
+msgstr "مرور برای عکس‌های بیشتر"
 
 #: ../panels/user-accounts/um-photo-dialog.c:443
 msgid "Disable image"
@@ -6395,7 +6627,8 @@ msgstr "نمی‌توان به‌طور خودکار به این نوع از د
 msgid "No such domain or realm found"
 msgstr "چنین دامنه یا محدوده‌ای پیدا نشد"
 
-#: ../panels/user-accounts/um-realm-manager.c:815
+#: ../panels/user-accounts/um-realm-manager.c:814
+#: ../panels/user-accounts/um-realm-manager.c:828
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "نمی توان از طریق %s بر اساس دامنه %s وارد سیستم شد"
@@ -6404,25 +6637,29 @@ msgstr "نمی توان از طریق %s بر اساس دامنه %s وارد س
 msgid "Invalid password, please try again"
 msgstr "گذرواژه‌ی نادرست، لطفا مجددا تلاش کنید"
 
-#: ../panels/user-accounts/um-realm-manager.c:824
+#: ../panels/user-accounts/um-realm-manager.c:833
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "نمی‌توان به دامنه %s متصل شد: %s"
 
-#: ../panels/user-accounts/um-user-panel.c:376
+#: ../panels/user-accounts/um-user-panel.c:193
+msgid "Other Accounts"
+msgstr "حساب‌های دیگر"
+
+#: ../panels/user-accounts/um-user-panel.c:412
 msgid "Failed to delete user"
 msgstr "پاک‌کردن کاربر شکست خورد"
 
-#: ../panels/user-accounts/um-user-panel.c:436
+#: ../panels/user-accounts/um-user-panel.c:477
 msgid "You cannot delete your own account."
 msgstr "شما نمی‌توانید حساب خودتان را حذف کنید."
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:486
 #, c-format
 msgid "%s is still logged in"
 msgstr "کاربر %s هنوز وارد سیستم است"
 
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:490
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6430,12 +6667,12 @@ msgstr ""
 "حذف یک کاربر در حالی که وارد سیستم هستند ممکن است سیستم را در حالتی ناجور "
 "قرار دهد."
 
-#: ../panels/user-accounts/um-user-panel.c:458
+#: ../panels/user-accounts/um-user-panel.c:499
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "آیا می‌خواهید پرونده‌های «%s» را نگاه دارید؟"
 
-#: ../panels/user-accounts/um-user-panel.c:462
+#: ../panels/user-accounts/um-user-panel.c:503
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -6443,42 +6680,42 @@ msgstr ""
 " در زمان پاک کردن یک کاربر، نگهداری از شاخه آغازه، پست‌الکترونیکی و پرونده‌های "
 "موقت او امکان‌پذیر است."
 
-#: ../panels/user-accounts/um-user-panel.c:465
+#: ../panels/user-accounts/um-user-panel.c:506
 msgid "_Delete Files"
 msgstr "_حذف پرونده‌ها"
 
-#: ../panels/user-accounts/um-user-panel.c:466
+#: ../panels/user-accounts/um-user-panel.c:507
 msgid "_Keep Files"
 msgstr "_نگهداری پرونده‌ها"
 
-#: ../panels/user-accounts/um-user-panel.c:518
+#: ../panels/user-accounts/um-user-panel.c:559
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "حساب غیرفعال شد"
 
-#: ../panels/user-accounts/um-user-panel.c:526
+#: ../panels/user-accounts/um-user-panel.c:567
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "در ورود بعدی تنظیم می‌شود"
 
-#: ../panels/user-accounts/um-user-panel.c:529
+#: ../panels/user-accounts/um-user-panel.c:570
 msgctxt "Password mode"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/user-accounts/um-user-panel.c:578
+#: ../panels/user-accounts/um-user-panel.c:619
 msgid "Logged in"
 msgstr "وارد شده"
 
-#: ../panels/user-accounts/um-user-panel.c:942
+#: ../panels/user-accounts/um-user-panel.c:999
 msgid "Failed to contact the accounts service"
 msgstr "ارتباط با سرویس حساب شکست خورد"
 
-#: ../panels/user-accounts/um-user-panel.c:944
+#: ../panels/user-accounts/um-user-panel.c:1001
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "لطفا مطمئن شوید که AccountService نصب و فعال است."
 
-#: ../panels/user-accounts/um-user-panel.c:985
+#: ../panels/user-accounts/um-user-panel.c:1042
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6486,12 +6723,12 @@ msgstr ""
 "برای ایجاد تغییرات،\n"
 "ابتدا بر روی نقشک * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1023
+#: ../panels/user-accounts/um-user-panel.c:1080
 msgid "Create a user account"
 msgstr "ساخت یک حساب کاربری"
 
-#: ../panels/user-accounts/um-user-panel.c:1034
-#: ../panels/user-accounts/um-user-panel.c:1320
+#: ../panels/user-accounts/um-user-panel.c:1091
+#: ../panels/user-accounts/um-user-panel.c:1380
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6499,12 +6736,12 @@ msgstr ""
 "برای ساختن یک حساب کاربر،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1043
+#: ../panels/user-accounts/um-user-panel.c:1101
 msgid "Delete the selected user account"
 msgstr "حذف حساب کاربر انتخاب شده"
 
-#: ../panels/user-accounts/um-user-panel.c:1055
-#: ../panels/user-accounts/um-user-panel.c:1325
+#: ../panels/user-accounts/um-user-panel.c:1113
+#: ../panels/user-accounts/um-user-panel.c:1385
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -6512,39 +6749,48 @@ msgstr ""
 "برای حذف حساب کاربر انتخاب شده،\n"
 "ابتدا بر روی شمایل * کلیک کنید"
 
-#: ../panels/user-accounts/um-user-panel.c:1229
+#: ../panels/user-accounts/um-user-panel.c:1295
 msgid "My Account"
 msgstr "حساب من"
 
-#: ../panels/user-accounts/um-user-panel.c:1238
-msgid "Other Accounts"
-msgstr "حساب‌های دیگر"
-
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:551
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "یک کاربر با نام «%s» پیشاپیش وجود دارد"
 
-#: ../panels/user-accounts/um-utils.c:520
+#: ../panels/user-accounts/um-utils.c:555
 #, c-format
 msgid "The username is too long"
 msgstr "نام کاربری خیلی بلند است"
 
-#: ../panels/user-accounts/um-utils.c:523
+#: ../panels/user-accounts/um-utils.c:558
 msgid "The username cannot start with a '-'"
 msgstr "نام کاربری نمیتواند با یک «-» شروع شود"
 
-#: ../panels/user-accounts/um-utils.c:526
+#: ../panels/user-accounts/um-utils.c:561
+#| msgid ""
+#| "The username must only consist of:\n"
+#| " ➣ letters from the English alphabet\n"
+#| " ➣ digits\n"
+#| " ➣ any of the characters '.', '-' and '_'"
 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 '_'"
 msgstr ""
-"نام کاربری باید شامل:\n"
-" ➣حروف از الفبای انگلیسی\n"
-" ➣اعداد\n"
-" ➣هرکدام از نویسه‌های «.»، «-» و «_»"
+"نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و هر کدام از "
+"نویسه‌های «.» «-» و «_» باشد"
+
+#. Translators: This is a date format string in the style of "Feb 24".
+#: ../panels/user-accounts/um-utils.c:811
+#| msgid "%b %d %Y"
+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"
+msgid "%b %e, %Y"
+msgstr "%b %Oe، %OY"
 
 #: ../panels/wacom/button-mapping.ui.h:1
 msgid "Map Buttons"
@@ -6554,7 +6800,19 @@ msgstr "هدایت کلیدها"
 msgid "Map buttons to functions"
 msgstr "هدایت دکمه‌ها به تابع‌ها"
 
-#: ../panels/wacom/calibrator/gui_gtk.c:79
+#: ../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."
+msgstr ""
+"برای ویرایش یک کلید میان‌بر، کنش «ارسال ضربه کلید» را انتخاب کنید، دکمه کلید "
+"میان‌بر را فشار دهید و کلیدهای جدید را بگیرید یا اینکه کلید پس‌بر را برای پاک "
+"کردن فشار دهید."
+
+#: ../panels/wacom/calibrator/calibrator-gui.c:82
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -6562,76 +6820,67 @@ msgstr ""
 "همانطور که نشانه‌ها بر روی صفحه‌نمایش نمایش داده می‌شود بر روی اهدف ضربه بزنید "
 "تا تبلت درجه‌بندی شود."
 
-#: ../panels/wacom/calibrator/gui_gtk.c:368
+#: ../panels/wacom/calibrator/calibrator-gui.c:86
 msgid "Mis-click detected, restarting..."
 msgstr "Mis-click شناسایی شد، راه‌اندازی مجدد..."
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:275
-msgid "Output:"
-msgstr "خروجی:"
-
-#. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:287
-msgid "Keep aspect ratio (letterbox):"
-msgstr "نگاه‌داشتن نسبت عرض به ارتفاع (letterbox):"
-
-#. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:298
-msgid "Map to single monitor"
-msgstr "هدایت به صفحه‌نمایش انفرادی"
+#: ../panels/wacom/cc-wacom-button-row.c:443
+msgctxt "Wacom tablet button"
+msgid "Up"
+msgstr "بالا"
 
-#: ../panels/wacom/cc-wacom-nav-button.c:89
-#, c-format
-msgid "%d of %d"
-msgstr "%Id از %Id"
+#: ../panels/wacom/cc-wacom-button-row.c:444
+msgctxt "Wacom tablet button"
+msgid "Down"
+msgstr "پایین"
 
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
+#: ../panels/wacom/cc-wacom-button-row.h:55
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../panels/wacom/cc-wacom-page.c:119
+#: ../panels/wacom/cc-wacom-button-row.h:56
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "ارسال ضربه کلید"
 
-#: ../panels/wacom/cc-wacom-page.c:120
+#: ../panels/wacom/cc-wacom-button-row.h:57
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "تعویض نمایشگر"
 
-#: ../panels/wacom/cc-wacom-page.c:121
+#: ../panels/wacom/cc-wacom-button-row.h:58
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "نمایش راهنمای روی-صفحه"
 
-#: ../panels/wacom/cc-wacom-page.c:621
-msgctxt "Wacom tablet button"
-msgid "Up"
-msgstr "بالا"
-
-#: ../panels/wacom/cc-wacom-page.c:621
-msgctxt "Wacom tablet button"
-msgid "Down"
-msgstr "پایین"
+#: ../panels/wacom/cc-wacom-mapping-panel.c:264
+msgid "Output:"
+msgstr "خروجی:"
 
-#: ../panels/wacom/cc-wacom-page.c:662
-msgid "Switch Modes"
-msgstr "حالت‌های معاوضه"
+#. Keep ratio switch
+#: ../panels/wacom/cc-wacom-mapping-panel.c:276
+msgid "Keep aspect ratio (letterbox):"
+msgstr "نگاه‌داشتن نسبت عرض به ارتفاع (letterbox):"
 
-#: ../panels/wacom/cc-wacom-page.c:752
-#: ../panels/wacom/cc-wacom-stylus-page.c:373
-msgid "Button"
-msgstr "دکمه"
+#. Whole-desktop checkbox
+#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+msgid "Map to single monitor"
+msgstr "هدایت به صفحه‌نمایش انفرادی"
 
-#: ../panels/wacom/cc-wacom-page.c:810
-msgid "Action"
-msgstr "کنش"
+#: ../panels/wacom/cc-wacom-nav-button.c:89
+#, c-format
+msgid "%d of %d"
+msgstr "%Id از %Id"
 
-#: ../panels/wacom/cc-wacom-page.c:920
+#: ../panels/wacom/cc-wacom-page.c:522
 msgid "Display Mapping"
 msgstr "هدایت نمایشگر"
 
+#: ../panels/wacom/cc-wacom-stylus-page.c:373
+msgid "Button"
+msgstr "دکمه"
+
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
 #: ../panels/wacom/gnome-wacom-properties.ui.h:7
 msgid "Wacom Tablet"
@@ -6683,74 +6932,79 @@ msgid "Adjust display resolution"
 msgstr "تنظیم تفکیک‌پذیری نمایشگر"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#| msgid "Mouse Settings"
+msgid "Adjust mouse settings"
+msgstr "تنظیم تنظیمات موشی"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Tracking Mode"
 msgstr "حالت ردیابی"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: ../panels/wacom/gnome-wacom-properties.ui.h:14
 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:1076
+#: ../panels/wacom/gsd-wacom-device.c:1063
 msgid "Left Ring"
 msgstr "حلقه‌ی راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1086
+#: ../panels/wacom/gsd-wacom-device.c:1074
 #, 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:1105
+#: ../panels/wacom/gsd-wacom-device.c:1094
 msgid "Right Ring"
 msgstr "حلقه راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1115
+#: ../panels/wacom/gsd-wacom-device.c:1105
 #, 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:1156
+#: ../panels/wacom/gsd-wacom-device.c:1147
 msgid "Left Touchstrip"
 msgstr "نوارلمسی چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1166
+#: ../panels/wacom/gsd-wacom-device.c:1158
 #, 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:1185
+#: ../panels/wacom/gsd-wacom-device.c:1178
 msgid "Right Touchstrip"
 msgstr "نوارلمسی راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1195
+#: ../panels/wacom/gsd-wacom-device.c:1189
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "حالت نوارلمسی راست #%Id"
 
-#: ../panels/wacom/gsd-wacom-device.c:1220
+#: ../panels/wacom/gsd-wacom-device.c:1215
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "کلید حالت Touchring چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1222
+#: ../panels/wacom/gsd-wacom-device.c:1217
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "کلید حالت Touchring راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1225
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "کلید حالت Touchring چپ"
 
-#: ../panels/wacom/gsd-wacom-device.c:1227
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "کلید حالت Touchring راست"
 
-#: ../panels/wacom/gsd-wacom-device.c:1232
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "معاوضه حالت #%Id"
@@ -6775,6 +7029,11 @@ msgstr "دکمه بالا #%Id"
 msgid "Bottom Button #%d"
 msgstr "دکمه پایین #%Id"
 
+#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264
+#| msgid "New shortcut..."
+msgid "New shortcut…"
+msgstr "میان‌بر جدید..."
+
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
 msgid "No Action"
 msgstr "بدون کنش"
@@ -6844,40 +7103,40 @@ msgstr "دکمه پایینی"
 msgid "Tip Pressure Feel"
 msgstr "حساسیت فشار ضربه"
 
-#: ../shell/cc-application.c:67
+#: ../shell/cc-application.c:69
 msgid "Enable verbose mode"
 msgstr "فعال‌کردن حالت مفصل"
 
-#: ../shell/cc-application.c:68
+#: ../shell/cc-application.c:70
 msgid "Show the overview"
 msgstr "نمایش مرور کلی"
 
-#: ../shell/cc-application.c:69
+#: ../shell/cc-application.c:71
 msgid "Search for the string"
 msgstr "جست‌وجو برای رشته"
 
-#: ../shell/cc-application.c:70
+#: ../shell/cc-application.c:72
 msgid "List possible panel names and exit"
 msgstr "نام تابلوهای ممکن را فهرست کن و خارج شو"
 
-#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
-#: ../shell/cc-application.c:73
+#: ../shell/cc-application.c:73 ../shell/cc-application.c:74
+#: ../shell/cc-application.c:75
 msgid "Show help options"
 msgstr "نمایش گزینه‌های راهنما"
 
-#: ../shell/cc-application.c:74
+#: ../shell/cc-application.c:76
 msgid "Panel to display"
 msgstr "تابلو برای نمایش"
 
-#: ../shell/cc-application.c:74
+#: ../shell/cc-application.c:76
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEL] [ARGUMENT…]"
 
-#: ../shell/cc-application.c:116
+#: ../shell/cc-application.c:142
 msgid "- Settings"
 msgstr "- تنظیمات"
 
-#: ../shell/cc-application.c:124
+#: ../shell/cc-application.c:160
 #, c-format
 msgid ""
 "%s\n"
@@ -6886,46 +7145,527 @@ msgstr ""
 "%s\n"
 "«%s --help» را برای دیدن تمام گزینه‌های خط فرمان اجرا کنید.\n"
 
-#: ../shell/cc-application.c:154
+#: ../shell/cc-application.c:190
 msgid "Available panels:"
 msgstr "تابلوهای موجود:"
 
-#: ../shell/cc-application.c:273
+#: ../shell/cc-application.c:325
 msgid "Help"
 msgstr "راهنما"
 
-#: ../shell/cc-application.c:274
+#: ../shell/cc-application.c:326
 msgid "Quit"
 msgstr "خروج"
 
-#: ../shell/cc-window.c:62 ../shell/gnome-control-center.desktop.in.in.h:1
-msgid "Settings"
-msgstr "تنظیمات"
+#: ../shell/cc-window.c:61 ../shell/cc-window.c:1486
+msgid "All Settings"
+msgstr "همه‌ی تنظیمات"
 
 #. Add categories
-#: ../shell/cc-window.c:858
+#: ../shell/cc-window.c:868
 msgctxt "category"
 msgid "Personal"
 msgstr "شخصی"
 
-#: ../shell/cc-window.c:859
+#: ../shell/cc-window.c:869
 msgctxt "category"
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../shell/cc-window.c:860
+#: ../shell/cc-window.c:870
 msgctxt "category"
 msgid "System"
 msgstr "سیستم"
 
-#: ../shell/cc-window.c:1411
-msgid "All Settings"
-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 "Export"
+#~ msgstr "صادر کردن"
+
+#~ msgid "Device type:"
+#~ msgstr "نوع دستگاه:"
+
+#~ msgid "Manufacturer:"
+#~ msgstr "تولید کننده:"
+
+#~ msgid "Model:"
+#~ msgstr "مدل:"
+
+#~ msgid ""
+#~ "Image files can be dragged on this window to auto-complete the above "
+#~ "fields."
+#~ msgstr ""
+#~ "پرونده‌های تصاویر می‌توانند بر روی این پنجره کشیده شوند تا فیلدهای بالا "
+#~ "تکمیل خودکار گردند."
+
+#~ msgid "Left Shift"
+#~ msgstr "تبدیل چپ"
+
+#~ msgid "Left Alt"
+#~ msgstr "دگرساز چپ"
+
+#~ msgid "Left Ctrl"
+#~ msgstr "مهار چپ"
+
+#~ msgid "Right Shift"
+#~ msgstr "تبدیل راست"
+
+#~ msgid "Right Alt"
+#~ msgstr "دگرساز راست"
+
+#~ msgid "Right Ctrl"
+#~ msgstr "مهار راست"
+
+#~ msgid "Left Alt+Shift"
+#~ msgstr "دگرساز+تبدیل چپ"
+
+#~ msgid "Right Alt+Shift"
+#~ msgstr "دگرساز+تبدیل راست"
+
+#~ msgid "Left Ctrl+Shift"
+#~ msgstr "مهار+تبدیل چپ"
+
+#~ msgid "Right Ctrl+Shift"
+#~ msgstr "مهار+تبدیل راست"
+
+#~ msgid "Left+Right Shift"
+#~ msgstr "چپ+تبدیل راست"
+
+#~ msgid "Left+Right Ctrl"
+#~ msgstr "چپ+مهار راست"
+
+#~ msgid "Alt+Shift"
+#~ msgstr "دگرساز+تبدیل"
+
+#~ msgid "Ctrl+Shift"
+#~ msgstr "مهار+تبدیل"
+
+#~ msgid "Alt+Ctrl"
+#~ msgstr "دگرساز+مهار"
+
+#~ msgid "Caps"
+#~ msgstr "قفل‌تبدیل"
+
+#~ msgid "Shift+Caps"
+#~ msgstr "تبدیل+قفل‌تبدیل"
+
+#~ msgid "Alt+Caps"
+#~ msgstr "دگرساز+قفل‌تبدیل"
+
+#~ msgid "Ctrl+Caps"
+#~ msgstr "مهار+قفل‌تبدیل"
+
+#~ msgid "_Region:"
+#~ msgstr "_منطقه:"
+
+#~ msgid "_City:"
+#~ msgstr "_شهر:"
+
+#~ msgid "_Network Time"
+#~ msgstr "_زمان شبکه"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "Set the time one hour ahead."
+#~ msgstr "تنظیم زمان به یک ساعت جلو."
+
+#~ msgid "Set the time one hour back."
+#~ msgstr "تنظیم زمان به یک ساعت عقب."
+
+#~ msgid "Set the time one minute ahead."
+#~ msgstr "تنظیم زمان یک دقیقه به جلو."
+
+#~ msgid "Set the time one minute back."
+#~ msgstr "تنظیم زمان به یک ساعت عقب."
+
+#~ msgid "Switch between AM and PM."
+#~ msgstr "تعویض بین AM و PM."
+
+#~ msgid "AM/PM"
+#~ msgstr "ق‌ظ/ب‌ظ"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Normal"
+#~ msgstr "عادی"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Counterclockwise"
+#~ msgstr "خلاف جهت عقربه‌های ساعت"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "Clockwise"
+#~ msgstr "جهت چرخش عقربه‌های ساعت"
+
+#~ msgctxt "display panel, rotation"
+#~ msgid "180 Degrees"
+#~ msgstr "۱۸۰ درجه"
+
+#~ msgid "Monitor"
+#~ msgstr "صفحه‌نمایش"
+
+#~ msgid "Drag to change primary display."
+#~ msgstr "بکشید تا نمایشگر اصلی را تغییر دهید."
+
+#~ msgid ""
+#~ "Select a monitor to change its properties; drag it to rearrange its "
+#~ "placement."
+#~ msgstr ""
+#~ "یک صفحه‌نمایش را برای تغییر ترجیحات آن انتخاب کنید؛ آن را بکشید تا محل آن "
+#~ "را تغییر دهید."
+
+#~ msgid "%a %R"
+#~ msgstr "%a %OH:OM"
+
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %Ol:%OM %p"
+
+#~ msgid "Could not save the monitor configuration"
+#~ msgstr "نمی‌توان پیکربندی صفحه‌نمایش را ذخیره کرد"
+
+#~ msgid "Could not detect displays"
+#~ msgstr "نمي‌توان نمایشگرها را شناسایی کرد"
+
+#~ msgid "_Resolution"
+#~ msgstr "_تفکیک‌پذیری"
+
+#~ msgid "R_otation"
+#~ msgstr "_چرخش"
+
+#~ msgid "_Mirror displays"
+#~ msgstr "نمایشگرهای آ_ینه‌ای"
+
+#~ msgid "Note: may limit resolution options"
+#~ msgstr "نکته: ممکن است گزینه‌های تفکیک‌پذیری را محدود کند"
+
+#~ msgid "_Detect Displays"
+#~ msgstr "_نمایش‌گرها"
+
+#~ msgid "Mouse Preferences"
+#~ msgstr "ترجیحات موشی"
+
+#~ msgctxt "mouse, speed"
+#~ msgid "Slow"
+#~ msgstr "آهسته"
+
+#~ msgctxt "mouse, speed"
+#~ msgid "Fast"
+#~ msgstr "سریع"
+
+#~ msgid "C_ontent sticks to fingers"
+#~ msgstr "_محتویات به انگشتان می‌چسبند"
+
+#~ msgid "_Options…"
+#~ msgstr "_گزینه‌ها..."
+
+#~ msgid "Select the interface to use for the new service"
+#~ msgstr "واسطی را برای استفاده در سرویس جدید انتخاب کنید"
+
+#~ msgid "C_reate…"
+#~ msgstr "_ایجاد..."
+
+#~ msgid "_Interface"
+#~ msgstr "_واسط"
+
+#~ msgid "blablabla"
+#~ msgstr "چیزچیزچیز"
+
+#~ msgid ""
+#~ "Address\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "جای\n"
+#~ "قسمت\n"
+#~ "آدرس\n"
+#~ "اینجاست"
+
+#~ msgid ""
+#~ "DNS\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "جای\n"
+#~ "قسمت\n"
+#~ "دی‌ان‌اس\n"
+#~ "اینجاست"
+
+#~ msgid ""
+#~ "Routes\n"
+#~ "section\n"
+#~ "goes\n"
+#~ "here"
+#~ msgstr ""
+#~ "جای\n"
+#~ "قسمت\n"
+#~ "مسیرها\n"
+#~ "اینجاست"
+
+#~ msgid "00:24:16:31:8G:7A"
+#~ msgstr "00:24:16:31:8G:7A"
+
+#~ msgid "Estimated battery capacity: %s"
+#~ msgstr "گنجایش تقریبی باتری: %s"
+
+#~ msgid "_Mobile Broadband"
+#~ msgstr "پهن‌باند _همراه"
+
+#~ msgid "Hidden"
+#~ msgstr "مخفی"
+
+#~ msgid "Visible"
+#~ msgstr "نمایان"
+
+#~ msgid "Name & Visibility"
+#~ msgstr "نام و وضعیت نمایش"
+
+#~ msgid "Control how you appear on the screen and the network."
+#~ msgstr "نحوه‌ی نمایش خود را در شبکه و نمایشگر کنترل کنید."
+
+#~ msgid "Display _full name in top bar"
+#~ msgstr "نمایش _نام کامل، در نوار بالا"
+
+#~ msgid "Display full name in _lock screen"
+#~ msgstr "نمایش نام کامل در صفحه‌ی _قفل"
+
+#~ msgid "_Stealth Mode"
+#~ msgstr "حالت _مخفی"
+
+#~ msgid "No shortcut set"
+#~ msgstr "هیچ میان‌بری تنظیم نشده"
+
+#~ msgctxt "universal access, contrast"
+#~ msgid "Normal"
+#~ msgstr "عادی"
+
+#~ msgctxt "universal access, contrast"
+#~ msgid "High/Inverse"
+#~ msgstr "بلند/معکوس"
+
+#~ msgid "On screen keyboard"
+#~ msgstr "صفحه‌کلید مجازی"
+
+#~ msgid "OnBoard"
+#~ msgstr "OnBoard"
+
+#~ msgid "75%"
+#~ msgstr "۷۵٪"
+
+#~ msgid "100%"
+#~ msgstr "۱۰۰٪"
+
+#~ msgctxt "universal access, text size"
+#~ msgid "Normal"
+#~ msgstr "عادی"
+
+#~ msgid "125%"
+#~ msgstr "۱۲۵٪"
+
+#~ msgid "150%"
+#~ msgstr "۱۵۰٪"
+
+#~ msgctxt "universal access, text size"
+#~ msgid "Larger"
+#~ msgstr "بزرگ‌تر"
+
+#~ msgid "Beep on Caps and Num Lock"
+#~ msgstr "هنگام استفاده از قفل تبدیل و قفل اعداد بوق زده شود"
+
+#~ msgid "Turn on or off:"
+#~ msgstr "خاموش یا روشن کردن:"
+
+#~ msgctxt "universal access, zoom"
+#~ msgid "Zoom"
+#~ msgstr "بزرگ‌نمایی"
+
+#~ msgid "Zoom in:"
+#~ msgstr "بزرگ‌نمایی:"
+
+#~ msgid "Zoom out:"
+#~ msgstr "کوچک‌نمایی:"
+
+#~ msgid "Closed Captioning"
+#~ msgstr "عنوان‌بندی‌های بسته شده"
+
+#~ msgid "Display a textual description of speech and sounds"
+#~ msgstr "نمایش یک توضیح متنی از گفتارها و صداها"
+
+#~ msgid "On Screen Keyboard"
+#~ msgstr "صفحه‌کلید مجازی"
+
+# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: 
parse error
+#~ msgctxt "universal access, delay"
+#~ msgid "Short"
+#~ msgstr "کوتاه"
+
+#~ msgctxt "universal access, delay"
+#~ msgid "Long"
+#~ msgstr "بلند"
+
+#~ msgid "Beep when a key is"
+#~ msgstr "بوق زدن هنگامی که یک کلید"
+
+#~ msgid "pressed"
+#~ msgstr "فشار داده شد"
+
+#~ msgid "accepted"
+#~ msgstr "پذیرفته شد"
+
+#~ msgid "rejected"
+#~ msgstr "رد شد"
+
+#~ msgid "Acc_eptance delay:"
+#~ msgstr "تاخیر پ_ذیرش:"
+
+#~ msgid "Control the pointer using the keypad"
+#~ msgstr "کنترل اشاره‌گر از طریق صفحه‌ی شماره‌ها"
+
+#~ msgid "Video Mouse"
+#~ msgstr "موشی تصویری"
+
+#~ msgid "Control the pointer using the video camera."
+#~ msgstr "کنترل اشاره‌گر از طریق دوربین ویدئویی."
+
+#~ msgctxt "universal access, threshold"
+#~ msgid "Small"
+#~ msgstr "کوتاه"
+
+#~ msgctxt "universal access, threshold"
+#~ msgid "Large"
+#~ msgstr "بلند"
+
+#~ msgid "Add account"
+#~ msgstr "اضافه کردن حساب"
+
+#~ msgid "_Local Account"
+#~ msgstr "حساب _محلی"
+
+#~ msgid "_Login Name"
+#~ msgstr "نام _ورود به سیستم"
+
+#~ msgid "Tip: Enterprise domain or realm name"
+#~ msgstr "نکته: نام دامنه یا محدوده تجاری"
+
+#~ msgid "C_ontinue"
+#~ msgstr "_ادامه"
+
+#~ msgid "Previous Week"
+#~ msgstr "هفته قبل"
+
+#~ msgid "Next Week"
+#~ msgstr "هفته بعد"
+
+#~ msgid "Next week"
+#~ msgstr "هفته بعد"
+
+#~ msgid "Log in without a password"
+#~ msgstr "ورود به سیستم بدون گذرواژه"
+
+#~ msgid "Disable this account"
+#~ msgstr "غیرفعال کردن این حساب"
+
+#~ msgid "Enable this account"
+#~ msgstr "فعال کردن این حساب"
+
+#~ msgid "C_onfirm password"
+#~ msgstr "_تایید گذرواژه"
+
+#~ msgid "Generate a password"
+#~ msgstr "تولید یک گذرواژه"
+
+#~ msgid "_Action"
+#~ msgstr "_کنش"
+
+#~ msgid "_Show password"
+#~ msgstr "_نمایش گذرواژه"
+
+#~ msgid "How to choose a strong password"
+#~ msgstr "چگونه یک گذرواژه‌ی قوی انتخاب کنیم"
+
+#~ msgid "Changing photo for:"
+#~ msgstr "درحال تغییر عکس برای:"
+
+#~ msgid ""
+#~ "Choose a picture that will be shown at the login screen for this account."
+#~ msgstr ""
+#~ "عکسی انتخاب کنید تا برای این کاربر، در صفحه نمایش ورود به سیستم نمایش "
+#~ "داده شود."
+
+#~ msgid "Gallery"
+#~ msgstr "گالری"
+
+#~ msgid "Take a photograph"
+#~ msgstr "یک عکس بگیرید"
+
+#~ msgid "Browse"
+#~ msgstr "مرور"
+
+#~ msgid "Photograph"
+#~ msgstr "عکس‌برداری"
+
+#~ msgid "Account Information"
+#~ msgstr "اطلاعات حساب"
+
+#~ msgctxt "Password strength"
+#~ msgid "Too short"
+#~ msgstr "خیلی کوتاه"
+
+#~ msgctxt "Password strength"
+#~ msgid "Not good enough"
+#~ msgstr "به اندازه کافی خوب نیست"
+
+#~ msgctxt "Password strength"
+#~ msgid "Weak"
+#~ msgstr "ضعیف"
+
+#~ msgctxt "Password strength"
+#~ msgid "Fair"
+#~ msgstr "نسبتا خوب"
+
+#~ msgctxt "Password strength"
+#~ msgid "Good"
+#~ msgstr "خوب"
+
+#~ msgctxt "Password strength"
+#~ msgid "Strong"
+#~ msgstr "قوی"
+
+#~ msgid "_Generate a password"
+#~ msgstr "_تولید یک گذرواژه"
+
+#~ msgid "You need to enter a new password"
+#~ msgstr "شما باید گذرواژه‌ی جدیدی وارد کنید"
+
+#~ msgid "The new password is not strong enough"
+#~ msgstr "گذرواژه جدید به اندازه کافی قوی نیست"
+
+#~ msgid "You need to confirm the password"
+#~ msgstr "شما باید گذرواژه را تایید کنید"
+
+#~ msgid "You need to enter your current password"
+#~ msgstr "شما باید گذرواژه فعلی خود را وارد کنید"
+
+#~ msgid "The current password is not correct"
+#~ msgstr "گذرواژه فعلی صحیح نیست"
+
+# ../capplets/common/gconf-property-editor.:c:183
+#~ msgid "Wrong password"
+#~ msgstr "گذرواژه اشتباه"
+
+#~ msgid "Switch Modes"
+#~ msgstr "حالت‌های معاوضه"
+
+#~ msgid "Action"
+#~ msgstr "کنش"
+
 #~ msgid "Change the background"
 #~ msgstr "تعویض تصویر پس‌زمینه"
 
@@ -7134,12 +7874,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "_Connect"
 #~ msgstr "_متصل کردن"
 
-#~ msgid "Wired"
-#~ msgstr "سیمی"
-
-#~ msgid "Mobile broadband"
-#~ msgstr "پهن‌باند موبایل"
-
 #~ msgid "Mesh"
 #~ msgstr "Mesh"
 
@@ -7443,10 +8177,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Swap colors"
 #~ msgstr "معاوضه‌ی رنگ‌ها"
 
-#~| msgid "Seco_ndary click:"
-#~ msgid "Secondary color"
-#~ msgstr "رنگ ثانویه"
-
 #~ msgid "Horizontal Gradient"
 #~ msgstr "شیب افقی"
 
@@ -7513,9 +8243,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "_Disabled"
 #~ msgstr "_غیرفعال کردن"
 
-#~ msgid "_Edge scrolling"
-#~ msgstr "لغرش در _گوشه‌ها"
-
 #~ msgctxt "Wireless access point"
 #~ msgid "Other..."
 #~ msgstr "بقیه..."
@@ -7613,10 +8340,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "_Back"
 #~ msgstr "_برگشت"
 
-#~| msgid "User"
-#~ msgid "Add User"
-#~ msgstr "اضافه کردن کاربر"
-
 #~ msgid "Allowed users"
 #~ msgstr "کاربران مجاز شده"
 
@@ -7693,12 +8416,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Zoom"
 #~ msgstr "بزرگ‌نمایی"
 
-#~ msgid "Screen keyboard"
-#~ msgstr "صفحه‌کلید مجازی"
-
-#~ msgid "Typing Assistant"
-#~ msgstr "همکار تایپ"
-
 #~ msgid "Type here to test settings"
 #~ msgstr "برای آزمایش تنظیمات اینجا تایپ کنید"
 
@@ -7748,9 +8465,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Toggle screen reader"
 #~ msgstr "تغییر حالت صفحه‌نمایش‌خوان"
 
-#~ msgid "New shortcut..."
-#~ msgstr "میان‌بر جدید..."
-
 #~ msgid "Accelerator key"
 #~ msgstr "کلید شتاب‌ده"
 
@@ -8292,9 +9006,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Upside Down"
 #~ msgstr "برعکس"
 
-#~ msgid "Mirror Screens"
-#~ msgstr "صفحات‌نمایش آینه‌ای"
-
 #~ msgid "Desktop"
 #~ msgstr "رومیزی"
 
@@ -8385,9 +9096,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Web;Location;"
 #~ msgstr "وب;مکان;"
 
-#~ msgid "<b>Di_rect internet connection</b>"
-#~ msgstr "<b>اتصال م_ستقیم اینترنت</b>"
-
 #~ msgid "<b>_Manual proxy configuration</b>"
 #~ msgstr "<b>پیکربندی _دستی پیشکار</b>"
 
@@ -8421,9 +9129,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "I need assistance with:"
 #~ msgstr "من احتیاج به کمک دارم با:"
 
-#~ msgid "Show Universal Access status"
-#~ msgstr "نمایش وضعیت دسترسی فراگیر"
-
 #~ msgid ""
 #~ "A guest account will allow anyone to temporarily log in to this computer "
 #~ "without a password.  For security, remote logins to this account are not "
@@ -8451,9 +9156,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "E-mail address:"
 #~ msgstr "آدرس پست الکترونیکی:"
 
-#~ msgid "Open"
-#~ msgstr "باز کردن"
-
 #~ msgid "Restrictions:"
 #~ msgstr "محدودیت‌ها:"
 
@@ -8634,15 +9336,9 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Beep when a _toggle key is pressed"
 #~ msgstr "هنگام فشرده شدن کلید _دو حالته بوق زده شود"
 
-#~ msgid "Beep when a key is pr_essed"
-#~ msgstr "هنگام _فشرده شدن یک کلید بوق بزن"
-
 #~ msgid "Beep when a key is reje_cted"
 #~ msgstr "هنگام _نپذیرفتن یک کلید بوق بزن"
 
-#~ msgid "Beep when key is _accepted"
-#~ msgstr "هنگام _پذیرفتن کلید بوق بزن"
-
 #~ msgid "Beep when key is _rejected"
 #~ msgstr "هنگام نپذ_یرفتن کلید بوق بزن"
 
@@ -8679,9 +9375,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Duration of work before forcing a break"
 #~ msgstr "مدت زمان کار کردن، پیش تحمیل استراحت"
 
-#~ msgid "Keyboard Preferences"
-#~ msgstr "ترجیحات صفحه‌کلید"
-
 #~ msgid ""
 #~ "Lock screen after a certain duration to help prevent repetitive keyboard "
 #~ "use injuries"
@@ -9425,9 +10118,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Copying '%s'"
 #~ msgstr "در حال نسخه برداری از «%s»"
 
-#~ msgid "Copying files"
-#~ msgstr "در حال نسخه‌برداری از پرونده‌ها"
-
 #~| msgid "Windows"
 #~ msgid "Parent Window"
 #~ msgstr "پنجره‌ها"
@@ -9658,9 +10348,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Whether to thumbnail Type1 fonts"
 #~ msgstr "این که قلم‌های Type1 مسطوره بشوند یا نه"
 
-#~ msgid "Size:"
-#~ msgstr "اندازه:"
-
 #~ msgid "Copyright:"
 #~ msgstr "حق نسخه‌برداری:"
 
@@ -9744,21 +10431,12 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "?"
 #~ msgstr "؟"
 
-#~ msgid "%l:%M %p"
-#~ msgstr "%l:%M %p"
-
 #~ msgid "Today %l:%M %p"
 #~ msgstr "امروز %l:%M %p"
 
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "دیروز %l:%M %p"
 
-#~ msgid "%b %d %l:%M %p"
-#~ msgstr "%b %d %l:%M %p"
-
-#~ msgid "%b %d %Y"
-#~ msgstr "%b %d %Y"
-
 #~| msgid "Windows"
 #~ msgid "Find Now"
 #~ msgstr "اکنون جستجو کن"
@@ -10246,9 +10924,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "_New"
 #~ msgstr "_جدید"
 
-#~ msgid "_Save"
-#~ msgstr "_ذخیره"
-
 #~ msgid "C_ontrol"
 #~ msgstr "م_هار"
 
@@ -10685,9 +11360,6 @@ msgstr "ترجیحات;تنظیمات;"
 #~ msgid "Event"
 #~ msgstr "رویداد"
 
-#~ msgid "_Sounds:"
-#~ msgstr "_صداها:"
-
 #~ msgid "_Play"
 #~ msgstr "_پخش"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]