Updated Norwegian bokmål translation

1 files changed, 309 insertions, 233 deletions

diff --git a/po/nb.po b/po/nb.po
index 710a2b1b..94b875af 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gvfs 1.7.x\n"
+"Project-Id-Version: gvfs 1.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 17:40+0200\n"
-"PO-Revision-Date: 2012-05-30 17:40+0200\n"
+"POT-Creation-Date: 2012-07-09 22:39+0200\n"
+"PO-Revision-Date: 2012-07-09 22:42+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -17,54 +17,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
+#: ../client/gdaemonfile.c:500 ../client/gdaemonfile.c:2405
 msgid "Operation not supported, files on different mounts"
 msgstr "Operasjonen er ikke støttet. Filer på forskjellige monteringspunkter"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
-#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
-#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
-#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
-#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
-#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
-#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
-#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
-#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
-#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
+#: ../client/gdaemonfile.c:878 ../client/gdaemonfile.c:913
+#: ../client/gdaemonfile.c:1029 ../client/gdaemonfile.c:1108
+#: ../client/gdaemonfile.c:1171 ../client/gdaemonfile.c:1234
+#: ../client/gdaemonfile.c:1300 ../client/gdaemonfile.c:1363
+#: ../client/gdaemonfile.c:1380 ../client/gdaemonfile.c:1869
+#: ../client/gdaemonfile.c:1899 ../client/gdaemonfile.c:2060
+#: ../client/gdaemonfile.c:2565 ../client/gdaemonfile.c:2614
+#: ../client/gdaemonfile.c:2679 ../client/gdaemonfile.c:2764
+#: ../client/gdaemonfile.c:2840 ../client/gdaemonfile.c:3029
+#: ../client/gdaemonfile.c:3110 ../client/gvfsiconloadable.c:145
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
 msgstr "Ugyldig returverdi fra %s"
 
-#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:996 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Kunne ikke finne fildeskriptor for strøm"
 
-#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
-#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
-#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1118 ../client/gdaemonfile.c:1181
+#: ../client/gdaemonfile.c:1244 ../client/gdaemonfile.c:1310
+#: ../client/gdaemonfile.c:2644 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Fant ikke fildeskriptor for strøm"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1981
+#: ../client/gdaemonfile.c:1983
 msgid "Could not find enclosing mount"
 msgstr "Kan ikke finne omsluttende montering"
 
-#: ../client/gdaemonfile.c:2011
+#: ../client/gdaemonfile.c:2013
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Ugyldig filnavn %s"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1202
-#: ../client/gdaemonvfs.c:1337 ../client/gdaemonvfs.c:1390
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1192
+#: ../client/gdaemonvfs.c:1344 ../client/gdaemonvfs.c:1396
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Feil under setting av metadata for fil: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1391
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1397
 msgid "values must be string or list of strings"
 msgstr "verdier må være av type streng eller liste med strenger"
 
@@ -89,11 +89,11 @@ msgstr "verdier må være av type streng eller liste med strenger"
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
 #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
-#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
-#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
-#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
-#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
-#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
+#: ../monitor/proxy/gproxydrive.c:522 ../monitor/proxy/gproxydrive.c:610
+#: ../monitor/proxy/gproxydrive.c:760 ../monitor/proxy/gproxydrive.c:898
+#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1061
+#: ../monitor/proxy/gproxymount.c:475 ../monitor/proxy/gproxymount.c:560
+#: ../monitor/proxy/gproxyvolume.c:829 ../monitor/proxy/gproxyvolume.c:892
 msgid "Operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
@@ -121,12 +121,12 @@ msgstr "Slutt på strømmen"
 msgid "Seek not supported on stream"
 msgstr "Søking ikke støttet på strøm"
 
-#: ../client/gdaemonvfs.c:834
+#: ../client/gdaemonvfs.c:837
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Feil ved henting av informasjon om monteringspunkt: %s"
 
-#: ../client/gdaemonvfs.c:1203
+#: ../client/gdaemonvfs.c:1193
 msgid "Can't contact session bus"
 msgstr "Kunne ikke kontakte systembussen"
 
@@ -226,7 +226,8 @@ msgid "%s Filesystem Service"
 msgstr "Filsystemtjeneste for %s"
 
 #: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
-#: ../programs/gvfs-move.c:78
+#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
+#: ../programs/gvfs-set-attribute.c:105
 #, c-format
 msgid "Error: %s"
 msgstr "Feil: %s"
@@ -263,26 +264,26 @@ msgstr "Tilkoblingen gikk ned uventet"
 msgid "Got EOS"
 msgstr "Fikk EOS"
 
-#: ../daemon/gvfsafpserver.c:171 ../daemon/gvfsafpserver.c:457
+#: ../daemon/gvfsafpserver.c:172 ../daemon/gvfsafpserver.c:458
 #, c-format
 msgid "Server doesn't support passwords longer than %d characters"
 msgstr "Tjener støtter ikke passord som er lenger enn %d tegn"
 
