[gnome-control-center] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 4f4b17de5da23b90c15bbe3988352bca7d3c1aaf
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 18 08:43:05 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  763 ++++++++++++++++++++++++++++++++++++++---------------------
 po/zh_TW.po |  763 ++++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 986 insertions(+), 540 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 59ee462..47ffc8c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 3.3.3\n"
+"Project-Id-Version: gnome-control-center 3.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:23+0800\n"
-"PO-Revision-Date: 2012-01-29 23:24+0800\n"
+"POT-Creation-Date: 2012-02-18 08:42+0800\n"
+"PO-Revision-Date: 2012-02-18 08:42+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -178,7 +178,7 @@ msgctxt "Power"
 msgid "Bluetooth"
 msgstr "èç"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/network/network.ui.h:22
+#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/network/network.ui.h:23
 msgid "Remove Device"
 msgstr "çéèç"
 
@@ -323,142 +323,142 @@ msgid "Available Profiles"
 msgstr "åççæèæ"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:794
-#: ../panels/sound/gvc-mixer-dialog.c:1515
+#: ../panels/color/cc-color-panel.c:806
+#: ../panels/sound/gvc-mixer-dialog.c:1516
 msgid "Device"
 msgstr "èç"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:829
+#: ../panels/color/cc-color-panel.c:841
 msgid "Calibration"
 msgstr "ææ"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:861
+#: ../panels/color/cc-color-panel.c:873
 msgid "Create a color profile for the selected device"
 msgstr "çåéåèçåçèåæèæ"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:875 ../panels/color/cc-color-panel.c:899
+#: ../panels/color/cc-color-panel.c:887 ../panels/color/cc-color-panel.c:911
 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:908
+#: ../panels/color/cc-color-panel.c:920
 msgid "The measuring instrument does not support printer profiling."
 msgstr "æéååäæææåæçåæã"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:931
 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:992
+#: ../panels/color/cc-color-panel.c:1004
 msgid "Cannot remove automatically added profile"
 msgstr "äèçéèåååçèåçå"
 
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1327
+#: ../panels/color/cc-color-panel.c:1339
 msgid "No profile"
 msgstr "ææèåçå"
 
-#: ../panels/color/cc-color-panel.c:1358
+#: ../panels/color/cc-color-panel.c:1370
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i å"
 
-#: ../panels/color/cc-color-panel.c:1369
+#: ../panels/color/cc-color-panel.c:1381
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i åæ"
 
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1392
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i é"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1387
+#: ../panels/color/cc-color-panel.c:1399
 #, c-format
 msgid "Less than 1 week"
 msgstr "åæ 1 é"
 
-#: ../panels/color/cc-color-panel.c:1449
+#: ../panels/color/cc-color-panel.c:1461
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "éè RGB"
 
-#: ../panels/color/cc-color-panel.c:1454
+#: ../panels/color/cc-color-panel.c:1466
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "éè CMYK"
 
-#: ../panels/color/cc-color-panel.c:1459
+#: ../panels/color/cc-color-panel.c:1471
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "éèçé"
 
-#: ../panels/color/cc-color-panel.c:1577 ../panels/color/cc-color-panel.c:1609
-#: ../panels/color/cc-color-panel.c:1620 ../panels/color/cc-color-panel.c:1631
+#: ../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
 msgid "Uncalibrated"
 msgstr "æçææ"
 
-#: ../panels/color/cc-color-panel.c:1580
+#: ../panels/color/cc-color-panel.c:1592
 msgid "This device is not color managed."
 msgstr "éåèçæåéèççã"
 
-#: ../panels/color/cc-color-panel.c:1612
+#: ../panels/color/cc-color-panel.c:1633
 msgid "This device is using manufacturing calibrated data."
 msgstr "éåèçæäçèéåçææèæã"
 
-#: ../panels/color/cc-color-panel.c:1623
+#: ../panels/color/cc-color-panel.c:1644
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
 msgstr "éåèçææéçæåèåéèææçæèæã"
 
-#: ../panels/color/cc-color-panel.c:1656
+#: ../panels/color/cc-color-panel.c:1677
 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:1684
+#: ../panels/color/cc-color-panel.c:1705
 msgid "Not specified"
 msgstr "åææå"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1868
+#: ../panels/color/cc-color-panel.c:1889
 msgid "No devices supporting color management detected"
 msgstr "åæäåææéèçççèç"
 
-#: ../panels/color/cc-color-panel.c:2097
+#: ../panels/color/cc-color-panel.c:2118
 msgctxt "Device kind"
 msgid "Display"
 msgstr "éçå"
 
-#: ../panels/color/cc-color-panel.c:2099
+#: ../panels/color/cc-color-panel.c:2120
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "ææå"
 
-#: ../panels/color/cc-color-panel.c:2101
+#: ../panels/color/cc-color-panel.c:2122
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "æåæ"
 
-#: ../panels/color/cc-color-panel.c:2103
+#: ../panels/color/cc-color-panel.c:2124
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "ççæ"
 
-#: ../panels/color/cc-color-panel.c:2105
+#: ../panels/color/cc-color-panel.c:2126
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "ççæåæ"
@@ -610,7 +610,7 @@ msgstr "éæèè"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Cancel"
 msgstr "åæ(_C)"
 
@@ -859,34 +859,34 @@ msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;éæ;æåæ;èå;èåå;éææç;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:401
 #, c-format
 msgid "VESA: %s"
 msgstr "VESAï%s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:79
+#: ../panels/info/cc-info-panel.c:425 ../panels/network/panel-common.c:79
 #: ../panels/network/panel-common.c:158
 msgid "Unknown"
 msgstr "äæ"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:586
 #, c-format
 msgid "%d-bit"
 msgstr "%d-äå"
 
-#: ../panels/info/cc-info-panel.c:744
+#: ../panels/info/cc-info-panel.c:743
 msgid "Unknown model"
 msgstr "äæçåè"
 
-#: ../panels/info/cc-info-panel.c:827
+#: ../panels/info/cc-info-panel.c:826
 msgid "The next login will attempt to use the standard experience."
 msgstr "äæçåæåèäçææééã"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:828
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -894,47 +894,47 @@ 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:871
+#: ../panels/info/cc-info-panel.c:870
 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:877
+#: ../panels/info/cc-info-panel.c:876
 msgctxt "Experience"
 msgid "Standard"
 msgstr "ææ"
 
-#: ../panels/info/cc-info-panel.c:1200
+#: ../panels/info/cc-info-panel.c:1199
 msgid "Ask what to do"
 msgstr "èåèåäé"
 
-#: ../panels/info/cc-info-panel.c:1204
+#: ../panels/info/cc-info-panel.c:1203
 msgid "Do nothing"
 msgstr "äåäää"
 
-#: ../panels/info/cc-info-panel.c:1208
+#: ../panels/info/cc-info-panel.c:1207
 msgid "Open folder"
 msgstr "éåèæå"
 
-#: ../panels/info/cc-info-panel.c:1319
+#: ../panels/info/cc-info-panel.c:1318
 msgid "Select an application for audio CDs"
 msgstr "éæææéæ CD çæççå"
 
-#: ../panels/info/cc-info-panel.c:1320
+#: ../panels/info/cc-info-panel.c:1319
 msgid "Select an application for video DVDs"
 msgstr "éæææåç DVD çæççå"
 
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-panel.c:1320
 msgid "Select an application to run when a music player is connected"
 msgstr "éæçéæææåéææèåèçæççå"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-panel.c:1321
 msgid "Select an application to run when a camera is connected"
 msgstr "éæçæåæéææèåèçæççå"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-panel.c:1322
 msgid "Select an application for software CDs"
 msgstr "éæèä CD èççæççå"
 
@@ -943,85 +943,85 @@ msgstr "éæèä CD èççæççå"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1335
+#: ../panels/info/cc-info-panel.c:1334
 msgid "audio DVD"
 msgstr "éæ DVD"
 
-#: ../panels/info/cc-info-panel.c:1336
+#: ../panels/info/cc-info-panel.c:1335
 msgid "blank Blu-ray disc"
 msgstr "çç Blu-ray åç"
 
-#: ../panels/info/cc-info-panel.c:1337
+#: ../panels/info/cc-info-panel.c:1336
 msgid "blank CD disc"
 msgstr "çç CD åç"
 
-#: ../panels/info/cc-info-panel.c:1338
+#: ../panels/info/cc-info-panel.c:1337
 msgid "blank DVD disc"
 msgstr "çç DVD åç"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1338
 msgid "blank HD DVD disc"
 msgstr "çç HD DVD åç"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1339
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray åçåç"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1340
 msgid "e-book reader"
 msgstr "éåæéèå"
 
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1341
 msgid "HD DVD video disc"
 msgstr "HD DVD åçåç"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1342
 msgid "Picture CD"
 msgstr "çç CD"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1343
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1344
 msgid "Video CD"
 msgstr "åç CD"
 
-#: ../panels/info/cc-info-panel.c:1474
-#: ../panels/keyboard/keyboard-shortcuts.c:1627
+#: ../panels/info/cc-info-panel.c:1473
+#: ../panels/keyboard/keyboard-shortcuts.c:1617
 msgid "Section"
 msgstr "ç"
 
-#: ../panels/info/cc-info-panel.c:1483 ../panels/info/info.ui.h:15
+#: ../panels/info/cc-info-panel.c:1482 ../panels/info/info.ui.h:15
 msgid "Overview"
 msgstr "æè"
 
-#: ../panels/info/cc-info-panel.c:1489 ../panels/info/info.ui.h:4
+#: ../panels/info/cc-info-panel.c:1488 ../panels/info/info.ui.h:4
 msgid "Default Applications"
 msgstr "éèæççå"
 
-#: ../panels/info/cc-info-panel.c:1494 ../panels/info/info.ui.h:17
+#: ../panels/info/cc-info-panel.c:1493 ../panels/info/info.ui.h:17
 msgid "Removable Media"
 msgstr "åçéååé"
 
-#: ../panels/info/cc-info-panel.c:1499 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1498 ../panels/info/info.ui.h:11
 msgid "Graphics"
 msgstr "çå"
 
-#: ../panels/info/cc-info-panel.c:1701
+#: ../panels/info/cc-info-panel.c:1700
 #, c-format
 msgid "Version %s"
 msgstr "çæ %s"
 
-#: ../panels/info/cc-info-panel.c:1751
+#: ../panels/info/cc-info-panel.c:1750
 msgid "Install Updates"
 msgstr "åèææ"
 
-#: ../panels/info/cc-info-panel.c:1755
+#: ../panels/info/cc-info-panel.c:1754
 msgid "System Up-To-Date"
 msgstr "ççåæææ"
 
-#: ../panels/info/cc-info-panel.c:1759
+#: ../panels/info/cc-info-panel.c:1758
 msgid "Checking for Updates"
 msgstr "æåææææ"
 
@@ -1386,6 +1386,7 @@ msgid "Slow"
 msgstr "æé"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/wacom/button-mapping.ui.h:3
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1411,8 +1412,8 @@ msgstr "éå(_S)ï"
 #: ../panels/keyboard/keyboard-shortcuts.c:555
 #: ../panels/keyboard/keyboard-shortcuts.c:563
 #: ../panels/keyboard/keyboard-shortcuts.c:882
-#: ../panels/keyboard/keyboard-shortcuts.c:1383
-#: ../panels/keyboard/keyboard-shortcuts.c:1387
+#: ../panels/keyboard/keyboard-shortcuts.c:1373
+#: ../panels/keyboard/keyboard-shortcuts.c:1377
 msgid "Custom Shortcuts"
 msgstr "èéæåé"
 
@@ -1422,14 +1423,14 @@ msgstr "<èåèåäè>"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1064
+#: ../panels/keyboard/keyboard-shortcuts.c:1054
 #: ../panels/sound/gvc-mixer-control.c:1087
