Updated Norwegian bokmål translation.

1 files changed, 211 insertions, 195 deletions

diff --git a/po/nb.po b/po/nb.po
index 7e4226a2..60be34fe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gvfs 1.19.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-23 14:57+0200\n"
-"PO-Revision-Date: 2014-07-23 14:58+0200\n"
+"POT-Creation-Date: 2014-08-23 13:35+0200\n"
+"PO-Revision-Date: 2014-08-23 13:35+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -48,13 +48,13 @@ msgstr "Kan ikke finne omsluttende montering"
 msgid "Invalid filename %s"
 msgstr "Ugyldig filnavn %s"
 
-#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1254
-#: ../client/gdaemonvfs.c:1306
+#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264
+#: ../client/gdaemonvfs.c:1316
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Feil under setting av metadata for fil: %s"
 
-#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1307
+#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317
 msgid "values must be string or list of strings"
 msgstr "verdier må være av type streng eller liste med strenger"
 
@@ -103,8 +103,8 @@ msgstr "Feil i protokoll for strøm: %s"
 #: ../client/gdaemonfileinputstream.c:545
 #: ../client/gdaemonfileinputstream.c:1715
 #: ../client/gdaemonfileoutputstream.c:496
-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:1874
-#: ../daemon/gvfsbackendmtp.c:2258
+#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2144
+#: ../daemon/gvfsbackendmtp.c:2528
 msgid "End of stream"
 msgstr "Slutt på strømmen"
 
@@ -117,7 +117,7 @@ msgstr "Søking ikke støttet på strøm"
 msgid "Truncate not supported on stream"
 msgstr "Avkutting er ikke støttet på strøm"
 
-#: ../client/gdaemonvfs.c:778
+#: ../client/gdaemonvfs.c:788
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Feil ved henting av informasjon om monteringspunkt: %s"
@@ -224,22 +224,27 @@ msgstr "monteringspunkt for %s kjører allerede"
 msgid "error starting mount daemon"
 msgstr "feil under oppstart av monteringstjenesten"
 
-#: ../daemon/gvfsafpconnection.c:765
+#: ../daemon/gvfsafpconnection.c:766
 msgid "The connection is not opened"
 msgstr "Tilkoblingen er ikke åpnet"
 
-#: ../daemon/gvfsafpconnection.c:772 ../daemon/gvfsbackendmtp.c:327
+#: ../daemon/gvfsafpconnection.c:773 ../daemon/gvfsbackendmtp.c:378
 msgid "The connection is closed"
 msgstr "Tilkoblingen er lukket"
 
-#: ../daemon/gvfsafpconnection.c:1544
-msgid "Connection unexpectedly went down"
-msgstr "Tilkoblingen gikk ned uventet"
-
-#: ../daemon/gvfsafpconnection.c:1571
+#: ../daemon/gvfsafpconnection.c:886 ../daemon/gvfsafpconnection.c:1592
 msgid "Got EOS"
 msgstr "Fikk EOS"
 
+#: ../daemon/gvfsafpconnection.c:1061 ../daemon/gvfsafpconnection.c:1102
+#: ../daemon/gvfsftptask.c:370
+msgid "Host closed connection"
+msgstr "Vert lukket forbindelsen"
+
+#: ../daemon/gvfsafpconnection.c:1565
+msgid "Connection unexpectedly went down"
+msgstr "Tilkoblingen gikk ned uventet"
+
 #: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
 msgid "The server doesn't support passwords longer than %d character."
@@ -257,8 +262,8 @@ msgid "Unable to login to the server “%s” with the given password."
 msgstr "Kan ikke logge inn på tjener «%s» med oppgitt passord."
 
 #: ../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."
 msgstr "Kan ikke koble til tjener «%s». Et kommunikasjonsproblem oppsto."
@@ -282,7 +287,7 @@ msgstr ""
 "Kan ikke koble til tjener «%s». Ingen passende autentiseringsmekanisme "
 "funnet."
 
-#: ../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 "
@@ -291,51 +296,51 @@ msgstr ""
 "Kan ikke koble til tjener «%s». Tjeneren støtter ikke AFP-versjon 3.0 eller "
 "senere."
 
-#: ../daemon/gvfsafpserver.c:914
+#: ../daemon/gvfsafpserver.c:915
 #, c-format
 msgid "Permission denied."
 msgstr "Tilgang nektet."
 
-#: ../daemon/gvfsafpserver.c:919
+#: ../daemon/gvfsafpserver.c:920
 #, c-format
 msgid "The command is not supported by the server."
 msgstr "Kommandoen er ikke støttet av tjener."
 
-#: ../daemon/gvfsafpserver.c:923
+#: ../daemon/gvfsafpserver.c:924
 #, c-format
 msgid "Your password has expired."
 msgstr "Brukers passord har utløpt."
 
-#: ../daemon/gvfsafpserver.c:927
+#: ../daemon/gvfsafpserver.c:928
 #, c-format
 msgid "Your password needs to be changed."
 msgstr "Passordet ditt må byttes."
 
 #. 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 "Skriv inn passord for tjener «%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 "Oppgi navn og passord for tjener «%s»."
 
