diff --git a/po/sv.po b/po/sv.po
index 1ded024..05095cb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the TigerVNC package.
 # Peter Åstrand <astrand@cendio.se>, 2011.
 # Göran Uddeborg <goeran@uddeborg.se>, 2015.
-# (Only submitting contribution from unknown contributor.)
 #
-# $Revision: 1.7 $
+# $Revision: 1.9 $
 msgid ""
 msgstr ""
-"Project-Id-Version: tigervnc 1.4.90\n"
+"Project-Id-Version: tigervnc 1.5.90\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
-"POT-Creation-Date: 2015-06-22 07:27+0000\n"
-"PO-Revision-Date: 2015-06-24 21:44+0200\n"
+"POT-Creation-Date: 2015-11-26 11:33+0000\n"
+"PO-Revision-Date: 2015-12-02 22:50+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -25,103 +24,103 @@
 msgid "connected to host %s port %d"
 msgstr "ansluten till värd %s port %d"
 
-#: vncviewer/CConn.cxx:172
+#: vncviewer/CConn.cxx:173
 #, c-format
 msgid "Desktop name: %.80s"
 msgstr "Skrivbordsnamn: %.80s"
 
-#: vncviewer/CConn.cxx:177
+#: vncviewer/CConn.cxx:178
 #, c-format
 msgid "Host: %.80s port: %d"
 msgstr "Värd: %.80s port: %d"
 
-#: vncviewer/CConn.cxx:182
+#: vncviewer/CConn.cxx:183
 #, c-format
 msgid "Size: %d x %d"
 msgstr "Storlek: %d x %d"
 
-#: vncviewer/CConn.cxx:190
+#: vncviewer/CConn.cxx:191
 #, c-format
 msgid "Pixel format: %s"
 msgstr "Pixelformat: %s"
 
-#: vncviewer/CConn.cxx:197
+#: vncviewer/CConn.cxx:198
 #, c-format
 msgid "(server default %s)"
 msgstr "(serverstandard %s)"
 
-#: vncviewer/CConn.cxx:202
+#: vncviewer/CConn.cxx:203
 #, c-format
 msgid "Requested encoding: %s"
 msgstr "Begärd kodning: %s"
 
-#: vncviewer/CConn.cxx:207
+#: vncviewer/CConn.cxx:208
 #, c-format
 msgid "Last used encoding: %s"
 msgstr "Senast använd kodning: %s"
 
-#: vncviewer/CConn.cxx:212
+#: vncviewer/CConn.cxx:213
 #, c-format
 msgid "Line speed estimate: %d kbit/s"
 msgstr "Uppskattad hastighet på förbindelsen: %d kbit/s"
 
-#: vncviewer/CConn.cxx:217
+#: vncviewer/CConn.cxx:218
 #, c-format
 msgid "Protocol version: %d.%d"
 msgstr "Protokollversion: %d.%d"
 
-#: vncviewer/CConn.cxx:222
+#: vncviewer/CConn.cxx:223
 #, c-format
 msgid "Security method: %s"
 msgstr "Säkerhetsmetod: %s"
 
-#: vncviewer/CConn.cxx:322
+#: vncviewer/CConn.cxx:329
 #, c-format
 msgid "SetDesktopSize failed: %d"
 msgstr "SetDesktopSize misslyckades: %d"
 
-#: vncviewer/CConn.cxx:387
+#: vncviewer/CConn.cxx:398
 msgid "Invalid SetColourMapEntries from server!"
 msgstr "Ogiltig SetColourMapEntries från server!"
 
 #. TRANSLATORS: Refers to a VNC protocol encoding type
-#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#: vncviewer/CConn.cxx:444 vncviewer/CConn.cxx:451
 #, c-format
 msgid "Unknown encoding %d"
 msgstr "Okänd kodning %d"
 
-#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+#: vncviewer/CConn.cxx:445 vncviewer/CConn.cxx:452
 msgid "Unknown encoding"
 msgstr "Okänd kodning"
 
-#: vncviewer/CConn.cxx:473
+#: vncviewer/CConn.cxx:484
 msgid "Enabling continuous updates"
 msgstr "Aktiverar kontinuerliga uppdateringar"
 
-#: vncviewer/CConn.cxx:543
+#: vncviewer/CConn.cxx:554
 #, c-format
 msgid "Throughput %d kbit/s - changing to quality %d"
 msgstr "Bandbredd %d kbit/s - byter till kvalitet %d"
 
