[gvfs] Updated Serbian translation



commit 86b6124c5307ccc3e070429d8e2d4dc73137eb0a
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Tue Sep 20 21:58:52 2011 +0200

    Updated Serbian translation

 po/sr.po       | 1202 +++++++++++++++++++++++++++++++++++++-------------------
 po/sr latin po | 1198 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 1576 insertions(+), 824 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 1edbd98..3348e42 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,16 +9,18 @@ msgstr ""
 "Project-Id-Version: gvfs\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-01 05:01+0000\n"
-"PO-Revision-Date: 2011-06-13 22:05+0200\n"
+"POT-Creation-Date: 2011-09-19 14:53+0000\n"
+"PO-Revision-Date: 2011-09-13 10:49+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\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"
-"Language: Serbian (sr)\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"
+"Language: sr\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"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
@@ -69,7 +71,7 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÐÐÐ: %s"
 
 #: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
 msgid "values must be string or list of strings"
-msgstr "ÐÐÐÐÐÑÐÐ ÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
 #: ../client/gdaemonfileenumerator.c:600
@@ -81,17 +83,17 @@ msgstr "ÐÐÐÐÐÑÐÐ ÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐ
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1050
-#: ../daemon/gvfsbackendobexftp.c:1087 ../daemon/gvfsbackendobexftp.c:1108
-#: ../daemon/gvfsbackendobexftp.c:1227 ../daemon/gvfsbackendobexftp.c:1364
-#: ../daemon/gvfsbackendobexftp.c:1428 ../daemon/gvfsbackendobexftp.c:1630
-#: ../daemon/gvfsbackendobexftp.c:1737 ../daemon/gvfsbackendobexftp.c:1899
-#: ../daemon/gvfsbackendobexftp.c:1926 ../daemon/gvfsbackendobexftp.c:1985
-#: ../daemon/gvfsbackendobexftp.c:2007 ../daemon/gvfsbackendobexftp.c:2070
-#: ../daemon/gvfsbackendobexftp.c:2089 ../daemon/gvfsbackendsmb.c:1179
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
 #: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
 #: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
 #: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
@@ -110,7 +112,7 @@ msgstr "ÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 #: ../client/gdaemonfileoutputstream.c:1246
 #, c-format
 msgid "Error in stream protocol: %s"
-msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÐÐ ÑÐÐ: %s"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÑÐÐÐ: %s"
 
 #: ../client/gdaemonfileinputstream.c:535
 #: ../client/gdaemonfileinputstream.c:1694
@@ -133,28 +135,28 @@ msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÑÐÑÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÑÐÑÐ
 msgid "Can't contact session bus"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐÑ ÐÐÐÐÑÑÑÐÐÑ"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1004
+#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
 #, c-format
 msgid "Error connecting to daemon: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÑÑ ÑÐ ÑÐÑÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐ: %s"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ ÑÐ ÑÑÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐ: %s"
 
 #: ../common/gsysutils.c:136
 #, c-format
 msgid "Error creating socket: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÑÑ ÑÐÐÐÑÐ: %s"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÑÑ ÐÑÐÐÑÑÑÐÐ: %s"
 
 #: ../common/gsysutils.c:174
 #, c-format
 msgid "Error connecting to socket: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐ ÑÐÐÐÑ: %s"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ ÐÐ ÐÑÐÐÑÑÑÐÐ: %s"
 
-#: ../common/gvfsdaemonprotocol.c:522
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
-msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÑÐ"
 
-#: ../common/gvfsdaemonprotocol.c:540
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
-msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../common/gvfsdnssdresolver.c:209
 #, c-format
@@ -174,7 +176,7 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑ
 #: ../common/gvfsdnssdresolver.c:1100
 #, c-format
 msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\""
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÑÐÐÐÑÑ â%sâ ÑÐÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÑ â%sâ"
+msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÑÐÐÐÑÑ â%sâ ÑÐÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÑ â%sâ"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -188,7 +190,7 @@ msgid ""
 "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
 "records are missing. Keys required: \"%s\"."
 msgstr ""
-"ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÑÐÐÐÑÑ â%sâ ÑÐÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÑ â%sâ. ÐÐÐÐÑÑÐÑÐ ÑÐÐÐÐ ÐÐÐ "
+"ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÑÐÐÐÑÑ â%sâ ÑÐÑÐÐÑÐ â%sâ ÐÐ ÐÐÐÐÐÑ â%sâ. ÐÐÐÐÑÑÐÑÐ ÑÐÐÐÐ ÐÐÐ "
 "ÐÐÑÐ ÑÐÐÑÑÑÐÐÐÐÑ ÐÐÐÐÑÐ. ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÑÑ:â%sâ."
 
 #. Translators:
@@ -218,168 +220,230 @@ msgstr "ÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑ ÐÐÐÐÐÑÑ"
 
 # ÐÑÐ ÐÐÑÐÐÑÐ Ð Ð-ÐÐÐÐÑÑÑÐÐÐ???
 # ~ ÐÐÐÐÑ
-#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:231
+#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐ Ð-ÐÐÑ: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:97
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "%s ÑÐÑÐÐÑ ÐÐ ÑÐÑÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/daemon-main.c:110 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "ÐÑÐÑÐÐ: %s"
 
-#: ../daemon/daemon-main.c:156
+#: ../daemon/daemon-main.c:162
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
-msgstr "ÐÐÐÑÑÐÐÐ: %s --spawner ÐÐ_ÐÐÐÐÑÑÑÐÐÐ ÐÑÑÐÑÐ_ÐÐ_ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÑÐÐÐ: %s --spawner ÐÑÑÐÑÐ_ÐÐ_ÐÐÑÐÐÑÐ ÐÐ_ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../daemon/daemon-main.c:180 ../daemon/daemon-main.c:198
+#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "ÐÐÐÑÑÐÐÐ: %s ÐÑÑÑ=ÐÑÐÐÐÐÑÑ ÐÑÑÑ=ÐÑÐÐÐÐÑÑ ..."
 
-#: ../daemon/daemon-main.c:196
+#: ../daemon/daemon-main.c:202
 #, c-format
 msgid "No mount type specified"
 msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÑÑÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../daemon/daemon-main.c:266
+#: ../daemon/daemon-main.c:272
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "ÐÐÑ ÑÐ ÐÐÐÑÐÐÑÑÐ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐ %s"
 
-#: ../daemon/daemon-main.c:277
+#: ../daemon/daemon-main.c:283
 msgid "error starting mount daemon"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ ÑÐÑÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ ÑÑÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../daemon/gvfsbackend.c:933 ../monitor/gdu/ggdumount.c:921
-msgid "Unmount Anyway"
-msgstr "ÐÐÐÐ ÐÐÐÐÐÑÐÑÐÑ"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "ÐÐÐÐÑ ÐÐÐ"
 
-#: ../daemon/gvfsbackend.c:934 ../daemon/gvfsbackendafc.c:388
-#: ../monitor/gdu/ggdudrive.c:1022 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "ÐÑÐÐÐÐ"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐ ÐÐ 256 ÐÐÐÐÐÐÐ"
+
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "ÐÐÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr "ÐÐÐ ÑÐÑÐÐÑ %s ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑ"
+
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../daemon/gvfsbackend.c:936 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐ ÐÐ 64 ÐÐÐÐÐÐÐ"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "ÐÐÐ ÑÐÑÐÐÑ %s ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr ""
+"ÐÐÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÐ, ÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐ: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
 msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
+"Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
-"ÐÐÑÐ ÑÐ ÐÐÑÐÐÑ\n"
-"ÐÐÐÐ ÐÑÐÐÑÐÐ(Ð) ÐÐÑÐÑÑÐ ÐÐÐÑ ÐÐÑÐ."
+"ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÐ (ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ "
+"ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ)"
+
+# bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+msgid "Failed to connect to server (%s)"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ (%s)"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+msgid "Enter password for afp as %s on %s"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐ ÐÐÐ %s ÐÐ %s"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+msgid "Enter password for afp on %s"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐ ÐÐ %s"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑÐÐÐ"
 
 #: ../daemon/gvfsbackendafc.c:212
 msgid "Internal Apple File Control error"
-msgstr "ÐÑÐÑÐÐ ÑÐÑÑÐÑ ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:729
+#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:219
+#: ../daemon/gvfsbackendafc.c:220
 msgid "The directory is not empty"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐ ÐÑÐÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:223
+#: ../daemon/gvfsbackendafc.c:224
 msgid "The device did not respond"
 msgstr "ÐÑÐÑÐÑ ÐÐ ÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:227
+#: ../daemon/gvfsbackendafc.c:228
 msgid "The connection was interrupted"
 msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:231
+#: ../daemon/gvfsbackendafc.c:232
 msgid "Invalid Apple File Control data received"
 msgstr "ÐÑÐÐÑÐÐÐ ÑÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:235
+#: ../daemon/gvfsbackendafc.c:236
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ (%d)"
 
-#: ../daemon/gvfsbackendafc.c:254
-#, c-format
-msgid "Unhandled Inst proxy error (%d)"
-msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÑ ÐÐÑÑÐÐÐÐÐÐ (%d)"
+#: ../daemon/gvfsbackendafc.c:252
+msgid "Listing applications installed on device failed"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑ ÐÐ ÑÑÐÑÐÑÑ"
 
-#: ../daemon/gvfsbackendafc.c:273
-#, c-format
-msgid "Unhandled SBServices proxy error (%d)"
-msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐ (%d)"
+#: ../daemon/gvfsbackendafc.c:268
+msgid "Accessing application icons on device failed"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐ ÐÐ ÑÑÐÑÐÑÑ"
 
-#: ../daemon/gvfsbackendafc.c:290
+#: ../daemon/gvfsbackendafc.c:285
 msgid "Lockdown Error: Invalid Argument"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÑÐÐÐÑÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
-
-#: ../daemon/gvfsbackendafc.c:294 ../daemon/gvfsbackendsftp.c:310
+msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÑÑÑÐÐÐÑÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
+
+#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
 #: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
 msgid "Permission denied"
-msgstr "ÐÑÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÑÑÐ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:297
+#: ../daemon/gvfsbackendafc.c:293
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
-msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÑÐÐÐÑÑ (%d)"
+msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ Ñ ÐÐÐÑÑÑÐÐÐÑÑ (%d)"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:310
 msgid "libimobiledevice Error: Invalid Argument"
-msgstr "ÐÑÐÑÐÐ ÑÐÑÑÐÑ libimobiledevice: ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
+msgstr ""
+"ÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÑÐÑÐÐÐ ÑÑÐÑÐÑÐ (libimobiledevice): ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:314
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
 msgstr ""
-"ÐÑÐÑÐÐ ÑÐÑÑÐÑ libimobiledevice: ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÑÑÐÑÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ "
-"usbmuxd ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ."
+"ÐÑÐÑÐÐ ÑÐÑÑÐÑ ÐÐÐ_ÐÐÐÐÐÑÐÑÐÐÐ_ÑÑÐÑÐÑÐ: ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÑÑÐÑÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ "
+"ÑÐ ÐÐÐÑÐÑ_ÑÑÐ_ÑÑÐÑÐÑÐ (usbmuxd) ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ."
 
-#: ../daemon/gvfsbackendafc.c:321
+#: ../daemon/gvfsbackendafc.c:318
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
-msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÑÐÑÑÐÑ libimobiledevice (%d)"
+msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÐ_ÐÐÐÐÐÑÐÑÐÐÐ_ÑÑÐÑÐÑÐ (%d)"
 
-#: ../daemon/gvfsbackendafc.c:388
+#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "ÐÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafc.c:385
 msgid "Try again"
 msgstr "ÐÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1628
-#: ../daemon/gvfsbackendhttp.c:315 ../daemon/gvfsbackendobexftp.c:863
-#: ../daemon/gvfsbackendobexftp.c:879 ../daemon/gvfsbackendobexftp.c:898
+#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
+#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackendafc.c:443
+#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
-"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐ: ÐÐÑÐ ÐÐÑÐ Ñ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ afc://uuid:ÐÐÑÑ-ÐÑÐÑ"
+"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐ: ÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ afc://uuid:ÐÑÐÑ-ÐÐÑÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:428
+#: ../daemon/gvfsbackendafc.c:425
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÑÑÐÑÐÑ"
 
-#: ../daemon/gvfsbackendafc.c:433
+#: ../daemon/gvfsbackendafc.c:430
 #, c-format
-msgid "Service %d on Apple Mobile Device"
-msgstr "ÐÐÑÐÐÑ %d ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐ ÑÑÐÑÐÑÑ"
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "ÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÑÑÐÑÐÑ, ÐÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:435
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÑÐÑÐÑÑ"
 
-#: ../daemon/gvfsbackendafc.c:497
+#: ../daemon/gvfsbackendafc.c:493
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÑÐ)"
@@ -387,7 +451,7 @@ msgstr "%s (ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÑÐ)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:504 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ â%sâ"
@@ -395,7 +459,7 @@ msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐ â%sâ"
 #. translators:
 #. * %s is the device name. 'Try again' is the caption of the button
 #. * shown in the dialog which is defined above.
-#: ../daemon/gvfsbackendafc.c:583
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
 "Device '%s' is password protected. Enter the password on the device and "
@@ -404,55 +468,304 @@ msgstr ""
 "ÐÑÐÑÐÑ â%sâ ÑÐ ÐÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐ. ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÑÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÐÐ "
 "âÐÐÐÑÑÐÑ ÐÐÐÐÐÐâ."
 
-#: ../daemon/gvfsbackendafc.c:922 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1886
-#: ../daemon/gvfsbackendobexftp.c:1073 ../daemon/gvfsbackendsmb.c:718
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:932 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
 #: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:986
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:1060 ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
 #: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
 #: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:1123 ../daemon/gvfsbackendafc.c:2466
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "ÐÐÑ ÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ."
 
-#: ../daemon/gvfsbackendafc.c:1295
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÑÐÑÑÐÐÐÐÐÑÐ"
 
