[gvfs] Updated Hebrew translation.



commit 0e3f4aafae7b7353c83775cca6ae25d17770968d
Author: Yaron Shahrabani <sh yaron gmail com>
Date:   Sat Oct 22 14:52:59 2011 +0200

    Updated Hebrew translation.

 po/he.po | 1683 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1150 insertions(+), 533 deletions(-)
---
diff --git a/po/he.po b/po/he.po
index 6a25a0d..d07d9f6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 13:45+0300\n"
-"PO-Revision-Date: 2011-06-04 13:47+0200\n"
+"POT-Creation-Date: 2011-10-22 13:19+0200\n"
+"PO-Revision-Date: 2011-10-22 14:52+0200\n"
 "Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
 "Language-Team: Gezer (Hebrew)\n"
 "Language: he\n"
@@ -19,33 +19,48 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0-beta4\n"
 "X-Project-Style: default\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
+#: ../client/gdaemonfile.c:498
+#: ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
 msgstr "Operation not supported, files on different mounts"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
-#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
-#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
-#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
-#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
-#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
-#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
-#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
-#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
-#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
+#: ../client/gdaemonfile.c:876
+#: ../client/gdaemonfile.c:911
+#: ../client/gdaemonfile.c:1027
+#: ../client/gdaemonfile.c:1106
+#: ../client/gdaemonfile.c:1169
+#: ../client/gdaemonfile.c:1232
+#: ../client/gdaemonfile.c:1298
+#: ../client/gdaemonfile.c:1361
+#: ../client/gdaemonfile.c:1378
+#: ../client/gdaemonfile.c:1867
+#: ../client/gdaemonfile.c:1897
+#: ../client/gdaemonfile.c:2058
+#: ../client/gdaemonfile.c:2560
+#: ../client/gdaemonfile.c:2609
+#: ../client/gdaemonfile.c:2674
+#: ../client/gdaemonfile.c:2759
+#: ../client/gdaemonfile.c:2835
+#: ../client/gdaemonfile.c:3024
+#: ../client/gdaemonfile.c:3105
+#: ../client/gvfsiconloadable.c:145
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
 msgstr "Invalid return value from %s"
 
-#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:994
+#: ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Couldn't get stream file descriptor"
 
-#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
-#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
-#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1116
+#: ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242
+#: ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639
+#: ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Didn't get stream file descriptor"
 
@@ -60,17 +75,21 @@ msgstr "Could not find enclosing mount"
 msgid "Invalid filename %s"
 msgstr "Invalid filename %s"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1199
-#: ../client/gdaemonvfs.c:1334 ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonfile.c:2256
+#: ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333
+#: ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Error setting file metadata: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2257
+#: ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "values must be string or list of strings"
 
-#: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
+#: ../client/gdaemonfileenumerator.c:466
+#: ../client/gdaemonfileenumerator.c:549
 #: ../client/gdaemonfileenumerator.c:600
 #: ../client/gdaemonfileinputstream.c:630
 #: ../client/gdaemonfileinputstream.c:783
@@ -80,22 +99,38 @@ msgstr "values must be string or list of strings"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
-#: ../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
-#: ../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
-#: ../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
-#: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
+#: ../client/gdaemonfileoutputstream.c:1052
+#: ../client/gvfsdaemondbus.c:1062
+#: ../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:1073
+#: ../monitor/proxy/gproxydrive.c:541
+#: ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777
+#: ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963
+#: ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488
+#: ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826
+#: ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
 
@@ -123,16 +158,17 @@ msgstr "End of stream"
 msgid "Seek not supported on stream"
 msgstr "Seek not supported on stream"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Error while getting mount info: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Can't contact session bus"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
+#: ../client/gvfsdaemondbus.c:575
+#: ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Error connecting to daemon: %s"
@@ -147,11 +183,11 @@ msgstr "Error creating socket: %s"
 msgid "Error connecting to socket: %s"
 msgstr "Error connecting to socket: %s"
 
-#: ../common/gvfsdaemonprotocol.c:522
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
 msgstr "Invalid file info format"
 
-#: ../common/gvfsdaemonprotocol.c:540
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
 msgstr "Invalid attribute info list content"
 
@@ -183,12 +219,8 @@ msgstr "Error resolving \"%s\" service \"%s\" on domain \"%s\""
 #.
 #: ../common/gvfsdnssdresolver.c:1126
 #, c-format
-msgid ""
-"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
-"records are missing. Keys required: \"%s\"."
-msgstr ""
-"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
-"records are missing. Keys required: \"%s\"."
+msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
+msgstr "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -200,7 +232,8 @@ msgstr ""
 msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
 msgstr "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
 
-#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:233
+#: ../common/gvfsdnssdutils.c:263
 #: ../common/gvfsdnssdutils.c:280
 #, c-format
 msgid "Malformed dns-sd encoded_triple '%s'"
@@ -215,163 +248,245 @@ msgstr "Can't handle version %d of GVfsIcon encoding"
 msgid "Malformed input data for GVfsIcon"
 msgstr "Malformed input data for GVfsIcon"
 
-#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:231
+#: ../daemon/daemon-main.c:81
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Error connecting to D-Bus: %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:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "%s Filesystem Service"
 
-#: ../daemon/daemon-main.c:110 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:115
+#: ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../daemon/daemon-main.c:156
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Usage: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:180 ../daemon/daemon-main.c:198
+#: ../daemon/daemon-main.c:185
+#: ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Usage: %s key=value key=value ..."
 
-#: ../daemon/daemon-main.c:196
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "No mount type specified"
 
-#: ../daemon/daemon-main.c:266
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "mountpoint for %s already running"
 
-#: ../daemon/daemon-main.c:277
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "error starting mount daemon"
 
-#: ../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 "××××× ××× ×××× ××××××× (EOS)"
 
-#: ../daemon/gvfsbackend.c:934 ../daemon/gvfsbackendafc.c:382
-#: ../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/gvfsbackend.c:936 ../monitor/gdu/ggdumount.c:923
-msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
-msgstr ""
-"×××× ××××\n"
-"×××× ××× ×× ×××× ××××××× ×× ××××."
+#: ../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 "××× ×ÖAFPâ %s ××× ×× ××××× ××××××"
+
+#: ../daemon/gvfsafpserver.c:365
+#: ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "×××××× ×××× ×ÖAFPâ %s ×××××"
+
+#: ../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 "××× ×ÖAFPâ %s ×××× ×××× ×××××× ××××××××"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr "×××××× ××××××××× ×××× ×ÖAFPâ %s ×××××, ××××× ××× ××××××: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
+msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
+msgstr "×××××× ×××× ×ÖAFPâ %s ××××× (×× ×××× ×××××× ××××× ×××××)"
+
+#: ../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 "×× ××××× ×××× ×××× ×ÖAFP ×××× %s ×Ö%s"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+msgid "Enter password for afp on %s"
+msgstr "×× ××××× ×××× ×××× ×ÖAFP ×Ö%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 "××××× ×××××× ×ÖApple File Control"
 
