[gnome-control-center] hindi update



commit 5b6c95500b74c88e83b3c3452d6055d12e65ceb6
Author: Rajesh Ranjan <rranjan redhat com>
Date:   Tue Sep 18 17:23:19 2012 +0530

    hindi update

 po/hi.po | 4320 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 2639 insertions(+), 1681 deletions(-)
---
diff --git a/po/hi.po b/po/hi.po
index 602645e..8047f17 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,19 +6,20 @@
 # Rajesh Ranjan <rranjan redhat com>, 2005, 2006, 2008, 2009.
 # Rajesh Ranjan <rajesh672 gmail com>, 2009.
 # chandankumar(ciypro) <chandankumar 093047 gmail com>, 2012.
+# rajesh <rajeshkajha yahoo com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.master.hi\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-03-04 10:59+0000\n"
-"PO-Revision-Date: 2012-03-18 21:06+0530\n"
-"Last-Translator: chandankumar(ciypro) <chandankumar 093047 gmail com>\n"
+"POT-Creation-Date: 2012-09-16 20:16+0000\n"
+"PO-Revision-Date: 2012-09-18 17:22+0530\n"
+"Last-Translator: rajesh <rajeshkajha yahoo com>\n"
 "Language-Team: Hindi <kde-i18n-doc kde org>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
@@ -36,74 +37,80 @@ msgstr ""
 "\n"
 "\n"
 
-#  Create the file chooser dialog stuff here
-#: ../panels/background/background.ui.h:1
-#| msgid "Wallpapers"
-msgid "Add wallpaper"
-msgstr "ààààààà àààààà"
-
-#  Create the file chooser dialog stuff here
-#: ../panels/background/background.ui.h:2
-#| msgid "Wallpapers"
-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 "Solid Color"
-msgid "Secondary color"
-msgstr "àààààààà ààà"
-
-#: ../panels/background/background.ui.h:8
+#: ../panels/background/background.ui.h:3
+#| msgid "Tile"
+msgctxt "background, style"
 msgid "Tile"
 msgstr "àààà"
 
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:4
+#| msgid "Zoom"
+msgctxt "background, style"
 msgid "Zoom"
-msgstr "àààà"
+msgstr "àààà-àààà àààà"
 
-#: ../panels/background/background.ui.h:10
+#: ../panels/background/background.ui.h:5
+#| msgid "Center"
+msgctxt "background, style"
 msgid "Center"
-msgstr "àààààààà"
+msgstr "àààà"
 
-#: ../panels/background/background.ui.h:11
+#: ../panels/background/background.ui.h:6
+#| msgid "Scale"
+msgctxt "background, style"
 msgid "Scale"
 msgstr "àààà"
 
-# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
-# libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
+# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
-#: ../panels/background/background.ui.h:12
+#: ../panels/background/background.ui.h:7
+#| msgid "Fill"
+msgctxt "background, style"
 msgid "Fill"
 msgstr "àààà"
 
-#: ../panels/background/background.ui.h:13
+#: ../panels/background/background.ui.h:8
+#| msgid "Span"
+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 "Background"
+msgid "Select Background"
+msgstr "ààààààààà ààààà"
+
+#  Create the file chooser dialog stuff here
+#: ../panels/background/cc-background-chooser-dialog.c:218
+msgid "Wallpapers"
+msgstr "ààààààààà"
+
+#: ../panels/background/cc-background-chooser-dialog.c:227
+#| msgid "Picture CD"
+msgid "Pictures"
+msgstr "àààààà"
 
-#: ../panels/background/bg-colors-source.c:47
-msgid "Vertical Gradient"
-msgstr "ààààà ààààà"
+#: ../panels/background/cc-background-chooser-dialog.c:235
+#| msgid "Color"
+msgid "Colors"
+msgstr "ààà"
+
+#: ../panels/background/cc-background-chooser-dialog.c:244
+msgid "Flickr"
+msgstr "àààààà"
 
-#: ../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"
@@ -120,33 +127,10 @@ msgstr "%d à %d"
 msgid "No Desktop Background"
 msgstr "ààà àààààààà ààààààààà"
 
-#: ../panels/background/cc-background-panel.c:1001
-#: ../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:1093
+#: ../panels/background/cc-background-panel.c:387
 msgid "Current background"
 msgstr "àààààà ààààààààà"
 
-#  Create the file chooser dialog stuff here
-#: ../panels/background/cc-background-panel.c:1203
-msgid "Wallpapers"
-msgstr "ààààààààà"
-
-#: ../panels/background/cc-background-panel.c:1210
-msgid "Pictures Folder"
-msgstr "ààààà àààààà"
-
-#: ../panels/background/cc-background-panel.c:1217
-msgid "Colors & Gradients"
-msgstr "ààà & àààààà"
-
-#: ../panels/background/cc-background-panel.c:1225
-msgid "Flickr"
-msgstr "àààààà"
-
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
 msgid "Background"
 msgstr "ààààààààà"
@@ -162,7 +146,7 @@ msgstr "ààààààà; ààààààà; àààààààà;"
 
 #. TRANSLATORS: device type
 #: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:99
+#: ../panels/network/panel-common.c:102
 msgid "Bluetooth"
 msgstr "ààààààà"
 
@@ -175,12 +159,10 @@ msgid "Set Up New Device"
 msgstr "àà àààààà ààààà àààà"
 
 #: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
-#| msgid "Removable Media"
 msgid "Remove Device"
 msgstr "àààààà àààààà"
 
 #: ../panels/bluetooth/bluetooth.ui.h:3
-#| msgid "Connecting"
 msgid "Connection"
 msgstr "ààààààà"
 
@@ -188,8 +170,7 @@ msgstr "ààààààà"
 msgid "Paired"
 msgstr "ààààà"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
-#| msgid "_Type:"
+#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "àààààà"
 
@@ -198,15 +179,14 @@ msgid "Address"
 msgstr "ààà"
 
 #: ../panels/bluetooth/bluetooth.ui.h:7
-#| msgid "Mouse and Touchpad"
 msgid "Mouse and Touchpad Settings"
 msgstr "àààà àà ààààà àààààà"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:43
+#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "ààààà ààààààà"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/universal-access/uap.ui.h:74
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Keyboard Settings"
 msgstr "ààààààà ààààààà"
 
@@ -215,54 +195,50 @@ msgid "Send Files..."
 msgstr "àààà ààààà..."
 
 #: ../panels/bluetooth/bluetooth.ui.h:11
-#| msgid "More choices..."
 msgid "Browse Files..."
 msgstr "àààà àààààà àààà..."
 
 #. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth radio's on the device.
 #: ../panels/bluetooth/bluetooth.ui.h:13
-#| msgid "Bluetooth"
 msgctxt "Power"
 msgid "Bluetooth"
 msgstr "ààààààà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
+#: ../panels/bluetooth/cc-bluetooth-panel.c:290
 msgid "Yes"
 msgstr "ààà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
-#| msgid "None"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:290
 msgid "No"
 msgstr "àààà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:393
-#| msgid "Bluetooth"
+#: ../panels/bluetooth/cc-bluetooth-panel.c:405
 msgid "Bluetooth is disabled"
 msgstr "ààààààà ààààà àà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:398
+#: ../panels/bluetooth/cc-bluetooth-panel.c:410
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "ààààààà ààààààààà ààààà àà ààààà àà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:414
 msgid "No Bluetooth adapters found"
 msgstr "ààà ààààààà ààààààà ààààà àààà àààà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:535
+#: ../panels/bluetooth/cc-bluetooth-panel.c:547
 msgid "Visibility"
 msgstr "ààààààà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:539
+#: ../panels/bluetooth/cc-bluetooth-panel.c:551
 #, c-format
 msgid "Visibility of â%sâ"
 msgstr "ààààààà â%sâ àà"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:583
+#: ../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:585
+#: ../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 ""
@@ -271,14 +247,12 @@ msgstr ""
 
 #. TRANSLATORS: this is where the user can click and import a profile
 #: ../panels/color/cc-color-panel.c:106
-#| msgid "Other finger: "
 msgid "Other profileâ"
 msgstr "àààà ààààààààà ..."
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
 #: ../panels/color/cc-color-panel.c:119
-#| msgid "Default"
 msgid "Default: "
 msgstr "àààààà: "
 
@@ -291,14 +265,12 @@ msgstr "àààààààà: "
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
 #: ../panels/color/cc-color-panel.c:132
-#| msgid "Test page"
 msgid "Test profile: "
 msgstr "ààààà ààààààààà: "
 
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:166
 #. TRANSLATORS: this is when the profile should be set for all users
 #: ../panels/color/cc-color-panel.c:185 ../panels/color/color.ui.h:11
-#| msgid "Create a user"
 msgid "Set for all users"
 msgstr "ààà àààààààààààà àà ààà ààà àààà"
 
@@ -327,104 +299,99 @@ msgid "All files"
 msgstr "ààà ààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:504
+#: ../panels/color/cc-color-panel.c:522
 msgid "Available Profiles for Displays"
 msgstr "àààààààà àà ààà àààààà àààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:508
+#: ../panels/color/cc-color-panel.c:526
 msgid "Available Profiles for Scanners"
 msgstr "àààààààà àà ààà àààààà àààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:512
+#: ../panels/color/cc-color-panel.c:530
 msgid "Available Profiles for Printers"
 msgstr "ààààààààà àà ààà àààààà àààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:516
+#: ../panels/color/cc-color-panel.c:534
 msgid "Available Profiles for Cameras"
 msgstr "ààààà àà ààà àààààà àààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:520
+#: ../panels/color/cc-color-panel.c:538
 msgid "Available Profiles for Webcams"
 msgstr "àààààà àà ààà àààààà àààààààà"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #. * where the device type is not recognised
 #. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:525 ../panels/color/color.ui.h:2
+#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
 msgid "Available Profiles"
 msgstr "àààààà ààààààààà"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:806
-#: ../panels/sound/gvc-mixer-dialog.c:1516
+#: ../panels/color/cc-color-panel.c:824
+#: ../panels/sound/gvc-mixer-dialog.c:1525
 msgid "Device"
 msgstr "àààààà"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:841
-#| msgid "Applications"
+#: ../panels/color/cc-color-panel.c:859
 msgid "Calibration"
 msgstr "àààààààààà"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:873
-#| msgid "Settings for the selected device:"
+#: ../panels/color/cc-color-panel.c:891
 msgid "Create a color profile for the selected device"
 msgstr "ààààà àààààà àà ààà àà ààà ààààààààà ààààà"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:887 ../panels/color/cc-color-panel.c:911
+#: ../panels/color/cc-color-panel.c:905 ../panels/color/cc-color-panel.c:929
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr ""
-"àààà ààààà àà ààà àààà ààà àà. ààààà ààààà àà àà àààà àà àà "
-"ààà ààà àà àààààààà àà."
+"àààà ààààà àà ààà àààà ààà àà. ààààà ààààà àà àà àààà àà àà ààà ààà àà "
+"àààààààà àà."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:920
+#: ../panels/color/cc-color-panel.c:938
 msgid "The measuring instrument does not support printer profiling."
 msgstr "ààà ààààà ààààààà ààààààààààà àà àààààà àààà àààà àà."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:931
+#: ../panels/color/cc-color-panel.c:949
 msgid "The device type is not currently supported."
 msgstr "àààààà àààààà àààààà ààà ààààààà àààà àà."
 
 #. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1004
+#: ../panels/color/cc-color-panel.c:1022
 msgid "Cannot remove automatically added profile"
 msgstr "àààààààà ààà àà ààààà ààààààààà ààà àààà àààà ààà"
 
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1339
-#| msgid "_Profile:"
+#: ../panels/color/cc-color-panel.c:1359
 msgid "No profile"
 msgstr "ààà ààààààààà àààà"
 
-#: ../panels/color/cc-color-panel.c:1370
+#: ../panels/color/cc-color-panel.c:1390
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ààà"
 msgstr[1] "%i ààà"
 
-#: ../panels/color/cc-color-panel.c:1381
+#: ../panels/color/cc-color-panel.c:1401
 #, c-format
-#| msgid "%i minute"
-#| msgid_plural "%i minutes"
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i ààà"
 msgstr[1] "%i ààà"
 
-#: ../panels/color/cc-color-panel.c:1392
+#: ../panels/color/cc-color-panel.c:1412
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -432,103 +399,88 @@ msgstr[0] "%i àààààà"
 msgstr[1] "%i àààààà"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1399
+#: ../panels/color/cc-color-panel.c:1419
 #, c-format
 msgid "Less than 1 week"
 msgstr "àà àà àà 1 àààààà"
 
-#: ../panels/color/cc-color-panel.c:1461
-#| msgid "Default"
+#: ../panels/color/cc-color-panel.c:1481
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "àààààà RGB"
 
-#: ../panels/color/cc-color-panel.c:1466
-#| msgid "Default"
+#: ../panels/color/cc-color-panel.c:1486
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "àààààà CMYK"
 
-#: ../panels/color/cc-color-panel.c:1471
-#| msgid "Default"
+#: ../panels/color/cc-color-panel.c:1491
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "àààààààà àààà"
 
-#: ../panels/color/cc-color-panel.c:1589 ../panels/color/cc-color-panel.c:1630
-#: ../panels/color/cc-color-panel.c:1641 ../panels/color/cc-color-panel.c:1652
-#| msgctxt "volume"
-#| msgid "Unamplified"
+#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
+#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
 msgid "Uncalibrated"
 msgstr "ààààààààààààà"
 
-#: ../panels/color/cc-color-panel.c:1592
-#| msgid "The device is already in use."
+#: ../panels/color/cc-color-panel.c:1612
 msgid "This device is not color managed."
 msgstr "àà ààààà ààà àààààààà ààà àààà àà."
 
-#: ../panels/color/cc-color-panel.c:1633
+#: ../panels/color/cc-color-panel.c:1653
 msgid "This device is using manufacturing calibrated data."
 msgstr "ààààààààààà àààà àà àààààà àààà àà àààààà àà ààààààà ààà àà."
 
-#: ../panels/color/cc-color-panel.c:1644
+#: ../panels/color/cc-color-panel.c:1664
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
 msgstr ""
-"àà àààààà àà ààà ààà ààààààà àààààààà ààààà ààààààà ààà "
-"ààààà àà ààà àààà àà."
+"àà àààààà àà ààà ààà ààààààà àààààààà ààààà ààààààà ààà ààààà àà ààà àààà àà."
 
-#: ../panels/color/cc-color-panel.c:1677
+#: ../panels/color/cc-color-panel.c:1697
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "àà àààààà àà àààààààà àà àà àà àààààà ààà àà ààà àààà àà."
 
 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1705
-#| msgid "Unspecified"
+#: ../panels/color/cc-color-panel.c:1725
 msgid "Not specified"
 msgstr "àààààààà àààà"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1889
+#: ../panels/color/cc-color-panel.c:1910
 msgid "No devices supporting color management detected"
 msgstr "ààà ààà ààààààà àààààà ààààààà àààà àààà"
 
-#: ../panels/color/cc-color-panel.c:2118
-#| msgctxt "universal access, seeing"
-#| msgid "Display"
+#: ../panels/color/cc-color-panel.c:2139
 msgctxt "Device kind"
 msgid "Display"
 msgstr "àààààààà"
 
-#: ../panels/color/cc-color-panel.c:2120
-#| msgid "Scale"
+#: ../panels/color/cc-color-panel.c:2141
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "àààààà"
 
-#: ../panels/color/cc-color-panel.c:2122
-#| msgid "Printer"
+#: ../panels/color/cc-color-panel.c:2143
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "àààààà"
 
-#: ../panels/color/cc-color-panel.c:2124
-#| msgid "Name"
+#: ../panels/color/cc-color-panel.c:2145
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "ààààà"
 
-#: ../panels/color/cc-color-panel.c:2126
-#| msgid "Web"
+#: ../panels/color/cc-color-panel.c:2147
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "àààààà"
 
 #: ../panels/color/color.ui.h:3
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-#| msgid "Solid Color"
 msgid "Color"
 msgstr "ààà"
 
@@ -547,7 +499,6 @@ msgid "Learn more about color management"
 msgstr "ààà ààààààà àà àààà ààà àààà ààààà"
 
 #: ../panels/color/color.ui.h:7
-#| msgid "Device"
 msgid "Add device"
 msgstr "àààààà àààààà"
 
@@ -556,21 +507,19 @@ msgid "Add a virtual device"
 msgstr "ààààààà àààààà àààààà"
 
 #: ../panels/color/color.ui.h:9
-#| msgid "_Delete Files"
 msgid "Delete device"
 msgstr "ààààà àààààà"
 
 #: ../panels/color/color.ui.h:10
-#| msgid "Removable Media"
 msgid "Remove a device"
 msgstr "àààààà àààààà"
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this device for all users on this computer"
-msgstr "àà àààààààà àà ààà àààààààààààà àà ààà àà àààààà àà ààà àààà"
+#| msgid "Set this device for all users on this computer"
+msgid "Set this profile for all users on this computer"
+msgstr "àà àààààààà àà ààà àààààààààààà àà ààà àà ààààààààà àà ààà àààà"
 
 #: ../panels/color/color.ui.h:13
-#| msgid "April"
 msgid "Add profile"
 msgstr "àààààà àààààààà"
 
@@ -591,7 +540,6 @@ msgid "View details"
 msgstr "ààààà ààààà"
 
 #: ../panels/color/color.ui.h:18
-#| msgid "Device name"
 msgid "Device type:"
 msgstr "ààààà àààààà:"
 
@@ -602,7 +550,6 @@ msgstr "ààààààà:"
 # libgnomeprintui/gpaui/add-printer-dialog.c:83
 # libgnomeprintui/gpaui/config-dialog.c:83
 #: ../panels/color/color.ui.h:20
-#| msgid "Model"
 msgid "Model:"
 msgstr "ààààà"
 
@@ -614,7 +561,6 @@ msgstr ""
 "àààà ààà."
 
 #: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-#| msgid "Power management settings"
 msgid "Color management settings"
 msgstr "ààà ààààààà àààààààà"
 
@@ -624,66 +570,69 @@ msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
 msgstr "ààà;àààààà;àààààààà;àààà;ààààààà;àààààààà;"
 
 #. Add some common languages first
-#: ../panels/common/cc-common-language.c:513
+#: ../panels/common/cc-common-language.c:523
 msgid "English"
 msgstr "ààààààààà"
 
-#: ../panels/common/cc-common-language.c:515
+#: ../panels/common/cc-common-language.c:525
 msgid "British English"
 msgstr "ààààààà àààààààà"
 
-#: ../panels/common/cc-common-language.c:517
-#| msgid "General"
+#: ../panels/common/cc-common-language.c:528
 msgid "German"
 msgstr "ààààà"
 
-#: ../panels/common/cc-common-language.c:519
+#: ../panels/common/cc-common-language.c:531
 msgid "French"
 msgstr "àààààà"
 
-#: ../panels/common/cc-common-language.c:521
-#| msgid "Span"
+#: ../panels/common/cc-common-language.c:534
 msgid "Spanish"
 msgstr "ààààààà"
 
-#: ../panels/common/cc-common-language.c:523
+#: ../panels/common/cc-common-language.c:536
 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:552
+#: ../panels/common/cc-common-language.c:571
 msgid "United States"
 msgstr "àààààààà ààààààà"
 
-#: ../panels/common/cc-common-language.c:553
+#: ../panels/common/cc-common-language.c:572
 msgid "Germany"
 msgstr "àààààà"
 
-#: ../panels/common/cc-common-language.c:554
-#| msgid "Cancel"
+#: ../panels/common/cc-common-language.c:573
 msgid "France"
 msgstr "àààààà"
 
-#: ../panels/common/cc-common-language.c:555
-#| msgid "Span"
+#: ../panels/common/cc-common-language.c:574
 msgid "Spain"
 msgstr "ààààà"
 
-#: ../panels/common/cc-common-language.c:556
+#: ../panels/common/cc-common-language.c:575
 msgid "China"
 msgstr "ààà"
 
-#: ../panels/common/cc-language-chooser.c:119
+#: ../panels/common/cc-language-chooser.c:122
 msgid "Other..."
 msgstr "àààà..."
 
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
-#: ../panels/common/cc-language-chooser.c:290
-#| msgid "Section"
+#: ../panels/common/cc-language-chooser.c:296
 msgid "Select a region"
 msgstr "ààààààà àà ààà àààà"
 
-#: ../panels/common/gdm-languages.c:774
+#: ../panels/common/gdm-languages.c:781
 msgid "Unspecified"
 msgstr "àààààààà"
 
@@ -692,8 +641,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:446
+#: ../panels/printers/new-printer-dialog.ui.h:1
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "àààà àààà (_C)"
 
@@ -702,17 +651,14 @@ msgid "_Select"
 msgstr "ààààà (_S)"
 
 #: ../panels/datetime/datetime.ui.h:1