-#: ../daemon/gvfsafpserver.c:199 ../daemon/gvfsafpserver.c:512
+#: ../daemon/gvfsafpserver.c:200 ../daemon/gvfsafpserver.c:513
 msgid "An invalid username was provided"
 msgstr "Et ugyldig brukernavn ble oppgitt"
 
-#: ../daemon/gvfsafpserver.c:378 ../daemon/gvfsafpserver.c:606
+#: ../daemon/gvfsafpserver.c:379 ../daemon/gvfsafpserver.c:607
 #, c-format
 msgid "AFP server %s declined the submitted password"
 msgstr "AFP-tjener %s nektet innsendt passord"
 
-#: ../daemon/gvfsafpserver.c:652 ../daemon/gvfsafpserver.c:681
+#: ../daemon/gvfsafpserver.c:653 ../daemon/gvfsafpserver.c:682
 #, c-format
 msgid "AFP server %s doesn't support anonymous login"
 msgstr "AFP-tjener %s støtter ikke anonym innlogging"
 
-#: ../daemon/gvfsafpserver.c:709
+#: ../daemon/gvfsafpserver.c:710
 #, c-format
 msgid ""
 "Login to AFP server %s failed (no suitable authentication mechanism found)"
@@ -290,12 +291,12 @@ msgstr ""
 "Innlogging til AFP-tjener %s feilet (ingen passende autentiseringsmekanisme "
 "funnet)"
 
-#: ../daemon/gvfsafpserver.c:780
+#: ../daemon/gvfsafpserver.c:781
 #, c-format
 msgid "Failed to connect to server (%s)"
 msgstr "Klarte ikke å koble til gjener (%s)"
 
-#: ../daemon/gvfsafpserver.c:885 ../daemon/gvfsafpvolume.c:391
+#: ../daemon/gvfsafpserver.c:886 ../daemon/gvfsafpvolume.c:391
 #: ../daemon/gvfsafpvolume.c:664 ../daemon/gvfsafpvolume.c:817
 #: ../daemon/gvfsafpvolume.c:1011 ../daemon/gvfsafpvolume.c:1211
 #: ../daemon/gvfsafpvolume.c:1394 ../daemon/gvfsafpvolume.c:1551
@@ -307,34 +308,34 @@ msgstr "Klarte ikke å koble til gjener (%s)"
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../daemon/gvfsafpserver.c:890
+#: ../daemon/gvfsafpserver.c:891
 #, c-format
 msgid "Command is not supported by server"
 msgstr "Kommandoen er ikke støttet av tjener"
 
-#: ../daemon/gvfsafpserver.c:894
+#: ../daemon/gvfsafpserver.c:895
 #, c-format
 msgid "User's password has expired"
 msgstr "Brukers passord har utløpt"
 
-#: ../daemon/gvfsafpserver.c:898
+#: ../daemon/gvfsafpserver.c:899
 #, c-format
 msgid "User's password needs to be changed"
 msgstr "Brukers passord må byttes"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsafpserver.c:994
+#: ../daemon/gvfsafpserver.c:995
 #, c-format
 msgid "Enter password for afp as %s on %s"
 msgstr "Skriv inn passord for afp som %s på %s"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:997
+#: ../daemon/gvfsafpserver.c:998
 #, c-format
 msgid "Enter password for afp on %s"
 msgstr "Skriv inn passord for afp på %s"
 
-#: ../daemon/gvfsafpserver.c:1029 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsafpserver.c:1030 ../daemon/gvfsbackendftp.c:518
 #: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
 #: ../daemon/gvfsbackendsmb.c:619
 msgid "Password dialog cancelled"
@@ -372,7 +373,7 @@ msgstr "Filen eksisterer ikke"
 #: ../daemon/gvfsafpvolume.c:399 ../daemon/gvfsafpvolume.c:464
 #: ../daemon/gvfsafpvolume.c:2668 ../daemon/gvfsbackendafp.c:275
 #: ../daemon/gvfsbackendafp.c:476 ../daemon/gvfsbackendafp.c:1316
-#: ../daemon/gvfsbackenddav.c:2210 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:773
 #: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
 #: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
 msgid "File is directory"
@@ -387,7 +388,7 @@ msgid "Target file is open"
 msgstr "Målfilen er åpen"
 
 #: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsbackendburn.c:420
-#: ../daemon/gvfsbackenddav.c:2559 ../daemon/gvfsbackendsftp.c:1828
+#: ../daemon/gvfsbackenddav.c:2590 ../daemon/gvfsbackendsftp.c:1828
 msgid "Directory not empty"
 msgstr "Katalogen er ikke tom"
 
@@ -414,8 +415,8 @@ msgstr "Ikke nok plass på volumet"
 
 #: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1410
 #: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsbackendafp.c:282
