changeset 957:cada4133c13d

2008-07-09 Kjartan Maraas <[e-mail]> * POTFILES.in: Add missing files. * nb.po: Updated Norwegian bokm«©l translation.

--- a/po/ChangeLog	Mon Jun 09 12:15:22 2008 +0000
+++ b/po/ChangeLog	Wed Jul 09 15:23:22 2008 +0000
@@ -1,3 +1,8 @@
[phone]  Kjartan Maraas  <[e-mail]>
+
+	* POTFILES.in: Add missing files.
+	* nb.po: Updated Norwegian bokmÄl translation.
+
 2008-05-21  Jonh Wendell  <[e-mail]>
 
 	* pt_BR.po: Brazilian Portuguese translation updated by Henrique Machado.

--- a/po/POTFILES.in	Mon Jun 09 12:15:22 2008 +0000
+++ b/po/POTFILES.in	Wed Jul 09 15:23:22 2008 +0000
@@ -1,5 +1,6 @@
 lib/bookmark.c
 lib/cache.c
+lib/charset-conv.c
 lib/config_file.c
 lib/fsp.c
 lib/ftpcommon.h
@@ -11,10 +12,15 @@
 lib/misc.c
 lib/mkstemps.c
 lib/options.h
+lib/parse-dir-listing.c
 lib/protocols.c
 lib/pty.c
 lib/rfc2068.c
 lib/rfc959.c
+lib/socket-connect-getaddrinfo.c
+lib/socket-connect-gethostbyname.c
+lib/socket-connect.c
+lib/sockutils.c
 lib/sshv2.c
 lib/sslcommon.c
 src/uicommon/gftpui.c

--- a/po/nb.po	Mon Jun 09 12:15:22 2008 +0000
+++ b/po/nb.po	Wed Jul 09 15:23:22 2008 +0000
@@ -1,15 +1,15 @@
 # gFTP Norwegian BokmÄl catalog
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Anders Henriksen <[e-mail]>, 2001.
-# Kjartan Maraas <[e-mail]>, 2005.
+# Kjartan Maraas <[e-mail]>, 2005-2008.
 # Øivind Hoel <[e-mail]>, 2006,
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gFTP 2.0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-15 17:24+0100\n"
-"PO-Revision-Date: 2006-01-15 17:56+0100\n"
+"POT-Creation-Date: 2008-07-09 16:37+0200\n"
+"PO-Revision-Date: 2008-07-09 17:22+0200\n"
 "Last-Translator: Øivind Hoel <[e-mail]>\n"
 "Language-Team: Norwegian bokmÄl <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -21,71 +21,57 @@
 msgid "Invalid URL %s\n"
 msgstr "Ugyldig URL %s\n"
 
-#: ../lib/cache.c:50
-#: ../lib/cache.c:64
-#: ../lib/cache.c:77
+#: ../lib/cache.c:50 ../lib/cache.c:64 ../lib/cache.c:77
 #, c-format
 msgid "Error: Invalid line %s in cache index file\n"
 msgstr "Feil: Ugylding linje %s i indeksfil for mellomlager\n"
 
-#: ../lib/cache.c:137
-#: ../lib/fsp.c:537
-#: ../lib/local.c:477
+#: ../lib/cache.c:138 ../lib/fsp.c:535 ../lib/local.c:561
 #, c-format
 msgid "Error: Could not make directory %s: %s\n"
 msgstr "Feil: Kunne ikke opprette mappe %s: %s\n"
 
-#: ../lib/cache.c:161
+#: ../lib/cache.c:164
 #, c-format
 msgid "Error: Cannot create temporary file: %s\n"
 msgstr "Feil: Kunne ikke opprette midlertidig fil: %s\n"
 
-#: ../lib/cache.c:183
-#: ../lib/cache.c:232
-#: ../lib/config_file.c:157
-#: ../lib/config_file.c:163
-#: ../lib/local.c:102
-#: ../lib/local.c:217
-#: ../lib/rfc2068.c:259
-#: ../lib/sshv2.c:1128
+#: ../lib/cache.c:186 ../lib/cache.c:236 ../lib/config_file.c:157
+#: ../lib/config_file.c:163 ../lib/local.c:144 ../lib/local.c:272
+#: ../lib/rfc2068.c:260 ../lib/sshv2.c:1250
 #, c-format
 msgid "Error closing file descriptor: %s\n"
 msgstr "Feil under luking av fildeskriptor: %s\n"
 
-#: ../lib/cache.c:250
-#: ../lib/fsp.c:128
-#: ../lib/fsp.c:208
-#: ../lib/local.c:136
-#: ../lib/local.c:145
-#: ../lib/local.c:192
+#: ../lib/cache.c:254 ../lib/fsp.c:127 ../lib/fsp.c:207 ../lib/local.c:184
+#: ../lib/local.c:193 ../lib/local.c:247
 #, c-format
 msgid "Error: Cannot seek on file %s: %s\n"
 msgstr "Feil: Kunne ikke Ă„pne lokal fil %s: %s\n"
 
-#: ../lib/config_file.c:126
-#: ../lib/config_file.c:133
-#: ../lib/protocols.c:3000
+#: ../lib/charset-conv.c:73
+#, c-format
+msgid ""
+"Error converting string '%s' from character set %s to character set %s: %s\n"
+msgstr ""
+
+#: ../lib/config_file.c:126 ../lib/config_file.c:133 ../lib/protocols.c:1627
 #, c-format
 msgid "Error: Cannot open local file %s: %s\n"
 msgstr "Feil: Kunne ikke Ă„pne lokal fil %s: %s\n"
 
-#: ../lib/config_file.c:143
-#: ../lib/protocols.c:2707
-#: ../lib/sslcommon.c:486
+#: ../lib/config_file.c:143 ../lib/sockutils.c:293 ../lib/sslcommon.c:496
 #, c-format
 msgid "Error: Could not write to socket: %s\n"
 msgstr "Feil: Kunne ikke skrive til socket: %s\n"
 
-#: ../lib/config_file.c:151
-#: ../lib/protocols.c:2631
-#: ../lib/sshv2.c:364
-#: ../lib/sslcommon.c:439
+#: ../lib/config_file.c:151 ../lib/sockutils.c:214 ../lib/sshv2.c:445
+#: ../lib/sslcommon.c:449
 #, c-format
 msgid "Error: Could not read from socket: %s\n"
 msgstr "Feil: Kunne ikke lese fra socket: %s\n"
 
-#: ../lib/config_file.c:183
-#: ../lib/config_file.c:737
+#: ../lib/config_file.c:183 ../lib/config_file.c:737
 #, c-format
 msgid "gFTP Error: Bad bookmarks file name %s\n"
 msgstr "gFTP-feil: Feil i bokmerkefilnavn: %s\n"
@@ -95,14 +81,12 @@
 msgid "Warning: Cannot find master bookmark file %s\n"
 msgstr "Advarsel: Kunne ikke finne hovedfilen for bokmerker %s\n"
 
-#: ../lib/config_file.c:203
-#: ../lib/config_file.c:743
+#: ../lib/config_file.c:203 ../lib/config_file.c:743
 #, c-format
 msgid "gFTP Error: Cannot open bookmarks file %s: %s\n"
 msgstr "gFTP-feil: Kunne ikke Ă„pne bokmerkefil %s: %s\n"
 
-#: ../lib/config_file.c:295
-#: ../lib/config_file.c:317
+#: ../lib/config_file.c:295 ../lib/config_file.c:317
 #, c-format
 msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n"
 msgstr "gFTP-advarsel: Hopper over linje %d i bokmerkefil %s\n"
@@ -112,16 +96,26 @@
 msgid "gFTP Warning: Line %d doesn't have enough arguments\n"
 msgstr "gFTP-advarsel: Linje %d har ikke mange nok argumenter\n"
 
-#: ../lib/config_file.c:505
-msgid "This section specifies which hosts are on the local subnet and won't need to go out the proxy server (if available). Syntax: dont_use_proxy=.domain or dont_use_proxy=network number/netmask"
-msgstr "Denne seksjonen spesifiserer hvilke vertsmaskiner som ligger pÄ det lokale subnettet og ikke trenger Ä kobles gjennom noen proxy (om nÞdvendig ellers). Format: dont_use_proxy=.domene eller dont_use_proxy=nettverksadress/nettverksmaske"
-
-#: ../lib/config_file.c:508
-msgid "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: All arguments except the file extension are optional"
-msgstr "ext=filetternavn:XPM file:Ascii eller BinĂŠr (A eller B):visningsprogram. Merk: Alle argumenter bortsett fra filetternavnet er valgfrie"
-
-#: ../lib/config_file.c:587
-#: ../lib/config_file.c:832
+#: ../lib/config_file.c:504
+msgid ""
+"This section specifies which hosts are on the local subnet and won't need to "
+"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or "
+"dont_use_proxy=network number/netmask"
+msgstr ""
+"Denne seksjonen spesifiserer hvilke vertsmaskiner som ligger pÄ det lokale "
+"subnettet og ikke trenger Ă„ kobles gjennom noen proxy (om nĂždvendig ellers). "
+"Format: dont_use_proxy=.domene eller dont_use_proxy=nettverksadress/"
+"nettverksmaske"
+
+#: ../lib/config_file.c:507
+msgid ""
+"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: "
+"All arguments except the file extension are optional"
+msgstr ""
+"ext=filetternavn:XPM file:Ascii eller BinĂŠr (A eller B):visningsprogram. "
+"Merk: Alle argumenter bortsett fra filetternavnet er valgfrie"
+
+#: ../lib/config_file.c:587 ../lib/config_file.c:832
 #, c-format
 msgid "gFTP Error: Bad config file name %s\n"
 msgstr "gFTP-feil: Feil i konfigurasjonsfilnavn: %s\n"
@@ -141,8 +135,7 @@
 msgid "Did you do a make install?\n"
 msgstr "KjĂžrte du \"make install\"?\n"
 
-#: ../lib/config_file.c:619
-#: ../lib/config_file.c:838
+#: ../lib/config_file.c:619 ../lib/config_file.c:838
 #, c-format
 msgid "gFTP Error: Cannot open config file %s: %s\n"
 msgstr "gFTP-feil: Kunne ikke Ă„pne konfigurasjonsfil %s: %s\n"
@@ -168,766 +161,719 @@
 msgstr "gFTP-advarsel: Kan ikke Ă„pne %s for skriving: %s\n"
 
 #: ../lib/config_file.c:732
-#, fuzzy
-msgid "Bookmarks file for gFTP. Copyright (C) 1998-2003 Brian Masney <[e-mail]>. Warning: Any comments that you add to this file WILL be overwritten"
-msgstr "Konfigurationsfil for gFTP. Copyright (C) 1998-2002 Brian Masney <[e-mail]>. Advarsel: Eventuelle kommentarer du legger til i denne fila KOMMER TIL Å BLI OVERSKREVET."
+msgid ""
+"Bookmarks file for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb@gftp."
+"org>. Warning: Any comments that you add to this file WILL be overwritten"
+msgstr "Bokmerkefil for gFTP. Copyright (C) 1998-2007 Brian Masney <[e-mail]>. Advarsel: Eventuelle kommentarer du legger til i denne fila KOMMER TIL Å BLI OVERSKREVET."
 
 #: ../lib/config_file.c:733
-msgid "Note: The passwords contained inside this file are scrambled. This algorithm is not secure. This is to avoid your password being easily remembered by someone standing over your shoulder while you're editing this file. Prior to this, all passwords were stored in plaintext."
-msgstr "Obs: Passordene som oppbevares i denne filen er kryptert med en usikker algoritme. Dette gjÞres for Ä hindre enkel avlesing av passord av personer som f.eks stÄr bak deg nÄr du jobber med filen. Tidligere ble alle passord lagret som ren tekst."
+msgid ""
+"Note: The passwords contained inside this file are scrambled. This algorithm "
+"is not secure. This is to avoid your password being easily remembered by "
+"someone standing over your shoulder while you're editing this file. Prior to "
+"this, all passwords were stored in plaintext."
+msgstr ""
+"Obs: Passordene som oppbevares i denne filen er kryptert med en usikker "
+"algoritme. Dette gjĂžres for Ă„ hindre enkel avlesing av passord av personer "
+"som f.eks stÄr bak deg nÄr du jobber med filen. Tidligere ble alle passord "
+"lagret som ren tekst."
 
 #: ../lib/config_file.c:845
-#, fuzzy
-msgid "Config file for gFTP. Copyright (C) 1998-2003 Brian Masney <[e-mail]>. Warning: Any comments that you add to this file WILL be overwritten. If a entry has a (*) in it's comment, you can't change it inside gFTP"
-msgstr "Konfigurasjonsfil for gFTP. Copyright (C) 1998-2002 Brian Masney <[e-mail]>. Advarsel: Eventuelle kommentarer du legger til i denne filen SKRIVES OVER. Om en post har en \"*\" i kommentaren sin kan du endre den fra gFTP"
-
-#: ../lib/config_file.c:1209
-#: ../lib/protocols.c:383
-#: ../lib/protocols.c:455
-#: ../lib/protocols.c:526
-#: ../lib/rfc2068.c:545
-#: ../lib/rfc2068.c:546
+msgid ""
+"Config file for gFTP. Copyright (C) 1998-2007 Brian Masney <masneyb@gftp."
+"org>. Warning: Any comments that you add to this file WILL be overwritten. "
+"If a entry has a (*) in it's comment, you can't change it inside gFTP"
+msgstr "Konfigurasjonsfil for gFTP. Copyright (C) 1998-2007 Brian Masney <[e-mail]>. Advarsel: Eventuelle kommentarer du legger til i denne filen SKRIVES OVER. Om en post har en «*» i kommentaren sin kan du ikke endre den fra gFTP"
+
+#: ../lib/config_file.c:1209 ../lib/protocols.c:385 ../lib/rfc2068.c:543
+#: ../lib/rfc2068.c:544
+#, c-format
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: ../lib/config_file.c:1289
-#: ../lib/config_file.c:1352
-#: ../lib/config_file.c:1394
-#: ../lib/config_file.c:1427
+#: ../lib/config_file.c:1289 ../lib/config_file.c:1352
+#: ../lib/config_file.c:1394 ../lib/config_file.c:1427
 #, c-format
 msgid "FATAL gFTP Error: Config option '%s' not found in global hash table\n"
-msgstr "Kritisk gFTP-feil: Konfigurasjonsvalget \"%s\" ble ikke funnet i global hashtabell\n"
-
-#: ../lib/fsp.c:190
+msgstr ""
+"Kritisk gFTP-feil: Konfigurasjonsvalget \"%s\" ble ikke funnet i global "
+"hashtabell\n"
+
+#: ../lib/fsp.c:189
 #, c-format
 msgid "Error: Cannot upload file %s\n"
 msgstr "Feil: Kan ikke laste opp fil %s\n"
 
-#: ../lib/fsp.c:200
+#: ../lib/fsp.c:199
 #, c-format
 msgid "Error: Cannot write to file %s: %s\n"
 msgstr "Feil: Kan ikke Ă„pne skrive til fil %s: %s\n"
 
-#: ../lib/fsp.c:238
+#: ../lib/fsp.c:237
 #, c-format
 msgid "Error: Error closing file: %s\n"
 msgstr "Feil: Feil ved lukking av fil: %s\n"
 
-#: ../lib/fsp.c:326
-#, fuzzy, c-format
+#: ../lib/fsp.c:327
+#, c-format
 msgid "Corrupted file listing from FSP server %s\n"
-msgstr "Kunne ikke koble til %s: %s\n"
-
-#: ../lib/fsp.c:338
-#: ../lib/fsp.c:339
-#: ../lib/protocols.c:1541
-#: ../lib/protocols.c:1542
-#: ../lib/protocols.c:1583
-#: ../lib/protocols.c:1584
-#: ../lib/protocols.c:1647
-#: ../lib/protocols.c:1654
-#: ../lib/protocols.c:1730
-#: ../lib/protocols.c:1731
-#: ../lib/protocols.c:1767
+msgstr "Korrupt filliste fra FSP-tjener %s\n"
+
+#: ../lib/fsp.c:339 ../lib/fsp.c:340 ../lib/parse-dir-listing.c:337
+#: ../lib/parse-dir-listing.c:338 ../lib/parse-dir-listing.c:379
+#: ../lib/parse-dir-listing.c:380 ../lib/parse-dir-listing.c:446
+#: ../lib/parse-dir-listing.c:453 ../lib/parse-dir-listing.c:529
+#: ../lib/parse-dir-listing.c:530 ../lib/parse-dir-listing.c:566
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../lib/fsp.c:376
+#: ../lib/fsp.c:377
 #, fuzzy, c-format
 msgid "Could not get FSP directory listing %s: %s\n"
 msgstr "Kunne ikke lese lokal katalog %s: %s\n"
 
-#: ../lib/fsp.c:438
+#: ../lib/fsp.c:436
 #, c-format
 msgid "Successfully changed directory to %s\n"
 msgstr "Byttet mappe til %s\n"
 
-#: ../lib/fsp.c:448
+#: ../lib/fsp.c:446
 #, c-format
 msgid "Could not change directory to %s\n"
 msgstr "Kunne ikke bytte mappe til %s\n"
 
-#: ../lib/fsp.c:473
-#: ../lib/fsp.c:502
-#: ../lib/local.c:424
-#: ../lib/local.c:447
-#: ../src/gtk/transfer.c:260
-#: ../src/gtk/view_dialog.c:328
+#: ../lib/fsp.c:471 ../lib/fsp.c:500 ../lib/local.c:480 ../lib/local.c:516
+#: ../src/gtk/transfer.c:263 ../src/gtk/view_dialog.c:306
 #, c-format
 msgid "Successfully removed %s\n"
 msgstr "Fjernet %s\n"
 
-#: ../lib/fsp.c:479
-#: ../lib/local.c:430
+#: ../lib/fsp.c:477 ../lib/local.c:486
 #, c-format
 msgid "Error: Could not remove directory %s: %s\n"
 msgstr "Feil: Kunne ikke fjerne mappen %s: %s\n"
 
-#: ../lib/fsp.c:508
-#: ../lib/local.c:453
-#: ../src/gtk/transfer.c:264
-#: ../src/gtk/view_dialog.c:332
+#: ../lib/fsp.c:506 ../lib/local.c:522 ../src/gtk/transfer.c:267
+#: ../src/gtk/view_dialog.c:310
 #, c-format
 msgid "Error: Could not remove file %s: %s\n"
 msgstr "Feil: Kunne ikke fjerne fil %s: %s\n"
 
-#: ../lib/fsp.c:530
-#: ../lib/local.c:470
+#: ../lib/fsp.c:528 ../lib/local.c:554
 #, c-format
 msgid "Successfully made directory %s\n"
 msgstr "Mappen %s opprettet\n"
 
-#: ../lib/fsp.c:565
-#: ../lib/local.c:496
+#: ../lib/fsp.c:563 ../lib/local.c:590
 #, c-format
 msgid "Successfully renamed %s to %s\n"
 msgstr "%s heter nÄ %s\n"
 
-#: ../lib/fsp.c:577
-#: ../lib/local.c:503
+#: ../lib/fsp.c:575 ../lib/local.c:597
 #, c-format
 msgid "Error: Could not rename %s to %s: %s\n"
 msgstr "Feil: Kunne ikke bytte navn pÄ %s til %s: %s\n"
 
-#: ../lib/ftps.c:157
-msgid "FTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
+#: ../lib/ftps.c:156
+msgid ""
+"FTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 msgstr ""
 
 #: ../lib/https.c:91
-msgid "HTTPS Support unavailable since SSL support was not compiled in. Aborting connection.\n"
+msgid ""
+"HTTPS Support unavailable since SSL support was not compiled in. Aborting "
+"connection.\n"
 msgstr ""
 
