[gnome-control-center] Updated Serbian translation



commit eb7c08409fccc9f663afa3a7a0685ee41b566faa
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Wed Feb 15 10:50:53 2012 +0100

    Updated Serbian translation

 po/sr.po       |  419 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po |  419 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 450 insertions(+), 388 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 6cb5dd3..c8492ee 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-08 14:46+0000\n"
-"PO-Revision-Date: 2012-02-13 11:39+0200\n"
+"POT-Creation-Date: 2012-02-14 19:38+0000\n"
+"PO-Revision-Date: 2012-02-15 10:49+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -45,7 +45,6 @@ msgid "Swap colors"
 msgstr "ÐÐÑÐ ÑÐÐÐÐÐÐ"
 
 #: ../panels/background/background.ui.h:7
-#| msgid "Solid Color"
 msgid "Secondary color"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ"
 
@@ -146,52 +145,42 @@ msgid "Bluetooth"
 msgstr "ÐÐÑÑÑÑ"
 
 #: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-#| msgid "Bluetooth Settings"
 msgid "Configure Bluetooth settings"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÑÑÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:1
-#| msgid "Delete device"
 msgid "Set Up New Device"
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÑÐÑ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
-#| msgid "Remove a device"
 msgid "Remove Device"
 msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:3
-#| msgid "Connecting"
 msgid "Connection"
 msgstr "ÐÐÐÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:4
-#| msgid "Wired"
 msgid "Paired"
 msgstr "ÐÐÐÑÐÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:5
-#| msgid "_Type:"
 msgid "Type"
 msgstr "ÐÑÑÑÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:6
-#| msgid "A_ddress:"
 msgid "Address"
 msgstr "ÐÐÑÐÑÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:7
-#| msgid "Mouse and Touchpad"
 msgid "Mouse and Touchpad Settings"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ Ð ÐÐÐÐÑÐÐ ÑÐÐÐÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:43
-#| msgid "_Sound Settings"
 msgid "Sound Settings"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐ"
 
 #: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/universal-access/uap.ui.h:74
-#| msgid "_Keyboard Settings"
 msgid "Keyboard Settings"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÑÑÑÐ"
 
@@ -200,13 +189,11 @@ msgid "Send Files..."
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ..."
 
 #: ../panels/bluetooth/bluetooth.ui.h:11
-#| msgid "Browse for more pictures..."
 msgid "Browse Files..."
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ..."
 
 #. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth radio's on the device.
 #: ../panels/bluetooth/bluetooth.ui.h:13
-#| msgid "Bluetooth"
 msgctxt "Power"
 msgid "Bluetooth"
 msgstr "ÐÐÑÑÑÑ"
@@ -216,12 +203,10 @@ msgid "Yes"
 msgstr "ÐÐ"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:281
-#| msgid "None"
 msgid "No"
 msgstr "ÐÐ"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:393
-#| msgid "Bluetooth Settings"
 msgid "Bluetooth is disabled"
 msgstr "ÐÐÑÑÑÑ ÑÐ ÐÑÐÑÑÑÐÐ"
 
@@ -262,7 +247,6 @@ msgstr "ÐÑÑÐÐÐ ÐÑÐÑÐÐÐâ"
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
 #: ../panels/color/cc-color-panel.c:119
-#| msgid "Default"
 msgid "Default: "
 msgstr "ÐÑÐÐÐÐÐ: "
 
@@ -275,7 +259,6 @@ msgstr "ÐÑÐÑÑÐÑ ÐÐÑÐ: "
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
 #: ../panels/color/cc-color-panel.c:132
-#| msgid "No profile"
 msgid "Test profile: "
 msgstr "ÐÑÐÐÐÐ ÐÑÐÑÐÐ: "
 
@@ -310,31 +293,26 @@ msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:504
-#| msgid "Available Profiles"
 msgid "Available Profiles for Displays"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐ"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:508
-#| msgid "Available Profiles"
 msgid "Available Profiles for Scanners"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÑÐ"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:512
-#| msgid "Available Profiles"
 msgid "Available Profiles for Printers"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ ÑÑÐÐÐÐÑÐ"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:516
-#| msgid "Available Profiles"
 msgid "Available Profiles for Cameras"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÑÐÑÐ"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:520
-#| msgid "Available Profiles"
 msgid "Available Profiles for Webcams"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÑÐÑÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÑÐÑÐ"
 
@@ -776,34 +754,30 @@ msgid "Clock;Timezone;Location;"
 msgstr "ÐÐÑ;ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ;ÐÐÑÑÐ;"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
-#| msgid "Change your region and language settings"
 msgid "Change system time and date settings"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ Ð ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÑ"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
 msgid "To change time or date settings, you need to authenticate."
-msgstr "ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ Ð ÐÐÑÑÐÐ, ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÑÐÑÐÑ."
+msgstr ""
+"ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ Ð ÐÐÑÑÐÐ, ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÑÐÑÐÑ."
 
 #: ../panels/display/cc-display-panel.c:473
-#| msgid "Normal"
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
 #: ../panels/display/cc-display-panel.c:474
-#| msgid "Counterclockwise"
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "ÐÑÐÑÐÑÐÐ ÑÐÐÑÑ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑ"
 
 #: ../panels/display/cc-display-panel.c:475
-#| msgid "Clockwise"
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Ð ÑÐÐÑÑ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑ"
 
 #: ../panels/display/cc-display-panel.c:476
-#| msgid "180 Degrees"
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 ÑÑÐÐÐÐÐ"
@@ -855,7 +829,6 @@ msgstr "%a %l:%M %p"
 #: ../panels/display/cc-display-panel.c:2262
 #: ../panels/display/cc-display-panel.c:2314
 #, c-format
-#| msgid "Automatic configuration"
 msgid "Failed to apply configuration: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ: %s"
 
@@ -872,12 +845,10 @@ msgid "Could not get screen information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÑ"
 
 #: ../panels/display/display-capplet.ui.h:2
-#| msgid "_Resolution:"
 msgid "_Resolution"
 msgstr "_ÐÐÐÐÐÑÑÐÑÐ"
 
 #: ../panels/display/display-capplet.ui.h:3
-#| msgid "R_otation:"
 msgid "R_otation"
 msgstr "_ÐÐÑÐÐÑÑÐÑÑ"
 
@@ -1039,7 +1010,7 @@ msgid "Video CD"
 msgstr "ÐÐÐÐÐ ÐÐ"
 
 #: ../panels/info/cc-info-panel.c:1473
-#: ../panels/keyboard/keyboard-shortcuts.c:1627
+#: ../panels/keyboard/keyboard-shortcuts.c:1617
 msgid "Section"
 msgstr "ÐÐÐÑÐÐ"
 
@@ -1077,7 +1048,6 @@ msgid "Checking for Updates"
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑÐÑÐ"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#| msgid "View details"
 msgid "Details"
 msgstr "ÐÐÑÐÑÐ"
 
@@ -1087,15 +1057,13 @@ msgstr "ÐÐÑÐÑÐÐÑÐÑÐ Ð ÑÐÑÑÐÐÑ"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
-#| msgid ""
-#| "device;system;information;memory;processor;version;default;application;"
-#| "fallback;preferred;"
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"ÑÑÐÑÐÑ;ÑÐÑÑÐÐ;ÐÐÑÐÑÐÐÑÐÑÐ;ÐÐÐÐÑÐÑÐ;ÐÑÐÑÐÑÐÑ;ÐÐÐÐÑÐ;ÐÑÐÐÐÐÐ;ÐÑÐÐÑÐÐ;ÐÑÐÐÐÑÐÐÐ"
-"ÑÐ;ÐÐÐÑÐÐÐ;ÑÐ;ÐÐÐ;ÑÑÐ;ÐÐÑÐ;ÑÐÐÐÐÐ;ÐÐÑÐ;ÑÐÐÐÑÐÐÐ;ÐÐÐÐÑÑÐ;ÑÐÐÐÐÐÐÑÐÑÐÑÐ;"
+"ÑÑÐÑÐÑ;ÑÐÑÑÐÐ;ÐÐÑÐÑÐÐÑÐÑÐ;ÐÐÐÐÑÐÑÐ;ÐÑÐÑÐÑÐÑ;ÐÐÐÐÑÐ;ÐÑÐÐÐÐÐ;ÐÑÐÐÑÐÐ;"
+"ÐÑÐÐÐÑÐÐÐÑÐ;ÐÐÐÑÐÐÐ;ÑÐ;ÐÐÐ;ÑÑÐ;ÐÐÑÐ;ÑÐÐÐÐÐ;ÐÐÑÐ;ÑÐÐÐÑÐÐÐ;ÐÐÐÐÑÑÐ;"
+"ÑÐÐÐÐÐÐÑÐÑÐÑÐ;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1162,22 +1130,18 @@ msgid "Select how media should be handled"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÑÑÐÑÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../panels/info/info.ui.h:20
-#| msgid "CD _audio:"
 msgid "CD _audio"
 msgstr "ÐÐ _ÐÑÐÐÐ"
 
 #: ../panels/info/info.ui.h:21
-#| msgid "_DVD video:"
 msgid "_DVD video"
 msgstr "_ÐÐÐ ÐÐÐÐÐ"
 
 #: ../panels/info/info.ui.h:22
-#| msgid "_Music player:"
 msgid "_Music player"
 msgstr "_ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐ"
 
 #: ../panels/info/info.ui.h:23
-#| msgid "_Software:"
 msgid "_Software"
 msgstr "_ÐÐÑÑÐÐÑ"
 
@@ -1275,12 +1239,10 @@ msgid "Search"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:1
-#| msgid "Screen"
 msgid "Screenshots"
 msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐ"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:2
-#| msgid "Take a photo..."
 msgid "Take a screenshot"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐ"
 