-#: ../daemon/gvfsafpserver.c:1105
+#: ../daemon/gvfsafpserver.c:1106
 msgid "The password prompt was cancelled."
 msgstr "Passorddialog avbrutt."
 
-#: ../daemon/gvfsafpserver.c:1222
+#: ../daemon/gvfsafpserver.c:1224
 msgid "Unable to disconnect from the server."
 msgstr "Klarte ikke å koble fra tjener."
 
-#: ../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 "Kan ikke koble til tjener. Et kommunikasjonsproblem oppsto."
 
-#: ../daemon/gvfsafpserver.c:1719
+#: ../daemon/gvfsafpserver.c:1721
 msgid "Identification not found."
 msgstr "Identifikasjonen ble ikke funnet."
 
@@ -350,29 +355,29 @@ msgid "Got unknown error code %d from server"
 msgstr "Fikk ukjent feilkode %d fra tjener"
 
 #. Translators: first %s is volumename and second servername
-#: ../daemon/gvfsafpvolume.c:145
+#: ../daemon/gvfsafpvolume.c:154
 #, c-format
 msgid "Couldn't load %s on %s"
 msgstr "Kunne ikke laste %s på %s"
 
-#: ../daemon/gvfsafpvolume.c:393 ../daemon/gvfsafpvolume.c:663
-#: ../daemon/gvfsafpvolume.c:816 ../daemon/gvfsafpvolume.c:1010
-#: ../daemon/gvfsafpvolume.c:1212 ../daemon/gvfsafpvolume.c:1395
-#: ../daemon/gvfsafpvolume.c:1552 ../daemon/gvfsafpvolume.c:1998
-#: ../daemon/gvfsafpvolume.c:2126 ../daemon/gvfsafpvolume.c:2288
-#: ../daemon/gvfsafpvolume.c:2508 ../daemon/gvfsbackendafc.c:289
+#: ../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:403
+#: ../daemon/gvfsftptask.c:410
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../daemon/gvfsafpvolume.c:397 ../daemon/gvfsafpvolume.c:1718
-#: ../daemon/gvfsafpvolume.c:2512 ../daemon/gvfsbackendafc.c:991
+#: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727
+#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991
 #: ../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/gvfsbackendcomputer.c:638 ../daemon/gvfsbackenddnssd.c:415
+#: ../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/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
@@ -380,149 +385,150 @@ msgstr "Tilgang nektet"
 msgid "File doesn't exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:401 ../daemon/gvfsafpvolume.c:2516
+#: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525
 #: ../daemon/gvfsbackendafp.c:288 ../daemon/gvfsbackendafp.c:491
-#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2232
-#: ../daemon/gvfsbackenddav.c:3057 ../daemon/gvfsbackendftp.c:779
+#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2227
+#: ../daemon/gvfsbackenddav.c:3052 ../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 "Filen er en katalog"
 
-#: ../daemon/gvfsafpvolume.c:405
+#: ../daemon/gvfsafpvolume.c:414
 msgid "Too many files open"
 msgstr "For mange åpne filer"
 
-#: ../daemon/gvfsafpvolume.c:667 ../daemon/gvfsafpvolume.c:824
+#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsafpvolume.c:833
 msgid "Target file is open"
 msgstr "Målfilen er åpen"
 
-#: ../daemon/gvfsafpvolume.c:671 ../daemon/gvfsbackendburn.c:421
-#: ../daemon/gvfsbackenddav.c:2622 ../daemon/gvfsbackendsftp.c:1861
+#: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421
+#: ../daemon/gvfsbackenddav.c:2617 ../daemon/gvfsbackendsftp.c:1861
 msgid "Directory not empty"
 msgstr "Katalogen er ikke tom"
 
-#: ../daemon/gvfsafpvolume.c:675
+#: ../daemon/gvfsafpvolume.c:684
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "Målobjektet er merket som ikke slettbart (DeleteInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:679 ../daemon/gvfsafpvolume.c:1228
-#: ../daemon/gvfsafpvolume.c:2130
+#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237
+#: ../daemon/gvfsafpvolume.c:2139
 msgid "Target object doesn't exist"
 msgstr "Målobjektet eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:683 ../daemon/gvfsafpvolume.c:836
-#: ../daemon/gvfsafpvolume.c:1032 ../daemon/gvfsafpvolume.c:1232
-#: ../daemon/gvfsafpvolume.c:2134
+#: ../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 "Volumet er skrivebeskyttet"
 
-#: ../daemon/gvfsafpvolume.c:820 ../daemon/gvfsafpvolume.c:1014
-#: ../daemon/gvfsafpvolume.c:1564 ../daemon/gvfsafpvolume.c:2002
-#: ../daemon/gvfsafpvolume.c:2646
+#: ../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 "Ikke nok plass på volumet"
 
