diff --git a/po/ChangeLog b/po/ChangeLog
index c9777b41a..f91b44f6c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
 2003-01-22  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
 
 	* nl.po: Dutch translation updated.
diff --git a/po/sv.po b/po/sv.po
index baee379c0..0892a2003 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,24 +1,25 @@
 # Swedish messages for mc.
-# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 # FIRST AUTHOR: Henrik Steen <hsteen@sw.seisy.abb.se>, 26 Aug 1999.
 # 		revision for gnome 1.0.50, 17 Sept 1999
 #
 # Richard Hult <rhult@hem.passagen.se>.
 # Martin Norbäck <d95mback@dtek.chalmers.se>.
 # Andreas Hyden <a.hyden@cyberpoint.se>.
-# Christian Rose <menthos@menthos.com>, 2000, 2001, 2002.
+# Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"POT-Creation-Date: 2003-01-22 02:37-0500\n"
-"PO-Revision-Date: 2002-02-09 13:46+0100\n"
+"POT-Creation-Date: 2003-01-22 18:09+0100\n"
+"PO-Revision-Date: 2003-01-22 18:10+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. The file-name is printed after the ':'
 #: edit/edit.c:150 edit/edit.c:281 edit/edit.c:289 edit/edit.c:337
 #: edit/edit.c:352 edit/edit.c:363 edit/edit.c:379 edit/edit.c:2686
 #: edit/editcmd.c:267 edit/editcmd.c:275 edit/editcmd.c:1653 src/wtools.c:132
@@ -28,7 +29,7 @@ msgstr "Fel"
 
 #: edit/edit.c:153 edit/edit.c:340
 msgid " Cannot open file for reading: "
-msgstr " Misslyckades med att öppna fil för läsning: "
+msgstr " Kan inte öppna fil för läsning: "
 
 #: edit/edit.c:283
 msgid " Error reading from pipe: "
@@ -36,11 +37,11 @@ msgstr " Problem att l
 
 #: edit/edit.c:292
 msgid " Cannot open pipe for reading: "
-msgstr " Misslyckades med att öppna rör för läsning: "
+msgstr " Kan inte öppna rör för läsning: "
 
 #: edit/edit.c:355
 msgid " Cannot get size/permissions info for file: "
-msgstr " Kan inte hämta information om storlek/rättigheter från fil: "
+msgstr " Kan inte hämta information om storlek/rättigheter för fil: "
 
 #: edit/edit.c:364
 msgid " Not an ordinary file: "
@@ -56,12 +57,13 @@ msgstr "Anv
 
 #: edit/edit.c:2686
 msgid "Macro recursion is too deep"
-msgstr ""
+msgstr "Makrorekursion är för djup"
 
 #: edit/edit.h:264
 msgid "&Dismiss"
 msgstr "&Försvinn"
 
+#. 1
 #: edit/edit.h:266 edit/editcmd.c:367 edit/editcmd.c:1162 edit/editcmd.c:1244
 #: edit/editcmd.c:2480 edit/editmenu.c:36 edit/editoptions.c:71
 #: src/boxes.c:138 src/boxes.c:275 src/boxes.c:373 src/boxes.c:465
@@ -71,10 +73,9 @@ msgstr "&F
 msgid "&OK"
 msgstr "&OK"
 
-# varsågod att komma på något bättre
 #: edit/editcmd.c:43 edit/editcmd.c:44
 msgid " Enter file name: "
-msgstr " Mata in filnamn: "
+msgstr " Ange filnamn: "
 
 #: edit/editcmd.c:268
 msgid " Error writing to pipe: "
@@ -82,7 +83,7 @@ msgstr " Fel vid skrivning till r
 
 #: edit/editcmd.c:278
 msgid " Cannot open pipe for writing: "
-msgstr " Misslyckades med att öppna rör för läsning: "
+msgstr " Kan inte öppna rör för skrivning: "
 
 #: edit/editcmd.c:360
 msgid "Quick save "
@@ -94,8 +95,9 @@ msgstr "S
 
 #: edit/editcmd.c:362
 msgid "Do backups -->"
-msgstr "Gör backup -->"
+msgstr "Gör säkerhetskopia -->"
 
+#. 0
 #: edit/editcmd.c:365 edit/editcmd.c:1103 edit/editcmd.c:1160
 #: edit/editcmd.c:1242 edit/editcmd.c:2478 edit/editoptions.c:68
 #: src/achown.c:69 src/boxes.c:139 src/boxes.c:276 src/boxes.c:371
@@ -119,6 +121,7 @@ msgstr " Redigera sparl
 msgid " Save As "
 msgstr " Spara som "
 
+#. Execution on this filesysten is not implemented
 #: edit/editcmd.c:460 edit/editcmd.c:747 edit/editcmd.c:775 edit/editcmd.c:934
 #: edit/editcmd.c:1047 src/file.c:623 src/help.c:319 src/main.c:466
 #: src/screen.c:1397 src/screen.c:1976 src/selcodepage.c:106