-#| msgid "Region:"
 msgid "_Region:"
 msgstr "ààààààà: (_R)"
 
 #: ../panels/datetime/datetime.ui.h:2
-#| msgid "City:"
 msgid "_City:"
 msgstr "ààà: (_C)"
 
 #: ../panels/datetime/datetime.ui.h:3
-#| msgid "Network Time"
 msgid "_Network Time"
 msgstr "ààààà ààà (_N)"
 
@@ -742,24 +688,18 @@ msgid "Switch between AM and PM."
 msgstr "AM àà PM àà ààà ààààà àààà."
 
 #: ../panels/datetime/datetime.ui.h:11
-#| msgid "Monitor"
 msgid "Month"
 msgstr "ààà"
 
 #: ../panels/datetime/datetime.ui.h:12
-#| msgid "May"
 msgid "Day"
 msgstr "ààà"
 
 #: ../panels/datetime/datetime.ui.h:13
-#| msgctxt "balance"
-#| msgid "Rear"
 msgid "Year"
 msgstr "àààà"
 
 #: ../panels/datetime/datetime.ui.h:14
-#| msgid "hour"
-#| msgid_plural "hours"
 msgid "24-hour"
 msgstr "24-àààà"
 
@@ -816,8 +756,9 @@ msgid "December"
 msgstr "ààààààà"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1
-msgid "Date and Time"
-msgstr "àààààà à ààà"
+#| msgid "Date and Time"
+msgid "Date & Time"
+msgstr "àààà à ààà"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
 msgid "Date and Time preferences panel"
@@ -829,7 +770,6 @@ msgid "Clock;Timezone;Location;"
 msgstr "àààà;ààà ààààààà;ààààà;"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
-#| msgid "Change printer settings"
 msgid "Change system time and date settings"
 msgstr "àààààà àà ààà àà àààààà àààààààà ààààà"
 
@@ -838,101 +778,96 @@ msgid "To change time or date settings, you need to authenticate."
 msgstr ""
 "ààà àà àààààà àààààààà àà ààààà àà ààà, àààà àààààààà àààà àà ààààà àà."
 
-#: ../panels/display/cc-display-panel.c:475
-#| msgid "Normal"
+#: ../panels/display/cc-display-panel.c:481
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "ààààààà"
 
-#: ../panels/display/cc-display-panel.c:476
-#| msgid "Clockwise"
+#: ../panels/display/cc-display-panel.c:482
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "àààà àà àààààà àààà ààà"
 
-#: ../panels/display/cc-display-panel.c:477
-#| msgid "Clockwise"
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "àààà àà àààà ààà"
 
-#: ../panels/display/cc-display-panel.c:478
-#| msgid "180 Degrees"
+#: ../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:615
-msgid "Mirror Displays"
-msgstr "àààà àààààààà"
+#: ../panels/display/cc-display-panel.c:623
+#| msgid "Mirror Displays"
+msgid "Mirrored Displays"
+msgstr "àààà àààà àààààààà"
 
-#: ../panels/display/cc-display-panel.c:639
+#: ../panels/display/cc-display-panel.c:647
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "àààààà"
 
-#: ../panels/display/cc-display-panel.c:745
+#: ../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:747
+#: ../panels/display/cc-display-panel.c:750
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1654
+#: ../panels/display/cc-display-panel.c:1659
 msgid "Drag to change primary display."
 msgstr "àààààààà àààààààà ààààà àà ààà àààààà."
 
-#: ../panels/display/cc-display-panel.c:1712
+#: ../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:2100
+#: ../panels/display/cc-display-panel.c:2105
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2102
+#: ../panels/display/cc-display-panel.c:2107
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../panels/display/cc-display-panel.c:2264
-#: ../panels/display/cc-display-panel.c:2316
+#: ../panels/display/cc-display-panel.c:2269
+#: ../panels/display/cc-display-panel.c:2321
 #, c-format
-#| msgid "Automatic configuration"
 msgid "Failed to apply configuration: %s"
 msgstr "ààààààà àà àààà àààà ààà àààà: %s"
 
-#: ../panels/display/cc-display-panel.c:2344
+#: ../panels/display/cc-display-panel.c:2349
 msgid "Could not save the monitor configuration"
 msgstr "àààààà ààààààà àààà àààà ààà"
 
-#: ../panels/display/cc-display-panel.c:2404
+#: ../panels/display/cc-display-panel.c:2409
 msgid "Could not detect displays"
 msgstr "àààààààà ààà àààà àà ààà"
 
-#: ../panels/display/cc-display-panel.c:2598
+#: ../panels/display/cc-display-panel.c:2603
 msgid "Could not get screen information"
 msgstr "ààààààà ààààà àààà àà ààà"
 
 #: ../panels/display/display-capplet.ui.h:2
-#| msgid "_Resolution:"
 msgid "_Resolution"
 msgstr "ààààààààààà (_R)"
 
 #: ../panels/display/display-capplet.ui.h:3
-#| msgid "R_otation:"
 msgid "R_otation"
 msgstr "àààààà (_o)"
 
@@ -963,15 +898,15 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "àààà;àààààààààà;xrandr;ààààààà;ààààààààààà;ààààààà;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:401
+#: ../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:425 ../panels/network/panel-common.c:79
-#: ../panels/network/panel-common.c:158
+#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
+#: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "àààààà"
 
@@ -982,70 +917,76 @@ msgstr "àààààà"
 # libgnomeui/gnome-app-helper.c:84 libgnomeui/gnome-app-helper.h:516
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:586
+#: ../panels/info/cc-info-panel.c:593
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:743
+#: ../panels/info/cc-info-panel.c:752
 msgid "Unknown model"
 msgstr "àààààà àààà"
 
-#: ../panels/info/cc-info-panel.c:826
+#: ../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:828
+#: ../panels/info/cc-info-panel.c:837
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
 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:870
+#: ../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:876
+#: ../panels/info/cc-info-panel.c:885
 msgctxt "Experience"
 msgid "Standard"
 msgstr "àààà"
 
-#: ../panels/info/cc-info-panel.c:1199
+#: ../panels/info/cc-info-panel.c:1227
 msgid "Ask what to do"
 msgstr "ààààà àà àààà àààà àà"
 
-#: ../panels/info/cc-info-panel.c:1203
+#: ../panels/info/cc-info-panel.c:1231
 msgid "Do nothing"
 msgstr "ààà àà àààà"
 
-#: ../panels/info/cc-info-panel.c:1207
+#: ../panels/info/cc-info-panel.c:1235
 msgid "Open folder"
 msgstr "ààààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1318
+#: ../panels/info/cc-info-panel.c:1326
+#| msgid "_Other Media..."
+msgid "Other Media"
+msgstr "àààà àààààà"
+
+#: ../panels/info/cc-info-panel.c:1357
 msgid "Select an application for audio CDs"
 msgstr "ààààà àààà àà ààà ààààààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1319
+#: ../panels/info/cc-info-panel.c:1358
 msgid "Select an application for video DVDs"
 msgstr "àààààà àààà àà ààà ààààààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1320
+#: ../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:1321
+#: ../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:1322
+#: ../panels/info/cc-info-panel.c:1361
 msgid "Select an application for software CDs"
 msgstr "àààààààààà àààà àà ààà ààààààààà ààààà"
 
@@ -1054,93 +995,100 @@ msgstr "àààààààààà àààà àà ààà ààà
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1334
+#: ../panels/info/cc-info-panel.c:1373
 msgid "audio DVD"
 msgstr "ààààà àààààà"
 
-#: ../panels/info/cc-info-panel.c:1335
+#: ../panels/info/cc-info-panel.c:1374
 msgid "blank Blu-ray disc"
 msgstr "àààà Blu-Ray ààààà"
 
-#: ../panels/info/cc-info-panel.c:1336
+#: ../panels/info/cc-info-panel.c:1375
 msgid "blank CD disc"
 msgstr "àààà àààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1337
+#: ../panels/info/cc-info-panel.c:1376
 msgid "blank DVD disc"
 msgstr "ààààà àààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1338
+#: ../panels/info/cc-info-panel.c:1377
 msgid "blank HD DVD disc"
 msgstr "àààà HD DVD ààààà"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1378
 msgid "Blu-ray video disc"
 msgstr "Blu-ray àààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1379
 msgid "e-book reader"
 msgstr "à-ààà àààà"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1380
 msgid "HD DVD video disc"
 msgstr "HD àààààà àààààà ààààà"
 
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1381
 msgid "Picture CD"
 msgstr "àààààà àààà"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1382
 msgid "Super Video CD"
 msgstr "àààà àààààà àààà"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1383
 msgid "Video CD"
 msgstr "àààààà àààà"
 
+#: ../panels/info/cc-info-panel.c:1384
+msgid "Windows software"
+msgstr "ààààààà àààààààààà"
+
+#: ../panels/info/cc-info-panel.c:1385
+#| msgid "_Software"
+msgid "Software"
+msgstr "ààààààààà"
+
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/logout.c:266
-#: ../panels/info/cc-info-panel.c:1473
-#: ../panels/keyboard/keyboard-shortcuts.c:1569
+#: ../panels/info/cc-info-panel.c:1508
+#: ../panels/keyboard/keyboard-shortcuts.c:1647
 msgid "Section"
 msgstr "ààààà"
 
-#: ../panels/info/cc-info-panel.c:1482 ../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:1488 ../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:1493 ../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:1498 ../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:1700
+#: ../panels/info/cc-info-panel.c:1735
 #, c-format
 msgid "Version %s"
 msgstr "ààààààà %s"
 
-#: ../panels/info/cc-info-panel.c:1750
-#| msgid "Install languages..."
+#: ../panels/info/cc-info-panel.c:1785
 msgid "Install Updates"
 msgstr "àààààà ààààààààà àààà"
 
-#: ../panels/info/cc-info-panel.c:1754
+#: ../panels/info/cc-info-panel.c:1789
 msgid "System Up-To-Date"
 msgstr "àààààà àààààà"
 
-#: ../panels/info/cc-info-panel.c:1758
+#: ../panels/info/cc-info-panel.c:1793
 msgid "Checking for Updates"
 msgstr "àààààà àà ààà àààà ààà àà"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#| msgid "_Delete Files"
 msgid "Details"
 msgstr "ààààà"
 
@@ -1154,19 +1102,19 @@ msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"àààààà;àààààà;ààààààà;àààààà;àààààààà;ààààààà;àààààààà;ààààààààà;"
-"àààààà;àààààààà;àààà;àààààà;àààààà;ààààà;àààààà;ààààà;ààààà "
-"ààààà;àààààà;ààààà àààà;"
+"àààààà;àààààà;ààààààà;àààààà;àààààààà;ààààààà;àààààààà;ààààààààà;àààààà;àààààà"
+"àà;àààà;àààààà;"
+"àààààà;ààààà;àààààà;ààààà;ààààà ààààà;àààààà;ààààà àààà;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
 msgstr "ààààà àààà àààà àààààà àà ààààààààà àààà àààà ààààà"
 
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/logout.c:266
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
 #: ../panels/info/info.ui.h:2
-msgid "Acti_on:"
-msgstr "àààààà: (_o)"
+#| msgid "_Action"
+msgid "_Action:"
+msgstr "àààààà (_A):"
 
 #: ../panels/info/info.ui.h:3
 msgid "_Type:"
@@ -1193,37 +1141,30 @@ msgid "Disk"
 msgstr "ààààà"
 
 #: ../panels/info/info.ui.h:9
-#| msgid "Locations..."
 msgid "Calculating..."
 msgstr "àààà ààà... "
 
 #: ../panels/info/info.ui.h:12
-#| msgid "Web"
 msgid "_Web"
 msgstr "ààà (_W)"
 
 #: ../panels/info/info.ui.h:13
-#| msgid "Mail"
 msgid "_Mail"
 msgstr "ààà (_M)"
 
 #: ../panels/info/info.ui.h:14
-#| msgid "Calendar"
 msgid "_Calendar"
 msgstr "àààààà (_C)"
 
 #: ../panels/info/info.ui.h:15
-#| msgid "Music"
 msgid "M_usic"
 msgstr "ààààà (_u)"
 
 #: ../panels/info/info.ui.h:16
-#| msgid "Video"
 msgid "_Video"
 msgstr "àààààà (_V)"
 
 #: ../panels/info/info.ui.h:17
-#| msgid "_Photos:"
 msgid "_Photos"
 msgstr "àààà (_P)"
 
@@ -1236,17 +1177,14 @@ msgid "CD _audio"
 msgstr "àààà ààààà (_a)"
 
 #: ../panels/info/info.ui.h:21
-#| msgid "Video"
 msgid "_DVD video"
 msgstr "_DVD àààààà"
 
 #: ../panels/info/info.ui.h:22
-#| msgid "_Music player:"
 msgid "_Music player"
 msgstr "ààààà àààààà (_M)"
 
 #: ../panels/info/info.ui.h:23
-#| msgid "_Software:"
 msgid "_Software"
 msgstr "ààààààààà (_S)"
 
@@ -1315,6 +1253,24 @@ msgstr "àààà ààààà"
 msgid "Eject"
 msgstr "àààà àààà"
 
+#: ../panels/keyboard/01-input-sources.xml.in.h:1
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/keyboard/keyboard-shortcuts.c:858
+#: ../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
+#| msgid "Switch Modes"
+msgid "Switch to next source"
+msgstr "àààà ààààà ààà àààà"
+
+#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: ../panels/region/gnome-region-panel.ui.h:24
+msgid "Switch to previous source"
+msgstr "ààààà ààààà àà àààà"
+
 #: ../panels/keyboard/01-launchers.xml.in.h:1
 msgid "Launchers"
 msgstr "ààààà"
@@ -1344,37 +1300,41 @@ msgid "Search"
 msgstr "àààààà"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:1
-#| msgid "Screen"
 msgid "Screenshots"
 msgstr "àààààààààà"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:2
-#| msgid "Take a photo..."
-msgid "Take a screenshot"
-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 "Take a screenshot of an area"
+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 "Take a screenshot of a window"
+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 "Take a screenshot of an area"
+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 "àààààààààà àà àààààààààà àà ààà ààààà"
+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 "àààààààààà àà ààààààà àà àààààààààà àà ààà ààààà"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:40
+#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "àààààà"
 
@@ -1396,22 +1356,18 @@ msgid "Turn zoom on or off"
 msgstr "ààà àààà àà ààà àààà"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:3
-#| msgid "Zoom in:"
 msgid "Zoom in"
 msgstr "ààà ààà ààà àààààà"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:4
-#| msgid "Zoom out:"
 msgid "Zoom out"
 msgstr "àààà ààà ààà àààààà"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:5
-#| msgid "Toggle screen reader"
 msgid "Turn screen reader on or off"
 msgstr "ààààààà àààà àà àààà àà ààà àààà"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:6
-#| msgid "Toggle on-screen keyboard"
 msgid "Turn on-screen keyboard on or off"
 msgstr "àà ààààààà àààààààà àà àààà àà ààà àààà"
 
@@ -1427,6 +1383,28 @@ msgstr "ààà àà àààà ààààà"
 msgid "High contrast on or off"
 msgstr "àààà ààààààààà àààà àà ààà àààà"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gtk/gtkinputdialog.c:238
+#. 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:1112
+#: ../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 "Mouse Keys"
+msgid "Compose Key"
+msgstr "àààà ààààà"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
@@ -1471,15 +1449,13 @@ msgstr "àààà (_S)"
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
-#: ../panels/universal-access/uap.ui.h:55
-#: ../panels/universal-access/zoom-options.c:333
+#: ../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 "àààà"
 
@@ -1489,9 +1465,7 @@ msgstr "ààààààà àààà ààààà ààà"
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:58
-#: ../panels/universal-access/zoom-options.c:337
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "àààà"
 
@@ -1499,7 +1473,7 @@ msgstr "àààà"
 # libgnomeui/gnome-app-helper.c:166
 #. 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 "ààà"
 
@@ -1516,27 +1490,18 @@ msgid "S_peed:"
 msgstr "ààà: (_p)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-#| msgid "Cursor blinks speed"
 msgid "Cursor blink speed"
 msgstr "ààààà àààààà ààà"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-#| msgid "Mouse Settings"
 msgid "Layout Settings"
 msgstr "ààààà àààààààà"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:75
-msgid "Typing"
-msgstr "ààààà àà ààà àà"
-
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#| msgid "Shortcut"
 msgid "Add Shortcut"
 msgstr "ààààààà àààààà"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-#| msgid "Shortcut"
 msgid "Remove Shortcut"
 msgstr "ààààààà àààààà"
 
@@ -1547,37 +1512,27 @@ msgid ""
 "Backspace to clear."
 msgstr ""
 "ààààààà ààààààà àààà àà ààà, àààààà àà ààààà àààà àà àà ààààà àààà ààààà àà "
-"àààààà àààà "
-"àà ààà àààààààà ààààà àààà."
+"àààààà àààà àà ààà "
+"àààààààà ààààà àààà."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:29
 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:552
+#: ../panels/keyboard/keyboard-shortcuts.c:560
+#: ../panels/keyboard/keyboard-shortcuts.c:942
+#: ../panels/keyboard/keyboard-shortcuts.c:1414
+#: ../panels/keyboard/keyboard-shortcuts.c:1418
 msgid "Custom Shortcuts"
 msgstr "ààààààà ààààààà"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:721
+#: ../panels/keyboard/keyboard-shortcuts.c:756
 msgid "<Unknown Action>"
 msgstr "<àààààà àààààà>"
 
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gtk/gtkinputdialog.c:238
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1025
-#: ../panels/sound/gvc-mixer-control.c:1087
-#: ../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:1253
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1589,7 +1544,7 @@ msgstr ""
 "ààààà àààà.\n"
 "ààààà Control, Alt àà Shift ààààà àà àà ààà ààààà àààà."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1196
+#: ../panels/keyboard/keyboard-shortcuts.c:1285
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1598,30 +1553,25 @@ msgstr ""
 "àà ààààààà \"%s\" àààà àà àà:\n"
 " \"%s\" àààà àààààààà àà"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1201
+#: ../panels/keyboard/keyboard-shortcuts.c:1290
 #, 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:1296
 msgid "_Reassign"
 msgstr "ààà àààà àààà (_R)"
 
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/logout.c:266
-#: ../panels/keyboard/keyboard-shortcuts.c:1618
-#: ../panels/wacom/cc-wacom-page.c:582
-msgid "Action"
-msgstr "ààààà"
-
-#: ../panels/keyboard/keyboard-shortcuts.c:1640
-msgid "Shortcut"
-msgstr "ààààààà"
+#: ../panels/mouse/cc-mouse-panel.c:152
+#| msgid "Your settings"
+msgid "_Test Your Settings"
+msgstr "àààà àààààààà àààààà (_T)"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
-msgid "Mouse and Touchpad"
+#| msgid "Mouse and Touchpad"
+msgid "Mouse & Touchpad"
 msgstr "àààà à ààààà"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
@@ -1641,830 +1591,1118 @@ 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 timeout"
+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 "Control ààààà àààà àààà àà àààààààà àà àààààà àààààà (_o)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#| msgid "Primary Color"
+msgid "Primary _button"
+msgstr "àààààààà ààà (_b)"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#| msgctxt "balance"
+#| msgid "Left"
+msgid "_Left"
+msgstr "ààààà (_L)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
-msgid "Pointer Speed"
-msgstr "àààààà ààà"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#| msgctxt "balance"
+#| msgid "Right"
+msgid "_Right"
+msgstr "àààààà (_R)"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
-#| msgid "_Acceleration:"
-msgid "A_cceleration:"
-msgstr "ààààà: (_c)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+msgid "Mouse"
+msgstr "àààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
-msgid "_Sensitivity:"
-msgstr "ààààààààààà:  (_S)"
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#| msgid "Pointer Speed"
+msgid "_Pointer speed"
+msgstr "àààààà ààà (_P)"
 
-#. low sensitivity
-#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
-#: ../panels/power/cc-power-panel.c:570
-msgid "Low"
-msgstr "ààààà"
+msgid "Touchpad"
+msgstr "ààààà"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#| msgid "Disable _touchpad while typing"
+msgid "Disable while _typing"
+msgstr "ààààààà àà ààààà ààààààààà àààà (_t)"
 
-#. high sensitivity
 #: ../panels/mouse/gnome-mouse-properties.ui.h:16
-msgid "High"
-msgstr "àààà"
+msgid "Tap to _click"
+msgstr "ààààà àààà àà ààà ààà àààà (_c)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:17
-msgid "Drag and Drop"
-msgstr "àààààà àà àààààà"
+#| msgid "Two-_finger scrolling"
+msgid "Two _finger scroll"
+msgstr "àà àààààà àà ààààààà (_f)"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:18
-msgid "Thr_eshold:"
-msgstr "ààààààà:  (_e)"
-
-#. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
-#: ../panels/universal-access/uap.ui.h:87
-msgid "Small"
-msgstr "àààà"
+msgid "C_ontent sticks to fingers"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:21
-#| msgid "Thr_eshold:"
-msgid "Drag Threshold"
-msgstr "ààààà ààààààààà"
+#: ../panels/mouse/gnome-mouse-test.c:134
+#: ../panels/mouse/gnome-mouse-test.ui.h:1
+msgid "Try clicking, double clicking, scrolling"
+msgstr ""
 
