[gnome-bluetooth/gnome-2-32] Updated Serbian translation

[Miloš Popović <mpopovic src gnome org>]

commit edba514ae7c5955d453faf0babdb97b272aa829c
Author: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>
Date:   Tue Aug 24 05:19:19 2010 +0200

    Updated Serbian translation

 po/sr.po       |  253 ++++++++++++++++++++++++++------------------------------
 po/sr latin po |  253 ++++++++++++++++++++++++++------------------------------
 2 files changed, 234 insertions(+), 272 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index b369176..6af4b39 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,22 +7,22 @@
 # Launchpad Contributions:
 #  Bojan BogdanoviÄ? https://launchpad.net/~bojce\n";
 #  Marcel Holtmann https://launchpad.net/~holtmann\n";
-#
 # Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>, 2007-2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-bluetooth\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "bluetooth&component=general\n"
-"POT-Creation-Date: 2010-02-17 16:54+0000\n"
-"PO-Revision-Date: 2010-03-07 17:45+0100\n"
+"POT-Creation-Date: 2010-08-13 08:08+0000\n"
+"PO-Revision-Date: 2010-08-23 21:22+0200\n"
 "Last-Translator: Ð?илоÑ? Ð?оповиÑ? <gpopac gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: ../lib/bluetooth-client.c:127
 msgid "All types"
@@ -82,12 +82,11 @@ msgid "Tablet"
 msgstr "ТаблеÑ?"
 
 #: ../lib/bluetooth-client.c:156
-#| msgid "Audio device"
 msgid "Video device"
 msgstr "Ð?идео Ñ?Ñ?еÑ?аÑ?"
 
 #: ../lib/bluetooth-client.c:158 ../lib/bluetooth-chooser.c:129
-#: ../lib/bluetooth-filter-widget.c:85
+#: ../lib/bluetooth-filter-widget.c:81
 msgid "Unknown"
 msgstr "Ð?епознаÑ?о"
 
@@ -121,57 +120,53 @@ msgstr "УÑ?еÑ?аÑ?"
 msgid "Type"
 msgstr "Ð?Ñ?Ñ?Ñ?а"
 
-#: ../lib/bluetooth-filter-widget.c:75
+#: ../lib/bluetooth-filter-widget.c:71
 msgid "All categories"
 msgstr "Све каÑ?егоÑ?иÑ?е"
 
-#: ../lib/bluetooth-filter-widget.c:77
+#: ../lib/bluetooth-filter-widget.c:73
 msgid "Paired"
 msgstr "УпаÑ?ени"
 
-#: ../lib/bluetooth-filter-widget.c:79
+#: ../lib/bluetooth-filter-widget.c:75
 msgid "Trusted"
 msgstr "Ð?д повеÑ?еÑ?а"
 
-#: ../lib/bluetooth-filter-widget.c:81
+#: ../lib/bluetooth-filter-widget.c:77
 msgid "Not paired or trusted"
 msgstr "Ð?еÑ?паÑ?ени или неповеÑ?Ñ?иви"
 
-#: ../lib/bluetooth-filter-widget.c:83
+#: ../lib/bluetooth-filter-widget.c:79
 msgid "Paired or trusted"
 msgstr "УпаÑ?ени или повеÑ?Ñ?иви"
 
-#: ../lib/bluetooth-filter-widget.c:238
-#| msgid "Show Only Bluetooth Devices With..."
+#: ../lib/bluetooth-filter-widget.c:227
 msgid "<b>Show Only Bluetooth Devices With...</b>"
 msgstr "<b>Ð?Ñ?икажи Ñ?амо Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?е Ñ?а...</b>"
 
 #. The device category filter
-#: ../lib/bluetooth-filter-widget.c:254
+#: ../lib/bluetooth-filter-widget.c:243
 msgid "Device _category:"
 msgstr "_Ð?аÑ?егоÑ?иÑ?а Ñ?Ñ?еÑ?аÑ?а:"
 
-#: ../lib/bluetooth-filter-widget.c:269
-#| msgid "Select the device category to filter above list"
+#: ../lib/bluetooth-filter-widget.c:258
 msgid "Select the device category to filter"
 msgstr "Ð?забеÑ?иÑ?е каÑ?егоÑ?иÑ?Ñ? Ñ?Ñ?еÑ?аÑ?а за Ñ?Ñ?жаваÑ?е Ñ?пиÑ?ка"
 
 #. The device type filter
-#: ../lib/bluetooth-filter-widget.c:283
+#: ../lib/bluetooth-filter-widget.c:272
 msgid "Device _type:"
 msgstr "_Ð?Ñ?Ñ?Ñ?а Ñ?Ñ?еÑ?аÑ?а:"
 
-#: ../lib/bluetooth-filter-widget.c:304
-#| msgid "Select the device type to filter above list"
+#: ../lib/bluetooth-filter-widget.c:293
 msgid "Select the device type to filter"
 msgstr "Ð?забеÑ?иÑ?е вÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?а за Ñ?Ñ?жаваÑ?е Ñ?пиÑ?ка"
 
-#: ../lib/bluetooth-filter-widget.c:310
-#| msgid "Input devices (mice, keyboards, ...)"
+#: ../lib/bluetooth-filter-widget.c:299
 msgid "Input devices (mice, keyboards, etc.)"
 msgstr "Улазни Ñ?Ñ?еÑ?аÑ?и (миÑ?, Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?а,...)"
 
-#: ../lib/bluetooth-filter-widget.c:314
+#: ../lib/bluetooth-filter-widget.c:303
 msgid "Headphones, headsets and other audio devices"
 msgstr "СлÑ?Ñ?алиÑ?е и дÑ?Ñ?ги звÑ?Ñ?ни Ñ?Ñ?еÑ?аÑ?и"
 
@@ -186,93 +181,92 @@ msgstr "Ð?оÑ?иÑ?Ñ?и оваÑ? GPS Ñ?Ñ?еÑ?аÑ? за геолоÑ?иÑ?аÑ?е"
 msgid "Access the Internet using your cell phone (test)"
 msgstr "Ð?Ñ?иÑ?Ñ?Ñ?пи Ð?нÑ?еÑ?неÑ?Ñ? пÑ?еко мобилног Ñ?елеÑ?она (пÑ?обно)"
 
-#: ../applet/main.c:139
+#: ../applet/main.c:147
 msgid "Select Device to Browse"
 msgstr "Ð?забеÑ?иÑ?е Ñ?Ñ?еÑ?аÑ? за Ñ?азгледаÑ?е"
 
-#: ../applet/main.c:143
+#: ../applet/main.c:151
 msgid "_Browse"
 msgstr "_РазгледаÑ?"
 
-#: ../applet/main.c:152
+#: ../applet/main.c:160
 msgid "Select device to browse"
 msgstr "Ð?забеÑ?иÑ?е Ñ?Ñ?еÑ?аÑ? за Ñ?азгледаÑ?е"
 
-#: ../applet/main.c:329 ../properties/properties-adapter-off.ui.h:1
+#: ../applet/main.c:380 ../properties/properties-adapter-off.ui.h:1
 msgid "Turn On Bluetooth"
 msgstr "УкÑ?Ñ?Ñ?и Ð?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../applet/main.c:330
+#: ../applet/main.c:381
 msgid "Bluetooth: Off"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ?: иÑ?кÑ?Ñ?Ñ?ен"
 
-#: ../applet/main.c:333
+#: ../applet/main.c:384
 msgid "Turn Off Bluetooth"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?и Ð?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../applet/main.c:334
+#: ../applet/main.c:385
 msgid "Bluetooth: On"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ?: Ñ?кÑ?Ñ?Ñ?ен"
 
-#: ../applet/main.c:339 ../applet/notify.c:148
+#: ../applet/main.c:390 ../applet/notify.c:154
 msgid "Bluetooth: Disabled"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ?: иÑ?кÑ?Ñ?Ñ?ен"
 
-#: ../applet/main.c:482
+#: ../applet/main.c:544
 msgid "Disconnecting..."
 msgstr "Ð?Ñ?екидам везÑ?..."
 
-#: ../applet/main.c:485 ../sendto/main.c:217 ../sendto/main.c:314
+#: ../applet/main.c:547 ../sendto/main.c:217 ../sendto/main.c:314
 msgid "Connecting..."
 msgstr "Ð?овезÑ?Ñ?ем Ñ?е..."
 