@@ -1323,27 +1285,22 @@ msgid "Universal Access"
 msgstr "ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÑÑÐ"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:2
-#| msgid "Turn on or off:"
 msgid "Turn zoom on or off"
 msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:3
-#| msgid "Zoom in:"
 msgid "Zoom in"
 msgstr "ÐÐÐÑÐÑ"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:4
-#| msgid "Zoom out:"
 msgid "Zoom out"
 msgstr "ÐÐÐÑÐ"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:5
-#| msgid "Turn on or off:"
 msgid "Turn screen reader on or off"
 msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÑÐÑÐÑ ÐÐÑÐÐÐ"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:6
-#| msgid "Toggle on-screen keyboard"
 msgid "Turn on-screen keyboard on or off"
 msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÐÐÑÐÐÑÐÑ ÑÐÑÑÐÑÑÑÑ"
 
@@ -1446,7 +1403,6 @@ msgid "S_peed:"
 msgstr "_ÐÑÐÐÐÐ:"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-#| msgid "Cursor blinks speed"
 msgid "Cursor blink speed"
 msgstr "ÐÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÐÑÑÑÐÑÐ"
 
@@ -1460,16 +1416,15 @@ msgid "Typing"
 msgstr "ÐÑÑÐÑÐ"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#| msgid "Shortcut"
 msgid "Add Shortcut"
 msgstr "ÐÐÐÐÑ ÐÑÐÑÐÑÑ"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-#| msgid "Shortcut"
 msgid "Remove Shortcut"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÑ"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../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."
@@ -1484,8 +1439,8 @@ msgstr "ÐÑÐÑÐÑÐ"
 #: ../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 "ÐÑÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑÐ"
 
@@ -1495,14 +1450,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: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 "
@@ -1513,7 +1468,7 @@ msgstr ""
 "ÐÐÐÑ ÑÐÑÑÐÑ.\n"
 "ÐÑÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÑÑÐÑ ÐÐÐ ÑÑÐ ÑÐ âÐÑÑÐ, ÐÐÑ ÐÐÐ ÐÐÑÑâ."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1237
+#: ../panels/keyboard/keyboard-shortcuts.c:1227
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1522,21 +1477,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 "_ÐÐÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1676
+#: ../panels/keyboard/keyboard-shortcuts.c:1666
+#: ../panels/wacom/cc-wacom-page.c:472
 msgid "Action"
 msgstr "ÐÐÐÑÐ"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1699
+#: ../panels/keyboard/keyboard-shortcuts.c:1688
 msgid "Shortcut"
 msgstr "ÐÑÐÑÐÑÐ"
 
@@ -1586,7 +1542,9 @@ msgid "_Sensitivity:"
 msgstr "Ð_ÑÐÑÑÐÐÐÑÑ:"
 
 #. low sensitivity
+#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/power/cc-power-panel.c:570
 msgid "Low"
 msgstr "ÐÐÐÐ"
 
@@ -1610,7 +1568,6 @@ msgid "Small"
 msgstr "ÐÐÐÐ"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:21
-#| msgid "Thr_eshold:"
 msgid "Drag Threshold"
 msgstr "ÐÑÐÐ ÐÑÐÐÐÐÑÐÑÐ"
 
@@ -1629,13 +1586,13 @@ msgid "_Timeout:"
 msgstr "_ÐÐÑÐÑÐÐÐ:"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:27
-#| msgid "Double-Click Timeout"
 msgid "Double-click timeout"
 msgstr "ÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐ"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "To test your settings, try to double-click on the face."
-msgstr "ÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ, ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÑÑ."
+msgstr ""
+"ÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ, ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÑÑ."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "Mouse"
@@ -1779,7 +1736,6 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐ"
 
 #: ../panels/network/cc-network-panel.c:2722
-#| msgid "Format:"
 msgid "Forget"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
@@ -1815,7 +1771,6 @@ msgstr "_ÐÐÑÑÑÐÐÐ ÐÑÑÑÑ ÑÐÑÐÑ"
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
 #: ../panels/network/cc-network-panel.c:3342
-#| msgid "Air_plane Mode"
 msgid "Airplane Mode"
 msgstr "ÐÐÐÐÐ Ñ ÐÐÐÐÐÑ"
 
@@ -1829,7 +1784,6 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐ"
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-#| msgid "Network;Wireless;IP;LAN;"
 msgid "Network;Wireless;IP;LAN;Proxy;"
 msgstr "ÐÑÐÐÐ;ÐÐÐÐÑÐÐ;ÐÐ;ÐÐÐ;ÐÐÑÑÐÐÐÐÐ"
 
@@ -1865,7 +1819,6 @@ msgid "Automatic"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ"
 
 #: ../panels/network/network.ui.h:8
-#| msgid "Add device"
 msgid "Add Device"
 msgstr "ÐÐÐÐÑ ÑÑÐÑÐÑ"
 
@@ -1886,7 +1839,6 @@ msgid "DNS"
 msgstr "ÐÐÐ"
 
 #: ../panels/network/network.ui.h:16
-#| msgid "Device"
 msgid "Device Off"
 msgstr "ÐÑÐÑÐÑ ÑÐ ÐÑÐÑÑÑÐÐ"
 
@@ -1912,7 +1864,6 @@ msgid "Security Key"
 msgstr "ÐÑÑÑ ÐÐÐÐÐÐÐÐÑÑÐ"
 
 #: ../panels/network/network.ui.h:22
-#| msgid "Network"
 msgid "Forget Network"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÐÑ"
 
@@ -1954,7 +1905,6 @@ msgid "Username"
 msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ"
 
 #: ../panels/network/network.ui.h:33
-#| msgid "Disabled"
 msgid "Disable VPN"
 msgstr "ÐÑÐÑÑÑÐ ÐÐÐ"
 
@@ -1987,22 +1937,18 @@ msgid "_Socks Host"
 msgstr "_ÐÑÐÐÑÑÑÑÐ ÐÐÐÐÑÐÐÐ:"
 
 #: ../panels/network/network.ui.h:41
-#| msgid "_HTTP Proxy"
 msgid "HTTP Port"
 msgstr "ÐÐÐÐ ÐÐÑÑ"
 
 #: ../panels/network/network.ui.h:42
-#| msgid "H_TTPS Proxy"
 msgid "HTTPS Port"
 msgstr "ÐÐÐÐÐ ÐÐÑÑ"
 
 #: ../panels/network/network.ui.h:43
-#| msgid "_FTP Proxy"
 msgid "FTP Port"
 msgstr "ÐÐÐ ÐÐÑÑ"
 
 #: ../panels/network/network.ui.h:44
-#| msgid "_Socks Host"
 msgid "Socks Port"
 msgstr "ÐÐÑÑ ÐÑÐÐÑÑÑÐÐÐ"
 
@@ -2120,7 +2066,6 @@ msgstr "_ÐÑÐÑÐÐÐ ÐÐ"
 #. * The title is not visible when using GNOME Shell
 #: ../panels/online-accounts/cc-online-accounts-panel.c:461
 #: ../panels/online-accounts/online-accounts.ui.h:1
-#| msgid "My Account"
 msgid "Add Account"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐ"
 
@@ -2170,7 +2115,6 @@ msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 msgstr "ÐÑÐÐ;ÐÐÑÑÐÑÐ;ÐÐÐÑÐÑ;ÐÐÑÑ;ÐÐÐ;ÐÐ ÐÑÐÐÐ;ÐÐÑÐÐÑÐ;ÐÐÐÐÐÐÐÑ;ÐÐÑÑÐ;ÐÐÐÑÐÐÑ;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:2
-#| msgid "My Account"
 msgid "Remove Account"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ"
 
@@ -2178,12 +2122,12 @@ msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ"
 msgid "Select an account"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ"
 
-#: ../panels/power/cc-power-panel.c:160
+#: ../panels/power/cc-power-panel.c:162
 msgid "Unknown time"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ"
 
 # bug(danilo): plural-forms
-#: ../panels/power/cc-power-panel.c:166
+#: ../panels/power/cc-power-panel.c:168
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -2192,7 +2136,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
 msgstr[2] "%i ÐÐÐÑÑÐ"
 msgstr[3] "ÐÐÐÐÐ ÐÐÐÑÑ"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2203,12 +2147,12 @@ msgstr[3] "ÐÐÐÐÐ ÑÐÑ"
 
 #. 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 "%d %s %d %s"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:189
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ÑÐÑ"
@@ -2217,7 +2161,7 @@ msgstr[2] "ÑÐÑÐ"
 msgstr[3] "ÑÐÑ"
 
 # bug(danilo): plural-forms
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ÐÐÐÑÑ"
@@ -2225,40 +2169,158 @@ msgstr[1] "ÐÐÐÑÑÐ"
 msgstr[2] "ÐÐÐÑÑÐ"
 msgstr[3] "ÐÐÐÑÑ"
 
-#: ../panels/power/cc-power-panel.c:265
-msgid "Battery 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:268
-msgid "Battery 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"
 
-#: ../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:249
+#, c-format
+#| msgid "On battery power"
+msgid "Using battery power - %s remaining"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÑÑÐ ÑÐÑ %s ÑÐÐÐ"
+
+#. TRANSLATORS: primary battery
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:266 ../panels/power/cc-power-panel.c:558
+#| msgid "UPS charging"
+msgid "Charging"
+msgstr "ÐÑÑÐÑÐ ÑÐ Ñ ÑÐÐÑ"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:271
+#| msgid "On battery power"
+msgid "Using battery power"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../panels/power/cc-power-panel.c:282
-msgid "UPS discharging"
-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:300
+#: ../panels/power/cc-power-panel.c:347
 #, c-format
-msgid "%s until charged (%.0lf%%)"
-msgstr "%s ÐÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐ (%.0lf%%)"
+msgid "Caution low UPS, %s remaining"
+msgstr "ÐÐÐ ÑÐ ÑÐÐÑÐ ÐÑÐÐÐÐ, ÐÐÐÐÐÐÑÑÑÐ ÑÐÑ %s ÑÐÐÐ"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:306
+#: ../panels/power/cc-power-panel.c:353
 #, c-format
