Use generic copyright message which refers the user to the complete copyright history...

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

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 51f017203d66f788d2fca5521a97dad533c36dd3..06a376ff77907aa7e60e334d66e9e3834b14b0da 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -24,7 +24,7 @@ if (GETTEXT_XGETTEXT_EXECUTABLE)
       --default-domain=tigervnc
       --keyword=_
       --keyword=N_
-      --copyright-holder='RealVNC Ltd, Constantin Kaplinsky, Peter Astrand, Cendio AB'
+      --copyright-holder='TigerVNC Team and many others (see README.txt)'
       --msgid-bugs-address="tigervnc-devel@lists.sourceforge.net"
       --sort-output
       --no-location

diff --git a/po/de.po b/po/de.po
index 35cbe2073a4e1026c92cc137b2cfacb456553e8a..60fe860e36a00a1ce3e6f9f11addb91292a07200 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TigerVNC 0.0.91\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-02-21 12:26+0100\n"
+"POT-Creation-Date: 2011-02-09 17:10+0100\n"
 "PO-Revision-Date: 2005-03-01 20:41+0100\n"
 "Last-Translator: Klaus Franken <Klaus.Franken@StrukturPunkt.de>\n"
 "Language-Team: German\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "About TigerVNC Viewer"
@@ -215,12 +215,10 @@ msgstr "VNC-Server:"
 msgid "About..."
 msgstr "Über..."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "TigerVNC-Viewer für X version %s - gebaut %s\n"

diff --git a/po/fr.po b/po/fr.po
index 829bca17386c7a4c27b7c58807969e6e4969ed06..88b0f3240d9845cc5e40d4431deaff403815f10d 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2010-03-13 09:47+0100\n"
 "Last-Translator: Alain Portal <alain.portal@free.fr>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -215,12 +215,10 @@ msgstr "Serveur VNC :"
 msgid "About..."
 msgstr "À propos..."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "Visionneur TigerVNC pour la version %s du serveur X - Paquetage construit le "

diff --git a/po/pl.po b/po/pl.po
index a941ac0f2f4e5572417ee6299123273ce2876a3d..a4e941eb02465fdf15552307690e60b3491ed7b2 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2009-03-25 21:26+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 
 msgid "About TigerVNC Viewer"
 msgstr "O Przeglądarce VNC"
@@ -211,12 +211,10 @@ msgstr "Serwer VNC:"
 msgid "About..."
 msgstr "O programie..."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "Przeglądarka TigerVNC dla X Window, wersja %s - zbudowano %s\n"

diff --git a/po/ru.po b/po/ru.po
index e2d09df80f26df6b2d4241ddc0eab6f6624997d0..999fb1ff0b742cc329d1bc157ebad6c866b48e6e 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2006-04-13 20:13+0700\n"
 "Last-Translator: Constantin Kaplinsky <const@tightvnc.com>\n"
 "Language-Team: Russian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #, fuzzy
 msgid "About TigerVNC Viewer"
@@ -218,9 +218,7 @@ msgstr "О программе..."
 #, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "TigerVNC viewer для X, версия %s - время сборки %s\n"

diff --git a/po/sk.po b/po/sk.po
index 42d906beb0e893d8182a568fdb37bccaefc8acdf..4e7d7929b1ebdb10fd7d7e431bff1746c8fc90f7 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2008-11-30 21:34+0100\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 msgid "About TigerVNC Viewer"
 msgstr "O aplikácií VNC Viewer"
@@ -213,12 +213,10 @@ msgstr "VNC server:"
 msgid "About..."
 msgstr "O programe..."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "TigerVNC viewer pre X verzie %s - zostavené %s\n"

diff --git a/po/sv.po b/po/sv.po
index 9089d7d6e611df94416817d372920cda03481dac..ac6f5a786caa66c6c00465fa843c8a5c6683c5ed 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2010-10-11 12:11+0200\n"
 "Last-Translator: Peter Astrand <astrand@cendio.se>\n"
 "Language-Team: Swedish\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "About TigerVNC Viewer"
@@ -213,12 +213,10 @@ msgstr "VNC-server:"
 msgid "About..."
 msgstr "Om..."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""
 "TigerVNC-visare för X version %s - byggd %s\n"