-#: ../daemon/gvfsafpvolume.c:828 ../daemon/gvfsafpvolume.c:1411
-#: ../daemon/gvfsafpvolume.c:1568 ../daemon/gvfsbackendafp.c:295
-#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2287
-#: ../daemon/gvfsbackenddav.c:2584 ../daemon/gvfsbackenddav.c:2690
-#: ../daemon/gvfsbackenddav.c:2824 ../daemon/gvfsbackenddav.c:3048
+#: ../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/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939
 #: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487
-#: ../daemon/gvfsbackendmtp.c:1417 ../daemon/gvfsbackendmtp.c:1528
-#: ../daemon/gvfsbackendsftp.c:4511 ../daemon/gvfsbackendsmb.c:2217
+#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660
+#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendsftp.c:4511
+#: ../daemon/gvfsbackendsmb.c:2217
 msgid "Target file already exists"
 msgstr "Målfilen eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:832 ../daemon/gvfsafpvolume.c:1024
+#: ../daemon/gvfsafpvolume.c:841 ../daemon/gvfsafpvolume.c:1033
 msgid "Ancestor directory doesn't exist"
 msgstr "Opphavskatalogen eksisterer ikke"
 
 #. Translators: flat means volume doesn't support directories
 #. (all files are in the volume root)
-#: ../daemon/gvfsafpvolume.c:1020
+#: ../daemon/gvfsafpvolume.c:1029
 msgid "Volume is flat and doesn't support directories"
 msgstr "Volumet er flatt og støtter ikke kataloger"
 
-#: ../daemon/gvfsafpvolume.c:1028
+#: ../daemon/gvfsafpvolume.c:1037
 msgid "Target directory already exists"
 msgstr "Målkatalogen eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:1216 ../daemon/gvfsbackendafp.c:603
+#: ../daemon/gvfsafpvolume.c:1225 ../daemon/gvfsbackendafp.c:603
 msgid "Can't rename volume"
 msgstr "Kan ikke endre navn på volumet"
 
-#: ../daemon/gvfsafpvolume.c:1220
+#: ../daemon/gvfsafpvolume.c:1229
 msgid "Object with that name already exists"
 msgstr "Et objekt med dette navnet eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:1224
+#: ../daemon/gvfsafpvolume.c:1233
 msgid "Target object is marked as not renameable (RenameInhibit)"
 msgstr "Kan ikke endre navn på målobjektet (RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1399
+#: ../daemon/gvfsafpvolume.c:1408
 msgid "Can't move directory into one of its descendants"
 msgstr "Kan ikke flytte katalogen inn i en underkatalog"
 
-#: ../daemon/gvfsafpvolume.c:1403
+#: ../daemon/gvfsafpvolume.c:1412
 msgid "Can't move sharepoint into a shared directory"
 msgstr "Kan ikke flytte delingspunkt inn i en delt katalog"
 
-#: ../daemon/gvfsafpvolume.c:1407
+#: ../daemon/gvfsafpvolume.c:1416
 msgid "Can't move a shared directory into the Trash"
 msgstr "Kan ikke flytte en delt katalog til papirkurven"
 
-#: ../daemon/gvfsafpvolume.c:1415
+#: ../daemon/gvfsafpvolume.c:1424
 msgid "Object being moved is marked as not renameable (RenameInhibit)"
 msgstr "Kan ikke endre navn på objektet som flyttes (RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1419
+#: ../daemon/gvfsafpvolume.c:1428
 msgid "Object being moved doesn't exist"
 msgstr "Objektet som flyttes eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:1556
+#: ../daemon/gvfsafpvolume.c:1565
 msgid "Server doesn't support the FPCopyFile operation"
 msgstr "Tjener støtter ikke FPCopyFile-operasjonen"
 
-#: ../daemon/gvfsafpvolume.c:1560
+#: ../daemon/gvfsafpvolume.c:1569
 msgid "Unable to open source file for reading"
 msgstr "Kan ikke åpne kildefilen for lesing"
 
-#: ../daemon/gvfsafpvolume.c:1572
+#: ../daemon/gvfsafpvolume.c:1581
 msgid "Source file and/or destination directory doesn't exist"
 msgstr "Kildefil og/eller målkatalog eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:1576
+#: ../daemon/gvfsafpvolume.c:1585
 msgid "Source file is a directory"
 msgstr "Kildefilen er en katalog"
 
 #. Translators: range conflict means
 #. requested data are locked by another user
-#: ../daemon/gvfsafpvolume.c:2008
+#: ../daemon/gvfsafpvolume.c:2017
 msgid "Range lock conflict exists"
 msgstr "Konflikt i områdelås eksisterer"
 
-#: ../daemon/gvfsafpvolume.c:2292 ../daemon/gvfsbackendmtp.c:1199
-#: ../daemon/gvfsbackendmtp.c:1346 ../daemon/gvfsbackendmtp.c:1537
-#: ../daemon/gvfsbackendmtp.c:2000
+#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369
+#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535
+#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2270
 msgid "Directory doesn't exist"
 msgstr "Katalogen eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:2296