-#: ../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 "×××××× ××××× Apple File Control ××××××"
 
-#: ../daemon/gvfsbackendafc.c:235
+#: ../daemon/gvfsbackendafc.c:236
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "××××× ×××× ×××××× ×ÖApple File Controlâ (%d)"
 
-#: ../daemon/gvfsbackendafc.c:251
+#: ../daemon/gvfsbackendafc.c:252
 msgid "Listing applications installed on device failed"
 msgstr "×××× ×××××××× ×××××××× ××××× ×××××"
 
-#: ../daemon/gvfsbackendafc.c:267
+#: ../daemon/gvfsbackendafc.c:268
 msgid "Accessing application icons on device failed"
 msgstr "××××× ××××× ×××××××× ××××× ×××××"
 
-#: ../daemon/gvfsbackendafc.c:284
+#: ../daemon/gvfsbackendafc.c:285
 msgid "Lockdown Error: Invalid Argument"
 msgstr "××××× ×××××: ×××××××× ××××"
 
-#: ../daemon/gvfsbackendafc.c:288 ../daemon/gvfsbackendsftp.c:310
-#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
+#: ../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 "×××××× ×××××"
 
-#: ../daemon/gvfsbackendafc.c:291
+#: ../daemon/gvfsbackendafc.c:293
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "××××× ××××× ×××× ×××××× (%d)"
 
-#: ../daemon/gvfsbackendafc.c:308
+#: ../daemon/gvfsbackendafc.c:310
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "××××× libimobiledevice: ××××××× ××××"
 
-#: ../daemon/gvfsbackendafc.c:312
-msgid ""
-"libimobiledevice Error: No device found. Make sure usbmuxd is set up "
-"correctly."
+#: ../daemon/gvfsbackendafc.c:314
+msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly."
 msgstr "××××× libimobiledevice: ×× ×××× ××××. ×× ××××× ×Öusbmuxd ××××× ×××××."
 
-#: ../daemon/gvfsbackendafc.c:315
+#: ../daemon/gvfsbackendafc.c:318
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "××××× libimobiledevice ×××× ×××××× (%d)"
 
-#: ../daemon/gvfsbackendafc.c:382
+#: ../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:400 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1796
-#: ../daemon/gvfsbackendhttp.c:302 ../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:406 ../daemon/gvfsbackendafc.c:436
+#: ../daemon/gvfsbackendafc.c:409
+#: ../daemon/gvfsbackendafc.c:439
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "××××× ×ÖAFC ××××: ×××× ××××× ××××× afc://uuid:port-number"
 
-#: ../daemon/gvfsbackendafc.c:422
+#: ../daemon/gvfsbackendafc.c:425
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "×××× ×××× ×× Apple"
 
-#: ../daemon/gvfsbackendafc.c:427
+#: ../daemon/gvfsbackendafc.c:430
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "×××× ×××× ×× Apple, ×××× (Jailbroken)"
 
-#: ../daemon/gvfsbackendafc.c:432
+#: ../daemon/gvfsbackendafc.c:435
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "×××××× ×× ×××× ×××× ×× Apple"
 
-#: ../daemon/gvfsbackendafc.c:490
+#: ../daemon/gvfsbackendafc.c:493
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (××××)"
@@ -379,7 +494,8 @@ msgstr "%s (××××)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:500
+#: ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "×××××× ×× %s"
@@ -387,65 +503,381 @@ 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:576
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
-msgid ""
-"Device '%s' is password protected. Enter the password on the device and "
-"click 'Try again'."
-msgstr ""
-"××××× '%s' ×××× ×××××. ×× ××××× ×× ××××× ××××× ×××××× ×× '×××××× ××××'."
+msgid "Device '%s' is password protected. Enter the password on the device and click 'Try again'."
+msgstr "××××× '%s' ×××× ×××××. ×× ××××× ×× ××××× ××××× ×××××× ×× '×××××× ××××'."
 
-#: ../daemon/gvfsbackendafc.c:915 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1887
-#: ../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:925 ../daemon/gvfsbackendarchive.c:647
-#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:1060 ../daemon/gvfsbackendnetwork.c:602
-#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
-#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
+#: ../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: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:1116 ../daemon/gvfsbackendafc.c:2459
+#: ../daemon/gvfsbackendafc.c:1119
+#: ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "××××××× ××××× ×× ××××××."
 
-#: ../daemon/gvfsbackendafc.c:1288
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "××× ×××××× ×××× ××××"
 
-#: ../daemon/gvfsbackendafc.c:2296 ../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 "â×××××× AFP ×××× %s ×Ö%s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+msgid "AFP shares on %s"
+msgstr "××××× AFP ×Ö%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 "××××× ××××× ×××××× ×× Apple"
+
+#: ../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 "×××× ×××× ××××× ×××× DeleteInhibit (×××× ××××××)"
+
+#: ../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 "××××× ××××× ××××× ×××× RenameInhibit (×××× ×××× ××××× ××)"
+
+#: ../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 "×××× ×××× ×××× ×××××× FPCopyFile"
+
+#: ../daemon/gvfsbackendafp.c:1585
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "×× ×××× ××××× ×× ×××× ××××× ×××× Read/DenyWrite (×××××/××××× ×××××)"
+
+#: ../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 "×××× ×××× ××××× ×××× RenameInhibit (×××× ×××× ××××× ××)"
+
+#: ../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 "×××××× FPGetUserInfo ××××× (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "××× AFPâ %s  ×××× %s ×× %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+msgid "AFP volume %s on %s"
+msgstr "××× AFPâ %s ×× %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "×× ×××× ×××× ×× ××× ×ÖAFPâ %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>"
-#: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
+#. 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/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
-#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendarchive.c:785
+#: ../daemon/gvfsbackendburn.c:680
+#: ../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"
 msgstr "××××× ×××× ××××××"
 
@@ -458,26 +890,31 @@ msgstr "××××"
 msgid "Unable to create temporary directory"
 msgstr "×× ×××× ××××× ×××××× ×××××"
 
-#: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
-#: ../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:2208
-#: ../daemon/gvfsbackendgphoto2.c:2927 ../daemon/gvfsbackendsftp.c:1836
-#: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
-#: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:405
+#: ../daemon/gvfsbackendburn.c:416
+#: ../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: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:2549
-#: ../daemon/gvfsbackendsftp.c:1828
-msgid "Directory not empty"
-msgstr "×××××× ×× ××××"
-
-#: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1812
+#: ../daemon/gvfsbackendburn.c:459
+#: ../daemon/gvfsbackendburn.c:904
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "×× ×××× ×××××× ×××× ×× ××× ××××××"
 
@@ -486,34 +923,57 @@ msgstr "×× ×××× ×××××× ×××× ×× ××× ××××××"
 msgid "CD/DVD Creator"
 msgstr "×××× CD/DVD"
 
