[gnome-control-center] update Simplified Chinese (zh_CN) translation



commit c2c69fb93e5abafe3a163d603c475f9d62a13878
Author: Cheng Lu <chenglu1990 gmail com>
Date:   Sat Sep 22 21:22:44 2012 +0400

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 1921 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1040 insertions(+), 881 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f97a7f0..ed0b62d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,82 +27,78 @@ msgstr ""
 "Project-Id-Version: gnome-control-center master\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: 2012-08-02 09:48+0000\n"
-"PO-Revision-Date: 2012-07-31 21:49+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"POT-Creation-Date: 2012-09-22 15:49+0000\n"
+"PO-Revision-Date: 2012-09-20 23:27+0800\n"
+"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
+"Language-Team: Chinese (Simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panels/background/background.ui.h:1
-msgid "Add wallpaper"
-msgstr "æååç"
-
-#: ../panels/background/background.ui.h:2
-msgid "Remove wallpaper"
-msgstr "çéåç"
-
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:2
 msgid "Changes throughout the day"
 msgstr "èæåæææå"
 
-#: ../panels/background/background.ui.h:5
-msgid "Primary Color"
-msgstr "äè"
-
-#: ../panels/background/background.ui.h:6
-msgid "Swap colors"
-msgstr "äæéè"
-
-#: ../panels/background/background.ui.h:7
-msgid "Secondary color"
-msgstr "åè"
-
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:3
 msgctxt "background, style"
 msgid "Tile"
 msgstr "åé"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:4
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:5
 msgctxt "background, style"
 msgid "Center"
 msgstr "åä"
 
-#: ../panels/background/background.ui.h:11
+#: ../panels/background/background.ui.h:6
 msgctxt "background, style"
 msgid "Scale"
 msgstr "æäæå"
 
-#: ../panels/background/background.ui.h:12
+#: ../panels/background/background.ui.h:7
 msgctxt "background, style"
 msgid "Fill"
 msgstr "åå"
 
-#: ../panels/background/background.ui.h:13
+#: ../panels/background/background.ui.h:8
 msgctxt "background, style"
 msgid "Span"
 msgstr "éååå"
 
-#: ../panels/background/bg-colors-source.c:46
-msgid "Horizontal Gradient"
-msgstr "æåæå"
+#. translators: This is the title of the wallpaper chooser dialog.
+#: ../panels/background/cc-background-chooser-dialog.c:199
+msgid "Select Background"
+msgstr "éæèæ"
+
+#: ../panels/background/cc-background-chooser-dialog.c:218
+msgid "Wallpapers"
+msgstr "åç"
+
+#: ../panels/background/cc-background-chooser-dialog.c:227
+msgid "Pictures"
+msgstr "åç"
+
+#: ../panels/background/cc-background-chooser-dialog.c:235
+msgid "Colors"
+msgstr "èå"
 
-#: ../panels/background/bg-colors-source.c:47
-msgid "Vertical Gradient"
-msgstr "ççæå"
+#: ../panels/background/cc-background-chooser-dialog.c:244
+msgid "Flickr"
+msgstr "Flickr"
 
-#: ../panels/background/bg-colors-source.c:48
-msgid "Solid Color"
-msgstr "çè"
+#: ../panels/background/cc-background-chooser-dialog.c:286
+#: ../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:148
 msgid "multiple sizes"
@@ -119,32 +115,10 @@ msgstr "%d à %d"
 msgid "No Desktop Background"
 msgstr "ææéèæ"
 
-#: ../panels/background/cc-background-panel.c:1018
-#: ../panels/user-accounts/data/photo-dialog.ui.h:4
-#: ../panels/user-accounts/um-photo-dialog.c:218
-msgid "Browse for more pictures"
-msgstr "æèæååç"
-
-#: ../panels/background/cc-background-panel.c:1110
+#: ../panels/background/cc-background-panel.c:387
 msgid "Current background"
 msgstr "ååèæ"
 
-#: ../panels/background/cc-background-panel.c:1220
-msgid "Wallpapers"
-msgstr "åç"
-
-#: ../panels/background/cc-background-panel.c:1227
-msgid "Pictures Folder"
-msgstr "åçæäå"
-
-#: ../panels/background/cc-background-panel.c:1234
-msgid "Colors & Gradients"
-msgstr "éèåæå"
-
-#: ../panels/background/cc-background-panel.c:1242
-msgid "Flickr"
-msgstr "Flickr"
-
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
 msgid "Background"
 msgstr "èæ"
@@ -184,7 +158,7 @@ msgstr "èæ"
 msgid "Paired"
 msgstr "åéå"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "çå"
 
@@ -196,7 +170,7 @@ msgstr "åå"
 msgid "Mouse and Touchpad Settings"
 msgstr "éæåèææèç"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:41
+#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "åéèç"
 
@@ -226,33 +200,33 @@ msgstr "æ"
 msgid "No"
 msgstr "å"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:405
 msgid "Bluetooth is disabled"
 msgstr "èçåçç"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:407
+#: ../panels/bluetooth/cc-bluetooth-panel.c:410
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "èçåéèçäååçç"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:411
+#: ../panels/bluetooth/cc-bluetooth-panel.c:414
 msgid "No Bluetooth adapters found"
 msgstr "ææåèçééå"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:544
+#: ../panels/bluetooth/cc-bluetooth-panel.c:547
 msgid "Visibility"
 msgstr "åèæ"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:548
+#: ../panels/bluetooth/cc-bluetooth-panel.c:551
 #, c-format
 msgid "Visibility of â%sâ"
 msgstr "â%sâçåèæ"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:592
+#: ../panels/bluetooth/cc-bluetooth-panel.c:595
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "åâ%sâäèååèäçéåï"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:594
+#: ../panels/bluetooth/cc-bluetooth-panel.c:597
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr "åææçéèèåïäæäçåæéèéæèçåã"
@@ -343,7 +317,7 @@ msgstr "åçéç"
 
 #. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1516
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "èå"
 
@@ -591,24 +565,32 @@ msgstr "èççè"
 msgid "Chinese (simplified)"
 msgstr "çääæ"
 
+#: ../panels/common/cc-common-language.c:539
+msgid "Russian"
+msgstr "äè"
+
+#: ../panels/common/cc-common-language.c:542
+msgid "Arabic"
+msgstr "éæäè"
+
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:565
+#: ../panels/common/cc-common-language.c:571
 msgid "United States"
 msgstr "çå"
 
-#: ../panels/common/cc-common-language.c:566
+#: ../panels/common/cc-common-language.c:572
 msgid "Germany"
 msgstr "åå"
 
-#: ../panels/common/cc-common-language.c:567
+#: ../panels/common/cc-common-language.c:573
 msgid "France"
 msgstr "æå"
 
-#: ../panels/common/cc-common-language.c:568
+#: ../panels/common/cc-common-language.c:574
 msgid "Spain"
 msgstr "èçç"
 
-#: ../panels/common/cc-common-language.c:569
+#: ../panels/common/cc-common-language.c:575
 msgid "China"
 msgstr "äå"
 
@@ -629,8 +611,8 @@ msgid "Select a language"
 msgstr "éæäçèè"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:455
+#: ../panels/printers/new-printer-dialog.ui.h:1
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "åæ(_C)"
 
@@ -764,83 +746,84 @@ msgstr "ææççæéåææèç"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "äææéæææèçïæéèèåççåæéã"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:481
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "æå"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:482
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "éæé"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "éæé"
 
-#: ../panels/display/cc-display-panel.c:485
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 å"
 
+#. 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 monitor.  Here, "Mirror" is being
-#. * used as an adjective, not as a verb.  For example, the Spanish
-#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#. * 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:622
-msgid "Mirror Displays"
+#: ../panels/display/cc-display-panel.c:623
+msgid "Mirrored Displays"
 msgstr "éåæç"
 
-#: ../panels/display/cc-display-panel.c:646
+#: ../panels/display/cc-display-panel.c:647
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "æçå"
 
-#: ../panels/display/cc-display-panel.c:747
+#: ../panels/display/cc-display-panel.c:748
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/cc-display-panel.c:749
+#: ../panels/display/cc-display-panel.c:750
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1656
+#: ../panels/display/cc-display-panel.c:1659
 msgid "Drag to change primary display."
 msgstr "ææäææäæçèåã"
 
-#: ../panels/display/cc-display-panel.c:1714
+#: ../panels/display/cc-display-panel.c:1717
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "éæäåæçåæææåçåæïæååææåäçã"
 
-#: ../panels/display/cc-display-panel.c:2102
+#: ../panels/display/cc-display-panel.c:2105
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2104
+#: ../panels/display/cc-display-panel.c:2107
 msgid "%a %l:%M %p"
 msgstr "%A %H%M"
 
-#: ../panels/display/cc-display-panel.c:2266
-#: ../panels/display/cc-display-panel.c:2318
+#: ../panels/display/cc-display-panel.c:2269
+#: ../panels/display/cc-display-panel.c:2321
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "åçéçåèï%s"
 
-#: ../panels/display/cc-display-panel.c:2346
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Could not save the monitor configuration"
 msgstr "ææäåæçåéç"
 
-#: ../panels/display/cc-display-panel.c:2406
+#: ../panels/display/cc-display-panel.c:2409
 msgid "Could not detect displays"
 msgstr "æææææçå"
 
-#: ../panels/display/cc-display-panel.c:2600
+#: ../panels/display/cc-display-panel.c:2603
 msgid "Could not get screen information"
 msgstr "ææèåååäæ"
 
@@ -881,34 +864,34 @@ msgstr ""
 "æ;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:413
 #, c-format
 msgid "VESA: %s"
 msgstr "VESAï%s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:82
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
 #: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "æç"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:593
 #, c-format
 msgid "%d-bit"
 msgstr "%d ä"
 
-#: ../panels/info/cc-info-panel.c:746
+#: ../panels/info/cc-info-panel.c:752
 msgid "Unknown model"
 msgstr "æçåå"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:835
 msgid "The next login will attempt to use the standard experience."
 msgstr "äæçåååèæäæåçæäéã"
 
-#: ../panels/info/cc-info-panel.c:831
+#: ../panels/info/cc-info-panel.c:837
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -916,51 +899,51 @@ msgstr "äæçååäçääææçæççäèèèçåçæå
 
 #. translators: The hardware is not able to run GNOME 3's
 #. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:873
+#: ../panels/info/cc-info-panel.c:879
 msgctxt "Experience"
 msgid "Fallback"
 msgstr "åç"
 
 #. translators: The hardware is able to run GNOME 3's
 #. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:879
+#: ../panels/info/cc-info-panel.c:885
 msgctxt "Experience"
 msgid "Standard"
 msgstr "æå"
 
-#: ../panels/info/cc-info-panel.c:1202
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Ask what to do"
 msgstr "èéåäåç"
 
-#: ../panels/info/cc-info-panel.c:1206
+#: ../panels/info/cc-info-panel.c:1231
 msgid "Do nothing"
 msgstr "äåç"
 
-#: ../panels/info/cc-info-panel.c:1210
+#: ../panels/info/cc-info-panel.c:1235
 msgid "Open folder"
 msgstr "æåæäå"
 