+#: ../daemon/gvfsafpvolume.c:2305
 msgid "Target object is not a directory"
 msgstr "Målobjektet er ikke en katalog"
 
-#: ../daemon/gvfsafpvolume.c:2642
+#: ../daemon/gvfsafpvolume.c:2651
 msgid "File is not open for write access"
 msgstr "Filen er ikke åpen for skrivetilgang"
 
-#: ../daemon/gvfsafpvolume.c:2650
+#: ../daemon/gvfsafpvolume.c:2659
 msgid "File is locked by another user"
 msgstr "Filen er låst av en annen bruker"
 
-#: ../daemon/gvfsafpvolume.c:2788
+#: ../daemon/gvfsafpvolume.c:2797
 msgid "File is not open for read access"
 msgstr "Filen er ikke åpen for lesetilgang"
 
@@ -531,9 +537,9 @@ msgid "Internal Apple File Control error"
 msgstr "Intern Apple File Control feil"
 
 #: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742
-#: ../daemon/gvfsbackendmtp.c:1392 ../daemon/gvfsbackendmtp.c:1430
-#: ../daemon/gvfsbackendmtp.c:1622 ../daemon/gvfsbackendmtp.c:1669
-#: ../daemon/gvfsbackendmtp.c:1739 ../daemon/gvfsbackendmtp.c:2077
+#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598
+#: ../daemon/gvfsbackendmtp.c:1875 ../daemon/gvfsbackendmtp.c:1922
+#: ../daemon/gvfsbackendmtp.c:1991 ../daemon/gvfsbackendmtp.c:2347
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
@@ -606,9 +612,9 @@ msgstr "Prøv igjen"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:607
-#: ../daemon/gvfsbackendarchive.c:636 ../daemon/gvfsbackenddav.c:1813
-#: ../daemon/gvfsbackendhttp.c:318 ../daemon/gvfsbackendobexftp.c:887
+#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:611
+#: ../daemon/gvfsbackendarchive.c:640 ../daemon/gvfsbackenddav.c:1813
+#: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887
 #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922
 #: ../daemon/gvfsbackendsmb.c:712
 msgid "Invalid mount spec"
@@ -660,10 +666,11 @@ msgid ""
 msgstr ""
 "Enhet «%s» er låst. Oppgi passordkode på enheten og klikk på «Prøv igjen»."
 
-#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:713
-#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1848
-#: ../daemon/gvfsbackendobexftp.c:1099 ../daemon/gvfsbackendrecent.c:122
-#: ../daemon/gvfsbackendsmb.c:803 ../daemon/gvfsbackendtrash.c:234
+#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:717
+#: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848
+#: ../daemon/gvfsbackendmtp.c:2013 ../daemon/gvfsbackendobexftp.c:1099
+#: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803
+#: ../daemon/gvfsbackendtrash.c:234
 msgid "Can't open directory"
 msgstr "Kan ikke åpne katalog"
 
@@ -677,11 +684,11 @@ msgstr "Ugyldig type søk"
 
 #: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790
 #: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141
-#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1726
-#: ../daemon/gvfsbackendmtp.c:1974 ../daemon/gvfsbackendmtp.c:2064
-#: ../daemon/gvfsbackendmtp.c:2134 ../daemon/gvfsbackendsftp.c:1865
+#: ../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:395
+#: ../daemon/gvfsftptask.c:402
 msgid "Operation unsupported"
 msgstr "Operasjonen støttes ikke"
 
@@ -715,12 +722,12 @@ msgid "%s"
 msgstr "%s"
 
 #: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2148
-#: ../daemon/gvfsbackendarchive.c:596 ../daemon/gvfsbackendftp.c:673
+#: ../daemon/gvfsbackendarchive.c:600 ../daemon/gvfsbackendftp.c:673
 #: ../daemon/gvfsbackendsftp.c:1778
 msgid "No hostname specified"
 msgstr "Ingen vertsnavn oppgitt"
 
-#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2240
+#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2243
 msgid "Apple Filing Protocol Service"
 msgstr "Apple Filing Protocol Service"
 
@@ -730,12 +737,13 @@ msgid "Can't copy directory over directory"
 msgstr "Kan ikke kopiere katalog over katalog"
 
 #: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891
-#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1440
-#: ../daemon/gvfsbackendmtp.c:1549 ../daemon/gvfsbackendobexftp.c:1821
+#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643
+#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1789
+#: ../daemon/gvfsbackendmtp.c:1813 ../daemon/gvfsbackendobexftp.c:1821
 msgid "Can't recursively copy directory"
 msgstr "Kan ikke kopiere katalog rekursivt"
 
-#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2752
+#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2747
 #: ../daemon/gvfsbackendsftp.c:4497 ../daemon/gvfsbackendsmb.c:2206
 msgid "Can't move directory over directory"
 msgstr "Kan ikke flytte katalog over katalog"