-#: ../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:3001
+#: ../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:2926
 msgid "File exists"
 msgstr "×××× ××××"
 
-#: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:171
-#: ../daemon/gvfsjobcreatemonitor.c:141 ../daemon/gvfsjobcreatemonitor.c:152
-#: ../daemon/gvfsjobcreatemonitor.c:175 ../daemon/gvfsjobcreatemonitor.c:193
-#: ../daemon/gvfsjobdelete.c:123 ../daemon/gvfsjobenumerate.c:257
-#: ../daemon/gvfsjobmakedirectory.c:123 ../daemon/gvfsjobmount.c:109
-#: ../daemon/gvfsjobmountmountable.c:157 ../daemon/gvfsjobmove.c:169
-#: ../daemon/gvfsjobopenforread.c:134 ../daemon/gvfsjobopenforwrite.c:152
-#: ../daemon/gvfsjobopenforwrite.c:166 ../daemon/gvfsjobopenforwrite.c:180
-#: ../daemon/gvfsjobopeniconforread.c:117 ../daemon/gvfsjobpollmountable.c:126
-#: ../daemon/gvfsjobpull.c:176 ../daemon/gvfsjobpush.c:176
-#: ../daemon/gvfsjobqueryattributes.c:136 ../daemon/gvfsjobqueryfsinfo.c:132
-#: ../daemon/gvfsjobqueryinfo.c:150 ../daemon/gvfsjobqueryinforead.c:119
-#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:151 ../daemon/gvfsjobsetdisplayname.c:128
-#: ../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
+#: ../daemon/gvfsbackendburn.c:828
+#: ../daemon/gvfsjobcloseread.c:112
+#: ../daemon/gvfsjobclosewrite.c:120
+#: ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141
+#: ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175
+#: ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123
+#: ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123
+#: ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157
+#: ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134
+#: ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166
+#: ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117
+#: ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176
+#: ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136
+#: ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150
+#: ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119
+#: ../daemon/gvfsjobread.c:120
+#: ../daemon/gvfsjobseekread.c:119
+#: ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobsetattribute.c:151
+#: ../daemon/gvfsjobsetdisplayname.c:128
+#: ../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:1177
+#: ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "×××××× ×× ××××× ×× ××× ×××××"
 
@@ -521,45 +981,59 @@ 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:2581 ../daemon/gvfsbackendgphoto2.c:2790
-#: ../daemon/gvfsbackendgphoto2.c:2887 ../daemon/gvfsbackendgphoto2.c:2980
+#: ../daemon/gvfsbackendburn.c:950
+#: ../daemon/gvfsbackendcomputer.c:794
+#: ../daemon/gvfsbackendgphoto2.c:2506
+#: ../daemon/gvfsbackendgphoto2.c:2715
+#: ../daemon/gvfsbackendgphoto2.c:2812
+#: ../daemon/gvfsbackendgphoto2.c:2905
 msgid "Not supported"
 msgstr "×× ××××"
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../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 "×× ×××× ××××× ×××× gudev"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352
+#: ../daemon/gvfsbackendgphoto2.c:1528
 msgid "Cannot connect to the system bus"
 msgstr "Cannot connect to the system bus"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363
+#: ../daemon/gvfsbackendgphoto2.c:1540
 msgid "Cannot create libhal context"
 msgstr "Cannot create libhal context"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377
+#: ../daemon/gvfsbackendgphoto2.c:1553
 msgid "Cannot initialize libhal"
 msgstr "Cannot initialize libhal"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
+#: ../daemon/gvfsbackendcdda.c:393
+#: ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "×× ××××× ××××"
 
@@ -580,9 +1054,12 @@ msgstr "××××× %s ×××× ×××× ×××× ×××"
 msgid "cdda mount on %s"
 msgstr "××××× cdda ×× %s"
 
-#: ../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
+#: ../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 "××××××× ×××"
@@ -610,7 +1087,8 @@ msgstr "××××× ×Ö'paranoia' ××××× %s"
 msgid "Error seeking in stream on drive %s"
 msgstr "××××× ×××××× ×××××× ×××××× %s"
 
-#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1895
+#: ../daemon/gvfsbackendcdda.c:980
+#: ../daemon/gvfsbackendgphoto2.c:1820
 #, c-format
 msgid "No such file"
 msgstr "××× ××× ××××"
@@ -624,7 +1102,8 @@ msgstr "××××× ×× ×××× ×× ××××× ××××× ×××"
 msgid "Audio CD Filesystem Service"
 msgstr "××××× ××××× ×××× ×××××××× ×××"
 
-#: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:756
+#: ../daemon/gvfsbackendcomputer.c:192
+#: ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
 msgstr "××××"
 
@@ -636,12 +1115,14 @@ msgstr "××××× ×××××"
 msgid "Can't open mountable file"
 msgstr "×× ×××× ××××× ×××× ××××× ××××××"
 
-#: ../daemon/gvfsbackendcomputer.c:840 ../daemon/gvfsbackendsftp.c:1163
+#: ../daemon/gvfsbackendcomputer.c:840
+#: ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "××××× ××××××: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:872 ../daemon/gvfsbackendcomputer.c:991
+#: ../daemon/gvfsbackendcomputer.c:872
+#: ../daemon/gvfsbackendcomputer.c:991
 msgid "Can't mount file"
 msgstr "×× ×××× ×××× ×× ×××××"
 
@@ -649,9 +1130,12 @@ msgstr "×× ×××× ×××× ×× ×××××"
 msgid "No medium in the drive"
 msgstr "××× ×××× ×××××"
 
-#: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
-#: ../daemon/gvfsbackendcomputer.c:1142 ../daemon/gvfsbackendcomputer.c:1232
-#: ../daemon/gvfsbackendcomputer.c:1305 ../daemon/gvfsbackendcomputer.c:1374
+#: ../daemon/gvfsbackendcomputer.c:941
+#: ../daemon/gvfsbackendcomputer.c:1036
+#: ../daemon/gvfsbackendcomputer.c:1142
+#: ../daemon/gvfsbackendcomputer.c:1232
+#: ../daemon/gvfsbackendcomputer.c:1305
+#: ../daemon/gvfsbackendcomputer.c:1374
 msgid "Not a mountable file"
 msgstr "×× ×××× ××××× ××××××"
 
@@ -663,15 +1147,18 @@ msgstr "×× ×××× ×××× ×× ×××××"
 msgid "Can't eject file"
 msgstr "×× ×××× ×××××× ×× ×××××"
 
-#: ../daemon/gvfsbackendcomputer.c:1252 ../daemon/gvfsbackendcomputer.c:1259
+#: ../daemon/gvfsbackendcomputer.c:1252
+#: ../daemon/gvfsbackendcomputer.c:1259
 msgid "Can't start file"
 msgstr "×× ×××× ×××××× ×× ×××××"
 
