Merge remote-tracking branch 'upstream/master'

34 files changed, 3841 insertions, 1645 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84fb7f3b..a46679b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,10 @@ include(CheckCSourceRuns)
 include(CMakeMacroLibtoolFile)
 
 project(tigervnc)
-set(VERSION 1.4.80)
+set(VERSION 1.5.80)
 
 # The RC version must always be four comma-separated numbers
-set(RCVERSION 1,4,80,0)
+set(RCVERSION 1,5,80,0)
 
 # Installation paths
 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index 1ebaeecb..f51873c1 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -145,9 +145,7 @@ TcpSocket::TcpSocket(int sock, bool close)
 TcpSocket::TcpSocket(const char *host, int port)
   : closeFd(true)
 {
-  int sock, err, result, family;
-  vnc_sockaddr_t sa;
-  socklen_t salen;
+  int sock, err, result;
   struct addrinfo *ai, *current, hints;
 
   // - Create a socket
@@ -165,11 +163,14 @@ TcpSocket::TcpSocket(const char *host, int port)
                     gai_strerror(result));
   }
 
-  // This logic is too complex for the compiler to determine if
-  // sock is properly assigned or not.
   sock = -1;
-
+  err = 0;
   for (current = ai; current != NULL; current = current->ai_next) {
+    int family;
+    vnc_sockaddr_t sa;
+    socklen_t salen;
+    char ntop[NI_MAXHOST];
+
     family = current->ai_family;
 
     switch (family) {
@@ -193,6 +194,9 @@ TcpSocket::TcpSocket(const char *host, int port)
     else
       sa.u.sin6.sin6_port = htons(port);
 
+    getnameinfo(&sa.u.sa, salen, ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST);
+    vlog.debug("Connecting to %s [%s] port %d", host, ntop, port);
+
     sock = socket (family, SOCK_STREAM, 0);
     if (sock == -1) {
       err = errorNumber;
@@ -207,7 +211,10 @@ TcpSocket::TcpSocket(const char *host, int port)
       if (err == EINTR)
         continue;
 #endif
+      vlog.debug("Failed to connect to address %s port %d: %d",
+                 ntop, port, err);
       closesocket(sock);
+      sock = -1;
       break;
     }
 
@@ -217,11 +224,12 @@ TcpSocket::TcpSocket(const char *host, int port)
 
   freeaddrinfo(ai);
 
-  if (current == NULL)
-    throw Exception("No useful address for host");
-
-  if (result == -1)
-    throw SocketException("unable connect to socket", err);
+  if (sock == -1) {
+    if (err == 0)
+      throw Exception("No useful address for host");
+    else
+      throw SocketException("unable connect to socket", err);
+  }
 
 #ifndef WIN32
   // - By default, close the socket on exec()
diff --git a/common/os/winerrno.h b/common/os/winerrno.h
index aebbdbe7..052d4de2 100644
--- a/common/os/winerrno.h
+++ b/common/os/winerrno.h
@@ -2,21 +2,9 @@
 /* Generated with:
 cat /usr/i686-pc-mingw32/sys-root/mingw/include/winerror.h \
  | awk '/#define WSAE.*WSABASE/{gsub("WSA", ""); print "#undef " $2 "\n#define " $2 " WSA" $2}' \
- | egrep -v '_QOS|PROVIDER|PROCTABLE'
+ | egrep -v 'EINTR|EBADF|EACCES|EFAULT|EINVAL|EMFILE|_QOS|PROVIDER|PROCTABLE'
 */
 
-#undef EINTR
-#define EINTR WSAEINTR
-#undef EBADF
-#define EBADF WSAEBADF
-#undef EACCES
-#define EACCES WSAEACCES
-#undef EFAULT
-#define EFAULT WSAEFAULT
-#undef EINVAL
-#define EINVAL WSAEINVAL
-#undef EMFILE
-#define EMFILE WSAEMFILE
 #undef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #undef EINPROGRESS
diff --git a/common/rdr/FdInStream.cxx b/common/rdr/FdInStream.cxx
index 22433a1b..9f35c9fb 100644
--- a/common/rdr/FdInStream.cxx
+++ b/common/rdr/FdInStream.cxx
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #ifdef _WIN32
 #include <winsock2.h>
 #ifndef _WIN32_WCE
@@ -34,7 +35,6 @@
 #include <os/winerrno.h>
 #else
 #include <sys/types.h>
-#include <errno.h>
 #include <unistd.h>
 #include <sys/time.h>
 #endif
diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx
index 83360d64..75131a64 100644
--- a/common/rdr/FdOutStream.cxx
+++ b/common/rdr/FdOutStream.cxx
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #ifdef _WIN32
 #include <winsock2.h>
 #define write(s,b,l) send(s,(const char*)b,l,0)
@@ -31,7 +32,6 @@
 #include <os/winerrno.h>
 #else
 #include <sys/types.h>
-#include <errno.h>
 #include <unistd.h>
 #include <sys/time.h>
 #endif
diff --git a/common/rfb/Cursor.cxx b/common/rfb/Cursor.cxx
index 8ef8b171..3bb8e0f6 100644
--- a/common/rfb/Cursor.cxx
+++ b/common/rfb/Cursor.cxx
@@ -38,6 +38,7 @@ void Cursor::setSize(int w, int h) {
 void Cursor::drawOutline(const Pixel& c)
 {
   Cursor outlined;
+  rdr::U8 cbuf[4];
 
   // Create a mirror of the existing cursor
   outlined.setPF(getPF());
@@ -45,7 +46,8 @@ void Cursor::drawOutline(const Pixel& c)
   outlined.hotspot = hotspot;
 
   // Clear the mirror's background to the outline colour
-  outlined.fillRect(getRect(), c);
+  outlined.getPF().bufferFromPixel(cbuf, c);
+  outlined.fillRect(getRect(), cbuf);
 
   // Blit the existing cursor, using its mask
   outlined.maskRect(getRect(), data, mask.buf);
diff --git a/common/rfb/Encoder.cxx b/common/rfb/Encoder.cxx
index 56b5f384..18b66809 100644
--- a/common/rfb/Encoder.cxx
+++ b/common/rfb/Encoder.cxx
@@ -38,13 +38,11 @@ void Encoder::writeSolidRect(int width, int height,
                              const PixelFormat& pf, const rdr::U8* colour)
 {
   ManagedPixelBuffer buffer(pf, width, height);
-  Pixel pixel;
 
   Palette palette;
   rdr::U32 palcol;
 
-  pixel = pf.pixelFromBuffer(colour);
-  buffer.fillRect(buffer.getRect(), pixel);
+  buffer.fillRect(buffer.getRect(), colour);
 
   palcol = 0;
   memcpy(&palcol, colour, pf.bpp/8);
diff --git a/common/rfb/PixelBuffer.cxx b/common/rfb/PixelBuffer.cxx
index b03af1af..89addabc 100644
--- a/common/rfb/PixelBuffer.cxx
+++ b/common/rfb/PixelBuffer.cxx
@@ -96,7 +96,7 @@ ModifiablePixelBuffer::~ModifiablePixelBuffer()
 {
 }
 
-void ModifiablePixelBuffer::fillRect(const Rect& r, Pixel pix)
+void ModifiablePixelBuffer::fillRect(const Rect& r, const void* pix)
 {
   int stride;
   U8 *buf;
@@ -113,20 +113,18 @@ void ModifiablePixelBuffer::fillRect(const Rect& r, Pixel pix)
 
   if (b == 1) {
     while (h--) {
-      memset(buf, pix, w);
+      memset(buf, *(const U8*)pix, w);
       buf += stride * b;
     }
   } else {
-    U8 pixbuf[4], *start;
+    U8 *start;
     int w1;
 
     start = buf;
 
-    format.bufferFromPixel(pixbuf, pix);
-
     w1 = w;
     while (w1--) {
-      memcpy(buf, pixbuf, b);
+      memcpy(buf, pix, b);
       buf += b;
     }
     buf += (stride - w) * b;
@@ -309,9 +307,11 @@ void ModifiablePixelBuffer::copyRect(const Rect &rect,
 }
 
 void ModifiablePixelBuffer::fillRect(const PixelFormat& pf, const Rect &dest,
-                                     Pixel pix)
+                                     const void* pix)
 {
-  fillRect(dest, format.pixelFromPixel(pf, pix));
+  rdr::U8 buf[4];
+  format.bufferFromBuffer(buf, pf, (const rdr::U8*)pix, 1);
+  fillRect(dest, buf);
 }
 
 void ModifiablePixelBuffer::imageRect(const PixelFormat& pf, const Rect &dest,
diff --git a/common/rfb/PixelBuffer.h b/common/rfb/PixelBuffer.h
index b0db6eb5..ba586b0f 100644
--- a/common/rfb/PixelBuffer.h
+++ b/common/rfb/PixelBuffer.h
@@ -119,7 +119,7 @@ namespace rfb {
     // These operations DO NOT clip to the pixelbuffer area, or trap overruns.
 
     // Fill a rectangle
-    void fillRect(const Rect &dest, Pixel pix);
+    void fillRect(const Rect &dest, const void* pix);
 
     // Copy pixel data to the buffer
     void imageRect(const Rect &dest, const void* pixels, int stride=0);
@@ -140,7 +140,7 @@ namespace rfb {
     // Render in a specific format
     //   Does the exact same thing as the above methods, but the given
     //   pixel values are defined by the given PixelFormat.
-    void fillRect(const PixelFormat& pf, const Rect &dest, Pixel pix);
+    void fillRect(const PixelFormat& pf, const Rect &dest, const void* pix);
     void imageRect(const PixelFormat& pf, const Rect &dest,
                    const void* pixels, int stride=0);
 
diff --git a/common/rfb/SDesktop.h b/common/rfb/SDesktop.h
index 546506a9..833762ef 100644
--- a/common/rfb/SDesktop.h
+++ b/common/rfb/SDesktop.h
@@ -92,12 +92,16 @@ namespace rfb {
   public:
     SStaticDesktop(const Point& size) : server(0), buffer(0) {
       PixelFormat pf;
+      const rdr::U8 black[4] = { 0, 0, 0, 0 };
       buffer = new ManagedPixelBuffer(pf, size.x, size.y);
-      if (buffer) buffer->fillRect(buffer->getRect(), 0);
+      if (buffer)
+        buffer->fillRect(buffer->getRect(), black);
     }
     SStaticDesktop(const Point& size, const PixelFormat& pf) : buffer(0) {
+      const rdr::U8 black[4] = { 0, 0, 0, 0 };
       buffer = new ManagedPixelBuffer(pf, size.x, size.y);
-      if (buffer) buffer->fillRect(buffer->getRect(), 0);
+      if (buffer)
+        buffer->fillRect(buffer->getRect(), black);
     }
     virtual ~SStaticDesktop() {
       if (buffer) delete buffer;
diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 932abc0b..49975cbf 100644
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -74,7 +74,7 @@ VNCSConnectionST::VNCSConnectionST(VNCServerST* server_, network::Socket *s,
     minRTT(-1), seenCongestion(false),
     pingCounter(0), congestionTimer(this),
     server(server_), updates(false),
-    drawRenderedCursor(false), removeRenderedCursor(false),
+    updateRenderedCursor(false), removeRenderedCursor(false),
     continuousUpdates(false), encodeManager(this),
     updateTimer(this), pointerEventTime(0),
     accessRights(AccessDefault), startTime(time(0))
@@ -198,7 +198,7 @@ void VNCSConnectionST::pixelBufferChange()
       // We need to clip the next update to the new size, but also add any
       // extra bits if it's bigger.  If we wanted to do this exactly, something
       // like the code below would do it, but at the moment we just update the
-      // entire new size.  However, we do need to clip the renderedCursorRect
+      // entire new size.  However, we do need to clip the damagedCursorRegion
       // because that might be added to updates in writeFramebufferUpdate().
 
       //updates.intersect(server->pb->getRect());
@@ -210,7 +210,7 @@ void VNCSConnectionST::pixelBufferChange()
       //  updates.add_changed(Rect(0, cp.height, cp.width,
       //                           server->pb->height()));
 
-      renderedCursorRect = renderedCursorRect.intersect(server->pb->getRect());
+      damagedCursorRegion.assign_intersect(server->pb->getRect());
 
       cp.width = server->pb->width();
       cp.height = server->pb->height();
@@ -341,10 +341,10 @@ bool VNCSConnectionST::getComparerState()
 void VNCSConnectionST::renderedCursorChange()
 {
   if (state() != RFBSTATE_NORMAL) return;
-  if (!renderedCursorRect.is_empty())
+  if (!damagedCursorRegion.is_empty())
     removeRenderedCursor = true;
   if (needRenderedCursor()) {
-    drawRenderedCursor = true;
+    updateRenderedCursor = true;
     writeFramebufferUpdateOrClose();
   }
 }
@@ -688,9 +688,8 @@ void VNCSConnectionST::enableContinuousUpdates(bool enable,
 void VNCSConnectionST::supportsLocalCursor()
 {
   if (cp.supportsLocalCursor || cp.supportsLocalXCursor) {
-    if (!renderedCursorRect.is_empty())
+    if (!damagedCursorRegion.is_empty())
       removeRenderedCursor = true;
-    drawRenderedCursor = false;
     setCursor();
   }
 }
@@ -910,6 +909,7 @@ void VNCSConnectionST::writeFramebufferUpdate()
   Region req;
   UpdateInfo ui;
   bool needNewUpdateInfo;
+  bool drawRenderedCursor;
 
   updateTimer.stop();
 
@@ -975,28 +975,31 @@ void VNCSConnectionST::writeFramebufferUpdate()
   // copy, then when the copy happens the corresponding rectangle in the
   // destination will be wrong, so add it to the changed region.
 
-  if (!ui.copied.is_empty() && !renderedCursorRect.is_empty()) {
-    Rect bogusCopiedCursor = (renderedCursorRect.translate(ui.copy_delta)
-                              .intersect(server->pb->getRect()));
+  if (!ui.copied.is_empty() && !damagedCursorRegion.is_empty()) {
+    Region bogusCopiedCursor;
+
+    bogusCopiedCursor.copyFrom(damagedCursorRegion);
+    bogusCopiedCursor.translate(ui.copy_delta);
+    bogusCopiedCursor.assign_intersect(server->pb->getRect());
     if (!ui.copied.intersect(bogusCopiedCursor).is_empty()) {
       updates.add_changed(bogusCopiedCursor);
       needNewUpdateInfo = true;
     }
   }
 
-  // If we need to remove the old rendered cursor, just add the rectangle to
+  // If we need to remove the old rendered cursor, just add the region to
   // the changed region.
 
   if (removeRenderedCursor) {
-    updates.add_changed(renderedCursorRect);
+    updates.add_changed(damagedCursorRegion);
     needNewUpdateInfo = true;
-    renderedCursorRect.clear();
+    damagedCursorRegion.clear();
     removeRenderedCursor = false;
   }
 
   // Return if there is nothing to send the client.
 
-  if (updates.is_empty() && !writer()->needFakeUpdate() && !drawRenderedCursor)
+  if (updates.is_empty() && !writer()->needFakeUpdate() && !updateRenderedCursor)
     goto out;
 
   // The `updates' object could change, make sure we have valid update info.
@@ -1009,13 +1012,18 @@ void VNCSConnectionST::writeFramebufferUpdate()
   // with the update region, we need to draw the rendered cursor regardless of
   // whether it has changed.
 
+  drawRenderedCursor = false;
   if (needRenderedCursor()) {
+    Rect renderedCursorRect;
+
     renderedCursorRect
       = server->renderedCursor.getEffectiveRect()
          .intersect(req.get_bounding_rect());
 
     if (renderedCursorRect.is_empty()) {
       drawRenderedCursor = false;
+    } else if (updateRenderedCursor) {
+      drawRenderedCursor = true;
     } else if (!ui.changed.union_(ui.copied)
                .intersect(renderedCursorRect).is_empty()) {
       drawRenderedCursor = true;
@@ -1030,6 +1038,9 @@ void VNCSConnectionST::writeFramebufferUpdate()
     //  updates.subtract(renderedCursorRect);
     //  updates.getUpdateInfo(&ui, req);
     //}
+
+    damagedCursorRegion.assign_union(renderedCursorRect);
+    updateRenderedCursor = false;
   }
 
   if (!ui.is_empty() || writer()->needFakeUpdate() || drawRenderedCursor) {
@@ -1045,9 +1056,11 @@ void VNCSConnectionST::writeFramebufferUpdate()
 
     writeRTTPing();
 
-    drawRenderedCursor = false;
+    // The request might be for just part of the screen, so we cannot
+    // just clear the entire update tracker.
+    updates.subtract(req);
+
     requested.clear();
-    updates.clear();
   }
 
 out:
diff --git a/common/rfb/VNCSConnectionST.h b/common/rfb/VNCSConnectionST.h
index 978879f8..72ffc1df 100644
--- a/common/rfb/VNCSConnectionST.h
+++ b/common/rfb/VNCSConnectionST.h
@@ -186,7 +186,7 @@ namespace rfb {
 
     unsigned baseRTT;
     unsigned congWindow;
-    int ackedOffset, sentOffset;
+    unsigned ackedOffset, sentOffset;
 
     unsigned minRTT;
     bool seenCongestion;
@@ -196,8 +196,8 @@ namespace rfb {
     VNCServerST* server;
     SimpleUpdateTracker updates;
     Region requested;
-    bool drawRenderedCursor, removeRenderedCursor;
-    Rect renderedCursorRect;
+    bool updateRenderedCursor, removeRenderedCursor;
+    Region damagedCursorRegion;
     bool continuousUpdates;
     Region cuRegion;
     EncodeManager encodeManager;
diff --git a/common/rfb/rreDecode.h b/common/rfb/rreDecode.h
index 9dc04703..56defbd1 100644
--- a/common/rfb/rreDecode.h
+++ b/common/rfb/rreDecode.h
@@ -41,7 +41,7 @@ void RRE_DECODE (const Rect& r, rdr::InStream* is,
 {
   int nSubrects = is->readU32();
   PIXEL_T bg = is->READ_PIXEL();
-  pb->fillRect(pf, r, bg);
+  pb->fillRect(pf, r, &bg);
 
   for (int i = 0; i < nSubrects; i++) {
     PIXEL_T pix = is->READ_PIXEL();
@@ -49,7 +49,7 @@ void RRE_DECODE (const Rect& r, rdr::InStream* is,
     int y = is->readU16();
     int w = is->readU16();
     int h = is->readU16();
-    pb->fillRect(pf, Rect(r.tl.x+x, r.tl.y+y, r.tl.x+x+w, r.tl.y+y+h), pix);
+    pb->fillRect(pf, Rect(r.tl.x+x, r.tl.y+y, r.tl.x+x+w, r.tl.y+y+h), &pix);
   }
 }
 
diff --git a/common/rfb/tightDecode.h b/common/rfb/tightDecode.h
index fe18ce86..7a1a9a26 100644
--- a/common/rfb/tightDecode.h
+++ b/common/rfb/tightDecode.h
@@ -77,7 +77,7 @@ void TIGHT_DECODE (const Rect& r)
     } else {
       pix = is->READ_PIXEL();
     }
-    pb->fillRect(serverpf, r, pix);
+    pb->fillRect(serverpf, r, &pix);
     return;
   }
 
diff --git a/common/rfb/zrleDecode.h b/common/rfb/zrleDecode.h
index 42b28b32..25661711 100644
--- a/common/rfb/zrleDecode.h
+++ b/common/rfb/zrleDecode.h
@@ -73,7 +73,7 @@ void ZRLE_DECODE (const Rect& r, rdr::InStream* is,
 
       if (palSize == 1) {
         PIXEL_T pix = palette[0];
-        pb->fillRect(pf, t, pix);
+        pb->fillRect(pf, t, &pix);
         continue;
       }
 
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index bf1cffb5..c7d6300c 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project(tigervnc-java Java)
 if(NOT VERSION)
-  set(VERSION 1.4.80)
+  set(VERSION 1.5.80)
 endif()
 
 find_package(Java)
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 9070609e..5ce1c2f7 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -781,7 +781,7 @@ public class CConn extends CConnection implements
       Attributes attributes = manifest.getMainAttributes();
       pkgDate = attributes.getValue("Package-Date");
       pkgTime = attributes.getValue("Package-Time");
-    } catch (IOException e) { }
+    } catch (java.lang.Exception e) { }
 
     Window fullScreenWindow = Viewport.getFullScreenWindow();
     if (fullScreenWindow != null)
diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index 1e0f2230..cc21c2e1 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -365,7 +365,7 @@ public class VncViewer extends javax.swing.JApplet
         build = attributes.getValue("Build");
         buildDate = attributes.getValue("Package-Date");
         buildTime = attributes.getValue("Package-Time");
-      } catch (java.io.IOException e) { }
+      } catch (java.lang.Exception e) { }
     }
   }
 
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 59a15c4b..08aa04b9 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Gettext support - mostly borrowed from the Licq project
 
 set(po_FILES
-    de eo es fi fr it nl pl pt_BR ru sk sv tr uk
+    bg da de el eo es fi fr it nl pl pt_BR ru sk sv tr uk
 )
 
 if (NOT GETTEXT_MSGMERGE_EXECUTABLE AND NOT GETTEXT_MSGFMT_EXECUTABLE)
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 00000000..139c4f7a
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,709 @@
+# Bulgarian translation of tigervnc po-file.
+# Copyright (C) 2015 the TigerVNC Team (msgids)
+# This file is distributed under the same license as the tigervnc package.
+# Alexander Shopov <ash@kambanaria.org>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tigervnc 1.4.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-07-02 10:27+0300\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Language-Team: Bulgarian <dict@ludost.net>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: vncviewer/CConn.cxx:111
+#, c-format
+msgid "connected to host %s port %d"
+msgstr "връзка към машина „%s“, порт %d"
+
+#: vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
+msgstr "Име на работен плот: %.80s"
+
+#: vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
+msgstr "Машина: %.80s, порт: %d"
+
+#: vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
+msgstr "Размер: %d ✕ %d"
+
+#: vncviewer/CConn.cxx:190
+#, c-format
+msgid "Pixel format: %s"
+msgstr "Формат на пикселите: %s"
+
+#: vncviewer/CConn.cxx:197
+#, c-format
+msgid "(server default %s)"
+msgstr "(стандартното за сървъра %s)"
+
+#: vncviewer/CConn.cxx:202
+#, c-format
+msgid "Requested encoding: %s"
+msgstr "Заявено кодиране: %s"
+
+#: vncviewer/CConn.cxx:207
+#, c-format
+msgid "Last used encoding: %s"
+msgstr "Последно ползвано кодиране: %s"
+
+#: vncviewer/CConn.cxx:212
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
+msgstr "Оценка на скоростта на линията: %d kbit/s"
+
+#: vncviewer/CConn.cxx:217
+#, c-format
+msgid "Protocol version: %d.%d"
+msgstr "Версия на протокола: %d.%d"
+
+#: vncviewer/CConn.cxx:222
+#, c-format
+msgid "Security method: %s"
+msgstr "Вид сигурност: %s"
+
+#: vncviewer/CConn.cxx:322
+#, c-format
+msgid "SetDesktopSize failed: %d"
+msgstr "Неуспешно задаване на размер на плота чрез SetDesktopSize: %d"
+
+#: vncviewer/CConn.cxx:387
+msgid "Invalid SetColourMapEntries from server!"
+msgstr "Неправилна палитра SetColourMapEntries от сървъра!"
+
+#. TRANSLATORS: Refers to a VNC protocol encoding type
+#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#, c-format
+msgid "Unknown encoding %d"
+msgstr "Непознато кодиране %d"
+
+#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+msgid "Unknown encoding"
+msgstr "Непознато кодиране"
+
+#: vncviewer/CConn.cxx:473
+msgid "Enabling continuous updates"
+msgstr "Непрекъснато обновяване"
+
+#: vncviewer/CConn.cxx:543
+#, c-format
+msgid "Throughput %d kbit/s - changing to quality %d"
+msgstr "Скорост %d kbit/s — преминаване към качество %d"
+
+#: vncviewer/CConn.cxx:565
+#, c-format
+msgid "Throughput %d kbit/s - full color is now %s"
+msgstr "Скорост %d kbit/s — преминаване към цвят %s"
+
+#: vncviewer/CConn.cxx:567
+msgid "disabled"
+msgstr "изключено"
+
+#: vncviewer/CConn.cxx:567
+msgid "enabled"
+msgstr "включено"
+
+#: vncviewer/CConn.cxx:577
+#, c-format
+msgid "Using %s encoding"
+msgstr "Ползва се кодиране %s"
+
+#: vncviewer/CConn.cxx:624
+#, c-format
+msgid "Using pixel format %s"
+msgstr "Ползва се формат на пикселите %s"
+
+#: vncviewer/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
+msgstr "Указани са неправилни размери!"
+
+#: vncviewer/DesktopWindow.cxx:309
+msgid "Adjusting window size to avoid accidental full screen request"
+msgstr "Размер на екрана за избягване на случайна заявка за цял екран"
+
+#: vncviewer/DesktopWindow.cxx:491 vncviewer/DesktopWindow.cxx:497
+#: vncviewer/DesktopWindow.cxx:510
+msgid "Failure grabbing keyboard"
+msgstr "Неуспешно прихващане на клавиатурата"
+
+#: vncviewer/DesktopWindow.cxx:522
+msgid "Failure grabbing mouse"
+msgstr "Неуспешно прихващане на мишката"
+
+#: vncviewer/DesktopWindow.cxx:752
+msgid "Invalid screen layout computed for resize request!"
+msgstr "Изчислено е неправилно разположение на екрана според заявката за преоразмеряване!"
+
+#: vncviewer/FLTKPixelBuffer.cxx:33 vncviewer/OSXPixelBuffer.cxx:48
+#: vncviewer/X11PixelBuffer.cxx:113
+msgid "Not enough memory for framebuffer"
+msgstr "Недостатъчно памет за буфера за кадри"
+
+#: vncviewer/OSXPixelBuffer.cxx:52
+msgid "Could not create framebuffer device"
+msgstr "Устройството за буфера за кадри не може да бъде създадено"
+
+#: vncviewer/OSXPixelBuffer.cxx:58
+msgid "Could not create framebuffer bitmap"
+msgstr "Побитовата карта за буфера за кадри не може да бъде създадена"
+
+#: vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
+msgstr "Визуализатор на VNC: настройки на връзката"
+
+#: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
+#: vncviewer/vncviewer.cxx:263
+msgid "Cancel"
+msgstr "Отмяна"
+
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+msgid "OK"
+msgstr "Добре"
+
+#: vncviewer/OptionsDialog.cxx:413
+msgid "Compression"
+msgstr "Компресия"
+
+#: vncviewer/OptionsDialog.cxx:429
+msgid "Auto select"
+msgstr "Автоматичен избор"
+
+#: vncviewer/OptionsDialog.cxx:441
+msgid "Preferred encoding"
+msgstr "Предпочитано кодиране"
+
+#: vncviewer/OptionsDialog.cxx:489
+msgid "Color level"
+msgstr "Цвят"
+
+#: vncviewer/OptionsDialog.cxx:500
+msgid "Full (all available colors)"
+msgstr "Пълен (всички налични цветове)"
+
+#: vncviewer/OptionsDialog.cxx:507
+msgid "Medium (256 colors)"
+msgstr "8 битов (256 цвята)"
+
+#: vncviewer/OptionsDialog.cxx:514
+msgid "Low (64 colors)"
+msgstr "6 битов (64 цвята)"
+
+#: vncviewer/OptionsDialog.cxx:521
+msgid "Very low (8 colors)"
+msgstr "3 битов (8 цвята)"
+
+#: vncviewer/OptionsDialog.cxx:538
+msgid "Custom compression level:"
+msgstr "Ниво на компресия:"
+
+#: vncviewer/OptionsDialog.cxx:544
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+msgstr "ниво (1=бързо, 6=най-добро [4-6 са рядко полезни])"
+
+#: vncviewer/OptionsDialog.cxx:551
+msgid "Allow JPEG compression:"
+msgstr "Ползване на компресия JPEG:"
+
+#: vncviewer/OptionsDialog.cxx:557
+msgid "quality (0=poor, 9=best)"
+msgstr "качество (0=лошо, 9=най-добро)"
+
+#: vncviewer/OptionsDialog.cxx:568
+msgid "Security"
+msgstr "Сигурност"
+
+#: vncviewer/OptionsDialog.cxx:583
+msgid "Encryption"
+msgstr "Шифриране"
+
+#: vncviewer/OptionsDialog.cxx:594 vncviewer/OptionsDialog.cxx:647
+#: vncviewer/OptionsDialog.cxx:715
+msgid "None"
+msgstr "Без"
+
+#: vncviewer/OptionsDialog.cxx:600
+msgid "TLS with anonymous certificates"
+msgstr "TLS + анонимен сертификат"
+
+#: vncviewer/OptionsDialog.cxx:606
+msgid "TLS with X509 certificates"
+msgstr "TLS + сертификат X509"
+
+#: vncviewer/OptionsDialog.cxx:613
+msgid "Path to X509 CA certificate"
+msgstr "Път към сертификата на удостоверителя по X509"
+
+#: vncviewer/OptionsDialog.cxx:620
+msgid "Path to X509 CRL file"
+msgstr "Път към файла CPL по X509"
+
+#: vncviewer/OptionsDialog.cxx:636
+msgid "Authentication"
+msgstr "Идентификация"
+
+#: vncviewer/OptionsDialog.cxx:653
+msgid "Standard VNC (insecure without encryption)"
+msgstr "Стандартна за VNC (несигурна без допълнително шифриране)"
+
+#: vncviewer/OptionsDialog.cxx:659
+msgid "Username and password (insecure without encryption)"
+msgstr "Име и парола (несигурна без допълнително шифриране)"
+
+#: vncviewer/OptionsDialog.cxx:678
+msgid "Input"
+msgstr "Права"
+
+#: vncviewer/OptionsDialog.cxx:686
+msgid "View only (ignore mouse and keyboard)"
+msgstr "Визуализация (без вход от мишка и клавиатура)"
+
+#: vncviewer/OptionsDialog.cxx:692
+msgid "Accept clipboard from server"
+msgstr "Приемане на буфера за обмен от сървъра"
+
+#: vncviewer/OptionsDialog.cxx:698
+msgid "Send clipboard to server"
+msgstr "Изпращане на буфера за обмен към сървъра"
+
+#: vncviewer/OptionsDialog.cxx:704
+msgid "Send primary selection and cut buffer as clipboard"
+msgstr "Изпращане на основния избор и буфера за отрязано като буфер за обмен"
+
+#: vncviewer/OptionsDialog.cxx:710
+msgid "Pass system keys directly to server (full screen)"
+msgstr "Изпращане на системните клавиши директно към сървъра (при цял екран)"
+
+#: vncviewer/OptionsDialog.cxx:713
+msgid "Menu key"
+msgstr "Клавиш „Меню“"
+
+#: vncviewer/OptionsDialog.cxx:729
+msgid "Screen"
+msgstr "Екран"
+
+#: vncviewer/OptionsDialog.cxx:737
+msgid "Resize remote session on connect"
+msgstr "Преоразмеряване на отдалечената сесия при свързване"
+
+#: vncviewer/OptionsDialog.cxx:750
+msgid "Resize remote session to the local window"
+msgstr "Преоразмеряване на отдалечената сесия според локалния прозорец"
+
+#: vncviewer/OptionsDialog.cxx:756
+msgid "Full-screen mode"
+msgstr "Режим на цял екран"
+
+#: vncviewer/OptionsDialog.cxx:762
+msgid "Enable full-screen mode over all monitors"
+msgstr "Включване на цял екран върху всички монитори"
+
+#: vncviewer/OptionsDialog.cxx:771
+msgid "Misc."
+msgstr "Разни"
+
+#: vncviewer/OptionsDialog.cxx:779
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Споделена (без прекъсване на връзката към останалите визуализатори)"
+
+#: vncviewer/OptionsDialog.cxx:785
+msgid "Show dot when no cursor"
+msgstr "Точка, ако няма курсор"
+
+#: vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
+msgstr "Визуализатор: информация за връзката"
+
+#: vncviewer/ServerDialog.cxx:49 vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
+msgstr "Сървър за VNC:"
+
+#: vncviewer/ServerDialog.cxx:64
+msgid "Options..."
+msgstr "Настройки…"
+
+#: vncviewer/ServerDialog.cxx:69
+msgid "Load..."
+msgstr "Зареждане…"
+
+#: vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
+msgstr "Запазване като…"
+
+#: vncviewer/ServerDialog.cxx:86
+msgid "About..."
+msgstr "Относно…"
+
+#: vncviewer/ServerDialog.cxx:96
+msgid "Connect"
+msgstr "Свързване"
+
+#: vncviewer/UserDialog.cxx:74
+msgid "Opening password file failed"
+msgstr "Файлът с паролата не може да се отвори"
+
+#. 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"
+
+#: vncviewer/UserDialog.cxx:87 vncviewer/UserDialog.cxx:102
+msgid "Password:"
+msgstr "Парола:"
+
+#: vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
+msgstr "Отменена идентификация"
+
+#: vncviewer/UserDialog.cxx:99
+msgid "Username:"
+msgstr "Име:"
+
+#: vncviewer/Viewport.cxx:434
+#, c-format
+msgid "Unable to create platform specific framebuffer: %s"
+msgstr "Буферът за кадри, зависещ от платформата, не може да бъде създаден: %s"
+
+#: vncviewer/Viewport.cxx:435
+msgid "Using platform independent framebuffer"
+msgstr "Ползва се буфер за кадри независещ от платформата"
+
+#: vncviewer/Viewport.cxx:669
+#, c-format
+msgid "No scan code for extended virtual key 0x%02x"
+msgstr "Липсва код за разширения виртуален клавиш 0x%02x"
+
+#: vncviewer/Viewport.cxx:671
+#, c-format
+msgid "No scan code for virtual key 0x%02x"
+msgstr "Липсва код за виртуалния клавиш 0x%02x"
+
+#: vncviewer/Viewport.cxx:688
+#, c-format
+msgid "No symbol for extended virtual key 0x%02x"
+msgstr "Липсва знак за разширения виртуален клавиш 0x%02x"
+
+#: vncviewer/Viewport.cxx:690
+#, c-format
+msgid "No symbol for virtual key 0x%02x"
+msgstr "Липсва знак за виртуалния клавиш 0x%02x"
+
+#: vncviewer/Viewport.cxx:728
+#, c-format
+msgid "No symbol for key code 0x%02x (in the current state)"
+msgstr "Липсва знак за кода за клавиш 0x%02x (в текущото състояние)"
+
+#: vncviewer/Viewport.cxx:754
+#, c-format
+msgid "No symbol for key code %d (in the current state)"
+msgstr "Липсва знак за кода за клавиш %d (в текущото състояние)"
+
+#: vncviewer/Viewport.cxx:791
+msgid "E&xit viewer"
+msgstr "&Спиране на програмата"
+
+#: vncviewer/Viewport.cxx:794
+msgid "&Full screen"
+msgstr "&Цял екран"
+
+#: vncviewer/Viewport.cxx:796
+msgid "Resize &window to session"
+msgstr "&Преоразмеряване на прозореца към сесията"
+
+#: vncviewer/Viewport.cxx:801
+msgid "&Ctrl"
+msgstr "„&Ctrl“"
+
+#: vncviewer/Viewport.cxx:803
+msgid "&Alt"
+msgstr "„&Alt“"
+
+#: vncviewer/Viewport.cxx:808
+#, c-format
+msgid "Send %s"
+msgstr "Изпращане на „%s“"
+
+#: vncviewer/Viewport.cxx:814
+msgid "Send Ctrl-Alt-&Del"
+msgstr "Изпращане на „Ctrl-Alt-&Del“"
+
+#: vncviewer/Viewport.cxx:817
+msgid "&Refresh screen"
+msgstr "Опресняване на &екрана"
+
+#: vncviewer/Viewport.cxx:820
+msgid "&Options..."
+msgstr "&Настройки…"
+
+#: vncviewer/Viewport.cxx:822
+msgid "Connection &info..."
+msgstr "&Информация за връзката…"
+
+#: vncviewer/Viewport.cxx:824
+msgid "About &TigerVNC viewer..."
+msgstr "&Относно TigerVNC…"
+
+#: vncviewer/Viewport.cxx:827
+msgid "Dismiss &menu"
+msgstr "&Затваряне на менюто"
+
+#: vncviewer/Viewport.cxx:908
+msgid "VNC connection info"
+msgstr "Информация за връзката по VNC"
+
+#: vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
+msgstr "неуспешно създаване на независеща от платформата побитова карта (DIB)"
+
+#: vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
+msgstr "Неуспешно изпълнение на „CreateCompatibleDC“"
+
+#: vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
+msgstr "Неуспешно изпълнение на „SelectObject“"
+
+#: vncviewer/Win32PixelBuffer.cxx:91
+msgid "BitBlt failed"
+msgstr "Неуспешно изпълнение на „BitBlt“"
+
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:61
+msgid "Display lacks pixmap format for default depth"
+msgstr "Стандартните битове на цвят не се поддържат от този дисплей"
+
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:72
+msgid "Couldn't find suitable pixmap format"
+msgstr "Не може де се открие подходящ формат за прозорец"
+
+#: vncviewer/X11PixelBuffer.cxx:81
+msgid "Only true colour displays supported"
+msgstr "Поддържат се само дисплеи с истински цвят"
+
+#: vncviewer/X11PixelBuffer.cxx:83
+#, c-format
+msgid "Using default colormap and visual, TrueColor, depth %d."
+msgstr "Стандартна палитра при истински цвят с %d бита на пиксел."
+
+#: vncviewer/X11PixelBuffer.cxx:109
+msgid "Could not create framebuffer image"
+msgstr "Изображението за буфера за кадри не може да бъде създадено"
+
+#: vncviewer/parameters.cxx:279 vncviewer/parameters.cxx:313
+#, c-format
+msgid "The name of the parameter %s was too large to write to the registry"
+msgstr "Името на параметъра „%s“ е прекалено дълго и не може да се запази в регистъра"
+
+#: vncviewer/parameters.cxx:285 vncviewer/parameters.cxx:292
+#, c-format
+msgid "The parameter %s was too large to write to the registry"
+msgstr "Стойността на параметъра „%s“ е прекалено голяма и не може да се запази в регистъра"
+
+#: vncviewer/parameters.cxx:298 vncviewer/parameters.cxx:319
+#, c-format
+msgid "Failed to write parameter %s of type %s to the registry: %ld"
+msgstr "Неуспешно запазване на параметъра „%s“, вид: „%s“, в регистъра: %ld"
+
+#: vncviewer/parameters.cxx:334 vncviewer/parameters.cxx:373
+#, c-format
+msgid "The name of the parameter %s was too large to read from the registry"
+msgstr "Името на параметъра „%s“ е прекалено дълго и не може да се прочете от регистъра"
+
+#: vncviewer/parameters.cxx:343 vncviewer/parameters.cxx:382
+#, c-format
+msgid "Failed to read parameter %s from the registry: %ld"
+msgstr "Неуспешно прочитане на параметъра „%s“ от регистъра: %ld"
+
+#: vncviewer/parameters.cxx:352
+#, c-format
+msgid "The parameter %s was too large to read from the registry"
+msgstr "Стойността на параметъра „%s“ е прекалено голяма и не може да се прочете от регистъра"
+
+#: vncviewer/parameters.cxx:402
+#, c-format
+msgid "Failed to create registry key: %ld"
+msgstr "Ключът за регистъра не може да бъде създаден: %ld"
+
+#: vncviewer/parameters.cxx:416 vncviewer/parameters.cxx:465
+#: vncviewer/parameters.cxx:527 vncviewer/parameters.cxx:658
+#, c-format
+msgid "Unknown parameter type for parameter %s"
+msgstr "Непознат вид на параметъра за „%s“"
+
+#: vncviewer/parameters.cxx:423 vncviewer/parameters.cxx:472
+#, c-format
+msgid "Failed to close registry key: %ld"
+msgstr "Ключът за регистъра не може да бъде затворен: %ld"
+
+#: vncviewer/parameters.cxx:439
+#, c-format
+msgid "Failed to open registry key: %ld"
+msgstr "Ключът за регистъра не може да бъде отворен: %ld"
+
+#: vncviewer/parameters.cxx:496
+msgid "Failed to write configuration file, can't obtain home directory path."
+msgstr "Неуспешно запазване на файла с настройките, пътят до домашната папка не може да бъде определен."
+
+#: vncviewer/parameters.cxx:509
+#, c-format
+msgid "Failed to write configuration file, can't open %s: %s"
+msgstr "Неуспешно запазване на файла с настройките, не може да се отвори %s: %s"
+
+#: vncviewer/parameters.cxx:552
+msgid "Failed to read configuration file, can't obtain home directory path."
+msgstr "Неуспешно прочитане на файла с настройките, пътят до домашната папка не може да бъде определен."
+
+#. Use defaults.
+#: vncviewer/parameters.cxx:565
+#, c-format
+msgid "Failed to read configuration file, can't open %s: %s"
+msgstr "Неуспешно прочитане на файла с настройките, не може да се отвори %s: %s"
+
+#: vncviewer/parameters.cxx:578 vncviewer/parameters.cxx:583
+#: vncviewer/parameters.cxx:608 vncviewer/parameters.cxx:621
+#: vncviewer/parameters.cxx:637
+#, c-format
+msgid "Failed to read line %d in file %s: %s"
+msgstr "Ред %d от файла %s не може да бъде прочетен: %s"
+
+#: vncviewer/parameters.cxx:584
+msgid "Line too long"
+msgstr "Прекалено дълъг ред"
+
+#: vncviewer/parameters.cxx:591
+#, c-format
+msgid "Configuration file %s is in an invalid format"
+msgstr "Неправилен формат на файла с настройки „%s“"
+
+#: vncviewer/parameters.cxx:609
+msgid "Invalid format"
+msgstr "Неправилен формат"
+
+#: vncviewer/parameters.cxx:622 vncviewer/parameters.cxx:638
+msgid "Invalid format or too large value"
+msgstr "Неправилен формат или прекалено голяма стойност"
+
+#: vncviewer/parameters.cxx:665
+#, c-format
+msgid "Unknown parameter %s on line %d in file %s"
+msgstr "Неправилен параметър „%s“ на ред %d във файла „%s“"
+
+#: vncviewer/vncviewer.cxx:100
+#, c-format
+msgid ""
+"TigerVNC Viewer %d-bit v%s\n"
+"Built on: %s\n"
+"Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
+"See http://www.tigervnc.org for information on TigerVNC."
+msgstr ""
+"Визуализатор на TigerVNC, %d-битов,  версия: %s\n"
+"Компилиран на: %s\n"
+"Авторски права (C) 1999-%d екипът на TigerVNC и мн. др.\n"
+"(погледнете файла README.txt)\n"
+"За повече информация за TigerVNC: http://www.tigervnc.org"
+
+#: vncviewer/vncviewer.cxx:122
+msgid "About TigerVNC Viewer"
+msgstr "Относно визуализатора на TigerVNC"
+
+#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
+#, c-format
+msgid "Error starting new TigerVNC Viewer: %s"
+msgstr "Грешка при стартирането на нов визуализатор на TigerVNC: %s"
+
+#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
+#. exit() rather than the default which is to abort.
+#: vncviewer/vncviewer.cxx:160
+#, c-format
+msgid "Termination signal %d has been received. TigerVNC Viewer will now exit."
+msgstr "Получен е сигнал %d. Визуализаторът на TigerVNC ще спре работа."
+
+#. Avoid empty titles for popups
+#: vncviewer/vncviewer.cxx:252
+msgid "TigerVNC Viewer"
+msgstr "Визуализатор на TigerVNC"
+
+#. FLTK exposes these so that we can translate them.
+#: vncviewer/vncviewer.cxx:260
+msgid "No"
+msgstr "Не"
+
+#: vncviewer/vncviewer.cxx:261
+msgid "Yes"
+msgstr "Да"
+
+#: vncviewer/vncviewer.cxx:264
+msgid "Close"
+msgstr "Затваряне"
+
+#: vncviewer/vncviewer.cxx:269
+msgid "About"
+msgstr "Относно"
+
+#: vncviewer/vncviewer.cxx:272
+msgid "Hide"
+msgstr "Скриване"
+
+#: vncviewer/vncviewer.cxx:275
+msgid "Quit"
+msgstr "Спиране"
+
+#. Don't want the print item
+#: vncviewer/vncviewer.cxx:279
+msgid "Services"
+msgstr "Услуги"
+
+#: vncviewer/vncviewer.cxx:280
+msgid "Hide Others"
+msgstr "Скриване на другите"
+
+#: vncviewer/vncviewer.cxx:281
+msgid "Show All"
+msgstr "Показване на всички"
+
+#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
+#. which means we cannot use our generic Fl_Menu_ helpers.
+#: vncviewer/vncviewer.cxx:290
+msgid "&File"
+msgstr "&Файл"
+
+#: vncviewer/vncviewer.cxx:292
+msgid "&New Connection"
+msgstr "Нова &връзка"
+
+#: vncviewer/vncviewer.cxx:303
+msgid "Could not create VNC home directory: can't obtain home directory path."
+msgstr "Папката на VNC не може да създадена: пътят до домашната папка не може да бъде определен."
+
+#: vncviewer/vncviewer.cxx:308
+#, c-format
+msgid "Could not create VNC home directory: %s."
+msgstr "Папката на VNC в домашната не може да бъде създадена: %s."
+
+#. TRANSLATORS: "Parameters" are command line arguments, or settings
+#. from a file or the Windows registry.
+#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+msgid "Parameters -listen and -via are incompatible"
+msgstr "„-listen“ и „-via“ са несъвместими"
+
+#: vncviewer/vncviewer.cxx:529
+#, c-format
+msgid "Listening on port %d"
+msgstr "Слуша се на порт %d"
+
+#: vncviewer/vncviewer.cxx:590
+msgid "Internal FLTK error. Exiting."
+msgstr "Вътрешна грешка на FLTK. Спиране на програмата."
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 00000000..eea0b463
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,708 @@
+# Danish translation of tigervnc.
+# Copyright (C) 2015 the TigerVNC Team (msgids)
+# This file is distributed under the same license as the tigervnc package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tigervnc 1.4.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-27 15:00+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: vncviewer/CConn.cxx:111
+#, c-format
+msgid "connected to host %s port %d"
+msgstr "forbundet til værten %s på port %d"
+
+#: vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
+msgstr "Skrivebordsnavn: %.80s"
+
+#: vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
+msgstr "Vært: %.80s port: %d"
+
+#: vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
+msgstr "Størrelse: %d x %d"
+
+#: vncviewer/CConn.cxx:190
+#, c-format
+msgid "Pixel format: %s"
+msgstr "Billedformat: %s"
+
+#: vncviewer/CConn.cxx:197
+#, c-format
+msgid "(server default %s)"
+msgstr "(serverstandard %s)"
+
+#: vncviewer/CConn.cxx:202
+#, c-format
+msgid "Requested encoding: %s"
+msgstr "Anmodt kodning: %s"
+
+#: vncviewer/CConn.cxx:207
+#, c-format
+msgid "Last used encoding: %s"
+msgstr "Sidst anvendt kodning: %s"
+
+#: vncviewer/CConn.cxx:212
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
+msgstr "Linjehastighedsestimat: %d kbit/s"
+
+#: vncviewer/CConn.cxx:217
+#, c-format
+msgid "Protocol version: %d.%d"
+msgstr "Protokolversion: %d.%d"
+
+#: vncviewer/CConn.cxx:222
+#, c-format
+msgid "Security method: %s"
+msgstr "Sikkerhedsmetode: %s"
+
+#: vncviewer/CConn.cxx:322
+#, c-format
+msgid "SetDesktopSize failed: %d"
+msgstr "SetDesktopSize fejlede: %d"
+
+#: vncviewer/CConn.cxx:387
+msgid "Invalid SetColourMapEntries from server!"
+msgstr "Ugyldig SetColourMapEntries fra server!"
+
+#. TRANSLATORS: Refers to a VNC protocol encoding type
+#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#, c-format
+msgid "Unknown encoding %d"
+msgstr "Ukendt kodning %d"
+
+#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+msgid "Unknown encoding"
+msgstr "Ukendt kodning"
+
+#: vncviewer/CConn.cxx:473
+msgid "Enabling continuous updates"
+msgstr "Aktiverer fortsættende opdateringer"
+
+#: vncviewer/CConn.cxx:543
+#, c-format
+msgid "Throughput %d kbit/s - changing to quality %d"
+msgstr "Gennemløb %d kbit/s - ændrer til kvalitet %d"
+
+#: vncviewer/CConn.cxx:565
+#, c-format
+msgid "Throughput %d kbit/s - full color is now %s"
+msgstr "Gennemløb %d kbit/s - fuld farve er nu %s"
+
+#: vncviewer/CConn.cxx:567
+msgid "disabled"
+msgstr "deaktiveret"
+
+#: vncviewer/CConn.cxx:567
+msgid "enabled"
+msgstr "aktiveret"
+
+#: vncviewer/CConn.cxx:577
+#, c-format
+msgid "Using %s encoding"
+msgstr "Bruger %s-kodning"
+
+#: vncviewer/CConn.cxx:624
+#, c-format
+msgid "Using pixel format %s"
+msgstr "Bruger billedpunktsformat %s"
+
+#: vncviewer/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
+msgstr "Ugyldig geometri angivet!"
+
+#: vncviewer/DesktopWindow.cxx:309
+msgid "Adjusting window size to avoid accidental full screen request"
+msgstr "Justerer vinduesstørrelse for at undgå utilsigtet anmodning om fuld skærm"
+
+#: vncviewer/DesktopWindow.cxx:491 vncviewer/DesktopWindow.cxx:497
+#: vncviewer/DesktopWindow.cxx:510
+msgid "Failure grabbing keyboard"
+msgstr "Kunne ikke fange tastatur"
+
+#: vncviewer/DesktopWindow.cxx:522
+msgid "Failure grabbing mouse"
+msgstr "Kunne ikke fange mus"
+
+#: vncviewer/DesktopWindow.cxx:752
+msgid "Invalid screen layout computed for resize request!"
+msgstr "Ugyldig skærmlayout beregnet for anmodning om ny størrelse!"
+
+#: vncviewer/FLTKPixelBuffer.cxx:33 vncviewer/OSXPixelBuffer.cxx:48
+#: vncviewer/X11PixelBuffer.cxx:113
+msgid "Not enough memory for framebuffer"
+msgstr "Ikke nok hukommelse for framebuffer"
+
+#: vncviewer/OSXPixelBuffer.cxx:52
+msgid "Could not create framebuffer device"
+msgstr "Kunne ikke oprette framebuffer-enhed"
+
+#: vncviewer/OSXPixelBuffer.cxx:58
+msgid "Could not create framebuffer bitmap"
+msgstr "Kunne ikke oprettet framebuffer-bitmap"
+
+#: vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
+msgstr "VNC-fremviser: Forbindelsesindstillinger"
+
+#: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
+#: vncviewer/vncviewer.cxx:263
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+msgid "OK"
+msgstr "O.k."
+
+#: vncviewer/OptionsDialog.cxx:413
+msgid "Compression"
+msgstr "Komprimering"
+
+#: vncviewer/OptionsDialog.cxx:429
+msgid "Auto select"
+msgstr "Vælg automatisk"
+
+#: vncviewer/OptionsDialog.cxx:441
+msgid "Preferred encoding"
+msgstr "Foretrukken kodning"
+
+#: vncviewer/OptionsDialog.cxx:489
+msgid "Color level"
+msgstr "Farveniveau"
+
+#: vncviewer/OptionsDialog.cxx:500
+msgid "Full (all available colors)"
+msgstr "Fuld (alle tilgængelige farver)"
+
+#: vncviewer/OptionsDialog.cxx:507
+msgid "Medium (256 colors)"
+msgstr "Mellem (256 farver)"
+
+#: vncviewer/OptionsDialog.cxx:514
+msgid "Low (64 colors)"
+msgstr "Lav (64 farver)"
+
+#: vncviewer/OptionsDialog.cxx:521
+msgid "Very low (8 colors)"
+msgstr "Meget lav (8 farver)"
+
+#: vncviewer/OptionsDialog.cxx:538
+msgid "Custom compression level:"
+msgstr "Tilpasset komprimeringsniveau:"
+
+#: vncviewer/OptionsDialog.cxx:544
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+msgstr "niveau (1=hurtig, 6=bedst [4-6 bruges sjældent])"
+
+#: vncviewer/OptionsDialog.cxx:551
+msgid "Allow JPEG compression:"
+msgstr "Tillad JPEG-komprimering:"
+
+#: vncviewer/OptionsDialog.cxx:557
+msgid "quality (0=poor, 9=best)"
+msgstr "kvalitet (0=dårlig, 9=bedst)"
+
+#: vncviewer/OptionsDialog.cxx:568
+msgid "Security"
+msgstr "Sikkerhed"
+
+#: vncviewer/OptionsDialog.cxx:583
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: vncviewer/OptionsDialog.cxx:594 vncviewer/OptionsDialog.cxx:647
+#: vncviewer/OptionsDialog.cxx:715
+msgid "None"
+msgstr "Ingen"
+
+#: vncviewer/OptionsDialog.cxx:600
+msgid "TLS with anonymous certificates"
+msgstr "TLS med anonyme certifikater"
+
+#: vncviewer/OptionsDialog.cxx:606
+msgid "TLS with X509 certificates"
+msgstr "TLS med X509-certifikater"
+
+#: vncviewer/OptionsDialog.cxx:613
+msgid "Path to X509 CA certificate"
+msgstr "Sti til X509 CA-certifikat"
+
+#: vncviewer/OptionsDialog.cxx:620
+msgid "Path to X509 CRL file"
+msgstr "Sti til X509 CRL-fil"
+
+#: vncviewer/OptionsDialog.cxx:636
+msgid "Authentication"
+msgstr "Godkendelse"
+
+#: vncviewer/OptionsDialog.cxx:653
+msgid "Standard VNC (insecure without encryption)"
+msgstr "Standard-VNC (usikker uden kryptering)"
+
+#: vncviewer/OptionsDialog.cxx:659
+msgid "Username and password (insecure without encryption)"
+msgstr "Bruernavn og adgangskode (usikker uden kryptering)"
+
+#: vncviewer/OptionsDialog.cxx:678
+msgid "Input"
+msgstr "Inddata"
+
+#: vncviewer/OptionsDialog.cxx:686
+msgid "View only (ignore mouse and keyboard)"
+msgstr "Vis kun (ignorer mus og tastatur)"
+
+#: vncviewer/OptionsDialog.cxx:692
+msgid "Accept clipboard from server"
+msgstr "Accepter udklipsholderen fra serveren"
+
+#: vncviewer/OptionsDialog.cxx:698
+msgid "Send clipboard to server"
+msgstr "Send udklipsholderen til serveren"
+
+#: vncviewer/OptionsDialog.cxx:704
+msgid "Send primary selection and cut buffer as clipboard"
+msgstr "Send primær markering og klip mellemlager som udklipsholder"
+
+#: vncviewer/OptionsDialog.cxx:710
+msgid "Pass system keys directly to server (full screen)"
+msgstr "Videresend systemnøgler direkte til serveren (fuld skærm)"
+
+#: vncviewer/OptionsDialog.cxx:713
+msgid "Menu key"
+msgstr "Menutast"
+
+#: vncviewer/OptionsDialog.cxx:729
+msgid "Screen"
+msgstr "Skærm"
+
+#: vncviewer/OptionsDialog.cxx:737
+msgid "Resize remote session on connect"
+msgstr "Ændr størrelse for ekstern session ved forbind"
+
+#: vncviewer/OptionsDialog.cxx:750
+msgid "Resize remote session to the local window"
+msgstr "Ændr størrelse for ekstern session til det lokale vindue"
+
+#: vncviewer/OptionsDialog.cxx:756
+msgid "Full-screen mode"
+msgstr "Tilstand for fuld skærm"
+
+#: vncviewer/OptionsDialog.cxx:762
+msgid "Enable full-screen mode over all monitors"
+msgstr "Aktiver tilstand for fuld skærm over alle skærme"
+
+#: vncviewer/OptionsDialog.cxx:771
+msgid "Misc."
+msgstr "Div."
+
+#: vncviewer/OptionsDialog.cxx:779
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Delt (afbryd ikke andre fremvisere)"
+
+#: vncviewer/OptionsDialog.cxx:785
+msgid "Show dot when no cursor"
+msgstr "Vis punktum når ingen markør"
+
+#: vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
+msgstr "VNC-fremviser: Forbindelsesdetaljer"
+
+#: vncviewer/ServerDialog.cxx:49 vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
+msgstr "VNC-server:"
+
+#: vncviewer/ServerDialog.cxx:64
+msgid "Options..."
+msgstr "Tilvalg ..."
+
+#: vncviewer/ServerDialog.cxx:69
+msgid "Load..."
+msgstr "Indlæs ..."
+
+#: vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
+msgstr "Gem som ..."
+
+#: vncviewer/ServerDialog.cxx:86
+msgid "About..."
+msgstr "Om ..."
+
+#: vncviewer/ServerDialog.cxx:96
+msgid "Connect"
+msgstr "Forbind"
+
+#: vncviewer/UserDialog.cxx:74
+msgid "Opening password file failed"
+msgstr "Åbning af adgangskodefil mislykkedes"
+
+#. 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-godkendelse"
+
+#: vncviewer/UserDialog.cxx:87 vncviewer/UserDialog.cxx:102
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
+msgstr "Godkendelse afbrudt"
+
+#: vncviewer/UserDialog.cxx:99
+msgid "Username:"
+msgstr "Brugernavn:"
+
+#: vncviewer/Viewport.cxx:434
+#, c-format
+msgid "Unable to create platform specific framebuffer: %s"
+msgstr "Kan ikke oprette platformspecifik framebuffer: %s"
+
+#: vncviewer/Viewport.cxx:435
+msgid "Using platform independent framebuffer"
+msgstr "Bruger framebuffer uafhængig af platform"
+
+#: vncviewer/Viewport.cxx:669
+#, c-format
+msgid "No scan code for extended virtual key 0x%02x"
+msgstr "Ingen skanningskode for udvidet virtuel nøgle 0x%02x"
+
+#: vncviewer/Viewport.cxx:671
+#, c-format
+msgid "No scan code for virtual key 0x%02x"
+msgstr "Ingen skanningskode for virtuel nøgle 0x%02x"
+
+#: vncviewer/Viewport.cxx:688
+#, c-format
+msgid "No symbol for extended virtual key 0x%02x"
+msgstr "Intet symbol for udvidet virtuel nøgle 0x%02x"
+
+#: vncviewer/Viewport.cxx:690
+#, c-format
+msgid "No symbol for virtual key 0x%02x"
+msgstr "Intet symbol for virtuel nøgle 0x%02x"
+
+#: vncviewer/Viewport.cxx:728
+#, c-format
+msgid "No symbol for key code 0x%02x (in the current state)"
+msgstr "Intet symbol for nøglekode 0x%02x (i den nuværende tilstand)"
+
+#: vncviewer/Viewport.cxx:754
+#, c-format
+msgid "No symbol for key code %d (in the current state)"
+msgstr "Intet symbol for nøglekode %d (i den nuværende tilstand)"
+
+#: vncviewer/Viewport.cxx:791
+msgid "E&xit viewer"
+msgstr "&Afslut fremviser"
+
+#: vncviewer/Viewport.cxx:794
+msgid "&Full screen"
+msgstr "&Fuld skærm"
+
+#: vncviewer/Viewport.cxx:796
+msgid "Resize &window to session"
+msgstr "Ændr størrelse for &vindue til session"
+
+#: vncviewer/Viewport.cxx:801
+msgid "&Ctrl"
+msgstr "&Ctrl"
+
+#: vncviewer/Viewport.cxx:803
+msgid "&Alt"
+msgstr "&Alt"
+
+#: vncviewer/Viewport.cxx:808
+#, c-format
+msgid "Send %s"
+msgstr "Send %s"
+
+#: vncviewer/Viewport.cxx:814
+msgid "Send Ctrl-Alt-&Del"
+msgstr "Send Ctrl-Alt-&Slet"
+
+#: vncviewer/Viewport.cxx:817
+msgid "&Refresh screen"
+msgstr "&Opdater skærm"
+
+#: vncviewer/Viewport.cxx:820
+msgid "&Options..."
+msgstr "&Tilvalg ..."
+
+#: vncviewer/Viewport.cxx:822
+msgid "Connection &info..."
+msgstr "Forbindelses&info ..."
+
+#: vncviewer/Viewport.cxx:824
+msgid "About &TigerVNC viewer..."
+msgstr "Om &TigerVNC-fremviseren ..."
+
+#: vncviewer/Viewport.cxx:827
+msgid "Dismiss &menu"
+msgstr "Fjern %menu"
+
+#: vncviewer/Viewport.cxx:908
+msgid "VNC connection info"
+msgstr "VNC-forbindelsesinfo"
+
+#: vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
+msgstr "kan ikke oprette DIB-sektion"
+
+#: vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
+msgstr "CreateCompatibleDC mislykkedes"
+
+#: vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
+msgstr "SelectObject mislykkedes"
+
+#: vncviewer/Win32PixelBuffer.cxx:91
+msgid "BitBlt failed"
+msgstr "BitBlt mislykkedes"
+
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:61
+msgid "Display lacks pixmap format for default depth"
+msgstr "Skærm mangler pixmap-format for standarddybde"
+
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:72
+msgid "Couldn't find suitable pixmap format"
+msgstr "Kunne ikke finde et egnet pixmap-format"
+
+#: vncviewer/X11PixelBuffer.cxx:81
+msgid "Only true colour displays supported"
+msgstr "Kun skærme med »true colour« er understøttet"
+
+#: vncviewer/X11PixelBuffer.cxx:83
+#, c-format
+msgid "Using default colormap and visual, TrueColor, depth %d."
+msgstr "Bruger standardfarvekort og visuel, TrueColor, dybde %d."
+
+#: vncviewer/X11PixelBuffer.cxx:109
+msgid "Could not create framebuffer image"
+msgstr "Kunne ikke oprette framebuffer-billede"
+
+#: vncviewer/parameters.cxx:279 vncviewer/parameters.cxx:313
+#, c-format
+msgid "The name of the parameter %s was too large to write to the registry"
+msgstr "Navnet på parameteren %s var for lang til at kunne skrives til registret"
+
+#: vncviewer/parameters.cxx:285 vncviewer/parameters.cxx:292
+#, c-format
+msgid "The parameter %s was too large to write to the registry"
+msgstr "Parameteren %s var for lang til at kunne skrives til registret"
+
+#: vncviewer/parameters.cxx:298 vncviewer/parameters.cxx:319
+#, c-format
+msgid "Failed to write parameter %s of type %s to the registry: %ld"
+msgstr "Kunne ikke skrive parameteren %s af typen %s til registret: %ld"
+
+#: vncviewer/parameters.cxx:334 vncviewer/parameters.cxx:373
+#, c-format
+msgid "The name of the parameter %s was too large to read from the registry"
+msgstr "Navnet for parameteren %s var for lang til at kunne læses fra registret"
+
+#: vncviewer/parameters.cxx:343 vncviewer/parameters.cxx:382
+#, c-format
+msgid "Failed to read parameter %s from the registry: %ld"
+msgstr "Kunne ikke læse parameteren %s fra registret: %ld"
+
+#: vncviewer/parameters.cxx:352
+#, c-format
+msgid "The parameter %s was too large to read from the registry"
+msgstr "Parameteren %s var for lang til at kunne læses fra registret"
+
+#: vncviewer/parameters.cxx:402
+#, c-format
+msgid "Failed to create registry key: %ld"
+msgstr "Kunne ikke oprette registernøgle: %ld"
+
+#: vncviewer/parameters.cxx:416 vncviewer/parameters.cxx:465
+#: vncviewer/parameters.cxx:527 vncviewer/parameters.cxx:658
+#, c-format
+msgid "Unknown parameter type for parameter %s"
+msgstr "Ukendt parametertype for parameteren %s"
+
+#: vncviewer/parameters.cxx:423 vncviewer/parameters.cxx:472
+#, c-format
+msgid "Failed to close registry key: %ld"
+msgstr "Kunne ikke lukke registernøgle: %ld"
+
+#: vncviewer/parameters.cxx:439
+#, c-format
+msgid "Failed to open registry key: %ld"
+msgstr "Kunne ikke åbne registernøgle: %ld"
+
+#: vncviewer/parameters.cxx:496
+msgid "Failed to write configuration file, can't obtain home directory path."
+msgstr "Kunne ikke skrive konfigurationsfil, kan ikke indhente hjemmemappens sti."
+
+#: vncviewer/parameters.cxx:509
+#, c-format
+msgid "Failed to write configuration file, can't open %s: %s"
+msgstr "Kunne ikke skrive konfigurationsfil, kan ikke åbne %s: %s"
+
+#: vncviewer/parameters.cxx:552
+msgid "Failed to read configuration file, can't obtain home directory path."
+msgstr "Kunne ikke læse konfigurationsfil, kan ikke indhente hjemmemappens sti."
+
+#. Use defaults.
+#: vncviewer/parameters.cxx:565
+#, c-format
+msgid "Failed to read configuration file, can't open %s: %s"
+msgstr "Kunne ikke læse konfigurationsfil, kan ikke åbne %s: %s"
+
+#: vncviewer/parameters.cxx:578 vncviewer/parameters.cxx:583
+#: vncviewer/parameters.cxx:608 vncviewer/parameters.cxx:621
+#: vncviewer/parameters.cxx:637
+#, c-format
+msgid "Failed to read line %d in file %s: %s"
+msgstr "Kunne ikke læse linje %d i filen %s: %s"
+
+#: vncviewer/parameters.cxx:584
+msgid "Line too long"
+msgstr "Linjen er for lang"
+
+#: vncviewer/parameters.cxx:591
+#, c-format
+msgid "Configuration file %s is in an invalid format"
+msgstr "Konfigurationsfilen %s er i et ugyldigt format"
+
+#: vncviewer/parameters.cxx:609
+msgid "Invalid format"
+msgstr "Ugyldigt format"
+
+#: vncviewer/parameters.cxx:622 vncviewer/parameters.cxx:638
+msgid "Invalid format or too large value"
+msgstr "Ugyldigt format eller for stor værdi"
+
+#: vncviewer/parameters.cxx:665
+#, c-format
+msgid "Unknown parameter %s on line %d in file %s"
+msgstr "Ukendt parameter %s på linje %d i filen %s"
+
+#: vncviewer/vncviewer.cxx:100
+#, c-format
+msgid ""
+"TigerVNC Viewer %d-bit v%s\n"
+"Built on: %s\n"
+"Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
+"See http://www.tigervnc.org for information on TigerVNC."
+msgstr ""
+"TigerVNC-fremviser %d-bit v%s\n"
+"Bygget på: %s\n"
+"Ophavsret 1999-%d TigerVNC-holdet og mange andre (se README.txt)\n"
+"Se http://www.tigervnc.org for information om TigerVNC."
+
+#: vncviewer/vncviewer.cxx:122
+msgid "About TigerVNC Viewer"
+msgstr "Om TigerVNC-fremviseren"
+
+#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
+#, c-format
+msgid "Error starting new TigerVNC Viewer: %s"
+msgstr "Fejl ved start af ny TigerVNC-fremviser: %s"
+
+#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
+#. exit() rather than the default which is to abort.
+#: vncviewer/vncviewer.cxx:160
+#, c-format
+msgid "Termination signal %d has been received. TigerVNC Viewer will now exit."
+msgstr "Opsigelsessignalet %d er blevet modtaget. TigerVNC-fremviseren vil nu afslutte."
+
+#. Avoid empty titles for popups
+#: vncviewer/vncviewer.cxx:252
+msgid "TigerVNC Viewer"
+msgstr "TigerVNC-fremviser"
+
+#. FLTK exposes these so that we can translate them.
+#: vncviewer/vncviewer.cxx:260
+msgid "No"
+msgstr "Nej"
+
+#: vncviewer/vncviewer.cxx:261
+msgid "Yes"
+msgstr "Ja"
+
+#: vncviewer/vncviewer.cxx:264
+msgid "Close"
+msgstr "Luk"
+
+#: vncviewer/vncviewer.cxx:269
+msgid "About"
+msgstr "Om"
+
+#: vncviewer/vncviewer.cxx:272
+msgid "Hide"
+msgstr "Skjul"
+
+#: vncviewer/vncviewer.cxx:275
+msgid "Quit"
+msgstr "Afslut"
+
+#. Don't want the print item
+#: vncviewer/vncviewer.cxx:279
+msgid "Services"
+msgstr "Tjenester"
+
+#: vncviewer/vncviewer.cxx:280
+msgid "Hide Others"
+msgstr "Skjul andre"
+
+#: vncviewer/vncviewer.cxx:281
+msgid "Show All"
+msgstr "Vis alle"
+
+#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
+#. which means we cannot use our generic Fl_Menu_ helpers.
+#: vncviewer/vncviewer.cxx:290
+msgid "&File"
+msgstr "&Fil"
+
+#: vncviewer/vncviewer.cxx:292
+msgid "&New Connection"
+msgstr "&Ny forbindelse"
+
+#: vncviewer/vncviewer.cxx:303
+msgid "Could not create VNC home directory: can't obtain home directory path."
+msgstr "Kunne ikke oprette VNC-hjemmemappen: Kan ikke indhente hjemmemappens sti."
+
+#: vncviewer/vncviewer.cxx:308
+#, c-format
+msgid "Could not create VNC home directory: %s."
+msgstr "Kunne ikke oprette VNC-hjemmemappe: %s."
+
+#. TRANSLATORS: "Parameters" are command line arguments, or settings
+#. from a file or the Windows registry.
+#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+msgid "Parameters -listen and -via are incompatible"
+msgstr "Parameterne -listen og -via er ikke kompatible"
+
+#: vncviewer/vncviewer.cxx:529
+#, c-format
+msgid "Listening on port %d"
+msgstr "Lytter på port %d"
+
+#: vncviewer/vncviewer.cxx:590
+msgid "Internal FLTK error. Exiting."
+msgstr "Intern FLTK-fejl. Afbryder."
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 00000000..f3d0f588
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,764 @@
+# TigerVNC Greek (el) translation.
+# Copyright (C) 2014 the TigerVNC Team (msgids)
+# This file is distributed under the same license as the tigervnc package.
+# First translator: Vangelis Skarmoutsos <skarmoutsosv@gmail.com>, 2015.
+# Vangelis Skarmoutsos <skarmoutsosv@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tigervnc 1.3.90\n"
+"Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
+"POT-Creation-Date: 2014-11-19 12:46+0000\n"
+"PO-Revision-Date: 2015-06-17 18:48+0300\n"
+"Last-Translator: Vangelis Skarmoutsos <skarmoutsosv@gmail.com>\n"
+"Language-Team: Greek <team@lists.gnome.gr>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:194
+#, c-format
+msgid "(server default %s)"
+msgstr "(προκαθορισμένο εξυπηρετητή %s)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:227
+msgid "About"
+msgstr "Σχετικά"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:103
+msgid "About TigerVNC Viewer"
+msgstr "Σχετικά με τον Θεατή TigerVNC"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1097
+msgid "About TigerVNC viewer..."
+msgstr "Σχετικά με τον θεατή TigerVNC..."
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:86
+msgid "About..."
+msgstr "Σχετικά..."
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:704
+msgid "Accept clipboard from server"
+msgstr "Αποδοχή πρόχειρου από τον εξηπηρετητή"
+
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:327
+msgid "Adjusting window size to avoid accidental full screen request"
+msgstr "Προσαρμογή του μεγέθους παραθύρου για αποφυγή τυχαίου αιτήματος πλήρους οθόνης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:563
+msgid "Allow JPEG compression:"
+msgstr "Να επιτρέπεται η συμπίεση JPEG"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1081
+msgid "Alt"
+msgstr "Alt"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:648
+msgid "Authentication"
+msgstr "Πιστοποίηση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
+msgstr "Ακυρώθηκε η πιστοποίηση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:437
+msgid "Auto select"
+msgstr "Αυτόματη επιλογή"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:651
+#, c-format
+msgid "Bad Name/Value pair on line: %d in file: %s"
+msgstr "Λανθασμένο ζευγάρι ονόματος/τιμής στην γραμμή: %d στο αρχείο: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:91
+#, fuzzy
+msgid "BitBlt failed"
+msgstr "BitBlt απέτυχε"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:91
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:221
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:83
+msgid "Cancel"
+msgstr "Άκυρο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:116
+msgid "CleanupSignalHandler called"
+msgstr "Κλήθηκε το CleanupSignalHandler"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:222
+msgid "Close"
+msgstr "Κλείσιμο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:499
+#, fuzzy
+msgid "Color level"
+msgstr "Επίπεδο χρώματος"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:421
+msgid "Compression"
+msgstr "Συμπίεση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:96
+msgid "Connect"
+msgstr "Σύνδεση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1096
+msgid "Connection info..."
+msgstr "Πληροφορίες σύνδεσης..."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:362
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:404
+#, fuzzy, c-format
+msgid "Could not convert the parameter-name %s to wchar_t* when reading from the Registry, the buffersize is to small."
+msgstr "Δεν μπορούσε να μετατραπεί το όνομα παραμέτου %s σε wchar_t* κατά την ανάγνωση από την registry, το buffersize είναι πολύ μικρό."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:302
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:340
+#, c-format
+msgid "Could not convert the parameter-name %s to wchar_t* when writing to the Registry, the buffersize is to small."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:318
+#, c-format
+msgid "Could not convert the parameter-value %s to wchar_t* when writing to the Registry, the buffersize is to small."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:381
+#, c-format
+msgid "Could not convert the parameter-value for %s to utf8 char* when reading from the Registry, the buffer dest is to small."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:256
+#, c-format
+msgid "Could not create VNC home directory: %s."
+msgstr "Αδυναμία δημιουργίας αρχικού καταλόγου VNC: %s."
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:251
+msgid "Could not create VNC home directory: can't obtain home directory path."
+msgstr "Αδυναμία δημιουργίας αρχικού καταλόγου VNC: δεν μπορεί να ληφθεί το μονοπάτι του αρχικού καταλόγου."
+
+#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:58
+#, fuzzy
+msgid "Could not create framebuffer bitmap"
+msgstr "Αδυναμία δημιουργίας framebuffer bitmap"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:52
+msgid "Could not create framebuffer device"
+msgstr "Αδυναμία δημιουργίας συσκευής framebuffer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:107
+msgid "Could not create framebuffer image"
+msgstr "Αδυναμία δημιουργίας εικόνας framebuffer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:310
+#, c-format
+msgid "Could not encode the parameter-value %s when writing to the Registry."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:613
+#, fuzzy, c-format
+msgid "Could not read the line(%d) in the configuration file,the buffersize is to small."
+msgstr "Αδυναμία ανάγνωσης της γραμμής(%d) στο αρχείο διαμόρφωσης, το buffersize είναι πολύ μικρό."
+
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:68
+#, fuzzy
+msgid "Couldn't find suitable pixmap format"
+msgstr "Αδυναμία εύρεσης κατάλληλης μορφής pixmap"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
+msgstr "Απέτυχε το CreateCompatibleDC"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1079
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:550
+msgid "Custom compression level:"
+msgstr "Προσαρμοσμένο επίπεδο συμπίεσης:"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:283
+msgid "Decoding: The size of the buffer dest is to small, it needs to be 1 byte bigger."
+msgstr "Αποκωδικοποίηση: Το μέγεθος του buffer είναι πολύ μικρό, χρειάζεται να είναι 1 byte μεγαλύτερο."
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
+msgstr "Όνομα επιφάνειας εργασίας: %.80s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1099
+#, fuzzy
+msgid "Dismiss menu"
+msgstr "Μενού απόρριψης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:59
+msgid "Display lacks pixmap format for default depth"
+msgstr "Η οθόνη στερείται τύπου pixmap για το προκαθορισμένο βάθος"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:778
+msgid "Enable full-screen mode over all monitors"
+msgstr "Ενεργοποίηση κατάστασης πλήρους-οθόνης σε όλες τις οθόνες"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:469
+msgid "Enabling continuous updates"
+msgstr "Ενεργοποίηση συνεχών ενημερώσεων"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:200
+#, c-format
+msgid "Encoding backslash: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+msgstr "Κωδικοποίηση ανάποδης καθέτου: Το μέγεθος του buffer προορισμού είναι πολύ μικρό, χρειάζεται είναι περισσότερο από %d byte μεγαλύτερο."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:214
+#, c-format
+msgid "Encoding escape sequence: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+msgstr "Κωδικοποίηση ακολουθίας escape: Το μέγεθος του buffer προορισμού είναι πολύ μικρό, χρειάζεται είναι περισσότερο από %d byte μεγαλύτερο."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:234
+#, c-format
+msgid "Encoding normal character: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+msgstr "Κωδικοποίηση κανονικού χαρακτήρα: Το μέγεθος του buffer προορισμού είναι πολύ μικρό, χρειάζεται είναι περισσότερο από %d byte μεγαλύτερο."
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:595
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:503
+#, c-format
+msgid "Error(%d) closing key:  Software\\TigerVNC\\vncviewer"
+msgstr "Σφάλμα(%d) closing key:  Software\\TigerVNC\\vncviewer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:455
+#, c-format
+msgid "Error(%d) closing key: Software\\TigerVNC\\vncviewer"
+msgstr "Σφάλμα(%d) closing key: Software\\TigerVNC\\vncviewer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:434
+#, c-format
+msgid "Error(%d) creating key: Software\\TigerVNC\\vncviewer"
+msgstr "Σφάλμα(%d) creating key: Software\\TigerVNC\\vncviewer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:471
+#, c-format
+msgid "Error(%d) opening key: Software\\TigerVNC\\vncviewer"
+msgstr "Σφάλμα(%d) opening key: Software\\TigerVNC\\vncviewer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:373
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:415
+#, c-format
+msgid "Error(%d) reading %s from Registry."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:348
+#, c-format
+msgid "Error(%d) writing %d(REG_DWORD) to Registry."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:326
+#, c-format
+msgid "Error(%d) writing %s(REG_SZ) to Registry."
+msgstr ""
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1067
+msgid "Exit viewer"
+msgstr "Έξοδος από τον θεατή"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:588
+msgid "Failed to read configuration file, can't obtain home directory path."
+msgstr "Αποτυχία ανάγνωσης αρχείου διαμόρφωσης, δεν βρέθηκε το μονοπάτι αρχικού καταλόγου."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:602
+#, c-format
+msgid "Failed to read configuration file, can't open %s"
+msgstr "Αποτυχία ανάγωνσης αρχείου διαμόρφωσης, δεν μπορεί να ανοίξει το %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:621
+#, c-format
+msgid "Failed to read line %d in file %s"
+msgstr "Αποτυχία ανάγνωσης της γραμμής %d από το αρχείο %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:528
+msgid "Failed to write configuration file, can't obtain home directory path."
+msgstr "Αποτυχία εγγραφής του αρχείου διαμόρφωσης, δεν μπορεί να ληφθεί το μονοπάτι του αρχικού καταλόγου."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:542
+#, c-format
+msgid "Failed to write configuration file, can't open %s"
+msgstr "Αποτυχία εγγραφής τους αρχείου διαμόρφωσης, δεν μπορεί να ανοίξει το %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:526
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:538
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:551
+msgid "Failure grabbing keyboard"
+msgstr "Αποτυχία σύλληψης πληκτρολογίου"
+
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:563
+msgid "Failure grabbing mouse"
+msgstr "Αποτυχία σύλληψης ποντικιού"
+
+# Color level. Επίπεδο χρώματος.
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:512
+msgid "Full (all available colors)"
+msgstr "Πλήρες (όλα τα διαθέσιμα χρώματα)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1070
+msgid "Full screen"
+msgstr "Πλήρης οθόνη"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:770
+msgid "Full-screen mode"
+msgstr "Κατάσταση πλήρους οθόνης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:230
+msgid "Hide"
+msgstr "Απόκρυψη"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:238
+msgid "Hide Others"
+msgstr "Απόκρυψη άλλων"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
+msgstr "Ξενιστής: %.80s θύρα: %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:690
+msgid "Input"
+msgstr "Είσοδος"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:510
+msgid "Internal FLTK error. Exiting."
+msgstr "Εσωτερικό σφάλμα του FLTK. Γίνεται έξοδος."
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:384
+msgid "Invalid SetColourMapEntries from server!"
+msgstr "Άκυρο SetColourMapEntries από τον εξυπηρετητή!"
+
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
+msgstr "Καθορίστηκε άκυρη γεωμετρία!"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:708
+#, c-format
+msgid "Invalid parameter name on line: %d in file: %s"
+msgstr "Άκυρο όνομα παραμέτρου στην γραμμή %d στο αρχείο: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:805
+msgid "Invalid screen layout computed for resize request!"
+msgstr "Άκυρη διάταξη οθόνης υπολογισμένη από αίτημα αλλαγής μεγέθους!"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:204
+#, c-format
+msgid "Last used encoding: %s"
+msgstr "Τελευταία χρησιμοποιημένη κωδικοποίηση: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:631
+#, c-format
+msgid ""
+"Line 1 in file %s\n"
+"must contain the TigerVNC configuration file identifier string:\n"
+"\"%s\""
+msgstr ""
+"Η γραμμή 1 στο αρχείο %s\n"
+"πρέπει να περιέχει τη συμβολοσειρά αναγνώρισης αρχείου διαμόρφωσης του TigerVNC:\n"
+"\"%s\""
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:209
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
+msgstr "Τελευταία εκτίμηση ταχύτητας: %d kbit/s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:478
+#, c-format
+msgid "Listening on port %d\n"
+msgstr "Ακρόαση στην θύρα %d\n"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:69
+msgid "Load..."
+msgstr "Φόρτωση..."
+
+# Color level. Επίπεδο χρώματος.
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:526
+msgid "Low (64 colors)"
+msgstr "Χαμηλό (64 χρώματα)"
+
+# Color level. Επίπεδο χρώματος.
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:519
+msgid "Medium (256 colors)"
+msgstr "Ενδιάμεσο (256 χρώματα)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:725
+msgid "Menu key"
+msgstr "Πλήκτρο μενού"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:791
+msgid "Misc."
+msgstr "Διάφορα"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1037
+#, c-format
+msgid "Multiple characters given for key code %d (0x%04x): '%s'"
+msgstr "Πολλαπλοί χαρακτήρες δόθηκαν για τον κώδικα πλήκτρου %d (0x%04x): '%s'"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:218
+msgid "No"
+msgstr "Όχι"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:691
+#, c-format
+msgid "No scan code for extended virtual key 0x%02x"
+msgstr "Χωρίς κώδικα σάρωσης για το εκτεταμένο εικονικό πλήκτρο 0x%02x"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:693
+#, c-format
+msgid "No scan code for virtual key 0x%02x"
+msgstr "Χωρίς κώδικα σάρωσης για το εικονικό πλήκτρο 0x%02x"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:710
+#, c-format
+msgid "No symbol for extended virtual key 0x%02x"
+msgstr "Χωρίς σύμβολο για το εκτεταμένο εικονικό πλήκτρο 0x%02x"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:776
+#, c-format
+msgid "No symbol for key code %d (in the current state)"
+msgstr "Χωρίς σύμβολο για τον κώδικα πλήκτρου %d (στην τρέχουσα κατάσταση)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:750
+#, c-format
+msgid "No symbol for key code 0x%02x (in the current state)"
+msgstr "Χωρίς σύμβολο για τον κώδικα πλήκτρου 0x%02x (στην τρέχουσα κατάσταση)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:712
+#, c-format
+msgid "No symbol for virtual key 0x%02x"
+msgstr "Χωρίς σύμβολο για το εικονικό πλήκτρο 0x%02x"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:606
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:659
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:727
+msgid "None"
+msgstr "Κανένα"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:48
+#: /home/ossman/devel/tigervnc/vncviewer/FLTKPixelBuffer.cxx:33
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:111
+msgid "Not enough memory for framebuffer"
+msgstr "Ανεπάρκεια μνήμης για τον framebuffer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:220
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:88
+msgid "OK"
+msgstr "Εντάξει"
+
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:77
+msgid "Only true colour displays supported"
+msgstr "Υποστηρίζονται μόνο οθόνες πραγματικού χρώματος"
+
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:74
+msgid "Opening password file failed"
+msgstr "Απέτυχε το άνοιγμα του αρχείου κωδικού"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1095
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:64
+msgid "Options..."
+msgstr "Επιλογές..."
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:463
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:464
+msgid "Parameters -listen and -via are incompatible"
+msgstr "Οι παράμετροι -listen και -via δεν είναι συμβατές"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:722
+msgid "Pass system keys directly to server (full screen)"
+msgstr "Πέρασμα των πλήκτρων συστήματος κατ' ευθείαν στον εξυπηρετητή (πλήρης οθόνη)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:87
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:102
+msgid "Password:"
+msgstr "Συνθηματικό:"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:625
+msgid "Path to X509 CA certificate"
+msgstr "Μονοπάτι στο πιστοποιητικό X509 CA"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:632
+msgid "Path to X509 CRL file"
+msgstr "Μονοπάτι στο αρχείο X509 CRL"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:188
+#, c-format
+msgid "Pixel format: %s"
+msgstr "Μορφοποίηση pixel: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:449
+msgid "Preferred encoding"
+msgstr "Προτιμώμενη κωδικοποίηση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:214
+#, c-format
+msgid "Protocol version: %d.%d"
+msgstr "Έκδοση πρωτοκόλλου:  %d.%d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:233
+msgid "Quit"
+msgstr "Εγκατάλειψη"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1093
+msgid "Refresh screen"
+msgstr "Ανανέωση οθόνης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:199
+#, c-format
+msgid "Requested encoding: %s"
+msgstr "Αιτούμενη κωδικοποίηση: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:749
+msgid "Resize remote session on connect"
+msgstr "Αλλαγή μεγέθους απομακρυσμένης συνεδρίας κατά την σύνδεση"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:762
+msgid "Resize remote session to the local window"
+msgstr "Αλλαγή μεγέθους απομακρυσμένης συνεδρίας στο τοπικό παράθυρο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1073
+msgid "Resize window to session"
+msgstr "Αλλαγή μεγέθους παραθύρου στην συνεδρία"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
+msgstr "Αποθήκευση ως..."
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:741
+msgid "Screen"
+msgstr "Οθόνη"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:580
+msgid "Security"
+msgstr "Ασφάλεια"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:219
+#, c-format
+msgid "Security method: %s"
+msgstr "Μέθοδος ασφάλειας: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
+msgstr "Απέτυχε το SelectObject"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1086
+#, c-format
+msgid "Send %s"
+msgstr "Αποστολή %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1091
+msgid "Send Ctrl-Alt-Del"
+msgstr "Αποστολή Ctrl-Alt-Del"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:710
+msgid "Send clipboard to server"
+msgstr "Αποστολή του πρόχειρου στον εξηπηρετητή"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:716
+#, fuzzy
+msgid "Send primary selection and cut buffer as clipboard"
+msgstr "Αποστολή της κύριας επιλογής και αποκοπή της ενδιάμεσης μνήμης ως πρόχειρο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:237
+msgid "Services"
+msgstr "Υπηρεσίες"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:319
+#, c-format
+msgid "SetDesktopSize failed: %d"
+msgstr "Απέτυχε το SetDesktopSize: %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:799
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Κοινόχρηστο (να μην αποσυνδεθούν άλλοι θεατές)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:239
+msgid "Show All"
+msgstr "Εμφάνιση όλων"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:805
+msgid "Show dot when no cursor"
+msgstr "Εμφάνιση κουκίδας όταν δεν υπάρχει δρομέας"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
+msgstr "Μέγεθος: %d x %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:665
+msgid "Standard VNC (insecure without encryption)"
+msgstr "Τυπικό VNC (μη ασφαλές χωρίς κρυπτογράφηση)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:618
+msgid "TLS with X509 certificates"
+msgstr "TLS με πιστοποιητικά X509"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:612
+msgid "TLS with anonymous certificates"
+msgstr "TLS με ανώνυμα πιστοποιητικά"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:448
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:497
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:561
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:701
+#, c-format
+msgid "The parameterArray contains a object of a invalid type at line %d."
+msgstr "Το parameterArray περιέχει ένα αντικείμενο άκυρου τύπου στην γραμμή %d."
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:664
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:680
+#, c-format
+msgid "The value of the parameter %s on line %d in file %s is invalid."
+msgstr "Η τιμή της παραμέτρου %s στην γραμμή %d του αρχείου %s είναι άκυρη."
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:539
+#, c-format
+msgid "Throughput %d kbit/s - changing to quality %d"
+msgstr "Διαμεταγωγή %d kbit/s - αλλαγή στην ποιότητα %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:561
+#, c-format
+msgid "Throughput %d kbit/s - full color is now %s"
+msgstr "Διαμεταγωγή %d kbit/s - το πλήρες χρώμα είναι τώρα %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:210
+msgid "TigerVNC Viewer"
+msgstr "Θεατής TigerVNC"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:80
+#, c-format
+msgid ""
+"TigerVNC Viewer %d-bit v%s\n"
+"Built on: %s\n"
+"Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
+"See http://www.tigervnc.org for information on TigerVNC."
+msgstr ""
+"Θεατής TigerVNC %d-bit v%s\n"
+"Built on: %s\n"
+"Πνευματικά δικαιώματα (C) 1999-%d Ομάδα TigerVNC και πολλοί άλλοι (δείτε το README.txt)\n"
+"Δείτε στο http://www.tigervnc.org για πληροφορίες σχετικά με το TigerVNC."
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:456
+#, c-format
+msgid "Unable to create platform specific framebuffer: %s"
+msgstr "Αδυναμία δημιουργίας framebuffer στη συγκεκριμένη πλατφόρμα: %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1015
+#, c-format
+msgid "Unknown FLTK key code %d (0x%04x)"
+msgstr "Άγνωστος FLTK κώδικας πλήκτρου %d (0x%04x)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:889
+#, c-format
+msgid "Unknown decimal separator: '%s'"
+msgstr "Άγνωστο διαχωριστικό δεκαδικών: '%s'"
+
+#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:271
+#, c-format
+msgid "Unknown escape sequence at character %d"
+msgstr "Άγνωστη ακολουθία escape στον χαρακτήρα %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:430
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:437
+msgid "Unknown rect encoding"
+msgstr "Άγνωστη κωδικοποίηση rect"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:429
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:436
+#, c-format
+msgid "Unknown rect encoding %d"
+msgstr "Άγνωστη κωδικοποίηση rect %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:671
+msgid "Username and password (insecure without encryption)"
+msgstr "Όνομα χρήστη και συνθηματικό"
+
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:99
+msgid "Username:"
+msgstr "Όνομα χρήστη:"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:573
+#, c-format
+msgid "Using %s encoding"
+msgstr "Χρήση κωδικοποίησης %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:79
+#, c-format
+msgid "Using default colormap and visual, %sdepth %d."
+msgstr "Χρήση προκαθορισμένου χρωματικού χάρτη και οπτικών, %sβάθος %d."
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:620
+#, c-format
+msgid "Using pixel format %s"
+msgstr "Χρήση μορφής pixel %s"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:457
+msgid "Using platform independent framebuffer"
+msgstr "Χρήση ανεξάρτητης πλατφόρμας framebuffer"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
+msgstr "Θεατής VNC: Λεπτομέρειες σύνδεσης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
+msgstr "Θεατής VNC: Επιλογές σύνδεσης"
+
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:86
+#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:96
+msgid "VNC authentication"
+msgstr "Πιστοποίηση VNC"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1187
+msgid "VNC connection info"
+msgstr "Πληροφορίες σύνδεσης VNC"
+
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:49
+#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
+msgstr "Εξυπηρετητής VNC:"
+
+# Color level. Επίπεδο χρώματος.
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:533
+msgid "Very low (8 colors)"
+msgstr "Πολύ χαμηλό (8 χρώματα)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:698
+msgid "View only (ignore mouse and keyboard)"
+msgstr "Μόνο προβολή (αγνόηση ποντικιού και πληκτρολογίου)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:219
+msgid "Yes"
+msgstr "Ναι"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:111
+#, c-format
+msgid "connected to host %s port %d"
+msgstr "σε σύνδεση με ξενιστή %s θύρα %d"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
+msgid "disabled"
+msgstr "απενεργοποιημένο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
+msgid "enabled"
+msgstr "ενεργοποιημένο"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:556
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+msgstr "επίπεδο (1=γρήγορο, 6=καλύτερο [4-6 είναι σπάνια χρήσιμα])"
+
+#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:569
+msgid "quality (0=poor, 9=best)"
+msgstr "ποιότητα (0=φτωχή, 9=καλύτερη)"
+
+#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
+msgstr "αδύνατη η δημιουργία τομέα DIB"
diff --git a/po/sv.po b/po/sv.po
index da32df24..1ded0245 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,747 +1,726 @@
-# Copyright (C) 2011 TigerVNC Team
+# Swedish messages for TigerVNC.
+# Copyright © 2015 the TigerVNC Team (msgids)
+# 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 $
 msgid ""
 msgstr ""
-"Project-Id-Version: TigerVNC 0.0.91\n"
+"Project-Id-Version: tigervnc 1.4.90\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
-"POT-Creation-Date: 2014-09-22 11:15+0000\n"
-"PO-Revision-Date: 2011-08-29 16:01+0200\n"
-"Last-Translator: Peter Astrand <astrand@cendio.se>\n"
-"Language-Team: Swedish\n"
-"Language: \n"
+"POT-Creation-Date: 2015-06-22 07:27+0000\n"
+"PO-Revision-Date: 2015-06-24 21:44+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:194
+#: vncviewer/CConn.cxx:111
 #, c-format
-msgid "(server default %s)"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:227
-msgid "About"
-msgstr "Om"
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:103
-msgid "About TigerVNC Viewer"
-msgstr "Om VNC-visaren"
-
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1086
-msgid "About TigerVNC viewer..."
-msgstr "Om TigerVNC-visaren..."
-
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:86
-msgid "About..."
-msgstr "Om..."
-
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:704
-msgid "Accept clipboard from server"
-msgstr "Acceptera urklipp från server"
+msgid "connected to host %s port %d"
+msgstr "ansluten till värd %s port %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:327
-msgid "Adjusting window size to avoid accidental full screen request"
-msgstr ""
+#: vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
+msgstr "Skrivbordsnamn: %.80s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:563
-msgid "Allow JPEG compression:"
-msgstr "Tillåt JPEG-kompression:"
+#: vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
+msgstr "Värd: %.80s port: %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1070
-msgid "Alt"
-msgstr "Alt"
+#: vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
+msgstr "Storlek: %d x %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:648
-msgid "Authentication"
-msgstr "Autentisering"
+#: vncviewer/CConn.cxx:190
+#, c-format
+msgid "Pixel format: %s"
+msgstr "Pixelformat: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:89
-msgid "Authentication cancelled"
-msgstr "Autentisering avbruten"
+#: vncviewer/CConn.cxx:197
+#, c-format
+msgid "(server default %s)"
+msgstr "(serverstandard %s)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:437
-msgid "Auto select"
-msgstr "Automatiskt val"
+#: vncviewer/CConn.cxx:202
+#, c-format
+msgid "Requested encoding: %s"
+msgstr "Begärd kodning: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:651
+#: vncviewer/CConn.cxx:207
 #, c-format
-msgid "Bad Name/Value pair on line: %d in file: %s"
-msgstr ""
+msgid "Last used encoding: %s"
+msgstr "Senast använd kodning: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:92
-msgid "BitBlt failed"
-msgstr ""
+#: vncviewer/CConn.cxx:212
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
+msgstr "Uppskattad hastighet på förbindelsen: %d kbit/s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:91
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:221
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:83
-msgid "Cancel"
-msgstr "Avbryt"
+#: vncviewer/CConn.cxx:217
+#, c-format
+msgid "Protocol version: %d.%d"
+msgstr "Protokollversion: %d.%d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:116
-msgid "CleanupSignalHandler called"
-msgstr ""
+#: vncviewer/CConn.cxx:222
+#, c-format
+msgid "Security method: %s"
+msgstr "Säkerhetsmetod: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:222
-msgid "Close"
-msgstr "Stäng"
+#: vncviewer/CConn.cxx:322
+#, c-format
+msgid "SetDesktopSize failed: %d"
+msgstr "SetDesktopSize misslyckades: %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:499
-msgid "Color level"
-msgstr "Färgnivå"
+#: vncviewer/CConn.cxx:387
+msgid "Invalid SetColourMapEntries from server!"
+msgstr "Ogiltig SetColourMapEntries från server!"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:421
-msgid "Compression"
-msgstr "Kompression"
+#. TRANSLATORS: Refers to a VNC protocol encoding type
+#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#, c-format
+msgid "Unknown encoding %d"
+msgstr "Okänd kodning %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:96
-msgid "Connect"
-msgstr "Anslut"
+#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+msgid "Unknown encoding"
+msgstr "Okänd kodning"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1085
-msgid "Connection info..."
-msgstr "Information om anslutningen..."
+#: vncviewer/CConn.cxx:473
+msgid "Enabling continuous updates"
+msgstr "Aktiverar kontinuerliga uppdateringar"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:362
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:404
+#: vncviewer/CConn.cxx:543
 #, c-format
-msgid ""
-"Could not convert the parameter-name %s to wchar_t* when reading from the "
-"Registry, the buffersize is to small."
-msgstr ""
+msgid "Throughput %d kbit/s - changing to quality %d"
+msgstr "Bandbredd %d kbit/s - byter till kvalitet %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:302
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:340
+#: vncviewer/CConn.cxx:565
 #, c-format
-msgid ""
-"Could not convert the parameter-name %s to wchar_t* when writing to the "
-"Registry, the buffersize is to small."
-msgstr ""
+msgid "Throughput %d kbit/s - full color is now %s"
+msgstr "Bandbredd %d kbit/s - fullfärg är nu %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:318
-#, c-format
-msgid ""
-"Could not convert the parameter-value %s to wchar_t* when writing to the "
-"Registry, the buffersize is to small."
-msgstr ""
+#: vncviewer/CConn.cxx:567
+msgid "disabled"
+msgstr "avaktiverad"
+
+#: vncviewer/CConn.cxx:567
+msgid "enabled"
+msgstr "aktiverad"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:381
+#: vncviewer/CConn.cxx:577
 #, c-format
-msgid ""
-"Could not convert the parameter-value for %s to utf8 char* when reading from "
-"the Registry, the buffer dest is to small."
-msgstr ""
+msgid "Using %s encoding"
+msgstr "Använder kodning %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:256
+#: vncviewer/CConn.cxx:624
 #, c-format
-msgid "Could not create VNC home directory: %s."
-msgstr "Kunde inte skapa VNC-hemkatalog: %s."
+msgid "Using pixel format %s"
+msgstr "Använder pixelformat %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:251
-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/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
+msgstr "Ogiltig geometri angiven!"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:310
-#, c-format
-msgid "Could not encode the parameter-value %s when writing to the Registry."
-msgstr ""
+#: vncviewer/DesktopWindow.cxx:309
+msgid "Adjusting window size to avoid accidental full screen request"
+msgstr "Justerar fönsterstorleken för att undvika fullskärm av misstag"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:613
-#, c-format
-msgid ""
-"Could not read the line(%d) in the configuration file,the buffersize is to "
-"small."
-msgstr ""
+#: vncviewer/DesktopWindow.cxx:491 vncviewer/DesktopWindow.cxx:497
+#: vncviewer/DesktopWindow.cxx:510
+msgid "Failure grabbing keyboard"
+msgstr "Misslyckades med att fånga tangentbordet"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:80
-msgid "CreateCompatibleDC failed"
-msgstr ""
+#: vncviewer/DesktopWindow.cxx:522
+msgid "Failure grabbing mouse"
+msgstr "Misslyckades med att fånga musen"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1068
-msgid "Ctrl"
-msgstr "Ctrl"
+#: vncviewer/DesktopWindow.cxx:752
+msgid "Invalid screen layout computed for resize request!"
+msgstr "Ogiltig skärmlayout beräknad för storleksförändrings-begäran!"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:550
-msgid "Custom compression level:"
-msgstr "Anpassad kompressionsnivå:"
+#: vncviewer/FLTKPixelBuffer.cxx:33 vncviewer/OSXPixelBuffer.cxx:48
+#: vncviewer/X11PixelBuffer.cxx:113
+msgid "Not enough memory for framebuffer"
+msgstr "Inte tillräckligt med minne för framebuffer"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:283
-msgid ""
-"Decoding: The size of the buffer dest is to small, it needs to be 1 byte "
-"bigger."
-msgstr ""
+#: vncviewer/OSXPixelBuffer.cxx:52
+msgid "Could not create framebuffer device"
+msgstr "Kunde inte skapa framebuffer-enhet"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:172
-#, c-format
-msgid "Desktop name: %.80s"
-msgstr ""
+#: vncviewer/OSXPixelBuffer.cxx:58
+msgid "Could not create framebuffer bitmap"
+msgstr "Kunde inte skapa framebuffer-bitmap"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1088
-msgid "Dismiss menu"
-msgstr "Stäng meny"
+#: vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
+msgstr "VNC-visare: Anslutningsalternativ"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:778
-msgid "Enable full-screen mode over all monitors"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
+#: vncviewer/vncviewer.cxx:263
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:469
-msgid "Enabling continuous updates"
-msgstr "Aktiverar kontinuerliga uppdateringar"
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+msgid "OK"
+msgstr "Ok"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:200
-#, c-format
-msgid ""
-"Encoding backslash: The size of the buffer dest is to small, it needs to be "
-"more than %d bytes bigger."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:413
+msgid "Compression"
+msgstr "Kompression"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:214
-#, c-format
-msgid ""
-"Encoding escape sequence: The size of the buffer dest is to small, it needs "
-"to be more than %d bytes bigger."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:429
+msgid "Auto select"
+msgstr "Automatiskt val"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:234
-#, c-format
-msgid ""
-"Encoding normal character: The size of the buffer dest is to small, it needs "
-"to be more than %d bytes bigger."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:441
+msgid "Preferred encoding"
+msgstr "Föredragen kodning"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:595
-msgid "Encryption"
-msgstr "Kryptering"
+#: vncviewer/OptionsDialog.cxx:489
+msgid "Color level"
+msgstr "Färgnivå"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:503
-#, c-format
-msgid "Error(%d) closing key:  Software\\TigerVNC\\vncviewer"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:500
+msgid "Full (all available colors)"
+msgstr "Full (alla tillgängliga färger)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:455
-#, c-format
-msgid "Error(%d) closing key: Software\\TigerVNC\\vncviewer"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:507
+msgid "Medium (256 colors)"
+msgstr "Medium (256 färger)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:434
-#, c-format
-msgid "Error(%d) creating key: Software\\TigerVNC\\vncviewer"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:514
+msgid "Low (64 colors)"
+msgstr "Låg (64 färger)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:471
-#, c-format
-msgid "Error(%d) opening key: Software\\TigerVNC\\vncviewer"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:521
+msgid "Very low (8 colors)"
+msgstr "Mycket låg (8 färger)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:373
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:415
-#, c-format
-msgid "Error(%d) reading %s from Registry."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:538
+msgid "Custom compression level:"
+msgstr "Anpassad kompressionsnivå:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:348
-#, c-format
-msgid "Error(%d) writing %d(REG_DWORD) to Registry."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:544
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+msgstr "nivå (1=snabb, 6=bäst [4-6 sällan användbara])"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:326
-#, c-format
-msgid "Error(%d) writing %s(REG_SZ) to Registry."
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:551
+msgid "Allow JPEG compression:"
+msgstr "Tillåt JPEG-kompression:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:50
-#: /home/ossman/devel/tigervnc/vncviewer/FLTKPixelBuffer.cxx:33
-msgid "Error: Not enough memory for framebuffer"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:557
+msgid "quality (0=poor, 9=best)"
+msgstr "kvalitet (0=dålig, 9=bäst)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:69
-msgid "Error: couldn't find suitable pixmap format"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:568
+msgid "Security"
+msgstr "Säkerhet"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:60
-msgid "Error: display lacks pixmap format for default depth"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:583
+msgid "Encryption"
+msgstr "Kryptering"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:78
-msgid "Error: only true colour displays supported"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:594 vncviewer/OptionsDialog.cxx:647
+#: vncviewer/OptionsDialog.cxx:715
+msgid "None"
+msgstr "Ingen"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1056
-msgid "Exit viewer"
-msgstr "Avsluta visaren"
+#: vncviewer/OptionsDialog.cxx:600
+msgid "TLS with anonymous certificates"
+msgstr "TLS med anonyma certifikat"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:588
-#, fuzzy
-msgid "Failed to read configuration file, can't obtain home directory path."
-msgstr "Kunde inte skapa VNC-hemkatalog: kan inte avgöra hemkatalogens sökväg"
+#: vncviewer/OptionsDialog.cxx:606
+msgid "TLS with X509 certificates"
+msgstr "TLS med X509-certifikat"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:602
-#, c-format
-msgid "Failed to read configuration file, can't open %s"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:613
+msgid "Path to X509 CA certificate"
+msgstr "Sökväg till CA-certifikat för X509"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:621
-#, c-format
-msgid "Failed to read line %d in file %s"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:620
+msgid "Path to X509 CRL file"
+msgstr "Sökväg till CRL-fil för X509"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:528
-#, fuzzy
-msgid "Failed to write configuration file, can't obtain home directory path."
-msgstr "Kunde inte skapa VNC-hemkatalog: kan inte avgöra hemkatalogens sökväg"
+#: vncviewer/OptionsDialog.cxx:636
+msgid "Authentication"
+msgstr "Autentisering"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:542
-#, c-format
-msgid "Failed to write configuration file, can't open %s"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:653
+msgid "Standard VNC (insecure without encryption)"
+msgstr "Standard-VNC (osäkert utan kryptering)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:526
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:538
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:551
-msgid "Failure grabbing keyboard"
-msgstr "Misslyckades med att fånga tangentbordet"
+#: vncviewer/OptionsDialog.cxx:659
+msgid "Username and password (insecure without encryption)"
+msgstr "Användarnamn och lösenord (osäkert utan kryptering)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:563
-msgid "Failure grabbing mouse"
-msgstr "Misslyckades med att fånga musen"
+#: vncviewer/OptionsDialog.cxx:678
+msgid "Input"
+msgstr "Inmatning"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:512
-msgid "Full (all available colors)"
-msgstr "Full (alla tillgängliga färger)"
+#: vncviewer/OptionsDialog.cxx:686
+msgid "View only (ignore mouse and keyboard)"
+msgstr "Endast visning (ignorera mus och tangentbord)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1059
-msgid "Full screen"
-msgstr "Fullskärm"
+#: vncviewer/OptionsDialog.cxx:692
+msgid "Accept clipboard from server"
+msgstr "Acceptera urklipp från server"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:770
-msgid "Full-screen mode"
-msgstr "Fullskärmsläge"
+#: vncviewer/OptionsDialog.cxx:698
+msgid "Send clipboard to server"
+msgstr "Skicka urklipp till server"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:230
-msgid "Hide"
-msgstr "Göm"
+#: vncviewer/OptionsDialog.cxx:704
+msgid "Send primary selection and cut buffer as clipboard"
+msgstr "Skicka primär markering och klippbuffert som urklipp"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:238
-msgid "Hide Others"
-msgstr "Göm andra"
+#: vncviewer/OptionsDialog.cxx:710
+msgid "Pass system keys directly to server (full screen)"
+msgstr "Skicka systemtangenter direkt till servern (fullskärm)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:177
-#, c-format
-msgid "Host: %.80s port: %d"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:713
+msgid "Menu key"
+msgstr "Menytangent"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:690
-msgid "Input"
-msgstr "Inmatning"
+#: vncviewer/OptionsDialog.cxx:729
+msgid "Screen"
+msgstr "Skärm"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:510
-msgid "Internal FLTK error. Exiting."
-msgstr "Internt FLTK-fel. Avslutar."
+#: vncviewer/OptionsDialog.cxx:737
+msgid "Resize remote session on connect"
+msgstr "Anpassa sessionsstorlek vid anslutning"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:384
-msgid "Invalid SetColourMapEntries from server!"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:750
+msgid "Resize remote session to the local window"
+msgstr "Anpassa sessionsstorlek till lokalt fönster"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:106
-msgid "Invalid geometry specified!"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:756
+msgid "Full-screen mode"
+msgstr "Fullskärmsläge"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:708
-#, c-format
-msgid "Invalid parameter name on line: %d in file: %s"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:762
+msgid "Enable full-screen mode over all monitors"
+msgstr "Aktivera fullskärmsläge på alla skärmar"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:797
-msgid "Invalid screen layout computed for resize request!"
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:771
+msgid "Misc."
+msgstr "Diverse"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:204
-#, fuzzy, c-format
-msgid "Last used encoding: %s"
-msgstr "Använder kodning %s"
+#: vncviewer/OptionsDialog.cxx:779
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Delad (koppla ej från andra visare)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:631
-#, c-format
-msgid ""
-"Line 1 in file %s\n"
-"must contain the TigerVNC configuration file identifier string:\n"
-"\"%s\""
-msgstr ""
+#: vncviewer/OptionsDialog.cxx:785
+msgid "Show dot when no cursor"
+msgstr "Visa punkt när muspekare saknas"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:209
-#, c-format
-msgid "Line speed estimate: %d kbit/s"
-msgstr ""
+#: vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
+msgstr "VNC-visare: Anslutningsdetaljer"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:478
-#, c-format
-msgid "Listening on port %d\n"
-msgstr ""
+#: vncviewer/ServerDialog.cxx:49 vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
+msgstr "VNC-server:"
+
+#: vncviewer/ServerDialog.cxx:64
+msgid "Options..."
+msgstr "Inställningar..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:69
+#: vncviewer/ServerDialog.cxx:69
 msgid "Load..."
 msgstr "Öppna..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:526
-msgid "Low (64 colors)"
-msgstr "Låg (64 färger)"
+#: vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
+msgstr "Spara som..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:519
-msgid "Medium (256 colors)"
-msgstr "Medium (256 färger)"
+#: vncviewer/ServerDialog.cxx:86
+msgid "About..."
+msgstr "Om..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:725
-msgid "Menu key"
-msgstr "Menytangent"
+#: vncviewer/ServerDialog.cxx:96
+msgid "Connect"
+msgstr "Anslut"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:791
-msgid "Misc."
-msgstr "Diverse"
+#: vncviewer/UserDialog.cxx:74
+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"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1026
+#: vncviewer/UserDialog.cxx:87 vncviewer/UserDialog.cxx:102
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
+msgstr "Autentisering avbruten"
+
+#: vncviewer/UserDialog.cxx:99
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: vncviewer/Viewport.cxx:434
 #, c-format
-msgid "Multiple characters given for key code %d (0x%04x): '%s'"
-msgstr "Multipla tecken angivna för tangentkod %d (0x%04x): '%s'"
+msgid "Unable to create platform specific framebuffer: %s"
+msgstr "Kan inte skapa plattformsspecifik framebuffer: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:218
-msgid "No"
-msgstr "Ingen"
+#: vncviewer/Viewport.cxx:435
+msgid "Using platform independent framebuffer"
+msgstr "Använder plattformsoberoende framebuffer"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:688
+#: vncviewer/Viewport.cxx:669
 #, c-format
 msgid "No scan code for extended virtual key 0x%02x"
-msgstr ""
+msgstr "Ingen scancode för utökad virtuell tangent 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:690
+#: vncviewer/Viewport.cxx:671
 #, c-format
 msgid "No scan code for virtual key 0x%02x"
-msgstr ""
+msgstr "Ingen scancode för virtuell tangent 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:701
+#: vncviewer/Viewport.cxx:688
 #, c-format
 msgid "No symbol for extended virtual key 0x%02x"
-msgstr ""
+msgstr "Ingen symbol för utökad virtuell tangent 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:765
+#: vncviewer/Viewport.cxx:690
 #, c-format
-msgid "No symbol for key code %d (in the current state)"
-msgstr ""
+msgid "No symbol for virtual key 0x%02x"
+msgstr "Ingen symbol för virtuell tangent 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:739
+#: vncviewer/Viewport.cxx:728
 #, c-format
 msgid "No symbol for key code 0x%02x (in the current state)"
-msgstr ""
+msgstr "Ingen symbol för tangentkod 0x%02x (i nuvarande tillstånd)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:703
+#: vncviewer/Viewport.cxx:754
 #, c-format
-msgid "No symbol for virtual key 0x%02x"
-msgstr ""
+msgid "No symbol for key code %d (in the current state)"
+msgstr "Ingen symbol för tangentkod %d (i nuvarande tillstånd)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:606
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:659
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:727
-msgid "None"
-msgstr "Ingen"
+#: vncviewer/Viewport.cxx:791
+msgid "E&xit viewer"
+msgstr "&Avsluta visaren"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:220
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:88
-msgid "OK"
-msgstr "Ok"
+#: vncviewer/Viewport.cxx:794
+msgid "&Full screen"
+msgstr "&Fullskärm"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:74
-msgid "Opening password file failed"
-msgstr "Öppning av lösenordsfilen misslyckades"
+#: vncviewer/Viewport.cxx:796
+msgid "Resize &window to session"
+msgstr "Anpassa &fönster till session"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1084
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:64
-msgid "Options..."
-msgstr "Inställningar..."
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:463
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:464
-msgid "Parameters -listen and -via are incompatible"
-msgstr ""
+#: vncviewer/Viewport.cxx:801
+msgid "&Ctrl"
+msgstr "&Ctrl"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:722
-msgid "Pass system keys directly to server (full screen)"
-msgstr "Skicka systemtangenter direkt till servern (fullskärm)"
+#: vncviewer/Viewport.cxx:803
+msgid "&Alt"
+msgstr "&Alt"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:87
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:102
-msgid "Password:"
-msgstr "Lösenord:"
+#: vncviewer/Viewport.cxx:808
+#, c-format
+msgid "Send %s"
+msgstr "Skicka %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:625
-msgid "Path to X509 CA certificate"
-msgstr "Sökväg till CA-certifikat för X509"
+#: vncviewer/Viewport.cxx:814
+msgid "Send Ctrl-Alt-&Del"
+msgstr "Skicka Ctrl-Alt-&Del"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:632
-msgid "Path to X509 CRL file"
-msgstr "Sökväg till CRL-fil för X509"
+#: vncviewer/Viewport.cxx:817
+msgid "&Refresh screen"
+msgstr "&Uppdatera skärm"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:188
-#, fuzzy, c-format
-msgid "Pixel format: %s"
-msgstr "Använder pixelformat %s"
+#: vncviewer/Viewport.cxx:820
+msgid "&Options..."
+msgstr "&Inställningar..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:449
-msgid "Preferred encoding"
-msgstr "Föredragen kodning"
+#: vncviewer/Viewport.cxx:822
+msgid "Connection &info..."
+msgstr "&Information om anslutningen..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:214
-#, c-format
-msgid "Protocol version: %d.%d"
-msgstr ""
+#: vncviewer/Viewport.cxx:824
+msgid "About &TigerVNC viewer..."
+msgstr "Om &TigerVNC-visaren..."
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:233
-msgid "Quit"
-msgstr "Avsluta"
+#: vncviewer/Viewport.cxx:827
+msgid "Dismiss &menu"
+msgstr "Stäng &meny"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1082
-msgid "Refresh screen"
-msgstr "Uppdatera skärm"
+#: vncviewer/Viewport.cxx:908
+msgid "VNC connection info"
+msgstr "VNC anslutningsinformation"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:199
-#, fuzzy, c-format
-msgid "Requested encoding: %s"
-msgstr "Föredragen kodning"
+#: vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
+msgstr "kan inte skapa DIB-sektion"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:749
-msgid "Resize remote session on connect"
-msgstr ""
+#: vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
+msgstr "CreateCompatibleDC misslyckades"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:762
-msgid "Resize remote session to the local window"
-msgstr "Anpassa sessionsstorlek till lokalt fönster"
+#: vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
+msgstr "SelectObject misslyckades"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1062
-msgid "Resize window to session"
-msgstr "Anpassa fönster till session"
+#: vncviewer/Win32PixelBuffer.cxx:91
+msgid "BitBlt failed"
+msgstr "BitBlt misslyckades"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:74
-msgid "Save As..."
-msgstr "Spara som..."
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:61
+msgid "Display lacks pixmap format for default depth"
+msgstr "Skärmen saknar pixmap-format för standarddjup"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:741
-msgid "Screen"
-msgstr "Skärm"
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:72
+msgid "Couldn't find suitable pixmap format"
+msgstr "Kunde inte hitta lämpligt pixmap-format"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:580
-msgid "Security"
-msgstr "Säkerhet"
+#: vncviewer/X11PixelBuffer.cxx:81
+msgid "Only true colour displays supported"
+msgstr "Endast skärmar med true colour stöds"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:219
+#: vncviewer/X11PixelBuffer.cxx:83
 #, c-format
-msgid "Security method: %s"
-msgstr ""
+msgid "Using default colormap and visual, TrueColor, depth %d."
+msgstr "Använder standardfärgkarta och visual, TrueColor, depth %d."
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:83
-msgid "SelectObject failed"
-msgstr ""
+#: vncviewer/X11PixelBuffer.cxx:109
+msgid "Could not create framebuffer image"
+msgstr "Kunde inte skapa framebuffer-bild"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1075
+#: vncviewer/parameters.cxx:279 vncviewer/parameters.cxx:313
 #, c-format
-msgid "Send %s"
-msgstr "Skicka %s"
+msgid "The name of the parameter %s was too large to write to the registry"
+msgstr "Namnet på parameter %s var för stor för skrivning till registret"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1080
-msgid "Send Ctrl-Alt-Del"
-msgstr "Skicka Ctrl-Alt-Del"
+#: vncviewer/parameters.cxx:285 vncviewer/parameters.cxx:292
+#, c-format
+msgid "The parameter %s was too large to write to the registry"
+msgstr "Parameter %s var för stor för skrivning till registret"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:710
-msgid "Send clipboard to server"
-msgstr "Skicka urklipp till server"
+#: vncviewer/parameters.cxx:298 vncviewer/parameters.cxx:319
+#, c-format
+msgid "Failed to write parameter %s of type %s to the registry: %ld"
+msgstr "Misslyckades med att skriva parameter %s av typ %s till registret: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:716
-msgid "Send primary selection and cut buffer as clipboard"
-msgstr "Skicka primär markering och klippbuffert som urklipp"
+#: vncviewer/parameters.cxx:334 vncviewer/parameters.cxx:373
+#, c-format
+msgid "The name of the parameter %s was too large to read from the registry"
+msgstr "Namnet på parameter %s var för stor för att läsas från registret"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:237
-msgid "Services"
-msgstr "Tjänster"
+#: vncviewer/parameters.cxx:343 vncviewer/parameters.cxx:382
+#, c-format
+msgid "Failed to read parameter %s from the registry: %ld"
+msgstr "Misslyckades med att läsa parameter %s från registret: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:319
+#: vncviewer/parameters.cxx:352
 #, c-format
-msgid "SetDesktopSize failed: %d"
-msgstr "SetDesktopSize misslyckades: %d"
+msgid "The parameter %s was too large to read from the registry"
+msgstr "Parameter %s var för stor för läsning från registret"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:799
-msgid "Shared (don't disconnect other viewers)"
-msgstr "Delad (koppla ej från andra visare)"
+#: vncviewer/parameters.cxx:402
+#, c-format
+msgid "Failed to create registry key: %ld"
+msgstr "Misslyckades med att skapa registernyckel: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:239
-msgid "Show All"
-msgstr "Visa alla"
+#: vncviewer/parameters.cxx:416 vncviewer/parameters.cxx:465
+#: vncviewer/parameters.cxx:527 vncviewer/parameters.cxx:658
+#, c-format
+msgid "Unknown parameter type for parameter %s"
+msgstr "Okänd parametertyp för parameter %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:805
-msgid "Show dot when no cursor"
-msgstr "Visa punkt när muspekare saknas"
+#: vncviewer/parameters.cxx:423 vncviewer/parameters.cxx:472
+#, c-format
+msgid "Failed to close registry key: %ld"
+msgstr "Misslyckades med att stänga registernyckel: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:182
+#: vncviewer/parameters.cxx:439
 #, c-format
-msgid "Size: %d x %d"
-msgstr ""
+msgid "Failed to open registry key: %ld"
+msgstr "Misslyckades med att öppna registernyckel: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:665
-msgid "Standard VNC (insecure without encryption)"
-msgstr "Standard-VNC (osäkert utan kryptering)"
+#: vncviewer/parameters.cxx:496
+msgid "Failed to write configuration file, can't obtain home directory path."
+msgstr "Misslyckades med att skriva konfigurations-fil, kan inte avgöra hemkatalogens sökväg."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:618
-msgid "TLS with X509 certificates"
-msgstr "TLS med X509-certifikat"
+#: vncviewer/parameters.cxx:509
+#, c-format
+msgid "Failed to write configuration file, can't open %s: %s"
+msgstr "Misslyckades med att skriva konfigurations-fil: kan inte öppna %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:612
-msgid "TLS with anonymous certificates"
-msgstr "TLS med anonyma certifikat"
+#: vncviewer/parameters.cxx:552
+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."
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:448
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:497
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:561
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:701
+#. Use defaults.
+#: vncviewer/parameters.cxx:565
 #, c-format
-msgid "The parameterArray contains a object of a invalid type at line %d."
-msgstr ""
+msgid "Failed to read configuration file, can't open %s: %s"
+msgstr "Misslyckades med att läsa konfigurations-fil, kan inte öppna %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:664
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:680
+#: vncviewer/parameters.cxx:578 vncviewer/parameters.cxx:583
+#: vncviewer/parameters.cxx:608 vncviewer/parameters.cxx:621
+#: vncviewer/parameters.cxx:637
 #, c-format
-msgid "The value of the parameter %s on line %d in file %s is invalid."
-msgstr ""
+msgid "Failed to read line %d in file %s: %s"
+msgstr "Misslyckades med att läsa rad %d i fil %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:539
-#, c-format
-msgid "Throughput %d kbit/s - changing to quality %d"
-msgstr "Bandbredd %d kbit/s - byter till kvalitet %d"
+#: vncviewer/parameters.cxx:584
+msgid "Line too long"
+msgstr "Raden är för lång"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:561
+#: vncviewer/parameters.cxx:591
 #, c-format
-msgid "Throughput %d kbit/s - full color is now %s"
-msgstr "Bandbredd %d kbit/s - fullfärg är nu %s"
+msgid "Configuration file %s is in an invalid format"
+msgstr "Konfigurationsfilen %s har ogiltigt format"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:210
-msgid "TigerVNC Viewer"
-msgstr "VNC-visare"
+#: vncviewer/parameters.cxx:609
+msgid "Invalid format"
+msgstr "Ogiltigt format"
+
+#: vncviewer/parameters.cxx:622 vncviewer/parameters.cxx:638
+msgid "Invalid format or too large value"
+msgstr "Ogiltigt format eller för stort värde"
+
+#: vncviewer/parameters.cxx:665
+#, c-format
+msgid "Unknown parameter %s on line %d in file %s"
+msgstr "Okänd parameter %s på rad %d i fil %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:80
-#, fuzzy, c-format
+#: vncviewer/vncviewer.cxx:100
+#, c-format
 msgid ""
 "TigerVNC Viewer %d-bit v%s\n"
 "Built on: %s\n"
 "Copyright (C) 1999-%d TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
-"TigerVNC-visare %d-bit v%s (%s)\n"
-"%s\n"
-"Copyright (C) 1999-2011 TigerVNC-teamet och många andra (se README.txt)\n"
-"Se http://www.tigervnc.org för mer information om TigerVNC."
+"TigerVNC-visare %d-bit v%s\n"
+"Byggd: %s\n"
+"Copyright (C) 1999-%d TigerVNC-teamet och många andra (se README.txt)\n"
+"Se http://www.tigervnc.org för information om TigerVNC."
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1004
-#, c-format
-msgid "Unknown FLTK key code %d (0x%04x)"
-msgstr "Okänd FLTK-tangentkod %d (0x%04x)"
+#: vncviewer/vncviewer.cxx:122
+msgid "About TigerVNC Viewer"
+msgstr "Om VNC-visaren"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:878
+#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
 #, c-format
-msgid "Unknown decimal separator: '%s'"
-msgstr "Okänd decimalseparator: '%s'"
+msgid "Error starting new TigerVNC Viewer: %s"
+msgstr "Fel vid start av ny TigerVNC-visare: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:271
-#, fuzzy, c-format
-msgid "Unknown escape sequence at character %d"
-msgstr "Okänd decimalseparator: '%s'"
+#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
+#. exit() rather than the default which is to abort.
+#: vncviewer/vncviewer.cxx:160
+#, 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."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:430
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:437
-#, fuzzy
-msgid "Unknown rect encoding"
-msgstr "Använder kodning %s"
+#. Avoid empty titles for popups
+#: vncviewer/vncviewer.cxx:252
+msgid "TigerVNC Viewer"
+msgstr "VNC-visare"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:429
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:436
-#, c-format
-msgid "Unknown rect encoding %d"
-msgstr ""
+#. FLTK exposes these so that we can translate them.
+#: vncviewer/vncviewer.cxx:260
+msgid "No"
+msgstr "Ingen"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:671
-msgid "Username and password (insecure without encryption)"
-msgstr "Användarnamn och lösenord (osäkert utan kryptering)"
+#: vncviewer/vncviewer.cxx:261
+msgid "Yes"
+msgstr "Ja"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:99
-msgid "Username:"
-msgstr "Användarnamn:"
+#: vncviewer/vncviewer.cxx:264
+msgid "Close"
+msgstr "Stäng"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:573
-#, c-format
-msgid "Using %s encoding"
-msgstr "Använder kodning %s"
+#: vncviewer/vncviewer.cxx:269
+msgid "About"
+msgstr "Om"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:80
-#, c-format
-msgid "Using default colormap and visual, %sdepth %d."
-msgstr ""
+#: vncviewer/vncviewer.cxx:272
+msgid "Hide"
+msgstr "Göm"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:620
-#, c-format
-msgid "Using pixel format %s"
-msgstr "Använder pixelformat %s"
+#: vncviewer/vncviewer.cxx:275
+msgid "Quit"
+msgstr "Avsluta"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:42
-msgid "VNC Viewer: Connection Details"
-msgstr "VNC-visare: Anslutningsdetaljer"
+#. Don't want the print item
+#: vncviewer/vncviewer.cxx:279
+msgid "Services"
+msgstr "Tjänster"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:57
-msgid "VNC Viewer: Connection Options"
-msgstr "VNC-visare: Anslutningsalternativ"
+#: vncviewer/vncviewer.cxx:280
+msgid "Hide Others"
+msgstr "Göm andra"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:86
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:96
-msgid "VNC authentication"
-msgstr "VNC-autentisering"
+#: vncviewer/vncviewer.cxx:281
+msgid "Show All"
+msgstr "Visa alla"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1176
-msgid "VNC connection info"
-msgstr "VNC anslutningsinformation"
+#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
+#. which means we cannot use our generic Fl_Menu_ helpers.
+#: vncviewer/vncviewer.cxx:290
+msgid "&File"
+msgstr "&Arkiv"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:49
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:54
-msgid "VNC server:"
-msgstr "VNC-server:"
+#: vncviewer/vncviewer.cxx:292
+msgid "&New Connection"
+msgstr "&Ny anslutning"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:533
-msgid "Very low (8 colors)"
-msgstr "Mycket låg (8 färger)"
+#: vncviewer/vncviewer.cxx:303
+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"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:698
-msgid "View only (ignore mouse and keyboard)"
-msgstr "Endast visning (ignorera mus och tangentbord)"
+#: vncviewer/vncviewer.cxx:308
+#, c-format
+msgid "Could not create VNC home directory: %s."
+msgstr "Kunde inte skapa VNC-hemkatalog: %s."
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:219
-msgid "Yes"
-msgstr "Ja"
+#. TRANSLATORS: "Parameters" are command line arguments, or settings
+#. from a file or the Windows registry.
+#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+msgid "Parameters -listen and -via are incompatible"
+msgstr "Parametrar -listen och -via är inkompatibla"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:111
+#: vncviewer/vncviewer.cxx:529
 #, c-format
-msgid "connected to host %s port %d"
-msgstr "ansluten till värd %s port %d"
+msgid "Listening on port %d"
+msgstr "Lyssnar på port %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "disabled"
-msgstr "avaktiverad"
+#: vncviewer/vncviewer.cxx:590
+msgid "Internal FLTK error. Exiting."
+msgstr "Internt FLTK-fel. Avslutar."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "enabled"
-msgstr "aktiverad"
+#~ msgid "Multiple characters given for key code %d (0x%04x): '%s'"
+#~ msgstr "Multipla tecken angivna för tangentkod %d (0x%04x): '%s'"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:556
-msgid "level (1=fast, 6=best [4-6 are rarely useful])"
-msgstr "nivå (1=snabb, 6=bäst [4-6 sällan användbara])"
+#~ msgid "Unknown FLTK key code %d (0x%04x)"
+#~ msgstr "Okänd FLTK-tangentkod %d (0x%04x)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:569
-msgid "quality (0=poor, 9=best)"
-msgstr "kvalitet (0=dålig, 9=bäst)"
+#~ msgid "Unknown decimal separator: '%s'"
+#~ msgstr "Okänd decimalseparator: '%s'"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:63
-msgid "unable to create DIB section"
-msgstr ""
+#~ msgid "Unknown escape sequence at character %d"
+#~ msgstr "Okänd specialsekvens vid tecken %d"
 
 #~ msgid ""
 #~ "Desktop name: %.80s\n"
diff --git a/po/tigervnc.pot b/po/tigervnc.pot
index 5a918040..d9cf4803 100644
--- a/po/tigervnc.pot
+++ b/po/tigervnc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
-"POT-Creation-Date: 2014-11-19 12:46+0000\n"
+"POT-Creation-Date: 2015-06-22 07:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,626 +17,591 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:194
+#: vncviewer/CConn.cxx:111
 #, c-format
-msgid "(server default %s)"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:227
-msgid "About"
+msgid "connected to host %s port %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:103
-msgid "About TigerVNC Viewer"
+#: vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1097
-msgid "About TigerVNC viewer..."
+#: vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:86
-msgid "About..."
+#: vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:704
-msgid "Accept clipboard from server"
+#: vncviewer/CConn.cxx:190
+#, c-format
+msgid "Pixel format: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:327
-msgid "Adjusting window size to avoid accidental full screen request"
+#: vncviewer/CConn.cxx:197
+#, c-format
+msgid "(server default %s)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:563
-msgid "Allow JPEG compression:"
+#: vncviewer/CConn.cxx:202
+#, c-format
+msgid "Requested encoding: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1081
-msgid "Alt"
+#: vncviewer/CConn.cxx:207
+#, c-format
+msgid "Last used encoding: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:648
-msgid "Authentication"
+#: vncviewer/CConn.cxx:212
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:89
-msgid "Authentication cancelled"
+#: vncviewer/CConn.cxx:217
+#, c-format
+msgid "Protocol version: %d.%d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:437
-msgid "Auto select"
+#: vncviewer/CConn.cxx:222
+#, c-format
+msgid "Security method: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:651
+#: vncviewer/CConn.cxx:322
 #, c-format
-msgid "Bad Name/Value pair on line: %d in file: %s"
+msgid "SetDesktopSize failed: %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:91
-msgid "BitBlt failed"
+#: vncviewer/CConn.cxx:387
+msgid "Invalid SetColourMapEntries from server!"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:91
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:221
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:83
-msgid "Cancel"
+#. TRANSLATORS: Refers to a VNC protocol encoding type
+#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#, c-format
+msgid "Unknown encoding %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:116
-msgid "CleanupSignalHandler called"
+#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+msgid "Unknown encoding"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:222
-msgid "Close"
+#: vncviewer/CConn.cxx:473
+msgid "Enabling continuous updates"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:499
-msgid "Color level"
+#: vncviewer/CConn.cxx:543
+#, c-format
+msgid "Throughput %d kbit/s - changing to quality %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:421
-msgid "Compression"
+#: vncviewer/CConn.cxx:565
+#, c-format
+msgid "Throughput %d kbit/s - full color is now %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:96
-msgid "Connect"
+#: vncviewer/CConn.cxx:567
+msgid "disabled"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1096
-msgid "Connection info..."
+#: vncviewer/CConn.cxx:567
+msgid "enabled"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:362
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:404
+#: vncviewer/CConn.cxx:577
 #, c-format
-msgid ""
-"Could not convert the parameter-name %s to wchar_t* when reading from the "
-"Registry, the buffersize is to small."
+msgid "Using %s encoding"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:302
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:340
+#: vncviewer/CConn.cxx:624
 #, c-format
-msgid ""
-"Could not convert the parameter-name %s to wchar_t* when writing to the "
-"Registry, the buffersize is to small."
+msgid "Using pixel format %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:318
-#, c-format
-msgid ""
-"Could not convert the parameter-value %s to wchar_t* when writing to the "
-"Registry, the buffersize is to small."
+#: vncviewer/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:381
-#, c-format
-msgid ""
-"Could not convert the parameter-value for %s to utf8 char* when reading from "
-"the Registry, the buffer dest is to small."
+#: vncviewer/DesktopWindow.cxx:309
+msgid "Adjusting window size to avoid accidental full screen request"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:256
-#, c-format
-msgid "Could not create VNC home directory: %s."
+#: vncviewer/DesktopWindow.cxx:491 vncviewer/DesktopWindow.cxx:497
+#: vncviewer/DesktopWindow.cxx:510
+msgid "Failure grabbing keyboard"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:251
-msgid "Could not create VNC home directory: can't obtain home directory path."
+#: vncviewer/DesktopWindow.cxx:522
+msgid "Failure grabbing mouse"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:58
-msgid "Could not create framebuffer bitmap"
+#: vncviewer/DesktopWindow.cxx:752
+msgid "Invalid screen layout computed for resize request!"
+msgstr ""
+
+#: vncviewer/FLTKPixelBuffer.cxx:33 vncviewer/OSXPixelBuffer.cxx:48
+#: vncviewer/X11PixelBuffer.cxx:113
+msgid "Not enough memory for framebuffer"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:52
+#: vncviewer/OSXPixelBuffer.cxx:52
 msgid "Could not create framebuffer device"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:107
-msgid "Could not create framebuffer image"
+#: vncviewer/OSXPixelBuffer.cxx:58
+msgid "Could not create framebuffer bitmap"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:310
-#, c-format
-msgid "Could not encode the parameter-value %s when writing to the Registry."
+#: vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:613
-#, c-format
-msgid ""
-"Could not read the line(%d) in the configuration file,the buffersize is to "
-"small."
+#: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
+#: vncviewer/vncviewer.cxx:263
+msgid "Cancel"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:68
-msgid "Couldn't find suitable pixmap format"
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+msgid "OK"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:79
-msgid "CreateCompatibleDC failed"
+#: vncviewer/OptionsDialog.cxx:413
+msgid "Compression"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1079
-msgid "Ctrl"
+#: vncviewer/OptionsDialog.cxx:429
+msgid "Auto select"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:550
-msgid "Custom compression level:"
+#: vncviewer/OptionsDialog.cxx:441
+msgid "Preferred encoding"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:283
-msgid ""
-"Decoding: The size of the buffer dest is to small, it needs to be 1 byte "
-"bigger."
+#: vncviewer/OptionsDialog.cxx:489
+msgid "Color level"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:172
-#, c-format
-msgid "Desktop name: %.80s"
+#: vncviewer/OptionsDialog.cxx:500
+msgid "Full (all available colors)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1099
-msgid "Dismiss menu"
+#: vncviewer/OptionsDialog.cxx:507
+msgid "Medium (256 colors)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:59
-msgid "Display lacks pixmap format for default depth"
+#: vncviewer/OptionsDialog.cxx:514
+msgid "Low (64 colors)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:778
-msgid "Enable full-screen mode over all monitors"
+#: vncviewer/OptionsDialog.cxx:521
+msgid "Very low (8 colors)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:469
-msgid "Enabling continuous updates"
+#: vncviewer/OptionsDialog.cxx:538
+msgid "Custom compression level:"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:200
-#, c-format
-msgid ""
-"Encoding backslash: The size of the buffer dest is to small, it needs to be "
-"more than %d bytes bigger."
+#: vncviewer/OptionsDialog.cxx:544
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:214
-#, c-format
-msgid ""
-"Encoding escape sequence: The size of the buffer dest is to small, it needs "
-"to be more than %d bytes bigger."
+#: vncviewer/OptionsDialog.cxx:551
+msgid "Allow JPEG compression:"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:234
-#, c-format
-msgid ""
-"Encoding normal character: The size of the buffer dest is to small, it needs "
-"to be more than %d bytes bigger."
+#: vncviewer/OptionsDialog.cxx:557
+msgid "quality (0=poor, 9=best)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:595
-msgid "Encryption"
+#: vncviewer/OptionsDialog.cxx:568
+msgid "Security"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:503
-#, c-format
-msgid "Error(%d) closing key:  Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:583
+msgid "Encryption"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:455
-#, c-format
-msgid "Error(%d) closing key: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:594 vncviewer/OptionsDialog.cxx:647
+#: vncviewer/OptionsDialog.cxx:715
+msgid "None"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:434
-#, c-format
-msgid "Error(%d) creating key: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:600
+msgid "TLS with anonymous certificates"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:471
-#, c-format
-msgid "Error(%d) opening key: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:606
+msgid "TLS with X509 certificates"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:373
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:415
-#, c-format
-msgid "Error(%d) reading %s from Registry."
+#: vncviewer/OptionsDialog.cxx:613
+msgid "Path to X509 CA certificate"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:348
-#, c-format
-msgid "Error(%d) writing %d(REG_DWORD) to Registry."
+#: vncviewer/OptionsDialog.cxx:620
+msgid "Path to X509 CRL file"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:326
-#, c-format
-msgid "Error(%d) writing %s(REG_SZ) to Registry."
+#: vncviewer/OptionsDialog.cxx:636
+msgid "Authentication"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1067
-msgid "Exit viewer"
+#: vncviewer/OptionsDialog.cxx:653
+msgid "Standard VNC (insecure without encryption)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:588
-msgid "Failed to read configuration file, can't obtain home directory path."
+#: vncviewer/OptionsDialog.cxx:659
+msgid "Username and password (insecure without encryption)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:602
-#, c-format
-msgid "Failed to read configuration file, can't open %s"
+#: vncviewer/OptionsDialog.cxx:678
+msgid "Input"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:621
-#, c-format
-msgid "Failed to read line %d in file %s"
+#: vncviewer/OptionsDialog.cxx:686
+msgid "View only (ignore mouse and keyboard)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:528
-msgid "Failed to write configuration file, can't obtain home directory path."
+#: vncviewer/OptionsDialog.cxx:692
+msgid "Accept clipboard from server"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:542
-#, c-format
-msgid "Failed to write configuration file, can't open %s"
+#: vncviewer/OptionsDialog.cxx:698
+msgid "Send clipboard to server"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:526
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:538
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:551
-msgid "Failure grabbing keyboard"
+#: vncviewer/OptionsDialog.cxx:704
+msgid "Send primary selection and cut buffer as clipboard"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:563
-msgid "Failure grabbing mouse"
+#: vncviewer/OptionsDialog.cxx:710
+msgid "Pass system keys directly to server (full screen)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:512
-msgid "Full (all available colors)"
+#: vncviewer/OptionsDialog.cxx:713
+msgid "Menu key"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1070
-msgid "Full screen"
+#: vncviewer/OptionsDialog.cxx:729
+msgid "Screen"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:770
-msgid "Full-screen mode"
+#: vncviewer/OptionsDialog.cxx:737
+msgid "Resize remote session on connect"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:230
-msgid "Hide"
+#: vncviewer/OptionsDialog.cxx:750
+msgid "Resize remote session to the local window"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:238
-msgid "Hide Others"
+#: vncviewer/OptionsDialog.cxx:756
+msgid "Full-screen mode"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:177
-#, c-format
-msgid "Host: %.80s port: %d"
+#: vncviewer/OptionsDialog.cxx:762
+msgid "Enable full-screen mode over all monitors"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:690
-msgid "Input"
+#: vncviewer/OptionsDialog.cxx:771
+msgid "Misc."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:510
-msgid "Internal FLTK error. Exiting."
+#: vncviewer/OptionsDialog.cxx:779
+msgid "Shared (don't disconnect other viewers)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:384
-msgid "Invalid SetColourMapEntries from server!"
+#: vncviewer/OptionsDialog.cxx:785
+msgid "Show dot when no cursor"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:106
-msgid "Invalid geometry specified!"
+#: vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:708
-#, c-format
-msgid "Invalid parameter name on line: %d in file: %s"
+#: vncviewer/ServerDialog.cxx:49 vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:805
-msgid "Invalid screen layout computed for resize request!"
+#: vncviewer/ServerDialog.cxx:64
+msgid "Options..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:204
-#, c-format
-msgid "Last used encoding: %s"
+#: vncviewer/ServerDialog.cxx:69
+msgid "Load..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:631
-#, c-format
-msgid ""
-"Line 1 in file %s\n"
-"must contain the TigerVNC configuration file identifier string:\n"
-"\"%s\""
+#: vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:209
-#, c-format
-msgid "Line speed estimate: %d kbit/s"
+#: vncviewer/ServerDialog.cxx:86
+msgid "About..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:478
-#, c-format
-msgid "Listening on port %d\n"
+#: vncviewer/ServerDialog.cxx:96
+msgid "Connect"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:69
-msgid "Load..."
+#: vncviewer/UserDialog.cxx:74
+msgid "Opening password file failed"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:526
-msgid "Low (64 colors)"
+#. 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 ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:519
-msgid "Medium (256 colors)"
+#: vncviewer/UserDialog.cxx:87 vncviewer/UserDialog.cxx:102
+msgid "Password:"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:725
-msgid "Menu key"
+#: vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:791
-msgid "Misc."
+#: vncviewer/UserDialog.cxx:99
+msgid "Username:"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1037
+#: vncviewer/Viewport.cxx:434
 #, c-format
-msgid "Multiple characters given for key code %d (0x%04x): '%s'"
+msgid "Unable to create platform specific framebuffer: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:218
-msgid "No"
+#: vncviewer/Viewport.cxx:435
+msgid "Using platform independent framebuffer"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:691
+#: vncviewer/Viewport.cxx:669
 #, c-format
 msgid "No scan code for extended virtual key 0x%02x"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:693
+#: vncviewer/Viewport.cxx:671
 #, c-format
 msgid "No scan code for virtual key 0x%02x"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:710
+#: vncviewer/Viewport.cxx:688
 #, c-format
 msgid "No symbol for extended virtual key 0x%02x"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:776
+#: vncviewer/Viewport.cxx:690
 #, c-format
-msgid "No symbol for key code %d (in the current state)"
+msgid "No symbol for virtual key 0x%02x"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:750
+#: vncviewer/Viewport.cxx:728
 #, c-format
 msgid "No symbol for key code 0x%02x (in the current state)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:712
+#: vncviewer/Viewport.cxx:754
 #, c-format
-msgid "No symbol for virtual key 0x%02x"
+msgid "No symbol for key code %d (in the current state)"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:606
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:659
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:727
-msgid "None"
+#: vncviewer/Viewport.cxx:791
+msgid "E&xit viewer"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:48
-#: /home/ossman/devel/tigervnc/vncviewer/FLTKPixelBuffer.cxx:33
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:111
-msgid "Not enough memory for framebuffer"
+#: vncviewer/Viewport.cxx:794
+msgid "&Full screen"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:220
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:88
-msgid "OK"
+#: vncviewer/Viewport.cxx:796
+msgid "Resize &window to session"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:77
-msgid "Only true colour displays supported"
+#: vncviewer/Viewport.cxx:801
+msgid "&Ctrl"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:74
-msgid "Opening password file failed"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1095
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:64
-msgid "Options..."
+#: vncviewer/Viewport.cxx:803
+msgid "&Alt"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:463
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:464
-msgid "Parameters -listen and -via are incompatible"
+#: vncviewer/Viewport.cxx:808
+#, c-format
+msgid "Send %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:722
-msgid "Pass system keys directly to server (full screen)"
+#: vncviewer/Viewport.cxx:814
+msgid "Send Ctrl-Alt-&Del"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:87
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:102
-msgid "Password:"
+#: vncviewer/Viewport.cxx:817
+msgid "&Refresh screen"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:625
-msgid "Path to X509 CA certificate"
+#: vncviewer/Viewport.cxx:820
+msgid "&Options..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:632
-msgid "Path to X509 CRL file"
+#: vncviewer/Viewport.cxx:822
+msgid "Connection &info..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:188
-#, c-format
-msgid "Pixel format: %s"
+#: vncviewer/Viewport.cxx:824
+msgid "About &TigerVNC viewer..."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:449
-msgid "Preferred encoding"
+#: vncviewer/Viewport.cxx:827
+msgid "Dismiss &menu"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:214
-#, c-format
-msgid "Protocol version: %d.%d"
+#: vncviewer/Viewport.cxx:908
+msgid "VNC connection info"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:233
-msgid "Quit"
+#: vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1093
-msgid "Refresh screen"
+#: vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:199
-#, c-format
-msgid "Requested encoding: %s"
+#: vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:749
-msgid "Resize remote session on connect"
+#: vncviewer/Win32PixelBuffer.cxx:91
+msgid "BitBlt failed"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:762
-msgid "Resize remote session to the local window"
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:61
+msgid "Display lacks pixmap format for default depth"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1073
-msgid "Resize window to session"
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:72
+msgid "Couldn't find suitable pixmap format"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:74
-msgid "Save As..."
+#: vncviewer/X11PixelBuffer.cxx:81
+msgid "Only true colour displays supported"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:741
-msgid "Screen"
+#: vncviewer/X11PixelBuffer.cxx:83
+#, c-format
+msgid "Using default colormap and visual, TrueColor, depth %d."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:580
-msgid "Security"
+#: vncviewer/X11PixelBuffer.cxx:109
+msgid "Could not create framebuffer image"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:219
+#: vncviewer/parameters.cxx:279 vncviewer/parameters.cxx:313
 #, c-format
-msgid "Security method: %s"
+msgid "The name of the parameter %s was too large to write to the registry"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:82
-msgid "SelectObject failed"
+#: vncviewer/parameters.cxx:285 vncviewer/parameters.cxx:292
+#, c-format
+msgid "The parameter %s was too large to write to the registry"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1086
+#: vncviewer/parameters.cxx:298 vncviewer/parameters.cxx:319
 #, c-format
-msgid "Send %s"
+msgid "Failed to write parameter %s of type %s to the registry: %ld"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1091
-msgid "Send Ctrl-Alt-Del"
+#: vncviewer/parameters.cxx:334 vncviewer/parameters.cxx:373
+#, c-format
+msgid "The name of the parameter %s was too large to read from the registry"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:710
-msgid "Send clipboard to server"
+#: vncviewer/parameters.cxx:343 vncviewer/parameters.cxx:382
+#, c-format
+msgid "Failed to read parameter %s from the registry: %ld"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:716
-msgid "Send primary selection and cut buffer as clipboard"
+#: vncviewer/parameters.cxx:352
+#, c-format
+msgid "The parameter %s was too large to read from the registry"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:237
-msgid "Services"
+#: vncviewer/parameters.cxx:402
+#, c-format
+msgid "Failed to create registry key: %ld"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:319
+#: vncviewer/parameters.cxx:416 vncviewer/parameters.cxx:465
+#: vncviewer/parameters.cxx:527 vncviewer/parameters.cxx:658
 #, c-format
-msgid "SetDesktopSize failed: %d"
+msgid "Unknown parameter type for parameter %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:799
-msgid "Shared (don't disconnect other viewers)"
+#: vncviewer/parameters.cxx:423 vncviewer/parameters.cxx:472
+#, c-format
+msgid "Failed to close registry key: %ld"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:239
-msgid "Show All"
+#: vncviewer/parameters.cxx:439
+#, c-format
+msgid "Failed to open registry key: %ld"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:805
-msgid "Show dot when no cursor"
+#: vncviewer/parameters.cxx:496
+msgid "Failed to write configuration file, can't obtain home directory path."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:182
+#: vncviewer/parameters.cxx:509
 #, c-format
-msgid "Size: %d x %d"
+msgid "Failed to write configuration file, can't open %s: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:665
-msgid "Standard VNC (insecure without encryption)"
+#: vncviewer/parameters.cxx:552
+msgid "Failed to read configuration file, can't obtain home directory path."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:618
-msgid "TLS with X509 certificates"
+#. Use defaults.
+#: vncviewer/parameters.cxx:565
+#, c-format
+msgid "Failed to read configuration file, can't open %s: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:612
-msgid "TLS with anonymous certificates"
+#: vncviewer/parameters.cxx:578 vncviewer/parameters.cxx:583
+#: vncviewer/parameters.cxx:608 vncviewer/parameters.cxx:621
+#: vncviewer/parameters.cxx:637
+#, c-format
+msgid "Failed to read line %d in file %s: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:448
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:497
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:561
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:701
-#, c-format
-msgid "The parameterArray contains a object of a invalid type at line %d."
+#: vncviewer/parameters.cxx:584
+msgid "Line too long"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:664
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:680
+#: vncviewer/parameters.cxx:591
 #, c-format
-msgid "The value of the parameter %s on line %d in file %s is invalid."
+msgid "Configuration file %s is in an invalid format"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:539
-#, c-format
-msgid "Throughput %d kbit/s - changing to quality %d"
+#: vncviewer/parameters.cxx:609
+msgid "Invalid format"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:561
-#, c-format
-msgid "Throughput %d kbit/s - full color is now %s"
+#: vncviewer/parameters.cxx:622 vncviewer/parameters.cxx:638
+msgid "Invalid format or too large value"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:210
-msgid "TigerVNC Viewer"
+#: vncviewer/parameters.cxx:665
+#, c-format
+msgid "Unknown parameter %s on line %d in file %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:80
+#: vncviewer/vncviewer.cxx:100
 #, c-format
 msgid ""
 "TigerVNC Viewer %d-bit v%s\n"
@@ -645,119 +610,95 @@ msgid ""
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:456
-#, c-format
-msgid "Unable to create platform specific framebuffer: %s"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1015
-#, c-format
-msgid "Unknown FLTK key code %d (0x%04x)"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:889
-#, c-format
-msgid "Unknown decimal separator: '%s'"
+#: vncviewer/vncviewer.cxx:122
+msgid "About TigerVNC Viewer"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:271
+#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
 #, c-format
-msgid "Unknown escape sequence at character %d"
+msgid "Error starting new TigerVNC Viewer: %s"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:430
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:437
-msgid "Unknown rect encoding"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:429
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:436
+#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
+#. exit() rather than the default which is to abort.
+#: vncviewer/vncviewer.cxx:160
 #, c-format
-msgid "Unknown rect encoding %d"
+msgid "Termination signal %d has been received. TigerVNC Viewer will now exit."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:671
-msgid "Username and password (insecure without encryption)"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:99
-msgid "Username:"
+#. Avoid empty titles for popups
+#: vncviewer/vncviewer.cxx:252
+msgid "TigerVNC Viewer"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:573
-#, c-format
-msgid "Using %s encoding"
+#. FLTK exposes these so that we can translate them.
+#: vncviewer/vncviewer.cxx:260
+msgid "No"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:79
-#, c-format
-msgid "Using default colormap and visual, %sdepth %d."
+#: vncviewer/vncviewer.cxx:261
+msgid "Yes"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:620
-#, c-format
-msgid "Using pixel format %s"
+#: vncviewer/vncviewer.cxx:264
+msgid "Close"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:457
-msgid "Using platform independent framebuffer"
+#: vncviewer/vncviewer.cxx:269
+msgid "About"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:42
-msgid "VNC Viewer: Connection Details"
+#: vncviewer/vncviewer.cxx:272
+msgid "Hide"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:57
-msgid "VNC Viewer: Connection Options"
+#: vncviewer/vncviewer.cxx:275
+msgid "Quit"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:86
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:96
-msgid "VNC authentication"
+#. Don't want the print item
+#: vncviewer/vncviewer.cxx:279
+msgid "Services"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1187
-msgid "VNC connection info"
+#: vncviewer/vncviewer.cxx:280
+msgid "Hide Others"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:49
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:54
-msgid "VNC server:"
+#: vncviewer/vncviewer.cxx:281
+msgid "Show All"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:533
-msgid "Very low (8 colors)"
+#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
+#. which means we cannot use our generic Fl_Menu_ helpers.
+#: vncviewer/vncviewer.cxx:290
+msgid "&File"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:698
-msgid "View only (ignore mouse and keyboard)"
+#: vncviewer/vncviewer.cxx:292
+msgid "&New Connection"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:219
-msgid "Yes"
+#: vncviewer/vncviewer.cxx:303
+msgid "Could not create VNC home directory: can't obtain home directory path."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:111
+#: vncviewer/vncviewer.cxx:308
 #, c-format
-msgid "connected to host %s port %d"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "disabled"
-msgstr ""
-
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "enabled"
+msgid "Could not create VNC home directory: %s."
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:556
-msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+#. TRANSLATORS: "Parameters" are command line arguments, or settings
+#. from a file or the Windows registry.
+#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+msgid "Parameters -listen and -via are incompatible"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:569
-msgid "quality (0=poor, 9=best)"
+#: vncviewer/vncviewer.cxx:529
+#, c-format
+msgid "Listening on port %d"
 msgstr ""
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:62
-msgid "unable to create DIB section"
+#: vncviewer/vncviewer.cxx:590
+msgid "Internal FLTK error. Exiting."
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 731859fe..6587858b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2014 the TigerVNC Team (msgids)
 # This file is distributed under the same license as the tigervnc package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: tigervnc 1.3.90\n"
+"Project-Id-Version: tigervnc 1.4.90\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
-"POT-Creation-Date: 2014-11-19 12:46+0000\n"
-"PO-Revision-Date: 2014-11-22 10:05+0200\n"
+"POT-Creation-Date: 2015-06-22 07:27+0000\n"
+"PO-Revision-Date: 2015-06-23 08:24+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -18,611 +18,591 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:194
+#: vncviewer/CConn.cxx:111
 #, c-format
-msgid "(server default %s)"
-msgstr "(типовий для сервера %s)"
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:227
-msgid "About"
-msgstr "Про програму"
+msgid "connected to host %s port %d"
+msgstr "з’єднано з вузлом %s, порт %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:103
-msgid "About TigerVNC Viewer"
-msgstr "Про засіб перегляду TigerVNC"
+#: vncviewer/CConn.cxx:172
+#, c-format
+msgid "Desktop name: %.80s"
+msgstr "Назва робочої станції: %.80s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1097
-msgid "About TigerVNC viewer..."
-msgstr "Про засіб перегляду TigerVNC…"
+#: vncviewer/CConn.cxx:177
+#, c-format
+msgid "Host: %.80s port: %d"
+msgstr "Вузол: %.80s порт: %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:86
-msgid "About..."
-msgstr "Про програму…"
+#: vncviewer/CConn.cxx:182
+#, c-format
+msgid "Size: %d x %d"
+msgstr "Розмір: %d x %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:704
-msgid "Accept clipboard from server"
-msgstr "Приймати вміст буфера з сервера"
+#: vncviewer/CConn.cxx:190
+#, c-format
+msgid "Pixel format: %s"
+msgstr "Формат у пікселях: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:327
-msgid "Adjusting window size to avoid accidental full screen request"
-msgstr "Коригувати розміри вікна, щоб уникнути випадкового запиту щодо переходу у повноекранний режим"
+#: vncviewer/CConn.cxx:197
+#, c-format
+msgid "(server default %s)"
+msgstr "(типовий для сервера %s)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:563
-msgid "Allow JPEG compression:"
-msgstr "Дозволити стискання JPEG:"
+#: vncviewer/CConn.cxx:202
+#, c-format
+msgid "Requested encoding: %s"
+msgstr "Запит щодо кодування: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1081
-msgid "Alt"
-msgstr "Alt"
+#: vncviewer/CConn.cxx:207
+#, c-format
+msgid "Last used encoding: %s"
+msgstr "Останнє використане кодування: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:648
-msgid "Authentication"
-msgstr "Розпізнавання"
+#: vncviewer/CConn.cxx:212
+#, c-format
+msgid "Line speed estimate: %d kbit/s"
+msgstr "Оцінка швидкості лінії: %d кбіт/с"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:89
-msgid "Authentication cancelled"
-msgstr "Розпізнавання скасовано"
+#: vncviewer/CConn.cxx:217
+#, c-format
+msgid "Protocol version: %d.%d"
+msgstr "Версія протоколу: %d.%d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:437
-msgid "Auto select"
-msgstr "Автовибір"
+#: vncviewer/CConn.cxx:222
+#, c-format
+msgid "Security method: %s"
+msgstr "Метод захисту: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:651
+#: vncviewer/CConn.cxx:322
 #, c-format
-msgid "Bad Name/Value pair on line: %d in file: %s"
-msgstr "Помилкова пара назва/значення у рядку %d файла %s"
+msgid "SetDesktopSize failed: %d"
+msgstr "Помилка SetDesktopSize: %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:91
-msgid "BitBlt failed"
-msgstr "Помилка BitBlt"
+#: vncviewer/CConn.cxx:387
+msgid "Invalid SetColourMapEntries from server!"
+msgstr "Некоректне значення SetColourMapEntries від сервера!"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:91
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:221
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:83
-msgid "Cancel"
-msgstr "Скасувати"
+#. TRANSLATORS: Refers to a VNC protocol encoding type
+#: vncviewer/CConn.cxx:433 vncviewer/CConn.cxx:440
+#, c-format
+msgid "Unknown encoding %d"
+msgstr "Невідоме кодування %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:116
-msgid "CleanupSignalHandler called"
-msgstr "Викликано CleanupSignalHandler"
+#: vncviewer/CConn.cxx:434 vncviewer/CConn.cxx:441
+msgid "Unknown encoding"
+msgstr "Невідоме кодування"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:222
-msgid "Close"
-msgstr "Закрити"
+#: vncviewer/CConn.cxx:473
+msgid "Enabling continuous updates"
+msgstr "Увімкнути неперервне оновлення"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:499
-msgid "Color level"
-msgstr "Рівень відтворення кольору"
+#: vncviewer/CConn.cxx:543
+#, c-format
+msgid "Throughput %d kbit/s - changing to quality %d"
+msgstr "Пропускна здатність %d кбіт/с — змінюємо якість на %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:421
-msgid "Compression"
-msgstr "Стискання"
+#: vncviewer/CConn.cxx:565
+#, c-format
+msgid "Throughput %d kbit/s - full color is now %s"
+msgstr "Пропускна здатність %d кбіт/с — змінюємо колірність на %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:96
-msgid "Connect"
-msgstr "З'єднатися"
+#: vncviewer/CConn.cxx:567
+msgid "disabled"
+msgstr "вимкнено"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1096
-msgid "Connection info..."
-msgstr "Дані щодо з’єднання…"
+#: vncviewer/CConn.cxx:567
+msgid "enabled"
+msgstr "увімкнено"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:362
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:404
+#: vncviewer/CConn.cxx:577
 #, c-format
-msgid "Could not convert the parameter-name %s to wchar_t* when reading from the Registry, the buffersize is to small."
-msgstr "Не вдалося перетворити назву параметра %s на wchar_t* під час читання даних з реєстру. Розмір буфера є надто малим."
+msgid "Using %s encoding"
+msgstr "Використовуємо кодування %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:302
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:340
+#: vncviewer/CConn.cxx:624
 #, c-format
-msgid "Could not convert the parameter-name %s to wchar_t* when writing to the Registry, the buffersize is to small."
-msgstr "Не вдалося перетворити назву параметра %s на wchar_t* під час запису даних до реєстру. Розмір буфера є надто малим."
+msgid "Using pixel format %s"
+msgstr "Використовуємо формат у пікселях %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:318
-#, c-format
-msgid "Could not convert the parameter-value %s to wchar_t* when writing to the Registry, the buffersize is to small."
-msgstr "Не вдалося перетворити значення параметра %s на wchar_t* під час запису даних до реєстру. Розмір буфера є надто малим."
+#: vncviewer/DesktopWindow.cxx:106
+msgid "Invalid geometry specified!"
+msgstr "Вказано некоректні геометричні параметри!"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:381
-#, c-format
-msgid "Could not convert the parameter-value for %s to utf8 char* when reading from the Registry, the buffer dest is to small."
-msgstr "Не вдалося перетворити значення параметра %s на utf8 char* під час читання з реєстру. Буфер призначення є надто малим."
+#: vncviewer/DesktopWindow.cxx:309
+msgid "Adjusting window size to avoid accidental full screen request"
+msgstr "Коригувати розміри вікна, щоб уникнути випадкового запиту щодо переходу у повноекранний режим"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:256
-#, c-format
-msgid "Could not create VNC home directory: %s."
-msgstr "Не вдалося створити домашній каталог VNC: %s."
+#: vncviewer/DesktopWindow.cxx:491 vncviewer/DesktopWindow.cxx:497
+#: vncviewer/DesktopWindow.cxx:510
+msgid "Failure grabbing keyboard"
+msgstr "Помилка під час спроби перехопити клавіатуру"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:251
-msgid "Could not create VNC home directory: can't obtain home directory path."
-msgstr "Не вдалося створити домашній каталог VNC: не вдалося отримати шлях до домашнього каталогу."
+#: vncviewer/DesktopWindow.cxx:522
+msgid "Failure grabbing mouse"
+msgstr "Помилка під час спроби перехопити мишу"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:58
-msgid "Could not create framebuffer bitmap"
-msgstr "Не вдалося створити растрові дані буфера кадрів"
+#: vncviewer/DesktopWindow.cxx:752
+msgid "Invalid screen layout computed for resize request!"
+msgstr "Результати обчислення компонування вікна для запиту щодо зміни розмірів є некоректними!"
+
+#: vncviewer/FLTKPixelBuffer.cxx:33 vncviewer/OSXPixelBuffer.cxx:48
+#: vncviewer/X11PixelBuffer.cxx:113
+msgid "Not enough memory for framebuffer"
+msgstr "Недостатньо пам’яті для буфера кадрів"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:52
+#: vncviewer/OSXPixelBuffer.cxx:52
 msgid "Could not create framebuffer device"
 msgstr "Не вдалося створити пристрій буфера кадрів"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:107
-msgid "Could not create framebuffer image"
-msgstr "Не вдалося створити зображення буфера кадрів"
+#: vncviewer/OSXPixelBuffer.cxx:58
+msgid "Could not create framebuffer bitmap"
+msgstr "Не вдалося створити растрові дані буфера кадрів"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:310
-#, c-format
-msgid "Could not encode the parameter-value %s when writing to the Registry."
-msgstr "Не вдалося виконати кодування значення параметра %s під час запису до реєстру."
+#: vncviewer/OptionsDialog.cxx:57
+msgid "VNC Viewer: Connection Options"
+msgstr "Засіб перегляду VNC: параметри з’єднання"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:613
-#, c-format
-msgid "Could not read the line(%d) in the configuration file,the buffersize is to small."
-msgstr "Не вдалося прочитати рядок %d у файлі налаштувань. Розмір буфера є надто малим."
+#: vncviewer/OptionsDialog.cxx:83 vncviewer/ServerDialog.cxx:91
+#: vncviewer/vncviewer.cxx:263
+msgid "Cancel"
+msgstr "Скасувати"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:68
-msgid "Couldn't find suitable pixmap format"
-msgstr "Не вдалося визначити відповідний формат зображення"
+#: vncviewer/OptionsDialog.cxx:88 vncviewer/vncviewer.cxx:262
+msgid "OK"
+msgstr "Гаразд"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:79
-msgid "CreateCompatibleDC failed"
-msgstr "Помилка CreateCompatibleDC"
+#: vncviewer/OptionsDialog.cxx:413
+msgid "Compression"
+msgstr "Стискання"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1079
-msgid "Ctrl"
-msgstr "Ctrl"
+#: vncviewer/OptionsDialog.cxx:429
+msgid "Auto select"
+msgstr "Автовибір"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:550
-msgid "Custom compression level:"
-msgstr "Нетиповий рівень стискання:"
+#: vncviewer/OptionsDialog.cxx:441
+msgid "Preferred encoding"
+msgstr "Бажане кодування"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:283
-msgid "Decoding: The size of the buffer dest is to small, it needs to be 1 byte bigger."
-msgstr "Декодування: розмір буфера призначення є надто малим. Його слід збільшити на 1 байт."
+#: vncviewer/OptionsDialog.cxx:489
+msgid "Color level"
+msgstr "Рівень відтворення кольору"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:172
-#, c-format
-msgid "Desktop name: %.80s"
-msgstr "Назва робочої станції: %.80s"
+#: vncviewer/OptionsDialog.cxx:500
+msgid "Full (all available colors)"
+msgstr "Повністю (усі доступні кольори)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1099
-msgid "Dismiss menu"
-msgstr "Закрити меню"
+#: vncviewer/OptionsDialog.cxx:507
+msgid "Medium (256 colors)"
+msgstr "Середній (256 кольори)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:59
-msgid "Display lacks pixmap format for default depth"
-msgstr "Для дисплея не вказано формат у пікселях для типової глибини"
+#: vncviewer/OptionsDialog.cxx:514
+msgid "Low (64 colors)"
+msgstr "Низький (64 кольори)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:778
-msgid "Enable full-screen mode over all monitors"
-msgstr "Увімкнути повноекранний режим на усіх моніторах"
+#: vncviewer/OptionsDialog.cxx:521
+msgid "Very low (8 colors)"
+msgstr "Дуже низький (8 кольорів)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:469
-msgid "Enabling continuous updates"
-msgstr "Увімкнути неперервне оновлення"
+#: vncviewer/OptionsDialog.cxx:538
+msgid "Custom compression level:"
+msgstr "Нетиповий рівень стискання:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:200
-#, c-format
-msgid "Encoding backslash: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
-msgstr "Кодування зворотної похилої риски: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
+#: vncviewer/OptionsDialog.cxx:544
+msgid "level (1=fast, 6=best [4-6 are rarely useful])"
+msgstr "рівень (1=швидко, 6=найякісніше [4-6 використовувати не варто])"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:214
-#, c-format
-msgid "Encoding escape sequence: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
-msgstr "Кодування екранованої послідовності: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
+#: vncviewer/OptionsDialog.cxx:551
+msgid "Allow JPEG compression:"
+msgstr "Дозволити стискання JPEG:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:234
-#, c-format
-msgid "Encoding normal character: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
-msgstr "Кодування звичайного символу: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
+#: vncviewer/OptionsDialog.cxx:557
+msgid "quality (0=poor, 9=best)"
+msgstr "якість (0=найгірша, 9=найкраща)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:595
+#: vncviewer/OptionsDialog.cxx:568
+msgid "Security"
+msgstr "Захист"
+
+#: vncviewer/OptionsDialog.cxx:583
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:503
-#, c-format
-msgid "Error(%d) closing key:  Software\\TigerVNC\\vncviewer"
-msgstr "Помилка (%d) закриття ключа:  Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:594 vncviewer/OptionsDialog.cxx:647
+#: vncviewer/OptionsDialog.cxx:715
+msgid "None"
+msgstr "Немає"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:455
-#, c-format
-msgid "Error(%d) closing key: Software\\TigerVNC\\vncviewer"
-msgstr "Помилка (%d) закриття ключа: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:600
+msgid "TLS with anonymous certificates"
+msgstr "TLS із анонімними сертифікатами"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:434
-#, c-format
-msgid "Error(%d) creating key: Software\\TigerVNC\\vncviewer"
-msgstr "Помилка (%d) під час створення ключа: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:606
+msgid "TLS with X509 certificates"
+msgstr "TLS з сертифікатами X509"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:471
-#, c-format
-msgid "Error(%d) opening key: Software\\TigerVNC\\vncviewer"
-msgstr "Помилка (%d) під час відкриття ключа: Software\\TigerVNC\\vncviewer"
+#: vncviewer/OptionsDialog.cxx:613
+msgid "Path to X509 CA certificate"
+msgstr "Шлях до сертифіката CA X509"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:373
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:415
-#, c-format
-msgid "Error(%d) reading %s from Registry."
-msgstr "Помилка (%d) під час читання %s з реєстру."
+#: vncviewer/OptionsDialog.cxx:620
+msgid "Path to X509 CRL file"
+msgstr "Шлях до файла CRL X509"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:348
-#, c-format
-msgid "Error(%d) writing %d(REG_DWORD) to Registry."
-msgstr "Помилка (%d) під час запису %d(REG_DWORD) до реєстру."
+#: vncviewer/OptionsDialog.cxx:636
+msgid "Authentication"
+msgstr "Розпізнавання"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:326
-#, c-format
-msgid "Error(%d) writing %s(REG_SZ) to Registry."
-msgstr "Помилка (%d) під час запису %s(REG_SZ) до реєстру."
+#: vncviewer/OptionsDialog.cxx:653
+msgid "Standard VNC (insecure without encryption)"
+msgstr "Стандартний VNC (без захисту і шифрування)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1067
-msgid "Exit viewer"
-msgstr "Вийти із засобу перегляду"
+#: vncviewer/OptionsDialog.cxx:659
+msgid "Username and password (insecure without encryption)"
+msgstr "Ім’я користувача і пароль (без захисту і шифрування)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:588
-msgid "Failed to read configuration file, can't obtain home directory path."
-msgstr "Не вдалося прочитати файл налаштувань, оскільки не вдалося визначити шлях до домашнього каталогу."
+#: vncviewer/OptionsDialog.cxx:678
+msgid "Input"
+msgstr "Введення"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:602
-#, c-format
-msgid "Failed to read configuration file, can't open %s"
-msgstr "Не вдалося прочитати файл налаштувань, оскільки не вдалося відкрити %s"
+#: vncviewer/OptionsDialog.cxx:686
+msgid "View only (ignore mouse and keyboard)"
+msgstr "Лише перегляд (ігнорувати сигнали від миші і клавіатури)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:621
-#, c-format
-msgid "Failed to read line %d in file %s"
-msgstr "Не вдалося прочитати рядок %d у файлі %s"
+#: vncviewer/OptionsDialog.cxx:692
+msgid "Accept clipboard from server"
+msgstr "Приймати вміст буфера з сервера"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:528
-msgid "Failed to write configuration file, can't obtain home directory path."
-msgstr "Не вдалося записати файл налаштувань, оскільки не вдалося визначити шлях до домашнього каталогу."
+#: vncviewer/OptionsDialog.cxx:698
+msgid "Send clipboard to server"
+msgstr "Надіслати вміст буфера обміну до сервера"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:542
-#, c-format
-msgid "Failed to write configuration file, can't open %s"
-msgstr "Не вдалося записати файл налаштувань, оскільки не вдалося відкрити %s"
+#: vncviewer/OptionsDialog.cxx:704
+msgid "Send primary selection and cut buffer as clipboard"
+msgstr "Надіслати основне позначене і вирізати буфер до буфера обміну"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:526
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:538
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:551
-msgid "Failure grabbing keyboard"
-msgstr "Помилка під час спроби перехопити клавіатуру"
+#: vncviewer/OptionsDialog.cxx:710
+msgid "Pass system keys directly to server (full screen)"
+msgstr "Передавати натискання системних клавіш безпосередньо до сервера (повноекранний режим)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:563
-msgid "Failure grabbing mouse"
-msgstr "Помилка під час спроби перехопити мишу"
+#: vncviewer/OptionsDialog.cxx:713
+msgid "Menu key"
+msgstr "Клавіша меню"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:512
-msgid "Full (all available colors)"
-msgstr "Повністю (усі доступні кольори)"
+#: vncviewer/OptionsDialog.cxx:729
+msgid "Screen"
+msgstr "Екран"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1070
-msgid "Full screen"
-msgstr "На весь екран"
+#: vncviewer/OptionsDialog.cxx:737
+msgid "Resize remote session on connect"
+msgstr "Змінювати розміри віддаленого сеансу під час з’єднання"
+
+#: vncviewer/OptionsDialog.cxx:750
+msgid "Resize remote session to the local window"
+msgstr "Змінювати розміри віддаленого сеансу відповідно до локального вікна"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:770
+#: vncviewer/OptionsDialog.cxx:756
 msgid "Full-screen mode"
 msgstr "Повноекранний режим"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:230
-msgid "Hide"
-msgstr "Сховати"
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:238
-msgid "Hide Others"
-msgstr "Сховати решту"
-
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:177
-#, c-format
-msgid "Host: %.80s port: %d"
-msgstr "Вузол: %.80s порт: %d"
+#: vncviewer/OptionsDialog.cxx:762
+msgid "Enable full-screen mode over all monitors"
+msgstr "Увімкнути повноекранний режим на усіх моніторах"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:690
-msgid "Input"
-msgstr "Введення"
+#: vncviewer/OptionsDialog.cxx:771
+msgid "Misc."
+msgstr "Інше"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:510
-msgid "Internal FLTK error. Exiting."
-msgstr "Внутрішня помилка FLTK. Завершуємо роботу."
+#: vncviewer/OptionsDialog.cxx:779
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Спільний (не від’єднувати інші засоби перегляду)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:384
-msgid "Invalid SetColourMapEntries from server!"
-msgstr "Некоректне значення SetColourMapEntries від сервера!"
+#: vncviewer/OptionsDialog.cxx:785
+msgid "Show dot when no cursor"
+msgstr "Показувати крапку, якщо немає курсора"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:106
-msgid "Invalid geometry specified!"
-msgstr "Вказано некоректні геометричні параметри!"
+#: vncviewer/ServerDialog.cxx:42
+msgid "VNC Viewer: Connection Details"
+msgstr "Засіб перегляду VNC: подробиці з’єднання"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:708
-#, c-format
-msgid "Invalid parameter name on line: %d in file: %s"
-msgstr "Некоректна назва параметра у рядку %d файла %s"
+#: vncviewer/ServerDialog.cxx:49 vncviewer/ServerDialog.cxx:54
+msgid "VNC server:"
+msgstr "Сервер VNC:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/DesktopWindow.cxx:805
-msgid "Invalid screen layout computed for resize request!"
-msgstr "Результати обчислення компонування вікна для запиту щодо зміни розмірів є некоректними!"
+#: vncviewer/ServerDialog.cxx:64
+msgid "Options..."
+msgstr "Параметри…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:204
-#, c-format
-msgid "Last used encoding: %s"
-msgstr "Останнє використане кодування: %s"
+#: vncviewer/ServerDialog.cxx:69
+msgid "Load..."
+msgstr "Завантажити…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:631
-#, c-format
-msgid ""
-"Line 1 in file %s\n"
-"must contain the TigerVNC configuration file identifier string:\n"
-"\"%s\""
-msgstr ""
-"Рядок 1 у файлі %s\n"
-"має містити рядок ідентифікатор файла налаштувань TigerVNC:\n"
-"«%s»"
+#: vncviewer/ServerDialog.cxx:74
+msgid "Save As..."
+msgstr "Зберегти як…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:209
-#, c-format
-msgid "Line speed estimate: %d kbit/s"
-msgstr "Оцінка швидкості лінії: %d кбіт/с"
+#: vncviewer/ServerDialog.cxx:86
+msgid "About..."
+msgstr "Про програму…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:478
-#, c-format
-msgid "Listening on port %d\n"
-msgstr "Очікуємо на дані на порту %d\n"
+#: vncviewer/ServerDialog.cxx:96
+msgid "Connect"
+msgstr "З'єднатися"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:69
-msgid "Load..."
-msgstr "Завантажити…"
+#: vncviewer/UserDialog.cxx:74
+msgid "Opening password file failed"
+msgstr "Спроба відкриття файла паролів зазнала невдачі"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:526
-msgid "Low (64 colors)"
-msgstr "Низький (64 кольори)"
+#. 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"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:519
-msgid "Medium (256 colors)"
-msgstr "Середній (256 кольори)"
+#: vncviewer/UserDialog.cxx:87 vncviewer/UserDialog.cxx:102
+msgid "Password:"
+msgstr "Пароль:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:725
-msgid "Menu key"
-msgstr "Клавіша меню"
+#: vncviewer/UserDialog.cxx:89
+msgid "Authentication cancelled"
+msgstr "Розпізнавання скасовано"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:791
-msgid "Misc."
-msgstr "Інше"
+#: vncviewer/UserDialog.cxx:99
+msgid "Username:"
+msgstr "Користувач:"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1037
+#: vncviewer/Viewport.cxx:434
 #, c-format
-msgid "Multiple characters given for key code %d (0x%04x): '%s'"
-msgstr "З клавішею з кодом %d (0x%04x) пов’язано декілька символів: «%s»"
+msgid "Unable to create platform specific framebuffer: %s"
+msgstr "Не вдалося створити специфічний для платформи буфер кадрів: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:218
-msgid "No"
-msgstr "Ні"
+#: vncviewer/Viewport.cxx:435
+msgid "Using platform independent framebuffer"
+msgstr "Використовуємо незалежний від платформи буфер кадрів"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:691
+#: vncviewer/Viewport.cxx:669
 #, c-format
 msgid "No scan code for extended virtual key 0x%02x"
 msgstr "Немає коду сканування для віртуальної клавіші розширення 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:693
+#: vncviewer/Viewport.cxx:671
 #, c-format
 msgid "No scan code for virtual key 0x%02x"
 msgstr "Немає коду сканування для віртуальної клавіші 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:710
+#: vncviewer/Viewport.cxx:688
 #, c-format
 msgid "No symbol for extended virtual key 0x%02x"
 msgstr "Немає символу для віртуальної клавіші розширення 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:776
+#: vncviewer/Viewport.cxx:690
 #, c-format
-msgid "No symbol for key code %d (in the current state)"
-msgstr "Немає символу для клавіші з кодом %d (у поточному стані)"
+msgid "No symbol for virtual key 0x%02x"
+msgstr "Немає символу для віртуальної клавіші 0x%02x"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:750
+#: vncviewer/Viewport.cxx:728
 #, c-format
 msgid "No symbol for key code 0x%02x (in the current state)"
 msgstr "Немає символу для клавіші з кодом 0x%02x (у поточному стані)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:712
+#: vncviewer/Viewport.cxx:754
 #, c-format
-msgid "No symbol for virtual key 0x%02x"
-msgstr "Немає символу для віртуальної клавіші 0x%02x"
-
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:606
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:659
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:727
-msgid "None"
-msgstr "Немає"
-
-#: /home/ossman/devel/tigervnc/vncviewer/OSXPixelBuffer.cxx:48
-#: /home/ossman/devel/tigervnc/vncviewer/FLTKPixelBuffer.cxx:33
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:111
-msgid "Not enough memory for framebuffer"
-msgstr "Недостатньо пам’яті для буфера кадрів"
-
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:220
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:88
-msgid "OK"
-msgstr "Гаразд"
+msgid "No symbol for key code %d (in the current state)"
+msgstr "Немає символу для клавіші з кодом %d (у поточному стані)"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:77
-msgid "Only true colour displays supported"
-msgstr "Передбачено підтримку лише дисплеїв з True Color"
+#: vncviewer/Viewport.cxx:791
+msgid "E&xit viewer"
+msgstr "Ви&йти із засобу перегляду"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:74
-msgid "Opening password file failed"
-msgstr "Спроба відкриття файла паролів зазнала невдачі"
+#: vncviewer/Viewport.cxx:794
+msgid "&Full screen"
+msgstr "&На весь екран"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1095
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:64
-msgid "Options..."
-msgstr "Параметри…"
+#: vncviewer/Viewport.cxx:796
+msgid "Resize &window to session"
+msgstr "Змінити &розміри вікна відповідно до сеансу"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:463
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:464
-msgid "Parameters -listen and -via are incompatible"
-msgstr "Параметри -listen і -via є несумісними"
+#: vncviewer/Viewport.cxx:801
+msgid "&Ctrl"
+msgstr "&Ctrl"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:722
-msgid "Pass system keys directly to server (full screen)"
-msgstr "Передавати натискання системних клавіш безпосередньо до сервера (повноекранний режим)"
+#: vncviewer/Viewport.cxx:803
+msgid "&Alt"
+msgstr "&Alt"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:87
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:102
-msgid "Password:"
-msgstr "Пароль:"
+#: vncviewer/Viewport.cxx:808
+#, c-format
+msgid "Send %s"
+msgstr "Надіслати %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:625
-msgid "Path to X509 CA certificate"
-msgstr "Шлях до сертифіката CA X509"
+#: vncviewer/Viewport.cxx:814
+msgid "Send Ctrl-Alt-&Del"
+msgstr "На&діслати Ctrl-Alt-Del"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:632
-msgid "Path to X509 CRL file"
-msgstr "Шлях до файла CRL X509"
+#: vncviewer/Viewport.cxx:817
+msgid "&Refresh screen"
+msgstr "&Оновити вміст екрана"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:188
-#, c-format
-msgid "Pixel format: %s"
-msgstr "Формат у пікселях: %s"
+#: vncviewer/Viewport.cxx:820
+msgid "&Options..."
+msgstr "П&араметри…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:449
-msgid "Preferred encoding"
-msgstr "Бажане кодування"
+#: vncviewer/Viewport.cxx:822
+msgid "Connection &info..."
+msgstr "Дані щодо з’&єднання…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:214
-#, c-format
-msgid "Protocol version: %d.%d"
-msgstr "Версія протоколу: %d.%d"
+#: vncviewer/Viewport.cxx:824
+msgid "About &TigerVNC viewer..."
+msgstr "Про &засіб перегляду TigerVNC…"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:233
-msgid "Quit"
-msgstr "Вийти"
+#: vncviewer/Viewport.cxx:827
+msgid "Dismiss &menu"
+msgstr "Закрити &меню"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1093
-msgid "Refresh screen"
-msgstr "Оновити вміст екрана"
+#: vncviewer/Viewport.cxx:908
+msgid "VNC connection info"
+msgstr "Дані щодо з’єднання VNC"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:199
-#, c-format
-msgid "Requested encoding: %s"
-msgstr "Запит щодо кодування: %s"
+#: vncviewer/Win32PixelBuffer.cxx:62
+msgid "unable to create DIB section"
+msgstr "не вдалося створити розділ DIB"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:749
-msgid "Resize remote session on connect"
-msgstr "Змінювати розміри віддаленого сеансу під час з’єднання"
+#: vncviewer/Win32PixelBuffer.cxx:79
+msgid "CreateCompatibleDC failed"
+msgstr "Помилка CreateCompatibleDC"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:762
-msgid "Resize remote session to the local window"
-msgstr "Змінювати розміри віддаленого сеансу відповідно до локального вікна"
+#: vncviewer/Win32PixelBuffer.cxx:82
+msgid "SelectObject failed"
+msgstr "Помилка SelectObject"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1073
-msgid "Resize window to session"
-msgstr "Змінити розміри вікна відповідно до сеансу"
+#: vncviewer/Win32PixelBuffer.cxx:91
+msgid "BitBlt failed"
+msgstr "Помилка BitBlt"
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:74
-msgid "Save As..."
-msgstr "Зберегти як…"
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:61
+msgid "Display lacks pixmap format for default depth"
+msgstr "Для дисплея не вказано формат у пікселях для типової глибини"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:741
-msgid "Screen"
-msgstr "Екран"
+#. TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+#. to translate.
+#: vncviewer/X11PixelBuffer.cxx:72
+msgid "Couldn't find suitable pixmap format"
+msgstr "Не вдалося визначити відповідний формат зображення"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:580
-msgid "Security"
-msgstr "Захист"
+#: vncviewer/X11PixelBuffer.cxx:81
+msgid "Only true colour displays supported"
+msgstr "Передбачено підтримку лише дисплеїв з True Color"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:219
+#: vncviewer/X11PixelBuffer.cxx:83
 #, c-format
-msgid "Security method: %s"
-msgstr "Метод захисту: %s"
+msgid "Using default colormap and visual, TrueColor, depth %d."
+msgstr "Використовуємо типову карту кольорів і відтворення, TrueColor, глибина %d."
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:82
-msgid "SelectObject failed"
-msgstr "Помилка SelectObject"
+#: vncviewer/X11PixelBuffer.cxx:109
+msgid "Could not create framebuffer image"
+msgstr "Не вдалося створити зображення буфера кадрів"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1086
+#: vncviewer/parameters.cxx:279 vncviewer/parameters.cxx:313
 #, c-format
-msgid "Send %s"
-msgstr "Надіслати %s"
+msgid "The name of the parameter %s was too large to write to the registry"
+msgstr "Назва параметра %s є надто довгою для запису до реєстру"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1091
-msgid "Send Ctrl-Alt-Del"
-msgstr "Надіслати Ctrl-Alt-Del"
+#: vncviewer/parameters.cxx:285 vncviewer/parameters.cxx:292
+#, c-format
+msgid "The parameter %s was too large to write to the registry"
+msgstr "Параметр %s є надто довгим для запису до реєстру"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:710
-msgid "Send clipboard to server"
-msgstr "Надіслати вміст буфера обміну до сервера"
+#: vncviewer/parameters.cxx:298 vncviewer/parameters.cxx:319
+#, c-format
+msgid "Failed to write parameter %s of type %s to the registry: %ld"
+msgstr "Не вдалося записати параметр %s типу %s до реєстру: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:716
-msgid "Send primary selection and cut buffer as clipboard"
-msgstr "Надіслати основне позначене і вирізати буфер до буфера обміну"
+#: vncviewer/parameters.cxx:334 vncviewer/parameters.cxx:373
+#, c-format
+msgid "The name of the parameter %s was too large to read from the registry"
+msgstr "Назва параметра %s є надто довгою для читання з реєстру"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:237
-msgid "Services"
-msgstr "Служби"
+#: vncviewer/parameters.cxx:343 vncviewer/parameters.cxx:382
+#, c-format
+msgid "Failed to read parameter %s from the registry: %ld"
+msgstr "Не вдалося прочитати параметр %s з реєстру: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:319
+#: vncviewer/parameters.cxx:352
 #, c-format
-msgid "SetDesktopSize failed: %d"
-msgstr "Помилка SetDesktopSize: %d"
+msgid "The parameter %s was too large to read from the registry"
+msgstr "Параметр %s є надто довгим для читання з реєстру"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:799
-msgid "Shared (don't disconnect other viewers)"
-msgstr "Спільний (не від’єднувати інші засоби перегляду)"
+#: vncviewer/parameters.cxx:402
+#, c-format
+msgid "Failed to create registry key: %ld"
+msgstr "Не вдалося створити ключ реєстру: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:239
-msgid "Show All"
-msgstr "Показати всі"
+#: vncviewer/parameters.cxx:416 vncviewer/parameters.cxx:465
+#: vncviewer/parameters.cxx:527 vncviewer/parameters.cxx:658
+#, c-format
+msgid "Unknown parameter type for parameter %s"
+msgstr "Невідомий тип параметра %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:805
-msgid "Show dot when no cursor"
-msgstr "Показувати крапку, якщо немає курсора"
+#: vncviewer/parameters.cxx:423 vncviewer/parameters.cxx:472
+#, c-format
+msgid "Failed to close registry key: %ld"
+msgstr "Не вдалося закрити ключ реєстру: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:182
+#: vncviewer/parameters.cxx:439
 #, c-format
-msgid "Size: %d x %d"
-msgstr "Розмір: %d x %d"
+msgid "Failed to open registry key: %ld"
+msgstr "Не вдалося відкрити ключ реєстру: %ld"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:665
-msgid "Standard VNC (insecure without encryption)"
-msgstr "Стандартний VNC (без захисту і шифрування)"
+#: vncviewer/parameters.cxx:496
+msgid "Failed to write configuration file, can't obtain home directory path."
+msgstr "Не вдалося записати файл налаштувань, оскільки не вдалося визначити шлях до домашнього каталогу."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:618
-msgid "TLS with X509 certificates"
-msgstr "TLS з сертифікатами X509"
+#: vncviewer/parameters.cxx:509
+#, c-format
+msgid "Failed to write configuration file, can't open %s: %s"
+msgstr "Не вдалося записати файл налаштувань, оскільки не вдалося відкрити %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:612
-msgid "TLS with anonymous certificates"
-msgstr "TLS із анонімними сертифікатами"
+#: vncviewer/parameters.cxx:552
+msgid "Failed to read configuration file, can't obtain home directory path."
+msgstr "Не вдалося прочитати файл налаштувань, оскільки не вдалося визначити шлях до домашнього каталогу."
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:448
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:497
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:561
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:701
+#. Use defaults.
+#: vncviewer/parameters.cxx:565
 #, c-format
-msgid "The parameterArray contains a object of a invalid type at line %d."
-msgstr "Змінна parameterArray містить об’єкт некоректного типу у рядку %d."
+msgid "Failed to read configuration file, can't open %s: %s"
+msgstr "Не вдалося прочитати файл налаштувань, оскільки не вдалося відкрити %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:664
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:680
+#: vncviewer/parameters.cxx:578 vncviewer/parameters.cxx:583
+#: vncviewer/parameters.cxx:608 vncviewer/parameters.cxx:621
+#: vncviewer/parameters.cxx:637
 #, c-format
-msgid "The value of the parameter %s on line %d in file %s is invalid."
-msgstr "Значення параметра %s у рядку %d файла %s є некоректним."
+msgid "Failed to read line %d in file %s: %s"
+msgstr "Не вдалося прочитати рядок %d у файлі %s: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:539
-#, c-format
-msgid "Throughput %d kbit/s - changing to quality %d"
-msgstr "Пропускна здатність %d кбіт/с — змінюємо якість на %d"
+#: vncviewer/parameters.cxx:584
+msgid "Line too long"
+msgstr "Занадто довгий рядок"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:561
+#: vncviewer/parameters.cxx:591
 #, c-format
-msgid "Throughput %d kbit/s - full color is now %s"
-msgstr "Пропускна здатність %d кбіт/с — змінюємо колірність на %s"
+msgid "Configuration file %s is in an invalid format"
+msgstr "Файл налаштувань %s збережено у некоректному форматі"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:210
-msgid "TigerVNC Viewer"
-msgstr "Засіб перегляду TigerVNC"
+#: vncviewer/parameters.cxx:609
+msgid "Invalid format"
+msgstr "Некоректне форматування"
+
+#: vncviewer/parameters.cxx:622 vncviewer/parameters.cxx:638
+msgid "Invalid format or too large value"
+msgstr "Некоректне форматування або надто велике значення"
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:80
+#: vncviewer/parameters.cxx:665
+#, c-format
+msgid "Unknown parameter %s on line %d in file %s"
+msgstr "Невідомий параметр %s у рядку %d файла %s"
+
+#: vncviewer/vncviewer.cxx:100
 #, c-format
 msgid ""
 "TigerVNC Viewer %d-bit v%s\n"
@@ -635,119 +615,179 @@ msgstr ""
 "Авторські права належать команді TigerVNC та багатьом іншим (див. файл README.txt), 1999–%d\n"
 "Докладніший опис TigerVNC можна знайти на http://www.tigervnc.org."
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:456
-#, c-format
-msgid "Unable to create platform specific framebuffer: %s"
-msgstr "Не вдалося створити специфічний для платформи буфер кадрів: %s"
+#: vncviewer/vncviewer.cxx:122
+msgid "About TigerVNC Viewer"
+msgstr "Про засіб перегляду TigerVNC"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1015
+#: vncviewer/vncviewer.cxx:139 vncviewer/vncviewer.cxx:151
 #, c-format
-msgid "Unknown FLTK key code %d (0x%04x)"
-msgstr "Невідомий код клавіші FLTK, %d (0x%04x)"
+msgid "Error starting new TigerVNC Viewer: %s"
+msgstr "Помилка під час спроби запуску нового засобу перегляду TigerVNC: %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:889
+#. CleanupSignalHandler allows C++ object cleanup to happen because it calls
+#. exit() rather than the default which is to abort.
+#: vncviewer/vncviewer.cxx:160
 #, c-format
-msgid "Unknown decimal separator: '%s'"
-msgstr "Невідомий десятковий роздільник: «%s»"
+msgid "Termination signal %d has been received. TigerVNC Viewer will now exit."
+msgstr "Отримано сигнал переривання %d. Зараз засіб перегляду TigerVNC завершить роботу."
 
-#: /home/ossman/devel/tigervnc/vncviewer/parameters.cxx:271
-#, c-format
-msgid "Unknown escape sequence at character %d"
-msgstr "Невідома послідовність екранування на позиції %d"
+#. Avoid empty titles for popups
+#: vncviewer/vncviewer.cxx:252
+msgid "TigerVNC Viewer"
+msgstr "Засіб перегляду TigerVNC"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:430
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:437
-msgid "Unknown rect encoding"
-msgstr "Невідоме кодування rect"
+#. FLTK exposes these so that we can translate them.
+#: vncviewer/vncviewer.cxx:260
+msgid "No"
+msgstr "Ні"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:429
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:436
-#, c-format
-msgid "Unknown rect encoding %d"
-msgstr "Невідоме кодування rect, %d"
+#: vncviewer/vncviewer.cxx:261
+msgid "Yes"
+msgstr "Так"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:671
-msgid "Username and password (insecure without encryption)"
-msgstr "Ім’я користувача і пароль (без захисту і шифрування)"
+#: vncviewer/vncviewer.cxx:264
+msgid "Close"
+msgstr "Закрити"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:99
-msgid "Username:"
-msgstr "Користувач:"
+#: vncviewer/vncviewer.cxx:269
+msgid "About"
+msgstr "Про програму"
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:573
-#, c-format
-msgid "Using %s encoding"
-msgstr "Використовуємо кодування %s"
+#: vncviewer/vncviewer.cxx:272
+msgid "Hide"
+msgstr "Сховати"
+
+#: vncviewer/vncviewer.cxx:275
+msgid "Quit"
+msgstr "Вийти"
+
+#. Don't want the print item
+#: vncviewer/vncviewer.cxx:279
+msgid "Services"
+msgstr "Служби"
+
+#: vncviewer/vncviewer.cxx:280
+msgid "Hide Others"
+msgstr "Сховати решту"
+
+#: vncviewer/vncviewer.cxx:281
+msgid "Show All"
+msgstr "Показати всі"
+
+#. Fl_Sys_Menu_Bar overrides methods without them being virtual,
+#. which means we cannot use our generic Fl_Menu_ helpers.
+#: vncviewer/vncviewer.cxx:290
+msgid "&File"
+msgstr "&Файл"
 
-#: /home/ossman/devel/tigervnc/vncviewer/X11PixelBuffer.cxx:79
+#: vncviewer/vncviewer.cxx:292
+msgid "&New Connection"
+msgstr "&Створити з'єднання"
+
+#: vncviewer/vncviewer.cxx:303
+msgid "Could not create VNC home directory: can't obtain home directory path."
+msgstr "Не вдалося створити домашній каталог VNC: не вдалося отримати шлях до домашнього каталогу."
+
+#: vncviewer/vncviewer.cxx:308
 #, c-format
-msgid "Using default colormap and visual, %sdepth %d."
-msgstr "Використовуємо типову карту кольорів і відтворення, %sглибина %d."
+msgid "Could not create VNC home directory: %s."
+msgstr "Не вдалося створити домашній каталог VNC: %s."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:620
+#. TRANSLATORS: "Parameters" are command line arguments, or settings
+#. from a file or the Windows registry.
+#: vncviewer/vncviewer.cxx:513 vncviewer/vncviewer.cxx:514
+msgid "Parameters -listen and -via are incompatible"
+msgstr "Параметри -listen і -via є несумісними"
+
+#: vncviewer/vncviewer.cxx:529
 #, c-format
-msgid "Using pixel format %s"
-msgstr "Використовуємо формат у пікселях %s"
+msgid "Listening on port %d"
+msgstr "Очікуємо на дані на порту %d"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:457
-msgid "Using platform independent framebuffer"
-msgstr "Використовуємо незалежний від платформи буфер кадрів"
+#: vncviewer/vncviewer.cxx:590
+msgid "Internal FLTK error. Exiting."
+msgstr "Внутрішня помилка FLTK. Завершуємо роботу."
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:42
-msgid "VNC Viewer: Connection Details"
-msgstr "Засіб перегляду VNC: подробиці з’єднання"
+#~ msgid "Alt"
+#~ msgstr "Alt"
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:57
-msgid "VNC Viewer: Connection Options"
-msgstr "Засіб перегляду VNC: параметри з’єднання"
+#~ msgid "Bad Name/Value pair on line: %d in file: %s"
+#~ msgstr "Помилкова пара назва/значення у рядку %d файла %s"
 
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:86
-#: /home/ossman/devel/tigervnc/vncviewer/UserDialog.cxx:96
-msgid "VNC authentication"
-msgstr "Розпізнавання VNC"
+#~ msgid "CleanupSignalHandler called"
+#~ msgstr "Викликано CleanupSignalHandler"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Viewport.cxx:1187
-msgid "VNC connection info"
-msgstr "Дані щодо з’єднання VNC"
+#~ msgid "Could not convert the parameter-name %s to wchar_t* when reading from the Registry, the buffersize is to small."
+#~ msgstr "Не вдалося перетворити назву параметра %s на wchar_t* під час читання даних з реєстру. Розмір буфера є надто малим."
 
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:49
-#: /home/ossman/devel/tigervnc/vncviewer/ServerDialog.cxx:54
-msgid "VNC server:"
-msgstr "Сервер VNC:"
+#~ msgid "Could not convert the parameter-name %s to wchar_t* when writing to the Registry, the buffersize is to small."
+#~ msgstr "Не вдалося перетворити назву параметра %s на wchar_t* під час запису даних до реєстру. Розмір буфера є надто малим."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:533
-msgid "Very low (8 colors)"
-msgstr "Дуже низький (8 кольорів)"
+#~ msgid "Could not convert the parameter-value %s to wchar_t* when writing to the Registry, the buffersize is to small."
+#~ msgstr "Не вдалося перетворити значення параметра %s на wchar_t* під час запису даних до реєстру. Розмір буфера є надто малим."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:698
-msgid "View only (ignore mouse and keyboard)"
-msgstr "Лише перегляд (ігнорувати сигнали від миші і клавіатури)"
+#~ msgid "Could not convert the parameter-value for %s to utf8 char* when reading from the Registry, the buffer dest is to small."
+#~ msgstr "Не вдалося перетворити значення параметра %s на utf8 char* під час читання з реєстру. Буфер призначення є надто малим."
 
-#: /home/ossman/devel/tigervnc/vncviewer/vncviewer.cxx:219
-msgid "Yes"
-msgstr "Так"
+#~ msgid "Could not read the line(%d) in the configuration file,the buffersize is to small."
+#~ msgstr "Не вдалося прочитати рядок %d у файлі налаштувань. Розмір буфера є надто малим."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:111
-#, c-format
-msgid "connected to host %s port %d"
-msgstr "з’єднано з вузлом %s, порт %d"
+#~ msgid "Decoding: The size of the buffer dest is to small, it needs to be 1 byte bigger."
+#~ msgstr "Декодування: розмір буфера призначення є надто малим. Його слід збільшити на 1 байт."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "disabled"
-msgstr "вимкнено"
+#~ msgid "Encoding backslash: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+#~ msgstr "Кодування зворотної похилої риски: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
 
-#: /home/ossman/devel/tigervnc/vncviewer/CConn.cxx:563
-msgid "enabled"
-msgstr "увімкнено"
+#~ msgid "Encoding escape sequence: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+#~ msgstr "Кодування екранованої послідовності: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:556
-msgid "level (1=fast, 6=best [4-6 are rarely useful])"
-msgstr "рівень (1=швидко, 6=найякісніше [4-6 використовувати не варто])"
+#~ msgid "Encoding normal character: The size of the buffer dest is to small, it needs to be more than %d bytes bigger."
+#~ msgstr "Кодування звичайного символу: розмір буфера призначення є надто малим. Його слід збільшити на понад %d байтів."
 
-#: /home/ossman/devel/tigervnc/vncviewer/OptionsDialog.cxx:569
-msgid "quality (0=poor, 9=best)"
-msgstr "якість (0=найгірша, 9=найкраща)"
+#~ msgid "Error(%d) closing key:  Software\\TigerVNC\\vncviewer"
+#~ msgstr "Помилка (%d) закриття ключа:  Software\\TigerVNC\\vncviewer"
 
-#: /home/ossman/devel/tigervnc/vncviewer/Win32PixelBuffer.cxx:62
-msgid "unable to create DIB section"
-msgstr "не вдалося створити розділ DIB"
+#~ msgid "Error(%d) closing key: Software\\TigerVNC\\vncviewer"
+#~ msgstr "Помилка (%d) закриття ключа: Software\\TigerVNC\\vncviewer"
+
+#~ msgid "Error(%d) creating key: Software\\TigerVNC\\vncviewer"
+#~ msgstr "Помилка (%d) під час створення ключа: Software\\TigerVNC\\vncviewer"
+
+#~ msgid "Error(%d) opening key: Software\\TigerVNC\\vncviewer"
+#~ msgstr "Помилка (%d) під час відкриття ключа: Software\\TigerVNC\\vncviewer"
+
+#~ msgid "Error(%d) reading %s from Registry."
+#~ msgstr "Помилка (%d) під час читання %s з реєстру."
+
+#~ msgid "Error(%d) writing %d(REG_DWORD) to Registry."
+#~ msgstr "Помилка (%d) під час запису %d(REG_DWORD) до реєстру."
+
+#~ msgid "Error(%d) writing %s(REG_SZ) to Registry."
+#~ msgstr "Помилка (%d) під час запису %s(REG_SZ) до реєстру."
+
+#~ msgid ""
+#~ "Line 1 in file %s\n"
+#~ "must contain the TigerVNC configuration file identifier string:\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "Рядок 1 у файлі %s\n"
+#~ "має містити рядок ідентифікатор файла налаштувань TigerVNC:\n"
+#~ "«%s»"
+
+#~ msgid "Multiple characters given for key code %d (0x%04x): '%s'"
+#~ msgstr "З клавішею з кодом %d (0x%04x) пов’язано декілька символів: «%s»"
+
+#~ msgid "The parameterArray contains a object of a invalid type at line %d."
+#~ msgstr "Змінна parameterArray містить об’єкт некоректного типу у рядку %d."
+
+#~ msgid "The value of the parameter %s on line %d in file %s is invalid."
+#~ msgstr "Значення параметра %s у рядку %d файла %s є некоректним."
+
+#~ msgid "Unknown FLTK key code %d (0x%04x)"
+#~ msgstr "Невідомий код клавіші FLTK, %d (0x%04x)"
+
+#~ msgid "Unknown decimal separator: '%s'"
+#~ msgstr "Невідомий десятковий роздільник: «%s»"
+
+#~ msgid "Unknown escape sequence at character %d"
+#~ msgstr "Невідома послідовність екранування на позиції %d"
diff --git a/unix/tx/TXWindow.cxx b/unix/tx/TXWindow.cxx
index 1f69702a..a6819179 100644
--- a/unix/tx/TXWindow.cxx
+++ b/unix/tx/TXWindow.cxx
@@ -89,11 +89,11 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_)
   XSetFont(dpy, defaultGC, defaultFont);
   XSelectInput(dpy, DefaultRootWindow(dpy), PropertyChangeMask);
 
-  static char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06};
-  dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), dotBits,
+  static unsigned char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06};
+  dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)dotBits,
                               dotSize, dotSize);
-  static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};
-  tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits,
+  static unsigned char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00};
+  tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)tickBits,
                                tickSize, tickSize);
   defaultWindowClass = rfb::strDup(defaultWindowClass_);
 }
diff --git a/unix/vncserver b/unix/vncserver
index b9627389..9ff24411 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -337,7 +337,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber" ||
 }
 $ENV{VNCDESKTOP}= $desktopName;
 