-#: ../panels/info/cc-info-panel.c:1295
+#: ../panels/info/cc-info-panel.c:1326
 msgid "Other Media"
 msgstr "åäåä"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1357
 msgid "Select an application for audio CDs"
 msgstr "éæææéé CD çåççå"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Select an application for video DVDs"
 msgstr "éæææèé DVD çåççå"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-panel.c:1359
 msgid "Select an application to run when a music player is connected"
 msgstr "éæèåèæéäææååèèçåççå"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-panel.c:1360
 msgid "Select an application to run when a camera is connected"
 msgstr "éæèåèæçæåèèçåççå"
 
-#: ../panels/info/cc-info-panel.c:1330
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Select an application for software CDs"
 msgstr "éæèåæåèä CD æèèçåççå"
 
@@ -969,94 +952,94 @@ msgstr "éæèåæåèä CD æèèçåççå"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1373
 msgid "audio DVD"
 msgstr "éé DVD"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1374
 msgid "blank Blu-ray disc"
 msgstr "ççèååç"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1375
 msgid "blank CD disc"
 msgstr "çç CD åç"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1376
 msgid "blank DVD disc"
 msgstr "çç DVD åç"
 
 # çç HD DVD åç
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1377
 msgid "blank HD DVD disc"
 msgstr "çç HD DVD åç"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Blu-ray video disc"
 msgstr "èåèéåç"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1379
 msgid "e-book reader"
 msgstr "çåäéèå"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1380
 msgid "HD DVD video disc"
 msgstr "HD DVD èéåç"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1381
 msgid "Picture CD"
 msgstr "åç CD"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1382
 msgid "Super Video CD"
 msgstr "èç VCD"
 
-#: ../panels/info/cc-info-panel.c:1352
+#: ../panels/info/cc-info-panel.c:1383
 msgid "Video CD"
 msgstr "èé CD"
 
-#: ../panels/info/cc-info-panel.c:1353
+#: ../panels/info/cc-info-panel.c:1384
 msgid "Windows software"
 msgstr "Windows èä"
 
-#: ../panels/info/cc-info-panel.c:1354
+#: ../panels/info/cc-info-panel.c:1385
 msgid "Software"
 msgstr "èä"
 
-#: ../panels/info/cc-info-panel.c:1477
-#: ../panels/keyboard/keyboard-shortcuts.c:1569
+#: ../panels/info/cc-info-panel.c:1508
+#: ../panels/keyboard/keyboard-shortcuts.c:1667
 msgid "Section"
 msgstr "è"
 
-#: ../panels/info/cc-info-panel.c:1486 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
 msgid "Overview"
 msgstr "æå"
 
-#: ../panels/info/cc-info-panel.c:1492 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
 msgid "Default Applications"
 msgstr "éèåççå"
 
-#: ../panels/info/cc-info-panel.c:1497 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
 msgid "Removable Media"
 msgstr "åçåäè"
 
-#: ../panels/info/cc-info-panel.c:1502 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "åå"
 
-#: ../panels/info/cc-info-panel.c:1704
+#: ../panels/info/cc-info-panel.c:1735
 #, c-format
 msgid "Version %s"
 msgstr "çæ %s"
 
-#: ../panels/info/cc-info-panel.c:1754
+#: ../panels/info/cc-info-panel.c:1785
 msgid "Install Updates"
 msgstr "åèææ"
 
-#: ../panels/info/cc-info-panel.c:1758
+#: ../panels/info/cc-info-panel.c:1789
 msgid "System Up-To-Date"
 msgstr "ççåæææ"
 
-#: ../panels/info/cc-info-panel.c:1762
+#: ../panels/info/cc-info-panel.c:1793
 msgid "Checking for Updates"
 msgstr "æåææææ"
 
@@ -1084,8 +1067,8 @@ msgid "Select how other media should be handled"
 msgstr "éæåäåçåääè"
 
 #: ../panels/info/info.ui.h:2
-msgid "Acti_on:"
-msgstr "åä(_O)ï"
+msgid "_Action:"
+msgstr "åä(_A)ï"
 
 #: ../panels/info/info.ui.h:3
 msgid "_Type:"
@@ -1169,7 +1152,7 @@ msgstr "äèæåæääæçæååçå(_N)"
 
 #: ../panels/info/info.ui.h:27
 msgid "Driver"
-msgstr "éå"
+msgstr "éåå"
 
 #: ../panels/info/info.ui.h:28
 msgid "Experience"
@@ -1225,9 +1208,10 @@ msgid "Eject"
 msgstr "åå"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:30
-msgid "Input Sources"
-msgstr "èåæ"
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/universal-access/uap.ui.h:68
+msgid "Typing"
+msgstr "æå"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
 #: ../panels/region/gnome-region-panel.ui.h:26
@@ -1269,29 +1253,33 @@ msgstr "æç"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:1
 msgid "Screenshots"
-msgstr "æå"
-
-#: ../panels/keyboard/01-screenshot.xml.in.h:2
-msgid "Take a screenshot"
-msgstr "åååæå"
+msgstr "æå"
 
+# ääéçåèæâäçâçåã
+#. translators: Pictures is the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:3
-msgid "Take a screenshot of a window"
-msgstr "åçåæå"
-
-#: ../panels/keyboard/01-screenshot.xml.in.h:4
-msgid "Take a screenshot of an area"
-msgstr "åéåæå"
+msgid "Save a screenshot to Pictures"
+msgstr "åååæåäåååççå"
 
+#. translators: Pictures is the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:5
+msgid "Save a screenshot of a window to Pictures"
+msgstr "åçåæåäåååççå"
+
+#. translators: Pictures is the name of the XDG Pictures directory
+#: ../panels/keyboard/01-screenshot.xml.in.h:7
+msgid "Save a screenshot of an area to Pictures"
+msgstr "åéåæåäåååççå"
+
+#: ../panels/keyboard/01-screenshot.xml.in.h:8
 msgid "Copy a screenshot to clipboard"
 msgstr "ååæåååèæ"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:6
+#: ../panels/keyboard/01-screenshot.xml.in.h:9
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "ååçåæåååèæ"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: ../panels/keyboard/01-screenshot.xml.in.h:10
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "ååéåæåååèæ"
 
@@ -1345,6 +1333,25 @@ msgstr "ååææåå"
 msgid "High contrast on or off"
 msgstr "éåæååæå"
 
+#. translators:
+#. * The device has been disabled
+#: ../panels/keyboard/cc-keyboard-option.c:241
+#: ../panels/keyboard/cc-keyboard-option.c:347
+#: ../panels/keyboard/keyboard-shortcuts.c:1132
+#: ../panels/sound/gvc-mixer-control.c:1834
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "çç"
+
+#: ../panels/keyboard/cc-keyboard-option.c:315
+msgid "Alternative Characters Key"
+msgstr "æäçåçé"
+
+#: ../panels/keyboard/cc-keyboard-option.c:320
+msgid "Compose Key"
+msgstr "çåé"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
@@ -1389,14 +1396,13 @@ msgstr "éå(_S)ï"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/mouse/gnome-mouse-properties.ui.h:24
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Short"
 msgstr "ç"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Slow"
 msgstr "æ"
 
@@ -1406,14 +1412,13 @@ msgstr "éåééå"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
-#: ../panels/universal-access/uap.ui.h:55
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "é"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Fast"
 msgstr "å"
 
@@ -1437,11 +1442,6 @@ msgstr "åæéçéå"
 msgid "Layout Settings"
 msgstr "ååèç"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:71
-msgid "Typing"
-msgstr "æå"
-
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
 msgstr "æååæé"
@@ -1463,28 +1463,16 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "åæé"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:553
-#: ../panels/keyboard/keyboard-shortcuts.c:561
-#: ../panels/keyboard/keyboard-shortcuts.c:873
-#: ../panels/keyboard/keyboard-shortcuts.c:1325
-#: ../panels/keyboard/keyboard-shortcuts.c:1329
+#: ../panels/keyboard/keyboard-shortcuts.c:557
+#: ../panels/keyboard/keyboard-shortcuts.c:565
 msgid "Custom Shortcuts"
 msgstr "èåäåæé"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:721
+#: ../panels/keyboard/keyboard-shortcuts.c:776
 msgid "<Unknown Action>"
 msgstr "<æçåä>"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1025
-#: ../panels/sound/gvc-mixer-control.c:1834
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "çç"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1164
+#: ../panels/keyboard/keyboard-shortcuts.c:1273
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1494,7 +1482,7 @@ msgstr ""
 "â%sâäèçäåæéïåääçæéåæææåèåã\n"
 "èçå CtrlãAlt æ Shift éåèäæ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1196
+#: ../panels/keyboard/keyboard-shortcuts.c:1305
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1503,24 +1491,19 @@ msgstr ""
 "åæéâ%sâåèçä\n"
 "â%sâ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1201
+#: ../panels/keyboard/keyboard-shortcuts.c:1310
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "åæäéæåéåæé %sïååæé %s åèçç"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1207
+#: ../panels/keyboard/keyboard-shortcuts.c:1316
 msgid "_Reassign"
 msgstr "éæåé(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1618
-#: ../panels/wacom/cc-wacom-page.c:620
-msgid "Action"
-msgstr "åä"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1640
-msgid "Shortcut"
-msgstr "åæé"
+#: ../panels/mouse/cc-mouse-panel.c:152
+msgid "_Test Your Settings"
+msgstr "æèæçèç(_T)"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
 msgid "Mouse & Touchpad"
@@ -1545,133 +1528,105 @@ msgstr "éæééé"
 msgid "General"
 msgstr "åè"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