@@ -129,7 +132,7 @@ msgstr "Varning"
 
 #: edit/editcmd.c:461
 msgid " A file already exists with this name. "
-msgstr " Det existerar redan en fil med det namnet. "
+msgstr " Det finns redan en fil med det namnet. "
 
 #: edit/editcmd.c:462
 msgid "Overwrite"
@@ -144,26 +147,31 @@ msgstr "Avbryt"
 msgid " Cannot save file. "
 msgstr " Fel vid försök att spara fil. "
 
+#. This heads the delete macro error dialog box
 #: edit/editcmd.c:581 edit/editcmd.c:589 edit/editcmd.c:614 edit/editcmd.c:661
 msgid " Delete macro "
-msgstr " Radera makro "
+msgstr " Ta bort makro "
 
+#. 'Open' = load temp file
 #: edit/editcmd.c:583
 msgid " Cannot open temp file "
-msgstr " Fel vid försök att öppna tillfällig fil "
+msgstr " Kan inte öppna temporär fil "
 
+#. 'Open' = load temp file
 #: edit/editcmd.c:591 edit/editcmd.c:652 edit/editcmd.c:709
 msgid " Cannot open macro file "
-msgstr " Fel vid försök att öppna makrofil "
+msgstr " Kan inte öppna makrofil "
 
 #: edit/editcmd.c:615
 msgid " Cannot overwrite macro file "
-msgstr " Fel vid försök att skriva över makrofil "
+msgstr " Kan inte skriva över makrofil "
 
+#. This heads the 'Macro' dialog box
 #: edit/editcmd.c:631 edit/editcmd.c:652
 msgid " Save macro "
 msgstr " Spara makro "
 
+#. Input line for a single key press follows the ':'
 #: edit/editcmd.c:633
 msgid " Press the macro's new hotkey: "
 msgstr " Tryck ned makrots nya snabbtangent: "
@@ -172,6 +180,7 @@ msgstr " Tryck ned makrots nya snabbtangent: "
 msgid " Press macro hotkey: "
 msgstr " Tryck snabbtangent för makro: "
 
+#. This heads the 'Load Macro' dialog box
 #: edit/editcmd.c:708
 msgid " Load macro "
 msgstr " Ladda makro "
@@ -180,6 +189,7 @@ msgstr " Ladda makro "
 msgid " Confirm save file? : "
 msgstr " Bekräfta spara? : "
 
+#. Buttons to 'Confirm save file' query
 #: edit/editcmd.c:723 src/view.c:474
 msgid " Save file "
 msgstr " Spara fil "
@@ -219,7 +229,7 @@ msgstr "a&Lla"
 
 #: edit/editcmd.c:1109 src/file.c:2178 src/filegui.c:227
 msgid "&Skip"
-msgstr "&Skippa"
+msgstr "&Hoppa över"
 
 #: edit/editcmd.c:1111
 msgid "&Replace"
@@ -277,6 +287,7 @@ msgstr " Ange s
 msgid " Replace "
 msgstr " Ersätt "
 
+#. in response to number of bookmarks added because of string being found %d times
 #: edit/editcmd.c:1272 edit/editcmd.c:1970 edit/editcmd.c:1972
 #: edit/editcmd.c:2000 edit/editwidget.c:288 src/view.c:1601 src/view.c:1681
 #: src/view.c:1801 src/view.c:1813 src/view.c:2037 src/view.c:2074
@@ -368,7 +379,7 @@ msgstr " Infoga fil "
 
 #: edit/editcmd.c:2252
 msgid " Cannot insert file. "
-msgstr " Fel vid infogning av fil. "
+msgstr " Kan inte infoga fil. "
 
 #: edit/editcmd.c:2269
 msgid " Sort block "
@@ -393,7 +404,7 @@ msgstr " Sortera "
 
 #: edit/editcmd.c:2289
 msgid " Cannot execute sort command "
-msgstr " Fel vid exekvering av 'sort' kommandot "
+msgstr " Kan inte köra kommandot \"sort\" "
 
 #: edit/editcmd.c:2294
 msgid " Sort returned non-zero: "
@@ -545,7 +556,7 @@ msgstr "&Flytta             F6"
 
 #: edit/editmenu.c:317 edit/editmenu.c:334
 msgid "&Delete            F8"
-msgstr "&Radera             F8"
+msgstr "&Ta bort            F8"
 
 #: edit/editmenu.c:319 edit/editmenu.c:336
 msgid "&Undo             C-u"
@@ -613,7 +624,7 @@ msgstr "formatera &Paragraf         M-p"
 
 #: edit/editmenu.c:373
 msgid "'ispell' s&pell check    C-p"
-msgstr "'ispell' sta&Vningskontroll C-p"
+msgstr "\"ispell\"-sta&Vningskontroll C-p"
 
 #: edit/editmenu.c:374 edit/editmenu.c:397
 msgid "Sor&t...                 M-t"