-#: ../applet/main.c:488 ../applet/main.c:829
+#: ../applet/main.c:550 ../applet/main.c:891
 msgid "Connected"
 msgstr "Ð?овезан"
 
-#: ../applet/main.c:491 ../applet/main.c:829
+#: ../applet/main.c:553 ../applet/main.c:891
 msgid "Disconnected"
 msgstr "Ð?еповезан"
 
-#: ../applet/main.c:847 ../applet/main.c:911 ../properties/adapter.c:371
+#: ../applet/main.c:909 ../applet/main.c:973 ../properties/adapter.c:380
 msgid "Disconnect"
 msgstr "Ð?Ñ?екини везÑ?"
 
-#: ../applet/main.c:847 ../applet/main.c:911
+#: ../applet/main.c:909 ../applet/main.c:973
 msgid "Connect"
 msgstr "Ð?овежи Ñ?е"
 
-#: ../applet/main.c:860
+#: ../applet/main.c:922
 msgid "Send files..."
 msgstr "Ð?оÑ?аÑ?и даÑ?оÑ?еке..."
 
-#: ../applet/main.c:870
+#: ../applet/main.c:932
 msgid "Browse files..."
 msgstr "РазгледаÑ? даÑ?оÑ?еке..."
 
-#: ../applet/main.c:881
+#: ../applet/main.c:943
 msgid "Open Keyboard Preferences..."
 msgstr "Ð?одеÑ?и Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?Ñ?..."
 
-#: ../applet/main.c:889
+#: ../applet/main.c:951
 msgid "Open Mouse Preferences..."
 msgstr "Ð?одеÑ?и миÑ?а..."
 
-#: ../applet/main.c:899
-#| msgid "Open Mouse Preferences..."
+#: ../applet/main.c:961
 msgid "Open Sound Preferences..."
 msgstr "Ð?Ñ?воÑ?и поÑ?Ñ?авке звÑ?ка..."
 
-#: ../applet/main.c:1026
+#: ../applet/main.c:1081
 msgid "Debug"
 msgstr "ТÑ?ажи гÑ?еÑ?ке"
 
 #. Parse command-line options
-#: ../applet/main.c:1046
+#: ../applet/main.c:1100
 msgid "- Bluetooth applet"
 msgstr "â?? Ð?лÑ?Ñ?Ñ?Ñ?ово пÑ?огÑ?амÑ?е"
 
-#: ../applet/main.c:1051
+#: ../applet/main.c:1105
 #, c-format
 msgid ""
 "%s\n"
@@ -281,11 +275,20 @@ msgstr ""
 "%s\n"
 "Ð?окÑ?ениÑ?е â??%s --helpâ?? за Ñ?пиÑ?ак Ñ?виÑ? доÑ?Ñ?Ñ?пниÑ? опÑ?иÑ?а из командне линиÑ?е.\n"
 
-#: ../applet/main.c:1068
+#: ../applet/main.c:1122
 msgid "Bluetooth Applet"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ? пÑ?огÑ?амÑ?е"
 
-#: ../applet/notify.c:148
+#. Power switch
+#. Translators: This string appears next to a toggle switch which controls
+#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
+#. * switches in the Network UI of Moblin
+#: ../applet/notify.c:115 ../properties/bluetooth-properties.desktop.in.in.h:1
+#: ../moblin/moblin-panel.c:1455
+msgid "Bluetooth"
+msgstr "Ð?лÑ?Ñ?Ñ?Ñ?"
+
+#: ../applet/notify.c:154
 msgid "Bluetooth: Enabled"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ?: Ñ?кÑ?Ñ?Ñ?ен"
 
@@ -367,7 +370,7 @@ msgstr "Ð?лÑ?Ñ?Ñ?Ñ?: пÑ?овеÑ?авам"
 msgid "Browse files on device..."
 msgstr "РазгледаÑ? даÑ?оÑ?еке на Ñ?Ñ?еÑ?аÑ?Ñ?..."
 
-#: ../applet/popup-menu.ui.h:3 ../properties/adapter.c:330
+#: ../applet/popup-menu.ui.h:3 ../properties/adapter.c:339
 #: ../moblin/moblin-panel.c:1297 ../moblin/moblin-panel.c:1385
 msgid "Devices"
 msgstr "УÑ?еÑ?аÑ?и"
@@ -416,60 +419,59 @@ msgstr "_Ð?оклапа Ñ?е"
 msgid "_Show input"
 msgstr "Ð?_Ñ?икажи Ñ?ноÑ?"
 
-#: ../properties/main.c:91
+#: ../properties/main.c:90
 msgid "Cannot start \"Personal File Sharing\" Preferences"
 msgstr "Ð?е могÑ? да покÑ?енем поÑ?Ñ?авке деÑ?еÑ?а лиÑ?ниÑ? даÑ?оÑ?ека"
 
-#: ../properties/main.c:96
+#: ../properties/main.c:95
 msgid ""
 "Please verify that the \"Personal File Sharing\" program is correctly "
 "installed."
 msgstr ""
 "Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е пÑ?огÑ?ам â??Ð?еÑ?еÑ?е лиÑ?ниÑ? даÑ?оÑ?екаâ?? пÑ?авилно инÑ?Ñ?алиÑ?ан."
 
-#: ../properties/main.c:125
+#: ../properties/main.c:124
 msgid "Bluetooth Preferences"
 msgstr "Ð?оÑ?Ñ?авке за Ð?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../properties/main.c:140
+#: ../properties/main.c:139
 msgid "_Show Bluetooth icon"
 msgstr "Ð?Ñ?икажи _икониÑ?Ñ? за Ð?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../properties/main.c:164
+#: ../properties/main.c:163
 msgid "Receive Files"
 msgstr "Ð?Ñ?имаÑ? даÑ?оÑ?еке"
 
-#: ../properties/main.c:212
+#: ../properties/main.c:211
 msgid "Output a list of currently known devices"
 msgstr "Ð?Ñ?пиÑ?и Ñ?ве познаÑ?е Ñ?Ñ?еÑ?аÑ?е"
 
-#: ../properties/main.c:250
+#: ../properties/main.c:249
 msgid "Bluetooth Properties"
 msgstr "Ð?оÑ?Ñ?авке за Ð?лÑ?Ñ?Ñ?Ñ?"
 
 #. The discoverable checkbox
-#: ../properties/adapter.c:277
-#| msgid "Make computer _discoverable"
+#: ../properties/adapter.c:286
 msgid "Make computer _visible"
 msgstr "Ð?оÑ?Ñ?ави Ñ?аÑ?Ñ?наÑ? као _видÑ?ив"
 
-#: ../properties/adapter.c:300
+#: ../properties/adapter.c:309
 msgid "Friendly name"
 msgstr "Ð?ме за пÑ?иÑ?аÑ?еÑ?е"
 
-#: ../properties/adapter.c:362
+#: ../properties/adapter.c:371
 msgid "Set up _new device..."
 msgstr "Ð?одеÑ?и _нови Ñ?Ñ?еÑ?аÑ?..."
 
-#: ../properties/adapter.c:385
+#: ../properties/adapter.c:394
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../properties/adapter.c:661
+#: ../properties/adapter.c:671
 msgid "Bluetooth is disabled"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ? Ñ?е онемогÑ?Ñ?ен"
 
-#: ../properties/adapter.c:697
+#: ../properties/adapter.c:711
 msgid "No Bluetooth adapters present"
 msgstr "Ð?иÑ?е пÑ?иÑ?Ñ?Ñ?ан Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?"
 
@@ -477,51 +479,29 @@ msgstr "Ð?иÑ?е пÑ?иÑ?Ñ?Ñ?ан Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?"
 msgid "Your computer does not have any Bluetooth adapters plugged in."
 msgstr "Ð?аÑ? Ñ?аÑ?Ñ?наÑ? нема пÑ?икÑ?Ñ?Ñ?ене Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?е."
 