-msgid "%s until empty (%.0lf%%)"
-msgstr "%s ÐÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐÐÐ (%.0lf%%)"
+msgid "Using UPS power - %s remaining"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐ-Ð ÐÐÐÐÐÐÑÑÑÐ ÑÐÑ %s ÑÐÐÐ"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:371
+msgid "Caution low UPS"
+msgstr "ÐÐÐ ÑÐ ÑÐÐÑÐ ÐÑÐÐÐÐ"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:376
+msgid "Using UPS power"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐ-Ð"
+
+#. 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"
+msgid "Wireless mouse"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:519
+#| msgid "Screen keyboard"
+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 "_Music player"
+msgid "Media player"
+msgstr "ÐÑÐÐÑÐÐ ÑÑÐÑÐÑ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:539
+#| msgid "Wacom Tablet"
+msgid "Tablet"
+msgstr "ÐÐÐÐÐÑÐ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:543
+#| msgctxt "print job"
+#| msgid "Completed"
+msgid "Computer"
+msgstr "ÐÐÑÑÐÐÑ"
+
+#. TRANSLATORS: secondary battery, misc
+#: ../panels/power/cc-power-panel.c:547
+#| msgid "Battery charging"
+msgid "Battery"
+msgstr "ÐÐÑÐÑÐÑÐ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:565
+#| msgid "Calibration"
+msgid "Caution"
+msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#. 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
-#, c-format
-msgid "%.0lf%% charged"
-msgstr "%.0lf%% ÐÐÐÑÑÐÐÐÑÑÐ"
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:575
+#| msgctxt "Password strength"
+#| msgid "Good"
+msgid "Good"
+msgstr "ÐÐÐÑÐ"
+
+#: ../panels/power/cc-power-panel.c:1083
+#| msgid "_Type:"
+msgid "Tip:"
+msgstr "ÐÑÑÑÐ:"
+
+#: ../panels/power/cc-power-panel.c:1084
+#| msgid "Sound Settings"
+msgid "Screen Settings"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
+
+#: ../panels/power/cc-power-panel.c:1085
+msgid "affect how much power is used"
+msgstr "ÐÐÑÐÑÑÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÑÐ ÐÐÑÐÑÑÐ"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2278,7 +2340,6 @@ msgid "Hibernate"
 msgstr "ÐÐÐÑÐÐÐ"
 
 #: ../panels/power/power.ui.h:2
-#| msgid "Power"
 msgid "Power off"
 msgstr "ÐÐÐÑÐ"
 
@@ -2559,21 +2620,21 @@ msgstr "_ÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ"
 msgid "_Add"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../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."
@@ -2582,52 +2643,50 @@ msgstr ""
 "ÑÑÐÑÐÐ ÐÐÐÑ, ÐÐÐ, ÐÐÐ-ÐÐÐÑÐÐÑ Ð ÑÐÐÐÐ-ÐÐÐÑÐÐÑ ÐÐ ÐÑÐÐÐÐÑ ÐÐÑÐÑÐÑÐ."
 
 #. 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 "ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐ ÐÐÐÐ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1874
+#: ../panels/printers/pp-new-printer-dialog.c:1851
 msgid "Opening firewall for Samba connections"
 msgstr "ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐ"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1883
+#: ../panels/printers/pp-new-printer-dialog.c:1860
 msgid "Opening firewall for IPP connections"
 msgstr "ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐ ÐÐÐÐ"
 
 #: ../panels/printers/printers.ui.h:1
-#| msgid "Add printer"
 msgid "Add Printer"
 msgstr "ÐÐÐÐÑ ÑÑÐÐÐÐÑ"
 
 #: ../panels/printers/printers.ui.h:2
-#| msgid "Remove printer"
 msgid "Remove Printer"
 msgstr "ÐÐÐÐÐÐ ÑÑÐÐÐÐÑ"
 
@@ -2680,18 +2739,15 @@ msgid "Active Print Jobs"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐ ÑÑÐÐÐÐÑÐ"
 
 #: ../panels/printers/printers.ui.h:22
-#| msgid "Remove printer"
 msgid "Resume Printing"
 msgstr "ÐÐÑÑÐÐÐ ÑÑÐÐÐÐÑÐ"
 
 # ÑÐÐÐÑÐ ÑÐ ÐÐÐÐ âÑÐÐÐÑÐâ, ÐÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÐ âÑÐÐÑÐÐÐâ
 #: ../panels/printers/printers.ui.h:23
-#| msgid "Printing..."
 msgid "Pause Printing"
 msgstr "ÐÐÑÐÐÑÐÑ ÑÑÐÐÐÐÑÐ"
 
 #: ../panels/printers/printers.ui.h:24
-#| msgid "Active Print Jobs"
 msgid "Cancel Print Job"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐ ÑÑÐÐÐÐÑÐ"
 
@@ -2701,12 +2757,10 @@ msgid "Printer Options"
 msgstr "ÐÐÑÐÑÐ ÑÑÐÐÐÐÑÐ"
 
 #: ../panels/printers/printers.ui.h:27
-#| msgid "Add printer"
 msgid "Add User"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ"
 
 #: ../panels/printers/printers.ui.h:28
-#| msgid "Remove printer"
 msgid "Remove User"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ"
 
@@ -2805,12 +2859,10 @@ msgid "Install languages..."
 msgstr "ÐÐÑÑÐÐÐÑÐÑ ÑÐÐÐÐÐ..."
 
 #: ../panels/region/gnome-region-panel.ui.h:4
-#| msgid "Language"
 msgid "Add Language"
 msgstr "ÐÐÐÐÑ ÑÐÐÐÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:5
-#| msgid "Region and Language"
 msgid "Remove Language"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÐÐ"
 
@@ -2823,12 +2875,10 @@ msgid "Select a region (change will be applied the next time you log in)"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÑ (ÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ ÐÑÐ ÑÐÐÐÐÑÐÐ ÐÑÐÑÐÐÑÐÐÐÑÑ)"
 
 #: ../panels/region/gnome-region-panel.ui.h:8
-#| msgid "_Region:"
 msgid "Add Region"
 msgstr "ÐÐÐÐÑ ÑÐÐÐÐÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:9
-#| msgid "Remove printer"
 msgid "Remove Region"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
@@ -2861,12 +2911,10 @@ msgid "Formats"
 msgstr "ÐÐÐÐÑÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:17
-#| msgid "Layout"
 msgid "Add Layout"
 msgstr "ÐÐÐÐÑ ÑÐÑÐÐÑÐÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:18
-#| msgid "Choose a Layout"
 msgid "Remove Layout"
 msgstr "ÐÐÐÐÐÐ ÑÐÑÐÐÑÐÐ"
 
@@ -2875,12 +2923,10 @@ msgid "Move Up"
 msgstr "ÐÐÐÐÑÐ ÐÐÑÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:20
-#| msgid "Volume down"
 msgid "Move Down"
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐ"
 
 #: ../panels/region/gnome-region-panel.ui.h:21
-#| msgid "Preview"
 msgid "Preview Layout"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐ"
 
@@ -2951,7 +2997,6 @@ msgid "Default"
 msgstr "ÐÑÐÐÐÐÐ"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-#| msgid "Brightness"
 msgid "Brightness and Lock"
 msgstr "ÐÑÐÐÑÑÐÐÐÑÑ Ð ÐÐÐÑÑÑÐÐÐÑÐ"
 
@@ -2996,7 +3041,6 @@ msgid "Brightness"
 msgstr "ÐÑÐÐÑÑÐÐÐÑÑ"
 
 #: ../panels/screen/screen.ui.h:12
-#| msgid "Suspend when inactive for:"
 msgid "_Turn screen off when inactive for:"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ _ÐÑÐÑÑÑÐ ÐÐ ÐÐÐÐÐ:"
 
@@ -3314,16 +3358,13 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐ"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
-#| msgid ""
-#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;"
-#| "size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
 "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgstr ""
-"ÐÐÑÑÐÑÑÑÐ;ÐÐÑ;a11y;ÐÑÐÑÑÑÐÐÑÐÐÑÑ;ÐÐÐÑÑÐÑÑ;ÐÑÐ;ÐÐÑÐÑ ÐÐÑÐÐÐ;ÑÐÐÑÑ;ÑÐÐÐÐÐ "
-"ÐÐÐ;ÐÐÐÐÑÐÐÐ;ÐÑÐÑÑÑÐ ÐÐÑÑ;ÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐ;ÐÐÐÑÐ ÑÐÑÑÐÑÐ;ÐÐÑÐÐÑÐÐ "
-"ÑÐÑÑÐÑÐ;ÐÐÑÑÐÑÐ ÐÐÑÐ;"
+"ÐÐÑÑÐÑÑÑÐ;ÐÐÑ;a11y;ÐÑÐÑÑÑÐÐÑÐÐÑÑ;ÐÐÐÑÑÐÑÑ;ÐÑÐ;ÐÐÑÐÑ ÐÐÑÐÐÐ;ÑÐÐÑÑ;ÑÐÐÐÐÐ ÐÐÐ;"
+"ÐÐÐÐÑÐÐÐ;ÐÑÐÑÑÑÐ ÐÐÑÑ;ÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐ;ÐÐÐÑÐ ÑÐÑÑÐÑÐ;ÐÐÑÐÐÑÐÐ ÑÐÑÑÐÑÐ;ÐÐÑÑÐÑÐ "
+"ÐÐÑÐ;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "On screen keyboard"
@@ -3590,7 +3631,6 @@ msgid "Trigger a secondary click by holding down the primary button"
 msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÑÐÐÑÐÐÐÑÐÐ ÐÐÐÐ ÐÑÐÐÑÐ ÐÑÐÑÐÑÐÑÑ ÐÑÐÐÐÑÐÐ ÑÐÑÑÐÑ"
 
 #: ../panels/universal-access/uap.ui.h:81