-#. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
-#: ../panels/universal-access/uap.ui.h:89
-msgid "Large"
-msgstr "àààà"
+#: ../panels/mouse/gnome-mouse-test.c:139
+msgid "Five clicks, GEGL time!"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:24
-msgid "Double-Click Timeout"
+#: ../panels/mouse/gnome-mouse-test.c:144
+#, fuzzy
+#| msgid "Double-click timeout"
+msgid "Double click, primary button"
 msgstr "ààààà ààààà ààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:25
-msgid "_Timeout:"
-msgstr "ààààààà: (_T)"
+#: ../panels/mouse/gnome-mouse-test.c:144
+msgid "Single click, primary button"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
-#| msgid "Double-Click Timeout"
-msgid "Double-click timeout"
+#: ../panels/mouse/gnome-mouse-test.c:147
+#, fuzzy
+#| msgid "Double-click timeout"
+msgid "Double click, middle button"
 msgstr "ààààà ààààà ààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:29
-msgid "To test your settings, try to double-click on the face."
-msgstr "àààà ààààà ààààà àààààà àà àààààà àà ààà, ààààà àà ààààà ààààà àààààà."
+#: ../panels/mouse/gnome-mouse-test.c:147
+msgid "Single click, middle button"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
-msgid "Mouse"
-msgstr "àààà"
+#: ../panels/mouse/gnome-mouse-test.c:150
+#, fuzzy
+#| msgid "Double-click timeout"
+msgid "Double click, secondary button"
+msgstr "ààààà ààààà ààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:31
-msgid "Disable _touchpad while typing"
-msgstr "ààààààà àà ààààà ààààà ààààààààà àààà (_t)"
+#: ../panels/mouse/gnome-mouse-test.c:150
+msgid "Single click, secondary button"
+msgstr ""
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:32
-msgid "Enable _mouse clicks with touchpad"
-msgstr "ààààà àà ààà àààà ààààà àààààà àààà (_m)"
+#: ../panels/network/cc-network-panel.c:615
+msgid "Network proxy"
+msgstr "ààààààà àààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:33
-msgid "Scrolling"
-msgstr "ààààààà àà ààà"
+#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
+#, c-format
+msgid "%s VPN"
+msgstr "%s VPN"
 
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gtk/gtkinputdialog.c:238
-#: ../panels/mouse/gnome-mouse-properties.ui.h:34
-msgid "_Disabled"
-msgstr "ààààààààà (_D)"
+#. TRANSLATORS: the user is running a NM that is not API compatible
+#: ../panels/network/cc-network-panel.c:866
+msgid "The system network services are not compatible with this version."
+msgstr "ààààà ààààà àààààà àà ààààààà àà ààà àààà àààà ààà."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:35
-msgid "_Edge scrolling"
-msgstr "àààààà àààààààààà (_E)"
+#. TRANSLATORS: this is to disable the radio hardware in the
+#. * network panel
+#: ../panels/network/cc-network-panel.c:1001
+#, fuzzy
+#| msgid "Airplane Mode"
+msgid "Air_plane Mode"
+msgstr "àààà àààà ààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:36
-msgid "Two-_finger scrolling"
-msgstr "àà ààààà àààààààààà (_f)"
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "ààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:37
-msgid "Enable h_orizontal scrolling"
-msgstr "ààààààà àààààààààà àààààà àààà (_o)"
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Network settings"
+msgstr "ààààààà àààààààà"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:38
-msgid "Touchpad"
-msgstr "ààààà"
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;IP;LAN;Proxy;"
+msgstr "ààààààà;ààààààà;àààà;ààà;àààààààà;"
 
-#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/cc-network-panel.c:273
-msgid ""
-"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
-msgstr ""
-"ààà àààààààà ààà àààààààà àà àààààà àààà àààà àà àà àààààààààààà àààààà "
-"àààààà àààà àààà àààà àà."
+#: ../panels/network/net-device-mobile.c:222
+#, fuzzy
+#| msgid "Connection"
+msgid "Add new connection"
+msgstr "ààààààà"
 
-#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
-#. * network, then anyone else on that network can tell your
-#. * machine that it should proxy all of your web traffic
-#. * through them.
-#: ../panels/network/cc-network-panel.c:281
-msgid "This is not recommended for untrusted public networks."
-msgstr "àà àààààààààà ààààààààà ààààà àà ààà àààààààà àààà àà."
+#. Translators: network device speed
+#: ../panels/network/net-device-mobile.c:261
+#: ../panels/network/net-device-wifi.c:770
+#: ../panels/network/net-device-wired.c:126
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#. 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/cc-network-panel.c:1001
-#| msgid "Other..."
-msgctxt "Wireless access point"
-msgid "Other..."
-msgstr "àààà..."
+#. 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:203
+msgid "Connect to a Hidden Network"
+msgstr ""
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/cc-network-panel.c:1159
-#: ../panels/network/cc-network-panel.c:1566
+#: ../panels/network/net-device-wifi.c:302
+#: ../panels/network/net-device-wifi.c:481
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1163
-#: ../panels/network/cc-network-panel.c:1570
+#: ../panels/network/net-device-wifi.c:306
+#: ../panels/network/net-device-wifi.c:485
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1167
+#: ../panels/network/net-device-wifi.c:310
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/cc-network-panel.c:1172
+#: ../panels/network/net-device-wifi.c:315
 msgid "Enterprise"
 msgstr "ààààà"
 
-#. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/cc-network-panel.c:1178
-#: ../panels/network/cc-network-panel.c:1561
-#: ../panels/universal-access/uap.ui.h:5 ../panels/wacom/cc-wacom-page.c:297
-#: ../panels/wacom/cc-wacom-page.c:314
+#: ../panels/network/net-device-wifi.c:320
+#: ../panels/network/net-device-wifi.c:476
+#| msgid "None"
+msgctxt "Wifi security"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../panels/network/cc-network-panel.c:1665
-msgid "Hotspot"
-msgstr "àààààààà"
-
-#. Translators: network device speed
-#: ../panels/network/cc-network-panel.c:1672
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
-
-#: ../panels/network/cc-network-panel.c:2018 ../panels/network/network.ui.h:11
-msgid "IPv4 Address"
-msgstr "IPv4 ààà"
+#: ../panels/network/net-device-wifi.c:697
+msgid "never"
+msgstr "ààà àààà"
 
-#: ../panels/network/cc-network-panel.c:2019 ../panels/network/network.ui.h:12
-msgid "IPv6 Address"
-msgstr "IPv6 ààà"
+#: ../panels/network/net-device-wifi.c:707
+msgid "today"
+msgstr "àà"
 
-#: ../panels/network/cc-network-panel.c:2022
-#: ../panels/network/cc-network-panel.c:2025 ../panels/network/network.ui.h:27
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "àààà ààà"
+#: ../panels/network/net-device-wifi.c:709
+msgid "yesterday"
+msgstr "àà"
 
-#: ../panels/network/cc-network-panel.c:2072
-#: ../panels/network/cc-network-panel.c:2447
+#: ../panels/network/net-device-wifi.c:711
 #, c-format
-msgid "%s VPN"
-msgstr "%s VPN"
+msgid "%i day ago"
+msgid_plural "%i days ago"
+msgstr[0] "%i ààà àààà"
+msgstr[1] "%i ààààà àààà"
 
-#: ../panels/network/cc-network-panel.c:2180
-msgid "Proxy"
-msgstr "àààààààà"
+#. TRANSLATORS: VPN status
+#: ../panels/network/net-device-wifi.c:780
+#: ../panels/network/panel-common.c:277
+msgid "Not connected"
+msgstr "àààààààà àààà àà"
 
-#: ../panels/network/cc-network-panel.c:2254
-msgid "Network proxy"
-msgstr "ààààààà àààààààà"
+#: ../panels/network/net-device-wifi.c:782
+#: ../panels/network/net-device-wifi.c:2086
+#| msgid "Out of toner"
+msgid "Out of range"
+msgstr "àààà àà àààà"
 
-#. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2514
-msgid "The system network services are not compatible with this version."
-msgstr "ààààà ààààà àààààà àà ààààààà àà ààà àààà àààà ààà."
+#: ../panels/network/net-device-wifi.c:813
+#| msgid "None"
+msgctxt "Signal strength"
+msgid "None"
+msgstr "ààà àààà"
 
-#: ../panels/network/cc-network-panel.c:2712
-#, c-format
+#: ../panels/network/net-device-wifi.c:815
+#| msgctxt "Password strength"
+#| msgid "Weak"
+msgctxt "Signal strength"
+msgid "Weak"
+msgstr "ààààà"
+
+#: ../panels/network/net-device-wifi.c:817
+msgctxt "Signal strength"
+msgid "Ok"
+msgstr "ààà"
+
+#: ../panels/network/net-device-wifi.c:819
+#| msgid "Good"
+msgctxt "Signal strength"
+msgid "Good"
+msgstr "ààààà"
+
+#: ../panels/network/net-device-wifi.c:821
+msgctxt "Signal strength"
+msgid "Excellent"
+msgstr "àààà ààààà"
+
+#: ../panels/network/net-device-wifi.c:1005
+#, fuzzy, c-format
+#| msgid ""
+#| "Network details for %s including password and any custom configuration "
+#| "will be lost"
 msgid ""
 "Network details for %s including password and any custom configuration will "
-"be lost"
+"be lost."
 msgstr ""
-"ààààà ààààà %s àààà ààààààà àà àààà ààà ààààà ààààààà àà ààà "
-"àà ààà àààà"
+"ààààà ààààà %s àààà ààààààà àà àààà ààà ààààà ààààààà àà ààà àà ààà àààà"
 
-#: ../panels/network/cc-network-panel.c:2722
+#: ../panels/network/net-device-wifi.c:1016
 msgid "Forget"
 msgstr "ààààà"
 
-#: ../panels/network/cc-network-panel.c:3221
-#| msgid "Not connected"
-msgid "Not connected to the internet."
-msgstr "àààààààà àà ààààà àààà."
-
-#: ../panels/network/cc-network-panel.c:3222
-msgid "Create the hotspot anyway?"
-msgstr "àààà àà àààààààà ààààà?"
+#: ../panels/network/net-device-wifi.c:1552
+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/cc-network-panel.c:3240
+#: ../panels/network/net-device-wifi.c:1556
 #, c-format
-msgid "Disconnect from %s and create a new hotspot?"
-msgstr "àààààààààà àààà %s àà àà ààà àààààààà àààààà?"
-
-#: ../panels/network/cc-network-panel.c:3243
-msgid "This is your only connection to the internet."
-msgstr "àà àààà ààààààà ààààààà àààààààà àà àà."
+msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+msgstr ""
 
-#: ../panels/network/cc-network-panel.c:3261
-msgid "Create _Hotspot"
-msgstr "àààààààà ààààà (_H)"
+#: ../panels/network/net-device-wifi.c:1560
+msgid ""
+"It is not possible to access the internet through your wireless while the "
+"hotspot is active."
+msgstr ""
 
-#: ../panels/network/cc-network-panel.c:3321
+#: ../panels/network/net-device-wifi.c:1626
 msgid "Stop hotspot and disconnect any users?"
 msgstr "àààààààà ààààà àà àààà àà àààààààààààà àà àààààààààà àààà?"
 
-#: ../panels/network/cc-network-panel.c:3324
+#: ../panels/network/net-device-wifi.c:1629
 msgid "_Stop Hotspot"
 msgstr "àààààààà ààààà (_S)"
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:3342
-#| msgid "Accel Mode"
-msgid "Airplane Mode"
-msgstr "àààà àààà ààà"
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/net-proxy.c:67
+msgid ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgstr ""
+"ààà àààààààà ààà àààààààà àà àààààà àààà àààà àà àà àààààààààààà àààààà "
+"àààààà àààà àààà "
+"àààà àà."
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-msgid "Network"
-msgstr "ààààààà"
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * network, then anyone else on that network can tell your
+#. * machine that it should proxy all of your web traffic
+#. * through them.
+#: ../panels/network/net-proxy.c:75
+msgid "This is not recommended for untrusted public networks."
+msgstr "àà àààààààààà ààààààààà ààààà àà ààà àààààààà àààà àà."
 
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "ààààààà àààààààà"
+#: ../panels/network/net-proxy.c:367
+msgid "Proxy"
+msgstr "àààààààà"
 
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;IP;LAN;Proxy;"
-msgstr "ààààààà;ààààààà;àààà;ààà;àààààààà;"
+#: ../panels/network/network-mobile.ui.h:1
+msgid "IMEI"
+msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:1
-msgid "Select the interface to use for the new service"
-msgstr "ààà àààààà àà ààààà àààà àà ààà ààààààà àà ààà ààà"
+#: ../panels/network/network-mobile.ui.h:2
+msgid "Provider"
+msgstr "ààààààà"
 
-# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
-# libgnomeui/gnome-app-helper.c:166
-#: ../panels/network/network.ui.h:2
-msgid "Create..."
-msgstr "ààààà..."
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "àààà ààà"
 
-#: ../panels/network/network.ui.h:3
-msgid "Interface"
-msgstr "ààààààà"
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-wifi.ui.h:12
+#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
+msgid "IPv6 Address"
+msgstr "IPv6 ààà"
 
-#: ../panels/network/network.ui.h:4
-msgid "VPN"
-msgstr "VPN"
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-wifi.ui.h:13
+#: ../panels/network/network-wired.ui.h:4
+msgid "Default Route"
+msgstr "àààààà ààààà"
+
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-wifi.ui.h:14
+#: ../panels/network/network-wired.ui.h:5
+msgid "DNS"
+msgstr "àààààà"
+
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-wired.ui.h:6
+msgid "_Options..."
+msgstr "àààààà... (_O)"
 
-#: ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "ààààààààà"
 
-#: ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "àààààààà"
 
-#: ../panels/network/network.ui.h:8
-#| msgid "Device"
-msgid "Add Device"
-msgstr "àààààà àààààà"
-
-#: ../panels/network/network.ui.h:10
-msgid "Hardware Address"
-msgstr "ààààààààà ààà"
-
-#: ../panels/network/network.ui.h:13
-msgid "Subnet Mask"
-msgstr "ààààà ààààà"
-
-#: ../panels/network/network.ui.h:14
-msgid "Default Route"
-msgstr "àààààà ààààà"
-
-#: ../panels/network/network.ui.h:15
-msgid "DNS"
-msgstr "àààààà"
-
-#: ../panels/network/network.ui.h:16
-#| msgid "Device"
-msgid "Device Off"
-msgstr "ààà àààààà"
+#: ../panels/network/network-proxy.ui.h:4
+msgid "_Method"
+msgstr "àààà (_M)"
 
-#: ../panels/network/network.ui.h:17
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "_Options..."
-msgstr "àààààà... (_O)"
+#: ../panels/network/network-proxy.ui.h:5
+msgid "_Configuration URL"
+msgstr "ààààààà àààààà (_C)"
 
-#: ../panels/network/network.ui.h:18
-msgid "Security"
-msgstr "ààààààà"
+#: ../panels/network/network-proxy.ui.h:6
+msgid "_HTTP Proxy"
+msgstr "àààààààà àààààààà (_H)"
 
-#: ../panels/network/network.ui.h:19
-msgid "_Network Name"
-msgstr "ààààà ààà (_N)"
+#: ../panels/network/network-proxy.ui.h:7
+msgid "H_TTPS Proxy"
+msgstr "àààààààà àààààààà: (_T)"
 
-#: ../panels/network/network.ui.h:20
-#| msgid "_Network Name"
-msgid "Network Name"
-msgstr "ààààà ààà"
+#: ../panels/network/network-proxy.ui.h:8
+msgid "_FTP Proxy"
+msgstr "àààààà àààààààà (_F)"
 
-#: ../panels/network/network.ui.h:21
-#| msgid "Security"
-msgid "Security Key"
-msgstr "ààààààà ààààà"
+#: ../panels/network/network-proxy.ui.h:9
+msgid "_Socks Host"
+msgstr "ààààà ààààà (_S)"
 
-#: ../panels/network/network.ui.h:22
-#| msgid "Network"
-msgid "Forget Network"
-msgstr "ààààà ààà ààà"
+#: ../panels/network/network.ui.h:1
+msgid "Select the interface to use for the new service"
+msgstr "ààà àààààà àà ààààà àààà àà ààà ààààààà àà ààà ààà"
 
-#: ../panels/network/network.ui.h:23
-#| msgid "Take a photo..."
-msgid "_Use as Hotspot..."
-msgstr "àààààààà àà ààà ààà àààààà... (_U)"
+# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:166
+#: ../panels/network/network.ui.h:2
+#| msgid "Create..."
+msgid "C_reate..."
+msgstr "ààààà (_r)..."
 
-#: ../panels/network/network.ui.h:24
-msgid "_Stop Hotspot..."
-msgstr "àààààààà ààààà... (_S)"
+#: ../panels/network/network.ui.h:3
+#| msgid "Interface"
+msgid "_Interface"
+msgstr "ààààààà (_I)"
 
-#: ../panels/network/network.ui.h:25
-msgid "IMEI"
-msgstr "IMEI"
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
 
-#: ../panels/network/network.ui.h:26
-msgid "Provider"
-msgstr "ààààààà"
+#: ../panels/network/network.ui.h:8
+msgid "Add Device"
+msgstr "àààààà àààààà"
 
-#: ../panels/network/network.ui.h:28
+#: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "VPN àààààà"
 
-#: ../panels/network/network.ui.h:29
+#: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "ààààà"
 
-#: ../panels/network/network.ui.h:30
+#: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "àààà ààà"
 
-#: ../panels/network/network.ui.h:31
+#: ../panels/network/network-vpn.ui.h:5
 msgid "Group Password"
 msgstr "àààà ààààààà"
 
-#: ../panels/network/network.ui.h:32
+#: ../panels/network/network-vpn.ui.h:6
 msgid "Username"
 msgstr "ààààààààààà"
 
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-# gtk/gtkinputdialog.c:238
-#: ../panels/network/network.ui.h:33
-#| msgid "Disabled"
-msgid "Disable VPN"
-msgstr "ààààà VPN"
-
-#: ../panels/network/network.ui.h:34
+#: ../panels/network/network-vpn.ui.h:7
 msgid "_Configure..."
 msgstr "àààààààà àààà... (_C)"
 
-#: ../panels/network/network.ui.h:35
-msgid "_Method"
-msgstr "àààà (_M)"
+#: ../panels/network/network-wifi.ui.h:1
+#| msgid "Wireless mouse"
+msgid "Wireless Hotspot"
+msgstr "ààààà àààààààà"
 
-#: ../panels/network/network.ui.h:36
-msgid "_Configuration URL"
-msgstr "ààààààà àààààà (_C)"
+#: ../panels/network/network-wifi.ui.h:2
+msgid "_Turn On"
+msgstr "àààà àààà (_T)"
 
-#: ../panels/network/network.ui.h:37
-msgid "_HTTP Proxy"
-msgstr "àààààààà àààààààà (_H)"
+#. TRANSLATORS: device type
+#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
+msgid "Wireless"
+msgstr "ààààà"
 
-#: ../panels/network/network.ui.h:38
-msgid "H_TTPS Proxy"
-msgstr "àààààààà àààààààà: (_T)"
+#: ../panels/network/network-wifi.ui.h:4
+msgid "_Use as Hotspot..."
+msgstr "àààààààà àà ààà ààà àààààà... (_U)"
 
-#: ../panels/network/network.ui.h:39
-msgid "_FTP Proxy"
-msgstr "àààààà àààààààà (_F)"
+#: ../panels/network/network-wifi.ui.h:5
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "àààààà àààà (_C)"
 
-#: ../panels/network/network.ui.h:40
-msgid "_Socks Host"
-msgstr "ààààà ààààà (_S)"
+#: ../panels/network/network-wifi.ui.h:6
+#| msgctxt "printer state"
+#| msgid "Paused"
+msgid "Last used"
+msgstr "ààààà àààààààà"
+
+#: ../panels/network/network-wifi.ui.h:7
+#: ../panels/network/network-wired.ui.h:1
+msgid "Hardware Address"
+msgstr "ààààààààà ààà"
+
+#: ../panels/network/network-wifi.ui.h:8
+msgid "Security"
+msgstr "ààààààà"
+
+#: ../panels/network/network-wifi.ui.h:9
+#| msgid "Length:"
+msgid "Strength"
+msgstr "àààà"
+
+#: ../panels/network/network-wifi.ui.h:10
+#| msgid "Cursor blink speed"
+msgid "Link speed"
+msgstr "àààà ààà"
+
+#: ../panels/network/network-wifi.ui.h:11
+#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
+msgid "IPv4 Address"
+msgstr "IPv4 ààà"
+
+#: ../panels/network/network-wifi.ui.h:15
+#| msgid "Forget Network"
+msgid "_Forget Network"
+msgstr "ààààà ààà ààà (_F)"
+
+#: ../panels/network/network-wifi.ui.h:16
+#| msgid "Copy Settings..."
+msgid "_Settings..."
+msgstr "àààààààà (_S)..."
+
+#: ../panels/network/network-wifi.ui.h:17
+msgid "Switch off to connect to a wireless network"
+msgstr ""
 