-#. Power switch
-#. Translators: This string appears next to a toggle switch which controls
-#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
-#. * switches in the Network UI of Moblin
-#: ../properties/bluetooth-properties.desktop.in.in.h:1
-#: ../moblin/moblin-panel.c:1455
-msgid "Bluetooth"
-msgstr "Ð?лÑ?Ñ?Ñ?Ñ?"
+#: ../properties/properties-killed-adapter.ui.h:1
+msgid "Bluetooth has been disabled by a switch on your computer."
+msgstr "Ð?лÑ?Ñ?Ñ?Ñ? Ñ?е иÑ?кÑ?Ñ?Ñ?ен пÑ?еко дÑ?гмеÑ?а на Ñ?аÑ?Ñ?наÑ?Ñ?."
 
 #: ../properties/bluetooth-properties.desktop.in.in.h:2
 msgid "Configure Bluetooth settings"
 msgstr "Ð?змени подеÑ?аваÑ?а за Ð?лÑ?Ñ?Ñ?Ñ?"
 
-#: ../properties/bluetooth-manager.schemas.in.h:1
-msgid "Whether to show the notification icon"
-msgstr "Ð?а ли да пÑ?икажем икониÑ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони"
-
-#: ../properties/bluetooth-manager.schemas.in.h:2
-msgid "Whether to show the notification icon."
-msgstr "Ð?а ли да пÑ?икажем икониÑ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони."
-
-#: ../properties/gconf-bridge.c:1233
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf гÑ?еÑ?ка: %s"
-
-#: ../properties/gconf-bridge.c:1238
-msgid "All further errors shown only on terminal."
-msgstr "Ð?аÑ?едне гÑ?еÑ?ке Ñ?е Ñ?е иÑ?пиÑ?иваÑ?и Ñ? Ñ?еÑ?миналÑ?."
-
 #. translators:
 #. * The '%s' is the device name, for example:
 #. * Pairing with 'Sony Bluetooth Headset' cancelled
 #.
-#: ../wizard/main.c:205 ../wizard/main.c:326
+#: ../wizard/main.c:206 ../wizard/main.c:327
 #, c-format
 msgid "Pairing with '%s' cancelled"
 msgstr "Ð?Ñ?екинÑ?Ñ?о Ñ?е Ñ?паÑ?иваÑ?е Ñ?а â??%sâ??"
 
-#: ../wizard/main.c:245 ../moblin/moblin-panel.c:1049
+#: ../wizard/main.c:246 ../moblin/moblin-panel.c:1049
 #, c-format
 msgid "Please confirm that the PIN displayed on '%s' matches this one."
 msgstr "Ð?оÑ?вÑ?диÑ?е да ли Ñ?е Ð?Ð?Ð? иÑ?пиÑ?ан на â??%sâ?? поклапа Ñ?а овим."
 
-#: ../wizard/main.c:299 ../moblin/moblin-panel.c:1100
+#: ../wizard/main.c:300 ../moblin/moblin-panel.c:1100
 msgid "Please enter the following PIN:"
 msgstr "УнеÑ?иÑ?е Ñ?ледеÑ?и Ð?Ð?Ð?:"
 
@@ -529,7 +509,7 @@ msgstr "УнеÑ?иÑ?е Ñ?ледеÑ?и Ð?Ð?Ð?:"
 #. * The '%s' is the device name, for example:
 #. * Setting up 'Sony Bluetooth Headset' failed
 #.
-#: ../wizard/main.c:382
+#: ../wizard/main.c:383
 #, c-format
 msgid "Setting up '%s' failed"
 msgstr "Ð?иÑ?е Ñ?Ñ?пело подеаваÑ?е â??%sâ??"
@@ -538,18 +518,18 @@ msgstr "Ð?иÑ?е Ñ?Ñ?пело подеаваÑ?е â??%sâ??"
 #. * The '%s' is the device name, for example:
 #. * Connecting to 'Sony Bluetooth Headset' now...
 #.
-#: ../wizard/main.c:513
+#: ../wizard/main.c:514
 #, c-format
 msgid "Connecting to '%s'..."
 msgstr "Ð?овезÑ?Ñ?ем Ñ?е Ñ?а â??%sâ??..."
 
-#: ../wizard/main.c:549 ../moblin/moblin-panel.c:658
+#: ../wizard/main.c:550 ../moblin/moblin-panel.c:658
 #, c-format
 msgid ""
 "Please enter the following PIN on '%s' and press â??Enterâ?? on the keyboard:"
 msgstr "УнеÑ?иÑ?е Ñ?ледеÑ?и Ð?Ð?Ð? на â??%sâ?? и пÑ?иÑ?иÑ?ниÑ?е â??Ð?нÑ?еÑ?â?? на Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?и:"
 
-#: ../wizard/main.c:551 ../moblin/moblin-panel.c:660
+#: ../wizard/main.c:552 ../moblin/moblin-panel.c:660
 #, c-format
 msgid "Please enter the following PIN on '%s':"
 msgstr "УнеÑ?иÑ?е Ñ?ледеÑ?и Ð?Ð?Ð? на â??%sâ??:"
@@ -558,12 +538,12 @@ msgstr "УнеÑ?иÑ?е Ñ?ледеÑ?и Ð?Ð?Ð? на â??%sâ??:"
 #. * The '%s' is the device name, for example:
 #. * Please wait while finishing setup on 'Sony Bluetooth Headset'...
 #.
-#: ../wizard/main.c:572
+#: ../wizard/main.c:573
 #, c-format
 msgid "Please wait while finishing setup on device '%s'..."
 msgstr "СаÑ?екаÑ?Ñ?е док не завÑ?Ñ?им подеÑ?аваÑ?е Ñ?Ñ?еÑ?аÑ?а â??%sâ??..."
 
-#: ../wizard/main.c:588 ../moblin/moblin-panel.c:686
+#: ../wizard/main.c:589 ../moblin/moblin-panel.c:686
 #, c-format
 msgid "Successfully set up new device '%s'"
 msgstr "Ð?одеаваÑ?е новог Ñ?Ñ?еÑ?аÑ?а â??%sâ?? Ñ?е Ñ?Ñ?пело"
@@ -585,7 +565,6 @@ msgid "Bluetooth New Device Setup"
 msgstr "Ð?одеÑ?аваÑ?е новог Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?а"
 
 #: ../wizard/wizard.ui.h:5
-#| msgid "Custom PIN code:"
 msgid "Custom PIN:"
 msgstr "Ð?Ñ?оизвоÑ?ни Ð?Ð?Ð?:"
 
@@ -601,50 +580,55 @@ msgstr "Ð?иÑ?е Ñ?Ñ?пело подеÑ?аваÑ?е Ñ?Ñ?еÑ?аÑ?а"
 msgid "Device search"
 msgstr "ТÑ?ажим Ñ?Ñ?еÑ?аÑ?"
 
+#: ../wizard/wizard.ui.h:9
+#| msgid "Does not match"
+msgid "Do not pair"
+msgstr "Ð?е Ñ?паÑ?Ñ?Ñ?"
+
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:10 ../moblin/moblin-panel.c:1253
+#: ../wizard/wizard.ui.h:11 ../moblin/moblin-panel.c:1253
 msgid "Does not match"
 msgstr "Ð?е поклапа Ñ?е"
 
-#: ../wizard/wizard.ui.h:11
+#: ../wizard/wizard.ui.h:12
 msgid "Finishing New Device Setup"
 msgstr "Ð?авÑ?Ñ?авам подеÑ?аваÑ?е новог Ñ?Ñ?еÑ?аÑ?а"
 
 #. Translators: this is a PIN with a set value, such as 1111, or 0000
-#: ../wizard/wizard.ui.h:13
+#: ../wizard/wizard.ui.h:14
 msgid "Fixed PIN"
 msgstr "Ð?адаÑ?и Ð?Ð?Ð?"
 
-#: ../wizard/wizard.ui.h:14
+#: ../wizard/wizard.ui.h:15
 msgid "Introduction"
 msgstr "Увод"
 
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:16 ../moblin/moblin-panel.c:1249
+#: ../wizard/wizard.ui.h:17 ../moblin/moblin-panel.c:1249
 msgid "Matches"
 msgstr "Ð?оклапа Ñ?е"
 
-#: ../wizard/wizard.ui.h:17
+#: ../wizard/wizard.ui.h:18
 msgid "PIN Options"
 msgstr "Ð?пÑ?иÑ?е за Ð?Ð?Ð?"
 