-#| msgid "Simulated Secondary Click"
 msgid "Secondary click delay"
 msgstr "ÐÐÑÑÐÑ ÑÐÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐ"
 
@@ -3615,7 +3655,6 @@ msgid "Hover Click"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÑÐ"
 
 #: ../panels/universal-access/uap.ui.h:91
-#| msgid "_Mouse Settings"
 msgid "Mouse Settings"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐ"
 
@@ -3644,22 +3683,18 @@ msgid "High/Inverse"
 msgstr "ÐÐÑÐÐ/ÐÐÑÐÑÑ"
 
 #: ../panels/universal-access/zoom-options.c:334
-#| msgid "Screen"
 msgid "1/4 Screen"
 msgstr "1/4 ÐÐÑÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.c:335
-#| msgid "Screen"
 msgid "1/2 Screen"
 msgstr "1/2 ÐÐÑÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.c:336
-#| msgid "Screen"
 msgid "3/4 Screen"
 msgstr "3/4 ÐÐÑÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:1
-#| msgid "Login Options"
 msgid "Zoom Options"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
 
@@ -3668,12 +3703,10 @@ msgid "Magnification:"
 msgstr "ÐÐÐÑÐÐÐÑÐ:"
 
 #: ../panels/universal-access/zoom-options.ui.h:3
-#| msgid "Allowed users"
 msgid "Follow mouse cursor"
 msgstr "ÐÑÐÑÐ ÐÑÑÑÐÑ ÐÐÑÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:4
-#| msgid "Screen Reader"
 msgid "Screen part:"
 msgstr "ÐÐÐ ÐÐÑÐÐÐ:"
 
@@ -3694,7 +3727,6 @@ msgid "Magnifier cursor moves with contents"
 msgstr "ÐÑÑÑÐÑ ÐÑÐÐ ÑÐ ÐÐÐÐÑÐ ÑÐ ÑÐÐÑÐÐÑÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:9
-#| msgid "Magnifier zoom in"
 msgid "Magnifier Position:"
 msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐ:"
 
@@ -3704,7 +3736,6 @@ msgstr "ÐÐÐÑÐÐÐ:"
 
 #. short delay
 #: ../panels/universal-access/zoom-options.ui.h:12
-#| msgid "China"
 msgid "Thin"
 msgstr "ÐÐÐÐÐ"
 
@@ -3718,7 +3749,6 @@ msgid "Length:"
 msgstr "ÐÑÐÑÐÑÐ:"
 
 #: ../panels/universal-access/zoom-options.ui.h:16
-#| msgid "Color"
 msgid "Color:"
 msgstr "ÐÐÑÐ:"
 
@@ -3731,7 +3761,6 @@ msgid "Overlaps mouse cursor"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÑÑÑÐÑ ÐÐÑÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:19
-#| msgid "Screen"
 msgid "Full Screen"
 msgstr "ÐÐÐ ÐÐÑÐÐ"
 
@@ -3744,12 +3773,10 @@ msgid "Bottom Half"
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:22
-#| msgid "Left"
 msgid "Left Half"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../panels/universal-access/zoom-options.ui.h:23
-#| msgid "Right"
 msgid "Right Half"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐÐ"
 
@@ -3970,12 +3997,10 @@ msgid "Account Information"
 msgstr "ÐÐÑÐÑÐÐÑÐÑÐ Ð ÐÐÐÐÐÑ"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-#| msgid "User Accounts"
 msgid "Add User Account"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐ"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-#| msgid "User Accounts"
 msgid "Remove User Account"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐ"
 
@@ -4000,7 +4025,6 @@ msgid "_Fingerprint Login"
 msgstr "ÐÑÐÑÐÐÑÐÐÐÑÐ _ÐÑÐÑÐÐÐ ÐÑÑÑÐ"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-#| msgid "User Accounts"
 msgid "User Icon"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÐ"
 
@@ -4327,15 +4351,11 @@ msgstr ""
 "ÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑ * "
 
 #: ../panels/user-accounts/um-user-panel.c:923
-#| msgid "Create new account"
 msgid "Create a user account"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐ"
 
 #: ../panels/user-accounts/um-user-panel.c:934
 #: ../panels/user-accounts/um-user-panel.c:1223
-#| msgid ""
-#| "To create a user,\n"
-#| "click the * icon first"
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4344,15 +4364,11 @@ msgstr ""
 "ÐÐÐÐÐÐÑÐ ÐÑÐÐ ÐÐ ÐÐÐÐÐÑÑ *"
 
 #: ../panels/user-accounts/um-user-panel.c:943
-#| msgid "Delete the selected user"
 msgid "Delete the selected user account"
 msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐ"
 
 #: ../panels/user-accounts/um-user-panel.c:955
 #: ../panels/user-accounts/um-user-panel.c:1228
-#| msgid ""
-#| "To delete the selected user,\n"
-#| "click the * icon first"
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4436,7 +4452,6 @@ msgid "Tracking Mode"
 msgstr "ÐÐÐÐÐ ÐÑÐÑÐÑÐ"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-#| msgid "Left-Handed Orientation:"
 msgid "Left-Handed Orientation"
 msgstr "ÐÐÐÐÑÑÐÐ ÑÑÐÐÑÐÑÐ"
 
@@ -4453,7 +4468,6 @@ msgid "Calibrate..."
 msgstr "ÐÐÐÐÑÐ..."
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
-#| msgid "Options..."
 msgid "Map Buttons..."
 msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÐ..."
 
@@ -4525,78 +4539,82 @@ msgstr "ÐÐÑÑÐ ÐÑÐÐÐ"
 msgid "Stylus"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../panels/wacom/gsd-wacom-device.c:790
+#: ../panels/wacom/button-mapping.ui.h:1
+#| msgid "Map Buttons..."
+msgid "Map Buttons"
+msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÐ"
+
+#: ../panels/wacom/button-mapping.ui.h:2
+msgid "Map buttons to functions"
+msgstr "ÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐ ÑÑÐÐÑÐÑÐÐÐ"
+
+#: ../panels/wacom/gsd-wacom-device.c:876
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐ ÐÑÑÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:797
+#: ../panels/wacom/gsd-wacom-device.c:883
 #, c-format
-#| msgid "Right ring finger"
 msgid "Right Ring Mode #%d"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÑÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:824
+#: ../panels/wacom/gsd-wacom-device.c:911
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "ÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:831
+#: ../panels/wacom/gsd-wacom-device.c:918
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:846
+#: ../panels/wacom/gsd-wacom-device.c:933
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐ"
 
-#: ../panels/wacom/gsd-wacom-device.c:848
+#: ../panels/wacom/gsd-wacom-device.c:935
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÑÑÐÐÐ"
 
-#: ../panels/wacom/gsd-wacom-device.c:851
+#: ../panels/wacom/gsd-wacom-device.c:938
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐ"
 
-#: ../panels/wacom/gsd-wacom-device.c:853
+#: ../panels/wacom/gsd-wacom-device.c:940
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐ"
 
-#: ../panels/wacom/gsd-wacom-device.c:858
+#: ../panels/wacom/gsd-wacom-device.c:945
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:928
+#: ../panels/wacom/gsd-wacom-device.c:1017
 #, c-format
-#| msgid "Lower Button"
 msgid "Left Button #%d"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:931
+#: ../panels/wacom/gsd-wacom-device.c:1020
 #, c-format
-#| msgid "Right Mouse Button Click"
 msgid "Right Button #%d"
 msgstr "ÐÐÑÐÐ ÐÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:934
+#: ../panels/wacom/gsd-wacom-device.c:1023
 #, c-format
-#| msgid "Top Button"
 msgid "Top Button #%d"
 msgstr "ÐÐÑÑÐ ÐÑÐÐÐ #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:937
+#: ../panels/wacom/gsd-wacom-device.c:1026
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "ÐÐÑÐ ÐÑÐÐÐ #%d"
 
 #. Text printed on screen
 #: ../panels/wacom/calibrator/gui_gtk.c:70
-#| msgid "Calibration"
 msgid "Screen Calibration"
 msgstr "ÐÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐÐÐ"
 
@@ -4614,12 +4632,11 @@ msgstr "ÐÑÐÑÐÐÐÐ ÑÐ ÐÐÑ ÐÐÐÐ, ÐÐÑÐÑÐÐ ÐÐ ÐÐÑÐÑÐ
 
 #: ../panels/wacom/cc-wacom-nav-button.c:89
 #, c-format
-#| msgid "%d x %d"
 msgid "%d of %d"
 msgstr "%d ÐÐ %d"
 
 #: ../panels/wacom/cc-wacom-stylus-page.c:374
-#| msgid "Top Button"
+#: ../panels/wacom/cc-wacom-page.c:451
 msgid "Button"
 msgstr "ÐÑÐÐÐ"
 
@@ -4667,10 +4684,24 @@ msgid "Preferences;Settings;"
 msgstr "ÐÐÑÑÐÐÐÐ;ÐÐÐÐÑÐÐÐÑÐ;"
 
 #: ../shell/shell.ui.h:2
-#| msgid "_All Settings"
 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 "Could not get session bus while applying display configuration"
 #~ msgstr ""
 #~ "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÑÐÐÑ ÑÐÑÐÑÐ ÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐ"
diff --git a/po/sr latin po b/po/sr latin po
index a7d0ef2..bfb6e0f 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-08 14:46+0000\n"
-"PO-Revision-Date: 2012-02-13 11:39+0200\n"
+"POT-Creation-Date: 2012-02-14 19:38+0000\n"
+"PO-Revision-Date: 2012-02-15 10:49+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -45,7 +45,6 @@ msgid "Swap colors"
 msgstr "Boje razmene"
 
 #: ../panels/background/background.ui.h:7