diff --git a/po/tigervnc.pot b/po/tigervnc.pot
index f1e157760937b14d8b19efa47ff6198a9e02d895..9f9c3ba021f6c573876f17fd46d675efc1ff0632 100644 (file)
--- a/po/tigervnc.pot
+++ b/po/tigervnc.pot
@@ -1,6 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR RealVNC Ltd, Constantin Kaplinsky, Peter Astrand, Cendio AB
-# Copyright (C) 2011 TigerVNC Team
+# Copyright (C) YEAR TigerVNC Team and many others (see README.txt)
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -205,8 +204,6 @@ msgstr ""
 #, c-format
 msgid ""
 "TigerVNC Viewer for X version %s - built %s\n"
-"Copyright (C) 2002-2005 RealVNC Ltd.\n"
-"Copyright (C) 2000-2006 TightVNC Group\n"
-"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
 "See http://www.tigervnc.org for information on TigerVNC."
 msgstr ""

diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 8b741c0d5714f29edba1fe11024bbe13c42c4de5..e418267dc2492e6864613693c807d022c8cd1864 100644 (file)
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -274,9 +274,7 @@ int main(int argc, char** argv)
   textdomain(PACKAGE_NAME);
 
   const char englishAbout[] = N_("TigerVNC Viewer for X version %s - built %s\n"
-                                "Copyright (C) 2002-2005 RealVNC Ltd.\n"
-                                "Copyright (C) 2000-2006 TightVNC Group\n"
-                                "Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+                                "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
                                 "See http://www.tigervnc.org for information on TigerVNC.");
 
   rfb::SecurityClient::setDefaults();

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index 663d1716f1ef5fd9de29943dbd623935110b9d8c..42eac4ed55641f79fd95993606cc23d81e8abbcc 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -97,9 +97,7 @@ extern "C" {
 #endif
 
 #define XVNCVERSION "TigerVNC 1.1.80"
-#define XVNCCOPYRIGHT ("Copyright (C) 2002-2005 RealVNC Ltd.\n" \
-                      "Copyright (C) 2000-2006 Constantin Kaplinsky\n" \
-                      "Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n" \
+#define XVNCCOPYRIGHT ("Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" \
                        "See http://www.tigervnc.org for information on TigerVNC.\n")
 
 

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 41d3796ce275feaa6427c69c93a430da9a59a5a3..cfe5cfae665bdc301e9f30796af9c8b2b20365f5 100644 (file)
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -180,9 +180,7 @@ int main(int argc, char** argv)
   UserDialog dlg;
 
   const char englishAbout[] = N_("TigerVNC Viewer version %s\n"
-                                 "Copyright (C) 2002-2005 RealVNC Ltd.\n"
-                                 "Copyright (C) 2000-2006 TightVNC Group\n"
-                                 "Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n"
+                                 "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n"
                                  "See http://www.tigervnc.org for information on TigerVNC.");
 
   setlocale(LC_ALL, "");

diff --git a/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc
index 8914c1dce729d2089a34a12876138d0d9118dd6c..12ef73e38b19e6621bc81d3aa7db59d36284286f 100644 (file)
--- a/win/vncconfig/vncconfig.rc
+++ b/win/vncconfig/vncconfig.rc
@@ -224,18 +224,18 @@ BEGIN
                     WS_TABSTOP,7,95,172,15
 END
 
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 249, 92
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "About TigerVNC Config for Windows"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,195,70,47,15
+    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
     ICON            IDI_ICON,IDC_STATIC,7,7,20,20
     LTEXT           ">appname<",IDC_DESCRIPTION,40,7,125,18
     LTEXT           ">version<",IDC_VERSION,165,7,77,18
     LTEXT           ">buildtime<",IDC_BUILDTIME,40,25,202,15
-    LTEXT           ">copyright<",IDC_COPYRIGHT,40,40,202,15
+    LTEXT           ">copyright<",IDC_COPYRIGHT,40,40,256,15
     LTEXT           "See http://www.tigervnc.org for more information on TigerVNC.",
                     IDC_STATIC,40,55,202,15
 END
@@ -477,7 +477,7 @@ BEGIN
             #endif
             VALUE "FileVersion", __RCVERSIONSTR
             VALUE "InternalName", "vncconfig\0"
-            VALUE "LegalCopyright", "Copyright (C) 1998-2010 [many holders]\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
             VALUE "LegalTrademarks", "TigerVNC\0"
             VALUE "OriginalFilename", "vncconfig.exe\0"
             VALUE "PrivateBuild", "\0"