-#: ../wizard/wizard.ui.h:18
+#: ../wizard/wizard.ui.h:19
 msgid "PIN _options..."
 msgstr "_Ð?пÑ?иÑ?е за Ð?Ð?Ð?..."
 
-#: ../wizard/wizard.ui.h:19 ../moblin/moblin-panel.c:1163
+#: ../wizard/wizard.ui.h:20 ../moblin/moblin-panel.c:1163
 msgid "Select the additional services you want to use with your device:"
 msgstr "Ð?забеÑ?иÑ?е додаÑ?не Ñ?еÑ?виÑ?е за Ñ?поÑ?Ñ?ебÑ? на овом Ñ?Ñ?еÑ?аÑ?Ñ?:"
 
-#: ../wizard/wizard.ui.h:20
+#: ../wizard/wizard.ui.h:21
 msgid "Select the device you want to setup"
 msgstr "Ð?забеÑ?иÑ?е Ñ?Ñ?еÑ?аÑ? коÑ?и желиÑ?е да подеÑ?иÑ?е"
 
-#: ../wizard/wizard.ui.h:21
+#: ../wizard/wizard.ui.h:22
 msgid "Setup Completed"
 msgstr "Ð?одеÑ?аваÑ?е Ñ?е завÑ?Ñ?ено"
 
-#: ../wizard/wizard.ui.h:22
+#: ../wizard/wizard.ui.h:23
 msgid ""
 "The Bluetooth new device setup will walk you through the process of "
 "configuring Bluetooth enabled devices for use with this computer."
@@ -652,11 +636,7 @@ msgstr ""
 "Ð?одеÑ?аваÑ?е новог Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?а Ñ?е ваÑ? пÑ?овеÑ?Ñ?и кÑ?оз подеÑ?аваÑ?е дозвоÑ?ениÑ? "
 "Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?а на овом Ñ?аÑ?Ñ?наÑ?Ñ?."
 
-#: ../wizard/wizard.ui.h:23
-#| msgid ""
-#| "The device will need to be within 10 meters of your computer, and be "
-#| "â??discoverableâ?? (sometimes called â??visibleâ??). Check the device's manual if "
-#| "in doubt."
+#: ../wizard/wizard.ui.h:24
 msgid ""
 "The device will need to be within 10 meters of your computer, and be "
 "â??visibleâ?? (sometimes called â??discoverableâ??). Check the device's manual if in "
@@ -665,15 +645,15 @@ msgstr ""
 "УÑ?еÑ?аÑ? моÑ?а да бÑ?де на наÑ?виÑ?е 10 меÑ?аÑ?а од Ñ?аÑ?Ñ?наÑ?а, и да бÑ?де подеÑ?ен као "
 "â??видÑ?ивâ??; Ð?Ñ?овеÑ?иÑ?е Ñ?пÑ?Ñ?Ñ?Ñ?во за Ñ?поÑ?Ñ?ебÑ? Ñ?Ñ?еÑ?аÑ?а Ñ?колико ниÑ?Ñ?е Ñ?игÑ?Ñ?ни."
 
-#: ../wizard/wizard.ui.h:24
+#: ../wizard/wizard.ui.h:25
 msgid "Welcome to the Bluetooth new device setup"
 msgstr "Ð?обÑ?одоÑ?ли Ñ? подеÑ?аваÑ?е новог Ð?лÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?а"
 
-#: ../wizard/wizard.ui.h:25
+#: ../wizard/wizard.ui.h:26
 msgid "_Automatic PIN selection"
 msgstr "_Сам изабеÑ?и Ð?Ð?Ð?"
 
-#: ../wizard/wizard.ui.h:26
+#: ../wizard/wizard.ui.h:27
 msgid "_Restart Setup"
 msgstr "_Ð?оново покÑ?ени подеÑ?аваÑ?е"
 
@@ -684,6 +664,7 @@ msgid_plural "%'d seconds"
 msgstr[0] "%'d Ñ?екÑ?нда"
 msgstr[1] "%'d Ñ?екÑ?нде"
 msgstr[2] "%'d Ñ?екÑ?нди"
+msgstr[3] "%'d Ñ?екÑ?нда"
 
 #: ../sendto/main.c:167 ../sendto/main.c:180
 #, c-format
@@ -692,6 +673,7 @@ msgid_plural "%'d minutes"
 msgstr[0] "%'d минÑ?Ñ?"
 msgstr[1] "%'d минÑ?Ñ?а"
 msgstr[2] "%'d минÑ?Ñ?а"
+msgstr[3] "%'d минÑ?Ñ?а"
 
 #: ../sendto/main.c:178
 #, c-format
@@ -700,6 +682,7 @@ msgid_plural "%'d hours"
 msgstr[0] "%'d Ñ?аÑ?"
 msgstr[1] "%'d Ñ?аÑ?а"
 msgstr[2] "%'d Ñ?аÑ?и"
+msgstr[3] "%'d Ñ?аÑ?"
 
 #: ../sendto/main.c:188
 #, c-format
@@ -708,13 +691,13 @@ msgid_plural "approximately %'d hours"
 msgstr[0] "пÑ?иближно %'d Ñ?аÑ?"
 msgstr[1] "пÑ?иближно %'d Ñ?аÑ?а"
 msgstr[2] "пÑ?иближно %'d Ñ?аÑ?и"
+msgstr[3] "пÑ?иближно %'d Ñ?аÑ?"
 
 #: ../sendto/main.c:249
 msgid "File Transfer"
 msgstr "Ð?Ñ?еноÑ?и даÑ?оÑ?ека"
 
 #: ../sendto/main.c:253
-#| msgid "_Reject"
 msgid "_Retry"
 msgstr "_Ð?Ñ?обаÑ? поново"
 
@@ -783,17 +766,16 @@ msgstr "Ð?еÑ?ени Ñ?даÑ?ени Ñ?Ñ?еÑ?аÑ?"
 msgid "Remote device's name"
 msgstr "Ð?ме Ñ?даÑ?еног Ñ?Ñ?еÑ?аÑ?а"
 
-#: ../sendto/nautilus-sendto-plugin.c:172
+#: ../sendto/nautilus-sendto-plugin.c:168
 msgid "Programming error, could not find the device in the list"
 msgstr "Ð?Ñ?еÑ?ка Ñ?нÑ?Ñ?аÑ? пÑ?огÑ?ама. Ð?е могÑ? да наÑ?ем Ñ?Ñ?еÑ?аÑ? Ñ?а Ñ?пиÑ?ка"
 
-#: ../sendto/nautilus-sendto-plugin.c:247
+#: ../sendto/nautilus-sendto-plugin.c:243
 #, c-format
 msgid "Obex Push file transfer unsupported"
 msgstr "Ð?иÑ?е подÑ?жано гÑ?Ñ?аÑ?е даÑ?оÑ?еке кÑ?оз Ð?бекÑ?"
 
-#: ../sendto/nautilus-sendto-plugin.c:266
-#| msgid "Bluetooth Status"
+#: ../sendto/nautilus-sendto-plugin.c:262
 msgid "Bluetooth (OBEX Push)"
 msgstr "Ð?лÑ?Ñ?Ñ?Ñ?а (гÑ?Ñ?аÑ?е кÑ?оз Ð?бекÑ?)"
 
@@ -802,23 +784,19 @@ msgid "Run in standalone mode"
 msgstr "Ð?окÑ?ени Ñ? Ñ?амоÑ?Ñ?алном Ñ?ежимÑ?"
 
 #: ../moblin/main.c:94 ../moblin/bluetooth-panel.desktop.in.in.h:2
-#| msgid "Bluetooth Manager"
 msgid "Moblin Bluetooth Panel"
 msgstr "Ð?облин повÑ?Ñ? за блÑ?Ñ?Ñ?Ñ?"
 
 #: ../moblin/main.c:95
-#| msgid "- Bluetooth applet"
 msgid "- Moblin Bluetooth Panel"
 msgstr "â?? Ð?облин повÑ?Ñ? за блÑ?Ñ?Ñ?Ñ?"
 
 #: ../moblin/main.c:122
-#| msgid "Bluetooth"
 msgid "bluetooth"
 msgstr "блÑ?Ñ?Ñ?Ñ?"
 
 #: ../moblin/moblin-panel.c:533
 #, c-format