-#: ../lib/local.c:71
-#: ../lib/local.c:407
+#: ../lib/local.c:66
+#, c-format
+msgid "Could not get current working directory: %s\n"
+msgstr "Kunne ikke bytte fjernmappe til: %s\n"
+
+#: ../lib/local.c:105
+#, c-format
+msgid "Successfully changed local directory to %s\n"
+msgstr "Byttet lokal mappe til %s\n"
+
+#: ../lib/local.c:112
 #, c-format
 msgid "Could not change local directory to %s: %s\n"
 msgstr "Kunne ikke bytte lokal mappe til %s: %s\n"
 
-#: ../lib/local.c:85
-#: ../lib/local.c:392
-#, c-format
-msgid "Could not get current working directory: %s\n"
-msgstr "Kunne ikke bytte fjernmappe til: %s\n"
-
-#: ../lib/local.c:183
+#: ../lib/local.c:238
 #, c-format
 msgid "Error: Cannot truncate local file %s: %s\n"
 msgstr "Feil: Kunne ikke Ă„pne lokal fil %s: %s\n"
 
-#: ../lib/local.c:347
+#: ../lib/local.c:424
 #, c-format
 msgid "Could not get local directory listing %s: %s\n"
 msgstr "Kunne ikke lese lokal mappe %s: %s\n"
 
-#: ../lib/local.c:384
-#, c-format
-msgid "Successfully changed local directory to %s\n"
-msgstr "Byttet lokal mappe til %s\n"
-
-#: ../lib/local.c:520
+#: ../lib/local.c:634
 #, c-format
 msgid "Successfully changed mode of %s to %o\n"
 msgstr "Byttet attributter pÄ %s til %o\n"
 
-#: ../lib/local.c:527
+#: ../lib/local.c:641
 #, c-format
 msgid "Error: Could not change mode of %s to %o: %s\n"
 msgstr "Feil: Kunne ikke endre attributter pÄ %s til %o: %s\n"
 
-#: ../lib/local.c:623
+#: ../lib/local.c:676
+#, fuzzy, c-format
+msgid "Successfully changed the time stamp of %s\n"
+msgstr "Byttet mappe til %s\n"
+
+#: ../lib/local.c:683
+#, fuzzy, c-format
+msgid "Error: Could not change the time stamp of %s: %s\n"
+msgstr "Feil: Kunne ikke endre attributter pÄ %s til %o: %s\n"
+
+#: ../lib/local.c:750
 msgid "local filesystem"
 msgstr "lokalt filsystem"
 
-#: ../lib/misc.c:401
+#: ../lib/misc.c:414
 #, c-format
 msgid "usage: gftp "
 msgstr "bruk: gftp "
 
-#: ../lib/misc.c:401
-#: ../lib/rfc2068.c:303
-#: ../src/uicommon/gftpui.c:662
-#, c-format
-msgid "\n"
-msgstr "\n"
-
-#: ../lib/options.h:24
-#: ../lib/rfc959.c:26
+#. @null@
+#: ../lib/options.h:25 ../lib/rfc959.c:26
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/options.h:24
-msgid "file"
-msgstr "fil:"
-
-#: ../lib/options.h:24
-msgid "size"
-msgstr "stĂžrrelse"
-
-#: ../lib/options.h:25
-msgid "user"
-msgstr "bruker"
-
 #: ../lib/options.h:25
-msgid "group"
-msgstr "gruppe"
+msgid "file"
+msgstr "fil:"
 
 #: ../lib/options.h:26
-msgid "datetime"
-msgstr "datotid"
+msgid "size"
+msgstr "stĂžrrelse"
 
 #: ../lib/options.h:26
-msgid "attribs"
-msgstr "attributter"
+msgid "user"
+msgstr "bruker"
+
+#: ../lib/options.h:27
+msgid "group"
+msgstr "gruppe"
 
 #: ../lib/options.h:28
+msgid "datetime"
+msgstr "datotid"
+
+#: ../lib/options.h:29
+msgid "attribs"
+msgstr "attributter"
+
+#. @null@
+#: ../lib/options.h:32
 msgid "descending"
 msgstr "synkende"
 
-#: ../lib/options.h:28
+#: ../lib/options.h:33
 msgid "ascending"
 msgstr "stigende"
 
-#: ../lib/options.h:34
+#: ../lib/options.h:40
 msgid "General"
 msgstr "Generelt"
 
-#: ../lib/options.h:37
+#: ../lib/options.h:43
 msgid "View program:"
 msgstr "Visningprogram:"
 
-#: ../lib/options.h:38
-msgid "The default program used to view files. If this is blank, the internal file viewer will be used"
-msgstr "Det program som brukes for Ă„ lese filer. Hvis ikke annet oppgis vil det interne visningsprogrammes bli brukt."
-
-#: ../lib/options.h:40
+#: ../lib/options.h:44
+msgid ""
+"The default program used to view files. If this is blank, the internal file "
+"viewer will be used"
+msgstr ""
+"Det program som brukes for Ă„ lese filer. Hvis ikke annet oppgis vil det "
+"interne visningsprogrammes bli brukt."
+
+#: ../lib/options.h:46
 msgid "Edit program:"
 msgstr "Redigeringsprogram:"
 
-#: ../lib/options.h:41
-msgid "The default program used to edit files."
-msgstr "Det program som brukes til Ă„ redigere filer."
-
-#: ../lib/options.h:42
-msgid "Startup Directory:"
-msgstr "Oppstartsmappe:"
-
-#: ../lib/options.h:44
-msgid "The default directory gFTP will go to on startup"
-msgstr "Mappen gFTP vil starte opp i."
-
-#: ../lib/options.h:45
-msgid "Max Log Window Size:"
-msgstr "Maksimal loggvindustĂžrrelse:"
-
 #: ../lib/options.h:47
+msgid "The default program used to edit files."
+msgstr "Det program som brukes til Ă„ redigere filer."
+
+#: ../lib/options.h:48
+msgid "Max Log Window Size:"
+msgstr "Maksimal loggvindustĂžrrelse:"
+
+#: ../lib/options.h:50
 msgid "The maximum size of the log window in bytes for the GTK+ port"
 msgstr "Maksimal stÞrrelse pÄ loggvinduet i bytes (for \"GTK+\"-versjonen)"
 
-#: ../lib/options.h:49
+#: ../lib/options.h:52
 msgid "Remote Character Sets:"
 msgstr "Eksterne tegnsett:"
 
-#: ../lib/options.h:51
-msgid "This is a comma separated list of charsets to try to convert the remote messages to the current locale"
+#: ../lib/options.h:54
+msgid ""
+"This is a comma separated list of charsets to try to convert the remote "
+"messages to the current locale"
 msgstr ""
 
-#: ../lib/options.h:53
+#: ../lib/options.h:56
 msgid "Remote LC_TIME:"
 msgstr "Tjenerens LC_TIME:"
 
-#: ../lib/options.h:55
-msgid "This is the value of LC_TIME for the remote site. This is so that dates can be parsed properly in the directory listings."
-msgstr "Dette er verdien av LC_TIME pÄ tjeneren, og brukes til Ä oppgi riktig tid i mappelistene."
-
-#: ../lib/options.h:57
+#: ../lib/options.h:58
+msgid ""
+"This is the value of LC_TIME for the remote site. This is so that dates can "
+"be parsed properly in the directory listings."
+msgstr ""
+"Dette er verdien av LC_TIME pÄ tjeneren, og brukes til Ä oppgi riktig tid i "
+"mappelistene."
+
+#: ../lib/options.h:60
 msgid "Cache TTL:"
 msgstr ""
 
-#: ../lib/options.h:60
+#: ../lib/options.h:63
 #, fuzzy
 msgid "The number of seconds to keep cache entries before they expire."
 msgstr "Antall sekunder mellom gjenoppkoblingsforsĂžk"
 
-#: ../lib/options.h:63
+#: ../lib/options.h:66
 msgid "Append file transfers"
 msgstr "Legg til filoverfĂžringer"
 
-#: ../lib/options.h:65
+#: ../lib/options.h:68
 msgid "Append new file transfers onto existing ones"
 msgstr "Legg nye filoverfĂžringer til de eksisterende."
 
-#: ../lib/options.h:66
+#: ../lib/options.h:69
 msgid "Do one transfer at a time"
 msgstr "GjĂžr en overfĂžring av gangen"
 
-#: ../lib/options.h:68
+#: ../lib/options.h:71
 msgid "Do only one transfer at a time?"
 msgstr "OverfĂžr kun en fil av gangen?"
 
-#: ../lib/options.h:69
+#: ../lib/options.h:72
 msgid "Overwrite by Default"
 msgstr "Overskriv som standard"
 
-#: ../lib/options.h:72
+#: ../lib/options.h:75
 msgid "Overwrite files by default or set to resume file transfers"
 msgstr "Overskriv fil eller fortsett overfĂžring fra slutten av fila"
 
-#: ../lib/options.h:74
+#: ../lib/options.h:77
 msgid "Preserve file permissions"
 msgstr "Bevar filrettigheter"
 
-#: ../lib/options.h:77
+#: ../lib/options.h:80
 msgid "Preserve file permissions of transfered files"
 msgstr "Bevar filrettighetene pÄ overfÞrte filer"
 
-#: ../lib/options.h:79
+#: ../lib/options.h:82
 msgid "Preserve file time"
 msgstr "Bevar tid for filer"
 
-#: ../lib/options.h:82
-#, fuzzy
+#: ../lib/options.h:85
 msgid "Preserve file times of transfered files"
-msgstr "Bevar filrettighetene pÄ overfÞrte filer"
-
-#: ../lib/options.h:84
+msgstr "Bevar tider pÄ filer pÄ overfÞrte filer"
+
+#: ../lib/options.h:87
 msgid "Refresh after each file transfer"
 msgstr "Oppdater etter hver filoverfĂžring"
 
-#: ../lib/options.h:87
+#: ../lib/options.h:90
 msgid "Refresh the listbox after each file is transfered"
 msgstr "Oppdatér mappelisten etter hver filoverfÞring"
 
-#: ../lib/options.h:89
+#: ../lib/options.h:92
 msgid "Sort directories first"
 msgstr "Sorter mapper Ăžverst"
 
-#: ../lib/options.h:92
+#: ../lib/options.h:95
 msgid "Put the directories first then the files"
 msgstr "Send mapper fĂžrst, deretter filer"
 
-#: ../lib/options.h:93
+#: ../lib/options.h:96
 msgid "Show hidden files"
 msgstr "Vis skjulte filer"
 
-#: ../lib/options.h:96
+#: ../lib/options.h:99
 msgid "Show hidden files in the listboxes"
 msgstr "Vis skjulte filer i mappelistene"
 
-#: ../lib/options.h:97
-msgid "Show transfer status in title"
-msgstr "Vis overfĂžringsstatus i tittelen"
-
-#: ../lib/options.h:99
-msgid "Show the file transfer status in the titlebar"
-msgstr "Vis status for overfĂžring av filer i tittellinjen"
-
 #: ../lib/options.h:100
-msgid "Start file transfers"
-msgstr "Start filoverfĂžringer"
+msgid "Show transfer status in title"
+msgstr "Vis overfĂžringsstatus i tittelen"
 
 #: ../lib/options.h:102
+msgid "Show the file transfer status in the titlebar"
+msgstr "Vis status for overfĂžring av filer i tittellinjen"
+
+#: ../lib/options.h:103
+msgid "Start file transfers"
+msgstr "Start filoverfĂžringer"
+
+#: ../lib/options.h:105
 msgid "Automatically start the file transfers when they get queued"
 msgstr "Start overfÞring av filer automatisk nÄr de havner i kÞen?"
 
-#: ../lib/options.h:104
+#: ../lib/options.h:107
 msgid "Allow manual commands in GUI"
 msgstr "Tillat manuelle kommandoer i det grafiske grensesnittet"
 
-#: ../lib/options.h:106
-msgid "Allow entering manual commands in the GUI (functions like the text port)"
+#: ../lib/options.h:109
+msgid ""
+"Allow entering manual commands in the GUI (functions like the text port)"
 msgstr ""
 
-#: ../lib/options.h:108
-#: ../src/gtk/options_dialog.c:1023
-#: ../src/gtk/options_dialog.c:1243
-msgid "Network"
-msgstr "Nettverk"
-
-#: ../lib/options.h:110
-msgid "Network timeout:"
-msgstr "Nettverkstimeout:"
+#: ../lib/options.h:111
+#, fuzzy
+msgid "Remember last directory"
+msgstr "Fjerner en lokal mappe"
 
 #: ../lib/options.h:113
-msgid "The timeout waiting for network input/output. This is NOT an idle timeout."
+msgid "Save the last local and remote directory when the application is closed"
 msgstr ""
 
 #: ../lib/options.h:115
+#, fuzzy
+msgid "Connect to remote server on startup"
+msgstr "Koble fra ekstern vert"
+
+#: ../lib/options.h:117
+msgid ""
+"Automatically connect to the remote server when the application is started."
+msgstr ""
+
+#: ../lib/options.h:120 ../src/gtk/options_dialog.c:1020
+#: ../src/gtk/options_dialog.c:1240
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../lib/options.h:122
+msgid "Network timeout:"
+msgstr "Nettverkstimeout:"
+
+#: ../lib/options.h:125
+msgid ""
+"The timeout waiting for network input/output. This is NOT an idle timeout."
+msgstr ""
+
+#: ../lib/options.h:127
 msgid "Connect retries:"
 msgstr "OppkoblingsforsĂžk:"
 
-#: ../lib/options.h:118
+#: ../lib/options.h:130
 #, fuzzy
 msgid "The number of auto-retries to do. Set this to 0 to retry indefinitely"
 msgstr "Maksimalt antall oppkoblingsforsĂžk. Sett til 0 for uendelig."
 
-#: ../lib/options.h:120
+#: ../lib/options.h:132
 msgid "Retry sleep time:"
 msgstr "Tid mellom oppkoblingsforsĂžk"
 
-#: ../lib/options.h:123
+#: ../lib/options.h:135
 msgid "The number of seconds to wait between retries"
 msgstr "Antall sekunder mellom gjenoppkoblingsforsĂžk"
 
-#: ../lib/options.h:124
+#: ../lib/options.h:136
 msgid "Max KB/S:"
 msgstr "Max KB/s:"
 
-#: ../lib/options.h:127
+#: ../lib/options.h:139
 msgid "The maximum KB/s a file transfer can get. (Set to 0 to disable)"
 msgstr "Maximal bÄndbredde i KB/s. Sett til 0 for Ä koble ut."
 
-#: ../lib/options.h:129
+#: ../lib/options.h:141
 msgid "Transfer Block Size:"
 msgstr "BlokkstĂžrrelse for overfĂžring:"
 
-#: ../lib/options.h:132
-msgid "The block size that is used when transfering files. This should be a multiple of 1024."
+#: ../lib/options.h:144
+msgid ""
+"The block size that is used when transfering files. This should be a "
+"multiple of 1024."
 msgstr ""
 
-#: ../lib/options.h:135
+#: ../lib/options.h:147
 msgid "Default Protocol:"
 msgstr "Forvalgt protokoll:"
 
-#: ../lib/options.h:137
+#: ../lib/options.h:149
 msgid "This specifies the default protocol to use"
 msgstr "Spesifiserer standardprotokoll"
 
-#: ../lib/options.h:139
-#: ../lib/options.h:142
+#: ../lib/options.h:151 ../lib/options.h:154
 msgid "Enable IPv6 support"
 msgstr "Skru pÄ stÞtte for IPv6"
 
-#: ../lib/options.h:147
-msgid "This defines what will happen when you double click a file in the file listboxes. 0=View file 1=Edit file 2=Transfer file"
-msgstr "Dette definerer hva som skjer hvis man dobbeltklikker pÄ en fil i mappelisten. 0=Les fil, 1=Rediger fil, 2=Send fil"
-
-#: ../lib/options.h:150
+#: ../lib/options.h:159
+msgid ""
+"This defines what will happen when you double click a file in the file "
+"listboxes. 0=View file 1=Edit file 2=Transfer file"
+msgstr ""
+"Dette definerer hva som skjer hvis man dobbeltklikker pÄ en fil i "
+"mappelisten. 0=Les fil, 1=Rediger fil, 2=Send fil"
+
+#: ../lib/options.h:162
 msgid "The default width of the local files listbox"
 msgstr "Standardbredden pÄ listen av lokale filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:153
+#: ../lib/options.h:165
 msgid "The default width of the remote files listbox"
 msgstr "Standardbredden pÄ listen av fjerne filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:156
+#: ../lib/options.h:168
 msgid "The default height of the local/remote files listboxes"
 msgstr "HÞyden pÄ lister av lokale/fjerne filer hvis ikke annet oppgis"
 
-#: ../lib/options.h:159
+#: ../lib/options.h:171
 msgid "The default height of the transfer listbox"
 msgstr "HÞyden pÄ overfÞringslisten hvis ikke annet oppgis"
 
-#: ../lib/options.h:162
+#: ../lib/options.h:174
 msgid "The default height of the logging window"
 msgstr "HÞyden pÄ loggen hvis ikke annet oppgis"
 
-#: ../lib/options.h:165
-msgid "The width of the filename column in the transfer window. Set this to 0 to have this column automagically resize."
-msgstr "Bredden pÄ filnavnskolonner i overfÞringsvinduet. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automagisk."
-
-#: ../lib/options.h:173
-#: ../lib/options.h:179
+#: ../lib/options.h:177
+msgid ""
+"The width of the filename column in the transfer window. Set this to 0 to "
+"have this column automagically resize."
+msgstr ""
+"Bredden pÄ filnavnskolonner i overfÞringsvinduet. Hvis denne er satt til 0 "
+"kommer de til Ă„ endre stĂžrrelse automagisk."
+
+#: ../lib/options.h:190 ../lib/options.h:196
 msgid "The default column to sort by"
 msgstr "Standardkolonne for sortering"
 
-#: ../lib/options.h:176
-#: ../lib/options.h:182
+#: ../lib/options.h:193 ../lib/options.h:199
 msgid "Sort ascending or descending"
 msgstr "Sortér stigende eller synkende"
 
-#: ../lib/options.h:186
-#: ../lib/options.h:204
-msgid "The width of the filename column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ filnavnskolonner i mappelister. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automatisk. Hvis den er satt til -1, tas kolonnene ikke med"
-
-#: ../lib/options.h:189
-#: ../lib/options.h:207
-msgid "The width of the size column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ stÞrrelseskolonnen i mappelistene. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automagisk. Hvis den er satt til -1, tas kolonnene ikke med"
-
-#: ../lib/options.h:192
-#: ../lib/options.h:210
-msgid "The width of the user column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ eierkolonnen i mappelistene. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automatisk. Hvis den er satt til -1, tas kolonnene ikke med"
-
-#: ../lib/options.h:195
-#: ../lib/options.h:213
-msgid "The width of the group column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ gruppekolonnen i mappelistene. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automagisk. Hvis den er satt til -1 tas kolonnene ikke med"
-
-#: ../lib/options.h:198
-#: ../lib/options.h:216
-msgid "The width of the date column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ datokolonnen i mappelistene. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automagisk. Hvis den er satt til -1, tas kolonnene ikke med"
-
-#: ../lib/options.h:201
-#: ../lib/options.h:219
-msgid "The width of the attribs column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"
-msgstr "Bredden pÄ attributtkolonnen i mappelistene. Hvis denne er satt til 0 kommer de til Ä endre stÞrrelse automagisk. Hvis den er satt til -1, tas kolonnene ikke med"
-
-#: ../lib/options.h:222
+#: ../lib/options.h:203 ../lib/options.h:221
+msgid ""
+"The width of the filename column in the file listboxes. Set this to 0 to "
+"have this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ filnavnskolonner i mappelister. Hvis denne er satt til 0 kommer "
+"de til Ă„ endre stĂžrrelse automatisk. Hvis den er satt til -1, tas kolonnene "
+"ikke med"
+
+#: ../lib/options.h:206 ../lib/options.h:224
+msgid ""
+"The width of the size column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ stÞrrelseskolonnen i mappelistene. Hvis denne er satt til 0 "
+"kommer de til Ă„ endre stĂžrrelse automagisk. Hvis den er satt til -1, tas "
+"kolonnene ikke med"
+
+#: ../lib/options.h:209 ../lib/options.h:227
+msgid ""
+"The width of the user column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ eierkolonnen i mappelistene. Hvis denne er satt til 0 kommer de "
+"til Ă„ endre stĂžrrelse automatisk. Hvis den er satt til -1, tas kolonnene "
+"ikke med"
+
+#: ../lib/options.h:212 ../lib/options.h:230
+msgid ""
+"The width of the group column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ gruppekolonnen i mappelistene. Hvis denne er satt til 0 kommer de "
+"til Ă„ endre stĂžrrelse automagisk. Hvis den er satt til -1 tas kolonnene ikke "
+"med"
+
+#: ../lib/options.h:215 ../lib/options.h:233
+msgid ""
+"The width of the date column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ datokolonnen i mappelistene. Hvis denne er satt til 0 kommer de "
+"til Ă„ endre stĂžrrelse automagisk. Hvis den er satt til -1, tas kolonnene "
+"ikke med"
+
+#: ../lib/options.h:218 ../lib/options.h:236
+msgid ""
+"The width of the attribs column in the file listboxes. Set this to 0 to have "
+"this column automagically resize. Set this to -1 to disable this column"
+msgstr ""
+"Bredden pÄ attributtkolonnen i mappelistene. Hvis denne er satt til 0 kommer "
+"de til Ă„ endre stĂžrrelse automagisk. Hvis den er satt til -1, tas kolonnene "
+"ikke med"
+
+#: ../lib/options.h:239
 msgid "The color of the commands that are sent to the server"
 msgstr "Fargen pÄ kommandoene som sendes til tjeneren"
 
