From c4a18c2fddb2b640ae0d554c5444e9bffa3d256f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 7 Apr 2020 21:26:08 +0100 Subject: Resources: Update presentation to use nscolour. --- resources/en/credits.html | 15 +++++---- resources/en/licence.html | 78 +++++++++++++++++++++++------------------------ resources/it/credits.html | 15 +++++---- resources/it/licence.html | 78 +++++++++++++++++++++++------------------------ resources/nl/credits.html | 15 +++++---- resources/nl/licence.html | 78 +++++++++++++++++++++++------------------------ 6 files changed, 135 insertions(+), 144 deletions(-) (limited to 'resources') diff --git a/resources/en/credits.html b/resources/en/credits.html index 51139243a..3818c9c34 100644 --- a/resources/en/credits.html +++ b/resources/en/credits.html @@ -13,16 +13,15 @@ div#DevList ul { - - + -

NetSurf Credits

+

NetSurf Credits

NetSurf was brought to you by the following people:

-

Code

+

Code

-

Documentation

+

Documentation

-

Graphics

+

Graphics

-

Translations

+

Translations

-

Copyright 2003–2019 The NetSurf Developers

+

Copyright 2003–2019 The NetSurf Developers

diff --git a/resources/en/licence.html b/resources/en/licence.html index afae90f2d..c0c9cbf02 100644 --- a/resources/en/licence.html +++ b/resources/en/licence.html @@ -6,23 +6,22 @@ - - + -

NetSurf Licence

+

NetSurf Licence

NetSurf, the source code, documentation, translatable messages files and UI definitions are licensed under the GNU General Public Licence, version 2.0. In @@ -49,7 +47,7 @@ extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.

-

Component Licencing

+

Component Licencing

NetSurf's artwork resources are licensed under the MIT licence.

@@ -58,73 +56,73 @@ version.

NetSurf Project Components

-
NetSurf
+
NetSurf
© 2002–2019 The NetSurf Developers GPLv2
-
LibCSS
+
LibCSS
© 2007–2019 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2019 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2019 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa
© 2017 Michael Drake MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox
© 2017 Vincent Sanders MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -134,49 +132,49 @@ version.

Third Party Components

-
cURL
+
cURL
© 1996–2010 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-
OSLib
+
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -185,14 +183,14 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib
-

Licence texts

+

Licence texts

Generic forms of the licence texts appear here where possible. Some components may vary the licence slightly, and our best effort has been made to @@ -201,7 +199,7 @@ white space, etc, were not considered.

GNU General Public Licence, Version 2

-
GNU GENERAL PUBLIC LICENSE +
GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., @@ -544,7 +542,7 @@ Public License instead of this License.

MIT/X Licence

-
Permission is hereby granted, free of charge, to any person obtaining a copy +
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -565,7 +563,7 @@ THE SOFTWARE.

ZLib Licence

-
This software is provided 'as-is', without any express or implied +
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -584,7 +582,7 @@ THE SOFTWARE.

IJG Licence

-
The authors make NO WARRANTY or representation, either express or implied, +
The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. @@ -639,7 +637,7 @@ but is also freely distributable.

OSLib Licence