-#: vncviewer/CConn.cxx:565
+#: vncviewer/CConn.cxx:576
 #, c-format
 msgid "Throughput %d kbit/s - full color is now %s"
 msgstr "Bandbredd %d kbit/s - fullfärg är nu %s"
 
-#: vncviewer/CConn.cxx:567
+#: vncviewer/CConn.cxx:578
 msgid "disabled"
 msgstr "avaktiverad"
 
-#: vncviewer/CConn.cxx:567
+#: vncviewer/CConn.cxx:578
 msgid "enabled"
 msgstr "aktiverad"
 
-#: vncviewer/CConn.cxx:577
+#: vncviewer/CConn.cxx:588
 #, c-format
 msgid "Using %s encoding"
 msgstr "Använder kodning %s"
 
-#: vncviewer/CConn.cxx:624
+#: vncviewer/CConn.cxx:635
 #, c-format
 msgid "Using pixel format %s"
 msgstr "Använder pixelformat %s"
@@ -165,11 +164,11 @@
 msgstr "VNC-visare: Anslutningsalternativ"
 
 #: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
-#: vncviewer/vncviewer.cxx:263
+#: vncviewer/vncviewer.cxx:268
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:267
 msgid "OK"
 msgstr "Ok"
 
@@ -354,8 +353,6 @@
 msgid "Opening password file failed"
 msgstr "Öppning av lösenordsfilen misslyckades"
 
-#. Largely copied from FLTK so that we get the same look and feel
-#. as the simpler password input.
 #: vncviewer/UserDialog.cxx:86 vncviewer/UserDialog.cxx:96
 msgid "VNC authentication"
 msgstr "VNC-autentisering"
@@ -372,95 +369,112 @@
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: vncviewer/Viewport.cxx:434
+#: vncviewer/Viewport.cxx:433
 #, c-format
 msgid "Unable to create platform specific framebuffer: %s"
 msgstr "Kan inte skapa plattformsspecifik framebuffer: %s"
 
-#: vncviewer/Viewport.cxx:435
+#: vncviewer/Viewport.cxx:434
 msgid "Using platform independent framebuffer"
 msgstr "Använder plattformsoberoende framebuffer"
 
-#: vncviewer/Viewport.cxx:669
+#: vncviewer/Viewport.cxx:668
 #, c-format
 msgid "No scan code for extended virtual key 0x%02x"
 msgstr "Ingen scancode för utökad virtuell tangent 0x%02x"
 
-#: vncviewer/Viewport.cxx:671
+#: vncviewer/Viewport.cxx:670
 #, c-format
 msgid "No scan code for virtual key 0x%02x"
 msgstr "Ingen scancode för virtuell tangent 0x%02x"
 
-#: vncviewer/Viewport.cxx:688
+#: vncviewer/Viewport.cxx:687
 #, c-format
 msgid "No symbol for extended virtual key 0x%02x"
 msgstr "Ingen symbol för utökad virtuell tangent 0x%02x"
 
-#: vncviewer/Viewport.cxx:690
+#: vncviewer/Viewport.cxx:689
 #, c-format
 msgid "No symbol for virtual key 0x%02x"
 msgstr "Ingen symbol för virtuell tangent 0x%02x"
 
-#: vncviewer/Viewport.cxx:728
+#: vncviewer/Viewport.cxx:727
 #, c-format
 msgid "No symbol for key code 0x%02x (in the current state)"
 msgstr "Ingen symbol för tangentkod 0x%02x (i nuvarande tillstånd)"
 
-#: vncviewer/Viewport.cxx:754
+#: vncviewer/Viewport.cxx:753
 #, c-format
 msgid "No symbol for key code %d (in the current state)"
 msgstr "Ingen symbol för tangentkod %d (i nuvarande tillstånd)"
 
-#: vncviewer/Viewport.cxx:791
+#: vncviewer/Viewport.cxx:790
+msgctxt "ContextMenu|"
 msgid "E&xit viewer"
 msgstr "&Avsluta visaren"
 
-#: vncviewer/Viewport.cxx:794
+#: vncviewer/Viewport.cxx:793
+msgctxt "ContextMenu|"
 msgid "&Full screen"
 msgstr "&Fullskärm"
 
 #: vncviewer/Viewport.cxx:796
+msgctxt "ContextMenu|"
+msgid "Minimi&ze"
+msgstr "M&inimera"
+
+#: vncviewer/Viewport.cxx:798
+msgctxt "ContextMenu|"
 msgid "Resize &window to session"
 msgstr "Anpassa &fönster till session"
 