-#: ../daemon/gvfsbackendcomputer.c:1325 ../daemon/gvfsbackendcomputer.c:1332
+#: ../daemon/gvfsbackendcomputer.c:1325
+#: ../daemon/gvfsbackendcomputer.c:1332
 msgid "Can't stop file"
 msgstr "×× ×××× ××××× ×× ×××××"
 
-#: ../daemon/gvfsbackendcomputer.c:1389 ../daemon/gvfsbackendcomputer.c:1396
+#: ../daemon/gvfsbackendcomputer.c:1389
+#: ../daemon/gvfsbackendcomputer.c:1396
 msgid "Can't poll file"
 msgstr "×× ×××× ××××× ×× ×××××"
 
@@ -691,135 +1178,113 @@ msgstr "âWebDAV ××× ××× %s ×Ö%s%s"
 msgid "WebDAV on %s%s"
 msgstr "âWebDAV ×Ö%s%s"
 
-#: ../daemon/gvfsbackenddav.c:667 ../daemon/gvfsbackenddav.c:1863
+#: ../daemon/gvfsbackenddav.c:668
+#: ../daemon/gvfsbackenddav.c:1864
 #: ../daemon/gvfsbackendhttp.c:248
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "××××× HTTP: %s"
 
-#: ../daemon/gvfsbackenddav.c:684
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Could not parse response"
 
-#: ../daemon/gvfsbackenddav.c:693
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Empty response"
 
-#: ../daemon/gvfsbackenddav.c:701
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "Unexpected reply from server"
 
-#: ../daemon/gvfsbackenddav.c:1372 ../daemon/gvfsbackenddav.c:1998
-#: ../daemon/gvfsbackenddav.c:2085 ../daemon/gvfsbackenddav.c:2192
+#: ../daemon/gvfsbackenddav.c:1373
+#: ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086
+#: ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Response invalid"
 
-#: ../daemon/gvfsbackenddav.c:1515
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "××××× WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1517
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "×××× ×××× ×××× %s"
 
-#: ../daemon/gvfsbackenddav.c:1520
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
 msgstr "×× ××××× ×× ×××× ××××××"
 
-#: ../daemon/gvfsbackenddav.c:1867 ../daemon/gvfsbackenddav.c:1871
+#: ../daemon/gvfsbackenddav.c:1868
+#: ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "××××× ×× ×××× ×××× ×ÖWebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1952 ../daemon/gvfsbackenddav.c:2040
-#: ../daemon/gvfsbackenddav.c:2113 ../daemon/gvfsbackenddav.c:2226
+#: ../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:2200 ../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:2256 ../daemon/gvfsbackenddav.c:2509
-#: ../daemon/gvfsbackenddav.c:2620 ../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:2329 ../daemon/gvfsbackendsftp.c:3421
-#: ../daemon/gvfsbackendsmb.c:1148
-msgid "The file was externally modified"
-msgstr "××××× ××××× ×× ××× ×××× ××××××"
-
-#: ../daemon/gvfsbackenddav.c:2360 ../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 "××××× ×××× ××××× ×××××"
 
 #. "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 "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:749 ../daemon/gvfsbackendnetwork.c:688
-#: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
+#: ../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 "×××× ×××× ×××× ftp ×Ö%s ×Ö%s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "×× ××××× ×××× ×××× ×ÖFTP ×Ö%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 "×××× ×××× ×××× ftp ×Ö%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 "×× ××××× ×××× ×××× ×ÖSFTP ×Ö%s"
 
-#: ../daemon/gvfsbackendftp.c:623
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ftp ×-%s"
+msgid "FTP on %s"
+msgstr "âFTP ×Ö%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 "âsftp ×Ö%s ×Ö%s"
+msgid "FTP as %s on %s"
+msgstr "âFTP ×Ö%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)"
-
 #: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
@@ -841,14 +1306,16 @@ msgid "%s: %d: Not Supported"
 msgstr "â%s: â%d: ×× ××××"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:720
+#: ../daemon/gvfsbackendgphoto2.c:726
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "××××× ×××××××× (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:949 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:949
+#: ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -856,18 +1323,21 @@ msgstr "××××× ×× %s"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:952
+#: ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "××× ××× ×× %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:961
+#: ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "×××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:963
+#: ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "××× ×××"
 
@@ -883,7 +1353,8 @@ msgstr "×× ×××× ××××× ×××× gphoto2"
 msgid "Error creating camera"
 msgstr "××××× ×××××× ×××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1613
+#: ../daemon/gvfsbackendgphoto2.c:1623
 msgid "Error loading device information"
 msgstr "××××× ×××××× ××××× ×××××"
 
@@ -914,115 +1385,115 @@ msgstr "××××× gphoto2 ×× %s"
 msgid "No camera specified"
 msgstr "×× ×××××× ×××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:1807 ../daemon/gvfsbackendgphoto2.c:1833
-#, c-format
-msgid "Filesystem is busy"
-msgstr "××××× ×××××× ×××××"
-
-#: ../daemon/gvfsbackendgphoto2.c:1903
+#: ../daemon/gvfsbackendgphoto2.c:1828
 msgid "Error creating file object"
 msgstr "××××× ×××××× ××××××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:1918
+#: ../daemon/gvfsbackendgphoto2.c:1843
 msgid "Error getting file"
 msgstr "××××× ××××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:1928
+#: ../daemon/gvfsbackendgphoto2.c:1853
 msgid "Error getting data from file"
 msgstr "××××× ××××× ×××××× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:1986
+#: ../daemon/gvfsbackendgphoto2.c:1911
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "×××× ×××× '%s' ×××× ×××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2062 ../daemon/gvfsbackendgphoto2.c:3251
+#: ../daemon/gvfsbackendgphoto2.c:1987
+#: ../daemon/gvfsbackendgphoto2.c:3176
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "××××× ×××××× ×××××× ×××××× %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2202 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2127
+#: ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "×× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2235
+#: ../daemon/gvfsbackendgphoto2.c:2160
 msgid "Failed to get folder list"
 msgstr "×××× ××××× ××××× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2301
+#: ../daemon/gvfsbackendgphoto2.c:2226
 msgid "Failed to get file list"
 msgstr "×××× ××××× ××××× ×××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2593
+#: ../daemon/gvfsbackendgphoto2.c:2518
 msgid "Error creating directory"
 msgstr "××××× ×××××× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2802
+#: ../daemon/gvfsbackendgphoto2.c:2727
 msgid "Name already exists"
 msgstr "××× ××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2813 ../daemon/gvfsbackendgphoto2.c:3442
+#: ../daemon/gvfsbackendgphoto2.c:2738
+#: ../daemon/gvfsbackendgphoto2.c:3367
 msgid "New name too long"
 msgstr "××× ×××× ×××× ×××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2823 ../daemon/gvfsbackendgphoto2.c:3453