-#| msgid "Pairing with '%s' finished"
 msgid "Pairing with %s failed."
 msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?паÑ?иваÑ?е Ñ?а %s."
 
@@ -827,17 +805,14 @@ msgid "<u>Pair</u>"
 msgstr "<u>УпаÑ?и</u>"
 
 #: ../moblin/moblin-panel.c:909
-#| msgid "Connect"
 msgid "<u>Connect</u>"
 msgstr "<u>Ð?овежи Ñ?е</u>"
 
 #: ../moblin/moblin-panel.c:928
-#| msgid "_Browse"
 msgid "<u>Browse</u>"
 msgstr "<u>РазгледаÑ?</u>"
 
 #: ../moblin/moblin-panel.c:1122
-#| msgid "Device Setup Failed"
 msgid "Device setup failed"
 msgstr "Ð?иÑ?е Ñ?Ñ?пело подеÑ?аваÑ?е Ñ?Ñ?еÑ?аÑ?а"
 
@@ -845,17 +820,14 @@ msgstr "Ð?иÑ?е Ñ?Ñ?пело подеÑ?аваÑ?е Ñ?Ñ?еÑ?аÑ?а"
 #: ../moblin/moblin-panel.c:1136 ../moblin/moblin-panel.c:1212
 #: ../moblin/moblin-panel.c:1261 ../moblin/moblin-panel.c:1323
 #: ../moblin/moblin-panel.c:1540
-#| msgid "Bluetooth device"
 msgid "Back to devices"
 msgstr "Ð?азад на Ñ?Ñ?еÑ?аÑ?е"
 
 #: ../moblin/moblin-panel.c:1175
-#| msgid "Phone"
 msgid "Done"
 msgstr "Ð?оÑ?ово"
 
 #: ../moblin/moblin-panel.c:1196 ../moblin/moblin-panel.c:1233
-#| msgid "Device Setup"
 msgid "Device setup"
 msgstr "Ð?одеÑ?аваÑ?е Ñ?Ñ?еÑ?аÑ?а"
 
@@ -865,13 +837,11 @@ msgstr "Ð?Ñ?икажи Ñ?амо:"
 
 #. Button for PIN options file
 #: ../moblin/moblin-panel.c:1350
-#| msgid "PIN Options"
 msgid "PIN options"
 msgstr "Ð?пÑ?иÑ?е за Ð?Ð?Ð?"
 
 #. Add new button
 #: ../moblin/moblin-panel.c:1433
-#| msgid "Set up new device..."
 msgid "Add a new device"
 msgstr "Ð?одаÑ? нови Ñ?Ñ?еÑ?аÑ?"
 
@@ -881,10 +851,21 @@ msgid "Send file from your computer"
 msgstr "Ð?оÑ?аÑ?и даÑ?оÑ?екÑ? Ñ?а Ñ?аÑ?Ñ?наÑ?а"
 
 #: ../moblin/bluetooth-panel.desktop.in.in.h:1
-#| msgid "Bluetooth Manager applet"
 msgid "Bluetooth Manager Panel"
 msgstr "Ð?Ñ?огÑ?амÑ?е за Ñ?пÑ?авÑ?аÑ?е Ð?лÑ?Ñ?Ñ?Ñ?ом"
 
+#~ msgid "Whether to show the notification icon"
+#~ msgstr "Ð?а ли да пÑ?икажем икониÑ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони"
+
+#~ msgid "Whether to show the notification icon."
+#~ msgstr "Ð?а ли да пÑ?икажем икониÑ?Ñ? Ñ? обавеÑ?Ñ?аÑ?ноÑ? зони."
+
+#~ msgid "GConf error: %s"
+#~ msgstr "GConf гÑ?еÑ?ка: %s"
+
+#~ msgid "All further errors shown only on terminal."
+#~ msgstr "Ð?аÑ?едне гÑ?еÑ?ке Ñ?е Ñ?е иÑ?пиÑ?иваÑ?и Ñ? Ñ?еÑ?миналÑ?."
+
 #~ msgid "A Bluetooth manager for the GNOME desktop"
 #~ msgstr "Ð?лÑ?Ñ?Ñ?Ñ? Ñ?пÑ?авник за Ð?ном"
 
diff --git a/po/sr latin po b/po/sr latin po
index 7b300ba..54f6031 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -7,22 +7,22 @@
 # Launchpad Contributions:
 #  Bojan BogdanoviÄ? https://launchpad.net/~bojce\n";
 #  Marcel Holtmann https://launchpad.net/~holtmann\n";
-#
 # MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2007-2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-bluetooth\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "bluetooth&component=general\n"
-"POT-Creation-Date: 2010-02-17 16:54+0000\n"
-"PO-Revision-Date: 2010-03-07 17:45+0100\n"
+"POT-Creation-Date: 2010-08-13 08:08+0000\n"
+"PO-Revision-Date: 2010-08-23 21:22+0200\n"
 "Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: ../lib/bluetooth-client.c:127
 msgid "All types"
@@ -82,12 +82,11 @@ msgid "Tablet"
 msgstr "Tablet"
 
 #: ../lib/bluetooth-client.c:156
-#| msgid "Audio device"
 msgid "Video device"
 msgstr "Video ureÄ?aj"
 
 #: ../lib/bluetooth-client.c:158 ../lib/bluetooth-chooser.c:129
-#: ../lib/bluetooth-filter-widget.c:85
+#: ../lib/bluetooth-filter-widget.c:81
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -121,57 +120,53 @@ msgstr "UreÄ?aj"
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../lib/bluetooth-filter-widget.c:75
+#: ../lib/bluetooth-filter-widget.c:71
 msgid "All categories"
 msgstr "Sve kategorije"
 
-#: ../lib/bluetooth-filter-widget.c:77
+#: ../lib/bluetooth-filter-widget.c:73
 msgid "Paired"
 msgstr "Upareni"
 
-#: ../lib/bluetooth-filter-widget.c:79
+#: ../lib/bluetooth-filter-widget.c:75
 msgid "Trusted"
 msgstr "Od poverenja"
 
-#: ../lib/bluetooth-filter-widget.c:81
+#: ../lib/bluetooth-filter-widget.c:77
 msgid "Not paired or trusted"
 msgstr "Neupareni ili nepoverljivi"
 
-#: ../lib/bluetooth-filter-widget.c:83
+#: ../lib/bluetooth-filter-widget.c:79
 msgid "Paired or trusted"
 msgstr "Upareni ili poverljivi"
 
-#: ../lib/bluetooth-filter-widget.c:238
-#| msgid "Show Only Bluetooth Devices With..."
+#: ../lib/bluetooth-filter-widget.c:227
 msgid "<b>Show Only Bluetooth Devices With...</b>"
 msgstr "<b>Prikaži samo Blutut ureÄ?aje sa...</b>"
 
 #. The device category filter
-#: ../lib/bluetooth-filter-widget.c:254
+#: ../lib/bluetooth-filter-widget.c:243
 msgid "Device _category:"
 msgstr "_Kategorija ureÄ?aja:"
 
-#: ../lib/bluetooth-filter-widget.c:269
-#| msgid "Select the device category to filter above list"
+#: ../lib/bluetooth-filter-widget.c:258
 msgid "Select the device category to filter"
 msgstr "Izaberite kategoriju ureÄ?aja za sužavanje spiska"
 
 #. The device type filter
-#: ../lib/bluetooth-filter-widget.c:283
+#: ../lib/bluetooth-filter-widget.c:272
 msgid "Device _type:"
 msgstr "_Vrsta ureÄ?aja:"
 
-#: ../lib/bluetooth-filter-widget.c:304
-#| msgid "Select the device type to filter above list"
+#: ../lib/bluetooth-filter-widget.c:293
 msgid "Select the device type to filter"
 msgstr "Izaberite vrstu ureÄ?aja za sužavanje spiska"
 
-#: ../lib/bluetooth-filter-widget.c:310
-#| msgid "Input devices (mice, keyboards, ...)"
+#: ../lib/bluetooth-filter-widget.c:299
 msgid "Input devices (mice, keyboards, etc.)"
 msgstr "Ulazni ureÄ?aji (miÅ¡, tastatura,...)"
 
