From b5285ccc28a74ce7ff5e3d0462b37b7f03c2c998 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 28 Jun 2011 05:02:49 +0000 Subject: [PATCH] Use generic copyright message which refers the user to the complete copyright history in README.txt git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_1@4565 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- po/Makevars | 2 +- po/de.po | 12 ++++-------- po/fr.po | 12 ++++-------- po/pl.po | 12 ++++-------- po/ru.po | 12 ++++-------- po/sk.po | 12 ++++-------- po/sv.po | 12 ++++-------- po/tigervnc.pot | 9 +++------ unix/vncviewer/vncviewer.cxx | 4 +--- unix/xserver/hw/vnc/xvnc.cc | 4 +--- win/vncconfig/vncconfig.rc | 8 ++++---- win/vncviewer/vncviewer.rc | 8 ++++---- win/winvnc/winvnc.rc | 8 ++++---- 13 files changed, 42 insertions(+), 73 deletions(-) diff --git a/po/Makevars b/po/Makevars index 93e76d41..ace675e1 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --no-location # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = RealVNC Ltd, Constantin Kaplinsky, Peter Astrand, Cendio AB +COPYRIGHT_HOLDER = TigerVNC Team and many others (see README.txt) # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: diff --git a/po/de.po b/po/de.po index 35cbe207..ce6659df 100644 --- 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-06-27 23:58-0500\n" "PO-Revision-Date: 2005-03-01 20:41+0100\n" "Last-Translator: Klaus Franken \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" @@ -218,14 +218,10 @@ msgstr "Über..." #, 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" -"Copyright (C) 2002-2004 RealVNC Ltd.\n" -"Copyright (C) 2000-2004 Constantin Kaplinsky.\n" -"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n" +"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" "Copyright (C) 2005 Klaus Franken, StrukturPunkt\n" "Siehe http://www.tigervnc.org für Informationen über TigerVNC." diff --git a/po/fr.po b/po/fr.po index 829bca17..0b2ab4cf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: tigervnc-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-02-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: 2010-03-13 09:47+0100\n" "Last-Translator: Alain Portal \n" "Language-Team: French \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" @@ -218,14 +218,10 @@ msgstr "À propos..." #, 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 " "« %s »\n" -"Copyright (C) 2002-2005 RealVNC Ltd.\n" -"Copyright (C) 2000-2006 TightVNC Group\n" -"Copyright (C) 2004-2009 Peter Astrand pour Cendio AB\n" +"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" "Voir http://www.tigervnc.org pour plus d'informations sur TigerVNC." diff --git a/po/pl.po b/po/pl.po index a941ac0f..fe5d3cb0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: tigervnc-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-02-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: 2009-03-25 21:26+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \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" @@ -214,15 +214,11 @@ msgstr "O programie..." #, 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" -"Copyright (C) 2002-2005 RealVNC Ltd.\n" -"Copyright (C) 2000-2006 Grupa TightVNC\n" -"Copyright (C) 2004-2009 Peter Astrand dla Cendio AB\n" +"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" "Zobacz http://www.tigervnc.org, aby dowiedzieć się więcej o TigerVNC." #~ msgid "About VNCviewer..." diff --git a/po/ru.po b/po/ru.po index e2d09df8..dc5c3a8d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,14 +9,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-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: 2006-04-13 20:13+0700\n" "Last-Translator: Constantin Kaplinsky \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,13 +218,9 @@ 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" -"Copyright (C) 2002-2004 RealVNC Ltd.\n" -"Copyright (C) 2000-2004 Константин Каплинский\n" -"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n" +"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" "Ищите информацию о TigerVNC на сайте http://www.tigervnc.org" diff --git a/po/sk.po b/po/sk.po index 42d906be..d8ca4c52 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,14 +8,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-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: 2008-11-30 21:34+0100\n" "Last-Translator: Jozef Riha \n" "Language-Team: Slovak \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" @@ -216,15 +216,11 @@ msgstr "O programe..." #, 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" -"Copyright (C) 2002-2004 RealVNC Ltd.\n" -"Copyright (C) 2000-2004 Constantin Kaplinsky\n" -"Copyright (C) 2004-2009 Peter Astrand for Cendio AB\n" +"Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" "Pre informácie o TigerVNC navštívte http://www.tigervnc.org." #~ msgid "About VNCviewer..." diff --git a/po/sv.po b/po/sv.po index 9089d7d6..a7f45936 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,14 +9,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-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: 2010-10-11 12:11+0200\n" "Last-Translator: Peter Astrand \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" @@ -216,13 +216,9 @@ msgstr "Om..." #, 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" -"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" "Se http://www.tigervnc.org för information om TigerVNC." diff --git a/po/tigervnc.pot b/po/tigervnc.pot index f1e15776..7f6adbb7 100644 --- 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 , YEAR. # @@ -9,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: tigervnc-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-02-09 17:10+0100\n" +"POT-Creation-Date: 2011-06-27 23:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -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 8b741c0d..e418267d 100644 --- 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 5d5b1ca4..8edfdcf1 100644 --- 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.0.90" -#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/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc index 8914c1dc..12ef73e3 100644 --- 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 c2c98252..1d467584 100644 --- 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 0206c946..9c503500 100644 --- 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 -- 2.39.5