Swedish translation for UNIX vncviewer GUI completed

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@122 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/config.h b/config.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/po/sv.po b/po/sv.po
index 581660b34b86537ba13023cae72cc8fc93c8e9b3..eb8c1c99cbc976a08a2237575ee2d105cf4374cb 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,17 +7,173 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tightvnc 1.5.0\n"
-"POT-Creation-Date: 2005-01-23 22:03+0100\n"
-"PO-Revision-Date: 2005-01-23 21:33+0100\n"
+"Report-Msgid-Bugs-To: devteam@tightvnc.com\n"
+"POT-Creation-Date: 2005-01-24 20:27+0100\n"
+"PO-Revision-Date: 2005-01-24 20:59+0100\n"
 "Last-Translator: Peter Astrand <astrand@cendio.se>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: devteam@tightvnc.com\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: vncviewer_unix/vncviewer.cxx:189
+msgid "About VNC Viewer"
+msgstr "Om VNC-visaren"
+
+msgid "VNC authentication"
+msgstr "VNC-autentisering"
+
+msgid "Exit viewer"
+msgstr "Avsluta visaren"
+
+msgid "Full screen"
+msgstr "Fullskärm"
+
+msgid "Ctrl"
+msgstr "Ctrl"
+
+msgid "Alt"
+msgstr "Alt"
+
+#, c-format
+msgid "Send %s"
+msgstr "Skicka %s"
+
+msgid "Send Ctrl-Alt-Del"
+msgstr "Skicka Ctrl-Alt-Del"
+
+msgid "Refresh screen"
+msgstr "Uppdatera skärm"
+
+msgid "New connection..."
+msgstr "Ny anslutning..."
+
+msgid "Options..."
+msgstr "Inställningar..."
+
+msgid "Connection info..."
+msgstr "Information om anslutningen..."
+
+msgid "About VNCviewer..."
+msgstr "Om VNC-visaren..."
+
+msgid "Dismiss menu"
+msgstr "Stäng meny"
+
+msgid "VNC Menu"
+msgstr "VNC-meny"
+
+#, c-format
+msgid ""
+"Desktop name: %.80s\n"
+"Host: %.80s port: %d\n"
+"Size: %d x %d\n"
+"Pixel format: %s\n"
+"(server default %s)\n"
+"Requested encoding: %s\n"
+"Last used encoding: %s\n"
+"Line speed estimate: %d kbit/s\n"
+"Protocol version: %d.%d\n"
+"Security method: %s\n"
+msgstr ""
+"Skrivbordsnamn: %.80s\n"
+"Värd: %.80s port: %d\n"
+"Storlek: %d x %d\n"
+"Pixelformat: %s\n"
+"(serverstandard %s)\n"
+"Begärd kodning: %s\n"
+"Senast använd kodning: %s\n"
+"Uppskattad hastighet på förbindelsen: %d kbit/s\n"
+"Protokollversion: %d.%d\n"
+"Säkerhetsmetod: %s\n"
+
+msgid "VNC connection info"
+msgstr "VNC anslutningsinformation"
+
+msgid "VNC Viewer: Connection Options"
+msgstr "VNC-visare: Anslutningsalternativ"
+
+msgid "Encoding and Color Level:"
+msgstr "Kodning och färgnivå:"
+
+msgid "Inputs:"
+msgstr "Inmatning:"
+
+msgid "Misc:"
+msgstr "Diverse:"
+
+msgid "Auto select"
+msgstr "Automatiskt val"
+
+msgid "Full (all available colors)"
+msgstr "Full (alla tillgängliga färger)"
+
+msgid "Medium (256 colors)"
+msgstr "Medium (256 färger)"
+
+msgid "Low (64 colors)"
+msgstr "Låg (64 färger)"
+
+msgid "Very low (8 colors)"
+msgstr "Mycket låg (8 färger)"
+
+msgid "Custom compression level:"
+msgstr "Anpassad kompressionsnivå:"
+
+msgid "level (1=fast, 9=best)"
+msgstr "nivå (1=snabb, 9=bäst)"
+
+msgid "Allow JPEG compression:"
+msgstr "Tillåt JPEG-kompression:"
+
+msgid "quality (1=poor, 9=best)"
+msgstr "kvalitet (0=dålig, 9=bäst)"
+
+msgid "View only (ignore mouse & keyboard)"
+msgstr "Endast visning (ignorera mus och tangentbord)"
+
+msgid "Accept clipboard from server"
+msgstr "Acceptera urklipp från server"
+
+msgid "Send clipboard to server"
+msgstr "Skicka urklipp till server"
+
+msgid "Send primary selection & cut buffer as clipboard"
+msgstr "Skicka PRIMARY och CUT_BUFFER som urklipp"
+
+msgid "Shared (don't disconnect other viewers)"
+msgstr "Delad (koppla ej från andra visare)"
+
+msgid "Full-screen mode"
+msgstr "Fullskärmsläge"
+
+msgid "Render cursor locally"
+msgstr "Hantera muspekaren lokalt"
+
+msgid "Show dot when no cursor"
+msgstr "Visa punkt när muspekare saknas"
+
+msgid "OK"
+msgstr "Ok"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "Username:"
+msgstr "Användarnamn:"
+
+msgid "Password:"
+msgstr "Lösenord:"
+
+msgid "VNC Viewer: Connection Details"
+msgstr "VNC-visare: Anslutningsdetaljer"
+
+msgid "VNC server:"
+msgstr "VNC-server:"
+
+msgid "About..."
+msgstr "Om..."
+
 #, c-format
 msgid ""
 "TightVNC viewer for X version 4.0 - built %s\n"