-#: ../daemon/gvfsbackendafc.c:2303 ../daemon/gvfsbackendftp.c:1080
-#: ../daemon/gvfsbackendftp.c:1128 ../daemon/gvfsbackendftp.c:1149
-#: ../daemon/gvfsbackendsftp.c:1832 ../daemon/gvfsbackendsftp.c:4633
-#: ../daemon/gvfsbackendsmb.c:1718 ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:392
 msgid "Operation unsupported"
 msgstr "ÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "ÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐ: %d ÑÐ ÑÐÑÐÐÑÐ"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+msgid "AFP shares for %s on %s"
+msgstr "ÐÐÐ ÐÐÑÐÑÐ ÐÐ %s ÐÐ %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+msgid "AFP shares on %s"
+msgstr "ÐÐÐ ÐÐÑÐÑÐ ÐÐ %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "ÐÐÐÐÐÐÐ ÑÑÐÑÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+msgid "File is a directory"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑ"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+msgid "Target file is open"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+msgid "Ancestor directory doesn't exist"
+msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ."
+
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐ ÐÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+msgid "Target object doesn't exist"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:1452
+msgid "Can't move directory into one of it's descendants"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ Ñ ÐÐÐÑ ÐÐÑÐ ÑÐ Ñ ÑÐÐÑ"
+
+#: ../daemon/gvfsbackendafp.c:1456
+msgid "Can't move sharepoint into a shared directory"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÑÐÑÐÑ ÐÐÑÐÑÐ Ñ ÐÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1460
+msgid "Can't move a shared directory into the Trash"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ Ñ ÐÐÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "ÐÑÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1472
+msgid "Object being moved doesn't exist"
+msgstr "ÐÑÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÑ âÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑâ"
+
+#: ../daemon/gvfsbackendafp.c:1585
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑ/ÐÑÐÐÑÐ ÐÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ Ð/ÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1601
+msgid "Source file is a directory"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐÐÑÑÐÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+msgid "Can't rename volume"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÐÐÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:2218
+msgid "Object with that name already exists"
+msgstr "ÐÐÑÐÐÐÑ ÑÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "ÐÐÐÑÐÐÐ ÑÐ ÑÐÐÐÐ Ð ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:2362
+msgid "Target directory already exists"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐ ÐÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐ ÑÐÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "ÐÐÑÑÐÑÐ ÑÑÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ ÐÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+msgid "Couldn't create temporary file (%s)"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s)"
+
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÑÑ ÑÐÑ ÑÐÐÐ ÐÐÐÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:3539
+msgid "Directory doesn't exist"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:3543
+msgid "Target object is not a directory"
+msgstr "ÐÐÑÐÐ ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÑÐÐÐÐÐ (âuint32â ÑÐ ÐÑÐÐÐÐÐÐÐ)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+msgid "Command not supported"
+msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÑÐ ÐÑÑÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐ"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "ÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐ ÑÑÐÐÐÐ (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "ÐÐÐ ÐÐÐÑÐÐÐ %s ÐÐ %s ÐÐ %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+msgid "AFP volume %s on %s"
+msgstr "ÐÐÐ ÐÐÐÑÐÐÐ %s ÐÐ %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐ ÐÐÐÑÐÐÐ %s ÐÐ %s"
+
+#: ../daemon/gvfsbackendafp.c:4303
+msgid "No volume specified"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐÐÐ"
+
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
-#. Translators: This is the name of the root of an sftp share, like "/ on <hostname>"
+#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
 #: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ ÐÐ %s"
 
-#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:660
-#: ../daemon/gvfsbackendsftp.c:1745
-msgid "No hostname specified"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
-
 #: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:439
+#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
 #: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
 #: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
@@ -461,7 +774,7 @@ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 #. Translators: This is the name of the backend
 #: ../daemon/gvfsbackendburn.c:346
 msgid "Burn"
-msgstr "ÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑ"
 
 #: ../daemon/gvfsbackendburn.c:376
 msgid "Unable to create temporary directory"
@@ -471,34 +784,29 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐ
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:786
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2207
-#: ../daemon/gvfsbackendgphoto2.c:2926 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
+#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "ÐÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2298
-#: ../daemon/gvfsbackendsftp.c:1828
-msgid "Directory not empty"
-msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÐ ÐÑÐÐÐÐ"
-
 #: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
 #. Translators: this is the display name of the backend
 #: ../daemon/gvfsbackendburn.c:651
 msgid "CD/DVD Creator"
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐÐÐ"
+msgstr "ÐÐ/ÐÐÐ ÐÐÐÑÐÑ"
 
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:3000
+#: ../daemon/gvfsbackendgphoto2.c:2926
 msgid "File exists"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ"
 
@@ -521,8 +829,8 @@ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
-#: ../monitor/gdu/ggduvolume.c:1608
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "ÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ"
 
@@ -530,28 +838,30 @@ msgstr "ÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑÐ
 msgid "No such file or directory in target path"
 msgstr "ÐÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ Ñ ÑÐÑÐÐÑ ÐÑÑÐÑÐ"
 
-#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendftp.c:1535
-#: ../daemon/gvfsbackendobexftp.c:1781
-msgid "Can't copy directory over directory"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
-
-#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1789
-#: ../daemon/gvfsbackendobexftp.c:1820 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
 #: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendftp.c:1558
-#: ../daemon/gvfsbackendobexftp.c:1796
-msgid "Can't recursively copy directory"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐÐÑÑÐÐÐÐÐ"
-
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2580 ../daemon/gvfsbackendgphoto2.c:2789
-#: ../daemon/gvfsbackendgphoto2.c:2886 ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
+#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
 msgid "Not supported"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÑÐÑÐÑ"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"ÐÐÑÐ ÑÐ ÐÐÑÐÐÑ\n"
+"ÐÐÐÐ ÐÑÐÐÑÐÐ(Ð) ÐÐÑÐÑÑÐ ÐÐÐÑ ÐÐÑÐ."
+
 #: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
 msgid "Cannot create gudev client"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ"
@@ -568,7 +878,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ libhal ÐÐÐÑÐÐÑÑ"
 msgid "Cannot initialize libhal"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ libhal"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÑÐÑÐÑ"
 
@@ -582,55 +892,56 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÑÑÐÑÐÑ %s"
 msgid "Drive %s does not contain audio files"
 msgstr "ÐÑÐÑÐÑ %s ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:439
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
-msgstr "ÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐ Ñ %s"
+msgstr "cdda ÑÐ ÐÐÐÑÐÑÐÐ Ñ %s"
 
-#: ../daemon/gvfsbackendcdda.c:440 ../daemon/gvfsbackendcdda.c:960
+#: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
 #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÐ"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ: %d ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
 msgstr[1] "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ: %d ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÐÐÑÐÐÐ"
 msgstr[2] "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ: %d ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
-msgstr[3] "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ: ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
+msgstr[3] "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ: ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "ÐÐÑÐÑÐÐÐ %s ÐÐ ÐÐÑÑÐÑÐ ÐÐ ÑÑÐÑÐÑÑ %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÑ âparanoiaâ ÐÐ ÑÑÐÑÐÑÑ %s"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐ ÑÐ ÑÑÐÑÐÑÐ %s"
 
-#: ../daemon/gvfsbackendcdda.c:979 ../daemon/gvfsbackendgphoto2.c:1894
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
 #, c-format
 msgid "No such file"
 msgstr "ÐÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐÑ"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "ÐÐÑÐÐÑ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÐ ÐÐÑÐ"
 
@@ -656,7 +967,7 @@ msgid "Can't mount file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
+msgid "No medium in the drive"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐÐ Ñ ÑÑÐÑÐÑÑ"
 
 #: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
@@ -685,139 +996,117 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÑÐÐÑ"
 msgid "Can't poll file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../daemon/gvfsbackenddav.c:560 ../daemon/gvfsbackenddav.c:1695
-#: ../daemon/gvfsbackendhttp.c:261
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+msgid "WebDAV as %s on %s%s"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ %s ÐÐ %s%s"
+
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
+#. %s and it is only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:493
+#, c-format
+msgid "WebDAV on %s%s"
+msgstr "ÐÐÐÐÐÐ ÐÐ %s%s"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:248
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../daemon/gvfsbackenddav.c:577
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../daemon/gvfsbackenddav.c:586
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../daemon/gvfsbackenddav.c:594
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../daemon/gvfsbackenddav.c:1211 ../daemon/gvfsbackenddav.c:1835
-#: ../daemon/gvfsbackenddav.c:1941
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../daemon/gvfsbackenddav.c:1354
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../daemon/gvfsbackenddav.c:1356
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../daemon/gvfsbackenddav.c:1699 ../daemon/gvfsbackenddav.c:1703
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "ÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../daemon/gvfsbackenddav.c:1731
-#, c-format
-msgid "WebDAV on %s"
-msgstr "ÐÐÐÐÐÐ ÐÐ %s"
-
-#: ../daemon/gvfsbackenddav.c:1791 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackenddav.c:1975
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../daemon/gvfsbackenddav.c:1949 ../daemon/gvfsbackendftp.c:766
-#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
-#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
-msgid "File is directory"
-msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#: ../daemon/gvfsbackenddav.c:2005 ../daemon/gvfsbackenddav.c:2258
-#: ../daemon/gvfsbackenddav.c:2369 ../daemon/gvfsbackendftp.c:745
-#: ../daemon/gvfsbackendftp.c:926 ../daemon/gvfsbackendftp.c:1365
-#: ../daemon/gvfsbackendftp.c:1543 ../daemon/gvfsbackendsftp.c:4285
-#: ../daemon/gvfsbackendsmb.c:2063
-msgid "Target file already exists"
-msgstr "ÐÐÑ ÐÐÑÑÐÑÐ ÑÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../daemon/gvfsbackenddav.c:2078 ../daemon/gvfsbackendsftp.c:3421
-#: ../daemon/gvfsbackendsmb.c:1148
-msgid "The file was externally modified"
-msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐ"
-
-#: ../daemon/gvfsbackenddav.c:2109 ../daemon/gvfsbackendsmb.c:1184
-#: ../daemon/gvfsbackendsmb.c:2080
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:486 ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
 msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackenddnssd.c:730 ../daemon/gvfsbackendnetwork.c:753
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:748
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "ÐÐÑ-ÐÐ"
 
-#: ../daemon/gvfsbackenddnssd.c:749 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
 #: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "ÐÑÐÐÐ"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:481
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÑÐ ÐÐÐ %s ÐÐ %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐ ÐÐÐ %s ÐÐ %s"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:484
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÑÐ ÐÐ %s"
-
-#: ../daemon/gvfsbackendftp.c:511 ../daemon/gvfsbackendsftp.c:985
-#: ../daemon/gvfsbackendsmb.c:619 ../daemon/gvfsbackendsmbbrowse.c:995
-msgid "Password dialog cancelled"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑÐÐÐ"
+msgid "Enter password for FTP on %s"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐ ÐÐ %s"
 
-#: ../daemon/gvfsbackendftp.c:623
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ÑÑÐ ÐÐ %s"
+msgid "FTP on %s"
+msgstr "ÐÐÐ ÐÐ %s"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:627
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "ÑÑÐ ÐÐÐ %s ÐÐ %s"
+msgid "FTP as %s on %s"
+msgstr "ÐÐÐ ÐÐÐ %s ÐÐ %s"
 
-#: ../daemon/gvfsbackendftp.c:720
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
-
-#: ../daemon/gvfsbackendftp.c:974 ../daemon/gvfsbackendftp.c:1328
-#: ../daemon/gvfsbackendsftp.c:3274
-msgid "backups not supported yet"
-msgstr "ÑÐÑ ÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
-
-#: ../daemon/gvfsbackendftp.c:1121 ../daemon/gvfsbackendsftp.c:4643
-msgid "Invalid attribute type (uint32 expected)"
-msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÑÐÐÐÐÐ (âuint32â ÑÐ ÐÑÐÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
@@ -859,7 +1148,7 @@ msgstr "ÐÐÑÐÐÐÐÑÐÑ ÐÐÑÐÐ %s"
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "ÐÐÑÑÐÐ ÐÐÐÑÐÑ ÐÐÑÐÐ %s"
+msgstr "ÐÐÑÑÐÐ ÑÑÐÑÐÑ ÐÐÑÐÐ %s"
 
 #: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
@@ -868,7 +1157,7 @@ msgstr "ÐÐÑÐÐÐÐÑÐÑ"
 
 #: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
-msgstr "ÐÐÑÑÐÐ ÐÐÐÑÐÑ"
+msgstr "ÐÐÑÑÐÐ ÑÑÐÑÐÑ"
 
 #: ../daemon/gvfsbackendgphoto2.c:1569
 msgid "No device specified"
@@ -902,131 +1191,132 @@ msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÑÐÐÑÐÑÑ ÐÐÐÐ ÑÐ ÑÐÑÐÐÐÐÑ
 msgid "Error initializing camera"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ ÑÐÑÐÐÐÐÑÐÑÐ"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1683
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1684
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "ÐÐÐÑÐ2 ÑÑÐÑÐÑ ÐÐÐÑÐÑÐÐ ÐÐ %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1765
+#: ../daemon/gvfsbackendgphoto2.c:1766
 msgid "No camera specified"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐ ÑÐÑÐÐÐÐÑÐÑ"
 
-#: ../daemon/gvfsbackendgphoto2.c:1806 ../daemon/gvfsbackendgphoto2.c:1832
-#, c-format
-msgid "Filesystem is busy"
-msgstr "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ"
-
-#: ../daemon/gvfsbackendgphoto2.c:1902
+#: ../daemon/gvfsbackendgphoto2.c:1828
 msgid "Error creating file object"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:1917
+#: ../daemon/gvfsbackendgphoto2.c:1843
 msgid "Error getting file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:1927
+#: ../daemon/gvfsbackendgphoto2.c:1853
 msgid "Error getting data from file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
+#: ../daemon/gvfsbackendgphoto2.c:1911
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "ÐÐÑ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐ â%sâ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2061 ../daemon/gvfsbackendgphoto2.c:3250
+#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐ ÑÐ ÑÐÑÐÐÐÐÑÐÑÐ %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2201 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "ÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
 # bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
-#: ../daemon/gvfsbackendgphoto2.c:2234
+#: ../daemon/gvfsbackendgphoto2.c:2160
 msgid "Failed to get folder list"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 # bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
-#: ../daemon/gvfsbackendgphoto2.c:2300
+#: ../daemon/gvfsbackendgphoto2.c:2226
 msgid "Failed to get file list"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2592
+#: ../daemon/gvfsbackendgphoto2.c:2518
 msgid "Error creating directory"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2801
+#: ../daemon/gvfsbackendgphoto2.c:2727
 msgid "Name already exists"
-msgstr "ÐÐÐ ÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:3441
+#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
 msgid "New name too long"
-msgstr "ÐÐÐÐ ÐÐÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
+msgstr "ÐÐÐÐ ÐÐÐÐÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2822 ../daemon/gvfsbackendgphoto2.c:3452
-msgid "Error renaming dir"
+#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
+msgid "Error renaming directory"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2835 ../daemon/gvfsbackendgphoto2.c:3465
+#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
 msgid "Error renaming file"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2899
+#: ../daemon/gvfsbackendgphoto2.c:2825
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ ÐÐÑÐ ÐÑÐÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2910
+#: ../daemon/gvfsbackendgphoto2.c:2836
 msgid "Error deleting directory"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2936
+#: ../daemon/gvfsbackendgphoto2.c:2862
 msgid "Error deleting file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2989
+#: ../daemon/gvfsbackendgphoto2.c:2915
 msgid "Can't write to directory"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:3036
+#: ../daemon/gvfsbackendgphoto2.c:2962
 msgid "Cannot allocate new file to append to"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:3051
+#: ../daemon/gvfsbackendgphoto2.c:2977
 msgid "Cannot read file to append to"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:3062
+#: ../daemon/gvfsbackendgphoto2.c:2988
 msgid "Cannot get data of file to append to"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
+#: ../daemon/gvfsbackendgphoto2.c:3275
 msgid "Error writing file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:3323
 msgid "Not supported (not same directory)"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÑÐ ÐÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3409
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÐÐÑ Ð ÐÐÑÐÐÐÑÑÐ ÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ)"
+#: ../daemon/gvfsbackendgphoto2.c:3335
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
+msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (Ð ÐÐÐÐÑ Ð ÐÐÑÐÐÐÑÑÐ ÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3417
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ, ÐÐÑÐÐÐÑÑÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ)"
+#: ../daemon/gvfsbackendgphoto2.c:3343
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr ""
+"ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ, ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÑÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3429
-msgid "Not supported (src is file, dst is dir)"
-msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÐÐÑ ÑÐ ÐÐÑÐÑÐÐÐ, ÐÐÑÐÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ)"
+#: ../daemon/gvfsbackendgphoto2.c:3355
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
+msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ (ÐÐÐÐÑ ÑÐ ÐÐÑÐÑÐÐÐ, ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ)"
 