-#: ../panels/user-accounts/um-fingerprint-dialog.c:177
-#: ../panels/user-accounts/um-fingerprint-dialog.c:178
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
 msgid "Disabled"
 msgstr "ååç"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1205
+#: ../panels/keyboard/keyboard-shortcuts.c:1195
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1439,7 +1440,7 @@ msgstr ""
 "æåâ%sâçæäçïååææçææäææéã\n"
 "èèçååçæéïååæäç ControlïAlt  æ Shiftã"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1237
+#: ../panels/keyboard/keyboard-shortcuts.c:1227
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1448,21 +1449,22 @@ msgstr ""
 "æåéâ%sâåçäçæï\n"
 "â%sâ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1242
+#: ../panels/keyboard/keyboard-shortcuts.c:1232
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "åæäéææææåéçã%sãïã%sãçæåéåæåçã"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1248
+#: ../panels/keyboard/keyboard-shortcuts.c:1238
 msgid "_Reassign"
 msgstr "éæææ(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1676
+#: ../panels/keyboard/keyboard-shortcuts.c:1666
+#: ../panels/wacom/cc-wacom-page.c:478
 msgid "Action"
 msgstr "åä"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1699
+#: ../panels/keyboard/keyboard-shortcuts.c:1688
 msgid "Shortcut"
 msgstr "æåé"
 
@@ -1527,7 +1529,9 @@ msgid "Large"
 msgstr "å"
 
 #. low sensitivity
+#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/power/cc-power-panel.c:570
 msgid "Low"
 msgstr "ä"
 
@@ -1658,71 +1662,82 @@ msgstr "çé"
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/cc-network-panel.c:2014 ../panels/network/network.ui.h:17
+#: ../panels/network/cc-network-panel.c:2018 ../panels/network/network.ui.h:18
 msgid "IPv4 Address"
 msgstr "IPv4 äå"
 
-#: ../panels/network/cc-network-panel.c:2015 ../panels/network/network.ui.h:18
+#: ../panels/network/cc-network-panel.c:2019 ../panels/network/network.ui.h:19
 msgid "IPv6 Address"
 msgstr "IPv6 äå"
 
-#: ../panels/network/cc-network-panel.c:2018
-#: ../panels/network/cc-network-panel.c:2021 ../panels/network/network.ui.h:16
+#: ../panels/network/cc-network-panel.c:2022
+#: ../panels/network/cc-network-panel.c:2025 ../panels/network/network.ui.h:17
 #: ../panels/printers/printers.ui.h:9
 msgid "IP Address"
 msgstr "IP äå"
 
-#: ../panels/network/cc-network-panel.c:2068
-#: ../panels/network/cc-network-panel.c:2443
+#: ../panels/network/cc-network-panel.c:2072
+#: ../panels/network/cc-network-panel.c:2447
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:2176
+#: ../panels/network/cc-network-panel.c:2180
 msgid "Proxy"
 msgstr "äçäæå"
 
-#: ../panels/network/cc-network-panel.c:2250
+#: ../panels/network/cc-network-panel.c:2254
 msgid "Network proxy"
 msgstr "ççäçäæå"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2510
+#: ../panels/network/cc-network-panel.c:2514
 msgid "The system network services are not compatible with this version."
 msgstr "ççççæåèéåçæäååã"
 
-#: ../panels/network/cc-network-panel.c:3125
+#: ../panels/network/cc-network-panel.c:2712
+#, c-format
+msgid ""
+"Network details for %s including password and any custom configuration will "
+"be lost"
+msgstr "%s çççèçèæåååçåääèéççæéææå"
+
+#: ../panels/network/cc-network-panel.c:2722
+msgid "Forget"
+msgstr "éå"
+
+#: ../panels/network/cc-network-panel.c:3221
 msgid "Not connected to the internet."
 msgstr "ææéçåäèçã"
 
-#: ../panels/network/cc-network-panel.c:3126
+#: ../panels/network/cc-network-panel.c:3222
 msgid "Create the hotspot anyway?"
 msgstr "æååååççéï"
 
-#: ../panels/network/cc-network-panel.c:3144
+#: ../panels/network/cc-network-panel.c:3240
 #, c-format
 msgid "Disconnect from %s and create a new hotspot?"
 msgstr "æåå %s äæéçäåçæççéï"
 
-#: ../panels/network/cc-network-panel.c:3147
+#: ../panels/network/cc-network-panel.c:3243
 msgid "This is your only connection to the internet."
 msgstr "éæäéæäèççåäéçã"
 
-#: ../panels/network/cc-network-panel.c:3165
+#: ../panels/network/cc-network-panel.c:3261
 msgid "Create _Hotspot"
 msgstr "åççé(_H)"
 
-#: ../panels/network/cc-network-panel.c:3225
+#: ../panels/network/cc-network-panel.c:3321
 msgid "Stop hotspot and disconnect any users?"
 msgstr "åæçéääæäääçèçéçï"
 
-#: ../panels/network/cc-network-panel.c:3228
+#: ../panels/network/cc-network-panel.c:3324
 msgid "_Stop Hotspot"
 msgstr "åæçé(_S)"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:3246
+#: ../panels/network/cc-network-panel.c:3342
 msgid "Airplane Mode"
 msgstr "éåæå"
 
@@ -1768,73 +1783,73 @@ msgid "FTP Port"
 msgstr "FTP éæå"
 
 #: ../panels/network/network.ui.h:8
+msgid "Forget Network"
+msgstr "éåçç"
+
+#: ../panels/network/network.ui.h:9
 msgid "Gateway"
 msgstr "éèé"
 
-#: ../panels/network/network.ui.h:9
+#: ../panels/network/network.ui.h:10
 msgid "Group Name"
 msgstr "ççåç"
 
-#: ../panels/network/network.ui.h:10
+#: ../panels/network/network.ui.h:11
 msgid "Group Password"
 msgstr "ççåç"
 
-#: ../panels/network/network.ui.h:11
+#: ../panels/network/network.ui.h:12
 msgid "HTTP Port"
 msgstr "HTTP éæå"
 
-#: ../panels/network/network.ui.h:12
+#: ../panels/network/network.ui.h:13
 msgid "HTTPS Port"
 msgstr "HTTPS éæå"
 
-#: ../panels/network/network.ui.h:13
+#: ../panels/network/network.ui.h:14
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS äçäæå"
 
-#: ../panels/network/network.ui.h:14
+#: ../panels/network/network.ui.h:15
 msgid "Hardware Address"
 msgstr "çääå"
 
-#: ../panels/network/network.ui.h:15
+#: ../panels/network/network.ui.h:16
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:19
+#: ../panels/network/network.ui.h:20
 msgid "Interface"
 msgstr "äé"
 
-#: ../panels/network/network.ui.h:20
+#: ../panels/network/network.ui.h:21
 msgid "Network Name"
 msgstr "ççåç"
 
-#: ../panels/network/network.ui.h:21
+#: ../panels/network/network.ui.h:22
 msgid "Provider"
 msgstr "äæå"
 
-#: ../panels/network/network.ui.h:23
+#: ../panels/network/network.ui.h:24
 msgid "Security"
 msgstr "ååæ"
 
-#: ../panels/network/network.ui.h:24
+#: ../panels/network/network.ui.h:25
 msgid "Security Key"
 msgstr "åååçå"
 
-#: ../panels/network/network.ui.h:25
+#: ../panels/network/network.ui.h:26
 msgid "Select the interface to use for the new service"
 msgstr "éæèçæææåçäé"
 
-#: ../panels/network/network.ui.h:26
+#: ../panels/network/network.ui.h:27
 msgid "Socks Port"
 msgstr "Socks éæå"
 
-#: ../panels/network/network.ui.h:27
+#: ../panels/network/network.ui.h:28
 msgid "Subnet Mask"
 msgstr "åççéç"
 
-#: ../panels/network/network.ui.h:28
-msgid "Unlock"
-msgstr "èé"
-
 #: ../panels/network/network.ui.h:29
 msgid "Username"
 msgstr "äçèåç"
@@ -1872,28 +1887,33 @@ msgid "_Network Name"
 msgstr "ççåç(_N)"
 
 #: ../panels/network/network.ui.h:38
+#: ../panels/region/gnome-region-panel.ui.h:40
+msgid "_Options..."
+msgstr "éé(_O)â"
+
+#: ../panels/network/network.ui.h:39
 msgid "_Socks Host"
 msgstr "Socks äæ(_S)"
 
-#: ../panels/network/network.ui.h:39
+#: ../panels/network/network.ui.h:40
 msgid "_Stop Hotspot..."
 msgstr "åæçé(_S)â"
 
-#: ../panels/network/network.ui.h:40
+#: ../panels/network/network.ui.h:41
 msgid "_Use as Hotspot..."
 msgstr "åççé(_U)â"
 
-#: ../panels/network/network.ui.h:41
+#: ../panels/network/network.ui.h:42
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "èå"
 
-#: ../panels/network/network.ui.h:42
+#: ../panels/network/network.ui.h:43
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "æå"
 
-#: ../panels/network/network.ui.h:43
+#: ../panels/network/network.ui.h:44
 msgctxt "proxy method"
 msgid "None"
 msgstr "ææ"
@@ -2023,27 +2043,27 @@ msgstr "èååæçåèïèåéæåèéå"
 msgid "Account Type:"
 msgstr "åèéåï"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:502
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "_Add..."
 msgstr "åå(_A)â"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:555
+#: ../panels/online-accounts/cc-online-accounts-panel.c:550
 msgid "Error creating account"
 msgstr "åçåèæççéè"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:589
+#: ../panels/online-accounts/cc-online-accounts-panel.c:584
 msgid "Error removing account"
 msgstr "çéåèæççéè"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:625
+#: ../panels/online-accounts/cc-online-accounts-panel.c:620
 msgid "Are you sure you want to remove the account?"
 msgstr "çåèåééååèï"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:627
+#: ../panels/online-accounts/cc-online-accounts-panel.c:622
 msgid "This will not remove the account on the server."
 msgstr "éäæçéäæåäçåèã"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:628
+#: ../panels/online-accounts/cc-online-accounts-panel.c:623
 msgid "_Remove"
 msgstr "çé(_R)"
 
@@ -2068,17 +2088,17 @@ msgstr "çéåè"
 msgid "Select an account"
 msgstr "éæäååè"
 
-#: ../panels/power/cc-power-panel.c:160
+#: ../panels/power/cc-power-panel.c:162
 msgid "Unknown time"
 msgstr "æççæé"
 
-#: ../panels/power/cc-power-panel.c:166
+#: ../panels/power/cc-power-panel.c:168
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i åé"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2086,55 +2106,158 @@ msgstr[0] "%i åæ"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:186
+#: ../panels/power/cc-power-panel.c:188
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:189
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "åæ"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "åé"
 
-#: ../panels/power/cc-power-panel.c:265
-msgid "Battery charging"
-msgstr "éææååé"
-
-#: ../panels/power/cc-power-panel.c:268
-msgid "Battery discharging"
-msgstr "éææåæé"
-
-#: ../panels/power/cc-power-panel.c:279
-msgid "UPS charging"
-msgstr "äæéççæååé"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:233
+#, c-format
+msgid "Charging - %s until fully charged"
+msgstr "åé - ååååéåéæ %s"
 
-#: ../panels/power/cc-power-panel.c:282
-msgid "UPS discharging"
-msgstr "äæéççæåæé"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:241
+#, 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:300
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
-msgid "%s until charged (%.0lf%%)"
-msgstr "èéåååééæ %s (%.0lf%%)"
+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 "Charging"
+msgstr "åé"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:271
+msgid "Using battery power"
+msgstr "äçéæéå"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+msgid "Charging - fully charged"
+msgstr "åé - ååååé"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+msgid "Empty"
+msgstr "æé"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:306
+#: ../panels/power/cc-power-panel.c:347
 #, c-format