@@ -26,7 +182,7 @@ msgid ""
 "Copyright (C) 2004 Peter Astrand, Cendio AB\n"
 "See http://www.tightvnc.com for information on TightVNC."
 msgstr ""
-"TightVNC viewer för X version 4.0 - byggd %s\n"
+"TightVNC-visare för X version 4.0 - byggd %s\n"
 "Copyright (C) 2002-2004 RealVNC Ltd.\n"
 "Copyright (C) 2000-2004 Constantin Kaplinsky.\n"
 "Copyright (C) 2004 Peter Astrand, Cendio AB\n"

diff --git a/po/tightvnc.pot b/po/tightvnc.pot
index 0390e2d57fd3b5d4935f2821e42b7474f22d3ea8..f9e62b2e7254d482d44a4d22deed2cbd535baffc 100644 (file)
--- a/po/tightvnc.pot
+++ b/po/tightvnc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: devteam@tightvnc.com\n"
-"POT-Creation-Date: 2005-01-23 22:03+0100\n"
+"POT-Creation-Date: 2005-01-24 20:27+0100\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"
@@ -16,7 +16,153 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vncviewer_unix/vncviewer.cxx:189
+msgid "About VNC Viewer"
+msgstr ""
+
+msgid "VNC authentication"
+msgstr ""
+
+msgid "Exit viewer"
+msgstr ""
+
+msgid "Full screen"
+msgstr ""
+
+msgid "Ctrl"
+msgstr ""
+
+msgid "Alt"
+msgstr ""
+
+#, c-format
+msgid "Send %s"
+msgstr ""
+
+msgid "Send Ctrl-Alt-Del"
+msgstr ""
+
+msgid "Refresh screen"
+msgstr ""
+
+msgid "New connection..."
+msgstr ""
+
+msgid "Options..."
+msgstr ""
+
+msgid "Connection info..."
+msgstr ""
+
+msgid "About VNCviewer..."
+msgstr ""
+
+msgid "Dismiss menu"
+msgstr ""
+
+msgid "VNC Menu"
+msgstr ""
+
+#, c-format
+msgid ""
+"Desktop name: %.80s\n"
+"Host: %.80s port: %d\n"
+"Size: %d x %d\n"
+"Pixel format: %s\n"
+"(server default %s)\n"
+"Requested encoding: %s\n"
+"Last used encoding: %s\n"
+"Line speed estimate: %d kbit/s\n"
+"Protocol version: %d.%d\n"
+"Security method: %s\n"
+msgstr ""
+
+msgid "VNC connection info"
+msgstr ""
+
+msgid "VNC Viewer: Connection Options"
+msgstr ""
+
+msgid "Encoding and Color Level:"
+msgstr ""
+
+msgid "Inputs:"
+msgstr ""
+
+msgid "Misc:"
+msgstr ""
+
+msgid "Auto select"
+msgstr ""
+
+msgid "Full (all available colors)"
+msgstr ""
+
+msgid "Medium (256 colors)"
+msgstr ""
+
+msgid "Low (64 colors)"
+msgstr ""
+
+msgid "Very low (8 colors)"
+msgstr ""
+
+msgid "Custom compression level:"
+msgstr ""
+
+msgid "level (1=fast, 9=best)"
+msgstr ""
+
+msgid "Allow JPEG compression:"
+msgstr ""
+
+msgid "quality (1=poor, 9=best)"
+msgstr ""
+
+msgid "View only (ignore mouse & keyboard)"
+msgstr ""
+
+msgid "Accept clipboard from server"
+msgstr ""
+
+msgid "Send clipboard to server"
+msgstr ""
+
+msgid "Send primary selection & cut buffer as clipboard"
+msgstr ""
+
+msgid "Shared (don't disconnect other viewers)"
+msgstr ""
+
+msgid "Full-screen mode"
+msgstr ""
+
+msgid "Render cursor locally"
+msgstr ""
+
+msgid "Show dot when no cursor"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Username:"
+msgstr ""
+
+msgid "Password:"
+msgstr ""
+
+msgid "VNC Viewer: Connection Details"
+msgstr ""
+
+msgid "VNC server:"
+msgstr ""
+
+msgid "About..."
+msgstr ""
+
 #, c-format
 msgid ""
 "TightVNC viewer for X version 4.0 - built %s\n"