@@ -749,7 +757,7 @@ msgstr "sikkerhetskopier er ikke støttet"
 msgid "Unable to create temporary file (%s)"
 msgstr "Kan ikke opprette midlertidig fil (%s)"
 
-#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2368
+#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2363
 #: ../daemon/gvfsbackendsftp.c:3485 ../daemon/gvfsbackendsmb.c:1235
 msgid "The file was externally modified"
 msgstr "Filen er endret eksternt"
@@ -778,8 +786,8 @@ msgstr "Ingen volumer oppgitt"
 msgid "/ on %s"
 msgstr "/ på %s"
 
-#: ../daemon/gvfsbackendarchive.c:843 ../daemon/gvfsbackendburn.c:679
-#: ../daemon/gvfsbackendcomputer.c:728 ../daemon/gvfsbackenddnssd.c:464
+#: ../daemon/gvfsbackendarchive.c:849 ../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"
@@ -829,7 +837,7 @@ msgstr "Filen eksisterer"
 #: ../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:271
+#: ../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:184
@@ -855,17 +863,17 @@ msgstr "Operasjonen ikke tillatt av motoren"
 msgid "No such file or directory in target path"
 msgstr "Fil eller katalog finnes ikke i målsti"
 
-#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2791
+#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2786
 #: ../daemon/gvfsbackendobexftp.c:1814 ../daemon/gvfsbackendobexftp.c:1845
 #: ../daemon/gvfsbackendsftp.c:1863 ../daemon/gvfsbackendsftp.c:4667
 msgid "Target file exists"
 msgstr "Målfilen eksisterer"
 
-#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:811
-#: ../daemon/gvfsbackenddav.c:3133 ../daemon/gvfsbackenddav.c:3165
+#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:812
+#: ../daemon/gvfsbackenddav.c:3128 ../daemon/gvfsbackenddav.c:3160
 #: ../daemon/gvfsbackendgphoto2.c:2537 ../daemon/gvfsbackendgphoto2.c:2750
 #: ../daemon/gvfsbackendgphoto2.c:2847 ../daemon/gvfsbackendgphoto2.c:2940
-#: ../daemon/gvfsbackendgphoto2.c:3548 ../daemon/gvfsbackendgphoto2.c:3558
+#: ../daemon/gvfsbackendgphoto2.c:3549 ../daemon/gvfsbackendgphoto2.c:3559
 #: ../daemon/gvfsbackendsftp.c:5499 ../daemon/gvfsbackendsftp.c:5531
 #: ../daemon/gvfsbackendsftp.c:6017
 msgid "Not supported"
@@ -886,7 +894,7 @@ msgstr ""
 "Et eller flere programmer holder volumet opptatt."
 
 #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555
-#: ../daemon/gvfsbackendmtp.c:698
+#: ../daemon/gvfsbackendmtp.c:850
 msgid "Cannot create gudev client"
 msgstr "Kan ikke opprette gudev-klient"
 
@@ -968,54 +976,54 @@ msgstr "Filen eksisterer ikke eller er ikke et lydspor"
 msgid "Audio CD File System Service"
 msgstr "Filsystemtjeneste for lyd-CD"
 
-#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:770
+#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:771
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: ../daemon/gvfsbackendcomputer.c:531
+#: ../daemon/gvfsbackendcomputer.c:532
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../daemon/gvfsbackendcomputer.c:660
+#: ../daemon/gvfsbackendcomputer.c:661
 msgid "Can't open mountable file"
 msgstr "Kan ikke åpne monterbar fil"
 
-#: ../daemon/gvfsbackendcomputer.c:857
+#: ../daemon/gvfsbackendcomputer.c:858
 #, c-format
 msgid "Internal error: %s"
 msgstr "Intern feil: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1007
+#: ../daemon/gvfsbackendcomputer.c:890 ../daemon/gvfsbackendcomputer.c:1008
 msgid "Can't mount file"
 msgstr "Kan ikke montere fil"
 
-#: ../daemon/gvfsbackendcomputer.c:900
+#: ../daemon/gvfsbackendcomputer.c:901
 msgid "No medium in the drive"
 msgstr "Ikke noe medie i stasjonen"
 
-#: ../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 "Ikke en monterbar fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1071
+#: ../daemon/gvfsbackendcomputer.c:1072
 msgid "Can't unmount file"
 msgstr "Kan ikke avmontere fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1201
+#: ../daemon/gvfsbackendcomputer.c:1202
 msgid "Can't eject file"
 msgstr "Kan ikke løse ut fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1268 ../daemon/gvfsbackendcomputer.c:1275
+#: ../daemon/gvfsbackendcomputer.c:1269 ../daemon/gvfsbackendcomputer.c:1276
 msgid "Can't start drive"
 msgstr "Kan ikke starte stasjon"
 
-#: ../daemon/gvfsbackendcomputer.c:1341 ../daemon/gvfsbackendcomputer.c:1348
+#: ../daemon/gvfsbackendcomputer.c:1342 ../daemon/gvfsbackendcomputer.c:1349
 msgid "Can't stop drive"
 msgstr "Kan ikke stoppe stasjon"
 