-#: ../daemon/gvfsbackendhttp.c:257
+#: ../daemon/gvfsbackendhttp.c:244
 #, c-format
 msgid "HTTP Client Error: %s"
-msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÐ ÐÐÐÑÐÐÑÑ: %s"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ: %s"
 
 #: ../daemon/gvfsbackendlocaltest.c:855
 msgid "Directory notification not supported"
@@ -1035,7 +1325,7 @@ msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÑÑÐÐÐÑÐ Ð ÐÐÑÐÐÑÐÑÐ
 #. smb:/// root link
 #: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
-msgstr "Windows ÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÑÐÐÐ"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
@@ -1049,25 +1339,25 @@ msgstr "ÐÐÑÑÐ ÐÐ ÐÑÐÐÐ"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:683 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:681 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s ÐÐ %s"
 
-#: ../daemon/gvfsbackendobexftp.c:892
+#: ../daemon/gvfsbackendobexftp.c:890
 msgid "USB support missing. Please contact your software vendor"
 msgstr "ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ. ÐÑÑÐÐÑÐ Ñ ÐÐÐÑ ÑÐ ÐÑÐÐÐÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendobexftp.c:1012
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐ ÐÐÐÐ ÑÐ ÑÑÐÑÐÑÐÐ"
 
-#: ../daemon/gvfsbackendobexftp.c:1509
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "ÐÑÐÑÐÑ ÐÐÑÑÐÐÐ ÐÐÑÑÐÑÐÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../daemon/gvfsbackendobexftp.c:1857 ../daemon/gvfsbackendsmb.c:1954
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ: %s"
@@ -1094,12 +1384,12 @@ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÑÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÐÐ ssh ÐÑÐÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÑÑ ÐÑÐÐÑÐÐ"
 
 #: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÑÐÐÐÐ ssh ÐÑÐÐÑÐÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÑÑ ÐÑÐÐÑÐÐ: %s"
 
 #: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
@@ -1135,7 +1425,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑ"
 
 #: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
-msgstr "ÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐ"
 
 #: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
@@ -1151,7 +1441,7 @@ msgid ""
 "sure it is safe to continue, contact the system administrator."
 msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÑÐÑÐÑ ÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑÐ (%s).\n"
-"ÐÐÐ ÑÐ ÐÐÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐ ÐÑÐÐ ÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑ.\n"
+"ÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐ ÑÐ ÐÑÐÐ ÐÑÑ ÐÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑ.\n"
 "\n"
 "ÐÐÐÐÑÐÑÐÑ ÐÐÑÐ ÑÐ ÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÑÐÑÑÐÐÑ ÑÐ %s. ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐ "
 "ÐÐÑÐÑÐÐ ÑÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ, ÑÑÑÐÐÑÐ Ñ ÐÐÐÑ ÑÐ "
@@ -1169,21 +1459,21 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÑÐÑ ÐÐÐÐÑÐÑÐÑÐ Ð
 msgid "Protocol error"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
 
-#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp for %s on %s"
-msgstr "ÑÑÑÐ ÐÐÐ %s ÐÐ %s"
+msgid "SFTP for %s on %s"
+msgstr "ÐÐÐÐ ÐÐÐ %s ÐÐ %s"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
-msgid "sftp on %s"
-msgstr "ÑÑÑÐ ÐÐ %s"
+msgid "SFTP on %s"
+msgstr "ÐÐÐÐ ÐÐ %s"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ssh ÐÐÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ÑÑÑ ÐÐÑÐÐÐÐ"
 
 #: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
 #: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
@@ -1217,7 +1507,7 @@ msgstr "ÐÐÑÑÐÐÑ"
 #: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ icon_id â%sâ ÑÐÑÑÐÑ OpenIconForRead"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐ_ÐÐÐÐÐÑÐ â%sâ Ñ âÐÑÐÐÑÐ ÐÐÐÐÐÑÑ ÐÐ ÑÐÑÐÑÐâ"
 
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
@@ -1228,9 +1518,31 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ: %s"
 msgid "Unable to create temporary file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../daemon/gvfsbackendsftp.c:4271 ../daemon/gvfsbackendsmb.c:2052
-msgid "Can't move directory over directory"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ %s"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐ %s"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÑÐÐÑ ÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #. translators: First %s is a share name, second is a server name
 #: ../daemon/gvfsbackendsmb.c:238
@@ -1247,7 +1559,7 @@ msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ (%s)"
 #. translators: We tried to mount a windows (samba) share, but failed
 #: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÑÐÐ Windows ÐÐÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐ ÐÐÑÐÑÐ"
 
 #: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
@@ -1258,65 +1570,39 @@ msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÑÑÑÐ ÐÑÐÐÐÑÐÐÐÑÐ"
 msgid "Backup file creation failed: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1733
+#: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÑÐÐÐÐÐ (âuint64â ÑÐ ÐÑÐÐÐÐÐÐÐ)"
 
-#: ../daemon/gvfsbackendsmb.c:2028
+#: ../daemon/gvfsbackendsmb.c:1922
+msgid "Can't rename file, filename already exists"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑ, ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÐ: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2100
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÑÐÑÑ ÑÐÑÐÐ ÐÐÑÐÑÐÐÐ: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2124
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐÐÑÑÐÐÐÐÐ"
 
-#: ../daemon/gvfsbackendsmb.c:2168
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
-msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÐÑ ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
-
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:375
-#, c-format
-msgid "Password required for %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ %s"
-
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:902
-#, c-format
-msgid "Windows shares on %s"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐ %s"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:1001
-msgid "Failed to retrieve share list from server"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1089 ../daemon/gvfsbackendsmbbrowse.c:1135
-msgid "The file is not a mountable"
-msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1157
-msgid "Not a regular file"
-msgstr "ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1489
-msgid "Windows Network Filesystem Service"
-msgstr "ÐÐÑÐÐÑ ÐÑÐÐÐÐÑ ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
-msgstr "ÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 msgid "Items in the trash may not be modified"
-msgstr "ÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐ ÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÑÐÐÐ "
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
@@ -1330,8 +1616,8 @@ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐ"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ fd: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÑ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
@@ -1347,7 +1633,8 @@ msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
 msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ. ÐÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÑÑÑÐÐÐ ÐÐÑÐÐ ÑÑÑÐÑÐ?"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑ. ÐÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÑÑÑÐÐÐ ÐÐÑÐÐ "
+"ÑÑÐÐÑÐÐÐÑÐ?"
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
@@ -1363,7 +1650,7 @@ msgstr "ÐÐÐ ÑÐÑÐÐÑ ÑÐ ÐÐÑÐÐÑ. ÐÐÐÑÑÐÑÑÐ ÐÐÑÐÐÑÐ
 
 #: ../daemon/gvfsftptask.c:356
 msgid "Accounts are unsupported"
-msgstr "ÐÐÑÑ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐ"
 
 #: ../daemon/gvfsftptask.c:360
 msgid "Host closed connection"
@@ -1371,7 +1658,8 @@ msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑ"
 
 #: ../daemon/gvfsftptask.c:364
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐ ÑÐ ÑÐÑÑÑÐÐ ÑÐÑÐÑÐÐÐ?"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐ ÑÐ ÑÐÑÑÑÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ?"
 
 #: ../daemon/gvfsftptask.c:368
 msgid "Data connection closed"
@@ -1405,62 +1693,68 @@ msgstr "ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ
 msgid "Invalid dbus message"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑ ÐÐÑÑÐÐ"
 
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐÑ"
+
 #: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
-msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐ ÑÐÑÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ."
+msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐ ÑÑÐÑÐÐÐ ÐÑÐÐÑÐÐ."
 
 #: ../daemon/main.c:46
 msgid "Don't start fuse."
 msgstr "ÐÐ ÐÐÐÑÐÑÐ ÑÑÑÐ."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:62
 msgid "GVFS Daemon"
-msgstr "ÐÐÑÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:65
 msgid "Main daemon for GVFS"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:82 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mkdir.c:60
-#: ../programs/gvfs-move.c:111 ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128 ../programs/gvfs-tree.c:251
+#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
+#: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "ÐÐÐÑÐÐÐÑÐ â%s --helpâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../daemon/mount.c:459
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../daemon/mount.c:780
+#: ../daemon/mount.c:779
 #, c-format
 msgid "Automount failed: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐÑÐ: %s"
 
-#: ../daemon/mount.c:826 ../daemon/mount.c:903
+#: ../daemon/mount.c:825 ../daemon/mount.c:902
 msgid "The specified location is not mounted"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/mount.c:831
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../daemon/mount.c:1045
+#: ../daemon/mount.c:1044
 msgid "Location is already mounted"
 msgstr "ÐÐÐ ÐÐÑÑÐ ÑÐ ÐÐÑ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../daemon/mount.c:1053
+#: ../daemon/mount.c:1052
 msgid "Location is not mountable"
 msgstr "ÐÐÑÑÐ ÑÐ ÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
@@ -1481,7 +1775,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÑÑÑ ÑÐ ÐÐÑÐÐÐÐÐÑÐÐÐ
 
 #: ../metadata/meta-daemon.c:428
 msgid "Unable to remove metadata keys"
-msgstr "ÐÑ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐÑÐÐÐ"
 
 #: ../metadata/meta-daemon.c:459
 msgid "Unable to move metadata keys"
@@ -1489,11 +1783,11 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÑÐÐÐÐ
 
 #: ../metadata/meta-daemon.c:704
 msgid "GVFS Metadata Daemon"
-msgstr "ÐÐÑÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐÐ"
 
 #: ../metadata/meta-daemon.c:707
 msgid "Metadata daemon for GVFS"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ ÑÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐÐ"
 
 #: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
 msgid "GVfs GDU Volume Monitor"
@@ -1512,12 +1806,13 @@ msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÑÐÑÐÑ (%s)"
 msgid "Unnamed Drive"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÑÐÑÐÑ"
 
-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/hal/ghaldrive.c:662
+#: ../monitor/gdu/ggdudrive.c:561
 #, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐ; ÐÐÐÐ ÑÑÐÑÐÑ ÑÐ ÐÐÑÐÐÑ."
+msgid "Failed to eject medium; one or more volumes on the medium are busy."
+msgstr ""
+"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑ; ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÑÑ ÑÐ ÐÐÑÐÐÑ."
 
-#: ../monitor/gdu/ggdudrive.c:1015
+#: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
 "Starting a drive in degraded mode means that the drive is no longer tolerant "
@@ -1528,21 +1823,21 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐ. ÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ ÑÐ ÑÑÐÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐ "
 "ÐÑÐÐÐÐ."
 
-#: ../monitor/gdu/ggdudrive.c:1021
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "ÐÐÐÐ ÐÐÐÑÐÐÐ"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "ÐÐÐÐ ÐÑÐÐÑÐÐ(Ð) ÐÐ ÐÐÐÑÑÑÐÑÑ ÐÐÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÑÐ."
 
 # ÐÐÐÐ!!! ~ÐÐÐÐÑ
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 # ÐÐÐÐ!!! ~ÐÐÐÐÑ
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ Ñ ÐÑÑÐÑÐ â%sâ"
@@ -1551,7 +1846,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐ
 msgid "Floppy Disk"
 msgstr "ÐÐÑÐÐÑÐ"
 