-msgid "Error renaming dir"
-msgstr "××××× ×××××× ×× ××××××"
+#: ../daemon/gvfsbackendgphoto2.c:2748
+#: ../daemon/gvfsbackendgphoto2.c:3378
+msgid "Error renaming directory"
+msgstr "××××× ×××××× ×× ×××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836 ../daemon/gvfsbackendgphoto2.c:3466
+#: ../daemon/gvfsbackendgphoto2.c:2761
+#: ../daemon/gvfsbackendgphoto2.c:3391
 msgid "Error renaming file"
 msgstr "××××× ×××××× ×× ××××"
 
 # c-format
-#: ../daemon/gvfsbackendgphoto2.c:2900
+#: ../daemon/gvfsbackendgphoto2.c:2825
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "××××××× '%s' ×××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2911
+#: ../daemon/gvfsbackendgphoto2.c:2836
 msgid "Error deleting directory"
 msgstr "××××× ×××××× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2937
+#: ../daemon/gvfsbackendgphoto2.c:2862
 msgid "Error deleting file"
 msgstr "××××× ×××××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:2990
+#: ../daemon/gvfsbackendgphoto2.c:2915
 msgid "Can't write to directory"
 msgstr "×× ×××× ××××× ×××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:3037
+#: ../daemon/gvfsbackendgphoto2.c:2962
 msgid "Cannot allocate new file to append to"
 msgstr "×× ×××× ×××××× ×××× ××× ×××× ×× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:3052
+#: ../daemon/gvfsbackendgphoto2.c:2977
 msgid "Cannot read file to append to"
 msgstr "×× ×××× ××××× ×× ××××× ×××× ×× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:3063
+#: ../daemon/gvfsbackendgphoto2.c:2988
 msgid "Cannot get data of file to append to"
 msgstr "×× ×××× ×××× ×××××× ×××× ××××× ×××× ×× ××××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:3350
+#: ../daemon/gvfsbackendgphoto2.c:3275
 msgid "Error writing file"
 msgstr "××××× ×××××× ××××"
 
-#: ../daemon/gvfsbackendgphoto2.c:3398
+#: ../daemon/gvfsbackendgphoto2.c:3323
 msgid "Not supported (not same directory)"
 msgstr "×× ×××× (×× ×××× ××××××)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3410
-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:3418
-msgid "Not supported (src is dir, dst is existing file)"
+#: ../daemon/gvfsbackendgphoto2.c:3343
+msgid "Not supported (the source is a directory, but the destination is an existing file)"
 msgstr "×× ×××× (××××× ××× ××××××, ×××× ××× ×××× ××××)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3430
-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:244
 #, c-format
@@ -1034,7 +1505,8 @@ msgid "Directory notification not supported"
 msgstr "×××××× ×××××× ×× ××××××"
 
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
+#: ../daemon/gvfsbackendnetwork.c:247
+#: ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "××× Windows"
 
@@ -1050,30 +1522,33 @@ 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 "××× ××××× ×ÖUSB. ×× ××××× ××× ×× ×××× ×××××× ×××"
 
-#: ../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"
 
-#: ../daemon/gvfsbackendsftp.c:302 ../daemon/gvfsbackendsftp.c:658
+#: ../daemon/gvfsbackendsftp.c:302
+#: ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "××××× ×Össh ××××××× ××××× ×××× ××××"
 
@@ -1102,7 +1577,8 @@ msgstr "×× ×××× ××××× ×× ×××××× ssh"
 msgid "Unable to spawn ssh program: %s"
 msgstr "×× ×××× ××××× ×× ×××××× ssh: â%s"
 
-#: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
+#: ../daemon/gvfsbackendsftp.c:620
+#: ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "××× ×××××× ×× ××× ××××××"
 
@@ -1148,14 +1624,12 @@ msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely "
-"sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is %s. If you want to be absolutely sure it is safe to continue, contact the system administrator."
 msgstr ""
 "××××× ×× ××××× ×××××× (%s) ×××× ×××××.\n"
 "××× ×× ×××× ××× ×××××× ××××× ×××× ×××××××.\n"
 "\n"
-"××××× ×××××× ×× ××× ××××× ×××××× ××× %s. ×× ×××××× ××××× ××××× ×××××× ×××××, "
-"×××× ××××× ××× ×× ×××× ×××××× ×××."
+"××××× ×××××× ×× ××× ××××× ×××××× ××× %s. ×× ×××××× ××××× ××××× ×××××× ×××××, ×××× ××××× ××× ×× ×××× ×××××× ×××."
 
 #: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
@@ -1165,47 +1639,66 @@ msgstr "×××× ×××-××× ×× ××××××× ×××××"
 msgid "Can't send host identity confirmation"
 msgstr "×× ×××× ××××× ×× ××××× ×××× ×××××"
 
-#: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
+#: ../daemon/gvfsbackendsftp.c:1643
+#: ../daemon/gvfsbackendsftp.c:1666
 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 "âsftp ×Ö%s ×-%s"
+msgid "SFTP for %s on %s"
+msgstr "âSFTP ×Ö%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 "âsftp ×-%s"
+msgid "SFTP on %s"
+msgstr "âSFTP ×Ö%s"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "×× ×××× ××××× ××××× ssh ×××××"
 
-#: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
-#: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
-#: ../daemon/gvfsbackendsftp.c:2544 ../daemon/gvfsbackendsftp.c:2630
-#: ../daemon/gvfsbackendsftp.c:2680 ../daemon/gvfsbackendsftp.c:2726
-#: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
-#: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
-#: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
-#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
-#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
-#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
-#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
-#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
-#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
-#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
-#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
-#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
-#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
+#: ../daemon/gvfsbackendsftp.c:2009
+#: ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477
+#: ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544
+#: ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680
+#: ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801
+#: ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025
+#: ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178
+#: ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246
+#: ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473
+#: ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560
+#: ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914
+#: ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114
+#: ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209
+#: ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345
+#: ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438
+#: ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506
+#: ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536
+#: ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "×××××× ××××× ×××××"
 
-#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2257
+#: ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
 msgstr " (××××× ×× ××××)"
@@ -1228,9 +1721,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 "××××× Windows ×Ö%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 "××××× ××××× ×××× ××× Windows"
 
 #. translators: First %s is a share name, second is a server name
 #: ../daemon/gvfsbackendsmb.c:238
@@ -1238,7 +1753,8 @@ msgstr "×× ×××× ×××××× ×××××× ×× ××××××"
 msgid "Password required for share %s on %s"
 msgstr "××××× ×××× ×××× ×××××× %s ××Ö%s"
 
-#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
+#: ../daemon/gvfsbackendsmb.c:494
+#: ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
@@ -1249,7 +1765,8 @@ msgstr "××××× ×××××× (%s)"
 msgid "Failed to mount Windows share"
 msgstr "×××× ×××××× ××××× Windows"
 