-msgid "%s until empty (%.0lf%%)"
-msgstr "èéååæééæ %s (%.0lf%%)"
+msgid "Caution low UPS, %s remaining"
+msgstr "ææ UPS éåäèïåä %s"
 
-#. TRANSLATORS: %1 is a percentage value. Note: this string is only
-#. * used when we don't have a time value
-#: ../panels/power/cc-power-panel.c:314
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:353
 #, c-format
-msgid "%.0lf%% charged"
-msgstr "ååé %.0lf%%"
+msgid "Using UPS power - %s remaining"
+msgstr "äç UPS éå - åä %s"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:371
+msgid "Caution low UPS"
+msgstr "ææ UPS éåäè"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:376
+msgid "Using UPS power"
+msgstr "äç UPS éå"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:428
+msgid "Your secondary battery is fully charged"
+msgstr "äççäéæååååé"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:432
+msgid "Your secondary battery is empty"
+msgstr "äççäéæåçæé"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:515
+msgid "Wireless mouse"
+msgstr "ççæé"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:519
+msgid "Wireless keyboard"
+msgstr "ççéç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:523
+msgid "Uninterruptible power supply"
+msgstr "äæéçç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:527
+msgid "Personal digital assistant"
+msgstr "åäæçåç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:531
+msgid "Cellphone"
+msgstr "ææ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:535
+msgid "Media player"
+msgstr "åéææå"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:539
+msgid "Tablet"
+msgstr "çåæ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:543
+msgid "Computer"
+msgstr "éè"
+
+#. TRANSLATORS: secondary battery, misc
+#: ../panels/power/cc-power-panel.c:547
+msgid "Battery"
+msgstr "éæ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:565
+msgid "Caution"
+msgstr "ææ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:575
+msgid "Good"
+msgstr "èå"
+
+#: ../panels/power/cc-power-panel.c:1081
+msgid "Tip:"
+msgstr "æçï"
+
+#: ../panels/power/cc-power-panel.c:1082
+msgid "Screen Settings"
+msgstr "èåèåå"
+
+#: ../panels/power/cc-power-panel.c:1083
+msgid "affect how much power is used"
+msgstr "åééååääç"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2182,7 +2305,7 @@ msgid "Power off"
 msgstr "éééæ"
 
 #: ../panels/power/power.ui.h:9
-msgid "Suspend when inactive for:"
+msgid "Suspend when inactive for"
 msgstr "çäæååäåæåï"
 
 #: ../panels/power/power.ui.h:10
@@ -2190,8 +2313,8 @@ msgid "When plugged in"
 msgstr "çæåéæçæ"
 
 #: ../panels/power/power.ui.h:11
-msgid "When power is _critically low:"
-msgstr "çéæçééæäæ(_C)ï"
+msgid "When power is _critically low"
+msgstr "çéæçééæäæ(_C)"
 
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:542
@@ -2381,18 +2504,18 @@ msgid "Time"
 msgstr "æå"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2047
+#: ../panels/printers/cc-printers-panel.c:2052
 msgid "Failed to add new printer."
 msgstr "çæååæçæåæã"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2251
-#: ../panels/printers/cc-printers-panel.c:2265
+#: ../panels/printers/cc-printers-panel.c:2256
+#: ../panels/printers/cc-printers-panel.c:2270
 msgid "Test page"
 msgstr "æèé"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2514
+#: ../panels/printers/cc-printers-panel.c:2519
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "çæèå uiï%s"
@@ -2427,63 +2550,63 @@ msgstr "åå(_A)"
 msgid "_Search by Address"
 msgstr "ææäåæå(_S)"
 
-#: ../panels/printers/pp-new-printer-dialog.c:665
+#: ../panels/printers/pp-new-printer-dialog.c:654
 msgid "Getting devices..."
 msgstr "æåååèçâ"
 
 #. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1277
+#: ../panels/printers/pp-new-printer-dialog.c:1254
 msgid "No local printers found"
 msgstr "æäåæåæåæ"
 
 #. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1290
+#: ../panels/printers/pp-new-printer-dialog.c:1267
 msgid "No network printers found"
 msgstr "æäåççæåæ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1382
+#: ../panels/printers/pp-new-printer-dialog.c:1359
 msgid ""
 "FirewallD is not running. Network printer detection needs services mdns, "
 "ipp, ipp-client and samba-client enabled on firewall."
 msgstr "FirewallD åæåèãççæåæçåæéèåéççäåç mdnsãippãipp-client å samba-client æåã"
 
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1410
-#: ../panels/printers/pp-new-printer-dialog.c:1415
+#: ../panels/printers/pp-new-printer-dialog.c:1387
+#: ../panels/printers/pp-new-printer-dialog.c:1392
 msgid "Devices"
 msgstr "èç"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1440
+#: ../panels/printers/pp-new-printer-dialog.c:1417
 msgctxt "printer type"
 msgid "Local"
 msgstr "ææ"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1442
+#: ../panels/printers/pp-new-printer-dialog.c:1419
 msgctxt "printer type"
 msgid "Network"
 msgstr "çç"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1483
+#: ../panels/printers/pp-new-printer-dialog.c:1460
 msgid "Device types"
 msgstr "èçéå"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1782
+#: ../panels/printers/pp-new-printer-dialog.c:1759
 msgid "Automatic configuration"
 msgstr "èåçæ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1865
+#: ../panels/printers/pp-new-printer-dialog.c:1842
 msgid "Opening firewall for mDNS connections"
 msgstr "éåéççç mDNS éç"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1874
+#: ../panels/printers/pp-new-printer-dialog.c:1851
 msgid "Opening firewall for Samba connections"
 msgstr "éåéççç Samba éç"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1883
+#: ../panels/printers/pp-new-printer-dialog.c:1860
 msgid "Opening firewall for IPP connections"
 msgstr "éåéççç IPP éç"
 
@@ -2784,10 +2907,6 @@ msgstr "æèäçèéçéçéé"
 msgid "Your settings"
 msgstr "äçèåå"
 
-#: ../panels/region/gnome-region-panel.ui.h:40
-msgid "_Options..."
-msgstr "éé(_O)â"
-
 #: ../panels/region/gnome-region-panel-xkblt.c:210
 msgid "Layout"
 msgstr "éç"
@@ -2916,7 +3035,7 @@ msgstr "æçç"
 msgid "Sonar"
 msgstr "èç"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1767
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
 msgid "Output"
 msgstr "èå"
 
@@ -2924,7 +3043,7 @@ msgstr "èå"
 msgid "Sound Output Volume"
 msgstr "éæèåéé"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
 msgid "Input"
 msgstr "èå"
 
@@ -2984,7 +3103,7 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "æçæå"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1621
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
 msgid "_Profile:"
 msgstr "èåçå(_P):"
 
@@ -3008,76 +3127,76 @@ msgstr[0] "%u èå"
 msgid "System Sounds"
 msgstr "ççéæ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:323
-#: ../panels/sound/gvc-mixer-dialog.c:634
+#: ../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:540
+#: ../panels/sound/gvc-mixer-dialog.c:541
 msgid "Peak detect"
 msgstr "ååææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1496
-#: ../panels/sound/gvc-mixer-dialog.c:1709
+#: ../panels/sound/gvc-mixer-dialog.c:1497
+#: ../panels/sound/gvc-mixer-dialog.c:1710
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "åç"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1563
+#: ../panels/sound/gvc-mixer-dialog.c:1564
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s çååæè"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-mixer-dialog.c:1623
 msgid "_Test Speakers"
 msgstr "æèåå(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1753
+#: ../panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Output volume:"
 msgstr "èåéé(_O)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1772
+#: ../panels/sound/gvc-mixer-dialog.c:1773
 msgid "C_hoose a device for sound output:"
 msgstr "éæèéèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1797
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1798
+#: ../panels/sound/gvc-mixer-dialog.c:1927
 msgid "Settings for the selected device:"
 msgstr "åéåèççèååï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1815
+#: ../panels/sound/gvc-mixer-dialog.c:1816
 msgid "_Input volume:"
 msgstr "èåéé(_I)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1838
+#: ../panels/sound/gvc-mixer-dialog.c:1839
 msgid "Input level:"
 msgstr "èåççï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1866
+#: ../panels/sound/gvc-mixer-dialog.c:1867
 msgid "C_hoose a device for sound input:"
 msgstr "éæèéèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1893
+#: ../panels/sound/gvc-mixer-dialog.c:1894
 msgid "Hardware"
 msgstr "çä"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1898
+#: ../panels/sound/gvc-mixer-dialog.c:1899
 msgid "C_hoose a device to configure:"
 msgstr "éæèèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1937
+#: ../panels/sound/gvc-mixer-dialog.c:1938
 msgid "Sound Effects"
 msgstr "èéææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1944
+#: ../panels/sound/gvc-mixer-dialog.c:1945
 msgid "_Alert volume:"
 msgstr "èçéé(_A)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1957
+#: ../panels/sound/gvc-mixer-dialog.c:1958
 msgid "Applications"
 msgstr "çåé"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1961
+#: ../panels/sound/gvc-mixer-dialog.c:1962
 msgid "No application is currently playing or recording audio."
 msgstr "æææççåçåæåæææéèéæã"
 
@@ -3118,20 +3237,20 @@ msgstr "æè"
 msgid "Subwoofer"
 msgstr "éäé"
 
-#: ../panels/sound/gvc-stream-status-icon.c:235
+#: ../panels/sound/gvc-stream-status-icon.c:236
 #, c-format
 msgid "Failed to start Sound Preferences: %s"
 msgstr "ååéæååèååæï%s"
 
-#: ../panels/sound/gvc-stream-status-icon.c:261
+#: ../panels/sound/gvc-stream-status-icon.c:262
 msgid "_Mute"
 msgstr "éé(_M)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:270
+#: ../panels/sound/gvc-stream-status-icon.c:271
 msgid "_Sound Preferences"
 msgstr "éæååèå(_S)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:415
+#: ../panels/sound/gvc-stream-status-icon.c:416
 msgid "Muted"
 msgstr "åéé"
 
@@ -3604,7 +3723,7 @@ msgid "_Username"
 msgstr "äçèåç(_U)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
-#: ../panels/user-accounts/um-fingerprint-dialog.c:571
+#: ../panels/user-accounts/um-fingerprint-dialog.c:706
 msgid "Enable Fingerprint Login"
 msgstr "åçæççå"
 
@@ -3869,47 +3988,47 @@ msgstr "äæçéè"
 msgid "Failed to create user"
 msgstr "åçäçèåæ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:107
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "ääèåèäçéåèçãèèçäçççççèã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:109
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "èèçåçåäçäã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:111
+#: ../panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "ççåéçéèã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:181
-#: ../panels/user-accounts/um-fingerprint-dialog.c:182
+#: ../panels/user-accounts/um-fingerprint-dialog.c:219
+#: ../panels/user-accounts/um-fingerprint-dialog.c:220
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:224
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "Delete registered fingerprints?"
 msgstr "æååéåèåçæçï"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:228
+#: ../panels/user-accounts/um-fingerprint-dialog.c:272
 msgid "_Delete Fingerprints"
 msgstr "åéæç(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:235
+#: ../panels/user-accounts/um-fingerprint-dialog.c:279
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "äçåèåéåèåçæçåïééääåæåçæççåã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:363
+#: ../panels/user-accounts/um-fingerprint-dialog.c:455
 msgid "Done!"
 msgstr "åæï"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:410