-#: ../monitor/gdu/ggduvolume.c:1088
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1560,7 +1855,7 @@ msgstr ""
 "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÐÐÑÐÐ\n"
 "ÐÑÐÑÐÑ â%sâ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÐÑÐÑ %d."
 
-#: ../monitor/gdu/ggduvolume.c:1095
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1569,7 +1864,7 @@ msgstr ""
 "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÐÐÑÐÐ\n"
 "ÐÑÐÑÐÑ â%sâ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ."
 
-#: ../monitor/gdu/ggduvolume.c:1102
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1588,11 +1883,11 @@ msgstr "ÐÑÐÐÐÐ ÐÐÐÑÐÐ ÐÐÑÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
-msgstr "ÐÐÐÑÐÐ ÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÑÐÐ ÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
@@ -1600,7 +1895,7 @@ msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
-msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
 #: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
@@ -1626,7 +1921,7 @@ msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
-msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐ"
 
 #: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
@@ -1638,7 +1933,7 @@ msgstr "ÐÑÐÐÐÐ ÐÐÐ+"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐ+"
+msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐ+"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
@@ -1858,6 +2153,11 @@ msgstr "ÐÑÐÑÑÑÐÐ ÐÐÑÐ"
 msgid "Mass Storage Drive"
 msgstr "ÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÑÐ"
 
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+msgid "Failed to eject media; one or more volumes on the media are busy."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐ; ÐÐÐÐ ÑÑÐÑÐÑ ÑÐ ÐÐÑÐÐÑ."
+
 #: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
@@ -1878,10 +2178,9 @@ msgid "Mixed Audio/Data Disc"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐÐÐ Ð ÐÐÐÐÑÐÐÐ"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
+msgid "%s Medium"
 msgstr "ÐÐÐÐÑÑÐ ÐÐ %s"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
@@ -1890,6 +2189,12 @@ msgstr "ÐÐÐÐÑÑÐ ÐÐ %s"
 msgid "%s Encrypted Data"
 msgstr "%s ÑÐÑÑÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "ÐÐÐÐÑÑÐ ÐÐ %s"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
 msgstr "ÐÐÑÑÐ"
@@ -1924,7 +2229,7 @@ msgstr "%s: %s: ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÑÐÑÑ: %s\n"
 
 #: ../programs/gvfs-cat.c:136
 msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "ÐÐÐÐÐ... - ÑÑÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÐÑÐÐÑÑÑÐ ÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐ... â ÑÑÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÐÑÐÐÑÑÑÐ ÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÐ."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
@@ -1944,21 +2249,22 @@ msgid ""
 "Note: just pipe through cat if you need its formatting option like -n, -T or "
 "other."
 msgstr ""
-"ÐÑÐÐÐÐÐÐ: ÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐ Ñ âcatâ ÑÐÐÐÐÐÐ ÑÑ ÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÐÐÐ "
-"ÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑÐÑÐÑÐ, ÐÐÐ ÑÑÐ ÑÑ -n, -T Ð ÐÑÑÐÐ."
+"ÐÑÐÐÐÐÐÐ: ÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÑÐÐ âcatâ ÑÐÐÐÐÐÐ ÑÑ ÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐ "
+"ÐÐ ÑÐÑÐÐÑÐÑÐÑÐ, ÐÐÐ ÑÑÐ ÑÑ -n, -T Ð ÐÑÑÐÐ."
 
 #: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
 #: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-move.c:109
-#: ../programs/gvfs-open.c:138 ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126 ../programs/gvfs-tree.c:249
+#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
+#: ../programs/gvfs-tree.c:249
 #, c-format
 msgid "Error parsing commandline options: %s\n"
-msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÑÐÐÐÑÑ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐ: %s\n"
+msgstr "ÐÑÐÑÐÐ Ñ ÐÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐ: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: ÐÐÐÐÑÑÐÑÑ ÐÐÑÑÐ"
@@ -2132,7 +2438,7 @@ msgstr "â ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐ ÐÐ <ÐÐÑÑÐ>"
 
 #: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../programs/gvfs-ls.c:41
 msgid "Use a long listing format"
@@ -2140,7 +2446,7 @@ msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐ ÑÐÑÐÐÑ ÑÐÐÑÐÐ"
 
 #: ../programs/gvfs-ls.c:42
 msgid "Show completions"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑÐÑÐÐ"
 
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
 #: ../programs/gvfs-rename.c:69
@@ -2152,18 +2458,69 @@ msgstr "ÐÑÐÑÐÐ: %s\n"
 msgid "- list files at <location>"
 msgstr "â ÐÑÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐ <ÐÐÑÑÐ>"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ-ÐÑÑÑÑ"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "ÐÐÑÑÐÐÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ-ÐÑÑÑÑ"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "â ÐÐÐÐÐÑÐ/ÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐ <ÐÐÐÐ-ÐÑÑÑÑ>"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÐ ÐÐ â--queryâ Ð â--setâ"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐ-ÑÐÐ.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐ ÐÐÐÐ-ÑÐÐ ÐÐ ÐÐÑÐÐ ÑÐÐÐÐ ÐÑÐÐÐÐÐ ÑÑÐÐÐÐÐÐÑ.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐ ÐÐ â%sâ\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ â%sâ: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐ:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÑÑÐÐÐÐÐÑÑ Ñ%sâ\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ â%sâ ÐÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÐÐÐÑÐ ÐÐ â%sâ: %s\n"
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÑÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÑÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
 #: ../programs/gvfs-mkdir.c:51
 msgid "- create directories"
-msgstr "â ÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+msgstr "â ÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
 #: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s\n"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s\n"
 
 #: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
 msgid "Don't send single MOVED events."
@@ -2171,7 +2528,7 @@ msgstr "ÐÐ ÑÐÑÐ ÐÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐÐ."
 
 #: ../programs/gvfs-mount.c:54
 msgid "Mount as mountable"
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑ ÑÐÑÐÑ"
+msgstr "ÐÐÑÐ ÐÐÐ ÐÑÐÐÐÑÑÐÐÐÐ"
 
 #: ../programs/gvfs-mount.c:55
 msgid "Mount volume with device file"
@@ -2185,49 +2542,50 @@ msgstr "ÐÐÐÐÐÑÐÑÐÑ"
 msgid "Unmount all mounts with the given scheme"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐÑÐÑÐÐÐ ÑÐÑÐÐ ÐÐÐÐÑÑ ÐÐÑÐ ÑÐÐÐ"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
-msgstr "ÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÑÐ"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐ Ð ÐÑÐÑÐÑÐ"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
 msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../programs/gvfs-mount.c:163 ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ ÐÐÑÑÐ: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÑÐÑÑ: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑÐÑÑÑÐÐ ÐÐÐÑÐÑÐÑÐ: %s\n"
 
-#: ../programs/gvfs-mount.c:682
+#: ../programs/gvfs-mount.c:683
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÑÑ %s: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:697
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "ÐÐÐÑÐÑÐÐÐ %s ÐÐ %s\n"
 
-#: ../programs/gvfs-mount.c:747
+#: ../programs/gvfs-mount.c:748
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "ÐÐ ÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÑ ÑÑÐÑÐÑÐ %s\n"
 
-#: ../programs/gvfs-mount.c:938
+#: ../programs/gvfs-mount.c:939
 msgid "- mount <location>"
 msgstr "â ÐÐÐÑÐÑÐ <ÐÐÑÑÐ>"
 
@@ -2258,13 +2616,13 @@ msgstr "%s: %s: ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÑÑ ÐÐÑÑÐ: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: ÐÑÐÑÐÐ Ñ ÐÐÐÑÐÑÐÑÑ ÐÑÐÐÑÐÐÐ: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "ÐÐÐÐÐÐÐÐ... â ÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
+#: ../programs/gvfs-open.c:127
 msgid ""
 "Opens the file(s) with the default application registered to handle the type "
 "of the file."
@@ -2281,7 +2639,7 @@ msgstr "ÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÐÐÐ. ÐÐÐÐ ÐÑÑÐÑÐ ÑÐ: %s\
 
 #: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
 msgid "ignore nonexistent files, never prompt"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ, ÐÐ ÐÐÑÐÑ ÐÐ"
+msgstr "ÐÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ, ÐÐ ÐÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../programs/gvfs-rm.c:53
 msgid "- delete files"
@@ -2289,11 +2647,11 @@ msgstr "â ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../programs/gvfs-save.c:43
 msgid "Create backup"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ"
 
 #: ../programs/gvfs-save.c:44
 msgid "Only create if not existing"
-msgstr "ÐÐÐÐ ÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
 #: ../programs/gvfs-save.c:45
 msgid "Append to end of file"
@@ -2349,7 +2707,7 @@ msgstr ""
 
 #: ../programs/gvfs-set-attribute.c:119
 msgid " <location> <attribute> <values> - set attribute"
-msgstr " <ÐÐÑÑÐ> <ÐÑÐÐÐÐÐ> <ÐÑÐÐÐÐÑÑÐ> â ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÑÐÑ"
+msgstr " <ÐÐÑÑÐ> <ÐÑÐÐÐÐÐ> <ÐÑÐÐÐÐÑÑÐ> â ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÑÑ"
 
 #: ../programs/gvfs-set-attribute.c:137
 #, c-format
@@ -2386,13 +2744,31 @@ msgid "Error trashing file: %s\n"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑÐÑÑ ÐÐÑÐÑÐÐÐ Ñ ÑÐÐÑÐ: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
 msgstr "ÐÑÐÑÐ ÑÐÐÐÐÐÐÑÐÐ ÐÐÐÐ, ÐÐÐÑÐÑÐÐÐ ÑÑÐÑÐÑÐ Ð ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "â ÑÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÑÑÐ ÑÐÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
 
+#~ msgid "Unhandled Inst proxy error (%d)"
+#~ msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÑ ÐÐÑÑÐÐÐÐÐÐ (%d)"
+
+#~ msgid "Unhandled SBServices proxy error (%d)"
+#~ msgstr "ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐ (%d)"
+
+#~ msgid "Service %d on Apple Mobile Device"
+#~ msgstr "ÐÐÑÐÐÑ %d ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐ ÑÑÐÑÐÑÑ"
+
+#~ msgid "ftp on %s"
+#~ msgstr "ÑÑÐ ÐÐ %s"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ"
+
+#~ msgid "sftp on %s"
+#~ msgstr "ÑÑÑÐ ÐÐ %s"
+
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
diff --git a/po/sr latin po b/po/sr latin po
index 9f3b331..9648bd6 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -9,16 +9,18 @@ msgstr ""
 "Project-Id-Version: gvfs\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-01 05:01+0000\n"
-"PO-Revision-Date: 2011-06-13 22:05+0200\n"
+"POT-Creation-Date: 2011-09-19 14:53+0000\n"
+"PO-Revision-Date: 2011-09-13 10:49+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\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"
-"Language: Serbian (sr)\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"
+"Language: sr\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"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
@@ -69,7 +71,7 @@ msgstr "GreÅka pri izmeni metapodataka: %s"
 
 #: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
 msgid "values must be string or list of strings"
-msgstr "dozvoljen je niz ili spisak niza znakova"
+msgstr "vrednosti mogu biti niz ili spisak niza znakova"
 
 #: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
 #: ../client/gdaemonfileenumerator.c:600
@@ -81,17 +83,17 @@ msgstr "dozvoljen je niz ili spisak niza znakova"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1050
-#: ../daemon/gvfsbackendobexftp.c:1087 ../daemon/gvfsbackendobexftp.c:1108
-#: ../daemon/gvfsbackendobexftp.c:1227 ../daemon/gvfsbackendobexftp.c:1364
-#: ../daemon/gvfsbackendobexftp.c:1428 ../daemon/gvfsbackendobexftp.c:1630
-#: ../daemon/gvfsbackendobexftp.c:1737 ../daemon/gvfsbackendobexftp.c:1899
-#: ../daemon/gvfsbackendobexftp.c:1926 ../daemon/gvfsbackendobexftp.c:1985
-#: ../daemon/gvfsbackendobexftp.c:2007 ../daemon/gvfsbackendobexftp.c:2070
-#: ../daemon/gvfsbackendobexftp.c:2089 ../daemon/gvfsbackendsmb.c:1179
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
 #: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
 #: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
 #: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
@@ -110,7 +112,7 @@ msgstr "Radnja je otkazana"
 #: ../client/gdaemonfileoutputstream.c:1246
 #, c-format
 msgid "Error in stream protocol: %s"
-msgstr "GreÅka u protokolu za tok: %s"
+msgstr "GreÅka u protokolu toka: %s"
 
 #: ../client/gdaemonfileinputstream.c:535
 #: ../client/gdaemonfileinputstream.c:1694
@@ -133,28 +135,28 @@ msgstr "GreÅka u prikupljanju podataka o montiranju: %s"
 msgid "Can't contact session bus"
 msgstr "Ne mogu da se poveÅem na sistemsku magistralu"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1004
+#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
 #, c-format
 msgid "Error connecting to daemon: %s"
-msgstr "GreÅka pri povezivanju sa upravljaÄkim programom: %s"
+msgstr "GreÅka u povezivanju sa usluÅnim programom: %s"
 
 #: ../common/gsysutils.c:136
 #, c-format
 msgid "Error creating socket: %s"
-msgstr "GreÅka pri pravljenju soketa: %s"
+msgstr "GreÅka u pravljenju prikljuÄka: %s"
 
 #: ../common/gsysutils.c:174
 #, c-format
 msgid "Error connecting to socket: %s"
-msgstr "GreÅka pri povezivanju na soket: %s"
+msgstr "GreÅka u povezivanju na prikljuÄak: %s"
 