-msgid "_Right-handed"
-msgstr "æçåæ(_R)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+msgid "Double-click timeout"
+msgstr "ååèæ"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
-msgid "_Left-handed"
-msgstr "æçåæ(_L)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+msgid "_Double-click"
+msgstr "åå(_D)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
-msgid "Sh_ow position of pointer when the Control key is pressed"
-msgstr "æä Ctrl éææçæéäç(_O)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+msgid "Primary _button"
+msgstr "äæé(_B)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "Pointer Speed"
-msgstr "æééå"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+msgid "_Left"
+msgstr "å(_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
-msgid "A_cceleration:"
-msgstr "åé(_C)ï"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+msgid "_Right"
+msgstr "å(_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "_Sensitivity:"
-msgstr "çæå(_S)ï"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+msgid "Mouse"
+msgstr "éæ"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:13
-msgctxt "Mouse sensitivity"
-msgid "Low"
-msgstr "ä"
+msgid "_Pointer speed"
+msgstr "æééå(_P)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-msgctxt "Mouse sensitivity"
-msgid "High"
-msgstr "é"
+msgid "Touchpad"
+msgstr "èææ"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:15
-msgid "Drag and Drop"
-msgstr "ææ"
+msgid "Disable while _typing"
+msgstr "æåæçç(_T)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "Thr_eshold:"
-msgstr "éå(_E)ï"
-
-#. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
-#: ../panels/universal-access/uap.ui.h:84
-msgid "Small"
-msgstr "å"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:19
-msgid "Drag Threshold"
-msgstr "æåéå"
-
-#. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
-#: ../panels/universal-access/uap.ui.h:86
-msgid "Large"
-msgstr "å"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:22
-msgid "Double-Click Timeout"
-msgstr "ååèæ"
+msgid "Tap to _click"
+msgstr "èèèççå(_C)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
-msgid "_Timeout:"
-msgstr "èæ(_T)ï"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
-msgid "Double-click timeout"
-msgstr "ååèæ"
-
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
-msgid "To test your settings, try to double-click on the face."
-msgstr "èæèæçèçïèèçåååäçåèã"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+msgid "Two _finger scroll"
+msgstr "åææå(_F)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
-msgid "Mouse"
-msgstr "éæ"
+#, fuzzy
+#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+msgid "C_ontent sticks to fingers"
+msgstr "èçææçåå(_O)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
-msgid "Disable _touchpad while typing"
-msgstr "æåæççèææ(_T)"
+#: ../panels/mouse/gnome-mouse-test.c:134
+#: ../panels/mouse/gnome-mouse-test.ui.h:1
+msgid "Try clicking, double clicking, scrolling"
+msgstr "åèååïååïæå"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
-msgid "Enable _mouse clicks with touchpad"
-msgstr "åçèææçéæçå(_M)"
+#: ../panels/mouse/gnome-mouse-test.c:139
+msgid "Five clicks, GEGL time!"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
-msgid "Scrolling"
-msgstr "æå"
+#: ../panels/mouse/gnome-mouse-test.c:144
+msgid "Double click, primary button"
+msgstr "ååïäé"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "_Disabled"
-msgstr "çç(_D)"
+#: ../panels/mouse/gnome-mouse-test.c:144
+msgid "Single click, primary button"
+msgstr "ååïäé"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
-msgid "_Edge scrolling"
-msgstr "èçæå(_E)"
+#: ../panels/mouse/gnome-mouse-test.c:147
+msgid "Double click, middle button"
+msgstr "ååïäé"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:34
-msgid "Two-_finger scrolling"
-msgstr "åææå(_F)"
+#: ../panels/mouse/gnome-mouse-test.c:147
+msgid "Single click, middle button"
+msgstr "ååïäé"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
-msgid "Enable h_orizontal scrolling"
-msgstr "åçæåæå(_O)"
+#: ../panels/mouse/gnome-mouse-test.c:150
+msgid "Double click, secondary button"
+msgstr "ååïæé"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Touchpad"
-msgstr "èææ"
+#: ../panels/mouse/gnome-mouse-test.c:150
+msgid "Single click, secondary button"
+msgstr "ååïæé"
 
-#: ../panels/network/cc-network-panel.c:627
+#: ../panels/network/cc-network-panel.c:615
 msgid "Network proxy"
 msgstr "ççäç"
 
-#: ../panels/network/cc-network-panel.c:811 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:878
+#: ../panels/network/cc-network-panel.c:866
 msgid "The system network services are not compatible with this version."
 msgstr "çççççæåäæçæçççççåäååã"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:1013
+#: ../panels/network/cc-network-panel.c:1001
 msgid "Air_plane Mode"
 msgstr "éèæå(_P)"
 
@@ -1695,125 +1650,139 @@ msgstr "æåæèæ"
 
 #. Translators: network device speed
 #: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:697
+#: ../panels/network/net-device-wifi.c:759
 #: ../panels/network/net-device-wired.c:126
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/ç"
 
-#. TRANSLATORS: this is when the access point is not listed in
-#. *  the dropdown (or hidden) and the user has to select another
-#. *  entry manually
-#: ../panels/network/net-device-wifi.c:196
+#. TRANSLATORS: this is when the access point is not shown
+#. * in the list and the user has to enter the SSID manually
+#.
+#: ../panels/network/net-device-wifi.c:192
 msgid "Connect to a Hidden Network"
 msgstr "èæåéèçç"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:293
-#: ../panels/network/net-device-wifi.c:466
+#: ../panels/network/net-device-wifi.c:291
+#: ../panels/network/net-device-wifi.c:470
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:297
-#: ../panels/network/net-device-wifi.c:470
+#: ../panels/network/net-device-wifi.c:295
+#: ../panels/network/net-device-wifi.c:474
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:301
+#: ../panels/network/net-device-wifi.c:299
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:306
+#: ../panels/network/net-device-wifi.c:304
 msgid "Enterprise"
 msgstr "ää"
 
-#. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/net-device-wifi.c:312
-#: ../panels/network/net-device-wifi.c:461
-#: ../panels/universal-access/uap.ui.h:8 ../panels/wacom/cc-wacom-page.c:335
-#: ../panels/wacom/cc-wacom-page.c:352
+#: ../panels/network/net-device-wifi.c:309
+#: ../panels/network/net-device-wifi.c:465
+msgctxt "Wifi security"
 msgid "None"
 msgstr "æ"
 
-#: ../panels/network/net-device-wifi.c:738
+#: ../panels/network/net-device-wifi.c:686
+msgid "never"
+msgstr "ää"
+
+#: ../panels/network/net-device-wifi.c:696
+msgid "today"
+msgstr "äå"
+
+#: ../panels/network/net-device-wifi.c:698
+msgid "yesterday"
+msgstr "æå"
+
+#: ../panels/network/net-device-wifi.c:700
+#, c-format
+msgid "%i day ago"
+msgid_plural "%i days ago"
+msgstr[0] "%i åå"
+
+#. TRANSLATORS: VPN status
+#: ../panels/network/net-device-wifi.c:769
+#: ../panels/network/panel-common.c:277
+msgid "Not connected"
+msgstr "æèæ"
+
+#: ../panels/network/net-device-wifi.c:771
+#: ../panels/network/net-device-wifi.c:2075
+msgid "Out of range"
+msgstr "èåèå"
+
+#: ../panels/network/net-device-wifi.c:802
 msgctxt "Signal strength"
 msgid "None"
 msgstr "æ"
 
-#: ../panels/network/net-device-wifi.c:740
+#: ../panels/network/net-device-wifi.c:804
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "åå"
 
-#: ../panels/network/net-device-wifi.c:742
+#: ../panels/network/net-device-wifi.c:806
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "äè"
 
-#: ../panels/network/net-device-wifi.c:744
+#: ../panels/network/net-device-wifi.c:808
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "èå"
 
-#: ../panels/network/net-device-wifi.c:746
+#: ../panels/network/net-device-wifi.c:810
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "èå"
 
-#: ../panels/network/net-device-wifi.c:890
+#: ../panels/network/net-device-wifi.c:994
 #, c-format
 msgid ""
 "Network details for %s including password and any custom configuration will "
-"be lost"
-msgstr "çç %s åæåçåèåäèççææçèéåäå"
+"be lost."
+msgstr "çç %s åæåçååéèåäèçççèéåäåã"
 
-#: ../panels/network/net-device-wifi.c:901
+#: ../panels/network/net-device-wifi.c:1005
 msgid "Forget"
 msgstr "åè"
 
-#: ../panels/network/net-device-wifi.c:1403
-msgid "Not connected to the internet."
-msgstr "æèæåäèçã"
-
-#: ../panels/network/net-device-wifi.c:1404
-msgid "Create the hotspot anyway?"
-msgstr "äçååççï"
+#: ../panels/network/net-device-wifi.c:1541
+msgid ""
+"If you have a connection to the Internet other than wireless, you can use it "
+"to share your internet connection with others."
+msgstr ""
+"åæææéæçççäåçæåèæåäèçïæåääçåæäåääåääæçä"
+"èçèæã"
 
-#: ../panels/network/net-device-wifi.c:1422
+#: ../panels/network/net-device-wifi.c:1545
 #, c-format
-msgid "Disconnect from %s and create a new hotspot?"
-msgstr "ä %s æååååääæççï"
-
-#: ../panels/network/net-device-wifi.c:1425
-msgid "This is your only connection to the internet."
-msgstr "èæææäçäèçèæã"
+msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+msgstr "åææççççääåæä <b>%s</b> æçã"
 
-#: ../panels/network/net-device-wifi.c:1445
-msgid "Create _Hotspot"
-msgstr "ååçç(_H)"
+#: ../panels/network/net-device-wifi.c:1549
+msgid ""
+"It is not possible to access the internet through your wireless while the "
+"hotspot is active."
+msgstr "åççåäçææææéèæçççèéäèççã"
 
-#: ../panels/network/net-device-wifi.c:1512
+#: ../panels/network/net-device-wifi.c:1615
 msgid "Stop hotspot and disconnect any users?"
 msgstr "åæççåæåææçæï"
 
-#: ../panels/network/net-device-wifi.c:1515
+#: ../panels/network/net-device-wifi.c:1618
 msgid "_Stop Hotspot"
 msgstr "åæçç(_S)"
 
-#: ../panels/network/net-device-wifi.c:1580
-#, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "%i åå"
-
-#: ../panels/network/net-device-wifi.c:1924
-#: ../panels/network/network-wifi.ui.h:17
-msgid "Out of range"
-msgstr "èåèå"
-
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: ../panels/network/net-proxy.c:67
 msgid ""
@@ -1841,32 +1810,31 @@ msgid "Provider"
 msgstr "æäå"
 
 #: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:697 ../panels/network/panel-common.c:699
+#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP åå"
 
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:4
-#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:695
+#: ../panels/network/network-wifi.ui.h:13
+#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
 msgid "IPv6 Address"
 msgstr "IPv6 åå"
 
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:5
-#: ../panels/network/network-wired.ui.h:5
+#: ../panels/network/network-wifi.ui.h:14
+#: ../panels/network/network-wired.ui.h:4
 msgid "Default Route"
 msgstr "éèèç"
 
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:6
-#: ../panels/network/network-wired.ui.h:6
+#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/network-wired.ui.h:5
 msgid "DNS"
 msgstr "DNS"
 
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-wifi.ui.h:10
-#: ../panels/network/network-wired.ui.h:7
+#: ../panels/network/network-wired.ui.h:6
 msgid "_Options..."
 msgstr "éé(_O)..."
 
@@ -1954,82 +1922,90 @@ msgid "_Configure..."
 msgstr "éç(_C)..."
 
 #: ../panels/network/network-wifi.ui.h:1
+msgid "Wireless Hotspot"
+msgstr "æççç"
+
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Turn On"
+msgstr "åå(_T)"
+
+#. TRANSLATORS: device type
+#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
+msgid "Wireless"
+msgstr "æç"
+
+#: ../panels/network/network-wifi.ui.h:4
 msgid "_Use as Hotspot..."
 msgstr "çäçç(_U)..."
 
-#: ../panels/network/network-wifi.ui.h:2
+#: ../panels/network/network-wifi.ui.h:5
+msgid "_Disconnect"
+msgstr "æåèæ(_D)"
+
+#: ../panels/network/network-wifi.ui.h:6
+msgid "_Connect"
+msgstr "èæ(_C)"
+
+#: ../panels/network/network-wifi.ui.h:7
+msgid "Last used"
+msgstr "äæäçç"
+
+#: ../panels/network/network-wifi.ui.h:8
 #: ../panels/network/network-wired.ui.h:1
 msgid "Hardware Address"
 msgstr "çäåå"
 
-#: ../panels/network/network-wifi.ui.h:3
-#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:694
-msgid "IPv4 Address"
-msgstr "IPv4 åå"
-
-#: ../panels/network/network-wifi.ui.h:7
+#: ../panels/network/network-wifi.ui.h:9
 msgid "Security"
 msgstr "ååæ"
 
-#: ../panels/network/network-wifi.ui.h:8
+#: ../panels/network/network-wifi.ui.h:10
 msgid "Strength"
 msgstr "åå"
 
-#: ../panels/network/network-wifi.ui.h:9
+#: ../panels/network/network-wifi.ui.h:11
 msgid "Link speed"
 msgstr "èæéå"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Wireless Hotspot"