@@ -633,7 +644,7 @@ msgstr "&K
 
 #: edit/editmenu.c:396
 msgid "'ispell' s&pell check    M-$"
-msgstr "'ispell' sta&Vningskontroll M-$"
+msgstr "\"ispell\"-sta&Vningskontroll M-$"
 
 #: edit/editmenu.c:404 edit/editmenu.c:413
 msgid "&General...  "
@@ -701,20 +712,19 @@ msgstr "Flikstorlek: "
 
 #: edit/editoptions.c:88
 msgid "Synta&x highlighting"
-msgstr "markera synta&X"
+msgstr "Markera synta&x"
 
 #: edit/editoptions.c:91
-#, fuzzy
 msgid "Save file &position"
-msgstr " Spara fil "
+msgstr "Spara fil&position"
 
 #: edit/editoptions.c:94
 msgid "Confir&m before saving"
-msgstr "fr&Åga innan spara"
+msgstr "Fr&åga innan sparande"
 
 #: edit/editoptions.c:97
 msgid "Fill tabs with &spaces"
-msgstr "fyll tabbar med &Mellanslag"
+msgstr "Fyll tabbar med &blanksteg"
 
 #: edit/editoptions.c:100
 msgid "&Return does autoindent"
@@ -722,7 +732,7 @@ msgstr "&Retur g
 
 #: edit/editoptions.c:103
 msgid "&Backspace through tabs"
-msgstr "&Backspace växlar mellan flikar"
+msgstr "&Backsteg växlar mellan flikar"
 
 #: edit/editoptions.c:106
 msgid "&Fake half tabs"
@@ -739,7 +749,7 @@ msgstr "Tangentemulering"
 
 #: edit/editoptions.c:124
 msgid " Editor options "
-msgstr "Inställningar"
+msgstr " Redigeraralternativ "
 
 #: edit/editwidget.c:282 src/help.c:792 src/help.c:813 src/main.c:1418
 #: src/screen.c:2191 src/tree.c:1029 src/view.c:2152
@@ -764,7 +774,7 @@ msgstr "Flytta"
 
 #: edit/editwidget.c:289 src/screen.c:2198
 msgid "Delete"
-msgstr "Radera"
+msgstr "Ta bort"
 
 #: edit/editwidget.c:291 src/main.c:1420
 msgid "PullDn"
@@ -971,13 +981,12 @@ msgid "&Select"
 msgstr "&Välj"
 
 #: src/boxes.c:715
-#, fuzzy
 msgid "Use &passive mode"
-msgstr "&Sparläge..."
+msgstr "Använd &passivt läge"
 
 #: src/boxes.c:717
 msgid "&Use ~/.netrc"
-msgstr ""
+msgstr "&Använd ~/.netrc"
 
 #: src/boxes.c:721
 msgid "&Always use ftp proxy"
@@ -1008,6 +1017,7 @@ msgstr " Inst
 msgid "Quick cd"
 msgstr "Snabb cd"
 
+#. want cd like completion
 #: src/boxes.c:801
 msgid "cd"
 msgstr "cd"
@@ -1208,6 +1218,7 @@ msgstr " Anv
 msgid " Chown command "
 msgstr " chown kommandot "
 
+#. add fields for unknown names (numbers)
 #: src/chown.c:184
 msgid "<Unknown user>"
 msgstr "<Okänd användare>"
@@ -1227,7 +1238,7 @@ msgstr "Filerna 
 
 #: src/cmd.c:247 src/cmd.c:709 src/cmd.c:771 src/main.c:851 src/screen.c:1937
 msgid "Cannot change directory"
-msgstr "Kan inte ändra katalog"
+msgstr "Kan inte byta katalog"
 
 #: src/cmd.c:280
 msgid " View file "
@@ -1251,7 +1262,7 @@ msgstr "Skapa en ny katalog"
 
 #: src/cmd.c:403
 msgid " Enter directory name:"
-msgstr " Mata in katalognamnet:"
+msgstr " Ange katalognamn:"
 
 #: src/cmd.c:464
 msgid " Filter "
@@ -1306,14 +1317,12 @@ msgid "&Home"
 msgstr "&Hem"
 
 #: src/cmd.c:738
-#, fuzzy
 msgid "Syntax file edit"
-msgstr "ändra &Menyfilen"
+msgstr "Redigera filsyntax"
 
 #: src/cmd.c:739
-#, fuzzy
 msgid " Which syntax file you want to edit? "
-msgstr " Vilken utökningsfil vill du redigera? "
+msgstr " Vilken syntaxfil vill du redigera? "
 
 #: src/cmd.c:898
 msgid " Compare directories "
@@ -1359,12 +1368,12 @@ msgstr ""
 
 #: src/cmd.c:1010
 msgid "Type `exit' to return to the Midnight Commander"
