[gvfs] Updated Japanese translation

[Jiro Matsuzawa <jmatsuzawa src gnome org>]

commit c99b8f22d7aa0273acb4a8a4094a01920839234c
Author: Hideki Yamane <henrich debian org>
Date:   Wed Jan 4 16:26:22 2012 +0900

    Updated Japanese translation

 po/ja.po |  749 +++++++++++++++++++++++++------------------------------------
 1 files changed, 307 insertions(+), 442 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index ad58286..f184fef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,19 +1,20 @@
 # gvfs ja.po.
-# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gvfs package.
 # Takeshi AIHANA <takeshi aihana gmail com>, 2008, 2009.
 # Shushi Kurose <md81bird hitaki net>, 2010.
-# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010-2011.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2010-2012.
+# Hideki Yamane <henrich debian org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-10 21:31+0000\n"
-"PO-Revision-Date: 2011-09-11 07:40+0900\n"
+"POT-Creation-Date: 2012-01-02 11:51+0000\n"
+"PO-Revision-Date: 2012-01-04 00:45+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
-"Language-Team: Japanese <takeshi aihana gmail com>\n"
+"Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,36 +39,36 @@ msgstr "ããããããããããæäãã (ãããããåããã
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
-msgstr "%s ãããæãåãééããããã"
+msgstr "%s ãããçåãæãå"
 
 #: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
-msgstr "ããããããããããããããããããããååãããããããã"
+msgstr "ãããããããããããããããããããååãããããããã"
 
 #: ../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 "ããããããããããããããããããããååããããããã"
+msgstr "ãããããããããããããããããããååããããããã"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
 #: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
-msgstr "éãããããããããèããããããããã"
+msgstr "ééãããããããèããããããããã"
 
 #: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
-msgstr "ããããåãééããããã: %s"
+msgstr "çåãããããå: %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 "ãããããããããããèåäãããã: %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 "åãæååãããæååããããããåèããããã"
 
@@ -81,7 +82,7 @@ msgstr "åãæååãããæååããããããåèããããã
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../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
@@ -91,14 +92,14 @@ msgstr "åãæååãããæååããããããåèããããã
 #: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
-#: ../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
+#: ../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 "æäããããããããã"
+msgstr "æäããããããããããã"
 
 #: ../client/gdaemonfileinputstream.c:527
 #: ../client/gdaemonfileinputstream.c:535
@@ -124,16 +125,16 @@ msgstr "ããããããæå"
 msgid "Seek not supported on stream"
 msgstr "ãããããäããããããããããããããã"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "ããããæåãååããéãããã: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "ããããããããæçããããã"
 
-#: ../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 "ãããããæçããéãããã: %s"
@@ -150,11 +151,11 @@ msgstr "ãããããæçããéãããã: %s"
 
 #: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
-msgstr "ããããæåãæåãééããããã"
+msgstr "çåãããããæååå"
 
 #: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
-msgstr "åææåãããããããããããééããããã"
+msgstr "çåãåææåäè"
 
 #: ../common/gvfsdnssdresolver.c:209
 #, c-format
@@ -164,7 +165,7 @@ msgstr "Avahi ããããããåæåããéãããã: %s"
 #: ../common/gvfsdnssdresolver.c:255
 #, c-format
 msgid "Error creating Avahi resolver: %s"
-msgstr "Avahi ããããããçæããéãããã: %s"
+msgstr "Avahi ãããããããçæããéãããã: %s"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -218,178 +219,176 @@ msgstr "ããããã %d ã GVfsIcon åãããããããããããã
 msgid "Malformed input data for GVfsIcon"
 msgstr "GVfsIcon åãååããããååãééããããã"
 
-#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "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:97
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
-msgstr "%s ãããããããããããããã"
+msgstr "%s ããããããããããããã"
 
-#: ../daemon/daemon-main.c:116 ../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 "ããã: %s"
 
-#: ../daemon/daemon-main.c:162
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "çæ: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "çæ: %s key=value key=value ..."
 
-#: ../daemon/daemon-main.c:202
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "ãããããçéãæåããããããã"
 
-#: ../daemon/daemon-main.c:272
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s çããããããããããæãäçäãã"
 
-#: ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
-msgstr "ããããããããããèåããéãããã"
+msgstr "ãããããããããèåããéãããã"
 
 #: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
 msgid "Got EOS"
-msgstr ""
+msgstr "EOS ãåãããããã"
 
 #: ../daemon/gvfsafpserver.c:127
 msgid "Server doesn't support passwords longer than 256 characters"
-msgstr ""
+msgstr "ããããã 256 æåããéããããããããããããããããã"
 
 #: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
 msgid "An invalid username was provided"
-msgstr ""
+msgstr "æåããããããããåãååããããã"
 
 #: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
 #, c-format
 msgid "AFP server %s declined the submitted password"
-msgstr ""
+msgstr "AFP ãããã %s ãååããããããããæåãããã"
 
 #: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
 #, c-format
 msgid "Login to AFP server %s failed"
-msgstr ""
+msgstr "AFP ãããã %s ãããããããåæãããã"
 
 #: ../daemon/gvfsafpserver.c:414
 msgid "Server doesn't support passwords longer than 64 characters"
-msgstr ""
+msgstr "ããããã 64 æåããéããããããããããããããããã"
 
 #: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
 #, c-format
 msgid "AFP server %s doesn't support anonymous login"
-msgstr ""
+msgstr "AFP ãããã %s ãååããããããããããããããããã"
 
 #: ../daemon/gvfsafpserver.c:645
 #, c-format
 msgid "Anonymous login to AFP server %s failed, got error code: %d"
-msgstr ""
+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
-#, fuzzy, c-format
-#| msgid "Failed to get folder list"
+#, c-format
 msgid "Failed to connect to server (%s)"
-msgstr "ããããããäèãååãããããããã"
+msgstr "ãããããæçãããããããã (%s)"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsafpserver.c:830
-#, fuzzy, c-format
-#| msgid "Enter password for ftp as %s on %s"
+#, c-format
 msgid "Enter password for afp as %s on %s"
-msgstr "%s %s ãããããããååæåãããã"
+msgstr "%s$2 ãã %s$1 ã afp ããããããååãããããã"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsafpserver.c:833
-#, fuzzy, c-format
-#| msgid "Enter password for ftp on %s"
+#, c-format
 msgid "Enter password for afp on %s"
-msgstr "FTP %s ãããããããååæåãããã"
+msgstr "%s ãã afp ããããããååãããããã"
 
 #: ../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 "ããããããããããããããããããããã"
+msgstr "ãããããããããããããããããããã"
 
-#: ../daemon/gvfsbackendafc.c:212
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Apple ãããããããããããåéããã"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "ãããããååãããã"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "ãããããããçããããããã"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "ãããããåçãããããã"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "æçãåãèããããããã"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "çåã Apple ããããããããããããããåäãããã"
 
-#: ../daemon/gvfsbackendafc.c:236
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Apple ãããããããããããåçããããããã (%d)"
 
-#: ../daemon/gvfsbackendafc.c:252
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
-msgstr ""
+msgstr "ããããããããããããããããããããããäèãäæãåæãããã"
 
-#: ../daemon/gvfsbackendafc.c:268
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
-msgstr ""
+msgstr "ããããããããããããããããããããããããåæãããã"
 
-#: ../daemon/gvfsbackendafc.c:285
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
-msgstr "ãããããããããã: åæãééããããã"
+msgstr "ããããããããã: åæãééããããã"
 
-#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafc.c:286 ../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
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "æéãããããã"
 
-#: ../daemon/gvfsbackendafc.c:293
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
-msgstr "åçãããããããããããããã (%d)"
+msgstr "åçããããããããããããã (%d)"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice ããã: çåãåæ"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -397,50 +396,49 @@ msgstr ""
 "libimobiledevice ããã: ãããããèãããããããusbmuxd ãæããèåããã"
 "ãããçèããããããã"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "libimobiledevice ãåçããããããã (%d)"
 
-#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
-#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "ããããã"
-
-#: ../daemon/gvfsbackendafc.c:385
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "ããäåèã"
 
-#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "ããããã"
+
+#: ../daemon/gvfsbackendafc.c:400 ../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/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "ãããããäæãééããããã"
 
-#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
 "AFC ãåæãééããããã: afc://uuid:port-number ãååãããåèããããã"
 
-#: ../daemon/gvfsbackendafc.c:425
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple ãããããããã"
 
-#: ../daemon/gvfsbackendafc.c:430
-#, fuzzy, c-format
-#| msgid "Apple Mobile Device"
+#: ../daemon/gvfsbackendafc.c:427
+#, c-format
 msgid "Apple Mobile Device, Jailbroken"
-msgstr "Apple ãããããããã"
+msgstr "Apple ãããããããã (Jailbrake æ)"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple ããããããããäããããããã"
 
-#: ../daemon/gvfsbackendafc.c:493
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (jailbreak)"
@@ -448,7 +446,7 @@ msgstr "%s (jailbreak)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "%s äããããããã"
@@ -459,14 +457,14 @@ msgstr "%s äããããããã"
 #: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
-"Device '%s' is password protected. Enter the password on the device and "
-"click 'Try again'."
+"The device '%s' is locked. Enter the passcode on the device and click 'Try "
+"again'."
 msgstr ""
-"ãããã '%s' ãããããããäèããããããããããããããããããåå"
-"ãã'ããäåèã' ãããããããããããã"
+"ãããã '%s' ããããããããããããããããããããããååãã'ããäåè"
+"ã' ãããããããããããã"
 
 #: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
@@ -498,7 +496,7 @@ msgstr "çåãããããçéãã"
 #: ../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
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "ãããããããããæäãã"
 
@@ -514,7 +512,7 @@ msgstr "ãããããããããæäãã"
 #: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
 #, c-format
 msgid "Got error code: %d from server"
-msgstr ""
+msgstr "ããããããããããããèãããã: %d"
 
 #: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
 #: ../daemon/gvfsbackendsmbbrowse.c:1135
@@ -522,16 +520,14 @@ msgid "The file is not a mountable"
 msgstr "ãããããããããããããããã"
 
 #: ../daemon/gvfsbackendafpbrowse.c:498
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "AFP shares for %s on %s"
-msgstr "sftp (%s %s)"
+msgstr "%s$2 äã %s$1 ã AFP åæ"
 
 #: ../daemon/gvfsbackendafpbrowse.c:501
-#, fuzzy, c-format
-#| msgid "Windows shares on %s"
+#, c-format
 msgid "AFP shares on %s"
-msgstr "Windows åæ %s"
+msgstr "%s äã AFP åæ"
 
 #: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
 #: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
@@ -541,30 +537,26 @@ msgstr "ãããåãæåããããããã"
 
 #: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
 msgid "Apple Filing Protocol Service"
-msgstr ""
+msgstr "Apple ããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
 #: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
-#, fuzzy
-#| msgid "File is directory"
 msgid "File is a directory"
 msgstr "ããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:475
 msgid "Too many files open"
-msgstr ""
+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 ""
+msgstr "ããããããçãåéãããããã"
 
 #: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
-#, fuzzy
-#| msgid "Target file exists"
 msgid "Target file is open"
-msgstr "èéåããããããååããã"
+msgstr "åèãããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
 #: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
@@ -577,16 +569,14 @@ msgid "Target file already exists"
 msgstr "åèããããããæãååããããã"
 
 #: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Ancestor directory doesn't exist"
-msgstr "ãããããããããã"
+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 ""
+msgstr "ããããããèãåãåçãã"
 
 #: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
 #: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
@@ -595,66 +585,54 @@ msgstr "ãããããããçããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1215
 msgid "Target object is marked as DeleteInhibit"
-msgstr ""
+msgstr "åèãããããããã DeleteInhibit ãããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
 #: ../daemon/gvfsbackendafp.c:2226
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Target object doesn't exist"
-msgstr "ãããããããããã"
+msgstr "åèããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1319
 msgid "ID not found"
-msgstr ""
+msgstr "ID ãèãããããã"
 
 #: ../daemon/gvfsbackendafp.c:1452
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move directory into one of it's descendants"
-msgstr "ããããããããããããããåãçåããããã"
+msgstr "ãããããããåãããããããçåããããã"
 
 #: ../daemon/gvfsbackendafp.c:1456
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move sharepoint into a shared directory"
-msgstr "ããããããããããããããåãçåããããã"
+msgstr "åæãããããåæããããããåãçåããããã"
 
 #: ../daemon/gvfsbackendafp.c:1460
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move a shared directory into the Trash"
-msgstr "ããããããããããããããåãçåããããã"
+msgstr "åæãããããããããçãçåããããã"
 
 #: ../daemon/gvfsbackendafp.c:1468
 msgid "Object being moved is marked as RenameInhibit"
-msgstr ""
+msgstr "çåããããããããããã RenameInhibit ãããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1472
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Object being moved doesn't exist"
-msgstr "ãããããããããã"
+msgstr "çåãããããããããããååãããã"
 
 #: ../daemon/gvfsbackendafp.c:1581
 msgid "Server doesn't support the FPCopyFile operation"
-msgstr ""
+msgstr "ããããã FPCopyFile æäããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1585
-#, fuzzy
-#| msgid "Couldn't get stream file descriptor"
 msgid "Couldn't open source file as Read/DenyWrite"
-msgstr "ããããããããããããããããããããååãããããããã"
+msgstr "ãããåãããããã Read/DenyWrite ãããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1597
 msgid "Source file and/or destination directory doesn't exist"
 msgstr ""
+"ãããåãããããããããããåããããããããããããããããäæãååã"
+"ãããã"
 
 #: ../daemon/gvfsbackendafp.c:1601
-#, fuzzy
-#| msgid "The file is not a directory"
 msgid "Source file is a directory"
-msgstr "ãããããããããããããããããããã"
+msgstr "ãããåããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
 #: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
@@ -679,48 +657,41 @@ msgid "Can't move directory over directory"
 msgstr "ããããããããããããããåãçåããããã"
 
 #: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
-#, fuzzy
-#| msgid "Can't eject file"
 msgid "Can't rename volume"
-msgstr "ãããããåãåãããã"
+msgstr "ããããããååãåæããããã"
 
 #: ../daemon/gvfsbackendafp.c:2218
-#, fuzzy
-#| msgid "Name already exists"
 msgid "Object with that name already exists"
-msgstr "æãååããããã"
+msgstr "ããååããããããããæãååããããã"
 
 #: ../daemon/gvfsbackendafp.c:2222
 msgid "Target object is marked as RenameInhibit"
-msgstr ""
+msgstr "åèãããããããã RenameInhibit ãããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:2354
 msgid "Volume is flat and doesn't support directories"
-msgstr ""
+msgstr "ããããããããããããããããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:2362
-#, fuzzy
-#| msgid "Target file already exists"
 msgid "Target directory already exists"
-msgstr "åèããããããæãååããããã"
+msgstr "åèããããããããæãååããããã"
 
 #: ../daemon/gvfsbackendafp.c:2501
 msgid "File is not open for write access"
-msgstr ""
+msgstr "æãèããããããåãããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:2742
 msgid "File is not open for read access"
-msgstr ""
+msgstr "èãåããããããåãããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:2973
 msgid "Range lock conflict exists"
-msgstr ""
+msgstr "Range lock conflict ãååããã"
 
 #: ../daemon/gvfsbackendafp.c:3212
-#, fuzzy, c-format
-#| msgid "Unable to create temporary file"
+#, c-format
 msgid "Couldn't create temporary file (%s)"
-msgstr "äæãããããçæããããã"
+msgstr "äæäæãããããçæããããã (%s)"
 
 #: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
 #: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
@@ -730,19 +701,15 @@ msgstr "ãããããããäããããããåæããããã"
 #: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
 #: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
 msgid "backups not supported yet"
-msgstr "ãããããããæããããããããããã"
+msgstr "ãããããããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:3539
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Directory doesn't exist"
-msgstr "ãããããããããã"
+msgstr "ãããããããååãããããã"
 
 #: ../daemon/gvfsbackendafp.c:3543
-#, fuzzy
-#| msgid "Target %s is not a directory\n"
 msgid "Target object is not a directory"
-msgstr "ããããã %s ãããããããããããããã\n"
+msgstr "åèããããããããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
 #: ../daemon/gvfsbackendsftp.c:4643
@@ -750,46 +717,40 @@ msgid "Invalid attribute type (uint32 expected)"
 msgstr "çåãåæããã (uint32 ããããã)"
 
 #: ../daemon/gvfsbackendafp.c:4093
-#, fuzzy
-#| msgid "Not supported"
 msgid "Command not supported"
-msgstr "ãããããããããã"
+msgstr "ãããããããããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:4097
 msgid "User's password has expired"
-msgstr ""
+msgstr "ããããããããããæéãåãããã"
 
 #: ../daemon/gvfsbackendafp.c:4101
 msgid "User's password needs to be changed"
-msgstr ""
+msgstr "ãããããããããããåæããåèããããã"
 
 #: ../daemon/gvfsbackendafp.c:4111
 #, c-format
 msgid "FPGetUserInfo failed (%s)"
-msgstr ""
+msgstr "FPGetUserInfo ãåæãããã (%s)"
 
 #: ../daemon/gvfsbackendafp.c:4250
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "AFP volume %s for %s on %s"
-msgstr "sftp (%s %s)"
+msgstr "%s$3 äã %s$2 ã AFP ããããã %s$1"
 
 #: ../daemon/gvfsbackendafp.c:4254
-#, fuzzy, c-format
-#| msgid "Documents on %s"
+#, c-format
 msgid "AFP volume %s on %s"
-msgstr "%s äããããããã"
+msgstr "%s$1 äã AFP ããããã %s$2"
 
 #: ../daemon/gvfsbackendafp.c:4272
 #, c-format
 msgid "Couldn't mount AFP volume %s on %s"
-msgstr ""
+msgstr "%s$2 äã AFP ããããã %s$1 ãããããããããã"
 
 #: ../daemon/gvfsbackendafp.c:4303
-#, fuzzy
-#| msgid "No drive specified"
 msgid "No volume specified"
-msgstr "ãããããæåããããããã"
+msgstr "ããããããæåããããããã"
 
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
@@ -814,15 +775,15 @@ msgstr "Burn"
 
 #: ../daemon/gvfsbackendburn.c:376
 msgid "Unable to create temporary directory"
-msgstr "äæãããããããçæããããã"
+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:793
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
-#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
@@ -842,7 +803,7 @@ 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:2926
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "ãããããååããããã"
 
@@ -865,7 +826,7 @@ msgstr "ãããããååããããã"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
 #: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "ããããããããããããããããæäãã"
@@ -881,16 +842,16 @@ msgid "Target file exists"
 msgstr "èéåããããããååããã"
 
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "ãããããããããã"
 
-#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:921
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
 msgid "Unmount Anyway"
 msgstr "ãããããããããããã"
 
-#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -898,19 +859,19 @@ msgstr ""
 "ããããããäçäãã\n"
 "1ãääããããããããããããããããäçäããã"
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "gudev ãããããããçæããããã"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
-msgstr "ããããããããæçããããã"
+msgstr "ãããããããæçããããã"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "libhal ããããããããçæããããã"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "libhal ãåæåããããã"
 
@@ -940,7 +901,7 @@ msgstr "cdda ã %s ããããããããã"
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../daemon/gvfsbackendcdda.c:504
 #, c-format
@@ -964,7 +925,7 @@ msgstr "ãããã (%s) ã 'paranoia' ãããã"
 msgid "Error seeking in stream on drive %s"
 msgstr "ãããã (%s) ããããããããããããéãããã"
 
-#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "ããããããããããååãããã"
@@ -972,11 +933,11 @@ msgstr "ããããããããããååãããã"
 #: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
-msgstr "ãããããããååãããããããããããããããããããããããããã"
+msgstr "ãããããããååããããããããããããããããããããããããã"
 
 #: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
-msgstr "ããããã CD ãããããããããããããã"
+msgstr "ããããã CD ããããããããããããã"
 
 #: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
@@ -1000,8 +961,6 @@ msgid "Can't mount file"
 msgstr "ãããããããããããããã"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-#, fuzzy
-#| msgid "No media in the drive"
 msgid "No medium in the drive"
 msgstr "ããããããããããæåããããããã"
 
@@ -1035,22 +994,20 @@ msgstr "ãããããpollããããã"
 #. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
 #. the second %s and only shown if it is not the default http(s) port.
 #: ../daemon/gvfsbackenddav.c:485
-#, fuzzy, c-format
-#| msgid "WebDAV on %s"
+#, c-format
 msgid "WebDAV as %s on %s%s"
-msgstr "%s ãã WebDAV åæ"
+msgstr "%s$2%s$3 ãã %s$1 ã WebDAV åæ"
 
 #. Translators: This is the name of the WebDAV share constructed as
 #. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
 #. %s and it is only shown if it is not the default http(s) port.
 #: ../daemon/gvfsbackenddav.c:493
-#, fuzzy, c-format
-#| msgid "WebDAV on %s"
+#, c-format
 msgid "WebDAV on %s%s"
-msgstr "%s ãã WebDAV åæ"
+msgstr "%s%s ãã WebDAV åæ"
 
 #: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP ãããã: %s"
@@ -1097,7 +1054,7 @@ msgstr "èæããããããçæãããããããã"
 #: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
-msgstr "ããããããããããããçæãåæãããã"
+msgstr "ãããããããããããçæãåæãããã"
 
 #. "separate": a link to dns-sd://local/
 #: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
@@ -1120,30 +1077,26 @@ msgstr "ãããããã"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendftp.c:488
-#, fuzzy, c-format
-#| msgid "Enter password for ftp as %s on %s"
+#, c-format
 msgid "Enter password for FTP as %s on %s"
-msgstr "%s %s ãããããããååæåãããã"
+msgstr "%s$2 ãã %s$1 ã FTP ããããããååãããããã"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsbackendftp.c:491
-#, fuzzy, c-format
-#| msgid "Enter password for ftp on %s"
+#, c-format
 msgid "Enter password for FTP on %s"
-msgstr "FTP %s ãããããããååæåãããã"
+msgstr "%s ã FTP ããããããååãããããã"
 
 #: ../daemon/gvfsbackendftp.c:630
-#, fuzzy, c-format
-#| msgid "/ on %s"
+#, c-format
 msgid "FTP on %s"
-msgstr "%s ã / (ããã)"
+msgstr "%s ã FTP"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendftp.c:634
-#, fuzzy, c-format
-#| msgid "ftp as %s on %s"
+#, c-format
 msgid "FTP as %s on %s"
-msgstr "ftp (%s %s)"
+msgstr "%s$2 ã %s$1 ããã FTP"
 
 #: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
@@ -1170,14 +1123,14 @@ 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:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
-msgstr "ãããã (%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:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1185,181 +1138,173 @@ 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:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "%s èãããããããããããã"
+msgstr "%s èããããããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../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:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "ãããããæåããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "gphoto2 ããããããããçæããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
-msgstr "ãããããããããããçæããããã"
+msgstr "ããããããããããçæããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "ããããæåãèãèãéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "ããããæåãæçããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "ããããæåãååããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "ããããæçããããããèåããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "ãããããããããããåæåããéãããã"
 
 #. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
 #. backend and shouldn't be translated.
-#: ../daemon/gvfsbackendgphoto2.c:1684
+#: ../daemon/gvfsbackendgphoto2.c:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 ã %s ããããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1766
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "ããããæåããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1828
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "ããããããããããããçæããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1843
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "ãããããååããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1853
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "ãããããããããååããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:1911
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "ãããããèååãååãééããããã: '%s'"
 
-#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "ããã (%s) ãããããããæçããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "ããããããããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2160
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "ããããããäèãååãããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2226
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "ãããããäèãååãããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2518
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "ãããããããçæããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2727
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "æãååããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "æããååãéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
-#, fuzzy
-#| msgid "Error creating directory"
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
-msgstr "ãããããããçæããéãããã"
+msgstr "ããããããåãåæããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "ããããåãåæããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2825
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "ãããããã (%s) ãçããããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "ãããããããåéããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2862
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "ãããããåéããéãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "ãããããããæãèãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2962
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "èååãæãããããããçäããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2977
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "èååããããããèãèãããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:2988
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "èååããããããããããååããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:3275
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "ãããããæãèããããã"
 
-#: ../daemon/gvfsbackendgphoto2.c:3323
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "æãããããã (åãããããããããããããã)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3335
-#, fuzzy
-#| msgid "Not supported (src is dir, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "æãããããã (èéåãèéåãåæããããããã)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3343
-#, fuzzy
-#| msgid "Not supported (src is dir, dst is existing file)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
-msgstr "æãããããã (èéåããããããããèéåããããã)"
+msgstr "æãããããã (èéåããããããããèéåããããããåå)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3355
-#, fuzzy
-#| msgid "Not supported (src is file, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "æãããããã (èéåããããããèéåããããããã)"
 
-#: ../daemon/gvfsbackendhttp.c:244
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP ãããããããããã: %s"
@@ -1385,17 +1330,15 @@ 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:681 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
-msgstr "%s %s"
+msgstr "%s$2 äã %s$1"
 
-#: ../daemon/gvfsbackendobexftp.c:890
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
-msgstr ""
-"USB ããããããããããã; æããããããæäãããããããããåãåããã"
-"ãããã"
+msgstr "USB ããããããããããã; ãããããããããããåãåããããããã"
 
 #: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
@@ -1403,7 +1346,7 @@ msgstr "ããããããæçãåããããã"
 
 #: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
-msgstr "ããããããããããããææãããããã"
+msgstr "ããããããããããããææãåèãã"
 
 #: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
@@ -1497,7 +1440,7 @@ msgstr ""
 
 #: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
-msgstr "ãããããããããããããããããããã"
+msgstr "ããããããããããããããããããããã"
 
 #: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
@@ -1509,17 +1452,15 @@ msgstr "ããããããããããã"
 
 #. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "SFTP for %s on %s"
-msgstr "sftp (%s %s)"
+msgstr "%s$2 ã %s$1 ããã SFTP"
 
 #. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
-#, fuzzy, c-format
-#| msgid "/ on %s"
+#, c-format
 msgid "SFTP on %s"
-msgstr "%s ã / (ããã)"
+msgstr "%s äã SFTP"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
@@ -1543,12 +1484,12 @@ msgstr "ssh ãããããèãããããã"
 #: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
 #: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
-msgstr "åäãããããããééããããã"
+msgstr "çåããããããåäãããã"
 
 #: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
-msgstr " (ãããããããããééããããã)"
+msgstr " (çåããããããããã)"
 
 #: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
@@ -1562,11 +1503,11 @@ msgstr "OpenIconForRead ãããã icon_id ãæããããããã: '%s'"
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
-msgstr "ããããããããããããçæããéãããã: %s"
+msgstr "ãããããããããããçæããéãããã: %s"
 
 #: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
-msgstr "äæãããããçæããããã"
+msgstr "äæäæãããããçæããããã"
 
 #. translators: %s is a server name
 #: ../daemon/gvfsbackendsmbbrowse.c:375
@@ -1579,7 +1520,7 @@ msgstr "%s ãããããããååãããããã"
 #: ../daemon/gvfsbackendsmbbrowse.c:902
 #, c-format
 msgid "Windows shares on %s"
-msgstr "Windows åæ %s"
+msgstr "%s äãWindows åæ"
 
 #. translators: We tried to mount a windows (samba) share, but failed
 #: ../daemon/gvfsbackendsmbbrowse.c:1001
@@ -1588,11 +1529,11 @@ msgstr "ããããããåæããããååãããããããã"
 
 #: ../daemon/gvfsbackendsmbbrowse.c:1157
 msgid "Not a regular file"
-msgstr "éåããããããããããã"
+msgstr "éåãããããããããããã"
 
 #: ../daemon/gvfsbackendsmbbrowse.c:1489
 msgid "Windows Network Filesystem Service"
-msgstr "Windows ãããããããããããããããããããã"
+msgstr "Windows ããããããããããããããããããã"
 
 #. translators: First %s is a share name, second is a server name
 #: ../daemon/gvfsbackendsmb.c:238
@@ -1618,17 +1559,15 @@ msgstr "ãããããããããããããçéãã"
 #: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
-msgstr "ããããããããããããçæãåæãããã: %s"
+msgstr "ãããããããããããçæãåæãããã: %s"
 
 #: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "çåãåæããã (uint64 ããããã)"
 
 #: ../daemon/gvfsbackendsmb.c:1922
-#, fuzzy
-#| msgid "Target file already exists"
 msgid "Can't rename file, filename already exists"
-msgstr "åèããããããæãååããããã"
+msgstr "ãããããååãåæãããããããããããæãååããããã"
 
 #: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
@@ -1646,7 +1585,7 @@ msgstr "ãããããããååçãçåããããã"
 
 #: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
-msgstr "Windows åæãããããããããããããã"
+msgstr "Windows åæããããããããããããã"
 
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
@@ -1662,32 +1601,31 @@ msgstr "ããçãäããããããããåæããããã"
 msgid "Trash"
 msgstr "ããç"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
-msgstr "ãããããããçéãééããããã"
+msgstr "çåããããããããçé"
 
 #: ../daemon/gvfsdaemonutils.c:104
-#, fuzzy, c-format
-#| msgid "Error sending fd: %s"
+#, c-format
 msgid "Error sending file descriptor: %s"
-msgstr "fd ãéäããéãããã: %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/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
-msgstr "ãããããééããããã"
+msgstr "çåããããã"
 
 #: ../daemon/gvfsftpconnection.c:392
 msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
 msgstr ""
-"ãããããã FTP æçãäæããããããããããããããããããããããããã"
-"ãåèæãããããã"
+"ãããããã FTP æçãäæããããããããããããããããããããããããã"
+"ããåèæãããããã"
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
@@ -1697,47 +1635,47 @@ msgstr "ãããããã FTP æçãäæããããããããã"
 msgid "Filename contains invalid characters."
 msgstr "ããããåãçåãæåãåããããããã"
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP ãããããããããããåãããäåèããããããã"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "ããããããããããããããããã"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "ããããæçãéãããã"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr ""
-"ããããæçãéåããããã (ããããããããããããããééãããããæã"
-"ããã)"
+"ããããæçãéåããããã (ãããããããããããããééãããããæãã"
+"ãã)"
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "ããããæçãéãããã"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "æäãåæãããã"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "ãããããåéãèãããã"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "ãããããããããããããããããããããã"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "ããããçéãäæãã"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
-msgstr "ããããåãééããããã"
+msgstr "ããããåãçåãã"
 
 #: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
@@ -1745,7 +1683,7 @@ msgstr "ãããããããããããããããããããããããã
 
 #: ../daemon/gvfsjobsetattribute.c:120
 msgid "Invalid dbus message"
-msgstr "D-Bus ãããããããééããããã"
+msgstr "çåã D-Bus ãããããã"
 
 #: ../daemon/gvfsjobunmount.c:156
 msgid "Filesystem is busy"
@@ -1759,22 +1697,22 @@ msgstr "åããããããçãããã"
 msgid "Don't start fuse."
 msgstr "fuse ãèåããã"
 
-#: ../daemon/main.c:62
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS ãããã"
 
-#: ../daemon/main.c:65
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
-msgstr "GVFS ããããããããã"
+msgstr "GVFS ãããããããã"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:80 ../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:82 ../metadata/meta-daemon.c:720
+#: ../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
@@ -1796,7 +1734,7 @@ msgstr "fork() ããåãããããåæãééããããã"
 msgid "Automount failed: %s"
 msgstr "èåãããããåæãããã: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:902
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "æåããåæãããããããããããã"
 
@@ -1804,11 +1742,11 @@ msgstr "æåããåæãããããããããããã"
 msgid "The specified location is not supported"
 msgstr "æåããåæãããããããããããã"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "ããåæãæããããããããããã"
 
-#: ../daemon/mount.c:1052
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "ããåæãããããããããã"
 
@@ -1837,11 +1775,11 @@ msgstr "ããããããåãçåãããããããã"
 
 #: ../metadata/meta-daemon.c:704
 msgid "GVFS Metadata Daemon"
-msgstr "GVFS ãããããããããã"
+msgstr "GVFS ããããããããã"
 
 #: ../metadata/meta-daemon.c:707
 msgid "Metadata daemon for GVFS"
-msgstr "GVFS ããããããããããã"
+msgstr "GVFS ãããããããããã"
 
 #: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
 msgid "GVfs GDU Volume Monitor"
@@ -1849,7 +1787,7 @@ msgstr "GVfs GDU ããããããçè"
 
 #: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../monitor/gdu/ggdudrive.c:258
 #, c-format
@@ -1861,8 +1799,7 @@ msgid "Unnamed Drive"
 msgstr "ååããããããã"
 
 #: ../monitor/gdu/ggdudrive.c:561
-#, fuzzy, c-format
-#| msgid "Failed to eject media; one or more volumes on the media are busy."
+#, c-format
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr ""
 "ãããããåãåããããããã (ããããã1ãääãããããããäçäãã)"
@@ -1873,31 +1810,31 @@ msgid ""
 "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"
-"ãããããããããããããããéåãããããããããããããããããæéæã"
-"èéåæããããããæåããããããããããããæéããååãããããããã"
-"ãããããååãããåãããããåèæãããããã"
+"ããããããããããããããéåãããã?\n"
+"ããããããããããããããéåãããããããããããããããããæéæãè"
+"éåæããããããæåããããããããããããæéããååããããããããã"
+"ããããååãããåãããããåèæãããããã"
 
 #: ../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 "ããããããæäãåãããããããã1ãääããããã"
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "LUKS cleartext slave ãååãããããããã"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "ãã `%s' ãã LUKS cleartext slave ãååãããããããã"
 
 #: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
@@ -2168,19 +2105,19 @@ msgstr "FireWire ãããã"
 
 #: ../monitor/hal/ghaldrive.c:197
 msgid "Tape Drive"
-msgstr "ãããããããã"
+msgstr "ããããããã"
 
 #: ../monitor/hal/ghaldrive.c:199
 msgid "CompactFlash Drive"
-msgstr "CompactFlash ãããã"
+msgstr "ãããããããããããããã"
 
 #: ../monitor/hal/ghaldrive.c:201
 msgid "MemoryStick Drive"
-msgstr "MemoryStick ãããã"
+msgstr "ããããããããããããã"
 
 #: ../monitor/hal/ghaldrive.c:203
 msgid "SmartMedia Drive"
-msgstr "SmartMedia ãããã"
+msgstr "ãããããããããããã"
 
 #: ../monitor/hal/ghaldrive.c:205
 msgid "SD/MMC Drive"
@@ -2200,7 +2137,7 @@ msgstr "Thumb ãããã"
 
 #: ../monitor/hal/ghaldrive.c:214
 msgid "Mass Storage Drive"
-msgstr "ãããããããããããã"
+msgstr "ååéããããããããã"
 
 #: ../monitor/hal/ghaldrive.c:662
 #, c-format
@@ -2229,10 +2166,9 @@ msgstr "ææãããããæåãããã"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
 #: ../monitor/hal/ghalmount.c:336
-#, fuzzy, c-format
-#| msgid "%s Media"
+#, c-format
 msgid "%s Medium"
-msgstr "%s ããããã"
+msgstr "%s ãããã"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -2513,54 +2449,54 @@ msgstr "- <åæ> ããããããäèèç"
 
 #: ../programs/gvfs-mime.c:36
 msgid "Query handler for mime-type"
-msgstr ""
+msgstr "MIMEåããããããããã"
 
 #: ../programs/gvfs-mime.c:37
 msgid "Set handler for mime-type"
-msgstr ""
+msgstr "MIMEåãããããããèå"
 
 #: ../programs/gvfs-mime.c:76
 msgid "- get/set handler for <mimetype>"
-msgstr ""
+msgstr "- <MIMEå> ãããããããååãèå"
 
 #: ../programs/gvfs-mime.c:85
 msgid "Specify one of --query and --set"
-msgstr ""
+msgstr "--query ã --set ãããããäããæå"
 
 #: ../programs/gvfs-mime.c:97
 #, c-format
 msgid "Must specify a single mime-type.\n"
-msgstr ""
+msgstr "åäã MIME åãæåããåèãããããã\n"
 
 #: ../programs/gvfs-mime.c:105
 #, c-format
 msgid "Must specify the mime-type followed by the default handler.\n"
-msgstr ""
+msgstr "MIMEåãçããããããããããããããæåããããããããããã\n"
 
 #: ../programs/gvfs-mime.c:121
 #, c-format
 msgid "No default applications for '%s'\n"
-msgstr ""
+msgstr "'%s' çãææãããããããããèåããããããã\n"
 
 #: ../programs/gvfs-mime.c:127
 #, c-format
 msgid "Default application for '%s': %s\n"
-msgstr ""
+msgstr "'%s' çãææãããããããã: %s\n"
 
 #: ../programs/gvfs-mime.c:132
 #, c-format
 msgid "Registered applications:\n"
-msgstr ""
+msgstr "çéããããããããããããã:\n"
 
 #: ../programs/gvfs-mime.c:152
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
-msgstr ""
+msgstr "ããããã '%s' ãæåãèãèããããããã\n"
 
 #: ../programs/gvfs-mime.c:158
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
-msgstr ""
+msgstr "'%s' ã '%s' ãããããããããããããããèåãããããããã: %s\n"
 
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
@@ -2623,22 +2559,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 "- <åæ> ããããã"
 
@@ -2793,8 +2729,6 @@ msgid "Error trashing file: %s\n"
 msgstr "ãããããåéããéãããã: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-#, fuzzy
-#| msgid "Follow symlinks, mounts and shortcuts like dirs"
 msgid "Follow symbolic links, mounts and shortcuts like directories"
 msgstr ""
 "ãããããããããããããããããããããããããããããããããããããã"
@@ -2802,72 +2736,3 @@ msgstr ""
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "- ãããçããããããããããããããäèãäèããã"
-
-#~ msgid "Unhandled Inst proxy error (%d)"
-#~ msgstr "åçãããã Inst ããããããããã (%d)"
-
-#~ msgid "Unhandled SBServices proxy error (%d)"
-#~ msgstr "åçãããã SBServices ããããããããã (%d)"
-
-#~ msgid "Service %d on Apple Mobile Device"
-#~ msgstr "Apple ããããããããããããã %d"
-
-#~ msgid "ftp on %s"
-#~ msgstr "ftp (%s)"
-
-#~ msgid "Error renaming dir"
-#~ msgstr "ããããããåãåæããéãããã"
-
-#~ msgid "sftp on %s"
-#~ msgstr "sftp (%s)"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Enter password"
-#~ msgstr "ããããããååãããããã"
-
-#~ msgid "- output files at <location>"
-#~ msgstr "- <åæ> ãããååãããã"
-
-#~ msgid "Invalid return value from get_info"
-#~ msgstr "get_info() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from query_info"
-#~ msgstr "query_info() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from call"
-#~ msgstr "call() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from get_filesystem_info"
-#~ msgstr "get_filesystem_info() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from query_filesystem_info"
-#~ msgstr "query_filesystem_info() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from monitor_dir"
-#~ msgstr "monitor_dir() ãèãåãééããããã"
-
-#~ msgid "Invalid return value from monitor_file"
-#~ msgstr "monitor_file() ãèãåãééããããã"
-
-#~ msgid "The query info operation is not supported"
-#~ msgstr "query_info ãæäããããããããããã"
-
-#~ msgid "Query info not supported on stream"
-#~ msgstr "ãããããäãã query_info ããããããããããã"
-
-#~ msgid "Invalid return value from open_icon_for_read"
-#~ msgstr "open_icon_for_read() ãèãåãééããããã"
-
-#~ msgid "broken transmission"
-#~ msgstr "éäããã"
-
-#~ msgid "Could not connect to host"
-#~ msgstr "ããããæçãããããããã"
-
-#~ msgid "filename too long"
-#~ msgstr "ããããåãéãããã"
-
-#~ msgid "Invalid destination filename"
-#~ msgstr "èéåãããããåãééããããã"