-msgstr "æççç"
-
 #: ../panels/network/network-wifi.ui.h:12
+#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
+msgid "IPv4 Address"
+msgstr "IPv4 åå"
+
+#: ../panels/network/network-wifi.ui.h:16
+msgid "_Forget Network"
+msgstr "åèçç(_F)"
+
+#: ../panels/network/network-wifi.ui.h:17
+msgid "_Settings..."
+msgstr "èç(_S)..."
+
+#: ../panels/network/network-wifi.ui.h:18
 msgid "Switch off to connect to a wireless network"
 msgstr "åéäèæåæççç"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: ../panels/network/network-wifi.ui.h:19
 msgid "Network Name"
 msgstr "ççåç"
 
-#: ../panels/network/network-wifi.ui.h:14
+#: ../panels/network/network-wifi.ui.h:20
 msgid "Connected Devices"
 msgstr "åèæçèå"
 
-#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/network-wifi.ui.h:21
 msgid "Security type"
 msgstr "ååçå"
 
-#: ../panels/network/network-wifi.ui.h:16
+#: ../panels/network/network-wifi.ui.h:22
 msgid "Security key"
 msgstr "åååé"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "Security Key"
-msgstr "åååé"
-
-#: ../panels/network/network-wifi.ui.h:19
-msgid "Last used"
-msgstr "äæäç"
-
-#: ../panels/network/network-wifi.ui.h:20
-msgid "_Forget Network"
-msgstr "åèçç(_F)"
-
-#: ../panels/network/network-wired.ui.h:4
-msgid "Subnet Mask"
-msgstr "åçæç"
-
 #. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:86
 msgid "Wired"
 msgstr "æç"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:90
-msgid "Wireless"
-msgstr "æç"
-
-#. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:97
 msgid "Mobile broadband"
 msgstr "çååå"
@@ -2066,7 +2042,7 @@ msgstr "åäçå"
 
 #: ../panels/network/panel-common.c:206
 msgid "Cable unplugged"
-msgstr "ççææå"
+msgstr "ççèæå"
 
 #: ../panels/network/panel-common.c:208
 msgid "Unavailable"
@@ -2112,11 +2088,6 @@ msgstr "èæåè"
 msgid "Status unknown (missing)"
 msgstr "æççæ(äå)"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:277
-msgid "Not connected"
-msgstr "æèæ"
-
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:301
 msgid "Configuration failed"
@@ -2140,22 +2111,22 @@ msgstr "éèèèåæïäæææä"
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:317
 msgid "802.1x supplicant disconnected"
-msgstr "802.1x çèæåæå"
+msgstr "802.1x åæçåæå"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:321
 msgid "802.1x supplicant configuration failed"
-msgstr "802.1x çèæéçåè"
+msgstr "802.1x åæçéçåè"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:325
 msgid "802.1x supplicant failed"
-msgstr "802.1x çèæåè"
+msgstr "802.1x åæçåè"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:329
 msgid "802.1x supplicant took too long to authenticate"
-msgstr "802.1x çèæèèèæèé"
+msgstr "802.1x åæçèèèæèé"
 
 #. TRANSLATORS: device status reason
 #: ../panels/network/panel-common.c:333
@@ -2332,43 +2303,41 @@ msgstr "ééäèèåäææåèææå"
 msgid "Connection dependency failed"
 msgstr "èæäèåè"
 
-#. translators: This is the title of the "Add Account" dialogue.
-#. * The title is not visible when using GNOME Shell
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:252
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:263
+#. translators: This is the title of the "Add Account" dialog.
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:249
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "æåèæ"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:340
+#: ../panels/online-accounts/cc-online-accounts-panel.c:383
 msgid "Error logging into the account"
 msgstr "çååèèæåé"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:394
+#: ../panels/online-accounts/cc-online-accounts-panel.c:437
 msgid "Expired credentials. Please log in again."
-msgstr "åæèæãèéæçåã"
+msgstr "èäèæãèéæçåã"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:397
+#: ../panels/online-accounts/cc-online-accounts-panel.c:440
 msgid "_Log In"
 msgstr "çå(_L)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:551
+#: ../panels/online-accounts/cc-online-accounts-panel.c:676
 msgid "Error creating account"
 msgstr "ååèæåé"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:593
+#: ../panels/online-accounts/cc-online-accounts-panel.c:718
 msgid "Error removing account"
 msgstr "çéèæåé"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:629
+#: ../panels/online-accounts/cc-online-accounts-panel.c:754
 msgid "Are you sure you want to remove the account?"
 msgstr "æçåèçéèèæåï"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:631
+#: ../panels/online-accounts/cc-online-accounts-panel.c:756
 msgid "This will not remove the account on the server."
 msgstr "èääåèèæäæååäçéã"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:632
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
 msgid "_Remove"
 msgstr "çé(_R)"
 
@@ -2385,7 +2354,7 @@ msgstr "ççåçèæ"
 msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;çç;å"
-"ç;èå;æå;éä;èçä"
+"ç;èå;æå;éä;èçä;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:1
 msgid "No online accounts configured"
@@ -2399,24 +2368,25 @@ msgstr "çéèæ"
 msgid "Add an online account"
 msgstr "æååçèæ"
 
+# çääçè
 #: ../panels/online-accounts/online-accounts.ui.h:5
 msgid ""
 "Adding an account allows your applications to access it for documents, mail, "
 "contacts, calendar, chat and more."
 msgstr ""
-"æåääèæïèæçåççåèéåæçææãéäãèçäãæåãèåççã"
+"æåääèæïèæçåççåèéèæçææãéäãèçäãæåãèåççã"
 
-#: ../panels/power/cc-power-panel.c:170
+#: ../panels/power/cc-power-panel.c:157
 msgid "Unknown time"
 msgstr "æçæé"
 
-#: ../panels/power/cc-power-panel.c:176
+#: ../panels/power/cc-power-panel.c:163
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i åé"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:175
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2424,172 +2394,177 @@ msgstr[0] "%i åæ"
 
 #. 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:196
+#: ../panels/power/cc-power-panel.c:183
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:197
+#: ../panels/power/cc-power-panel.c:184
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "æ"
 
-#: ../panels/power/cc-power-panel.c:198
+#: ../panels/power/cc-power-panel.c:185
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:241
+#: ../panels/power/cc-power-panel.c:228
 #, c-format
 msgid "Charging - %s until fully charged"
 msgstr "æååç - åä %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:249
+#: ../panels/power/cc-power-panel.c:236
 #, c-format
 msgid "Caution low battery, %s remaining"
 msgstr "çæçéäïåä %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:257
+#: ../panels/power/cc-power-panel.c:244
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "äççæ - åä %s"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
+#: ../panels/power/cc-power-panel.c:261
 msgid "Charging"
 msgstr "æååç"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:279
+#: ../panels/power/cc-power-panel.c:266
 msgid "Using battery power"
 msgstr "äççæ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:283
+#: ../panels/power/cc-power-panel.c:270
 msgid "Charging - fully charged"
 msgstr "åçåæ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:287
+#: ../panels/power/cc-power-panel.c:274
 msgid "Empty"
 msgstr "çæåç"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:355
+#: ../panels/power/cc-power-panel.c:342
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "UPS çéäïåä %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:361
+#: ../panels/power/cc-power-panel.c:348
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "äç UPS - åä %s"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:379
+#: ../panels/power/cc-power-panel.c:366
 msgid "Caution low UPS"
 msgstr "UPS çéä"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:384
+#: ../panels/power/cc-power-panel.c:371
 msgid "Using UPS power"
 msgstr "äç UPS"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:436
+#: ../panels/power/cc-power-panel.c:423
 msgid "Your secondary battery is fully charged"
 msgstr "æçèçæååæ"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:440
+#: ../panels/power/cc-power-panel.c:427
 msgid "Your secondary battery is empty"
 msgstr "æçèçæåç"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:523
+#: ../panels/power/cc-power-panel.c:510
 msgid "Wireless mouse"
 msgstr "æçéæ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:514
 msgid "Wireless keyboard"
 msgstr "æçéç"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:531
+#: ../panels/power/cc-power-panel.c:518
 msgid "Uninterruptible power supply"
 msgstr "äéæçæ(UPS)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
+#: ../panels/power/cc-power-panel.c:522
 msgid "Personal digital assistant"
 msgstr "ääæååç(PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
+#: ../panels/power/cc-power-panel.c:526
 msgid "Cellphone"
 msgstr "ææ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:530
 msgid "Media player"
 msgstr "åäææå"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:547
+#: ../panels/power/cc-power-panel.c:534
 msgid "Tablet"
 msgstr "æåæ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:551
+#: ../panels/power/cc-power-panel.c:538
 msgid "Computer"
 msgstr "èçæ"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:555
+#: ../panels/power/cc-power-panel.c:542
 msgid "Battery"
 msgstr "çæ"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:566
+#: ../panels/power/cc-power-panel.c:553
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "æååç"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:573
+#: ../panels/power/cc-power-panel.c:560
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "èå"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:578
+#: ../panels/power/cc-power-panel.c:565
 msgctxt "Battery power"
 msgid "Low"
 msgstr "ä"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:583
+#: ../panels/power/cc-power-panel.c:570
 msgctxt "Battery power"
 msgid "Good"
 msgstr "åè"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:588
+#: ../panels/power/cc-power-panel.c:575
 msgctxt "Battery power"
 msgid "Charging - fully charged"
 msgstr "åç -ååæ"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:592
+#: ../panels/power/cc-power-panel.c:579
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "ç"
 
+#: ../panels/power/cc-power-panel.c:1075
+msgid ""
+"Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
+msgstr "æçï<a href=\"screen\">ååäå</a>ååçéäç"
+
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "çæ"
@@ -2648,238 +2623,191 @@ msgid "When power is _critically low"
 msgstr "çéäéäèæ(_C)ï"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:554
+#: ../panels/printers/cc-printers-panel.c:589
 msgid "Low on toner"
 msgstr "åçäè"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:556
+#: ../panels/printers/cc-printers-panel.c:591
 msgid "Out of toner"
 msgstr "åççå"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:559
+#: ../panels/printers/cc-printers-panel.c:594
 msgid "Low on developer"
 msgstr "æååäè"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:562
+#: ../panels/printers/cc-printers-panel.c:597
 msgid "Out of developer"
 msgstr "æååçå"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:564
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Low on a marker supply"
 msgstr "æèåæäè"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:566
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Out of a marker supply"
 msgstr "æèåæçå"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:568
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Open cover"
 msgstr "æåäç"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:570
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open door"
 msgstr "æååé"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:572
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Low on paper"
 msgstr "çåäè"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:574
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Out of paper"
 msgstr "çåçå"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:576
+#: ../panels/printers/cc-printers-panel.c:611
 msgctxt "printer state"
 msgid "Offline"
 msgstr "çç"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:578
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Paused"
 msgstr "åæå"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:580
+#: ../panels/printers/cc-printers-panel.c:615
 msgid "Waste receptacle almost full"
 msgstr "åçäåæ"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:582
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle full"
 msgstr "åçäåæ"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:584
+#: ../panels/printers/cc-printers-panel.c:619
 msgid "The optical photo conductor is near end of life"
 msgstr "æåéæèäçåå"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:586