-#: ../lib/bluetooth-filter-widget.c:314
+#: ../lib/bluetooth-filter-widget.c:303
 msgid "Headphones, headsets and other audio devices"
 msgstr "SluÅ¡alice i drugi zvuÄ?ni ureÄ?aji"
 
@@ -186,93 +181,92 @@ msgstr "Koristi ovaj GPS ureÄ?aj za geolociranje"
 msgid "Access the Internet using your cell phone (test)"
 msgstr "Pristupi Internetu preko mobilnog telefona (probno)"
 
-#: ../applet/main.c:139
+#: ../applet/main.c:147
 msgid "Select Device to Browse"
 msgstr "Izaberite ureÄ?aj za razgledanje"
 
-#: ../applet/main.c:143
+#: ../applet/main.c:151
 msgid "_Browse"
 msgstr "_Razgledaj"
 
-#: ../applet/main.c:152
+#: ../applet/main.c:160
 msgid "Select device to browse"
 msgstr "Izaberite ureÄ?aj za razgledanje"
 
-#: ../applet/main.c:329 ../properties/properties-adapter-off.ui.h:1
+#: ../applet/main.c:380 ../properties/properties-adapter-off.ui.h:1
 msgid "Turn On Bluetooth"
 msgstr "UkljuÄ?i Blutut"
 
-#: ../applet/main.c:330
+#: ../applet/main.c:381
 msgid "Bluetooth: Off"
 msgstr "Blutut: iskljuÄ?en"
 
-#: ../applet/main.c:333
+#: ../applet/main.c:384
 msgid "Turn Off Bluetooth"
 msgstr "IskljuÄ?i Blutut"
 
-#: ../applet/main.c:334
+#: ../applet/main.c:385
 msgid "Bluetooth: On"
 msgstr "Blutut: ukljuÄ?en"
 
-#: ../applet/main.c:339 ../applet/notify.c:148
+#: ../applet/main.c:390 ../applet/notify.c:154
 msgid "Bluetooth: Disabled"
 msgstr "Blutut: iskljuÄ?en"
 
-#: ../applet/main.c:482
+#: ../applet/main.c:544
 msgid "Disconnecting..."
 msgstr "Prekidam vezu..."
 
-#: ../applet/main.c:485 ../sendto/main.c:217 ../sendto/main.c:314
+#: ../applet/main.c:547 ../sendto/main.c:217 ../sendto/main.c:314
 msgid "Connecting..."
 msgstr "Povezujem se..."
 
-#: ../applet/main.c:488 ../applet/main.c:829
+#: ../applet/main.c:550 ../applet/main.c:891
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../applet/main.c:491 ../applet/main.c:829
+#: ../applet/main.c:553 ../applet/main.c:891
 msgid "Disconnected"
 msgstr "Nepovezan"
 
-#: ../applet/main.c:847 ../applet/main.c:911 ../properties/adapter.c:371
+#: ../applet/main.c:909 ../applet/main.c:973 ../properties/adapter.c:380
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../applet/main.c:847 ../applet/main.c:911
+#: ../applet/main.c:909 ../applet/main.c:973
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../applet/main.c:860
+#: ../applet/main.c:922
 msgid "Send files..."
 msgstr "Pošalji datoteke..."
 
-#: ../applet/main.c:870
+#: ../applet/main.c:932
 msgid "Browse files..."
 msgstr "Razgledaj datoteke..."
 
-#: ../applet/main.c:881
+#: ../applet/main.c:943
 msgid "Open Keyboard Preferences..."
 msgstr "Podesi tastaturu..."
 
-#: ../applet/main.c:889
+#: ../applet/main.c:951
 msgid "Open Mouse Preferences..."
 msgstr "Podesi miša..."
 
-#: ../applet/main.c:899
-#| msgid "Open Mouse Preferences..."
+#: ../applet/main.c:961
 msgid "Open Sound Preferences..."
 msgstr "Otvori postavke zvuka..."
 
-#: ../applet/main.c:1026
+#: ../applet/main.c:1081
 msgid "Debug"
 msgstr "Traži greške"
 
 #. Parse command-line options
-#: ../applet/main.c:1046
+#: ../applet/main.c:1100
 msgid "- Bluetooth applet"
 msgstr "â?? Blututovo programÄ?e"
 
-#: ../applet/main.c:1051
+#: ../applet/main.c:1105
 #, c-format
 msgid ""
 "%s\n"
@@ -281,11 +275,20 @@ msgstr ""
 "%s\n"
 "Pokrenite â??%s --helpâ?? za spisak svih dostupnih opcija iz komandne linije.\n"
 
-#: ../applet/main.c:1068
+#: ../applet/main.c:1122
 msgid "Bluetooth Applet"
 msgstr "Blutut programÄ?e"
 
-#: ../applet/notify.c:148
+#. Power switch
+#. Translators: This string appears next to a toggle switch which controls
+#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
+#. * switches in the Network UI of Moblin
+#: ../applet/notify.c:115 ../properties/bluetooth-properties.desktop.in.in.h:1
+#: ../moblin/moblin-panel.c:1455
+msgid "Bluetooth"
+msgstr "Blutut"
+
+#: ../applet/notify.c:154
 msgid "Bluetooth: Enabled"
 msgstr "Blutut: ukljuÄ?en"
 
@@ -367,7 +370,7 @@ msgstr "Blutut: proveravam"
 msgid "Browse files on device..."
 msgstr "Razgledaj datoteke na ureÄ?aju..."
 
-#: ../applet/popup-menu.ui.h:3 ../properties/adapter.c:330
+#: ../applet/popup-menu.ui.h:3 ../properties/adapter.c:339
 #: ../moblin/moblin-panel.c:1297 ../moblin/moblin-panel.c:1385
 msgid "Devices"
 msgstr "UreÄ?aji"
@@ -416,60 +419,59 @@ msgstr "_Poklapa se"
 msgid "_Show input"
 msgstr "P_rikaži unos"
 
-#: ../properties/main.c:91
+#: ../properties/main.c:90
 msgid "Cannot start \"Personal File Sharing\" Preferences"
 msgstr "Ne mogu da pokrenem postavke deljenja liÄ?nih datoteka"
 
-#: ../properties/main.c:96
+#: ../properties/main.c:95
 msgid ""
 "Please verify that the \"Personal File Sharing\" program is correctly "
 "installed."
 msgstr ""
 "Proverite da li je program â??Deljenje liÄ?nih datotekaâ?? pravilno instaliran."
 
-#: ../properties/main.c:125
+#: ../properties/main.c:124
 msgid "Bluetooth Preferences"
 msgstr "Postavke za Blutut"
 
-#: ../properties/main.c:140
+#: ../properties/main.c:139
 msgid "_Show Bluetooth icon"
 msgstr "Prikaži _ikonicu za Blutut"
 
-#: ../properties/main.c:164
+#: ../properties/main.c:163
 msgid "Receive Files"
 msgstr "Primaj datoteke"
 
-#: ../properties/main.c:212
+#: ../properties/main.c:211
 msgid "Output a list of currently known devices"
 msgstr "IspiÅ¡i sve poznate ureÄ?aje"
 
-#: ../properties/main.c:250
+#: ../properties/main.c:249
 msgid "Bluetooth Properties"
 msgstr "Postavke za Blutut"
 
 #. The discoverable checkbox
-#: ../properties/adapter.c:277
-#| msgid "Make computer _discoverable"
+#: ../properties/adapter.c:286
 msgid "Make computer _visible"
 msgstr "Postavi raÄ?unar kao _vidljiv"
 
-#: ../properties/adapter.c:300
+#: ../properties/adapter.c:309
 msgid "Friendly name"
 msgstr "Ime za prijatelje"
 
-#: ../properties/adapter.c:362
+#: ../properties/adapter.c:371
 msgid "Set up _new device..."
 msgstr "Podesi _novi ureÄ?aj..."
 
-#: ../properties/adapter.c:385
+#: ../properties/adapter.c:394
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../properties/adapter.c:661
+#: ../properties/adapter.c:671
 msgid "Bluetooth is disabled"
 msgstr "Blutut je onemoguÄ?en"
 
-#: ../properties/adapter.c:697
+#: ../properties/adapter.c:711
 msgid "No Bluetooth adapters present"
 msgstr "Nije prisuran Blutut ureÄ?aj"
 