-#| msgid "Solid Color"
 msgid "Secondary color"
 msgstr "Dodatna boja"
 
@@ -146,52 +145,42 @@ msgid "Bluetooth"
 msgstr "Blutut"
 
 #: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-#| msgid "Bluetooth Settings"
 msgid "Configure Bluetooth settings"
 msgstr "Izmenite podeÅavanja blututa"
 
 #: ../panels/bluetooth/bluetooth.ui.h:1
-#| msgid "Delete device"
 msgid "Set Up New Device"
 msgstr "Podesi novi ureÄaj"
 
 #: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9
-#| msgid "Remove a device"
 msgid "Remove Device"
 msgstr "Ukloni ureÄaj"
 
 #: ../panels/bluetooth/bluetooth.ui.h:3
-#| msgid "Connecting"
 msgid "Connection"
 msgstr "Veza"
 
 #: ../panels/bluetooth/bluetooth.ui.h:4
-#| msgid "Wired"
 msgid "Paired"
 msgstr "Uparen"
 
 #: ../panels/bluetooth/bluetooth.ui.h:5
-#| msgid "_Type:"
 msgid "Type"
 msgstr "Vrsta"
 
 #: ../panels/bluetooth/bluetooth.ui.h:6
-#| msgid "A_ddress:"
 msgid "Address"
 msgstr "Adresa"
 
 #: ../panels/bluetooth/bluetooth.ui.h:7
-#| msgid "Mouse and Touchpad"
 msgid "Mouse and Touchpad Settings"
 msgstr "PodeÅavanja miÅa i dodirne table"
 
 #: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:43
-#| msgid "_Sound Settings"
 msgid "Sound Settings"
 msgstr "PodeÅavanja zvuka"
 
 #: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/universal-access/uap.ui.h:74
-#| msgid "_Keyboard Settings"
 msgid "Keyboard Settings"
 msgstr "PodeÅavanja tastature"
 
@@ -200,13 +189,11 @@ msgid "Send Files..."
 msgstr "PoÅalji datoteke..."
 
 #: ../panels/bluetooth/bluetooth.ui.h:11
-#| msgid "Browse for more pictures..."
 msgid "Browse Files..."
 msgstr "Razgledaj datoteke..."
 
 #. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth radio's on the device.
 #: ../panels/bluetooth/bluetooth.ui.h:13
-#| msgid "Bluetooth"
 msgctxt "Power"
 msgid "Bluetooth"
 msgstr "Blutut"
@@ -216,12 +203,10 @@ msgid "Yes"
 msgstr "Da"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:281
-#| msgid "None"
 msgid "No"
 msgstr "Ne"
 
 #: ../panels/bluetooth/cc-bluetooth-panel.c:393
-#| msgid "Bluetooth Settings"
 msgid "Bluetooth is disabled"
 msgstr "Blutut je iskljuÄen"
 
@@ -262,7 +247,6 @@ msgstr "Ostali profiliâ"
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
 #: ../panels/color/cc-color-panel.c:119
-#| msgid "Default"
 msgid "Default: "
 msgstr "Osnovno: "
 
@@ -275,7 +259,6 @@ msgstr "Prostor boja: "
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
 #: ../panels/color/cc-color-panel.c:132
-#| msgid "No profile"
 msgid "Test profile: "
 msgstr "Probni profil: "
 
@@ -310,31 +293,26 @@ msgstr "Sve datoteke"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:504
-#| msgid "Available Profiles"
 msgid "Available Profiles for Displays"
 msgstr "Dostupni profili za ekrane"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:508
-#| msgid "Available Profiles"
 msgid "Available Profiles for Scanners"
 msgstr "Dostupni profili za skenere"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:512
-#| msgid "Available Profiles"
 msgid "Available Profiles for Printers"
 msgstr "Dostupni profili za ÅtampaÄe"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:516
-#| msgid "Available Profiles"
 msgid "Available Profiles for Cameras"
 msgstr "Dostupni profili za fotoaparate"
 
 #. TRANSLATORS: this is the dialog title in the 'Add profile' UI
 #: ../panels/color/cc-color-panel.c:520
-#| msgid "Available Profiles"
 msgid "Available Profiles for Webcams"
 msgstr "Dostupni profili za veb kamerice"
 
@@ -776,34 +754,30 @@ msgid "Clock;Timezone;Location;"
 msgstr "Sat;Vremenska zona;Mesto;"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
-#| msgid "Change your region and language settings"
 msgid "Change system time and date settings"
 msgstr "Izmenite podeÅavanja vremena i datuma na sistemu"
 
 #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
 msgid "To change time or date settings, you need to authenticate."
-msgstr "Da izmenite podeÅavanja vremena i datuma, morate da potvrdite identitet."
+msgstr ""
+"Da izmenite podeÅavanja vremena i datuma, morate da potvrdite identitet."
 
 #: ../panels/display/cc-display-panel.c:473
-#| msgid "Normal"
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Normalno"
 
 #: ../panels/display/cc-display-panel.c:474
-#| msgid "Counterclockwise"
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Suprotno smeru kazaljke na satu"
 
 #: ../panels/display/cc-display-panel.c:475
-#| msgid "Clockwise"
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "U smeru kazaljke na satu"
 
 #: ../panels/display/cc-display-panel.c:476
-#| msgid "180 Degrees"
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 stepeni"
@@ -855,7 +829,6 @@ msgstr "%a %l:%M %p"
 #: ../panels/display/cc-display-panel.c:2262
 #: ../panels/display/cc-display-panel.c:2314
 #, c-format
-#| msgid "Automatic configuration"
 msgid "Failed to apply configuration: %s"
 msgstr "Nisam uspeo da primenim podeÅavanje: %s"
 
@@ -872,12 +845,10 @@ msgid "Could not get screen information"
 msgstr "Ne mogu da dobijem podatke o ekranu"
 
 #: ../panels/display/display-capplet.ui.h:2
-#| msgid "_Resolution:"
 msgid "_Resolution"
 msgstr "_Rezolucija"
 
 #: ../panels/display/display-capplet.ui.h:3
-#| msgid "R_otation:"
 msgid "R_otation"
 msgstr "_Okrenutost"
 
@@ -1039,7 +1010,7 @@ msgid "Video CD"
 msgstr "Video CD"
 
 #: ../panels/info/cc-info-panel.c:1473
-#: ../panels/keyboard/keyboard-shortcuts.c:1627
+#: ../panels/keyboard/keyboard-shortcuts.c:1617
 msgid "Section"
 msgstr "Odeljak"
 
@@ -1077,7 +1048,6 @@ msgid "Checking for Updates"
 msgstr "Proveravam aÅuriranja"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
-#| msgid "View details"
 msgid "Details"
 msgstr "Detalji"
 
@@ -1087,15 +1057,13 @@ msgstr "Informacije o sistemu"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
-#| msgid ""
-#| "device;system;information;memory;processor;version;default;application;"
-#| "fallback;preferred;"
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"ureÄaj;sistem;informacije;memorija;procesor;izdanje;osnovno;program;prebaciva"
-"nje;omiljeno;cd;dvd;usb;zvuk;snimak;disk;uklonjivi;medijum;samopokretanje;"
+"ureÄaj;sistem;informacije;memorija;procesor;izdanje;osnovno;program;"
+"prebacivanje;omiljeno;cd;dvd;usb;zvuk;snimak;disk;uklonjivi;medijum;"
+"samopokretanje;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1162,22 +1130,18 @@ msgid "Select how media should be handled"
 msgstr "Izaberite kako treba da se rukuje medijima"
 
 #: ../panels/info/info.ui.h:20
-#| msgid "CD _audio:"
 msgid "CD _audio"
 msgstr "CD _audio"
 
 #: ../panels/info/info.ui.h:21
-#| msgid "_DVD video:"
 msgid "_DVD video"
 msgstr "_DVD video"
 
 #: ../panels/info/info.ui.h:22
-#| msgid "_Music player:"
 msgid "_Music player"
 msgstr "_MuziÄki program"
 
 #: ../panels/info/info.ui.h:23
-#| msgid "_Software:"
 msgid "_Software"
 msgstr "_Softver"
 
@@ -1275,12 +1239,10 @@ msgid "Search"
 msgstr "Pretraga"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:1
-#| msgid "Screen"
 msgid "Screenshots"
 msgstr "Snimci ekrana"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:2
-#| msgid "Take a photo..."
 msgid "Take a screenshot"
 msgstr "Napravi snimak ekrana"
 
@@ -1323,27 +1285,22 @@ msgid "Universal Access"
 msgstr "Univerzalni pristup"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:2
-#| msgid "Turn on or off:"
 msgid "Turn zoom on or off"
 msgstr "UkljuÄi/iskljuÄi uveÄanje"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:3
-#| msgid "Zoom in:"
 msgid "Zoom in"
 msgstr "UveÄaj"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:4
-#| msgid "Zoom out:"
 msgid "Zoom out"
 msgstr "Umanji"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:5
-#| msgid "Turn on or off:"
 msgid "Turn screen reader on or off"
 msgstr "UkljuÄi/iskljuÄi ÄitaÄ ekrana"
 
 #: ../panels/keyboard/50-accessibility.xml.in.h:6
-#| msgid "Toggle on-screen keyboard"
 msgid "Turn on-screen keyboard on or off"
 msgstr "UkljuÄi/iskljuÄi ekransku tastaturu"
 
@@ -1446,7 +1403,6 @@ msgid "S_peed:"
 msgstr "_Brzina:"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:17
-#| msgid "Cursor blinks speed"
 msgid "Cursor blink speed"
 msgstr "Brzina treptanja kursora"
 
@@ -1460,16 +1416,15 @@ msgid "Typing"
 msgstr "Kucanje"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