-msgstr "Skriv `exit' för att återvända till Midnight Commander"
+msgstr "Skriv \"exit\" för att återvända till Midnight Commander"
 
 #: src/cmd.c:1059
-#, fuzzy, c-format
+#, c-format
 msgid "Link %s to:"
-msgstr " länk: %s "
+msgstr "Länka %s till:"
 
 #: src/cmd.c:1060
 msgid " Link "
@@ -1383,7 +1392,7 @@ msgstr " syml
 #: src/cmd.c:1132
 #, c-format
 msgid " Symlink `%s' points to: "
-msgstr " Symlänk `%s' pekar på: "
+msgstr " Symlänk \"%s\" pekar på: "
 
 #: src/cmd.c:1137
 msgid " Edit symlink "
@@ -1411,7 +1420,7 @@ msgstr " Kunde inte byta katalog till %s "
 
 #: src/cmd.c:1292
 msgid " Enter machine name (F1 for details): "
-msgstr " Mata in maskinnamnet (F1 för detaljer): "
+msgstr " Ange maskinnamn (F1 för detaljer): "
 
 #: src/cmd.c:1297 src/widget.c:1048
 msgid " Link to a remote machine "
@@ -1422,9 +1431,8 @@ msgid " FTP to machine "
 msgstr " FTP till maskin"
 
 #: src/cmd.c:1310
-#, fuzzy
 msgid " Shell link to machine "
-msgstr " SMB-länk till maskin "
+msgstr " Skallänk till maskin "
 
 #: src/cmd.c:1317 src/widget.c:1050
 msgid " SMB link to machine "
@@ -1455,7 +1463,7 @@ msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
 msgstr ""
-" Mata in namnet på enheten (utan /dev/) som du \n"
+" Ange namnet på enheten (utan /dev/) som du \n"
 " vill återskapa filer på: (F1 för detaljer)"
 
 #: src/cmd.c:1399
@@ -1528,6 +1536,7 @@ msgstr "&Storlek"
 msgid "&Inode"
 msgstr "&Inod"
 
+#. New sort orders
 #: src/dir.c:60
 msgid "&Type"
 msgstr "&Typ"
@@ -1553,9 +1562,8 @@ msgid "&Group"
 msgstr "gru&Pp"
 
 #: src/dir.c:478 src/dir.c:584
-#, fuzzy
 msgid "Cannot read directory contents"
-msgstr "Kan inte ändra katalog"
+msgstr "Kan inte läsa kataloginnehåll"
 
 #: src/ext.c:106 src/user.c:568
 #, c-format
@@ -1622,7 +1630,7 @@ msgstr " Flytta "
 
 #: src/file.c:142 src/tree.c:765
 msgid " Delete "
-msgstr " Radera "
+msgstr " Ta bort "
 
 #: src/file.c:229
 msgid " Invalid target mask "
@@ -1699,7 +1707,7 @@ msgid ""
 " Cannot chown target file \"%s\" \n"
 " %s "
 msgstr ""
-" Kan inte ändra ägare på målfilen \"%s\" \n"
+" Kan inte byta ägare på målfilen \"%s\" \n"
 " %s "
 
 #: src/file.c:599 src/file.c:857
@@ -1798,7 +1806,7 @@ msgstr "Den 
 
 #: src/file.c:830
 msgid "&Delete"
-msgstr "&Radera"
+msgstr "&Ta bort"
 
 #: src/file.c:830
 msgid "&Keep"
@@ -1932,6 +1940,15 @@ msgstr ""
 " Kan inte radera katalog \"%s\" \n"
 " %s "
 
+#.
+#. * This array introduced to avoid translation problems. The former (op_names)
+#. * is assumed to be nouns, suitable in dialog box titles; this one should
+#. * contain whatever is used in prompt itself (i.e. in russian, it's verb).
+#. * Notice first symbol - it is to fool gettext and force these strings to
+#. * be different for it. First symbol is skipped while building a prompt.
+#. * (I don't use spaces around the words, because someday they could be
+#. * dropped, when widgets get smarter)
+#.
 #: src/file.c:1689
 msgid "1Copy"
 msgstr "1Kopiera"
@@ -1942,8 +1959,17 @@ msgstr "1Flytta"
 
 #: src/file.c:1689
 msgid "1Delete"
-msgstr "1Radera"
+msgstr "1Ta bort"
 
+#.
+#. * These are formats for building a prompt. Parts encoded as follows:
+#. * %o - operation from op_names1
+#. * %f - file/files or files/directories, as appropriate
+#. * %m - "with source mask" or question mark for delete
+#. * %s - source name (truncated)
+#. * %d - number of marked files
+#. * %e - "to:" or question mark for delete
+#. *
 #: src/file.c:1704
 #, no-c-format
 msgid "%o %f \"%s\"%m"
@@ -2006,7 +2032,7 @@ msgid ""
 msgstr ""
 "\n"
 "  Katalogen är inte tom.  \n"