diff --git a/vncviewer_unix/AboutDialog.h b/vncviewer_unix/AboutDialog.h
index 2f54f66b84af1761472006d69115d7d973ea3e21..f242753a2e133f4b6d7f4e065e83691093cef81a 100644 (file)
--- a/vncviewer_unix/AboutDialog.h
+++ b/vncviewer_unix/AboutDialog.h
@@ -25,12 +25,17 @@
 #include "TXMsgBox.h"
 #include "parameters.h"
 
+#include <intl/gettext.h>
+#define _(String) gettext (String)
+#define gettext_noop(String) String
+#define N_(String) gettext_noop (String)
+
 extern char buildtime[];
 
 class AboutDialog : public TXMsgBox {
 public:
   AboutDialog(Display* dpy)
-    : TXMsgBox(dpy, aboutText, MB_OK, "About VNC Viewer") {
+    : TXMsgBox(dpy, aboutText, MB_OK, _("About VNC Viewer")) {
   }
 };
 

diff --git a/vncviewer_unix/CConn.cxx b/vncviewer_unix/CConn.cxx
index 0a163c7d0e160fd3b793a2a69513b255db0c0624..c0f7b8ac02daaff446be52783dc79e77461110fb 100644 (file)
--- a/vncviewer_unix/CConn.cxx
+++ b/vncviewer_unix/CConn.cxx
@@ -197,7 +197,7 @@ bool CConn::getUserPasswd(char** user, char** password)
   }
 
   const char* secType = secTypeName(getCurrentCSecurity()->getType());
-  const char* titlePrefix = "VNC Authentication";
+  const char* titlePrefix = _("VNC authentication");
   unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
   CharArray title(titleLen);
   snprintf(title.buf, titleLen, "%s [%s]", titlePrefix, secType);