@@ -477,51 +479,29 @@ msgstr "Nije prisuran Blutut ureÄ?aj"
 msgid "Your computer does not have any Bluetooth adapters plugged in."
 msgstr "VaÅ¡ raÄ?unar nema prikljuÄ?ene Blutut ureÄ?aje."
 
-#. Power switch
-#. Translators: This string appears next to a toggle switch which controls
-#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
-#. * switches in the Network UI of Moblin
-#: ../properties/bluetooth-properties.desktop.in.in.h:1
-#: ../moblin/moblin-panel.c:1455
-msgid "Bluetooth"
-msgstr "Blutut"
+#: ../properties/properties-killed-adapter.ui.h:1
+msgid "Bluetooth has been disabled by a switch on your computer."
+msgstr "Blutut je iskljuÄ?en preko dugmeta na raÄ?unaru."
 
 #: ../properties/bluetooth-properties.desktop.in.in.h:2
 msgid "Configure Bluetooth settings"
 msgstr "Izmeni podešavanja za Blutut"
 
-#: ../properties/bluetooth-manager.schemas.in.h:1
-msgid "Whether to show the notification icon"
-msgstr "Da li da prikažem ikonicu u obaveštajnoj zoni"
-
-#: ../properties/bluetooth-manager.schemas.in.h:2
-msgid "Whether to show the notification icon."
-msgstr "Da li da prikažem ikonicu u obaveštajnoj zoni."
-
-#: ../properties/gconf-bridge.c:1233
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf greška: %s"
-
-#: ../properties/gconf-bridge.c:1238
-msgid "All further errors shown only on terminal."
-msgstr "Naredne greÅ¡ke Ä?e se ispisivati u terminalu."
-
 #. translators:
 #. * The '%s' is the device name, for example:
 #. * Pairing with 'Sony Bluetooth Headset' cancelled
 #.
-#: ../wizard/main.c:205 ../wizard/main.c:326
+#: ../wizard/main.c:206 ../wizard/main.c:327
 #, c-format
 msgid "Pairing with '%s' cancelled"
 msgstr "Prekinuto je uparivanje sa â??%sâ??"
 
-#: ../wizard/main.c:245 ../moblin/moblin-panel.c:1049
+#: ../wizard/main.c:246 ../moblin/moblin-panel.c:1049
 #, c-format
 msgid "Please confirm that the PIN displayed on '%s' matches this one."
 msgstr "Potvrdite da li se PIN ispisan na â??%sâ?? poklapa sa ovim."
 
-#: ../wizard/main.c:299 ../moblin/moblin-panel.c:1100
+#: ../wizard/main.c:300 ../moblin/moblin-panel.c:1100
 msgid "Please enter the following PIN:"
 msgstr "Unesite sledeÄ?i PIN:"
 
@@ -529,7 +509,7 @@ msgstr "Unesite sledeÄ?i PIN:"
 #. * The '%s' is the device name, for example:
 #. * Setting up 'Sony Bluetooth Headset' failed
 #.
-#: ../wizard/main.c:382
+#: ../wizard/main.c:383
 #, c-format
 msgid "Setting up '%s' failed"
 msgstr "Nije uspelo podeavanje â??%sâ??"
@@ -538,18 +518,18 @@ msgstr "Nije uspelo podeavanje â??%sâ??"
 #. * The '%s' is the device name, for example:
 #. * Connecting to 'Sony Bluetooth Headset' now...
 #.
-#: ../wizard/main.c:513
+#: ../wizard/main.c:514
 #, c-format
 msgid "Connecting to '%s'..."
 msgstr "Povezujem se sa â??%sâ??..."
 
-#: ../wizard/main.c:549 ../moblin/moblin-panel.c:658
+#: ../wizard/main.c:550 ../moblin/moblin-panel.c:658
 #, c-format
 msgid ""
 "Please enter the following PIN on '%s' and press â??Enterâ?? on the keyboard:"
 msgstr "Unesite sledeÄ?i PIN na â??%sâ?? i pritisnite â??Enterâ?? na tastaturi:"
 
-#: ../wizard/main.c:551 ../moblin/moblin-panel.c:660
+#: ../wizard/main.c:552 ../moblin/moblin-panel.c:660
 #, c-format
 msgid "Please enter the following PIN on '%s':"
 msgstr "Unesite sledeÄ?i PIN na â??%sâ??:"
@@ -558,12 +538,12 @@ msgstr "Unesite sledeÄ?i PIN na â??%sâ??:"
 #. * The '%s' is the device name, for example:
 #. * Please wait while finishing setup on 'Sony Bluetooth Headset'...
 #.
-#: ../wizard/main.c:572
+#: ../wizard/main.c:573
 #, c-format
 msgid "Please wait while finishing setup on device '%s'..."
 msgstr "SaÄ?ekajte dok ne zavrÅ¡im podeÅ¡avanje ureÄ?aja â??%sâ??..."
 
-#: ../wizard/main.c:588 ../moblin/moblin-panel.c:686
+#: ../wizard/main.c:589 ../moblin/moblin-panel.c:686
 #, c-format
 msgid "Successfully set up new device '%s'"
 msgstr "Podeavanje novog ureÄ?aja â??%sâ?? je uspelo"
@@ -585,7 +565,6 @@ msgid "Bluetooth New Device Setup"
 msgstr "PodeÅ¡avanje novog Blutut ureÄ?aja"
 
 #: ../wizard/wizard.ui.h:5
-#| msgid "Custom PIN code:"
 msgid "Custom PIN:"
 msgstr "Proizvoljni PIN:"
 
@@ -601,50 +580,55 @@ msgstr "Nije uspelo podeÅ¡avanje ureÄ?aja"
 msgid "Device search"
 msgstr "Tražim ureÄ?aj"
 
+#: ../wizard/wizard.ui.h:9
+#| msgid "Does not match"
+msgid "Do not pair"
+msgstr "Ne uparuj"
+
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:10 ../moblin/moblin-panel.c:1253
+#: ../wizard/wizard.ui.h:11 ../moblin/moblin-panel.c:1253
 msgid "Does not match"
 msgstr "Ne poklapa se"
 
-#: ../wizard/wizard.ui.h:11
+#: ../wizard/wizard.ui.h:12
 msgid "Finishing New Device Setup"
 msgstr "ZavrÅ¡avam podeÅ¡avanje novog ureÄ?aja"
 
 #. Translators: this is a PIN with a set value, such as 1111, or 0000
-#: ../wizard/wizard.ui.h:13
+#: ../wizard/wizard.ui.h:14
 msgid "Fixed PIN"
 msgstr "Zadati PIN"
 
-#: ../wizard/wizard.ui.h:14
+#: ../wizard/wizard.ui.h:15
 msgid "Introduction"
 msgstr "Uvod"
 
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:16 ../moblin/moblin-panel.c:1249
+#: ../wizard/wizard.ui.h:17 ../moblin/moblin-panel.c:1249
 msgid "Matches"
 msgstr "Poklapa se"
 
-#: ../wizard/wizard.ui.h:17
+#: ../wizard/wizard.ui.h:18
 msgid "PIN Options"
 msgstr "Opcije za PIN"
 
-#: ../wizard/wizard.ui.h:18
+#: ../wizard/wizard.ui.h:19
 msgid "PIN _options..."
 msgstr "_Opcije za PIN..."
 
-#: ../wizard/wizard.ui.h:19 ../moblin/moblin-panel.c:1163
+#: ../wizard/wizard.ui.h:20 ../moblin/moblin-panel.c:1163
 msgid "Select the additional services you want to use with your device:"
 msgstr "Izaberite dodatne servise za upotrebu na ovom ureÄ?aju:"
 
-#: ../wizard/wizard.ui.h:20
+#: ../wizard/wizard.ui.h:21
 msgid "Select the device you want to setup"
 msgstr "Izaberite ureÄ?aj koji želite da podesite"
 
-#: ../wizard/wizard.ui.h:21
+#: ../wizard/wizard.ui.h:22
 msgid "Setup Completed"
 msgstr "Podešavanje je završeno"
 
-#: ../wizard/wizard.ui.h:22
+#: ../wizard/wizard.ui.h:23
 msgid ""
 "The Bluetooth new device setup will walk you through the process of "
 "configuring Bluetooth enabled devices for use with this computer."