-"  Radera den rekursivt? "
+"  Ta bort den rekursivt? "
 
 #: src/file.c:2233
 msgid ""
@@ -2020,7 +2046,7 @@ msgstr ""
 
 #: src/file.c:2235
 msgid " Delete: "
-msgstr " Radera: "
+msgstr " Ta bort: "
 
 #: src/file.c:2241 src/filegui.c:537
 msgid "Non&e"
@@ -2029,22 +2055,22 @@ msgstr "&Ingen"
 #: src/filegui.c:341
 #, c-format
 msgid "ETA %d:%02d.%02d"
-msgstr ""
+msgstr "Klar om %d:%02d.%02d"
 
 #: src/filegui.c:364
 #, c-format
 msgid "%.2f MB/s"
-msgstr ""
+msgstr "%.2f MB/s"
 
 #: src/filegui.c:367
 #, c-format
 msgid "%.2f KB/s"
-msgstr ""
+msgstr "%.2f kB/s"
 
 #: src/filegui.c:370
 #, c-format
 msgid "%ld B/s"
-msgstr ""
+msgstr "%ld B/s"
 
 #: src/filegui.c:393
 msgid "File"
@@ -2069,7 +2095,7 @@ msgstr "M
 
 #: src/filegui.c:515
 msgid "Deleting"
-msgstr "Raderar"
+msgstr "Tar bort"
 
 #: src/filegui.c:534
 #, c-format
@@ -2120,14 +2146,17 @@ msgstr " Filen existerar "
 msgid " Background process: File exists "
 msgstr " Bakgrundsprocess: Filen existerar "
 
+#. follow symlinks and preserve Attributes must be the first
 #: src/filegui.c:746
 msgid "preserve &Attributes"
 msgstr "bevara &Attribut"
 
+#. &op_preserve
 #: src/filegui.c:748
 msgid "follow &Links"
 msgstr "följ &Länkar"
 
+#. &file_mask_op_follow_links
 #: src/filegui.c:750
 msgid "to:"
 msgstr "till:"
@@ -2144,6 +2173,7 @@ msgstr "&Bakgrund"
 msgid "&Stable Symlinks"
 msgstr "&Stabila symlänkar"
 
+#. &file_mask_stable_symlinks
 #: src/filegui.c:784
 msgid "&Dive into subdir if exists"
 msgstr "&Dyk in i underkataloger  "
@@ -2156,7 +2186,7 @@ msgid ""
 "Invalid source pattern `%s' \n"
 " %s "
 msgstr ""
-"Ogiltigt sökmönster `%s' \n"
+"Ogiltigt sökmönster \"%s\" \n"
 " %s "
 
 #: src/find.c:102
@@ -2229,6 +2259,7 @@ msgstr "S
 msgid "Searching"
 msgstr "Söker"
 
+#. Create a replacement page with the error message
 #: src/help.c:280
 msgid " Help file format error\n"
 msgstr " Fel i hjälpfilens format\n"
@@ -2303,6 +2334,7 @@ msgstr "Katalogfavoriter"
 msgid " Directory path "
 msgstr " Katalogsökväg"
 
+#. This one holds the displayed pathname
 #: src/hotlist.c:621 src/hotlist.c:671
 msgid " Directory label "
 msgstr " Katalogetikett"
@@ -2377,6 +2409,7 @@ msgstr " Ladda favoriter "
 msgid "Midnight Commander %s"
 msgstr "Midnight Commander %s"
 
+#. This printf pattern string is used as a reference for size
 #: src/info.c:99
 #, c-format
 msgid "File:       %s"
@@ -2482,9 +2515,8 @@ msgid "&Horizontal"
 msgstr "&Horisontell"
 
 #: src/layout.c:164
-#, fuzzy
 msgid "&Xterm window title"
-msgstr "visa &Xterm tipsrad"
+msgstr "&Xterm-fönstertitel"
 
 #: src/layout.c:165
 msgid "h&Intbar visible"
@@ -2522,6 +2554,7 @@ msgstr "&Filtyper"
 msgid "&Save"
 msgstr "&Spara"
 
+#. length of line with '<' '>' buttons
 #: src/layout.c:370
 msgid " Panel split "
 msgstr " Dela panelen "
@@ -2578,7 +2611,7 @@ msgstr " Kan inte acceptera den h
 #: src/learn.c:117
 #, c-format
 msgid " You have entered \"%s\""
-msgstr " Du har matat in \"%s\""
+msgstr " Du har angett \"%s\""
 
 #. TRANSLATORS: This label appears near learned keys.  Keep it short.
 #: src/learn.c:166
@@ -2687,9 +2720,8 @@ msgid "FT&P link..."
 msgstr "FT&Plänk..."
 
 #: src/main.c:969 src/main.c:996
-#, fuzzy
 msgid "S&hell link..."
-msgstr "SM&B länk..."
+msgstr "S&kallänk..."
 
 #: src/main.c:971 src/main.c:998
 msgid "SM&B link..."