-#: ../lib/options.h:225
+#: ../lib/options.h:242
 msgid "The color of the commands that are received from the server"
 msgstr "Fargen pÄ kommandoene som mottas fra tjeneren"
 
-#: ../lib/options.h:228
+#: ../lib/options.h:245
 msgid "The color of the error messages"
 msgstr "Fargen pÄ feilmeldingene"
 
-#: ../lib/options.h:231
+#: ../lib/options.h:248
 msgid "The color of the rest of the log messages"
 msgstr "Fargen pÄ resten av loggmeldingene"
 
-#: ../lib/options.h:237
-#: ../lib/rfc959.c:40
+#: ../lib/options.h:254 ../lib/rfc959.c:40
 msgid "FTP"
 msgstr "FTP"
 
-#: ../lib/options.h:240
-#: ../lib/options.h:242
+#: ../lib/options.h:257 ../lib/options.h:259
 msgid "FTPS"
 msgstr "FTPS"
 
-#: ../lib/options.h:245
-#: ../lib/rfc2068.c:27
+#: ../lib/options.h:262 ../lib/rfc2068.c:27
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../lib/options.h:248
-#: ../lib/options.h:250
+#: ../lib/options.h:265 ../lib/options.h:267
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../lib/options.h:253
+#: ../lib/options.h:270
 msgid "Local"
 msgstr "Lokal"
 
-#: ../lib/options.h:255
+#: ../lib/options.h:272
 msgid "SSH2"
 msgstr "SSH2"
 
-#: ../lib/options.h:257
-#: ../src/gtk/bookmarks.c:886
+#: ../lib/options.h:274 ../src/gtk/bookmarks.c:883
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: ../lib/options.h:258
+#: ../lib/options.h:275
 msgid "FSP"
 msgstr "FSP"
 
-#: ../lib/protocols.c:225
+#: ../lib/protocols.c:228
 #, c-format
 msgid "File transfer will be throttled to %.2f KB/s\n"
 msgstr "FiloverfĂžringshastighet vil bli begrenset til %.2f KB/s\n"
 
-#: ../lib/protocols.c:379
+#: ../lib/protocols.c:381
 #, c-format
 msgid "Error setting LC_TIME to '%s'. Falling back to '%s'\n"
 msgstr ""
 
-#: ../lib/protocols.c:390
+#: ../lib/protocols.c:392
 #, c-format
 msgid "Loading directory listing %s from cache (LC_TIME=%s)\n"
 msgstr "Henter mappeliste %s fra mellomlager (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:400
+#: ../lib/protocols.c:402
 #, c-format
 msgid "Loading directory listing %s from server (LC_TIME=%s)\n"
 msgstr "Henter mappeliste %s fra tjener (LC_TIME=%s)\n"
 
-#: ../lib/protocols.c:454
-#: ../lib/protocols.c:486
-#: ../lib/protocols.c:525
-#: ../lib/protocols.c:557
+#: ../lib/protocols.c:452
 #, c-format
-msgid "Error converting string '%s' from character set %s to character set %s: %s\n"
-msgstr ""
-
-#. Don't use request->logging_function since the strings must be in UTF-8
-#. for the GTK+ 2.x port
-#: ../lib/protocols.c:469
-#, c-format
-msgid "Error converting string '%s' to UTF-8 from current locale: %s\n"
+msgid ""
+"Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't "
+"match the current directory (%s)\n"
 msgstr ""
 
-#. Don't use request->logging_function since the strings must be in UTF-8
-#. for the GTK+ 2.x port
-#: ../lib/protocols.c:540
-#, c-format
-msgid "Error converting string '%s' to current locale from UTF-8: %s\n"
-msgstr ""
-
-#: ../lib/protocols.c:629
-#, c-format
-msgid "Warning: Stripping path off of file '%s'. The stripped path (%s) doesn't match the current directory (%s)\n"
-msgstr ""
-
-#: ../lib/protocols.c:647
+#: ../lib/protocols.c:483
 #, c-format
 msgid "Error: Cannot write to cache: %s\n"
 msgstr "Feil: Kunne ikke skrive til cache: %s\n"
 
-#: ../lib/protocols.c:680
+#: ../lib/protocols.c:516
 #, c-format
 msgid "Error: Could not find bookmark %s\n"
 msgstr "Feil: Kunne ikke finne bokmerke %s\n"
 
-#: ../lib/protocols.c:687
+#: ../lib/protocols.c:523
 #, c-format
 msgid "Bookmarks Error: The bookmark entry %s does not have a hostname\n"
 msgstr "Feil i bokmerker: BokmerkeoppfĂžring %s har ikke et vertsnavn\n"
 
-#: ../lib/protocols.c:826
-#: ../lib/protocols.c:853
+#: ../lib/protocols.c:645 ../lib/protocols.c:672
 #, c-format
 msgid "The protocol '%s' is currently not supported.\n"
 msgstr "Protokollen «%s» stÞttes ikke enda\n"
 
-#: ../lib/protocols.c:1167
-#: ../lib/protocols.c:1182
-#: ../lib/protocols.c:2214
-#: ../lib/protocols.c:2324
+#: ../lib/protocols.c:1155
 #, c-format
-msgid "Looking up %s\n"
-msgstr "SlÄr opp %s\n"
-
-#: ../lib/protocols.c:1173
-#: ../lib/protocols.c:1188
-#: ../lib/protocols.c:2219
-#: ../lib/protocols.c:2329
-#, c-format
-msgid "Cannot look up hostname %s: %s\n"
-msgstr "Kunne ikke slÄ opp hostname %s: %s\n"
-
-#: ../lib/protocols.c:2237
-#, c-format
-msgid "Failed to create a socket: %s\n"
-msgstr "Kunne ikke opprette tilkobling: %s\n"
-
-#: ../lib/protocols.c:2243
-#: ../lib/protocols.c:2346
+msgid "Found recursive symbolic link %s\n"
+msgstr ""
+
+#: ../lib/protocols.c:1533
 #, c-format
-msgid "Trying %s:%d\n"
-msgstr "PrĂžver med %s:%d\n"
-
-#: ../lib/protocols.c:2248
-#: ../lib/protocols.c:2353
+msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
+msgstr ""
+"Feil: Vertsmaskinen %s koblet fra. Maks antall forsÞk nÄdd... gir opp\n"
+
+#: ../lib/protocols.c:1541
 #, c-format
-msgid "Cannot connect to %s: %s\n"
-msgstr "Kunne ikke koble til %s: %s\n"
-
-#: ../lib/protocols.c:2283
-#: ../lib/rfc959.c:640
-#, fuzzy, c-format
-msgid "Failed to create a IPv4 socket: %s\n"
-msgstr "Kunne ikke opprette tilkobling: %s\n"
-
-#: ../lib/protocols.c:2307
-#: ../lib/sshv2.c:1046
-#, c-format
-msgid "Cannot look up service name %s/tcp. Please check your services file\n"
-msgstr ""
-
-#: ../lib/protocols.c:2369
-#: ../lib/protocols.c:3009
-#: ../lib/rfc959.c:649
-#: ../lib/rfc959.c:826
+msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
+msgstr "Feil: Vertsmaskinen %s koblet ned. Nytt forsĂžk om %d sekunder\n"
+
+#: ../lib/protocols.c:1636 ../lib/rfc959.c:715 ../lib/rfc959.c:885
+#: ../lib/socket-connect.c:126
 #, fuzzy, c-format
 msgid "Error: Cannot set close on exec flag: %s\n"
 msgstr "Feil: Kunne ikke Ă„pne lokal fil %s: %s\n"
 
-#: ../lib/protocols.c:2376
-#, c-format
-msgid "Connected to %s:%d\n"
-msgstr "Koblet til %s:%d\n"
-
-#: ../lib/protocols.c:2607
-#: ../lib/protocols.c:2682
-#: ../lib/sshv2.c:355
-#, c-format
-msgid "Connection to %s timed out\n"
-msgstr "Tid for oppkoblingsforsĂžk mot %s gikk ut\n"
-
-#: ../lib/protocols.c:2750
-#, fuzzy, c-format
-msgid "Cannot get socket flags: %s\n"
-msgstr "Kunne ikke opprette tilkobling: %s\n"
-
-#: ../lib/protocols.c:2764
-#, fuzzy, c-format
-msgid "Cannot set socket to non-blocking: %s\n"
-msgstr "Kunne ikke opprette tilkobling: %s\n"
-
-#: ../lib/protocols.c:2899
-#, c-format
-msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n"
-msgstr "Feil: Vertsmaskinen %s koblet fra. Maks antall forsÞk nÄdd... gir opp\n"
-
-#: ../lib/protocols.c:2907
-#, c-format
-msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n"
-msgstr "Feil: Vertsmaskinen %s koblet ned. Nytt forsĂžk om %d sekunder\n"
-
-#: ../lib/pty.c:297
+#: ../lib/pty.c:301
 #, c-format
 msgid "Cannot open master pty %s: %s\n"
 msgstr "Kan ikke Ă„pne master pty %s: %s\n"
 
-#: ../lib/pty.c:305
+#: ../lib/pty.c:309
 #, c-format
 msgid "Cannot create a socket pair: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/pty.c:334
+#: ../lib/pty.c:338
 #, c-format
 msgid "Error: Cannot execute ssh: %s\n"
 msgstr "Feil: Kan ikke kjĂžre ssh: %s\n"
 
-#: ../lib/pty.c:350
+#: ../lib/pty.c:354
 #, c-format
 msgid "Cannot fork another process: %s\n"
 msgstr "Kunne ikke opprette underprosess: %s\n"
 
-#: ../lib/rfc2068.c:30
-#: ../lib/rfc959.c:47
+#: ../lib/rfc2068.c:30 ../lib/rfc959.c:47
 msgid "Proxy hostname:"
 msgstr "Proxytjener:"
 
-#: ../lib/rfc2068.c:32
-#: ../lib/rfc959.c:49
+#: ../lib/rfc2068.c:32 ../lib/rfc959.c:49
 msgid "Firewall hostname"
 msgstr "Brannmur:"
 
-#: ../lib/rfc2068.c:33
-#: ../lib/rfc959.c:50
+#: ../lib/rfc2068.c:33 ../lib/rfc959.c:50
 msgid "Proxy port:"
 msgstr "Proxy-port:"
 
-#: ../lib/rfc2068.c:35
-#: ../lib/rfc959.c:52
+#: ../lib/rfc2068.c:35 ../lib/rfc959.c:52
 msgid "Port to connect to on the firewall"
 msgstr "Port for Ă„ koble til brannmuren"
 
-#: ../lib/rfc2068.c:36
-#: ../lib/rfc959.c:53
+#: ../lib/rfc2068.c:36 ../lib/rfc959.c:53
 msgid "Proxy username:"
 msgstr "Proxybrukernavn:"
 
-#: ../lib/rfc2068.c:38
-#: ../lib/rfc959.c:55
+#: ../lib/rfc2068.c:38 ../lib/rfc959.c:55
 msgid "Your firewall username"
 msgstr "Ditt brukernavn i brannmuren"
 
-#: ../lib/rfc2068.c:39
-#: ../lib/rfc959.c:56
+#: ../lib/rfc2068.c:39 ../lib/rfc959.c:56
 msgid "Proxy password:"
 msgstr "Proxypassord:"
 
-#: ../lib/rfc2068.c:41
-#: ../lib/rfc959.c:58
+#: ../lib/rfc2068.c:41 ../lib/rfc959.c:58
 msgid "Your firewall password"
 msgstr "Ditt passord i brannmuren"
 
@@ -939,38 +885,33 @@
 msgid "Do you want to use HTTP/1.1 or HTTP/1.0"
 msgstr "Vil du bruke HTTP/1.1 eller HTTP/1.0"
 
-#: ../lib/rfc2068.c:150
-#: ../lib/rfc2068.c:843
+#: ../lib/rfc2068.c:151 ../lib/rfc2068.c:840
 #, fuzzy, c-format
 msgid ""
 "Received wrong response from server, disconnecting\n"
 "Invalid chunk size '%s' returned by the remote server\n"
 msgstr "Mottok uventet svar fra server\n"
 
-#: ../lib/rfc2068.c:254
-#: ../lib/rfc959.c:608
-#: ../lib/sshv2.c:1123
+#: ../lib/rfc2068.c:255 ../lib/rfc959.c:679 ../lib/sshv2.c:1245
 #, c-format
 msgid "Disconnecting from site %s\n"
 msgstr "Kobler fra vertsmaskin %s\n"
 
-#: ../lib/rfc2068.c:303
+#: ../lib/rfc2068.c:301
 #, fuzzy
 msgid "Starting the file transfer at offset "
 msgstr "Starter filoverfĂžringen ved posisjon %ld\n"
 
-#: ../lib/rfc2068.c:324
+#: ../lib/rfc2068.c:322
 #, c-format
 msgid "Cannot retrieve file %s\n"
 msgstr "Kan ikke hente fil %s\n"
 
-#: ../lib/rfc2068.c:423
-#: ../lib/sshv2.c:1205
+#: ../lib/rfc2068.c:421 ../lib/sshv2.c:1327
 msgid "Retrieving directory listing...\n"
 msgstr "Henter mappeliste...\n"
 
-#: ../lib/rfc2068.c:819
-#: ../lib/sshv2.c:814
+#: ../lib/rfc2068.c:816 ../lib/sshv2.c:895
 #, fuzzy
 msgid "Received wrong response from server, disconnecting\n"
 msgstr "Mottok uventet svar fra server\n"
@@ -1012,7 +953,9 @@
 msgstr "Epostadresse:"
 
 #: ../lib/rfc959.c:45
-msgid "This is the password that will be used whenever you log into a remote FTP server as anonymous"
+msgid ""
+"This is the password that will be used whenever you log into a remote FTP "
+"server as anonymous"
 msgstr ""
 
 #: ../lib/rfc959.c:59
@@ -1029,7 +972,13 @@
 
 #: ../lib/rfc959.c:66
 #, no-c-format
-msgid "This specifies how your proxy server expects us to log in. You can specify a 2 character replacement string prefixed by a % that will be replaced with the proper data. The first character can be either p for proxy or h for the host of the FTP server. The second character can be u (user), p (pass), h (host), o (port) or a (account). For example, to specify the proxy user, you can you type in %pu"
+msgid ""
+"This specifies how your proxy server expects us to log in. You can specify a "
+"2 character replacement string prefixed by a % that will be replaced with "
+"the proper data. The first character can be either p for proxy or h for the "
+"host of the FTP server. The second character can be u (user), p (pass), h "
+"(host), o (port) or a (account). For example, to specify the proxy user, you "
+"can you type in %pu"
 msgstr ""
 
 #: ../lib/rfc959.c:69
@@ -1037,7 +986,11 @@
 msgstr ""
 
 #: ../lib/rfc959.c:72
-msgid "If this is enabled, then the remote FTP server's PASV IP address field will be ignored and the host's IP address will be used instead. This is often needed for routers giving their internal rather then their external IP address in a PASV reply."
+msgid ""
+"If this is enabled, then the remote FTP server's PASV IP address field will "
+"be ignored and the host's IP address will be used instead. This is often "
+"needed for routers giving their internal rather then their external IP "
+"address in a PASV reply."
 msgstr ""
 
 #: ../lib/rfc959.c:74
@@ -1045,7 +998,13 @@
 msgstr "Passive filoverfĂžringer"
 
 #: ../lib/rfc959.c:77
-msgid "If this is enabled, then the remote FTP server will open up a port for the data connection. If you are behind a firewall, you will need to enable this. Generally, it is a good idea to keep this enabled unless you are connecting to an older FTP server that doesn't support this. If this is disabled, then gFTP will open up a port on the client side and the remote server will attempt to connect to it."
+msgid ""
+"If this is enabled, then the remote FTP server will open up a port for the "
+"data connection. If you are behind a firewall, you will need to enable this. "
+"Generally, it is a good idea to keep this enabled unless you are connecting "
+"to an older FTP server that doesn't support this. If this is disabled, then "
+"gFTP will open up a port on the client side and the remote server will "
+"attempt to connect to it."
 msgstr ""
 
 #: ../lib/rfc959.c:79
@@ -1054,7 +1013,11 @@
 msgstr "Utvid symbolske lenker pÄ fjernmaskinen"
 
 #: ../lib/rfc959.c:82
-msgid "The remote FTP server will attempt to resolve symlinks in the directory listings. Generally, this is a good idea to leave enabled. The only time you will want to disable this is if the remote FTP server doesn't support the -L option to LIST"
+msgid ""
+"The remote FTP server will attempt to resolve symlinks in the directory "
+"listings. Generally, this is a good idea to leave enabled. The only time you "
+"will want to disable this is if the remote FTP server doesn't support the -L "
+"option to LIST"
 msgstr ""
 
 #: ../lib/rfc959.c:84
@@ -1062,88 +1025,144 @@
 msgstr "OverfĂžr filer i ASCII-modus"
 
 #: ../lib/rfc959.c:87
-msgid "If you are transfering a text file from Windows to UNIX box or vice versa, then you should enable this. Each system represents newlines differently for text files. If you are transfering from UNIX to UNIX, then it is safe to leave this off. If you are downloading binary data, you will want to disable this."
+msgid ""
+"If you are transfering a text file from Windows to UNIX box or vice versa, "
+"then you should enable this. Each system represents newlines differently for "
+"text files. If you are transfering from UNIX to UNIX, then it is safe to "
+"leave this off. If you are downloading binary data, you will want to disable "
+"this."
 msgstr ""
 
-#: ../lib/rfc959.c:322
-#: ../lib/rfc959.c:331
-#: ../lib/rfc959.c:342
-#: ../lib/rfc959.c:789
-#: ../lib/rfc959.c:1387
+#: ../lib/rfc959.c:381 ../lib/rfc959.c:390 ../lib/rfc959.c:401
+#: ../lib/rfc959.c:849 ../lib/rfc959.c:1414
 #, c-format
 msgid "Invalid response '%c' received from server.\n"
 msgstr "Ugyldig svar \"%c\" mottatt fra tjeneren.\n"
 