-#: ../panels/user-accounts/um-fingerprint-dialog.c:432
+#: ../panels/user-accounts/um-fingerprint-dialog.c:516
+#: ../panels/user-accounts/um-fingerprint-dialog.c:558
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "çæååã%sãèç"
@@ -3917,16 +4036,16 @@ msgstr "çæååã%sãèç"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:481
+#: ../panels/user-accounts/um-fingerprint-dialog.c:603
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "çæäçã%sãèçäçæçææ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:533
+#: ../panels/user-accounts/um-fingerprint-dialog.c:655
 msgid "Could not access any fingerprint readers"
 msgstr "çæååääæçèèå"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:534
+#: ../panels/user-accounts/um-fingerprint-dialog.c:656
 msgid "Please contact your system administrator for help."
 msgstr "èèçäçççççåäååã"
 
@@ -3935,22 +4054,22 @@ msgstr "èèçäçççççåäååã"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:605
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "èåçæççåïäéèäçã%sãèçååäçæçã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:612
+#: ../panels/user-accounts/um-fingerprint-dialog.c:747
 msgid "Selecting finger"
 msgstr "éæææ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:613
+#: ../panels/user-accounts/um-fingerprint-dialog.c:748
 msgid "Enrolling fingerprints"
 msgstr "çèæç"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:614
+#: ../panels/user-accounts/um-fingerprint-dialog.c:749
 msgid "Summary"
 msgstr "æè"
 
@@ -4045,77 +4164,77 @@ msgstr "çèæåçç..."
 msgid "Used by %s"
 msgstr "ç %s äç"
 
-#: ../panels/user-accounts/um-user-manager.c:450
+#: ../panels/user-accounts/um-user-manager.c:463
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "äã%sãçåçäçèåçååã"
 
-#: ../panels/user-accounts/um-user-manager.c:546
+#: ../panels/user-accounts/um-user-manager.c:569
 msgid "This user does not exist."
 msgstr "éåäçèäååã"
 
-#: ../panels/user-accounts/um-user-panel.c:358
+#: ../panels/user-accounts/um-user-panel.c:355
 msgid "Failed to delete user"
 msgstr "åéäçèåæ"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:415
 msgid "You cannot delete your own account."
 msgstr "ääèåéèåçåèã"
 
-#: ../panels/user-accounts/um-user-panel.c:427
+#: ../panels/user-accounts/um-user-panel.c:424
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s äåçåä"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:428
 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:440
+#: ../panels/user-accounts/um-user-panel.c:437
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "äæèäç %s çææåï"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:441
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "çåéäçèææåääçåçéãæééä(mail spool)åæåææçã"
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid "_Delete Files"
 msgstr "åéææ(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:445
 msgid "_Keep Files"
 msgstr "äçææ(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:500
+#: ../panels/user-accounts/um-user-panel.c:497
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "åèååç"
 
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/user-accounts/um-user-panel.c:505
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "åäæçåæèå"
 
-#: ../panels/user-accounts/um-user-panel.c:511
+#: ../panels/user-accounts/um-user-panel.c:508
 msgctxt "Password mode"
 msgid "None"
 msgstr "ææ"
 
-#: ../panels/user-accounts/um-user-panel.c:846
+#: ../panels/user-accounts/um-user-panel.c:843
 msgid "Failed to contact the accounts service"
 msgstr "çæéæåèæå"
 
-#: ../panels/user-accounts/um-user-panel.c:848
+#: ../panels/user-accounts/um-user-panel.c:845
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "èçå AccountService åçåèäåçã"
 
-#: ../panels/user-accounts/um-user-panel.c:888
+#: ../panels/user-accounts/um-user-panel.c:885
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4123,12 +4242,12 @@ msgstr ""
 "èéèææï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:926
+#: ../panels/user-accounts/um-user-panel.c:923
 msgid "Create a user account"
 msgstr "åçæçäçèåè"
 
-#: ../panels/user-accounts/um-user-panel.c:937
-#: ../panels/user-accounts/um-user-panel.c:1226
+#: ../panels/user-accounts/um-user-panel.c:934
+#: ../panels/user-accounts/um-user-panel.c:1223
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4136,12 +4255,12 @@ msgstr ""
 "èåçäçèåèï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:946
+#: ../panels/user-accounts/um-user-panel.c:943
 msgid "Delete the selected user account"
 msgstr "åééåçäçèåè"
 
-#: ../panels/user-accounts/um-user-panel.c:958
-#: ../panels/user-accounts/um-user-panel.c:1231
+#: ../panels/user-accounts/um-user-panel.c:955
+#: ../panels/user-accounts/um-user-panel.c:1228
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4149,11 +4268,11 @@ msgstr ""
 "èåééåçäçèåèï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:1135
+#: ../panels/user-accounts/um-user-panel.c:1132
 msgid "My Account"
 msgstr "æçåè"
 
-#: ../panels/user-accounts/um-user-panel.c:1145
+#: ../panels/user-accounts/um-user-panel.c:1142
 msgid "Other Accounts"
 msgstr "åäåè"
 
@@ -4209,38 +4328,42 @@ msgid "Calibrate..."
 msgstr "ææâ"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:4
+msgid "Display Mapping..."
+msgstr "éçåæâ"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "Left-Handed Orientation"
 msgstr "åææå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: ../panels/wacom/gnome-wacom-properties.ui.h:6
 msgid "Map Buttons..."
 msgstr "æåæéâ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: ../panels/wacom/gnome-wacom-properties.ui.h:7
 msgid "No tablet detected"
 msgstr "æåæåçåæ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: ../panels/wacom/gnome-wacom-properties.ui.h:8
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "èæåæéåäç Wacom çåæ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
 msgid "Tablet (absolute)"
 msgstr "çåæ (çåäç)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Tablet Preferences"
 msgstr "çåæååèå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Touchpad (relative)"
 msgstr "èææ (çåäç)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
 msgid "Tracking Mode"
 msgstr "èèæå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Wacom Tablet"
 msgstr "Wacom çåæ"
 
@@ -4312,6 +4435,79 @@ msgstr "ééååææ"
 msgid "Top Button"
 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:882
+#, fuzzy, c-format
+msgid "Left Ring Mode #%d"
+msgstr "åæçåæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:889
+#, fuzzy, c-format
+msgid "Right Ring Mode #%d"
+msgstr "åæçåæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:917
+#, fuzzy, c-format
+msgid "Left Touchstrip Mode #%d"
+msgstr "åæåèåæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:924
+#, fuzzy, c-format
+msgid "Right Touchstrip Mode #%d"
+msgstr "åæåèåæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:939
+#, fuzzy, c-format
+msgid "Left Touchring Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:941
+#, fuzzy, c-format
+msgid "Right Touchring Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:944
+#, fuzzy, c-format
+msgid "Left Touchstrip Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:946
+#, fuzzy, c-format
+msgid "Right Touchstrip Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:951
+#, fuzzy, c-format
+msgid "Mode Switch #%d"
+msgstr "mode switch"
+
+#: ../panels/wacom/gsd-wacom-device.c:1023
+#, fuzzy, c-format
+msgid "Left Button #%d"
+msgstr "æéåééæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:1026
+#, fuzzy, c-format
+msgid "Right Button #%d"
+msgstr "æéåééæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:1029
+#, fuzzy, c-format
+msgid "Top Button #%d"
+msgstr "éçæé"
+
+#: ../panels/wacom/gsd-wacom-device.c:1032
+#, fuzzy, c-format
+msgid "Bottom Button #%d"
+msgstr "æé"
+
 #. Text printed on screen
 #: ../panels/wacom/calibrator/gui_gtk.c:70
 msgid "Screen Calibration"
@@ -4333,31 +4529,36 @@ msgid "%d of %d"
 msgstr "%d / %d"
 
 #: ../panels/wacom/cc-wacom-stylus-page.c:374
+#: ../panels/wacom/cc-wacom-page.c:457
 msgid "Button"
 msgstr "æé"
 
-#: ../shell/control-center.c:54
+#: ../panels/wacom/cc-wacom-page.c:581
+msgid "Display Mapping"
+msgstr "éçåæ"
+
+#: ../shell/control-center.c:58
 msgid "Enable verbose mode"
 msgstr "åçèçæå"
 
-#: ../shell/control-center.c:55
+#: ../shell/control-center.c:59
 msgid "Show the overview"
 msgstr "éçæè"
 
-#: ../shell/control-center.c:56 ../shell/control-center.c:57
-#: ../shell/control-center.c:58
+#: ../shell/control-center.c:60 ../shell/control-center.c:61
+#: ../shell/control-center.c:62
 msgid "Show help options"
 msgstr "éçèæçéé"
 
-#: ../shell/control-center.c:59
+#: ../shell/control-center.c:63
 msgid "Panel to display"
 msgstr "èéççéæ"
 
-#: ../shell/control-center.c:81
+#: ../shell/control-center.c:85
 msgid "- System Settings"
 msgstr "- ççèåå"
 
-#: ../shell/control-center.c:89
+#: ../shell/control-center.c:93
 #, c-format
 msgid ""
 "%s\n"
@@ -4370,10 +4571,32 @@ msgstr ""
 msgid "Control Center"
 msgstr "æåäå"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:2
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Preferences;Settings;"
+msgstr "Preferences;Settings;ååèå;èåå;"
+
+#: ../shell/gnome-control-center.desktop.in.in.h:2 ../shell/shell.ui.h:2
 msgid "System Settings"
 msgstr "ççèåå"
 
 #: ../shell/shell.ui.h:1
 msgid "All Settings"
 msgstr "ææèåå"
+
+#~ msgid "Battery discharging"
+#~ msgstr "éææåæé"
+
+#~ msgid "UPS discharging"
+#~ msgstr "äæéççæåæé"
+
+#~ msgid "%s until charged (%.0lf%%)"
+#~ msgstr "èéåååééæ %s (%.0lf%%)"
+
+#~ msgid "%s until empty (%.0lf%%)"
+#~ msgstr "èéååæééæ %s (%.0lf%%)"
+
+#~ msgid "%.0lf%% charged"
+#~ msgstr "ååé %.0lf%%"
+
+#~ msgid "Unlock"
+#~ msgstr "èé"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 58dfb5c..61111c4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center 3.3.3\n"
+"Project-Id-Version: gnome-control-center 3.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:23+0800\n"
-"PO-Revision-Date: 2012-01-29 10:54+0800\n"
+"POT-Creation-Date: 2012-02-18 08:42+0800\n"
+"PO-Revision-Date: 2012-02-17 22:02+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: \n"
@@ -178,7 +178,7 @@ msgctxt "Power"
 msgid "Bluetooth"
 msgstr "èç"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/network/network.ui.h:22
+#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/network/network.ui.h:23
 msgid "Remove Device"
 msgstr "çéèç"
 
@@ -323,142 +323,142 @@ msgid "Available Profiles"
 msgstr "åççæèæ"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:794
-#: ../panels/sound/gvc-mixer-dialog.c:1515
+#: ../panels/color/cc-color-panel.c:806
+#: ../panels/sound/gvc-mixer-dialog.c:1516
 msgid "Device"
 msgstr "èç"
 
 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:829
+#: ../panels/color/cc-color-panel.c:841
 msgid "Calibration"
 msgstr "ææ"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:861
+#: ../panels/color/cc-color-panel.c:873
 msgid "Create a color profile for the selected device"
 msgstr "çåéåèçåçèåæèæ"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:875 ../panels/color/cc-color-panel.c:899
+#: ../panels/color/cc-color-panel.c:887 ../panels/color/cc-color-panel.c:911
 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:908
+#: ../panels/color/cc-color-panel.c:920
 msgid "The measuring instrument does not support printer profiling."
 msgstr "æéååäææåèæçåæã"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:919
+#: ../panels/color/cc-color-panel.c:931
 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:992