@@ -2742,7 +2774,7 @@ msgstr "&SymL
 
 #: src/main.c:1019
 msgid "edit s&Ymlink  C-x C-s"
-msgstr "ändra s&YmLänk C-x C-s"
+msgstr "redigera s&YmLänk C-x C-s"
 
 #: src/main.c:1020
 msgid "ch&Own           C-x o"
@@ -2758,11 +2790,11 @@ msgstr "byt namn/&Flytta   F6"
 
 #: src/main.c:1024
 msgid "&Mkdir              F7"
-msgstr "Skapa &Katalog      F7"
+msgstr "skapa &Katalog      F7"
 
 #: src/main.c:1025
 msgid "&Delete             F8"
-msgstr "&Radera             F8"
+msgstr "&Ta bort            F8"
 
 #: src/main.c:1026
 msgid "&Quick cd          M-c"
@@ -2770,7 +2802,7 @@ msgstr "snabb &Cd          M-c"
 
 #: src/main.c:1028
 msgid "select &Group      M-+"
-msgstr "välj &Grupp        M-+"
+msgstr "välj &grupp        M-+"
 
 #: src/main.c:1029
 msgid "u&Nselect group    M-\\"
@@ -2785,6 +2817,10 @@ msgid "e&Xit              F10"
 msgstr "&Avsluta           F10"
 
 # # >>---<< 
+#. I know, I'm lazy, but the tree widget when it's not running
+#. * as a panel still has some problems, I have not yet finished
+#. * the WTree widget port, sorry.
+#.
 #: src/main.c:1040
 msgid "&Directory tree"
 msgstr "katalogtr&Äd"
@@ -2839,24 +2875,23 @@ msgstr "&
 
 #: src/main.c:1062
 msgid "&Listing format edit"
-msgstr "ändra &Listningsformatet"
+msgstr "Redigera &listningsformatet"
 
 #: src/main.c:1067
 msgid "Edit &extension file"
-msgstr "ändra &Utökningsfilen"
+msgstr "Redigera &utökningsfil"
 
 #: src/main.c:1068
 msgid "Edit &menu file"
-msgstr "ändra &Menyfilen"
+msgstr "Redigera &menyfilen"
 
 #: src/main.c:1070
 msgid "Edit edi&tor menu file"
 msgstr "Redigera meny&redigeraren"
 
 #: src/main.c:1071
-#, fuzzy
 msgid "Edit &syntax file"
-msgstr "ändra &Menyfilen"
+msgstr "Redigera &syntaxfil"
 
 #: src/main.c:1077
 msgid "&Configuration..."
@@ -2945,13 +2980,12 @@ msgid "[flags] [this_dir] [other_panel_dir]\n"
 msgstr "[flaggor] [denna katalog] [annan panels katalog]\n"
 
 #: src/main.c:2132
-#, fuzzy
 msgid "+number"
-msgstr "Inodnummer"
+msgstr "+nummer"
 
 #: src/main.c:2133
 msgid "Set initial line number for the internal editor"
-msgstr ""
+msgstr "Ställ in initialt radnummer för den interna redigeraren"
 
 #: src/main.c:2135
 msgid ""
@@ -3033,12 +3067,11 @@ msgstr "Logga ftpdialog till specificerad fil"
 
 #: src/main.c:2246
 msgid "Set debug level"
-msgstr ""
+msgstr "Ställ in felsökningsnivå"
 
 #: src/main.c:2250
-#, fuzzy
 msgid "Print data directory"
-msgstr "Skapar en ny katalog"
+msgstr "Skriv ut datakatalog"
 
 #: src/main.c:2252
 msgid "Requests to run in black and white"
@@ -3053,14 +3086,12 @@ msgid "Disables subshell support"
 msgstr "Stäng av stöd för subshell"
 
 #: src/main.c:2259
-#, fuzzy
 msgid "Force subshell execution"
-msgstr "sätt användar-ID vid exekvering"
+msgstr "Tvinga exekvering av underskal"
 
 #: src/main.c:2262
-#, fuzzy
 msgid "Print last working directory to specified file"
-msgstr "Skriver ut arbetskatalogen vid programmavslutning"
+msgstr "Skriv ut senaste arbetskatalog till angiven fil"
 
 #: src/main.c:2264
 msgid "Resets soft keys on HP terminals"
@@ -3072,7 +3103,7 @@ msgstr "Att k
 
 #: src/main.c:2269
 msgid "Use stickchars to draw"
-msgstr "Använd 'stickchars' för att rita"
+msgstr "Använd \"stickchars\" för att rita"
 
 # incomplete
 #: src/main.c:2273
@@ -3110,6 +3141,7 @@ msgstr ""
 " sparas numera i ~/.mc-katalogen. Filerna har  \n"
 " flyttats nu\n"
 