-#: ../lib/rfc959.c:679
-#: ../lib/rfc959.c:689
+#: ../lib/rfc959.c:706 ../lib/socket-connect-gethostbyname.c:120
+#, fuzzy, c-format
+msgid "Failed to create a IPv4 socket: %s\n"
+msgstr "Kunne ikke opprette tilkobling: %s\n"
+
+#: ../lib/rfc959.c:745 ../lib/rfc959.c:755
 #, c-format
 msgid "Cannot find an IP address in PASV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:715
+#: ../lib/rfc959.c:775
 #, c-format
 msgid "Ignoring IP address in PASV response, connecting to %d.%d.%d.%d:%d\n"
 msgstr ""
 
-#: ../lib/rfc959.c:726
-#: ../lib/rfc959.c:887
+#: ../lib/rfc959.c:786 ../lib/rfc959.c:945
 #, c-format
 msgid "Cannot create a data connection: %s\n"
 msgstr "Kunne ikke opprette dataoppkobling: %s\n"
 
-#: ../lib/rfc959.c:738
-#: ../lib/rfc959.c:759
-#: ../lib/rfc959.c:912
+#: ../lib/rfc959.c:798 ../lib/rfc959.c:819 ../lib/rfc959.c:970
 #, fuzzy, c-format
 msgid "Cannot get socket name: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:749
-#: ../lib/rfc959.c:902
+#: ../lib/rfc959.c:809 ../lib/rfc959.c:960
 #, c-format
 msgid "Cannot bind a port: %s\n"
 msgstr "Kan ikke tilknytte port: %s\n"
 
-#: ../lib/rfc959.c:768
-#: ../lib/rfc959.c:921
+#: ../lib/rfc959.c:828 ../lib/rfc959.c:979
 #, c-format
 msgid "Cannot listen on port %d: %s\n"
 msgstr "Kan ikke lytte pÄ port %d: %s\n"
 
-#: ../lib/rfc959.c:817
+#: ../lib/rfc959.c:876
 #, fuzzy, c-format
 msgid "Failed to create a IPv6 socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:837
-msgid "Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
+#: ../lib/rfc959.c:895
+msgid ""
+"Error: It doesn't look like we are connected via IPv6. Aborting connection.\n"
 msgstr ""
 
-#: ../lib/rfc959.c:865
-#: ../lib/rfc959.c:874
+#: ../lib/rfc959.c:923 ../lib/rfc959.c:932
 #, c-format
 msgid "Invalid EPSV response '%s'\n"
 msgstr ""
 
-#: ../lib/rfc959.c:931
+#: ../lib/rfc959.c:989
 #, fuzzy, c-format
 msgid "Cannot get address of local socket: %s\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/rfc959.c:1005
+#: ../lib/rfc959.c:1076
 #, fuzzy, c-format
 msgid "Cannot accept connection from server: %s\n"
 msgstr "Kunne ikke koble til %s: %s\n"
 
-#: ../lib/rfc959.c:1542
+#: ../lib/rfc959.c:1584
 msgid "total"
 msgstr "totalt"
 
-#: ../lib/rfc959.c:1544
+#: ../lib/rfc959.c:1586
 #, c-format
 msgid "Warning: Cannot parse listing %s\n"
 msgstr "Advarsel: Kan ikke tolke liste %s\n"
 
+#: ../lib/socket-connect-getaddrinfo.c:77
+#: ../lib/socket-connect-gethostbyname.c:64
+#, c-format
+msgid "Looking up %s\n"
+msgstr "SlÄr opp %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:82
+#: ../lib/socket-connect-gethostbyname.c:69
+#, c-format
+msgid "Cannot look up hostname %s: %s\n"
+msgstr "Kunne ikke slÄ opp hostname %s: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:115
+#, c-format
+msgid "Failed to create a socket: %s\n"
+msgstr "Kunne ikke opprette tilkobling: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:121
+#: ../lib/socket-connect-gethostbyname.c:134
+#, c-format
+msgid "Trying %s:%d\n"
+msgstr "PrĂžver med %s:%d\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:127
+#: ../lib/socket-connect-gethostbyname.c:141
+#, c-format
+msgid "Cannot connect to %s: %s\n"
+msgstr "Kunne ikke koble til %s: %s\n"
+
+#: ../lib/socket-connect-getaddrinfo.c:152
+#: ../lib/socket-connect-gethostbyname.c:159
+#, c-format
+msgid "Connected to %s:%d\n"
+msgstr "Koblet til %s:%d\n"
+
+#: ../lib/socket-connect-gethostbyname.c:101 ../lib/sshv2.c:1168
+#, c-format
+msgid "Cannot look up service name %s/tcp. Please check your services file\n"
+msgstr ""
+
+#: ../lib/sockutils.c:190 ../lib/sockutils.c:268 ../lib/sshv2.c:435
+#, c-format
+msgid "Connection to %s timed out\n"
+msgstr "Tid for oppkoblingsforsĂžk mot %s gikk ut\n"
+
+#: ../lib/sockutils.c:338
+#, fuzzy, c-format
+msgid "Cannot get socket flags: %s\n"
+msgstr "Kunne ikke opprette tilkobling: %s\n"
+
+#: ../lib/sockutils.c:352
+#, fuzzy, c-format
+msgid "Cannot set socket to non-blocking: %s\n"
+msgstr "Kunne ikke opprette tilkobling: %s\n"
+
 #: ../lib/sshv2.c:28
 msgid "SSH"
 msgstr "SSH"
@@ -1172,190 +1191,186 @@
 msgid "Require a username/password for SSH connections"
 msgstr "Krev brukernavn og passord for SSH-tilkoblinger"
 
-#: ../lib/sshv2.c:298
+#: ../lib/sshv2.c:369
 #, c-format
 msgid "Running program %s\n"
 msgstr "Starter program: %s\n"
 
-#: ../lib/sshv2.c:307
+#: ../lib/sshv2.c:378
 msgid "Enter passphrase for RSA key"
 msgstr "Oppgi passord for RSA-nĂžkkel"
 
-#: ../lib/sshv2.c:308
+#: ../lib/sshv2.c:379
 msgid "Enter passphrase for key '"
 msgstr "Oppgi passord for nÞkkel «"
 
-#: ../lib/sshv2.c:309
+#: ../lib/sshv2.c:380
 msgid "Password"
 msgstr "Passord"
 
-#: ../lib/sshv2.c:310
+#: ../lib/sshv2.c:381
 msgid "password"
 msgstr "passord"
 
-#: ../lib/sshv2.c:414
+#: ../lib/sshv2.c:496
 msgid "(yes/no)?"
 msgstr "(ja/nei)?"
 
-#: ../lib/sshv2.c:432
+#: ../lib/sshv2.c:514
 msgid "Enter PASSCODE:"
 msgstr "Oppgi passord:"
 
-#: ../lib/sshv2.c:436
-#: ../src/gtk/gtkui.c:118
-#: ../src/gtk/transfer.c:554
-#: ../src/gtk/transfer.c:564
+#: ../lib/sshv2.c:518 ../src/gtk/gtkui.c:142 ../src/gtk/transfer.c:562
+#: ../src/gtk/transfer.c:572
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../lib/sshv2.c:437
+#: ../lib/sshv2.c:519
 msgid "Enter SecurID Password:"
 msgstr "Skriv inn passord for SecurID:"
 
-#: ../lib/sshv2.c:487
+#: ../lib/sshv2.c:567
 msgid "Error: An incorrect password was entered\n"
 msgstr "Feil: Oppgitt passord er ugyldig\n"
 
-#: ../lib/sshv2.c:516
+#: ../lib/sshv2.c:596
 #, c-format
 msgid "%d: Protocol Initialization\n"
 msgstr ""
 
-#: ../lib/sshv2.c:520
+#: ../lib/sshv2.c:600
 #, c-format
 msgid "%d: Protocol version %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:529
+#: ../lib/sshv2.c:609
 #, c-format
 msgid "%d: Open %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:534
+#: ../lib/sshv2.c:614
 #, c-format
 msgid "%d: Close\n"
 msgstr "%d: Lukk\n"
 
-#: ../lib/sshv2.c:537
+#: ../lib/sshv2.c:618
 #, c-format
 msgid "%d: Open Directory %s\n"
 msgstr "%d: Åpne mappen %s\n"
 
-#: ../lib/sshv2.c:542
+#: ../lib/sshv2.c:623
 #, c-format
 msgid "%d: Read Directory\n"
 msgstr "%d: Les mappe\n"
 
-#: ../lib/sshv2.c:546
+#: ../lib/sshv2.c:627
 #, c-format
 msgid "%d: Remove file %s\n"
 msgstr "%d: Slett filen %s\n"
 
-#: ../lib/sshv2.c:551
+#: ../lib/sshv2.c:632
 #, c-format
 msgid "%d: Make directory %s\n"
 msgstr "%d: Opprett mappe %s\n"
 
-#: ../lib/sshv2.c:556
+#: ../lib/sshv2.c:637
 #, c-format
 msgid "%d: Remove directory %s\n"
 msgstr "%d: Fjern mappe %s\n"
 
-#: ../lib/sshv2.c:561
+#: ../lib/sshv2.c:642
 #, c-format
 msgid "%d: Realpath %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:566
+#: ../lib/sshv2.c:647
 #, c-format
 msgid "%d: File attributes\n"
 msgstr ""
 
-#: ../lib/sshv2.c:570
+#: ../lib/sshv2.c:651
 #, c-format
 msgid "%d: Stat %s\n"
 msgstr ""
 
-#: ../lib/sshv2.c:590
+#: ../lib/sshv2.c:671
 #, c-format
 msgid "%d: Chmod %s %o\n"
 msgstr ""
 
-#: ../lib/sshv2.c:595
+#: ../lib/sshv2.c:676
 #, c-format
 msgid "%d: Utime %s %d\n"
 msgstr ""
 
-#: ../lib/sshv2.c:609
-#: ../src/gtk/bookmarks.c:1045
-#: ../src/gtk/bookmarks.c:1298
-#: ../src/gtk/chmod_dialog.c:253
-#: ../src/gtk/gtkui_transfer.c:368
-#: ../src/gtk/misc-gtk.c:1011
-#: ../src/gtk/options_dialog.c:1208
-#: ../src/gtk/options_dialog.c:1442
+#: ../lib/sshv2.c:690 ../src/gtk/bookmarks.c:1042 ../src/gtk/bookmarks.c:1292
+#: ../src/gtk/chmod_dialog.c:253 ../src/gtk/gtkui_transfer.c:376
+#: ../src/gtk/misc-gtk.c:995 ../src/gtk/options_dialog.c:1205
+#: ../src/gtk/options_dialog.c:1437
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/sshv2.c:612
+#: ../lib/sshv2.c:693
 msgid "EOF"
 msgstr "EOF"
 
-#: ../lib/sshv2.c:615
+#: ../lib/sshv2.c:696
 msgid "No such file or directory"
 msgstr "Filen eller mappen finnes ikke"
 
-#: ../lib/sshv2.c:618
+#: ../lib/sshv2.c:699
 msgid "Permission denied"
 msgstr ""
 
-#: ../lib/sshv2.c:621
+#: ../lib/sshv2.c:702
 msgid "Failure"
 msgstr "Feil"
 
-#: ../lib/sshv2.c:624
+#: ../lib/sshv2.c:705
 msgid "Bad message"
 msgstr "Ugyldig melding"
 
-#: ../lib/sshv2.c:627
+#: ../lib/sshv2.c:708
 msgid "No connection"
 msgstr "Ingen tilkobling"
 
-#: ../lib/sshv2.c:630
+#: ../lib/sshv2.c:711
 msgid "Connection lost"
 msgstr "Mistet tilkobling"
 
-#: ../lib/sshv2.c:633
+#: ../lib/sshv2.c:714
 msgid "Operation unsupported"
 msgstr "Handling ikke stĂžttet"
 
-#: ../lib/sshv2.c:636
+#: ../lib/sshv2.c:717
 msgid "Unknown message returned from server"
 msgstr "Tjeneren sendte en ukjent melding"
 
-#: ../lib/sshv2.c:671
+#: ../lib/sshv2.c:752
 #, c-format
 msgid "Error: Message size %d too big\n"
 msgstr "Feil: BeskjedstĂžrrelse %d fra tjener for stor\n"
 
-#: ../lib/sshv2.c:730
-#: ../lib/sshv2.c:1225
-#: ../lib/sshv2.c:1821
-#: ../lib/sshv2.c:1959
+#: ../lib/sshv2.c:811 ../lib/sshv2.c:1346 ../lib/sshv2.c:1838
+#: ../lib/sshv2.c:1957
 #, c-format
 msgid "Error: Message size %d too big from server\n"
 msgstr "Feil: BeskjedstĂžrrelse %d fra server for stor\n"
 
-#: ../lib/sshv2.c:736
-msgid "There was an error initializing a SSH connection with the remote server. The error message from the remote server follows:\n"
-msgstr "Det oppstod en feil under oppstart av SSH-tilkobling med tjeneren. Tjeneren oppga fĂžlgende feilmelding:\n"
-
-#: ../lib/sshv2.c:1038
+#: ../lib/sshv2.c:817
+msgid ""
+"There was an error initializing a SSH connection with the remote server. The "
+"error message from the remote server follows:\n"
+msgstr ""
+"Det oppstod en feil under oppstart av SSH-tilkobling med tjeneren. Tjeneren "
+"oppga fĂžlgende feilmelding:\n"
+
+#: ../lib/sshv2.c:1160
 #, c-format
 msgid "Opening SSH connection to %s\n"
 msgstr "Kunne ikke koble til %s\n"
 
-#: ../lib/sshv2.c:1090
+#: ../lib/sshv2.c:1212
 #, c-format
 msgid "Successfully logged into SSH server %s\n"
 msgstr "Koblet til SSH-server %s\n"
@@ -1380,8 +1395,7 @@
 msgid "The maximum number of bytes to seed the SSL engine with"
 msgstr ""
 
-#: ../lib/sslcommon.c:41
-#: ../lib/sslcommon.c:43
+#: ../lib/sslcommon.c:41 ../lib/sslcommon.c:43
 msgid "Verify SSL Peer"
 msgstr ""
 
@@ -1399,136 +1413,141 @@
 msgid "Cannot get peer certificate\n"
 msgstr "Kunne ikke opprette tilkobling: %s\n"
 
-#: ../lib/sslcommon.c:188
+#: ../lib/sslcommon.c:199
 #, c-format
-msgid "ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). Aborting connection.\n"
+msgid ""
+"ERROR: The host in the SSL certificate (%s) does not match the host that we "
+"connected to (%s). Aborting connection.\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:295
+#: ../lib/sslcommon.c:305
 msgid "Cannot initialize the OpenSSL library\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:310
+#: ../lib/sslcommon.c:320
 msgid "Error loading default SSL certificates\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:322
+#: ../lib/sslcommon.c:332
 msgid "Error setting cipher list (no valid ciphers)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:342
-#: ../lib/sslcommon.c:416
-#: ../lib/sslcommon.c:464
+#: ../lib/sslcommon.c:352 ../lib/sslcommon.c:426 ../lib/sslcommon.c:474
 msgid "Error: SSL engine was not initialized\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:359
-msgid "Error setting up SSL connection (BIO object)\n"
-msgstr ""
-
 #: ../lib/sslcommon.c:369
+msgid "Error setting up SSL connection (BIO object)\n"
+msgstr ""
+
+#: ../lib/sslcommon.c:379
 msgid "Error setting up SSL connection (SSL object)\n"
 msgstr ""
 
-#: ../lib/sslcommon.c:390
+#: ../lib/sslcommon.c:400
 #, fuzzy, c-format
 msgid "Error with peer certificate: %s\n"
 msgstr "Feil: Kunne ikke skrive til cache: %s\n"
 
-#: ../src/uicommon/gftpui.c:91
+#: ../src/uicommon/gftpui.c:56
+msgid "Operation canceled\n"
+msgstr "Operasjonen ble avbrutt\n"
+
+#: ../src/uicommon/gftpui.c:65
 #, c-format
 msgid "Waiting %d seconds until trying to connect again\n"
 msgstr "Venter %d sekunder og prĂžver igen\n"
 
-#: ../src/uicommon/gftpui.c:101
-msgid "Operation canceled\n"
-msgstr "Operasjonen ble avbrutt\n"
-
-#: ../src/uicommon/gftpui.c:190
-msgid ">. If you have any questions, comments, or suggestions about this program, please feel free to email them to me. You can always find out the latest news about gFTP from my website at http://www.gftp.org/\n"
-msgstr ">. Hvis du har spÞrsmÄl, kommentarer eller forslag til dette programmet mÄ du gjerne sende dem til meg pÄ mail. Du kan alltid finne de siste nyhetene om gFTP pÄ min webside: http://www.gftp.org\n"
-
-#: ../src/uicommon/gftpui.c:191
-msgid "gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. This is free software, and you are welcome to redistribute it under certain conditions; for details, see the COPYING file\n"
-msgstr "gFTP levereres HELT UTEN NOEN GARANTI; for detaljer les COPYING-filen. Dette er gratis programvare, og du stÄr fritt til Ä distribuere den videre med visse forbehold; for detaljer se COPYING-filen.\n"
-
-#: ../src/uicommon/gftpui.c:193
-#: ../src/gtk/menu-items.c:505
+#: ../src/uicommon/gftpui.c:157
+msgid ""
+">. If you have any questions, comments, or suggestions about this program, "
+"please feel free to email them to me. You can always find out the latest "
+"news about gFTP from my website at http://www.gftp.org/\n"
+msgstr ""
+">. Hvis du har spÞrsmÄl, kommentarer eller forslag til dette programmet mÄ "
+"du gjerne sende dem til meg pÄ mail. Du kan alltid finne de siste nyhetene "
+"om gFTP pÄ min webside: http://www.gftp.org\n"
+
+#: ../src/uicommon/gftpui.c:158
+msgid ""
+"gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. "
+"This is free software, and you are welcome to redistribute it under certain "
+"conditions; for details, see the COPYING file\n"
+msgstr ""
+"gFTP levereres HELT UTEN NOEN GARANTI; for detaljer les COPYING-filen. Dette "
+"er gratis programvare, og du stÄr fritt til Ä distribuere den videre med "
+"visse forbehold; for detaljer se COPYING-filen.\n"
+
+#: ../src/uicommon/gftpui.c:160 ../src/gtk/menu-items.c:491
 msgid "Translated by"
 msgstr ""
 "Oversatt av\n"
 "Anders Henriksen <[e-mail]>\n"
 "Kjartan Maraas <[e-mail]>"
 
-#: ../src/uicommon/gftpui.c:240
-#: ../src/uicommon/gftpui.c:282
-#: ../src/uicommon/gftpui.c:322
-#: ../src/uicommon/gftpui.c:357
-#: ../src/uicommon/gftpui.c:392
-#: ../src/uicommon/gftpui.c:427
-#: ../src/uicommon/gftpui.c:463
-#: ../src/uicommon/gftpui.c:528
-#: ../src/uicommon/gftpui.c:609
-#: ../src/uicommon/gftpui.c:872
+#: ../src/uicommon/gftpui.c:207 ../src/uicommon/gftpui.c:249
+#: ../src/uicommon/gftpui.c:289 ../src/uicommon/gftpui.c:324
+#: ../src/uicommon/gftpui.c:359 ../src/uicommon/gftpui.c:395
+#: ../src/uicommon/gftpui.c:431 ../src/uicommon/gftpui.c:496
+#: ../src/uicommon/gftpui.c:577 ../src/uicommon/gftpui.c:845
 msgid "Error: Not connected to a remote site\n"
 msgstr "Feil: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/uicommon/gftpui.c:251
+#: ../src/uicommon/gftpui.c:218
 msgid "usage: chmod <mode> <file>\n"
 msgstr "bruk: chmod <modus> <fil>\n"
 