@@ -652,11 +636,7 @@ msgstr ""
 "PodeÅ¡avanje novog Blutut ureÄ?aja Ä?e vas provesti kroz podeÅ¡avanje dozvoljenih "
 "Blutut ureÄ?aja na ovom raÄ?unaru."
 
-#: ../wizard/wizard.ui.h:23
-#| msgid ""
-#| "The device will need to be within 10 meters of your computer, and be "
-#| "â??discoverableâ?? (sometimes called â??visibleâ??). Check the device's manual if "
-#| "in doubt."
+#: ../wizard/wizard.ui.h:24
 msgid ""
 "The device will need to be within 10 meters of your computer, and be "
 "â??visibleâ?? (sometimes called â??discoverableâ??). Check the device's manual if in "
@@ -665,15 +645,15 @@ msgstr ""
 "UreÄ?aj mora da bude na najviÅ¡e 10 metara od raÄ?unara, i da bude podeÅ¡en kao "
 "â??vidljivâ??; Proverite uputstvo za upotrebu ureÄ?aja ukoliko niste sigurni."
 
-#: ../wizard/wizard.ui.h:24
+#: ../wizard/wizard.ui.h:25
 msgid "Welcome to the Bluetooth new device setup"
 msgstr "DobrodoÅ¡li u podeÅ¡avanje novog Blutut ureÄ?aja"
 
-#: ../wizard/wizard.ui.h:25
+#: ../wizard/wizard.ui.h:26
 msgid "_Automatic PIN selection"
 msgstr "_Sam izaberi PIN"
 
-#: ../wizard/wizard.ui.h:26
+#: ../wizard/wizard.ui.h:27
 msgid "_Restart Setup"
 msgstr "_Ponovo pokreni podešavanje"
 
@@ -684,6 +664,7 @@ msgid_plural "%'d seconds"
 msgstr[0] "%'d sekunda"
 msgstr[1] "%'d sekunde"
 msgstr[2] "%'d sekundi"
+msgstr[3] "%'d sekunda"
 
 #: ../sendto/main.c:167 ../sendto/main.c:180
 #, c-format
@@ -692,6 +673,7 @@ msgid_plural "%'d minutes"
 msgstr[0] "%'d minut"
 msgstr[1] "%'d minuta"
 msgstr[2] "%'d minuta"
+msgstr[3] "%'d minuta"
 
 #: ../sendto/main.c:178
 #, c-format
@@ -700,6 +682,7 @@ msgid_plural "%'d hours"
 msgstr[0] "%'d sat"
 msgstr[1] "%'d sata"
 msgstr[2] "%'d sati"
+msgstr[3] "%'d sat"
 
 #: ../sendto/main.c:188
 #, c-format
@@ -708,13 +691,13 @@ msgid_plural "approximately %'d hours"
 msgstr[0] "približno %'d sat"
 msgstr[1] "približno %'d sata"
 msgstr[2] "približno %'d sati"
+msgstr[3] "približno %'d sat"
 
 #: ../sendto/main.c:249
 msgid "File Transfer"
 msgstr "Prenosi datoteka"
 
 #: ../sendto/main.c:253
-#| msgid "_Reject"
 msgid "_Retry"
 msgstr "_Probaj ponovo"
 
@@ -783,17 +766,16 @@ msgstr "Željeni udaljeni ureÄ?aj"
 msgid "Remote device's name"
 msgstr "Ime udaljenog ureÄ?aja"
 
-#: ../sendto/nautilus-sendto-plugin.c:172
+#: ../sendto/nautilus-sendto-plugin.c:168
 msgid "Programming error, could not find the device in the list"
 msgstr "GreÅ¡ka unutar programa. Ne mogu da naÄ?em ureÄ?aj sa spiska"
 
-#: ../sendto/nautilus-sendto-plugin.c:247
+#: ../sendto/nautilus-sendto-plugin.c:243
 #, c-format
 msgid "Obex Push file transfer unsupported"
 msgstr "Nije podržano guranje datoteke kroz Obeks"
 
-#: ../sendto/nautilus-sendto-plugin.c:266
-#| msgid "Bluetooth Status"
+#: ../sendto/nautilus-sendto-plugin.c:262
 msgid "Bluetooth (OBEX Push)"
 msgstr "Blututa (guranje kroz Obeks)"
 
@@ -802,23 +784,19 @@ msgid "Run in standalone mode"
 msgstr "Pokreni u samostalnom režimu"
 
 #: ../moblin/main.c:94 ../moblin/bluetooth-panel.desktop.in.in.h:2
-#| msgid "Bluetooth Manager"
 msgid "Moblin Bluetooth Panel"
 msgstr "Moblin površ za blutut"
 
 #: ../moblin/main.c:95
-#| msgid "- Bluetooth applet"
 msgid "- Moblin Bluetooth Panel"
 msgstr "â?? Moblin povrÅ¡ za blutut"
 
 #: ../moblin/main.c:122
-#| msgid "Bluetooth"
 msgid "bluetooth"
 msgstr "blutut"
 
 #: ../moblin/moblin-panel.c:533
 #, c-format
-#| msgid "Pairing with '%s' finished"
 msgid "Pairing with %s failed."
 msgstr "Nije uspelo uparivanje sa %s."
 
@@ -827,17 +805,14 @@ msgid "<u>Pair</u>"
 msgstr "<u>Upari</u>"
 
 #: ../moblin/moblin-panel.c:909
-#| msgid "Connect"
 msgid "<u>Connect</u>"
 msgstr "<u>Poveži se</u>"
 
 #: ../moblin/moblin-panel.c:928
-#| msgid "_Browse"
 msgid "<u>Browse</u>"
 msgstr "<u>Razgledaj</u>"
 
 #: ../moblin/moblin-panel.c:1122
-#| msgid "Device Setup Failed"
 msgid "Device setup failed"
 msgstr "Nije uspelo podeÅ¡avanje ureÄ?aja"
 
@@ -845,17 +820,14 @@ msgstr "Nije uspelo podeÅ¡avanje ureÄ?aja"
 #: ../moblin/moblin-panel.c:1136 ../moblin/moblin-panel.c:1212
 #: ../moblin/moblin-panel.c:1261 ../moblin/moblin-panel.c:1323
 #: ../moblin/moblin-panel.c:1540
-#| msgid "Bluetooth device"
 msgid "Back to devices"
 msgstr "Nazad na ureÄ?aje"
 
 #: ../moblin/moblin-panel.c:1175
-#| msgid "Phone"
 msgid "Done"
 msgstr "Gotovo"
 
 #: ../moblin/moblin-panel.c:1196 ../moblin/moblin-panel.c:1233
-#| msgid "Device Setup"
 msgid "Device setup"
 msgstr "PodeÅ¡avanje ureÄ?aja"
 
@@ -865,13 +837,11 @@ msgstr "Prikaži samo:"
 
 #. Button for PIN options file
 #: ../moblin/moblin-panel.c:1350
-#| msgid "PIN Options"
 msgid "PIN options"
 msgstr "Opcije za PIN"
 
 #. Add new button
 #: ../moblin/moblin-panel.c:1433
-#| msgid "Set up new device..."
 msgid "Add a new device"
 msgstr "Dodaj novi ureÄ?aj"
 
@@ -881,10 +851,21 @@ msgid "Send file from your computer"
 msgstr "PoÅ¡alji datoteku sa raÄ?unara"
 
 #: ../moblin/bluetooth-panel.desktop.in.in.h:1
-#| msgid "Bluetooth Manager applet"
 msgid "Bluetooth Manager Panel"
 msgstr "ProgramÄ?e za upravljanje Blututom"
 
+#~ msgid "Whether to show the notification icon"
+#~ msgstr "Da li da prikažem ikonicu u obaveštajnoj zoni"
+
+#~ msgid "Whether to show the notification icon."
+#~ msgstr "Da li da prikažem ikonicu u obaveštajnoj zoni."
+
+#~ msgid "GConf error: %s"
+#~ msgstr "GConf greška: %s"
+
+#~ msgid "All further errors shown only on terminal."
+#~ msgstr "Naredne greÅ¡ke Ä?e se ispisivati u terminalu."
+
 #~ msgid "A Bluetooth manager for the GNOME desktop"
 #~ msgstr "Blutut upravnik za Gnom"