+#. other options
 #: src/option.c:61
 msgid "safe de&Lete"
 msgstr "s&Äker radering"
@@ -3158,6 +3190,7 @@ msgstr "Ber
 msgid "&Verbose operation"
 msgstr "&Utförliga operationer"
 
+#. panel options
 #: src/option.c:74
 msgid "&Fast dir reload"
 msgstr "&Snabb katalogomladdning"
@@ -3180,11 +3213,11 @@ msgstr "visa &G
 
 #: src/option.c:79
 msgid "show &Backup files"
-msgstr "visa &Backupfiler"
+msgstr "visa &Säkerhetskopior"
 
 #: src/option.c:90
 msgid "&Never"
-msgstr "al&drig"
+msgstr "al&Drig"
 
 #: src/option.c:91
 msgid "on dumb &Terminals"
@@ -3195,6 +3228,7 @@ msgid "Alwa&ys"
 msgstr "&Alltid"
 
 # kort och bra
+#. Similar code is in layout.c (init_layout())
 #: src/option.c:154
 msgid " Panel options "
 msgstr " Panelinställningar "
@@ -3229,7 +3263,7 @@ msgstr " L
 
 #: src/panelize.c:226
 msgid " Enter command label: "
-msgstr " Mata in kommandoetikett: "
+msgstr " Ange kommandoetikett: "
 
 #: src/panelize.c:266
 msgid " Cannot run external panelize in a non-local directory "
@@ -3259,16 +3293,15 @@ msgstr "Pipe close misslyckades"
 
 #: src/popt.c:547
 msgid "missing argument"
-msgstr ""
+msgstr "argument saknas"
 
 #: src/popt.c:549
-#, fuzzy
 msgid "unknown option"
-msgstr "<Okänd grupp>"
+msgstr "okänd flagga"
 
 #: src/popt.c:555
 msgid "invalid numeric value"
-msgstr ""
+msgstr "ogiltigt numeriskt värde"
 
 #: src/popthelp.c:31
 msgid "Show this help message"
@@ -3280,24 +3313,23 @@ msgstr "Visa korta anv
 
 #: src/popthelp.c:60
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
 #: src/popthelp.c:179
-#, fuzzy
 msgid "Usage:"
-msgstr "Användarnamn:"
+msgstr "Användning:"
 
 #: src/screen.c:202
 msgid "UP--DIR"
-msgstr "Förälderkatalog"
+msgstr "UPPKAT"
 
 #: src/screen.c:223
 msgid "SYMLINK"
-msgstr "Symbolisk länk"
+msgstr "SYMLÄNK"
 
 #: src/screen.c:227
 msgid "SUB-DIR"
-msgstr "Underkatalog"
+msgstr "UNDERKAT"
 
 #: src/screen.c:407 src/screen.c:408
 msgid "Size"
@@ -3389,6 +3421,7 @@ msgstr "Redigera"
 msgid "RenMov"
 msgstr "RenMov"
 
+#. FIXME: mkdir is currently defunct
 #: src/screen.c:2197 src/tree.c:1040
 msgid "Mkdir"
 msgstr "Mkdir"
@@ -3432,7 +3465,7 @@ msgstr " Skalet 
 #: src/subshell.c:840
 #, c-format
 msgid "Warning: Cannot change to %s.\n"
-msgstr "Varning: Kan inte ändra till %s.\n"
+msgstr "Varning: Kan inte byta till %s.\n"
 
 #: src/textconf.c:50
 msgid "With builtin Editor\n"
@@ -3525,7 +3558,7 @@ msgstr ""
 #: src/tree.c:764
 #, c-format
 msgid "  Delete %s?  "
-msgstr "  Radera %s?  "
+msgstr "  Ta bort %s?  "
 
 #: src/tree.c:796
 msgid "Static"
@@ -3604,50 +3637,49 @@ msgstr ""
 msgid " No suitable entries found in %s "
 msgstr "Inga lämpliga poster funna i %s "
 
+#. Create listbox
 #: src/user.c:787
 msgid " User menu "
 msgstr " Användarmeny "
 
+#. strftime() format string for recent dates
 #: src/util.c:665 src/util.c:691
 msgid "%b %e %H:%M"
 msgstr "%e %b %H.%M"
 
+#. strftime() format string for old dates
 #: src/util.c:666 src/util.c:689
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
 #: src/utilunix.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a directory\n"
-msgstr "Skapar en ny katalog"
+msgstr "%s är inte en katalog\n"
 
 #: src/utilunix.c:335
 #, c-format
 msgid "Directory %s is not owned by you\n"
-msgstr ""
+msgstr "Katalogen %s ägs inte av dig\n"
 
 #: src/utilunix.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot set correct permissions for directory %s\n"