-#| msgid "Shortcut"
 msgid "Add Shortcut"
 msgstr "Dodaj preÄicu"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:21
-#| msgid "Shortcut"
 msgid "Remove Shortcut"
 msgstr "Ukloni preÄicu"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:22
+#: ../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."
@@ -1484,8 +1439,8 @@ msgstr "PreÄice"
 #: ../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 "Proizvoljne preÄice"
 
@@ -1495,14 +1450,14 @@ msgstr "<Nepoznata radnja>"
 
 #. 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:215
 #: ../panels/user-accounts/um-fingerprint-dialog.c:216
 msgid "Disabled"
 msgstr "IskljuÄeno"
 
-#: ../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 "
@@ -1513,7 +1468,7 @@ msgstr ""
 "ovaj taster.\n"
 "Probajte da pridodate taster kao Åto je âCtrl, Alt ili Åiftâ."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1237
+#: ../panels/keyboard/keyboard-shortcuts.c:1227
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1522,21 +1477,22 @@ msgstr ""
 "PreÄica â%sâ se veÄ koristi za\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 "Ukoliko dodelite preÄicu za â%sâ, preÄica â%sâ Äe biti iskljuÄena."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1248
+#: ../panels/keyboard/keyboard-shortcuts.c:1238
 msgid "_Reassign"
 msgstr "_Ponovo dodeli"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1676
+#: ../panels/keyboard/keyboard-shortcuts.c:1666
+#: ../panels/wacom/cc-wacom-page.c:472
 msgid "Action"
 msgstr "Radnja"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1699
+#: ../panels/keyboard/keyboard-shortcuts.c:1688
 msgid "Shortcut"
 msgstr "PreÄica"
 
@@ -1586,7 +1542,9 @@ msgid "_Sensitivity:"
 msgstr "O_setljivost:"
 
 #. low sensitivity
+#. TRANSLATORS: secondary battery
 #: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/power/cc-power-panel.c:570
 msgid "Low"
 msgstr "Mala"
 
@@ -1610,7 +1568,6 @@ msgid "Small"
 msgstr "Mala"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:21
-#| msgid "Thr_eshold:"
 msgid "Drag Threshold"
 msgstr "Prag prevlaÄenja"
 
@@ -1629,13 +1586,13 @@ msgid "_Timeout:"
 msgstr "_Interval:"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:27
-#| msgid "Double-Click Timeout"
 msgid "Double-click timeout"
 msgstr "Vreme za dupli klik"
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:29
 msgid "To test your settings, try to double-click on the face."
-msgstr "Da isprobate vaÅa podeÅavanja, pokuÅajte dvaput da kliknite na figuricu."
+msgstr ""
+"Da isprobate vaÅa podeÅavanja, pokuÅajte dvaput da kliknite na figuricu."
 
 #: ../panels/mouse/gnome-mouse-properties.ui.h:30
 msgid "Mouse"
@@ -1779,7 +1736,6 @@ msgstr ""
 "izgubljeni"
 
 #: ../panels/network/cc-network-panel.c:2722
-#| msgid "Format:"
 msgid "Forget"
 msgstr "Zaboravi"
 
@@ -1815,7 +1771,6 @@ msgstr "_Zaustavi vruÄu taÄku"
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
 #: ../panels/network/cc-network-panel.c:3342
-#| msgid "Air_plane Mode"
 msgid "Airplane Mode"
 msgstr "ReÅim u avionu"
 
@@ -1829,7 +1784,6 @@ msgstr "PodeÅavanja mreÅe"
 
 #. Translators: those are keywords for the network control-center panel
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-#| msgid "Network;Wireless;IP;LAN;"
 msgid "Network;Wireless;IP;LAN;Proxy;"
 msgstr "MreÅa;BeÅiÄna;IP;LAN;Posrednik"
 
@@ -1865,7 +1819,6 @@ msgid "Automatic"
 msgstr "Automatski"
 
 #: ../panels/network/network.ui.h:8
-#| msgid "Add device"
 msgid "Add Device"
 msgstr "Dodaj ureÄaj"
 
@@ -1886,7 +1839,6 @@ msgid "DNS"
 msgstr "DNS"
 
 #: ../panels/network/network.ui.h:16
-#| msgid "Device"
 msgid "Device Off"
 msgstr "UreÄaj je iskljuÄen"
 
@@ -1912,7 +1864,6 @@ msgid "Security Key"
 msgstr "KljuÄ bezbednosti"
 
 #: ../panels/network/network.ui.h:22
-#| msgid "Network"
 msgid "Forget Network"
 msgstr "Zaboravi mreÅu"
 
@@ -1954,7 +1905,6 @@ msgid "Username"
 msgstr "KorisniÄko ime"
 
 #: ../panels/network/network.ui.h:33
-#| msgid "Disabled"
 msgid "Disable VPN"
 msgstr "IskljuÄi VPN"
 
@@ -1987,22 +1937,18 @@ msgid "_Socks Host"
 msgstr "_PrikljuÄci domaÄina:"
 
 #: ../panels/network/network.ui.h:41
-#| msgid "_HTTP Proxy"
 msgid "HTTP Port"
 msgstr "HTTP port"
 
 #: ../panels/network/network.ui.h:42
-#| msgid "H_TTPS Proxy"
 msgid "HTTPS Port"
 msgstr "HTTPS port"
 
 #: ../panels/network/network.ui.h:43
-#| msgid "_FTP Proxy"
 msgid "FTP Port"
 msgstr "FTP port"
 
 #: ../panels/network/network.ui.h:44
-#| msgid "_Socks Host"
 msgid "Socks Port"
 msgstr "Port prikljuÄaka"
 
@@ -2120,7 +2066,6 @@ msgstr "_Prijavi me"
 #. * The title is not visible when using GNOME Shell
 #: ../panels/online-accounts/cc-online-accounts-panel.c:461
 #: ../panels/online-accounts/online-accounts.ui.h:1
-#| msgid "My Account"
 msgid "Add Account"
 msgstr "Dodaj nalog"
 
@@ -2170,7 +2115,6 @@ msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;"
 msgstr "Gugl;Fejsbuk;Tviter;Jahu;Veb;Na mreÅi;Äaskanje;Kalendar;PoÅta;Kontakt;"
 
 #: ../panels/online-accounts/online-accounts.ui.h:2
-#| msgid "My Account"
 msgid "Remove Account"
 msgstr "Ukloni nalog"
 
@@ -2178,12 +2122,12 @@ msgstr "Ukloni nalog"
 msgid "Select an account"
 msgstr "Izaberite nalog"
 
-#: ../panels/power/cc-power-panel.c:160
+#: ../panels/power/cc-power-panel.c:162
 msgid "Unknown time"
 msgstr "Nepoznato vreme"
 
 # bug(danilo): plural-forms
-#: ../panels/power/cc-power-panel.c:166
+#: ../panels/power/cc-power-panel.c:168
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -2192,7 +2136,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuta"
 msgstr[3] "Jedan minut"
 
-#: ../panels/power/cc-power-panel.c:178
+#: ../panels/power/cc-power-panel.c:180
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2203,12 +2147,12 @@ msgstr[3] "Jedan sat"
 
 #. 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 "%d %s %d %s"
 
-#: ../panels/power/cc-power-panel.c:187
+#: ../panels/power/cc-power-panel.c:189
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -2217,7 +2161,7 @@ msgstr[2] "sati"
 msgstr[3] "sat"
 
 # bug(danilo): plural-forms
-#: ../panels/power/cc-power-panel.c:188
+#: ../panels/power/cc-power-panel.c:190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -2225,40 +2169,158 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../panels/power/cc-power-panel.c:265
-msgid "Battery charging"
-msgstr "Baterija se puni"
+#. 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 "Punjenje â %s do potpune napunjenosti"
 
-#: ../panels/power/cc-power-panel.c:268
-msgid "Battery discharging"
-msgstr "Baterija se prazni"
+#. 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 "Baterija je skoro prazna, preostalo vreme: %s"
 
-#: ../panels/power/cc-power-panel.c:279
-msgid "UPS charging"
-msgstr "UPS se puni"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#: ../panels/power/cc-power-panel.c:249
+#, c-format
+#| msgid "On battery power"
+msgid "Using battery power - %s remaining"
+msgstr "Napajanje iz baterije obezbeÄuje joÅ %s rada"
+
+#. TRANSLATORS: primary battery
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:266 ../panels/power/cc-power-panel.c:558
+#| msgid "UPS charging"
+msgid "Charging"
+msgstr "Punjenje je u toku"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:271
+#| msgid "On battery power"
+msgid "Using battery power"
+msgstr "Napajanje iz baterije"
 
-#: ../panels/power/cc-power-panel.c:282
-msgid "UPS discharging"
-msgstr "UPS se prazni"
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:275 ../panels/power/cc-power-panel.c:580
+msgid "Charging - fully charged"
+msgstr "Punjenje â potpuno napunjena"
+
+#. TRANSLATORS: primary battery
+#: ../panels/power/cc-power-panel.c:279 ../panels/power/cc-power-panel.c:584
+msgid "Empty"
+msgstr "Prazna"
 
 #. 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:347
 #, c-format
-msgid "%s until charged (%.0lf%%)"
-msgstr "%s dok se ne napuni (%.0lf%%)"
+msgid "Caution low UPS, %s remaining"
+msgstr "UPS je skoro prazan, obezbeÄuje joÅ %s rada"
 
 #. 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:353
 #, c-format