-#: ../common/gvfsdaemonprotocol.c:522
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
-msgstr "Nije ispravan format podataka o datoteci"
+msgstr "Neispravan format podataka o datoteci"
 
-#: ../common/gvfsdaemonprotocol.c:540
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
-msgstr "Nije ispravan sadrÅaj spiska osobina"
+msgstr "Neispravan sadrÅaj spiska osobina"
 
 #: ../common/gvfsdnssdresolver.c:209
 #, c-format
@@ -174,7 +176,7 @@ msgstr "GreÅka pri pokretanju Avahijevog razreÅivaÄa: %s"
 #: ../common/gvfsdnssdresolver.c:1100
 #, c-format
 msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\""
-msgstr "GreÅka pri razreÅavanju â%sâ servisa â%sâ na domenu â%sâ"
+msgstr "GreÅka u razreÅavanju â%sâ servisa â%sâ na domenu â%sâ"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -188,7 +190,7 @@ msgid ""
 "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
 "records are missing. Keys required: \"%s\"."
 msgstr ""
-"GreÅka pri razreÅavanju â%sâ servisa â%sâ na domenu â%sâ. Nedostaje jedan ili "
+"GreÅka u razreÅavanju â%sâ servisa â%sâ na domenu â%sâ. Nedostaje jedan ili "
 "viÅe tekstualnih zapisa. Potreban je kljuÄ:â%sâ."
 
 #. Translators:
@@ -218,168 +220,230 @@ msgstr "LoÅi ulazni podaci za Gvfs ikonicu"
 
 # Åta mislite o D-magistrala???
 # ~ MiloÅ
-#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:231
+#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "GreÅka pri povezivanju na D-bas: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:97
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "%s servis za sistem datoteka"
 
-#: ../daemon/daemon-main.c:110 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "GreÅka: %s"
 
-#: ../daemon/daemon-main.c:156
+#: ../daemon/daemon-main.c:162
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
-msgstr "Upotreba: %s --spawner IB_magistrale putanja_do_objekta"
+msgstr "Upotreba: %s --spawner putanja_do_objekta IB_magistrale"
 
-#: ../daemon/daemon-main.c:180 ../daemon/daemon-main.c:198
+#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Upotreba: %s kljuÄ=vrednost kljuÄ=vrednost ..."
 
-#: ../daemon/daemon-main.c:196
+#: ../daemon/daemon-main.c:202
 #, c-format
 msgid "No mount type specified"
 msgstr "Nije odreÄena vrsta za montiranje"
 
-#: ../daemon/daemon-main.c:266
+#: ../daemon/daemon-main.c:272
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "veÄ je pokrenuta taÄka montiranja za %s"
 
-#: ../daemon/daemon-main.c:277
+#: ../daemon/daemon-main.c:283
 msgid "error starting mount daemon"
-msgstr "greÅka pri pokretanju upravljaÄkog programa za montiranje"
+msgstr "greÅka pri pokretanju usluÅnog programa za montiranje"
 
-#: ../daemon/gvfsbackend.c:933 ../monitor/gdu/ggdumount.c:921
-msgid "Unmount Anyway"
-msgstr "Ipak demontiraj"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "Dobih EOS"
 
-#: ../daemon/gvfsbackend.c:934 ../daemon/gvfsbackendafc.c:388
-#: ../monitor/gdu/ggdudrive.c:1022 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "OtkaÅi"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "Server ne podrÅava lozinke duÅe od 256 znakova"
+
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "ObezbeÄeno je neispravno korisniÄko ime"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr "AFP server %s je odbio podnetu lozinku"
+
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "Prijavljivanje na AFP server %s nije uspelo"
 
-#: ../daemon/gvfsbackend.c:936 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "Server ne podrÅava lozinke duÅe od 64 znakova"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "AFP server %s ne podrÅava anonimno prijavljivanje"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr ""
+"Anonimno prijavljivanje na AFP server %s nije uspelo, dobih kod greÅke: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
 msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
+"Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
-"Disk je zauzet\n"
-"Neki program(i) koriste ovaj disk."
+"Prijavljivanje na AFP server %s nije uspelo (nije pronaÄen odgovarajuÄi "
+"mehanizam potvrÄivanja identiteta)"
+
+# bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+msgid "Failed to connect to server (%s)"
+msgstr "Nisam uspeo da se poveÅem sa serverom (%s)"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+msgid "Enter password for afp as %s on %s"
+msgstr "Unesite lozinku za afp kao %s na %s"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+msgid "Enter password for afp on %s"
+msgstr "Unesite lozinku za afp na %s"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "ProzorÄe za lozinku je zatvoreno"
 
 #: ../daemon/gvfsbackendafc.c:212
 msgid "Internal Apple File Control error"
-msgstr "GreÅka unutar Eplovog kontrolera datoteka"
+msgstr "UnutraÅnja greÅka Eplovog kontrolera datoteka"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:729
+#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
-#: ../daemon/gvfsbackendafc.c:219
+#: ../daemon/gvfsbackendafc.c:220
 msgid "The directory is not empty"
 msgstr "Direktorijum nije prazan"
 
-#: ../daemon/gvfsbackendafc.c:223
+#: ../daemon/gvfsbackendafc.c:224
 msgid "The device did not respond"
 msgstr "UreÄaj ne daje odziv"
 
-#: ../daemon/gvfsbackendafc.c:227
+#: ../daemon/gvfsbackendafc.c:228
 msgid "The connection was interrupted"
 msgstr "Veza je prekinuta"
 
-#: ../daemon/gvfsbackendafc.c:231
+#: ../daemon/gvfsbackendafc.c:232
 msgid "Invalid Apple File Control data received"
 msgstr "Primljeni su neispravni podaci sa Eplovog kontrolera datoteka"
 
-#: ../daemon/gvfsbackendafc.c:235
+#: ../daemon/gvfsbackendafc.c:236
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Nepopravljiva greÅka Eplovog kontrolera datoteka (%d)"
 
-#: ../daemon/gvfsbackendafc.c:254
-#, c-format
-msgid "Unhandled Inst proxy error (%d)"
-msgstr "Nepopravljiva greÅka Inst posrednika (%d)"
+#: ../daemon/gvfsbackendafc.c:252
+msgid "Listing applications installed on device failed"
+msgstr "Nije uspelo ispisivanje programa instaliranih na ureÄaju"
 
-#: ../daemon/gvfsbackendafc.c:273
-#, c-format
-msgid "Unhandled SBServices proxy error (%d)"
-msgstr "Nepopravljiva greÅka posrednika SB usluga (%d)"
+#: ../daemon/gvfsbackendafc.c:268
+msgid "Accessing application icons on device failed"
+msgstr "Nije uspelo pristupanje ikonicama programa na ureÄaju"
 
-#: ../daemon/gvfsbackendafc.c:290
+#: ../daemon/gvfsbackendafc.c:285
 msgid "Lockdown Error: Invalid Argument"
-msgstr "GreÅka pri zakljuÄavanju: Neispravan argument"
-
-#: ../daemon/gvfsbackendafc.c:294 ../daemon/gvfsbackendsftp.c:310
+msgstr "GreÅka u zakljuÄavanju: Neispravan argument"
+
+#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
 #: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
 msgid "Permission denied"
-msgstr "Pristip je odbijen"
+msgstr "Pristup je odbijen"
 
-#: ../daemon/gvfsbackendafc.c:297
+#: ../daemon/gvfsbackendafc.c:293
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
-msgstr "Nepopravljiva greÅka pri zakljuÄavanju (%d)"
+msgstr "Nepopravljiva greÅka u zakljuÄavanju (%d)"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:310
 msgid "libimobiledevice Error: Invalid Argument"
-msgstr "GreÅka unutar libimobiledevice: Neispravan argument"
+msgstr ""
+"GreÅka biblioteke nepokretnog ureÄaja (libimobiledevice): Neispravan argument"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:314
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
 msgstr ""
-"GreÅka unutar libimobiledevice: Nije pronaÄen ureÄaj. Proverite da li je "
-"usbmuxd ispravno podeÅen."
+"GreÅka unutar bib_nepokretnog_ureÄaja: Nije pronaÄen ureÄaj. Proverite da li "
+"je mikser_usb_ureÄaja (usbmuxd) ispravno podeÅen."
 
-#: ../daemon/gvfsbackendafc.c:321
+#: ../daemon/gvfsbackendafc.c:318
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
-msgstr "Nepopravljiva greÅka unutar libimobiledevice (%d)"
+msgstr "Nepopravljiva greÅka bib_nepokretnog_ureÄaja (%d)"
 
-#: ../daemon/gvfsbackendafc.c:388
+#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "OtkaÅi"
+
+#: ../daemon/gvfsbackendafc.c:385
 msgid "Try again"
 msgstr "PokuÅaj ponovo"
 
-#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1628
-#: ../daemon/gvfsbackendhttp.c:315 ../daemon/gvfsbackendobexftp.c:863
-#: ../daemon/gvfsbackendobexftp.c:879 ../daemon/gvfsbackendobexftp.c:898
+#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
+#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Neispravna specifikacija za montiranje"
 
-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackendafc.c:443
+#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
-"Naispravna AFC putanja: mora biti u napisana u obliku afc://uuid:port-broj"
+"Naispravna AFC putanja: mora biti napisana u obliku afc://uuid:broj-porta"
 
-#: ../daemon/gvfsbackendafc.c:428
+#: ../daemon/gvfsbackendafc.c:425
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Eplov prenosni ureÄaj"
 
-#: ../daemon/gvfsbackendafc.c:433
+#: ../daemon/gvfsbackendafc.c:430
 #, c-format
-msgid "Service %d on Apple Mobile Device"
-msgstr "Servis %d na Eplovom prenosnom ureÄaju"
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Eplov prenosni ureÄaj, DÅejlbrouken"
 
-#: ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:435
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Dokumenti na Eplovom mobilnom ureÄaju"
 
-#: ../daemon/gvfsbackendafc.c:497
+#: ../daemon/gvfsbackendafc.c:493
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (bekstvo iz zatvora)"
@@ -387,7 +451,7 @@ msgstr "%s (bekstvo iz zatvora)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:504 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "Dokumenti na â%sâ"
@@ -395,7 +459,7 @@ msgstr "Dokumenti na â%sâ"
 #. translators:
 #. * %s is the device name. 'Try again' is the caption of the button
 #. * shown in the dialog which is defined above.
-#: ../daemon/gvfsbackendafc.c:583
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
 "Device '%s' is password protected. Enter the password on the device and "
@@ -404,55 +468,304 @@ msgstr ""
 "UreÄaj â%sâ je zaÅtiÄen lozinkom. Unesite lozinku ureÄaja i kliknite na "
 "âPokuÅaj ponovoâ."
 
-#: ../daemon/gvfsbackendafc.c:922 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1886
-#: ../daemon/gvfsbackendobexftp.c:1073 ../daemon/gvfsbackendsmb.c:718
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "Ne mogu da otvorim direktorijum"
 
-#: ../daemon/gvfsbackendafc.c:932 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
 #: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:986
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:1060 ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
 #: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
 #: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "Datoteka ne postoji"
 
-#: ../daemon/gvfsbackendafc.c:1123 ../daemon/gvfsbackendafc.c:2466
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "JoÅ uvek nisu podrÅane rezervne kopije."
 
-#: ../daemon/gvfsbackendafc.c:1295
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "Nije ispravna vrsta pretraÅivanja"
 