-#: ../src/uicommon/gftpui.c:292
+#: ../src/uicommon/gftpui.c:259
 msgid "usage: rename <old name> <new name>\n"
 msgstr "bruk: rename <gammelt navn> <nytt navn>\n"
 
-#: ../src/uicommon/gftpui.c:328
+#: ../src/uicommon/gftpui.c:295
 msgid "usage: delete <file>\n"
 msgstr "bruk: delete <fil>\n"
 
-#: ../src/uicommon/gftpui.c:363
+#: ../src/uicommon/gftpui.c:330
 msgid "usage: rmdir <directory>\n"
 msgstr "bruk: rmdir <mappe>\n"
 
-#: ../src/uicommon/gftpui.c:398
+#: ../src/uicommon/gftpui.c:365
 msgid "usage: site <site command>\n"
 msgstr "bruk: site <kommando>\n"
 
-#: ../src/uicommon/gftpui.c:433
+#: ../src/uicommon/gftpui.c:401
 msgid "usage: mkdir <new directory>\n"
 msgstr "bruk: mkdir <ny mappe>\n"
 
-#: ../src/uicommon/gftpui.c:469
-#: ../src/uicommon/gftpui.c:487
+#: ../src/uicommon/gftpui.c:437 ../src/uicommon/gftpui.c:455
 msgid "usage: chdir <directory>\n"
 msgstr "bruk: chdir <mappe>\n"
 
-#: ../src/uicommon/gftpui.c:560
+#: ../src/uicommon/gftpui.c:528
 msgid "Invalid argument\n"
 msgstr "Ugyldig argument\n"
 
-#: ../src/uicommon/gftpui.c:573
+#: ../src/uicommon/gftpui.c:541
 msgid "Clear the directory cache\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:662
+#: ../src/uicommon/gftpui.c:630
 msgid "usage: open "
 msgstr "bruk: open "
 
-#: ../src/uicommon/gftpui.c:733
+#: ../src/uicommon/gftpui.c:706
 msgid "usage: set [variable = value]\n"
 msgstr "bruk: set[variabel = verdi]\n"
 
-#: ../src/uicommon/gftpui.c:747
+#: ../src/uicommon/gftpui.c:720
 #, c-format
 msgid "Error: Variable %s is not a valid configuration variable.\n"
 msgstr "Feil: Variabelen %s er ikke en gyldig konfigurasjonsvariabel.\n"
 
-#: ../src/uicommon/gftpui.c:754
+#: ../src/uicommon/gftpui.c:727
 #, c-format
 msgid "Error: Variable %s is not available in the text port of gFTP\n"
 msgstr "Feil: Variabelen %s er ikke tilgjengelig i tekstutgaven av gFTP\n"
 
-#: ../src/uicommon/gftpui.c:836
+#: ../src/uicommon/gftpui.c:809
 msgid ""
 "Supported commands:\n"
 "\n"
@@ -1536,301 +1555,301 @@
 "Tilgjengelige kommandoer:\n"
 "\n"
 
-#: ../src/uicommon/gftpui.c:879
+#: ../src/uicommon/gftpui.c:852
 #, c-format
 msgid "usage: %s <filespec>\n"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:964
+#: ../src/uicommon/gftpui.c:937
 msgid "about"
 msgstr "om"
 
-#: ../src/uicommon/gftpui.c:965
+#: ../src/uicommon/gftpui.c:938
 msgid "Shows gFTP information"
 msgstr "Viser informasjon om gFTP"
 
-#: ../src/uicommon/gftpui.c:966
+#: ../src/uicommon/gftpui.c:939
 msgid "ascii"
 msgstr "ascii"
 
-#: ../src/uicommon/gftpui.c:967
+#: ../src/uicommon/gftpui.c:940
 msgid "Sets the current file transfer mode to Ascii (only for FTP)"
 msgstr "Setter nÄvÊrende filoverfÞringsmodus til tekst/ASCII (bare for FTP)"
 
-#: ../src/uicommon/gftpui.c:968
+#: ../src/uicommon/gftpui.c:941
 msgid "binary"
 msgstr "binary"
 
-#: ../src/uicommon/gftpui.c:969
+#: ../src/uicommon/gftpui.c:942
 msgid "Sets the current file transfer mode to Binary (only for FTP)"
 msgstr "Setter nÄvÊrende filoverfÞringsmodus til binÊr (bare for FTP)"
 
-#: ../src/uicommon/gftpui.c:970
+#: ../src/uicommon/gftpui.c:943
 msgid "cd"
 msgstr "cd"
 
-#: ../src/uicommon/gftpui.c:971
-#: ../src/uicommon/gftpui.c:973
+#: ../src/uicommon/gftpui.c:944 ../src/uicommon/gftpui.c:946
 msgid "Changes the remote working directory"
 msgstr "Endrer aktiv mappe pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:972
+#: ../src/uicommon/gftpui.c:945
 msgid "chdir"
 msgstr "chdir"
 
-#: ../src/uicommon/gftpui.c:974
+#: ../src/uicommon/gftpui.c:947
 msgid "chmod"
 msgstr "chmod"
 
-#: ../src/uicommon/gftpui.c:975
+#: ../src/uicommon/gftpui.c:948
 #, fuzzy
 msgid "Changes the permissions of a remote file"
 msgstr "Ta vare pÄ rettighetene pÄ overfÞrte filer"
 
-#: ../src/uicommon/gftpui.c:976
+#: ../src/uicommon/gftpui.c:949
 #, fuzzy
 msgid "clear"
 msgstr "tĂžm"
 
-#: ../src/uicommon/gftpui.c:977
+#: ../src/uicommon/gftpui.c:950
 msgid "Available options: cache"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:978
+#: ../src/uicommon/gftpui.c:951
 msgid "close"
 msgstr "lukk"
 
-#: ../src/uicommon/gftpui.c:979
+#: ../src/uicommon/gftpui.c:952
 msgid "Disconnects from the remote site"
 msgstr "Kobler fra tjeneren"
 
-#: ../src/uicommon/gftpui.c:980
+#: ../src/uicommon/gftpui.c:953
 msgid "delete"
 msgstr "slett"
 
-#: ../src/uicommon/gftpui.c:981
+#: ../src/uicommon/gftpui.c:954
 msgid "Removes a remote file"
 msgstr "Fjerner en fil pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:982
+#: ../src/uicommon/gftpui.c:955
 #, fuzzy
 msgid "dir"
 msgstr "dir"
 
-#: ../src/uicommon/gftpui.c:983
-#: ../src/uicommon/gftpui.c:1009
+#: ../src/uicommon/gftpui.c:956 ../src/uicommon/gftpui.c:982
 msgid "Shows the directory listing for the current remote directory"
 msgstr "Viser innholdsliste for valgt mappe pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:984
+#: ../src/uicommon/gftpui.c:957
 msgid "get"
 msgstr "get"
 
-#: ../src/uicommon/gftpui.c:985
-#: ../src/uicommon/gftpui.c:1011
+#: ../src/uicommon/gftpui.c:958 ../src/uicommon/gftpui.c:984
 msgid "Downloads remote file(s)"
 msgstr "Laster ned fil(er) fra tjeneren"
 
-#: ../src/uicommon/gftpui.c:986
+#: ../src/uicommon/gftpui.c:959
 #, fuzzy
 msgid "help"
 msgstr "help"
 
-#: ../src/uicommon/gftpui.c:987
+#: ../src/uicommon/gftpui.c:960
 msgid "Shows this help screen"
 msgstr "Viser denne hjelpeskjermen"
 
-#: ../src/uicommon/gftpui.c:988
+#: ../src/uicommon/gftpui.c:961
 msgid "lcd"
 msgstr "lcd"
 
-#: ../src/uicommon/gftpui.c:989
-#: ../src/uicommon/gftpui.c:991
+#: ../src/uicommon/gftpui.c:962 ../src/uicommon/gftpui.c:964
 msgid "Changes the local working directory"
 msgstr "Bytter aktiv lokal mappe"
 
-#: ../src/uicommon/gftpui.c:990
+#: ../src/uicommon/gftpui.c:963
 msgid "lchdir"
 msgstr "lchdir"
 
-#: ../src/uicommon/gftpui.c:992
+#: ../src/uicommon/gftpui.c:965
 msgid "lchmod"
 msgstr "lchmod"
 
-#: ../src/uicommon/gftpui.c:993
+#: ../src/uicommon/gftpui.c:966
 #, fuzzy
 msgid "Changes the permissions of a local file"
 msgstr "Ta vare pÄ rettighetene pÄ overfÞrte filer"
 
-#: ../src/uicommon/gftpui.c:994
+#: ../src/uicommon/gftpui.c:967
 msgid "ldelete"
 msgstr "ldelete"
 
-#: ../src/uicommon/gftpui.c:995
+#: ../src/uicommon/gftpui.c:968
 msgid "Removes a local file"
 msgstr "Fjerner en lokal fil"
 
-#: ../src/uicommon/gftpui.c:996
+#: ../src/uicommon/gftpui.c:969
 msgid "ldir"
 msgstr "ldir"
 
-#: ../src/uicommon/gftpui.c:997
-#: ../src/uicommon/gftpui.c:999
+#: ../src/uicommon/gftpui.c:970 ../src/uicommon/gftpui.c:972
 msgid "Shows the directory listing for the current local directory"
 msgstr "Viser innholdslisten for valgt lokal mappe"
 
-#: ../src/uicommon/gftpui.c:998
+#: ../src/uicommon/gftpui.c:971
 msgid "lls"
 msgstr "lls"
 
-#: ../src/uicommon/gftpui.c:1000
+#: ../src/uicommon/gftpui.c:973
 msgid "lmkdir"
 msgstr "lmkdir"
 
-#: ../src/uicommon/gftpui.c:1001
+#: ../src/uicommon/gftpui.c:974
 msgid "Creates a local directory"
 msgstr "Oppretter en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:1002
+#: ../src/uicommon/gftpui.c:975
 msgid "lpwd"
 msgstr "lpwd"
 
-#: ../src/uicommon/gftpui.c:1003
+#: ../src/uicommon/gftpui.c:976
 msgid "Show current local directory"
 msgstr "Vis valgt lokal mappe"
 
-#: ../src/uicommon/gftpui.c:1004
+#: ../src/uicommon/gftpui.c:977
 msgid "lrename"
 msgstr "lrename"
 
-#: ../src/uicommon/gftpui.c:1005
+#: ../src/uicommon/gftpui.c:978
 msgid "Rename a local file"
 msgstr "Gi nytt navn til lokal fil"
 
-#: ../src/uicommon/gftpui.c:1006
+#: ../src/uicommon/gftpui.c:979
 msgid "lrmdir"
 msgstr "lrmdir"
 
-#: ../src/uicommon/gftpui.c:1007
+#: ../src/uicommon/gftpui.c:980
 msgid "Remove a local directory"
 msgstr "Fjerner en lokal mappe"
 
-#: ../src/uicommon/gftpui.c:1008
+#: ../src/uicommon/gftpui.c:981
 msgid "ls"
 msgstr "ls"
 
-#: ../src/uicommon/gftpui.c:1010
+#: ../src/uicommon/gftpui.c:983
 msgid "mget"
 msgstr "mget"
 
-#: ../src/uicommon/gftpui.c:1012
+#: ../src/uicommon/gftpui.c:985
 msgid "mkdir"
 msgstr "mkdir"
 
-#: ../src/uicommon/gftpui.c:1013
+#: ../src/uicommon/gftpui.c:986
 msgid "Creates a remote directory"
 msgstr "Oppretter ny mappe pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:1014
+#: ../src/uicommon/gftpui.c:987
 msgid "mput"
 msgstr "mput"
 
-#: ../src/uicommon/gftpui.c:1015
-#: ../src/uicommon/gftpui.c:1019
+#: ../src/uicommon/gftpui.c:988 ../src/uicommon/gftpui.c:992
 msgid "Uploads local file(s)"
 msgstr "Laster opp lokal(e) fil(er)"
 
-#: ../src/uicommon/gftpui.c:1016
+#: ../src/uicommon/gftpui.c:989
 msgid "open"
 msgstr "Ă„pne"
 
-#: ../src/uicommon/gftpui.c:1017
+#: ../src/uicommon/gftpui.c:990
 msgid "Opens a connection to a remote site"
 msgstr "Kobler til en tjener"
 
-#: ../src/uicommon/gftpui.c:1018
+#: ../src/uicommon/gftpui.c:991
 msgid "put"
 msgstr "put"
 
-#: ../src/uicommon/gftpui.c:1020
+#: ../src/uicommon/gftpui.c:993
 msgid "pwd"
 msgstr "pwd"
 
-#: ../src/uicommon/gftpui.c:1021
+#: ../src/uicommon/gftpui.c:994
 msgid "Show current remote directory"
 msgstr "Vis valgt mappe pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:1022
+#: ../src/uicommon/gftpui.c:995
 msgid "quit"
 msgstr "avslutt"
 
-#: ../src/uicommon/gftpui.c:1023
+#: ../src/uicommon/gftpui.c:996
 msgid "Exit from gFTP"
 msgstr "Avslutt gFTP"
 
-#: ../src/uicommon/gftpui.c:1024
+#: ../src/uicommon/gftpui.c:997
 msgid "rename"
 msgstr "Bytt navn"
 
-#: ../src/uicommon/gftpui.c:1025
+#: ../src/uicommon/gftpui.c:998
 msgid "Rename a remote file"
 msgstr "Gi nytt navn til fil pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:1026
+#: ../src/uicommon/gftpui.c:999
 msgid "rmdir"
 msgstr "rmdir"
 
-#: ../src/uicommon/gftpui.c:1027
+#: ../src/uicommon/gftpui.c:1000
 msgid "Remove a remote directory"
 msgstr "Fjern en mappe pÄ tjeneren"
 
-#: ../src/uicommon/gftpui.c:1028
+#: ../src/uicommon/gftpui.c:1001
 msgid "set"
 msgstr "set"
 
-#: ../src/uicommon/gftpui.c:1029
-msgid "Show configuration file variables. You can also set variables by set var=val"
+#: ../src/uicommon/gftpui.c:1002
+msgid ""
+"Show configuration file variables. You can also set variables by set var=val"
 msgstr ""
 
-#: ../src/uicommon/gftpui.c:1031
+#: ../src/uicommon/gftpui.c:1004
 #, fuzzy
 msgid "site"
 msgstr "stĂžrrelse"
 
-#: ../src/uicommon/gftpui.c:1032
+#: ../src/uicommon/gftpui.c:1005
 #, fuzzy
 msgid "Run a site specific command"
 msgstr "Skriv inn vertsmaskinspesifikk kommando"
 
-#: ../src/uicommon/gftpui.c:1122
+#: ../src/uicommon/gftpui.c:1094
 msgid "Error: Command not recognized\n"
 msgstr "Feil: Ukjent kommando\n"
 
-#: ../src/uicommon/gftpui.c:1375
-msgid "Error: Remote site disconnected after trying to transfer file\n"
-msgstr "Feil: Vertsmaskinen koblet fra etter fÞrsÞk pÄ filoverfÞring\n"
-
-#: ../src/uicommon/gftpui.c:1443
+#: ../src/uicommon/gftpui.c:1304
+#, fuzzy, c-format
+msgid "Successfully transferred %s at %.2f KB/s\n"
+msgstr "OverfĂžrte %s ved %.2f KB/s\n"
+
+#: ../src/uicommon/gftpui.c:1335
+#, c-format
+msgid "Skipping file %s on host %s\n"
+msgstr "Hopper over %s pÄ vertsmaskin %s\n"
+
+#: ../src/uicommon/gftpui.c:1359
+#, c-format
+msgid "Stopping the transfer on host %s\n"
+msgstr "Stopper overfĂžringen til/fra vertsmaskin %s\n"
+
+#: ../src/uicommon/gftpui.c:1505
 #, c-format
 msgid "Could not download %s from %s\n"
 msgstr "Kunne ikke laste ned %s fra %s\n"
 
-#: ../src/uicommon/gftpui.c:1467
-#, fuzzy, c-format
-msgid "Successfully transferred %s at %.2f KB/s\n"
-msgstr "OverfĂžrte %s ved %.2f KB/s\n"
-
-#: ../src/uicommon/gftpui.c:1474
-#, fuzzy, c-format
-msgid "There was an error transfering the file %s"
-msgstr "Du har ikke valgt noen overfĂžringer\n"
-
-#: ../src/gtk/bookmarks.c:40
-#: ../src/gtk/dnd.c:122
-#: ../src/gtk/gftp-gtk.c:213
-#: ../src/gtk/gftp-gtk.c:1063
-#: ../src/gtk/misc-gtk.c:512
-#: ../src/gtk/misc-gtk.c:520
+#: ../src/uicommon/gftpui.c:1561
+#, c-format
+msgid ""
+"There were %d files or directories that could not be transferred. Check the "
+"log for which items were not properly transferred."
+msgstr ""
+
+#: ../src/gtk/bookmarks.c:40 ../src/gtk/dnd.c:122 ../src/gtk/gftp-gtk.c:234
+#: ../src/gtk/gftp-gtk.c:1103 ../src/gtk/misc-gtk.c:505
+#: ../src/gtk/misc-gtk.c:513
 #, c-format
 msgid "%s: Please hit the stop button first to do anything else\n"
 msgstr "%s: Trykk pÄ stoppknappen fÞr du gjÞr noe annet\n"
@@ -1846,10 +1865,10 @@
 #: ../src/gtk/bookmarks.c:78
 #, c-format
 msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n"
-msgstr "Legge til bokmerke: Kan ikke legge til %s fordi bokmerket allerede finnes\n"
-
-#: ../src/gtk/bookmarks.c:135
-#: ../src/gtk/bookmarks.c:146
+msgstr ""
+"Legge til bokmerke: Kan ikke legge til %s fordi bokmerket allerede finnes\n"
+
+#: ../src/gtk/bookmarks.c:135 ../src/gtk/bookmarks.c:146
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
@@ -1871,135 +1890,137 @@
 msgid "Remember password"
 msgstr "Husk passord"
 
-#: ../src/gtk/bookmarks.c:473
-#: ../src/gtk/bookmarks.c:483
+#: ../src/gtk/bookmarks.c:420
+#, fuzzy
+msgid "You must specify a name for the bookmark."
+msgstr "Legg til bokmerke: Du mÄ skrive inn et navn pÄ bokmerket\n"
+
+#: ../src/gtk/bookmarks.c:472
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../src/gtk/bookmarks.c:474
+#: ../src/gtk/bookmarks.c:473
 msgid "Enter the name of the new folder to create"
 msgstr "Skriv inn navnet pÄ den nye mappa"
 
-#: ../src/gtk/bookmarks.c:484
+#: ../src/gtk/bookmarks.c:482
+#, fuzzy
+msgid "New Item"
+msgstr "/Fil/Ny oppfĂžring"
+
+#: ../src/gtk/bookmarks.c:483
 msgid "Enter the name of the new item to create"
 msgstr "Skriv inn navnet pÄ den nye oppfÞringen"
 
-#: ../src/gtk/bookmarks.c:557
-#, c-format
+#: ../src/gtk/bookmarks.c:556
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to erase the bookmark\n"
-"%s and all it's children?"
+"%s and all its children?"
 msgstr ""
 "Er du sikker pÄ at du vil fjerne bokmerket\n"
 "%s og dets innhold?"
 
-#: ../src/gtk/bookmarks.c:558
+#: ../src/gtk/bookmarks.c:557
 msgid "Delete Bookmark"
 msgstr "Slett bokmerke"
 
-#: ../src/gtk/bookmarks.c:630
+#: ../src/gtk/bookmarks.c:629
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../src/gtk/bookmarks.c:850
-#: ../src/gtk/bookmarks.c:853
+#: ../src/gtk/bookmarks.c:849 ../src/gtk/bookmarks.c:852
 msgid "Edit Entry"
 msgstr "Rediger post"
 