-#: ../daemon/gvfsbackendcomputer.c:1405 ../daemon/gvfsbackendcomputer.c:1412
+#: ../daemon/gvfsbackendcomputer.c:1406 ../daemon/gvfsbackendcomputer.c:1413
 msgid "Can't poll file"
 msgstr "Kan ikke hente data om fil"
 
@@ -1028,7 +1036,7 @@ msgid "%s on %s%s"
 msgstr "%s på %s%s"
 
 #: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1903
-#: ../daemon/gvfsbackendhttp.c:264
+#: ../daemon/gvfsbackendhttp.c:202
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-feil: %s"
@@ -1045,8 +1053,8 @@ msgstr "Tomt svar"
 msgid "Unexpected reply from server"
 msgstr "Uventet svar fra tjener"
 
-#: ../daemon/gvfsbackenddav.c:1387 ../daemon/gvfsbackenddav.c:2033
-#: ../daemon/gvfsbackenddav.c:2122 ../daemon/gvfsbackenddav.c:2224
+#: ../daemon/gvfsbackenddav.c:1387 ../daemon/gvfsbackenddav.c:2028
+#: ../daemon/gvfsbackenddav.c:2117 ../daemon/gvfsbackenddav.c:2219
 msgid "Response invalid"
 msgstr "Ugyldig svar"
 
@@ -1070,21 +1078,21 @@ msgstr "Skriv inn passord for proxy"
 msgid "Not a WebDAV enabled share"
 msgstr "Ressursen støtter ikke WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1987 ../daemon/gvfsbackenddav.c:2077
-#: ../daemon/gvfsbackenddav.c:2150 ../daemon/gvfsbackenddav.c:2258
+#: ../daemon/gvfsbackenddav.c:1982 ../daemon/gvfsbackenddav.c:2072
+#: ../daemon/gvfsbackenddav.c:2145 ../daemon/gvfsbackenddav.c:2253
 msgid "Could not create request"
 msgstr "Kan ikke opprette forespørsel"
 
-#: ../daemon/gvfsbackenddav.c:2399 ../daemon/gvfsbackenddav.c:2723
+#: ../daemon/gvfsbackenddav.c:2394 ../daemon/gvfsbackenddav.c:2718
 #: ../daemon/gvfsbackendsmb.c:1271 ../daemon/gvfsbackendsmb.c:2234
 msgid "Backup file creation failed"
 msgstr "Oppretting av sikkerhetskopi feilet"
 
-#: ../daemon/gvfsbackenddav.c:2757
+#: ../daemon/gvfsbackenddav.c:2752
 msgid "Can't move over directory"
 msgstr "Kan ikke flytte over katalog"
 
-#: ../daemon/gvfsbackenddav.c:2920
+#: ../daemon/gvfsbackenddav.c:2915
 msgid "File length changed during transfer"
 msgstr "Fillengden ble endret under overføring"
 
@@ -1177,7 +1185,7 @@ msgstr "Kamera"
 msgid "Audio Player"
 msgstr "Lydspiller"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:690
+#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842
 msgid "No device specified"
 msgstr "Ingen enhet oppgitt"
 
@@ -1232,7 +1240,7 @@ msgstr "Feil under henting av fil"
 msgid "Error getting data from file"
 msgstr "Feil under henting av data fra fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:1835
+#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2105
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Feilutformet ikonidentifikator «%s»"
@@ -1284,7 +1292,7 @@ msgstr "Katalog «%s» er ikke tom"
 msgid "Error deleting directory"
 msgstr "Feil under sletting av katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2897 ../daemon/gvfsbackendgphoto2.c:3634
+#: ../daemon/gvfsbackendgphoto2.c:2897 ../daemon/gvfsbackendgphoto2.c:3642
 msgid "Error deleting file"
 msgstr "Feil under sletting av fil"
 
@@ -1328,7 +1336,7 @@ msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Ikke støttet (kilde er fil, mål er katalog)"
 
-#: ../daemon/gvfsbackendhttp.c:260
+#: ../daemon/gvfsbackendhttp.c:198
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP-klientfeil: %s"
@@ -1337,85 +1345,89 @@ msgstr "HTTP-klientfeil: %s"
 msgid "Directory notification not supported"
 msgstr "Varsling for kataloger er ikke støttet"
 
-#: ../daemon/gvfsbackendmtp.c:505
+#: ../daemon/gvfsbackendmtp.c:556
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: ../daemon/gvfsbackendmtp.c:511
+#: ../daemon/gvfsbackendmtp.c:562
 #, c-format
 msgid "libmtp error: %s"
 msgstr "feil i libmtp: %s"
 
-#: ../daemon/gvfsbackendmtp.c:644
+#: ../daemon/gvfsbackendmtp.c:796
 msgid "Unexpected host URI format."
 msgstr "Uventet format på URI for vert."
 