-#: ../daemon/gvfsbackendafc.c:2303 ../daemon/gvfsbackendftp.c:1080
-#: ../daemon/gvfsbackendftp.c:1128 ../daemon/gvfsbackendftp.c:1149
-#: ../daemon/gvfsbackendsftp.c:1832 ../daemon/gvfsbackendsftp.c:4633
-#: ../daemon/gvfsbackendsmb.c:1718 ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:392
 msgid "Operation unsupported"
 msgstr "Radnja nije podrÅana"
 
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "Dobih kod greÅke: %d sa servera"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "Datoteka se ne moÅe montirati"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+msgid "AFP shares for %s on %s"
+msgstr "AFP deljenja za %s na %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+msgid "AFP shares on %s"
+msgstr "AFP deljenja na %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "Nije odreÄeno ime domaÄina"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Epolova usluga protokola podnoÅenja"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+msgid "File is a directory"
+msgstr "Datoteka je direktorijum"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "PreviÅe datoteka je otvoreno"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "Nema dovoljno prostora na volumenu"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+msgid "Target file is open"
+msgstr "Ciljna datoteka je otvorena"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "Ciljna datoteka veÄ postoji"
+
+#: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+msgid "Ancestor directory doesn't exist"
+msgstr "Roditeljski direktorijum ne postoji"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "Volumen je samo za Äitanje."
+
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "Direktorijum nije prazan"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "Ciljni objekat je oznaÄen kao SpreÄeno brisanje"
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+msgid "Target object doesn't exist"
+msgstr "Ciljni objekat ne postoji"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "Nije pronaÄen IB"
+
+#: ../daemon/gvfsbackendafp.c:1452
+msgid "Can't move directory into one of it's descendants"
+msgstr "Ne mogu da premestim direktorijum u onaj koji je u njemu"
+
+#: ../daemon/gvfsbackendafp.c:1456
+msgid "Can't move sharepoint into a shared directory"
+msgstr "Ne mogu da premestim taÄku deljenja u deljeni direktorijum"
+
+#: ../daemon/gvfsbackendafp.c:1460
+msgid "Can't move a shared directory into the Trash"
+msgstr "Ne mogu da premestim deljeni direktorijum u SmeÄe"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "PremeÅteni objekat je oznaÄen kao SpreÄeno preimenovanje"
+
+#: ../daemon/gvfsbackendafp.c:1472
+msgid "Object being moved doesn't exist"
+msgstr "PremeÅteni objekat ne postoji"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "Server ne podrÅava radnju âFP umnoÅi datotekuâ"
+
+#: ../daemon/gvfsbackendafp.c:1585
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "Ne mogu da otvorim datoteku izvora kao Äitaj/Ospori pisanje"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "Izvorna datoteka i/ili odrediÅni direktorijum ne postoji"
+
+#: ../daemon/gvfsbackendafp.c:1601
+msgid "Source file is a directory"
+msgstr "Izvorna datoteka je direktorijum"
+
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "Ne mogu da umnoÅim direktorijum preko direktorijuma"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "Datoteka je direktorijum"
+
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "Ne mogu da umnoÅim direktorijum rekurzivno"
+
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "Ne mogu da premestim direktorijum preko direktorijuma"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+msgid "Can't rename volume"
+msgstr "Ne mogu da preimenujem volumen"
+
+#: ../daemon/gvfsbackendafp.c:2218
+msgid "Object with that name already exists"
+msgstr "Objekat sa ovim imenom veÄ postoji"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "Ciljni objekat je oznaÄen kao SpreÄeno preimenovanje"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "Volumen je ravan i ne podrÅava direktorijume"
+
+#: ../daemon/gvfsbackendafp.c:2362
+msgid "Target directory already exists"
+msgstr "Ciljni direktorijum veÄ postoji"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "Datoteka nije otvorena za pristup pisanja"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "Datoteka nije otvorena za pristup Äitanja"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "Postoji sukob zakljuÄavanja opsega"
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+msgid "Couldn't create temporary file (%s)"
+msgstr "Ne mogu da napravim privremenu datoteku (%s)"
+
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "Datoteka je izmenjena spoljnim programom"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "rezervne kopije nisu joÅ uvek podrÅane"
+
+#: ../daemon/gvfsbackendafp.c:3539
+msgid "Directory doesn't exist"
+msgstr "Direktorijum ne postoji"
+
+#: ../daemon/gvfsbackendafp.c:3543
+msgid "Target object is not a directory"
+msgstr "Ciljni objekat nije direktorijum"
+
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "Nije ispravna vrsta osobine (âuint32â je oÄekivano)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+msgid "Command not supported"
+msgstr "Naredba nije podrÅana"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "KorisniÄka lozinka je istekla"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "KorisniÄka lozinka treba da se promeni"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FP Dobavi korisniÄke podatke nije uspelo (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "AFP volumen %s za %s na %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+msgid "AFP volume %s on %s"
+msgstr "AFP volumen %s na %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "Ne mogu da prikaÄim AFP volumen %s na %s"
+
+#: ../daemon/gvfsbackendafp.c:4303
+msgid "No volume specified"
+msgstr "Nije odreÄen volumen"
+
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
-#. Translators: This is the name of the root of an sftp share, like "/ on <hostname>"
+#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
 #: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ na %s"
 
-#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:660
-#: ../daemon/gvfsbackendsftp.c:1745
-msgid "No hostname specified"
-msgstr "Nije odreÄeno ime domaÄina"
-
 #: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:439
+#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
 #: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
 #: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
@@ -461,7 +774,7 @@ msgstr "Datoteka nije direktorijum"
 #. Translators: This is the name of the backend
 #: ../daemon/gvfsbackendburn.c:346
 msgid "Burn"
-msgstr "UpiÅi"
+msgstr "RezaÄ"
 
 #: ../daemon/gvfsbackendburn.c:376
 msgid "Unable to create temporary directory"
@@ -471,34 +784,29 @@ msgstr "Ne mogu da napravim privremeni direktorijum"
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:786
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2207
-#: ../daemon/gvfsbackendgphoto2.c:2926 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
+#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "Ne postoji takva datoteka ili direktorijum"
 
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2298
-#: ../daemon/gvfsbackendsftp.c:1828
-msgid "Directory not empty"
-msgstr "Direktorijum nije prazan"
-
 #: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
-msgstr "Ne mogu da prepiÅem datoteku preko direktorijuma"
+msgstr "Ne mogu da umnoÅim datoteku preko direktorijuma"
 
 #. Translators: this is the display name of the backend
 #: ../daemon/gvfsbackendburn.c:651
 msgid "CD/DVD Creator"
-msgstr "Izrada diskova"
+msgstr "CD/DVD Tvorac"
 
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:3000
+#: ../daemon/gvfsbackendgphoto2.c:2926
 msgid "File exists"
 msgstr "Datoteka postoji"
 
@@ -521,8 +829,8 @@ msgstr "Datoteka postoji"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
-#: ../monitor/gdu/ggduvolume.c:1608
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "Radnja nije podrÅana pozadinskim programima"
 
@@ -530,28 +838,30 @@ msgstr "Radnja nije podrÅana pozadinskim programima"
 msgid "No such file or directory in target path"
 msgstr "Ne postoji takva datoteka ili direktorijum u ciljnoj putanji"
 
-#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendftp.c:1535
-#: ../daemon/gvfsbackendobexftp.c:1781
-msgid "Can't copy directory over directory"
-msgstr "Ne mogu da prepiÅem direktorijum preko direktorijuma"
-
-#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1789
-#: ../daemon/gvfsbackendobexftp.c:1820 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
 #: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "Ciljna datoteka veÄ postoji"
 
-#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendftp.c:1558
-#: ../daemon/gvfsbackendobexftp.c:1796
-msgid "Can't recursively copy directory"
-msgstr "Ne mogu da umnoÅim direktorijum rekurzivno"
-
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2580 ../daemon/gvfsbackendgphoto2.c:2789
-#: ../daemon/gvfsbackendgphoto2.c:2886 ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
+#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
 msgid "Not supported"
 msgstr "Nije podrÅano"
 
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "Ipak demontiraj"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"Disk je zauzet\n"
+"Neki program(i) koriste ovaj disk."
+
 #: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
 msgid "Cannot create gudev client"
 msgstr "Ne mogu da napravim gudev klijent"
@@ -568,7 +878,7 @@ msgstr "Ne mogu da napravim libhal kontekst"
 msgid "Cannot initialize libhal"
 msgstr "Ne mogu da pokrenem libhal"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "Nije odreÄen ureÄaj"
 
@@ -582,55 +892,56 @@ msgstr "Ne mogu da naÄem ureÄaj %s"
 msgid "Drive %s does not contain audio files"
 msgstr "UreÄaj %s ne sadrÅi zvuÄne datoteke"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:439
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
 msgstr "cdda je montiran u %s"
 
-#: ../daemon/gvfsbackendcdda.c:440 ../daemon/gvfsbackendcdda.c:960
+#: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
 #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "ZvuÄni disk"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "Sistem datoteka je zauzet: %d datoteka je otvorena"
 msgstr[1] "Sistem datoteka je zauzet: %d datoteke su otvorene"
 msgstr[2] "Sistem datoteka je zauzet: %d datoteka je otvoreno"
-msgstr[3] "Sistem datoteka je zauzet: datoteka je otvorena"
+msgstr[3] "Sistem datoteka je zauzet: jedna datoteka je otvorena"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "Datoteka %s ne postoji na ureÄaju %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "GreÅka u programu âparanoiaâ na ureÄaju %s"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "Ne mogu da premotam tok sa ureÄaja %s"
 
-#: ../daemon/gvfsbackendcdda.c:979 ../daemon/gvfsbackendgphoto2.c:1894
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
 #, c-format
 msgid "No such file"
 msgstr "Ne postoji takva datoteka"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "Datoteka ne postoji ili nije zvuÄni zapis"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "Servis sistema datoteka za zvuÄni disk"
 
@@ -656,7 +967,7 @@ msgid "Can't mount file"
 msgstr "Ne mogu da montiram datoteku"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
+msgid "No medium in the drive"
 msgstr "Nema medijuma u ureÄaju"
 
 #: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
@@ -685,139 +996,117 @@ msgstr "Ne mogu da zaustavim datoteku"
 msgid "Can't poll file"
 msgstr "Ne mogu da upitam datoteku"
 
-#: ../daemon/gvfsbackenddav.c:560 ../daemon/gvfsbackenddav.c:1695
-#: ../daemon/gvfsbackendhttp.c:261
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+msgid "WebDAV as %s on %s%s"
+msgstr "VebDAV kao %s na %s%s"
+
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
+#. %s and it is only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:493
+#, c-format
+msgid "WebDAV on %s%s"
+msgstr "VebDAV na %s%s"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:248
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP greÅka: %s"
 
-#: ../daemon/gvfsbackenddav.c:577
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Ne mogu da obradim odgovor"
 
-#: ../daemon/gvfsbackenddav.c:586
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Prazan odgovor"
 
-#: ../daemon/gvfsbackenddav.c:594
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "NeoÄekivan odgovor sa servera"
 
-#: ../daemon/gvfsbackenddav.c:1211 ../daemon/gvfsbackenddav.c:1835
-#: ../daemon/gvfsbackenddav.c:1941
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Neispravan odgovor"
 
-#: ../daemon/gvfsbackenddav.c:1354
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "VebDAV deljenje"
 
-#: ../daemon/gvfsbackenddav.c:1356
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
-msgstr "Unesite lozinku za proksi"
+msgstr "Unesite lozinku posrednika"
 
-#: ../daemon/gvfsbackenddav.c:1699 ../daemon/gvfsbackenddav.c:1703
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "Ovo nije VebDAV deljenje"
 
-#: ../daemon/gvfsbackenddav.c:1731
-#, c-format
-msgid "WebDAV on %s"
-msgstr "VebDAV na %s"
-
-#: ../daemon/gvfsbackenddav.c:1791 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackenddav.c:1975
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "Ne mogu da napravim zahtev"
 
-#: ../daemon/gvfsbackenddav.c:1949 ../daemon/gvfsbackendftp.c:766
-#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
-#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
-msgid "File is directory"
-msgstr "Datoteka je direktorijum"
-
-#: ../daemon/gvfsbackenddav.c:2005 ../daemon/gvfsbackenddav.c:2258
-#: ../daemon/gvfsbackenddav.c:2369 ../daemon/gvfsbackendftp.c:745
-#: ../daemon/gvfsbackendftp.c:926 ../daemon/gvfsbackendftp.c:1365
-#: ../daemon/gvfsbackendftp.c:1543 ../daemon/gvfsbackendsftp.c:4285
-#: ../daemon/gvfsbackendsmb.c:2063
-msgid "Target file already exists"
-msgstr "VeÄ postoji ciljna datoteka"
-
-#: ../daemon/gvfsbackenddav.c:2078 ../daemon/gvfsbackendsftp.c:3421
-#: ../daemon/gvfsbackendsmb.c:1148
-msgid "The file was externally modified"
-msgstr "Datoteka je izmenjena spoljnim programom"
-
-#: ../daemon/gvfsbackenddav.c:2109 ../daemon/gvfsbackendsmb.c:1184
-#: ../daemon/gvfsbackendsmb.c:2080
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
-msgstr "Nije uspelo pravljenje datoteke sa rezervnom kopijom"
+msgstr "Nije uspelo pravljenje datoteke rezervne kopije"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:486 ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
 msgstr "Lokalna mreÅa"
 
-#: ../daemon/gvfsbackenddnssd.c:730 ../daemon/gvfsbackendnetwork.c:753
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "Ne mogu da nadgledam datoteku ili direktorijum."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:748
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:749 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
 #: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "MreÅa"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:481
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "Unesite lozinku za ftp kao %s na %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "Unesite lozinku za FTP kao %s na %s"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:484
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "Unesite lozinku za ftp na %s"
-
-#: ../daemon/gvfsbackendftp.c:511 ../daemon/gvfsbackendsftp.c:985
-#: ../daemon/gvfsbackendsmb.c:619 ../daemon/gvfsbackendsmbbrowse.c:995
-msgid "Password dialog cancelled"
-msgstr "ProzorÄe za lozinku je zatvoreno"
+msgid "Enter password for FTP on %s"
+msgstr "Unesite lozinku za FTP na %s"
 
-#: ../daemon/gvfsbackendftp.c:623
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ftp na %s"
+msgid "FTP on %s"
+msgstr "FTP na %s"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:627
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "ftp kao %s na %s"
+msgid "FTP as %s on %s"
+msgstr "FTP kao %s na %s"
 
-#: ../daemon/gvfsbackendftp.c:720
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
-msgstr "Nemate ovlaÅÄenja"
-
-#: ../daemon/gvfsbackendftp.c:974 ../daemon/gvfsbackendftp.c:1328
-#: ../daemon/gvfsbackendsftp.c:3274
-msgid "backups not supported yet"
-msgstr "joÅ uvek nisu podrÅane rezervne kopije"
-
-#: ../daemon/gvfsbackendftp.c:1121 ../daemon/gvfsbackendsftp.c:4643
-msgid "Invalid attribute type (uint32 expected)"
-msgstr "Nije ispravna vrsta osobine (âuint32â je oÄekivano)"
+msgstr "Nedovoljna ovlaÅÄenja"
 
 #: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
@@ -859,7 +1148,7 @@ msgstr "Fotoaparat marke %s"
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "ZvuÄni plejer marke %s"
+msgstr "ZvuÄni ureÄaj marke %s"
 
 #: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
@@ -868,7 +1157,7 @@ msgstr "Fotoaparat"
 
 #: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
-msgstr "ZvuÄni plejer"
+msgstr "ZvuÄni ureÄaj"
 
 #: ../daemon/gvfsbackendgphoto2.c:1569
 msgid "No device specified"
@@ -902,131 +1191,132 @@ msgstr "GreÅka u uspostavljanju veze sa fotoaparatom"
 msgid "Error initializing camera"
 msgstr "GreÅka pri pokretanju fotoaparata"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1683
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1684
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "GFoto2 ureÄaj montiran na %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1765
+#: ../daemon/gvfsbackendgphoto2.c:1766
 msgid "No camera specified"
 msgstr "Nije izabran fotoaparat"
 
-#: ../daemon/gvfsbackendgphoto2.c:1806 ../daemon/gvfsbackendgphoto2.c:1832
-#, c-format
-msgid "Filesystem is busy"
-msgstr "Sistem datoteka je zauzet"
-
-#: ../daemon/gvfsbackendgphoto2.c:1902
+#: ../daemon/gvfsbackendgphoto2.c:1828
 msgid "Error creating file object"
 msgstr "Ne mogu da napravim objekat datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:1917
+#: ../daemon/gvfsbackendgphoto2.c:1843
 msgid "Error getting file"
 msgstr "GreÅka pri dobijanju datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:1927
+#: ../daemon/gvfsbackendgphoto2.c:1853
 msgid "Error getting data from file"
 msgstr "GreÅka pri dobijanju podataka iz datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
+#: ../daemon/gvfsbackendgphoto2.c:1911
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "LoÅ odrednik ikonice â%sâ"
 
-#: ../daemon/gvfsbackendgphoto2.c:2061 ../daemon/gvfsbackendgphoto2.c:3250
+#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Ne mogu da premotam tok sa fotoaparata %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2201 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Nije fascikla"
 
 # bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
-#: ../daemon/gvfsbackendgphoto2.c:2234
+#: ../daemon/gvfsbackendgphoto2.c:2160
 msgid "Failed to get folder list"
 msgstr "Ne mogu da dobijem spisak fascikli"
 
 # bug: inconsistent wording with above "Bookmark saving failed" [eg. "Failed to save a bookmark" would be one way to solve it]
-#: ../daemon/gvfsbackendgphoto2.c:2300
+#: ../daemon/gvfsbackendgphoto2.c:2226
 msgid "Failed to get file list"
 msgstr "Ne mogu da dobijem spisak datoteka"
 
-#: ../daemon/gvfsbackendgphoto2.c:2592
+#: ../daemon/gvfsbackendgphoto2.c:2518
 msgid "Error creating directory"
-msgstr "GreÅka pri obrazovanju datoteke"
+msgstr "GreÅka u stvaranju datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:2801
+#: ../daemon/gvfsbackendgphoto2.c:2727
 msgid "Name already exists"
-msgstr "Ovo ime veÄ postoji"
+msgstr "Naziv veÄ postoji"
 
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:3441
+#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
 msgid "New name too long"
-msgstr "Novo ime je predugaÄko"
+msgstr "Novi naziv je predugaÄak"
 
-#: ../daemon/gvfsbackendgphoto2.c:2822 ../daemon/gvfsbackendgphoto2.c:3452
-msgid "Error renaming dir"
+#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
+msgid "Error renaming directory"
 msgstr "GreÅka u preimenovanju direktorijuma"
 
-#: ../daemon/gvfsbackendgphoto2.c:2835 ../daemon/gvfsbackendgphoto2.c:3465
+#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
 msgid "Error renaming file"
 msgstr "GreÅka u preimenovanju datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:2899
+#: ../daemon/gvfsbackendgphoto2.c:2825
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Direktorijum â%sâ nije prazan"
 
-#: ../daemon/gvfsbackendgphoto2.c:2910
+#: ../daemon/gvfsbackendgphoto2.c:2836
 msgid "Error deleting directory"
 msgstr "GreÅka pri brisanju direktorijuma"
 
-#: ../daemon/gvfsbackendgphoto2.c:2936
+#: ../daemon/gvfsbackendgphoto2.c:2862
 msgid "Error deleting file"
 msgstr "GreÅka pri brisanju datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:2989
+#: ../daemon/gvfsbackendgphoto2.c:2915
 msgid "Can't write to directory"
 msgstr "Ne mogu da upiÅem u direktorijum"
 
-#: ../daemon/gvfsbackendgphoto2.c:3036
+#: ../daemon/gvfsbackendgphoto2.c:2962
 msgid "Cannot allocate new file to append to"
 msgstr "Ne mogu da pronaÄem novu datoteku za dodavanje"
 
-#: ../daemon/gvfsbackendgphoto2.c:3051
+#: ../daemon/gvfsbackendgphoto2.c:2977
 msgid "Cannot read file to append to"
 msgstr "Ne mogu da proÄitam datoteku za dodavanje"
 
-#: ../daemon/gvfsbackendgphoto2.c:3062
+#: ../daemon/gvfsbackendgphoto2.c:2988
 msgid "Cannot get data of file to append to"
 msgstr "Ne mogu da dobijem podatke o datoteci za dodavanje"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
+#: ../daemon/gvfsbackendgphoto2.c:3275
 msgid "Error writing file"
 msgstr "GreÅka pri upisu datoteke"
 
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:3323
 msgid "Not supported (not same directory)"
 msgstr "Nije podrÅano (nije isti direktorijum)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3409
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Nije podrÅano (izvor i odrediÅte su direktorijumi)"
+#: ../daemon/gvfsbackendgphoto2.c:3335
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
+msgstr "Nije podrÅano (i izvor i odrediÅte su direktorijumi)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3417
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "Nije podrÅano (izvor je direktorijum, odrediÅte postojeÄa datoteka)"
+#: ../daemon/gvfsbackendgphoto2.c:3343
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr ""
+"Nije podrÅano (izvor je direktorijum, ali odrediÅte je postojeÄa datoteka)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3429
-msgid "Not supported (src is file, dst is dir)"
-msgstr "Nije podrÅano (izvor je datoteka, odrediÅte direktorijum)"
+#: ../daemon/gvfsbackendgphoto2.c:3355
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
+msgstr "Nije podrÅano (izvor je datoteka, ali odrediÅte je direktorijum)"
 
-#: ../daemon/gvfsbackendhttp.c:257
+#: ../daemon/gvfsbackendhttp.c:244
 #, c-format
 msgid "HTTP Client Error: %s"
-msgstr "GreÅka u HTTP klijentu: %s"
+msgstr "GreÅka HTTP klijenta: %s"
 
 #: ../daemon/gvfsbackendlocaltest.c:855
 msgid "Directory notification not supported"
@@ -1035,7 +1325,7 @@ msgstr "Nije podrÅano obaveÅtavanje o direktorijumu"
 #. smb:/// root link
 #: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
-msgstr "Windows mreÅa"
+msgstr "Vindouz mreÅa"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
@@ -1049,25 +1339,25 @@ msgstr "Mesta na mreÅi"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:683 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:681 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: ../daemon/gvfsbackendobexftp.c:892
+#: ../daemon/gvfsbackendobexftp.c:890
 msgid "USB support missing. Please contact your software vendor"
 msgstr "USB nije podrÅan. Stupite u vezu sa proizvoÄaÄem programa"
 
-#: ../daemon/gvfsbackendobexftp.c:1012
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "Prekinuta je veza sa ureÄajem"
 
-#: ../daemon/gvfsbackendobexftp.c:1509
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "UreÄaj zahteva aÅuriranje programa"
 
-#: ../daemon/gvfsbackendobexftp.c:1857 ../daemon/gvfsbackendsmb.c:1954
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "GreÅka pri brisanju datoteke: %s"
@@ -1094,12 +1384,12 @@ msgstr "Nije uspela provera kljuÄa domaÄina"
 
 #: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
-msgstr "Ne mogu da razgranam ssh program"
+msgstr "Ne mogu da izrodim ssh program"
 
 #: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
-msgstr "Ne mogu da razgranam ssh program: %s"
+msgstr "Ne mogu da izrodim ssh program: %s"
 
 #: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
@@ -1135,7 +1425,7 @@ msgstr "Ne mogu da poÅaljem lozinku"
 
 #: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
-msgstr "Ipak se prijavi"
+msgstr "Ipak me prijavi"
 
 #: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
@@ -1151,7 +1441,7 @@ msgid ""
 "sure it is safe to continue, contact the system administrator."
 msgstr ""
 "Nije poznat identitet udaljenog raÄunara (%s).\n"
-"Ovo se dogaÄa kada se po prvi put prijavite na raÄunar.\n"
+"Do ovoga dolazi kada se prvi put prijavite na raÄunar.\n"
 "\n"
 "Identitet koji je poslao udaljeni raÄunar je %s. Ukoliko Åelite da budete "
 "potpuno sigurni da je bezbedno da nastavite, stupite u vezu sa "
@@ -1169,17 +1459,17 @@ msgstr "Ne mogu da poÅaljem potvrdu identiteta domaÄinu"
 msgid "Protocol error"
 msgstr "GreÅka u protokolu"
 
-#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp for %s on %s"
-msgstr "sftp kao %s na %s"
+msgid "SFTP for %s on %s"
+msgstr "SFTP kao %s na %s"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
-msgid "sftp on %s"
-msgstr "sftp na %s"
+msgid "SFTP on %s"
+msgstr "SFTP na %s"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
@@ -1217,7 +1507,7 @@ msgstr "Neuspeh"
 #: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
-msgstr "Neispravan icon_id â%sâ unutar OpenIconForRead"
+msgstr "Neispravan ib_ikonice â%sâ u âOtvori ikonicu za Äitanjeâ"
 
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
@@ -1228,9 +1518,31 @@ msgstr "Ne mogu da napravim rezervnu kopiju: %s"
 msgid "Unable to create temporary file"
 msgstr "Ne mogu da napravim privremenu datoteku"
 
-#: ../daemon/gvfsbackendsftp.c:4271 ../daemon/gvfsbackendsmb.c:2052
-msgid "Can't move directory over directory"
-msgstr "Ne mogu da premestim direktorijum preko direktorijuma"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "Potrebna je lozinka za %s"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "Vindouz deljenja na %s"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "Ne mogu da dobijem spisak deljenja sa servera"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "Nije obiÄna datoteka"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Vindouz servis mreÅnih sistema datoteka"
 
 #. translators: First %s is a share name, second is a server name
 #: ../daemon/gvfsbackendsmb.c:238
@@ -1247,7 +1559,7 @@ msgstr "UnutraÅnja greÅka (%s)"
 #. translators: We tried to mount a windows (samba) share, but failed
 #: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
-msgstr "Ne mogu da montiram Windows deljenje"
+msgstr "Ne mogu da montiram Vindouz deljenje"
 
 #: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
@@ -1258,65 +1570,39 @@ msgstr "Nije podrÅana vrsta premotavanja"
 msgid "Backup file creation failed: %s"
 msgstr "Nije uspelo pravljenje rezervne kopije: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1733
+#: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Nije ispravna vrsta osobine (âuint64â je oÄekivano)"
 
-#: ../daemon/gvfsbackendsmb.c:2028
+#: ../daemon/gvfsbackendsmb.c:1922
+msgid "Can't rename file, filename already exists"
+msgstr "Ne mogu da preimenujem datoteku, naziv datoteke veÄ postoji"
+
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "GreÅka pri premeÅtanju datoteke: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2100
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "GreÅka pri uklanjanju ciljne datoteke: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2124
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Ne mogu da premestim direktorijum rekurzivno"
 
-#: ../daemon/gvfsbackendsmb.c:2168
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
-msgstr "Servis deljenih Vindouz sistema datoteka"
-
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:375
-#, c-format
-msgid "Password required for %s"
-msgstr "Potrebna je lozinka za %s"
-
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:902
-#, c-format
-msgid "Windows shares on %s"
-msgstr "Vindouz deljenja na %s"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:1001
-msgid "Failed to retrieve share list from server"
-msgstr "Ne mogu da dobijem spisak deljenja sa servera"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1089 ../daemon/gvfsbackendsmbbrowse.c:1135
-msgid "The file is not a mountable"
-msgstr "Datoteka se ne moÅe montirati"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1157
-msgid "Not a regular file"
-msgstr "Nije obiÄna datoteka"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1489
-msgid "Windows Network Filesystem Service"
-msgstr "Servis mreÅnih Vindouz sistema datoteka"
+msgstr "Vindouz servis deljenih sistema datoteka"
 
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
-msgstr "Ne smete obrisati fasciklu za smeÄe"
+msgstr "Fascikla za smeÄe ne moÅe biti obrisana"
 
 #: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 msgid "Items in the trash may not be modified"
-msgstr "Ne smete menjati stavke iz smeÄa"
+msgstr "Stavke iz smeÄa ne mogu biti izmenjene "
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
@@ -1330,8 +1616,8 @@ msgstr "Neispravna vrsta pozadinskog programa"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "GreÅka pri slanju fd: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "GreÅka u slanju opisivaÄa datoteke: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
@@ -1347,7 +1633,8 @@ msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
 msgstr ""
-"Ne mogu da napravim FTP vezu. MoÅda ovo nije podrÅano od strane vaÅeg rutera?"
+"Ne mogu da napravim FTP vezu. MoÅda ovo nije podrÅano od strane vaÅeg "
+"usmerivaÄa?"
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
@@ -1363,7 +1650,7 @@ msgstr "FTP server je zauzet. PokuÅajte kasnije."
 
 #: ../daemon/gvfsftptask.c:356
 msgid "Accounts are unsupported"
-msgstr "Nisu podrÅani nalozi"
+msgstr "Nalozi nisu podrÅani"
 
 #: ../daemon/gvfsftptask.c:360
 msgid "Host closed connection"
@@ -1371,7 +1658,8 @@ msgstr "DomaÄin je zatvorio vezu"
 
 #: ../daemon/gvfsftptask.c:364
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr "Ne mogu da otvorim vezu do podataka. MoÅda je ukljuÄen fajervol?"
+msgstr ""
+"Ne mogu da otvorim vezu do podataka. MoÅda je ukljuÄena mreÅna barijera?"
 
 #: ../daemon/gvfsftptask.c:368
 msgid "Data connection closed"
@@ -1405,62 +1693,68 @@ msgstr "SimboliÄke veze nisu podrÅane pozadinskim programom"
 msgid "Invalid dbus message"
 msgstr "Neispravna dbas poruka"
 
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "Sistem datoteka je zauzet"
+
 #: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
-msgstr "Zameni stari upravljaÄki program."
+msgstr "Zameni stari usluÅni program."
 
 #: ../daemon/main.c:46
 msgid "Don't start fuse."
 msgstr "Ne pokreÄi fuse."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:62
 msgid "GVFS Daemon"
-msgstr "UpravljaÄki program za GVFS"
+msgstr "UsluÅni program za GVFS"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:65
 msgid "Main daemon for GVFS"
-msgstr "Glavni upravljaÄki program za GVFS"
+msgstr "Glavni usluÅni program za GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:82 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mkdir.c:60
-#: ../programs/gvfs-move.c:111 ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128 ../programs/gvfs-tree.c:251
+#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
+#: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pokrenite â%s --helpâ za viÅe podataka."
 
-#: ../daemon/mount.c:459
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
-msgstr "Neispravni argumenti od razgranatog deÄjeg procesa"
+msgstr "Neispravni argumenti od izroÄenog deÄjeg procesa"
 
-#: ../daemon/mount.c:780
+#: ../daemon/mount.c:779
 #, c-format
 msgid "Automount failed: %s"
 msgstr "Nije uspelo automatsko montiranje: %s"
 
-#: ../daemon/mount.c:826 ../daemon/mount.c:903
+#: ../daemon/mount.c:825 ../daemon/mount.c:902
 msgid "The specified location is not mounted"
 msgstr "Izabrano mesto nije montirano"
 
-#: ../daemon/mount.c:831
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "Izabrano mesto nije podrÅano"
 
-#: ../daemon/mount.c:1045
+#: ../daemon/mount.c:1044
 msgid "Location is already mounted"
 msgstr "Ovo mesto je veÄ montirano"
 
-#: ../daemon/mount.c:1053
+#: ../daemon/mount.c:1052
 msgid "Location is not mountable"
 msgstr "Mesto se ne moÅe montirati"
 
@@ -1481,7 +1775,7 @@ msgstr "Ne mogu da uklonim kljuÄ sa metapodacima"
 
 #: ../metadata/meta-daemon.c:428
 msgid "Unable to remove metadata keys"
-msgstr "Nr mogu da uklonim kljuÄeve sa metapodacima"
+msgstr "Ne mogu da uklonim kljuÄeve sa metapodacima"
 
 #: ../metadata/meta-daemon.c:459
 msgid "Unable to move metadata keys"
@@ -1489,11 +1783,11 @@ msgstr "Ne mogu da premestim kljuÄeve sa metapodacima"
 
 #: ../metadata/meta-daemon.c:704
 msgid "GVFS Metadata Daemon"
-msgstr "UpravljaÄki program za metapodatke"
+msgstr "UsluÅni program za metapodatke"
 
 #: ../metadata/meta-daemon.c:707
 msgid "Metadata daemon for GVFS"
-msgstr "GVFS upravljaÄki program za metapodatke"
+msgstr "GVFS usluÅni program za metapodatke"
 
 #: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
 msgid "GVfs GDU Volume Monitor"
@@ -1512,12 +1806,13 @@ msgstr "Neimenovani ureÄaj (%s)"
 msgid "Unnamed Drive"
 msgstr "Neimenovani ureÄaj"
 
-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/hal/ghaldrive.c:662
+#: ../monitor/gdu/ggdudrive.c:561
 #, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
-msgstr "Ne mogu da izbacim medijum; neki ureÄaj je zauzet."
+msgid "Failed to eject medium; one or more volumes on the medium are busy."
+msgstr ""
+"Nisam uspeo da izbacim medij; jedan ili viÅe volumena na mediju je zauzet."
 
-#: ../monitor/gdu/ggdudrive.c:1015
+#: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
 "Starting a drive in degraded mode means that the drive is no longer tolerant "
@@ -1528,21 +1823,21 @@ msgstr ""
 "neispravan rad. MoÅete zauvek izgubiti podatke sa ureÄaja ukoliko neki deo "
 "otkaÅe."
 
-#: ../monitor/gdu/ggdudrive.c:1021
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "Ipak pokreni"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Neki program(i) ne dopuÅtaju demontiranje ureÄaja."
 
 # Aman!!! ~MiloÅ
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "Ne mogu da naÄem LUKS program za Åifrovanje"
 
 # Aman!!! ~MiloÅ
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Ne mogu da naÄem LUKS program za Åifrovanje u putanji â%sâ"
@@ -1551,7 +1846,7 @@ msgstr "Ne mogu da naÄem LUKS program za Åifrovanje u putanji â%sâ"
 msgid "Floppy Disk"
 msgstr "Disketa"
 
-#: ../monitor/gdu/ggduvolume.c:1088
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1560,7 +1855,7 @@ msgstr ""
 "Unesite lozinku za otkljuÄavanje diska\n"
 "UreÄaj â%sâ sadrÅi Åifrovane podatke u odeljku %d."
 
-#: ../monitor/gdu/ggduvolume.c:1095
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1569,7 +1864,7 @@ msgstr ""
 "Unesite lozinku za otkljuÄavanje diska\n"
 "UreÄaj â%sâ sadrÅi Åifrovane."
 
-#: ../monitor/gdu/ggduvolume.c:1102
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1588,11 +1883,11 @@ msgstr "Prazan obiÄan disk"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
-msgstr "ObiÄan disk"
+msgstr "Upisiv obiÄan disk"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
-msgstr "Prazan obiÄan disk"
+msgstr "Prazan obiÄan upisiv disk"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
@@ -1600,7 +1895,7 @@ msgstr "Prepisiv obiÄan disk"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
-msgstr "Prazan prepisiv disk"
+msgstr "Prazan prepisiv obiÄan disk"
 
 #: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
 #: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
@@ -1626,7 +1921,7 @@ msgstr "Prepisiv DVD"
 
 #: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
-msgstr "Prazan prepisiv DVD"
+msgstr "Prazan prepisivi DVD"
 
 #: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
@@ -1638,7 +1933,7 @@ msgstr "Prazan DVD+"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
-msgstr "Prepisiv DVD+"
+msgstr "Prepisivi DVD+"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
@@ -1858,6 +2153,11 @@ msgstr "PriruÄni disk"
 msgid "Mass Storage Drive"
 msgstr "Masovno skladiÅte"
 
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+msgid "Failed to eject media; one or more volumes on the media are busy."
+msgstr "Ne mogu da izbacim medijum; neki ureÄaj je zauzet."
+
 #: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
@@ -1878,10 +2178,9 @@ msgid "Mixed Audio/Data Disc"
 msgstr "Disk sa zvukom i podacima"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
+msgid "%s Medium"
 msgstr "Medijum od %s"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
@@ -1890,6 +2189,12 @@ msgstr "Medijum od %s"
 msgid "%s Encrypted Data"
 msgstr "%s Åifrovanih podataka"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "Medijum od %s"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
 msgstr "mesta"
@@ -1924,7 +2229,7 @@ msgstr "%s: %s: greÅka u zatvaranju: %s\n"
 
 #: ../programs/gvfs-cat.c:136
 msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "MESTO... - stapa sadrÅaj datoteka i ispisuje na standardni izlaz."
+msgstr "MESTO... â stapa sadrÅaj datoteka i ispisuje na standardni izlaz."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
@@ -1944,21 +2249,22 @@ msgid ""
 "Note: just pipe through cat if you need its formatting option like -n, -T or "
 "other."
 msgstr ""
-"Primedba: samo prosledite cevovodom u âcatâ ukoliko su vam potrebne njegove "
-"opcije za formatiranje, kao Åto su -n, -T i druge."
+"Primedba: samo prosledite kroz âcatâ ukoliko su vam potrebne njegove opcije "
+"za formatiranje, kao Åto su -n, -T i druge."
 
 #: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
 #: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-move.c:109
-#: ../programs/gvfs-open.c:138 ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126 ../programs/gvfs-tree.c:249
+#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
+#: ../programs/gvfs-tree.c:249
 #, c-format
 msgid "Error parsing commandline options: %s\n"
-msgstr "GreÅka u prosleÄivanju opcija komandne linije: %s\n"
+msgstr "GreÅka u analizi opcija komandne linije: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: nedostaju mesta"
@@ -2132,7 +2438,7 @@ msgstr "â prikazuje podatke za <mesto>"
 
 #: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
-msgstr "PrikaÅi skrivene datoteke"
+msgstr "Prikazuje skrivene datoteke"
 
 #: ../programs/gvfs-ls.c:41
 msgid "Use a long listing format"
@@ -2140,7 +2446,7 @@ msgstr "Koristi dugi format spiska"
 
 #: ../programs/gvfs-ls.c:42
 msgid "Show completions"
-msgstr "PrikaÅi zavrÅetke"
+msgstr "Prikazuje zavrÅetke"
 
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
 #: ../programs/gvfs-rename.c:69
@@ -2152,18 +2458,69 @@ msgstr "GreÅka: %s\n"
 msgid "- list files at <location>"
 msgstr "â ispisuje datoteke iz <mesto>"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "Pita rukovaoca za mime-vrstu"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "Postavlja rukovaoca za mime-vrstu"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "â dobavlja/podeÅava rukovaoca za <mime-vrstu>"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "OdreÄuje jedan od â--queryâ i â--setâ"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "Morate da navedete jedan mime-tip.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "Morate navesti mime-tip za kojim sledi osnovni rukovalac.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "Nema osnovnog programa za â%sâ\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "Osnovni program za â%sâ: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "ZabeleÅeni programi:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "Nisam uspeo da uÄitam podatke o rukovaocu s%sâ\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "Nisam uspeo da podesim â%sâ kao osnovnog rukovaoca za â%sâ: %s\n"
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
-msgstr "napravi roditeljski direktorijum"
+msgstr "pravi roditeljski direktorijum"
 
 #: ../programs/gvfs-mkdir.c:51
 msgid "- create directories"
-msgstr "â napravi direktorijume"
+msgstr "â pravi direktorijume"
 
 #: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
-msgstr "PreÅka prilikom pravljenja direktorijuma: %s\n"
+msgstr "GreÅka prilikom pravljenja direktorijuma: %s\n"
 
 #: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
 msgid "Don't send single MOVED events."
@@ -2171,7 +2528,7 @@ msgstr "Ne Åalje pojedinaÄna PREMEÅTANJA."
 
 #: ../programs/gvfs-mount.c:54
 msgid "Mount as mountable"
-msgstr "Ne moÅete montirati ovu taÄku"
+msgstr "KaÄi kao prikaÄljivom"
 
 #: ../programs/gvfs-mount.c:55
 msgid "Mount volume with device file"
@@ -2185,49 +2542,50 @@ msgstr "Demontiraj"
 msgid "Unmount all mounts with the given scheme"
 msgstr "Demontira sve montirane taÄke pomoÄu date Åeme"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
-msgstr "Spisak"
+msgstr "IspiÅi"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
 msgstr "PrikaÅi dodatne podatke za Spisak i PraÄenje"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
 msgstr "Prati dogaÄaje"
 
-#: ../programs/gvfs-mount.c:163 ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "GreÅka pri montiranju mesta: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "GreÅka pri demontiranju: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "GreÅka pri pronalaÅenju zatvarajuÄeg montiranja: %s\n"
 
-#: ../programs/gvfs-mount.c:682
+#: ../programs/gvfs-mount.c:683
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "GreÅka pri montiranju %s: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:697
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Montirano %s na %s\n"
 
-#: ../programs/gvfs-mount.c:747
+#: ../programs/gvfs-mount.c:748
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Ne postoji disk za datoteku ureÄaja %s\n"
 
-#: ../programs/gvfs-mount.c:938
+#: ../programs/gvfs-mount.c:939
 msgid "- mount <location>"
 msgstr "â montira <mesto>"
 
@@ -2258,13 +2616,13 @@ msgstr "%s: %s: greÅka u otvaranju mesta: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: greÅka u pokretanju programa: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "DATOTEKE... â otvara DATOTEKE dostupnim programima."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
+#: ../programs/gvfs-open.c:127
 msgid ""
 "Opens the file(s) with the default application registered to handle the type "
 "of the file."
@@ -2281,7 +2639,7 @@ msgstr "UspeÅno preimenovano. Nova putanja je: %s\n"
 
 #: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
 msgid "ignore nonexistent files, never prompt"
-msgstr "zanemari nepostojeÄe datoteke, ne pitaj me"
+msgstr "zanemaruje nepostojeÄe datoteke, ne pita nikada"
 
 #: ../programs/gvfs-rm.c:53
 msgid "- delete files"
@@ -2289,11 +2647,11 @@ msgstr "â briÅe datoteke"
 
 #: ../programs/gvfs-save.c:43
 msgid "Create backup"
-msgstr "Napravi rezervnu kopiju"
+msgstr "Pravi rezervnu kopiju"
 
 #: ../programs/gvfs-save.c:44
 msgid "Only create if not existing"
-msgstr "Samo napravi ukoliko ne postoji"
+msgstr "Samo pravi ukoliko ne postoji"
 
 #: ../programs/gvfs-save.c:45
 msgid "Append to end of file"
@@ -2349,7 +2707,7 @@ msgstr ""
 
 #: ../programs/gvfs-set-attribute.c:119
 msgid " <location> <attribute> <values> - set attribute"
-msgstr " <mesto> <osobina> <vrednosti> â postavlja vrednsot"
+msgstr " <mesto> <osobina> <vrednosti> â postavlja vrednost"
 
 #: ../programs/gvfs-set-attribute.c:137
 #, c-format
@@ -2386,13 +2744,31 @@ msgid "Error trashing file: %s\n"
 msgstr "GreÅka pri premeÅtanju datoteka u smeÄe: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
 msgstr "Prati simboliÄke veze, montirane ureÄaje i preÄice kao direktorijume"
 
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "â razgranato ispisuje sadrÅaj direktorijuma"
 
+#~ msgid "Unhandled Inst proxy error (%d)"
+#~ msgstr "Nepopravljiva greÅka Inst posrednika (%d)"
+
+#~ msgid "Unhandled SBServices proxy error (%d)"
+#~ msgstr "Nepopravljiva greÅka posrednika SB usluga (%d)"
+
+#~ msgid "Service %d on Apple Mobile Device"
+#~ msgstr "Servis %d na Eplovom prenosnom ureÄaju"
+
+#~ msgid "ftp on %s"
+#~ msgstr "ftp na %s"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "GreÅka u preimenovanju direktorijuma"
+
+#~ msgid "sftp on %s"
+#~ msgstr "sftp na %s"
+
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 



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