-msgid "%s until empty (%.0lf%%)"
-msgstr "%s dok se ne isprazni (%.0lf%%)"
+msgid "Using UPS power - %s remaining"
+msgstr "Napajanje iz UPS-a obezbeÄuje joÅ %s rada"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:371
+msgid "Caution low UPS"
+msgstr "UPS je skoro prazan"
+
+#. TRANSLATORS: UPS battery
+#: ../panels/power/cc-power-panel.c:376
+msgid "Using UPS power"
+msgstr "Napajanje iz UPS-a"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:428
+msgid "Your secondary battery is fully charged"
+msgstr "VaÅa pomoÄna baterija je potpuno napunjena"
+
+#. TRANSLATORS: secondary battery is normally in the media bay
+#: ../panels/power/cc-power-panel.c:432
+msgid "Your secondary battery is empty"
+msgstr "VaÅa pomoÄna baterija je prazna"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:515
+#| msgid "Wireless"
+msgid "Wireless mouse"
+msgstr "BeÅiÄni miÅ"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:519
+#| msgid "Screen keyboard"
+msgid "Wireless keyboard"
+msgstr "BeÅiÄna tastatura"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:523
+msgid "Uninterruptible power supply"
+msgstr "Neprekidiv izvor napajanja"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:527
+msgid "Personal digital assistant"
+msgstr "LiÄni digitalni pomoÄnik"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:531
+msgid "Cellphone"
+msgstr "Mobilni telefon"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:535
+#| msgid "_Music player"
+msgid "Media player"
+msgstr "MuziÄki ureÄaj"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:539
+#| msgid "Wacom Tablet"
+msgid "Tablet"
+msgstr "Tablica"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:543
+#| msgctxt "print job"
+#| msgid "Completed"
+msgid "Computer"
+msgstr "RaÄunar"
+
+#. TRANSLATORS: secondary battery, misc
+#: ../panels/power/cc-power-panel.c:547
+#| msgid "Battery charging"
+msgid "Battery"
+msgstr "Baterija"
+
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:565
+#| msgid "Calibration"
+msgid "Caution"
+msgstr "Upozorenje"
 
-#. 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
-#, c-format
-msgid "%.0lf%% charged"
-msgstr "%.0lf%% napunjenosti"
+#. TRANSLATORS: secondary battery
+#: ../panels/power/cc-power-panel.c:575
+#| msgctxt "Password strength"
+#| msgid "Good"
+msgid "Good"
+msgstr "Dobra"
+
+#: ../panels/power/cc-power-panel.c:1083
+#| msgid "_Type:"
+msgid "Tip:"
+msgstr "Vrsta:"
+
+#: ../panels/power/cc-power-panel.c:1084
+#| msgid "Sound Settings"
+msgid "Screen Settings"
+msgstr "PodeÅavanja ekrana"
+
+#: ../panels/power/cc-power-panel.c:1085
+msgid "affect how much power is used"
+msgstr "odreÄuje koliko napajanja se koristi"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
@@ -2278,7 +2340,6 @@ msgid "Hibernate"
 msgstr "Zamrzni"
 
 #: ../panels/power/power.ui.h:2
-#| msgid "Power"
 msgid "Power off"
 msgstr "Ugasi"
 
@@ -2559,21 +2620,21 @@ msgstr "_TraÅi po adresi"
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../panels/printers/pp-new-printer-dialog.c:665
+#: ../panels/printers/pp-new-printer-dialog.c:654
 msgid "Getting devices..."
 msgstr "Preuzimam ureÄaje..."
 
 #. 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 "Nisam pronaÅao lokalne ÅtampaÄe"
 
 #. 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 "Nisam pronaÅao mreÅne ÅtampaÄe"
 
-#: ../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."
@@ -2582,52 +2643,50 @@ msgstr ""
 "usluge mdns, ipp, ipp-klijent i samba-klijent na mreÅnoj barijeri."
 
 #. 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 "UreÄaji"
 
 #. 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 "Lokalni"
 
 #. 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 "MreÅni"
 
 #. 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 "Vrsta ureÄaja"
 
 #. 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 "Automatsko podeÅavanje"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1865
+#: ../panels/printers/pp-new-printer-dialog.c:1842
 msgid "Opening firewall for mDNS connections"
 msgstr "Otvaram mreÅnu barijeru za mDNS veze"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1874
+#: ../panels/printers/pp-new-printer-dialog.c:1851
 msgid "Opening firewall for Samba connections"
 msgstr "Otvaram mreÅnu barijeru za Samba veze"
 
-#: ../panels/printers/pp-new-printer-dialog.c:1883
+#: ../panels/printers/pp-new-printer-dialog.c:1860
 msgid "Opening firewall for IPP connections"
 msgstr "Otvaram mreÅnu barijeru za IPP veze"
 
 #: ../panels/printers/printers.ui.h:1
-#| msgid "Add printer"
 msgid "Add Printer"
 msgstr "Dodaj ÅtampaÄ"
 
 #: ../panels/printers/printers.ui.h:2
-#| msgid "Remove printer"
 msgid "Remove Printer"
 msgstr "Ukloni ÅtampaÄ"
 
@@ -2680,18 +2739,15 @@ msgid "Active Print Jobs"
 msgstr "Aktivni poslovi Åtampanja"
 
 #: ../panels/printers/printers.ui.h:22
-#| msgid "Remove printer"
 msgid "Resume Printing"
 msgstr "Nastavi Åtampanje"
 
 # ranije je bilo âsavetiâ, ali moÅda je bolje âhintoviâ
 #: ../panels/printers/printers.ui.h:23
-#| msgid "Printing..."
 msgid "Pause Printing"
 msgstr "Pauziraj Åtampanje"
 
 #: ../panels/printers/printers.ui.h:24
-#| msgid "Active Print Jobs"
 msgid "Cancel Print Job"
 msgstr "OtkaÅi posao Åtampanja"
 
@@ -2701,12 +2757,10 @@ msgid "Printer Options"
 msgstr "Opcije ÅtampaÄa"
 
 #: ../panels/printers/printers.ui.h:27
-#| msgid "Add printer"
 msgid "Add User"
 msgstr "Dodaj korisnika"
 
 #: ../panels/printers/printers.ui.h:28
-#| msgid "Remove printer"
 msgid "Remove User"
 msgstr "Ukloni korisnika"
 
@@ -2805,12 +2859,10 @@ msgid "Install languages..."
 msgstr "Instaliraj jezike..."
 
 #: ../panels/region/gnome-region-panel.ui.h:4
-#| msgid "Language"
 msgid "Add Language"
 msgstr "Dodaj jezik"
 
 #: ../panels/region/gnome-region-panel.ui.h:5
-#| msgid "Region and Language"
 msgid "Remove Language"
 msgstr "Ukloni jezik"
 
@@ -2823,12 +2875,10 @@ msgid "Select a region (change will be applied the next time you log in)"
 msgstr "Izaberite oblast (izmene Äe biti primenjene pri sledeÄem prijavljivanju)"
 
 #: ../panels/region/gnome-region-panel.ui.h:8
-#| msgid "_Region:"
 msgid "Add Region"
 msgstr "Dodaj region"
 
 #: ../panels/region/gnome-region-panel.ui.h:9
-#| msgid "Remove printer"
 msgid "Remove Region"
 msgstr "Ukloni region"
 
@@ -2861,12 +2911,10 @@ msgid "Formats"
 msgstr "Oblici"
 
 #: ../panels/region/gnome-region-panel.ui.h:17
-#| msgid "Layout"
 msgid "Add Layout"
 msgstr "Dodaj raspored"
 
 #: ../panels/region/gnome-region-panel.ui.h:18
-#| msgid "Choose a Layout"
 msgid "Remove Layout"
 msgstr "Ukloni raspored"
 
@@ -2875,12 +2923,10 @@ msgid "Move Up"
 msgstr "Pomeri gore"
 
 #: ../panels/region/gnome-region-panel.ui.h:20
-#| msgid "Volume down"
 msgid "Move Down"
 msgstr "Pomeri dole"
 
 #: ../panels/region/gnome-region-panel.ui.h:21
-#| msgid "Preview"
 msgid "Preview Layout"
 msgstr "PrikaÅi raspored"
 
@@ -2951,7 +2997,6 @@ msgid "Default"
 msgstr "Osnovno"
 
 #: ../panels/screen/gnome-screen-panel.desktop.in.in.h:1
-#| msgid "Brightness"
 msgid "Brightness and Lock"
 msgstr "Osvetljenost i zakljuÄavanje"
 
@@ -2996,7 +3041,6 @@ msgid "Brightness"
 msgstr "Osvetljenost"
 
 #: ../panels/screen/screen.ui.h:12
-#| msgid "Suspend when inactive for:"
 msgid "_Turn screen off when inactive for:"
 msgstr "Kada je ekran neaktivan _iskljuÄi ga nakon:"
 
@@ -3314,16 +3358,13 @@ msgstr "PodeÅavanja univerzalnog pristupa"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
-#| msgid ""
-#| "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;"
-#| "size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys"
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;"
 "AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;"
 msgstr ""
-"Tastatura;MiÅ;a11y;PristupaÄnost;Kontrast;Zum;ÄitaÄ ekrana;tekst;slovni "
-"lik;veliÄina;Pristup Iksu;Lepljivi tasteri;Spori tasteri;OdskoÄni "
-"tasteri;Tasteri miÅa;"
+"Tastatura;MiÅ;a11y;PristupaÄnost;Kontrast;Zum;ÄitaÄ ekrana;tekst;slovni lik;"
+"veliÄina;Pristup Iksu;Lepljivi tasteri;Spori tasteri;OdskoÄni tasteri;Tasteri "
+"miÅa;"
 
 #: ../panels/universal-access/uap.ui.h:1
 msgid "On screen keyboard"
@@ -3590,7 +3631,6 @@ msgid "Trigger a secondary click by holding down the primary button"
 msgstr "UkljuÄi/iskljuÄi sekundarni klik drÅeÄi pritisnut primarni taster"
 
 #: ../panels/universal-access/uap.ui.h:81
-#| msgid "Simulated Secondary Click"
 msgid "Secondary click delay"
 msgstr "Zastoj sekundarnog klika"
 