+#: ../panels/color/cc-color-panel.c:1004
 msgid "Cannot remove automatically added profile"
 msgstr "äèçéèåååçèåçå"
 
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1327
+#: ../panels/color/cc-color-panel.c:1339
 msgid "No profile"
 msgstr "ææèåçå"
 
-#: ../panels/color/cc-color-panel.c:1358
+#: ../panels/color/cc-color-panel.c:1370
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i å"
 
-#: ../panels/color/cc-color-panel.c:1369
+#: ../panels/color/cc-color-panel.c:1381
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i åæ"
 
-#: ../panels/color/cc-color-panel.c:1380
+#: ../panels/color/cc-color-panel.c:1392
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i é"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1387
+#: ../panels/color/cc-color-panel.c:1399
 #, c-format
 msgid "Less than 1 week"
 msgstr "åæ 1 é"
 
-#: ../panels/color/cc-color-panel.c:1449
+#: ../panels/color/cc-color-panel.c:1461
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "éè RGB"
 
-#: ../panels/color/cc-color-panel.c:1454
+#: ../panels/color/cc-color-panel.c:1466
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "éè CMYK"
 
-#: ../panels/color/cc-color-panel.c:1459
+#: ../panels/color/cc-color-panel.c:1471
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "éèçé"
 
-#: ../panels/color/cc-color-panel.c:1577 ../panels/color/cc-color-panel.c:1609
-#: ../panels/color/cc-color-panel.c:1620 ../panels/color/cc-color-panel.c:1631
+#: ../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
 msgid "Uncalibrated"
 msgstr "æçææ"
 
-#: ../panels/color/cc-color-panel.c:1580
+#: ../panels/color/cc-color-panel.c:1592
 msgid "This device is not color managed."
 msgstr "éåèçæåéèççã"
 
-#: ../panels/color/cc-color-panel.c:1612
+#: ../panels/color/cc-color-panel.c:1633
 msgid "This device is using manufacturing calibrated data."
 msgstr "éåèçæäçèéåçææèæã"
 
-#: ../panels/color/cc-color-panel.c:1623
+#: ../panels/color/cc-color-panel.c:1644
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
 msgstr "éåèçææéçæåèåéèææçæèæã"
 
-#: ../panels/color/cc-color-panel.c:1656
+#: ../panels/color/cc-color-panel.c:1677
 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:1684
+#: ../panels/color/cc-color-panel.c:1705
 msgid "Not specified"
 msgstr "åææå"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1868
+#: ../panels/color/cc-color-panel.c:1889
 msgid "No devices supporting color management detected"
 msgstr "åæäåææéèçççèç"
 
-#: ../panels/color/cc-color-panel.c:2097
+#: ../panels/color/cc-color-panel.c:2118
 msgctxt "Device kind"
 msgid "Display"
 msgstr "éçå"
 
-#: ../panels/color/cc-color-panel.c:2099
+#: ../panels/color/cc-color-panel.c:2120
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "ææå"
 
-#: ../panels/color/cc-color-panel.c:2101
+#: ../panels/color/cc-color-panel.c:2122
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "åèæ"
 
-#: ../panels/color/cc-color-panel.c:2103
+#: ../panels/color/cc-color-panel.c:2124
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "ççæ"
 
-#: ../panels/color/cc-color-panel.c:2105
+#: ../panels/color/cc-color-panel.c:2126
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "çèæåæ"
@@ -612,7 +612,7 @@ msgstr "éæèè"
 
 #: ../panels/common/language-chooser.ui.h:2
 #: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:449
+#: ../panels/user-accounts/um-user-panel.c:446
 msgid "_Cancel"
 msgstr "åæ(_C)"
 
@@ -863,34 +863,34 @@ msgstr ""
 "æç;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:401
 #, c-format
 msgid "VESA: %s"
 msgstr "VESAï%s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:79
+#: ../panels/info/cc-info-panel.c:425 ../panels/network/panel-common.c:79
 #: ../panels/network/panel-common.c:158
 msgid "Unknown"
 msgstr "äæ"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:586
 #, c-format
 msgid "%d-bit"
 msgstr "%d-äå"
 
-#: ../panels/info/cc-info-panel.c:744
+#: ../panels/info/cc-info-panel.c:743
 msgid "Unknown model"
 msgstr "äæçåè"
 
-#: ../panels/info/cc-info-panel.c:827
+#: ../panels/info/cc-info-panel.c:826
 msgid "The next login will attempt to use the standard experience."
 msgstr "äæçåæåèäçææééã"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:828
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -898,47 +898,47 @@ 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:871
+#: ../panels/info/cc-info-panel.c:870
 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:877
+#: ../panels/info/cc-info-panel.c:876
 msgctxt "Experience"
 msgid "Standard"
 msgstr "ææ"
 
-#: ../panels/info/cc-info-panel.c:1200
+#: ../panels/info/cc-info-panel.c:1199
 msgid "Ask what to do"
 msgstr "èåèåäé"
 
-#: ../panels/info/cc-info-panel.c:1204
+#: ../panels/info/cc-info-panel.c:1203
 msgid "Do nothing"
 msgstr "äåäää"
 
-#: ../panels/info/cc-info-panel.c:1208
+#: ../panels/info/cc-info-panel.c:1207
 msgid "Open folder"
 msgstr "éåèæå"
 
-#: ../panels/info/cc-info-panel.c:1319
+#: ../panels/info/cc-info-panel.c:1318
 msgid "Select an application for audio CDs"
 msgstr "éæææéæ CD çæççå"
 
-#: ../panels/info/cc-info-panel.c:1320
+#: ../panels/info/cc-info-panel.c:1319
 msgid "Select an application for video DVDs"
 msgstr "éæææåç DVD çæççå"
 
-#: ../panels/info/cc-info-panel.c:1321
+#: ../panels/info/cc-info-panel.c:1320
 msgid "Select an application to run when a music player is connected"
 msgstr "éæçéæææåéææèåèçæççå"
 
-#: ../panels/info/cc-info-panel.c:1322
+#: ../panels/info/cc-info-panel.c:1321
 msgid "Select an application to run when a camera is connected"
 msgstr "éæçæåæéææèåèçæççå"
 
-#: ../panels/info/cc-info-panel.c:1323
+#: ../panels/info/cc-info-panel.c:1322
 msgid "Select an application for software CDs"
 msgstr "éæèé CD èççæççå"
 
@@ -947,85 +947,85 @@ msgstr "éæèé CD èççæççå"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1335
+#: ../panels/info/cc-info-panel.c:1334
 msgid "audio DVD"
 msgstr "éæ DVD"
 
-#: ../panels/info/cc-info-panel.c:1336
+#: ../panels/info/cc-info-panel.c:1335
 msgid "blank Blu-ray disc"
 msgstr "çç Blu-ray åç"
 
-#: ../panels/info/cc-info-panel.c:1337
+#: ../panels/info/cc-info-panel.c:1336
 msgid "blank CD disc"
 msgstr "çç CD åç"
 
-#: ../panels/info/cc-info-panel.c:1338
+#: ../panels/info/cc-info-panel.c:1337
 msgid "blank DVD disc"
 msgstr "çç DVD åç"
 
-#: ../panels/info/cc-info-panel.c:1339
+#: ../panels/info/cc-info-panel.c:1338
 msgid "blank HD DVD disc"
 msgstr "çç HD DVD åç"
 
-#: ../panels/info/cc-info-panel.c:1340
+#: ../panels/info/cc-info-panel.c:1339
 msgid "Blu-ray video disc"
 msgstr "Blu-Ray åçåç"
 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1340
 msgid "e-book reader"
 msgstr "éåæéèå"
 
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1341
 msgid "HD DVD video disc"
 msgstr "HD DVD åçåç"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1342
 msgid "Picture CD"
 msgstr "çç CD"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1343
 msgid "Super Video CD"
 msgstr "SVCD"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1344
 msgid "Video CD"
 msgstr "åç CD"
 
-#: ../panels/info/cc-info-panel.c:1474
-#: ../panels/keyboard/keyboard-shortcuts.c:1627
+#: ../panels/info/cc-info-panel.c:1473
+#: ../panels/keyboard/keyboard-shortcuts.c:1617
 msgid "Section"
 msgstr "ç"
 
-#: ../panels/info/cc-info-panel.c:1483 ../panels/info/info.ui.h:15
+#: ../panels/info/cc-info-panel.c:1482 ../panels/info/info.ui.h:15
 msgid "Overview"
 msgstr "æè"
 
-#: ../panels/info/cc-info-panel.c:1489 ../panels/info/info.ui.h:4
+#: ../panels/info/cc-info-panel.c:1488 ../panels/info/info.ui.h:4
 msgid "Default Applications"
 msgstr "éèæççå"
 
-#: ../panels/info/cc-info-panel.c:1494 ../panels/info/info.ui.h:17
+#: ../panels/info/cc-info-panel.c:1493 ../panels/info/info.ui.h:17
 msgid "Removable Media"
 msgstr "åçéååé"
 
-#: ../panels/info/cc-info-panel.c:1499 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1498 ../panels/info/info.ui.h:11
 msgid "Graphics"
 msgstr "çå"
 
-#: ../panels/info/cc-info-panel.c:1701
+#: ../panels/info/cc-info-panel.c:1700
 #, c-format
 msgid "Version %s"
 msgstr "çæ %s"
 
-#: ../panels/info/cc-info-panel.c:1751
+#: ../panels/info/cc-info-panel.c:1750
 msgid "Install Updates"
 msgstr "åèææ"
 
-#: ../panels/info/cc-info-panel.c:1755
+#: ../panels/info/cc-info-panel.c:1754
 msgid "System Up-To-Date"
 msgstr "ççåæææ"
 
-#: ../panels/info/cc-info-panel.c:1759
+#: ../panels/info/cc-info-panel.c:1758
 msgid "Checking for Updates"
 msgstr "æåææææ"
 
@@ -1394,6 +1394,7 @@ msgid "Slow"
 msgstr "æé"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
+#: ../panels/wacom/button-mapping.ui.h:3
 msgid ""
 "To edit a shortcut, click the row and hold down the new keys or press "
 "Backspace to clear."
@@ -1420,8 +1421,8 @@ msgstr "éå(_S)ï"
 #: ../panels/keyboard/keyboard-shortcuts.c:555
 #: ../panels/keyboard/keyboard-shortcuts.c:563
 #: ../panels/keyboard/keyboard-shortcuts.c:882
-#: ../panels/keyboard/keyboard-shortcuts.c:1383
-#: ../panels/keyboard/keyboard-shortcuts.c:1387
+#: ../panels/keyboard/keyboard-shortcuts.c:1373
+#: ../panels/keyboard/keyboard-shortcuts.c:1377
 msgid "Custom Shortcuts"
 msgstr "èèæåé"
 
@@ -1431,14 +1432,14 @@ msgstr "<èåèåäè>"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1064
+#: ../panels/keyboard/keyboard-shortcuts.c:1054
 #: ../panels/sound/gvc-mixer-control.c:1087
-#: ../panels/user-accounts/um-fingerprint-dialog.c:177
-#: ../panels/user-accounts/um-fingerprint-dialog.c:178
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
 msgid "Disabled"
 msgstr "ååç"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1205
+#: ../panels/keyboard/keyboard-shortcuts.c:1195
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1448,7 +1449,7 @@ msgstr ""
 "æåâ%sâçæäçïååææçææäææéã\n"
 "èèçååçæéïååæäç ControlïAlt  æ Shiftã"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1237
+#: ../panels/keyboard/keyboard-shortcuts.c:1227
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1457,21 +1458,22 @@ msgstr ""
 "æåéâ%sâåçäçæï\n"
 "â%sâ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1242