-#: ../src/gtk/bookmarks.c:891
+#: ../src/gtk/bookmarks.c:888
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../src/gtk/bookmarks.c:906
+#: ../src/gtk/bookmarks.c:903
 msgid "Hostname:"
 msgstr "Vertsmaskinnavn:"
 
-#: ../src/gtk/bookmarks.c:919
+#: ../src/gtk/bookmarks.c:916
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/gtk/bookmarks.c:936
+#: ../src/gtk/bookmarks.c:933
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtk/bookmarks.c:960
+#: ../src/gtk/bookmarks.c:957
 msgid "Remote Directory:"
 msgstr "Fjernmappe:"
 
-#: ../src/gtk/bookmarks.c:973
+#: ../src/gtk/bookmarks.c:970
 msgid "Local Directory:"
 msgstr "Lokalmappe:"
 
-#: ../src/gtk/bookmarks.c:990
+#: ../src/gtk/bookmarks.c:987
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../src/gtk/bookmarks.c:1003
-#: ../src/text/textui.c:86
+#: ../src/gtk/bookmarks.c:1000 ../src/text/textui.c:92
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtk/bookmarks.c:1017
+#: ../src/gtk/bookmarks.c:1014
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtk/bookmarks.c:1031
+#: ../src/gtk/bookmarks.c:1028
 msgid "Log in as ANONYMOUS"
 msgstr "Logg inn som ANONYMOUS"
 
-#: ../src/gtk/bookmarks.c:1056
-#: ../src/gtk/bookmarks.c:1309
-#: ../src/gtk/chmod_dialog.c:265
-#: ../src/gtk/gtkui_transfer.c:380
-#: ../src/gtk/options_dialog.c:1219
-#: ../src/gtk/options_dialog.c:1453
+#: ../src/gtk/bookmarks.c:1053 ../src/gtk/bookmarks.c:1303
+#: ../src/gtk/chmod_dialog.c:265 ../src/gtk/gtkui_transfer.c:388
+#: ../src/gtk/options_dialog.c:1216 ../src/gtk/options_dialog.c:1448
 msgid "  Cancel  "
 msgstr "  Avbryt  "
 
-#: ../src/gtk/bookmarks.c:1065
-#: ../src/gtk/options_dialog.c:1464
-msgid "Apply"
-msgstr "UtfĂžr"
-
-#: ../src/gtk/bookmarks.c:1215
+#: ../src/gtk/bookmarks.c:1204
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../src/gtk/bookmarks.c:1216
+#: ../src/gtk/bookmarks.c:1205
 msgid "/File/tearoff"
 msgstr "/Fil/tearoff"
 
-#: ../src/gtk/bookmarks.c:1217
-msgid "/File/New Folder..."
+#: ../src/gtk/bookmarks.c:1206
+#, fuzzy
+msgid "/File/New _Folder..."
 msgstr "/Fil/Ny mappe..."
 
-#: ../src/gtk/bookmarks.c:1218
-msgid "/File/New Item..."
+#: ../src/gtk/bookmarks.c:1207
+#, fuzzy
+msgid "/File/New _Item..."
 msgstr "/Fil/Ny oppfĂžring"
 
-#: ../src/gtk/bookmarks.c:1219
-msgid "/File/Delete"
+#: ../src/gtk/bookmarks.c:1208
+#, fuzzy
+msgid "/File/_Delete"
 msgstr "/Fil/Slett"
 
-#: ../src/gtk/bookmarks.c:1220
-msgid "/File/Properties..."
+#: ../src/gtk/bookmarks.c:1209
+#, fuzzy
+msgid "/File/_Properties..."
 msgstr "/Fil/Egenskaper"
 
-#: ../src/gtk/bookmarks.c:1221
+#: ../src/gtk/bookmarks.c:1210
 msgid "/File/sep"
 msgstr "/Fil/sep"
 
-#: ../src/gtk/bookmarks.c:1222
-msgid "/File/Close"
+#: ../src/gtk/bookmarks.c:1211
+#, fuzzy
+msgid "/File/_Close"
 msgstr "/Fil/Lukk"
 
-#: ../src/gtk/bookmarks.c:1240
-#: ../src/gtk/bookmarks.c:1243
+#: ../src/gtk/bookmarks.c:1229 ../src/gtk/bookmarks.c:1232
 msgid "Edit Bookmarks"
 msgstr "Rediger bokmerker"
 
-#: ../src/gtk/chmod_dialog.c:132
-#: ../src/gtk/chmod_dialog.c:137
+#: ../src/gtk/chmod_dialog.c:132 ../src/gtk/chmod_dialog.c:137
 #: ../src/gtk/chmod_dialog.c:142
 msgid "Chmod"
 msgstr "Chmod"
@@ -2028,31 +2049,26 @@
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../src/gtk/chmod_dialog.c:192
-#: ../src/gtk/gftp-gtk.c:748
+#: ../src/gtk/chmod_dialog.c:192 ../src/gtk/gftp-gtk.c:789
 msgid "User"
 msgstr "Bruker"
 
-#: ../src/gtk/chmod_dialog.c:200
-#: ../src/gtk/chmod_dialog.c:220
+#: ../src/gtk/chmod_dialog.c:200 ../src/gtk/chmod_dialog.c:220
 #: ../src/gtk/chmod_dialog.c:240
 msgid "Read"
 msgstr "Les"
 
-#: ../src/gtk/chmod_dialog.c:204
-#: ../src/gtk/chmod_dialog.c:224
+#: ../src/gtk/chmod_dialog.c:204 ../src/gtk/chmod_dialog.c:224
 #: ../src/gtk/chmod_dialog.c:244
 msgid "Write"
 msgstr "Skriv"
 
-#: ../src/gtk/chmod_dialog.c:208
-#: ../src/gtk/chmod_dialog.c:228
+#: ../src/gtk/chmod_dialog.c:208 ../src/gtk/chmod_dialog.c:228
 #: ../src/gtk/chmod_dialog.c:248
 msgid "Execute"
 msgstr "KjĂžr"
 
-#: ../src/gtk/chmod_dialog.c:212
-#: ../src/gtk/gftp-gtk.c:749
+#: ../src/gtk/chmod_dialog.c:212 ../src/gtk/gftp-gtk.c:790
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2079,34 +2095,29 @@
 msgid "Delete Files/Directories"
 msgstr "Slett filer/mapper"
 
-#: ../src/gtk/delete_dialog.c:90
-#: ../src/gtk/options_dialog.c:1305
+#: ../src/gtk/delete_dialog.c:90 ../src/gtk/options_dialog.c:1302
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/gtk/dnd.c:123
-#: ../src/gtk/gftp-gtk.c:1064
-#: ../src/gtk/misc-gtk.c:946
-#: ../src/gtk/misc-gtk.c:1020
+#: ../src/gtk/dnd.c:123 ../src/gtk/gftp-gtk.c:1104 ../src/gtk/misc-gtk.c:929
+#: ../src/gtk/misc-gtk.c:1004
 msgid "Connect"
 msgstr "Koble til"
 
-#: ../src/gtk/dnd.c:136
-#: ../src/gtk/dnd.c:269
+#: ../src/gtk/dnd.c:136 ../src/gtk/dnd.c:269
 #, c-format
 msgid "Received URL %s\n"
 msgstr "Mottok URL %s\n"
 
-#: ../src/gtk/dnd.c:159
-#: ../src/gtk/dnd.c:247
+#: ../src/gtk/dnd.c:159 ../src/gtk/dnd.c:247
 msgid "Drag-N-Drop"
 msgstr "Dra og slipp"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: ../src/gtk/gftp-gtk.c:144
 msgid "Exit"
 msgstr "Avslutt"
 
-#: ../src/gtk/gftp-gtk.c:127
+#: ../src/gtk/gftp-gtk.c:144
 msgid ""
 "There are file transfers in progress.\n"
 "Are you sure you want to exit?"
@@ -2114,491 +2125,522 @@
 "FiloverfÞring(er) pÄgÄr.\n"
 "Er du sikker pÄ at du vil avslutte?"
 
-#: ../src/gtk/gftp-gtk.c:198
-msgid "Connect via URL"
-msgstr "Koble til med URL"
-
-#: ../src/gtk/gftp-gtk.c:198
+#: ../src/gtk/gftp-gtk.c:219 ../src/gtk/gftp-gtk.c:235
+#, fuzzy
+msgid "Open Location"
+msgstr "Alternativer"
+
+#: ../src/gtk/gftp-gtk.c:219
 msgid "Enter a URL to connect to"
 msgstr "Oppgi en URL Ă„ koble til"
 
-#: ../src/gtk/gftp-gtk.c:214
-msgid "OpenURL"
-msgstr "Åpne URL"
-
-#: ../src/gtk/gftp-gtk.c:244
+#: ../src/gtk/gftp-gtk.c:265
 msgid "/_FTP"
 msgstr "/_FTP"
 
-#: ../src/gtk/gftp-gtk.c:245
+#: ../src/gtk/gftp-gtk.c:266
 msgid "/FTP/tearoff"
 msgstr "/FTP/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:246
-msgid "/FTP/Window 1"
+#: ../src/gtk/gftp-gtk.c:267
+#, fuzzy
+msgid "/FTP/Window _1"
 msgstr "/FTP/Vindu 1"
 
-#: ../src/gtk/gftp-gtk.c:248
-msgid "/FTP/Window 2"
+#: ../src/gtk/gftp-gtk.c:269
+#, fuzzy
+msgid "/FTP/Window _2"
 msgstr "/FTP/Vindu 2"
 
-#: ../src/gtk/gftp-gtk.c:250
-#: ../src/gtk/gftp-gtk.c:255
-#: ../src/gtk/gftp-gtk.c:258
+#: ../src/gtk/gftp-gtk.c:271 ../src/gtk/gftp-gtk.c:276
+#: ../src/gtk/gftp-gtk.c:279
 msgid "/FTP/sep"
 msgstr "/FTP/sep"
 
-#: ../src/gtk/gftp-gtk.c:251
-msgid "/FTP/Ascii"
+#: ../src/gtk/gftp-gtk.c:272
+#, fuzzy
+msgid "/FTP/_Ascii"
 msgstr "/FTP/Ascii-overfĂžring"
 
-#: ../src/gtk/gftp-gtk.c:253
-msgid "/FTP/Binary"
+#: ../src/gtk/gftp-gtk.c:274
+#, fuzzy
+msgid "/FTP/_Binary"
 msgstr "/FTP/BinĂŠr overfĂžring"
 
-#: ../src/gtk/gftp-gtk.c:256
-msgid "/FTP/_Options..."
-msgstr "/FTP/_Tilpass..."
-
-#: ../src/gtk/gftp-gtk.c:259
+#: ../src/gtk/gftp-gtk.c:277
+#, fuzzy
+msgid "/FTP/_Preferences..."
+msgstr "/Fil/Egenskaper"
+
+#: ../src/gtk/gftp-gtk.c:280
 msgid "/FTP/_Quit"
 msgstr "/FTP/_Avslutt"
 
-#: ../src/gtk/gftp-gtk.c:260
+#: ../src/gtk/gftp-gtk.c:281
 msgid "/_Local"
 msgstr "/_Lokalt"
 
-#: ../src/gtk/gftp-gtk.c:261
+#: ../src/gtk/gftp-gtk.c:282
 msgid "/Local/tearoff"
 msgstr "/Lokalt/tearoff"
 
-#: ../src/gtk/gftp-gtk.c:262
-msgid "/Local/Open URL..."
+#: ../src/gtk/gftp-gtk.c:283
+#, fuzzy
+msgid "/Local/_Open Location..."
 msgstr "/Lokalt/Åpne URL..."
 
-#: ../src/gtk/gftp-gtk.c:263
-msgid "/Local/Disconnect"
+#: ../src/gtk/gftp-gtk.c:285
+#, fuzzy
+msgid "/Local/D_isconnect"
 msgstr "/Lokalt/Koble fra"
 
-#: ../src/gtk/gftp-gtk.c:264
-#: ../src/gtk/gftp-gtk.c:270
+#: ../src/gtk/gftp-gtk.c:286 ../src/gtk/gftp-gtk.c:293
 msgid "/Local/sep"
 msgstr "/Lokalt/sep"
 
-#: ../src/gtk/gftp-gtk.c:265
-msgid "/Local/Change Filespec..."
+#: ../src/gtk/gftp-gtk.c:287
+#, fuzzy
+msgid "/Local/Change _Filespec..."
 msgstr "/Lokalt/Bytt filfilter..."
 
-#: ../src/gtk/gftp-gtk.c:266
-msgid "/Local/Show selected"
+#: ../src/gtk/gftp-gtk.c:289
+#, fuzzy
+msgid "/Local/_Show selected"
 msgstr "/Lokalt/Vis valgte"
 
-#: ../src/gtk/gftp-gtk.c:267
-msgid "/Local/Select All"
+#: ../src/gtk/gftp-gtk.c:290
+#, fuzzy
+msgid "/Local/Select _All"
 msgstr "/Lokalt/Velg alle"
 
-#: ../src/gtk/gftp-gtk.c:268
+#: ../src/gtk/gftp-gtk.c:291
 msgid "/Local/Select All Files"
 msgstr "/Lokalt/Velg alle filer"
 
-#: ../src/gtk/gftp-gtk.c:269
+#: ../src/gtk/gftp-gtk.c:292
 msgid "/Local/Deselect All"
 msgstr "/Lokalt/Velg bort alt"
 
-#: ../src/gtk/gftp-gtk.c:271
+#: ../src/gtk/gftp-gtk.c:294
 msgid "/Local/Save Directory Listing..."
 msgstr "/Lokalt/Lagre mappeliste..."
 
-#: ../src/gtk/gftp-gtk.c:272
+#: ../src/gtk/gftp-gtk.c:295
 msgid "/Local/Send SITE Command..."
 msgstr "/Lokalt/Send SITE-kommando"
 
-#: ../src/gtk/gftp-gtk.c:273
-msgid "/Local/Change Directory"
+#: ../src/gtk/gftp-gtk.c:296
+#, fuzzy
+msgid "/Local/_Change Directory"
 msgstr "/Lokalt/Bytt mappe"
 
-#: ../src/gtk/gftp-gtk.c:274
-msgid "/Local/Chmod..."
-msgstr "/Lokalt/Chmod..."
-
-#: ../src/gtk/gftp-gtk.c:275
-msgid "/Local/Make Directory..."
-msgstr "/Lokalt/Opprett mappe..."
-
-#: ../src/gtk/gftp-gtk.c:276
-msgid "/Local/Rename..."
-msgstr "/Lokalt/Bytt navn..."
-
-#: ../src/gtk/gftp-gtk.c:277
-msgid "/Local/Delete..."
-msgstr "/Lokalt/Slett..."
-
-#: ../src/gtk/gftp-gtk.c:278
-msgid "/Local/Edit..."
-msgstr "/Lokalt/Rediger..."
-
-#: ../src/gtk/gftp-gtk.c:279
-msgid "/Local/View..."
-msgstr "/Lokalt/Vis..."
-
-#: ../src/gtk/gftp-gtk.c:280
-msgid "/Local/Refresh"
-msgstr "/Lokalt/Oppdater"
-
-#: ../src/gtk/gftp-gtk.c:281
-msgid "/_Remote"
-msgstr "/_Eksternt"
-
-#: ../src/gtk/gftp-gtk.c:282
-msgid "/Remote/tearoff"
-msgstr "/Eksternt/tearoff"
-
-#: ../src/gtk/gftp-gtk.c:283
-msgid "/Remote/Open _URL..."
-msgstr "/Eksternt/Åpne _URL..."
-
-#: ../src/gtk/gftp-gtk.c:285
-msgid "/Remote/Disconnect"
-msgstr "/Eksternt/Koble fra"
-
-#: ../src/gtk/gftp-gtk.c:287
-#: ../src/gtk/gftp-gtk.c:293
-msgid "/Remote/sep"
-msgstr "/Eksternt/sep"
-
-#: ../src/gtk/gftp-gtk.c:288
-msgid "/Remote/Change Filespec..."
-msgstr "/Eksternt/Bytt filfilter..."
-
-#: ../src/gtk/gftp-gtk.c:289
-msgid "/Remote/Show selected"
-msgstr "/Eksternt/Vis valgte"
-
-#: ../src/gtk/gftp-gtk.c:290
-msgid "/Remote/Select All"
-msgstr "/Eksternt/Velg alt"
-
-#: ../src/gtk/gftp-gtk.c:291
-msgid "/Remote/Select All Files"
-msgstr "/Eksternt/Velg alle filer"
-
-#: ../src/gtk/gftp-gtk.c:292
-msgid "/Remote/Deselect All"
-msgstr "/Eksternt/Velg bort alle"
-
-#: ../src/gtk/gftp-gtk.c:294
-msgid "/Remote/Save Directory Listing..."
-msgstr "/Eksternt/Lagre mappeliste..."
-
-#: ../src/gtk/gftp-gtk.c:295
-msgid "/Remote/Send SITE Command..."
-msgstr "/Eksternt/Send SITE-kommando..."
-
-#: ../src/gtk/gftp-gtk.c:296
-msgid "/Remote/Change Directory"
-msgstr "/Eksternt/Bytt mappe"
-
 #: ../src/gtk/gftp-gtk.c:297
-msgid "/Remote/Chmod..."
-msgstr "/Eksternt/Chmod..."
-
-#: ../src/gtk/gftp-gtk.c:298
-msgid "/Remote/Make Directory..."
-msgstr "/Eksternt/Opprett mappe..."
+#, fuzzy
+msgid "/Local/_Permissions..."
+msgstr "/Lokalt/Chmod..."
 
 #: ../src/gtk/gftp-gtk.c:299
-msgid "/Remote/Rename..."
-msgstr "/Eksternt/Bytt navn..."
+#, fuzzy
+msgid "/Local/_New Folder..."
+msgstr "/Fil/Ny mappe..."
 
 #: ../src/gtk/gftp-gtk.c:300
-msgid "/Remote/Delete..."
-msgstr "/Eksternt/Ta bort..."
-
-#: ../src/gtk/gftp-gtk.c:301
-msgid "/Remote/Edit..."
-msgstr "/Eksternt/Rediger..."
+#, fuzzy
+msgid "/Local/Rena_me..."
+msgstr "/Lokalt/Bytt navn..."
 
 #: ../src/gtk/gftp-gtk.c:302
-msgid "/Remote/View..."
-msgstr "/Eksternt/Vis..."
-
-#: ../src/gtk/gftp-gtk.c:303
-msgid "/Remote/Refresh"
-msgstr "/Eksternt/Oppdater"
+#, fuzzy
+msgid "/Local/_Delete..."
+msgstr "/Lokalt/Slett..."
 
 #: ../src/gtk/gftp-gtk.c:304
-msgid "/_Bookmarks"
-msgstr "/_Bokmerker"
+#, fuzzy
+msgid "/Local/_Edit..."
+msgstr "/Lokalt/Rediger..."
 
 #: ../src/gtk/gftp-gtk.c:305
-msgid "/Bookmarks/tearoff"
-msgstr "/Bokmerker/tearoff"
+#, fuzzy
+msgid "/Local/_View..."
+msgstr "/Lokalt/Vis..."
 
 #: ../src/gtk/gftp-gtk.c:306
-msgid "/Bookmarks/Add bookmark"
-msgstr "/Bokmerker/Legg til bokmerke"
+#, fuzzy
+msgid "/Local/_Refresh"
+msgstr "/Lokalt/Oppdater"
 
 #: ../src/gtk/gftp-gtk.c:308
-msgid "/Bookmarks/Edit bookmarks"
-msgstr "/Bokmerker/Rediger bokmerker"
+msgid "/_Remote"
+msgstr "/_Eksternt"
 
 #: ../src/gtk/gftp-gtk.c:309