-#: ../daemon/gvfsbackendafp.c:483 ../daemon/gvfsbackenddav.c:2266
-#: ../daemon/gvfsbackenddav.c:2519 ../daemon/gvfsbackenddav.c:2630
+#: ../daemon/gvfsbackendafp.c:483 ../daemon/gvfsbackenddav.c:2297
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackenddav.c:2661
 #: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
 #: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
 #: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
@@ -580,7 +581,7 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../daemon/gvfsbackendafc.c:408 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1806
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1820
 #: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
 #: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
@@ -703,7 +704,7 @@ msgstr "sikkerhetskopier er ikke støttet"
 msgid "Unable to create temporary file (%s)"
 msgstr "Kan ikke opprette midlertidig fil (%s)"
 
-#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackenddav.c:2339
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackenddav.c:2370
 #: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
 msgid "The file was externally modified"
 msgstr "Filen er endret eksternt"
@@ -988,52 +989,52 @@ msgstr "WebDAV som %s på %s%s"
 msgid "WebDAV on %s%s"
 msgstr "WebDAV på %s%s"
 
-#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1873
+#: ../daemon/gvfsbackenddav.c:680 ../daemon/gvfsbackenddav.c:1910
 #: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-feil: %s"
 
-#: ../daemon/gvfsbackenddav.c:685
+#: ../daemon/gvfsbackenddav.c:697
 msgid "Could not parse response"
 msgstr "Kan ikke fortolke svar"
 
-#: ../daemon/gvfsbackenddav.c:694
+#: ../daemon/gvfsbackenddav.c:706
 msgid "Empty response"
 msgstr "Tomt svar"
 
-#: ../daemon/gvfsbackenddav.c:702
+#: ../daemon/gvfsbackenddav.c:714
 msgid "Unexpected reply from server"
 msgstr "Uventet svar fra tjener"
 
-#: ../daemon/gvfsbackenddav.c:1382 ../daemon/gvfsbackenddav.c:2008
-#: ../daemon/gvfsbackenddav.c:2095 ../daemon/gvfsbackenddav.c:2202
+#: ../daemon/gvfsbackenddav.c:1394 ../daemon/gvfsbackenddav.c:2039
+#: ../daemon/gvfsbackenddav.c:2126 ../daemon/gvfsbackenddav.c:2233
 msgid "Response invalid"
 msgstr "Ugyldig svar"
 
-#: ../daemon/gvfsbackenddav.c:1525
+#: ../daemon/gvfsbackenddav.c:1537
 msgid "WebDAV share"
 msgstr "WebDAV-ressurs"
 
-#: ../daemon/gvfsbackenddav.c:1527
+#: ../daemon/gvfsbackenddav.c:1539
 #, c-format
 msgid "Enter password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../daemon/gvfsbackenddav.c:1530
+#: ../daemon/gvfsbackenddav.c:1542
 msgid "Please enter proxy password"
 msgstr "Skriv inn passord for proxy"
 
-#: ../daemon/gvfsbackenddav.c:1877 ../daemon/gvfsbackenddav.c:1881
+#: ../daemon/gvfsbackenddav.c:1914 ../daemon/gvfsbackenddav.c:1918
 msgid "Not a WebDAV enabled share"
 msgstr "Ressursen støtter ikke WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1962 ../daemon/gvfsbackenddav.c:2050
-#: ../daemon/gvfsbackenddav.c:2123 ../daemon/gvfsbackenddav.c:2236
+#: ../daemon/gvfsbackenddav.c:1993 ../daemon/gvfsbackenddav.c:2081
+#: ../daemon/gvfsbackenddav.c:2154 ../daemon/gvfsbackenddav.c:2267
 msgid "Could not create request"
 msgstr "Kan ikke opprette forespørsel"
 
-#: ../daemon/gvfsbackenddav.c:2370 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Oppretting av sikkerhetskopi feilet"
@@ -1673,7 +1674,7 @@ msgstr "Ugyldig dbus-melding"
 msgid "Filesystem is busy"
 msgstr "Filsystemet er opptatt"
 
-#: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
+#: ../daemon/main.c:45 ../metadata/meta-daemon.c:447
 msgid "Replace old daemon."
 msgstr "Erstatt kjørende tjeneste."
 
@@ -1691,20 +1692,23 @@ msgstr "Hovedtjeneste for GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:472
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
-#: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
-#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
-#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
-#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
-#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
-#: ../programs/gvfs-tree.c:251
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:474
+#: ../programs/gvfs-cat.c:162 ../programs/gvfs-cat.c:174
+#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:382
+#: ../programs/gvfs-ls.c:409 ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:107 ../programs/gvfs-mime.c:114
+#: ../programs/gvfs-mkdir.c:71 ../programs/gvfs-monitor-dir.c:126
+#: ../programs/gvfs-monitor-file.c:125 ../programs/gvfs-mount.c:1019
+#: ../programs/gvfs-move.c:121 ../programs/gvfs-open.c:78
+#: ../programs/gvfs-open.c:90 ../programs/gvfs-rename.c:75
+#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:175
+#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:71
+#: ../programs/gvfs-tree.c:262
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Prøv «%s --help» for mer informasjon."
@@ -1734,34 +1738,34 @@ msgstr "Adressen er allerede montert"
 msgid "Location is not mountable"
 msgstr "Adressen kan ikke monteres"
 