-#: vncviewer/Viewport.cxx:801
+#: vncviewer/Viewport.cxx:803
+msgctxt "ContextMenu|"
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
-#: vncviewer/Viewport.cxx:803
+#: vncviewer/Viewport.cxx:806
+msgctxt "ContextMenu|"
 msgid "&Alt"
 msgstr "&Alt"
 
-#: vncviewer/Viewport.cxx:808
+#: vncviewer/Viewport.cxx:812
 #, c-format
+msgctxt "ContextMenu|"
 msgid "Send %s"
 msgstr "Skicka %s"
 
-#: vncviewer/Viewport.cxx:814
+#: vncviewer/Viewport.cxx:818
+msgctxt "ContextMenu|"
 msgid "Send Ctrl-Alt-&Del"
 msgstr "Skicka Ctrl-Alt-&Del"
 
-#: vncviewer/Viewport.cxx:817
+#: vncviewer/Viewport.cxx:821
+msgctxt "ContextMenu|"
 msgid "&Refresh screen"
 msgstr "&Uppdatera skärm"
 
-#: vncviewer/Viewport.cxx:820
+#: vncviewer/Viewport.cxx:824
+msgctxt "ContextMenu|"
 msgid "&Options..."
 msgstr "&Inställningar..."
 
-#: vncviewer/Viewport.cxx:822
+#: vncviewer/Viewport.cxx:826
+msgctxt "ContextMenu|"
 msgid "Connection &info..."
 msgstr "&Information om anslutningen..."
 
-#: vncviewer/Viewport.cxx:824
+#: vncviewer/Viewport.cxx:828
+msgctxt "ContextMenu|"
 msgid "About &TigerVNC viewer..."
 msgstr "Om &TigerVNC-visaren..."
 
-#: vncviewer/Viewport.cxx:827
+#: vncviewer/Viewport.cxx:831
+msgctxt "ContextMenu|"
 msgid "Dismiss &menu"
 msgstr "Stäng &meny"
 
-#: vncviewer/Viewport.cxx:908
+#: vncviewer/Viewport.cxx:915
 msgid "VNC connection info"
 msgstr "VNC anslutningsinformation"
 
@@ -569,7 +583,6 @@
 msgid "Failed to read configuration file, can't obtain home directory path."
 msgstr "Misslyckades med att läsa konfigurations-fil, kan inte avgöra hemkatalogens sökväg."
 
-#. Use defaults.
 #: vncviewer/parameters.cxx:565
 #, c-format
 msgid "Failed to read configuration file, can't open %s: %s"
@@ -617,130 +630,90 @@
 "Copyright (C) 1999-%d TigerVNC-teamet och många andra (se README.txt)\n"
 "Se http://www.tigervnc.org för information om TigerVNC."
 
-#: vncviewer/vncviewer.cxx:122
+#: vncviewer/vncviewer.cxx:127
 msgid "About TigerVNC Viewer"
 msgstr "Om VNC-visaren"
 
-#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
+#: vncviewer/vncviewer.cxx:144 vncviewer/vncviewer.cxx:156
 #, c-format
 msgid "Error starting new TigerVNC Viewer: %s"
 msgstr "Fel vid start av ny TigerVNC-visare: %s"
 
-#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
-#. exit() rather than the default which is to abort.
-#: vncviewer/vncviewer.cxx:160
+#: vncviewer/vncviewer.cxx:165
 #, c-format
 msgid "Termination signal %d has been received. TigerVNC Viewer will now exit."
 msgstr "Termineringssignal %d har mottagits. TigerVNC-visaren kommer nu att avslutas."
 
-#. Avoid empty titles for popups
-#: vncviewer/vncviewer.cxx:252
+#: vncviewer/vncviewer.cxx:257
 msgid "TigerVNC Viewer"
 msgstr "VNC-visare"
 
-#. FLTK exposes these so that we can translate them.
-#: vncviewer/vncviewer.cxx:260
+#: vncviewer/vncviewer.cxx:265
 msgid "No"
 msgstr "Ingen"
 
-#: vncviewer/vncviewer.cxx:261
+#: vncviewer/vncviewer.cxx:266
 msgid "Yes"
 msgstr "Ja"
 
-#: vncviewer/vncviewer.cxx:264
+#: vncviewer/vncviewer.cxx:269
 msgid "Close"
 msgstr "Stäng"
 