+#: ../panels/printers/cc-printers-panel.c:621
 msgid "The optical photo conductor is no longer functioning"
 msgstr "æåéææåä"
 
+#. Translators: Printer's state (printer is being configured right now)
+#: ../panels/printers/cc-printers-panel.c:724
+msgctxt "printer state"
+msgid "Configuring"
+msgstr "æåéç"
+
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:759
+#: ../panels/printers/cc-printers-panel.c:781
 msgctxt "printer state"
 msgid "Ready"
 msgstr "åç"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:763
+#: ../panels/printers/cc-printers-panel.c:785
 msgctxt "printer state"
 msgid "Processing"
 msgstr "æååç"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:767
+#: ../panels/printers/cc-printers-panel.c:789
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "ååæ"
 
 # ääåälevelääèäâéâæå
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:886
+#: ../panels/printers/cc-printers-panel.c:906
 msgid "Toner Level"
 msgstr "ççé"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:889
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Ink Level"
 msgstr "åæé"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:892
+#: ../panels/printers/cc-printers-panel.c:912
 msgid "Supply Level"
 msgstr "èæé"
 
-#. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:907
-#: ../panels/printers/cc-printers-panel.c:1306
-#, c-format
-msgid "%u active"
-msgid_plural "%u active"
-msgstr[0] "%u éæåäå"
+#. Translators: Printer's state (printer is being installed right now)
+#: ../panels/printers/cc-printers-panel.c:930
+msgctxt "printer state"
+msgid "Installing"
+msgstr "æååè"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1018
+#: ../panels/printers/cc-printers-panel.c:1107
 msgid "No printers available"
 msgstr "æåçæåæ"
 
-#. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1349
-msgctxt "print job"
-msgid "Pending"
-msgstr "çåä"
-
-#. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1353
-msgctxt "print job"
-msgid "Held"
-msgstr "æè"
-
-#. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1357
-msgctxt "print job"
-msgid "Processing"
-msgstr "åçä"
-
-#. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1361
-msgctxt "print job"
-msgid "Stopped"
-msgstr "ååæ"
-
-#. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1365
-msgctxt "print job"
-msgid "Canceled"
-msgstr "ååæ"
-
-#. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1369
-msgctxt "print job"
-msgid "Aborted"
-msgstr "åäæ"
-
-#. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1373
-msgctxt "print job"
-msgid "Completed"
-msgstr "ååæ"
-
-#. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1453
-msgid "Job Title"
-msgstr "äåæé"
-
-#. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1462
-msgid "Job State"
-msgstr "äåçæ"
-
-#. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1468
-msgid "Time"
-msgstr "æé"
+#. Translators: there is n active print jobs on this printer
+#: ../panels/printers/cc-printers-panel.c:1411
+#, c-format
+msgid "%u active"
+msgid_plural "%u active"
+msgstr[0] "%u éæåäå"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1860
+#: ../panels/printers/cc-printers-panel.c:1731
 msgid "Failed to add new printer."
 msgstr "æåææåæåèã"
 
-#: ../panels/printers/cc-printers-panel.c:2012
+#: ../panels/printers/cc-printers-panel.c:1896
 msgid "Select PPD File"
 msgstr "éæ PPD æä"
 
-#: ../panels/printers/cc-printers-panel.c:2021
+#: ../panels/printers/cc-printers-panel.c:1905
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
 msgstr "PostScript æåææèæä(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2308
+#: ../panels/printers/cc-printers-panel.c:2210
 msgid "No suitable driver found"
 msgstr "ææååéçéå"
 
-#: ../panels/printers/cc-printers-panel.c:2377
+#: ../panels/printers/cc-printers-panel.c:2279
 msgid "Searching for preferred drivers..."
 msgstr "æåæçééçéå..."
 
-#: ../panels/printers/cc-printers-panel.c:2392
+#: ../panels/printers/cc-printers-panel.c:2294
 msgid "Select from database..."
 msgstr "äææåéæ..."
 
-#: ../panels/printers/cc-printers-panel.c:2401
+#: ../panels/printers/cc-printers-panel.c:2303
 msgid "Provide PPD File..."
 msgstr "æä PPD æä..."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2539
-#: ../panels/printers/cc-printers-panel.c:2553
+#: ../panels/printers/cc-printers-panel.c:2454
+#: ../panels/printers/cc-printers-panel.c:2477
 msgid "Test page"
 msgstr "æèé"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2915
+#: ../panels/printers/cc-printers-panel.c:2880
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ææèåçéï%s"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:147
 msgid "Printers"
 msgstr "æåæ"
 
@@ -2893,27 +2821,46 @@ msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "Printer;Queue;Print;Paper;Ink;Toner;æåæ;éå;æå;çå;åæ;åç;çé;åç"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "æåææåæ"
+#: ../panels/printers/jobs-dialog.ui.h:1
+#: ../panels/printers/options-dialog.ui.h:1
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid " "
+msgstr " "
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-msgid "A_ddress:"
-msgstr "åå(_D)ï"
+#: ../panels/printers/jobs-dialog.ui.h:2
+#: ../panels/printers/options-dialog.ui.h:4
+msgid "Close"
+msgstr "åé"
 
-#: ../panels/printers/new-printer-dialog.ui.h:3
-msgid "_Search by Address"
-msgstr "æååæç(_S)"
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/jobs-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "æåçäå"
 
-#: ../panels/printers/new-printer-dialog.ui.h:5
-#: ../panels/user-accounts/um-account-dialog.c:994
+#: ../panels/printers/jobs-dialog.ui.h:5
+msgid "Resume Printing"
+msgstr "æåæå"
+
+#: ../panels/printers/jobs-dialog.ui.h:6
+msgid "Pause Printing"
+msgstr "æåæå"
+
+#: ../panels/printers/jobs-dialog.ui.h:7
+msgid "Cancel Print Job"
+msgstr "åææåæäå"
+
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-account-dialog.c:1044
 msgid "_Add"
 msgstr "æå(_A)"
 
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Add a New Printer"
+msgstr "æåææåæ"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
+msgid "Search for network printers or filter result"
+msgstr "æçççæåææèæçæ"
 
 #: ../panels/printers/options-dialog.ui.h:2
 msgid "Options"
@@ -2923,22 +2870,12 @@ msgstr "éé"
 msgid "Loading options..."
 msgstr "æåèåéé..."
 
-#: ../panels/printers/options-dialog.ui.h:4
-msgid "Close"
-msgstr "åé"
-
 #: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:993
+#: ../panels/user-accounts/um-account-dialog.c:1043
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../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/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "æåèåéåææå..."
@@ -2985,67 +2922,72 @@ msgstr "æååè"
 msgid "Reverse portrait"
 msgstr "çååè"
 
-#: ../panels/printers/pp-new-printer-dialog.c:651
-msgid "Getting devices..."
-msgstr "æåèåèå..."
+#. Translators: Job's state (job is waiting to be printed)
+#: ../panels/printers/pp-jobs-dialog.c:143
+msgctxt "print job"
+msgid "Pending"
+msgstr "çåä"
 
-#. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1234
-msgid "No local printers found"
-msgstr "ææåæåæåæ"
+#. Translators: Job's state (job is held for printing)
+#: ../panels/printers/pp-jobs-dialog.c:147
+msgctxt "print job"
+msgid "Held"
+msgstr "æè"
 
-#. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1247
-msgid "No network printers found"
-msgstr "ææåççæåæ"
+#. Translators: Job's state (job is currently printing)
+#: ../panels/printers/pp-jobs-dialog.c:151
+msgctxt "print job"
+msgid "Processing"
+msgstr "åçä"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1339
-msgid ""
-"FirewallD is not running. Network printer detection needs services mdns, "
-"ipp, ipp-client and samba-client enabled on firewall."
-msgstr ""
-"FirewallD æèèãççæåæåèéèéçååè mdnsãippãipp-client å "
-"samba-client æåã"
+#. Translators: Job's state (job has been stopped)
+#: ../panels/printers/pp-jobs-dialog.c:155
+msgctxt "print job"
+msgid "Stopped"
+msgstr "ååæ"
 
-#. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1367
-#: ../panels/printers/pp-new-printer-dialog.c:1372
-msgid "Devices"
-msgstr "èå"
+#. Translators: Job's state (job has been canceled)
+#: ../panels/printers/pp-jobs-dialog.c:159
+msgctxt "print job"
+msgid "Canceled"
+msgstr "ååæ"
 
-#. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1397
-msgctxt "printer type"
-msgid "Local"
-msgstr "æå"
+#. Translators: Job's state (job has aborted due to error)
+#: ../panels/printers/pp-jobs-dialog.c:163
+msgctxt "print job"
+msgid "Aborted"
+msgstr "åäæ"
 
-#. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1399
-msgctxt "printer type"
-msgid "Network"
-msgstr "çç"
+#. Translators: Job's state (job has completed successfully)
+#: ../panels/printers/pp-jobs-dialog.c:167
+msgctxt "print job"
+msgid "Completed"
+msgstr "ååæ"
 
-#. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1440
-msgid "Device types"
-msgstr "èåçå"
+#. Translators: Name of column showing titles of print jobs
+#: ../panels/printers/pp-jobs-dialog.c:289
+msgid "Job Title"
+msgstr "äåæé"
 
-#. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1760
-msgid "Automatic configuration"
-msgstr "èåéç"
+#. Translators: Name of column showing statuses of print jobs
+#: ../panels/printers/pp-jobs-dialog.c:298
+msgid "Job State"
+msgstr "äåçæ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1783
-msgid "Opening firewall for mDNS connections"
-msgstr "ä mDNS èææåéçå"
+#. Translators: Name of column showing times of creation of print jobs
+#: ../panels/printers/pp-jobs-dialog.c:304
+msgid "Time"
+msgstr "æé"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1792
-msgid "Opening firewall for Samba connections"
-msgstr "ä Samba èææåéçå"
+#: ../panels/printers/pp-jobs-dialog.c:484
+#, c-format
+msgid "%s Active Jobs"
+msgstr "%s äæåçäå"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1801
-msgid "Opening firewall for IPP connections"
-msgstr "ä IPP èææåéçå"
+#. Translators: No printers were found
+#: ../panels/printers/pp-new-printer-dialog.c:1291
+msgid "No printers detected."
+msgstr "æææåæåæã"
 
 #: ../panels/printers/pp-options-dialog.c:82
 msgid "Two Sided"
@@ -3136,7 +3078,7 @@ msgid "Advanced"
 msgstr "éç"
 
 #. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:934
+#: ../panels/printers/pp-options-dialog.c:936
 #, c-format
 msgid "%s Options"
 msgstr "%s éé"
@@ -3214,10 +3156,10 @@ msgstr "éè(_D)"
 msgid "Jobs"
 msgstr "ää"
 
-#. Tanslators: Switch to tab containing printer's jobs
+#. Tanslators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
 msgid "_Show"
-msgstr "æç(_O)"
+msgstr "æç(_S)"
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
@@ -3225,7 +3167,7 @@ msgstr "åå"
 
 #: ../panels/printers/printers.ui.h:14
 msgid "page 1"
-msgstr "ç1é"
+msgstr "ç 1 é"
 
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
@@ -3233,7 +3175,7 @@ msgstr "æç"
 
 #: ../panels/printers/printers.ui.h:16
 msgid "page 2"