-#: ../panels/network/network.ui.h:41
-#| msgid "_HTTP Proxy"
-msgid "HTTP Port"
-msgstr "àààààààà ààààà"
+#: ../panels/network/network-wifi.ui.h:18
+msgid "Network Name"
+msgstr "ààààà ààà"
 
-#: ../panels/network/network.ui.h:42
-#| msgid "H_TTPS Proxy"
-msgid "HTTPS Port"
-msgstr "ààààààààà ààààà"
+#: ../panels/network/network-wifi.ui.h:19
+#, fuzzy
+#| msgid "Connected"
+msgid "Connected Devices"
+msgstr "àààààààà"
 
-#: ../panels/network/network.ui.h:43
-#| msgid "_FTP Proxy"
-msgid "FTP Port"
-msgstr "àààààà ààààà"
+#: ../panels/network/network-wifi.ui.h:20
+#| msgid "Security Key"
+msgid "Security type"
+msgstr "ààààààà àààààà"
 
-#: ../panels/network/network.ui.h:44
-msgid "Socks Port"
-msgstr "ààààà ààààà"
+#: ../panels/network/network-wifi.ui.h:21
+#| msgid "Security Key"
+msgid "Security key"
+msgstr "ààààààà ààààà"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:83
+#: ../panels/network/panel-common.c:86
 msgid "Wired"
 msgstr "ààààààà"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:87
-msgid "Wireless"
-msgstr "ààààà"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:94
+#: ../panels/network/panel-common.c:97
 msgid "Mobile broadband"
 msgstr "àààààà ààààààààà"
 
 # libgnomeprintui/gpaui/add-printer-dialog.c:83
 # libgnomeprintui/gpaui/config-dialog.c:83
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:103
+#: ../panels/network/panel-common.c:106
 msgid "Mesh"
 msgstr "ààà"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:162
+#: ../panels/network/panel-common.c:166
 msgid "Ad-hoc"
 msgstr "ààààà"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:170
 msgid "Infrastructure"
 msgstr "àààààààà ààààà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:190 ../panels/network/panel-common.c:251
+#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
 msgid "Status unknown"
 msgstr "àààààà àààààà"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:194
+#: ../panels/network/panel-common.c:198
 msgid "Unmanaged"
 msgstr "àààà àààààààà"
 
-#: ../panels/network/panel-common.c:199
+#: ../panels/network/panel-common.c:203
 msgid "Firmware missing"
 msgstr "ààà àààààààà"
 
-#: ../panels/network/panel-common.c:202
+#: ../panels/network/panel-common.c:206
 msgid "Cable unplugged"
 msgstr "àààà àààààà"
 
-#: ../panels/network/panel-common.c:204
+#: ../panels/network/panel-common.c:208
 msgid "Unavailable"
 msgstr "àààààààà"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:208
+#: ../panels/network/panel-common.c:212
 msgid "Disconnected"
 msgstr "àààààààààààà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:215 ../panels/network/panel-common.c:257
+#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
 msgid "Connecting"
 msgstr "àààà ààà àà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
 msgid "Authentication required"
 msgstr "ààààààà àààààà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
 msgid "Connected"
 msgstr "àààààààà"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:231
 msgid "Disconnecting"
 msgstr "àààààààààààà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:231 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
 msgid "Connection failed"
 msgstr "ààààààà àààà"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
 msgid "Status unknown (missing)"
 msgstr "àààààà àààààà (ààà)"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:273
-msgid "Not connected"
-msgstr "àààààààà àààà àà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:301
+#| msgid "Connection failed"
+msgid "Configuration failed"
+msgstr "ààààààà àààà"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:305
-msgid "Error logging into the account"
-msgstr "àààà ààà àààààà àààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:305
+#| msgid "Connection failed"
+msgid "IP configuration failed"
+msgstr "IP ààààààà àààà"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:351
-msgid "Expired credentials. Please log in again."
-msgstr "ààààààààààà àà ààà àààà àààààà.ààààà ààà àà àààààà àààà."
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:309
+#, fuzzy
+#| msgid "_Configuration URL"
+msgid "IP configuration expired"
+msgstr "ààààààà àààààà (_C)"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:354
-msgid "_Log In"
-msgstr "ààà àà (_L) "
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:313
+msgid "Secrets were required, but not provided"
+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-panel.c:461
-#: ../panels/online-accounts/online-accounts.ui.h:1
-#| msgid "My Account"
-msgid "Add Account"
-msgstr "àààà àààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:317
+msgid "802.1x supplicant disconnected"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:466
-msgid "To add a new account, first select the account type"
-msgstr "ààà àààà àààààà àà ààà, àààà àààà àààààà àà ààà àààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:321
+msgid "802.1x supplicant configuration failed"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:469
-#| msgid "_Account Type"
-msgid "Account Type:"
-msgstr "àààà àààààà:"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:325
+msgid "802.1x supplicant failed"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:497
-#| msgid "Add"
-msgid "_Add..."
-msgstr "àààààà... (_A)"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:329
+msgid "802.1x supplicant took too long to authenticate"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:550
-#| msgid "Create new account"
-msgid "Error creating account"
-msgstr "àààà ààààà ààà àààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:333
+msgid "PPP service failed to start"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:584
-msgid "Error removing account"
-msgstr "àààà ààààà ààà àààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:337
+#, fuzzy
+#| msgid "Disconnected"
+msgid "PPP service disconnected"
+msgstr "àààààààààààà"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:620
-msgid "Are you sure you want to remove the account?"
-msgstr "àààà àà ààààà ààààà àà àààààà ààààà ààà?"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:341
+msgid "PPP failed"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:622
-msgid "This will not remove the account on the server."
-msgstr "àà ààààà àà àààà àà ààà àààà."
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:345
+msgid "DHCP client failed to start"
+msgstr ""
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:623
-msgid "_Remove"
-msgstr "ààààà (_R)"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:349
+msgid "DHCP client error"
+msgstr ""
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
-#| msgid "Other Accounts"
-msgid "Online Accounts"
-msgstr "àààààà ààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:353
+#, fuzzy
+#| msgid "Connection failed"
+msgid "DHCP client failed"
+msgstr "ààààààà àààà"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-#| msgid "Create new account"
-msgid "Manage online accounts"
-msgstr "àààààà ààààà àà ààààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:357
+msgid "Shared connection service failed to start"
+msgstr ""
 
-#. Translators: those are keywords for the online-accounts control-center panel
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
-msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
-msgstr "àààà;àààààà;àààààà;àààà;ààà;àààààà;ààà;ààààààà;ààà;àààààà;"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:361
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Shared connection service failed"
+msgstr "ààààààà àààà"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
-#| msgid "My Account"
-msgid "Remove Account"
-msgstr "àààà àààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:365
+msgid "AutoIP service failed to start"
+msgstr ""
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
-#| msgid "Create new account"
-msgid "Select an account"
-msgstr "àààà ààààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:369
+msgid "AutoIP service error"
+msgstr ""
 
-#: ../panels/power/cc-power-panel.c:162
-msgid "Unknown time"
-msgstr "àààààà ààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:373
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "AutoIP service failed"
+msgstr "ààààààà àààà"
 
-#: ../panels/power/cc-power-panel.c:168
-#, c-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i àààà"
-msgstr[1] "%i àààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:377
+msgid "Line busy"
+msgstr ""
 
-#: ../panels/power/cc-power-panel.c:180
-#, c-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i àààà"
-msgstr[1] "%i àààà"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:381
+msgid "No dial tone"
+msgstr "àààà ààà àààà"
 
-#. 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:188
-#, c-format
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:385
+msgid "No carrier could be established"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:389
+msgid "Dialing request timed out"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:393
+msgid "Dialing attempt failed"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:397
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Modem initialization failed"
+msgstr "ààààààà àààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:401
+#, fuzzy
+#| msgid "Failed to delete user"
+msgid "Failed to select the specified APN"
+msgstr "àààààààà àààààà ààà àààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:405
+msgid "Not searching for networks"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:409
+#, fuzzy
+#| msgid "Network settings"
+msgid "Network registration denied"
+msgstr "ààààààà àààààààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:413
+msgid "Network registration timed out"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:417
+msgid "Failed to register with the requested network"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:421
+msgid "PIN check failed"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:425
+msgid "Firmware for the device may be missing"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:429
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Connection disappeared"
+msgstr "ààààààà àààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:433
+msgid "Carrier/link changed"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:437
+msgid "Existing connection was assumed"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:441
+msgid "Modem not found"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:445
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Bluetooth connection failed"
+msgstr "ààààààà àààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:449
+msgid "SIM Card not inserted"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:453
+msgid "SIM Pin required"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:457
+msgid "SIM Puk required"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:461
+#, fuzzy
+#| msgctxt "Password strength"
+#| msgid "Strong"
+msgid "SIM wrong"
+msgstr "ààààà"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:465
+msgid "InfiniBand device does not support connected mode"
+msgstr ""
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:469
+#, fuzzy
+#| msgid "Connection failed"
+msgid "Connection dependency failed"
+msgstr "ààààààà àààà"
+
+#. 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:383
+msgid "Error logging into the account"
+msgstr "àààà ààà àààààà àààààà"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:437
+msgid "Expired credentials. Please log in again."
+msgstr "ààààààààààà àà ààà àààà àààààà.ààààà ààà àà àààààà àààà."
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:440
+msgid "_Log In"
+msgstr "ààà àà (_L) "
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:676
+msgid "Error creating account"
+msgstr "àààà ààààà ààà àààààà"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:718
+msgid "Error removing account"
+msgstr "àààà ààààà ààà àààààà"
+
+#: ../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:756
+msgid "This will not remove the account on the server."
+msgstr "àà ààààà àà àààà àà ààà àààà."
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:757
+msgid "_Remove"
+msgstr "ààààà (_R)"
+
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1
+msgid "Online Accounts"
+msgstr "àààààà ààààà"
+
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
+msgid "Manage online accounts"
+msgstr "àààààà ààààà àà ààààààà"
+
+#. Translators: those are keywords for the online-accounts control-center panel
+#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
+msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
+msgstr "àààà;àààààà;àààààà;àààà;ààà;àààààà;ààà;ààààààà;ààà;àààààà;"
+
+#: ../panels/online-accounts/online-accounts.ui.h:1
+#, fuzzy
+#| msgid "Manage online accounts"
+msgid "No online accounts configured"
+msgstr "àààààà ààààà àà ààààààà"
+
+#: ../panels/online-accounts/online-accounts.ui.h:3
+msgid "Remove Account"
+msgstr "àààà àààààà"
+
+#: ../panels/online-accounts/online-accounts.ui.h:4
+#, fuzzy
+#| msgid "Manage online accounts"
+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:157
+msgid "Unknown time"
+msgstr "àààààà ààà"
+
+#: ../panels/power/cc-power-panel.c:163
+#, c-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i àààà"
+msgstr[1] "%i àààà"
+
+#: ../panels/power/cc-power-panel.c:175
+#, c-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] "%i àààà"
+msgstr[1] "%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:183
+#, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:189
+#: ../panels/power/cc-power-panel.c:184
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "àààà"
 msgstr[1] "àààà"
 
-#: ../panels/power/cc-power-panel.c:190
+#: ../panels/power/cc-power-panel.c:185
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "àààà"
 msgstr[1] "àààà"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:233
+#: ../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:241
+#: ../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:249
+#: ../panels/power/cc-power-panel.c:244
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "ààààà ààààà àà ààààà - %s ààà"
 
 #. TRANSLATORS: primary battery
-#. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:266 ../panels/power/cc-power-panel.c:558
-#| msgid "UPS charging"
+#: ../panels/power/cc-power-panel.c:261
 msgid "Charging"
 msgstr "ààààà àà ààà àà"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:271
-#| msgid "On battery power:"
+#: ../panels/power/cc-power-panel.c:266
 msgid "Using battery power"
 msgstr "ààààà ààààà àà ààààà"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+#: ../panels/power/cc-power-panel.c:270
 msgid "Charging - fully charged"
 msgstr "àààààààà - àààà ààà ààààààà"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+#: ../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:347
+#: ../panels/power/cc-power-panel.c:342
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "àààààà àà àààààà, %s ààà"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:353
+#: ../panels/power/cc-power-panel.c:348
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "àààààà ààààà àà ààààà - %s ààà"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
+#: ../panels/power/cc-power-panel.c:366
 msgid "Caution low UPS"
 msgstr "àààààà àà àààààà"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:376
+#: ../panels/power/cc-power-panel.c:371
 msgid "Using UPS power"
 msgstr "àààààà ààààà àà ààààà"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:428
+#: ../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:432
+#: ../panels/power/cc-power-panel.c:427
 msgid "Your secondary battery is empty"
 msgstr "àààà àààààààà ààààà àààà àà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:515
-#| msgid "Wireless"
+#: ../panels/power/cc-power-panel.c:510
 msgid "Wireless mouse"
 msgstr "ààààà àààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:519
-#| msgid "Screen keyboard"
+#: ../panels/power/cc-power-panel.c:514
 msgid "Wireless keyboard"
 msgstr "ààààà ààààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:523
+#: ../panels/power/cc-power-panel.c:518
 msgid "Uninterruptible power supply"
 msgstr "àààà ààààààà àà ààààà ààààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:527
+#: ../panels/power/cc-power-panel.c:522
 msgid "Personal digital assistant"
 msgstr "ààààààààà àààààà ààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:531
+#: ../panels/power/cc-power-panel.c:526
 msgid "Cellphone"
 msgstr "àààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:535
-#| msgid "Launch media player"
+#: ../panels/power/cc-power-panel.c:530
 msgid "Media player"
 msgstr "àààààà àààààà"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-# gtk/gtkinputdialog.c:238
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:539
-#| msgid "Enabled"
+#: ../panels/power/cc-power-panel.c:534
 msgid "Tablet"
 msgstr "àààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
-#| msgctxt "print job"
-#| msgid "Completed"
+#: ../panels/power/cc-power-panel.c:538
 msgid "Computer"
 msgstr "ààààààààà"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:547
-#| msgid "Battery charging"
+#: ../panels/power/cc-power-panel.c:542
 msgid "Battery"
 msgstr "ààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
-#| msgid "Location"
+#: ../panels/power/cc-power-panel.c:553
+#| msgid "Charging"
+msgctxt "Battery power"
+msgid "Charging"
+msgstr "ààààà àà ààà àà"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:560
+#| msgid "Caution"
+msgctxt "Battery power"
 msgid "Caution"
 msgstr "ààààààà"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:575
-#| msgctxt "Password strength"
+#: ../panels/power/cc-power-panel.c:565
+#| msgid "Low"
+msgctxt "Battery power"
+msgid "Low"
+msgstr "àà"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:570
 #| msgid "Good"
+msgctxt "Battery power"
 msgid "Good"
 msgstr "ààààà"
 
-#: ../panels/power/cc-power-panel.c:1077
-#| msgid "_Type:"
-msgid "Tip:"
-msgstr "ààààààà:"
-
-#: ../panels/power/cc-power-panel.c:1078
-#| msgid "Brightness"
-msgid "Brightness Settings"
-msgstr "àààààààà àààààààà"
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:575
+#| msgid "Charging - fully charged"
+msgctxt "Battery power"
+msgid "Charging - fully charged"
+msgstr "àààààààà - àààà ààà ààààààà"
 
-#: ../panels/power/cc-power-panel.c:1079
-msgid "affect how much power is used"
-msgstr "àààààààà ààààà ààààà àà àààààààà àààà àà"
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:579
+#| msgid "Empty"
+msgctxt "Battery power"
+msgid "Empty"
+msgstr "ààààà"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2484,7 +2722,6 @@ msgid "Hibernate"
 msgstr "ààààààààààà"
 
 #: ../panels/power/power.ui.h:2
-#| msgid "Power"
 msgid "Power off"
 msgstr "àààà àà"
 
@@ -2507,17 +2744,14 @@ msgstr "1 àààà"
 # #-#-#-#-#  gnome-icon-theme.gnome-2-2.hi.po (gnome-icon theme 2.2)  #-#-#-#-# 48x48/emblems/emblem-sound.icon.in.h:1
 # 48x48/emblems/emblem-sound.icon.in.h:1
 #: ../panels/power/power.ui.h:7
-#| msgid "Suspend"
 msgid "Don't suspend"
 msgstr "ààààààà àààà"
 
 #: ../panels/power/power.ui.h:8
-#| msgid "On battery power:"
 msgid "On battery power"
 msgstr "ààààà àààà àà àààà"
 
 #: ../panels/power/power.ui.h:9
-#| msgid "Cable unplugged"
 msgid "When plugged in"
 msgstr "àà àààààà"
 
@@ -2530,313 +2764,553 @@ msgid "When power is _critically low"
 msgstr "àà àààà àààà àà àà (_c)"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:541
+#: ../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:543
+#: ../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:546
+#: ../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:549
+#: ../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:551
+#: ../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:553
+#: ../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:555
+#: ../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:557
+#: ../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:559
+#: ../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:561
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Out of paper"
 msgstr "àààà àà àààà"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:563
+#: ../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:565
+#: ../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:567
+#: ../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:569
+#: ../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:571
+#: ../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:573
+#: ../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
+#| msgid "_Configuration URL"
+msgctxt "printer state"
+msgid "Configuring"
+msgstr "àààààààà àà ààà àà"
+
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:748
+#: ../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:752
+#: ../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:756
+#: ../panels/printers/cc-printers-panel.c:789
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "ààà ààà"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:868
+#: ../panels/printers/cc-printers-panel.c:906
 msgid "Toner Level"
 msgstr "àààà àààà"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:871
+#: ../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:874
+#: ../panels/printers/cc-printers-panel.c:912
 msgid "Supply Level"
 msgstr "ààààààà àààà"
 
+#. Translators: Printer's state (printer is being installed right now)
+#: ../panels/printers/cc-printers-panel.c:930
+#| msgid "Install languages..."
+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:1107
+msgid "No printers available"
+msgstr "ààà ààààààà àààààà àààà"
+
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:889
-#: ../panels/printers/cc-printers-panel.c:1284
+#: ../panels/printers/cc-printers-panel.c:1411
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u àààààà"
 msgstr[1] "%u àààààà"
 