+#: ../panels/keyboard/keyboard-shortcuts.c:1232
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "åææéææææåéçã%sãïã%sãçæåéåæåçã"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1248
+#: ../panels/keyboard/keyboard-shortcuts.c:1238
 msgid "_Reassign"
 msgstr "éæææ(_R)"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1676
+#: ../panels/keyboard/keyboard-shortcuts.c:1666
+#: ../panels/wacom/cc-wacom-page.c:478
 msgid "Action"
 msgstr "åä"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1699
+#: ../panels/keyboard/keyboard-shortcuts.c:1688
 msgid "Shortcut"
 msgstr "æåé"
 
@@ -1538,7 +1540,9 @@ msgid "Large"
 msgstr "å"
 
 #. low sensitivity
+#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/power/cc-power-panel.c:570
 msgid "Low"
 msgstr "ä"
 
@@ -1669,71 +1673,82 @@ msgstr "çé"
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/cc-network-panel.c:2014 ../panels/network/network.ui.h:17
+#: ../panels/network/cc-network-panel.c:2018 ../panels/network/network.ui.h:18
 msgid "IPv4 Address"
 msgstr "IPv4 äå"
 
-#: ../panels/network/cc-network-panel.c:2015 ../panels/network/network.ui.h:18
+#: ../panels/network/cc-network-panel.c:2019 ../panels/network/network.ui.h:19
 msgid "IPv6 Address"
 msgstr "IPv6 äå"
 
-#: ../panels/network/cc-network-panel.c:2018
-#: ../panels/network/cc-network-panel.c:2021 ../panels/network/network.ui.h:16
+#: ../panels/network/cc-network-panel.c:2022
+#: ../panels/network/cc-network-panel.c:2025 ../panels/network/network.ui.h:17
 #: ../panels/printers/printers.ui.h:9
 msgid "IP Address"
 msgstr "IP äå"
 
-#: ../panels/network/cc-network-panel.c:2068
-#: ../panels/network/cc-network-panel.c:2443
+#: ../panels/network/cc-network-panel.c:2072
+#: ../panels/network/cc-network-panel.c:2447
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:2176
+#: ../panels/network/cc-network-panel.c:2180
 msgid "Proxy"
 msgstr "äçäæå"
 
-#: ../panels/network/cc-network-panel.c:2250
+#: ../panels/network/cc-network-panel.c:2254
 msgid "Network proxy"
 msgstr "çèäçäæå"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2510
+#: ../panels/network/cc-network-panel.c:2514
 msgid "The system network services are not compatible with this version."
 msgstr "çççèæåèéåçæäçåã"
 
-#: ../panels/network/cc-network-panel.c:3125
+#: ../panels/network/cc-network-panel.c:2712
+#, c-format
+msgid ""
+"Network details for %s including password and any custom configuration will "
+"be lost"
+msgstr "%s ççèèçèæåååçåääèèççæéææå"
+
+#: ../panels/network/cc-network-panel.c:2722
+msgid "Forget"
+msgstr "éå"
+
+#: ../panels/network/cc-network-panel.c:3221
 msgid "Not connected to the internet."
 msgstr "ææéçåçéçèã"
 
-#: ../panels/network/cc-network-panel.c:3126
+#: ../panels/network/cc-network-panel.c:3222
 msgid "Create the hotspot anyway?"
 msgstr "æååååççéï"
 
-#: ../panels/network/cc-network-panel.c:3144
+#: ../panels/network/cc-network-panel.c:3240
 #, c-format
 msgid "Disconnect from %s and create a new hotspot?"
 msgstr "æåå %s äæéçäåçæççéï"
 
-#: ../panels/network/cc-network-panel.c:3147
+#: ../panels/network/cc-network-panel.c:3243
 msgid "This is your only connection to the internet."
 msgstr "éææéæçéçèçåäéçã"
 
-#: ../panels/network/cc-network-panel.c:3165
+#: ../panels/network/cc-network-panel.c:3261
 msgid "Create _Hotspot"
 msgstr "åççé(_H)"
 
-#: ../panels/network/cc-network-panel.c:3225
+#: ../panels/network/cc-network-panel.c:3321
 msgid "Stop hotspot and disconnect any users?"
 msgstr "åæçéääæäääçèçéçï"
 
-#: ../panels/network/cc-network-panel.c:3228
+#: ../panels/network/cc-network-panel.c:3324
 msgid "_Stop Hotspot"
 msgstr "åæçé(_S)"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:3246
+#: ../panels/network/cc-network-panel.c:3342
 msgid "Airplane Mode"
 msgstr "éåæå"
 
@@ -1779,73 +1794,73 @@ msgid "FTP Port"
 msgstr "FTP éæå"
 
 #: ../panels/network/network.ui.h:8
+msgid "Forget Network"
+msgstr "éåçè"
+
+#: ../panels/network/network.ui.h:9
 msgid "Gateway"
 msgstr "éèé"
 
-#: ../panels/network/network.ui.h:9
+#: ../panels/network/network.ui.h:10
 msgid "Group Name"
 msgstr "ççåç"
 
-#: ../panels/network/network.ui.h:10
+#: ../panels/network/network.ui.h:11
 msgid "Group Password"
 msgstr "ççåç"
 
-#: ../panels/network/network.ui.h:11
+#: ../panels/network/network.ui.h:12
 msgid "HTTP Port"
 msgstr "HTTP éæå"
 
-#: ../panels/network/network.ui.h:12
+#: ../panels/network/network.ui.h:13
 msgid "HTTPS Port"
 msgstr "HTTPS éæå"
 
-#: ../panels/network/network.ui.h:13
+#: ../panels/network/network.ui.h:14
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS äçäæå"
 
-#: ../panels/network/network.ui.h:14
+#: ../panels/network/network.ui.h:15
 msgid "Hardware Address"
 msgstr "çéäå"
 
-#: ../panels/network/network.ui.h:15
+#: ../panels/network/network.ui.h:16
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:19
+#: ../panels/network/network.ui.h:20
 msgid "Interface"
 msgstr "äé"
 
-#: ../panels/network/network.ui.h:20
+#: ../panels/network/network.ui.h:21
 msgid "Network Name"
 msgstr "çèåç"
 
-#: ../panels/network/network.ui.h:21
+#: ../panels/network/network.ui.h:22
 msgid "Provider"
 msgstr "äæå"
 
-#: ../panels/network/network.ui.h:23
+#: ../panels/network/network.ui.h:24
 msgid "Security"
 msgstr "ååæ"
 
-#: ../panels/network/network.ui.h:24
+#: ../panels/network/network.ui.h:25
 msgid "Security Key"
 msgstr "ååéé"
 
-#: ../panels/network/network.ui.h:25
+#: ../panels/network/network.ui.h:26
 msgid "Select the interface to use for the new service"
 msgstr "éæèçæææåçäé"
 
-#: ../panels/network/network.ui.h:26
+#: ../panels/network/network.ui.h:27
 msgid "Socks Port"
 msgstr "Socks éæå"
 
-#: ../panels/network/network.ui.h:27
+#: ../panels/network/network.ui.h:28
 msgid "Subnet Mask"
 msgstr "åçèéç"
 
-#: ../panels/network/network.ui.h:28
-msgid "Unlock"
-msgstr "èé"
-
 #: ../panels/network/network.ui.h:29
 msgid "Username"
 msgstr "äçèåç"
@@ -1883,28 +1898,33 @@ msgid "_Network Name"
 msgstr "çèåç(_N)"
 
 #: ../panels/network/network.ui.h:38
+#: ../panels/region/gnome-region-panel.ui.h:40
+msgid "_Options..."
+msgstr "éé(_O)â"
+
+#: ../panels/network/network.ui.h:39
 msgid "_Socks Host"
 msgstr "Socks äæ(_S)"
 
-#: ../panels/network/network.ui.h:39
+#: ../panels/network/network.ui.h:40
 msgid "_Stop Hotspot..."
 msgstr "åæçé(_S)â"
 
-#: ../panels/network/network.ui.h:40
+#: ../panels/network/network.ui.h:41
 msgid "_Use as Hotspot..."
 msgstr "åççé(_U)â"
 
-#: ../panels/network/network.ui.h:41
+#: ../panels/network/network.ui.h:42
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "èå"
 
-#: ../panels/network/network.ui.h:42
+#: ../panels/network/network.ui.h:43
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "æå"
 
-#: ../panels/network/network.ui.h:43
+#: ../panels/network/network.ui.h:44
 msgctxt "proxy method"
 msgid "None"
 msgstr "ææ"
@@ -2034,27 +2054,27 @@ msgstr "èååæçåèïèåéæåèéå"
 msgid "Account Type:"
 msgstr "åèéåï"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:502
+#: ../panels/online-accounts/cc-online-accounts-panel.c:497
 msgid "_Add..."
 msgstr "åå(_A)â"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:555
+#: ../panels/online-accounts/cc-online-accounts-panel.c:550
 msgid "Error creating account"
 msgstr "åçåèæççéè"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:589
+#: ../panels/online-accounts/cc-online-accounts-panel.c:584
 msgid "Error removing account"
 msgstr "çéåèæççéè"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:625
+#: ../panels/online-accounts/cc-online-accounts-panel.c:620
 msgid "Are you sure you want to remove the account?"
 msgstr "çåèåééååèï"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:627
+#: ../panels/online-accounts/cc-online-accounts-panel.c:622
 msgid "This will not remove the account on the server."
 msgstr "éäæçéäæåäçåèã"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:628
+#: ../panels/online-accounts/cc-online-accounts-panel.c:623
 msgid "_Remove"
 msgstr "çé(_R)"
 
@@ -2081,17 +2101,17 @@ msgstr "çéåè"
 msgid "Select an account"
 msgstr "éæäååè"
 
-#: ../panels/power/cc-power-panel.c:160
+#: ../panels/power/cc-power-panel.c:162
 msgid "Unknown time"
 msgstr "æççæé"
 
-#: ../panels/power/cc-power-panel.c:166
+#: ../panels/power/cc-power-panel.c:168
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i åé"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2099,55 +2119,158 @@ msgstr[0] "%i åæ"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:186
+#: ../panels/power/cc-power-panel.c:188
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:189
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "åæ"
 
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "åé"
 
-#: ../panels/power/cc-power-panel.c:265
-msgid "Battery charging"
-msgstr "éææååé"
-
-#: ../panels/power/cc-power-panel.c:268
-msgid "Battery discharging"
-msgstr "éææåæé"
-
-#: ../panels/power/cc-power-panel.c:279
-msgid "UPS charging"
-msgstr "äæéççæååé"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:233
+#, c-format
+msgid "Charging - %s until fully charged"
+msgstr "åé - ååååéåéæ %s"
 
-#: ../panels/power/cc-power-panel.c:282
-msgid "UPS discharging"
-msgstr "äæéççæåæé"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:241
+#, 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:300
+#: ../panels/power/cc-power-panel.c:249
 #, c-format
-msgid "%s until charged (%.0lf%%)"
-msgstr "èéåååééæ %s (%.0lf%%)"
+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 "Charging"
+msgstr "åé"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:271
+msgid "Using battery power"
+msgstr "äçéæéå"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+msgid "Charging - fully charged"
+msgstr "åé - ååååé"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+msgid "Empty"
+msgstr "æé"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:306
+#: ../panels/power/cc-power-panel.c:347
 #, c-format
-msgid "%s until empty (%.0lf%%)"
-msgstr "èéååæééæ %s (%.0lf%%)"
+msgid "Caution low UPS, %s remaining"
+msgstr "ææ UPS éåäèïåä %s"
 
-#. TRANSLATORS: %1 is a percentage value. Note: this string is only
-#. * used when we don't have a time value
-#: ../panels/power/cc-power-panel.c:314
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:353
 #, c-format