-msgid "/Bookmarks/sep"
-msgstr "/Bokmerker/sep"
+msgid "/Remote/tearoff"
+msgstr "/Eksternt/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:310
-msgid "/_Transfers"
-msgstr "/_OverfĂžringer"
-
-#: ../src/gtk/gftp-gtk.c:311
-msgid "/Transfers/tearoff"
-msgstr "/OverfĂžringer/tearoff"
+#, fuzzy
+msgid "/Remote/_Open Location..."
+msgstr "/Eksternt/Åpne _URL..."
 
 #: ../src/gtk/gftp-gtk.c:312
-msgid "/Transfers/Start Transfer"
-msgstr "/OverfĂžringer/Start overfĂžring"
-
-#: ../src/gtk/gftp-gtk.c:313
-msgid "/Transfers/Stop Transfer"
-msgstr "/OverfĂžringer/Avbryt overfĂžring"
+#, fuzzy
+msgid "/Remote/D_isconnect"
+msgstr "/Eksternt/Koble fra"
+
+#: ../src/gtk/gftp-gtk.c:314 ../src/gtk/gftp-gtk.c:321
+msgid "/Remote/sep"
+msgstr "/Eksternt/sep"
 
 #: ../src/gtk/gftp-gtk.c:315
-#: ../src/gtk/gftp-gtk.c:323
-msgid "/Transfers/sep"
-msgstr "/OverfĂžringer/sep"
-
-#: ../src/gtk/gftp-gtk.c:316
-msgid "/Transfers/Skip Current File"
-msgstr "/OverfĂžringer/Hopp over fil"
+#, fuzzy
+msgid "/Remote/Change _Filespec..."
+msgstr "/Eksternt/Bytt filfilter..."
 
 #: ../src/gtk/gftp-gtk.c:317
-msgid "/Transfers/Remove File"
-msgstr "/OverfĂžringer/Fjern fil"
+#, fuzzy
+msgid "/Remote/_Show selected"
+msgstr "/Eksternt/Vis valgte"
+
+#: ../src/gtk/gftp-gtk.c:318
+#, fuzzy
+msgid "/Remote/Select _All"
+msgstr "/Eksternt/Velg alt"
 
 #: ../src/gtk/gftp-gtk.c:319
-msgid "/Transfers/Move File Up"
-msgstr "/OverfĂžringer/Flytt fil opp"
-
-#: ../src/gtk/gftp-gtk.c:321
-msgid "/Transfers/Move File Down"
-msgstr "/OverfĂžringer/Flytt fil ned"
+msgid "/Remote/Select All Files"
+msgstr "/Eksternt/Velg alle filer"
+
+#: ../src/gtk/gftp-gtk.c:320
+msgid "/Remote/Deselect All"
+msgstr "/Eksternt/Velg bort alle"
+
+#: ../src/gtk/gftp-gtk.c:322
+msgid "/Remote/Save Directory Listing..."
+msgstr "/Eksternt/Lagre mappeliste..."
+
+#: ../src/gtk/gftp-gtk.c:323
+msgid "/Remote/Send SITE Command..."
+msgstr "/Eksternt/Send SITE-kommando..."
 
 #: ../src/gtk/gftp-gtk.c:324
-msgid "/Transfers/Retrieve Files"
-msgstr "/OverfĂžringer/Last ned filer"
+#, fuzzy
+msgid "/Remote/_Change Directory"
+msgstr "/Eksternt/Bytt mappe"
 
 #: ../src/gtk/gftp-gtk.c:325
-msgid "/Transfers/Put Files"
-msgstr "/OverfĂžringer/Send filer"
+#, fuzzy
+msgid "/Remote/_Permisssions..."
+msgstr "/Eksternt/Chmod..."
 
 #: ../src/gtk/gftp-gtk.c:326
-msgid "/L_ogging"
-msgstr "/_Logging"
-
-#: ../src/gtk/gftp-gtk.c:327
-msgid "/Logging/tearoff"
-msgstr "/Logging/tearoff"
+#, fuzzy
+msgid "/Remote/_New Folder..."
+msgstr "/Fil/Ny mappe..."
 
 #: ../src/gtk/gftp-gtk.c:328
-msgid "/Logging/Clear"
-msgstr "/Logging/TĂžm logg"
-
-#: ../src/gtk/gftp-gtk.c:329
-msgid "/Logging/View log"
-msgstr "/Logging/Vis logg"
+#, fuzzy
+msgid "/Remote/Rena_me..."
+msgstr "/Eksternt/Bytt navn..."
 
 #: ../src/gtk/gftp-gtk.c:330
-msgid "/Logging/Save log..."
-msgstr "/Logging/Lagre logg..."
+#, fuzzy
+msgid "/Remote/_Delete..."
+msgstr "/Eksternt/Ta bort..."
 
 #: ../src/gtk/gftp-gtk.c:331
-msgid "/Tool_s"
-msgstr "/_VerktĂžy"
+#, fuzzy
+msgid "/Remote/_Edit..."
+msgstr "/Eksternt/Rediger..."
 
 #: ../src/gtk/gftp-gtk.c:332
-msgid "/Tools/tearoff"
-msgstr "/VerktĂžy/tearoff"
+#, fuzzy
+msgid "/Remote/_View..."
+msgstr "/Eksternt/Vis..."
 
 #: ../src/gtk/gftp-gtk.c:333
-msgid "/Tools/Compare Windows"
-msgstr "/VerktĂžy/Sammenlign vinduer"
-
-#: ../src/gtk/gftp-gtk.c:334
-msgid "/Tools/Clear Cache"
-msgstr "/VerktĂžy/TĂžm cache"
+#, fuzzy
+msgid "/Remote/_Refresh"
+msgstr "/Eksternt/Oppdater"
 
 #: ../src/gtk/gftp-gtk.c:335
-msgid "/Help"
-msgstr "/Hjelp"
+msgid "/_Bookmarks"
+msgstr "/_Bokmerker"
 
 #: ../src/gtk/gftp-gtk.c:336
-msgid "/Help/tearoff"
-msgstr "/Hjelp/tearoff"
+msgid "/Bookmarks/tearoff"
+msgstr "/Bokmerker/tearoff"
 
 #: ../src/gtk/gftp-gtk.c:337
-msgid "/Help/About"
+#, fuzzy
+msgid "/Bookmarks/Add _Bookmark"
+msgstr "/Bokmerker/Legg til bokmerke"
+
+#: ../src/gtk/gftp-gtk.c:339
+#, fuzzy
+msgid "/Bookmarks/Edit Bookmarks"
+msgstr "/Bokmerker/Rediger bokmerker"
+
+#: ../src/gtk/gftp-gtk.c:340
+msgid "/Bookmarks/sep"
+msgstr "/Bokmerker/sep"
+
+#: ../src/gtk/gftp-gtk.c:341
+#, fuzzy
+msgid "/_Transfer"
+msgstr "/_OverfĂžringer"
+
+#: ../src/gtk/gftp-gtk.c:342
+#, fuzzy
+msgid "/Transfer/tearoff"
+msgstr "/OverfĂžringer/tearoff"
+
+#: ../src/gtk/gftp-gtk.c:343
+#, fuzzy
+msgid "/Transfer/_Start"
+msgstr "/OverfĂžringer/tearoff"
+
+#: ../src/gtk/gftp-gtk.c:344
+#, fuzzy
+msgid "/Transfer/St_op"
+msgstr "/OverfĂžringer/sep"
+
+#: ../src/gtk/gftp-gtk.c:346 ../src/gtk/gftp-gtk.c:354
+#, fuzzy
+msgid "/Transfer/sep"
+msgstr "/OverfĂžringer/sep"
+
+#: ../src/gtk/gftp-gtk.c:347
+#, fuzzy
+msgid "/Transfer/Skip _Current File"
+msgstr "/OverfĂžringer/Hopp over fil"
+
+#: ../src/gtk/gftp-gtk.c:348
+#, fuzzy
+msgid "/Transfer/_Remove File"
+msgstr "/OverfĂžringer/Fjern fil"
+
+#: ../src/gtk/gftp-gtk.c:350
+#, fuzzy
+msgid "/Transfer/Move File _Up"
+msgstr "/OverfĂžringer/Flytt fil opp"
+
+#: ../src/gtk/gftp-gtk.c:352
+#, fuzzy
+msgid "/Transfer/Move File _Down"
+msgstr "/OverfĂžringer/Flytt fil ned"
+
+#: ../src/gtk/gftp-gtk.c:355
+#, fuzzy
+msgid "/Transfer/_Retrieve Files"
+msgstr "/OverfĂžringer/Last ned filer"
+
+#: ../src/gtk/gftp-gtk.c:356
+#, fuzzy
+msgid "/Transfer/_Put Files"
+msgstr "/OverfĂžringer/Send filer"
+
+#: ../src/gtk/gftp-gtk.c:357
+#, fuzzy
+msgid "/L_og"
+msgstr "/_Logging"
+
+#: ../src/gtk/gftp-gtk.c:358
+#, fuzzy
+msgid "/Log/tearoff"
+msgstr "/Logging/tearoff"
+
+#: ../src/gtk/gftp-gtk.c:359
+#, fuzzy
+msgid "/Log/_Clear"
+msgstr "/Logging/TĂžm logg"
+
+#: ../src/gtk/gftp-gtk.c:360
+#, fuzzy
+msgid "/Log/_View"
+msgstr "/Lokalt/Vis..."
+
+#: ../src/gtk/gftp-gtk.c:361
+#, fuzzy
+msgid "/Log/_Save..."
+msgstr "/Logging/Lagre logg..."
+
+#: ../src/gtk/gftp-gtk.c:362
+msgid "/Tool_s"
+msgstr "/_VerktĂžy"
+
+#: ../src/gtk/gftp-gtk.c:363
+msgid "/Tools/tearoff"
+msgstr "/VerktĂžy/tearoff"
+
+#: ../src/gtk/gftp-gtk.c:364
+#, fuzzy
+msgid "/Tools/C_ompare Windows"
+msgstr "/VerktĂžy/Sammenlign vinduer"
+
+#: ../src/gtk/gftp-gtk.c:365
+#, fuzzy
+msgid "/Tools/_Clear Cache"
+msgstr "/VerktĂžy/TĂžm cache"
+
+#: ../src/gtk/gftp-gtk.c:366
+msgid "/Help"
+msgstr "/Hjelp"
+
+#: ../src/gtk/gftp-gtk.c:367
+msgid "/Help/tearoff"
+msgstr "/Hjelp/tearoff"
+
+#: ../src/gtk/gftp-gtk.c:368
+#, fuzzy
+msgid "/Help/_About"
 msgstr "/Hjelp/Om"
 
-#: ../src/gtk/gftp-gtk.c:458
+#: ../src/gtk/gftp-gtk.c:488
 msgid "Host: "
 msgstr "Vert: "
 
-#: ../src/gtk/gftp-gtk.c:460
+#: ../src/gtk/gftp-gtk.c:490
 msgid "_Host: "
 msgstr "_Vert: "
 
-#: ../src/gtk/gftp-gtk.c:486
+#: ../src/gtk/gftp-gtk.c:516
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtk/gftp-gtk.c:507
+#: ../src/gtk/gftp-gtk.c:537
 msgid "User: "
 msgstr "Bruker: "
 
-#: ../src/gtk/gftp-gtk.c:509
+#: ../src/gtk/gftp-gtk.c:539
 msgid "_User: "
 msgstr "Br_uker: "
 
-#: ../src/gtk/gftp-gtk.c:534
+#: ../src/gtk/gftp-gtk.c:564
 msgid "Pass: "
 msgstr "Passord: "
 
-#: ../src/gtk/gftp-gtk.c:604
+#: ../src/gtk/gftp-gtk.c:636
 msgid "Command: "
 msgstr "Kommando: "
 
-#: ../src/gtk/gftp-gtk.c:746
-#: ../src/gtk/gftp-gtk.c:952
-#: ../src/gtk/gtkui_transfer.c:216
+#: ../src/gtk/gftp-gtk.c:787 ../src/gtk/gftp-gtk.c:996
+#: ../src/gtk/gtkui_transfer.c:228
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../src/gtk/gftp-gtk.c:747
+#: ../src/gtk/gftp-gtk.c:788
 msgid "Size"
 msgstr "StĂžrrelse"
 
-#: ../src/gtk/gftp-gtk.c:750
+#: ../src/gtk/gftp-gtk.c:791
 msgid "Date"
 msgstr "Dato"
 
-#: ../src/gtk/gftp-gtk.c:751
+#: ../src/gtk/gftp-gtk.c:792
 msgid "Attribs"
 msgstr "Attributter"
 
-#: ../src/gtk/gftp-gtk.c:953
+#: ../src/gtk/gftp-gtk.c:997
 msgid "Progress"
 msgstr "Progresjon"
 
-#: ../src/gtk/gftp-gtk.c:1094
+#: ../src/gtk/gftp-gtk.c:1133
 msgid "Error: You must type in a host to connect to\n"
 msgstr "Feil: Du mÄ skrive inn en vertsmaskin Ä koble opp mot\n"
 
-#: ../src/gtk/gtkui.c:51
+#: ../src/gtk/gtkui.c:53
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../src/gtk/gtkui.c:96
+#: ../src/gtk/gtkui.c:120
 msgid "Enter Username"
 msgstr "Oppgi brukernavn"
 
-#: ../src/gtk/gtkui.c:97
+#: ../src/gtk/gtkui.c:121
 msgid "Please enter your username for this site"
 msgstr "Vennligst skriv inn ditt brukernavn for denne verten"
 
-#: ../src/gtk/gtkui.c:119
-#: ../src/gtk/transfer.c:555
-#: ../src/gtk/transfer.c:565
+#: ../src/gtk/gtkui.c:143 ../src/gtk/transfer.c:563 ../src/gtk/transfer.c:573
 msgid "Please enter your password for this site"
 msgstr "Vennligst skriv inn ditt passord for denne vertsmaskinen"
 
-#: ../src/gtk/gtkui.c:274
+#: ../src/gtk/gtkui.c:298
 #, fuzzy
 msgid "Operation canceled...you must enter a string\n"
 msgstr "SITE: Operasjonen avbrutt... Du mÄ skrive inn en tekststreng\n"
 
-#: ../src/gtk/gtkui.c:320
+#: ../src/gtk/gtkui.c:344
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: ../src/gtk/gtkui.c:323
+#: ../src/gtk/gtkui.c:347
 msgid "Make Directory"
 msgstr "Opprett mappe"
 
-#: ../src/gtk/gtkui.c:323
+#: ../src/gtk/gtkui.c:347
 msgid "Enter name of directory to create"
 msgstr "Skriv inn navnet pÄ den nye mappen"
 
-#: ../src/gtk/gtkui.c:346
-#: ../src/gtk/gtkui.c:358
-#: ../src/gtk/misc-gtk.c:949
-#: ../src/gtk/misc-gtk.c:1023
+#: ../src/gtk/gtkui.c:370 ../src/gtk/gtkui.c:382 ../src/gtk/misc-gtk.c:932
+#: ../src/gtk/misc-gtk.c:1007
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: ../src/gtk/gtkui.c:356
+#: ../src/gtk/gtkui.c:380
 #, c-format
 msgid "What would you like to rename %s to?"
 msgstr "Hva vil du bytte navn pÄ %s til?"
 
-#: ../src/gtk/gtkui.c:378
-#: ../src/gtk/gtkui.c:381
+#: ../src/gtk/gtkui.c:402 ../src/gtk/gtkui.c:405
 msgid "Site"
 msgstr "Host"
 
-#: ../src/gtk/gtkui.c:381
+#: ../src/gtk/gtkui.c:405
 msgid "Enter site-specific command"
 msgstr "Skriv inn vertsmaskinspesifikk kommando"
 
-#: ../src/gtk/gtkui.c:382
+#: ../src/gtk/gtkui.c:406
 msgid "Prepend with SITE"
 msgstr ""
 
-#: ../src/gtk/gtkui.c:425
-#: ../src/gtk/menu-items.c:250
+#: ../src/gtk/gtkui.c:449 ../src/gtk/menu-items.c:235
 msgid "Chdir"
 msgstr "Chdir"
 
-#: ../src/gtk/gtkui_transfer.c:60
-#: ../src/gtk/transfer.c:450
-#: ../src/gtk/transfer.c:533
-#: ../src/gtk/transfer.c:1012
+#: ../src/gtk/gtkui_transfer.c:60 ../src/gtk/transfer.c:473
+#: ../src/gtk/transfer.c:541 ../src/gtk/transfer.c:998
 msgid "Skipped"
 msgstr "Hoppet over"
 
-#: ../src/gtk/gtkui_transfer.c:62
-#: ../src/gtk/transfer.c:512
-#: ../src/gtk/transfer.c:537
+#: ../src/gtk/gtkui_transfer.c:62 ../src/gtk/transfer.c:520
+#: ../src/gtk/transfer.c:545
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../src/gtk/gtkui_transfer.c:124
-#: ../src/gtk/gtkui_transfer.c:303
-#: ../src/gtk/gtkui_transfer.c:333
+#: ../src/gtk/gtkui_transfer.c:136 ../src/gtk/gtkui_transfer.c:314
+#: ../src/gtk/gtkui_transfer.c:341
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../src/gtk/gtkui_transfer.c:131
-#: ../src/gtk/gtkui_transfer.c:309
-#: ../src/gtk/gtkui_transfer.c:339
+#: ../src/gtk/gtkui_transfer.c:143 ../src/gtk/gtkui_transfer.c:320
+#: ../src/gtk/gtkui_transfer.c:347
 msgid "Resume"
 msgstr "Legg til"
 
-#: ../src/gtk/gtkui_transfer.c:138
-#: ../src/gtk/gtkui_transfer.c:306
+#: ../src/gtk/gtkui_transfer.c:150 ../src/gtk/gtkui_transfer.c:317
 msgid "Skip"
 msgstr "Hopp over"
 
-#: ../src/gtk/gtkui_transfer.c:219
+#: ../src/gtk/gtkui_transfer.c:231
 msgid "Action"
 msgstr "Handling"
 
-#: ../src/gtk/gtkui_transfer.c:224
-#: ../src/gtk/gtkui_transfer.c:233
+#: ../src/gtk/gtkui_transfer.c:236 ../src/gtk/gtkui_transfer.c:245
 #: ../src/gtk/transfer.c:91
 msgid "Transfer Files"
 msgstr "Send filer"
 
-#: ../src/gtk/gtkui_transfer.c:245
+#: ../src/gtk/gtkui_transfer.c:257
 msgid ""
 "The following file(s) exist on both the local and remote computer\n"
 "Please select what you would like to do"
@@ -2606,179 +2648,176 @@
 "FÞlgende fil(er) finnes bÄde lokalt og pÄ fjernmaskinen\n"
 "Hva vil du gjĂžre?"
 
-#: ../src/gtk/gtkui_transfer.c:312
+#: ../src/gtk/gtkui_transfer.c:323
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/gtk/gtkui_transfer.c:345
+#: ../src/gtk/gtkui_transfer.c:353
 msgid "Skip File"
 msgstr "Hopp over fil"
 
-#: ../src/gtk/gtkui_transfer.c:355
+#: ../src/gtk/gtkui_transfer.c:363
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../src/gtk/gtkui_transfer.c:361
+#: ../src/gtk/gtkui_transfer.c:369
 msgid "Deselect All"
 msgstr "Velg bort alle"
 
-#: ../src/gtk/menu-items.c:37
+#: ../src/gtk/menu-items.c:65
 msgid "Change Filespec: Operation canceled...you must enter a string\n"
-msgstr "Bytt filfilter: Operasjonen avbrutt...du mÄ skrive inn en tekststreng\n"
-
-#: ../src/gtk/menu-items.c:74
-#: ../src/gtk/menu-items.c:77
+msgstr ""
+"Bytt filfilter: Operasjonen avbrutt...du mÄ skrive inn en tekststreng\n"
+
+#: ../src/gtk/menu-items.c:83 ../src/gtk/menu-items.c:86
 msgid "Change Filespec"
 msgstr "Endre filfilter"
 