-#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
+#: ../daemon/gvfsbackendsmb.c:788
+#: ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "××× ×××××× ×××× ××××"
 
@@ -1258,69 +1775,46 @@ 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 "×××× ××××× ×××× ××××× Windows"
 
-#. 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 "××××× Windows ×Ö%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 "××××× ××××× ×××× ××× Windows"
-
-#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
+#: ../daemon/gvfsbackendtrash.c:370
+#: ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "×× ×××× ××××× ×× ×××××× ×××××"
 
-#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
+#: ../daemon/gvfsbackendtrash.c:387
+#: ../daemon/gvfsbackendtrash.c:440
 msgid "Items in the trash may not be modified"
 msgstr "×× ×××× ××××× ×××××× ×××××"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendtrash.c:742 ../daemon/gvfsbackendtrash.c:850
+#: ../daemon/gvfsbackendtrash.c:742
+#: ../daemon/gvfsbackendtrash.c:850
 msgid "Trash"
 msgstr "××××"
 
@@ -1330,22 +1824,22 @@ msgstr "××× ×××× ××××"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "××××× ×××××× ×××× ××××: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "××××× ×××××× ×××× ×××××: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
 msgstr "××× ××××× ×××× ××××"
 
-#: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftpconnection.c:196
+#: ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:412
+#: ../daemon/gvfsftptask.c:840
 msgid "Invalid reply"
 msgstr "×××××× ×××× ×××××"
 
 #: ../daemon/gvfsftpconnection.c:392
-msgid ""
-"Failed to create active FTP connection. Maybe your router does not support "
-"this?"
+msgid "Failed to create active FTP connection. Maybe your router does not support this?"
 msgstr "××× ××× ×××××× ××××× FTP ××××. ×××× ×××× ××× ×××× ×××× ×××?"
 
 #: ../daemon/gvfsftpconnection.c:399
@@ -1376,7 +1870,8 @@ msgstr "×× ×××× ××××× ×× ××××× ×××××××. ×××× ×××
 msgid "Data connection closed"
 msgstr "××××× ××××× ××××"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:375
+#: ../daemon/gvfsftptask.c:379
 msgid "Operation failed"
 msgstr "×××××× ×××××"
 
@@ -1404,7 +1899,12 @@ msgstr "××××××× ××××××××× ×× ×××××× ×× ××× ××××
 msgid "Invalid dbus message"
 msgstr "Invalid dbus message"
 
-#: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "××××× ×××××× ×××××"
+
+#: ../daemon/main.c:45
+#: ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
 msgstr "Replace old daemon."
 
@@ -1412,28 +1912,39 @@ msgstr "Replace old daemon."
 msgid "Don't start fuse."
 msgstr "Don't start fuse."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS Daemon"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "Main daemon for 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:78
+#: ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../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
+#: ../daemon/main.c:80
+#: ../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-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 "Try \"%s --help\" for more information."
@@ -1447,7 +1958,8 @@ msgstr "××××××××× ×××× ×××××× ××××× ××××××"
 msgid "Automount failed: %s"
 msgstr "××××× ××××××× ××××: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:902
+#: ../daemon/mount.c:825
+#: ../daemon/mount.c:902
 msgid "The specified location is not mounted"
 msgstr "×××××× ×××××× ×××× ×××××"
 
@@ -1463,18 +1975,22 @@ msgstr "×××××× ××× ×××××"
 msgid "Location is not mountable"
 msgstr "×××××× ×××× ×××××"
 
-#: ../metadata/meta-daemon.c:130 ../metadata/meta-daemon.c:336
-#: ../metadata/meta-daemon.c:390 ../metadata/meta-daemon.c:419
+#: ../metadata/meta-daemon.c:130
+#: ../metadata/meta-daemon.c:336
+#: ../metadata/meta-daemon.c:390
+#: ../metadata/meta-daemon.c:419
 #: ../metadata/meta-daemon.c:449
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "×× ×××× ××××× ×× ×××× ××××× ××× %s"
 
-#: ../metadata/meta-daemon.c:160 ../metadata/meta-daemon.c:179
+#: ../metadata/meta-daemon.c:160
+#: ../metadata/meta-daemon.c:179
 msgid "Unable to set metadata key"
 msgstr "×× ×××× ×××××× ×××× ××××× ××"
 
-#: ../metadata/meta-daemon.c:197 ../metadata/meta-daemon.c:399
+#: ../metadata/meta-daemon.c:197
+#: ../metadata/meta-daemon.c:399
 msgid "Unable to unset metadata key"
 msgstr "×× ×××× ×××× ××××× ×××× ××××× ××"
 
@@ -1498,7 +2014,8 @@ msgstr "×××× ××××× ×× ×××× GVFS"
 msgid "GVfs GDU Volume Monitor"
 msgstr "×× ×××× ×ÖGDU ×× GVfs"
 
-#: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
+#: ../monitor/gdu/ggdudrive.c:168
+#: ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
 msgstr "×××× ×××××××××"
 
@@ -1516,31 +2033,28 @@ 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 "
-"to failures. Data on the drive may be irrevocably lost if a component fails."
+"Starting a drive in degraded mode means that the drive is no longer tolerant to failures. Data on the drive may be irrevocably lost if a component fails."
 msgstr ""
 "××× ×××××× ×× ××××× ×××× ×××××?\n"
-"××××× ×××× ×××× ××××× ××××× ×××××× ×× ×××× ×××× ××× ×××× ×××××. ××××××× "
-"××××× ×××××× ×××× ×××××× ×× ××× ××××××× ××××."
+"××××× ×××× ×××× ××××× ××××× ×××××× ×× ×××× ×××× ××× ×××× ×××××. ××××××× ××××× ×××××× ×××× ×××××× ×× ××× ××××××× ××××."
 
-#: ../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
-#, fuzzy
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "×× ×××× ×××× ×××× ×××× ×××× ×ÖLUKS"
 
-#: ../monitor/gdu/ggdumount.c:1006
-#, fuzzy, c-format
+#: ../monitor/gdu/ggdumount.c:1010
+#, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "×× ×××× ×××× ×××× ×××× ×××× ×ÖLUKS ×××××× ×%s'"
 
@@ -1548,7 +2062,7 @@ msgstr "×× ×××× ×××× ×××× ×××× ×××× ×ÖLUKS ××××××
 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"
@@ -1557,7 +2071,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"
@@ -1566,7 +2080,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"
@@ -1575,141 +2089,177 @@ msgstr ""
 "×× ××××× ×××× ××× ××××× ×× ××××\n"
 "××××× %s ×××× ×××××× ×××××××."
 
-#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40
+#: ../monitor/hal/hal-utils.c:40
 msgid "CD-ROM Disc"
 msgstr "××××××× CD-ROM"
 
-#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40
+#: ../monitor/hal/hal-utils.c:40
 msgid "Blank CD-ROM Disc"
 msgstr "××××××× CD-ROM ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41