-msgstr "ç2é"
+msgstr "ç 2 é"
 
 #: ../panels/printers/printers.ui.h:17
 msgid "Setting new driver..."
@@ -3241,7 +3183,7 @@ msgstr "æåèçæéå..."
 
 #: ../panels/printers/printers.ui.h:18
 msgid "page 3"
-msgstr "ç3é"
+msgstr "ç 3 é"
 
 #. Translators: This button executes command which prints test page.
 #: ../panels/printers/printers.ui.h:20
@@ -3253,52 +3195,13 @@ msgstr "æåæèé(_T)"
 msgid "_Options"
 msgstr "éé(_O)"
 
-#. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:24
-msgid "_Back"
-msgstr "åé(_B)"
-
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:26
-msgid "Active Print Jobs"
-msgstr "æåçæåæäå"
-
-#: ../panels/printers/printers.ui.h:27
-msgid "Resume Printing"
-msgstr "æåæå"
-
-#: ../panels/printers/printers.ui.h:28
-msgid "Pause Printing"
-msgstr "æåæå"
-
-#: ../panels/printers/printers.ui.h:29
-msgid "Cancel Print Job"
-msgstr "åææåæäå"
-
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:31
-msgid "Printer Options"
-msgstr "æåæéé"
-
-#: ../panels/printers/printers.ui.h:32
-msgid "Add User"
-msgstr "æåçæ"
-
-#: ../panels/printers/printers.ui.h:33
-msgid "Remove User"
-msgstr "çéçæ"
-
-#: ../panels/printers/printers.ui.h:34
-msgid "Allowed users"
-msgstr "åèççæ"
-
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:36
+#: ../panels/printers/printers.ui.h:24
 msgid "Add New Printer"
 msgstr "æåææåæ"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:38
+#: ../panels/printers/printers.ui.h:26
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -3333,13 +3236,13 @@ msgstr "éæääèåæ"
 msgid "Select an input source to add"
 msgstr "éæääèæåçèåæ"
 
-#: ../panels/region/gnome-region-panel-system.c:330
+#: ../panels/region/gnome-region-panel-system.c:470
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
 msgstr "çåååãççèæåæçæåäççççâåååèèâèçã"
 
-#: ../panels/region/gnome-region-panel-system.c:335
+#: ../panels/region/gnome-region-panel-system.c:475
 #: ../panels/region/gnome-region-panel.ui.h:31
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
@@ -3349,11 +3252,11 @@ msgstr ""
 "çåååãççèæåæçæåäççççâåååèèâèçãæåäåééæéäæ"
 "çåççèçã"
 
-#: ../panels/region/gnome-region-panel-system.c:338
+#: ../panels/region/gnome-region-panel-system.c:478
 msgid "Copy Settings"
 msgstr "ååèç"
 
-#: ../panels/region/gnome-region-panel-system.c:341
+#: ../panels/region/gnome-region-panel-system.c:481
 #: ../panels/region/gnome-region-panel.ui.h:38
 msgid "Copy Settings..."
 msgstr "ååèç..."
@@ -3462,6 +3365,10 @@ msgstr "Ctrl+Alt+Shift+Space"
 msgid "Shortcut Settings"
 msgstr "åæéèç"
 
+#: ../panels/region/gnome-region-panel.ui.h:30
+msgid "Input Sources"
+msgstr "èåæ"
+
 #. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
 #: ../panels/region/gnome-region-panel.ui.h:33
 msgid "Display language:"
@@ -3543,7 +3450,7 @@ msgstr "äç..."
 
 #: ../panels/screen/screen.ui.h:17
 msgid "Show _notifications when locked"
-msgstr "éåææçéç"
+msgstr "éåææçéç(_N)"
 
 #: ../panels/screen/screen.ui.h:18
 msgid "Lock"
@@ -3608,7 +3515,7 @@ msgstr "æç"
 msgid "Sonar"
 msgstr "åç"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
 msgid "Output"
 msgstr "èå"
 
@@ -3616,7 +3523,7 @@ msgstr "èå"
 msgid "Sound Output Volume"
 msgstr "èåéé"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input"
 msgstr "èå"
 
@@ -3676,7 +3583,8 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "åå"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:521
 msgid "_Profile:"
 msgstr "éç(_P)ï"
 
@@ -3700,76 +3608,61 @@ msgstr[0] "%u èèå"
 msgid "System Sounds"
 msgstr "ççåé"
 
-#: ../panels/sound/gvc-mixer-dialog.c:324
-#: ../panels/sound/gvc-mixer-dialog.c:635
-msgid "Co_nnector:"
-msgstr "èæå(_N)ï"
+#: ../panels/sound/gvc-mixer-dialog.c:262
+msgid "_Test Speakers"
+msgstr "æèæåå(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:541
+#: ../panels/sound/gvc-mixer-dialog.c:426
 msgid "Peak detect"
 msgstr "ååææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1497
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1506
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "åç"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1564
+#: ../panels/sound/gvc-mixer-dialog.c:1588
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s æååæè"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1623
-msgid "_Test Speakers"
-msgstr "æèæåå(_T)"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1754
+#: ../panels/sound/gvc-mixer-dialog.c:1642
 msgid "_Output volume:"
 msgstr "èåéé(_O)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1773
+#: ../panels/sound/gvc-mixer-dialog.c:1661
 msgid "C_hoose a device for sound output:"
 msgstr "éæééèåèå(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1798
-#: ../panels/sound/gvc-mixer-dialog.c:1927
+#: ../panels/sound/gvc-mixer-dialog.c:1686
 msgid "Settings for the selected device:"
 msgstr "éäèåçèçï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1816
+#: ../panels/sound/gvc-mixer-dialog.c:1704
 msgid "_Input volume:"
 msgstr "èåéé(_I)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1839
+#: ../panels/sound/gvc-mixer-dialog.c:1727
 msgid "Input level:"
 msgstr "èåççï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1867
+#: ../panels/sound/gvc-mixer-dialog.c:1755
 msgid "C_hoose a device for sound input:"
 msgstr "éæééèåèå(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1894
-msgid "Hardware"
-msgstr "çä"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1899
-msgid "C_hoose a device to configure:"
-msgstr "éæèéççèå(_H)ï"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1938
+#: ../panels/sound/gvc-mixer-dialog.c:1782
 msgid "Sound Effects"
 msgstr "åéææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1945
+#: ../panels/sound/gvc-mixer-dialog.c:1789
 msgid "_Alert volume:"
 msgstr "èåéé(_A)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1958
+#: ../panels/sound/gvc-mixer-dialog.c:1802
 msgid "Applications"
 msgstr "åççå"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1962
+#: ../panels/sound/gvc-mixer-dialog.c:1806
 msgid "No application is currently playing or recording audio."
 msgstr "ææçåæåæææååééã"
 
@@ -3801,16 +3694,16 @@ msgstr "æèäé"
 msgid "C_hoose an alert sound:"
 msgstr "éæèååé(_H)ï"
 
-#: ../panels/sound/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:220
 msgid "Stop"
 msgstr "åæ"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound/gvc-speaker-test.c:333
+#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:332
 msgid "Test"
 msgstr "æè"
 
-#: ../panels/sound/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:228
 msgid "Subwoofer"
 msgstr "èäé"
 
@@ -3835,8 +3728,8 @@ msgstr "åéé"
 msgid "Custom"
 msgstr "èåä"
 
-#: ../panels/universal-access/cc-ua-panel.c:291
-#: ../panels/universal-access/cc-ua-panel.c:297
+#: ../panels/universal-access/cc-ua-panel.c:286
+#: ../panels/universal-access/cc-ua-panel.c:292
 msgid "No shortcut set"
 msgstr "æèçåæé"
 
@@ -3886,6 +3779,10 @@ msgstr "GNOME ååéç"
 msgid "OnBoard"
 msgstr "ååéç"
 
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "æ"
+
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3927,336 +3824,391 @@ msgid "Larger"
 msgstr "èå"
 
 #: ../panels/universal-access/uap.ui.h:21
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/universal-access/uap.ui.h:22
-msgid "Nomon"
-msgstr "Nomon"
-
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Caribou"
-msgstr "Caribou"
-
-#: ../panels/universal-access/uap.ui.h:24
 msgid "High Contrast"
 msgstr "éåæå"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: ../panels/universal-access/uap.ui.h:22
 msgid "Beep on Caps and Num Lock"
 msgstr "æ Caps æ Num Lock éæèé"
 
-#: ../panels/universal-access/uap.ui.h:26
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Options..."
 msgstr "éé..."
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "ååéèå"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "æåæåéï"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:26
 msgctxt "universal access, zoom"
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "æåï"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "çåï"
 
-#: ../panels/universal-access/uap.ui.h:32
+#: ../panels/universal-access/uap.ui.h:29
 msgid "Large Text"
 msgstr "ååææ"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
 msgstr "èè"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Visual Alerts"
 msgstr "èèèå"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "åèåååçæäçèèæç"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the window title"
 msgstr "éççåæéæ"
 
-#: ../panels/universal-access/uap.ui.h:37
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Flash the entire screen"
 msgstr "éçæäåå"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Closed Captioning"
 msgstr "éåæé"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Display a textual description of speech and sounds"
 msgstr "æçèéååéçæåæèã"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:37
 msgid "_Test flash"
 msgstr "æåéç(_T)"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
 msgstr "åè"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: ../panels/universal-access/uap.ui.h:40
 msgid "On Screen Keyboard"
 msgstr "ååéç"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Sticky Keys"
 msgstr "çæé"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: ../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:46
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "èåææäääéåçç(_D)"
 
-#: ../panels/universal-access/uap.ui.h:47
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "åæääééæååèéå(_M)"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Slow Keys"
 msgstr "æéé"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "åæéæäåæå(èå)äéæååè"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "åæååè(_C)ï"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Slow keys typing delay"
 msgstr "æééèååè"
 
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:57
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is"
 msgstr "ååèéååäçé"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:59
+#: ../panels/universal-access/uap.ui.h:56
 msgid "pressed"
 msgstr "åæä"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:58
 msgid "accepted"
 msgstr "åæå"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "åæç"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Bounce Keys"
 msgstr "ååé"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "åçåééåæé"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "åæååè(_E)ï"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "ååéèååè"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "åæäéèæçæååèéå(_R)"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Enable by Keyboard"
 msgstr "éèéçåç"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr "éèéçååèååèçæ"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Mouse Keys"
 msgstr "éæé"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "äçåéçæåéææéã"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Video Mouse"
 msgstr "åæéæ"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "äçæååæåéææé"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Simulated Secondary Click"
 msgstr "æææèçå"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "æäéæäéäææèåæå"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "æèçååè"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Hover Click"
 msgstr "æåçå"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "æéæåææèçåã"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "åæ(_E)ï"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "èåéå(_T)ï"
 
-#: ../panels/universal-access/uap.ui.h:87
+#. small threshold
+#: ../panels/universal-access/uap.ui.h:81
+msgid "Small"
+msgstr "å"
+
+#. large threshold
+#: ../panels/universal-access/uap.ui.h:83
+msgid "Large"
+msgstr "å"
+
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "éæèç"
 