@@ -338,29 +338,28 @@ enum { ID_OPTIONS, ID_INFO, ID_FULLSCREEN, ID_REFRESH, ID_F8, ID_CTRLALTDEL,
 void CConn::initMenu() {
   menuEventHandler = menu.setEventHandler(this);
   menu.addEventMask(KeyPressMask | KeyReleaseMask);
-  menu.addEntry("Exit viewer", ID_EXIT);
+  menu.addEntry(_("Exit viewer"), ID_EXIT);
   menu.addEntry(0, 0);
-  menu.addEntry("Full screen", ID_FULLSCREEN);
+  menu.addEntry(_("Full screen"), ID_FULLSCREEN);
   menu.check(ID_FULLSCREEN, fullScreen);
   menu.addEntry(0, 0);
-  menu.addEntry("Ctrl", ID_CTRL);
-  menu.addEntry("Alt", ID_ALT);
+  menu.addEntry(_("Ctrl"), ID_CTRL);
+  menu.addEntry(_("Alt"), ID_ALT);
   CharArray menuKeyStr(menuKey.getData());
-  unsigned int sendMenuKeyLen = 6+strlen(menuKeyStr.buf);
-  CharArray sendMenuKey(sendMenuKeyLen);
-  snprintf(sendMenuKey.buf, sendMenuKeyLen, "Send %s", menuKeyStr.buf);
+  CharArray sendMenuKey(64);
+  snprintf(sendMenuKey.buf, 64, _("Send %s"), menuKeyStr.buf);
   menu.addEntry(sendMenuKey.buf, ID_F8);
-  menu.addEntry("Send Ctrl-Alt-Del", ID_CTRLALTDEL);
+  menu.addEntry(_("Send Ctrl-Alt-Del"), ID_CTRLALTDEL);
   menu.addEntry(0, 0);
-  menu.addEntry("Refresh screen", ID_REFRESH);
+  menu.addEntry(_("Refresh screen"), ID_REFRESH);
   menu.addEntry(0, 0);
-  menu.addEntry("New connection...", ID_NEWCONN);
-  menu.addEntry("Options...", ID_OPTIONS);
-  menu.addEntry("Connection info...", ID_INFO);
-  menu.addEntry("About VNCviewer...", ID_ABOUT);
+  menu.addEntry(_("New connection..."), ID_NEWCONN);
+  menu.addEntry(_("Options..."), ID_OPTIONS);
+  menu.addEntry(_("Connection info..."), ID_INFO);
+  menu.addEntry(_("About VNCviewer..."), ID_ABOUT);
   menu.addEntry(0, 0);
-  menu.addEntry("Dismiss menu", ID_DISMISS);
-  menu.toplevel("VNC Menu", this);
+  menu.addEntry(_("Dismiss menu"), ID_DISMISS);
+  menu.toplevel(_("VNC Menu"), this);
   menu.setBorderWidth(1);
 }
 
@@ -408,16 +407,16 @@ void CConn::menuSelect(long id, TXMenu* m) {
       int secType = getCurrentCSecurity()->getType();
       char infoText[1024];
       snprintf(infoText, sizeof(infoText),
-              "Desktop name: %.80s\n"
-              "Host: %.80s port: %d\n"
-              "Size: %d x %d\n"
-              "Pixel format: %s\n"
-              "(server default %s)\n"
-              "Requested encoding: %s\n"
-              "Last used encoding: %s\n"
-              "Line speed estimate: %d kbit/s\n"
-              "Protocol version: %d.%d\n"
-              "Security method: %s\n",
+              _("Desktop name: %.80s\n"
+                "Host: %.80s port: %d\n"
+                "Size: %d x %d\n"
+                "Pixel format: %s\n"
+                "(server default %s)\n"
+                "Requested encoding: %s\n"
+                "Last used encoding: %s\n"
+                "Line speed estimate: %d kbit/s\n"
+                "Protocol version: %d.%d\n"
+                "Security method: %s\n"),
               cp.name(), serverHost, serverPort, cp.width, cp.height,
               pfStr, spfStr, encodingName(currentEncoding),
               encodingName(lastServerEncoding),

diff --git a/vncviewer_unix/InfoDialog.h b/vncviewer_unix/InfoDialog.h
index b228bfcb01f7185fed6e8f85d747730578d1366a..ef0a4b06af22c87e6f7aaa1bb48e5fcaf298d071 100644 (file)
--- a/vncviewer_unix/InfoDialog.h
+++ b/vncviewer_unix/InfoDialog.h
@@ -31,7 +31,7 @@ extern char buildtime[];
 class InfoDialog : public TXDialog, public TXButtonCallback {
 public:
   InfoDialog(Display* dpy)
-    : TXDialog(dpy, 1, 1, "VNC connection info"),
+    : TXDialog(dpy, 1, 1, _("VNC connection info")),
       infoLabel(dpy, "", this, 1, 1, TXLabel::left),
       okButton(dpy, "OK", this, this, 60)
   {

diff --git a/vncviewer_unix/OptionsDialog.h b/vncviewer_unix/OptionsDialog.h
index 561bad2d74e3634d1c72c78ebe955102dacf2f11..0bc1119b8152e124c1a577bda33c04e0511bea51 100644 (file)
--- a/vncviewer_unix/OptionsDialog.h
+++ b/vncviewer_unix/OptionsDialog.h
@@ -39,36 +39,36 @@ class OptionsDialog : public TXDialog, public TXButtonCallback,
                       public TXCheckboxCallback, public TXEntryCallback  {
 public:
   OptionsDialog(Display* dpy, OptionsDialogCallback* cb_)
-    : TXDialog(dpy, 400, 450, "VNC Viewer: Connection Options"), cb(cb_),
-      formatAndEnc(dpy, "Encoding and Color Level:", this),
-      inputs(dpy, "Inputs:", this),
-      misc(dpy, "Misc:", this),
-      autoSelect(dpy, "Auto select", this, false, this),
-      fullColour(dpy, "Full (all available colors)", this, true, this),
-      mediumColour(dpy, "Medium (256 colors)", this, true, this),
-      lowColour(dpy, "Low (64 colors)", this, true, this),
-      veryLowColour(dpy, "Very low (8 colors)", this, true, this),
+    : TXDialog(dpy, 400, 450, _("VNC Viewer: Connection Options")), cb(cb_),
+      formatAndEnc(dpy, _("Encoding and Color Level:"), this),
+      inputs(dpy, _("Inputs:"), this),
+      misc(dpy, _("Misc:"), this),
+      autoSelect(dpy, _("Auto select"), this, false, this),
+      fullColour(dpy, _("Full (all available colors)"), this, true, this),
+      mediumColour(dpy, _("Medium (256 colors)"), this, true, this),
+      lowColour(dpy, _("Low (64 colors)"), this, true, this),
+      veryLowColour(dpy, _("Very low (8 colors)"), this, true, this),
       tight(dpy, "Tight", this, true, this),
       zrle(dpy, "ZRLE", this, true, this),
       hextile(dpy, "Hextile", this, true, this),
       raw(dpy, "Raw", this, true, this),
-      customCompressLevel(dpy, "Custom compression level:", this, false, this),
+      customCompressLevel(dpy, _("Custom compression level:"), this, false, this),
       compressLevel(dpy, this, this, false, 30),
-      compressLevelLabel(dpy, "level (1=fast, 9=best)", this),
-      noJpeg(dpy, "Allow JPEG compression:", this, false, this),
+      compressLevelLabel(dpy, _("level (1=fast, 9=best)"), this),
+      noJpeg(dpy, _("Allow JPEG compression:"), this, false, this),
       qualityLevel(dpy, this, this, false, 30),
-      qualityLevelLabel(dpy, "quality (1=poor, 9=best)", this),
-      viewOnly(dpy, "View only (ignore mouse & keyboard)", this, false, this),
-      acceptClipboard(dpy, "Accept clipboard from server", this, false, this),
-      sendClipboard(dpy, "Send clipboard to server", this, false, this),
-      sendPrimary(dpy, "Send primary selection & cut buffer as clipboard",
+      qualityLevelLabel(dpy, _("quality (1=poor, 9=best)"), this),
+      viewOnly(dpy, _("View only (ignore mouse & keyboard)"), this, false, this),
+      acceptClipboard(dpy, _("Accept clipboard from server"), this, false, this),
+      sendClipboard(dpy, _("Send clipboard to server"), this, false, this),
+      sendPrimary(dpy, _("Send primary selection & cut buffer as clipboard"),
                   this, false, this),
-      shared(dpy, "Shared (don't disconnect other viewers)", this, false,this),
-      fullScreen(dpy, "Full-screen mode", this, false, this),
-      useLocalCursor(dpy, "Render cursor locally", this, false, this),
-      dotWhenNoCursor(dpy, "Show dot when no cursor", this, false, this),
-      okButton(dpy, "OK", this, this, 60),
-      cancelButton(dpy, "Cancel", this, this, 60)
+      shared(dpy, _("Shared (don't disconnect other viewers)"), this, false,this),
+      fullScreen(dpy, _("Full-screen mode"), this, false, this),
+      useLocalCursor(dpy, _("Render cursor locally"), this, false, this),
+      dotWhenNoCursor(dpy, _("Show dot when no cursor"), this, false, this),
+      okButton(dpy, _("OK"), this, this, 60),
+      cancelButton(dpy, _("Cancel"), this, this, 60)
   {
     int y = yPad;
     formatAndEnc.move(xPad, y);

diff --git a/vncviewer_unix/PasswdDialog.h b/vncviewer_unix/PasswdDialog.h
index 3c1ee8dc92985bfc91ab93ffac3a675209b5c57b..26543197f77422705a1e219e05d718f7df5b739a 100644 (file)
--- a/vncviewer_unix/PasswdDialog.h
+++ b/vncviewer_unix/PasswdDialog.h
@@ -30,9 +30,9 @@ class PasswdDialog : public TXDialog, public TXEntryCallback {
 public:
   PasswdDialog(Display* dpy, const char* title, bool userDisabled)
     : TXDialog(dpy, 320, 100, title, true),
-      userLabel(dpy, "Username:", this, 120),
+      userLabel(dpy, _("Username:"), this, 120),
       userEntry(dpy, this, this, false, 180),
-      passwdLabel(dpy, "Password:", this, 120),
+      passwdLabel(dpy, _("Password:"), this, 120),
       passwdEntry(dpy, this, this, true, 180)
   {
     userLabel.move(0, 20);

diff --git a/vncviewer_unix/ServerDialog.h b/vncviewer_unix/ServerDialog.h
index 245743f8f506973822adcc2d8283fecf417aa269..81d12917e269ca6dfbb0dee919b7e53ef7507c34 100644 (file)
--- a/vncviewer_unix/ServerDialog.h
+++ b/vncviewer_unix/ServerDialog.h
@@ -33,26 +33,26 @@ class ServerDialog : public TXDialog, public TXEntryCallback,
                      public TXButtonCallback {
 public:
   ServerDialog(Display* dpy, OptionsDialog* options_, AboutDialog* about_)
-    : TXDialog(dpy, 332, 120, "VNC Viewer: Connection Details", true),
-      label(dpy, "VNC server:", this, 100),
+    : TXDialog(dpy, 355, 120, _("VNC Viewer: Connection Details"), true),
+      label(dpy, _("VNC server:"), this, 100),
       entry(dpy, this, this, false, 180),
-      aboutButton(dpy, "About...", this, this, 60),
-      optionsButton(dpy, "Options...", this, this, 60),
-      okButton(dpy, "OK", this, this, 60),
-      cancelButton(dpy, "Cancel", this, this, 60),
+      aboutButton(dpy, _("About..."), this, this, 70),
+      optionsButton(dpy, _("Options..."), this, this, 70),
+      okButton(dpy, _("OK"), this, this, 70),
+      cancelButton(dpy, _("Cancel"), this, this, 70),
       options(options_), about(about_)
   {
     label.move(0, 30);
     entry.move(label.width(), 28);
     int x = width();
     int y = height() - yPad*4 - cancelButton.height();
-    x -= cancelButton.width() + xPad*6;
+    x -= cancelButton.width() + xPad*4;
     cancelButton.move(x, y);
-    x -= okButton.width() + xPad*6;
+    x -= okButton.width() + xPad*4;
     okButton.move(x, y);
-    x -= optionsButton.width() + xPad*6;
+    x -= optionsButton.width() + xPad*4;
     optionsButton.move(x, y);
-    x -= aboutButton.width() + xPad*6;
+    x -= aboutButton.width() + xPad*4;
     aboutButton.move(x, y);
   }
 

diff --git a/vncviewer_unix/vncviewer.cxx b/vncviewer_unix/vncviewer.cxx
index 7e7178fa9196ddeb3707fe4345c0ee407eabeb78..e8e14b1c08ae6f3d3bbb6d291a3eeffb8c64bd29 100644 (file)
--- a/vncviewer_unix/vncviewer.cxx
+++ b/vncviewer_unix/vncviewer.cxx
@@ -188,7 +188,7 @@ int main(int argc, char** argv)
   snprintf(aboutText, sizeof(aboutText), 
           _("TightVNC viewer for X version 4.0 - built %s\n"
             "Copyright (C) 2002-2004 RealVNC Ltd.\n"
-            "Copyright (C) 2000-2004 Constantin Kaplinsky.\n"
+            "Copyright (C) 2000-2004 Constantin Kaplinsky\n"
             "Copyright (C) 2004 Peter Astrand, Cendio AB\n"
             "See http://www.tightvnc.com for information on TightVNC."),
             buildtime);