diff --git a/win/vncviewer/vncviewer.rc b/win/vncviewer/vncviewer.rc
index c2c98252cf51cf278027e171eb1e45cd48145164..1d4675844600339ce27dbb3e0241de3170f09e25 100644 (file)
--- a/win/vncviewer/vncviewer.rc
+++ b/win/vncviewer/vncviewer.rc
@@ -95,7 +95,7 @@ BEGIN
             #endif
             VALUE "FileVersion", __RCVERSIONSTR
             VALUE "InternalName", "free4/vncviewer/win\0"
-            VALUE "LegalCopyright", "Copyright (C) 1998-2010 [many holders]\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
             VALUE "LegalTrademarks", "TigerVNC\0"
             VALUE "OriginalFilename", "vncviewer.exe\0"
             VALUE "PrivateBuild", "\0"
@@ -159,19 +159,19 @@ BEGIN
     RTEXT           "Server:",IDC_STATIC,43,15,37,13,SS_CENTERIMAGE
 END
 
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 249, 92
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "About TigerVNC Viewer for Windows"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,195,70,47,15
+    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
     CONTROL         120,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,7,
                     10,33,31
     LTEXT           ">appname<",IDC_DESCRIPTION,46,10,119,15
     LTEXT           ">version<",IDC_VERSION,165,10,77,15
     LTEXT           ">buildtime<",IDC_BUILDTIME,46,25,196,15
-    LTEXT           ">copyright<",IDC_COPYRIGHT,46,40,196,15
+    LTEXT           ">copyright<",IDC_COPYRIGHT,46,40,250,15
     LTEXT           "Visit www.tigervnc.org for more information on TigerVNC.",
                     IDC_STATIC,46,55,196,15
 END

diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc
index 0206c9468ba0b299ed032765ce8ccd8c143ab9d9..9c503500860bea01f475c32d65c6264156e8b736 100644 (file)
--- a/win/winvnc/winvnc.rc
+++ b/win/winvnc/winvnc.rc
@@ -86,7 +86,7 @@ BEGIN
             #endif
             VALUE "FileVersion", __RCVERSIONSTR
             VALUE "InternalName", "winvnc\0"
-            VALUE "LegalCopyright", "Copyright (C) 1998-2010 [many holders]\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0"
             VALUE "LegalTrademarks", "TigerVNC\0"
             VALUE "OriginalFilename", "winvnc4.exe\0"
             VALUE "PrivateBuild", "\0"
@@ -142,18 +142,18 @@ END
 // Dialog
 //
 
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 249, 92
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 300, 92
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "About TigerVNC Server for Windows"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,195,70,47,15
+    DEFPUSHBUTTON   "OK",IDOK,245,70,47,15
     CONTROL         109,IDC_STATIC,"Static",SS_BITMAP,5,10,33,31
     LTEXT           ">appname<",IDC_DESCRIPTION,45,10,125,15
     LTEXT           ">version<",IDC_VERSION,170,10,72,15
     LTEXT           ">buildtime<",IDC_BUILDTIME,45,25,202,15
-    LTEXT           ">copyright<",IDC_COPYRIGHT,45,40,202,15
+    LTEXT           ">copyright<",IDC_COPYRIGHT,45,40,256,15
     LTEXT           "See http://www.tigervnc.org for more information on VNC.",
                     IDC_STATIC,45,55,202,15
 END

diff --git a/win/wm_hooks/wm_hooks.rc b/win/wm_hooks/wm_hooks.rc
index d80c983ff8aadb7a356014e950a187c6e2c66a0c..4ea519a7b5c80e26c90d62a81176d7be6d8c8c27 100644 (file)
--- a/win/wm_hooks/wm_hooks.rc
+++ b/win/wm_hooks/wm_hooks.rc
@@ -82,7 +82,7 @@ BEGIN
             #endif
             VALUE "FileVersion", __RCVERSIONSTR
             VALUE "InternalName", "\0"
-            VALUE "LegalCopyright", "Copyright (C) 1998-2005 [many holders]\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2005 [many holders]\0"
             VALUE "LegalTrademarks", "TigerVNC\0"
             VALUE "OriginalFilename", "wm_hooks.dll\0"
             VALUE "PrivateBuild", "\0"