-#: ../panels/universal-access/uap.ui.h:88
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "æåååå"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: ../panels/universal-access/zoom-options.c:357
 msgctxt "Distance"
 msgid "Short"
 msgstr "ç"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: ../panels/universal-access/zoom-options.c:358
 msgctxt "Distance"
 msgid "Â Screen"
 msgstr "Â åå"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: ../panels/universal-access/zoom-options.c:359
 msgctxt "Distance"
 msgid "Â Screen"
 msgstr "Â åå"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: ../panels/universal-access/zoom-options.c:360
 msgctxt "Distance"
 msgid "Â Screen"
 msgstr "Â åå"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: ../panels/universal-access/zoom-options.c:361
 msgctxt "Distance"
 msgid "Long"
 msgstr "é"
 
 #: ../panels/universal-access/zoom-options.ui.h:1
+msgid "Full Screen"
+msgstr "ååå"
+
+#: ../panels/universal-access/zoom-options.ui.h:2
+msgid "Top Half"
+msgstr "äåéå"
+
+#: ../panels/universal-access/zoom-options.ui.h:3
+msgid "Bottom Half"
+msgstr "äåéå"
+
+#: ../panels/universal-access/zoom-options.ui.h:4
+msgid "Left Half"
+msgstr "ååéå"
+
+#: ../panels/universal-access/zoom-options.ui.h:5
+msgid "Right Half"
+msgstr "ååéå"
+
+#: ../panels/universal-access/zoom-options.ui.h:6
 msgid "Zoom Options"
 msgstr "çæéé"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: ../panels/universal-access/zoom-options.ui.h:7
+msgid "Zoom"
+msgstr "çæ"
+
+#: ../panels/universal-access/zoom-options.ui.h:8
 msgid "Magnification:"
 msgstr "æåæçï"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:9
 msgid "Follow mouse cursor"
 msgstr "èééæåæ"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: ../panels/universal-access/zoom-options.ui.h:10
 msgid "Screen part:"
 msgstr "ååååï"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: ../panels/universal-access/zoom-options.ui.h:11
 msgid "Magnifier extends outside of screen"
 msgstr "äæåéèåèçååæçååäåçåå"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: ../panels/universal-access/zoom-options.ui.h:12
 msgid "Keep magnifier cursor centered"
 msgstr "äææåéäéææéåèååçæääç"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: ../panels/universal-access/zoom-options.ui.h:13
 msgid "Magnifier cursor pushes contents around"
 msgstr "æåéäéææéçåèåèçæææèæåååçå"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: ../panels/universal-access/zoom-options.ui.h:14
 msgid "Magnifier cursor moves with contents"
 msgstr "æåéäéææéåèæåååäåçå"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
 msgstr "æåéååäçï"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: ../panels/universal-access/zoom-options.ui.h:16
+msgid "Magnifier"
+msgstr "æåé"
+
+#: ../panels/universal-access/zoom-options.ui.h:17
 msgid "Thickness:"
 msgstr "ççï"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: ../panels/universal-access/zoom-options.ui.h:19
 msgid "Thin"
 msgstr "ç"
 
 #. long delay
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: ../panels/universal-access/zoom-options.ui.h:21
 msgid "Thick"
 msgstr "ç"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Length:"
 msgstr "éåï"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Color:"
 msgstr "éèï"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Crosshairs:"
 msgstr "åååæï"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Overlaps mouse cursor"
 msgstr "åæäéææééå"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
-msgid "Full Screen"
-msgstr "ååå"
+#: ../panels/universal-access/zoom-options.ui.h:26
+msgid "Crosshairs"
+msgstr "åååæ"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
-msgid "Top Half"
-msgstr "äåéå"
+#: ../panels/universal-access/zoom-options.ui.h:27
+msgid "White on black:"
+msgstr "çåéåï"
 
-#: ../panels/universal-access/zoom-options.ui.h:21
-msgid "Bottom Half"
-msgstr "äåéå"
+#: ../panels/universal-access/zoom-options.ui.h:28
+msgid "Brightness:"
+msgstr "äåï"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
-msgid "Left Half"
-msgstr "ååéå"
+#: ../panels/universal-access/zoom-options.ui.h:29
+msgid "Contrast:"
+msgstr "åæåï"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
-msgid "Right Half"
-msgstr "ååéå"
+#: ../panels/universal-access/zoom-options.ui.h:30
+msgctxt "Zoom Grayscale"
+msgid "Color"
+msgstr "èå"
+
+#: ../panels/universal-access/zoom-options.ui.h:31
+msgctxt "Zoom Grayscale"
+msgid "None"
+msgstr "æ"
+
+#: ../panels/universal-access/zoom-options.ui.h:32
+msgctxt "Zoom Grayscale"
+msgid "Full"
+msgstr "åå"
+
+#. short delay
+#: ../panels/universal-access/zoom-options.ui.h:34
+msgid "Low"
+msgstr "ä"
+
+#. long delay
+#: ../panels/universal-access/zoom-options.ui.h:36
+msgid "High"
+msgstr "é"
+
+#: ../panels/universal-access/zoom-options.ui.h:37
+msgid "Color Effects:"
+msgstr "èåææï"
+
+#: ../panels/universal-access/zoom-options.ui.h:38
+msgid "Color Effects"
+msgstr "èåææ"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
@@ -4293,8 +4245,9 @@ msgid "_Full name"
 msgstr "åå(_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
 msgid "Account _Type"
-msgstr "èæçåï"
+msgstr "èæçå(_T)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:9
 msgid "_Domain"
@@ -4310,9 +4263,8 @@ msgid "_Password"
 msgstr "åç(_P)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
-#, fuzzy
 msgid "Tip: Enterprise domain or realm name"
-msgstr "æçïääåæåå"
+msgstr "æçïääåæ realm å"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:13
 msgid "C_ontinue"
@@ -4328,8 +4280,8 @@ msgid ""
 "enrolled in the domain. Please have your network administrator\n"
 "type their domain password here."
 msgstr ""
-"äääçääçåïèåçèéè\n"
-"åååãèççççååèé\n"
+"èæäçääçåïéèååä\n"
+"æåèèçæãèççççååæ\n"
 "èåååçã"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:18
@@ -4495,6 +4447,11 @@ msgstr "éæääåçåååäåæèæäåæççåçã"
 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 "çç"
@@ -4519,10 +4476,6 @@ msgstr "æåçæèæ"
 msgid "Remove User Account"
 msgstr "çéçæèæ"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-msgid "Account _type"
-msgstr "èæçå(_T)"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Login Options"
 msgstr "çåéé"
@@ -4552,7 +4505,7 @@ msgid "Authentication is required to change user data"
 msgstr "æåçæææéèèè"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:552
+#: ../panels/user-accounts/um-password-dialog.c:569
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "åç"
@@ -4563,93 +4516,97 @@ msgid "Not good enough"
 msgstr "äåå"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:553
+#: ../panels/user-accounts/um-password-dialog.c:570
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "å"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:554
+#: ../panels/user-accounts/um-password-dialog.c:571
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "äè"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:555
+#: ../panels/user-accounts/um-password-dialog.c:572
 msgctxt "Password strength"
 msgid "Good"
 msgstr "å"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:556
+#: ../panels/user-accounts/um-password-dialog.c:573
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "å"
 
-#: ../panels/user-accounts/run-passwd.c:426
+#: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "èèåè"
 
-#: ../panels/user-accounts/run-passwd.c:506
+#: ../panels/user-accounts/run-passwd.c:504
 #: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "æåçåç"
 
-#: ../panels/user-accounts/run-passwd.c:512
+#: ../panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "æåçåçå"
 
-#: ../panels/user-accounts/run-passwd.c:518
+#: ../panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "æåçåæåçåçä"
 
-#: ../panels/user-accounts/run-passwd.c:521
+#: ../panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "æåçåæèåçäçèã"
 
-#: ../panels/user-accounts/run-passwd.c:524
+#: ../panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "æåçåéååæåæçæåç"
 
-#: ../panels/user-accounts/run-passwd.c:528
+#: ../panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "æåçåæåççå"
 
-#: ../panels/user-accounts/run-passwd.c:532
+#: ../panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "æçåçåæéæçåååçææï"
 
-#: ../panels/user-accounts/run-passwd.c:536
+#: ../panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "æåçåéååèåçäååç"
 
-#: ../panels/user-accounts/run-passwd.c:540
+#: ../panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "æçéè"
 
-#: ../panels/user-accounts/um-account-dialog.c:175
+#: ../panels/user-accounts/um-account-dialog.c:180
 msgid "Failed to add account"
 msgstr "æåèæåè"
 
-#: ../panels/user-accounts/um-account-dialog.c:362
-#: ../panels/user-accounts/um-account-dialog.c:405
+#: ../panels/user-accounts/um-account-dialog.c:378
+#: ../panels/user-accounts/um-account-dialog.c:419
 msgid "Failed to register account"
 msgstr "æåçæåè"
 
-#: ../panels/user-accounts/um-account-dialog.c:561
+#: ../panels/user-accounts/um-account-dialog.c:551
+msgid "No supported way to authenticate with this domain"
+msgstr "ææææèäåéèçææ"
+
+#: ../panels/user-accounts/um-account-dialog.c:605
 msgid "Failed to join domain"
 msgstr "ååååè"
 
-#: ../panels/user-accounts/um-account-dialog.c:611
+#: ../panels/user-accounts/um-account-dialog.c:662
 msgid "Failed to log into domain"
 msgstr "çåååè"
 
@@ -4774,11 +4731,11 @@ msgstr "æéèèååååç"
 msgid "The current password is not correct"
 msgstr "åååçéè"
 
-#: ../panels/user-accounts/um-password-dialog.c:368
+#: ../panels/user-accounts/um-password-dialog.c:347
 msgid "Passwords do not match"
 msgstr "åçäåé"
 
-#: ../panels/user-accounts/um-password-dialog.c:394
+#: ../panels/user-accounts/um-password-dialog.c:409
 msgid "Wrong password"
 msgstr "åçéè"
 
@@ -4799,21 +4756,21 @@ msgstr "æèæååç..."
 msgid "Used by %s"
 msgstr "åè %s äç"
 
-#: ../panels/user-accounts/um-realm-manager.c:530
-#, fuzzy, c-format
+#: ../panels/user-accounts/um-realm-manager.c:379
+#, c-format
 msgid "No such domain or realm found"
-msgstr "æäåèäåæåå"
+msgstr "æåçæåæ realm"
 
-#: ../panels/user-accounts/um-realm-manager.c:737
+#: ../panels/user-accounts/um-realm-manager.c:780
 #, c-format
 msgid "Cannot log in as %s at the %s domain"
 msgstr "äèä %s èäçå %s å"
 
-#: ../panels/user-accounts/um-realm-manager.c:742
+#: ../panels/user-accounts/um-realm-manager.c:785
 msgid "Invalid password, please try again"
-msgstr "ææåçïèåèäæ"
+msgstr "ææåçïèéè"
 
-#: ../panels/user-accounts/um-realm-manager.c:746
+#: ../panels/user-accounts/um-realm-manager.c:789
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "ææèæå %s åï%s"
@@ -4832,68 +4789,68 @@ msgstr "åäâ%sâççæäååã"
 msgid "This user does not exist."
 msgstr "èçæäååã"
 
-#: ../panels/user-accounts/um-user-panel.c:364
+#: ../panels/user-accounts/um-user-panel.c:371
 msgid "Failed to delete user"
 msgstr "åéçæåè"
 