@@ -3615,7 +3655,6 @@ msgid "Hover Click"
 msgstr "Klik lebdenja"
 
 #: ../panels/universal-access/uap.ui.h:91
-#| msgid "_Mouse Settings"
 msgid "Mouse Settings"
 msgstr "PodeÅavanja miÅa"
 
@@ -3644,22 +3683,18 @@ msgid "High/Inverse"
 msgstr "Visok/Obrnut"
 
 #: ../panels/universal-access/zoom-options.c:334
-#| msgid "Screen"
 msgid "1/4 Screen"
 msgstr "1/4 ekrana"
 
 #: ../panels/universal-access/zoom-options.c:335
-#| msgid "Screen"
 msgid "1/2 Screen"
 msgstr "1/2 ekrana"
 
 #: ../panels/universal-access/zoom-options.c:336
-#| msgid "Screen"
 msgid "3/4 Screen"
 msgstr "3/4 ekrana"
 
 #: ../panels/universal-access/zoom-options.ui.h:1
-#| msgid "Login Options"
 msgid "Zoom Options"
 msgstr "Opcije uveÄanja"
 
@@ -3668,12 +3703,10 @@ msgid "Magnification:"
 msgstr "UveÄavanje:"
 
 #: ../panels/universal-access/zoom-options.ui.h:3
-#| msgid "Allowed users"
 msgid "Follow mouse cursor"
 msgstr "Prati kursor miÅa"
 
 #: ../panels/universal-access/zoom-options.ui.h:4
-#| msgid "Screen Reader"
 msgid "Screen part:"
 msgstr "Deo ekrana:"
 
@@ -3694,7 +3727,6 @@ msgid "Magnifier cursor moves with contents"
 msgstr "Kursor lupe se pomera sa sadrÅajima"
 
 #: ../panels/universal-access/zoom-options.ui.h:9
-#| msgid "Magnifier zoom in"
 msgid "Magnifier Position:"
 msgstr "PoloÅaj lupe:"
 
@@ -3704,7 +3736,6 @@ msgstr "Debljina:"
 
 #. short delay
 #: ../panels/universal-access/zoom-options.ui.h:12
-#| msgid "China"
 msgid "Thin"
 msgstr "Tanko"
 
@@ -3718,7 +3749,6 @@ msgid "Length:"
 msgstr "Trajanje:"
 
 #: ../panels/universal-access/zoom-options.ui.h:16
-#| msgid "Color"
 msgid "Color:"
 msgstr "Boja:"
 
@@ -3731,7 +3761,6 @@ msgid "Overlaps mouse cursor"
 msgstr "Preklapa kursor miÅa"
 
 #: ../panels/universal-access/zoom-options.ui.h:19
-#| msgid "Screen"
 msgid "Full Screen"
 msgstr "Ceo ekran"
 
@@ -3744,12 +3773,10 @@ msgid "Bottom Half"
 msgstr "Donja polovina"
 
 #: ../panels/universal-access/zoom-options.ui.h:22
-#| msgid "Left"
 msgid "Left Half"
 msgstr "Leva polovina"
 
 #: ../panels/universal-access/zoom-options.ui.h:23
-#| msgid "Right"
 msgid "Right Half"
 msgstr "Desna polovina"
 
@@ -3970,12 +3997,10 @@ msgid "Account Information"
 msgstr "Informacije o nalogu"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
-#| msgid "User Accounts"
 msgid "Add User Account"
 msgstr "Dodaj korisniÄki nalog"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
-#| msgid "User Accounts"
 msgid "Remove User Account"
 msgstr "Ukloni korisniÄki nalog"
 
@@ -4000,7 +4025,6 @@ msgid "_Fingerprint Login"
 msgstr "Prijavljivanje _otiskom prsta"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
-#| msgid "User Accounts"
 msgid "User Icon"
 msgstr "Ikonica korisnika"
 
@@ -4327,15 +4351,11 @@ msgstr ""
 "kliknite prvo na ikonicu * "
 
 #: ../panels/user-accounts/um-user-panel.c:923
-#| msgid "Create new account"
 msgid "Create a user account"
 msgstr "Napravite korisniÄki nalog"
 
 #: ../panels/user-accounts/um-user-panel.c:934
 #: ../panels/user-accounts/um-user-panel.c:1223
-#| msgid ""
-#| "To create a user,\n"
-#| "click the * icon first"
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4344,15 +4364,11 @@ msgstr ""
 "kliknite prvo na ikonicu *"
 
 #: ../panels/user-accounts/um-user-panel.c:943
-#| msgid "Delete the selected user"
 msgid "Delete the selected user account"
 msgstr "ObriÅite izabrani korisniÄki nalog"
 
 #: ../panels/user-accounts/um-user-panel.c:955
 #: ../panels/user-accounts/um-user-panel.c:1228
-#| msgid ""
-#| "To delete the selected user,\n"
-#| "click the * icon first"
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4436,7 +4452,6 @@ msgid "Tracking Mode"
 msgstr "ReÅim praÄenja"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-#| msgid "Left-Handed Orientation:"
 msgid "Left-Handed Orientation"
 msgstr "Levoruko usmerenje"
 
@@ -4453,7 +4468,6 @@ msgid "Calibrate..."
 msgstr "Podesi..."
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:12
-#| msgid "Options..."
 msgid "Map Buttons..."
 msgstr "Mapiraj dugmad..."
 
@@ -4525,78 +4539,82 @@ msgstr "Gornje dugme"
 msgid "Stylus"
 msgstr "Penkalo"
 
-#: ../panels/wacom/gsd-wacom-device.c:790
+#: ../panels/wacom/button-mapping.ui.h:1
+#| msgid "Map Buttons..."
+msgid "Map Buttons"
+msgstr "Mapiraj dugmad"
+
+#: ../panels/wacom/button-mapping.ui.h:2
+msgid "Map buttons to functions"
+msgstr "Mapirajte dugmad prema funkcijama"
+
+#: ../panels/wacom/gsd-wacom-device.c:876
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "ReÅim levog prstena #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:797
+#: ../panels/wacom/gsd-wacom-device.c:883
 #, c-format
-#| msgid "Right ring finger"
 msgid "Right Ring Mode #%d"
 msgstr "ReÅim desnog prstena #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:824
+#: ../panels/wacom/gsd-wacom-device.c:911
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "ReÅim leve dodirne trake #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:831
+#: ../panels/wacom/gsd-wacom-device.c:918
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "ReÅim desne dodirne trake #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:846
+#: ../panels/wacom/gsd-wacom-device.c:933
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "ReÅim prekidaÄa levog dodirnog prstena"
 
-#: ../panels/wacom/gsd-wacom-device.c:848
+#: ../panels/wacom/gsd-wacom-device.c:935
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "ReÅim prekidaÄa desnog dodirnog prstena"
 
-#: ../panels/wacom/gsd-wacom-device.c:851
+#: ../panels/wacom/gsd-wacom-device.c:938
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "ReÅim prekidaÄa leve dodirne trake"
 
-#: ../panels/wacom/gsd-wacom-device.c:853
+#: ../panels/wacom/gsd-wacom-device.c:940
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "ReÅim prekidaÄa desne dodirne trake"
 
-#: ../panels/wacom/gsd-wacom-device.c:858
+#: ../panels/wacom/gsd-wacom-device.c:945
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "ReÅim prekidaÄa #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:928
+#: ../panels/wacom/gsd-wacom-device.c:1017
 #, c-format
-#| msgid "Lower Button"
 msgid "Left Button #%d"
 msgstr "Levo dugme #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:931
+#: ../panels/wacom/gsd-wacom-device.c:1020
 #, c-format
-#| msgid "Right Mouse Button Click"
 msgid "Right Button #%d"
 msgstr "Desno dugme #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:934
+#: ../panels/wacom/gsd-wacom-device.c:1023
 #, c-format
-#| msgid "Top Button"
 msgid "Top Button #%d"
 msgstr "Gornje dugme #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:937
+#: ../panels/wacom/gsd-wacom-device.c:1026
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Donje dugme #%d"
 
 #. Text printed on screen
 #: ../panels/wacom/calibrator/gui_gtk.c:70
-#| msgid "Calibration"
 msgid "Screen Calibration"
 msgstr "Kalibracija ekrana"
 
@@ -4614,12 +4632,11 @@ msgstr "Otkriven je loÅ klik, poÄinjem iz poÄetka..."
 
 #: ../panels/wacom/cc-wacom-nav-button.c:89
 #, c-format
-#| msgid "%d x %d"
 msgid "%d of %d"
 msgstr "%d od %d"
 
 #: ../panels/wacom/cc-wacom-stylus-page.c:374
-#| msgid "Top Button"
+#: ../panels/wacom/cc-wacom-page.c:451
 msgid "Button"
 msgstr "Dugme"
 
@@ -4667,10 +4684,24 @@ msgid "Preferences;Settings;"
 msgstr "Postavke;PodeÅavanja;"
 
 #: ../shell/shell.ui.h:2
-#| msgid "_All Settings"
 msgid "All Settings"
 msgstr "Sva podeÅavanja"
 
+#~ msgid "Battery discharging"
+#~ msgstr "Baterija se prazni"
+
+#~ msgid "UPS discharging"
+#~ msgstr "UPS se prazni"
+
+#~ msgid "%s until charged (%.0lf%%)"
+#~ msgstr "%s dok se ne napuni (%.0lf%%)"
+
+#~ msgid "%s until empty (%.0lf%%)"
+#~ msgstr "%s dok se ne isprazni (%.0lf%%)"
+
+#~ msgid "%.0lf%% charged"
+#~ msgstr "%.0lf%% napunjenosti"
+
 #~ msgid "Could not get session bus while applying display configuration"
 #~ msgstr ""
 #~ "Ne mogu da dobijem magistralu sesije tokom primenjivanja podeÅavanja za ekran"



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