-#. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:996
-msgid "No printers available"
-msgstr "ààà ààààààà àààààà àààà"
+#. Translators: Addition of the new printer failed.
+#: ../panels/printers/cc-printers-panel.c:1731
+msgid "Failed to add new printer."
+msgstr "ààà ààààààà àààààà ààà àààà."
+
+#: ../panels/printers/cc-printers-panel.c:1896
+#| msgid "Select ICC Profile File"
+msgid "Select PPD File"
+msgstr "àà PPD àààà ààààà"
+
+#: ../panels/printers/cc-printers-panel.c:1905
+msgid ""
+"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
+"PPD.GZ)"
+msgstr ""
+"àààààààààààààà ààààààà ààààà ààààà (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD."
+"GZ)"
+
+#: ../panels/printers/cc-printers-panel.c:2210
+#, fuzzy
+#| msgid "No local printers found"
+msgid "No suitable driver found"
+msgstr "ààà ààààààà ààààààà àààà àààà"
+
+#: ../panels/printers/cc-printers-panel.c:2279
+msgid "Searching for preferred drivers..."
+msgstr ""
+
+#: ../panels/printers/cc-printers-panel.c:2294
+msgid "Select from database..."
+msgstr ""
+
+#: ../panels/printers/cc-printers-panel.c:2303
+#| msgid "Browse Files..."
+msgid "Provide PPD File..."
+msgstr "PPD àààà ààà..."
+
+#. Translators: Name of job which makes printer to print test page
+#: ../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:2880
+#, c-format
+msgid "Could not load ui: %s"
+msgstr "ààà àààà àà ààà ui: %s"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
+msgid "Printers"
+msgstr "àààààà"
+
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
+msgid "Change printer settings"
+msgstr "ààààààà àààààààà ààààà"
+
+#. Translators: those are keywords for the printing control-center panel
+#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
+msgid "Printer;Queue;Print;Paper;Ink;Toner;"
+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/jobs-dialog.ui.h:2
+#: ../panels/printers/options-dialog.ui.h:4
+msgid "Close"
+msgstr "ààà àààà"
+
+#. Translators: This tab contains list of active print jobs of the selected printer
+#: ../panels/printers/jobs-dialog.ui.h:4
+#| msgid "Active Print Jobs"
+msgid "Active Jobs"
+msgstr "àààààà ààààà"
+
+#: ../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:1017
+msgid "_Add"
+msgstr "àààààà (_A)"
+
+#: ../panels/printers/new-printer-dialog.ui.h:3
+msgid "Add a New Printer"
+msgstr "ààà ààààààà àààààà"
+
+#: ../panels/printers/new-printer-dialog.ui.h:4
+#, fuzzy
+#| msgid "No network printers found"
+msgid "Search for network printers or filter result"
+msgstr "ààà ààààà ààààààà àààà àààà"
+
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
+#: ../panels/printers/options-dialog.ui.h:2
+#| msgid "_Options"
+msgid "Options"
+msgstr "àààààà"
+
+#: ../panels/printers/options-dialog.ui.h:3
+#, fuzzy
+#| msgid "Locations..."
+msgid "Loading options..."
+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:1016
+msgid "Cancel"
+msgstr "àààà àààà"
+
+#: ../panels/printers/ppd-selection-dialog.ui.h:4
+msgid "Loading drivers database..."
+msgstr ""
+
+#: ../panels/printers/ppd-selection-dialog.ui.h:5
+#, fuzzy
+#| msgid "Selecting finger"
+msgid "Select Printer Driver"
+msgstr "ààààà àà ààà"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:65
+#: ../panels/printers/pp-ppd-option-widget.c:69
+msgid "One Sided"
+msgstr "àà àààà"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
+msgid "Long Edge (Standard)"
+msgstr "àààà àààààà (àààà)"
+
+#. Translators: this is an option of "Two Sided"
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
+msgid "Short Edge (Flip)"
+msgstr "àààà àààààà (ààààà)"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:71
+msgid "Portrait"
+msgstr "àààààààààààà"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:73
+msgid "Landscape"
+msgstr "ààààààà"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:75
+msgid "Reverse landscape"
+msgstr "ààààà ààààààà"
+
+#. Translators: this is an option of "Orientation"
+#: ../panels/printers/pp-ipp-option-widget.c:77
+msgid "Reverse portrait"
+msgstr "ààààà àààààààààààà"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1327
+#: ../panels/printers/pp-jobs-dialog.c:143
 msgctxt "print job"
 msgid "Pending"
 msgstr "àààààà"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1331
+#: ../panels/printers/pp-jobs-dialog.c:147
 msgctxt "print job"
 msgid "Held"
 msgstr "ààààà"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1335
+#: ../panels/printers/pp-jobs-dialog.c:151
 msgctxt "print job"
 msgid "Processing"
 msgstr "ààààààààà àà ààà àà"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1339
+#: ../panels/printers/pp-jobs-dialog.c:155
 msgctxt "print job"
 msgid "Stopped"
 msgstr "ààà ààà"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1343
+#: ../panels/printers/pp-jobs-dialog.c:159
 msgctxt "print job"
 msgid "Canceled"
 msgstr "àààà"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1347
+#: ../panels/printers/pp-jobs-dialog.c:163
 msgctxt "print job"
 msgid "Aborted"
 msgstr "ààààà ààà"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1351
+#: ../panels/printers/pp-jobs-dialog.c:167
 msgctxt "print job"
 msgid "Completed"
 msgstr "ààààà"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1431
+#: ../panels/printers/pp-jobs-dialog.c:289
 msgid "Job Title"
 msgstr "àà ààà"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1440
+#: ../panels/printers/pp-jobs-dialog.c:298
 msgid "Job State"
 msgstr "ààà àààààà"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1446
+#: ../panels/printers/pp-jobs-dialog.c:304
 msgid "Time"
 msgstr "ààà"
 
-#. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2068
-msgid "Failed to add new printer."
-msgstr "ààà ààààààà àààààà ààà àààà."
+#: ../panels/printers/pp-jobs-dialog.c:484
+#, c-format
+#| msgid "Active Print Jobs"
+msgid "%s Active Jobs"
+msgstr "%s àààààà ààààà"
+
+#. Translators: No printers were found
+#: ../panels/printers/pp-new-printer-dialog.c:1291
+#| msgid "No tablet detected"
+msgid "No printers detected."
+msgstr "ààà àààààà àààà ààà ààà."
+
+#: ../panels/printers/pp-options-dialog.c:82
+msgid "Two Sided"
+msgstr "àà àààà"
+
+#: ../panels/printers/pp-options-dialog.c:83
+#| msgid "VPN Type"
+msgid "Paper Type"
+msgstr "àààà àà àààààà"
+
+#: ../panels/printers/pp-options-dialog.c:84
+msgid "Paper Source"
+msgstr "àààà ààààà"
+
+#: ../panels/printers/pp-options-dialog.c:85
+#| msgid "Output"
+msgid "Output Tray"
+msgstr "àààààà àààààà"
+
+#: ../panels/printers/pp-options-dialog.c:86
+#| msgid "_Resolution"
+msgid "Resolution"
+msgstr "ààààààààààà"
+
+#: ../panels/printers/pp-options-dialog.c:87
+msgid "GhostScript pre-filtering"
+msgstr "GhostScript àààà àààààààààà"
+
+#. Translators: This option sets number of pages printed on one sheet
+#: ../panels/printers/pp-options-dialog.c:533
+msgid "Pages per side"
+msgstr "ààààà ààààà àààà"
+
+#. Translators: This option sets whether to print on both sides of paper
+#: ../panels/printers/pp-options-dialog.c:545
+msgid "Two-sided"
+msgstr "àà àààà"
+
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: ../panels/printers/pp-options-dialog.c:557
+#| msgid "Left-Handed Orientation"
+msgid "Orientation"
+msgstr "àààà"
+
+#. Translators: "General" tab contains general printer options
+#: ../panels/printers/pp-options-dialog.c:654
+#| msgid "General"
+msgctxt "Printer Option Group"
+msgid "General"
+msgstr "ààààààà"
 
-#. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2272
-#: ../panels/printers/cc-printers-panel.c:2286
-msgid "Test page"
-msgstr "àààà ààààà"
+#. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
+#: ../panels/printers/pp-options-dialog.c:657
+msgctxt "Printer Option Group"
+msgid "Page Setup"
+msgstr "ààààà ààààà"
+
+#. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, duplex unit, etc.)
+#: ../panels/printers/pp-options-dialog.c:660
+#| msgid "Printer Options"
+msgctxt "Printer Option Group"
+msgid "Installable Options"
+msgstr "àààààà àààààà"
 
-#. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2535
-#, c-format
-msgid "Could not load ui: %s"
-msgstr "ààà àààà àà ààà ui: %s"
-
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:147
-msgid "Printers"
-msgstr "àààààà"
-
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "ààààààà àààààààà ààààà"
-
-#. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
-msgid "Printer;Queue;Print;Paper;Ink;Toner;"
-msgstr "ààààààà;àààààà;àààààà;àààà;ààà;àààà;"
-
-#: ../panels/printers/new-printer-dialog.ui.h:1
-msgid "Add a New Printer"
-msgstr "ààà ààààààà àààààà"
-
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#| msgid "Address"
-msgid "A_ddress:"
-msgstr "ààà:  (_d)"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
-msgid "_Search by Address"
-msgstr "ààà àààààà ààààà (_S)"
+#. Translators: "Job" tab contains settings for jobs
+#: ../panels/printers/pp-options-dialog.c:663
+#| msgid "Jobs"
+msgctxt "Printer Option Group"
+msgid "Job"
+msgstr "ààààà"
 
-#: ../panels/printers/new-printer-dialog.ui.h:5
-#| msgid "Add"
-msgid "_Add"
-msgstr "àààààà (_A)"
+#. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
+#: ../panels/printers/pp-options-dialog.c:666
+msgctxt "Printer Option Group"
+msgid "Image Quality"
+msgstr "ààà àààààààà"
 
-#: ../panels/printers/pp-new-printer-dialog.c:649
-msgid "Getting devices..."
-msgstr "àààààà ààà ààà àà..."
+#. Translators: "Color" tab contains color settings (e.g. color printing)
+#: ../panels/printers/pp-options-dialog.c:669
+#| msgid "Color"
+msgctxt "Printer Option Group"
+msgid "Color"
+msgstr "ààà"
 
-#. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1232
-msgid "No local printers found"
-msgstr "ààà ààààààà ààààààà àààà àààà"
+#. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
+#: ../panels/printers/pp-options-dialog.c:672
+msgctxt "Printer Option Group"
+msgid "Finishing"
+msgstr "àààààà àà ààà àà"
 
-#. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1245
-msgid "No network printers found"
-msgstr "ààà ààààà ààààààà àààà àààà"
+#. Translators: "Advanced" tab contains all others settings
+#: ../panels/printers/pp-options-dialog.c:675
+#| msgctxt "print job"
+#| msgid "Canceled"
+msgctxt "Printer Option Group"
+msgid "Advanced"
+msgstr "ààààà"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1337
-msgid ""
-"FirewallD is not running. Network printer detection needs services mdns, "
-"ipp, ipp-client and samba-client enabled on firewall."
-msgstr ""
-"FirewallD àààà àà ààà àà. ààààà ààààààà àà ààà ààààà ààà àààààààà mdns, "
-"IPP, àààààà-ààààààà àà àààààà-ààààààà àà ààààà àà àà ààààààà àà ààààà àà. "
-
-#. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1365
-#: ../panels/printers/pp-new-printer-dialog.c:1370
-msgid "Devices"
-msgstr "ààààà"
-
-#. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1395
-#| msgid "Local"
-msgctxt "printer type"
-msgid "Local"
-msgstr "ààààààà"
-
-#. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1397
-#| msgid "Network"
-msgctxt "printer type"
-msgid "Network"
-msgstr "ààààà"
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
+#. Translators: Options of given printer (e.g. "MyPrinter Options")
+#: ../panels/printers/pp-options-dialog.c:936
+#, c-format
+#| msgid "_Options"
+msgid "%s Options"
+msgstr "%s àààààà"
+
+#. Translators: this is an option of "Paper Source"
+#: ../panels/printers/pp-ppd-option-widget.c:75
+#: ../panels/printers/pp-ppd-option-widget.c:77
+#: ../panels/printers/pp-ppd-option-widget.c:85
+#| msgid "Select"
+msgid "Auto Select"
+msgstr "ààààà ààààà"
+
+#. Translators: this is an option of "Paper Source"
+#. Translators: this is an option of "Resolution"
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:81
+#: ../panels/printers/pp-ppd-option-widget.c:83
+#: ../panels/printers/pp-ppd-option-widget.c:87
+#| msgid "Default"
+msgid "Printer Default"
+msgstr "àààààà àààààà"
 
-#. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1438
-msgid "Device types"
-msgstr "ààààà àààààà"
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:89
+msgid "Embed GhostScript fonts only"
+msgstr "àààààààààà GhostScript àààààà àààà"
 
-#. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1770
-msgid "Automatic configuration"
-msgstr "àààààààà ààààààà"
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:91
+msgid "Convert to PS level 1"
+msgstr "PS àààà 1 ààà ààààà"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1869
-msgid "Opening firewall for mDNS connections"
-msgstr "àààààààà ààààà MDNS ààààààà àà ààà "
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:93
+msgid "Convert to PS level 2"
+msgstr "àààà àààà 2 àà ààààààààà àààà"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1878
-msgid "Opening firewall for Samba connections"
-msgstr "àààààààà àààà ààààà ààààààà àà ààà"
+# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
+# test-gnome/testgnome.xml.h:5
+#. Translators: this is an option of "GhostScript"
+#: ../panels/printers/pp-ppd-option-widget.c:95
+#| msgid "No profile"
+msgid "No pre-filtering"
+msgstr "ààà ààààà àààààààààà àààà"
+
+#. Translators: Name of column showing printer manufacturers
+#: ../panels/printers/pp-ppd-selection-dialog.c:230
+#| msgid "Manufacturer:"
+msgid "Manufacturers"
+msgstr "ààààààà:"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1887
-msgid "Opening firewall for IPP connections"
-msgstr "àààààààà ààààà àà ààà àààààà ààààààà"
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/pp-ppd-selection-dialog.c:242
+#| msgid "Driver"
+msgid "Drivers"
+msgstr "ààààààà"
 
 #: ../panels/printers/printers.ui.h:1
-#| msgid "Add a New Printer"
 msgid "Add Printer"
 msgstr "ààààààà àààààà"
 
 #: ../panels/printers/printers.ui.h:2
-#| msgid "Printer"
 msgid "Remove Printer"
 msgstr "ààààààà àààààà"
 
@@ -2852,7 +3326,6 @@ msgstr "ààààà"
 
 #. Translators: This checkbox is checked when the default printer is selected.
 #: ../panels/printers/printers.ui.h:8
-#| msgid "Default"
 msgid "_Default"
 msgstr "àààààà (_D)"
 
@@ -2860,9 +3333,8 @@ 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"
 msgid "_Show"
 msgstr "àààààà (_S)"
 
@@ -2872,69 +3344,46 @@ msgstr "àààààà (_S)"
 msgid "Model"
 msgstr "àààà"
 
-#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "ààààà 1"
+
 #: ../panels/printers/printers.ui.h:15
-#| msgid "Print Test Page"
+msgid "label"
+msgstr "àààà"
+
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "ààààà 2"
+
+#: ../panels/printers/printers.ui.h:17
+#, fuzzy
+#| msgid "Getting devices..."
+msgid "Setting new driver..."
+msgstr "àààààà ààà ààà àà..."
+
+#: ../panels/printers/printers.ui.h:18
+msgid "page 3"
+msgstr "ààààà 3"
+
+#. Translators: This button executes command which prints test page.
+#: ../panels/printers/printers.ui.h:20
 msgid "Print _Test Page"
 msgstr "àààà ààààà ààààà (_T)"
 
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:17
-#| msgid "Options"
+#: ../panels/printers/printers.ui.h:22
 msgid "_Options"
 msgstr "àààààà (_O)"
 
-#. Translators: Switch back to printer's info tab
-#: ../panels/printers/printers.ui.h:19
-#| msgid "Back"
-msgid "_Back"
-msgstr "àààà (_B)"
-
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:21
-msgid "Active Print Jobs"
-msgstr "àààààà àààààà ààà"
-
-#: ../panels/printers/printers.ui.h:22
-#| msgid "Printing..."
-msgid "Resume Printing"
-msgstr "àààààà ààà àà àààà"
-
-#: ../panels/printers/printers.ui.h:23
-#| msgid "Printing..."
-msgid "Pause Printing"
-msgstr "ààààà àààààà"
-
-#: ../panels/printers/printers.ui.h:24
-msgid "Cancel Print Job"
-msgstr "àààààà ààààà àààà àààà"
-
-#. Translators: This tab contains list of active print jobs of the selected printer
-#: ../panels/printers/printers.ui.h:26
-msgid "Printer Options"
-msgstr "àààààà àààààà"
-
-#: ../panels/printers/printers.ui.h:27
-msgid "Add User"
-msgstr "àààààààà àààààà"
-
-#: ../panels/printers/printers.ui.h:28
-#| msgid "Removable Media"
-msgid "Remove User"
-msgstr "àààààààààà àààààà"
-
-#: ../panels/printers/printers.ui.h:29
-msgid "Allowed users"
-msgstr "àààààà ààààààà àààààààà"
-
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:31
+#: ../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:33
+#: ../panels/printers/printers.ui.h:26
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -2943,8 +3392,8 @@ msgstr ""
 "àààààà àààà àààà àà."
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
+#| msgid "Region and Language"
+msgid "Region & Language"
 msgstr "ààààààà àà àààà"
 
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:2
@@ -2957,7 +3406,6 @@ msgid "Language;Layout;Keyboard;"
 msgstr "àààà;ààààà;àààààààà;"
 
 #: ../panels/region/gnome-region-panel-formats.c:142
-#| msgid "April"
 msgid "Imperial"
 msgstr "ààààààààà"
 
@@ -2965,70 +3413,64 @@ msgstr "ààààààààà"
 msgid "Metric"
 msgstr "ààààààà"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:1
-msgid "Choose a Layout"
-msgstr "àà ààààà ààààà"
+#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
+#| msgid "Select an input source to add"
+msgid "Choose an input source"
+msgstr "ààààà ààààà ààààà"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:2
-msgid "Preview"
-msgstr "ààààààààààà"
-
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
+#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
 msgid "Select an input source to add"
 msgstr "àààààà àà ààà ààààà ààààà àà ààààà"
 
-#: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
-msgid "Keyboard Layout Options"
-msgstr "àààààààà ààààà àààààà"
-
-#: ../panels/region/gnome-region-panel-system.c:417
+#: ../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:422
-#: ../panels/region/gnome-region-panel.ui.h:32
+#: ../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 "
 "Region and Language settings. You may change the system settings to match "
 "yours."
 msgstr ""
-"ààààà ààààààà, ààààà ààààà àà àà àààààààààà ààààà àààààà-ààààààààà "
-"ààààààà àà àààà àààààààà àà ààààà àààà. àà àààà àà ààà àààà àà ààà "
-"ààààà àààààà àà ààà àààà àà"
+"ààààà ààààààà, ààààà ààààà àà àà àààààààààà ààààà àààààà-ààààààààà ààààààà àà "
+"àààà àààààààà "
+"àà ààààà àààà. àà àààà àà ààà àààà àà ààà ààààà àààààà àà ààà àààà àà"
 
-#: ../panels/region/gnome-region-panel-system.c:425
-#| msgid "Mouse Settings"
+#: ../panels/region/gnome-region-panel-system.c:478
 msgid "Copy Settings"
 msgstr "àààààà àà ààà ààà"
 
-#: ../panels/region/gnome-region-panel-system.c:428
-#: ../panels/region/gnome-region-panel.ui.h:39
-#| msgid "Mouse Settings"
+#: ../panels/region/gnome-region-panel-system.c:481
+#: ../panels/region/gnome-region-panel.ui.h:38
 msgid "Copy Settings..."
 msgstr "àààààà àà ààà ààà..."
 
+#: ../panels/region/gnome-region-panel.ui.h:1
+msgid "Region and Language"
+msgstr "ààààààà àà àààà"
+
 #: ../panels/region/gnome-region-panel.ui.h:2
 msgid "Select a display language (change will be applied next time you log in)"
 msgstr "àààààààà àààà ààààà (àààà ààà àà àà ààààà ààààà àà àààààààà àààà àààà)"
 
 #: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Install languages..."
-msgstr "àààà ààààààààà àààà..."
-
-#: ../panels/region/gnome-region-panel.ui.h:4
-#| msgid "Language"
 msgid "Add Language"
 msgstr "àààà àààààà"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-#| msgid "Language"
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Remove Language"
 msgstr "àààà ààààà"
 
+#: ../panels/region/gnome-region-panel.ui.h:5
+msgid "Install languages..."
+msgstr "àààà ààààààààà àààà..."
+
 #: ../panels/region/gnome-region-panel.ui.h:6
 msgid "Language"
 msgstr "àààà"
@@ -3038,12 +3480,10 @@ msgid "Select a region (change will be applied the next time you log in)"
 msgstr "ààààààà ààààà (àààà ààà àà àà ààààà ààààà àà àààààààà àààà àààà)"
 
 #: ../panels/region/gnome-region-panel.ui.h:8
-#| msgid "Region:"
 msgid "Add Region"
 msgstr "ààààààà àààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:9
-#| msgid "Removable Media"
 msgid "Remove Region"
 msgstr "ààààààà àààààà"
 
@@ -3052,12 +3492,10 @@ msgid "Dates"
 msgstr "ààààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:11
-#| msgid "Time"
 msgid "Times"
 msgstr "ààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:12
-#| msgid "November"
 msgid "Numbers"
 msgstr "àààààààà"
 
@@ -3074,108 +3512,93 @@ msgid "Examples"
 msgstr "àààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:16
-#| msgid "Normal"
 msgid "Formats"
 msgstr "ààààààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:17
-#| msgid "Layout"
-msgid "Add Layout"
-msgstr "àààà àààààà"
+#, fuzzy
+#| msgid "Select an input source to add"
+msgid "Select keyboards or other input sources"
+msgstr "àààààà àà ààà ààààà ààààà àà ààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:18
-#| msgid "Choose a Layout"
-msgid "Remove Layout"
-msgstr "àààà àààààà"
+#, fuzzy
+#| msgid "Input source:"
+msgid "Add Input Source"
+msgstr "ààààà ààààà:"
 
 #: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Move Up"
-msgstr "ààà àààà"
+#, fuzzy
+#| msgid "Input source:"
+msgid "Remove Input Source"
+msgstr "ààààà ààààà:"
 
 #: ../panels/region/gnome-region-panel.ui.h:20