-#: ../src/gtk/menu-items.c:77
+#: ../src/gtk/menu-items.c:86
 msgid "Enter the new file specification"
 msgstr "Skriv inn nytt filfilter"
 
-#: ../src/gtk/menu-items.c:105
-#: ../src/gtk/menu-items.c:313
-#: ../src/gtk/menu-items.c:377
-#: ../src/gtk/view_dialog.c:76
-#: ../src/gtk/view_dialog.c:155
+#: ../src/gtk/menu-items.c:114 ../src/gtk/menu-items.c:299
+#: ../src/gtk/menu-items.c:363 ../src/gtk/view_dialog.c:81
 #, c-format
 msgid "Error: Cannot open %s for writing: %s\n"
 msgstr "Feil: Kan ikke Ă„pne %s for skriving: %s\n"
 
-#: ../src/gtk/menu-items.c:134
+#: ../src/gtk/menu-items.c:143
 msgid "Save Directory Listing"
 msgstr "Lagre mappeliste"
 
-#: ../src/gtk/menu-items.c:341
-#: ../src/gtk/menu-items.c:405
+#: ../src/gtk/menu-items.c:327 ../src/gtk/menu-items.c:391
 #, c-format
 msgid "Error: Error writing to %s: %s\n"
 msgstr "Feil: En feil oppsto da %s skulle skrives til disk: %s\n"
 
-#: ../src/gtk/menu-items.c:416
+#: ../src/gtk/menu-items.c:402
 #, c-format
 msgid "Successfully wrote the log file to %s\n"
 msgstr "Loggfil lagret til %s\n"
 
-#: ../src/gtk/menu-items.c:428
+#: ../src/gtk/menu-items.c:414
 msgid "Save Log"
 msgstr "Lagre logg"
 
-#: ../src/gtk/menu-items.c:464
+#: ../src/gtk/menu-items.c:450
 #, c-format
-msgid "Cannot find the license agreement file COPYING. Please make sure it is in either %s or in %s"
-msgstr "Kan ikke finne lisensavtalefilen COPYING. Vennligst kontroller at den finnes i %s eller %s"
-
-#: ../src/gtk/menu-items.c:468
-#: ../src/gtk/menu-items.c:473
+msgid ""
+"Cannot find the license agreement file COPYING. Please make sure it is in "
+"either %s or in %s"
+msgstr ""
+"Kan ikke finne lisensavtalefilen COPYING. Vennligst kontroller at den finnes "
+"i %s eller %s"
+
+#: ../src/gtk/menu-items.c:454 ../src/gtk/menu-items.c:459
 msgid "About gFTP"
 msgstr "Om gFTP"
 
-#: ../src/gtk/menu-items.c:504
-#, c-format
+#: ../src/gtk/menu-items.c:490
+#, fuzzy, c-format
 msgid ""
 "%s\n"
-"Copyright (C) 1998-2003 Brian Masney <[e-mail]>\n"
+"Copyright (C) 1998-2007 Brian Masney <[e-mail]>\n"
 "Official Homepage: http://www.gftp.org/\n"
-"Logo by: Aaron Worley <[e-mail]>\n"
 msgstr ""
 "%s\n"
 "Copyright (C) 1998-2003 Brian Masney <[e-mail]>\n"
 "Offisiell hjemmeside: http://www.gftp.org/\n"
 "Logo av: Aaron Worley <[e-mail]>\n"
 
-#: ../src/gtk/menu-items.c:516
+#: ../src/gtk/menu-items.c:503
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtk/menu-items.c:565
+#: ../src/gtk/menu-items.c:552
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../src/gtk/menu-items.c:571
-#: ../src/gtk/view_dialog.c:404
+#: ../src/gtk/menu-items.c:558 ../src/gtk/view_dialog.c:385
 msgid "  Close  "
 msgstr "  Lukk  "
 
-#: ../src/gtk/menu-items.c:655
+#: ../src/gtk/menu-items.c:685
 msgid "Compare Windows"
 msgstr "Sammenlign vinduer"
 
-#: ../src/gtk/misc-gtk.c:253
+#: ../src/gtk/misc-gtk.c:257
 msgid "Disconnect from the remote server"
 msgstr "Koble fra ekstern vert"
 
-#: ../src/gtk/misc-gtk.c:257
-msgid "Connect to the site specified in the host entry. If the host entry is blank, then a dialog is presented that will allow you to enter a URL."
+#: ../src/gtk/misc-gtk.c:261
+msgid ""
+"Connect to the site specified in the host entry. If the host entry is blank, "
+"then a dialog is presented that will allow you to enter a URL."
 msgstr ""
 
-#: ../src/gtk/misc-gtk.c:304
+#: ../src/gtk/misc-gtk.c:308
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/gtk/misc-gtk.c:311
+#: ../src/gtk/misc-gtk.c:318
 msgid "] (Cached) ["
 msgstr "] (Cached) ["
 
-#: ../src/gtk/misc-gtk.c:336
+#: ../src/gtk/misc-gtk.c:329
 msgid "Not connected"
 msgstr "Ikke oppkoblet"
 
-#: ../src/gtk/misc-gtk.c:439
+#: ../src/gtk/misc-gtk.c:431
 #, c-format
 msgid "Error opening file %s: %s\n"
 msgstr "Feil ved Ă„pning av fil %s: %s\n"
 
-#: ../src/gtk/misc-gtk.c:528
+#: ../src/gtk/misc-gtk.c:521
 #, c-format
 msgid "%s: Not connected to a remote site\n"
 msgstr "%s: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/gtk/misc-gtk.c:535
+#: ../src/gtk/misc-gtk.c:528
 #, c-format
 msgid "%s: This feature is not available using this protocol\n"
 msgstr "%s: Den funksjonen er ikke tilgjengelig i denne protokollen\n"
 
-#: ../src/gtk/misc-gtk.c:543
+#: ../src/gtk/misc-gtk.c:536
 #, c-format
 msgid "%s: You must only have one item selected\n"
 msgstr "%s: Du kan bare velge Ă©n\n"
 
-#: ../src/gtk/misc-gtk.c:550
+#: ../src/gtk/misc-gtk.c:543
 #, c-format
 msgid "%s: You must have at least one item selected\n"
 msgstr "%s: Du mÄ velge minst én\n"
 
-#: ../src/gtk/misc-gtk.c:943
-#: ../src/gtk/misc-gtk.c:1017
+#: ../src/gtk/misc-gtk.c:926 ../src/gtk/misc-gtk.c:1001
 msgid "Change"
 msgstr "Endre"
 
-#: ../src/gtk/misc-gtk.c:1014
-#: ../src/gtk/options_dialog.c:1280
+#: ../src/gtk/misc-gtk.c:998 ../src/gtk/options_dialog.c:1277
 msgid "Add"
 msgstr "Legg til"
 
-#: ../src/gtk/misc-gtk.c:1040
+#: ../src/gtk/misc-gtk.c:1024
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/gtk/misc-gtk.c:1110
+#: ../src/gtk/misc-gtk.c:1094
 msgid "  Yes  "
 msgstr "  Ja  "
 
-#: ../src/gtk/misc-gtk.c:1120
+#: ../src/gtk/misc-gtk.c:1104
 msgid "  No  "
 msgstr "  Nei "
 
-#: ../src/gtk/misc-gtk.c:1180
+#: ../src/gtk/misc-gtk.c:1164
 msgid "Getting directory listings"
 msgstr "Henter mappeliste"
 
-#: ../src/gtk/misc-gtk.c:1200
+#: ../src/gtk/misc-gtk.c:1184
 msgid "  Stop  "
 msgstr " Stopp "
 
-#: ../src/gtk/misc-gtk.c:1210
+#: ../src/gtk/misc-gtk.c:1194
 #, c-format
 msgid ""
 "Received %ld directories\n"
@@ -2787,77 +2826,76 @@
 "Mottok %ld mapper\n"
 "og %ld filer"
 
-#: ../src/gtk/misc-gtk.c:1286
+#: ../src/gtk/misc-gtk.c:1270
 #, c-format
 msgid "gFTP Error: Cannot find file %s in %s or %s\n"
 msgstr "gFTP-feil: Kan ikke finne filen %s i verken %s eller %s\n"
 
-#: ../src/gtk/options_dialog.c:959
+#: ../src/gtk/options_dialog.c:956
 msgid "Edit Host"
 msgstr "Rediger vertsmaskinoppfĂžring"
 
-#: ../src/gtk/options_dialog.c:959
+#: ../src/gtk/options_dialog.c:956
 msgid "Add Host"
 msgstr "Legg til vertsmaskin"
 
-#: ../src/gtk/options_dialog.c:1005
+#: ../src/gtk/options_dialog.c:1002
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/gtk/options_dialog.c:1007
+#: ../src/gtk/options_dialog.c:1004
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../src/gtk/options_dialog.c:1017
-#: ../src/gtk/options_dialog.c:1140
+#: ../src/gtk/options_dialog.c:1014 ../src/gtk/options_dialog.c:1137
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/gtk/options_dialog.c:1050
+#: ../src/gtk/options_dialog.c:1047
 msgid "Network Address"
 msgstr "Nettverksadresse"
 
-#: ../src/gtk/options_dialog.c:1052
+#: ../src/gtk/options_dialog.c:1049
 msgid "_Network address:"
 msgstr "_Nettverksadresse:"
 
-#: ../src/gtk/options_dialog.c:1091
-#: ../src/gtk/options_dialog.c:1244
+#: ../src/gtk/options_dialog.c:1088 ../src/gtk/options_dialog.c:1241
 msgid "Netmask"
 msgstr "Nettverksmaske"
 
-#: ../src/gtk/options_dialog.c:1093
+#: ../src/gtk/options_dialog.c:1090
 msgid "N_etmask:"
 msgstr "N_ettverksmaske:"
 
-#: ../src/gtk/options_dialog.c:1142
+#: ../src/gtk/options_dialog.c:1139
 msgid "_Domain:"
 msgstr "_Domene:"
 
-#: ../src/gtk/options_dialog.c:1250
+#: ../src/gtk/options_dialog.c:1247
 msgid "Local Hosts"
 msgstr "Lokale vertsmaskiner"
 
-#: ../src/gtk/options_dialog.c:1291
-#: ../src/gtk/view_dialog.c:105
+#: ../src/gtk/options_dialog.c:1288 ../src/gtk/view_dialog.c:34
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../src/gtk/options_dialog.c:1293
+#: ../src/gtk/options_dialog.c:1290
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/gtk/options_dialog.c:1370
-#: ../src/gtk/options_dialog.c:1375
+#: ../src/gtk/options_dialog.c:1367 ../src/gtk/options_dialog.c:1372
 msgid "Options"
 msgstr "Alternativer"
 
+#: ../src/gtk/options_dialog.c:1459
+msgid "Apply"
+msgstr "UtfĂžr"
+
 #: ../src/gtk/transfer.c:30
 msgid "Receiving file names..."
 msgstr "Tar imot filnavn..."
 
-#: ../src/gtk/transfer.c:63
-#: ../src/gtk/transfer.c:681
+#: ../src/gtk/transfer.c:63 ../src/gtk/transfer.c:689
 msgid "Connecting..."
 msgstr "Kobler opp..."
 
@@ -2865,32 +2903,32 @@
 msgid "Retrieve Files: Not connected to a remote site\n"
 msgstr "Motta filer: Ikke koblet til noen vertsmaskin\n"
 
-#: ../src/gtk/transfer.c:351
+#: ../src/gtk/transfer.c:336
 #, c-format
 msgid "Error: Child %d returned %d\n"
 msgstr "Feil: Underprosess %d ga returverdi %d\n"
 
-#: ../src/gtk/transfer.c:358
+#: ../src/gtk/transfer.c:345
 #, c-format
 msgid "Child %d returned successfully\n"
 msgstr "Underprosess %d ble avsluttet normalt\n"
 
-#: ../src/gtk/transfer.c:362
+#: ../src/gtk/transfer.c:352
 #, fuzzy, c-format
 msgid "Error: Child %d did not terminate properly\n"
 msgstr "Feil: Underprosess %d ga returverdi %d\n"
 
-#: ../src/gtk/transfer.c:372
+#: ../src/gtk/transfer.c:368
 #, c-format
 msgid "Error: Cannot get information about file %s: %s\n"
 msgstr "Feil: Kan ikke fÄ informasjon om fil %s: %s\n"
 
-#: ../src/gtk/transfer.c:377
+#: ../src/gtk/transfer.c:374
 #, c-format
 msgid "File %s was not changed\n"
 msgstr "Fil %s ble ikke endret\n"
 
-#: ../src/gtk/transfer.c:385
+#: ../src/gtk/transfer.c:382
 #, c-format
 msgid ""
 "File %s has changed.\n"
@@ -2899,122 +2937,119 @@
 "Fil %s har blitt endret.\n"
 "Vil du laste den opp?"
 
-#: ../src/gtk/transfer.c:388
+#: ../src/gtk/transfer.c:385
 msgid "Edit File"
 msgstr "Rediger fil"
 
-#: ../src/gtk/transfer.c:453
+#: ../src/gtk/transfer.c:476
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../src/gtk/transfer.c:493
+#: ../src/gtk/transfer.c:734
+#, fuzzy, c-format
+msgid "Sent %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr ""
+"Mottar %s av %s med %.2fkB/s, gjenstÄende tid beregnes til %02d:%02d:%02d"
+
+#: ../src/gtk/transfer.c:739
 #, c-format
-msgid "Stopping the transfer of %s\n"
-msgstr "Stopper overfĂžringen av %s\n"
-
-#: ../src/gtk/transfer.c:727
+msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
+msgstr ""
+"Mottar %s av %s med %.2fkB/s, gjenstÄende tid beregnes til %02d:%02d:%02d"
+
+#: ../src/gtk/transfer.c:750
+#, fuzzy, c-format
+msgid "Sent %s of %s, transfer stalled, unknown time remaining"
+msgstr ""
+"Mottar %s av %s, men overfÞringen har stanset opp, gjenstÄende tid ukjent"
+
+#: ../src/gtk/transfer.c:756
+#, c-format
+msgid "Recv %s of %s, transfer stalled, unknown time remaining"
+msgstr ""
+"Mottar %s av %s, men overfÞringen har stanset opp, gjenstÄende tid ukjent"
+
+#: ../src/gtk/transfer.c:800
 #, c-format
 msgid "Unknown percentage complete. (File %ld of %ld)"
 msgstr "Ukjent prosentandel ferdig. (Fil %ld av %ld)"
 
-#: ../src/gtk/transfer.c:731
+#: ../src/gtk/transfer.c:804
 #, fuzzy, c-format
 msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)"
 msgstr "%d%% ferdige, omtrent %02d:%02d:%02d igjen. (Fil %d av %d)"
 
-#: ../src/gtk/transfer.c:761
-#, c-format
-msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining"
-msgstr "Mottar %s av %s med %.2fkB/s, gjenstÄende tid beregnes til %02d:%02d:%02d"
-
-#: ../src/gtk/transfer.c:770
-#, c-format
-msgid "Recv %s of %s, transfer stalled, unknown time remaining"
-msgstr "Mottar %s av %s, men overfÞringen har stanset opp, gjenstÄende tid ukjent"
-
-#: ../src/gtk/transfer.c:805
+#: ../src/gtk/transfer.c:842
 #, c-format
 msgid "Retrieving file names...%s bytes"
 msgstr "Henter filnavn... %s bytes"
 
-#: ../src/gtk/transfer.c:884
-#: ../src/gtk/transfer.c:906
-#: ../src/gtk/transfer.c:940
-#: ../src/gtk/transfer.c:980
-#: ../src/gtk/transfer.c:1033
-#: ../src/gtk/transfer.c:1093
+#: ../src/gtk/transfer.c:921 ../src/gtk/transfer.c:943
+#: ../src/gtk/transfer.c:962 ../src/gtk/transfer.c:984
+#: ../src/gtk/transfer.c:1012 ../src/gtk/transfer.c:1072
 msgid "There are no file transfers selected\n"
 msgstr "Du har ikke valgt noen overfĂžringer\n"
 
-#: ../src/gtk/transfer.c:924
-#, c-format
-msgid "Stopping the transfer on host %s\n"
-msgstr "Stopper overfĂžringen til/fra vertsmaskin %s\n"
-
-#: ../src/gtk/transfer.c:965
-#: ../src/gtk/transfer.c:1018
-#, c-format
-msgid "Skipping file %s on host %s\n"
-msgstr "Hopper over %s pÄ vertsmaskin %s\n"
-
-#: ../src/gtk/view_dialog.c:36
+#: ../src/gtk/view_dialog.c:34
 msgid "View"
 msgstr "Vis"
 
-#: ../src/gtk/view_dialog.c:48
+#: ../src/gtk/view_dialog.c:49
 #, c-format
 msgid "View: %s is a directory. Cannot view it.\n"
 msgstr "Lis: %s er en mappe, og kan ikke vises.\n"
 
-#: ../src/gtk/view_dialog.c:114
-msgid "Edit: You must specify an editor in the options dialog\n"
-msgstr "Rediger: Du mÄ oppgi et redigeringsprogram i alternativer-dialogboksen\n"
-
-#: ../src/gtk/view_dialog.c:127
+#: ../src/gtk/view_dialog.c:52
 #, c-format
 msgid "Edit: %s is a directory. Cannot edit it.\n"
 msgstr "Rediger: %s er en mappe, og kan ikke redigeres.\n"
 
-#: ../src/gtk/view_dialog.c:210
+#: ../src/gtk/view_dialog.c:123
+msgid "Edit: You must specify an editor in the options dialog\n"
+msgstr ""
+"Rediger: Du mÄ oppgi et redigeringsprogram i alternativer-dialogboksen\n"
+
+#: ../src/gtk/view_dialog.c:177
 #, c-format
 msgid "View: Cannot fork another process: %s\n"
 msgstr "Vis: Kunne ikke opprette underprosess: %s\n"
 
-#: ../src/gtk/view_dialog.c:213
+#: ../src/gtk/view_dialog.c:180
 #, c-format
 msgid "Running program: %s %s\n"
 msgstr "Starter program: %s %s\n"
 
-#: ../src/gtk/view_dialog.c:271
+#: ../src/gtk/view_dialog.c:240
 #, c-format
 msgid "Opening %s with %s\n"
 msgstr "Åpner %s med %s\n"
 
-#: ../src/gtk/view_dialog.c:306
+#: ../src/gtk/view_dialog.c:282
 #, c-format
 msgid "Viewing file %s\n"
 msgstr "Viser filen %s\n"
 
-#: ../src/gtk/view_dialog.c:313
+#: ../src/gtk/view_dialog.c:289
 #, c-format
 msgid "View: Cannot open file %s: %s\n"
 msgstr "Vis: Kan ikke Ă„pne fil %s: %s\n"
 
-#: ../src/text/gftp-text.c:176
+#: ../src/text/gftp-text.c:166
 #, fuzzy, c-format
 msgid "Cannot open controlling terminal %s\n"
 msgstr "Kunne ikke Ă„pne kontrollterminal %s\n"
 
-#: ../src/text/textui.c:74
+#: ../src/text/textui.c:80
 msgid "Username [anonymous]:"
 msgstr "Brukernavn [anonymous]:"
 
-#: ../src/text/textui.c:143
+#: ../src/text/textui.c:158
 #, c-format
 msgid ""
 "%s already exists. (%s source size, %s destination size):\n"
-"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%c)"
+"(o)verwrite, (r)esume, (s)kip, (O)verwrite All, (R)esume All, (S)kip All: (%"
+"c)"
 msgstr ""
 "%s finnes allerede. (%s kildestÞrrelse, %s mÄlstÞrrelse):\n"
-"o = skriv over, r = fortsett, s = hopp over, O = skriv over alle, R = fortsett alle, S = hopp over alle: (%c)"
-
+"o = skriv over, r = fortsett, s = hopp over, O = skriv over alle, R = "
+"fortsett alle, S = hopp over alle: (%c)"