-#: ../metadata/meta-daemon.c:130 ../metadata/meta-daemon.c:336
-#: ../metadata/meta-daemon.c:390 ../metadata/meta-daemon.c:419
-#: ../metadata/meta-daemon.c:449
+#: ../metadata/meta-daemon.c:135 ../metadata/meta-daemon.c:255
+#: ../metadata/meta-daemon.c:304 ../metadata/meta-daemon.c:339
+#: ../metadata/meta-daemon.c:375
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "Kan ikke finne metadatafil %s"
 
-#: ../metadata/meta-daemon.c:160 ../metadata/meta-daemon.c:179
+#: ../metadata/meta-daemon.c:153 ../metadata/meta-daemon.c:165
 msgid "Unable to set metadata key"
 msgstr "Kan ikke sette nøkkel for metadata"
 
-#: ../metadata/meta-daemon.c:197 ../metadata/meta-daemon.c:399
+#: ../metadata/meta-daemon.c:175 ../metadata/meta-daemon.c:314
 msgid "Unable to unset metadata key"
 msgstr "Kan ikke nullstille nøkkel for metadata"
 
-#: ../metadata/meta-daemon.c:428
+#: ../metadata/meta-daemon.c:349
 msgid "Unable to remove metadata keys"
 msgstr "Kan ikke fjerne nøkler for metadata"
 
-#: ../metadata/meta-daemon.c:459
+#: ../metadata/meta-daemon.c:386
 msgid "Unable to move metadata keys"
 msgstr "Kan ikke flytte nøkler for metadata"
 
-#: ../metadata/meta-daemon.c:704
+#: ../metadata/meta-daemon.c:457
 msgid "GVFS Metadata Daemon"
 msgstr "GVFS metadatatjeneste"
 
-#: ../metadata/meta-daemon.c:707
+#: ../metadata/meta-daemon.c:460
 msgid "Metadata daemon for GVFS"
 msgstr "Metadatatjeneste for GVFS"
 
@@ -2245,10 +2249,6 @@ msgstr "%s (%s)"
 msgid "GVfs UDisks2 Volume Monitor"
 msgstr "GVfs UDisks2 volumovervåking"
 
-#: ../programs/gvfs-cat.c:37
-msgid "locations"
-msgstr "adresser"
-
 #. 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:57
@@ -2277,101 +2277,123 @@ msgstr "%s: %s: feil ved lesing: %s\n"
 msgid "%s: %s:error closing: %s\n"
 msgstr "%s: %s: feil ved lukking: %s\n"
 
-#: ../programs/gvfs-cat.c:136
-msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "ADRESSE … - slå sammen ADRESSER til standard utdata."
+#: ../programs/gvfs-cat.c:135 ../programs/gvfs-open.c:61
+#: ../programs/gvfs-rm.c:58
+msgid "FILE"
+msgstr "FIL"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-cat.c:141
+#: ../programs/gvfs-cat.c:138
+#, fuzzy
+msgid "Concatenate files and print to the standard output."
+msgstr "ADRESSE … - slå sammen ADRESSER til standard utdata."
+
+#: ../programs/gvfs-cat.c:139
+#, fuzzy
 msgid ""
-"Concatenate files at locations and print to the standard output. Works just "
-"like the traditional cat utility, but using gvfs location instead local "
-"files: for example you can use something like smb://server/resource/file.txt "
-"as location to concatenate."
+"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"
+"like smb://server/resource/file.txt as location."
 msgstr ""
 "Slå sammen filer ved adresser og skriv ut til standard utdata. Fungerer som "
 "det vanlige cat-verktøyet, men bruker gvfs-adresser i stedet for lokale "
 "filer. Du kan for eksempel bruke smb://tjener/ressurs/fil.txt som en adresse "
 "som skal vises."
 
-#: ../programs/gvfs-cat.c:148
+#: ../programs/gvfs-cat.c:143
+#, fuzzy
 msgid ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
+"Note: just pipe through cat if you need its formatting options\n"
+"like -n, -T or other."
 msgstr ""
 "Merk: bare send dette gjennom cat hvis du trenger formateringsalternativene "
 "som -n -T eller annet."
 
-#: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
-#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
-#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
-#: ../programs/gvfs-tree.c:249
+#: ../programs/gvfs-cat.c:160 ../programs/gvfs-copy.c:131
+#: ../programs/gvfs-info.c:380 ../programs/gvfs-ls.c:407
+#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:69
+#: ../programs/gvfs-monitor-dir.c:124 ../programs/gvfs-monitor-file.c:123
+#: ../programs/gvfs-mount.c:1017 ../programs/gvfs-move.c:119
+#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:73
+#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:173
+#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-tree.c:260
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "Feil ved lesing av kommandolinjeflagg: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
+#: ../programs/gvfs-cat.c:172 ../programs/gvfs-open.c:88
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: mangler adresser"
 
 #: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