-#: ../daemon/gvfsbackendmtp.c:654
+#: ../daemon/gvfsbackendmtp.c:806
 msgid "Malformed host URI."
 msgstr "Feilutformet URI for vert."
 
-#: ../daemon/gvfsbackendmtp.c:667
+#: ../daemon/gvfsbackendmtp.c:819
 msgid "Couldn't find matching udev device."
 msgstr "Fant ikke passende udev-enhet."
 
-#: ../daemon/gvfsbackendmtp.c:811
+#: ../daemon/gvfsbackendmtp.c:974
 msgid "No MTP devices found"
 msgstr "Fant ingen MTP-enheter"
 
-#: ../daemon/gvfsbackendmtp.c:816
+#: ../daemon/gvfsbackendmtp.c:979
 msgid "Unable to connect to MTP device"
 msgstr "Kan ikke koble til MTP-enhet"
 
-#: ../daemon/gvfsbackendmtp.c:821
+#: ../daemon/gvfsbackendmtp.c:984
 msgid "Unable to allocate memory while detecting MTP devices"
 msgstr "Kan ikke allokere minne under søk etter MTP-enheter"
 
-#: ../daemon/gvfsbackendmtp.c:827
+#: ../daemon/gvfsbackendmtp.c:990
 msgid "Generic libmtp error"
 msgstr "Generisk libmtp-feil"
 
-#: ../daemon/gvfsbackendmtp.c:844
+#: ../daemon/gvfsbackendmtp.c:1007
 #, c-format
 msgid "Unable to open MTP device '%s'"
 msgstr "Kan ikke åpne MTP-enhet «%s»"
 
-#: ../daemon/gvfsbackendmtp.c:864
+#: ../daemon/gvfsbackendmtp.c:1027
 msgid "Device not found"
 msgstr "Fant ikke enhet"
 
-#: ../daemon/gvfsbackendmtp.c:903
+#: ../daemon/gvfsbackendmtp.c:1066
 msgid "Unnamed Device"
 msgstr "Enhet uten navn"
 
-#: ../daemon/gvfsbackendmtp.c:1125 ../daemon/gvfsbackendmtp.c:1218
-#: ../daemon/gvfsbackendmtp.c:1272
+#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399
+#: ../daemon/gvfsbackendmtp.c:1453
 msgid "File not found"
 msgstr "Fant ikke fil"
 
-#: ../daemon/gvfsbackendmtp.c:1335
+#: ../daemon/gvfsbackendmtp.c:1516
 msgid "Cannot make directory in this location"
 msgstr "Kan ikke lage katalog på denne lokasjonen"
 
-#: ../daemon/gvfsbackendmtp.c:1397 ../daemon/gvfsbackendmtp.c:1627
-#: ../daemon/gvfsbackendmtp.c:1674 ../daemon/gvfsbackendmtp.c:1744
-#: ../daemon/gvfsbackendmtp.c:2082 ../daemon/gvfsbackendmtp.c:2150
+#: ../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/gvfsbackendsmbbrowse.c:1209
 msgid "Not a regular file"
 msgstr "Ikke en vanlig fil"
 
-#: ../daemon/gvfsbackendmtp.c:1504
+#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1779
+msgid "Target is a directory"
+msgstr "Målet er en katalog"
+
+#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1784
+msgid "Can't merge directories"
+msgstr "Kan ikke slå sammen kataloger"
+
+#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2262
 msgid "Cannot write to this location"
 msgstr "Kan ikke skrive til lokasjonen"
 
-#: ../daemon/gvfsbackendmtp.c:1816
+#: ../daemon/gvfsbackendmtp.c:2087
 #, c-format
 msgid "No thumbnail for entity '%s'"
 msgstr "Ingen miniatyr for entitet «%s»"
 
-#: ../daemon/gvfsbackendmtp.c:1992 ../daemon/gvfsftptask.c:411
-msgid "Invalid filename"
-msgstr "Ugyldig filnavn"
-
 #: ../daemon/gvfsbackendnetwork.c:168
 msgid "File Sharing"
 msgstr "Fildeling"
@@ -1702,7 +1714,7 @@ msgid "Unexpected end of stream"
 msgstr "Uventet slutt på strøm"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:415 ../daemon/gvfsftptask.c:843
+#: ../daemon/gvfsftptask.c:422 ../daemon/gvfsftptask.c:850
 msgid "Invalid reply"
 msgstr "Ugyldig svar"
 
@@ -1721,42 +1733,42 @@ msgstr "Klarte ikke å åpne aktiv FTP-tilkobling."
 msgid "Filename contains invalid characters."
 msgstr "Filnavnet inneholder ugyldige tegn."
 
-#: ../daemon/gvfsftptask.c:261
+#: ../daemon/gvfsftptask.c:268
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP-tjeneren er opptatt. Prøv igjen senere"
 
-#: ../daemon/gvfsftptask.c:359
+#: ../daemon/gvfsftptask.c:366
 msgid "Accounts are unsupported"
 msgstr "Kontoer er ikke støttet"
 