-msgid "%.0lf%% charged"
-msgstr "ååé %.0lf%%"
+msgid "Using UPS power - %s remaining"
+msgstr "äç UPS éå - åä %s"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:371
+msgid "Caution low UPS"
+msgstr "ææ UPS éåäè"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:376
+msgid "Using UPS power"
+msgstr "äç UPS éå"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:428
+msgid "Your secondary battery is fully charged"
+msgstr "æççäéæååååé"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:432
+msgid "Your secondary battery is empty"
+msgstr "æççäéæåçæé"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:515
+msgid "Wireless mouse"
+msgstr "ççæé"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:519
+msgid "Wireless keyboard"
+msgstr "ççéç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:523
+msgid "Uninterruptible power supply"
+msgstr "äæéçç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:527
+msgid "Personal digital assistant"
+msgstr "åäæäåç"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:531
+msgid "Cellphone"
+msgstr "ææ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:535
+msgid "Media player"
+msgstr "åéææå"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:539
+msgid "Tablet"
+msgstr "çåæ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:543
+msgid "Computer"
+msgstr "éè"
+
+#. TRANSLATORS: secondary battery, misc
+#: ../panels/power/cc-power-panel.c:547
+msgid "Battery"
+msgstr "éæ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:565
+msgid "Caution"
+msgstr "ææ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:575
+msgid "Good"
+msgstr "èå"
+
+#: ../panels/power/cc-power-panel.c:1081
+msgid "Tip:"
+msgstr "æçï"
+
+#: ../panels/power/cc-power-panel.c:1082
+msgid "Screen Settings"
+msgstr "èåèåå"
+
+#: ../panels/power/cc-power-panel.c:1083
+msgid "affect how much power is used"
+msgstr "åééååääç"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2195,7 +2318,7 @@ msgid "Power off"
 msgstr "éééæ"
 
 #: ../panels/power/power.ui.h:9
-msgid "Suspend when inactive for:"
+msgid "Suspend when inactive for"
 msgstr "çäæååäåæåï"
 
 #: ../panels/power/power.ui.h:10
@@ -2203,8 +2326,8 @@ msgid "When plugged in"
 msgstr "çæåéæçæ"
 
 #: ../panels/power/power.ui.h:11
-msgid "When power is _critically low:"
-msgstr "çéæçééæäæ(_C)ï"
+msgid "When power is _critically low"
+msgstr "çéæçééæäæ(_C)"
 
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:542
@@ -2394,18 +2517,18 @@ msgid "Time"
 msgstr "æå"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2047
+#: ../panels/printers/cc-printers-panel.c:2052
 msgid "Failed to add new printer."
 msgstr "çæååæçåèæã"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2251
-#: ../panels/printers/cc-printers-panel.c:2265
+#: ../panels/printers/cc-printers-panel.c:2256
+#: ../panels/printers/cc-printers-panel.c:2270
 msgid "Test page"
 msgstr "æèé"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2514
+#: ../panels/printers/cc-printers-panel.c:2519
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "çæèå uiï%s"
@@ -2440,21 +2563,21 @@ msgstr "åå(_A)"
 msgid "_Search by Address"
 msgstr "ääåæå(_S)"
 
-#: ../panels/printers/pp-new-printer-dialog.c:665
+#: ../panels/printers/pp-new-printer-dialog.c:654
 msgid "Getting devices..."
 msgstr "æåååèçâ"
 
 #. Translators: No localy connected printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1277
+#: ../panels/printers/pp-new-printer-dialog.c:1254
 msgid "No local printers found"
 msgstr "æäåæååèæ"
 
 #. Translators: No network printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1290
+#: ../panels/printers/pp-new-printer-dialog.c:1267
 msgid "No network printers found"
 msgstr "æäåçèåèæ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1382
+#: ../panels/printers/pp-new-printer-dialog.c:1359
 msgid ""
 "FirewallD is not running. Network printer detection needs services mdns, "
 "ipp, ipp-client and samba-client enabled on firewall."
@@ -2463,42 +2586,42 @@ msgstr ""
 "å samba-client æåã"
 
 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:1410
-#: ../panels/printers/pp-new-printer-dialog.c:1415
+#: ../panels/printers/pp-new-printer-dialog.c:1387
+#: ../panels/printers/pp-new-printer-dialog.c:1392
 msgid "Devices"
 msgstr "èç"
 
 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:1440
+#: ../panels/printers/pp-new-printer-dialog.c:1417
 msgctxt "printer type"
 msgid "Local"
 msgstr "ææ"
 
 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:1442
+#: ../panels/printers/pp-new-printer-dialog.c:1419
 msgctxt "printer type"
 msgid "Network"
 msgstr "çè"
 
 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:1483
+#: ../panels/printers/pp-new-printer-dialog.c:1460
 msgid "Device types"
 msgstr "èçéå"
 
 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1782
+#: ../panels/printers/pp-new-printer-dialog.c:1759
 msgid "Automatic configuration"
 msgstr "èåçæ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1865
+#: ../panels/printers/pp-new-printer-dialog.c:1842
 msgid "Opening firewall for mDNS connections"
 msgstr "éåéççç mDNS éç"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1874
+#: ../panels/printers/pp-new-printer-dialog.c:1851
 msgid "Opening firewall for Samba connections"
 msgstr "éåéççç Samba éç"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1883
+#: ../panels/printers/pp-new-printer-dialog.c:1860
 msgid "Opening firewall for IPP connections"
 msgstr "éåéççç IPP éç"
 
@@ -2801,10 +2924,6 @@ msgstr "æèäçèéçéçéé"
 msgid "Your settings"
 msgstr "æçèåå"
 
-#: ../panels/region/gnome-region-panel.ui.h:40
-msgid "_Options..."
-msgstr "éé(_O)â"
-
 #: ../panels/region/gnome-region-panel-xkblt.c:210
 msgid "Layout"
 msgstr "éç"
@@ -2935,7 +3054,7 @@ msgstr "æçç"
 msgid "Sonar"
 msgstr "èç"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1767
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
 msgid "Output"
 msgstr "èå"
 
@@ -2943,7 +3062,7 @@ msgstr "èå"
 msgid "Sound Output Volume"
 msgstr "éæèåéé"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1808
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
 msgid "Input"
 msgstr "èå"
 
@@ -3003,7 +3122,7 @@ msgctxt "volume"
 msgid "Unamplified"
 msgstr "æçæå"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1621
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
 msgid "_Profile:"
 msgstr "èåçå(_P):"
 
@@ -3027,76 +3146,76 @@ msgstr[0] "%u èå"
 msgid "System Sounds"
 msgstr "ççéæ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:323
-#: ../panels/sound/gvc-mixer-dialog.c:634
+#: ../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:540
+#: ../panels/sound/gvc-mixer-dialog.c:541
 msgid "Peak detect"
 msgstr "ååææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1496
-#: ../panels/sound/gvc-mixer-dialog.c:1709
+#: ../panels/sound/gvc-mixer-dialog.c:1497
+#: ../panels/sound/gvc-mixer-dialog.c:1710
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "åç"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1563
+#: ../panels/sound/gvc-mixer-dialog.c:1564
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "%s çååæè"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1622
+#: ../panels/sound/gvc-mixer-dialog.c:1623
 msgid "_Test Speakers"
 msgstr "æèåå(_T)"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1753
+#: ../panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Output volume:"
 msgstr "èåéé(_O)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1772
+#: ../panels/sound/gvc-mixer-dialog.c:1773
 msgid "C_hoose a device for sound output:"
 msgstr "éæèéèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1797
-#: ../panels/sound/gvc-mixer-dialog.c:1926
+#: ../panels/sound/gvc-mixer-dialog.c:1798
+#: ../panels/sound/gvc-mixer-dialog.c:1927
 msgid "Settings for the selected device:"
 msgstr "åéåèççèååï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1815
+#: ../panels/sound/gvc-mixer-dialog.c:1816
 msgid "_Input volume:"
 msgstr "èåéé(_I)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1838
+#: ../panels/sound/gvc-mixer-dialog.c:1839
 msgid "Input level:"
 msgstr "èåççï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1866
+#: ../panels/sound/gvc-mixer-dialog.c:1867
 msgid "C_hoose a device for sound input:"
 msgstr "éæèéèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1893
+#: ../panels/sound/gvc-mixer-dialog.c:1894
 msgid "Hardware"
 msgstr "çé"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1898
+#: ../panels/sound/gvc-mixer-dialog.c:1899
 msgid "C_hoose a device to configure:"
 msgstr "éæèèåçèç(_H)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1937
+#: ../panels/sound/gvc-mixer-dialog.c:1938
 msgid "Sound Effects"
 msgstr "èéææ"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1944
+#: ../panels/sound/gvc-mixer-dialog.c:1945
 msgid "_Alert volume:"
 msgstr "èçéé(_A)ï"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1957
+#: ../panels/sound/gvc-mixer-dialog.c:1958
 msgid "Applications"
 msgstr "çåé"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1961
+#: ../panels/sound/gvc-mixer-dialog.c:1962
 msgid "No application is currently playing or recording audio."
 msgstr "æææççåçåæåæææéèéæã"
 
@@ -3137,20 +3256,20 @@ msgstr "æè"
 msgid "Subwoofer"
 msgstr "éäé"
 
-#: ../panels/sound/gvc-stream-status-icon.c:235
+#: ../panels/sound/gvc-stream-status-icon.c:236
 #, c-format
 msgid "Failed to start Sound Preferences: %s"
 msgstr "ååéæååèååæï%s"
 
-#: ../panels/sound/gvc-stream-status-icon.c:261
+#: ../panels/sound/gvc-stream-status-icon.c:262
 msgid "_Mute"
 msgstr "éé(_M)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:270
+#: ../panels/sound/gvc-stream-status-icon.c:271
 msgid "_Sound Preferences"
 msgstr "éæååèå(_S)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:415
+#: ../panels/sound/gvc-stream-status-icon.c:416
 msgid "Muted"
 msgstr "åéé"
 
@@ -3626,7 +3745,7 @@ msgid "_Username"
 msgstr "äçèåç(_U)"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:1
-#: ../panels/user-accounts/um-fingerprint-dialog.c:571
+#: ../panels/user-accounts/um-fingerprint-dialog.c:706
 msgid "Enable Fingerprint Login"
 msgstr "åçæççå"
 
@@ -3895,47 +4014,47 @@ msgstr "äæçéè"
 msgid "Failed to create user"
 msgstr "åçäçèåæ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:107
+#: ../panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
 msgstr "æäèåèäçéåèçãèéçæçççççèã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:109
+#: ../panels/user-accounts/um-fingerprint-dialog.c:141
 msgid "The device is already in use."
 msgstr "èèçåçåäçäã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:111
+#: ../panels/user-accounts/um-fingerprint-dialog.c:143
 msgid "An internal error occurred."
 msgstr "ççåéçéèã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:181
-#: ../panels/user-accounts/um-fingerprint-dialog.c:182
+#: ../panels/user-accounts/um-fingerprint-dialog.c:219
+#: ../panels/user-accounts/um-fingerprint-dialog.c:220
 msgid "Enabled"
 msgstr "ååç"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:224
+#: ../panels/user-accounts/um-fingerprint-dialog.c:268
 msgid "Delete registered fingerprints?"
 msgstr "æååéåèåçæçï"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:228
+#: ../panels/user-accounts/um-fingerprint-dialog.c:272
 msgid "_Delete Fingerprints"
 msgstr "åéæç(_D)"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:235
+#: ../panels/user-accounts/um-fingerprint-dialog.c:279
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
 msgstr "æçåèåéåèåçæçåïééääåæåçæççåã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:363