-msgid "no target directory"
-msgstr "ingen målkatalog"
+msgid "No target directory"
+msgstr "Ingen målkatalog"
 
 #: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
-msgid "show progress"
-msgstr "vis fremdrift"
+msgid "Show progress"
+msgstr "Vis fremdrift"
 
 #: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
-msgid "prompt before overwrite"
-msgstr "spør før overskriving"
+msgid "Prompt before overwrite"
+msgstr "Spør før overskriving"
 
 #: ../programs/gvfs-copy.c:47
-msgid "preserve all attributes"
-msgstr "behold alle attributter"
+msgid "Preserve all attributes"
+msgstr "Behold alle attributter"
 
 #: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
-msgid "backup existing destination files"
-msgstr "sikkerhetskopier eksisterende målfiler"
+#: ../programs/gvfs-save.c:43
+msgid "Backup existing destination files"
+msgstr "Sikkerhetskopier eksisterende målfiler"
 
 #: ../programs/gvfs-copy.c:49
-msgid "never follow symbolic links"
-msgstr "aldri følg symbolske lenker"
+msgid "Never follow symbolic links"
+msgstr "Aldri følg symbolske lenker"
 
 #: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
 #, c-format
 msgid "progress"
 msgstr "fremdrift"
 
-#: ../programs/gvfs-copy.c:115
-msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
-msgstr "KILDE … MÅL - kopier fil(er) fra KILDE til MÅL"
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
+msgid "SOURCE"
+msgstr "KILDE"
+
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
+#: ../programs/gvfs-save.c:162
+msgid "DEST"
+msgstr "MÅL"
 
-#: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
+#: ../programs/gvfs-copy.c:122
+#, fuzzy
+msgid "Copy one or more files from SOURCE to DEST."
+msgstr "KILDE … MÅL - flytt fil(er) fra KILDE til MÅL"
+
+#: ../programs/gvfs-copy.c:141 ../programs/gvfs-move.c:129
+#: ../programs/gvfs-rename.c:83
 msgid "Missing operand\n"
 msgstr "Mangler operand\n"
 
-#: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
 
-#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
+#: ../programs/gvfs-copy.c:158 ../programs/gvfs-move.c:146
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "Mål %s er ikke en katalog\n"
 
-#: ../programs/gvfs-copy.c:193
+#: ../programs/gvfs-copy.c:203
 #, c-format
 msgid "overwrite %s?"
 msgstr "overskriv %s?"
 
-#: ../programs/gvfs-copy.c:207
+#: ../programs/gvfs-copy.c:217
 #, c-format
 msgid "Error copying file %s: %s\n"
 msgstr "Feil under kopiering av fil %s: %s\n"
@@ -2388,9 +2410,13 @@ msgstr "Hent informasjon om filsystem"
 msgid "The attributes to get"
 msgstr "Attributter som skal hentes"
 
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
+msgid "ATTRIBUTES"
+msgstr "ATTRIBUTTER"
+
 #: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
-msgid "Don't follow symlinks"
+msgid "Don't follow symbolic links"
 msgstr "Ikke følg symbolske lenker"
 
 #: ../programs/gvfs-info.c:50
@@ -2483,9 +2509,17 @@ msgstr "Attributter som kan settes:\n"
 msgid "Writable attribute namespaces:\n"
 msgstr "Navneområder for skrivbare attributter:\n"
 
-#: ../programs/gvfs-info.c:362
-msgid "- show info for <location>"
-msgstr "- vis info for <adresse>"
+#: ../programs/gvfs-info.c:368 ../programs/gvfs-ls.c:390
+#: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-monitor-dir.c:112
+#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1005
+#: ../programs/gvfs-rename.c:64 ../programs/gvfs-set-attribute.c:139
+#: ../programs/gvfs-trash.c:57 ../programs/gvfs-tree.c:248
+msgid "LOCATION"
+msgstr "LOKASJON"
+
+#: ../programs/gvfs-info.c:369
+msgid "Show information about locations."
+msgstr "Vis informasjon om lokasjoner."
 
 #: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
@@ -2499,15 +2533,32 @@ msgstr "Bruk langt listeformat"
 msgid "Show completions"
 msgstr "Vis fullføring"
 