-#: ../daemon/gvfsftptask.c:363
-msgid "Host closed connection"
-msgstr "Vert lukket forbindelsen"
-
-#: ../daemon/gvfsftptask.c:367
+#: ../daemon/gvfsftptask.c:374
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr "Kan ikke åpne dataforbindelse. Kanskje en brannmur forhindrer dette?"
 
-#: ../daemon/gvfsftptask.c:371
+#: ../daemon/gvfsftptask.c:378
 msgid "Data connection closed"
 msgstr "Dataforbindelse lukket"
 
-#: ../daemon/gvfsftptask.c:378 ../daemon/gvfsftptask.c:382
+#: ../daemon/gvfsftptask.c:385 ../daemon/gvfsftptask.c:389
 msgid "Operation failed"
 msgstr "Operasjonen feilet"
 
-#: ../daemon/gvfsftptask.c:387
+#: ../daemon/gvfsftptask.c:394
 msgid "No space left on server"
 msgstr "Ikke mer plass på tjener"
 
-#: ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsftptask.c:406
 msgid "Unsupported network protocol"
 msgstr "Nettverksprotokoll ikke støttet"
 
-#: ../daemon/gvfsftptask.c:407
+#: ../daemon/gvfsftptask.c:414
 msgid "Page type unknown"
 msgstr "Ukjent sidetype"
 
+#: ../daemon/gvfsftptask.c:418
+msgid "Invalid filename"
+msgstr "Ugyldig filnavn"
+
 #: ../daemon/gvfsjobmakesymlink.c:111
 msgid "Symlinks not supported by backend"
 msgstr "Symbolske lenker er ikke støttet av motoren"
@@ -1819,7 +1831,7 @@ msgstr "%s: %s"
 #: ../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:178
+#: ../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
@@ -2395,7 +2407,7 @@ msgstr "GVfs UDisks2 volumovervåking"
 #: ../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:52
+#: ../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"
@@ -2464,7 +2476,7 @@ msgstr ""
 #: ../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:176
+#: ../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
@@ -2495,7 +2507,7 @@ msgid "Preserve all attributes"
 msgstr "Behold alle attributter"
 
 #: ../programs/gvfs-copy.c:49 ../programs/gvfs-move.c:46
-#: ../programs/gvfs-save.c:44
+#: ../programs/gvfs-save.c:45
 msgid "Backup existing destination files"
 msgstr "Sikkerhetskopier eksisterende målfiler"
 
@@ -2513,7 +2525,7 @@ msgid "SOURCE"
 msgstr "KILDE"
 
 #: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130
-#: ../programs/gvfs-save.c:165
+#: ../programs/gvfs-save.c:168
 msgid "DEST"
 msgstr "MÅL"
 
@@ -2943,53 +2955,57 @@ msgstr "Overse ikke-eksisterende filer, aldri spør"
 msgid "Delete the given files."
 msgstr "Slett gitte filer."
 
-#: ../programs/gvfs-save.c:45
+#: ../programs/gvfs-save.c:46
 msgid "Only create if not existing"
 msgstr "Opprett kun hvis den ikke eksisterer"
 
-#: ../programs/gvfs-save.c:46
+#: ../programs/gvfs-save.c:47
 msgid "Append to end of file"
 msgstr "Legg til ved slutten av filen"
 
-#: ../programs/gvfs-save.c:47
+#: ../programs/gvfs-save.c:48
 msgid "When creating, restrict access to the current user"
 msgstr "Begrens tilgang til aktiv bruker når en fil opprettes"
 
-#. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../programs/gvfs-save.c:49
+msgid "When replacing, replace as if the destination did not exist"
+msgstr "Erstatt som om målet ikke eksisterer når du erstatter"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:51
 msgid "Print new etag at end"
 msgstr "Skriv ny etag på slutten"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../programs/gvfs-save.c:51
+#: ../programs/gvfs-save.c:53
 msgid "The etag of the file being overwritten"
 msgstr "Etag for filen som blir overskrevet"
 
-#: ../programs/gvfs-save.c:51
+#: ../programs/gvfs-save.c:53
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../programs/gvfs-save.c:80
+#: ../programs/gvfs-save.c:83
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "Feil under åpning av fil: %s\n"
 
-#: ../programs/gvfs-save.c:113
+#: ../programs/gvfs-save.c:116
 msgid "Error reading stdin"
 msgstr "Feil ved lesing fra stdin"
 
-#: ../programs/gvfs-save.c:126
+#: ../programs/gvfs-save.c:129
 #, c-format
 msgid "Error closing: %s\n"
 msgstr "Feil ved lukking: %s\n"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../programs/gvfs-save.c:139
+#: ../programs/gvfs-save.c:142
 #, c-format
 msgid "Etag not available\n"
 msgstr "Etag ikke tilgjengelig\n"
 
-#: ../programs/gvfs-save.c:166
+#: ../programs/gvfs-save.c:169
 msgid "Read from standard input and save to DEST."
 msgstr "Les fra standard inndata og lagre til MÅL."