+#: ../panels/user-accounts/um-fingerprint-dialog.c:455
 msgid "Done!"
 msgstr "åæï"
 
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:410
-#: ../panels/user-accounts/um-fingerprint-dialog.c:432
+#: ../panels/user-accounts/um-fingerprint-dialog.c:516
+#: ../panels/user-accounts/um-fingerprint-dialog.c:558
 #, c-format
 msgid "Could not access '%s' device"
 msgstr "çæååã%sãèç"
@@ -3943,16 +4062,16 @@ msgstr "çæååã%sãèç"
 #. translators:
 #. * The variable is the name of the device, for example:
 #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: ../panels/user-accounts/um-fingerprint-dialog.c:481
+#: ../panels/user-accounts/um-fingerprint-dialog.c:603
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "çæäçã%sãèçäçæçææ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:533
+#: ../panels/user-accounts/um-fingerprint-dialog.c:655
 msgid "Could not access any fingerprint readers"
 msgstr "çæååääæçèèå"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:534
+#: ../panels/user-accounts/um-fingerprint-dialog.c:656
 msgid "Please contact your system administrator for help."
 msgstr "èéçæçççççåäååã"
 
@@ -3961,22 +4080,22 @@ msgstr "èéçæçççççåäååã"
 #. * "To enable fingerprint login, you need to save one of your fingerprints, using the
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #.
-#: ../panels/user-accounts/um-fingerprint-dialog.c:605
+#: ../panels/user-accounts/um-fingerprint-dialog.c:740
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
 "using the '%s' device."
 msgstr "èåçæççåïæéèäçã%sãèçååæçæçã"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:612
+#: ../panels/user-accounts/um-fingerprint-dialog.c:747
 msgid "Selecting finger"
 msgstr "éæææ"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:613
+#: ../panels/user-accounts/um-fingerprint-dialog.c:748
 msgid "Enrolling fingerprints"
 msgstr "çèæç"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:614
+#: ../panels/user-accounts/um-fingerprint-dialog.c:749
 msgid "Summary"
 msgstr "æè"
 
@@ -4071,77 +4190,77 @@ msgstr "çèæåçç..."
 msgid "Used by %s"
 msgstr "ç %s äç"
 
-#: ../panels/user-accounts/um-user-manager.c:450
+#: ../panels/user-accounts/um-user-manager.c:463
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "äã%sãçåçäçèåçååã"
 
-#: ../panels/user-accounts/um-user-manager.c:546
+#: ../panels/user-accounts/um-user-manager.c:569
 msgid "This user does not exist."
 msgstr "éåäçèäååã"
 
-#: ../panels/user-accounts/um-user-panel.c:358
+#: ../panels/user-accounts/um-user-panel.c:355
 msgid "Failed to delete user"
 msgstr "åéäçèåæ"
 
-#: ../panels/user-accounts/um-user-panel.c:418
+#: ../panels/user-accounts/um-user-panel.c:415
 msgid "You cannot delete your own account."
 msgstr "æäèåéèåçåèã"
 
-#: ../panels/user-accounts/um-user-panel.c:427
+#: ../panels/user-accounts/um-user-panel.c:424
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s äåçåä"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:428
 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:440
+#: ../panels/user-accounts/um-user-panel.c:437
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "ææèäç %s çææåï"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:441
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr "çåéäçèææåääçåçéãæééä(mail spool)åæåææçã"
 
-#: ../panels/user-accounts/um-user-panel.c:447
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid "_Delete Files"
 msgstr "åéææ(_D)"
 
-#: ../panels/user-accounts/um-user-panel.c:448
+#: ../panels/user-accounts/um-user-panel.c:445
 msgid "_Keep Files"
 msgstr "äçææ(_K)"
 
-#: ../panels/user-accounts/um-user-panel.c:500
+#: ../panels/user-accounts/um-user-panel.c:497
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "åèååç"
 
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/user-accounts/um-user-panel.c:505
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "åäæçåæèå"
 
-#: ../panels/user-accounts/um-user-panel.c:511
+#: ../panels/user-accounts/um-user-panel.c:508
 msgctxt "Password mode"
 msgid "None"
 msgstr "ææ"
 
-#: ../panels/user-accounts/um-user-panel.c:846
+#: ../panels/user-accounts/um-user-panel.c:843
 msgid "Failed to contact the accounts service"
 msgstr "çæéæåèæå"
 
-#: ../panels/user-accounts/um-user-panel.c:848
+#: ../panels/user-accounts/um-user-panel.c:845
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "èçå AccountService åçåèäåçã"
 
-#: ../panels/user-accounts/um-user-panel.c:888
+#: ../panels/user-accounts/um-user-panel.c:885
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4149,12 +4268,12 @@ msgstr ""
 "èéèèæï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:926
+#: ../panels/user-accounts/um-user-panel.c:923
 msgid "Create a user account"
 msgstr "åçæçäçèåè"
 
-#: ../panels/user-accounts/um-user-panel.c:937
-#: ../panels/user-accounts/um-user-panel.c:1226
+#: ../panels/user-accounts/um-user-panel.c:934
+#: ../panels/user-accounts/um-user-panel.c:1223
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4162,12 +4281,12 @@ msgstr ""
 "èåçäçèåèï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:946
+#: ../panels/user-accounts/um-user-panel.c:943
 msgid "Delete the selected user account"
 msgstr "åééåçäçèåè"
 
-#: ../panels/user-accounts/um-user-panel.c:958
-#: ../panels/user-accounts/um-user-panel.c:1231
+#: ../panels/user-accounts/um-user-panel.c:955
+#: ../panels/user-accounts/um-user-panel.c:1228
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4175,11 +4294,11 @@ msgstr ""
 "èåééåçäçèåèï\n"
 "èåéé * åç"
 
-#: ../panels/user-accounts/um-user-panel.c:1135
+#: ../panels/user-accounts/um-user-panel.c:1132
 msgid "My Account"
 msgstr "æçåè"
 
-#: ../panels/user-accounts/um-user-panel.c:1145
+#: ../panels/user-accounts/um-user-panel.c:1142
 msgid "Other Accounts"
 msgstr "åäåè"
 
@@ -4235,38 +4354,42 @@ msgid "Calibrate..."
 msgstr "ææâ"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:4
+msgid "Display Mapping..."
+msgstr "éçåæâ"
+
+#: ../panels/wacom/gnome-wacom-properties.ui.h:5
 msgid "Left-Handed Orientation"
 msgstr "åææå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: ../panels/wacom/gnome-wacom-properties.ui.h:6
 msgid "Map Buttons..."
 msgstr "æåæéâ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: ../panels/wacom/gnome-wacom-properties.ui.h:7
 msgid "No tablet detected"
 msgstr "æåæåçåæ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: ../panels/wacom/gnome-wacom-properties.ui.h:8
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "èæåæéåæç Wacom çåæ"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: ../panels/wacom/gnome-wacom-properties.ui.h:9
 msgid "Tablet (absolute)"
 msgstr "çåæ (çåäç)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
 msgid "Tablet Preferences"
 msgstr "çåæååèå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Touchpad (relative)"
 msgstr "èææ (çåäç)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: ../panels/wacom/gnome-wacom-properties.ui.h:12
 msgid "Tracking Mode"
 msgstr "èèæå"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: ../panels/wacom/gnome-wacom-properties.ui.h:13
 msgid "Wacom Tablet"
 msgstr "Wacom çåæ"
 
@@ -4338,6 +4461,79 @@ msgstr "ééååææ"
 msgid "Top Button"
 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:882
+#, fuzzy, c-format
+msgid "Left Ring Mode #%d"
+msgstr "åæçåæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:889
+#, fuzzy, c-format
+msgid "Right Ring Mode #%d"
+msgstr "åæçåæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:917
+#, fuzzy, c-format
+msgid "Left Touchstrip Mode #%d"
+msgstr "åæåèåæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:924
+#, fuzzy, c-format
+msgid "Right Touchstrip Mode #%d"
+msgstr "åæåèåæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:939
+#, fuzzy, c-format
+msgid "Left Touchring Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:941
+#, fuzzy, c-format
+msgid "Right Touchring Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:944
+#, fuzzy, c-format
+msgid "Left Touchstrip Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:946
+#, fuzzy, c-format
+msgid "Right Touchstrip Mode Switch"
+msgstr "åæèéçæå"
+
+#: ../panels/wacom/gsd-wacom-device.c:951
+#, fuzzy, c-format
+msgid "Mode Switch #%d"
+msgstr "mode switch"
+
+#: ../panels/wacom/gsd-wacom-device.c:1023
+#, fuzzy, c-format
+msgid "Left Button #%d"
+msgstr "æéåééæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:1026
+#, fuzzy, c-format
+msgid "Right Button #%d"
+msgstr "æéåééæ"
+
+#: ../panels/wacom/gsd-wacom-device.c:1029
+#, fuzzy, c-format
+msgid "Top Button #%d"
+msgstr "éçæé"
+
+#: ../panels/wacom/gsd-wacom-device.c:1032
+#, fuzzy, c-format
+msgid "Bottom Button #%d"
+msgstr "æé"
+
 #. Text printed on screen
 #: ../panels/wacom/calibrator/gui_gtk.c:70
 msgid "Screen Calibration"
@@ -4359,31 +4555,36 @@ msgid "%d of %d"
 msgstr "%d / %d"
 
 #: ../panels/wacom/cc-wacom-stylus-page.c:374
+#: ../panels/wacom/cc-wacom-page.c:457
 msgid "Button"
 msgstr "æé"
 
-#: ../shell/control-center.c:54
+#: ../panels/wacom/cc-wacom-page.c:581
+msgid "Display Mapping"
+msgstr "éçåæ"
+
+#: ../shell/control-center.c:58
 msgid "Enable verbose mode"
 msgstr "åçèçæå"
 
-#: ../shell/control-center.c:55
+#: ../shell/control-center.c:59
 msgid "Show the overview"
 msgstr "éçæè"
 
-#: ../shell/control-center.c:56 ../shell/control-center.c:57
-#: ../shell/control-center.c:58
+#: ../shell/control-center.c:60 ../shell/control-center.c:61
+#: ../shell/control-center.c:62
 msgid "Show help options"
 msgstr "éçèæçéé"
 
-#: ../shell/control-center.c:59
+#: ../shell/control-center.c:63
 msgid "Panel to display"
 msgstr "èéççéæ"
 
-#: ../shell/control-center.c:81
+#: ../shell/control-center.c:85
 msgid "- System Settings"
 msgstr "- ççèåå"
 
-#: ../shell/control-center.c:89
+#: ../shell/control-center.c:93
 #, c-format
 msgid ""
 "%s\n"
@@ -4396,10 +4597,32 @@ msgstr ""
 msgid "Control Center"
 msgstr "æåäå"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:2
+#: ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Preferences;Settings;"
+msgstr "Preferences;Settings;ååèå;èåå;"
+
+#: ../shell/gnome-control-center.desktop.in.in.h:2 ../shell/shell.ui.h:2
 msgid "System Settings"
 msgstr "ççèåå"
 
 #: ../shell/shell.ui.h:1
 msgid "All Settings"
 msgstr "ææèåå"
+
+#~ msgid "Battery discharging"
+#~ msgstr "éææåæé"
+
+#~ msgid "UPS discharging"
+#~ msgstr "äæéççæåæé"
+
+#~ msgid "%s until charged (%.0lf%%)"
+#~ msgstr "èéåååééæ %s (%.0lf%%)"
+
+#~ msgid "%s until empty (%.0lf%%)"
+#~ msgstr "èéååæééæ %s (%.0lf%%)"
+
+#~ msgid "%.0lf%% charged"
+#~ msgstr "ååé %.0lf%%"
+
+#~ msgid "Unlock"
+#~ msgstr "èé"



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