+#: ../programs/gvfs-ls.c:42
+msgid "PREFIX"
+msgstr "PREFIKS"
+
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
-#: ../programs/gvfs-rename.c:69
+#: ../programs/gvfs-rename.c:97
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: ../programs/gvfs-ls.c:383
-msgid "- list files at <location>"
-msgstr "- list filer i <adresse>"
+#: ../programs/gvfs-ls.c:391
+msgid "List the contents of the locations."
+msgstr ""
+
+#: ../programs/gvfs-ls.c:392
+#, fuzzy
+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"
+"like smb://server/resource/file.txt as location. File attributes can\n"
+"be specified with their gvfs name, e.g. standard::icon."
+msgstr ""
+"Slå sammen filer ved adresser og skriv ut til standard utdata. Fungerer som "
+"det vanlige cat-verktøyet, men bruker gvfs-adresser i stedet for lokale "
+"filer. Du kan for eksempel bruke smb://tjener/ressurs/fil.txt som en adresse "
+"som skal vises."
 
 #: ../programs/gvfs-mime.c:36
 msgid "Query handler for mime-type"
@@ -2517,81 +2568,100 @@ msgstr "Spørringshåndterer for MIME-type"
 msgid "Set handler for mime-type"
 msgstr "Sett håndterer for MIME-type"
 
-#: ../programs/gvfs-mime.c:76
-msgid "- get/set handler for <mimetype>"
-msgstr "- hent/sett håndterer for <mimetype>"
+#: ../programs/gvfs-mime.c:82
+msgid "MIMETYPE"
+msgstr "MIMETYPE"
 
-#: ../programs/gvfs-mime.c:85
-msgid "Specify one of --query and --set"
+#: ../programs/gvfs-mime.c:82
+msgid "HANDLER"
+msgstr "HÅNDTERER"
+
+#: ../programs/gvfs-mime.c:83
+#, fuzzy
+msgid "Get or set the handler for a mime-type."
+msgstr "Sett håndterer for MIME-type"
+
+#: ../programs/gvfs-mime.c:95
+#, fuzzy
+msgid "Specify either --query or --set"
 msgstr "Oppgi en av --query og --set"
 
-#: ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:106
 #, c-format
 msgid "Must specify a single mime-type.\n"
 msgstr "Må oppgi en enkelt MIME-type.\n"
 
-#: ../programs/gvfs-mime.c:105
+#: ../programs/gvfs-mime.c:113
 #, c-format
 msgid "Must specify the mime-type followed by the default handler.\n"
 msgstr "Du må oppgi MIME-type etterfulgt av forvalgt håndterer.\n"
 
-#: ../programs/gvfs-mime.c:121
+#: ../programs/gvfs-mime.c:128
 #, c-format
 msgid "No default applications for '%s'\n"
 msgstr "Ingen forvalgte programmer for «%s»\n"
 
-#: ../programs/gvfs-mime.c:127
+#: ../programs/gvfs-mime.c:134
 #, c-format
 msgid "Default application for '%s': %s\n"
 msgstr "Forvalgt program for «%s»: %s\n"
 
-#: ../programs/gvfs-mime.c:132
+#: ../programs/gvfs-mime.c:139
 #, c-format
 msgid "Registered applications:\n"
 msgstr "Registrerte programmer:\n"
 
-#: ../programs/gvfs-mime.c:134
+#: ../programs/gvfs-mime.c:141
 #, c-format
 msgid "No registered applications\n"
 msgstr "Ingen registrerte programmer\n"
 
-#: ../programs/gvfs-mime.c:145
+#: ../programs/gvfs-mime.c:152
 #, c-format
 msgid "Recommended applications:\n"
 msgstr "Anbefalte programmer:\n"
 
-#: ../programs/gvfs-mime.c:147
+#: ../programs/gvfs-mime.c:154
 #, c-format
 msgid "No recommended applications\n"
 msgstr "Ingen anbefalte programmer\n"
 
-#: ../programs/gvfs-mime.c:167
+#: ../programs/gvfs-mime.c:174
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Klarte ikke å laste informasjon for håndterer «%s»\n"
 
-#: ../programs/gvfs-mime.c:173
+#: ../programs/gvfs-mime.c:180
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "Klarte ikke å sette «%s» som forvalgt håndterer for «%s»: %s\n"
 
 #: ../programs/gvfs-mkdir.c:33
-msgid "create parent directories"
-msgstr "lag opphavskataloger"
+msgid "Create parent directories"
+msgstr "Lag opphavskataloger"
 
-#: ../programs/gvfs-mkdir.c:51
-msgid "- create directories"
-msgstr "- lag kataloger"
+#: ../programs/gvfs-mkdir.c:58
+msgid "Create directories."
+msgstr "Lag kataloger."
 
-#: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
+#: ../programs/gvfs-mkdir.c:89 ../programs/gvfs-mkdir.c:98
 #, c-format
 msgid "Error creating directory: %s\n"
 msgstr "Feil ved oppretting av katalog: %s\n"
 
 #: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
-msgid "Don't send single MOVED events."
+#, fuzzy
+msgid "Don't send single MOVED events"
 msgstr "Ikke send FLYTTET-hendelser enkeltvis."
 