+#: ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
 msgstr "××××××× CD-R"
 
-#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41
+#: ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
 msgstr "××××××× CD-R ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42
+#: ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
 msgstr "××××××× CD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42
+#: ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
 msgstr "××××××× CD-RW ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43
+#: ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43
+#: ../monitor/hal/hal-utils.c:45
 msgid "DVD-ROM Disc"
 msgstr "××××××× DVD-ROM"
 
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43
+#: ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43
+#: ../monitor/hal/hal-utils.c:45
 msgid "Blank DVD-ROM Disc"
 msgstr "××××××× DVD-ROM ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44
+#: ../monitor/hal/hal-utils.c:44
 msgid "DVD-RAM Disc"
 msgstr "××××××× DVD-RAM"
 
-#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44
+#: ../monitor/hal/hal-utils.c:44
 msgid "Blank DVD-RAM Disc"
 msgstr "××××××× DVD-RAM ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46
+#: ../monitor/hal/hal-utils.c:46
 msgid "DVD-RW Disc"
 msgstr "××××××× DVD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46
+#: ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
 msgstr "××××××× DVD-RW ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47
+#: ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
 msgstr "××××××× DVD+R"
 
-#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47
+#: ../monitor/hal/hal-utils.c:47
 msgid "Blank DVD+R Disc"
 msgstr "××××××× DVD+R ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48
+#: ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
 msgstr "××××××× DVD+RW"
 
-#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48
+#: ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
 msgstr "××××××× DVD+RW ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49
+#: ../monitor/hal/hal-utils.c:49
 msgid "DVD+R DL Disc"
 msgstr "××××××× DVD+R DL"
 
-#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49
+#: ../monitor/hal/hal-utils.c:49
 msgid "Blank DVD+R DL Disc"
 msgstr "××××××× DVD+R DL ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50
+#: ../monitor/hal/hal-utils.c:50
 msgid "Blu-Ray Disc"
 msgstr "××××××× Blu-Ray"
 
-#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50
+#: ../monitor/hal/hal-utils.c:50
 msgid "Blank Blu-Ray Disc"
 msgstr "××××××× Blu-Ray ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51
+#: ../monitor/hal/hal-utils.c:51
 msgid "Blu-Ray R Disc"
 msgstr "××××××× Blu-Ray R"
 
-#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51
+#: ../monitor/hal/hal-utils.c:51
 msgid "Blank Blu-Ray R Disc"
 msgstr "××××××× Blu-Ray R ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52
+#: ../monitor/hal/hal-utils.c:52
 msgid "Blu-Ray RW Disc"
 msgstr "××××××× Blu-Ray RW"
 
-#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52
+#: ../monitor/hal/hal-utils.c:52
 msgid "Blank Blu-Ray RW Disc"
 msgstr "××××××× Blu-Ray RW ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53
+#: ../monitor/hal/hal-utils.c:53
 msgid "HD DVD Disc"
 msgstr "××××××× HD DVD"
 
-#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53
+#: ../monitor/hal/hal-utils.c:53
 msgid "Blank HD DVD Disc"
 msgstr "××××××× HD DVD ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54
+#: ../monitor/hal/hal-utils.c:54
 msgid "HD DVD-R Disc"
 msgstr "××××××× HD DVD-R"
 
-#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54
+#: ../monitor/hal/hal-utils.c:54
 msgid "Blank HD DVD-R Disc"
 msgstr "××××××× HD DVD-R ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55
+#: ../monitor/hal/hal-utils.c:55
 msgid "HD DVD-RW Disc"
 msgstr "××××××× HD DVD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55
+#: ../monitor/hal/hal-utils.c:55
 msgid "Blank HD DVD-RW Disc"
 msgstr "××××××× HD DVD-RW ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56
+#: ../monitor/hal/hal-utils.c:56
 msgid "MO Disc"
 msgstr "××××××× MO"
 
-#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56
+#: ../monitor/hal/hal-utils.c:56
 msgid "Blank MO Disc"
 msgstr "××××××× MO ×××"
 
-#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57
+#: ../monitor/hal/hal-utils.c:57
 msgid "Disc"
 msgstr "×××××××"
 
-#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57
+#: ../monitor/hal/hal-utils.c:57
 msgid "Blank Disc"
 msgstr "××××××× ×××"
 
@@ -1856,22 +2406,26 @@ msgstr "×××× ×××××× ×××××"
 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
+#: ../monitor/hal/ghalmount.c:159
+#: ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
 msgstr "ââ%.1f ×××"
 
-#: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
+#: ../monitor/hal/ghalmount.c:164
+#: ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
 msgstr "ââ%.1f ×××"
 
-#: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
+#: ../monitor/hal/ghalmount.c:169
+#: ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
 msgstr "ââ%.1f ×××"
 
-#: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
+#: ../monitor/hal/ghalmount.c:323
+#: ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
 msgstr "××××××× ×××/×××××× ×××××"
 
@@ -1932,50 +2486,48 @@ msgstr "LOCATION... - concatenate LOCATIONS to standard output."
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
 #: ../programs/gvfs-cat.c:141
-msgid ""
-"Concatenate files at locations and print to the standard output. Works just "
-"like the traditional cat utility, but using gvfs location instead local "
-"files: for example you can use something like smb://server/resource/file.txt "
-"as location to concatenate."
-msgstr ""
-"Concatenate files at locations and print to the standard output. Works just "
-"like the traditional cat utility, but using gvfs location instead local "
-"files: for example you can use something like smb://server/resource/file.txt "
-"as location to concatenate."
+msgid "Concatenate files at locations and print to the standard output. Works just like the traditional cat utility, but using gvfs location instead local files: for example you can use something like smb://server/resource/file.txt as location to concatenate."
+msgstr "Concatenate files at locations and print to the standard output. Works just like the traditional cat utility, but using gvfs location instead local files: for example you can use something like smb://server/resource/file.txt as location to concatenate."
 
 #: ../programs/gvfs-cat.c:148
-msgid ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
-msgstr ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
-
-#: ../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
+msgid "Note: just pipe through cat if you need its formatting option like -n, -T or other."
+msgstr "Note: just pipe through cat if you need its formatting option like -n, -T or other."
+
+#: ../programs/gvfs-cat.c:161
+#: ../programs/gvfs-copy.c:121
+#: ../programs/gvfs-info.c:369
+#: ../programs/gvfs-ls.c:390
+#: ../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"
 
 #. 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: missing locations"
 
-#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
+#: ../programs/gvfs-copy.c:44
+#: ../programs/gvfs-move.c:42
 msgid "no target directory"
 msgstr "no target directory"
 
-#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
+#: ../programs/gvfs-copy.c:45
+#: ../programs/gvfs-move.c:43
 msgid "show progress"
 msgstr "show progress"
 