-#: ../panels/user-accounts/um-user-panel.c:424
+#: ../panels/user-accounts/um-user-panel.c:431
 msgid "You cannot delete your own account."
 msgstr "æäèåéèåçèæã"
 
-#: ../panels/user-accounts/um-user-panel.c:433
+#: ../panels/user-accounts/um-user-panel.c:440
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s äåçåçæ"
 
-#: ../panels/user-accounts/um-user-panel.c:437
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr "åçæåçåæåéèæåèåèççåäääèçæã"
 
-#: ../panels/user-accounts/um-user-panel.c:446
+#: ../panels/user-accounts/um-user-panel.c:453
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "ææèäç %s çæäåï"
 
-#: ../panels/user-accounts/um-user-panel.c:450
+#: ../panels/user-accounts/um-user-panel.c:457
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "åéçææåääççæäçåãçåéäçååäææäã"
 
-#: ../panels/user-accounts/um-user-panel.c:453
+#: ../panels/user-accounts/um-user-panel.c:460
 msgid "_Delete Files"
 msgstr "åéæä(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:454
+#: ../panels/user-accounts/um-user-panel.c:461
 msgid "_Keep Files"
 msgstr "äçæä(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:513
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "èæåçç"
 
-#: ../panels/user-accounts/um-user-panel.c:514
+#: ../panels/user-accounts/um-user-panel.c:521
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "äæçåæèç"
 
-#: ../panels/user-accounts/um-user-panel.c:517
+#: ../panels/user-accounts/um-user-panel.c:524
 msgctxt "Password mode"
 msgid "None"
 msgstr "æ"
 
-#: ../panels/user-accounts/um-user-panel.c:855
+#: ../panels/user-accounts/um-user-panel.c:871
 msgid "Failed to contact the accounts service"
 msgstr "èçèææååè"
 
-#: ../panels/user-accounts/um-user-panel.c:857
+#: ../panels/user-accounts/um-user-panel.c:873
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "èçå AccountService åçæçåèååçã"
 
-#: ../panels/user-accounts/um-user-panel.c:897
+#: ../panels/user-accounts/um-user-panel.c:913
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4901,12 +4858,12 @@ msgstr ""
 "èèèææï\n"
 "èåçå * åæ"
 
-#: ../panels/user-accounts/um-user-panel.c:935
+#: ../panels/user-accounts/um-user-panel.c:951
 msgid "Create a user account"
 msgstr "ååçæèæ"
 
-#: ../panels/user-accounts/um-user-panel.c:946
-#: ../panels/user-accounts/um-user-panel.c:1236
+#: ../panels/user-accounts/um-user-panel.c:962
+#: ../panels/user-accounts/um-user-panel.c:1273
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4914,12 +4871,12 @@ msgstr ""
 "èååçæèæï\n"
 "èåçå * åæ"
 
-#: ../panels/user-accounts/um-user-panel.c:955
+#: ../panels/user-accounts/um-user-panel.c:971
 msgid "Delete the selected user account"
 msgstr "åééäççæèæ"
 
-#: ../panels/user-accounts/um-user-panel.c:967
-#: ../panels/user-accounts/um-user-panel.c:1241
+#: ../panels/user-accounts/um-user-panel.c:983
+#: ../panels/user-accounts/um-user-panel.c:1278
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4927,11 +4884,11 @@ msgstr ""
 "èåééäççæèæï\n"
 "èåçå * åæ"
 
-#: ../panels/user-accounts/um-user-panel.c:1144
+#: ../panels/user-accounts/um-user-panel.c:1176
 msgid "My Account"
 msgstr "æçèæ"
 
-#: ../panels/user-accounts/um-user-panel.c:1154
+#: ../panels/user-accounts/um-user-panel.c:1186
 msgid "Other Accounts"
 msgstr "åäèæ"
 
@@ -5003,24 +4960,43 @@ msgstr "æåååäæçå..."
 msgid "%d of %d"
 msgstr "%d/%d"
 
-#: ../panels/wacom/cc-wacom-page.c:317
-msgid "Switch Modes"
-msgstr "æååæ"
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+msgctxt "Wacom action-type"
+msgid "None"
+msgstr "æ"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:119
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr "åéæé"
+
+#: ../panels/wacom/cc-wacom-page.c:120
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "åææçå"
+
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Up"
 msgstr "åä"
 
-#: ../panels/wacom/cc-wacom-page.c:564
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Down"
 msgstr "åä"
 
-#: ../panels/wacom/cc-wacom-page.c:599
+#: ../panels/wacom/cc-wacom-page.c:638
+msgid "Switch Modes"
+msgstr "æååæ"
+
+#: ../panels/wacom/cc-wacom-page.c:724
 #: ../panels/wacom/cc-wacom-stylus-page.c:376
 msgid "Button"
 msgstr "æé"
 
-#: ../panels/wacom/cc-wacom-page.c:725
+#: ../panels/wacom/cc-wacom-page.c:777
+msgid "Action"
+msgstr "åä"
+
+#: ../panels/wacom/cc-wacom-page.c:886
 msgid "Display Mapping"
 msgstr "æçæå"
 
@@ -5275,6 +5251,192 @@ msgstr "Preferences;Settings;ééé;èç;"
 msgid "All Settings"
 msgstr "åéèç"
 
+#~ msgid "Security Key"
+#~ msgstr "åååé"
+
+#~ msgid "Subnet Mask"
+#~ msgstr "åçæç"
+
+#~ msgid "A_ddress:"
+#~ msgstr "åå(_D)ï"
+
+#~ msgid "_Search by Address"
+#~ msgstr "æååæç(_S)"
+
+#~ msgid "Getting devices..."
+#~ msgstr "æåèåèå..."
+
+#~ msgid "No local printers found"
+#~ msgstr "ææåæåæåæ"
+
+#~ msgid ""
+#~ "FirewallD is not running. Network printer detection needs services mdns, "
+#~ "ipp, ipp-client and samba-client enabled on firewall."
+#~ msgstr ""
+#~ "FirewallD æèèãççæåæåèéèéçååè mdnsãippãipp-client å "
+#~ "samba-client æåã"
+
+#~ msgid "Devices"
+#~ msgstr "èå"
+
+#~ msgctxt "printer type"
+#~ msgid "Local"
+#~ msgstr "æå"
+
+#~ msgctxt "printer type"
+#~ msgid "Network"
+#~ msgstr "çç"
+
+#~ msgid "Device types"
+#~ msgstr "èåçå"
+
+#~ msgid "Automatic configuration"
+#~ msgstr "èåéç"
+
+#~ msgid "Opening firewall for mDNS connections"
+#~ msgstr "ä mDNS èææåéçå"
+
+#~ msgid "Opening firewall for Samba connections"
+#~ msgstr "ä Samba èææåéçå"
+
+#~ msgid "Opening firewall for IPP connections"
+#~ msgstr "ä IPP èææåéçå"
+
+#~ msgid "Add wallpaper"
+#~ msgstr "æååç"
+
+#~ msgid "Remove wallpaper"
+#~ msgstr "çéåç"
+
+#~ msgid "Swap colors"
+#~ msgstr "äæéè"
+
+#~ msgid "Secondary color"
+#~ msgstr "åè"
+
+#~ msgid "Horizontal Gradient"
+#~ msgstr "æåæå"
+
+#~ msgid "Vertical Gradient"
+#~ msgstr "ççæå"
+
+#~ msgid "Solid Color"
+#~ msgstr "çè"
+
+#~ msgid "Pictures Folder"
+#~ msgstr "åçæäå"
+
+#~ msgid "Colors & Gradients"
+#~ msgstr "éèåæå"
+
+#~ msgid "Acti_on:"
+#~ msgstr "åä(_O)ï"
+
+#~ msgid "Take a screenshot"
+#~ msgstr "åååæå"
+
+#~ msgid "Shortcut"
+#~ msgstr "åæé"
+
+#~ msgid "_Right-handed"
+#~ msgstr "æçåæ(_R)"
+
+#~ msgid "_Left-handed"
+#~ msgstr "æçåæ(_L)"
+
+#~ msgid "Sh_ow position of pointer when the Control key is pressed"
+#~ msgstr "æä Ctrl éææçæéäç(_O)"
+
+#~ msgid "A_cceleration:"
+#~ msgstr "åé(_C)ï"
+
+#~ msgid "_Sensitivity:"
+#~ msgstr "çæå(_S)ï"
+
+#~ msgid "Drag and Drop"
+#~ msgstr "ææ"
+
+#~ msgid "Thr_eshold:"
+#~ msgstr "éå(_E)ï"
+
+#~ msgid "Drag Threshold"
+#~ msgstr "æåéå"
+
+#~ msgid "Double-Click Timeout"
+#~ msgstr "ååèæ"
+
+#~ msgid "_Timeout:"
+#~ msgstr "èæ(_T)ï"
+
+#~ msgid "To test your settings, try to double-click on the face."
+#~ msgstr "èæèæçèçïèèçåååäçåèã"
+
+#~ msgid "Enable _mouse clicks with touchpad"
+#~ msgstr "åçèææçéæçå(_M)"
+
+#~ msgid "Scrolling"
+#~ msgstr "æå"
+
+#~ msgid "_Disabled"
+#~ msgstr "çç(_D)"
+
+#~ msgid "_Edge scrolling"
+#~ msgstr "èçæå(_E)"
+
+#~ msgid "Enable h_orizontal scrolling"
+#~ msgstr "åçæåæå(_O)"
+
+#~ msgid "Not connected to the internet."
+#~ msgstr "æèæåäèçã"
+
+#~ msgid "Create the hotspot anyway?"
+#~ msgstr "äçååççï"
+
+#~ msgid "Disconnect from %s and create a new hotspot?"
+#~ msgstr "ä %s æååååääæççï"
+
+#~ msgid "This is your only connection to the internet."
+#~ msgstr "èæææäçäèçèæã"
+
+#~ msgid "Create _Hotspot"
+#~ msgstr "ååçç(_H)"
+
+#~ msgid "_Back"
+#~ msgstr "åé(_B)"
+
+#~ msgid "Printer Options"
+#~ msgstr "æåæéé"
+
+#~ msgid "Add User"
+#~ msgstr "æåçæ"
+
+#~ msgid "Remove User"
+#~ msgstr "çéçæ"
+
+#~ msgid "Allowed users"
+#~ msgstr "åèççæ"
+
+#~ msgid "Co_nnector:"
+#~ msgstr "èæå(_N)ï"
+
+#~ msgid "Hardware"
+#~ msgstr "çä"
+
+#~ msgid "C_hoose a device to configure:"
+#~ msgstr "éæèéççèå(_H)ï"
+
+#~ msgid "Dasher"
+#~ msgstr "Dasher"
+
+#~ msgid "Nomon"
+#~ msgstr "Nomon"
+
+#~ msgid "Caribou"
+#~ msgstr "Caribou"
+
+#~ msgid "Account _type"
+#~ msgstr "èæçå(_T)"
+
 #~ msgctxt "Wireless access point"
 #~ msgid "Other..."
 #~ msgstr "åä..."
@@ -5504,9 +5666,6 @@ msgstr "åéèç"
 #~ msgid "To keep the pointer visible"
 #~ msgstr "äææéåè"
 
-#~ msgid "Magnifier zoom out"
-#~ msgstr "æåé çå"
-
 #~ msgid "Toggle contrast"
 #~ msgstr "åæåæå"
 



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