+#: ../programs/gvfs-monitor-dir.c:113
+msgid "Monitor directories for changes."
+msgstr ""
+
+#: ../programs/gvfs-monitor-file.c:112
+msgid "Monitor files for changes."
+msgstr ""
+
 #: ../programs/gvfs-mount.c:55
 msgid "Mount as mountable"
 msgstr "Monter som monterbar"
@@ -2600,6 +2670,10 @@ msgstr "Monter som monterbar"
 msgid "Mount volume with device file"
 msgstr "Monter volum med enhetsfil"
 
+#: ../programs/gvfs-mount.c:56
+msgid "DEVICE"
+msgstr "ENHET"
+
 #: ../programs/gvfs-mount.c:57
 msgid "Unmount"
 msgstr "Avmonter"
@@ -2612,19 +2686,23 @@ msgstr "Løs ut"
 msgid "Unmount all mounts with the given scheme"
 msgstr "Avmonter alle monteringspunkter med gitt schema"
 
+#: ../programs/gvfs-mount.c:59
+msgid "SCHEME"
+msgstr ""
+
 #. Translator: List here is a verb as in 'List all mounts'
 #: ../programs/gvfs-mount.c:61
 msgid "List"
 msgstr "Vis liste"
 
 #: ../programs/gvfs-mount.c:62
-msgid "Show extra information for List and Monitor"
-msgstr "Vis ekstra informasjon for listevisning og overvåking"
-
-#: ../programs/gvfs-mount.c:63
 msgid "Monitor events"
 msgstr "Overvåk hendelser"
 
+#: ../programs/gvfs-mount.c:63
+msgid "Show extra information"
+msgstr "Vis ekstra informasjon"
+
 #: ../programs/gvfs-mount.c:166 ../programs/gvfs-mount.c:187
 #, c-format
 msgid "Error mounting location: %s\n"
@@ -2660,71 +2738,58 @@ msgstr "Monterte %s i %s\n"
 msgid "No volume for device file %s\n"
 msgstr "Ingen volum for enhetsfil %s\n"
 
-#: ../programs/gvfs-mount.c:999
-msgid "- mount <location>"
-msgstr "- monter <adresse>"
+#: ../programs/gvfs-mount.c:1006
+msgid "Mount the locations."
+msgstr "Monter lokasjoner."
 
-#: ../programs/gvfs-move.c:103
-msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
+#: ../programs/gvfs-move.c:110
+#, fuzzy
+msgid "Move one or more files from SOURCE to DEST."
 msgstr "KILDE … MÅL - flytt fil(er) fra KILDE til MÅL"
 
-#: ../programs/gvfs-move.c:189
+#: ../programs/gvfs-move.c:199
 #, c-format
 msgid "Error moving file %s: %s\n"
 msgstr "Feil under flytting av fil %s: %s\n"
 
-#: ../programs/gvfs-open.c:37
-msgid "files"
-msgstr "filer"
+#. Translators: this message will appear after the usage string
+#. and before the list of options.
+#: ../programs/gvfs-open.c:64
+#, fuzzy
+msgid ""
+"Open files with the default application that\n"
+"is registered to handle files of this type."
+msgstr ""
+"Åpner filen(e) med programmet som er registrert som forvalg for å håndtere "
+"denne type fil."
 
 #. 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:65
+#: ../programs/gvfs-open.c:120
 #, c-format
 msgid "%s: %s: error opening location: %s\n"
 msgstr "%s: %s: feil under åpning av adresse: %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-open.c:92
-#, c-format
-msgid "%s: %s: error launching application: %s\n"
-msgstr "%s: %s: feil under start av program: %s\n"
+#: ../programs/gvfs-rename.c:64
+msgid "NEW-NAME"
+msgstr "NYTT-NAVN"
 
-#: ../programs/gvfs-open.c:123
-msgid "FILES... - open FILES with registered application."
-msgstr "FILER … - åpne FILER med registrert program."
+#: ../programs/gvfs-rename.c:65
+msgid "Rename a file."
+msgstr "Endre navn på en fil."
 
-#. Translators: this message will appear after the usage string
-#. and before the list of options.
-#: ../programs/gvfs-open.c:127
-msgid ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
-msgstr ""
-"Åpner filen(e) med programmet som er registrert som forvalg for å håndtere "
-"denne type fil."
-
-#: ../programs/gvfs-rename.c:50
-msgid "- rename file"
-msgstr "- endre navn på fil"
-
-#: ../programs/gvfs-rename.c:76
+#: ../programs/gvfs-rename.c:104
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Endring av navn fullført. Ny URI: %s\n"
 
-#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
-msgid "ignore nonexistent files, never prompt"
-msgstr "overse ikke-eksisterende filer, aldri spør"
+#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:34
+msgid "Ignore nonexistent files, never prompt"
+msgstr "Overse ikke-eksisterende filer, aldri spør"
 