-#: vncviewer/vncviewer.cxx:269
+#: vncviewer/vncviewer.cxx:274
 msgid "About"
 msgstr "Om"
 
-#: vncviewer/vncviewer.cxx:272
+#: vncviewer/vncviewer.cxx:277
 msgid "Hide"
 msgstr "Göm"
 
-#: vncviewer/vncviewer.cxx:275
+#: vncviewer/vncviewer.cxx:280
 msgid "Quit"
 msgstr "Avsluta"
 
-#. Don't want the print item
-#: vncviewer/vncviewer.cxx:279
+#: vncviewer/vncviewer.cxx:284
 msgid "Services"
 msgstr "Tjänster"
 
-#: vncviewer/vncviewer.cxx:280
+#: vncviewer/vncviewer.cxx:285
 msgid "Hide Others"
 msgstr "Göm andra"
 
-#: vncviewer/vncviewer.cxx:281
+#: vncviewer/vncviewer.cxx:286
 msgid "Show All"
 msgstr "Visa alla"
 
-#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
-#. which means we cannot use our generic Fl_Menu_ helpers.
-#: vncviewer/vncviewer.cxx:290
+#: vncviewer/vncviewer.cxx:295
+msgctxt "SysMenu|"
 msgid "&File"
 msgstr "&Arkiv"
 
-#: vncviewer/vncviewer.cxx:292
+#: vncviewer/vncviewer.cxx:298
+msgctxt "SysMenu|File|"
 msgid "&New Connection"
 msgstr "&Ny anslutning"
 
-#: vncviewer/vncviewer.cxx:303
+#: vncviewer/vncviewer.cxx:310
 msgid "Could not create VNC home directory: can't obtain home directory path."
 msgstr "Kunde inte skapa VNC-hemkatalog: kan inte avgöra hemkatalogens sökväg"
 
-#: vncviewer/vncviewer.cxx:308
+#: vncviewer/vncviewer.cxx:315
 #, c-format
 msgid "Could not create VNC home directory: %s."
 msgstr "Kunde inte skapa VNC-hemkatalog: %s."
 
 #. TRANSLATORS: "Parameters" are command line arguments, or settings
 #. from a file or the Windows registry.
-#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+#: vncviewer/vncviewer.cxx:520 vncviewer/vncviewer.cxx:521
 msgid "Parameters -listen and -via are incompatible"
 msgstr "Parametrar -listen och -via är inkompatibla"
 
-#: vncviewer/vncviewer.cxx:529
+#: vncviewer/vncviewer.cxx:536
 #, c-format
 msgid "Listening on port %d"
 msgstr "Lyssnar på port %d"
 
-#: vncviewer/vncviewer.cxx:590
+#: vncviewer/vncviewer.cxx:601
 msgid "Internal FLTK error. Exiting."
 msgstr "Internt FLTK-fel. Avslutar."
-
-#~ msgid "Multiple characters given for key code %d (0x%04x): '%s'"
-#~ msgstr "Multipla tecken angivna för tangentkod %d (0x%04x): '%s'"
-
-#~ msgid "Unknown FLTK key code %d (0x%04x)"
-#~ msgstr "Okänd FLTK-tangentkod %d (0x%04x)"
-
-#~ msgid "Unknown decimal separator: '%s'"
-#~ msgstr "Okänd decimalseparator: '%s'"
-
-#~ msgid "Unknown escape sequence at character %d"
-#~ msgstr "Okänd specialsekvens vid tecken %d"
-
-#~ msgid ""
-#~ "Desktop name: %.80s\n"
-#~ "Host: %.80s port: %d\n"
-#~ "Size: %d x %d\n"
-#~ "Pixel format: %s\n"
-#~ "(server default %s)\n"
-#~ "Requested encoding: %s\n"
-#~ "Last used encoding: %s\n"
-#~ "Line speed estimate: %d kbit/s\n"
-#~ "Protocol version: %d.%d\n"
-#~ "Security method: %s\n"
-#~ msgstr ""
-#~ "Skrivbordsnamn: %.80s\n"
-#~ "Värd: %.80s port: %d\n"
-#~ "Storlek: %d x %d\n"
-#~ "Pixelformat: %s\n"
-#~ "(serverstandard %s)\n"
-#~ "Begärd kodning: %s\n"
-#~ "Senast använd kodning: %s\n"
-#~ "Uppskattad hastighet på förbindelsen: %d kbit/s\n"
-#~ "Protokollversion: %d.%d\n"
-#~ "Säkerhetsmetod: %s\n"