-system($exedir."vncconfig -iconic >> " . &quotedString($desktopLog) . " 2>&1 &");
+system($exedir."vncconfig -nowin >> " . &quotedString($desktopLog) . " 2>&1 &");
 
 if ($opt{'-fg'}) {
     system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1");
diff --git a/unix/xserver/hw/vnc/XorgGlue.c b/unix/xserver/hw/vnc/XorgGlue.c
index 8a3a2735..d7892b18 100644
--- a/unix/xserver/hw/vnc/XorgGlue.c
+++ b/unix/xserver/hw/vnc/XorgGlue.c
@@ -291,25 +291,6 @@ void vncRandRGetOutputDimensions(int scrIdx, int outputIdx,
 #endif
 }
 
-#ifdef RANDR
-static RRModePtr findRandRMode(RROutputPtr output, int width, int height)
-{
-  RRModePtr mode;
-
-  for (int i = 0;i < output->numModes;i++) {
-    if ((output->modes[i]->mode.width == width) &&
-        (output->modes[i]->mode.height == height))
-      return output->modes[i];
-  }
-
-  mode = vncRandRModeGet(width, height);
-  if (mode != NULL)
-    return mode;
-
-  return NULL;
-}
-#endif
-
 int vncRandRReconfigureOutput(int scrIdx, int outputIdx, int x, int y,
                               int width, int height)
 {
@@ -340,15 +321,10 @@ int vncRandRReconfigureOutput(int scrIdx, int outputIdx, int x, int y,
       return -1;
   }
 
-  mode = crtc->mode;
-
-  /* Need to switch mode? */
-  if ((mode == NULL) ||
-      (mode->mode.width != width) || (mode->mode.height != height)) {
-    mode = findRandRMode(output, width, height);
-    if (mode == NULL)
-      return -1;
-  }
+  /* Make sure we have the mode we want */
+  mode = vncRandRCreatePreferredMode(output, width, height);
+  if (mode == NULL)
+    return -1;
 
   /* Reconfigure new mode and position */
   return RRCrtcSet(crtc, mode, x, y, crtc->rotation, 1, &output);
diff --git a/unix/xserver/hw/vnc/XorgGlue.h b/unix/xserver/hw/vnc/XorgGlue.h
index 05ca7ba9..92b0d18d 100644
--- a/unix/xserver/hw/vnc/XorgGlue.h
+++ b/unix/xserver/hw/vnc/XorgGlue.h
@@ -59,8 +59,8 @@ void vncRandRGetOutputDimensions(int scrIdx, int outputIdx,
 
 // These hide in xvnc.c or vncModule.c
 void vncClientGone(int fd);
-void *vncRandRModeGet(int width, int height);
 int vncRandRCreateOutputs(int scrIdx, int extraOutputs);
+void *vncRandRCreatePreferredMode(void *output, int width, int height);
 
 #ifdef __cplusplus
 }
diff --git a/unix/xserver/hw/vnc/vncModule.c b/unix/xserver/hw/vnc/vncModule.c
index 8cbf9c2d..21f87ce9 100644
--- a/unix/xserver/hw/vnc/vncModule.c
+++ b/unix/xserver/hw/vnc/vncModule.c
@@ -112,13 +112,28 @@ void vncClientGone(int fd)
 }
 
 #ifdef RANDR
-void *vncRandRModeGet(int width, int height)
+int vncRandRCreateOutputs(int scrIdx, int extraOutputs)
 {
-    return NULL;
+  return -1;
 }
 
-int vncRandRCreateOutputs(int scrIdx, int extraOutputs)
+void *vncRandRCreatePreferredMode(void *out, int width, int height)
 {
-  return -1;
+  RROutputPtr output;
+
+  /*
+   * We're not going to change which modes are preferred, but let's
+   * see if we can at least find a mode with matching dimensions.
+   */
+
+  output = out;
+
+  for (int i = 0;i < output->numModes;i++) {
+    if ((output->modes[i]->mode.width == width) &&
+        (output->modes[i]->mode.height == height))
+      return output->modes[i];
+  }
+
+  return NULL;
 }
 #endif
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index d2d9b102..cac2aeeb 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -85,7 +85,7 @@ from the X Consortium.
 #include "version-config.h"
 #include "site.h"
 
-#define XVNCVERSION "TigerVNC 1.4.80"
+#define XVNCVERSION "TigerVNC 1.5.80"
 #define XVNCCOPYRIGHT ("Copyright (C) 1999-2015 TigerVNC Team and many others (see README.txt)\n" \
                        "See http://www.tigervnc.org for information on TigerVNC.\n")
 