-#: ../programs/gvfs-rm.c:53
-msgid "- delete files"
-msgstr "- slett filer"
-
-#: ../programs/gvfs-save.c:43
-msgid "Create backup"
-msgstr "Lag sikkerhetskopi"
+#: ../programs/gvfs-rm.c:59
+msgid "Delete the given files."
+msgstr "Slett gitte filer."
 
 #: ../programs/gvfs-save.c:44
 msgid "Only create if not existing"
@@ -2735,7 +2800,8 @@ msgid "Append to end of file"
 msgstr "Legg til ved slutten av filen"
 
 #: ../programs/gvfs-save.c:46
-msgid "When creating a file, restrict access to the current user only"
+#, fuzzy
+msgid "When creating, restrict access to the current user"
 msgstr "Begrens tilgang til aktiv bruker når en fil opprettes"
 
 #: ../programs/gvfs-save.c:47
@@ -2746,6 +2812,10 @@ msgstr "Skriv ny etag på slutten"
 msgid "The etag of the file being overwritten"
 msgstr "Etag for filen som blir overskrevet"
 
+#: ../programs/gvfs-save.c:48
+msgid "ETAG"
+msgstr "ETAG"
+
 #: ../programs/gvfs-save.c:76
 #, c-format
 msgid "Error opening file: %s\n"
@@ -2765,60 +2835,66 @@ msgstr "Feil ved lukking: %s\n"
 msgid "Etag not available\n"
 msgstr "Etag ikke tilgjengelig\n"
 
-#: ../programs/gvfs-save.c:156
-msgid "DEST - read from standard input and save to DEST"
-msgstr "MÅL - les fra standard inndata og lagre til MÅL"
+#: ../programs/gvfs-save.c:163
+msgid "Read from standard input and save to DEST."
+msgstr "Les fra standard inndata og lagre til MÅL."
 
 #: ../programs/gvfs-set-attribute.c:36
-msgid ""
-"attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv, unset]"
-msgstr ""
-"type attributt [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv, unset]"
+msgid "Type of the attribute"
+msgstr "Type attributter"
+
+#: ../programs/gvfs-set-attribute.c:36
+msgid "TYPE"
+msgstr "TYPE"
 
-#: ../programs/gvfs-set-attribute.c:119
-msgid " <location> <attribute> <values> - set attribute"
-msgstr " <adresse> <attributt> <verdier> - sett attributt"
+#: ../programs/gvfs-set-attribute.c:139
+msgid "ATTRIBUTE"
+msgstr "ATTRIBUTT"
 
-#: ../programs/gvfs-set-attribute.c:137
-#, c-format
+#: ../programs/gvfs-set-attribute.c:139
+msgid "VALUE"
+msgstr "VERDI"
+
+#: ../programs/gvfs-set-attribute.c:140
+msgid "Set a file attribute of LOCATION."
+msgstr ""
+
+#: ../programs/gvfs-set-attribute.c:159
 msgid "Location not specified\n"
 msgstr "Adresse ikke oppgitt\n"
 
-#: ../programs/gvfs-set-attribute.c:145
-#, c-format
+#: ../programs/gvfs-set-attribute.c:167
 msgid "Attribute not specified\n"
 msgstr "Attributt ikke oppgitt\n"
 
-#: ../programs/gvfs-set-attribute.c:154
-#, c-format
+#: ../programs/gvfs-set-attribute.c:176
 msgid "Value not specified\n"
 msgstr "Verdi ikke oppgitt\n"
 
-#: ../programs/gvfs-set-attribute.c:194
+#: ../programs/gvfs-set-attribute.c:219
 #, c-format
 msgid "Invalid attribute type %s\n"
 msgstr "Ugyldig type attributt %s\n"
 
-#: ../programs/gvfs-set-attribute.c:204
+#: ../programs/gvfs-set-attribute.c:229
 #, c-format
 msgid "Error setting attribute: %s\n"
 msgstr "Feil under setting av attributt: %s\n"
 
-#: ../programs/gvfs-trash.c:52
-msgid "- move files to trash"
-msgstr "- flytt filer til papirkurven"
+#: ../programs/gvfs-trash.c:58
+#, fuzzy
+msgid "Move files or directories to the trash."
+msgstr "Kan ikke flytte en delt katalog til papirkurven"
 
-#: ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-trash.c:89
 #, c-format
 msgid "Error trashing file: %s\n"
 msgstr "Feil under flytting av fil til papirkurv: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symbolic links, mounts and shortcuts like directories"
-msgstr "Følg symbolske lenker, monteringspunkter og snarveier som kataloger"
+msgid "Follow symbolic links, mounts and shortcuts"
+msgstr "Følg symbolske lenker, monteringspunkter og snarveier"
 
-#: ../programs/gvfs-tree.c:242
-msgid "- list contents of directories in a tree-like format"
-msgstr "- vis innhold i kataloger i et trelignende format"
+#: ../programs/gvfs-tree.c:249
+msgid "List contents of directories in a tree-like format."
+msgstr "Vis innhold i kataloger i et trelignende format."