diff --git a/SOURCES/gvfs-1.22.4-EL7.3_translations.patch b/SOURCES/gvfs-1.22.4-EL7.3_translations.patch new file mode 100644 index 0000000..79dc483 --- /dev/null +++ b/SOURCES/gvfs-1.22.4-EL7.3_translations.patch @@ -0,0 +1,11878 @@ +diff -urN gvfs-1.22.4/po/de.po gvfs-1.22.4_localized/po/de.po +--- gvfs-1.22.4/po/de.po 2016-03-14 19:19:32.751126952 +0530 ++++ gvfs-1.22.4_localized/po/de.po 2016-03-14 19:47:32.584899651 +0530 +@@ -3,7 +3,7 @@ + # This file is distributed under the same license as the gvfs package. + # # + # etag = +-# ++# + # Andre Klapper , 2008. + # Hendrik Brandt , 2008. + # Hendrik Richter , 2008, 2009. +@@ -11,22 +11,22 @@ + # Paul Seyfert , 2011. + # Christian Kirbach , 2009, 2010, 2011, 2012, 2013. + # Wolfgang Stöggl , 2014. +-# ++# lstemmle , 2016. #zanata ++# pnemade , 2016. #zanata + 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: 2015-01-09 22:16+0000\n" +-"PO-Revision-Date: 2015-01-10 01:18+0100\n" +-"Last-Translator: Christian Kirbach \n" +-"Language-Team: Deutsch \n" +-"Language: de_DE\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2016-03-07 04:18+0000\n" ++"Last-Translator: lstemmle \n" ++"Language-Team: Deutsch \n" ++"Language: de\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Poedit 1.5.4\n" ++"X-Generator: Zanata 3.8.2\n" + + #: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" +@@ -101,7 +101,7 @@ + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "Vorgang wurde abgebrochen" +@@ -121,8 +121,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2161 +-#: ../daemon/gvfsbackendmtp.c:2545 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "Ende des Datenstroms" + +@@ -158,7 +158,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -169,7 +169,7 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1126 + #, c-format + msgid "" +@@ -183,7 +183,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -255,7 +255,7 @@ + msgstr "EOS wurde erhalten" + + #: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "Verbindung wurde von Gegenstelle getrennt" + +@@ -286,7 +286,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "" + "Verbindung mit dem Server »%s« ist nicht möglich. Es trat ein " + "Kommunikationsproblem auf." +@@ -394,12 +395,12 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "Zugriff verweigert" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 + #: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 + #: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 +@@ -463,8 +464,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1532 ../daemon/gvfsbackendmtp.c:1665 +-#: ../daemon/gvfsbackendmtp.c:1824 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "Zieldatei existiert bereits" +@@ -541,8 +542,8 @@ + msgstr "Sperrbereichskonflikt vorhanden" + + #: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 +-#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1540 +-#: ../daemon/gvfsbackendmtp.c:1759 ../daemon/gvfsbackendmtp.c:2287 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "Ordner existiert nicht" + +@@ -567,9 +568,9 @@ + msgstr "Interner Fehler in »Apple File Control«" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1603 +-#: ../daemon/gvfsbackendmtp.c:1892 ../daemon/gvfsbackendmtp.c:1939 +-#: ../daemon/gvfsbackendmtp.c:2008 ../daemon/gvfsbackendmtp.c:2364 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "Datei existiert nicht" + +@@ -596,7 +597,8 @@ + + #: ../daemon/gvfsbackendafc.c:252 + msgid "Listing applications installed on device failed" +-msgstr "Auflistung der auf dem Gerät installierten Anwendungen ist gescheitert" ++msgstr "" ++"Auflistung der auf dem Gerät installierten Anwendungen ist gescheitert" + + #: ../daemon/gvfsbackendafc.c:268 + msgid "Accessing application icons on device failed" +@@ -632,17 +634,17 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "Unbehandelter Fehler in libimobiledevice (%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "Erneut versuchen" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:989 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "Abbrechen" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 + #: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 +@@ -650,23 +652,23 @@ + msgid "Invalid mount spec" + msgstr "Ungültige Mount-Spezifikation" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "" + "Ungültiger Ort für »Apple File Control«, muss in der Form afc://uuid:" + "portnummer angegeben werden" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Apple-Mobilgerät" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Apple-Mobilgerät, eingeschränktes Dateisystem" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Dokumente auf Apple-Mobilgerät" +@@ -674,7 +676,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (jailbreak)" +@@ -682,7 +684,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "Dokumente auf %s" +@@ -690,7 +692,7 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " +@@ -699,29 +701,29 @@ + "Das Gerät »%s« ist gesperrt. Geben Sie das Passwort auf dem Gerät ein und " + "klicken Sie auf »Erneut versuchen«." + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2030 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "Ordner konnte nicht geöffnet werden" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "Sicherheitskopien werden derzeit nicht unterstützt." + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "Ungültiger Suchtyp" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1783 +-#: ../daemon/gvfsbackendmtp.c:1995 ../daemon/gvfsbackendmtp.c:2261 +-#: ../daemon/gvfsbackendmtp.c:2351 ../daemon/gvfsbackendmtp.c:2421 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 + #: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 +-#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "Vorgang wird nicht unterstützt" + +@@ -738,7 +740,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -770,9 +772,9 @@ + msgstr "Ordner kann nicht über einen Ordner kopiert werden" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1648 +-#: ../daemon/gvfsbackendmtp.c:1671 ../daemon/gvfsbackendmtp.c:1806 +-#: ../daemon/gvfsbackendmtp.c:1830 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "Ordner kann nicht rekursiv kopiert werden" + +@@ -888,7 +890,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "Vorgang wird vom Backend nicht unterstützt" + +@@ -920,8 +922,7 @@ + # CHECK + #: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." + msgstr "" + "Datenträger ist belegt\n" +@@ -1274,7 +1275,7 @@ + msgid "Error getting data from file" + msgstr "Fehler beim Auslesen der Datei" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2122 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "Fehlerhafte Symbolidentifikation »%s«" +@@ -1356,7 +1357,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "Nicht unterstützt (Quelle und Ziel sind Ordner)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 +@@ -1436,30 +1438,30 @@ + msgid "File not found" + msgstr "Datei nicht gefunden" + +-#: ../daemon/gvfsbackendmtp.c:1521 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "Ordner kann an diesem Ort nicht angelegt werden" + +-#: ../daemon/gvfsbackendmtp.c:1592 ../daemon/gvfsbackendmtp.c:1897 +-#: ../daemon/gvfsbackendmtp.c:1944 ../daemon/gvfsbackendmtp.c:2013 +-#: ../daemon/gvfsbackendmtp.c:2369 ../daemon/gvfsbackendmtp.c:2437 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "Keine gültige Datei" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1796 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "Das Ziel ist ein Ordner" + +-#: ../daemon/gvfsbackendmtp.c:1643 ../daemon/gvfsbackendmtp.c:1801 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "Ordner können nicht zusammengeführt werden" + +-#: ../daemon/gvfsbackendmtp.c:1736 ../daemon/gvfsbackendmtp.c:2279 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "Dieser Ort ist schreibgeschützt" + +-#: ../daemon/gvfsbackendmtp.c:2104 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "Keine Vorschau für Objekt »%s«" +@@ -1759,7 +1761,7 @@ + msgstr "Unerwartetes Ende des Datenstroms" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "Ungültige Antwort" + +@@ -1783,37 +1785,41 @@ + msgid "The FTP server is busy. Try again later" + msgstr "Der FTP-Server ist beschäftigt. Bitte versuchen Sie es später erneut." + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "Bereitstellung des Backend wird derzeit aufgehoben" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "Konten werden nicht unterstützt" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "" + "Es konnte keine Datenverbindung hergestellt werden. Wird dies eventuell von " + "Ihrer Firewall unterbunden?" + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "Datenverbindung geschlossen" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "Vorgang fehlgeschlagen" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "Der Speicherplatz auf dem Server ist aufgebraucht" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "Nicht unterstütztes Netzwerkprotokoll" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "Unbekannter Seitentyp" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "Ungültiger Dateiname" + +@@ -1832,53 +1838,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"%s wird ausgehängt\n" ++msgstr "%s wird ausgehängt\n" + "Bitte warten" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "Dateisystem ist belegt" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "Alten Dienst ersetzen." + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "FUSE nicht starten." + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "Programmversion zeigen." + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "GVFS-Dienst" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "Hauptdienst für GVFS." + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1930,11 +1934,11 @@ + msgid "Unable to move metadata keys" + msgstr "Metadaten-Schlüssel konnten nicht verschoben werden" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "GVFS-Metadaten-Dienst" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "Metadaten-Dienst für GVFS." + +@@ -2360,7 +2364,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Trotzdem auswerfen" +@@ -2372,8 +2376,7 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" + msgstr "" + "Daten werden auf %s geschrieben\n" +@@ -2386,7 +2389,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2394,7 +2397,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2410,27 +2413,27 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "Fehler beim Speichern der Passphrase im Schlüsselbund (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "" + "Fehler beim Löschen der ungültigen Passphrase aus dem Schlüsselbund (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "Das entsperrte Gerät enthält kein erkennbares Dateisystem" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "Verschlüsselungspassphrase für %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "Es wird eine Passphrase benötigt, um den Datenträger zu öffnen" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2442,8 +2445,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2457,7 +2460,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2492,7 +2495,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:Fehler beim Schließen: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "DATEI" +@@ -2526,7 +2529,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2536,7 +2539,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: keine Orte angegeben" +@@ -2924,8 +2927,7 @@ + #: ../programs/gvfs-mount.c:201 ../programs/gvfs-mount.c:225 + #, c-format + msgid "Error mounting location: %s\n" +-msgstr "" +-"Fehler beim Einhängen des Ortes: %s\n" ++msgstr "Fehler beim Einhängen des Ortes: %s\n" + "\n" + + #: ../programs/gvfs-mount.c:286 +@@ -2973,7 +2975,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2983,7 +2985,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: Fehler beim Öffnen des Ortes: %s\n" +@@ -3051,8 +3053,7 @@ + #: ../programs/gvfs-save.c:129 + #, c-format + msgid "Error closing: %s\n" +-msgstr "" +-"Fehler beim Schließen: %s\n" ++msgstr "Fehler beim Schließen: %s\n" + "\n" + + #. Translators: The "etag" is a token allowing to verify whether a file has been modified +@@ -3128,258 +3129,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "Den Inhalt von Ordnern in einer Baumstruktur auflisten." +- +-#~ msgid "Storage not found" +-#~ msgstr "Speicher nicht gefunden" +- +-#~ msgid "Destination directory not found" +-#~ msgstr "Zielordner wurde nicht gefunden" +- +-#~ msgid "File already exists" +-#~ msgstr "Datei existiert bereits" +- +-#~ msgid "Operation not supported." +-#~ msgstr "Vorgang wird nicht unterstützt." +- +-#~ msgid "Can't seek outside file" +-#~ msgstr "Außerhalb der Datei kann nicht gesucht werden" +- +-#~ msgid "Cannot create files in this location" +-#~ msgstr "Dateien können an diesem Ort nicht angelegt werden" +- +-#~ msgid "progress" +-#~ msgstr "Fortschritt" +- +-#~ msgid "No storage volumes found" +-#~ msgstr "Keine Speichergeräte gefunden" +- +-#~ msgid "Cannot delete this entity" +-#~ msgstr "Dieses Objekt kann nicht gelöscht werden" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "Keine Verbindung zum Sitzungs-Bus möglich" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "Fehler beim Verbinden zum Dienst: %s" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "Fehler beim Erstellen des Socket: %s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "Fehler beim Verbinden zum Socket: %s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "Ungültiger Inhalt der Attributinfoliste" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "Fehler beim Verbinden zu D-Bus: %s" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "Der AFP-Server %s hat das angegebene Passwort abgewiesen" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "Bitte Passwort für AFP als %s auf %s eingeben" +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "Bitte Passwort für AFP auf %s eingeben" +- +-#~ msgid "AFP volumes for %s on %s" +-#~ msgstr "AFP-Datenträger für %s auf %s" +- +-#~ msgid "AFP volumes on %s" +-#~ msgstr "AFP-Datenträger auf %s" +- +-#~ msgid "AFP volume %s for %s on %s" +-#~ msgstr "AFP-Datenträger %s für %s auf %s" +- +-#~ msgid "AFP volume %s on %s" +-#~ msgstr "AFP-Datenträger %s auf %s" +- +-#~ msgid "WebDAV as %s on %s%s" +-#~ msgstr "WebDAV als %s auf %s%s" +- +-#~ msgid "WebDAV on %s%s" +-#~ msgstr "WebDAV auf %s%s" +- +-#~ msgid "Enter password for FTP as %s on %s" +-#~ msgstr "Passwort für FTP als %s auf %s eingeben" +- +-#~ msgid "Enter password for FTP on %s" +-#~ msgstr "Passwort für FTP auf %s eingeben" +- +-#~ msgid "FTP on %s" +-#~ msgstr "FTP auf %s" +- +-#~ msgid "FTP as %s on %s" +-#~ msgstr "FTP als %s auf %s" +- +-#~ msgid "Enter passphrase for key for ssh as %s on %s" +-#~ msgstr "Bitte Passphrase für SSH-Schlüssel als %s auf %s eingeben" +- +-#~ msgid "Enter password for ssh as %s on %s" +-#~ msgstr "Bitte Passwort für SSH als %s auf %s eingeben" +- +-#~ msgid "SFTP on %s" +-#~ msgstr "SFTP auf %s" +- +-#~ msgid "Invalid icon_id '%s' in OpenIconForRead" +-#~ msgstr "Ungültige icon_id »%s« in OpenIconForRead" +- +-#~ msgid "Invalid backend type" +-#~ msgstr "Ungültiger Backend-Typ" +- +-#~ msgid "Error sending file descriptor: %s" +-#~ msgstr "Fehler beim Senden des Dateideskriptors: %s" +- +-#~ msgid "Invalid arguments from spawned child" +-#~ msgstr "Ungültige Argumente vom erzeugten Kindprozess" +- +-#~ msgid "locations" +-#~ msgstr "Orte" +- +-#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST" +-#~ msgstr "QUELLE… ZIEL - Datei(en) von QUELLE nach ZIEL kopieren" +- +-#~ msgid "- list files at " +-#~ msgstr "- Dateien in auflisten" +- +-#~ msgid "- get/set handler for " +-#~ msgstr "- Anwendung für abfragen/festlegen" +- +-#~ msgid "files" +-#~ msgstr "Dateien" +- +-#~ msgid "%s: %s: error launching application: %s\n" +-#~ msgstr "%s: %s: Fehler beim Starten der Anwendung: %s\n" +- +-#~ msgid "FILES... - open FILES with registered application." +-#~ msgstr "DATEIEN … ‒ DATEIEN mit der empfohlenen Anwendung öffnen." +- +-#~ msgid "- delete files" +-#~ msgstr "- Dateien löschen" +- +-#~ msgid "Create backup" +-#~ msgstr "Sicherung erstellen" +- +-#~ msgid "" +-#~ "attribute type [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +-#~ msgstr "" +-#~ "Typ des Attribut [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +- +-#~ msgid " - set attribute" +-#~ msgstr " - Attribute setzen" +- +-#~ msgid "- move files to trash" +-#~ msgstr "- Dateien in den Müll verschieben" +- +-#~ msgid "Server doesn't support passwords longer than 256 characters" +-#~ msgstr "" +-#~ "Der Server unterstützt keine Passwörter, die länger als 256 Zeichen sind" +- +-#~ msgid "Login to AFP server %s failed" +-#~ msgstr "Anmeldung am AFP-Server %s ist gescheitert" +- +-#~ msgid "Anonymous login to AFP server %s failed, got error code: %d" +-#~ msgstr "" +-#~ "Anonyme Anmeldung am AFP-Server %s ist gescheitert, Fehlercode war: %d" +- +-#~ msgid "AFP shares for %s on %s" +-#~ msgstr "AFP-Freigaben für %s auf %s" +- +-#~ msgid "AFP shares on %s" +-#~ msgstr "AFP-Freigaben auf %s" +- +-#~ msgid "File is a directory" +-#~ msgstr "Datei ist ein Ordner" +- +-#~ msgid "Couldn't create temporary file (%s)" +-#~ msgstr "Temporäre Datei konnte nicht erzeugt werden (%s)" +- +-#~ msgid "FPGetUserInfo failed (%s)" +-#~ msgstr "FPGetUserInfo ist gescheitert (%s)" +- +-#~ msgid "Unhandled Inst proxy error (%d)" +-#~ msgstr "Unbehandelter Fehler im Inst-Proxy (%d)" +- +-#~ msgid "Unhandled SBServices proxy error (%d)" +-#~ msgstr "Unbehandelter Fehler im SBServices-Proxy (%d)" +- +-#~ msgid "Service %d on Apple Mobile Device" +-#~ msgstr "Dienst %d auf Apple-Mobilgerät" +- +-#~ msgid "ftp on %s" +-#~ msgstr "FTP auf %s" +- +-#~ msgid "Error renaming dir" +-#~ msgstr "Fehler beim Umbenennen des Ordners" +- +-#~ msgid "sftp on %s" +-#~ msgstr "SFTP auf %s" +- +-#~ msgid "Enter password" +-#~ msgstr "Passwort eingeben" +- +-#~ msgid "- output files at " +-#~ msgstr "- Dateien nach schreiben" +- +-#~ msgid "Invalid return value from get_info" +-#~ msgstr "Ungültiger Rückgabewert von get_info" +- +-#~ msgid "Invalid return value from query_info" +-#~ msgstr "Ungültiger Rückgabewert von query_info" +- +-#~ msgid "Invalid return value from call" +-#~ msgstr "Ungültiger Rückgabewert von call" +- +-#~ msgid "Invalid return value from get_filesystem_info" +-#~ msgstr "Ungültiger Rückgabewert von get_filesystem_info" +- +-#~ msgid "Invalid return value from query_filesystem_info" +-#~ msgstr "Ungültiger Rückgabewert von query_filesystem_info" +- +-#~ msgid "Invalid return value from monitor_dir" +-#~ msgstr "Ungültiger Rückgabewert von monitor_dir" +- +-#~ msgid "Invalid return value from monitor_file" +-#~ msgstr "Ungültiger Rückgabewert von monitor_file" +- +-#~ msgid "Invalid return value from open_icon_for_read" +-#~ msgstr "Ungültiger Rückgabewert von open_icon_for_read" +- +-#~ msgid "broken transmission" +-#~ msgstr "beschädigte Übertragung" +- +-#~ msgid "Could not connect to host" +-#~ msgstr "Keine Verbindung zum Zielrechner möglich" +- +-#~ msgid "filename too long" +-#~ msgstr "Dateiname ist zu lang" +- +-#~ msgid "Invalid destination filename" +-#~ msgstr "Ungültiger Zieldateiname" +- +-#~ msgid "The query info operation is not supported" +-#~ msgstr "Das Abfragen von Informationen wird nicht unterstützt" +- +-#~ msgid "Query info not supported on stream" +-#~ msgstr "Das Abfragen von Informationen im Datenstrom wird nicht unterstützt" +- +-#~ msgid "dns-sd" +-#~ msgstr "dns-sd" +- +-#~ msgid "%s (in trash)" +-#~ msgstr "%s (im Müll)" +- +-#~ msgid "Trash directory notification not supported" +-#~ msgstr "Benachrichtigung des Müllordners wird nicht unterstützt" +- +-#~ msgid "%.1f kB Media" +-#~ msgstr "%.1fKB-Medium" +- +-#~ msgid "%.1f MB Media" +-#~ msgstr "%.1fMB-Medium" +- +-#~ msgid "%.1f GB Media" +-#~ msgstr "%.1fGB-Medium" +diff -urN gvfs-1.22.4/po/es.po gvfs-1.22.4_localized/po/es.po +--- gvfs-1.22.4/po/es.po 2016-03-14 19:19:32.751126952 +0530 ++++ gvfs-1.22.4_localized/po/es.po 2016-03-14 19:47:32.598899638 +0530 +@@ -1,67 +1,72 @@ +-# translation of gvfs.master.po to Español +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# +-# Jorge González , 2008, 2009, 2010, 2011, 2012. +-# +-# Daniel Mustieles , 2011. , 2012, 2013, 2014. +-# ++# translation of gvfs.master.po to Español ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Jorge González , 2008, 2009, 2010, 2011, 2012. ++# ++# Daniel Mustieles , 2011, 2012, 2013, 2014. ++# gguerrer , 2016. #zanata ++# pnemade , 2016. #zanata + 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: 2014-10-13 11:08+0000\n" +-"PO-Revision-Date: 2014-10-15 18:25+0200\n" +-"Last-Translator: Daniel Mustieles \n" +-"Language-Team: Español; Castellano \n" +-"Language: \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Gtranslator 2.91.6\n" ++"PO-Revision-Date: 2016-03-09 06:11+0000\n" ++"Last-Translator: gguerrer \n" ++"Language-Team: Español; Castellano \n" ++"Language: es\n" ++"X-Generator: Zanata 3.8.2\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "" + "La operación no está soportada, los archivos están en diferentes puntos de " + "montaje" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "No se pudo obtener el descriptor del archivo de flujo" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "No se obtuvo un descriptor del archivo de flujo" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "%s devolvió un valor no válido" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "No se pudo encontrar el punto de montaje adjunto" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "Nombre de archivo no válido %s" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "Error al establecer los metadatos del archivo: %s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "No se puede encontrar el árbol de metadatos" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "los valores deben ser cadenas o listas de cadenas" + +@@ -76,7 +81,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -90,10 +95,10 @@ + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" +-msgstr "Se canceló la operación" ++msgstr "Operación cancelada" + + #: ../client/gdaemonfileinputstream.c:537 + #: ../client/gdaemonfileinputstream.c:545 +@@ -110,8 +115,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2156 +-#: ../daemon/gvfsbackendmtp.c:2540 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "Final de flujo" + +@@ -124,7 +129,7 @@ + msgid "Truncate not supported on stream" + msgstr "No se permite truncar en el flujo" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "Error al obtener la información de montaje: %s" +@@ -147,7 +152,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -158,7 +163,7 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1126 + #, c-format + msgid "" +@@ -172,7 +177,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -244,7 +249,7 @@ + msgstr "Se obtuvo EOS" + + #: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "El servidor cerró la conexión" + +@@ -272,9 +277,11 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "" + "No se pudo conectar al servidor «%s». Ocurrió un problema en la comunicación." ++"" + + #: ../daemon/gvfsafpserver.c:623 + #, c-format +@@ -376,12 +383,12 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "Permiso denegado" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 + #: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 + #: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 +@@ -419,7 +426,8 @@ + + #: ../daemon/gvfsafpvolume.c:684 + msgid "Target object is marked as not deletable (DeleteInhibit)" +-msgstr "El objeto de destino está marcado como no eliminable («DeleteInhibit»)" ++msgstr "" ++"El objeto de destino está marcado como no eliminable («DeleteInhibit»)" + + #: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237 + #: ../daemon/gvfsafpvolume.c:2139 +@@ -445,8 +453,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1819 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "El archivo destino ya existe" +@@ -522,9 +530,9 @@ + msgid "Range lock conflict exists" + msgstr "Existe un conflicto de bloqueo de rango" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2282 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "La carpeta no existe" + +@@ -549,9 +557,9 @@ + msgstr "Error de control de archivos interno de Apple" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1887 ../daemon/gvfsbackendmtp.c:1934 +-#: ../daemon/gvfsbackendmtp.c:2003 ../daemon/gvfsbackendmtp.c:2359 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "El archivo no existe" + +@@ -614,17 +622,17 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "Error no manejable de libimobiledevice (%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "Intentarlo de nuevo" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "Cancelar" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 + #: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 +@@ -632,22 +640,22 @@ + msgid "Invalid mount spec" + msgstr "Especificación de montaje no válida" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "" + "Ubicación AFC no válida: debe ser de la forma afc://uuid:número-de-puerto" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Dispositivo móvil de Apple" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Dispositivo móvil de Apple, desbloqueado" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Documentos en el dispositivo móvil de Apple" +@@ -655,7 +663,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s («jailbreak»)" +@@ -663,7 +671,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "Documentación sobre %s" +@@ -671,7 +679,7 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " +@@ -680,29 +688,29 @@ + "El dispositivo «%s» está bloqueado. Introduzca la contraseña en el " + "dispositivo y pulse «Intentarlo de nuevo»." + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2025 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "No se puede abrir la carpeta" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "Aún no se soportan los respaldos." + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "Tipo de búsqueda no soportado" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1778 +-#: ../daemon/gvfsbackendmtp.c:1990 ../daemon/gvfsbackendmtp.c:2256 +-#: ../daemon/gvfsbackendmtp.c:2346 ../daemon/gvfsbackendmtp.c:2416 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 + #: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 +-#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "La operación no está soportada" + +@@ -719,7 +727,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -751,9 +759,9 @@ + msgstr "No se puede copiar una carpeta sobre otra carpeta" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1801 +-#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "No se puede copiar recursivamente una carpeta" + +@@ -869,7 +877,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "El backend no soporta la operación" + +@@ -893,22 +901,21 @@ + msgid "Not supported" + msgstr "No soportado" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "Desmontar de todas formas" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." + msgstr "" + "El volumen está ocupado\n" + "Una o más aplicaciones mantienen el volumen ocupado." + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "No se puede crear el cliente gudev" + +@@ -1199,7 +1206,7 @@ + msgid "Audio Player" + msgstr "Reproductor de sonido" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "No se especificó el dispositivo" + +@@ -1254,7 +1261,7 @@ + msgid "Error getting data from file" + msgstr "Error al obtener datos del archivo" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2117 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "Identificador de icono «%s» mal formado" +@@ -1336,7 +1343,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "" + "No soportado (el origen es una carpeta, el destino también es una carpeta)" + +@@ -1351,7 +1359,8 @@ + #: ../daemon/gvfsbackendgphoto2.c:3429 + msgid "" + "Not supported (the source is a file, but the destination is a directory)" +-msgstr "No soportado (el origen es un archivo, pero el destino es una carpeta)" ++msgstr "" ++"No soportado (el origen es un archivo, pero el destino es una carpeta)" + + #: ../daemon/gvfsbackendhttp.c:198 + #, c-format +@@ -1362,85 +1371,85 @@ + msgid "Directory notification not supported" + msgstr "No se soporta la notificación de carpetas" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "Elementos desconocido." + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "Error de libmtp: %s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "Formato de URI del equipo inesperado." + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "URI del equipo mal formado." + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "No se pudo encontrar un dispositivo de udev que coincida" + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "No se encontraron dispositivos MTP" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "No se pudo conectar al dispositivo MTP" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "No se pudo reservar memoria al detectar dispositivos MTP" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "Error de libmtp genérico" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "No se pudo abrir el dispositivo MTP «%s»" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "Dispositivo no encontrado" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "Dispositivo sin nombre" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "No se encontró el archivo" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "No se puede crear una carpeta en esta ubicación" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1892 +-#: ../daemon/gvfsbackendmtp.c:1939 ../daemon/gvfsbackendmtp.c:2008 +-#: ../daemon/gvfsbackendmtp.c:2364 ../daemon/gvfsbackendmtp.c:2432 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "No es un archivo regular" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1791 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "El destino es una carpeta" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1796 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "No se pueden mezclar carpetas" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2274 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "No se puede escribir en esta ubicación" + +-#: ../daemon/gvfsbackendmtp.c:2099 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "No hay miniatura para la entidad «%s»" +@@ -1735,7 +1744,7 @@ + msgstr "Final de flujo inesperado" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "Se recibió una respuesta no válida" + +@@ -1743,7 +1752,8 @@ + msgid "" + "Failed to create active FTP connection. Maybe your router does not support " + "this?" +-msgstr "Falló al crear la conexión FTP activa. ¿Quizá su router no lo soporta?" ++msgstr "" ++"Falló al crear la conexión FTP activa. ¿Quizá su router no lo soporta?" + + #: ../daemon/gvfsftpconnection.c:399 + msgid "Failed to create active FTP connection." +@@ -1757,37 +1767,41 @@ + msgid "The FTP server is busy. Try again later" + msgstr "El servidor FTP está ocupado. Inténtelo de nuevo más tarde." + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "Backend desmontándose actualmente " ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "Las cuentas no están soportadas" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "" + "No se puede abrir la conexión de datos. ¿Quizá su cortafuegos lo esté " + "impidiendo?" + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "Se cerró la conexión de datos" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "Falló la operación" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "No queda espacio libre en el servidor" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "Protocolo de red no soportado" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "Tipo de página desconocido" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "Nombre de archivo no válido" + +@@ -1806,53 +1820,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"Desmontando %s\n" ++msgstr "Desmontando %s\n" + "Espere" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "El sistema de archivos está ocupado" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "Reemplace el demonio antiguo." + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "No iniciar fuse." + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "Mostrar la versión del programa." + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "Demonio GVFS" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "Demonio principal para GVFS" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1904,11 +1916,11 @@ + msgid "Unable to move metadata keys" + msgstr "No se pueden mover las claves de metadatos" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "Demonio de metadatos de GVFS" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "Demonio de metadatos para GVFS" + +@@ -1996,17 +2008,17 @@ + "Introducir una contraseña para desbloquear el volumen\n" + "El dispositivo %s contiene datos cifrados." + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "Falló al obtener org.gnome.OnlineAccounts.Files para %s" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "Credenciales no válidas para %s" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "Método de autenticación no soportado para %s" +@@ -2332,7 +2344,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Expulsar de todas formas" +@@ -2344,11 +2356,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"Escribiendo datos en %s\n" ++msgstr "Escribiendo datos en %s\n" + "No lo desconecte hasta que termine" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2358,7 +2368,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2366,7 +2376,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2382,27 +2392,27 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "Error al guardar la contraseña en el depósito de claves (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "Error al eliminar la contraseña no válida del depósito de claves (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "" + "El dispositivo desbloqueado no contiene un sistema de archivos reconocible" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "Contraseña de cifrado para %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "Se requiere una contraseña para acceder al volumen" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2414,8 +2424,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2429,7 +2439,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2464,7 +2474,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:error al cerrar: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "ARCHIVO" +@@ -2498,7 +2508,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2508,7 +2518,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: faltan ubicaciones" +@@ -2942,7 +2952,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2952,7 +2962,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: error al abrir la ubicación: %s\n" +@@ -3094,269 +3104,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "Listar los contenidos de las carpeta en una vista de árbol." +- +-#~ msgid "progress" +-#~ msgstr "progreso" +- +-#~ msgid "No storage volumes found" +-#~ msgstr "No se encontraron volúmenes de almacenamiento" +- +-#~ msgid "Cannot delete this entity" +-#~ msgstr "No se puede eliminar esta entidad" +- +-#~ msgid "" +-#~ "Unable to connect to the server '%s'. A communication problem occurred." +-#~ msgstr "" +-#~ "No se pudo conectar al servidor «%s». Ocurrió un problema en la " +-#~ "comunicación." +- +-#~ msgid "AFP volumes for %s on %s" +-#~ msgstr "Volúmenes AFP para %s en %s" +- +-#~ msgid "AFP volumes on %s" +-#~ msgstr "Volúmenes AFP en %s" +- +-#~ msgid "AFP volume %s for %s on %s" +-#~ msgstr "El volumen AFP %s para %s en %s" +- +-#~ msgid "AFP volume %s on %s" +-#~ msgstr "El volumen %s en %s" +- +-#~ msgid "WebDAV as %s on %s%s" +-#~ msgstr "WebDAV como %s en %s%s" +- +-#~ msgid "WebDAV on %s%s" +-#~ msgstr "WebDAV en %s%s" +- +-#~ msgid "Enter password for FTP as %s on %s" +-#~ msgstr "Introducir la contraseña para el FTP como %s en %s" +- +-#~ msgid "Enter password for FTP on %s" +-#~ msgstr "Introducir la contraseña para el FTP en %s" +- +-#~ msgid "FTP on %s" +-#~ msgstr "FTP en %s" +- +-#~ msgid "FTP as %s on %s" +-#~ msgstr "FTP como %s en %s" +- +-#~ msgid "Enter passphrase for key for ssh as %s on %s" +-#~ msgstr "Introducir la contraseña para el SSH %s en %s" +- +-#~ msgid "Enter password for ssh as %s on %s" +-#~ msgstr "Introducir la contraseña para el SSH %s en %s" +- +-#~ msgid "SFTP on %s" +-#~ msgstr "SFTP en %s" +- +-#~ msgid "Invalid icon_id '%s' in OpenIconForRead" +-#~ msgstr "Identificador de icono «%s» no válido en OpenIconForRead" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "El servidor AFP %s rechazó la contraseña enviada" +- +-#~ msgid "Received invalid reply from server" +-#~ msgstr "Se recibió una respuesta no válida del servidor" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "Introducir la contraseña para AFP como %s en %s" +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "Introducir la contraseña para AFP en %s" +- +-#~ msgid "Failed to logout from server" +-#~ msgstr "Falló al desconectarse del servidor" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "Error al crear el socket: %s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "Error al conectar con el socket: %s" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "No se puede conectar con el bus del sistema" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "Error al conectar con el demonio: %s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "El contenido de la lista de información del atributo no es válido" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "Error al conectar con D-Bus: %s" +- +-#~ msgid "Invalid backend type" +-#~ msgstr "Tipo de backend no válido" +- +-#~ msgid "Error sending file descriptor: %s" +-#~ msgstr "Error al enviar el descriptor de archivo: %s" +- +-#~ msgid "Invalid arguments from spawned child" +-#~ msgstr "Argumentos no válidos para el hijo lanzado" +- +-#~ msgid "locations" +-#~ msgstr "ubicaciones" +- +-#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST" +-#~ msgstr "ORIGEN... DESTINO: copiar archivo(s) de ORIGEN a DESTINO" +- +-#~ msgid "- list files at " +-#~ msgstr "- listar los archivos en " +- +-#~ msgid "- get/set handler for " +-#~ msgstr "- obtener/establecer el gestor para " +- +-#~ msgid "files" +-#~ msgstr "archivos" +- +-#~ msgid "%s: %s: error launching application: %s\n" +-#~ msgstr "%s: %s: error al lanzar la aplicación: %s\n" +- +-#~ msgid "FILES... - open FILES with registered application." +-#~ msgstr "ARCHIVOS… - abre ARCHIVOS con la aplicación registrada." +- +-#~ msgid "- delete files" +-#~ msgstr "- borrar achivos" +- +-#~ msgid "Create backup" +-#~ msgstr "Crear respaldo" +- +-#~ msgid "" +-#~ "attribute type [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +-#~ msgstr "" +-#~ "tipo de atributo [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +- +-#~ msgid " - set attribute" +-#~ msgstr " - establecer atributo" +- +-#~ msgid "- move files to trash" +-#~ msgstr "- mover archivos a la papelera" +- +-#~ msgid "Server doesn't support passwords longer than 256 characters" +-#~ msgstr "El servidor no soporta contraseñas más largas de 256 caracteres" +- +-#~ msgid "Login to AFP server %s failed" +-#~ msgstr "Falló el inicio de sesión en el servidor AFP %s" +- +-#~ msgid "Anonymous login to AFP server %s failed, got error code: %d" +-#~ msgstr "" +-#~ "Falló el inicio de sesión anónimo en el servidor AFP %s, se obtuvo el " +-#~ "código de error: %d" +- +-#~ msgid "AFP shares for %s on %s" +-#~ msgstr "Comparticiones AFP para %s en %s" +- +-#~ msgid "AFP shares on %s" +-#~ msgstr "Comparticiones AFP en %s" +- +-#~ msgid "File is a directory" +-#~ msgstr "El archivo es una carpeta" +- +-#~ msgid "Couldn't create temporary file (%s)" +-#~ msgstr "No se pudo crear el archivo temporal (%s)" +- +-#~ msgid "FPGetUserInfo failed (%s)" +-#~ msgstr "Falló FPGetUserInfo (%s)" +- +-#~ msgid "Error renaming dir" +-#~ msgstr "Error al renombrar el directorio" +- +-#~ msgid "ftp on %s" +-#~ msgstr "ftp en %s" +- +-#~ msgid "sftp on %s" +-#~ msgstr "sftp en %s" +- +-#~ msgid "Unhandled Inst proxy error (%d)" +-#~ msgstr "Error no manejable de la instancia del proxy (%d)" +- +-#~ msgid "Unhandled SBServices proxy error (%d)" +-#~ msgstr "Error no manejable de SBServices del proxy (%d)" +- +-#~ msgid "Service %d on Apple Mobile Device" +-#~ msgstr "Servicio %d en el dispositivo móvil de Apple" +- +-#~ msgid "Enter password" +-#~ msgstr "Introduzca la contraseña" +- +-#~ msgid "- output files at " +-#~ msgstr "- mover los archivos a " +- +-#~ msgid "Invalid return value from get_info" +-#~ msgstr "get_info devolvió un valor no válido" +- +-#~ msgid "Invalid return value from query_info" +-#~ msgstr "query_info devolvió un valor no válido" +- +-#~ msgid "Invalid return value from call" +-#~ msgstr "call devolvió un valor no válido" +- +-#~ msgid "Invalid return value from get_filesystem_info" +-#~ msgstr "get_filesystem_info devolvió un valor no válido" +- +-#~ msgid "Invalid return value from query_filesystem_info" +-#~ msgstr "query_filesystem_info devolvió un valor no válido" +- +-#~ msgid "Invalid return value from monitor_dir" +-#~ msgstr "El valor devuelto por monitor_dir no es válido" +- +-#~ msgid "Invalid return value from monitor_file" +-#~ msgstr "El valor devuelto por monitor_file no es válido" +- +-#~ msgid "Invalid return value from open_icon_for_read" +-#~ msgstr "open_icon_for_read devolvió un valor no válido" +- +-#~ msgid "broken transmission" +-#~ msgstr "transmisión rota" +- +-#~ msgid "Could not connect to host" +-#~ msgstr "No se pudo conectar con el equipo" +- +-#~ msgid "Out of memory while reading directory contents" +-#~ msgstr "Sin memoria al leer el contenido del directorio" +- +-#~ msgid "Invalid destination filename" +-#~ msgstr "Nombre de archivo de destino no válido" +- +-#~ msgid "The query info operation is not supported" +-#~ msgstr "La operación de consulta de información no está soportada" +- +-#~ msgid "Query info not supported on stream" +-#~ msgstr "No se soporta consulta de información en flujo" +- +-#~ msgid "filename too long" +-#~ msgstr "el nombre de archivo es demasiado largo" +- +-#~ msgid "Can't pull trash" +-#~ msgstr "No se puede vaciar la papelera" +- +-#~ msgid "dns-sd" +-#~ msgstr "dns-sd" +- +-#~ msgid "%s (in trash)" +-#~ msgstr "%s (en la papelera)" +- +-#~ msgid "Trash directory notification not supported" +-#~ msgstr "No se soporta la notificación de la papelera" +- +-#~ msgid "Error listing folders to figure out ignore prefix" +-#~ msgstr "Error al listar las carpetas para averiguar el prefijo de ignorado" +- +-#~ msgid "Error creating port info list" +-#~ msgstr "Error al crear la lista del puerto de información" +- +-#~ msgid "Error getting port info from port info list" +-#~ msgstr "" +-#~ "Error al obtener el puerto de información desde la lista del puerto de " +-#~ "información" +- +-#~ msgid "File system is busy: %d open files" +-#~ msgstr "El sistema de archivos está ocupado: %d archivos abiertos" +- +-#~ msgid "Error listing folders" +-#~ msgstr "Error al listar las carpetas" +- +-#~ msgid "Error listing files in folder" +-#~ msgstr "Error al listar los archivos en la carpeta" +diff -urN gvfs-1.22.4/po/fr.po gvfs-1.22.4_localized/po/fr.po +--- gvfs-1.22.4/po/fr.po 2015-03-16 15:35:21.000000000 +0530 ++++ gvfs-1.22.4_localized/po/fr.po 2016-03-14 19:47:32.609899628 +0530 +@@ -1,69 +1,75 @@ + # French translation of gvfs. + # Copyright (C) 2008-2014 Free Software Foundation, Inc. + # This file is distributed under the same license as the gvfs package. +-# ++# + # Claude Paroz , 2008-2014. + # Robert-André Mauchin , 2008. + # Stéphane Raimbault , 2008-2010. + # Bruno Brouard , 2009-2010. + # Alexandre Franke , 2011. + # Alain Lojewski , 2012 +-# ++# Sam Friedmann , 2016. #zanata ++# pnemade , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: gvfs HEAD\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=gvfs&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2014-08-30 09:20+0000\n" +-"PO-Revision-Date: 2014-08-30 11:47+0200\n" +-"Last-Translator: Claude Paroz \n" +-"Language-Team: GNOME French Team \n" +-"Language: fr\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2016-03-07 12:24+0000\n" ++"Last-Translator: Sam Friedmann \n" ++"Language-Team: GNOME French Team \n" ++"Language: fr\n" + "Plural-Forms: nplurals=2; plural=n>1;\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "" + "L'opération n'est pas prise en charge, les fichiers étant sur différents " + "points de montage" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "Impossible d'obtenir le descripteur de fichier du flux" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "Le descripteur de fichier de flux n'a pas été obtenu" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "Valeur de retour de « %s » non valide" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "Impossible de trouver le point de montage hôte" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "Nom de fichier %s non valide" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "Erreur lors de la définition des métadonnées du fichier : %s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "Impossible d'ouvrir l'arborescence des métadonnées" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "" + "les valeurs doivent être une chaîne de caractères ou une liste de chaînes de " +@@ -80,7 +86,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -89,12 +95,12 @@ + #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094 + #: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266 + #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 +-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332 ++#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:343 + #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "L'opération a été annulée" +@@ -114,8 +120,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2144 +-#: ../daemon/gvfsbackendmtp.c:2528 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "Fin de flux" + +@@ -128,10 +134,11 @@ + msgid "Truncate not supported on stream" + msgstr "La troncature n'est pas prise en charge pour ce flux" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" +-msgstr "Erreur lors de l'obtention d'informations sur le point de montage : %s" ++msgstr "" ++"Erreur lors de l'obtention d'informations sur le point de montage : %s" + + #: ../common/gvfsdaemonprotocol.c:358 + msgid "Invalid file info format" +@@ -151,7 +158,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -162,7 +169,7 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1126 + #, c-format + msgid "" +@@ -176,7 +183,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -237,24 +244,24 @@ + msgid "error starting mount daemon" + msgstr "erreur lors du démarrage du démon de montage" + +-#: ../daemon/gvfsafpconnection.c:766 ++#: ../daemon/gvfsafpconnection.c:784 + msgid "The connection is not opened" + msgstr "La connexion n'est pas ouverte" + +-#: ../daemon/gvfsafpconnection.c:773 ../daemon/gvfsbackendmtp.c:378 ++#: ../daemon/gvfsafpconnection.c:791 ../daemon/gvfsbackendmtp.c:378 + msgid "The connection is closed" + msgstr "La connexion est fermée" + +-#: ../daemon/gvfsafpconnection.c:886 ../daemon/gvfsafpconnection.c:1592 ++#: ../daemon/gvfsafpconnection.c:904 ../daemon/gvfsafpconnection.c:1610 + msgid "Got EOS" + msgstr "EOS (fin de flux) obtenu" + +-#: ../daemon/gvfsafpconnection.c:1061 ../daemon/gvfsafpconnection.c:1102 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "L'hôte a fermé la connexion" + +-#: ../daemon/gvfsafpconnection.c:1565 ++#: ../daemon/gvfsafpconnection.c:1583 + msgid "Connection unexpectedly went down" + msgstr "La connexion a été interrompue de manière inattendue" + +@@ -281,7 +288,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "" + "Impossible de se connecter au serveur « %s ». Un problème de communication " + "est survenu." +@@ -388,16 +396,16 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "Accès refusé" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 +-#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:709 +-#: ../daemon/gvfsbackendarchive.c:759 ../daemon/gvfsbackendarchive.c:811 +-#: ../daemon/gvfsbackendarchive.c:840 ../daemon/gvfsbackendcdda.c:1022 ++#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 ++#: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 ++#: ../daemon/gvfsbackendarchive.c:867 ../daemon/gvfsbackendcdda.c:1022 + #: ../daemon/gvfsbackendcomputer.c:639 ../daemon/gvfsbackenddnssd.c:415 + #: ../daemon/gvfsbackendftp.c:1073 ../daemon/gvfsbackendnetwork.c:696 + #: ../daemon/gvfsbackendsmbbrowse.c:1146 ../daemon/gvfsbackendsmbbrowse.c:1213 +@@ -457,8 +465,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "Le fichier cible existe déjà" +@@ -533,9 +541,9 @@ + msgid "Range lock conflict exists" + msgstr "Il y a des conflits de verrouillage d'intervalles" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2270 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "Le répertoire n'existe pas" + +@@ -560,9 +568,9 @@ + msgstr "Erreur interne Apple File Control" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1875 ../daemon/gvfsbackendmtp.c:1922 +-#: ../daemon/gvfsbackendmtp.c:1991 ../daemon/gvfsbackendmtp.c:2347 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "Le fichier n'existe pas" + +@@ -625,41 +633,41 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "Erreur libimobiledevice non gérée (%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "Essayer à nouveau" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "Annuler" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:611 +-#: ../daemon/gvfsbackendarchive.c:640 ../daemon/gvfsbackenddav.c:1826 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 + #: ../daemon/gvfsbackendsmb.c:712 + msgid "Invalid mount spec" + msgstr "Spécification de montage non valide" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "" + "Emplacement AFC non valide : il doit être sous la forme afc://uuid:numéro-" + "port" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Périphérique Apple mobile" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Périphérique Apple mobile, débridé" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Documents sur un périphérique Apple mobile" +@@ -667,7 +675,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (débridé)" +@@ -675,7 +683,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "Documents sur %s" +@@ -683,7 +691,7 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " +@@ -692,29 +700,29 @@ + "Le périphérique « %s » est verrouillé. Saisissez le mot de passe sur le " + "périphérique, puis cliquez sur « Essayer à nouveau »." + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:717 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2013 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "Impossible d'ouvrir le répertoire" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "Les sauvegardes ne sont pas prises en charge pour le moment." + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "Type de positionnement non valide" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1978 +-#: ../daemon/gvfsbackendmtp.c:2244 ../daemon/gvfsbackendmtp.c:2334 +-#: ../daemon/gvfsbackendmtp.c:2404 ../daemon/gvfsbackendsftp.c:1865 +-#: ../daemon/gvfsbackendsftp.c:4859 ../daemon/gvfsbackendsmb.c:1861 +-#: ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 ++#: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "Opération non prise en charge" + +@@ -731,7 +739,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -748,7 +756,7 @@ + msgstr "%s" + + #: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2148 +-#: ../daemon/gvfsbackendarchive.c:600 ../daemon/gvfsbackendftp.c:673 ++#: ../daemon/gvfsbackendarchive.c:624 ../daemon/gvfsbackendftp.c:673 + #: ../daemon/gvfsbackendsftp.c:1778 + msgid "No hostname specified" + msgstr "Aucun nom d'hôte indiqué" +@@ -763,9 +771,9 @@ + msgstr "Impossible d'écraser un répertoire avec un autre répertoire" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1789 +-#: ../daemon/gvfsbackendmtp.c:1813 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "Impossible de copier récursivement un répertoire" + +@@ -806,13 +814,13 @@ + #. 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 " +-#: ../daemon/gvfsbackendarchive.c:335 ../daemon/gvfsbackendsftp.c:2315 ++#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2315 + #: ../daemon/gvfsftpdircache.c:431 + #, c-format + msgid "/ on %s" + msgstr "/ sur %s" + +-#: ../daemon/gvfsbackendarchive.c:849 ../daemon/gvfsbackendburn.c:679 ++#: ../daemon/gvfsbackendarchive.c:876 ../daemon/gvfsbackendburn.c:679 + #: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464 + #: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendnetwork.c:744 + #: ../daemon/gvfsbackendsftp.c:4003 ../daemon/gvfsftpdircache.c:157 +@@ -881,7 +889,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "Opération non prise en charge par le moteur" + +@@ -905,22 +913,21 @@ + msgid "Not supported" + msgstr "Non pris en charge" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "Démonter tout de même" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." + msgstr "" + "Le volume est occupé\n" + "Une ou plusieurs applications utilisent actuellement le volume." + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "Impossible de créer un client gudev" + +@@ -1211,7 +1218,7 @@ + msgid "Audio Player" + msgstr "Lecteur audio" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "Aucun périphérique indiqué" + +@@ -1267,7 +1274,7 @@ + msgid "Error getting data from file" + msgstr "Erreur lors de l'obtention des données du fichier" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2105 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "Identificateur d'icône « %s » malformé" +@@ -1349,8 +1356,10 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" +-msgstr "Non pris en charge (la source est un répertoire, la destination aussi)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" ++msgstr "" ++"Non pris en charge (la source est un répertoire, la destination aussi)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 + msgid "" +@@ -1376,86 +1385,86 @@ + msgid "Directory notification not supported" + msgstr "Les notifications de répertoires ne sont pas prises en charge" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "Erreur inconnue." + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "Erreur libmtp : %s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "Format de l'URI d'hôte inattendu." + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "URI d'hôte mal formé." + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "Impossible de trouver un périphérique udev correspondant." + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "Aucun périphérique MTP trouvé" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "Impossible de se connecter au périphérique MTP" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "" + "Impossible d'allouer de la mémoire lors de la détection de périphériques MTP" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "Erreur libmtp générique" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "Impossible d'ouvrir le périphérique MTP « %s »" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "Périphérique introuvable" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "Périphérique sans nom" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "Fichier introuvable" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "Impossible de créer un répertoire à cet emplacement" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1880 +-#: ../daemon/gvfsbackendmtp.c:1927 ../daemon/gvfsbackendmtp.c:1996 +-#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2420 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "Ce n'est pas un fichier standard" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1779 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "La cible est un répertoire" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "Impossible de fusionner des répertoires" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "Impossible d'écrire à cet emplacement" + +-#: ../daemon/gvfsbackendmtp.c:2087 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "Pas de vignette pour l'entité « %s »" +@@ -1597,6 +1606,7 @@ + msgstr "La connexion est fermée (le processus SSH sous-jacent est clos)" + + #: ../daemon/gvfsbackendsftp.c:1175 ++#, c-format + msgid "Internal error: Unknown Error" + msgstr "Erreur interne : erreur inconnue" + +@@ -1745,12 +1755,16 @@ + msgid "Trash" + msgstr "Corbeille" + ++#: ../daemon/gvfschannel.c:332 ++msgid "Channel blocked" ++msgstr "Canal bloqué" ++ + #: ../daemon/gvfsftpconnection.c:180 + msgid "Unexpected end of stream" + msgstr "Fin de flux inattendu" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "Réponse non valide" + +@@ -1774,37 +1788,41 @@ + msgid "The FTP server is busy. Try again later" + msgstr "Le serveur FTP est occupé. Essayez de nouveau plus tard" + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "Le moteur est en cours de démontage" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "Les comptes ne sont pris en charge" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "" + "Impossible d'ouvrir une connexion de données. Peut-être que votre pare-feu " + "empêche cette action ?" + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "Connexion de données fermée" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "L'opération a échoué" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "Plus d'espace disponible sur le serveur" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "Protocole réseau non pris en charge" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "Type de page inconnu" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "Nom de fichier non valide" + +@@ -1823,53 +1841,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"Démontage de %s\n" ++msgstr "Démontage de %s\n" + "Veuillez patienter" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "Le système de fichiers est occupé" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "Remplace l'ancien démon." + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "Ne démarre pas « fuse »." + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "Affiche la version du programme." + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "Démon GVFS" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "Démon principal pour GVFS" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s : %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1921,11 +1937,11 @@ + msgid "Unable to move metadata keys" + msgstr "Impossible de déplacer les clés de métadonnées" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "Démon de métadonnées GVFS" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "Démon de métadonnées pour GVFS" + +@@ -2014,17 +2030,17 @@ + "Saisissez un mot de passe pour déverrouiller le volume\n" + "Le périphérique « %s » contient des données chiffrées." + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "Impossible d'obtenir org.gnome.OnlineAccounts.Files pour %s" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "Informations d'authentification non valides pour %s" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "Méthode d'authentification non prise en charge pour %s" +@@ -2353,7 +2369,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Éjecter tout de même" +@@ -2365,8 +2381,7 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" + msgstr "" + "Écriture de données sur %s\n" +@@ -2379,7 +2394,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2387,7 +2402,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2404,29 +2419,29 @@ + msgstr "" + "Erreur lors du stockage de la phrase de passe dans le trousseau de clés (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "" + "Erreur lors de la suppression de la phrase de passe non valide du trousseau " + "de clés (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "" + "Le périphérique déverrouillé ne possède pas de système de fichiers valide" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "Phrase de passe de chiffrement pour %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "Une phrase de passe est requise pour accéder au volume" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2438,8 +2453,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2453,7 +2468,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2488,7 +2503,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s : %s : erreur de fermeture : %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "FICHIER" +@@ -2523,7 +2538,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2533,7 +2548,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s : emplacements manquants" +@@ -2971,7 +2986,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2981,7 +2996,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s : %s : erreur d'ouverture d'un emplacement : %s\n" +@@ -3099,7 +3114,7 @@ + msgid "Invalid attribute type %s\n" + msgstr "Type d'attribut %s non valide\n" + +-#: ../programs/gvfs-set-attribute.c:235 ++#: ../programs/gvfs-set-attribute.c:238 + #, c-format + msgid "Error setting attribute: %s\n" + msgstr "Erreur lors du paramétrage de l'attribut : %s\n" +diff -urN gvfs-1.22.4/po/it.po gvfs-1.22.4_localized/po/it.po +--- gvfs-1.22.4/po/it.po 2015-03-16 15:36:43.000000000 +0530 ++++ gvfs-1.22.4_localized/po/it.po 2016-03-14 19:47:32.620899618 +0530 +@@ -1,45 +1,46 @@ + # Italian translation for gvfs. + # Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. + # This file is distributed under the same license as the gvfs package. +-# +-# ++# ++# + # Da glib/gio + # * seek --> posizionamento + # * stream --> lasciato come tale, cfr + # http://library.gnome.org/devel/gio/stable/streaming.html +-# ++# + # Nota: diversi messaggi di errore finiscono con "[...]: %s" In genere il %s + # è sostituito con qualcosa che comincia con la maiuscola. Dove ho + # controllato il codice ho messo il punto. + # Milo Casagrande , 2013, 2014, 2015. + # Luca Ferretti , 2007, 2008, 2009, 2010, 2011, 2012, 2014. +-# ++# pnemade , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: gvfs\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&keywords=I18N" +-"+L10N&component=general\n" +-"POT-Creation-Date: 2015-03-12 22:31+0000\n" +-"PO-Revision-Date: 2015-03-13 09:59+0100\n" +-"Last-Translator: Milo Casagrande \n" +-"Language-Team: Italiano \n" +-"Language: it\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2015-03-13 08:59+0000\n" ++"Last-Translator: Milo Casagrande \n" ++"Language-Team: Italiano \n" ++"Language: it\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Poedit 1.7.5\n" ++"X-Generator: Zanata 3.8.2\n" + + #: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "Operazione non supportata, file su mount differenti" + +-#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 ../client/gvfsiconloadable.c:301 +-#: ../daemon/gvfsjobopenforread.c:183 ../daemon/gvfsjobopenforwrite.c:326 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 ++#: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 ++#: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "Impossibile ottenere il descrittore di file dello stream" + +-#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 ../client/gvfsiconloadable.c:127 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 ++#: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "Impossibile ottenere il descrittore di file dello stream" + +@@ -61,8 +62,9 @@ + msgid "Invalid filename %s" + msgstr "Nome file «%s» non valido" + +-#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ../client/gdaemonvfs.c:1265 +-#: ../client/gdaemonvfs.c:1286 ../client/gdaemonvfs.c:1326 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "Errore nell'impostare i metadati del file: %s" +@@ -78,11 +80,16 @@ + msgstr "i valori devono essere una stringa o un elenco di stringhe" + + #: ../client/gdaemonfileenumerator.c:553 ../client/gdaemonfileenumerator.c:636 +-#: ../client/gdaemonfileenumerator.c:687 ../client/gdaemonfileinputstream.c:642 +-#: ../client/gdaemonfileinputstream.c:795 ../client/gdaemonfileinputstream.c:915 +-#: ../client/gdaemonfileinputstream.c:1166 ../client/gdaemonfileinputstream.c:1411 +-#: ../client/gdaemonfileoutputstream.c:546 ../client/gdaemonfileoutputstream.c:724 +-#: ../client/gdaemonfileoutputstream.c:919 ../client/gdaemonfileoutputstream.c:1085 ++#: ../client/gdaemonfileenumerator.c:687 ++#: ../client/gdaemonfileinputstream.c:642 ++#: ../client/gdaemonfileinputstream.c:795 ++#: ../client/gdaemonfileinputstream.c:915 ++#: ../client/gdaemonfileinputstream.c:1166 ++#: ../client/gdaemonfileinputstream.c:1411 ++#: ../client/gdaemonfileoutputstream.c:546 ++#: ../client/gdaemonfileoutputstream.c:724 ++#: ../client/gdaemonfileoutputstream.c:919 ++#: ../client/gdaemonfileoutputstream.c:1085 + #: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 +@@ -91,8 +98,9 @@ + #: ../daemon/gvfsbackendobexftp.c:1951 ../daemon/gvfsbackendobexftp.c:2009 + #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094 + #: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266 +-#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 ../daemon/gvfsbackendtest.c:187 +-#: ../daemon/gvfschannel.c:343 ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 ++#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 ++#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:343 ++#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +@@ -102,21 +110,28 @@ + msgstr "L'operazione è stata annullata" + + # molto probabile che dopo : appaia msg che comincia per maiuscola +-#: ../client/gdaemonfileinputstream.c:537 ../client/gdaemonfileinputstream.c:545 +-#: ../client/gdaemonfileinputstream.c:1705 ../client/gdaemonfileinputstream.c:1715 +-#: ../client/gdaemonfileoutputstream.c:488 ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1452 ../client/gdaemonfileoutputstream.c:1462 ++#: ../client/gdaemonfileinputstream.c:537 ++#: ../client/gdaemonfileinputstream.c:545 ++#: ../client/gdaemonfileinputstream.c:1705 ++#: ../client/gdaemonfileinputstream.c:1715 ++#: ../client/gdaemonfileoutputstream.c:488 ++#: ../client/gdaemonfileoutputstream.c:496 ++#: ../client/gdaemonfileoutputstream.c:1452 ++#: ../client/gdaemonfileoutputstream.c:1462 + #, c-format + msgid "Error in stream protocol: %s" + msgstr "Errore nel protocollo dello stream. %s" + +-#: ../client/gdaemonfileinputstream.c:545 ../client/gdaemonfileinputstream.c:1715 +-#: ../client/gdaemonfileoutputstream.c:496 ../client/gdaemonfileoutputstream.c:1462 +-#: ../daemon/gvfsbackendmtp.c:2162 ../daemon/gvfsbackendmtp.c:2546 ++#: ../client/gdaemonfileinputstream.c:545 ++#: ../client/gdaemonfileinputstream.c:1715 ++#: ../client/gdaemonfileoutputstream.c:496 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "Fine dello stream" + +-#: ../client/gdaemonfileinputstream.c:1348 ../client/gdaemonfileoutputstream.c:1028 ++#: ../client/gdaemonfileinputstream.c:1348 ++#: ../client/gdaemonfileoutputstream.c:1028 + msgid "Seek not supported on stream" + msgstr "Posizionamento non supportato sullo stream" + +@@ -152,7 +167,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -163,33 +178,34 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../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\"." ++"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT " ++"records are missing. Keys required: \"%s\"." + msgstr "" +-"Errore nel risolvere «%s» per il servizio «%s» sul dominio «%s». Uno o più record TXT risultano " +-"mancanti. Chiavi richieste: «%s»." ++"Errore nel risolvere «%s» per il servizio «%s» sul dominio «%s». Uno o più " ++"record TXT risultano mancanti. Chiavi richieste: «%s»." + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +-msgstr "Tempo scaduto nel risolvere «%s» per il servizio «%s» sul dominio «%s»" ++msgstr "" ++"Tempo scaduto nel risolvere «%s» per il servizio «%s» sul dominio «%s»" + +-#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263 ../common/gvfsdnssdutils.c:280 ++#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263 ++#: ../common/gvfsdnssdutils.c:280 + #, c-format + msgid "Malformed DNS-SD encoded_triple '%s'" + msgstr "encoded_triple DNS-SD «%s» malformata" + + # tenere in sync con glib/gio +-# + #: ../common/gvfsicon.c:250 + #, c-format + msgid "Can't handle version %d of GVfsIcon encoding" +@@ -207,8 +223,9 @@ + msgstr "Servizio file system %s" + + # molto probabile che dopo : appaia msg che comincia per maiuscola +-#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:104 ../programs/gvfs-move.c:100 +-#: ../programs/gvfs-rename.c:44 ../programs/gvfs-set-attribute.c:107 ++#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:104 ++#: ../programs/gvfs-move.c:100 ../programs/gvfs-rename.c:44 ++#: ../programs/gvfs-set-attribute.c:107 + #, c-format + msgid "Error: %s" + msgstr "Errore. %s" +@@ -274,11 +291,15 @@ + msgid "Unable to login to the server “%s” with the given password." + msgstr "Impossibile accedere al server «%s» con la password fornita." + +-#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650 ../daemon/gvfsafpserver.c:826 +-#: ../daemon/gvfsafpserver.c:874 ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 ++#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650 ++#: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 ++#: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." +-msgstr "Impossibile collegarsi al server «%s». Si è verificato un problema di comunicazione." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." ++msgstr "" ++"Impossibile collegarsi al server «%s». Si è verificato un problema di " ++"comunicazione." + + #: ../daemon/gvfsafpserver.c:623 + #, c-format +@@ -292,14 +313,21 @@ + + #: ../daemon/gvfsafpserver.c:729 + #, c-format +-msgid "Unable to connect to the server “%s”. No suitable authentication mechanism was found." +-msgstr "Accesso al server «%s» non riuscito: nessun meccanismo di autenticazione adatto." ++msgid "" ++"Unable to connect to the server “%s”. No suitable authentication mechanism " ++"was found." ++msgstr "" ++"Accesso al server «%s» non riuscito: nessun meccanismo di autenticazione " ++"adatto." + + #: ../daemon/gvfsafpserver.c:804 + #, c-format +-msgid "Unable to connect to the server “%s”. The server doesn't support AFP version 3.0 or later." ++msgid "" ++"Unable to connect to the server “%s”. The server doesn't support AFP version " ++"3.0 or later." + msgstr "" +-"Accesso al server «%s» non riuscito: il server non supporta AFP versione 3.0 o successive." ++"Accesso al server «%s» non riuscito: il server non supporta AFP versione 3.0 " ++"o successive." + + #: ../daemon/gvfsafpserver.c:915 + #, c-format +@@ -343,7 +371,9 @@ + + #: ../daemon/gvfsafpserver.c:1366 ../daemon/gvfsafpserver.c:1765 + msgid "Unable to connect to the server. A communication problem occurred." +-msgstr "Impossibile collegarsi al server: si è verificato un problema di comunicazione." ++msgstr "" ++"Impossibile collegarsi al server: si è verificato un problema di " ++"comunicazione." + + #: ../daemon/gvfsafpserver.c:1721 + msgid "Identification not found." +@@ -365,30 +395,34 @@ + msgid "Couldn't load %s on %s" + msgstr "Impossibile caricare %s su %s" + +-#: ../daemon/gvfsafpvolume.c:402 ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:825 +-#: ../daemon/gvfsafpvolume.c:1019 ../daemon/gvfsafpvolume.c:1221 ../daemon/gvfsafpvolume.c:1404 +-#: ../daemon/gvfsafpvolume.c:1561 ../daemon/gvfsafpvolume.c:2007 ../daemon/gvfsafpvolume.c:2135 +-#: ../daemon/gvfsafpvolume.c:2297 ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 +-#: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsafpvolume.c:402 ../daemon/gvfsafpvolume.c:672 ++#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019 ++#: ../daemon/gvfsafpvolume.c:1221 ../daemon/gvfsafpvolume.c:1404 ++#: ../daemon/gvfsafpvolume.c:1561 ../daemon/gvfsafpvolume.c:2007 ++#: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 ++#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 ++#: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "Permesso negato" + +-#: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 ../daemon/gvfsafpvolume.c:2521 +-#: ../daemon/gvfsbackendafc.c:1001 ../daemon/gvfsbackendafpbrowse.c:190 +-#: ../daemon/gvfsbackendafpbrowse.c:327 ../daemon/gvfsbackendafpbrowse.c:359 +-#: ../daemon/gvfsbackendarchive.c:734 ../daemon/gvfsbackendarchive.c:786 +-#: ../daemon/gvfsbackendarchive.c:838 ../daemon/gvfsbackendarchive.c:867 +-#: ../daemon/gvfsbackendcdda.c:1022 ../daemon/gvfsbackendcomputer.c:639 +-#: ../daemon/gvfsbackenddnssd.c:415 ../daemon/gvfsbackendftp.c:1073 +-#: ../daemon/gvfsbackendnetwork.c:696 ../daemon/gvfsbackendsmbbrowse.c:1146 +-#: ../daemon/gvfsbackendsmbbrowse.c:1213 ../daemon/gvfsbackendsmbbrowse.c:1400 +-#: ../daemon/gvfsbackendsmbbrowse.c:1473 ++#: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 ++#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 ++#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 ++#: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 ++#: ../daemon/gvfsbackendarchive.c:867 ../daemon/gvfsbackendcdda.c:1022 ++#: ../daemon/gvfsbackendcomputer.c:639 ../daemon/gvfsbackenddnssd.c:415 ++#: ../daemon/gvfsbackendftp.c:1073 ../daemon/gvfsbackendnetwork.c:696 ++#: ../daemon/gvfsbackendsmbbrowse.c:1146 ../daemon/gvfsbackendsmbbrowse.c:1213 ++#: ../daemon/gvfsbackendsmbbrowse.c:1400 ../daemon/gvfsbackendsmbbrowse.c:1473 + #, c-format + msgid "File doesn't exist" + msgstr "Il file non esiste" + +-#: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525 ../daemon/gvfsbackendafp.c:288 +-#: ../daemon/gvfsbackendafp.c:491 ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2240 ++#: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525 ++#: ../daemon/gvfsbackendafp.c:288 ../daemon/gvfsbackendafp.c:491 ++#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2240 + #: ../daemon/gvfsbackenddav.c:3065 ../daemon/gvfsbackendftp.c:779 + #: ../daemon/gvfsbackendsftp.c:2379 ../daemon/gvfsbackendsftp.c:3120 + #: ../daemon/gvfsbackendsftp.c:3470 ../daemon/gvfsbackendsftp.c:4502 +@@ -404,34 +438,41 @@ + msgid "Target file is open" + msgstr "Il file di destinazione è aperto" + +-#: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421 ../daemon/gvfsbackenddav.c:2630 +-#: ../daemon/gvfsbackendsftp.c:1861 ++#: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421 ++#: ../daemon/gvfsbackenddav.c:2630 ../daemon/gvfsbackendsftp.c:1861 + msgid "Directory not empty" + msgstr "Directory non vuota" + + #: ../daemon/gvfsafpvolume.c:684 + msgid "Target object is marked as not deletable (DeleteInhibit)" +-msgstr "L'oggetto di destinazione è contrassegnato come non eliminabile (DeleteInhibit)" ++msgstr "" ++"L'oggetto di destinazione è contrassegnato come non eliminabile " ++"(DeleteInhibit)" + +-#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237 ../daemon/gvfsafpvolume.c:2139 ++#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237 ++#: ../daemon/gvfsafpvolume.c:2139 + msgid "Target object doesn't exist" + msgstr "L'oggetto di destinazione non esiste" + +-#: ../daemon/gvfsafpvolume.c:692 ../daemon/gvfsafpvolume.c:845 ../daemon/gvfsafpvolume.c:1041 +-#: ../daemon/gvfsafpvolume.c:1241 ../daemon/gvfsafpvolume.c:2143 ++#: ../daemon/gvfsafpvolume.c:692 ../daemon/gvfsafpvolume.c:845 ++#: ../daemon/gvfsafpvolume.c:1041 ../daemon/gvfsafpvolume.c:1241 ++#: ../daemon/gvfsafpvolume.c:2143 + msgid "Volume is read-only" + msgstr "Il volume è in sola lettura" + +-#: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1023 ../daemon/gvfsafpvolume.c:1573 +-#: ../daemon/gvfsafpvolume.c:2011 ../daemon/gvfsafpvolume.c:2655 ++#: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1023 ++#: ../daemon/gvfsafpvolume.c:1573 ../daemon/gvfsafpvolume.c:2011 ++#: ../daemon/gvfsafpvolume.c:2655 + msgid "Not enough space on volume" + msgstr "Spazio non sufficiente sul volume" + +-#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1420 ../daemon/gvfsafpvolume.c:1577 +-#: ../daemon/gvfsbackendafp.c:295 ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2295 ++#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1420 ++#: ../daemon/gvfsafpvolume.c:1577 ../daemon/gvfsbackendafp.c:295 ++#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2295 + #: ../daemon/gvfsbackenddav.c:2592 ../daemon/gvfsbackenddav.c:2698 +-#: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 ../daemon/gvfsbackendftp.c:758 +-#: ../daemon/gvfsbackendftp.c:939 ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 ++#: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 ++#: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 ++#: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 + #: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 + #: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 +@@ -462,15 +503,19 @@ + + #: ../daemon/gvfsafpvolume.c:1233 + msgid "Target object is marked as not renameable (RenameInhibit)" +-msgstr "L'oggetto di destinazione è contrassegnato come non rinominabile (RenameInhibit)" ++msgstr "" ++"L'oggetto di destinazione è contrassegnato come non rinominabile " ++"(RenameInhibit)" + + #: ../daemon/gvfsafpvolume.c:1408 + msgid "Can't move directory into one of its descendants" +-msgstr "Impossibile spostare la directory all'interno di uno dei suoi discendenti" ++msgstr "" ++"Impossibile spostare la directory all'interno di uno dei suoi discendenti" + + #: ../daemon/gvfsafpvolume.c:1412 + msgid "Can't move sharepoint into a shared directory" +-msgstr "Impossibile spostare lo sharepoint all'interno di una directory condivisa" ++msgstr "" ++"Impossibile spostare lo sharepoint all'interno di una directory condivisa" + + #: ../daemon/gvfsafpvolume.c:1416 + msgid "Can't move a shared directory into the Trash" +@@ -478,7 +523,9 @@ + + #: ../daemon/gvfsafpvolume.c:1424 + msgid "Object being moved is marked as not renameable (RenameInhibit)" +-msgstr "L'oggetto in fase di spostamento è contrassegnato come non rinominabile (RenameInhibit)" ++msgstr "" ++"L'oggetto in fase di spostamento è contrassegnato come non rinominabile " ++"(RenameInhibit)" + + #: ../daemon/gvfsafpvolume.c:1428 + msgid "Object being moved doesn't exist" +@@ -507,9 +554,9 @@ + msgid "Range lock conflict exists" + msgstr "Rileavto conflitti di intervallo di blocco" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ../daemon/gvfsbackendmtp.c:1393 +-#: ../daemon/gvfsbackendmtp.c:1541 ../daemon/gvfsbackendmtp.c:1760 +-#: ../daemon/gvfsbackendmtp.c:2288 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "La directory non esiste" + +@@ -533,10 +580,10 @@ + msgid "Internal Apple File Control error" + msgstr "Errore interno Apple File Control" + +-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 ../daemon/gvfsbackendmtp.c:1588 +-#: ../daemon/gvfsbackendmtp.c:1604 ../daemon/gvfsbackendmtp.c:1893 +-#: ../daemon/gvfsbackendmtp.c:1940 ../daemon/gvfsbackendmtp.c:2009 +-#: ../daemon/gvfsbackendmtp.c:2365 ++#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "Il file non esiste" + +@@ -587,10 +634,12 @@ + msgstr "Errore dispositivo libimobiledevice: argomento non valido" + + #: ../daemon/gvfsbackendafc.c:318 +-msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly." ++msgid "" ++"libimobiledevice Error: No device found. Make sure usbmuxd is set up " ++"correctly." + msgstr "" +-"Errore dispositivo libimobiledevice: nessun dispositivo trovato. Assicurarsi di aver impostato " +-"correttamente usbmuxd." ++"Errore dispositivo libimobiledevice: nessun dispositivo trovato. Assicurarsi " ++"di aver impostato correttamente usbmuxd." + + #: ../daemon/gvfsbackendafc.c:322 + #, c-format +@@ -602,8 +651,9 @@ + msgid "Try again" + msgstr "Prova ancora" + +-#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 ../monitor/gdu/ggdudrive.c:1024 +-#: ../monitor/gdu/ggdumount.c:923 ../monitor/udisks2/gvfsudisks2mount.c:762 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 ++#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 ++#: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "Annulla" + +@@ -617,7 +667,8 @@ + + #: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" +-msgstr "Posizione AFC non valida: deve essere nella forma «afc://UUID:NUMERO_PORTA»" ++msgstr "" ++"Posizione AFC non valida: deve essere nella forma «afc://UUID:NUMERO_PORTA»" + + #: ../daemon/gvfsbackendafc.c:467 + #, c-format +@@ -656,10 +707,12 @@ + #. * shown in the dialog which is defined above. + #: ../daemon/gvfsbackendafc.c:647 + #, c-format +-msgid "The device “%s” is locked. Enter the passcode on the device and click “Try again”." ++msgid "" ++"The device “%s” is locked. Enter the passcode on the device and click “Try " ++"again”." + msgstr "" +-"Il dispositivo «%s» è bloccato. Inserire il codice sul dispositivo e fare clic su «Prova " +-"ancora»." ++"Il dispositivo «%s» è bloccato. Inserire il codice sul dispositivo e fare " ++"clic su «Prova ancora»." + + #: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +@@ -701,7 +754,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -727,15 +780,15 @@ + msgid "Apple Filing Protocol Service" + msgstr "Servizio Apple Filing Protocol" + +-#: ../daemon/gvfsbackendafp.c:285 ../daemon/gvfsbackendburn.c:875 ../daemon/gvfsbackendftp.c:1479 +-#: ../daemon/gvfsbackendobexftp.c:1806 ++#: ../daemon/gvfsbackendafp.c:285 ../daemon/gvfsbackendburn.c:875 ++#: ../daemon/gvfsbackendftp.c:1479 ../daemon/gvfsbackendobexftp.c:1806 + msgid "Can't copy directory over directory" + msgstr "Impossibile copiare la directory sulla directory" + +-#: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 ../daemon/gvfsbackendftp.c:1502 +-#: ../daemon/gvfsbackendmtp.c:1649 ../daemon/gvfsbackendmtp.c:1672 +-#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendmtp.c:1831 +-#: ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "Impossibile copiare la directory ricorsivamente" + +@@ -839,17 +892,19 @@ + #: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:184 + #: ../daemon/gvfsjobopenforwrite.c:198 ../daemon/gvfsjobopenforwrite.c:212 + #: ../daemon/gvfsjobopeniconforread.c:104 ../daemon/gvfsjobpollmountable.c:107 +-#: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125 ../daemon/gvfsjobqueryattributes.c:145 +-#: ../daemon/gvfsjobqueryfsinfo.c:116 ../daemon/gvfsjobqueryinfo.c:124 +-#: ../daemon/gvfsjobqueryinforead.c:119 ../daemon/gvfsjobqueryinfowrite.c:119 +-#: ../daemon/gvfsjobread.c:120 ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119 ++#: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125 ++#: ../daemon/gvfsjobqueryattributes.c:145 ../daemon/gvfsjobqueryfsinfo.c:116 ++#: ../daemon/gvfsjobqueryinfo.c:124 ../daemon/gvfsjobqueryinforead.c:119 ++#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120 ++#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119 + #: ../daemon/gvfsjobsetattribute.c:130 ../daemon/gvfsjobsetdisplayname.c:111 + #: ../daemon/gvfsjobstartmountable.c:113 ../daemon/gvfsjobstopmountable.c:115 + #: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobtruncate.c:112 +-#: ../daemon/gvfsjobunmountmountable.c:157 ../daemon/gvfsjobunmountmountable.c:172 +-#: ../daemon/gvfsjobwrite.c:120 ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 ++#: ../daemon/gvfsjobunmountmountable.c:157 ++#: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 ++#: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "Operazione non supportata dal backend" + +@@ -881,8 +936,7 @@ + # cambiato secondo busy + #: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." + msgstr "" + "Il volume è occupato\n" +@@ -928,8 +982,9 @@ + msgstr "Mount cdda su %s" + + #: ../daemon/gvfsbackendcdda.c:465 ../daemon/gvfsbackendcdda.c:986 +-#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325 ../monitor/hal/ghalvolume.c:225 +-#: ../monitor/hal/ghalvolume.c:246 ../monitor/udisks2/gvfsudisks2volume.c:359 ++#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325 ++#: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246 ++#: ../monitor/udisks2/gvfsudisks2volume.c:359 + #, c-format + msgid "Audio Disc" + msgstr "Disco audio" +@@ -1032,7 +1087,8 @@ + msgstr "%s su %s%s" + + # molto probabile che dopo : appaia msg che comincia per maiuscola +-#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1916 ../daemon/gvfsbackendhttp.c:202 ++#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1916 ++#: ../daemon/gvfsbackendhttp.c:202 + #, c-format + msgid "HTTP Error: %s" + msgstr "Errore HTTP: %s" +@@ -1060,7 +1116,8 @@ + + #. translators: %s here is the hostname + #. Translators: %s is the hostname +-#: ../daemon/gvfsbackenddav.c:1543 ../daemon/gvfsbackendftp.c:496 ../daemon/gvfsbackendsftp.c:980 ++#: ../daemon/gvfsbackenddav.c:1543 ../daemon/gvfsbackendftp.c:496 ++#: ../daemon/gvfsbackendsftp.c:980 + #, c-format + msgid "Enter password for %s" + msgstr "Inserire la password per %s" +@@ -1322,16 +1379,26 @@ + msgstr "Non supportato (non è la stessa directory)" + + #: ../daemon/gvfsbackendgphoto2.c:3409 +-msgid "Not supported (the source is a directory, the destination is a directory too)" +-msgstr "Non supportato (la sorgente è una directory e anche la destinazione è una directory)" ++msgid "" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" ++msgstr "" ++"Non supportato (la sorgente è una directory e anche la destinazione è una " ++"directory)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 +-msgid "Not supported (the source is a directory, but the destination is an existing file)" +-msgstr "Non supportato (la sorgente è una directory, ma la destinazione è un file esistente)" ++msgid "" ++"Not supported (the source is a directory, but the destination is an existing " ++"file)" ++msgstr "" ++"Non supportato (la sorgente è una directory, ma la destinazione è un file " ++"esistente)" + + #: ../daemon/gvfsbackendgphoto2.c:3429 +-msgid "Not supported (the source is a file, but the destination is a directory)" +-msgstr "Non supportato (la sorgente è un file, ma la destinazione è una directory)" ++msgid "" ++"Not supported (the source is a file, but the destination is a directory)" ++msgstr "" ++"Non supportato (la sorgente è un file, ma la destinazione è una directory)" + + # molto probabile che dopo : appaia msg che comincia per maiuscola + #: ../daemon/gvfsbackendhttp.c:198 +@@ -1541,14 +1608,14 @@ + "Can't verify the identity of “%s”.\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 "" + "Impossibile verificare l'identità di «%s».\n" + "Ciò accade quando si accede a un computer per la prima volta.\n" + "\n" +-"L'identità inviata dal computer remoto è «%s». Per essere assolutamente certi che sia sicuro " +-"continuare, contattare l'amministratore di sistema." ++"L'identità inviata dal computer remoto è «%s». Per essere assolutamente " ++"certi che sia sicuro continuare, contattare l'amministratore di sistema." + + #: ../daemon/gvfsbackendsftp.c:1096 + msgid "Login dialog cancelled" +@@ -1634,7 +1701,8 @@ + msgstr "Richiesta password per %s" + + #: ../daemon/gvfsbackendsmbbrowse.c:863 ../daemon/gvfsbackendsmbbrowse.c:910 +-#: ../daemon/gvfsbackendsmb.c:524 ../daemon/gvfsbackendsmb.c:570 ../daemon/gvfsbackendsmb.c:748 ++#: ../daemon/gvfsbackendsmb.c:524 ../daemon/gvfsbackendsmb.c:570 ++#: ../daemon/gvfsbackendsmb.c:748 + #, c-format + msgid "Internal Error (%s)" + msgstr "Errore interno (%s)" +@@ -1737,8 +1805,12 @@ + msgstr "Replica non valida" + + #: ../daemon/gvfsftpconnection.c:392 +-msgid "Failed to create active FTP connection. Maybe your router does not support this?" +-msgstr "Creazione della connessione FTP attiva non riuscita. Forse non è supportato dal router." ++msgid "" ++"Failed to create active FTP connection. Maybe your router does not support " ++"this?" ++msgstr "" ++"Creazione della connessione FTP attiva non riuscita. Forse non è supportato " ++"dal router." + + #: ../daemon/gvfsftpconnection.c:399 + msgid "Failed to create active FTP connection." +@@ -1763,7 +1835,9 @@ + + #: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" +-msgstr "Impossibile aprire la connessione dati. Forse è impedito dal proprio firewall." ++msgstr "" ++"Impossibile aprire la connessione dati. Forse è impedito dal proprio " ++"firewall." + + #: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" +@@ -1804,11 +1878,9 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"Smontaggio di %s\n" ++msgstr "Smontaggio di %s\n" + "Attendere" + + #: ../daemon/gvfsjobunmount.c:197 +@@ -1844,14 +1916,18 @@ + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 ../programs/gvfs-cat.c:170 +-#: ../programs/gvfs-cat.c:188 ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 +-#: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 ../programs/gvfs-mime.c:113 +-#: ../programs/gvfs-mime.c:120 ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 +-#: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 ../programs/gvfs-move.c:142 +-#: ../programs/gvfs-open.c:78 ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 +-#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 ../programs/gvfs-set-attribute.c:151 +-#: ../programs/gvfs-trash.c:106 ../programs/gvfs-tree.c:263 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 ++#: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 ++#: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 ++#: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 ++#: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 ++#: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 ++#: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 ++#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 ++#: ../programs/gvfs-tree.c:263 + #, c-format + msgid "Try \"%s --help\" for more information." + msgstr "Provare \"%s --help\" per maggiori informazioni." +@@ -1878,8 +1954,9 @@ + msgid "Location is not mountable" + msgstr "La posizione non è montabile" + +-#: ../metadata/meta-daemon.c:157 ../metadata/meta-daemon.c:277 ../metadata/meta-daemon.c:326 +-#: ../metadata/meta-daemon.c:361 ../metadata/meta-daemon.c:397 ++#: ../metadata/meta-daemon.c:157 ../metadata/meta-daemon.c:277 ++#: ../metadata/meta-daemon.c:326 ../metadata/meta-daemon.c:361 ++#: ../metadata/meta-daemon.c:397 + #, c-format + msgid "Can't find metadata file %s" + msgstr "Impossibile trovare il file di metadati «%s»" +@@ -1929,19 +2006,21 @@ + #: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:609 + #, c-format + msgid "Failed to eject medium; one or more volumes on the medium are busy." +-msgstr "Espulsione del supporto non riuscita; uno o più volumi sul supporto sono occupati." ++msgstr "" ++"Espulsione del supporto non riuscita; uno o più volumi sul supporto sono " ++"occupati." + + # copiata da gnome-disk-utilities + #: ../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 "" + "Attivare l'unità nella modalità degradata?\n" +-"Attivare un'unità nella modalità degradata implica che l'unità non sarà più tollerante ai " +-"guasti. I dati presenti nell'unità potrebbero non essere recuperabili se un componente si " +-"guastasse." ++"Attivare un'unità nella modalità degradata implica che l'unità non sarà più " ++"tollerante ai guasti. I dati presenti nell'unità potrebbero non essere " ++"recuperabili se un componente si guastasse." + + #: ../monitor/gdu/ggdudrive.c:1023 + msgid "Start Anyway" +@@ -2285,10 +2364,9 @@ + + # In base al codice, ogni drive che non è + # riconosciuto come uno dei precedenti. +-# ++# + # Tolto "di massa" perché, dai, è inutile nella + # traduzione di qualcosa che appare all'utente. +-# + #: ../monitor/hal/ghaldrive.c:214 + msgid "Mass Storage Drive" + msgstr "Unità di memorizzazione" +@@ -2296,7 +2374,9 @@ + #: ../monitor/hal/ghaldrive.c:662 + #, c-format + msgid "Failed to eject media; one or more volumes on the media are busy." +-msgstr "Espulsione del supporto non riuscita: uno o più volumi sul supporto sono occupati." ++msgstr "" ++"Espulsione del supporto non riuscita: uno o più volumi sul supporto sono " ++"occupati." + + #: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163 + #, c-format +@@ -2314,7 +2394,7 @@ + msgstr "%.1f GB" + + # misto e ibrido sono diversi +-# ++# + # http://en.wikipedia.org/wiki/Hybrid_disc + # http://en.wikipedia.org/wiki/Mixed_mode + #: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244 +@@ -2343,7 +2423,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Espelli comunque" +@@ -2355,11 +2435,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"Scrittura dati su %s\n" ++msgstr "Scrittura dati su %s\n" + "Attendere il completamento prima di scollegarlo" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2370,7 +2448,7 @@ + # aggiunto volume in traduzione, in fondo è sottinteso e usare solo "Cifrato da %s" mi pare brutto + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2378,7 +2456,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2394,26 +2472,26 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "Errore nel salvare la passphrase nel portachiavi (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "Errore nell'eliminare la passphrase invalida dal portachiavi (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "Il dispositivo sbloccato non presenta un file system riconoscibile" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "Passphrase di cifratura per %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "È richiesta una passphrase per accedere al volume" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2425,8 +2503,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2436,12 +2514,15 @@ + msgid "GVfs UDisks2 Volume Monitor" + msgstr "Monitor volumi UDisks2 per GVfs" + +-#: ../programs/gvfs-cat.c:38 ../programs/gvfs-copy.c:51 ../programs/gvfs-info.c:42 +-#: ../programs/gvfs-ls.c:47 ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 ++#: ../programs/gvfs-cat.c:38 ../programs/gvfs-copy.c:51 ++#: ../programs/gvfs-info.c:42 ../programs/gvfs-ls.c:47 ++#: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 +-#: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 ../programs/gvfs-open.c:38 +-#: ../programs/gvfs-rename.c:34 ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 +-#: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 ../programs/gvfs-tree.c:39 ++#: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 ++#: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 ++#: ../programs/gvfs-tree.c:39 + msgid "Show program version" + msgstr "Mostra la versione del programma" + +@@ -2474,7 +2555,8 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s: errore nel chiudere. %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ../programs/gvfs-rm.c:58 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 ++#: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "FILE" + +@@ -2503,19 +2585,22 @@ + "Nota: mettere in pipe con cat se si necessita delle opzioni\n" + "di formattazione come -n, -T o altro." + +-#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 ../programs/gvfs-info.c:396 +-#: ../programs/gvfs-ls.c:428 ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 ++#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 ++#: ../programs/gvfs-info.c:396 ../programs/gvfs-ls.c:428 ++#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 +-#: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 ../programs/gvfs-open.c:76 +-#: ../programs/gvfs-rename.c:80 ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 +-#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 ../programs/gvfs-tree.c:261 ++#: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 ++#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 ++#: ../programs/gvfs-tree.c:261 + #, c-format + msgid "Error parsing commandline options: %s\n" + msgstr "Errore nell'analizzare le opzioni da riga di comando: %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:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: posizioni mancanti" +@@ -2536,7 +2621,8 @@ + msgid "Preserve all attributes" + msgstr "Preserva tutti gli attributi" + +-#: ../programs/gvfs-copy.c:49 ../programs/gvfs-move.c:46 ../programs/gvfs-save.c:45 ++#: ../programs/gvfs-copy.c:49 ../programs/gvfs-move.c:46 ++#: ../programs/gvfs-save.c:45 + msgid "Backup existing destination files" + msgstr "Backup dei file destinazione esistenti" + +@@ -2553,7 +2639,8 @@ + msgid "SOURCE" + msgstr "SORGENTE" + +-#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130 ../programs/gvfs-save.c:168 ++#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130 ++#: ../programs/gvfs-save.c:168 + msgid "DEST" + msgstr "DEST" + +@@ -2561,7 +2648,8 @@ + msgid "Copy one or more files from SOURCE to DEST." + msgstr "Copia uno o più file da SORGENTE a DEST" + +-#: ../programs/gvfs-copy.c:160 ../programs/gvfs-move.c:156 ../programs/gvfs-rename.c:96 ++#: ../programs/gvfs-copy.c:160 ../programs/gvfs-move.c:156 ++#: ../programs/gvfs-rename.c:96 + msgid "Missing operand\n" + msgstr "Operando mancante\n" + +@@ -2600,7 +2688,8 @@ + msgid "ATTRIBUTES" + msgstr "ATTRIBUTI" + +-#: ../programs/gvfs-info.c:41 ../programs/gvfs-ls.c:45 ../programs/gvfs-set-attribute.c:38 ++#: ../programs/gvfs-info.c:41 ../programs/gvfs-ls.c:45 ++#: ../programs/gvfs-set-attribute.c:38 + msgid "Don't follow symbolic links" + msgstr "Non segue i collegamenti simbolici" + +@@ -2702,10 +2791,11 @@ + msgid "Writable attribute namespaces:\n" + msgstr "Namespace attributi scrivibili:\n" + +-#: ../programs/gvfs-info.c:384 ../programs/gvfs-ls.c:411 ../programs/gvfs-mkdir.c:58 +-#: ../programs/gvfs-monitor-dir.c:113 ../programs/gvfs-monitor-file.c:112 +-#: ../programs/gvfs-mount.c:1074 ../programs/gvfs-rename.c:70 +-#: ../programs/gvfs-set-attribute.c:139 ../programs/gvfs-trash.c:92 ../programs/gvfs-tree.c:249 ++#: ../programs/gvfs-info.c:384 ../programs/gvfs-ls.c:411 ++#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-monitor-dir.c:113 ++#: ../programs/gvfs-monitor-file.c:112 ../programs/gvfs-mount.c:1074 ++#: ../programs/gvfs-rename.c:70 ../programs/gvfs-set-attribute.c:139 ++#: ../programs/gvfs-trash.c:92 ../programs/gvfs-tree.c:249 + msgid "LOCATION" + msgstr "POSIZIONE" + +@@ -2733,7 +2823,8 @@ + msgid "Print full URIs" + msgstr "Stampa URI completi" + +-#: ../programs/gvfs-ls.c:182 ../programs/gvfs-ls.c:190 ../programs/gvfs-rename.c:110 ++#: ../programs/gvfs-ls.c:182 ../programs/gvfs-ls.c:190 ++#: ../programs/gvfs-rename.c:110 + #, c-format + msgid "Error: %s\n" + msgstr "Errore: %s\n" +@@ -2787,7 +2878,8 @@ + #: ../programs/gvfs-mime.c:119 + #, c-format + msgid "Must specify the mime-type followed by the default handler.\n" +-msgstr "È necessario specificare il tipo MIME seguito dal gestore predefinito.\n" ++msgstr "" ++"È necessario specificare il tipo MIME seguito dal gestore predefinito.\n" + + #: ../programs/gvfs-mime.c:134 + #, c-format +@@ -2827,7 +2919,8 @@ + #: ../programs/gvfs-mime.c:186 + #, c-format + msgid "Failed to set '%s' as the default handler for '%s': %s\n" +-msgstr "Impostazione di «%s» come gestore predefinito per «%s» non riuscita: %s\n" ++msgstr "" ++"Impostazione di «%s» come gestore predefinito per «%s» non riuscita: %s\n" + + #: ../programs/gvfs-mkdir.c:35 + msgid "Create parent directories" +@@ -2950,7 +3043,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2960,7 +3053,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: errore nell'aprire la posizione. %s\n" +@@ -3001,7 +3094,8 @@ + + #: ../programs/gvfs-save.c:49 + msgid "When replacing, replace as if the destination did not exist" +-msgstr "Quando si sostituisce, sostituisce come se la destinazione non esistesse" ++msgstr "" ++"Quando si sostituisce, sostituisce come se la destinazione non esistesse" + + #. Translators: The "etag" is a token allowing to verify whether a file has been modified + #: ../programs/gvfs-save.c:51 +@@ -3103,51 +3197,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "Elenca il contenuto delle directory in un formato ad albero" +- +-msgid "Permission denied: Perhaps this host is disallowed or a privileged port is needed" +-msgstr "Permesso negato: forse questo host non è abilitato o è necessaria una porta privilegiata" +- +-msgid "Ignore outstanding file operations when unmounting or ejecting" +-msgstr "Ignora le rimanenti operazioni sui file quando smonta o espelle" +- +-msgid "Use an anonymous user when authenticating" +-msgstr "Usa un utente anonimo durante l'autenticazione" +- +-msgid "Don't use copy and delete fallback" +-msgstr "Non usa i ripieghi di copia ed elimina" +- +-#, fuzzy +-#~ msgid "Operation not supported" +-#~ msgstr "Operazione non supportata" +- +-#, fuzzy +-#~ msgid "Volume doesn't exist" +-#~ msgstr "Il file non esiste" +- +-#, fuzzy +-#~ msgid "Backups not supported" +-#~ msgstr "backup non supportati" +- +-#, fuzzy +-#~ msgid "Mount point does not exist" +-#~ msgstr "Il file non esiste" +- +-#, fuzzy +-#~ msgid "Target file is a directory" +-#~ msgstr "La destinazione è una directory" +- +-# aggiunto oggetto +-#, fuzzy +-#~ msgid "Target file is not a regular file" +-#~ msgstr "Il file non è un oggetto montabile" +- +-#, fuzzy +-#~ msgid "Invalid attribute type" +-#~ msgstr "Tipo di attributo %s non valido\n" +- +-#, fuzzy +-#~ msgid "Error mounting location: Anonymous access denied\n" +-#~ msgstr "Errore nel montare la posizione: %s\n" +- +-#~ msgid "progress" +-#~ msgstr "Avanzamento" +diff -urN gvfs-1.22.4/po/ja.po gvfs-1.22.4_localized/po/ja.po +--- gvfs-1.22.4/po/ja.po 2015-02-03 21:22:20.000000000 +0530 ++++ gvfs-1.22.4_localized/po/ja.po 2016-03-14 19:47:32.631899608 +0530 +@@ -7,33 +7,35 @@ + # Hideki Yamane , 2011. + # Hajime Taira , 2012. + # Nishio Futoshi , 2012. +-# ++# kmoriguc , 2016. #zanata ++# pnemade , 2016. #zanata + 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: 2013-09-02 14:13+0000\n" +-"PO-Revision-Date: 2013-08-01 15:27+0900\n" +-"Last-Translator: Jiro Matsuzawa \n" +-"Language-Team: Japanese \n" +-"Language: ja\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2016-03-13 11:16+0000\n" ++"Last-Translator: kmoriguc \n" ++"Language-Team: Japanese \n" ++"Language: ja\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:469 ../client/gdaemonfile.c:2827 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "サポートされていない操作です (ファイルが別々のマウント先にあります)" + +-#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3170 +-#: ../client/gvfsiconloadable.c:304 ../daemon/gvfsjobopenforread.c:183 +-#: ../daemon/gvfsjobopenforwrite.c:267 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 ++#: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 ++#: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "ストリームファイルのディスクリプターを取得できませんでした" + + #: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 +-#: ../client/gvfsiconloadable.c:129 ++#: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "ストリームファイルのディスクリプターを取得しませんでした" + +@@ -44,50 +46,56 @@ + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2301 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "関連するマウントが見つかりませんでした" + +-#: ../client/gdaemonfile.c:2337 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "無効なファイル名: %s" + +-#: ../client/gdaemonfile.c:2669 ../client/gdaemonvfs.c:1288 +-#: ../client/gdaemonvfs.c:1340 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "ファイルのメタデータを設定中にエラー: %s" + +-#: ../client/gdaemonfile.c:2670 ../client/gdaemonvfs.c:1341 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "メタデータツリーを開くことができません" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "値は文字列または文字列リストである必要があります" + +-#: ../client/gdaemonfileenumerator.c:528 ../client/gdaemonfileenumerator.c:611 +-#: ../client/gdaemonfileenumerator.c:662 ++#: ../client/gdaemonfileenumerator.c:553 ../client/gdaemonfileenumerator.c:636 ++#: ../client/gdaemonfileenumerator.c:687 + #: ../client/gdaemonfileinputstream.c:642 + #: ../client/gdaemonfileinputstream.c:795 + #: ../client/gdaemonfileinputstream.c:915 + #: ../client/gdaemonfileinputstream.c:1166 + #: ../client/gdaemonfileinputstream.c:1411 +-#: ../client/gdaemonfileoutputstream.c:517 +-#: ../client/gdaemonfileoutputstream.c:695 +-#: ../client/gdaemonfileoutputstream.c:890 +-#: ../client/gdaemonfileoutputstream.c:1072 ../client/gvfsdaemondbus.c:734 ++#: ../client/gdaemonfileoutputstream.c:546 ++#: ../client/gdaemonfileoutputstream.c:724 ++#: ../client/gdaemonfileoutputstream.c:919 ++#: ../client/gdaemonfileoutputstream.c:1085 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 + #: ../daemon/gvfsbackendobexftp.c:1762 ../daemon/gvfsbackendobexftp.c:1924 + #: ../daemon/gvfsbackendobexftp.c:1951 ../daemon/gvfsbackendobexftp.c:2009 + #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094 +-#: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1263 ++#: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266 + #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 +-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332 +-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070 ++#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:343 ++#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "操作がキャンセルされました" +@@ -96,28 +104,32 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1705 + #: ../client/gdaemonfileinputstream.c:1715 +-#: ../client/gdaemonfileoutputstream.c:459 +-#: ../client/gdaemonfileoutputstream.c:467 +-#: ../client/gdaemonfileoutputstream.c:1257 +-#: ../client/gdaemonfileoutputstream.c:1267 ++#: ../client/gdaemonfileoutputstream.c:488 ++#: ../client/gdaemonfileoutputstream.c:496 ++#: ../client/gdaemonfileoutputstream.c:1452 ++#: ../client/gdaemonfileoutputstream.c:1462 + #, c-format + msgid "Error in stream protocol: %s" + msgstr "ストリームのプロトコルでエラー: %s" + + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 +-#: ../client/gdaemonfileoutputstream.c:467 +-#: ../client/gdaemonfileoutputstream.c:1267 ../daemon/gvfsbackendmtp.c:1891 +-#: ../daemon/gvfsbackendmtp.c:2261 ++#: ../client/gdaemonfileoutputstream.c:496 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "ストリームの末尾" + + #: ../client/gdaemonfileinputstream.c:1348 +-#: ../client/gdaemonfileoutputstream.c:999 ++#: ../client/gdaemonfileoutputstream.c:1028 + msgid "Seek not supported on stream" + msgstr "ストリーム上のシークはサポートしていません" + +-#: ../client/gdaemonvfs.c:812 ++#: ../client/gdaemonfileoutputstream.c:1197 ++msgid "Truncate not supported on stream" ++msgstr "ストリーム上での切り詰めはサポートしていません" ++ ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "マウント情報を取得する際にエラー: %s" +@@ -140,7 +152,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -151,17 +163,21 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../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 "\"%s\" な \"%s\" というサービスは \"%s\" というドメインにはありませんでした: 1つ以上の TXT レコードが不足しています: 必要なキーは \"%s\" です" ++msgid "" ++"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT " ++"records are missing. Keys required: \"%s\"." ++msgstr "" ++"\"%s\" な \"%s\" というサービスは \"%s\" というドメインにはありませんでした: 1つ以上の TXT レコードが不足しています: " ++"必要なキーは \"%s\" です" + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -189,9 +205,9 @@ + msgid "%s File System Service" + msgstr "%s のファイルシステムサービス" + +-#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:90 +-#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36 +-#: ../programs/gvfs-set-attribute.c:105 ++#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:104 ++#: ../programs/gvfs-move.c:100 ../programs/gvfs-rename.c:44 ++#: ../programs/gvfs-set-attribute.c:107 + #, c-format + msgid "Error: %s" + msgstr "エラー: %s" +@@ -220,22 +236,27 @@ + msgid "error starting mount daemon" + msgstr "マウントデーモンを起動する際にエラー" + +-#: ../daemon/gvfsafpconnection.c:764 ++#: ../daemon/gvfsafpconnection.c:784 + msgid "The connection is not opened" + msgstr "接続が開いていません" + +-#: ../daemon/gvfsafpconnection.c:771 ++#: ../daemon/gvfsafpconnection.c:791 ../daemon/gvfsbackendmtp.c:378 + msgid "The connection is closed" + msgstr "接続が閉じています" + +-#: ../daemon/gvfsafpconnection.c:1545 +-msgid "Connection unexpectedly went down" +-msgstr "接続が予期せず切断されました" +- +-#: ../daemon/gvfsafpconnection.c:1572 ++#: ../daemon/gvfsafpconnection.c:904 ../daemon/gvfsafpconnection.c:1610 + msgid "Got EOS" + msgstr "EOS を受けとりました" + ++#: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 ++#: ../daemon/gvfsftptask.c:375 ++msgid "Host closed connection" ++msgstr "ホストが接続を閉じました" ++ ++#: ../daemon/gvfsafpconnection.c:1583 ++msgid "Connection unexpectedly went down" ++msgstr "接続が予期せず切断されました" ++ + #: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480 + #, c-format + msgid "The server doesn't support passwords longer than %d character." +@@ -252,10 +273,11 @@ + msgstr "そのパスワードでは、サーバー“%s”にログインできません。" + + #: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650 +-#: ../daemon/gvfsafpserver.c:825 ../daemon/gvfsafpserver.c:873 +-#: ../daemon/gvfsafpserver.c:989 ../daemon/gvfsafpserver.c:1672 ++#: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 ++#: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "サーバー“%s”に接続できません。通信に問題が生じました。" + + #: ../daemon/gvfsafpserver.c:623 +@@ -270,59 +292,63 @@ + + #: ../daemon/gvfsafpserver.c:729 + #, c-format +-msgid "Unable to connect to the server “%s”. No suitable authentication mechanism was found." ++msgid "" ++"Unable to connect to the server “%s”. No suitable authentication mechanism " ++"was found." + msgstr "サーバー“%s”に接続できません。適切な認証方法が見つかりませんでした。" + +-#: ../daemon/gvfsafpserver.c:803 ++#: ../daemon/gvfsafpserver.c:804 + #, c-format +-msgid "Unable to connect to the server “%s”. The server doesn't support AFP version 3.0 or later." ++msgid "" ++"Unable to connect to the server “%s”. The server doesn't support AFP version " ++"3.0 or later." + msgstr "サーバー“%s”に接続できません。サーバーは AFP バージョン 3.0 以降をサポートしていません。" + +-#: ../daemon/gvfsafpserver.c:914 ++#: ../daemon/gvfsafpserver.c:915 + #, c-format + msgid "Permission denied." + msgstr "権限がありません。" + +-#: ../daemon/gvfsafpserver.c:919 ++#: ../daemon/gvfsafpserver.c:920 + #, c-format + msgid "The command is not supported by the server." + msgstr "サーバーでサポートされていないコマンドです。" + +-#: ../daemon/gvfsafpserver.c:923 ++#: ../daemon/gvfsafpserver.c:924 + #, c-format + msgid "Your password has expired." + msgstr "あなたのパスワードは期限切れです。" + +-#: ../daemon/gvfsafpserver.c:927 ++#: ../daemon/gvfsafpserver.c:928 + #, c-format + msgid "Your password needs to be changed." + msgstr "あなたのパスワードを変更する必要があります。" + + #. translators: %s here is the hostname +-#: ../daemon/gvfsafpserver.c:1070 ++#: ../daemon/gvfsafpserver.c:1071 + #, c-format + msgid "Enter your password for the server “%s”." + msgstr "サーバー“%s”のパスワードを入力してください。" + + #. translators: %s here is the hostname +-#: ../daemon/gvfsafpserver.c:1073 ++#: ../daemon/gvfsafpserver.c:1074 + #, c-format + msgid "Enter your name and password for the server “%s”." + msgstr "サーバー“%s”へのユーザー名とパスワードを入力してください。" + +-#: ../daemon/gvfsafpserver.c:1105 ++#: ../daemon/gvfsafpserver.c:1106 + msgid "The password prompt was cancelled." + msgstr "パスワードプロンプトがキャンセルされました。" + +-#: ../daemon/gvfsafpserver.c:1222 ++#: ../daemon/gvfsafpserver.c:1224 + msgid "Unable to disconnect from the server." + msgstr "サーバーとの接続を切断できません。" + +-#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1763 ++#: ../daemon/gvfsafpserver.c:1366 ../daemon/gvfsafpserver.c:1765 + msgid "Unable to connect to the server. A communication problem occurred." + msgstr "サーバーに接続できません。通信に問題が生じました。" + +-#: ../daemon/gvfsafpserver.c:1719 ++#: ../daemon/gvfsafpserver.c:1721 + msgid "Identification not found." + msgstr "識別情報が見つかりません。" + +@@ -336,275 +362,285 @@ + msgid "Got unknown error code %d from server" + msgstr "サーバーが未知のエラーコード %d を返しました" + +-#: ../daemon/gvfsafpvolume.c:145 ++#. Translators: first %s is volumename and second servername ++#: ../daemon/gvfsafpvolume.c:154 + #, c-format + msgid "Couldn't load %s on %s" + msgstr "%2$s 上の %1$s をロードできません" + +-#: ../daemon/gvfsafpvolume.c:390 ../daemon/gvfsafpvolume.c:668 +-#: ../daemon/gvfsafpvolume.c:821 ../daemon/gvfsafpvolume.c:1015 +-#: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsafpvolume.c:1398 +-#: ../daemon/gvfsafpvolume.c:1555 ../daemon/gvfsafpvolume.c:2001 +-#: ../daemon/gvfsafpvolume.c:2127 ../daemon/gvfsafpvolume.c:2289 +-#: ../daemon/gvfsafpvolume.c:2509 ../daemon/gvfsbackendafc.c:286 +-#: ../daemon/gvfsbackendsftp.c:307 ../daemon/gvfsbackendsftp.c:1827 +-#: ../daemon/gvfsftptask.c:399 ++#: ../daemon/gvfsafpvolume.c:402 ../daemon/gvfsafpvolume.c:672 ++#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019 ++#: ../daemon/gvfsafpvolume.c:1221 ../daemon/gvfsafpvolume.c:1404 ++#: ../daemon/gvfsafpvolume.c:1561 ../daemon/gvfsafpvolume.c:2007 ++#: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 ++#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 ++#: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "権限がありません" + +-#: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721 +-#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:977 ++#: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 +-#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:651 +-#: ../daemon/gvfsbackendarchive.c:699 ../daemon/gvfsbackendarchive.c:751 +-#: ../daemon/gvfsbackendarchive.c:780 ../daemon/gvfsbackendcdda.c:1022 +-#: ../daemon/gvfsbackendcomputer.c:638 ../daemon/gvfsbackenddnssd.c:415 +-#: ../daemon/gvfsbackendftp.c:1068 ../daemon/gvfsbackendnetwork.c:696 +-#: ../daemon/gvfsbackendsmbbrowse.c:1147 ../daemon/gvfsbackendsmbbrowse.c:1214 +-#: ../daemon/gvfsbackendsmbbrowse.c:1401 ../daemon/gvfsbackendsmbbrowse.c:1474 ++#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 ++#: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 ++#: ../daemon/gvfsbackendarchive.c:867 ../daemon/gvfsbackendcdda.c:1022 ++#: ../daemon/gvfsbackendcomputer.c:639 ../daemon/gvfsbackenddnssd.c:415 ++#: ../daemon/gvfsbackendftp.c:1073 ../daemon/gvfsbackendnetwork.c:696 ++#: ../daemon/gvfsbackendsmbbrowse.c:1146 ../daemon/gvfsbackendsmbbrowse.c:1213 ++#: ../daemon/gvfsbackendsmbbrowse.c:1400 ../daemon/gvfsbackendsmbbrowse.c:1473 + #, c-format + msgid "File doesn't exist" + msgstr "ファイルがありません" + +-#: ../daemon/gvfsafpvolume.c:398 ../daemon/gvfsafpvolume.c:468 +-#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafp.c:277 +-#: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1310 +-#: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:774 +-#: ../daemon/gvfsbackendsftp.c:2339 ../daemon/gvfsbackendsftp.c:3055 +-#: ../daemon/gvfsbackendsftp.c:3394 ../daemon/gvfsbackendsftp.c:4264 ++#: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525 ++#: ../daemon/gvfsbackendafp.c:288 ../daemon/gvfsbackendafp.c:491 ++#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2240 ++#: ../daemon/gvfsbackenddav.c:3065 ../daemon/gvfsbackendftp.c:779 ++#: ../daemon/gvfsbackendsftp.c:2379 ../daemon/gvfsbackendsftp.c:3120 ++#: ../daemon/gvfsbackendsftp.c:3470 ../daemon/gvfsbackendsftp.c:4502 ++#: ../daemon/gvfsbackendsftp.c:5385 + msgid "File is directory" + msgstr "ファイルはフォルダーです" + +-#: ../daemon/gvfsafpvolume.c:402 ++#: ../daemon/gvfsafpvolume.c:414 + msgid "Too many files open" + msgstr "ファイルを開き過ぎています" + +-#: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:829 ++#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsafpvolume.c:833 + msgid "Target file is open" + msgstr "対象のファイルはオープンされています" + +-#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:421 +-#: ../daemon/gvfsbackenddav.c:2581 ../daemon/gvfsbackendsftp.c:1821 ++#: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421 ++#: ../daemon/gvfsbackenddav.c:2630 ../daemon/gvfsbackendsftp.c:1861 + msgid "Directory not empty" + msgstr "フォルダーが空ではありません" + +-#: ../daemon/gvfsafpvolume.c:680 ++#: ../daemon/gvfsafpvolume.c:684 + msgid "Target object is marked as not deletable (DeleteInhibit)" + msgstr "対象のオブジェクトは削除可能とマークされていません (DeleteInhibit)" + +-#: ../daemon/gvfsafpvolume.c:684 ../daemon/gvfsafpvolume.c:1231 +-#: ../daemon/gvfsafpvolume.c:2131 ++#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237 ++#: ../daemon/gvfsafpvolume.c:2139 + msgid "Target object doesn't exist" + msgstr "対象のオブジェクトがありません" + +-#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:841 +-#: ../daemon/gvfsafpvolume.c:1035 ../daemon/gvfsafpvolume.c:1235 +-#: ../daemon/gvfsafpvolume.c:2135 ++#: ../daemon/gvfsafpvolume.c:692 ../daemon/gvfsafpvolume.c:845 ++#: ../daemon/gvfsafpvolume.c:1041 ../daemon/gvfsafpvolume.c:1241 ++#: ../daemon/gvfsafpvolume.c:2143 + msgid "Volume is read-only" + msgstr "ボリュームは読み取り専用です" + +-#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019 +-#: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsafpvolume.c:2005 +-#: ../daemon/gvfsafpvolume.c:2647 ++#: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1023 ++#: ../daemon/gvfsafpvolume.c:1573 ../daemon/gvfsafpvolume.c:2011 ++#: ../daemon/gvfsafpvolume.c:2655 + msgid "Not enough space on volume" + msgstr "ボリュームに十分な空き容量がありません" + +-#: ../daemon/gvfsafpvolume.c:833 ../daemon/gvfsafpvolume.c:1414 +-#: ../daemon/gvfsafpvolume.c:1571 ../daemon/gvfsbackendafp.c:284 +-#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2296 +-#: ../daemon/gvfsbackenddav.c:2543 ../daemon/gvfsbackenddav.c:2649 +-#: ../daemon/gvfsbackendftp.c:753 ../daemon/gvfsbackendftp.c:934 +-#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552 +-#: ../daemon/gvfsbackendmtp.c:1446 ../daemon/gvfsbackendmtp.c:1555 +-#: ../daemon/gvfsbackendsftp.c:4273 ../daemon/gvfsbackendsmb.c:2187 ++#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1420 ++#: ../daemon/gvfsafpvolume.c:1577 ../daemon/gvfsbackendafp.c:295 ++#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2295 ++#: ../daemon/gvfsbackenddav.c:2592 ../daemon/gvfsbackenddav.c:2698 ++#: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 ++#: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 ++#: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "対象のファイルが既に存在しています" + +-#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1027 ++#: ../daemon/gvfsafpvolume.c:841 ../daemon/gvfsafpvolume.c:1033 + msgid "Ancestor directory doesn't exist" + msgstr "親フォルダーが存在しません" + +-#: ../daemon/gvfsafpvolume.c:1023 ++#. Translators: flat means volume doesn't support directories ++#. (all files are in the volume root) ++#: ../daemon/gvfsafpvolume.c:1029 + msgid "Volume is flat and doesn't support directories" + msgstr "ボリュームはフラットで、フォルダーをサポートしていません" + +-#: ../daemon/gvfsafpvolume.c:1031 ++#: ../daemon/gvfsafpvolume.c:1037 + msgid "Target directory already exists" + msgstr "対象のフォルダーが既に存在しています" + +-#: ../daemon/gvfsafpvolume.c:1219 ../daemon/gvfsbackendafp.c:590 ++#: ../daemon/gvfsafpvolume.c:1225 ../daemon/gvfsbackendafp.c:603 + msgid "Can't rename volume" + msgstr "ボリュームの名前を変更できません" + +-#: ../daemon/gvfsafpvolume.c:1223 ++#: ../daemon/gvfsafpvolume.c:1229 + msgid "Object with that name already exists" + msgstr "その名前のオブジェクトは既に存在しています" + +-#: ../daemon/gvfsafpvolume.c:1227 ++#: ../daemon/gvfsafpvolume.c:1233 + msgid "Target object is marked as not renameable (RenameInhibit)" + msgstr "対象のオブジェクトは名前の変更可能とマークされていません (RenameInhibit)" + +-#: ../daemon/gvfsafpvolume.c:1402 ++#: ../daemon/gvfsafpvolume.c:1408 + msgid "Can't move directory into one of its descendants" + msgstr "フォルダーはその配下のフォルダーに移動できません" + +-#: ../daemon/gvfsafpvolume.c:1406 ++#: ../daemon/gvfsafpvolume.c:1412 + msgid "Can't move sharepoint into a shared directory" + msgstr "共有ポイントを共有フォルダー内に移動できません" + +-#: ../daemon/gvfsafpvolume.c:1410 ++#: ../daemon/gvfsafpvolume.c:1416 + msgid "Can't move a shared directory into the Trash" + msgstr "共有フォルダーはゴミ箱に移動できません" + +-#: ../daemon/gvfsafpvolume.c:1418 ++#: ../daemon/gvfsafpvolume.c:1424 + msgid "Object being moved is marked as not renameable (RenameInhibit)" + msgstr "移動しているオブジェクトは名前の変更可能とマークされていません (RenameInhibit)" + +-#: ../daemon/gvfsafpvolume.c:1422 ++#: ../daemon/gvfsafpvolume.c:1428 + msgid "Object being moved doesn't exist" + msgstr "移動しているオブジェクトが存在しません" + +-#: ../daemon/gvfsafpvolume.c:1559 ++#: ../daemon/gvfsafpvolume.c:1565 + msgid "Server doesn't support the FPCopyFile operation" + msgstr "サーバーは FPCopyFile 操作をサポートしていません" + +-#: ../daemon/gvfsafpvolume.c:1563 ++#: ../daemon/gvfsafpvolume.c:1569 + msgid "Unable to open source file for reading" + msgstr "コピー元ファイルを読み込み用にオープンできません" + +-#: ../daemon/gvfsafpvolume.c:1575 ++#: ../daemon/gvfsafpvolume.c:1581 + msgid "Source file and/or destination directory doesn't exist" + msgstr "コピー元のファイルおよびコピー先のフォルダーのいずれか、または両方が存在しません。" + +-#: ../daemon/gvfsafpvolume.c:1579 ++#: ../daemon/gvfsafpvolume.c:1585 + msgid "Source file is a directory" + msgstr "コピー元ファイルはフォルダーです" + +-#: ../daemon/gvfsafpvolume.c:2009 ++#. Translators: range conflict means ++#. requested data are locked by another user ++#: ../daemon/gvfsafpvolume.c:2017 + msgid "Range lock conflict exists" + msgstr "Range lock conflict が存在します" + +-#: ../daemon/gvfsafpvolume.c:2293 ../daemon/gvfsbackendmtp.c:1235 +-#: ../daemon/gvfsbackendmtp.c:1378 ../daemon/gvfsbackendmtp.c:1564 +-#: ../daemon/gvfsbackendmtp.c:2013 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "フォルダーが存在していません" + +-#: ../daemon/gvfsafpvolume.c:2297 ++#: ../daemon/gvfsafpvolume.c:2305 + msgid "Target object is not a directory" + msgstr "対象のオブジェクトはフォルダーではありません" + +-#: ../daemon/gvfsafpvolume.c:2643 ++#: ../daemon/gvfsafpvolume.c:2651 + msgid "File is not open for write access" + msgstr "書き込みアクセスに対してファイルがオープンされません" + +-#: ../daemon/gvfsafpvolume.c:2651 ++#: ../daemon/gvfsafpvolume.c:2659 + msgid "File is locked by another user" + msgstr "ファイルは他のユーザーによってロックされています" + +-#: ../daemon/gvfsafpvolume.c:2789 ++#: ../daemon/gvfsafpvolume.c:2797 + msgid "File is not open for read access" + msgstr "読み取りアクセスに対してファイルがオープンされません" + +-#: ../daemon/gvfsbackendafc.c:209 ++#: ../daemon/gvfsbackendafc.c:212 + msgid "Internal Apple File Control error" + msgstr "Apple ファイルコントロールの内部エラー" + +-#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:737 +-#: ../daemon/gvfsbackendmtp.c:1421 ../daemon/gvfsbackendmtp.c:1459 +-#: ../daemon/gvfsbackendmtp.c:1647 ../daemon/gvfsbackendmtp.c:1692 +-#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2087 ++#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "ファイルが存在しません" + +-#: ../daemon/gvfsbackendafc.c:217 ++#: ../daemon/gvfsbackendafc.c:220 + msgid "The directory is not empty" + msgstr "フォルダーが空ではありません" + +-#: ../daemon/gvfsbackendafc.c:221 ++#: ../daemon/gvfsbackendafc.c:224 + msgid "The device did not respond" + msgstr "デバイスが応答していません" + +-#: ../daemon/gvfsbackendafc.c:225 ++#: ../daemon/gvfsbackendafc.c:228 + msgid "The connection was interrupted" + msgstr "接続に割り込みがありました" + +-#: ../daemon/gvfsbackendafc.c:229 ++#: ../daemon/gvfsbackendafc.c:232 + msgid "Invalid Apple File Control data received" + msgstr "無効な Apple ファイルコントロールデータを受信しました" + +-#: ../daemon/gvfsbackendafc.c:233 ++#: ../daemon/gvfsbackendafc.c:236 + #, c-format + msgid "Unhandled Apple File Control error (%d)" + msgstr "Apple ファイルコントロールの処理できないエラー (%d)" + +-#: ../daemon/gvfsbackendafc.c:249 ++#: ../daemon/gvfsbackendafc.c:252 + msgid "Listing applications installed on device failed" + msgstr "デバイスにインストールされたアプリケーション一覧の作成に失敗しました" + +-#: ../daemon/gvfsbackendafc.c:265 ++#: ../daemon/gvfsbackendafc.c:268 + msgid "Accessing application icons on device failed" + msgstr "デバイスのアプリケーションアイコンへのアクセスに失敗しました" + +-#: ../daemon/gvfsbackendafc.c:282 ++#: ../daemon/gvfsbackendafc.c:285 + msgid "Lockdown Error: Invalid Argument" + msgstr "ロックダウンエラー: 引数が間違っています" + +-#: ../daemon/gvfsbackendafc.c:290 ++#: ../daemon/gvfsbackendafc.c:293 + msgid "Unable to connect" + msgstr "接続できません" + +-#: ../daemon/gvfsbackendafc.c:294 ++#: ../daemon/gvfsbackendafc.c:297 + #, c-format + msgid "Unhandled Lockdown error (%d)" + msgstr "処理できないロックダウンエラー (%d)" + +-#: ../daemon/gvfsbackendafc.c:311 ++#: ../daemon/gvfsbackendafc.c:314 + msgid "libimobiledevice Error: Invalid Argument" + msgstr "libimobiledevice エラー: 引数が間違っています" + +-#: ../daemon/gvfsbackendafc.c:315 +-msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly." ++#: ../daemon/gvfsbackendafc.c:318 ++msgid "" ++"libimobiledevice Error: No device found. Make sure usbmuxd is set up " ++"correctly." + msgstr "libimobiledevice エラー: デバイスが見つかりません。usbmuxd が正しく設定されているか確認してください。" + +-#: ../daemon/gvfsbackendafc.c:319 ++#: ../daemon/gvfsbackendafc.c:322 + #, c-format + msgid "Unhandled libimobiledevice error (%d)" + msgstr "libimobiledevice の処理できないエラー (%d)" + +-#: ../daemon/gvfsbackendafc.c:412 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "もう一度試す" + +-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackend.c:978 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "キャンセル" + +-#: ../daemon/gvfsbackendafc.c:430 ../daemon/gvfsbackendarchive.c:553 +-#: ../daemon/gvfsbackendarchive.c:582 ../daemon/gvfsbackenddav.c:1825 +-#: ../daemon/gvfsbackendhttp.c:311 ../daemon/gvfsbackendobexftp.c:887 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 ++#: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 + #: ../daemon/gvfsbackendsmb.c:712 + msgid "Invalid mount spec" + msgstr "マウントの仕様が間違っています" + +-#: ../daemon/gvfsbackendafc.c:436 ../daemon/gvfsbackendafc.c:466 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "AFC の場所が間違っています: afc://uuid:port-number の形式である必要があります" + +-#: ../daemon/gvfsbackendafc.c:452 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Apple モバイルデバイス" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Apple モバイルデバイス (Jailbrake 済)" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Apple モバイルデバイス上のドキュメント" +@@ -612,7 +648,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:521 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (jailbreak)" +@@ -620,7 +656,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:528 ../monitor/afc/afcvolume.c:130 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "%s 上のドキュメント" +@@ -629,38 +665,41 @@ + #. 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:623 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format +-msgid "The device “%s” is locked. Enter the passcode on the device and click “Try again”." ++msgid "" ++"The device “%s” is locked. Enter the passcode on the device and click “Try " ++"again”." + msgstr "デバイス“%s”はロックされています。デバイスのパスコードを入力し、“もう一度試す”をクリックしてください。" + +-#: ../daemon/gvfsbackendafc.c:967 ../daemon/gvfsbackendarchive.c:659 +-#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1856 +-#: ../daemon/gvfsbackendobexftp.c:1099 ../daemon/gvfsbackendrecent.c:121 +-#: ../daemon/gvfsbackendsmb.c:802 ../daemon/gvfsbackendtrash.c:232 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 ++#: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "フォルダーをオープンできません" + +-#: ../daemon/gvfsbackendafc.c:1168 ../daemon/gvfsbackendafc.c:2532 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "バックアップはまだサポートされていません。" + +-#: ../daemon/gvfsbackendafc.c:1340 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "無効なシークの種類です" + +-#: ../daemon/gvfsbackendafc.c:2369 ../daemon/gvfsbackendafp.c:1749 +-#: ../daemon/gvfsbackendftp.c:1088 ../daemon/gvfsbackendftp.c:1136 +-#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendmtp.c:1749 +-#: ../daemon/gvfsbackendmtp.c:1989 ../daemon/gvfsbackendmtp.c:2076 +-#: ../daemon/gvfsbackendmtp.c:2143 ../daemon/gvfsbackendsftp.c:1825 +-#: ../daemon/gvfsbackendsftp.c:4621 ../daemon/gvfsbackendsmb.c:1825 +-#: ../daemon/gvfsftptask.c:391 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 ++#: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "サポートしていない操作です" + +-#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1142 +-#: ../daemon/gvfsbackendsmbbrowse.c:1188 ++#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1141 ++#: ../daemon/gvfsbackendsmbbrowse.c:1187 + msgid "The file is not a mountable" + msgstr "そのファイルはマウントできません" + +@@ -672,12 +711,12 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share +-#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2066 +-#: ../daemon/gvfsbackendftp.c:634 ../daemon/gvfsbackendobexftp.c:705 +-#: ../daemon/gvfsbackendsftp.c:1686 ../daemon/gvfsbackendsmb.c:584 +-#: ../daemon/gvfsbackendsmb.c:1516 ++#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 ++#: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 ++#: ../daemon/gvfsbackendsftp.c:1726 ../daemon/gvfsbackendsmb.c:584 ++#: ../daemon/gvfsbackendsmb.c:1546 + #, c-format + msgid "%s on %s" + msgstr "%2$s 上の %1$s" +@@ -688,74 +727,75 @@ + msgid "%s" + msgstr "%s" + +-#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2101 +-#: ../daemon/gvfsbackendarchive.c:542 ../daemon/gvfsbackendftp.c:668 +-#: ../daemon/gvfsbackendsftp.c:1738 ++#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2148 ++#: ../daemon/gvfsbackendarchive.c:624 ../daemon/gvfsbackendftp.c:673 ++#: ../daemon/gvfsbackendsftp.c:1778 + msgid "No hostname specified" + msgstr "ホスト名が指定されていません" + +-#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2192 ++#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2243 + msgid "Apple Filing Protocol Service" + msgstr "Apple ファイルプロトコルサービス" + +-#: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:875 +-#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1806 ++#: ../daemon/gvfsbackendafp.c:285 ../daemon/gvfsbackendburn.c:875 ++#: ../daemon/gvfsbackendftp.c:1479 ../daemon/gvfsbackendobexftp.c:1806 + msgid "Can't copy directory over directory" + msgstr "フォルダーがフォルダーの上書になるコピーはできません" + +-#: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendmtp.c:1469 +-#: ../daemon/gvfsbackendmtp.c:1576 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "フォルダーを再帰的にコピーできません" + +-#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4259 +-#: ../daemon/gvfsbackendsmb.c:2176 ++#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2760 ++#: ../daemon/gvfsbackendsftp.c:4497 ../daemon/gvfsbackendsmb.c:2206 + msgid "Can't move directory over directory" + msgstr "フォルダーがフォルダーの上書きになる移動はできません" + +-#: ../daemon/gvfsbackendafp.c:1229 ../daemon/gvfsbackendafp.c:1328 ++#: ../daemon/gvfsbackendafp.c:1269 ../daemon/gvfsbackendafp.c:1368 + msgid "backups not supported" + msgstr "バックアップはサポートされていません" + +-#: ../daemon/gvfsbackendafp.c:1243 ++#: ../daemon/gvfsbackendafp.c:1283 + #, c-format + msgid "Unable to create temporary file (%s)" + msgstr "一時ファイルを生成できません (%s)" + +-#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2369 +-#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsmb.c:1232 ++#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2376 ++#: ../daemon/gvfsbackendsftp.c:3485 ../daemon/gvfsbackendsmb.c:1235 + msgid "The file was externally modified" + msgstr "そのファイルは他のプロセスで変更されました" + +-#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1129 +-#: ../daemon/gvfsbackendsftp.c:4631 ++#: ../daemon/gvfsbackendafp.c:1774 ../daemon/gvfsbackendftp.c:1134 ++#: ../daemon/gvfsbackendsftp.c:4869 + msgid "Invalid attribute type (uint32 expected)" + msgstr "無効な属性タイプ (uint32 であるべき)" + + #. Translators: first %s is volumename, second username and third servername +-#: ../daemon/gvfsbackendafp.c:2061 ++#: ../daemon/gvfsbackendafp.c:2108 + #, c-format + msgid "%s for %s on %s" + msgstr "%3$s 上の %2$s が使用する %1$s" + +-#: ../daemon/gvfsbackendafp.c:2110 ++#: ../daemon/gvfsbackendafp.c:2157 + 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 " +-#: ../daemon/gvfsbackendarchive.c:331 ../daemon/gvfsbackendsftp.c:2275 ++#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2315 + #: ../daemon/gvfsftpdircache.c:431 + #, c-format + msgid "/ on %s" + msgstr "%s の / (ルート)" + +-#: ../daemon/gvfsbackendarchive.c:789 ../daemon/gvfsbackendburn.c:679 +-#: ../daemon/gvfsbackendcomputer.c:728 ../daemon/gvfsbackenddnssd.c:464 +-#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:744 +-#: ../daemon/gvfsbackendsftp.c:3867 ../daemon/gvfsftpdircache.c:157 ++#: ../daemon/gvfsbackendarchive.c:876 ../daemon/gvfsbackendburn.c:679 ++#: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464 ++#: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendnetwork.c:744 ++#: ../daemon/gvfsbackendsftp.c:4003 ../daemon/gvfsftpdircache.c:157 + msgid "The file is not a directory" + msgstr "そのファイルはフォルダーではありません" + +@@ -772,12 +812,12 @@ + #: ../daemon/gvfsbackendburn.c:447 ../daemon/gvfsbackendburn.c:671 + #: ../daemon/gvfsbackendburn.c:716 ../daemon/gvfsbackendburn.c:742 + #: ../daemon/gvfsbackendburn.c:780 ../daemon/gvfsbackendburn.c:971 +-#: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:794 +-#: ../daemon/gvfsbackendgphoto2.c:1238 ../daemon/gvfsbackendgphoto2.c:2177 +-#: ../daemon/gvfsbackendgphoto2.c:2895 ../daemon/gvfsbackendrecent.c:105 +-#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1829 +-#: ../daemon/gvfsbackendsftp.c:2935 ../daemon/gvfsbackendsftp.c:2948 +-#: ../daemon/gvfsbackendsftp.c:2968 ../daemon/gvfsbackendtrash.c:216 ++#: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:799 ++#: ../daemon/gvfsbackendgphoto2.c:1246 ../daemon/gvfsbackendgphoto2.c:2169 ++#: ../daemon/gvfsbackendgphoto2.c:2887 ../daemon/gvfsbackendrecent.c:106 ++#: ../daemon/gvfsbackendrecent.c:287 ../daemon/gvfsbackendsftp.c:1869 ++#: ../daemon/gvfsbackendsftp.c:2999 ../daemon/gvfsbackendsftp.c:3012 ++#: ../daemon/gvfsbackendsftp.c:3032 ../daemon/gvfsbackendtrash.c:218 + #, c-format + msgid "No such file or directory" + msgstr "そのようなファイルやフォルダーは存在しません" +@@ -795,7 +835,7 @@ + #: ../daemon/gvfsbackendburn.c:752 ../daemon/gvfsbackendburn.c:788 + #: ../daemon/gvfsbackendburn.c:923 ../daemon/gvfsbackendburn.c:985 + #: ../daemon/gvfsbackendburn.c:989 ../daemon/gvfsbackendburn.c:999 +-#: ../daemon/gvfsbackendgphoto2.c:2969 ++#: ../daemon/gvfsbackendgphoto2.c:2961 + msgid "File exists" + msgstr "ファイルが存在します" + +@@ -803,11 +843,11 @@ + #: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:121 + #: ../daemon/gvfsjobcreatemonitor.c:143 ../daemon/gvfsjobcreatemonitor.c:154 + #: ../daemon/gvfsjobcreatemonitor.c:177 ../daemon/gvfsjobcreatemonitor.c:195 +-#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:268 ++#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:272 + #: ../daemon/gvfsjobmakedirectory.c:108 ../daemon/gvfsjobmount.c:112 + #: ../daemon/gvfsjobmountmountable.c:138 ../daemon/gvfsjobmove.c:121 +-#: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:132 +-#: ../daemon/gvfsjobopenforwrite.c:146 ../daemon/gvfsjobopenforwrite.c:160 ++#: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:184 ++#: ../daemon/gvfsjobopenforwrite.c:198 ../daemon/gvfsjobopenforwrite.c:212 + #: ../daemon/gvfsjobopeniconforread.c:104 ../daemon/gvfsjobpollmountable.c:107 + #: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125 + #: ../daemon/gvfsjobqueryattributes.c:145 ../daemon/gvfsjobqueryfsinfo.c:116 +@@ -816,11 +856,12 @@ + #: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119 + #: ../daemon/gvfsjobsetattribute.c:130 ../daemon/gvfsjobsetdisplayname.c:111 + #: ../daemon/gvfsjobstartmountable.c:113 ../daemon/gvfsjobstopmountable.c:115 +-#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobunmountmountable.c:157 ++#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobtruncate.c:112 ++#: ../daemon/gvfsjobunmountmountable.c:157 + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 +-#: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258 ++#: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1673 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "バックエンドでサポートしていない操作です" + +@@ -828,46 +869,48 @@ + msgid "No such file or directory in target path" + msgstr "転送先のパスに、そのようなファイルやフォルダーは存在しません" + +-#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackendobexftp.c:1814 +-#: ../daemon/gvfsbackendobexftp.c:1845 ../daemon/gvfsbackendsftp.c:1823 +-#: ../daemon/gvfsbackendsftp.c:4429 ++#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2799 ++#: ../daemon/gvfsbackendobexftp.c:1814 ../daemon/gvfsbackendobexftp.c:1845 ++#: ../daemon/gvfsbackendsftp.c:1863 ../daemon/gvfsbackendsftp.c:4667 + msgid "Target file exists" + msgstr "転送先にファイルが存在します" + +-#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:811 +-#: ../daemon/gvfsbackendgphoto2.c:2545 ../daemon/gvfsbackendgphoto2.c:2758 +-#: ../daemon/gvfsbackendgphoto2.c:2855 ../daemon/gvfsbackendgphoto2.c:2948 ++#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:812 ++#: ../daemon/gvfsbackenddav.c:3141 ../daemon/gvfsbackenddav.c:3173 ++#: ../daemon/gvfsbackendgphoto2.c:2537 ../daemon/gvfsbackendgphoto2.c:2750 ++#: ../daemon/gvfsbackendgphoto2.c:2847 ../daemon/gvfsbackendgphoto2.c:2940 ++#: ../daemon/gvfsbackendgphoto2.c:3549 ../daemon/gvfsbackendgphoto2.c:3559 ++#: ../daemon/gvfsbackendsftp.c:5499 ../daemon/gvfsbackendsftp.c:5531 ++#: ../daemon/gvfsbackendsftp.c:6017 + msgid "Not supported" + msgstr "サポートしていません" + +-#: ../daemon/gvfsbackend.c:977 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "とにかくアンマウントする" + +-#: ../daemon/gvfsbackend.c:980 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." +-msgstr "" +-"ボリュームは使用中です\n" ++msgstr "ボリュームは使用中です\n" + "1つ以上のアプリケーションがボリュームを使用中です。" + +-#: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1548 +-#: ../daemon/gvfsbackendmtp.c:701 ++#: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "gudev クライアントを生成できません" + +-#: ../daemon/gvfsbackendcdda.c:376 ../daemon/gvfsbackendgphoto2.c:1566 ++#: ../daemon/gvfsbackendcdda.c:376 ../daemon/gvfsbackendgphoto2.c:1572 + msgid "Cannot connect to the system bus" + msgstr "システムバスに接続できません" + +-#: ../daemon/gvfsbackendcdda.c:387 ../daemon/gvfsbackendgphoto2.c:1578 ++#: ../daemon/gvfsbackendcdda.c:387 ../daemon/gvfsbackendgphoto2.c:1583 + msgid "Cannot create libhal context" + msgstr "libhal のコンテキストを生成できません" + +-#: ../daemon/gvfsbackendcdda.c:401 ../daemon/gvfsbackendgphoto2.c:1591 ++#: ../daemon/gvfsbackendcdda.c:401 ../daemon/gvfsbackendgphoto2.c:1595 + msgid "Cannot initialize libhal" + msgstr "libhal を初期化できません" + +@@ -895,7 +938,7 @@ + #: ../daemon/gvfsbackendcdda.c:465 ../daemon/gvfsbackendcdda.c:986 + #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325 + #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246 +-#: ../monitor/udisks2/gvfsudisks2volume.c:356 ++#: ../monitor/udisks2/gvfsudisks2volume.c:359 + #, c-format + msgid "Audio Disc" + msgstr "オーディオディスク" +@@ -922,7 +965,7 @@ + msgid "Error seeking in stream on drive %s" + msgstr "ドライブ (%s) のストリームをシークする際にエラー" + +-#: ../daemon/gvfsbackendcdda.c:1015 ../daemon/gvfsbackendgphoto2.c:1864 ++#: ../daemon/gvfsbackendcdda.c:1015 ../daemon/gvfsbackendgphoto2.c:1856 + #, c-format + msgid "No such file" + msgstr "そのようなファイルは存在しません" +@@ -936,118 +979,126 @@ + msgid "Audio CD File System Service" + msgstr "オーディオ CD のファイルシステムサービス" + +-#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:770 ++#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:771 + msgid "Computer" + msgstr "コンピューター" + +-#: ../daemon/gvfsbackendcomputer.c:531 ++#: ../daemon/gvfsbackendcomputer.c:532 + msgid "File System" + msgstr "ファイルシステム" + +-#: ../daemon/gvfsbackendcomputer.c:660 ++#: ../daemon/gvfsbackendcomputer.c:661 + msgid "Can't open mountable file" + msgstr "マウント可能なファイルをオープンできません" + +-#: ../daemon/gvfsbackendcomputer.c:857 ../daemon/gvfsbackendsftp.c:1158 ++#: ../daemon/gvfsbackendcomputer.c:858 + #, c-format + msgid "Internal error: %s" + msgstr "システム内部のエラー: %s" + +-#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1007 ++#: ../daemon/gvfsbackendcomputer.c:890 ../daemon/gvfsbackendcomputer.c:1008 + msgid "Can't mount file" + msgstr "ファイルをマウントできません" + +-#: ../daemon/gvfsbackendcomputer.c:900 ++#: ../daemon/gvfsbackendcomputer.c:901 + msgid "No medium in the drive" + msgstr "ドライブにメディアが挿入されていません" + +-#: ../daemon/gvfsbackendcomputer.c:957 ../daemon/gvfsbackendcomputer.c:1052 +-#: ../daemon/gvfsbackendcomputer.c:1158 ../daemon/gvfsbackendcomputer.c:1248 +-#: ../daemon/gvfsbackendcomputer.c:1321 ../daemon/gvfsbackendcomputer.c:1390 ++#: ../daemon/gvfsbackendcomputer.c:958 ../daemon/gvfsbackendcomputer.c:1053 ++#: ../daemon/gvfsbackendcomputer.c:1159 ../daemon/gvfsbackendcomputer.c:1249 ++#: ../daemon/gvfsbackendcomputer.c:1322 ../daemon/gvfsbackendcomputer.c:1391 + msgid "Not a mountable file" + msgstr "マウント可能なファイルは存在しません" + +-#: ../daemon/gvfsbackendcomputer.c:1071 ++#: ../daemon/gvfsbackendcomputer.c:1072 + msgid "Can't unmount file" + msgstr "ファイルをアンマウントできません" + +-#: ../daemon/gvfsbackendcomputer.c:1201 ++#: ../daemon/gvfsbackendcomputer.c:1202 + msgid "Can't eject file" + msgstr "ファイルを取り出せません" + +-#: ../daemon/gvfsbackendcomputer.c:1268 ../daemon/gvfsbackendcomputer.c:1275 ++#: ../daemon/gvfsbackendcomputer.c:1269 ../daemon/gvfsbackendcomputer.c:1276 + msgid "Can't start drive" + msgstr "ドライブを開始できません" + +-#: ../daemon/gvfsbackendcomputer.c:1341 ../daemon/gvfsbackendcomputer.c:1348 ++#: ../daemon/gvfsbackendcomputer.c:1342 ../daemon/gvfsbackendcomputer.c:1349 + msgid "Can't stop drive" + msgstr "ドライブを停止できません" + +-#: ../daemon/gvfsbackendcomputer.c:1405 ../daemon/gvfsbackendcomputer.c:1412 ++#: ../daemon/gvfsbackendcomputer.c:1406 ../daemon/gvfsbackendcomputer.c:1413 + msgid "Can't poll file" + msgstr "ファイルをpollできません" + + #. Translators: This is the name of the WebDAV share constructed as + #. "WebDAV as on :"; the ":" part is + #. the second %s and only shown if it is not the default http(s) port. +-#: ../daemon/gvfsbackenddav.c:482 ++#: ../daemon/gvfsbackenddav.c:490 + #, c-format + msgid "%s on %s%s" + msgstr "%2$s%3$s 上の %1$s" + +-#: ../daemon/gvfsbackenddav.c:674 ../daemon/gvfsbackenddav.c:1915 +-#: ../daemon/gvfsbackendhttp.c:257 ++#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1916 ++#: ../daemon/gvfsbackendhttp.c:202 + #, c-format + msgid "HTTP Error: %s" + msgstr "HTTP のエラー: %s" + +-#: ../daemon/gvfsbackenddav.c:691 ++#: ../daemon/gvfsbackenddav.c:671 + msgid "Could not parse response" + msgstr "応答メッセージを解析できませんでした" + +-#: ../daemon/gvfsbackenddav.c:700 ++#: ../daemon/gvfsbackenddav.c:680 + msgid "Empty response" + msgstr "応答メッセージが空です" + +-#: ../daemon/gvfsbackenddav.c:708 ++#: ../daemon/gvfsbackenddav.c:688 + msgid "Unexpected reply from server" + msgstr "サーバーからの想定外のリプライです" + +-#: ../daemon/gvfsbackenddav.c:1399 ../daemon/gvfsbackenddav.c:2045 +-#: ../daemon/gvfsbackenddav.c:2132 ../daemon/gvfsbackenddav.c:2233 ++#: ../daemon/gvfsbackenddav.c:1398 ../daemon/gvfsbackenddav.c:2041 ++#: ../daemon/gvfsbackenddav.c:2130 ../daemon/gvfsbackenddav.c:2232 + msgid "Response invalid" + msgstr "応答メッセージが間違っています" + +-#: ../daemon/gvfsbackenddav.c:1542 ++#: ../daemon/gvfsbackenddav.c:1541 + msgid "WebDAV share" + msgstr "WebDAV 共有" + + #. translators: %s here is the hostname + #. Translators: %s is the hostname +-#: ../daemon/gvfsbackenddav.c:1544 ../daemon/gvfsbackendftp.c:491 +-#: ../daemon/gvfsbackendsftp.c:964 ++#: ../daemon/gvfsbackenddav.c:1543 ../daemon/gvfsbackendftp.c:496 ++#: ../daemon/gvfsbackendsftp.c:980 + #, c-format + msgid "Enter password for %s" + msgstr "%s のパスワードを入力してください" + +-#: ../daemon/gvfsbackenddav.c:1547 ++#: ../daemon/gvfsbackenddav.c:1546 + msgid "Please enter proxy password" + msgstr "プロキシのパスワードを入力してください" + +-#: ../daemon/gvfsbackenddav.c:1919 ../daemon/gvfsbackenddav.c:1923 ++#: ../daemon/gvfsbackenddav.c:1920 ../daemon/gvfsbackenddav.c:1924 + msgid "Not a WebDAV enabled share" + msgstr "WebDAV 共有は利用できません" + +-#: ../daemon/gvfsbackenddav.c:1999 ../daemon/gvfsbackenddav.c:2087 +-#: ../daemon/gvfsbackenddav.c:2160 ../daemon/gvfsbackenddav.c:2267 ++#: ../daemon/gvfsbackenddav.c:1995 ../daemon/gvfsbackenddav.c:2085 ++#: ../daemon/gvfsbackenddav.c:2158 ../daemon/gvfsbackenddav.c:2266 + msgid "Could not create request" + msgstr "要求メッセージを生成できませんでした" + +-#: ../daemon/gvfsbackenddav.c:2400 ../daemon/gvfsbackendsmb.c:1268 +-#: ../daemon/gvfsbackendsmb.c:2204 ++#: ../daemon/gvfsbackenddav.c:2407 ../daemon/gvfsbackenddav.c:2731 ++#: ../daemon/gvfsbackendsmb.c:1271 ../daemon/gvfsbackendsmb.c:2234 + msgid "Backup file creation failed" + msgstr "バックアップファイルの生成に失敗しました" + ++#: ../daemon/gvfsbackenddav.c:2765 ++msgid "Can't move over directory" ++msgstr "ディレクトリへの移動はできません" ++ ++#: ../daemon/gvfsbackenddav.c:2928 ++msgid "File length changed during transfer" ++msgstr "転送中にファイルの長さが変更されました" ++ + #: ../daemon/gvfsbackenddnssd.c:511 ../daemon/gvfsbackendnetwork.c:462 + msgid "Local Network" + msgstr "ローカルネットワーク" +@@ -1067,54 +1118,54 @@ + msgstr "ネットワーク" + + #. Translators: the first %s is the username, the second the host name +-#: ../daemon/gvfsbackendftp.c:488 ../daemon/gvfsbackendsftp.c:957 ++#: ../daemon/gvfsbackendftp.c:493 ../daemon/gvfsbackendsftp.c:973 + #, c-format + msgid "Enter password for %s on %s" + msgstr "%2$s の %1$s のパスワードを入力してください" + +-#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:981 +-#: ../daemon/gvfsbackendsmbbrowse.c:1042 ../daemon/gvfsbackendsmb.c:667 ++#: ../daemon/gvfsbackendftp.c:523 ../daemon/gvfsbackendsftp.c:997 ++#: ../daemon/gvfsbackendsmbbrowse.c:1041 ../daemon/gvfsbackendsmb.c:667 + msgid "Password dialog cancelled" + msgstr "パスワードダイアログがキャンセルされました" + +-#: ../daemon/gvfsbackendftp.c:728 ++#: ../daemon/gvfsbackendftp.c:733 + msgid "Insufficient permissions" + msgstr "パーミッションが足りません" + +-#: ../daemon/gvfsbackendftp.c:982 ../daemon/gvfsbackendftp.c:1335 +-#: ../daemon/gvfsbackendsftp.c:3260 ++#: ../daemon/gvfsbackendftp.c:987 ../daemon/gvfsbackendftp.c:1342 ++#: ../daemon/gvfsbackendsftp.c:3329 ../daemon/gvfsbackendsftp.c:3531 + msgid "backups not supported yet" + msgstr "バックアップはまだサポートされていません" + +-#: ../daemon/gvfsbackendgphoto2.c:507 ++#: ../daemon/gvfsbackendgphoto2.c:515 + #, c-format + msgid "%s: %d: Directory or file exists" + msgstr "%s: %d: フォルダーまたはファイルが存在します" + +-#: ../daemon/gvfsbackendgphoto2.c:514 ++#: ../daemon/gvfsbackendgphoto2.c:522 + #, c-format + msgid "%s: %d: No such file or directory" + msgstr "%s: %d: そのようなファイルやフォルダーは存在しません" + +-#: ../daemon/gvfsbackendgphoto2.c:520 ++#: ../daemon/gvfsbackendgphoto2.c:528 + #, c-format + msgid "%s: %d: Invalid filename" + msgstr "%s: %d: ファイル名が間違っています" + +-#: ../daemon/gvfsbackendgphoto2.c:526 ++#: ../daemon/gvfsbackendgphoto2.c:534 + #, c-format + msgid "%s: %d: Not Supported" + msgstr "%s: %d: 未サポートです" + + #. Translator: %s represents the device, e.g. usb:001,042 +-#: ../daemon/gvfsbackendgphoto2.c:738 ../daemon/gvfsbackendgphoto2.c:744 ++#: ../daemon/gvfsbackendgphoto2.c:746 ../daemon/gvfsbackendgphoto2.c:752 + #, 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:972 ../monitor/gphoto2/ggphoto2volume.c:197 ++#: ../daemon/gvfsbackendgphoto2.c:980 ../monitor/gphoto2/ggphoto2volume.c:197 + #: ../monitor/gphoto2/ggphoto2volume.c:299 + #, c-format + msgid "%s Camera" +@@ -1122,252 +1173,265 @@ + + #. Translator: %s is the vendor name, e.g. Panasonic + #. Translators: %s is the device vendor +-#: ../daemon/gvfsbackendgphoto2.c:975 ../monitor/gphoto2/ggphoto2volume.c:192 ++#: ../daemon/gvfsbackendgphoto2.c:983 ../monitor/gphoto2/ggphoto2volume.c:192 + #: ../monitor/gphoto2/ggphoto2volume.c:294 + #, c-format + msgid "%s Audio Player" + msgstr "%s 製のオーディオプレイヤー" + +-#: ../daemon/gvfsbackendgphoto2.c:984 ../monitor/gphoto2/ggphoto2volume.c:203 ++#: ../daemon/gvfsbackendgphoto2.c:992 ../monitor/gphoto2/ggphoto2volume.c:203 + #: ../monitor/gphoto2/ggphoto2volume.c:308 + msgid "Camera" + msgstr "カメラ" + +-#: ../daemon/gvfsbackendgphoto2.c:986 ../monitor/gphoto2/ggphoto2volume.c:306 ++#: ../daemon/gvfsbackendgphoto2.c:994 ../monitor/gphoto2/ggphoto2volume.c:306 + msgid "Audio Player" + msgstr "オーディオプレイヤー" + +-#: ../daemon/gvfsbackendgphoto2.c:1607 ../daemon/gvfsbackendmtp.c:693 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "デバイスが指定されていません" + +-#: ../daemon/gvfsbackendgphoto2.c:1628 ++#: ../daemon/gvfsbackendgphoto2.c:1631 + msgid "Cannot create gphoto2 context" + msgstr "gphoto2 のコンテキストを生成できません" + +-#: ../daemon/gvfsbackendgphoto2.c:1638 ++#: ../daemon/gvfsbackendgphoto2.c:1640 + msgid "Error creating camera" + msgstr "カメラオブジェクトを生成できません" + +-#: ../daemon/gvfsbackendgphoto2.c:1651 ../daemon/gvfsbackendgphoto2.c:1661 ++#: ../daemon/gvfsbackendgphoto2.c:1652 ../daemon/gvfsbackendgphoto2.c:1661 + msgid "Error loading device information" + msgstr "デバイス情報を読み込む際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1673 ++#: ../daemon/gvfsbackendgphoto2.c:1672 + msgid "Error looking up device information" + msgstr "デバイス情報を検索する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1683 ++#: ../daemon/gvfsbackendgphoto2.c:1681 + msgid "Error getting device information" + msgstr "デバイス情報を取得する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1698 ++#: ../daemon/gvfsbackendgphoto2.c:1695 + msgid "Error setting up camera communications port" + msgstr "カメラに接続するポートを設定する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1709 ++#: ../daemon/gvfsbackendgphoto2.c:1705 + 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:1724 ++#: ../daemon/gvfsbackendgphoto2.c:1716 + #, c-format + msgid "gphoto2 mount on %s" + msgstr "gphoto2 が %s にマウントしました" + +-#: ../daemon/gvfsbackendgphoto2.c:1810 ++#: ../daemon/gvfsbackendgphoto2.c:1802 + msgid "No camera specified" + msgstr "カメラが指定されていません" + +-#: ../daemon/gvfsbackendgphoto2.c:1872 ++#: ../daemon/gvfsbackendgphoto2.c:1864 ../daemon/gvfsbackendgphoto2.c:3590 + msgid "Error creating file object" + msgstr "ファイルオブジェクトを生成する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1887 ++#: ../daemon/gvfsbackendgphoto2.c:1879 ../daemon/gvfsbackendgphoto2.c:3621 + msgid "Error getting file" + msgstr "ファイルを取得する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1897 ++#: ../daemon/gvfsbackendgphoto2.c:1889 + msgid "Error getting data from file" + msgstr "ファイルのデータを取得する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:1955 ../daemon/gvfsbackendmtp.c:1854 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "アイコンの識別子の形式が間違っています: '%s'" + +-#: ../daemon/gvfsbackendgphoto2.c:2031 ../daemon/gvfsbackendgphoto2.c:3219 ++#: ../daemon/gvfsbackendgphoto2.c:2023 ../daemon/gvfsbackendgphoto2.c:3212 + #, c-format + msgid "Error seeking in stream on camera %s" + msgstr "カメラ (%s) のストリームを検索する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2171 ../daemon/gvfsbackendsftp.c:2938 +-#: ../daemon/gvfsbackendsmbbrowse.c:1470 ++#: ../daemon/gvfsbackendgphoto2.c:2163 ../daemon/gvfsbackendsftp.c:3002 ++#: ../daemon/gvfsbackendsmbbrowse.c:1469 + msgid "Not a directory" + msgstr "フォルダーではありません" + +-#: ../daemon/gvfsbackendgphoto2.c:2204 ++#: ../daemon/gvfsbackendgphoto2.c:2196 + msgid "Failed to get folder list" + msgstr "フォルダーの一覧を取得できませんでした" + +-#: ../daemon/gvfsbackendgphoto2.c:2269 ++#: ../daemon/gvfsbackendgphoto2.c:2261 + msgid "Failed to get file list" + msgstr "ファイルの一覧を取得できませんでした" + +-#: ../daemon/gvfsbackendgphoto2.c:2557 ++#: ../daemon/gvfsbackendgphoto2.c:2549 + msgid "Error creating directory" + msgstr "フォルダーを生成する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2770 ++#: ../daemon/gvfsbackendgphoto2.c:2762 + msgid "Name already exists" + msgstr "既に存在しています" + +-#: ../daemon/gvfsbackendgphoto2.c:2781 ../daemon/gvfsbackendgphoto2.c:3414 ++#: ../daemon/gvfsbackendgphoto2.c:2773 ../daemon/gvfsbackendgphoto2.c:3441 + msgid "New name too long" + msgstr "新しい名前が長すぎます" + +-#: ../daemon/gvfsbackendgphoto2.c:2791 ../daemon/gvfsbackendgphoto2.c:3425 ++#: ../daemon/gvfsbackendgphoto2.c:2783 ../daemon/gvfsbackendgphoto2.c:3452 + msgid "Error renaming directory" + msgstr "フォルダー名を変更する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2804 ../daemon/gvfsbackendgphoto2.c:3438 ++#: ../daemon/gvfsbackendgphoto2.c:2796 ../daemon/gvfsbackendgphoto2.c:3465 + msgid "Error renaming file" + msgstr "ファイル名を変更する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2868 ++#: ../daemon/gvfsbackendgphoto2.c:2860 + #, c-format + msgid "Directory '%s' is not empty" + msgstr "フォルダー (%s) は空ではありません" + +-#: ../daemon/gvfsbackendgphoto2.c:2879 ++#: ../daemon/gvfsbackendgphoto2.c:2871 + msgid "Error deleting directory" + msgstr "フォルダーを削除する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2905 ++#: ../daemon/gvfsbackendgphoto2.c:2897 ../daemon/gvfsbackendgphoto2.c:3642 + msgid "Error deleting file" + msgstr "ファイルを削除する際にエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:2958 ++#: ../daemon/gvfsbackendgphoto2.c:2950 + msgid "Can't write to directory" + msgstr "フォルダーに書き込めません" + +-#: ../daemon/gvfsbackendgphoto2.c:3005 ++#: ../daemon/gvfsbackendgphoto2.c:2997 + msgid "Cannot allocate new file to append to" + msgstr "追加先の新しいファイルを確保できません" + +-#: ../daemon/gvfsbackendgphoto2.c:3020 ++#: ../daemon/gvfsbackendgphoto2.c:3012 + msgid "Cannot read file to append to" + msgstr "追加先のファイルを読み込めません" + +-#: ../daemon/gvfsbackendgphoto2.c:3031 ++#: ../daemon/gvfsbackendgphoto2.c:3023 + msgid "Cannot get data of file to append to" + msgstr "追加先のファイルのデータを取得できません" + +-#: ../daemon/gvfsbackendgphoto2.c:3322 ++#: ../daemon/gvfsbackendgphoto2.c:3349 + msgid "Error writing file" + msgstr "ファイルの書き込みでエラー" + +-#: ../daemon/gvfsbackendgphoto2.c:3370 ++#: ../daemon/gvfsbackendgphoto2.c:3397 + msgid "Not supported (not same directory)" + msgstr "未サポートです (同じフォルダーではありません)" + +-#: ../daemon/gvfsbackendgphoto2.c:3382 +-msgid "Not supported (the source is a directory, the destination is a directory too)" ++#: ../daemon/gvfsbackendgphoto2.c:3409 ++msgid "" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "未サポートです (転送元と転送先の双方がフォルダー)" + +-#: ../daemon/gvfsbackendgphoto2.c:3390 +-msgid "Not supported (the source is a directory, but the destination is an existing file)" ++#: ../daemon/gvfsbackendgphoto2.c:3417 ++msgid "" ++"Not supported (the source is a directory, but the destination is an existing " ++"file)" + msgstr "未サポートです (転送元がフォルダーで転送先にファイルが存在)" + +-#: ../daemon/gvfsbackendgphoto2.c:3402 +-msgid "Not supported (the source is a file, but the destination is a directory)" ++#: ../daemon/gvfsbackendgphoto2.c:3429 ++msgid "" ++"Not supported (the source is a file, but the destination is a directory)" + msgstr "未サポートです (転送元がファイルで転送先がフォルダー)" + +-#: ../daemon/gvfsbackendhttp.c:253 ++#: ../daemon/gvfsbackendhttp.c:198 + #, c-format + msgid "HTTP Client Error: %s" + msgstr "HTTP クライアントのエラー: %s" + +-#: ../daemon/gvfsbackendlocaltest.c:856 ++#: ../daemon/gvfsbackendlocaltest.c:857 + msgid "Directory notification not supported" + msgstr "フォルダー通知はサポートしていません" + +-#: ../daemon/gvfsbackendmtp.c:508 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "不明なエラー" + +-#: ../daemon/gvfsbackendmtp.c:514 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "libmtp エラー: %s" + +-#: ../daemon/gvfsbackendmtp.c:647 +-msgid "Unexpected host uri format." ++#: ../daemon/gvfsbackendmtp.c:801 ++msgid "Unexpected host URI format." + msgstr "予期せぬホスト URI 形式です。" + +-#: ../daemon/gvfsbackendmtp.c:657 +-msgid "Malformed host uri." ++#: ../daemon/gvfsbackendmtp.c:811 ++msgid "Malformed host URI." + msgstr "ホスト URI 形式が間違っています。" + +-#: ../daemon/gvfsbackendmtp.c:670 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "一致する udev デバイスを見つけられませんでした" + +-#: ../daemon/gvfsbackendmtp.c:814 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "MTP デバイスが見つかりませんでした" + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "MTP デバイスに接続できません" + +-#: ../daemon/gvfsbackendmtp.c:824 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "MTP デバイス検出中にメモリーを割り当てることはできません" + +-#: ../daemon/gvfsbackendmtp.c:830 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "一般的な libmtp エラー" + +-#: ../daemon/gvfsbackendmtp.c:847 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "MTP デバイス '%s' を開けません" + +-#: ../daemon/gvfsbackendmtp.c:899 ++#: ../daemon/gvfsbackendmtp.c:1032 ++msgid "Device not found" ++msgstr "デバイスが見つかりません" ++ ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "名前のないデバイス" + +-#: ../daemon/gvfsbackendmtp.c:1119 ../daemon/gvfsbackendmtp.c:1254 +-#: ../daemon/gvfsbackendmtp.c:1306 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "ファイルが見つかりません" + +-#: ../daemon/gvfsbackendmtp.c:1367 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "ここにはフォルダーを作成できません" + +-#: ../daemon/gvfsbackendmtp.c:1426 ../daemon/gvfsbackendmtp.c:1652 +-#: ../daemon/gvfsbackendmtp.c:1697 ../daemon/gvfsbackendmtp.c:1765 +-#: ../daemon/gvfsbackendmtp.c:2092 ../daemon/gvfsbackendmtp.c:2157 +-#: ../daemon/gvfsbackendsmbbrowse.c:1210 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 ++#: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "通常のファイルではありません" + +-#: ../daemon/gvfsbackendmtp.c:1531 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 ++msgid "Target is a directory" ++msgstr "ターゲットはディレクトリーです" ++ ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 ++msgid "Can't merge directories" ++msgstr "ディレクトリーをマージできません" ++ ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "ここには書き込めません" + +-#: ../daemon/gvfsbackendmtp.c:1835 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "エンティティ '%s' のサムネイルはありません" + +-#: ../daemon/gvfsbackendmtp.c:2005 ../daemon/gvfsftptask.c:407 +-msgid "Invalid filename" +-msgstr "ファイル名が無効です" +- + #: ../daemon/gvfsbackendnetwork.c:168 + msgid "File Sharing" + msgstr "ファイルの共有" +@@ -1376,7 +1440,7 @@ + msgid "Remote Login" + msgstr "リモートログイン" + +-#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:929 ++#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:928 + msgid "Windows Network" + msgstr "Windows ネットワーク" + +@@ -1398,152 +1462,171 @@ + msgid "Device requires a software update" + msgstr "デバイスはソフトウェアの更新が必要です" + +-#: ../daemon/gvfsbackendobexftp.c:1882 ../daemon/gvfsbackendsmb.c:2078 ++#: ../daemon/gvfsbackendobexftp.c:1882 ../daemon/gvfsbackendsmb.c:2108 + #, c-format + msgid "Error deleting file: %s" + msgstr "ファイルを削除する際にエラー: %s" + +-#: ../daemon/gvfsbackendrecent.c:238 ++#: ../daemon/gvfsbackendrecent.c:266 + msgid "The recent folder may not be deleted" + msgstr "最近使用したフォルダーは削除できません" + + #. Translators: this is the display name of the backend + #. translators: This is the name of the backend +-#: ../daemon/gvfsbackendrecent.c:548 ../daemon/gvfsbackendrecent.c:662 ++#: ../daemon/gvfsbackendrecent.c:580 ../daemon/gvfsbackendrecent.c:694 + msgid "Recent" + msgstr "最近" + +-#: ../daemon/gvfsbackendsftp.c:299 ../daemon/gvfsbackendsftp.c:654 ++#: ../daemon/gvfsbackendsftp.c:314 ../daemon/gvfsbackendsftp.c:670 + msgid "SSH program unexpectedly exited" + msgstr "SSH プログラムが突然終了しました" + +-#: ../daemon/gvfsbackendsftp.c:314 ++#: ../daemon/gvfsbackendsftp.c:329 + msgid "Hostname not known" + msgstr "ホスト名が不明です" + +-#: ../daemon/gvfsbackendsftp.c:321 ++#: ../daemon/gvfsbackendsftp.c:336 + msgid "No route to host" + msgstr "ホストへの経路がありません" + +-#: ../daemon/gvfsbackendsftp.c:328 ++#: ../daemon/gvfsbackendsftp.c:343 + msgid "Connection refused by server" + msgstr "サーバーが接続を拒否しました" + +-#: ../daemon/gvfsbackendsftp.c:335 ++#: ../daemon/gvfsbackendsftp.c:350 + msgid "Host key verification failed" + msgstr "ホストの鍵を検証できませんでした" + +-#: ../daemon/gvfsbackendsftp.c:498 ++#: ../daemon/gvfsbackendsftp.c:514 + msgid "Unable to spawn SSH program" + msgstr "SSH プログラムを起動できませんでした" + +-#: ../daemon/gvfsbackendsftp.c:514 ++#: ../daemon/gvfsbackendsftp.c:530 + #, c-format + msgid "Unable to spawn SSH program: %s" + msgstr "SSH プログラムを起動できませんでした: %s" + +-#: ../daemon/gvfsbackendsftp.c:616 ../daemon/gvfsbackendsftp.c:874 ++#: ../daemon/gvfsbackendsftp.c:632 ../daemon/gvfsbackendsftp.c:890 + msgid "Timed out when logging in" + msgstr "ログインがタイムアウトしました" + + #. Translators: the first %s is the username, the second the host name +-#: ../daemon/gvfsbackendsftp.c:954 ++#: ../daemon/gvfsbackendsftp.c:970 + #, c-format + msgid "Enter passphrase for secure key for %s on %s" + msgstr "%2$s の %1$s のセキュアキーのパスフレーズを入力してください" + + #. Translators: %s is the hostname +-#: ../daemon/gvfsbackendsftp.c:961 ++#: ../daemon/gvfsbackendsftp.c:977 + #, c-format + msgid "Enter passphrase for secure key for %s" + msgstr "%s のセキュアキーのパスフレーズを入力してください" + +-#: ../daemon/gvfsbackendsftp.c:1044 ++#: ../daemon/gvfsbackendsftp.c:1060 + msgid "Can't send password" + msgstr "パスワードを送信できません" + +-#: ../daemon/gvfsbackendsftp.c:1052 ++#: ../daemon/gvfsbackendsftp.c:1068 + msgid "Log In Anyway" + msgstr "とにかくログインする" + +-#: ../daemon/gvfsbackendsftp.c:1052 ++#: ../daemon/gvfsbackendsftp.c:1068 + msgid "Cancel Login" + msgstr "ログインをキャンセルする" + +-#: ../daemon/gvfsbackendsftp.c:1061 ++#: ../daemon/gvfsbackendsftp.c:1077 + #, c-format + msgid "" + "Can't verify the identity of “%s”.\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”の IDを検証できません。\n" + "これは、初めてコンピューターにログインした時に発生します。\n" + "\n" + "リモートコンピューターが送信してきた ID は“%s”です。続けても安全かどうか確認したい場合は、システム管理者に連絡してください。" + +-#: ../daemon/gvfsbackendsftp.c:1080 ++#: ../daemon/gvfsbackendsftp.c:1096 + msgid "Login dialog cancelled" + msgstr "ログインのダイアログがキャンセルされました" + +-#: ../daemon/gvfsbackendsftp.c:1100 ++#: ../daemon/gvfsbackendsftp.c:1116 + msgid "Can't send host identity confirmation" + msgstr "ホストの身元を確認できません" + +-#: ../daemon/gvfsbackendsftp.c:1638 ../daemon/gvfsbackendsftp.c:1661 ++#: ../daemon/gvfsbackendsftp.c:1174 ++#, c-format ++msgid "The connection is closed (the underlying SSH process died)" ++msgstr "接続が閉じています (基になる SSH プロセスが終了しました)" ++ ++#: ../daemon/gvfsbackendsftp.c:1175 ++#, c-format ++msgid "Internal error: Unknown Error" ++msgstr "内部エラー: 未知のエラーです" ++ ++#: ../daemon/gvfsbackendsftp.c:1673 ../daemon/gvfsbackendsftp.c:1701 + msgid "Protocol error" + msgstr "プロトコルのエラーです" + +-#: ../daemon/gvfsbackendsftp.c:1728 ++#: ../daemon/gvfsbackendsftp.c:1768 + msgid "Unable to find supported SSH command" + msgstr "SSH コマンドが見つかりません" + +-#: ../daemon/gvfsbackendsftp.c:2002 ../daemon/gvfsbackendsftp.c:2404 +-#: ../daemon/gvfsbackendsftp.c:2463 ../daemon/gvfsbackendsftp.c:2474 +-#: ../daemon/gvfsbackendsftp.c:2530 ../daemon/gvfsbackendsftp.c:2616 +-#: ../daemon/gvfsbackendsftp.c:2666 ../daemon/gvfsbackendsftp.c:2712 +-#: ../daemon/gvfsbackendsftp.c:2787 ../daemon/gvfsbackendsftp.c:2894 +-#: ../daemon/gvfsbackendsftp.c:3011 ../daemon/gvfsbackendsftp.c:3092 +-#: ../daemon/gvfsbackendsftp.c:3164 ../daemon/gvfsbackendsftp.c:3176 +-#: ../daemon/gvfsbackendsftp.c:3232 ../daemon/gvfsbackendsftp.c:3274 +-#: ../daemon/gvfsbackendsftp.c:3459 ../daemon/gvfsbackendsftp.c:3491 +-#: ../daemon/gvfsbackendsftp.c:3546 ../daemon/gvfsbackendsftp.c:3603 +-#: ../daemon/gvfsbackendsftp.c:3900 ../daemon/gvfsbackendsftp.c:3967 +-#: ../daemon/gvfsbackendsftp.c:4102 ../daemon/gvfsbackendsftp.c:4162 +-#: ../daemon/gvfsbackendsftp.c:4197 ../daemon/gvfsbackendsftp.c:4225 +-#: ../daemon/gvfsbackendsftp.c:4333 ../daemon/gvfsbackendsftp.c:4387 +-#: ../daemon/gvfsbackendsftp.c:4426 ../daemon/gvfsbackendsftp.c:4460 +-#: ../daemon/gvfsbackendsftp.c:4494 ../daemon/gvfsbackendsftp.c:4509 +-#: ../daemon/gvfsbackendsftp.c:4524 ../daemon/gvfsbackendsftp.c:4602 ++#: ../daemon/gvfsbackendsftp.c:2042 ../daemon/gvfsbackendsftp.c:2444 ++#: ../daemon/gvfsbackendsftp.c:2503 ../daemon/gvfsbackendsftp.c:2514 ++#: ../daemon/gvfsbackendsftp.c:2570 ../daemon/gvfsbackendsftp.c:2659 ++#: ../daemon/gvfsbackendsftp.c:2709 ../daemon/gvfsbackendsftp.c:2762 ++#: ../daemon/gvfsbackendsftp.c:2837 ../daemon/gvfsbackendsftp.c:2944 ++#: ../daemon/gvfsbackendsftp.c:3075 ../daemon/gvfsbackendsftp.c:3157 ++#: ../daemon/gvfsbackendsftp.c:3231 ../daemon/gvfsbackendsftp.c:3243 ++#: ../daemon/gvfsbackendsftp.c:3301 ../daemon/gvfsbackendsftp.c:3343 ++#: ../daemon/gvfsbackendsftp.c:3557 ../daemon/gvfsbackendsftp.c:3589 ++#: ../daemon/gvfsbackendsftp.c:3645 ../daemon/gvfsbackendsftp.c:3702 ++#: ../daemon/gvfsbackendsftp.c:3771 ../daemon/gvfsbackendsftp.c:4036 ++#: ../daemon/gvfsbackendsftp.c:4103 ../daemon/gvfsbackendsftp.c:4233 ++#: ../daemon/gvfsbackendsftp.c:4340 ../daemon/gvfsbackendsftp.c:4400 ++#: ../daemon/gvfsbackendsftp.c:4435 ../daemon/gvfsbackendsftp.c:4463 ++#: ../daemon/gvfsbackendsftp.c:4571 ../daemon/gvfsbackendsftp.c:4625 ++#: ../daemon/gvfsbackendsftp.c:4664 ../daemon/gvfsbackendsftp.c:4698 ++#: ../daemon/gvfsbackendsftp.c:4732 ../daemon/gvfsbackendsftp.c:4747 ++#: ../daemon/gvfsbackendsftp.c:4762 ../daemon/gvfsbackendsftp.c:4840 ++#: ../daemon/gvfsbackendsftp.c:5002 ../daemon/gvfsbackendsftp.c:5037 ++#: ../daemon/gvfsbackendsftp.c:5107 ../daemon/gvfsbackendsftp.c:5191 ++#: ../daemon/gvfsbackendsftp.c:5273 ../daemon/gvfsbackendsftp.c:5314 ++#: ../daemon/gvfsbackendsftp.c:5318 ../daemon/gvfsbackendsftp.c:5431 ++#: ../daemon/gvfsbackendsftp.c:5435 ../daemon/gvfsbackendsftp.c:5661 ++#: ../daemon/gvfsbackendsftp.c:5874 ../daemon/gvfsbackendsftp.c:5891 ++#: ../daemon/gvfsbackendsftp.c:6023 ../daemon/gvfsbackendsftp.c:6051 + msgid "Invalid reply received" + msgstr "無効なリプライを受信しました" + +-#: ../daemon/gvfsbackendsftp.c:2263 ../daemon/gvfsbackendsmb.c:1523 ++#: ../daemon/gvfsbackendsftp.c:2303 ../daemon/gvfsbackendsmb.c:1553 + #: ../daemon/gvfsdaemonutils.c:136 + msgid " (invalid encoding)" + msgstr " (無効なエンコーディング)" + +-#: ../daemon/gvfsbackendsftp.c:2348 ++#: ../daemon/gvfsbackendsftp.c:2388 + msgid "Failure" + msgstr "失敗" + +-#: ../daemon/gvfsbackendsftp.c:2732 ++#: ../daemon/gvfsbackendsftp.c:2782 + #, c-format + msgid "Error creating backup file: %s" + msgstr "バックアップファイルを生成する際にエラー: %s" + +-#: ../daemon/gvfsbackendsftp.c:3336 ++#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsftp.c:5342 + msgid "Unable to create temporary file" + msgstr "一時ファイルを生成できません" + + #. translators: %s is a server name +-#: ../daemon/gvfsbackendsmbbrowse.c:380 ++#: ../daemon/gvfsbackendsmbbrowse.c:379 + #, c-format + msgid "Password required for %s" + msgstr "%s のパスワードを入力してください" + +-#: ../daemon/gvfsbackendsmbbrowse.c:864 ../daemon/gvfsbackendsmbbrowse.c:911 ++#: ../daemon/gvfsbackendsmbbrowse.c:863 ../daemon/gvfsbackendsmbbrowse.c:910 + #: ../daemon/gvfsbackendsmb.c:524 ../daemon/gvfsbackendsmb.c:570 + #: ../daemon/gvfsbackendsmb.c:748 + #, c-format +@@ -1552,18 +1635,18 @@ + + #. translators: Name for the location that lists the smb shares + #. availible on a server (%s is the name of the server) +-#: ../daemon/gvfsbackendsmbbrowse.c:938 ++#: ../daemon/gvfsbackendsmbbrowse.c:937 + #, c-format + msgid "Windows shares on %s" + msgstr "%s 上のWindows 共有" + + #. translators: We tried to mount a windows (samba) share, but failed +-#: ../daemon/gvfsbackendsmbbrowse.c:1047 ++#: ../daemon/gvfsbackendsmbbrowse.c:1046 + #, c-format + msgid "Failed to retrieve share list from server: %s" + msgstr "サーバーから共有リストを取得できませんでした: %s" + +-#: ../daemon/gvfsbackendsmbbrowse.c:1559 ++#: ../daemon/gvfsbackendsmbbrowse.c:1558 + msgid "Windows Network File System Service" + msgstr "Windows ネットワークのファイルシステムサービス" + +@@ -1579,66 +1662,72 @@ + msgid "Failed to mount Windows share: %s" + msgstr "Windows 共有をマウントできませんでした: %s" + +-#: ../daemon/gvfsbackendsmb.c:872 ../daemon/gvfsbackendsmb.c:1368 ++#: ../daemon/gvfsbackendsmb.c:873 ../daemon/gvfsbackendsmb.c:1372 + msgid "Unsupported seek type" + msgstr "サポートしていないシークの種類です" + +-#: ../daemon/gvfsbackendsmb.c:1460 ++#: ../daemon/gvfsbackendsmb.c:1480 + #, c-format + msgid "Backup file creation failed: %s" + msgstr "バックアップファイルの生成に失敗しました: %s" + +-#: ../daemon/gvfsbackendsmb.c:1840 ++#: ../daemon/gvfsbackendsmb.c:1886 + msgid "Invalid attribute type (uint64 expected)" + msgstr "無効な属性タイプ (uint64 であるべき)" + +-#: ../daemon/gvfsbackendsmb.c:2027 ++#: ../daemon/gvfsbackendsmb.c:2057 + msgid "Can't rename file, filename already exists" + msgstr "ファイルの名前を変更できません。ファイルが既に存在しています" + +-#: ../daemon/gvfsbackendsmb.c:2152 ++#: ../daemon/gvfsbackendsmb.c:2182 + #, c-format + msgid "Error moving file: %s" + msgstr "ファイルを移動する際にエラー: %s" + +-#: ../daemon/gvfsbackendsmb.c:2224 ++#: ../daemon/gvfsbackendsmb.c:2254 + #, c-format + msgid "Error removing target file: %s" + msgstr "対象のファイルを削除する際にエラー: %s" + +-#: ../daemon/gvfsbackendsmb.c:2248 ++#: ../daemon/gvfsbackendsmb.c:2278 + msgid "Can't recursively move directory" + msgstr "フォルダーを再帰的に移動できません" + +-#: ../daemon/gvfsbackendsmb.c:2293 ++#: ../daemon/gvfsbackendsmb.c:2324 + msgid "Windows Shares File System Service" + msgstr "Windows 共有のファイルシステムサービス" + +-#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426 ++#: ../daemon/gvfsbackendtrash.c:399 ../daemon/gvfsbackendtrash.c:455 + msgid "The trash folder may not be deleted" + msgstr "ゴミ箱フォルダーは削除できません" + +-#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440 ++#: ../daemon/gvfsbackendtrash.c:416 ../daemon/gvfsbackendtrash.c:469 + 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:755 ../daemon/gvfsbackendtrash.c:867 ++#: ../daemon/gvfsbackendtrash.c:768 ../daemon/gvfsbackendtrash.c:880 + msgid "Trash" + msgstr "ゴミ箱" + ++#: ../daemon/gvfschannel.c:332 ++msgid "Channel blocked" ++msgstr "チャンネルがブロックされました" ++ + #: ../daemon/gvfsftpconnection.c:180 + msgid "Unexpected end of stream" + msgstr "予期せぬストリームの末尾です" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + 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 +@@ -1649,42 +1738,46 @@ + msgid "Filename contains invalid characters." + msgstr "ファイル名に無効な文字が含まれています。" + +-#: ../daemon/gvfsftptask.c:261 ++#: ../daemon/gvfsftptask.c:268 + msgid "The FTP server is busy. Try again later" + msgstr "FTP サーバーがビジーです。後でもう一度試してください。" + +-#: ../daemon/gvfsftptask.c:355 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "バックエンドは現在アンマウントしています" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "アカウントがサポートされていません" + +-#: ../daemon/gvfsftptask.c:359 +-msgid "Host closed connection" +-msgstr "ホストが接続を閉じました" +- +-#: ../daemon/gvfsftptask.c:363 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "データの接続を開始できません (おそらくファイアウォールが邪魔していると思われます)" + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "データの接続を閉じました" + +-#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "操作に失敗しました" + +-#: ../daemon/gvfsftptask.c:383 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "サーバーの容量が足りません" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "サポートしていないネットワークプロトコルです" + +-#: ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "ページの種類が不明です" + ++#: ../daemon/gvfsftptask.c:423 ++msgid "Invalid filename" ++msgstr "ファイル名が無効です" ++ + #: ../daemon/gvfsjobmakesymlink.c:111 + msgid "Symlinks not supported by backend" + msgstr "バックエンドはシンボリックリンクをサポートしていません" +@@ -1700,52 +1793,54 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"%s をアンマウントしています\n" ++msgstr "%s をアンマウントしています\n" + "しばらくお待ちください" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "ファイルシステムは使用中です" + +-#: ../daemon/main.c:140 ../metadata/meta-daemon.c:482 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "古いデーモンを置きかえる" + +-#: ../daemon/main.c:141 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "fuse を起動しない" + +-#: ../daemon/main.c:155 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 ++msgid "Show program version." ++msgstr "プログラムのバージョンを表示します。" ++ ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "GVFS デーモン" + +-#: ../daemon/main.c:158 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "GVFS のメインデーモン" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:173 ../metadata/meta-daemon.c:507 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:175 ../metadata/meta-daemon.c:509 +-#: ../programs/gvfs-cat.c:168 ../programs/gvfs-cat.c:180 +-#: ../programs/gvfs-copy.c:131 ../programs/gvfs-info.c:392 +-#: ../programs/gvfs-ls.c:414 ../programs/gvfs-mime.c:95 +-#: ../programs/gvfs-mime.c:105 ../programs/gvfs-mime.c:112 +-#: ../programs/gvfs-mkdir.c:69 ../programs/gvfs-monitor-dir.c:124 +-#: ../programs/gvfs-monitor-file.c:123 ../programs/gvfs-mount.c:1055 +-#: ../programs/gvfs-move.c:119 ../programs/gvfs-open.c:76 +-#: ../programs/gvfs-open.c:88 ../programs/gvfs-rename.c:73 +-#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:176 +-#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 +-#: ../programs/gvfs-tree.c:260 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 ++#: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 ++#: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 ++#: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 ++#: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 ++#: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 ++#: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 ++#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 ++#: ../programs/gvfs-tree.c:263 + #, c-format + msgid "Try \"%s --help\" for more information." + msgstr "詳細は \"%s --help\" の出力を確認してください" +@@ -1794,11 +1889,11 @@ + msgid "Unable to move metadata keys" + msgstr "メタデータの値を移動できませんでした" + +-#: ../metadata/meta-daemon.c:492 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "GVFS メタデータデーモン" + +-#: ../metadata/meta-daemon.c:495 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "GVFS のメタデータデーモン" + +@@ -1810,16 +1905,16 @@ + msgid "Floppy Drive" + msgstr "フロッピードライブ" + +-#: ../monitor/gdu/ggdudrive.c:258 ../monitor/udisks2/gvfsudisks2drive.c:284 ++#: ../monitor/gdu/ggdudrive.c:258 ../monitor/udisks2/gvfsudisks2drive.c:286 + #, c-format + msgid "Unnamed Drive (%s)" + msgstr "名前のないドライブ (%s)" + +-#: ../monitor/gdu/ggdudrive.c:260 ../monitor/udisks2/gvfsudisks2drive.c:286 ++#: ../monitor/gdu/ggdudrive.c:260 ../monitor/udisks2/gvfsudisks2drive.c:288 + msgid "Unnamed Drive" + msgstr "名前のないドライブ" + +-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:607 ++#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:609 + #, c-format + msgid "Failed to eject medium; one or more volumes on the medium are busy." + msgstr "メディアを取り出せませんでした (メディアで1つ以上のボリュームが使用中です)" +@@ -1827,7 +1922,8 @@ + #: ../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" + "ドライブをデグレードモードで開始するということは、もはやドライブに故障時の耐障害性がないことを意味します。コンポーネントが故障した場合は、ドライブにあるデータを回復できず失ってしまう可能性があります。" +@@ -1840,11 +1936,13 @@ + msgid "One or more programs are preventing the unmount operation." + msgstr "アンマウント操作を妨げるプログラムが1つ以上あります。" + +-#: ../monitor/gdu/ggdumount.c:985 ++#. Translators: can't get block device with unencrypted data to unmount ++#: ../monitor/gdu/ggdumount.c:986 + msgid "Cannot get LUKS cleartext slave" + msgstr "LUKS cleartext slave を取得できませんでした" + +-#: ../monitor/gdu/ggdumount.c:1007 ++#. Translators: can't get block device with unencrypted data from path ++#: ../monitor/gdu/ggdumount.c:1009 + #, c-format + msgid "Cannot get LUKS cleartext slave from path `%s'" + msgstr "パス `%s' から LUKS cleartext slave を取得できませんでした" +@@ -1858,8 +1956,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data on partition %d." +-msgstr "" +-"ボリュームのロック解除をするパスワードを入力してください\n" ++msgstr "ボリュームのロック解除をするパスワードを入力してください\n" + "デバイス \"%s\" にはパーティション %d 上に暗号化されたデータがあります。" + + #: ../monitor/gdu/ggduvolume.c:1104 +@@ -1867,8 +1964,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data." +-msgstr "" +-"ボリュームのロック解除をするパスワードを入力してください\n" ++msgstr "ボリュームのロック解除をするパスワードを入力してください\n" + "デバイス \"%s\" には暗号化されたデータが含まれています。" + + #: ../monitor/gdu/ggduvolume.c:1111 +@@ -1876,21 +1972,20 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device %s contains encrypted data." +-msgstr "" +-"ボリュームのロック解除をするパスワードを入力してください\n" ++msgstr "ボリュームのロック解除をするパスワードを入力してください\n" + "デバイス %s には暗号化されたデータが含まれています。" + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "%s の org.gnome.OnlineAccounts.Files 取得に失敗しました" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "%s の資格情報が無効です" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "%s の認証方法をサポートしていません" +@@ -2215,7 +2310,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "とにかく取り出す" +@@ -2227,11 +2322,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"データを %s に書込み中です\n" ++msgstr "データを %s に書込み中です\n" + "完了するまで取り外さないでください" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2241,63 +2334,62 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:276 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" + msgstr "%s 暗号済み" + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:288 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" + msgstr "%s ボリューム" + + #. Translators: Name used for volume +-#: ../monitor/udisks2/gvfsudisks2volume.c:524 ++#: ../monitor/udisks2/gvfsudisks2volume.c:527 + msgid "Volume" + msgstr "ボリューム" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1097 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1100 + #, c-format + msgid "Error storing passphrase in keyring (%s)" + msgstr "キーリング (%s) にパスフレーズを保存する際にエラー" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1132 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "キーリング (%s) から無効なパスフレーズを削除する際にエラー" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1197 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "ロックが解除されたデバイスには、その上に認識できるファイルシステムがありません" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1226 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "%s の暗号化パスフレーズ" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1394 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "このボリュームにアクセスするにはパスフレーズが必要です" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1409 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" + "The passphrase is needed to access encrypted data on %s." +-msgstr "" +-"ボリュームのロックを解除するパスフレーズを入力してください\n" ++msgstr "ボリュームのロックを解除するパスフレーズを入力してください\n" + "パスフレーズは、 %s 上の暗号化されたデータへのアクセスに必要です。" + + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1578 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2306,46 +2398,58 @@ + msgid "GVfs UDisks2 Volume Monitor" + msgstr "GVfs UDisks2 ボリュームの監視" + ++#: ../programs/gvfs-cat.c:38 ../programs/gvfs-copy.c:51 ++#: ../programs/gvfs-info.c:42 ../programs/gvfs-ls.c:47 ++#: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 ++#: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 ++#: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 ++#: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 ++#: ../programs/gvfs-tree.c:39 ++msgid "Show program version" ++msgstr "プログラムのバージョンを表示します" ++ + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-cat.c:58 ++#: ../programs/gvfs-cat.c:60 + #, c-format + msgid "%s: %s: error opening file: %s\n" + msgstr "%s: %s: ファイルをオープンする際にエラー: %s\n" + + #. Translators: the first %s is the program name, the + #. second one is the URI of the file. +-#: ../programs/gvfs-cat.c:82 ++#: ../programs/gvfs-cat.c:84 + #, c-format + msgid "%s: %s, error writing to stdout" + msgstr "%s: %s を標準出力に出力する際にエラー" + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-cat.c:95 ++#: ../programs/gvfs-cat.c:97 + #, c-format + msgid "%s: %s: error reading: %s\n" + msgstr "%s: %s: 読み込む際にエラー: %s\n" + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-cat.c:114 ++#: ../programs/gvfs-cat.c:116 + #, c-format + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:閉じる際にエラー: %s\n" + +-#: ../programs/gvfs-cat.c:141 ../programs/gvfs-open.c:59 +-#: ../programs/gvfs-rm.c:56 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 ++#: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "FILE" + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-cat.c:144 ++#: ../programs/gvfs-cat.c:146 + msgid "Concatenate files and print to the standard output." + msgstr "ファイルを連結し、標準出力に出力します。" + +-#: ../programs/gvfs-cat.c:145 ++#: ../programs/gvfs-cat.c:147 + msgid "" + "gvfs-cat works just like the traditional cat utility, but using gvfs\n" + "locations instead of local files: for example you can use something\n" +@@ -2355,253 +2459,261 @@ + "ローカルファイルの代わりに gvfs ロケーションを使用します。例えば、\n" + "smb://server/resource/file.txt をロケーションとして使用できます。" + +-#: ../programs/gvfs-cat.c:149 ++#: ../programs/gvfs-cat.c:151 + msgid "" + "Note: just pipe through cat if you need its formatting options\n" + "like -n, -T or other." +-msgstr "" +-"注意: -n や -T などの書式を変更するオプションを使用する場合\n" ++msgstr "注意: -n や -T などの書式を変更するオプションを使用する場合\n" + "cat コマンドにパイプで渡してください。" + +-#: ../programs/gvfs-cat.c:166 ../programs/gvfs-copy.c:129 +-#: ../programs/gvfs-info.c:390 ../programs/gvfs-ls.c:412 +-#: ../programs/gvfs-mime.c:92 ../programs/gvfs-mkdir.c:67 +-#: ../programs/gvfs-monitor-dir.c:122 ../programs/gvfs-monitor-file.c:121 +-#: ../programs/gvfs-mount.c:1053 ../programs/gvfs-move.c:117 +-#: ../programs/gvfs-open.c:74 ../programs/gvfs-rename.c:71 +-#: ../programs/gvfs-rm.c:68 ../programs/gvfs-save.c:174 +-#: ../programs/gvfs-set-attribute.c:147 ../programs/gvfs-trash.c:102 +-#: ../programs/gvfs-tree.c:258 ++#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 ++#: ../programs/gvfs-info.c:396 ../programs/gvfs-ls.c:428 ++#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 ++#: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 ++#: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 ++#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 ++#: ../programs/gvfs-tree.c:261 + #, 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:178 ../programs/gvfs-open.c:86 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: 場所が見つかりません" + +-#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42 ++#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43 + msgid "No target directory" + msgstr "ターゲットをフォルダーとして扱わない" + +-#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43 ++#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44 + msgid "Show progress" + msgstr "処理状況を表示する" + +-#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44 ++#: ../programs/gvfs-copy.c:47 ../programs/gvfs-move.c:45 + msgid "Prompt before overwrite" + msgstr "上書きする前に確認する" + +-#: ../programs/gvfs-copy.c:47 ++#: ../programs/gvfs-copy.c:48 + msgid "Preserve all attributes" + msgstr "すべての属性を保持する" + +-#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45 +-#: ../programs/gvfs-save.c:43 ++#: ../programs/gvfs-copy.c:49 ../programs/gvfs-move.c:46 ++#: ../programs/gvfs-save.c:45 + msgid "Backup existing destination files" + msgstr "既存の対象ファイルをバックアップする" + +-#: ../programs/gvfs-copy.c:49 ++#: ../programs/gvfs-copy.c:50 + msgid "Never follow symbolic links" + msgstr "シンボリックリンクをたどらない" + +-#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67 ++#: ../programs/gvfs-copy.c:88 ../programs/gvfs-move.c:84 + #, c-format +-msgid "progress" +-msgstr "処理状況" ++msgid "Transferred %s out of %s (%s/s)" ++msgstr "%s を %s (%s/s) から転送しました" + +-#: ../programs/gvfs-copy.c:119 ../programs/gvfs-move.c:107 ++#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130 + msgid "SOURCE" + msgstr "SOURCE" + +-#: ../programs/gvfs-copy.c:119 ../programs/gvfs-move.c:107 +-#: ../programs/gvfs-save.c:163 ++#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130 ++#: ../programs/gvfs-save.c:168 + msgid "DEST" + msgstr "DEST" + +-#: ../programs/gvfs-copy.c:120 ++#: ../programs/gvfs-copy.c:135 + msgid "Copy one or more files from SOURCE to DEST." + msgstr "ひとつ以上のファイルを SOURCE から DEST にコピーします。" + +-#: ../programs/gvfs-copy.c:139 ../programs/gvfs-move.c:127 +-#: ../programs/gvfs-rename.c:81 ++#: ../programs/gvfs-copy.c:160 ../programs/gvfs-move.c:156 ++#: ../programs/gvfs-rename.c:96 + msgid "Missing operand\n" + msgstr "オペランドが見つかりません\n" + +-#: ../programs/gvfs-copy.c:147 ../programs/gvfs-move.c:135 ++#: ../programs/gvfs-copy.c:168 ../programs/gvfs-move.c:164 + msgid "Too many arguments\n" + msgstr "引数が多すぎます\n" + +-#: ../programs/gvfs-copy.c:156 ../programs/gvfs-move.c:144 ++#: ../programs/gvfs-copy.c:177 ../programs/gvfs-move.c:173 + #, c-format + msgid "Target %s is not a directory\n" + msgstr "ターゲット %s はフォルダーではありません\n" + +-#: ../programs/gvfs-copy.c:201 ++#: ../programs/gvfs-copy.c:222 ../programs/gvfs-move.c:213 + #, c-format +-msgid "overwrite %s?" +-msgstr "%s を上書きしますか?" ++msgid "%s: overwrite ‘%s’? " ++msgstr "%s: ‘%s’ を上書きしますか? " + +-#: ../programs/gvfs-copy.c:215 ++#: ../programs/gvfs-copy.c:237 + #, c-format + msgid "Error copying file %s: %s\n" + msgstr "ファイル %s をコピーする際にエラー: %s\n" + +-#: ../programs/gvfs-info.c:37 ++#: ../programs/gvfs-info.c:38 + msgid "List writable attributes" + msgstr "書き込み属性を一覧にする" + +-#: ../programs/gvfs-info.c:38 ++#: ../programs/gvfs-info.c:39 + msgid "Get file system info" + msgstr "ファイルシステムの情報を取得する" + +-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39 ++#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:41 + msgid "The attributes to get" + msgstr "取得する属性を指定する" + +-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39 ++#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:41 + msgid "ATTRIBUTES" + msgstr "ATTRIBUTES" + +-#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43 +-#: ../programs/gvfs-set-attribute.c:37 ++#: ../programs/gvfs-info.c:41 ../programs/gvfs-ls.c:45 ++#: ../programs/gvfs-set-attribute.c:38 + msgid "Don't follow symbolic links" + msgstr "シンボリックリンクをたどらない" + +-#: ../programs/gvfs-info.c:50 ++#: ../programs/gvfs-info.c:52 + msgid "invalid type" + msgstr "無効な種類です" + +-#: ../programs/gvfs-info.c:53 ++#: ../programs/gvfs-info.c:55 + msgid "unknown" + msgstr "不明" + +-#: ../programs/gvfs-info.c:56 ++#: ../programs/gvfs-info.c:58 + msgid "regular" + msgstr "通常ファイル" + +-#: ../programs/gvfs-info.c:59 ++#: ../programs/gvfs-info.c:61 + msgid "directory" + msgstr "フォルダー" + +-#: ../programs/gvfs-info.c:62 ++#: ../programs/gvfs-info.c:64 + msgid "symlink" + msgstr "シンボリックリンク" + +-#: ../programs/gvfs-info.c:65 ++#: ../programs/gvfs-info.c:67 + msgid "special" + msgstr "特殊ファイル" + +-#: ../programs/gvfs-info.c:68 ++#: ../programs/gvfs-info.c:70 + msgid "shortcut" + msgstr "ショートカット" + +-#: ../programs/gvfs-info.c:71 ++#: ../programs/gvfs-info.c:73 + msgid "mountable" + msgstr "マウント可能" + +-#: ../programs/gvfs-info.c:109 ++#: ../programs/gvfs-info.c:111 + #, c-format + msgid "attributes:\n" + msgstr "属性:\n" + + #. Translators: This is a noun and represents and attribute of a file +-#: ../programs/gvfs-info.c:161 ++#: ../programs/gvfs-info.c:163 + #, c-format + msgid "display name: %s\n" + msgstr "名前を表示: %s\n" + + #. Translators: This is a noun and represents and attribute of a file +-#: ../programs/gvfs-info.c:166 ++#: ../programs/gvfs-info.c:168 + #, c-format + msgid "edit name: %s\n" + msgstr "名前を編集: %s\n" + +-#: ../programs/gvfs-info.c:172 ++#: ../programs/gvfs-info.c:174 + #, c-format + msgid "name: %s\n" + msgstr "名前: %s\n" + +-#: ../programs/gvfs-info.c:179 ++#: ../programs/gvfs-info.c:181 + #, c-format + msgid "type: %s\n" + msgstr "種類: %s\n" + +-#: ../programs/gvfs-info.c:185 ++#: ../programs/gvfs-info.c:187 + #, c-format + msgid "size: " + msgstr "サイズ:" + +-#: ../programs/gvfs-info.c:190 ++#: ../programs/gvfs-info.c:192 + #, c-format + msgid "hidden\n" + msgstr "隠しファイル\n" + +-#: ../programs/gvfs-info.c:275 ++#: ../programs/gvfs-info.c:195 ++#, c-format ++msgid "uri: %s\n" ++msgstr "uri: %s\n" ++ ++#: ../programs/gvfs-info.c:281 + msgid "Copy with file" + msgstr "ファイルと共にコピー" + +-#: ../programs/gvfs-info.c:279 ++#: ../programs/gvfs-info.c:285 + msgid "Keep with file when moved" + msgstr "ファイルが移動時に保持" + +-#: ../programs/gvfs-info.c:316 ++#: ../programs/gvfs-info.c:322 + #, c-format + msgid "Error getting writable attributes: %s\n" + msgstr "書き込み属性を取得する際にエラー: %s\n" + +-#: ../programs/gvfs-info.c:321 ++#: ../programs/gvfs-info.c:327 + #, c-format + msgid "Settable attributes:\n" + msgstr "設定可能な属性:\n" + +-#: ../programs/gvfs-info.c:344 ++#: ../programs/gvfs-info.c:350 + #, c-format + msgid "Writable attribute namespaces:\n" + msgstr "書き込み属性の名前空間:\n" + +-#: ../programs/gvfs-info.c:378 ../programs/gvfs-ls.c:395 +-#: ../programs/gvfs-mkdir.c:55 ../programs/gvfs-monitor-dir.c:110 +-#: ../programs/gvfs-monitor-file.c:109 ../programs/gvfs-mount.c:1041 +-#: ../programs/gvfs-rename.c:62 ../programs/gvfs-set-attribute.c:137 +-#: ../programs/gvfs-trash.c:90 ../programs/gvfs-tree.c:246 ++#: ../programs/gvfs-info.c:384 ../programs/gvfs-ls.c:411 ++#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-monitor-dir.c:113 ++#: ../programs/gvfs-monitor-file.c:112 ../programs/gvfs-mount.c:1074 ++#: ../programs/gvfs-rename.c:70 ../programs/gvfs-set-attribute.c:139 ++#: ../programs/gvfs-trash.c:92 ../programs/gvfs-tree.c:249 + msgid "LOCATION" + msgstr "LOCATION" + +-#: ../programs/gvfs-info.c:379 ++#: ../programs/gvfs-info.c:385 + msgid "Show information about locations." + msgstr "場所の情報を表示します。" + +-#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36 ++#: ../programs/gvfs-ls.c:42 ../programs/gvfs-tree.c:37 + msgid "Show hidden files" + msgstr "隠しファイルを表示する" + +-#: ../programs/gvfs-ls.c:41 ++#: ../programs/gvfs-ls.c:43 + msgid "Use a long listing format" + msgstr "長い出力形式を使用する" + +-#: ../programs/gvfs-ls.c:42 ++#: ../programs/gvfs-ls.c:44 + msgid "Show completions" + msgstr "補完候補を表示する" + +-#: ../programs/gvfs-ls.c:42 ++#: ../programs/gvfs-ls.c:44 + msgid "PREFIX" + msgstr "PREFIX" + +-#: ../programs/gvfs-ls.c:166 ../programs/gvfs-ls.c:174 +-#: ../programs/gvfs-rename.c:95 ++#: ../programs/gvfs-ls.c:46 ++msgid "Print full URIs" ++msgstr "完全な URI をプリントします" ++ ++#: ../programs/gvfs-ls.c:182 ../programs/gvfs-ls.c:190 ++#: ../programs/gvfs-rename.c:110 + #, c-format + msgid "Error: %s\n" + msgstr "エラー: %s\n" + +-#: ../programs/gvfs-ls.c:396 ++#: ../programs/gvfs-ls.c:412 + msgid "List the contents of the locations." + msgstr "場所の内容をリスト表示します。" + +-#: ../programs/gvfs-ls.c:397 ++#: ../programs/gvfs-ls.c:413 + msgid "" + "gvfs-ls is similar to the traditional ls utility, but using gvfs\n" + "locations instead of local files: for example you can use something\n" +@@ -2613,479 +2725,344 @@ + "使用することができます。smb://server/resource/file.txt\n" + "ファイル属性は、gvfs 名として、例えば standard::icon のように指定できます。" + +-#: ../programs/gvfs-mime.c:36 ++#: ../programs/gvfs-mime.c:37 + msgid "Query handler for mime-type" + msgstr "MIME型のハンドラーを照会する" + +-#: ../programs/gvfs-mime.c:37 ++#: ../programs/gvfs-mime.c:38 + msgid "Set handler for mime-type" + msgstr "MIME型のハンドラーを設定する" + +-#: ../programs/gvfs-mime.c:80 ++#: ../programs/gvfs-mime.c:82 + msgid "MIMETYPE" + msgstr "MIMETYPE" + +-#: ../programs/gvfs-mime.c:80 ++#: ../programs/gvfs-mime.c:82 + msgid "HANDLER" + msgstr "HANDLER" + +-#: ../programs/gvfs-mime.c:81 ++#: ../programs/gvfs-mime.c:83 + msgid "Get or set the handler for a mime-type." + msgstr "MIME型のハンドラーを取得または設定します。" + +-#: ../programs/gvfs-mime.c:93 ++#: ../programs/gvfs-mime.c:95 + msgid "Specify either --query or --set" + msgstr "--query か --set のどちらかを指定してください" + +-#: ../programs/gvfs-mime.c:104 ++#: ../programs/gvfs-mime.c:112 + #, c-format + msgid "Must specify a single mime-type.\n" + msgstr "単一の MIME 型を指定する必要があります。\n" + +-#: ../programs/gvfs-mime.c:111 ++#: ../programs/gvfs-mime.c:119 + #, c-format + msgid "Must specify the mime-type followed by the default handler.\n" + msgstr "MIME型に続いてデフォルトのハンドラーを指定しなくてはなりません。\n" + +-#: ../programs/gvfs-mime.c:126 ++#: ../programs/gvfs-mime.c:134 + #, c-format + msgid "No default applications for '%s'\n" + msgstr "'%s' 用の標準アプリケーションは設定されていません\n" + +-#: ../programs/gvfs-mime.c:132 ++#: ../programs/gvfs-mime.c:140 + #, c-format + msgid "Default application for '%s': %s\n" + msgstr "'%s' 用の標準アプリケーション: %s\n" + +-#: ../programs/gvfs-mime.c:137 ++#: ../programs/gvfs-mime.c:145 + #, c-format + msgid "Registered applications:\n" + msgstr "登録されているアプリケーション:\n" + +-#: ../programs/gvfs-mime.c:139 ++#: ../programs/gvfs-mime.c:147 + #, c-format + msgid "No registered applications\n" + msgstr "登録されていないアプリケーション:\n" + +-#: ../programs/gvfs-mime.c:150 ++#: ../programs/gvfs-mime.c:158 + #, c-format + msgid "Recommended applications:\n" + msgstr "推奨されているアプリケーション:\n" + +-#: ../programs/gvfs-mime.c:152 ++#: ../programs/gvfs-mime.c:160 + #, c-format + msgid "No recommended applications\n" + msgstr "推奨されていないアプリケーション:\n" + +-#: ../programs/gvfs-mime.c:172 ++#: ../programs/gvfs-mime.c:180 + #, c-format + msgid "Failed to load info for handler '%s'\n" + msgstr "ハンドラー '%s' の情報を読み込めませんでした\n" + +-#: ../programs/gvfs-mime.c:178 ++#: ../programs/gvfs-mime.c:186 + #, c-format + msgid "Failed to set '%s' as the default handler for '%s': %s\n" + msgstr "'%s' を '%s' のデフォルトのハンドラーとして設定できませんでした: %s\n" + +-#: ../programs/gvfs-mkdir.c:33 ++#: ../programs/gvfs-mkdir.c:35 + msgid "Create parent directories" + msgstr "親フォルダーを作成する" + +-#: ../programs/gvfs-mkdir.c:56 ++#: ../programs/gvfs-mkdir.c:59 + msgid "Create directories." + msgstr "フォルダーを作成します。" + +-#: ../programs/gvfs-mkdir.c:87 ../programs/gvfs-mkdir.c:96 ++#: ../programs/gvfs-mkdir.c:96 ../programs/gvfs-mkdir.c:105 + #, 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:40 ../programs/gvfs-monitor-file.c:40 + msgid "Don't send single MOVED events" + msgstr "単独の MOVED イベントを送らない" + +-#: ../programs/gvfs-monitor-dir.c:111 ++#: ../programs/gvfs-monitor-dir.c:114 + msgid "Monitor directories for changes." + msgstr "フォルダーの変更を監視します。" + +-#: ../programs/gvfs-monitor-file.c:110 ++#: ../programs/gvfs-monitor-file.c:113 + msgid "Monitor files for changes." + msgstr "ファイルの変更を監視します。" + +-#: ../programs/gvfs-mount.c:57 ++#: ../programs/gvfs-mount.c:59 + msgid "Mount as mountable" + msgstr "マウント可能としてマウントする" + +-#: ../programs/gvfs-mount.c:58 ++#: ../programs/gvfs-mount.c:60 + msgid "Mount volume with device file" + msgstr "デバイスファイルでボリュームをマウントする" + +-#: ../programs/gvfs-mount.c:58 ++#: ../programs/gvfs-mount.c:60 + msgid "DEVICE" + msgstr "DEVICE" + +-#: ../programs/gvfs-mount.c:59 ++#: ../programs/gvfs-mount.c:61 + msgid "Unmount" + msgstr "アンマウントする" + +-#: ../programs/gvfs-mount.c:60 ++#: ../programs/gvfs-mount.c:62 + msgid "Eject" + msgstr "取り出す" + +-#: ../programs/gvfs-mount.c:61 ++#: ../programs/gvfs-mount.c:63 + msgid "Unmount all mounts with the given scheme" + msgstr "指定されたスキームですべてのマウントを解除する" + +-#: ../programs/gvfs-mount.c:61 ++#: ../programs/gvfs-mount.c:63 + msgid "SCHEME" + msgstr "SCHEME" + + #. Translator: List here is a verb as in 'List all mounts' +-#: ../programs/gvfs-mount.c:63 ++#: ../programs/gvfs-mount.c:65 + msgid "List" + msgstr "リスト表示する" + +-#: ../programs/gvfs-mount.c:64 ++#: ../programs/gvfs-mount.c:66 + msgid "Monitor events" + msgstr "イベントを監視する" + +-#: ../programs/gvfs-mount.c:65 ++#: ../programs/gvfs-mount.c:67 + msgid "Show extra information" + msgstr "その他の情報を表示する" + +-#: ../programs/gvfs-mount.c:169 ../programs/gvfs-mount.c:193 ++#: ../programs/gvfs-mount.c:201 ../programs/gvfs-mount.c:225 + #, c-format + msgid "Error mounting location: %s\n" + msgstr "場所をマウントする際にエラー: %s\n" + +-#: ../programs/gvfs-mount.c:253 ++#: ../programs/gvfs-mount.c:286 + #, c-format + msgid "Error unmounting mount: %s\n" + msgstr "マウントを解除する際にエラー: %s\n" + +-#: ../programs/gvfs-mount.c:276 ../programs/gvfs-mount.c:325 ++#: ../programs/gvfs-mount.c:309 ../programs/gvfs-mount.c:358 + #, c-format + msgid "Error finding enclosing mount: %s\n" + msgstr "閉じているマウントを探す際にエラー: %s\n" + +-#: ../programs/gvfs-mount.c:302 ++#: ../programs/gvfs-mount.c:335 + #, c-format + msgid "Error ejecting mount: %s\n" + msgstr "マウント物を取り出す際にエラー: %s\n" + +-#: ../programs/gvfs-mount.c:781 ++#: ../programs/gvfs-mount.c:814 + #, c-format + msgid "Error mounting %s: %s\n" + msgstr "%s をマウントする際にエラー: %s\n" + +-#: ../programs/gvfs-mount.c:796 ++#: ../programs/gvfs-mount.c:829 + #, c-format + msgid "Mounted %s at %s\n" + msgstr "%s を %s にマウントしました\n" + +-#: ../programs/gvfs-mount.c:846 ++#: ../programs/gvfs-mount.c:879 + #, c-format + msgid "No volume for device file %s\n" + msgstr "デバイスファイル %s にはボリュームがありません\n" + +-#: ../programs/gvfs-mount.c:1042 ++#: ../programs/gvfs-mount.c:1075 + msgid "Mount the locations." + msgstr "ロケーションをマウントします。" + +-#: ../programs/gvfs-move.c:108 ++#: ../programs/gvfs-move.c:131 + msgid "Move one or more files from SOURCE to DEST." + msgstr "SOURCE から DEST にひとつ以上のファイルを移動します。" + +-#: ../programs/gvfs-move.c:197 ++#: ../programs/gvfs-move.c:228 + #, c-format + msgid "Error moving file %s: %s\n" + msgstr "ファイル %s を移動する際にエラー: %s\n" + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:62 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +-msgstr "" +-"この種類のファイルを扱うよう登録された、\n" ++msgstr "この種類のファイルを扱うよう登録された、\n" + "デフォルトのアプリケーションでファイルを開きます。" + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:118 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: 場所を開く際にエラー: %s\n" + +-#: ../programs/gvfs-rename.c:62 ++#: ../programs/gvfs-rename.c:70 + msgid "NEW-NAME" + msgstr "NEW-NAME" + +-#: ../programs/gvfs-rename.c:63 ++#: ../programs/gvfs-rename.c:71 + msgid "Rename a file." + msgstr "ファイル名を変更します。" + +-#: ../programs/gvfs-rename.c:102 ++#: ../programs/gvfs-rename.c:117 + #, c-format + msgid "Rename successful. New uri: %s\n" + msgstr "名前の変更に成功しました。新しいURI: %s\n" + +-#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:68 ++#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:69 + msgid "Ignore nonexistent files, never prompt" + msgstr "存在しないファイルを無視し、問い合わせない" + +-#: ../programs/gvfs-rm.c:57 ++#: ../programs/gvfs-rm.c:59 + msgid "Delete the given files." + msgstr "指定したファイルを削除します。" + +-#: ../programs/gvfs-save.c:44 ++#: ../programs/gvfs-save.c:46 + msgid "Only create if not existing" + msgstr "存在しない場合にのみ作成する" + +-#: ../programs/gvfs-save.c:45 ++#: ../programs/gvfs-save.c:47 + msgid "Append to end of file" + msgstr "ファイルの末尾に追加する" + +-#: ../programs/gvfs-save.c:46 ++#: ../programs/gvfs-save.c:48 + msgid "When creating, restrict access to the current user" + msgstr "ファイルを作成する際に現在のユーザーのみにアクセスを制限する" + ++#: ../programs/gvfs-save.c:49 ++msgid "When replacing, replace as if the destination did not exist" ++msgstr "置き換える場合は、宛先が存在しないかのように置き換えます" ++ + #. Translators: The "etag" is a token allowing to verify whether a file has been modified +-#: ../programs/gvfs-save.c:48 ++#: ../programs/gvfs-save.c:51 + msgid "Print new etag at end" + msgstr "新しい etag を最後に出力する" + + #. Translators: The "etag" is a token allowing to verify whether a file has been modified +-#: ../programs/gvfs-save.c:50 ++#: ../programs/gvfs-save.c:53 + msgid "The etag of the file being overwritten" + msgstr "上書き対象のファイルの etag を指定する" + +-#: ../programs/gvfs-save.c:50 ++#: ../programs/gvfs-save.c:53 + msgid "ETAG" + msgstr "ETAG" + +-#: ../programs/gvfs-save.c:78 ++#: ../programs/gvfs-save.c:83 + #, c-format + msgid "Error opening file: %s\n" + msgstr "ファイルを開く際にエラー: %s\n" + +-#: ../programs/gvfs-save.c:111 ++#: ../programs/gvfs-save.c:116 + msgid "Error reading stdin" + msgstr "標準入力からの読み込み中にエラー" + +-#: ../programs/gvfs-save.c:124 ++#: ../programs/gvfs-save.c:129 + #, c-format + msgid "Error closing: %s\n" + msgstr "閉じる際にエラー: %s\n" + + #. Translators: The "etag" is a token allowing to verify whether a file has been modified +-#: ../programs/gvfs-save.c:137 ++#: ../programs/gvfs-save.c:142 + #, c-format + msgid "Etag not available\n" + msgstr "Etag は利用できません\n" + +-#: ../programs/gvfs-save.c:164 ++#: ../programs/gvfs-save.c:169 + msgid "Read from standard input and save to DEST." + msgstr "標準入力から読み取って DEST に保存します。" + +-#: ../programs/gvfs-set-attribute.c:36 ++#: ../programs/gvfs-set-attribute.c:37 + msgid "Type of the attribute" + msgstr "属性の種類を指定する" + +-#: ../programs/gvfs-set-attribute.c:36 ++#: ../programs/gvfs-set-attribute.c:37 + msgid "TYPE" + msgstr "TYPE" + +-#: ../programs/gvfs-set-attribute.c:137 ++#: ../programs/gvfs-set-attribute.c:139 + msgid "ATTRIBUTE" + msgstr "ATTRIBUTE" + +-#: ../programs/gvfs-set-attribute.c:137 ++#: ../programs/gvfs-set-attribute.c:139 + msgid "VALUE" + msgstr "VALUE" + +-#: ../programs/gvfs-set-attribute.c:138 ++#: ../programs/gvfs-set-attribute.c:140 + msgid "Set a file attribute of LOCATION." + msgstr "LOCATION のファイル属性を設定します。" + +-#: ../programs/gvfs-set-attribute.c:157 ++#: ../programs/gvfs-set-attribute.c:165 + msgid "Location not specified\n" + msgstr "場所が指定されていません\n" + +-#: ../programs/gvfs-set-attribute.c:165 ++#: ../programs/gvfs-set-attribute.c:173 + msgid "Attribute not specified\n" + msgstr "属性が指定されていません\n" + +-#: ../programs/gvfs-set-attribute.c:174 ++#: ../programs/gvfs-set-attribute.c:182 + msgid "Value not specified\n" + msgstr "値が指定されていません\n" + +-#: ../programs/gvfs-set-attribute.c:217 ++#: ../programs/gvfs-set-attribute.c:225 + #, c-format + msgid "Invalid attribute type %s\n" + msgstr "無効な属性タイプ %s\n" + +-#: ../programs/gvfs-set-attribute.c:227 ++#: ../programs/gvfs-set-attribute.c:238 + #, c-format + msgid "Error setting attribute: %s\n" + msgstr "属性を設定する際にエラー: %s\n" + +-#: ../programs/gvfs-trash.c:69 ++#: ../programs/gvfs-trash.c:70 + msgid "Empty the trash" + msgstr "ゴミ箱を空にする" + +-#: ../programs/gvfs-trash.c:91 ++#: ../programs/gvfs-trash.c:93 + msgid "Move files or directories to the trash." + msgstr "ゴミ箱にファイルやフォルダーを移動します。" + +-#: ../programs/gvfs-trash.c:122 ++#: ../programs/gvfs-trash.c:130 + #, c-format + msgid "Error trashing file: %s\n" + msgstr "ファイルを削除する際にエラー: %s\n" + +-#: ../programs/gvfs-tree.c:37 ++#: ../programs/gvfs-tree.c:38 + msgid "Follow symbolic links, mounts and shortcuts" + msgstr "シンボリックリンクやマウント、ショートカットをたどる" + +-#: ../programs/gvfs-tree.c:247 ++#: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "フォルダーの中身をツリー形式で表示します。" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "セッションバスに接続できません" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "デーモンに接続する際にエラー: %s" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "ソケットを生成する際にエラー: %s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "ソケットに接続する際にエラー: %s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "無効な属性情報一覧" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "D-Bus に接続する際にエラー: %s" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "AFP サーバー %s が入力したパスワードを拒否しました" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "%2$s での %1$s の afp パスワードを入力してください" +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "%s での afp パスワードを入力してください" +- +-#~ msgid "AFP volumes for %s on %s" +-#~ msgstr "%s の AFP ボリューム (%s 上) " +- +-#~ msgid "AFP volumes on %s" +-#~ msgstr "%s 上の AFP ボリューム" +- +-#~ msgid "AFP volume %s for %s on %s" +-#~ msgstr "%3$s 上の %2$s の AFP ボリューム %1$s" +- +-#~ msgid "AFP volume %s on %s" +-#~ msgstr "%1$s 上の AFP ボリューム %2$s" +- +-#~ msgid "WebDAV as %s on %s%s" +-#~ msgstr "%2$s%3$s での %1$s の WebDAV 共有" +- +-#~ msgid "WebDAV on %s%s" +-#~ msgstr "%s%s での WebDAV 共有" +- +-#~ msgid "Enter password for FTP as %s on %s" +-#~ msgstr "%2$s での %1$s の FTP パスワードを入力してください" +- +-#~ msgid "Enter password for FTP on %s" +-#~ msgstr "%s の FTP パスワードを入力してください" +- +-#~ msgid "FTP on %s" +-#~ msgstr "%s の FTP" +- +-#~ msgid "FTP as %s on %s" +-#~ msgstr "%2$s で %1$s として FTP" +- +-#~ msgid "Enter passphrase for key for ssh as %s on %s" +-#~ msgstr "%2$s の %1$s の ssh のパスフレーズを入力してください" +- +-#~ msgid "Enter password for ssh as %s on %s" +-#~ msgstr "%2$s の %1$s の ssh のパスワードを入力してください" +- +-#~ msgid "SFTP on %s" +-#~ msgstr "%s 上の SFTP" +- +-#~ msgid "Invalid icon_id '%s' in OpenIconForRead" +-#~ msgstr "OpenIconForRead において icon_id が正しくありません: '%s'" +- +-#~ msgid "Invalid backend type" +-#~ msgstr "無効なバックエンドの種類" +- +-#~ msgid "Error sending file descriptor: %s" +-#~ msgstr "ファイルディスクリプターを送信する際にエラー: %s" +- +-#~ msgid "Invalid arguments from spawned child" +-#~ msgstr "fork() した子プロセスの引数が間違っています" +- +-#~ msgid "locations" +-#~ msgstr "場所" +- +-#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST" +-#~ msgstr "コピー元... コピー先 - コピー元からコピー先にファイルをコピーします" +- +-#~ msgid "- list files at " +-#~ msgstr "- <場所> のファイルを一覧表示" +- +-#~ msgid "- get/set handler for " +-#~ msgstr "- のハンドラーを取得・設定" +- +-#~ msgid "files" +-#~ msgstr "ファイル" +- +-#~ msgid "%s: %s: error launching application: %s\n" +-#~ msgstr "%s: %s: アプリケーションを起動する際にエラー: %s\n" +- +-#~ msgid "FILES... - open FILES with registered application." +-#~ msgstr "FILES... - 登録アプリケーションで複数の FILE を開く" +- +-#~ msgid "- delete files" +-#~ msgstr "- ファイルを削除する" +- +-#~ msgid "Create backup" +-#~ msgstr "バックアップを作成" +- +-#~ msgid "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]" +-#~ msgstr "属性タイプ [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]" +- +-#~ msgid " - set attribute" +-#~ msgstr "<場所> <属性> <値> - 属性を設定" +- +-#~ msgid "- move files to trash" +-#~ msgstr "- ファイルをゴミ箱に移動する" +- +-#~ msgid "Server doesn't support passwords longer than 256 characters" +-#~ msgstr "サーバーは 256 文字より長いパスワードをサポートしていません" +- +-#~ msgid "Login to AFP server %s failed" +-#~ msgstr "AFP サーバー %s へのログインが失敗しました" +- +-#~ msgid "Anonymous login to AFP server %s failed, got error code: %d" +-#~ msgstr "AFP サーバー %s への匿名ログインが失敗しました。エラーコード: %d" +- +-#~ msgid "AFP shares for %s on %s" +-#~ msgstr "%2$s 上の %1$s の AFP 共有" +- +-#~ msgid "AFP shares on %s" +-#~ msgstr "%s 上の AFP 共有" +- +-#~ msgid "File is a directory" +-#~ msgstr "ファイルはディレクトリです" +- +-#~ msgid "Couldn't create temporary file (%s)" +-#~ msgstr "一時ファイルを生成できません (%s)" +- +-#~ msgid "FPGetUserInfo failed (%s)" +-#~ msgstr "FPGetUserInfo が失敗しました (%s)" +diff -urN gvfs-1.22.4/po/ko.po gvfs-1.22.4_localized/po/ko.po +--- gvfs-1.22.4/po/ko.po 2015-03-16 15:35:22.000000000 +0530 ++++ gvfs-1.22.4_localized/po/ko.po 2016-03-14 19:47:32.642899598 +0530 +@@ -1,74 +1,79 @@ + # gvfs korean translation. + # This file is distributed under the same license as the gvfs package. +-# ++# + # Young-Ho Cha , 2008. + # Seong-ho Cho , 2011, 2012. + # Changwoo Ryu , 2009-2014. +-# ++# + # * 용어 번역 + # * WebDAV (share) - 웹 공유, 웹 공유 디렉터리 + # * AFP - AFP -- Apple Filing Protocol을 말함 +-# ++# + # * mountable - mount 정보가 들어 있는 파일을 말한다. "마운트 정보"라고 번역. +-# ++# + # * UI에 어떻게 보일지 생각하면서 번역한다. 볼륨 이름 따위에 *printf() + # 함수의 parameter order 기능을 (1$ 2$ 따위) 함부로 쓰면 파일 + # 관리자에서 이상하게 보일 수도 있다. +-# ++# pnemade , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: gvfs\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=gvfs&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2014-10-09 09:18+0000\n" +-"PO-Revision-Date: 2014-10-11 22:12+0900\n" +-"Last-Translator: Changwoo Ryu \n" +-"Language-Team: GNOME Korea \n" +-"Language: Korean\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2014-10-11 01:12+0000\n" ++"Last-Translator: Changwoo Ryu \n" ++"Language-Team: GNOME Korea \n" ++"Language: ko\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 1.5.3\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "동작을 지원하지 않습니다. 파일이 각각 다른곳에 마운트되어 있습니다" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "스트림의 파일 디스크립터를 가져올 수 없습니다" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "스트림의 파일 디스크립터를 가져오지 않았습니다" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "%s에서 반환값이 잘못되었습니다" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "둘러싸인 마운트를 찾을 수 없습니다" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "잘못된 파일 이름 %s" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "파일 메타데이터를 설정하는 중 오류: %s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++#, fuzzy ++msgid "can't open metadata tree" ++msgstr "%s 메타데이터 파일을 찾을 수 없습니다" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "값은 문자열이거나 문자열의 목록이어야 합니다" + +@@ -83,7 +88,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -97,7 +102,7 @@ + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "동작을 취소했습니다" +@@ -117,8 +122,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2156 +-#: ../daemon/gvfsbackendmtp.c:2540 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "스트림의 끝" + +@@ -131,7 +136,7 @@ + msgid "Truncate not supported on stream" + msgstr "스트림에서는 파일 자르기를 지원하지 않습니다" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "마운트 정보를 가져오는 중 오류: %s" +@@ -154,40 +159,36 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +-msgstr "" +-"\"%s\" 타입의 \"%s\" 서비스를 찾는데 오류가 발생했습니다(도메인 \"%s\")" ++msgstr "\"%s\" 타입의 \"%s\" 서비스를 찾는데 오류가 발생했습니다(도메인 \"%s\")" + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../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 "" +-"\"%3$s\" 도메인에서 \"%1$s\" 형식의 \"%2$s\" 서비스를 찾는 중 오류가 발생했습" +-"니다. 하나 이상의 필요한 TXT 레코드가 빠졌습니다. 필요한 키는 다음과 같습니" +-"다: \"%4$s\"." ++"\"%3$s\" 도메인에서 \"%1$s\" 형식의 \"%2$s\" 서비스를 찾는 중 오류가 발생했습니다. 하나 이상의 필요한 TXT " ++"레코드가 빠졌습니다. 필요한 키는 다음과 같습니다: \"%4$s\"." + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +-msgstr "" +-"\"%3$s\" 도메인에서 \"%1$s\" 형식의 \"%2$s\" 서비스를 찾는데 제한 시간이 초과" +-"했습니다" ++msgstr "\"%3$s\" 도메인에서 \"%1$s\" 형식의 \"%2$s\" 서비스를 찾는데 제한 시간이 초과했습니다" + + #: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263 + #: ../common/gvfsdnssdutils.c:280 +@@ -255,7 +256,7 @@ + msgstr "EOS 받음" + + #: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "호스트의 연결이 끊겼습니다" + +@@ -282,7 +283,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "“%s” 서버에 연결할 수 없습니다. 통신 문제가 발생했습니다." + + #: ../daemon/gvfsafpserver.c:623 +@@ -307,9 +309,7 @@ + msgid "" + "Unable to connect to the server “%s”. The server doesn't support AFP version " + "3.0 or later." +-msgstr "" +-"“%s” 서버에 연결할 수 없습니다. 서버에서 AFP 버전 3.0 이상을 지원하지 않습니" +-"다." ++msgstr "“%s” 서버에 연결할 수 없습니다. 서버에서 AFP 버전 3.0 이상을 지원하지 않습니다." + + #: ../daemon/gvfsafpserver.c:915 + #, c-format +@@ -382,12 +382,12 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "권한이 거부되었습니다" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 + #: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 + #: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 +@@ -451,8 +451,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1819 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "대상 파일이 이미 있습니다" +@@ -525,9 +525,9 @@ + msgid "Range lock conflict exists" + msgstr "범위 잠금 충돌이 있습니다" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2282 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "디렉터리가 없습니다" + +@@ -553,9 +553,9 @@ + msgstr "처리되지 않는 애플 파일 컨트롤 오류(%d)" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1887 ../daemon/gvfsbackendmtp.c:1934 +-#: ../daemon/gvfsbackendmtp.c:2003 ../daemon/gvfsbackendmtp.c:2359 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "파일이 없습니다" + +@@ -618,17 +618,17 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "처리되지 않은 libimobiledevice 오류(%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "다시 시도" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "취소" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 + #: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 +@@ -636,21 +636,21 @@ + msgid "Invalid mount spec" + msgstr "잘못된 마운트 spec 파일" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "잘못된 애플 파일 컨트롤 위치: afc://uuid:포트번호 형식이어야 합니다" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "애플 휴대 장치" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "탈옥된 애플 휴대 장치" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "애플 휴대 장치의 문서" +@@ -658,7 +658,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s(탈옥)" +@@ -666,7 +666,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "문서, 위치 %s" +@@ -674,38 +674,36 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " + "again”." +-msgstr "" +-"“%s” 장치가 잠겨 있습니다. 장치의 암호를 입력하시고 “다시 시도” 단추를 누르십" +-"시오." ++msgstr "“%s” 장치가 잠겨 있습니다. 장치의 암호를 입력하시고 “다시 시도” 단추를 누르십시오." + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2025 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "디렉터리를 열 수 없습니다" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "백업은 아직 지원하지 않습니다." + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "잘못된 파일 이동 방식" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1778 +-#: ../daemon/gvfsbackendmtp.c:1990 ../daemon/gvfsbackendmtp.c:2256 +-#: ../daemon/gvfsbackendmtp.c:2346 ../daemon/gvfsbackendmtp.c:2416 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 + #: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 +-#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "지원하는 동작이 아닙니다" + +@@ -723,7 +721,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -755,9 +753,9 @@ + msgstr "디렉터리에 디렉터리를 복사할 수 없습니다" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1801 +-#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "디렉터리를 되풀이해서 복사할 수 없습니다" + +@@ -875,7 +873,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "백엔드에서 지원하는 동작이 아닙니다" + +@@ -899,22 +897,20 @@ + msgid "Not supported" + msgstr "지원하지 않음" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "그래도 마운트 해제" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." +-msgstr "" +-"볼륨이 사용 중입니다\n" ++msgstr "볼륨이 사용 중입니다\n" + "이 볼륨을 사용하고 있는 프로그램이 있습니다." + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "gudev 클라이언트를 만들 수 없습니다" + +@@ -1206,7 +1202,7 @@ + msgid "Audio Player" + msgstr "오디오 재생기" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "장치를 지정하지 않았습니다" + +@@ -1262,7 +1258,7 @@ + msgid "Error getting data from file" + msgstr "파일 데이터를 가져오는 중 오류" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2117 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "아이콘 ID 형태가 잘못되었습니다: '%s'" +@@ -1344,7 +1340,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "지원하지 않음(원본도 디렉터리이고 대상도 디렉터리)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 +@@ -1367,85 +1364,85 @@ + msgid "Directory notification not supported" + msgstr "디렉터리 알림을 지원하지 않습니다" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "알 수 없는 오류." + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "libmtp 오류: %s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "예상치 않은 호스트 URI 형식입니다." + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "호스트 URI 형태가 잘못되었습니다." + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "해당하는 UDEV 장치를 찾을 수 없습니다." + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "MTP 장치가 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "MTP 장치에 연결할 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "MTP 장치를 검색하는데 메모리를 할당할 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "일반 libmtp 오류" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "'%s' MTP 장치를 열 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "장치가 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "이름 없는 장치" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "파일이 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "이 위치에 디렉터리를 만들 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1892 +-#: ../daemon/gvfsbackendmtp.c:1939 ../daemon/gvfsbackendmtp.c:2008 +-#: ../daemon/gvfsbackendmtp.c:2364 ../daemon/gvfsbackendmtp.c:2432 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "일반 파일이 아닙니다" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1791 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "대상은 디렉터리가 아닙니다" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1796 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "디렉터리를 합칠 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2274 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "이 위치에 쓸 수 없습니다" + +-#: ../daemon/gvfsbackendmtp.c:2099 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "'%s' 항목에 대한 섬네일이 없습니다" +@@ -1565,8 +1562,7 @@ + "“%s”의 신원을 검증할 수 없습니다.\n" + "컴퓨터에 처음 로그인할 때 발생하는 문제입니다.\n" + "\n" +-"원격 컴퓨터에 전송한 신원은 “%s”입니다. 계속해서 안전한 사용을 보장하려면 시" +-"스템 관리자에게 문의하십시오." ++"원격 컴퓨터에 전송한 신원은 “%s”입니다. 계속해서 안전한 사용을 보장하려면 시스템 관리자에게 문의하십시오." + + #: ../daemon/gvfsbackendsftp.c:1096 + msgid "Login dialog cancelled" +@@ -1740,7 +1736,7 @@ + msgstr "예상치 않게 스트림이 끝났습니다" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "잘못된 응답" + +@@ -1762,35 +1758,39 @@ + msgid "The FTP server is busy. Try again later" + msgstr "FTP 서버가 사용 중입니다. 나중에 다시 시도하십시오" + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "계정을 지원하지 않습니다" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "데이터 연결을 열 수 없습니다. 방화벽이 연결을 방해하는 것이 아닙니까?" + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "데이터 연결이 끊겼습니다" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "동작이 실패하였습니다" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "서버에 남은 공간이 없습니다" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "지원하지 않는 네트워크 프로토콜" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "알 수 없는 페이지 형식" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "잘못된 파일 이름" + +@@ -1809,53 +1809,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"%s을(를) 마운트 해제하고 있습니다\n" ++msgstr "%s을(를) 마운트 해제하고 있습니다\n" + "잠시만 기다려 주십시오" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "파일 시스템이 사용 중입니다" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "이전 데몬을 바꿉니다." + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "FUSE를 시작하지 않습니다." + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "프로그램 버전 표시." + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "GVFS 데몬" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "GVFS 기본 데몬" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1907,11 +1905,11 @@ + msgid "Unable to move metadata keys" + msgstr "메타데이터 키를 옮길 수 없습니다" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "GVFS 메타데이터 데몬" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "GVFS의 메타데이터 데몬" + +@@ -1944,8 +1942,8 @@ + "to failures. Data on the drive may be irrevocably lost if a component fails." + msgstr "" + "드라이브를 저수준 모드로 시작할까요?\n" +-"저수준 모드로 드라이브를 시작하면 드라이브가 실패에 취약할 수 있습니다. 한 동" +-"작이 실패하면 드라이브의 데이터가 복구 불가능하도록 손상될 수 있습니다." ++"저수준 모드로 드라이브를 시작하면 드라이브가 실패에 취약할 수 있습니다. 한 동작이 실패하면 드라이브의 데이터가 복구 불가능하도록 손상될 " ++"수 있습니다." + + #: ../monitor/gdu/ggdudrive.c:1023 + msgid "Start Anyway" +@@ -1975,8 +1973,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data on partition %d." +-msgstr "" +-"볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" ++msgstr "볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" + "\"%s\" 장치에는 %d번 파티션에 암호화된 데이터가 들어 있습니다." + + #: ../monitor/gdu/ggduvolume.c:1104 +@@ -1984,8 +1981,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data." +-msgstr "" +-"볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" ++msgstr "볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" + "\"%s\" 장치에는 암호화된 데이터가 들어 있습니다." + + #: ../monitor/gdu/ggduvolume.c:1111 +@@ -1993,21 +1989,20 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device %s contains encrypted data." +-msgstr "" +-"볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" ++msgstr "볼륨의 잠금을 해제하려면 암호를 입력하십시오\n" + "%s 장치에는 암호화된 데이터가 들어 있습니다." + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "%s에 대한 org.gnome.OnlineAccounts.Files 값을 가져오는데 실패했습니다" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "%s에 대한 비밀 값이 잘못되었습니다" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "%s에 대해 지원하지 않는 인증 방식" +@@ -2332,7 +2327,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "그래도 꺼내기" +@@ -2345,11 +2340,9 @@ + # 주의: 문자 그대로 "플러그"로 해석하지 마시오. 모든 종류의 저장 장치에 사용됨. + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"%s에 데이터 기록중입니다\n" ++msgstr "%s에 데이터 기록중입니다\n" + "끝날때까지 연결을 끊지 마십시오" + + # 주의: 문자 그대로 "플러그"로 해석하지 마시오. 모든 종류의 저장 장치에 사용됨. +@@ -2360,7 +2353,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2368,7 +2361,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2384,39 +2377,38 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "키 모음에 암호문을 저장하는 중 오류(%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "키 모음에서 잘못된 암호문을 삭제하는 중 오류(%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "잠금 해제한 장치에 인식할 수 있는 파일 시스템이 없습니다" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "%s에 대한 암호화 암호문" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "볼륨에 접근하려면 암호문이 필요합니다" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" + "The passphrase is needed to access encrypted data on %s." +-msgstr "" +-"볼륨의 잠금을 해제하려면 암호문을 입력하십시오\n" ++msgstr "볼륨의 잠금을 해제하려면 암호문을 입력하십시오\n" + "%s의 암호화된 데이터에 접근하려면 암호문이 필요합니다." + + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2430,7 +2422,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2465,7 +2457,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:닫는 중 오류: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "<파일>" +@@ -2490,8 +2482,7 @@ + msgid "" + "Note: just pipe through cat if you need its formatting options\n" + "like -n, -T or other." +-msgstr "" +-"참고: -n, -T 또는 다른 포매팅 옵션이 필요하다면\n" ++msgstr "참고: -n, -T 또는 다른 포매팅 옵션이 필요하다면\n" + "cat으로 파이프처리하십시오." + + #: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 +@@ -2499,7 +2490,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2509,7 +2500,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: 위치를 입력하지 않았습니다" +@@ -2954,17 +2945,16 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +-msgstr "" +-"기본 프로그램을 이용해 파일을 엽니다. 이 파일과 같은 종류의 파일을\n" ++msgstr "기본 프로그램을 이용해 파일을 엽니다. 이 파일과 같은 종류의 파일을\n" + "처리하도록 등록된 파일을 이용합니다." + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: 위치 열기 오류: %s\n" +diff -urN gvfs-1.22.4/po/pt_BR.po gvfs-1.22.4_localized/po/pt_BR.po +--- gvfs-1.22.4/po/pt_BR.po 2016-03-14 19:19:32.747126952 +0530 ++++ gvfs-1.22.4_localized/po/pt_BR.po 2016-03-14 19:47:32.652899589 +0530 +@@ -9,27 +9,28 @@ + # Rafael Ferreira , 2012, 2013. + # Enrico Nicoletto , 2008, 2013, 2014. + # Felipe Braga , 2015. ++# pnemade , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: gvfs\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&ke" +-"ywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2015-04-22 22:02+0000\n" +-"PO-Revision-Date: 2015-04-22 22:19-0200\n" +-"Last-Translator: Felipe Braga \n" +-"Language-Team: Brazilian Portuguese \n" +-"Language: pt_BR\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2015-04-23 12:19+0000\n" ++"Last-Translator: Felipe Braga \n" ++"Language-Team: Brazilian Portuguese \n" ++"Language: pt-BR\n" + "Plural-Forms: nplurals=2; plural=(n > 1);\n" +-"X-Generator: Virtaal 1.0.0-beta1\n" ++"X-Generator: Zanata 3.8.2\n" + "X-Project-Style: gnome\n" + + #: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "" +-"Não há suporte à operação, os arquivos estão em diferentes pontos de montagem" ++"Não há suporte à operação, os arquivos estão em diferentes pontos de " ++"montagem" + + #: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 +@@ -155,7 +156,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -166,7 +167,7 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1126 + #, c-format + msgid "" +@@ -180,7 +181,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -281,7 +282,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "" + "Não foi possível conectar ao servidor \"%s\". Ocorreu um problema de " + "comunicação." +@@ -503,7 +505,8 @@ + + #: ../daemon/gvfsafpvolume.c:1424 + msgid "Object being moved is marked as not renameable (RenameInhibit)" +-msgstr "O objeto sendo movido está marcado como não renomeável (RenameInhibit)" ++msgstr "" ++"O objeto sendo movido está marcado como não renomeável (RenameInhibit)" + + #: ../daemon/gvfsafpvolume.c:1428 + msgid "Object being moved doesn't exist" +@@ -727,7 +730,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -877,7 +880,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "Não há suporte à operação pelo backend" + +@@ -908,8 +911,7 @@ + + #: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." + msgstr "" + "O volume está ocupado\n" +@@ -1344,7 +1346,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "" + "Não há suporte (a origem é um diretório, o destino é um diretório também)" + +@@ -1359,7 +1362,8 @@ + #: ../daemon/gvfsbackendgphoto2.c:3429 + msgid "" + "Not supported (the source is a file, but the destination is a directory)" +-msgstr "Não há suporte (a origem é um diretório, mas o destino é um diretório)" ++msgstr "" ++"Não há suporte (a origem é um diretório, mas o destino é um diretório)" + + #: ../daemon/gvfsbackendhttp.c:198 + #, c-format +@@ -1820,11 +1824,9 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"Desmontando %s\n" ++msgstr "Desmontando %s\n" + "Por favor, aguarde" + + #: ../daemon/gvfsjobunmount.c:197 +@@ -1865,8 +1867,8 @@ + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -2345,7 +2347,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Ejetar mesmo assim" +@@ -2357,11 +2359,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"Escrevendo dados em %s\n" ++msgstr "Escrevendo dados em %s\n" + "Não desconecte antes de finalizado" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2371,7 +2371,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2379,7 +2379,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2395,26 +2395,27 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "Erro ao armazenar a palavra-passe no chaveiro (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "Erro ao excluir a palavra-chave inválida do chaveiro (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" +-msgstr "O dispositivo desbloqueado não possui sistema de arquivos reconhecível" ++msgstr "" ++"O dispositivo desbloqueado não possui sistema de arquivos reconhecível" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "palavra-chave de criptografia para %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "Uma frase secreta é necessária para acessar o volume" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2426,8 +2427,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2441,7 +2442,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2476,7 +2477,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:erro ao fechar: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "ARQUIVO" +@@ -2511,7 +2512,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2521,7 +2522,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: faltando as localizações" +@@ -2957,7 +2958,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2967,7 +2968,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: erro ao abrir a localização: %s\n" +@@ -3109,57 +3110,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "Lista conteúdos de diretórios em um formato de árvore." +- +-#~ msgid "progress" +-#~ msgstr "progresso" +- +-#~ msgid "Storage not found" +-#~ msgstr "Armazenamento não encontrado" +- +-#~ msgid "Destination directory not found" +-#~ msgstr "Diretório de destino não encontrado" +- +-#~ msgid "File already exists" +-#~ msgstr "O arquivo já existe" +- +-#~ msgid "Operation not supported." +-#~ msgstr "Operação não suportada." +- +-#~ msgid "Can't seek outside file" +-#~ msgstr "Não foi possível pesquisar arquivo externo" +- +-#~ msgid "Cannot create files in this location" +-#~ msgstr "Não foi possível criar arquivos neste local" +- +-#~ msgid "No storage volumes found" +-#~ msgstr "Nenhum volume de armazenamento encontrado" +- +-#~ msgid "Cannot delete this entity" +-#~ msgstr "Não foi possível excluir esta entidade" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "Não foi possível fazer contato com o bus do sistema" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "Erro ao conectar ao daemon: %s" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "Erro ao criar o soquete: %s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "Erro ao se conectar com o soquete: %s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "Atributo inválido da lista de conteúdo" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "Erro ao conectar ao D-Bus: %s" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "O servidor AFP %s recusou a senha enviada" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "Digite a senha para o afp como %s em %s" +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "Digite a senha para afp em %s" +diff -urN gvfs-1.22.4/po/ru.po gvfs-1.22.4_localized/po/ru.po +--- gvfs-1.22.4/po/ru.po 2015-03-16 15:35:22.000000000 +0530 ++++ gvfs-1.22.4_localized/po/ru.po 2016-03-14 19:47:32.662899580 +0530 +@@ -2,69 +2,74 @@ + # Russian translation for gvfs + # Copyright (C) 2008 Free Software Foudnation Inc. + # This file is distributed under the same license as the gvfs package. +-# ++# + # Leonid Kanter , 2008, 2010. + # Artur Sibagatullin , 2009, 2010. + # Alexander Saprykin , 2010. + # Yuri Kozlov , 2010, 2011. + # Yuri Myasoedov , 2012-2014. + # Stas Solovey , 2014. +-# ++# pnemade , 2016. #zanata ++# ypoyarko , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: ru\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=gvfs&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2014-10-09 09:18+0000\n" +-"PO-Revision-Date: 2014-10-10 01:38+0300\n" +-"Last-Translator: Stas Solovey \n" +-"Language-Team: Русский \n" +-"Language: ru\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +-"X-Generator: Gtranslator 2.91.6\n" ++"PO-Revision-Date: 2016-03-07 06:39+0000\n" ++"Last-Translator: ypoyarko \n" ++"Language-Team: Русский \n" ++"Language: ru\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " ++"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "Действие не поддерживается, файлы на разных точках монтирования" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "Не удалось получить дескриптор потокового файла" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "Дескриптор потокового файла не был получен" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "Неверное возвращённое значение от %s" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "Не удалось найти точку монтирования" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "Неверное имя файла %s" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "Ошибка установки метаданных файла: %s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "не удалось открыть дерево метаданных" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "значения должны быть строками или списком строк" + +@@ -79,7 +84,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -93,7 +98,7 @@ + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "Действие было отменено" +@@ -113,8 +118,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2156 +-#: ../daemon/gvfsbackendmtp.c:2540 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "Конец потока" + +@@ -127,7 +132,7 @@ + msgid "Truncate not supported on stream" + msgstr "Усечение потока не поддерживается" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "Ошибка получения информации о монтировании: %s" +@@ -150,7 +155,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -161,7 +166,7 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1126 + #, c-format + msgid "" +@@ -175,7 +180,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -247,7 +252,7 @@ + msgstr "Получен символ конца строки" + + #: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "Узел закрыл соединение" + +@@ -276,7 +281,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "Не удалось подключиться к серверу «%s» из-за ошибок связи." + + #: ../daemon/gvfsafpserver.c:623 +@@ -304,8 +310,8 @@ + "Unable to connect to the server “%s”. The server doesn't support AFP version " + "3.0 or later." + msgstr "" +-"Не удалось подключиться к серверу «%s». Сервер не поддерживает AFP версии " +-"3.0 и выше." ++"Не удалось подключиться к серверу «%s». Сервер не поддерживает AFP версии 3." ++"0 и выше." + + #: ../daemon/gvfsafpserver.c:915 + #, c-format +@@ -378,12 +384,12 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "Доступ запрещён" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 + #: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 + #: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 +@@ -447,8 +453,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1819 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "Файл назначения уже существует" +@@ -522,9 +528,9 @@ + msgid "Range lock conflict exists" + msgstr "Конфликт расширенного блокирования" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2282 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "Каталог не существует" + +@@ -549,9 +555,9 @@ + msgstr "Внутренняя ошибка Apple File Control" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1887 ../daemon/gvfsbackendmtp.c:1934 +-#: ../daemon/gvfsbackendmtp.c:2003 ../daemon/gvfsbackendmtp.c:2359 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "Файл не существует" + +@@ -614,17 +620,17 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "Неизвестная ошибка libmobiledevice (%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "Попытаться снова" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "Отменить" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 + #: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 +@@ -632,21 +638,21 @@ + msgid "Invalid mount spec" + msgstr "Неверная спецификация монтирования" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "Неверный адрес AFC: должен быть в формате afc://uuid:port-number" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Мобильное устройство Apple" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Мобильное устройство Apple, разлоченное" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Документы на мобильном устройстве Apple" +@@ -654,7 +660,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (разлоченное)" +@@ -662,7 +668,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "Документы на %s" +@@ -670,7 +676,7 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " +@@ -679,29 +685,29 @@ + "Устройство «%s» заблокировано. Введите пароль к устройству и нажмите " + "«Попытаться снова»." + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2025 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "Не удалось открыть каталог" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "Резервные копии ещё не поддерживаются." + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "Неверный тип поиска" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1778 +-#: ../daemon/gvfsbackendmtp.c:1990 ../daemon/gvfsbackendmtp.c:2256 +-#: ../daemon/gvfsbackendmtp.c:2346 ../daemon/gvfsbackendmtp.c:2416 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 + #: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 +-#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "Действие не поддерживается" + +@@ -718,7 +724,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -750,9 +756,9 @@ + msgstr "Не удалось скопировать каталог поверх каталога" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1801 +-#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "Не удалось скопировать каталог рекурсивно" + +@@ -868,9 +874,9 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" +-msgstr "Действие не поддерживается внутренней реализацией" ++msgstr "Действие не поддерживается административной реализацией" + + #: ../daemon/gvfsbackendburn.c:852 + msgid "No such file or directory in target path" +@@ -892,22 +898,20 @@ + msgid "Not supported" + msgstr "Не поддерживается" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "Всё равно отсоединить" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." +-msgstr "" +-"Том занят\n" ++msgstr "Том занят\n" + "Одно или более приложений используют том." + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "Не удалось создать клиент gudev" + +@@ -1199,7 +1203,7 @@ + msgid "Audio Player" + msgstr "Звуковой проигрыватель" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "Устройство не указано" + +@@ -1254,7 +1258,7 @@ + msgid "Error getting data from file" + msgstr "Ошибка получения данных из файла" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2117 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "Некорректный идентификатор значка «%s»" +@@ -1336,14 +1340,16 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "Не поддерживается (источник и назначение являются каталогами)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 + msgid "" + "Not supported (the source is a directory, but the destination is an existing " + "file)" +-msgstr "Не поддерживается (источник — каталог, назначение — существующий файл)" ++msgstr "" ++"Не поддерживается (источник — каталог, назначение — существующий файл)" + + #: ../daemon/gvfsbackendgphoto2.c:3429 + msgid "" +@@ -1359,85 +1365,85 @@ + msgid "Directory notification not supported" + msgstr "Уведомление для каталогов не поддерживается" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "Неизвестная ошибка." + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "Ошибка libmtp: %s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "Неожиданный формат URI для узла." + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "Некорректный формат URI для узла." + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "Не удалось найти соответствующее устройство udev." + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "Устройство MTP не найдено" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "Не удалось подключиться к устройству MTP" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "Не удалось выделить память при обнаружении устройств MTP" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "Общая ошибка libtmp" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "Не удалось открыть устройство MTP «%s»" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "Устройство не найдено" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "Безымянное устройство" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "Файл не найден" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "Не удалось создать каталог в данном каталоге" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1892 +-#: ../daemon/gvfsbackendmtp.c:1939 ../daemon/gvfsbackendmtp.c:2008 +-#: ../daemon/gvfsbackendmtp.c:2364 ../daemon/gvfsbackendmtp.c:2432 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "Не является обычным файлом" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1791 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "Цель является каталогом" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1796 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "Невозможно объединить каталоги" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2274 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "Не удалось выполнить запись в данном каталоге" + +-#: ../daemon/gvfsbackendmtp.c:2099 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "Нет миниатюры для объекта «%s»" +@@ -1733,7 +1739,7 @@ + msgstr "Неожиданный конец потока" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "Неверный ответ" + +@@ -1757,43 +1763,47 @@ + msgid "The FTP server is busy. Try again later" + msgstr "FTP сервер занят. Повторите попытку позднее" + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "Идет отсоединение на уровне административной части" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "Учётные записи не поддерживаются" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "" + "Не удалось установить соединение данных. Проверьте параметры межсетевого " + "экрана." + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "Соединение с данными закрыто" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "Сбой операции" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "На сервере не осталось свободного места" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "Неподдерживаемый сетевой протокол" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "Неизвестный тип страницы" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "Неверное имя файла" + + #: ../daemon/gvfsjobmakesymlink.c:111 + msgid "Symlinks not supported by backend" +-msgstr "Символические ссылки не поддерживаются внутренней реализацией" ++msgstr "Символические ссылки не поддерживаются административной реализацией" + + #: ../daemon/gvfsjobsetattribute.c:99 + msgid "Invalid dbus message" +@@ -1806,53 +1816,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"Отключение %s\n" ++msgstr "Отключение %s\n" + "Подождите" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "Файловая система занята" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "Заменить старую службу." + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "Не запускать fuse." + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "Показать версия программы." + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "Служба GVFS" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "Главная служба GVFS" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1905,11 +1913,11 @@ + msgid "Unable to move metadata keys" + msgstr "Невозможно переместить ключи метаданных" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "Служба метаданных GVFS" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "Служба метаданных для GVFS" + +@@ -1996,17 +2004,17 @@ + "Введите пароль для разблокирования тома\n" + "Устройство %s содержит зашифрованные данные." + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "Не удалось получить org.gnome.OnlineAccounts.Files для %s" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "Неверные учётные данные для %s" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "Неподдерживаемый метод аутентификации для %s" +@@ -2333,7 +2341,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "Всё равно извлечь" +@@ -2345,11 +2353,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"Запись данных в %s\n" ++msgstr "Запись данных в %s\n" + "Не отключайте до окончания записи" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2360,7 +2366,7 @@ + # Том + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2368,7 +2374,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2384,26 +2390,26 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "Ошибка сохранения пароля в связке ключей (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "Ошибка удаления неверного пароля из связки ключей (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "Не удалось определить файловую систему на разблокированном устройстве" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "Пароль шифрования для %s" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "Для получения доступа к тому требуется пароль" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" +@@ -2415,8 +2421,8 @@ + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2430,7 +2436,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2465,7 +2471,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:ошибка закрытия: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "ФАЙЛ" +@@ -2499,7 +2505,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2509,7 +2515,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s: не указаны адреса" +@@ -2946,7 +2952,7 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +@@ -2956,7 +2962,7 @@ + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s: ошибка открытия адреса: %s\n" +diff -urN gvfs-1.22.4/po/zh_CN.po gvfs-1.22.4_localized/po/zh_CN.po +--- gvfs-1.22.4/po/zh_CN.po 2015-02-03 21:22:21.000000000 +0530 ++++ gvfs-1.22.4_localized/po/zh_CN.po 2016-03-14 19:47:32.672899571 +0530 +@@ -10,60 +10,66 @@ + # tuhaihe <1132321739qq@gmail.com>, 2012. + # Wylmer Wang , 2014. + # Tong Hui , 2014. +-# ++# Leah Liu , 2016. #zanata ++# pnemade , 2016. #zanata + 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: 2014-09-05 06:45+0000\n" +-"PO-Revision-Date: 2014-08-26 04:12+0800\n" +-"Last-Translator: Tong Hui \n" +-"Language-Team: Chinese (simplified) \n" +-"Language: zh_CN\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2016-03-07 04:04+0000\n" ++"Last-Translator: Leah Liu \n" ++"Language-Team: Chinese (simplified) \n" ++"Language: zh-CN\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "文件在不同挂载点下，不支持此操作" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "无法取得流文件描述符" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "未曾取得流文件描述符" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "%s 返回无效值" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "找不到所属挂载点" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "无效文件名 %s" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "设置文件元数据出错：%s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "无法找到元数据树" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "值必须是字符串或字符串列表" + +@@ -78,7 +84,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -87,12 +93,12 @@ + #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094 + #: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266 + #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 +-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332 ++#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:343 + #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "操作被取消" +@@ -112,8 +118,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2144 +-#: ../daemon/gvfsbackendmtp.c:2528 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "流终止" + +@@ -126,7 +132,7 @@ + msgid "Truncate not supported on stream" + msgstr "流不支持截短" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "获取挂载信息时出错：%s" +@@ -149,7 +155,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -160,21 +166,19 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../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 "" +-"在“%3$s”域上解析“%1$s”服务“%2$s”时出错。一个或多个 TXT 记录丢失。要求密" +-"钥：“%4$s”" ++msgstr "在“%3$s”域上解析“%1$s”服务“%2$s”时出错。一个或多个 TXT 记录丢失。要求密钥：“%4$s”" + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -233,24 +237,24 @@ + msgid "error starting mount daemon" + msgstr "启动挂载守护进程失败" + +-#: ../daemon/gvfsafpconnection.c:766 ++#: ../daemon/gvfsafpconnection.c:784 + msgid "The connection is not opened" + msgstr "连接未打开" + +-#: ../daemon/gvfsafpconnection.c:773 ../daemon/gvfsbackendmtp.c:378 ++#: ../daemon/gvfsafpconnection.c:791 ../daemon/gvfsbackendmtp.c:378 + msgid "The connection is closed" + msgstr "连接已关闭" + +-#: ../daemon/gvfsafpconnection.c:886 ../daemon/gvfsafpconnection.c:1592 ++#: ../daemon/gvfsafpconnection.c:904 ../daemon/gvfsafpconnection.c:1610 + msgid "Got EOS" + msgstr "收到 EOS" + +-#: ../daemon/gvfsafpconnection.c:1061 ../daemon/gvfsafpconnection.c:1102 +-#: ../daemon/gvfsftptask.c:371 ++#: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "主机已关闭连接" + +-#: ../daemon/gvfsafpconnection.c:1565 ++#: ../daemon/gvfsafpconnection.c:1583 + msgid "Connection unexpectedly went down" + msgstr "连接异常中断" + +@@ -273,7 +277,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "无法连接到服务器“%s”。发生了通信问题。" + + #: ../daemon/gvfsafpserver.c:623 +@@ -371,12 +376,12 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:411 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "权限不足" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 + #: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 + #: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 +@@ -440,8 +445,8 @@ + #: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "目标文件已存在" +@@ -514,9 +519,9 @@ + msgid "Range lock conflict exists" + msgstr "存在范围锁冲突" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2270 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "目录不存在" + +@@ -541,9 +546,9 @@ + msgstr "内部的苹果文件控制(AFC)错误" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1875 ../daemon/gvfsbackendmtp.c:1922 +-#: ../daemon/gvfsbackendmtp.c:1991 ../daemon/gvfsbackendmtp.c:2347 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "文件不存在" + +@@ -604,17 +609,17 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "未处理的 libimobiledevice 错误(%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "重试" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "取消" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 + #: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 +@@ -622,21 +627,21 @@ + msgid "Invalid mount spec" + msgstr "无效的挂载描述" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "无效的 AFC 位置：必须是 afc://uuid:port-number 格式" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "苹果移动设备" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "苹果移动设备，已越狱" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "苹果移动设备上的文件" +@@ -644,7 +649,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (越狱)" +@@ -652,7 +657,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "%s 上的文档" +@@ -660,36 +665,36 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " + "again”." + msgstr "设备“%s”被锁定。请输入设备上的密码并点击“重试”。" + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2013 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "无法打开目录" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "尚不支持备份。" + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "无效的搜索类型" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1978 +-#: ../daemon/gvfsbackendmtp.c:2244 ../daemon/gvfsbackendmtp.c:2334 +-#: ../daemon/gvfsbackendmtp.c:2404 ../daemon/gvfsbackendsftp.c:1865 +-#: ../daemon/gvfsbackendsftp.c:4859 ../daemon/gvfsbackendsmb.c:1861 +-#: ../daemon/gvfsftptask.c:403 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 ++#: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "不支持此操作" + +@@ -706,7 +711,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -738,9 +743,9 @@ + msgstr "无法将目录复制到目录" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1789 +-#: ../daemon/gvfsbackendmtp.c:1813 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "无法递归复制目录" + +@@ -856,7 +861,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "后端不支持的操作" + +@@ -880,22 +885,20 @@ + msgid "Not supported" + msgstr "不支持" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "无论如何卸载" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." +-msgstr "" +-"卷被占用\n" ++msgstr "卷被占用\n" + "一个或更多应用程序正在占用卷。" + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "无法创建 gudev 客户端" + +@@ -1185,7 +1188,7 @@ + msgid "Audio Player" + msgstr "音频播放器" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "未指定设备" + +@@ -1240,7 +1243,7 @@ + msgid "Error getting data from file" + msgstr "从文件中获取数据时出错" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2105 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "图标识别符“%s”的格式错误" +@@ -1322,7 +1325,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "不支持(源为目录，目标也为目录)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 +@@ -1345,85 +1349,85 @@ + msgid "Directory notification not supported" + msgstr "不支持目录通知" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "未知错误。" + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "libmtp 错误：%s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "主机 URI 格式异常。" + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "主机 URI 有误。" + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "找不到匹配的 udev 设备。" + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "未找到 MTP 设备" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "无法连接 MTP 设备" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "在检测 MTP 设备时无法分配内存" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "常规 libmtp 错误" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "无法打开 MTP 设备“%s”" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "找不到设备" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "未命名的设备" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "找不到文件" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "不能在此位置创建目录" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1880 +-#: ../daemon/gvfsbackendmtp.c:1927 ../daemon/gvfsbackendmtp.c:1996 +-#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2420 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "非常规文件" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1779 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "目标是一个目录" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "不能合并目录" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "无法写入此位置" + +-#: ../daemon/gvfsbackendmtp.c:2087 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "没有实体“%s”的缩略图" +@@ -1542,8 +1546,7 @@ + "无法验证“%s”的标识。\n" + "这会在您首次登录计算机时发生。\n" + "\n" +-"远程计算机发送的标识是“%s”。如果您要完全确保继续操作是安全的，请联系其系统管" +-"理员。" ++"远程计算机发送的标识是“%s”。如果您要完全确保继续操作是安全的，请联系其系统管理员。" + + #: ../daemon/gvfsbackendsftp.c:1096 + msgid "Login dialog cancelled" +@@ -1708,12 +1711,16 @@ + msgid "Trash" + msgstr "回收站" + ++#: ../daemon/gvfschannel.c:332 ++msgid "Channel blocked" ++msgstr "已屏蔽的频道" ++ + #: ../daemon/gvfsftpconnection.c:180 + msgid "Unexpected end of stream" + msgstr "数据流意外结束" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "无效回复" + +@@ -1735,35 +1742,39 @@ + msgid "The FTP server is busy. Try again later" + msgstr "FTP 服务器正忙。稍后重试" + +-#: ../daemon/gvfsftptask.c:367 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "目前正在后端卸载" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "不支持这些账户" + +-#: ../daemon/gvfsftptask.c:375 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "无法打开数据连接。是不是您的防火墙不允许？" + +-#: ../daemon/gvfsftptask.c:379 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "数据连接已关闭" + +-#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "操作失败" + +-#: ../daemon/gvfsftptask.c:395 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "服务器上没有剩余空间了" + +-#: ../daemon/gvfsftptask.c:407 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "不支持的网络协议" + +-#: ../daemon/gvfsftptask.c:415 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "页面类型未知" + +-#: ../daemon/gvfsftptask.c:419 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "无效文件名" + +@@ -1782,53 +1793,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"正在卸载 %s\n" ++msgstr "正在卸载 %s\n" + "请稍等" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "文件系统正忙" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "替换旧守护进程。" + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "不启动 fuse。" + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "显示程序版本。" + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "GVFS 守护进程" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "GVFS 主守护进程" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s：%s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1880,11 +1889,11 @@ + msgid "Unable to move metadata keys" + msgstr "无法移动元数据键值" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "GVFS 元数据守护进程" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "GVFS 的元数据守护进程" + +@@ -1915,10 +1924,8 @@ + "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." +-msgstr "" +-"以降级模式启动驱动器？\n" +-"以降级模式启动驱动器，意味着驱动器不再容忍故障。如果有一个元件故障，驱动器上" +-"的数据可能会彻底丢失。" ++msgstr "以降级模式启动驱动器？\n" ++"以降级模式启动驱动器，意味着驱动器不再容忍故障。如果有一个元件故障，驱动器上的数据可能会彻底丢失。" + + #: ../monitor/gdu/ggdudrive.c:1023 + msgid "Start Anyway" +@@ -1948,8 +1955,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data on partition %d." +-msgstr "" +-"输入密码解锁该卷\n" ++msgstr "输入密码解锁该卷\n" + "“%s”设备在 %d 分区包含了加密数据。" + + #: ../monitor/gdu/ggduvolume.c:1104 +@@ -1957,8 +1963,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data." +-msgstr "" +-"输入密码解锁该卷\n" ++msgstr "输入密码解锁该卷\n" + "“%s”设备包含了加密数据。" + + #: ../monitor/gdu/ggduvolume.c:1111 +@@ -1966,21 +1971,20 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device %s contains encrypted data." +-msgstr "" +-"输入密码解锁该卷\n" ++msgstr "输入密码解锁该卷\n" + "%s 设备包含了加密数据。" + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "%s：无法获取 org.gnome.OnlineAccounts.Files" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "%s 的凭据无效" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "%s：不支持的认证方法" +@@ -2305,7 +2309,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "无论如何弹出" +@@ -2317,11 +2321,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"正在将数据写入 %s\n" ++msgstr "正在将数据写入 %s\n" + "结束前不要拔掉" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2331,7 +2333,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2339,7 +2341,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2355,39 +2357,38 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "存储密钥环(%s)中的密码时出错" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "从密钥环(%s)删除无效密码时出错。" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "已解锁的设备上没有可识别的文件系统" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "%s 的加密密码" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "访问该卷需要密码" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" + "The passphrase is needed to access encrypted data on %s." +-msgstr "" +-"输入密码以解锁该卷\n" ++msgstr "输入密码以解锁该卷\n" + "访问 %s 设备上的加密数据需要密码。" + + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2401,7 +2402,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2436,7 +2437,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s：关闭出错：%s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "文件" +@@ -2461,8 +2462,7 @@ + msgid "" + "Note: just pipe through cat if you need its formatting options\n" + "like -n, -T or other." +-msgstr "" +-"注意：如需要 cat 的 -n, -T 之类格式化功能，\n" ++msgstr "注意：如需要 cat 的 -n, -T 之类格式化功能，\n" + "可通过管道用 cat 过滤。" + + #: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 +@@ -2470,7 +2470,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2480,7 +2480,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s：缺少位置" +@@ -2914,17 +2914,16 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +-msgstr "" +-"使用已注册为处理该类型文件的\n" ++msgstr "使用已注册为处理该类型文件的\n" + "默认应用程序打开文件。" + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s：打开位置出错：%s\n" +@@ -3042,7 +3041,7 @@ + msgid "Invalid attribute type %s\n" + msgstr "无效的属性类型 %s\n" + +-#: ../programs/gvfs-set-attribute.c:235 ++#: ../programs/gvfs-set-attribute.c:238 + #, c-format + msgid "Error setting attribute: %s\n" + msgstr "设置属性出错：%s\n" +@@ -3067,130 +3066,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "以树形格式列举目录内容。" +- +-#~ msgid "progress" +-#~ msgstr "进度" +- +-#~ msgid "No storage volumes found" +-#~ msgstr "找不到存储卷" +- +-#~ msgid "Cannot delete this entity" +-#~ msgstr "无法删除此实体" +- +-#~ msgid "AFP volumes for %s on %s" +-#~ msgstr "%2$s 上 %1$s 的 AFP 卷" +- +-#~ msgid "AFP volumes on %s" +-#~ msgstr "%s 上的 AFP 卷" +- +-#~ msgid "AFP volume %s for %s on %s" +-#~ msgstr "%3$s 上 %2$s 的 AFP 卷 %1$s" +- +-#~ msgid "AFP volume %s on %s" +-#~ msgstr "%2$s 上的 AFP 卷 %1$s" +- +-#~ msgid "WebDAV as %s on %s%s" +-#~ msgstr "%2$s%3$s 上的 %1$s WebDAV 共享" +- +-#~ msgid "WebDAV on %s%s" +-#~ msgstr "%s%s 上的 WebDAV 共享" +- +-#~ msgid "Enter password for FTP as %s on %s" +-#~ msgstr "请输入 %2$s 上 %1$s 的 FTP 密码" +- +-#~ msgid "Enter password for FTP on %s" +-#~ msgstr "请输入 %s 上 FTP 的密码" +- +-#~ msgid "FTP on %s" +-#~ msgstr "%s 上的 FTP" +- +-#~ msgid "FTP as %s on %s" +-#~ msgstr "以 %s FTP 到 %s" +- +-#~ msgid "Enter passphrase for key for ssh as %s on %s" +-#~ msgstr "请输入 %2$s 上 %1$s 的 ssh 密钥的密码" +- +-#~ msgid "Enter password for ssh as %s on %s" +-#~ msgstr "请输入 %2$s 上 %1$s 的 ssh 密码" +- +-#~ msgid "SFTP on %s" +-#~ msgstr "%s 上的 SFTP" +- +-#~ msgid "Invalid icon_id '%s' in OpenIconForRead" +-#~ msgstr "OpenIconForRead 中无效的 icon_id“%s”" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "无法联系会话总线" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "连接守护进程出错：%s" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "建立套接字出错：%s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "连接套接字出错：%s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "属性信息列表内容无效" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "连接 D-Bus 出错：%s" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "AFP 服务器 %s 驳回了提交的密码" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "输入用户 %s 在 %s 上的 afp 密码" +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "请输入 %s 上 atp 的密码" +- +-#~ msgid "Invalid backend type" +-#~ msgstr "无效后端类型" +- +-#~ msgid "Error sending file descriptor: %s" +-#~ msgstr "发送文件描述符出错：%s" +- +-#~ msgid "Invalid arguments from spawned child" +-#~ msgstr "来自所调用子进程的参数无效" +- +-#~ msgid "locations" +-#~ msgstr "位置" +- +-#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST" +-#~ msgstr "SOURCE... DEST - 从 SOURCE 复制文件到 DEST" +- +-#~ msgid "- list files at " +-#~ msgstr "- 在 <位置> 列出文件" +- +-#~ msgid "- get/set handler for " +-#~ msgstr "- 的查询/设置程序" +- +-#~ msgid "files" +-#~ msgstr "文件" +- +-#~ msgid "%s: %s: error launching application: %s\n" +-#~ msgstr "%s: %s: 启动应用出错: %s\n" +- +-#~ msgid "FILES... - open FILES with registered application." +-#~ msgstr "FILES... - 用注册的应用程序打开 FILES。" +- +-#~ msgid "- delete files" +-#~ msgstr "- 删除文件" +- +-#~ msgid "Create backup" +-#~ msgstr "创建备份" +- +-#~ msgid "" +-#~ "attribute type [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +-#~ msgstr "" +-#~ "属性类型 [string, bytestring, boolean, uint32, int32, uint64, int64, " +-#~ "stringv, unset]" +- +-#~ msgid " - set attribute" +-#~ msgstr " <位置> <属性> <值> - 设定属性" +- +-#~ msgid "- move files to trash" +-#~ msgstr "- 移动文件到回收站" +diff -urN gvfs-1.22.4/po/zh_TW.po gvfs-1.22.4_localized/po/zh_TW.po +--- gvfs-1.22.4/po/zh_TW.po 2016-03-14 19:19:32.756126952 +0530 ++++ gvfs-1.22.4_localized/po/zh_TW.po 2016-03-14 19:47:32.683899561 +0530 +@@ -2,61 +2,66 @@ + # Copyright (C) 2003-06 Free Software Foundation, Inc. + # Chao-Hsiung Liao , 2008, 2009, 2010. + # Wei-Lun Chao , 2010. +-# ++# ccheng , 2016. #zanata ++# pnemade , 2016. #zanata + msgid "" + msgstr "" + "Project-Id-Version: gvfs 1.11.3\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +-"product=gvfs&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2014-08-20 21:17+0000\n" +-"PO-Revision-Date: 2014-08-21 13:30+0800\n" +-"Last-Translator: Chao-Hsiung Liao \n" +-"Language-Team: Chinese (traditional)\n" +-"Language: zh_TW\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2016-02-16 09:36+0530\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2016-03-04 06:22+0000\n" ++"Last-Translator: ccheng \n" ++"Language-Team: Chinese (traditional)\n" ++"Language: zh-TW\n" + "Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: Poedit 1.6.5\n" ++"X-Generator: Zanata 3.8.2\n" + +-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830 ++#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2844 + msgid "Operation not supported, files on different mounts" + msgstr "檔案在不同掛載點，不支援此操作" + +-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179 ++#: ../client/gdaemonfile.c:1094 ../client/gdaemonfile.c:3201 + #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183 + #: ../daemon/gvfsjobopenforwrite.c:326 + msgid "Couldn't get stream file descriptor" + msgstr "無法取得串流檔案檔案描述器" + +-#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291 ++#: ../client/gdaemonfile.c:1223 ../client/gdaemonfile.c:1295 + #: ../client/gvfsiconloadable.c:127 + msgid "Didn't get stream file descriptor" + msgstr "不要取得串流檔案檔案描述器" + +-#: ../client/gdaemonfile.c:1412 ++#: ../client/gdaemonfile.c:1416 + #, c-format + msgid "Invalid return value from %s" + msgstr "從 %s 傳回無效的數值" + + #. translators: this is an error message when there is no user visible "mount" object + #. corresponding to a particular path/uri +-#: ../client/gdaemonfile.c:2302 ++#: ../client/gdaemonfile.c:2306 + msgid "Could not find enclosing mount" + msgstr "找不到所屬掛載點" + +-#: ../client/gdaemonfile.c:2338 ++#: ../client/gdaemonfile.c:2342 + #, c-format + msgid "Invalid filename %s" + msgstr "無效的檔案名稱 %s" + +-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264 +-#: ../client/gdaemonvfs.c:1316 ++#: ../client/gdaemonfile.c:2657 ../client/gdaemonfile.c:2684 ++#: ../client/gdaemonvfs.c:1265 ../client/gdaemonvfs.c:1286 ++#: ../client/gdaemonvfs.c:1326 + #, c-format + msgid "Error setting file metadata: %s" + msgstr "設定檔案中繼資料時發生錯誤：%s" + +-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317 ++#: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 ++msgid "can't open metadata tree" ++msgstr "無法開啟 metadata 樹" ++ ++#: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" + msgstr "數值必須為字串或字串的清單" + +@@ -71,7 +76,7 @@ + #: ../client/gdaemonfileoutputstream.c:724 + #: ../client/gdaemonfileoutputstream.c:919 + #: ../client/gdaemonfileoutputstream.c:1085 +-#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:626 ++#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631 + #: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134 + #: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390 + #: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655 +@@ -80,12 +85,12 @@ + #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094 + #: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266 + #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124 +-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332 ++#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:343 + #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072 + #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635 + #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923 + #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086 +-#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586 ++#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587 + #: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923 + msgid "Operation was cancelled" + msgstr "操作已被取消" +@@ -105,8 +110,8 @@ + #: ../client/gdaemonfileinputstream.c:545 + #: ../client/gdaemonfileinputstream.c:1715 + #: ../client/gdaemonfileoutputstream.c:496 +-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2144 +-#: ../daemon/gvfsbackendmtp.c:2528 ++#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2162 ++#: ../daemon/gvfsbackendmtp.c:2546 + msgid "End of stream" + msgstr "串流結尾" + +@@ -119,7 +124,7 @@ + msgid "Truncate not supported on stream" + msgstr "不支援在串流中截短" + +-#: ../client/gdaemonvfs.c:788 ++#: ../client/gdaemonvfs.c:789 + #, c-format + msgid "Error while getting mount info: %s" + msgstr "取得掛載資訊時發生錯誤：%s" +@@ -142,7 +147,7 @@ + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1100 + #, c-format + msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -153,21 +158,19 @@ + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain + #. * - the fourth %s refers to the required TXT keys +-#. ++#. + #: ../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 "" +-"解析網域「%3$s」上服務「%2$s」的「%1$s」時發生錯誤。一或多個 TXT 紀錄遺失。需" +-"要設定鍵：「%4$s」" ++msgstr "解析網域「%3$s」上服務「%2$s」的「%1$s」時發生錯誤。一或多個 TXT 紀錄遺失。需要設定鍵：「%4$s」" + + #. Translators: + #. * - the first %s refers to the service type + #. * - the second %s refers to the service name + #. * - the third %s refers to the domain +-#. ++#. + #: ../common/gvfsdnssdresolver.c:1143 + #, c-format + msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\"" +@@ -226,24 +229,24 @@ + msgid "error starting mount daemon" + msgstr "啟動掛載伺服程式的發生錯誤" + +-#: ../daemon/gvfsafpconnection.c:766 ++#: ../daemon/gvfsafpconnection.c:784 + msgid "The connection is not opened" + msgstr "連線尚未開啟" + +-#: ../daemon/gvfsafpconnection.c:773 ../daemon/gvfsbackendmtp.c:378 ++#: ../daemon/gvfsafpconnection.c:791 ../daemon/gvfsbackendmtp.c:378 + msgid "The connection is closed" + msgstr "連線已關閉" + +-#: ../daemon/gvfsafpconnection.c:886 ../daemon/gvfsafpconnection.c:1592 ++#: ../daemon/gvfsafpconnection.c:904 ../daemon/gvfsafpconnection.c:1610 + msgid "Got EOS" + msgstr "得到 EOS" + +-#: ../daemon/gvfsafpconnection.c:1061 ../daemon/gvfsafpconnection.c:1102 +-#: ../daemon/gvfsftptask.c:370 ++#: ../daemon/gvfsafpconnection.c:1079 ../daemon/gvfsafpconnection.c:1120 ++#: ../daemon/gvfsftptask.c:375 + msgid "Host closed connection" + msgstr "主機關閉連線" + +-#: ../daemon/gvfsafpconnection.c:1565 ++#: ../daemon/gvfsafpconnection.c:1583 + msgid "Connection unexpectedly went down" + msgstr "連線未預期的中斷" + +@@ -266,7 +269,8 @@ + #: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874 + #: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674 + #, c-format +-msgid "Unable to connect to the server “%s”. A communication problem occurred." ++msgid "" ++"Unable to connect to the server “%s”. A communication problem occurred." + msgstr "無法連線到伺服器“%s”。發生通訊問題。" + + #: ../daemon/gvfsafpserver.c:623 +@@ -364,16 +368,16 @@ + #: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297 + #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289 + #: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867 +-#: ../daemon/gvfsftptask.c:410 ++#: ../daemon/gvfsftptask.c:415 + msgid "Permission denied" + msgstr "權限不足" + + #: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727 +-#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991 ++#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:1001 + #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327 +-#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:705 +-#: ../daemon/gvfsbackendarchive.c:753 ../daemon/gvfsbackendarchive.c:805 +-#: ../daemon/gvfsbackendarchive.c:834 ../daemon/gvfsbackendcdda.c:1022 ++#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734 ++#: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838 ++#: ../daemon/gvfsbackendarchive.c:867 ../daemon/gvfsbackendcdda.c:1022 + #: ../daemon/gvfsbackendcomputer.c:639 ../daemon/gvfsbackenddnssd.c:415 + #: ../daemon/gvfsbackendftp.c:1073 ../daemon/gvfsbackendnetwork.c:696 + #: ../daemon/gvfsbackendsmbbrowse.c:1146 ../daemon/gvfsbackendsmbbrowse.c:1213 +@@ -384,8 +388,8 @@ + + #: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525 + #: ../daemon/gvfsbackendafp.c:288 ../daemon/gvfsbackendafp.c:491 +-#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2227 +-#: ../daemon/gvfsbackenddav.c:3052 ../daemon/gvfsbackendftp.c:779 ++#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2240 ++#: ../daemon/gvfsbackenddav.c:3065 ../daemon/gvfsbackendftp.c:779 + #: ../daemon/gvfsbackendsftp.c:2379 ../daemon/gvfsbackendsftp.c:3120 + #: ../daemon/gvfsbackendsftp.c:3470 ../daemon/gvfsbackendsftp.c:4502 + #: ../daemon/gvfsbackendsftp.c:5385 +@@ -401,7 +405,7 @@ + msgstr "目標檔案已開啟" + + #: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421 +-#: ../daemon/gvfsbackenddav.c:2617 ../daemon/gvfsbackendsftp.c:1861 ++#: ../daemon/gvfsbackenddav.c:2630 ../daemon/gvfsbackendsftp.c:1861 + msgid "Directory not empty" + msgstr "目錄不是空的" + +@@ -428,13 +432,13 @@ + + #: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1420 + #: ../daemon/gvfsafpvolume.c:1577 ../daemon/gvfsbackendafp.c:295 +-#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2282 +-#: ../daemon/gvfsbackenddav.c:2579 ../daemon/gvfsbackenddav.c:2685 +-#: ../daemon/gvfsbackenddav.c:2819 ../daemon/gvfsbackenddav.c:3043 ++#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2295 ++#: ../daemon/gvfsbackenddav.c:2592 ../daemon/gvfsbackenddav.c:2698 ++#: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056 + #: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939 + #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487 +-#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660 +-#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendsftp.c:4511 ++#: ../daemon/gvfsbackendmtp.c:1533 ../daemon/gvfsbackendmtp.c:1666 ++#: ../daemon/gvfsbackendmtp.c:1825 ../daemon/gvfsbackendsftp.c:4511 + #: ../daemon/gvfsbackendsmb.c:2217 + msgid "Target file already exists" + msgstr "目標檔案已存在" +@@ -507,9 +511,9 @@ + msgid "Range lock conflict exists" + msgstr "存在範圍鎖定的衝突" + +-#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369 +-#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535 +-#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2270 ++#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1374 ++#: ../daemon/gvfsbackendmtp.c:1393 ../daemon/gvfsbackendmtp.c:1541 ++#: ../daemon/gvfsbackendmtp.c:1760 ../daemon/gvfsbackendmtp.c:2288 + msgid "Directory doesn't exist" + msgstr "目錄不存在" + +@@ -534,9 +538,9 @@ + msgstr "內部的 Apple 檔案控制器錯誤" + + #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742 +-#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598 +-#: ../daemon/gvfsbackendmtp.c:1875 ../daemon/gvfsbackendmtp.c:1922 +-#: ../daemon/gvfsbackendmtp.c:1991 ../daemon/gvfsbackendmtp.c:2347 ++#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:1604 ++#: ../daemon/gvfsbackendmtp.c:1893 ../daemon/gvfsbackendmtp.c:1940 ++#: ../daemon/gvfsbackendmtp.c:2009 ../daemon/gvfsbackendmtp.c:2365 + msgid "File does not exist" + msgstr "檔案不存在" + +@@ -597,39 +601,39 @@ + msgid "Unhandled libimobiledevice error (%d)" + msgstr "未處理的 libimobiledevice 錯誤 (%d)" + +-#: ../daemon/gvfsbackendafc.c:417 ++#: ../daemon/gvfsbackendafc.c:427 + msgid "Try again" + msgstr "再試一次" + +-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979 ++#: ../daemon/gvfsbackendafc.c:427 ../daemon/gvfsbackend.c:989 + #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923 + #: ../monitor/udisks2/gvfsudisks2mount.c:762 + msgid "Cancel" + msgstr "取消" + +-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:607 +-#: ../daemon/gvfsbackendarchive.c:636 ../daemon/gvfsbackenddav.c:1813 ++#: ../daemon/gvfsbackendafc.c:445 ../daemon/gvfsbackendarchive.c:635 ++#: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826 + #: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887 + #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922 + #: ../daemon/gvfsbackendsmb.c:712 + msgid "Invalid mount spec" + msgstr "無效的掛載資料" + +-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471 ++#: ../daemon/gvfsbackendafc.c:451 ../daemon/gvfsbackendafc.c:481 + msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" + msgstr "無效的 AFC 位置：必須為 afc://uuid:port-number 格式" + +-#: ../daemon/gvfsbackendafc.c:457 ++#: ../daemon/gvfsbackendafc.c:467 + #, c-format + msgid "Apple Mobile Device" + msgstr "Apple Mobile Device" + +-#: ../daemon/gvfsbackendafc.c:462 ++#: ../daemon/gvfsbackendafc.c:472 + #, c-format + msgid "Apple Mobile Device, Jailbroken" + msgstr "Apple Mobile Device, 已越獄" + +-#: ../daemon/gvfsbackendafc.c:467 ++#: ../daemon/gvfsbackendafc.c:477 + #, c-format + msgid "Documents on Apple Mobile Device" + msgstr "Apple Mobile Device 上的文件" +@@ -637,7 +641,7 @@ + #. translators: + #. * This is the device name, with the service being browsed in brackets, eg.: + #. * Alan Smithee's iPhone (jailbreak) +-#: ../daemon/gvfsbackendafc.c:526 ++#: ../daemon/gvfsbackendafc.c:536 + #, c-format + msgid "%s (jailbreak)" + msgstr "%s (越獄)" +@@ -645,7 +649,7 @@ + #. translators: + #. * This is "Documents on foo" where foo is the device name, eg.: + #. * Documents on Alan Smithee's iPhone +-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184 ++#: ../daemon/gvfsbackendafc.c:543 ../monitor/afc/afcvolume.c:184 + #, c-format + msgid "Documents on %s" + msgstr "%s 上的文件" +@@ -653,36 +657,36 @@ + #. 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:637 ++#: ../daemon/gvfsbackendafc.c:647 + #, c-format + msgid "" + "The device “%s” is locked. Enter the passcode on the device and click “Try " + "again”." + msgstr "裝置“%s”已鎖定。請輸入裝置的密碼後按下“再試一次”。" + +-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:713 ++#: ../daemon/gvfsbackendafc.c:991 ../daemon/gvfsbackendarchive.c:742 + #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848 +-#: ../daemon/gvfsbackendmtp.c:2013 ../daemon/gvfsbackendobexftp.c:1099 ++#: ../daemon/gvfsbackendmtp.c:2031 ../daemon/gvfsbackendobexftp.c:1099 + #: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803 + #: ../daemon/gvfsbackendtrash.c:234 + msgid "Can't open directory" + msgstr "不能開啟目錄" + +-#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578 ++#: ../daemon/gvfsbackendafc.c:1194 ../daemon/gvfsbackendafc.c:2588 + msgid "Backups are not yet supported." + msgstr "尚未支援備份。" + +-#: ../daemon/gvfsbackendafc.c:1357 ++#: ../daemon/gvfsbackendafc.c:1367 + msgid "Invalid seek type" + msgstr "無效的搜尋類型" + +-#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790 ++#: ../daemon/gvfsbackendafc.c:2425 ../daemon/gvfsbackendafp.c:1790 + #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141 +-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1978 +-#: ../daemon/gvfsbackendmtp.c:2244 ../daemon/gvfsbackendmtp.c:2334 +-#: ../daemon/gvfsbackendmtp.c:2404 ../daemon/gvfsbackendsftp.c:1865 +-#: ../daemon/gvfsbackendsftp.c:4859 ../daemon/gvfsbackendsmb.c:1861 +-#: ../daemon/gvfsftptask.c:402 ++#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1996 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2422 ++#: ../daemon/gvfsbackendsftp.c:1865 ../daemon/gvfsbackendsftp.c:4859 ++#: ../daemon/gvfsbackendsmb.c:1861 ../daemon/gvfsftptask.c:407 + msgid "Operation unsupported" + msgstr "操作不被支援" + +@@ -699,7 +703,7 @@ + #. credentials during mount loop. Nautilus and other gio clients depend + #. on correct mountspec, setting it to real (different) credentials would + #. lead to G_IO_ERROR_NOT_MOUNTED errors +-#. ++#. + #. Translators: This is " on " and is used as name for an SMB share + #: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113 + #: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705 +@@ -716,7 +720,7 @@ + msgstr "%s" + + #: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2148 +-#: ../daemon/gvfsbackendarchive.c:596 ../daemon/gvfsbackendftp.c:673 ++#: ../daemon/gvfsbackendarchive.c:624 ../daemon/gvfsbackendftp.c:673 + #: ../daemon/gvfsbackendsftp.c:1778 + msgid "No hostname specified" + msgstr "未指定主機名稱" +@@ -731,13 +735,13 @@ + msgstr "不能將目錄複製到目錄上" + + #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891 +-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643 +-#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1789 +-#: ../daemon/gvfsbackendmtp.c:1813 ../daemon/gvfsbackendobexftp.c:1821 ++#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1649 ++#: ../daemon/gvfsbackendmtp.c:1672 ../daemon/gvfsbackendmtp.c:1807 ++#: ../daemon/gvfsbackendmtp.c:1831 ../daemon/gvfsbackendobexftp.c:1821 + msgid "Can't recursively copy directory" + msgstr "不能遞廻複製目錄" + +-#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2747 ++#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2760 + #: ../daemon/gvfsbackendsftp.c:4497 ../daemon/gvfsbackendsmb.c:2206 + msgid "Can't move directory over directory" + msgstr "不能將目錄移動至目錄上" +@@ -751,7 +755,7 @@ + msgid "Unable to create temporary file (%s)" + msgstr "無法建立暫存檔 (%s)" + +-#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2363 ++#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2376 + #: ../daemon/gvfsbackendsftp.c:3485 ../daemon/gvfsbackendsmb.c:1235 + msgid "The file was externally modified" + msgstr "該檔案已被外部程式修改過" +@@ -774,13 +778,13 @@ + #. 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 " +-#: ../daemon/gvfsbackendarchive.c:335 ../daemon/gvfsbackendsftp.c:2315 ++#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2315 + #: ../daemon/gvfsftpdircache.c:431 + #, c-format + msgid "/ on %s" + msgstr "/ 於 %s" + +-#: ../daemon/gvfsbackendarchive.c:843 ../daemon/gvfsbackendburn.c:679 ++#: ../daemon/gvfsbackendarchive.c:876 ../daemon/gvfsbackendburn.c:679 + #: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464 + #: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendnetwork.c:744 + #: ../daemon/gvfsbackendsftp.c:4003 ../daemon/gvfsftpdircache.c:157 +@@ -849,7 +853,7 @@ + #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120 + #: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260 + #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134 +-#: ../monitor/udisks2/gvfsudisks2volume.c:1676 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1677 + msgid "Operation not supported by backend" + msgstr "後端不支援此操作" + +@@ -857,14 +861,14 @@ + msgid "No such file or directory in target path" + msgstr "在目標路徑沒有這個檔案或目錄" + +-#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2786 ++#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2799 + #: ../daemon/gvfsbackendobexftp.c:1814 ../daemon/gvfsbackendobexftp.c:1845 + #: ../daemon/gvfsbackendsftp.c:1863 ../daemon/gvfsbackendsftp.c:4667 + msgid "Target file exists" + msgstr "目標檔案已存在" + + #: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:812 +-#: ../daemon/gvfsbackenddav.c:3128 ../daemon/gvfsbackenddav.c:3160 ++#: ../daemon/gvfsbackenddav.c:3141 ../daemon/gvfsbackenddav.c:3173 + #: ../daemon/gvfsbackendgphoto2.c:2537 ../daemon/gvfsbackendgphoto2.c:2750 + #: ../daemon/gvfsbackendgphoto2.c:2847 ../daemon/gvfsbackendgphoto2.c:2940 + #: ../daemon/gvfsbackendgphoto2.c:3549 ../daemon/gvfsbackendgphoto2.c:3559 +@@ -873,22 +877,20 @@ + msgid "Not supported" + msgstr "不支援" + +-#: ../daemon/gvfsbackend.c:978 ../monitor/gdu/ggdumount.c:922 ++#: ../daemon/gvfsbackend.c:988 ../monitor/gdu/ggdumount.c:922 + #: ../monitor/udisks2/gvfsudisks2mount.c:760 + msgid "Unmount Anyway" + msgstr "強制卸載" + +-#: ../daemon/gvfsbackend.c:981 ../monitor/gdu/ggdumount.c:924 ++#: ../daemon/gvfsbackend.c:991 ../monitor/gdu/ggdumount.c:924 + #: ../monitor/udisks2/gvfsudisks2mount.c:763 +-msgid "" +-"Volume is busy\n" ++msgid "Volume is busy\n" + "One or more applications are keeping the volume busy." +-msgstr "" +-"儲存區忙碌中\n" ++msgstr "儲存區忙碌中\n" + "一或多個應用程式正在使用該儲存區。" + + #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555 +-#: ../daemon/gvfsbackendmtp.c:850 ++#: ../daemon/gvfsbackendmtp.c:855 + msgid "Cannot create gudev client" + msgstr "不能建立 gudev 客戶端" + +@@ -1028,7 +1030,7 @@ + msgid "%s on %s%s" + msgstr "%s 於 %s%s" + +-#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1903 ++#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1916 + #: ../daemon/gvfsbackendhttp.c:202 + #, c-format + msgid "HTTP Error: %s" +@@ -1046,46 +1048,46 @@ + msgid "Unexpected reply from server" + msgstr "來自伺服器未預期的回應" + +-#: ../daemon/gvfsbackenddav.c:1387 ../daemon/gvfsbackenddav.c:2028 +-#: ../daemon/gvfsbackenddav.c:2117 ../daemon/gvfsbackenddav.c:2219 ++#: ../daemon/gvfsbackenddav.c:1398 ../daemon/gvfsbackenddav.c:2041 ++#: ../daemon/gvfsbackenddav.c:2130 ../daemon/gvfsbackenddav.c:2232 + msgid "Response invalid" + msgstr "回應無效" + +-#: ../daemon/gvfsbackenddav.c:1530 ++#: ../daemon/gvfsbackenddav.c:1541 + msgid "WebDAV share" + msgstr "WebDAV 分享" + + #. translators: %s here is the hostname + #. Translators: %s is the hostname +-#: ../daemon/gvfsbackenddav.c:1532 ../daemon/gvfsbackendftp.c:496 ++#: ../daemon/gvfsbackenddav.c:1543 ../daemon/gvfsbackendftp.c:496 + #: ../daemon/gvfsbackendsftp.c:980 + #, c-format + msgid "Enter password for %s" + msgstr "輸入 %s 的密碼 " + +-#: ../daemon/gvfsbackenddav.c:1535 ++#: ../daemon/gvfsbackenddav.c:1546 + msgid "Please enter proxy password" + msgstr "請輸入代理伺服器密碼" + +-#: ../daemon/gvfsbackenddav.c:1907 ../daemon/gvfsbackenddav.c:1911 ++#: ../daemon/gvfsbackenddav.c:1920 ../daemon/gvfsbackenddav.c:1924 + msgid "Not a WebDAV enabled share" + msgstr "不是使用 WebDAV 的分享" + +-#: ../daemon/gvfsbackenddav.c:1982 ../daemon/gvfsbackenddav.c:2072 +-#: ../daemon/gvfsbackenddav.c:2145 ../daemon/gvfsbackenddav.c:2253 ++#: ../daemon/gvfsbackenddav.c:1995 ../daemon/gvfsbackenddav.c:2085 ++#: ../daemon/gvfsbackenddav.c:2158 ../daemon/gvfsbackenddav.c:2266 + msgid "Could not create request" + msgstr "無法建立要求" + +-#: ../daemon/gvfsbackenddav.c:2394 ../daemon/gvfsbackenddav.c:2718 ++#: ../daemon/gvfsbackenddav.c:2407 ../daemon/gvfsbackenddav.c:2731 + #: ../daemon/gvfsbackendsmb.c:1271 ../daemon/gvfsbackendsmb.c:2234 + msgid "Backup file creation failed" + msgstr "建立備份檔案失敗" + +-#: ../daemon/gvfsbackenddav.c:2752 ++#: ../daemon/gvfsbackenddav.c:2765 + msgid "Can't move over directory" + msgstr "不能移動至目錄上" + +-#: ../daemon/gvfsbackenddav.c:2915 ++#: ../daemon/gvfsbackenddav.c:2928 + msgid "File length changed during transfer" + msgstr "傳輸過程中檔案長度發生變動" + +@@ -1178,7 +1180,7 @@ + msgid "Audio Player" + msgstr "音樂播放機" + +-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842 ++#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:847 + msgid "No device specified" + msgstr "未指定裝置" + +@@ -1233,7 +1235,7 @@ + msgid "Error getting data from file" + msgstr "從檔案取得資料時發生錯誤" + +-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2105 ++#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2123 + #, c-format + msgid "Malformed icon identifier '%s'" + msgstr "圖示識別符「%s」格式不良" +@@ -1315,7 +1317,8 @@ + + #: ../daemon/gvfsbackendgphoto2.c:3409 + msgid "" +-"Not supported (the source is a directory, the destination is a directory too)" ++"Not supported (the source is a directory, the destination is a directory " ++"too)" + msgstr "不支援 (來源是目錄，目的也是目錄)" + + #: ../daemon/gvfsbackendgphoto2.c:3417 +@@ -1338,85 +1341,85 @@ + msgid "Directory notification not supported" + msgstr "不支援目錄通知" + +-#: ../daemon/gvfsbackendmtp.c:556 ++#: ../daemon/gvfsbackendmtp.c:560 + msgid "Unknown error." + msgstr "不明的錯誤。" + +-#: ../daemon/gvfsbackendmtp.c:562 ++#: ../daemon/gvfsbackendmtp.c:566 + #, c-format + msgid "libmtp error: %s" + msgstr "libmtp 錯誤：%s" + +-#: ../daemon/gvfsbackendmtp.c:796 ++#: ../daemon/gvfsbackendmtp.c:801 + msgid "Unexpected host URI format." + msgstr "未預期的主機 URI 格式。" + +-#: ../daemon/gvfsbackendmtp.c:806 ++#: ../daemon/gvfsbackendmtp.c:811 + msgid "Malformed host URI." + msgstr "格式不良的主機 URI。" + +-#: ../daemon/gvfsbackendmtp.c:819 ++#: ../daemon/gvfsbackendmtp.c:824 + msgid "Couldn't find matching udev device." + msgstr "找不到符合的 udev 裝置。" + +-#: ../daemon/gvfsbackendmtp.c:974 ++#: ../daemon/gvfsbackendmtp.c:979 + msgid "No MTP devices found" + msgstr "找不到 MTP 裝置" + +-#: ../daemon/gvfsbackendmtp.c:979 ++#: ../daemon/gvfsbackendmtp.c:984 + msgid "Unable to connect to MTP device" + msgstr "無法連線至 MTP 裝置" + +-#: ../daemon/gvfsbackendmtp.c:984 ++#: ../daemon/gvfsbackendmtp.c:989 + msgid "Unable to allocate memory while detecting MTP devices" + msgstr "偵測到 MTP 裝置時無法配置記憶體" + +-#: ../daemon/gvfsbackendmtp.c:990 ++#: ../daemon/gvfsbackendmtp.c:995 + msgid "Generic libmtp error" + msgstr "一般 libmtp 錯誤" + +-#: ../daemon/gvfsbackendmtp.c:1007 ++#: ../daemon/gvfsbackendmtp.c:1012 + #, c-format + msgid "Unable to open MTP device '%s'" + msgstr "無法開啟 MTP 裝置「%s」" + +-#: ../daemon/gvfsbackendmtp.c:1027 ++#: ../daemon/gvfsbackendmtp.c:1032 + msgid "Device not found" + msgstr "找不到裝置" + +-#: ../daemon/gvfsbackendmtp.c:1066 ++#: ../daemon/gvfsbackendmtp.c:1071 + msgid "Unnamed Device" + msgstr "未命名裝置" + +-#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399 +-#: ../daemon/gvfsbackendmtp.c:1453 ++#: ../daemon/gvfsbackendmtp.c:1300 ../daemon/gvfsbackendmtp.c:1404 ++#: ../daemon/gvfsbackendmtp.c:1458 + msgid "File not found" + msgstr "找不到檔案" + +-#: ../daemon/gvfsbackendmtp.c:1516 ++#: ../daemon/gvfsbackendmtp.c:1522 + msgid "Cannot make directory in this location" + msgstr "不能在這個位置建立目錄" + +-#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1880 +-#: ../daemon/gvfsbackendmtp.c:1927 ../daemon/gvfsbackendmtp.c:1996 +-#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2420 ++#: ../daemon/gvfsbackendmtp.c:1593 ../daemon/gvfsbackendmtp.c:1898 ++#: ../daemon/gvfsbackendmtp.c:1945 ../daemon/gvfsbackendmtp.c:2014 ++#: ../daemon/gvfsbackendmtp.c:2370 ../daemon/gvfsbackendmtp.c:2438 + #: ../daemon/gvfsbackendsmbbrowse.c:1209 + msgid "Not a regular file" + msgstr "不是正規的檔案" + +-#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1779 ++#: ../daemon/gvfsbackendmtp.c:1639 ../daemon/gvfsbackendmtp.c:1797 + msgid "Target is a directory" + msgstr "目標是一個目錄" + +-#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1784 ++#: ../daemon/gvfsbackendmtp.c:1644 ../daemon/gvfsbackendmtp.c:1802 + msgid "Can't merge directories" + msgstr "不能合併目錄" + +-#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2262 ++#: ../daemon/gvfsbackendmtp.c:1737 ../daemon/gvfsbackendmtp.c:2280 + msgid "Cannot write to this location" + msgstr "不能寫入到這個位置" + +-#: ../daemon/gvfsbackendmtp.c:2087 ++#: ../daemon/gvfsbackendmtp.c:2105 + #, c-format + msgid "No thumbnail for entity '%s'" + msgstr "沒有項目「%s」的縮圖" +@@ -1535,8 +1538,7 @@ + "「%s」的識別不明。\n" + "這通常發生在您第一次登入電腦的時候。\n" + "\n" +-"由遠端電腦傳送的識別為“%s”。如果您想要完全確定繼續是安全的，請連絡系統管理" +-"者。" ++"由遠端電腦傳送的識別為“%s”。如果您想要完全確定繼續是安全的，請連絡系統管理者。" + + #: ../daemon/gvfsbackendsftp.c:1096 + msgid "Login dialog cancelled" +@@ -1701,12 +1703,16 @@ + msgid "Trash" + msgstr "回收筒" + ++#: ../daemon/gvfschannel.c:332 ++msgid "Channel blocked" ++msgstr "頻道被封鎖" ++ + #: ../daemon/gvfsftpconnection.c:180 + msgid "Unexpected end of stream" + msgstr "未預期的串流結束" + + #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209 +-#: ../daemon/gvfsftptask.c:422 ../daemon/gvfsftptask.c:850 ++#: ../daemon/gvfsftptask.c:427 ../daemon/gvfsftptask.c:855 + msgid "Invalid reply" + msgstr "無效的回應" + +@@ -1728,35 +1734,39 @@ + msgid "The FTP server is busy. Try again later" + msgstr "該 FTP 伺服器忙碌中。請稍後再試" + +-#: ../daemon/gvfsftptask.c:366 ++#: ../daemon/gvfsftptask.c:274 ++msgid "Backend currently unmounting" ++msgstr "正在卸載後端" ++ ++#: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" + msgstr "帳號不被支援" + +-#: ../daemon/gvfsftptask.c:374 ++#: ../daemon/gvfsftptask.c:379 + msgid "Cannot open data connection. Maybe your firewall prevents this?" + msgstr "無法開啟資料連線。也許您的防火牆阻擋了它？" + +-#: ../daemon/gvfsftptask.c:378 ++#: ../daemon/gvfsftptask.c:383 + msgid "Data connection closed" + msgstr "資料連線已關閉" + +-#: ../daemon/gvfsftptask.c:385 ../daemon/gvfsftptask.c:389 ++#: ../daemon/gvfsftptask.c:390 ../daemon/gvfsftptask.c:394 + msgid "Operation failed" + msgstr "操作已失敗" + +-#: ../daemon/gvfsftptask.c:394 ++#: ../daemon/gvfsftptask.c:399 + msgid "No space left on server" + msgstr "伺服器中沒有剩餘空間" + +-#: ../daemon/gvfsftptask.c:406 ++#: ../daemon/gvfsftptask.c:411 + msgid "Unsupported network protocol" + msgstr "不支援的網路通訊協定" + +-#: ../daemon/gvfsftptask.c:414 ++#: ../daemon/gvfsftptask.c:419 + msgid "Page type unknown" + msgstr "頁面類型不明" + +-#: ../daemon/gvfsftptask.c:418 ++#: ../daemon/gvfsftptask.c:423 + msgid "Invalid filename" + msgstr "無效的檔案名稱" + +@@ -1775,53 +1785,51 @@ + + #: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:676 + #, c-format +-msgid "" +-"Unmounting %s\n" ++msgid "Unmounting %s\n" + "Please wait" +-msgstr "" +-"正在卸載 %s\n" ++msgstr "正在卸載 %s\n" + "請稍候" + + #: ../daemon/gvfsjobunmount.c:197 + msgid "File system is busy" + msgstr "檔案系統忙碌中" + +-#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483 ++#: ../daemon/main.c:148 ../metadata/meta-daemon.c:458 + msgid "Replace old daemon." + msgstr "置換舊的伺服程式。" + +-#: ../daemon/main.c:144 ++#: ../daemon/main.c:149 + msgid "Don't start fuse." + msgstr "不啟動 fuse。" + +-#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484 ++#: ../daemon/main.c:150 ../metadata/meta-daemon.c:459 + msgid "Show program version." + msgstr "顯示程式版本" + +-#: ../daemon/main.c:159 ++#: ../daemon/main.c:164 + msgid "GVFS Daemon" + msgstr "GVFS 伺服程式" + +-#: ../daemon/main.c:162 ++#: ../daemon/main.c:167 + msgid "Main daemon for GVFS" + msgstr "GCFS 主伺服程式" + + #. Translators: the first %s is the application name, + #. the second %s is the error message +-#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510 ++#: ../daemon/main.c:183 ../metadata/meta-daemon.c:485 + #, c-format + msgid "%s: %s" + msgstr "%s: %s" + +-#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512 ++#: ../daemon/main.c:185 ../metadata/meta-daemon.c:487 + #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 + #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 + #: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97 + #: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120 + #: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127 + #: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088 +-#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78 +-#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82 ++#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:141 ++#: ../programs/gvfs-open.c:159 ../programs/gvfs-rename.c:82 + #: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 + #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 + #: ../programs/gvfs-tree.c:263 +@@ -1873,11 +1881,11 @@ + msgid "Unable to move metadata keys" + msgstr "無法移動中繼資料設定鍵" + +-#: ../metadata/meta-daemon.c:494 ++#: ../metadata/meta-daemon.c:469 + msgid "GVFS Metadata Daemon" + msgstr "GVFS 中繼資料伺服程式" + +-#: ../metadata/meta-daemon.c:497 ++#: ../metadata/meta-daemon.c:472 + msgid "Metadata daemon for GVFS" + msgstr "GVFS 的中繼資料伺服程式" + +@@ -1908,10 +1916,8 @@ + "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." +-msgstr "" +-"是否以降級模式啟動裝置？\n" +-"以降級模式啟動裝置代表該裝置將不再能容錯。如果有元件發生錯誤，裝置上的資料可" +-"能會永遠消失。" ++msgstr "是否以降級模式啟動裝置？\n" ++"以降級模式啟動裝置代表該裝置將不再能容錯。如果有元件發生錯誤，裝置上的資料可能會永遠消失。" + + #: ../monitor/gdu/ggdudrive.c:1023 + msgid "Start Anyway" +@@ -1941,8 +1947,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data on partition %d." +-msgstr "" +-"輸入用來解鎖儲存區的密碼\n" ++msgstr "輸入用來解鎖儲存區的密碼\n" + "裝置「%s」在分割區 %d 含有加密的資料。" + + #: ../monitor/gdu/ggduvolume.c:1104 +@@ -1950,8 +1955,7 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device \"%s\" contains encrypted data." +-msgstr "" +-"輸入用來解鎖儲存區的密碼\n" ++msgstr "輸入用來解鎖儲存區的密碼\n" + "裝置「%s」含有加密的資料。" + + #: ../monitor/gdu/ggduvolume.c:1111 +@@ -1959,21 +1963,20 @@ + msgid "" + "Enter a password to unlock the volume\n" + "The device %s contains encrypted data." +-msgstr "" +-"輸入用來解鎖儲存區的密碼\n" ++msgstr "輸入用來解鎖儲存區的密碼\n" + "裝置 %s 含有加密的資料。" + +-#: ../monitor/goa/goavolume.c:219 ++#: ../monitor/goa/goavolume.c:223 + #, c-format + msgid "Failed to get org.gnome.OnlineAccounts.Files for %s" + msgstr "無法取得 %s 的 org.gnome.OnlineAccounts.Files" + +-#: ../monitor/goa/goavolume.c:256 ++#: ../monitor/goa/goavolume.c:260 + #, c-format + msgid "Invalid credentials for %s" + msgstr "%s 的無效憑證" + +-#: ../monitor/goa/goavolume.c:273 ++#: ../monitor/goa/goavolume.c:277 + #, c-format + msgid "Unsupported authentication method for %s" + msgstr "不支援 %s 的核對方法" +@@ -2298,7 +2301,7 @@ + + #. Note that the GUI (Shell, Files) currently use the term + #. * "Eject" for both GDrive.stop() and GDrive.eject(). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2mount.c:756 + msgid "Eject Anyway" + msgstr "強制退出" +@@ -2310,11 +2313,9 @@ + + #: ../monitor/udisks2/gvfsudisks2utils.c:677 + #, c-format +-msgid "" +-"Writing data to %s\n" ++msgid "Writing data to %s\n" + "Don't unplug until finished" +-msgstr "" +-"正在寫入資料至 %s\n" ++msgstr "正在寫入資料至 %s\n" + "在結束前請勿拔除" + + #: ../monitor/udisks2/gvfsudisks2utils.c:822 +@@ -2324,7 +2325,7 @@ + + #. Translators: This is used for encrypted volumes. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:279 + #, c-format + msgid "%s Encrypted" +@@ -2332,7 +2333,7 @@ + + #. Translators: This is used for volume with no filesystem label. + #. * The first %s is the formatted size (e.g. "42.0 MB"). +-#. ++#. + #: ../monitor/udisks2/gvfsudisks2volume.c:291 + #, c-format + msgid "%s Volume" +@@ -2348,39 +2349,38 @@ + msgid "Error storing passphrase in keyring (%s)" + msgstr "在鑰匙圈中儲存密語時發生錯誤 (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1135 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1136 + #, c-format + msgid "Error deleting invalid passphrase from keyring (%s)" + msgstr "從鑰匙圈中刪除無效的密語時發生錯誤 (%s)" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1200 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1201 + msgid "The unlocked device does not have a recognizable file system on it" + msgstr "解鎖的裝置上並沒有可以辨識的檔案系統" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1229 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1230 + #, c-format + msgid "Encryption passphrase for %s" + msgstr "%s 的加密密語" + +-#: ../monitor/udisks2/gvfsudisks2volume.c:1397 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1398 + msgid "A passphrase is required to access the volume" + msgstr "存取這個儲存區需要密語" + + #. Translators: This is the message shown to users +-#: ../monitor/udisks2/gvfsudisks2volume.c:1412 ++#: ../monitor/udisks2/gvfsudisks2volume.c:1413 + #, c-format + msgid "" + "Enter a passphrase to unlock the volume\n" + "The passphrase is needed to access encrypted data on %s." +-msgstr "" +-"輸入用來解鎖儲存區的密碼\n" ++msgstr "輸入用來解鎖儲存區的密碼\n" + "這個密語是存取 %s 上加密的資料所需要的。" + + #. Translators: this is used to describe the drive the encrypted media + #. * is on - the first %s is the name (such as 'WD 2500JB External'), the + #. * second %s is the description ('250 GB Hard Disk'). +-#. +-#: ../monitor/udisks2/gvfsudisks2volume.c:1581 ++#. ++#: ../monitor/udisks2/gvfsudisks2volume.c:1582 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" +@@ -2394,7 +2394,7 @@ + #: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36 + #: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41 + #: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47 +-#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34 ++#: ../programs/gvfs-open.c:39 ../programs/gvfs-rename.c:34 + #: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54 + #: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71 + #: ../programs/gvfs-tree.c:39 +@@ -2429,7 +2429,7 @@ + msgid "%s: %s:error closing: %s\n" + msgstr "%s: %s:發生錯誤時正關閉: %s\n" + +-#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61 ++#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:124 + #: ../programs/gvfs-rm.c:58 + msgid "FILE" + msgstr "FILE" +@@ -2454,8 +2454,7 @@ + msgid "" + "Note: just pipe through cat if you need its formatting options\n" + "like -n, -T or other." +-msgstr "" +-"注意：只要利用導管通過 cat 就可以使用它的格式選項\n" ++msgstr "注意：只要利用導管通過 cat 就可以使用它的格式選項\n" + "如 -n, -T 或其他。" + + #: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144 +@@ -2463,7 +2462,7 @@ + #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70 + #: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124 + #: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140 +-#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80 ++#: ../programs/gvfs-open.c:139 ../programs/gvfs-rename.c:80 + #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 + #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 + #: ../programs/gvfs-tree.c:261 +@@ -2473,7 +2472,7 @@ + + #. Translators: the %s is the program name. This error message + #. means the user is calling gvfs-cat without any argument. +-#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94 ++#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:157 + #, c-format + msgid "%s: missing locations" + msgstr "%s：漏掉位置" +@@ -2907,17 +2906,16 @@ + + #. Translators: this message will appear after the usage string + #. and before the list of options. +-#: ../programs/gvfs-open.c:64 ++#: ../programs/gvfs-open.c:127 + msgid "" + "Open files with the default application that\n" + "is registered to handle files of this type." +-msgstr "" +-"使用註冊為處理該檔案類型的\n" ++msgstr "使用註冊為處理該檔案類型的\n" + "預設應用程式來開啟檔案。" + + #. Translators: the first %s is the program name, the second one + #. is the URI of the file, the third is the error message. +-#: ../programs/gvfs-open.c:126 ++#: ../programs/gvfs-open.c:192 + #, c-format + msgid "%s: %s: error opening location: %s\n" + msgstr "%s: %s：發生錯誤時正開啟位置： %s\n" +@@ -3034,7 +3032,7 @@ + msgid "Invalid attribute type %s\n" + msgstr "無效的屬性類型 %s\n" + +-#: ../programs/gvfs-set-attribute.c:235 ++#: ../programs/gvfs-set-attribute.c:238 + #, c-format + msgid "Error setting attribute: %s\n" + msgstr "設定屬性時發生錯誤：%s\n" +@@ -3059,140 +3057,3 @@ + #: ../programs/gvfs-tree.c:250 + msgid "List contents of directories in a tree-like format." + msgstr "以樹狀格式列出目錄的內容。" +- +-#~ msgid "progress" +-#~ msgstr "進度" +- +-#~ msgid "No storage volumes found" +-#~ msgstr "找不到儲存區" +- +-#~ msgid "Cannot delete this entity" +-#~ msgstr "不能刪除這個項目" +- +-#~ msgid "" +-#~ "Unable to connect to the server '%s'. A communication problem occurred." +-#~ msgstr "無法連線到伺服器「%s」。發生通訊問題。" +- +-#~ msgid "AFP volumes for %s on %s" +-#~ msgstr "AFP 儲存區 %s 於 %s" +- +-#~ msgid "AFP volumes on %s" +-#~ msgstr "AFP 儲存區於 %s" +- +-#~ msgid "AFP volume %s for %s on %s" +-#~ msgstr "AFP 儲存區 %s ： %s 於 %s" +- +-#~ msgid "AFP volume %s on %s" +-#~ msgstr "AFP 儲存區 %s 於 %s" +- +-#~ msgid "WebDAV as %s on %s%s" +-#~ msgstr "WebDAV 以 %s 於 %s%s" +- +-#~ msgid "WebDAV on %s%s" +-#~ msgstr "WebDAV 於 %s%s" +- +-#~ msgid "Enter password for FTP as %s on %s" +-#~ msgstr "輸入 %s 在 %s 上的 FTP 密碼 " +- +-#~ msgid "Enter password for FTP on %s" +-#~ msgstr "輸入 %s 的 FTP 密碼 " +- +-#~ msgid "FTP on %s" +-#~ msgstr "FTP 於 %s" +- +-#~ msgid "FTP as %s on %s" +-#~ msgstr "以 %s 登入 %s 的 FTP" +- +-#~ msgid "Enter passphrase for key for ssh as %s on %s" +-#~ msgstr "輸入 %s 在 %s 上的 ssh 金鑰密語 " +- +-#~ msgid "Enter password for ssh as %s on %s" +-#~ msgstr "輸入 %s 在 %s 上的 ssh 密碼 " +- +-#~ msgid "SFTP on %s" +-#~ msgstr "SFTP 於 %s" +- +-#~ msgid "Invalid icon_id '%s' in OpenIconForRead" +-#~ msgstr "OpenIconForRead 中有無效的 icon_id 「%s」" +- +-#~ msgid "AFP server %s declined the submitted password" +-#~ msgstr "AFP 伺服器 %s 拒絕了送出的密碼" +- +-#~ msgid "Received invalid reply from server" +-#~ msgstr "從伺服器傳回無效的回覆" +- +-#~ msgid "Enter password for afp as %s on %s" +-#~ msgstr "輸入 %s 在 %s 上的 afp 密碼 " +- +-#~ msgid "Enter password for afp on %s" +-#~ msgstr "輸入 %s 的 afp 密碼 " +- +-#~ msgid "Failed to logout from server" +-#~ msgstr "無法從伺服器登出" +- +-#~ msgid "Error creating socket: %s" +-#~ msgstr "建立 socket 時發生錯誤：%s" +- +-#~ msgid "Error connecting to socket: %s" +-#~ msgstr "連線至 socket 時發生錯誤：%s" +- +-#~ msgid "Can't contact session bus" +-#~ msgstr "不能連接作業階段匯流排" +- +-#~ msgid "Error connecting to daemon: %s" +-#~ msgstr "連線到伺服程式發生錯誤：%s" +- +-#~ msgid "Invalid attribute info list content" +-#~ msgstr "無效的屬性資訊清單內容" +- +-#~ msgid "Error connecting to D-Bus: %s" +-#~ msgstr "連線到 D-Bus 時發生錯誤：%s" +- +-#~ msgid "Invalid backend type" +-#~ msgstr "無效的後端類型" +- +-#~ msgid "Error sending file descriptor: %s" +-#~ msgstr "取得檔案描述符時發生錯誤：%s" +- +-#~ msgid "Invalid arguments from spawned child" +-#~ msgstr "來自衍生子程序的無效引數" +- +-#~ msgid "locations" +-#~ msgstr "位置" +- +-#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST" +-#~ msgstr "SOURCE… DEST - 將檔案從 SOURCE 複製到 DEST" +- +-#~ msgid "- list files at " +-#~ msgstr "- 列出在 的檔案" +- +-#~ msgid "- get/set handler for " +-#~ msgstr "- 取得/設定 的處理程式" +- +-#~ msgid "files" +-#~ msgstr "檔案" +- +-#~ msgid "%s: %s: error launching application: %s\n" +-#~ msgstr "%s: %s：執行應用程式時發生錯誤：%s\n" +- +-#~ msgid "FILES... - open FILES with registered application." +-#~ msgstr "FILES… - 以註冊的應用程式開啟 FILES。" +- +-#~ msgid "- delete files" +-#~ msgstr "- 刪除檔案" +- +-#~ msgid "Create backup" +-#~ msgstr "建立備份" +- +-#~ msgid "" +-#~ "attribute type [string, bytestring, boolean, uint32, int32, uint64, " +-#~ "int64, stringv, unset]" +-#~ msgstr "" +-#~ "屬性類型 [string, bytestring, boolean, uint32, int32, uint64, int64, " +-#~ "stringv, unset]" +- +-#~ msgid " - set attribute" +-#~ msgstr " - 設定屬性" +- +-#~ msgid "- move files to trash" +-#~ msgstr "- 將檔案丟進回收筒" diff --git a/SOURCES/gvfs-1.22.4-EL7.3_translations_for_ko.patch b/SOURCES/gvfs-1.22.4-EL7.3_translations_for_ko.patch new file mode 100644 index 0000000..1e74cd0 --- /dev/null +++ b/SOURCES/gvfs-1.22.4-EL7.3_translations_for_ko.patch @@ -0,0 +1,42 @@ +diff -urN gvfs-1.22.4/po/ko.po gvfs-1.22.4_localized/po/ko.po +--- gvfs-1.22.4/po/ko.po 2016-06-19 11:37:44.400309712 +0530 ++++ gvfs-1.22.4_localized/po/ko.po 2016-06-19 11:38:06.446307958 +0530 +@@ -14,6 +14,7 @@ + # * UI에 어떻게 보일지 생각하면서 번역한다. 볼륨 이름 따위에 *printf() + # 함수의 parameter order 기능을 (1$ 2$ 따위) 함부로 쓰면 파일 + # 관리자에서 이상하게 보일 수도 있다. ++# eukim , 2016. #zanata + # pnemade , 2016. #zanata + msgid "" + msgstr "" +@@ -23,8 +24,8 @@ + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"PO-Revision-Date: 2014-10-11 01:12+0000\n" +-"Last-Translator: Changwoo Ryu \n" ++"PO-Revision-Date: 2016-05-26 01:19+0000\n" ++"Last-Translator: eukim \n" + "Language-Team: GNOME Korea \n" + "Language: ko\n" + "Plural-Forms: nplurals=1; plural=0;\n" +@@ -69,9 +70,8 @@ + msgstr "파일 메타데이터를 설정하는 중 오류: %s" + + #: ../client/gdaemonfile.c:2658 ../client/gdaemonvfs.c:1287 +-#, fuzzy + msgid "can't open metadata tree" +-msgstr "%s 메타데이터 파일을 찾을 수 없습니다" ++msgstr "메타데이터 트리를 열 수 없습니다" + + #: ../client/gdaemonfile.c:2685 ../client/gdaemonvfs.c:1327 + msgid "values must be string or list of strings" +@@ -1760,7 +1760,7 @@ + + #: ../daemon/gvfsftptask.c:274 + msgid "Backend currently unmounting" +-msgstr "" ++msgstr "현재 백엔드를 마운트 해제 중입니다" + + #: ../daemon/gvfsftptask.c:371 + msgid "Accounts are unsupported" diff --git a/SPECS/gvfs.spec b/SPECS/gvfs.spec index 327edaf..8ff2a4a 100644 --- a/SPECS/gvfs.spec +++ b/SPECS/gvfs.spec @@ -3,7 +3,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.22.4 -Release: 6%{?dist} +Release: 8%{?dist} License: GPLv3 and LGPLv2+ and BSD and MPLv1.1 Group: System Environment/Libraries URL: http://www.gtk.org @@ -56,6 +56,10 @@ Patch5: gvfs-1.25.4-udisks2-Handle-libsecret-error-properly.patch Patch6: gvfs-1.22.5-proxy-volume-monitor-Guard-access-to-the-internal-ca.patch Patch7: gvfs-1.22.5-proxy-volume-monitor-Properly-handle-failure-to-crea.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1304254 +Patch8: gvfs-1.22.4-EL7.3_translations.patch +Patch9: gvfs-1.22.4-EL7.3_translations_for_ko.patch + Obsoletes: gnome-mount <= 0.8 Obsoletes: gnome-mount-nautilus-properties <= 0.8 Obsoletes: gvfs-obexftp < 1.16.3-3 @@ -184,6 +188,8 @@ file services. %patch5 -p1 -b .handle-libsecret-errors %patch6 -p1 -b .proxy-volume-monitor-guard-caches %patch7 -p1 -b .proxy-volume-monitor-properly-handle-failure +%patch8 -p1 -b .translations +%patch9 -p1 -b .translations-for-ko # Needed for gvfs-0.2.1-archive-integration.patch libtoolize --force || : @@ -380,6 +386,13 @@ update-desktop-database >&/dev/null || : %{_datadir}/gvfs/remote-volume-monitors/goa.monitor %changelog +* Mon Jun 27 2016 Ondrej Holy - 1.22.4-8 +- Update translations +- Resolves: #1304254 + +* Tue Apr 5 2016 Matthias Clasen - 1.22.4-7 +- Update translations +- Resolves: #1304254 * Fri Oct 16 2015 Debarshi Ray - 1.22.4-6 - Properly handle failure to create a remote proxy