@@ -1071,6 +1071,7 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
 static Bool vncRandRCrtcSet(ScreenPtr pScreen, RRCrtcPtr crtc, RRModePtr mode,
                             int x, int y, Rotation rotation, int num_outputs,
                             RROutputPtr *outputs);
+static RRModePtr vncRandRModeGet(int width, int height);
 
 static Bool vncRandRScreenSetSize(ScreenPtr pScreen,
                                   CARD16 width, CARD16 height,
@@ -1179,7 +1180,7 @@ static Bool vncRandRScreenSetSize(ScreenPtr pScreen,
             continue;
         }
 
-        /* Just needs to be resized */
+        /* Just needs to be resized to a temporary mode */
         mode = vncRandRModeGet(width - crtc->x, height - crtc->y);
         if (mode == NULL) {
             ErrorF("Warning: Unable to create custom mode for %dx%d",
@@ -1244,8 +1245,7 @@ static const int vncRandRHeights[] = { 1200, 1080, 1200, 1050, 1050,  768, 1024,
 
 static int vncRandRIndex = 0;
 
-/* This is a global symbol since findRandRMode() also uses it */
-void *vncRandRModeGet(int width, int height)
+static RRModePtr vncRandRModeGet(int width, int height)
 {
     xRRModeInfo	modeInfo;
     char name[100];
@@ -1267,16 +1267,51 @@ void *vncRandRModeGet(int width, int height)
     return mode;
 }
 
+static void vncRandRSetModes(RROutputPtr output, int pref_width, int pref_height)
+{
+    RRModePtr mode;
+    RRModePtr *modes;
+    int i, num_modes, num_pref;
+
+    num_modes = sizeof(vncRandRWidths)/sizeof(*vncRandRWidths) + 1;
+    modes = malloc(sizeof(RRModePtr)*num_modes);
+    if (modes == NULL)
+        return;
+
+    num_modes = 0;
+    num_pref = 0;
+
+    if ((pref_width > 0) && (pref_height > 0)) {
+        mode = vncRandRModeGet(pref_width, pref_height);
+        if (mode != NULL) {
+            modes[num_modes] = mode;
+            num_modes++;
+            num_pref++;
+        }
+    }
+
+    for (i = 0;i < sizeof(vncRandRWidths)/sizeof(*vncRandRWidths);i++) {
+        if ((vncRandRWidths[i] == pref_width) &&
+            (vncRandRHeights[i] == pref_height))
+            continue;
+        mode = vncRandRModeGet(vncRandRWidths[i], vncRandRHeights[i]);
+        if (mode != NULL) {
+            modes[num_modes] = mode;
+            num_modes++;
+        }
+    }
+
+    RROutputSetModes(output, modes, num_modes, num_pref);
+
+    free(modes);
+}
+
 static RRCrtcPtr vncRandRCrtcCreate(ScreenPtr pScreen)
 {
     RRCrtcPtr crtc;
     RROutputPtr output;
-    RRModePtr mode;
     char name[100];
 
-    RRModePtr *modes;
-    int i, num_modes;
-
     /* First we create the CRTC... */
     crtc = RRCrtcCreate(pScreen, NULL);
 
@@ -1296,22 +1331,7 @@ static RRCrtcPtr vncRandRCrtcCreate(ScreenPtr pScreen)
     vncRandRCrtcSet(pScreen, crtc, NULL, 0, 0, RR_Rotate_0, 1, &output);
 
     /* Populate a list of default modes */
-    modes = malloc(sizeof(RRModePtr)*sizeof(vncRandRWidths)/sizeof(*vncRandRWidths));
-    if (modes == NULL)
-        return NULL;
-
-    num_modes = 0;
-    for (i = 0;i < sizeof(vncRandRWidths)/sizeof(*vncRandRWidths);i++) {
-        mode = vncRandRModeGet(vncRandRWidths[i], vncRandRHeights[i]);
-        if (mode != NULL) {
-            modes[num_modes] = mode;
-            num_modes++;
-        }
-    }
-
-    RROutputSetModes(output, modes, num_modes, 0);
-
-    free(modes);
+    vncRandRSetModes(output, -1, -1);
 
     return crtc;
 }
@@ -1331,6 +1351,30 @@ int vncRandRCreateOutputs(int scrIdx, int extraOutputs)
     return 0;
 }
 
+/* Used to create a preferred mode from various places */
+void *vncRandRCreatePreferredMode(void *out, int width, int height)
+{
+    RROutputPtr output;
+
+    output = out;
+
+    /* Already the preferred mode? */
+    if ((output->numModes >= 1) && (output->numPreferred == 1) &&
+        (output->modes[0]->mode.width == width) &&
+        (output->modes[0]->mode.height == height))
+        return output->modes[0];
+
+    /* Recreate the list, with the mode we want as preferred */
+    vncRandRSetModes(output, width, height);
+
+    if ((output->numModes >= 1) && (output->numPreferred == 1) &&
+        (output->modes[0]->mode.width == width) &&
+        (output->modes[0]->mode.height == height))
+        return output->modes[0];
+
+    return NULL;
+}
+
 static Bool vncRandRInit(ScreenPtr pScreen)
 {
     RRCrtcPtr crtc;
@@ -1350,13 +1394,13 @@ static Bool vncRandRInit(ScreenPtr pScreen)
     crtc = vncRandRCrtcCreate(pScreen);
 
     /* Make sure the current screen size is the active mode */
-    mode = vncRandRModeGet(pScreen->width, pScreen->height);
+    mode = vncRandRCreatePreferredMode(crtc->outputs[0],
+                                       pScreen->width, pScreen->height);
     if (mode == NULL)
         return FALSE;
 
     ret = vncRandRCrtcSet(pScreen, crtc, mode, 0, 0, RR_Rotate_0,
                           crtc->numOutputs, crtc->outputs);
-    RRModeDestroy(mode);
     if (!ret)
         return FALSE;
 
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 3d0d6888..4bd0758f 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -94,7 +94,7 @@ static rfb::LogWriter vlog("Viewport");
 
 // Menu constants
 
-enum { ID_EXIT, ID_FULLSCREEN, ID_RESIZE,
+enum { ID_EXIT, ID_FULLSCREEN, ID_MINIMIZE, ID_RESIZE,
        ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
        ID_REFRESH, ID_OPTIONS, ID_INFO, ID_ABOUT, ID_DISMISS };
 
@@ -281,6 +281,8 @@ void Viewport::resize(int x, int y, int w, int h)
   const rdr::U8* data;
   int stride;
 
+  const rdr::U8 black[4] = { 0, 0, 0, 0 };
+
   // FIXME: Resize should probably be a feature of the pixel buffer itself
 
   if ((w == frameBuffer->width()) && (h == frameBuffer->height()))
@@ -304,14 +306,14 @@ void Viewport::resize(int x, int y, int w, int h)
     rect.setXYWH(frameBuffer->width(), 0,
                  newBuffer->width() - frameBuffer->width(),
                  newBuffer->height());
-    newBuffer->fillRect(rect, 0);
+    newBuffer->fillRect(rect, black);
   }
 
   if (newBuffer->height() > frameBuffer->height()) {
     rect.setXYWH(0, frameBuffer->height(),
                  newBuffer->width(),
                  newBuffer->height() - frameBuffer->height());
-    newBuffer->fillRect(rect, 0);
+    newBuffer->fillRect(rect, black);
   }
 
   delete frameBuffer;
@@ -791,6 +793,8 @@ void Viewport::initContextMenu()
 
   fltk_menu_add(contextMenu, _("&Full screen"), 0, NULL, (void*)ID_FULLSCREEN,
                 FL_MENU_TOGGLE | (window()->fullscreen_active()?FL_MENU_VALUE:0));
+  fltk_menu_add(contextMenu, _("Minimi&ze"), 0, NULL,
+                (void*)ID_MINIMIZE, 0);
   fltk_menu_add(contextMenu, _("Resize &window to session"), 0, NULL,
                 (void*)ID_RESIZE,
                 (window()->fullscreen_active()?FL_MENU_INACTIVE:0) |
@@ -863,6 +867,9 @@ void Viewport::popupContextMenu()
     else
       ((DesktopWindow*)window())->fullscreen_on();
     break;
+  case ID_MINIMIZE:
+    window()->iconize();
+    break;
   case ID_RESIZE:
     if (window()->fullscreen_active())
       break;
diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index bf390103..7cce1cd7 100644
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -182,7 +182,7 @@ static bool encodeValue(const char* val, char* dest, size_t destSize) {
   bool normalCharacter = true;
   size_t pos = 0;
 
-  for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
+  for (size_t i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
     
     // Check for sequences which will need encoding
     if (val[i] == '\\') {
@@ -229,7 +229,7 @@ static bool decodeValue(const char* val, char* dest, size_t destSize) {
   size_t pos = 0;
   bool escapedCharacter = false;
   
-  for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
+  for (size_t i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) {
     
     // Check for escape sequences
     if (val[i] == '\\') {
diff --git a/win/rfb_win32/SInput.cxx b/win/rfb_win32/SInput.cxx
index f6345665..111a4d90 100644
--- a/win/rfb_win32/SInput.cxx
+++ b/win/rfb_win32/SInput.cxx
@@ -66,7 +66,7 @@ static DWORD buttonUpMapping[8] = {
 };
 
 static DWORD buttonDataMapping[8] = {
-  0, 0, 0, 120, -120, 0, 0, 0
+  0, 0, 0, 120, (DWORD)-120, 0, 0, 0
 };
 
 win32::SPointer::SPointer()