-#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
+#: ../programs/gvfs-copy.c:46
+#: ../programs/gvfs-move.c:44
 msgid "prompt before overwrite"
 msgstr "××××× ×××× ××××××"
 
@@ -1983,7 +2535,8 @@ msgstr "××××× ×××× ××××××"
 msgid "preserve all attributes"
 msgstr "××××× ×× ×××××××××"
 
-#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
+#: ../programs/gvfs-copy.c:48
+#: ../programs/gvfs-move.c:45
 msgid "backup existing destination files"
 msgstr "××××× ××××× ×××× ××××××××"
 
@@ -1991,7 +2544,8 @@ msgstr "××××× ××××× ×××× ××××××××"
 msgid "never follow symbolic links"
 msgstr "××××× ×× ××××× ××× ××××××× ××××××××"
 
-#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
+#: ../programs/gvfs-copy.c:78
+#: ../programs/gvfs-move.c:67
 #, c-format
 msgid "progress"
 msgstr "progress"
@@ -2000,15 +2554,18 @@ msgstr "progress"
 msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
 msgstr "SOURCE... DEST - ××××× ×××× ×× ××××× ×ÖSOURCE ×× DEST"
 
-#: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
+#: ../programs/gvfs-copy.c:132
+#: ../programs/gvfs-move.c:120
 msgid "Missing operand\n"
 msgstr "Missing operand\n"
 
-#: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
+#: ../programs/gvfs-copy.c:140
+#: ../programs/gvfs-move.c:128
 msgid "Too many arguments\n"
 msgstr "Too many arguments\n"
 
-#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
+#: ../programs/gvfs-copy.c:149
+#: ../programs/gvfs-move.c:137
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "×××× %s ×××× ××××××\n"
@@ -2031,11 +2588,13 @@ msgstr "×××× ×××××××× ××××××× ××××××"
 msgid "Get filesystem info"
 msgstr "×××× ××××× ××××× ××××××"
 
-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39
+#: ../programs/gvfs-ls.c:39
 msgid "The attributes to get"
 msgstr "The attributes to get"
 
-#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-info.c:40
+#: ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
 msgid "Don't follow symlinks"
 msgstr "Don't follow symlinks"
@@ -2134,7 +2693,8 @@ msgstr "××××× ×× ×× ×××××××× ××××××× ××××××:\n"
 msgid "- show info for <location>"
 msgstr "- ×××× ××××× ×××× <×××××>"
 
-#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:40
+#: ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
 msgstr "×××× ××××× ×××××××"
 
@@ -2146,7 +2706,8 @@ msgstr "××××× ××××× ××××× ××××"
 msgid "Show completions"
 msgstr "×××× ××××××"
 
-#: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
+#: ../programs/gvfs-ls.c:164
+#: ../programs/gvfs-ls.c:171
 #: ../programs/gvfs-rename.c:69
 #, c-format
 msgid "Error: %s\n"
@@ -2156,6 +2717,57 @@ msgstr "×××××: %s\n"
 msgid "- list files at <location>"
 msgstr "- ×××× ××××× ××× <×××××>"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "Query handler for mime-type"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "Set handler for mime-type"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "- get/set handler for <mimetype>"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "Specify one of --query and --set"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "Must specify a single mime-type.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "Must specify the mime-type followed by the default handler.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "No default applications for '%s'\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "Default application for '%s': %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "Registered applications:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "Failed to load info for handler '%s'\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "Failed to set '%s' as the default handler for '%s': %s\n"
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
 msgstr "××××× ×××××× ×××××"
@@ -2164,12 +2776,14 @@ msgstr "××××× ×××××× ×××××"
 msgid "- create directories"
 msgstr "- ××××× ××××××"
 
-#: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
+#: ../programs/gvfs-mkdir.c:79
+#: ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
 msgstr "××××× ×××××× ××××××: %s\n"
 
-#: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
+#: ../programs/gvfs-monitor-dir.c:38
+#: ../programs/gvfs-monitor-file.c:38
 msgid "Don't send single MOVED events."
 msgstr "××× ××××× ×××××× MOVED ××××××."
 
@@ -2202,7 +2816,8 @@ msgstr "×××× ×××× ×××× ××××× ××××××"
 msgid "Monitor events"
 msgstr "×××× ××× ×××××××"
 
-#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
+#: ../programs/gvfs-mount.c:164
+#: ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "××××× ×××××× ××××××: %s\n"
@@ -2217,22 +2832,22 @@ msgstr "××××× ×××××× ××××××: %s\n"
 msgid "Error finding enclosing mount: %s\n"
 msgstr "××××× ×××××× ×××××× ×××××: %s\n"
 
-#: ../programs/gvfs-mount.c:683
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "××××× ×××××× %s:â %s\n"
 
-#: ../programs/gvfs-mount.c:697
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s ××××× ×××× %s\n"
 
-#: ../programs/gvfs-mount.c:748
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "××× ××× ×××× ×××× ××××× %s\n"
 
-#: ../programs/gvfs-mount.c:939
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- mount <location>"
 
@@ -2263,19 +2878,15 @@ msgstr "%s: %s: error opening location: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: error launching application: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "FILES... - open FILES with registered application."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
-msgid ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
-msgstr ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
+#: ../programs/gvfs-open.c:127
+msgid "Opens the file(s) with the default application registered to handle the type of the file."
+msgstr "Opens the file(s) with the default application registered to handle the type of the file."
 
 #: ../programs/gvfs-rename.c:50
 msgid "- rename file"
@@ -2286,7 +2897,8 @@ msgstr "- ××××× ×× ××××"
 msgid "Rename successful. New uri: %s\n"
 msgstr "××××× ××× ×××××. ×××××× ×××××: %s\n"
 
-#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
+#: ../programs/gvfs-rm.c:35
+#: ../programs/gvfs-trash.c:35
 msgid "ignore nonexistent files, never prompt"
 msgstr "××××××× ×××××× ××××× ××××××, ××× ××××× ×××××"
 
@@ -2342,12 +2954,8 @@ msgid "DEST - read from standard input and save to DEST"
 msgstr "DEST - ××××× ××××× ××××× (stdin) ×××××× ×ÖDEST"
 
 #: ../programs/gvfs-set-attribute.c:36
-msgid ""
-"attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv, unset]"
-msgstr ""
-"××× ××××××× [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv, unset]"
+msgid "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]"
+msgstr "××× ××××××× [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]"
 
 #: ../programs/gvfs-set-attribute.c:119
 msgid " <location> <attribute> <values> - set attribute"
@@ -2388,13 +2996,22 @@ 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 "ftp on %s"
+#~ msgstr "ftp ×-%s"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "××××× ×××××× ×× ××××××"
+
+#~ msgid "sftp on %s"
+#~ msgstr "âsftp ×-%s"
+
 #~ msgid "Unhandled Inst proxy error (%d)"
 #~ msgstr "××××× Inst ×××× ×××××× ×××××× (%d)"
 



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