-
The copyright holder has granted a small relaxation of the +
The copyright holder has granted a small relaxation of the conditions of the GNU Public Licence, in that OSLib is itself free software, but applications linked to it need not be. This means that any changes to OSLib itself (the contents of @@ -899,7 +897,7 @@ That's all there is to it!

OpenSSL Licence

-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of +
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL @@ -1025,7 +1023,7 @@ That's all there is to it!

PNG Licence

-
* This code is released under the libpng license. +
* This code is released under the libpng license. * * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are @@ -1115,7 +1113,7 @@ That's all there is to it!

UnixLib Licence

-
In January 2005, permission was obtained from all relevant contributors +
In January 2005, permission was obtained from all relevant contributors by Peter Naulls to license all past and present contributions to UnixLib (where possible) under the revised BSD license. The license is included in the next section and is applicable to all code in UnixLib that does not @@ -1865,7 +1863,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-

Copyright 2003–2019 The NetSurf Developers

+

Copyright 2003–2019 The NetSurf Developers

diff --git a/resources/it/credits.html b/resources/it/credits.html index 93d2eb091..b68c61fbb 100644 --- a/resources/it/credits.html +++ b/resources/it/credits.html @@ -12,16 +12,15 @@ div#DevList ul { - - + -

Ringraziamenti

+

Ringraziamenti

NetSurf è stato sviluppato dalle seguenti persone:

-

Programmazione e codice sorgente

+

Programmazione e codice sorgente

  • Kevin Bagust
  • John-Mark Bell
    • @@ -59,7 +58,7 @@ div#DevList ul {
  • Chris Young
-

Documentazione

+

Documentazione

  • John-Mark Bell
  • James Bursa
    • @@ -69,7 +68,7 @@ div#DevList ul {
  • Richard Wilson
-

Grafica e loghi

+

Grafica e loghi

  • Michael Drake
  • Andrew Duffell
    • @@ -78,7 +77,7 @@ div#DevList ul {
  • Phil Mellor
-

Traduttori

+

Traduttori

  • Sebastian Barthel
  • Bruno D'Arcangeli
    • @@ -91,7 +90,7 @@ div#DevList ul {
-


Copyright 2003–2019 The NetSurf Developers

+

Copyright 2003–2019 The NetSurf Developers

diff --git a/resources/it/licence.html b/resources/it/licence.html index dbf93d7e4..3c3760245 100644 --- a/resources/it/licence.html +++ b/resources/it/licence.html @@ -5,23 +5,22 @@ - - + -

Licenza d'uso

+

Licenza d'uso

Il codice sorgente di NetSurf, la sua documentazione, nonchè i file delle traduzioni e le definizioni UI sono rilasciati liberamente secondo i termini della Licenza Pubblica Generica GNU cosi com'è pubblicata dalla Free Software Foundation nella versione 2.0 o successiva, inoltre, come eccezione particolare è possibile collegare il codice sorgente di NetSurf a quello della libreria OpenSSL oppure distribuirli insieme usando una versione modificata della libreria stessa avente però la medesima licenza d'uso.

@@ -41,7 +39,7 @@ dl.components > dd > span + span {

Nel caso si desideri modificare il programma è possibile estendere questa eccezione anche alla versione del codice sorgente modificato, tuttavia non è obbligatorio farlo e se non lo si desidera è possibile cancellare questa eccezione dalla propria versione.

-

Licenza d'uso dei vari componenti

+

Licenza d'uso dei vari componenti

Tutte le risorse ArtWork di NetSurf sono rilasciate secondo i termini della licenza MIT.

@@ -50,73 +48,73 @@ dl.components > dd > span + span {

Componenti del progetto NetSurf

-
NetSurf
+
NetSurf
© 2002–2018 The NetSurf Developers GPLv2
-
LibCSS
+
LibCSS
© 2007–2018 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2017 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2017 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -126,49 +124,49 @@ dl.components > dd > span + span {

Componenti di terze parti

-
cURL
+
cURL
© 1996–2010 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-q
OSLib
+q
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -177,20 +175,20 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib
-

Testi delle licenze

+

Testi delle licenze

Ove possibile le forme generiche dei vari testi delle licenze sono visualizzate qui. Alcuni componenti possono variare leggermente la licenza d'uso, tuttavia nei casi in cui abbiamo apportato delle modifiche il nostro sforzo è stato quello di rispettare il più fedelmente possibile (ed in accordo ad essa) la licenza originale, in questo caso le piccole variazioni alla licenza sono elencate qui, eventuali altre variazioni minori come ad esempio gli spazi bianchi non sono considerati.

GNU General Public Licence, Versione 2

-
GNU GENERAL PUBLIC LICENSE +
GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., @@ -533,7 +531,7 @@ Public License instead of this License.

Licenza MIT/X

-
Permission is hereby granted, free of charge, to any person obtaining a copy +
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -554,7 +552,7 @@ THE SOFTWARE.

Licenza ZLib

-
This software is provided 'as-is', without any express or implied +
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -573,7 +571,7 @@ THE SOFTWARE.

Licenza IJG

-
The authors make NO WARRANTY or representation, either express or implied, +
The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. @@ -627,7 +625,7 @@ but is also freely distributable.

Licenza OSLib

-
The copyright holder has granted a small relaxation of the +
The copyright holder has granted a small relaxation of the conditions of the GNU Public Licence, in that OSLib is itself free software, but applications linked to it need not be. This means that any changes to OSLib itself (the contents of @@ -887,7 +885,7 @@ That's all there is to it!

Licenza OpenSSL

-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of +
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL @@ -1013,7 +1011,7 @@ That's all there is to it!

Licenza PNG

-
* This code is released under the libpng license. +
* This code is released under the libpng license. * * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are @@ -1103,7 +1101,7 @@ That's all there is to it!

Licenza UnixLib

-
In January 2005, permission was obtained from all relevant contributors +
In January 2005, permission was obtained from all relevant contributors by Peter Naulls to license all past and present contributions to UnixLib (where possible) under the revised BSD license. The license is included in the next section and is applicable to all code in UnixLib that does not @@ -1853,7 +1851,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-

Copyright 2003–2019 The NetSurf Developers

+

Copyright 2003–2019 The NetSurf Developers

diff --git a/resources/nl/credits.html b/resources/nl/credits.html index 9c101bbea..1cd342600 100644 --- a/resources/nl/credits.html +++ b/resources/nl/credits.html @@ -13,16 +13,15 @@ div#DevList ul { - - + -

NetSurf-bijdragen

+

NetSurf-bijdragen

NetSurf kwam tot stand door bijdragen van de volgende personen:

-

Code

+

Code

  • Kevin Bagust
  • John-Mark Bell
    • @@ -60,7 +59,7 @@ div#DevList ul {
  • Chris Young
-

Documentatie

+

Documentatie

  • John-Mark Bell
  • James Bursa
    • @@ -70,7 +69,7 @@ div#DevList ul {
  • Richard Wilson
-

Afbeeldingen

+

Afbeeldingen

  • Michael Drake
  • Andrew Duffell
    • @@ -79,7 +78,7 @@ div#DevList ul {
  • Phil Mellor
-

Vertalingen

+

Vertalingen

  • Sebastian Barthel
  • Bruno D'Arcangeli
    • @@ -96,7 +95,7 @@ div#DevList ul {
-

Auteursrecht 2003–2019 De NetSurf-ontwikkelaars

+

Auteursrecht 2003–2019 De NetSurf-ontwikkelaars

diff --git a/resources/nl/licence.html b/resources/nl/licence.html index c4c4db8f1..d4fbf9a95 100644 --- a/resources/nl/licence.html +++ b/resources/nl/licence.html @@ -6,23 +6,22 @@ - - + -

NetSurf-gebruikerslicentie

+

NetSurf-gebruikerslicentie

De broncode van NetSurf, de documentatie, evenals de verschillende vertalingen, bijbehorende bestanden en de gebruikersinterface-definities zijn @@ -52,7 +50,7 @@ wijzigen, mag u deze uitzondering ook opnemen in uw versie van de gewijzigde broncode. Dit is echter niet verplicht om te doen en als u dat ook niet wenst dan verwijder deze uitzonderingverklaring uit uw eigen versie.

-

Gebruikerslicenties van de verschillende componenten

+

Gebruikerslicenties van de verschillende componenten

De grafische vormgeving van NetSurf, inclusief de bijbehorende bronbestanden, vallen onder de MIT-licentie.

@@ -61,73 +59,73 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.

Onderdelen van het NetSurf-project

-
NetSurf
+
NetSurf
© 2002–2018 De NetSurf-ontwikkerlaars GPLv2
-
LibCSS
+
LibCSS
© 2007–2018 John-Mark Bell MIT
-
Hubbub
+
Hubbub
© 2007–2018 John-Mark Bell
© 2008–2009 Andrew Sidwell MIT
-
LibParserUtils
+
LibParserUtils
© 2007–2018 John-Mark Bell MIT
-
LibROSprite
+
LibROSprite
© 2008 James Shaw MIT
-
Libpencil
+
Libpencil
© 2005–2006 James Bursa MIT
-
RUfl
+
RUfl
© 2005–2009 James Bursa MIT
-
Libsvgtiny
+
Libsvgtiny
© 2008–2009 James Bursa
© 2016–2018 Michael Drake MIT
-
Libnsbmp
+
Libnsbmp
© 2006 Richard Wilson
© 2008 Sean Fox
© 2016 Vincent Sanders MIT
-
Libnsfb
+
Libnsfb
© 2009–2017 Vincent Sanders
© 2009–2017 Michael Drake MIT
-
Libnsgif
+
Libnsgif
© 2004 Richard Wilson
© 2008 Sean Fox MIT
-
LibWapcaplet
+
LibWapcaplet
© 2009–2017 NetSurf Browser Project, Daniel Silverstone MIT @@ -138,49 +136,49 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.

Onderdelen van derden

-
cURL
+
cURL
© 1996–2010 Daniel Stenberg MIT
-
Haru PDF
+
Haru PDF
© 2000–2008 Takeshi Kanno ZLib
-
libjpeg
+
libjpeg
© 1991–2010 Thomas G. Lane, Guido Vollbeding IJG
-
liblcms
+
liblcms
© 1998–2007 Marti Maria Saguer MIT
-
OSLib
+
OSLib
© 1994–1998 Jonathan Coxhead and contributors OSLib
-
OpenSSL
+
OpenSSL
© 1995–1998 Eric A. Young, Tim J. Hudson
© 1998–2010 The OpenSSL Project OpenSSL
-
libpng
+
libpng
© 2004–2010 Glenn Randers-Pehrson PNG
-
UnixLib
+
UnixLib
© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood
© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, @@ -189,14 +187,14 @@ Graham Shaw, James Bursa and John-Mark Bell. UnixLib
-
ZLib
+
ZLib
© 1995–2010 Jean-loup Gailly and Mark Adler ZLib
-

Licentieteksten

+

Licentieteksten

Waar mogelijk zijn hieronder de algemeen geldende licentieteksten van de verschillende NetSurf-onderdelen opgenomen. Bij sommige onderdelen kan de @@ -208,7 +206,7 @@ genomen.

GNU General Public Licence, Versie 2 (Engels)

-
GNU GENERAL PUBLIC LICENSE +
GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., @@ -551,7 +549,7 @@ Public License instead of this License.

MIT/X-licentie (Engels)

-
Permission is hereby granted, free of charge, to any person obtaining a copy +
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell @@ -572,7 +570,7 @@ THE SOFTWARE.

ZLib-licentie (Engels)

-
This software is provided 'as-is', without any express or implied +
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -591,7 +589,7 @@ THE SOFTWARE.

IJG-licentie (Engels)

-
The authors make NO WARRANTY or representation, either express or implied, +
The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy. @@ -646,7 +644,7 @@ but is also freely distributable.

OSLib-licentie (Engels)

-
The copyright holder has granted a small relaxation of the +
The copyright holder has granted a small relaxation of the conditions of the GNU Public Licence, in that OSLib is itself free software, but applications linked to it need not be. This means that any changes to OSLib itself (the contents of @@ -906,7 +904,7 @@ That's all there is to it!

OpenSSL-licentie (Engels)

-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of +
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL @@ -1032,7 +1030,7 @@ That's all there is to it!

PNG-licentie (Engels)

-
* This code is released under the libpng license. +
* This code is released under the libpng license. * * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are @@ -1122,7 +1120,7 @@ That's all there is to it!

UnixLib-licenctie (Engels)

-
In January 2005, permission was obtained from all relevant contributors +
In January 2005, permission was obtained from all relevant contributors by Peter Naulls to license all past and present contributions to UnixLib (where possible) under the revised BSD license. The license is included in the next section and is applicable to all code in UnixLib that does not @@ -1872,7 +1870,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-

Auteursrecht 2003–2019 De NetSurf-ontwikkelaars

+

Auteursrecht 2003–2019 De NetSurf-ontwikkelaars

-- cgit v1.2.3