-#| msgid "Volume down"
-msgid "Move Down"
-msgstr "àààà àààà"
+#, fuzzy
+#| msgid "Input source:"
+msgid "Move Input Source Up"
+msgstr "ààààà ààààà:"
 
 #: ../panels/region/gnome-region-panel.ui.h:21
-#| msgid "Preview"
-msgid "Preview Layout"
-msgstr "ààààààààààà àààà"
+#, fuzzy
+#| msgid "Input source:"
+msgid "Move Input Source Down"
+msgstr "ààààà ààààà:"
 
 #: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Use the same layout for all windows"
-msgstr "ààà ààààààà àà ààà àà àà àààà àà ààààà àààà"
+#, fuzzy
+#| msgid "Mouse Settings"
+msgid "Input Source Settings"
+msgstr "àààà àààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:23
-#| msgid "Allow different layouts for each window"
-msgid "Allow different layouts for individual windows"
-msgstr "ààààààààà ààààààà àà ààà ààààààà àààà àà àààààà ààà"
-
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "New windows use the default layout"
-msgstr "àà àààààà àààààààà àààà àà ààààà àààà"
+#, fuzzy
+#| msgid "Keyboard Layout Options"
+msgid "Show Keyboard Layout"
+msgstr "àààààààà ààààà àààààà"
 
 #: ../panels/region/gnome-region-panel.ui.h:25
-msgid "New windows use the previous window's layout"
-msgstr "àà ààààààà ààààà ààààà àààà àà ààààà àààà"
+msgid "Ctrl+Alt+Space"
+msgstr ""
 
 #: ../panels/region/gnome-region-panel.ui.h:27
-msgid "View and edit keyboard layout options"
-msgstr "àààààààà ààààà àààààà ààààààà àààà àà ààààà"
+msgid "Ctrl+Alt+Shift+Space"
+msgstr "Ctrl+Alt+Shift+Space"
 
 #: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Reset to De_faults"
-msgstr "àààààààà ààà ààààà àààà (_f)"
+#| msgid "Sound Settings"
+msgid "Shortcut Settings"
+msgstr "ààààààà àààààààà"
 
-#: ../panels/region/gnome-region-panel.ui.h:29
-msgid ""
-"Replace the current keyboard layout settings with the\n"
-"default settings"
-msgstr ""
-"àààààà àààààààà àààà àààààààà àààààààààààà àààà\n"
-"àààààààà àààààààà àà ààà"
-
-#: ../panels/region/gnome-region-panel.ui.h:31
-msgid "Layouts"
-msgstr "àààààààà"
+#: ../panels/region/gnome-region-panel.ui.h:30
+#| msgid "Input source:"
+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:34
+#: ../panels/region/gnome-region-panel.ui.h:33
 msgid "Display language:"
 msgstr "àààà ààààààààà àààà:"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-#| msgid "_Input volume: "
+#: ../panels/region/gnome-region-panel.ui.h:34
 msgid "Input source:"
 msgstr "ààààà ààààà:"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-#| msgid "Contrast:"
+#: ../panels/region/gnome-region-panel.ui.h:35
 msgid "Format:"
 msgstr "ààààààà:"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
-#| msgid "Network settings"
+#: ../panels/region/gnome-region-panel.ui.h:36
 msgid "Your settings"
 msgstr "àààà àààààààà"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
-#| msgid "System Settings"
+#: ../panels/region/gnome-region-panel.ui.h:37
 msgid "System settings"
 msgstr "ààààà àààààà"
 
-#: ../panels/region/gnome-region-panel-xkblt.c:210
-msgid "Layout"
-msgstr "àààààààà"
-
-#: ../panels/region/gnome-region-panel-xkbot.c:229
-#: ../panels/sound/gvc-sound-theme-chooser.c:585
-msgid "Default"
-msgstr "àààààà"
-
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-#| msgid "Brightness"
-msgid "Brightness and Lock"
+#| msgid "Brightness and Lock"
+msgid "Brightness & Lock"
 msgstr "àààààààà àà ààà"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
@@ -3221,7 +3644,6 @@ msgid "_Turn screen off when inactive for:"
 msgstr "ààààààà ààà àà àààà ààà ààààààààà àà: (_T)"
 
 #: ../panels/screen/screen.ui.h:13
-#| msgid "Lock screen"
 msgid "_Lock screen after:"
 msgstr "àà ààà ààààààà ààà àààà: (_L)"
 
@@ -3235,6 +3657,10 @@ msgid "Locations..."
 msgstr "ààààà..."
 
 #: ../panels/screen/screen.ui.h:17
+msgid "Show _notifications when locked"
+msgstr ""
+
+#: ../panels/screen/screen.ui.h:18
 msgid "Lock"
 msgstr "ààà àààà"
 
@@ -3271,8 +3697,9 @@ msgstr "ààààà àààà àà ààààà àààà àà
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
-msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
+#| msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
+msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgstr "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 
 #. Translators: This is the name of an audio file that sounds like the bark of a dog.
 #. You might want to translate it into the equivalent words of your language.
@@ -3301,7 +3728,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 "àààààà"
 
@@ -3309,7 +3736,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 "ààààà"
 
@@ -3363,12 +3790,12 @@ msgstr "àààààà: (_F)"
 msgid "_Subwoofer:"
 msgstr "àà ààààà: (_S)"
 
-#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
+#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:617
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "àààà àààààààààà"
@@ -3376,13 +3803,14 @@ msgstr "àààà àààààààààà"
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
 # libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
-#: ../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)"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1094
+#: ../panels/sound/gvc-mixer-control.c:1841
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3391,91 +3819,72 @@ msgstr[1] "%u àààààà"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1104
+#: ../panels/sound/gvc-mixer-control.c:1851
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u ààààà"
 msgstr[1] "%u ààààà"
 
-#: ../panels/sound/gvc-mixer-control.c:1402
+#: ../panels/sound/gvc-mixer-control.c:2375
 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 page"
-msgid "_Test Speakers"
-msgstr "ààààà àààààààà (_T)"
-
-#: ../panels/sound/gvc-mixer-dialog.c:1754
-#| msgid "_Output volume: "
+#: ../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
-#| msgid "_Input volume: "
+#: ../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
-#| msgid "_Alert volume: "
+#: ../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 "ààà ààààààààà ààà ààààà ààà àà ààààààà àààà àà ààà àà."
 
@@ -3495,6 +3904,10 @@ msgstr "ààààà àààààà"
 msgid "Testing event sound"
 msgstr "àààà ààààà àààà ààà àà"
 
+#: ../panels/sound/gvc-sound-theme-chooser.c:585
+msgid "Default"
+msgstr "àààààà"
+
 #: ../panels/sound/gvc-sound-theme-chooser.c:586
 msgid "From theme"
 msgstr "àààààà àà"
@@ -3503,16 +3916,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 "Subwoofer"
 
@@ -3541,8 +3954,8 @@ msgstr "ààà"
 msgid "Custom"
 msgstr "ààààààà"
 
-#: ../panels/universal-access/cc-ua-panel.c:446
-#: ../panels/universal-access/cc-ua-panel.c:452
+#: ../panels/universal-access/cc-ua-panel.c:286
+#: ../panels/universal-access/cc-ua-panel.c:292
 msgid "No shortcut set"
 msgstr "ààà ààààààà ààà àààà àà..."
 
@@ -3556,445 +3969,495 @@ msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
 "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgstr ""
-"àààààààà;àààà;a11y;ààààààààààààà;ààààààààà;àààà;ààààààà àààà;ààà;àààààà;àààà;"
-"ààààààX;àààààà ààààà;àààà àààààààà;ààààà ààààà;àààà ààààà;"
+"àààààààà;àààà;a11y;ààààààààààààà;ààààààààà;àààà;ààààààà "
+"àààà;ààà;àààààà;àààà;ààààààX;àààààà "
+"ààààà;àààà àààààààà;ààààà ààààà;àààà ààààà;"
 
 #: ../panels/universal-access/uap.ui.h:1
-msgid "On screen keyboard"
-msgstr "àà ààààààà àààààààà"
+msgctxt "universal access, contrast"
+msgid "Low"
+msgstr "àà"
 
 #: ../panels/universal-access/uap.ui.h:2
-msgid "Dasher"
-msgstr "àààà"
+msgctxt "universal access, contrast"
+msgid "Normal"
+msgstr "ààààààà"
 
 #: ../panels/universal-access/uap.ui.h:3
-msgid "Nomon"
-msgstr "Nomon"
+msgctxt "universal access, contrast"
+msgid "High"
+msgstr "àààà"
 
 #: ../panels/universal-access/uap.ui.h:4
-msgid "Caribou"
-msgstr "àààààà"
+msgctxt "universal access, contrast"
+msgid "High/Inverse"
+msgstr "àààà/ààààà"
+
+#: ../panels/universal-access/uap.ui.h:5
+msgid "On screen keyboard"
+msgstr "àà ààààààà àààààààà"
+
+#: ../panels/universal-access/uap.ui.h:6
+msgid "GOK"
+msgstr "ààà"
 
 #: ../panels/universal-access/uap.ui.h:7
+msgid "OnBoard"
+msgstr "OnBoard"
+
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "ààà àààà"
+
+#: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: ../panels/universal-access/uap.ui.h:8
-#| msgid "Small"
+#: ../panels/universal-access/uap.ui.h:11
 msgctxt "universal access, text size"
 msgid "Small"
 msgstr "àààà"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:13
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/universal-access/uap.ui.h:11
-#| msgid "Normal"
+#: ../panels/universal-access/uap.ui.h:14
 msgctxt "universal access, text size"
 msgid "Normal"
 msgstr "ààààààà"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:16
 #, no-c-format
 msgid "125%"
 msgstr "125%"
 
-#: ../panels/universal-access/uap.ui.h:14
-#| msgid "Large"
+#: ../panels/universal-access/uap.ui.h:17
 msgctxt "universal access, text size"
 msgid "Large"
 msgstr "ààààà"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:19
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../panels/universal-access/uap.ui.h:17
-#| msgid "Larger"
+#: ../panels/universal-access/uap.ui.h:20
 msgctxt "universal access, text size"
 msgid "Larger"
 msgstr "àààà"
 
-#: ../panels/universal-access/uap.ui.h:18
-msgid "GOK"
-msgstr "ààà"
-
-#: ../panels/universal-access/uap.ui.h:19
-msgid "OnBoard"
-msgstr "OnBoard"
-
-#: ../panels/universal-access/uap.ui.h:20
-msgid "Change contrast:"
-msgstr "ààààààààà ààààà:"
-
 #: ../panels/universal-access/uap.ui.h:21
-#| msgid "Contrast:"
-msgid "_Contrast:"
-msgstr "ààààààààà: (_C)"
+#| msgid "_Contrast:"
+msgid "High Contrast"
+msgstr "àààà ààààà"
 
 #: ../panels/universal-access/uap.ui.h:22
-#| msgid "Text size:"
-msgid "_Text size:"
-msgstr "ààà àààà: (_T)"
+#, fuzzy
+#| msgid "Beep when Caps and Num Lock are used"
+msgid "Beep on Caps and Num Lock"
+msgstr "ààà ààààà àà ààààà àà àà ààà ààààà àààà àààà àà"
 
 #: ../panels/universal-access/uap.ui.h:23
-msgid "Increase size:"
-msgstr "àààà àààààà:"
+msgid "Options..."
+msgstr "àààààà..."
 
 #: ../panels/universal-access/uap.ui.h:24
-msgid "Decrease size:"
-msgstr "àààà ààààà:"
-
-#. Translators: this refers to theme contrast and font size
-#: ../panels/universal-access/uap.ui.h:26
-msgctxt "universal access, seeing"
-msgid "Display"
-msgstr "ààààààààà àààà"
+msgid "Screen Reader"
+msgstr "ààààààà àààà"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "àààà àà ààà àààà:"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:26
+#| msgid "Zoom"
+msgctxt "universal access, zoom"
+msgid "Zoom"
+msgstr "àààà-àààà àààà"
+
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "àààà àààà:"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "àààà àààà:"
 
+#: ../panels/universal-access/uap.ui.h:29
+#| msgid "Large"
+msgid "Large Text"
+msgstr "àààà ààà"
+
 #: ../panels/universal-access/uap.ui.h:30
-msgid "Options..."
-msgstr "àààààà..."
+msgid "Seeing"
+msgstr "ààà àà ààà àà"
+
+#: ../panels/universal-access/uap.ui.h:31
+msgid "Visual Alerts"
+msgstr "àààààà ààààààà"
 
-#. Translators: this refers to screen magnifier
 #: ../panels/universal-access/uap.ui.h:32
-msgctxt "universal access, seeing"
-msgid "Zoom"
-msgstr "àààà-àààà àààà"
+msgid "Use a visual indication when an alert sound occurs"
+msgstr "ààààà ààààà àà àààààà àààà àà àà ààààààà ààààà àààà àà"
 
 #: ../panels/universal-access/uap.ui.h:33
-msgid "Screen Reader"
-msgstr "ààààààà àààà"
+msgid "Flash the window title"
+msgstr "ààààà àààààà-ààààà àà àààààà"
 
 #: ../panels/universal-access/uap.ui.h:34
-msgid "Beep when Caps and Num Lock are used"
-msgstr "ààà ààààà àà ààààà àà àà ààà ààààà àààà àààà àà"
+msgid "Flash the entire screen"
+msgstr "àààà ààààààà àààààà"
 
 #: ../panels/universal-access/uap.ui.h:35
-msgid "Seeing"
-msgstr "ààà àà ààà àà"
+msgid "Closed Captioning"
+msgstr "ààà ààààààààà"
 
 #: ../panels/universal-access/uap.ui.h:36
-msgid "Use a visual indication when an alert sound occurs"
-msgstr "ààààà ààààà àà àààààà àààà àà àà ààààààà ààààà àààà àà"
+msgid "Display a textual description of speech and sounds"
+msgstr "àààà àà àààààààà àà ààààààà ààààà ààààààààà àààà"
 
 #: ../panels/universal-access/uap.ui.h:37
-#| msgid "Test page"
 msgid "_Test flash"
 msgstr "àààà ààààà (_T)"
 
-#: ../panels/universal-access/uap.ui.h:38
-msgid "Flash the window title"
-msgstr "ààààà àààààà-ààààà àà àààààà"
-
 #: ../panels/universal-access/uap.ui.h:39
-msgid "Flash the entire screen"
-msgstr "àààà ààààààà àààààà"
+msgid "Hearing"
+msgstr "àààààà"
 
 #: ../panels/universal-access/uap.ui.h:40
-msgid "Visual Alerts"
-msgstr "àààààà ààààààà"
+#| msgid "On screen keyboard"
+msgid "On Screen Keyboard"
+msgstr "ààààààààà àààààààà"
 
 #: ../panels/universal-access/uap.ui.h:41
-msgid "Display a textual description of speech and sounds"
-msgstr "àààà àà àààààààà àà ààààààà ààààà ààààààààà àààà"
+msgid "Sticky Keys"
+msgstr "àààààà ààààà"
 
 #: ../panels/universal-access/uap.ui.h:42
-msgid "Closed Captioning"
-msgstr "ààà ààààààààà"
-
-#: ../panels/universal-access/uap.ui.h:44
-msgid "Hearing"
-msgstr "àààààà"
-
-#: ../panels/universal-access/uap.ui.h:45
-msgid "Screen keyboard"
-msgstr "ààààààà àààààààà"
-
-#: ../panels/universal-access/uap.ui.h:46
-msgid "Typing Assistant"
-msgstr "ààààààà ààààà"
-
-#: ../panels/universal-access/uap.ui.h:47
-msgid "_Turn on accessibility features from the keyboard"
-msgstr "àààààààà àà ààààà àààààààà àà àààà àààà (_T)"
-
-#: ../panels/universal-access/uap.ui.h:48
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "ààààà àààààà àà ààà ààà ààààààààà ààààà àà àà ààààààà àà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:49
-#| msgid "Disable if two keys are pressed together"
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "ààààààààà àààà ààà àà ààààà àà ààà ààààà ààà (_D)"
 
-#: ../panels/universal-access/uap.ui.h:50
-#| msgid "Beep when a modifer key is pressed"
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "àà àààààààà ààààà ààààà àà ààà ààààà (_m)"
 
-#: ../panels/universal-access/uap.ui.h:51
-msgid "Sticky Keys"
-msgstr "àààààà ààààà"
+#: ../panels/universal-access/uap.ui.h:45
+msgid "Slow Keys"
+msgstr "àààà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../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:53
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "àààààààà ààà àààà: (_c)"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../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:60
+#: ../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:62
+#: ../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:64
+#: ../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:66
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "àààààààà"
 
-#: ../panels/universal-access/uap.ui.h:67
-msgid "Slow Keys"
-msgstr "àààà ààààà"
+#: ../panels/universal-access/uap.ui.h:61
+msgid "Bounce Keys"
+msgstr "ààààà (ààààà) àààààààà"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "ààà àààà ààààààà àààààà àààà"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "àààààààà ààààà: (_e)"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "ààààà ààààà ààààààà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:71
-#| msgid "Beep when a key is rejected"
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "àà ààààà àààààààà àà àà ààà ààààà  (_r)"
 
-#: ../panels/universal-access/uap.ui.h:72
-msgid "Bounce Keys"
-msgstr "ààààà (ààààà) àààààààà"
+#: ../panels/universal-access/uap.ui.h:66
+#| msgid "Keyboard"
+msgid "Enable by Keyboard"
+msgstr "àààààààà àà ààààà àààà"
 
-#: ../panels/universal-access/uap.ui.h:73
-msgid "Type here to test settings"
-msgstr "ààààààà àààààà àààà àààà àààà"
+#: ../panels/universal-access/uap.ui.h:67
+#, fuzzy
+#| msgid "_Turn on accessibility features from the keyboard"
+msgid "Turn accessibility features on and off using the keyboard"
+msgstr "àààààààà àà ààààà àààààààà àà àààà àààà (_T)"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:69
+msgid "Mouse Keys"
+msgstr "àààà àààààààà"
+
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "àààààààà àà àààààà àà àààààààà ààààààààà àààà àà àààà àà"
 
-#: ../panels/universal-access/uap.ui.h:77
-msgid "Mouse Keys"
-msgstr "àààà àààààààà"
+#: ../panels/universal-access/uap.ui.h:71
+msgid "Video Mouse"
+msgstr "àààààà àààà"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "àààààà ààààà àà ààààà àà àààààà àààààààà."
 
-#: ../panels/universal-access/uap.ui.h:79
-msgid "Video Mouse"
-msgstr "àààààà àààà"
+#: ../panels/universal-access/uap.ui.h:73
+msgid "Simulated Secondary Click"
+msgstr "ààààààààà àààààààà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../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:81
-#| msgid "Simulated Secondary Click"
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "àààààààà ààààà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:82
-msgid "Simulated Secondary Click"
-msgstr "ààààààààà àààààààà ààààà"
+#: ../panels/universal-access/uap.ui.h:76
+msgid "Hover Click"
+msgstr "àààà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "àààààààà ààà ààààà àà ààààà ààààà àààà àààà"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "àààà: (_e)"
 
-#: ../panels/universal-access/uap.ui.h:85
-#| msgid "_Motion threshold:"
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "ààà ààààààà: (_t)"
 
-#: ../panels/universal-access/uap.ui.h:90
-msgid "Hover Click"
-msgstr "àààà ààààà"
+#. 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:91
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "àààà àààààà"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "ààààà àà ààààà"
 
-#: ../panels/universal-access/uap.ui.h:93
-msgctxt "universal access, contrast"
-msgid "Low"
-msgstr "àà"
+#: ../panels/universal-access/zoom-options.c:357
+#| msgid "Short"
+msgctxt "Distance"
+msgid "Short"
+msgstr "àààà"
 
-#: ../panels/universal-access/uap.ui.h:94
-msgctxt "universal access, contrast"
-msgid "Normal"
-msgstr "ààààààà"
+#: ../panels/universal-access/zoom-options.c:358
+#| msgid "1/4 Screen"
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â ààààààà"
+
+#: ../panels/universal-access/zoom-options.c:359
+#| msgid "1/4 Screen"
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â ààààààà"
+
+#: ../panels/universal-access/zoom-options.c:360
+#| msgid "1/4 Screen"
+msgctxt "Distance"
+msgid "Â Screen"
+msgstr "Â ààààààà"
+
+#: ../panels/universal-access/zoom-options.c:361
+#| msgid "Long"
+msgctxt "Distance"
+msgid "Long"
+msgstr "àààà"
 
-#: ../panels/universal-access/uap.ui.h:95
-msgctxt "universal access, contrast"
-msgid "High"
-msgstr "àààà"
+#: ../panels/universal-access/zoom-options.ui.h:1
+msgid "Full Screen"
+msgstr "ààààà ààààààà"
 
-#: ../panels/universal-access/uap.ui.h:96
-msgctxt "universal access, contrast"
-msgid "High/Inverse"
-msgstr "àààà/ààààà"
+#: ../panels/universal-access/zoom-options.ui.h:2
+msgid "Top Half"
+msgstr "àààà ààà"
 