-msgstr ""
-" Kan inte skapa målkatalog \"%s\" \n"
-" %s "
+msgstr "Kan inte ställa in rätt rättigheter för katalogen %s\n"
 
 #: src/utilunix.c:343
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create temporary directory %s: %s\n"
-msgstr ""
-" Kan inte skapa målkatalog \"%s\" \n"
-" %s "
+msgstr "Kan inte skapa temporär katalog %s: %s\n"
 
 #: src/utilunix.c:373
 #, c-format
 msgid "Temporary files will be created in %s\n"
-msgstr ""
+msgstr "Temporära filer kommer att skapas i %s\n"
 
 #: src/utilunix.c:376
 msgid "Temporary files will not be created\n"
-msgstr ""
+msgstr "Temporära filer kommer inte att skapas\n"
 
 #: src/utilunix.c:401
 msgid " Pipe failed "
@@ -3663,7 +3695,7 @@ msgstr " Kan inte skapa barnprogram "
 
 #: src/view.c:548
 msgid "Empty output from child filter"
-msgstr ""
+msgstr "Tom utdata från barnfilter"
 
 #: src/view.c:554
 msgid " Cannot open file "
@@ -3816,6 +3848,8 @@ msgstr "Formera"
 msgid " History "
 msgstr " Historik "
 
+#. KEY_F(0) is not here, since we are mapping it to f10, so there is no reason
+#. to define f0 as well. Also, it makes Learn keys a bunch of problems :(
 #: src/win.c:121
 msgid "Function key 1"
 msgstr "Funktionstangent 1"
@@ -3956,6 +3990,7 @@ msgstr "- p
 msgid "* on keypad"
 msgstr "* på numeriska tangentbordet"
 
+#. From here on, these won't be shown in Learn keys (no space)
 #: src/win.c:157
 msgid "Left arrow keypad"
 msgstr "Vänsterpil, numeriska"
@@ -4048,6 +4083,11 @@ msgstr ""
 "i cpio-arkivet\n"
 "%s"
 
+#. In case entry is already there
+#. This shouldn't happen! (well, it can happen if there is a record for a
+#. file and than a record for a directory it is in; cpio would die with
+#. 'No such file or directory' is such case)
+#. This can be considered archive inconsistency
 #: vfs/cpio.c:453
 #, c-format
 msgid "%s contains duplicate entries! Skipping!"
@@ -4142,6 +4182,7 @@ msgstr "%s: klar."
 msgid "%s: failure"
 msgstr "%s: fel"
 
+#. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null )
 #: vfs/fish.c:485
 #, c-format
 msgid "fish: store %s: sending command..."
@@ -4535,3 +4576,78 @@ msgstr "%s: %s: %s %3d%% (%lu byte 
 #, c-format
 msgid "%s: %s: %s %lu bytes transferred"
 msgstr "%s: %s: %s %lu byte överförda"
+
+#~ msgid " Error "
+#~ msgstr " Fel "
+
+#~ msgid " Error reading file: "
+#~ msgstr " Fel vid läsning från fil: "
+
+#~ msgid ""
+#~ " \n"
+#~ " Increase edit.h:MAXBUF and recompile the editor. "
+#~ msgstr ""
+#~ " \n"
+#~ " Öka edit.h:MAXBUF och kompilera om textredigeraren. "
+
+#~ msgid "&Ok"
+#~ msgstr "&OK"
+
+#~ msgid " Warning "
+#~ msgstr " Varning "
+
+#~ msgid " Save as "
+#~ msgstr " Spara som "
+
+#~ msgid " Error trying to save file. "
+#~ msgstr " Fel vid skrivning till fil. "
+
+#~ msgid " Error trying to open temp file "
+#~ msgstr " Fel vid försök att öppna temporär fil "
+
+#~ msgid " Error trying to open macro file "
+#~ msgstr " Fel vid försök att öppna makrofil "
+
+#~ msgid " Error trying to overwrite macro file "
+#~ msgstr " Fel vid försök att skriva över makrofil "
+
+#~ msgid " Macro "
+#~ msgstr " Makro "
+
+#~ msgid "Macro"
+#~ msgstr "Makro"
+
+#~ msgid " Delete Macro "
+#~ msgstr " Ta bort makro "
+
+#~ msgid " Continue "
+#~ msgstr " Fortsätt "
+
+#~ msgid " Cancel "
+#~ msgstr " Avbryt "
+
+#~ msgid "o&Ne"
+#~ msgstr "e&N"
+
+#~ msgid "al&L"
+#~ msgstr "al&La"
+
+#~ msgid " Search "
+#~ msgstr " Sök "
+
+#~ msgid " Search string not found. "
+#~ msgstr " Söksträngen kunde inte hittas. "
+
+# ?
+# får plats
+#~ msgid " Quit "
+#~ msgstr " Avsluta "
+
+#~ msgid " Insert file "
+#~ msgstr " Infoga fil "
+
+#~ msgid " Error trying to insert file. "
+#~ msgstr " Fel vid försök att infoga fil. "
+
+#~ msgid "Error trying to stat file:"
+#~ msgstr "Fel vid försök att ta status på fil: "