-#: ../panels/universal-access/zoom-options.c:334
-#| msgid "Screen"
-msgid "1/4 Screen"
-msgstr "1/4 ààààààà"
+#: ../panels/universal-access/zoom-options.ui.h:3
+msgid "Bottom Half"
+msgstr "ààààà ààà"
 
-#: ../panels/universal-access/zoom-options.c:335
-#| msgid "Screen"
-msgid "1/2 Screen"
-msgstr "1/2 ààààààà"
+#: ../panels/universal-access/zoom-options.ui.h:4
+msgid "Left Half"
+msgstr "ààààà ààà"
 
-#: ../panels/universal-access/zoom-options.c:336
-#| msgid "Screen"
-msgid "3/4 Screen"
-msgstr "3/4 ààààààà"
+#: ../panels/universal-access/zoom-options.ui.h:5
+msgid "Right Half"
+msgstr "ààààà ààà"
 
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
-#: ../panels/universal-access/zoom-options.ui.h:1
-#| msgid "Options"
+#: ../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
-#| msgid "Allowed users"
+#: ../panels/universal-access/zoom-options.ui.h:9
 msgid "Follow mouse cursor"
 msgstr "àààà àààààà àà àààààà àààà"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
-#| msgid "Screen Reader"
+#: ../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 Position:"
+msgid "Magnifier"
+msgstr "àààààà:"
+
+#: ../panels/universal-access/zoom-options.ui.h:17
 msgid "Thickness:"
 msgstr "àààààà"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:12
-#| msgid "Typing"
+#: ../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 "Screen"
-msgid "Full Screen"
-msgstr "ààààà ààààààà"
+#: ../panels/universal-access/zoom-options.ui.h:26
+#| msgid "Crosshairs:"
+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"
+msgid "Brightness:"
+msgstr "àààààààà:"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
-#| msgid "Left"
-msgid "Left Half"
-msgstr "ààààà ààà"
+#: ../panels/universal-access/zoom-options.ui.h:29
+#| msgid "_Contrast:"
+msgid "Contrast:"
+msgstr "àààààà:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
-#| msgid "Right"
-msgid "Right Half"
-msgstr "ààààà ààà"
+#: ../panels/universal-access/zoom-options.ui.h:30
+#| msgid "Color"
+msgctxt "Zoom Grayscale"
+msgid "Color"
+msgstr "ààà"
+
+#: ../panels/universal-access/zoom-options.ui.h:31
+#| msgid "None"
+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 "Sound Effects"
+msgid "Color Effects:"
+msgstr "ààà àààààà:"
+
+#: ../panels/universal-access/zoom-options.ui.h:38
+#| msgid "Sound Effects"
+msgid "Color Effects"
+msgstr "ààà àààààà"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:1
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1
@@ -4011,26 +4474,84 @@ msgid "Administrator"
 msgstr "ààààààà"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:3
-msgid "_Username"
-msgstr "àààààààà ààà (_U)"
+#| msgid "Add Account"
+msgid "Add account"
+msgstr "àààà àààààà"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:4
-msgid "Create new account"
-msgstr "ààà àààà ààààà"
+#| msgid "My Account"
+msgid "_Local Account"
+msgstr "ààààààà àààà (_L)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:5
-msgid "_Full name"
-msgstr "àààà ààà (_F)"
+#, fuzzy
+#| msgid "_Fingerprint Login"
+msgid "_Enterprise Login"
+msgstr "ààààààààààà ààààà (_F)"
 
 #: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Account Type"
-msgstr "àààà àààààà (_A)"
+msgid "_Username"
+msgstr "àààààààà ààà (_U)"
 
-# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
-# libgnomeui/gnome-app-helper.c:166
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
-msgid "Cr_eate"
-msgstr "ààààà (_e)"
+msgid "_Full name"
+msgstr "àààà ààà (_F)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:8
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#, fuzzy
+#| msgid "Account Type:"
+msgid "Account _Type"
+msgstr "àààà àààààà:"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:9
+msgid "_Domain"
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:10
+msgid "_Login Name"
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "ààààààà (_P)"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:12
+msgid "Tip: Enterprise domain or realm name"
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:13
+msgid "C_ontinue"
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#, fuzzy
+#| msgctxt "Account type"
+#| msgid "Administrator"
+msgid "Domain Administrator Login"
+msgstr "ààààààà"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:15
+msgid ""
+"In order to use enterprise logins, this computer needs to be\n"
+"enrolled in the domain. Please have your network administrator\n"
+"type their domain password here."
+msgstr ""
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:18
+#, fuzzy
+#| msgctxt "Account type"
+#| msgid "Administrator"
+msgid "Administrator _Name"
+msgstr "ààààààà"
+
+#: ../panels/user-accounts/data/account-dialog.ui.h:19
+#, fuzzy
+#| msgctxt "Account type"
+#| msgid "Administrator"
+msgid "Administrator Password"
+msgstr "ààààààà"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
 msgid "Left thumb"
@@ -4070,17 +4591,14 @@ msgid "Enable Fingerprint Login"
 msgstr "ààààààààààà ààààà àààààà àààà"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:10
-#| msgid "Right index finger"
 msgid "_Right index finger"
 msgstr "ààààà àààààà (_R)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:11
-#| msgid "Left index finger"
 msgid "_Left index finger"
 msgstr "àààà àààààà (_L)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:12
-#| msgid "Other finger: "
 msgid "_Other finger:"
 msgstr "ààààà àààààà: (_O)"
 
@@ -4136,8 +4654,9 @@ msgid ""
 "This hint may be displayed at the login screen.  It will be visible to all "
 "users of this system.  Do <b>not</b> include the password here."
 msgstr ""
-"àà ààààà ààààà ààààààà àà ààààààààà àààà àà àààà àà. àà àààààààà àà ààààà àà "
-" ààààààà àà ààà àààààààààààà  àà ààà.  àààà ààààààà ààààà </b>àààà</b> àààà."
+"àà ààààà ààààà ààààààà àà ààààààààà àààà àà àààà àà. àà àààààààà àà ààààà àà  "
+"ààààààà "
+"àà ààà àààààààààààà  àà ààà.  àààà ààààààà ààààà </b>àààà</b> àààà."
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
@@ -4148,8 +4667,10 @@ msgid "_New password"
 msgstr "ààà ààààààà: (_N)"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:10
-msgid "Choose a generated password"
-msgstr "ààààààà àààà ààààààà ààààà"
+#, fuzzy
+#| msgid "Set a password now"
+msgid "Generate a password"
+msgstr "ààà ààààààà ààààààààà àààà"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Fair"
@@ -4194,6 +4715,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 "àà ààààà ààà"
@@ -4206,120 +4732,163 @@ msgstr "ààààààà"
 msgid "Photograph"
 msgstr "ààààààààà"
 
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-msgid "Cancel"
-msgstr "àààà àààà"
-
-#: ../panels/user-accounts/data/photo-dialog.ui.h:9
-#: ../panels/user-accounts/um-photo-dialog.c:98
-msgid "Select"
-msgstr "ààààà"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3
 msgid "Account Information"
 msgstr "àààà ààààààà"
 
 #  set the timeout value  label with correct value of timeout
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-#| msgid "User Accounts"
 msgid "Add User Account"
 msgstr "àààààààààà àààà àààààà"
 
 #  set the timeout value  label with correct value of timeout
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-#| msgid "User Accounts"
 msgid "Remove User Account"
 msgstr "àààààààààà àààà àààààà"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
-#| msgid "Account type"
-msgid "Account _type"
-msgstr "àààà àààààà (_t)"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
 msgid "Login Options"
 msgstr "ààààà àààààà"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-#| msgid "Password"
-msgid "_Password"
-msgstr "ààààààà (_P)"
-
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
-#| msgid "Automatic Login"
 msgid "A_utomatic Login"
 msgstr "àààààààà ààààà (_u)"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
-#| msgid "Fingerprint Login"
 msgid "_Fingerprint Login"
 msgstr "ààààààààààà ààààà (_F)"
 
 #  set the timeout value  label with correct value of timeout
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-#| msgid "User Accounts"
 msgid "User Icon"
 msgstr "àààààààà àààààà"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
-#| msgid "Language"
 msgid "_Language"
 msgstr "àààà (_L)"
 
-#: ../panels/user-accounts/run-passwd.c:426
+#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#, fuzzy
+#| msgid "Manage online accounts"
+msgid "Manage user accounts"
+msgstr "àààààà ààààà àà ààààààà"
+
+#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authentication is required to change user data"
+msgstr "ààààààà àààààà"
+
+#: ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/um-password-dialog.c:569
+msgctxt "Password strength"
+msgid "Too short"
+msgstr "àààà àààà"
+
+#: ../panels/user-accounts/pw-utils.c:99
+msgctxt "Password strength"
+msgid "Not good enough"
+msgstr ""
+
+#: ../panels/user-accounts/pw-utils.c:108
+#: ../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:571
+msgctxt "Password strength"
+msgid "Fair"
+msgstr "ààà"
+
+#: ../panels/user-accounts/pw-utils.c:114
+#: ../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:573
+msgctxt "Password strength"
+msgid "Strong"
+msgstr "ààààà"
+
+#: ../panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "ààààààà àààà"
 
-#: ../panels/user-accounts/run-passwd.c:506
-#: ../panels/user-accounts/um-password-dialog.c:375
+#: ../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:73
-msgid "Failed to create user"
+#: ../panels/user-accounts/um-account-dialog.c:175
+#, fuzzy
+#| msgid "Select an account"
+msgid "Failed to add account"
+msgstr "àààà ààààà"
+
+#: ../panels/user-accounts/um-account-dialog.c:366
+#: ../panels/user-accounts/um-account-dialog.c:405
+#, fuzzy
+#| msgid "Failed to create user"
+msgid "Failed to register account"
 msgstr "àààààààà ààààà ààà àààà"
 
+#: ../panels/user-accounts/um-account-dialog.c:530
+msgid "No supported way to authenticate with this domain"
+msgstr ""
+
+#: ../panels/user-accounts/um-account-dialog.c:582
+msgid "Failed to join domain"
+msgstr ""
+
+#: ../panels/user-accounts/um-account-dialog.c:635
+msgid "Failed to log into domain"
+msgstr ""
+
 #: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -4403,12 +4972,10 @@ msgstr ""
 "àààààà àà àààààà àà."
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:747
-#| msgid "Left ring finger"
 msgid "Selecting finger"
 msgstr "ààààà àà ààà"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:748
-#| msgid "_Delete Fingerprints"
 msgid "Enrolling fingerprints"
 msgstr "ààààààààààà àààààà"
 
@@ -4416,77 +4983,49 @@ msgstr "ààààààààààà àààààà"
 msgid "Summary"
 msgstr "àààààà"
 
-#: ../panels/user-accounts/um-password-dialog.c:179
-msgid "More choices..."
-msgstr "àààà àààà..."
+#: ../panels/user-accounts/um-password-dialog.c:96
+#, fuzzy
+#| msgid "Set a password now"
+msgid "_Generate a password"
+msgstr "ààà ààààààà ààààààààà àààà"
 
-#: ../panels/user-accounts/um-password-dialog.c:285
+#: ../panels/user-accounts/um-password-dialog.c:150
 msgid "Please choose another password."
 msgstr "ààààà àààà ààààààà àà ààà àààà."
 
-#: ../panels/user-accounts/um-password-dialog.c:294
+#: ../panels/user-accounts/um-password-dialog.c:159
 msgid "Please type your current password again."
 msgstr "àààà àààààà ààààààà ààà àààà àààà."
 
-#: ../panels/user-accounts/um-password-dialog.c:300
+#: ../panels/user-accounts/um-password-dialog.c:165
 msgid "Password could not be changed"
 msgstr "àààà ààààààà àààà ààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:372
+#: ../panels/user-accounts/um-password-dialog.c:236
 msgid "You need to enter a new password"
 msgstr "àààà ààà ààààààà ààà àààà àààà àààà"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:245
 msgid "You need to confirm the password"
 msgstr "àà àà ààààààà àà àààààà àààà àà àààààààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:384
+#: ../panels/user-accounts/um-password-dialog.c:248
 msgid "The passwords do not match"
 msgstr "ààààààà ààà àààà àààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:390
+#: ../panels/user-accounts/um-password-dialog.c:254
 msgid "You need to enter your current password"
 msgstr "àà àààà àààààà ààààààà àààà àààà àà àààààààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:393
+#: ../panels/user-accounts/um-password-dialog.c:257
 msgid "The current password is not correct"
 msgstr "ààààààà ààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:466
-#: ../panels/user-accounts/um-password-dialog.c:693
-msgctxt "Password strength"
-msgid "Too short"
-msgstr "àààà àààà"
-
-#: ../panels/user-accounts/um-password-dialog.c:469
-#: ../panels/user-accounts/um-password-dialog.c:694
-msgctxt "Password strength"
-msgid "Weak"
-msgstr "ààààà"
-
-#: ../panels/user-accounts/um-password-dialog.c:471
-#: ../panels/user-accounts/um-password-dialog.c:695
-msgctxt "Password strength"
-msgid "Fair"
-msgstr "ààà"
-
-#: ../panels/user-accounts/um-password-dialog.c:473
-#: ../panels/user-accounts/um-password-dialog.c:696
-msgctxt "Password strength"
-msgid "Good"
-msgstr "ààààà"
-
-#: ../panels/user-accounts/um-password-dialog.c:475
-#: ../panels/user-accounts/um-password-dialog.c:697
-msgctxt "Password strength"
-msgid "Strong"
-msgstr "ààààà"
-
-#: ../panels/user-accounts/um-password-dialog.c:514
+#: ../panels/user-accounts/um-password-dialog.c:347
 msgid "Passwords do not match"
 msgstr "ààààààà ààà àààà àààà àà"
 
-#: ../panels/user-accounts/um-password-dialog.c:540
+#: ../panels/user-accounts/um-password-dialog.c:409
 msgid "Wrong password"
 msgstr "ààà ààààààà"
 
@@ -4509,84 +5048,110 @@ msgstr "àààà àààààà àà ààà ààààààà 
 msgid "Used by %s"
 msgstr "%s àà àààààà àààààààà"
 
-#: ../panels/user-accounts/um-user-manager.c:463
+#: ../panels/user-accounts/um-realm-manager.c:368
+#, c-format
+msgid "No such domain or realm found"
+msgstr ""
+
+#: ../panels/user-accounts/um-realm-manager.c:743
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr ""
+
+#: ../panels/user-accounts/um-realm-manager.c:748
+msgid "Invalid password, please try again"
+msgstr ""
+
+#: ../panels/user-accounts/um-realm-manager.c:752
+#, c-format
+msgid "Couldn't connect to the %s domain: %s"
+msgstr ""
+
+#: ../panels/user-accounts/um-user-manager.c:466
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "àààààààà ààà '%s' àà ààà àààà àà àà ààààà àà."
 
-#: ../panels/user-accounts/um-user-manager.c:569
+#: ../panels/user-accounts/um-user-manager.c:473
+#, fuzzy, c-format
+#| msgid "A user with the username '%s' already exists"
+msgid "No user with the name '%s' exists."
+msgstr "àààààààààà ààà '%s' àà ààà àààààààààà àààà àà ààààà àà"
+
+#: ../panels/user-accounts/um-user-manager.c:631
 msgid "This user does not exist."
 msgstr "àà àààààààà ààààà àààà àà."
 
-#: ../panels/user-accounts/um-user-panel.c:355
+#: ../panels/user-accounts/um-user-panel.c:371
 msgid "Failed to delete user"
 msgstr "àààààààà àààààà ààà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:415
+#: ../panels/user-accounts/um-user-panel.c:431
 msgid "You cannot delete your own account."
 msgstr "àà àààà ààà àà àààà àà àààà àààà àà àààà ààà."
 
-#: ../panels/user-accounts/um-user-panel.c:424
+#: ../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:428
+#: ../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:437
+#: ../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:441
+#: ../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:444
+#: ../panels/user-accounts/um-user-panel.c:460
 msgid "_Delete Files"
 msgstr "ààààà àààààà (_D)"
 
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
 # libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:461
 msgid "_Keep Files"
 msgstr "ààààà àààà (_F)"
 
-#: ../panels/user-accounts/um-user-panel.c:497
+#: ../panels/user-accounts/um-user-panel.c:513
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "àààà ààààà"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../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:508
+#: ../panels/user-accounts/um-user-panel.c:524
 msgctxt "Password mode"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:843
+#: ../panels/user-accounts/um-user-panel.c:869
 msgid "Failed to contact the accounts service"
 msgstr "ààààà àààà àà àààààà àààà ààà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:845
+#: ../panels/user-accounts/um-user-panel.c:871
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "ààààà ààààààààà àààà àà àààà àààà ààààààà àà ààààà àà."
 
-#: ../panels/user-accounts/um-user-panel.c:885
+#: ../panels/user-accounts/um-user-panel.c:911
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4594,13 +5159,12 @@ msgstr ""
 "ààààà àààà àà ààà,\n"
 "ààààà àààà * ààààà àà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:923
-#| msgid "Create new account"
+#: ../panels/user-accounts/um-user-panel.c:949
 msgid "Create a user account"
 msgstr "àààààààààà àààà ààààà"
 
-#: ../panels/user-accounts/um-user-panel.c:934
-#: ../panels/user-accounts/um-user-panel.c:1221
+#: ../panels/user-accounts/um-user-panel.c:960
+#: ../panels/user-accounts/um-user-panel.c:1271
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4608,12 +5172,12 @@ msgstr ""
 "àààààààààà àààà ààààà àà ààà,\n"
 "ààààà àààà * ààààà àà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:943
+#: ../panels/user-accounts/um-user-panel.c:969
 msgid "Delete the selected user account"
 msgstr "ààààà àààààààààà àààà àà àààààà"
 
-#: ../panels/user-accounts/um-user-panel.c:955
-#: ../panels/user-accounts/um-user-panel.c:1226
+#: ../panels/user-accounts/um-user-panel.c:981
+#: ../panels/user-accounts/um-user-panel.c:1276
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4621,11 +5185,11 @@ msgstr ""
 "ààààà àààààààààà àààà àà ààààà àà ààà,\n"
 "ààààà àààà * ààààà àà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:1132
+#: ../panels/user-accounts/um-user-panel.c:1174
 msgid "My Account"
 msgstr "àààà àààà"
 
-#: ../panels/user-accounts/um-user-panel.c:1142
+#: ../panels/user-accounts/um-user-panel.c:1184
 msgid "Other Accounts"
 msgstr "àààà àààà"
 
@@ -4655,12 +5219,106 @@ msgstr ""
 " â ààààà\n"
 " â àààà àà ààà àà ààààààà '.', '-' àà '_'"
 
+#: ../panels/wacom/button-mapping.ui.h:1
+msgid "Map Buttons"
+msgstr "ààààà ààà"
+
+#: ../panels/wacom/button-mapping.ui.h:2
+msgid "Map buttons to functions"
+msgstr "ààààà àààà àà ààà ààààà ààà"
+
+#. Text printed on screen
+#: ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "ààààààà àààààààààà"
+
+#: ../panels/wacom/calibrator/gui_gtk.c:79
+msgid ""
+"Please tap the target markers as they appear on screen to calibrate the "
+"tablet."
+msgstr ""
+"ààààà àààààà àààààààà àà ààà àààà àà àààààà àà ààààààààà àààà ààà ààààààà àà "
+"ààààà àààà ààà."
+
+#: ../panels/wacom/calibrator/gui_gtk.c:368
+msgid "Mis-click detected, restarting..."
+msgstr "ààà-ààààà àà ààà ààà, àààààààà àà ààà àà ..."
+
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
+#, fuzzy
+#| msgid "Output"
+msgid "Output:"
+msgstr "àààààà"
+
+#. Keep ratio switch
+#: ../panels/wacom/cc-wacom-mapping-panel.c:287
+msgid "Keep aspect ratio (letterbox):"
+msgstr ""
+
+#. Whole-desktop checkbox
+#: ../panels/wacom/cc-wacom-mapping-panel.c:298
+#, fuzzy
+#| msgid "Map to Monitor..."
+msgid "Map to single monitor"
+msgstr "àààààà àà àààààà..."
+
+#: ../panels/wacom/cc-wacom-nav-button.c:89
+#, c-format
+msgid "%d of %d"
+msgstr "%d àà %d"
+
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+#, fuzzy
+#| msgid "None"
+msgctxt "Wacom action-type"
+msgid "None"
+msgstr "ààà àààà"
+
+#: ../panels/wacom/cc-wacom-page.c:119
+msgctxt "Wacom action-type"
+msgid "Send Keystroke"
+msgstr ""
+
+#: ../panels/wacom/cc-wacom-page.c:120
+#, fuzzy
+#| msgid "Switch Modes"
+msgctxt "Wacom action-type"
+msgid "Switch Monitor"
+msgstr "ààààà ààà"
+
+#: ../panels/wacom/cc-wacom-page.c:601
+msgid "Up"
+msgstr "ààà"
+
+#: ../panels/wacom/cc-wacom-page.c:601
+msgid "Down"
+msgstr "àààà"
+
+#: ../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 "ààà"
+
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/logout.c:266
+#: ../panels/wacom/cc-wacom-page.c:777
+msgid "Action"
+msgstr "ààààà"
+
+#: ../panels/wacom/cc-wacom-page.c:886
+msgid "Display Mapping"
+msgstr "ààààààààà ààààààààà àààà"
+
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
-msgid "Wacom Graphics Tablet"
-msgstr "Wacom ààààà ààààààà"
+#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+msgid "Wacom Tablet"
+msgstr "Wacom ààààààà"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-#| msgid "Set your mouse and touchpad preferences"
 msgid "Set your Wacom tablet preferences"
 msgstr "àààà Wacom àààààà àààààààà àà ààà àààà"
 
@@ -4678,7 +5336,6 @@ msgid "Touchpad (relative)"
 msgstr "ààààà (ààààààààà)"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:3
-#| msgid "Mouse Preferences"
 msgid "Tablet Preferences"
 msgstr "àààààà àààààààà"
 
@@ -4691,26 +5348,19 @@ msgid "Please plug in or turn on your Wacom tablet"
 msgstr "ààààà àààà Wacom àààààà àà àààà àà àààààà àààà"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:6
-#| msgid "Mouse Settings"
 msgid "Bluetooth Settings"
 msgstr "ààààààà àààààà"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
-msgid "Wacom Tablet"
-msgstr "Wacom ààààààà"
-
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
 msgid "Map to Monitor..."
 msgstr "àààààà àà àààààà..."
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-#| msgid "Options..."
 msgid "Map Buttons..."
 msgstr "ààààà ààà..."
 
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-# libgnomeui/gnome-app-helper.c:166
 #: ../panels/wacom/gnome-wacom-properties.ui.h:10
-#| msgid "Create..."
 msgid "Calibrate..."
 msgstr "ààààààààà..."
 
@@ -4726,9 +5376,73 @@ msgstr "àààààààà ààà"
 msgid "Left-Handed Orientation"
 msgstr "àààà-ààà ààààààààà"
 
+#: ../panels/wacom/gsd-wacom-device.c:1010
+#, c-format
+msgid "Left Ring Mode #%d"
+msgstr "àààà ààààààà ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1019
+#, c-format
+msgid "Right Ring Mode #%d"
+msgstr "àààààà àààààà ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1049
+#, c-format
+msgid "Left Touchstrip Mode #%d"
+msgstr "àààà Touchstrip ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1058
+#, c-format
+msgid "Right Touchstrip Mode #%d"
+msgstr "ààààà Touchstrip ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1075
+#, c-format
+msgid "Left Touchring Mode Switch"
+msgstr "àààà Touchring ààà ààààà àààà"
+
+#: ../panels/wacom/gsd-wacom-device.c:1077
+#, c-format
+msgid "Right Touchring Mode Switch"
+msgstr "ààààà Touchring ààà ààààà àààà"
+
+#: ../panels/wacom/gsd-wacom-device.c:1080
+#, c-format
+msgid "Left Touchstrip Mode Switch"
+msgstr "àààà Touchstrip ààà ààààà àààà"
+
+#: ../panels/wacom/gsd-wacom-device.c:1082
+#, c-format
+msgid "Right Touchstrip Mode Switch"
+msgstr "ààààà Touchstrip ààà ààààà àààà"
+
+#: ../panels/wacom/gsd-wacom-device.c:1087
+#, c-format
+msgid "Mode Switch #%d"
+msgstr "ààà ààààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1159
+#, c-format
+msgid "Left Button #%d"
+msgstr "ààààà ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1162
+#, c-format
+msgid "Right Button #%d"
+msgstr "ààààà ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1165
+#, c-format
+msgid "Top Button #%d"
+msgstr "ààààà ààà #%d"
+
+#: ../panels/wacom/gsd-wacom-device.c:1168
+#, c-format
+msgid "Bottom Button #%d"
+msgstr "àààà ààà #%d"
+
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-# gnome-session/logout.c:266
 #: ../panels/wacom/wacom-stylus-page.ui.h:1
-#| msgid "Action"
 msgid "No Action"
 msgstr "ààà àààààà àààà"
 
@@ -4745,22 +5459,18 @@ msgid "Right Mouse Button Click"
 msgstr "ààààà àààà ààà àà ààààà àààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:5
-#| msgid "Scrolling"
 msgid "Scroll Up"
 msgstr "ààà ààààààà àààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:6
-#| msgid "Scrolling"
 msgid "Scroll Down"
 msgstr "àààà ààààààà àààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:7
-#| msgid "Scrolling"
 msgid "Scroll Left"
 msgstr "àààà ààààààà àààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:8
-#| msgid "Scrolling"
 msgid "Scroll Right"
 msgstr "àààà ààààààà àààà"
 
@@ -4781,12 +5491,10 @@ msgid "Eraser Pressure Feel"
 msgstr "àààààà àààà ààà àààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:13
-#| msgid "Short"
 msgid "Soft"
 msgstr "ààààà"
 
 #: ../panels/wacom/wacom-stylus-page.ui.h:14
-#| msgid "Fair"
 msgid "Firm"
 msgstr "àààà"
 
@@ -4802,127 +5510,6 @@ msgstr "ààààà ààà"
 msgid "Tip Pressure Feel"
 msgstr "ààà àààà ààà àààà"
 
-#: ../panels/wacom/button-mapping.ui.h:1
-msgid "Map Buttons"
-msgstr "ààààà ààà"
-
-#: ../panels/wacom/button-mapping.ui.h:2
-msgid "Map buttons to functions"
-msgstr "ààààà àààà àà ààà ààààà ààà"
-
-#: ../panels/wacom/gsd-wacom-device.c:908
-#, c-format
-msgid "Left Ring Mode #%d"
-msgstr "àààà ààààààà ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:915
-#, c-format
-#| msgid "Right ring finger"
-msgid "Right Ring Mode #%d"
-msgstr "àààààà àààààà ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:943
-#, c-format
-msgid "Left Touchstrip Mode #%d"
-msgstr "àààà Touchstrip ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:950
-#, c-format
-msgid "Right Touchstrip Mode #%d"
-msgstr "ààààà Touchstrip ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:965
-#, c-format
-msgid "Left Touchring Mode Switch"
-msgstr "àààà Touchring ààà ààààà àààà"
-
-#: ../panels/wacom/gsd-wacom-device.c:967
-#, c-format
-msgid "Right Touchring Mode Switch"
-msgstr "ààààà Touchring ààà ààààà àààà"
-
-#: ../panels/wacom/gsd-wacom-device.c:970
-#, c-format
-msgid "Left Touchstrip Mode Switch"
-msgstr "àààà Touchstrip ààà ààààà àààà"
-
-#: ../panels/wacom/gsd-wacom-device.c:972
-#, c-format
-msgid "Right Touchstrip Mode Switch"
-msgstr "ààààà Touchstrip ààà ààààà àààà"
-
-#: ../panels/wacom/gsd-wacom-device.c:977
-#, c-format
-msgid "Mode Switch #%d"
-msgstr "ààà ààààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1049
-#, c-format
-msgid "Left Button #%d"
-msgstr "ààààà ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1052
-#, c-format
-msgid "Right Button #%d"
-msgstr "ààààà ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1055
-#, c-format
-msgid "Top Button #%d"
-msgstr "ààààà ààà #%d"
-
-#: ../panels/wacom/gsd-wacom-device.c:1058
-#, c-format
-msgid "Bottom Button #%d"
-msgstr "àààà ààà #%d"
-
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:70
-msgid "Screen Calibration"
-msgstr "ààààààà àààààààààà"
-
-#: ../panels/wacom/calibrator/gui_gtk.c:71
-msgid ""
-"Please tap the target markers as they appear on screen to calibrate the "
-"tablet."
-msgstr ""
-"ààààà àààààà àààààààà àà ààà àààà àà àààààà àà ààààààààà àààà ààà ààààààà àà "
-"ààààà àààà ààà."
-
-#: ../panels/wacom/calibrator/gui_gtk.c:271
-msgid "Mis-click detected, restarting..."
-msgstr "ààà-ààààà àà ààà ààà, àààààààà àà ààà àà ..."
-
-#: ../panels/wacom/cc-wacom-nav-button.c:89
-#, c-format
-#| msgid "%d x %d"
-msgid "%d of %d"
-msgstr "%d àà %d"
-
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
-#: ../panels/wacom/cc-wacom-page.c:561
-msgid "Button"
-msgstr "ààà"
-
-#: ../panels/wacom/cc-wacom-page.c:279
-msgid "Switch Modes"
-msgstr "ààààà ààà"
-
-#: ../panels/wacom/cc-wacom-page.c:526
-msgid "Up"
-msgstr "ààà"
-
-#: ../panels/wacom/cc-wacom-page.c:526
-#| msgid "Done!"
-msgid "Down"
-msgstr "àààà"
-
-#: ../panels/wacom/cc-wacom-page.c:681
-#| msgctxt "universal access, seeing"
-#| msgid "Display"
-msgid "Display Mapping"
-msgstr "ààààààààà ààààààààà àààà"
-
 #: ../shell/control-center.c:58
 msgid "Enable verbose mode"
 msgstr "àààààà àààà àààààà àààà"
@@ -4953,6 +5540,14 @@ msgstr ""
 "%s\n"
 "'%s --help' àà àààààà ààààà àààà àààààà àà àààà àààà àààààà àà ààà ààààà.\n"
 
+#: ../shell/control-center.c:211
+msgid "Help"
+msgstr ""
+
+#: ../shell/control-center.c:212
+msgid "Quit"
+msgstr ""
+
 #: ../shell/gnomecc.directory.in.h:1
 msgid "Control Center"
 msgstr "àààààààà àààààà"
@@ -4966,10 +5561,373 @@ msgid "Preferences;Settings;"
 msgstr "àààààààà;àààààààà;"
 
 #: ../shell/shell.ui.h:2
-#| msgid "_All Settings"
 msgid "All Settings"
 msgstr "ààà àààààààà"
 
+#  Create the file chooser dialog stuff here
+#~| msgid "Wallpapers"
+#~ msgid "Add wallpaper"
+#~ msgstr "ààààààà àààààà"
+
+#  Create the file chooser dialog stuff here
+#~| msgid "Wallpapers"
+#~ msgid "Remove wallpaper"
+#~ msgstr "ààààààà ààààà"
+
+#~ msgid "Swap colors"
+#~ msgstr "ààà ààà ààà ààààà"
+
+#~| msgid "Solid Color"
+#~ msgid "Secondary color"
+#~ msgstr "àààààààà ààà"
+
+#~ msgid "Horizontal Gradient"
+#~ msgstr "ààààààà ààà"
+
+#~ msgid "Vertical Gradient"
+#~ msgstr "ààààà ààààà"
+
+#~ msgid "Solid Color"
+#~ msgstr "ààà ààà"
+
+#~ msgid "Pictures Folder"
+#~ msgstr "ààààà àààààà"
+
+#~ msgid "Colors & Gradients"
+#~ msgstr "ààà & àààààà"
+
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/logout.c:266
+#~ msgid "Acti_on:"
+#~ msgstr "àààààà: (_o)"
+
+#~| msgid "Take a photo..."
+#~ 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 "Control ààààà àààà àààà àà àààààààà àà àààààà àààààà (_o)"
+
+#~| msgid "_Acceleration:"
+#~ msgid "A_cceleration:"
+#~ msgstr "ààààà: (_c)"
+
+#~ msgid "_Sensitivity:"
+#~ msgstr "ààààààààààà:  (_S)"
+
+#~ msgid "Drag and Drop"
+#~ msgstr "àààààà àà àààààà"
+
+#~ msgid "Thr_eshold:"
+#~ msgstr "ààààààà:  (_e)"
+
+#~| msgid "Thr_eshold:"
+#~ 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 "ààààààà àà ààà"
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gtk/gtkinputdialog.c:238
+#~ msgid "_Disabled"
+#~ msgstr "ààààààààà (_D)"
+
+#~ msgid "_Edge scrolling"
+#~ msgstr "àààààà àààààààààà (_E)"
+
+#~ msgid "Enable h_orizontal scrolling"
+#~ msgstr "ààààààà àààààààààà àààààà àààà (_o)"
+
+#~| msgid "Other..."
+#~ msgctxt "Wireless access point"
+#~ msgid "Other..."
+#~ msgstr "àààà..."
+
+#~ msgid "Hotspot"
+#~ msgstr "àààààààà"
+
+#~| msgid "Not connected"
+#~ 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 "Subnet Mask"
+#~ msgstr "ààààà ààààà"
+
+#~| msgid "Device"
+#~ msgid "Device Off"
+#~ msgstr "ààà àààààà"
+
+#~ msgid "_Network Name"
+#~ msgstr "ààààà ààà (_N)"
+
+#~ msgid "_Stop Hotspot..."
+#~ msgstr "àààààààà ààààà... (_S)"
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-# gtk/gtkinputdialog.c:238
+#~| msgid "Disabled"
+#~ msgid "Disable VPN"
+#~ msgstr "ààààà VPN"
+
+#~| msgid "_HTTP Proxy"
+#~ msgid "HTTP Port"
+#~ msgstr "àààààààà ààààà"
+
+#~| msgid "H_TTPS Proxy"
+#~ msgid "HTTPS Port"
+#~ msgstr "ààààààààà ààààà"
+
+#~| msgid "_FTP Proxy"
+#~ msgid "FTP Port"
+#~ msgstr "àààààà ààààà"
+
+#~ msgid "Socks Port"
+#~ msgstr "ààààà ààààà"
+
+#~ msgid "To add a new account, first select the account type"
+#~ msgstr "ààà àààà àààààà àà ààà, àààà àààà àààààà àà ààà àààà"
+
+#~| msgid "Add"
+#~ msgid "_Add..."
+#~ msgstr "àààààà... (_A)"
+
+#~| msgid "_Type:"
+#~ msgid "Tip:"
+#~ msgstr "ààààààà:"
+
+#~| msgid "Brightness"
+#~ msgid "Brightness Settings"
+#~ msgstr "àààààààà àààààààà"
+
+#~ msgid "affect how much power is used"
+#~ msgstr "àààààààà ààààà ààààà àà àààààààà àààà àà"
+
+#~| msgid "Address"
+#~ msgid "A_ddress:"
+#~ msgstr "ààà:  (_d)"
+
+#~ msgid "_Search by Address"
+#~ msgstr "ààà àààààà ààààà (_S)"
+
+#~ msgid ""
+#~ "FirewallD is not running. Network printer detection needs services mdns, "
+#~ "ipp, ipp-client and samba-client enabled on firewall."
+#~ msgstr ""
+#~ "FirewallD àààà àà ààà àà. ààààà ààààààà àà ààà ààààà ààà àààààààà mdns, IPP, àààààà-"
+#~ "ààààààà àà àààààà-ààààààà àà ààààà àà àà ààààààà àà ààààà àà. "
+
+#~ msgid "Devices"
+#~ msgstr "ààààà"
+
+#~| msgid "Local"
+#~ msgctxt "printer type"
+#~ msgid "Local"
+#~ msgstr "ààààààà"
+
+#~| msgid "Network"
+#~ 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 "àààààààà àààà ààààà ààààààà àà ààà"
+
+#~ msgid "Opening firewall for IPP connections"
+#~ msgstr "àààààààà ààààà àà ààà àààààà ààààààà"
+
+#~| msgid "Back"
+#~ msgid "_Back"
+#~ msgstr "àààà (_B)"
+
+#~ msgid "Add User"
+#~ msgstr "àààààààà àààààà"
+
+#~| msgid "Removable Media"
+#~ msgid "Remove User"
+#~ msgstr "àààààààààà àààààà"
+
+#~ msgid "Allowed users"
+#~ msgstr "àààààà ààààààà àààààààà"
+
+#~ msgid "Choose a Layout"
+#~ msgstr "àà ààààà ààààà"
+
+#~ msgid "Preview"
+#~ msgstr "ààààààààààà"
+
+#~| msgid "Layout"
+#~ msgid "Add Layout"
+#~ msgstr "àààà àààààà"
+
+#~| msgid "Choose a Layout"
+#~ msgid "Remove Layout"
+#~ msgstr "àààà àààààà"
+
+#~ msgid "Move Up"
+#~ msgstr "ààà àààà"
+
+#~| msgid "Volume down"
+#~ msgid "Move Down"
+#~ msgstr "àààà àààà"
+
+#~| msgid "Preview"
+#~ msgid "Preview Layout"
+#~ msgstr "ààààààààààà àààà"
+
+#~ msgid "Use the same layout for all windows"
+#~ msgstr "ààà ààààààà àà ààà àà àà àààà àà ààààà àààà"
+
+#~| msgid "Allow different layouts for each window"
+#~ msgid "Allow different layouts for individual windows"
+#~ msgstr "ààààààààà ààààààà àà ààà ààààààà àààà àà àààààà ààà"
+
+#~ msgid "New windows use the default layout"
+#~ msgstr "àà àààààà àààààààà àààà àà ààààà àààà"
+
+#~ msgid "New windows use the previous window's layout"
+#~ msgstr "àà ààààààà ààààà ààààà àààà àà ààààà àààà"
+
+#~ msgid "View and edit keyboard layout options"
+#~ msgstr "àààààààà ààààà àààààà ààààààà àààà àà ààààà"
+
+#~ msgid "Reset to De_faults"
+#~ msgstr "àààààààà ààà ààààà àààà (_f)"
+
+#~ msgid ""
+#~ "Replace the current keyboard layout settings with the\n"
+#~ "default settings"
+#~ msgstr ""
+#~ "àààààà àààààààà àààà àààààààà àààààààààààà àààà\n"
+#~ "àààààààà àààààààà àà ààà"
+
+#~ msgid "Layouts"
+#~ msgstr "àààààààà"
+
+#~ msgid "Layout"
+#~ msgstr "àààààààà"
+
+#~ msgid "Co_nnector:"
+#~ msgstr "ààààààà: (_n)"
+
+#~ msgid "Hardware"
+#~ msgstr "ààààààààà"
+
+#~ msgid "C_hoose a device to configure:"
+#~ msgstr "àààààààà àààà àà ààà ààà àààààà ààààà: (_h)"
+
+#~ msgid "Dasher"
+#~ msgstr "àààà"
+
+#~ msgid "Nomon"
+#~ msgstr "Nomon"
+
+#~ msgid "Caribou"
+#~ msgstr "àààààà"
+
+#~ msgid "Change contrast:"
+#~ msgstr "ààààààààà ààààà:"
+
+#~| msgid "Text size:"
+#~ msgid "_Text size:"
+#~ msgstr "ààà àààà: (_T)"
+
+#~ msgid "Increase size:"
+#~ msgstr "àààà àààààà:"
+
+#~ msgid "Decrease size:"
+#~ msgstr "àààà ààààà:"
+
+#~ msgctxt "universal access, seeing"
+#~ msgid "Display"
+#~ msgstr "ààààààààà àààà"
+
+#~ msgctxt "universal access, seeing"
+#~ msgid "Zoom"
+#~ msgstr "àààà-àààà àààà"
+
+#~ msgid "Screen keyboard"
+#~ msgstr "ààààààà àààààààà"
+
+#~ msgid "Typing Assistant"
+#~ msgstr "ààààààà ààààà"
+
+#~ msgid "Type here to test settings"
+#~ msgstr "ààààààà àààààà àààà àààà àààà"
+
+#~| msgid "Screen"
+#~ msgid "1/2 Screen"
+#~ msgstr "1/2 ààààààà"
+
+#~| msgid "Screen"
+#~ msgid "3/4 Screen"
+#~ msgstr "3/4 ààààààà"
+
+#~ msgid "Create new account"
+#~ msgstr "ààà àààà ààààà"
+
+#~ msgid "_Account Type"
+#~ msgstr "àààà àààààà (_A)"
+
+# #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
+# libgnomeui/gnome-app-helper.c:166
+#~ msgid "Cr_eate"
+#~ msgstr "ààààà (_e)"
+
+#~ msgid "Choose a generated password"
+#~ msgstr "ààààààà àààà ààààààà ààààà"
+
+#~| msgid "Account type"
+#~ msgid "Account _type"
+#~ msgstr "àààà àààààà (_t)"
+
+#~ msgid "More choices..."
+#~ msgstr "àààà àààà..."
+
+#~ msgid "Wacom Graphics Tablet"
+#~ msgstr "Wacom ààààà ààààààà"
+
 #~ msgid "Current network location"
 #~ msgstr "àààààà ààààà ààààà"
 



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