www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www graphics/graphics.es.html graphics/po/graph...


From: GNUN
Subject: www graphics/graphics.es.html graphics/po/graph...
Date: Wed, 1 Mar 2023 12:30:38 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     23/03/01 12:30:38

Modified files:
        graphics       : graphics.es.html 
        graphics/po    : graphics.es-en.html 
        licenses       : gpl-faq.fr.html 
        licenses/po    : gpl-faq.fr-en.html gpl-faq.it-diff.html 
                         gpl-faq.ja-diff.html 
        philosophy     : who-does-that-server-really-serve.es.html 
        philosophy/po  : who-does-that-server-really-serve.es-en.html 
                         who-does-that-server-really-serve.es.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/graphics.es.html?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/graphics.es-en.html?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.fr.html?cvsroot=www&r1=1.202&r2=1.203
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.fr-en.html?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.it-diff.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ja-diff.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/who-does-that-server-really-serve.es.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.es-en.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.es.po?cvsroot=www&r1=1.90&r2=1.91

Patches:
Index: graphics/graphics.es.html
===================================================================
RCS file: /web/www/www/graphics/graphics.es.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- graphics/graphics.es.html   26 Feb 2023 10:00:10 -0000      1.106
+++ graphics/graphics.es.html   1 Mar 2023 17:30:34 -0000       1.107
@@ -133,27 +133,21 @@
 <!--#endif -->
 <!--#if expr="$THEME = fs"
 -->
-<option value="fs" selected="selected">Otro software libre / 
FSF</option><!--#else
+<option value="fs" selected="selected">otro software libre / 
FSF</option><!--#else
 -->
-<option value="fs">Otro software libre / FSF</option>
+<option value="fs">otro software libre / FSF</option>
 <!--#endif -->
 <!--#if expr="$THEME = license"
 -->
-<option value="license" selected="selected">licencia</option><!--#else
+<option value="license" selected="selected">licencias</option><!--#else
 -->
-<option value="license">licencia</option>
+<option value="license">licencias</option>
 <!--#endif -->
-<!--#if expr="$THEME = drm"
+<!--#if expr="$THEME = malware"
 -->
-<option value="drm" selected="selected">DRM</option><!--#else
+<option value="malware" selected="selected">malware privativo</option><!--#else
 -->
-<option value="drm">DRM</option>
-<!--#endif -->
-<!--#if expr="$THEME = surveillance"
--->
-<option value="surveillance" selected="selected">vigilancia</option><!--#else
--->
-<option value="surveillance">vigilancia</option><!--#endif -->
+<option value="malware">malware privativo</option><!--#endif -->
 </select>
 </div>
 
@@ -174,9 +168,15 @@
 <!--#endif -->
 <!--#if expr="$TYPE = banner"
 -->
-<option value="banner" selected="selected">banner / distintivo / 
camiseta</option><!--#else
+<option value="banner" selected="selected">cartel</option><!--#else
 -->
-<option value="banner">banner / distintivo / camiseta</option>
+<option value="banner">cartel</option>
+<!--#endif -->
+<!--#if expr="$TYPE = banner"
+-->
+<option value="badge" selected="selected">distintivo / 
camiseta</option><!--#else
+-->
+<option value="badge">distintivo / camiseta</option>
 <!--#endif -->
 <!--#if expr="$TYPE = button"
 -->
@@ -238,7 +238,7 @@
 <tr style="display:none"><td></td></tr>
 <!-- Dummy entry for xhtml validation.
 -->
-<!--#if expr="$THEME,$TYPE = /^((license|surveillance|fs|),(poster|svg|))$/" 
-->
+<!--#if expr="$THEME,$TYPE = /^((license|malware|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/babiichuk-devil-eula.html">
     <img src="/graphics/icons/babiichuk-devil-eula.80.png"
          alt="&nbsp;[Sátira del EULA y del software privativo]&nbsp;" 
/></a></td>
@@ -254,7 +254,7 @@
     <small>de Carlos Chan</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|banner|poster|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|badge|poster|))$/" -->
 <tr><td><a href="/graphics/ai-art.html">
     <img src="/graphics/icons/ai-gnu-news.80.png"
          alt="&nbsp;[Gnu con textura del pelo leñosa]&nbsp;" /></a></td>
@@ -269,7 +269,7 @@
     <small>de Muhammed Omar Ali &amp; Fatamy</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((fs|),(poster|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" -->
 <tr><td><a href="/graphics/amihud-4-freedoms.html">
     <img src="/graphics/icons/amihud-4-freedoms.80.png"
          alt="&nbsp;[Poster con la definición de las cuatro 
libertades]&nbsp;" /></a></td>
@@ -309,22 +309,6 @@
     <small>de JC</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(wallpaper|))$/" -->
-<tr><td><a href="/graphics/wilgus-gnutiling.html">
-    <img src="/graphics/icons/wilgus-gnutiling-embossed.80.png"
-         alt="&nbsp;[Embaldosado de cabeza GNU en relieve]&nbsp;" /></a></td>
-    <td>Mayo de 2020: Fondos de pantalla de cabeza GNU en embaldosado <br />
-    <small>de Kacper Wilgus</small></td></tr>
-<!--#endif
--->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|logo|))$/" -->
-<tr><td><a href="/graphics/gnu-smiling.html">
-    <img src="/graphics/icons/gnu-smiling.80.png"
-         alt="&nbsp;[Cabeza de GNU sonriente]&nbsp;" /></a></td>
-    <td>Marzo de 2020: GNU sonriente<br />
-    <small>de Las</small></td></tr>
-<!--#endif
--->
 </table>
 
 <h3 id="this-site">Imágenes de GNU en este sitio</h3>
@@ -384,7 +368,7 @@
     <small>de Teddy Hogeborn</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|banner|poster|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|badge|poster|))$/" -->
 <tr><td><a href="/graphics/ai-art.html">
     <img src="/graphics/icons/ai-gnu-news.80.png"
          alt="&nbsp;[Gnu con textura del pelo leñosa]&nbsp;" /></a></td>
@@ -423,7 +407,7 @@
     <small>de Etienne Suvasa</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|banner|logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|badge|logo|))$/" -->
 <tr><td><a href="/graphics/atypinggnu.html">
     <img src="/graphics/icons/gnu-type.80.png"
          alt="&nbsp;[Hacker GNU tecleando]&nbsp;" /></a></td>
@@ -439,7 +423,7 @@
     <small>de Peter McLachlan</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|poster|logo|))$/" -->
 <tr><td><a href="/graphics/arantxa.html">
     <img src="/graphics/icons/arantxa-glitch.80.png"
          alt="&nbsp;[Glitch]&nbsp;" /></a></td>
@@ -447,7 +431,7 @@
     <small>de Arantxa Serantes</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((license|surveillance|fs|),(poster|svg))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((license|malware|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/babiichuk-devil-eula.html">
     <img src="/graphics/icons/babiichuk-devil-eula.80.png"
          alt="&nbsp;[Sátira del EULA y del software privativo]&nbsp;" 
/></a></td>
@@ -487,7 +471,7 @@
     <small>de Bravo Edison</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(banner|button|icon|logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(badge|button|icon|logo|))$/" -->
 <tr><td><a href="/graphics/BVBN.html">
     <img src="/graphics/icons/bvbn-logo-small.80.png"
          alt="&nbsp;[GNU Head logo]&nbsp;" /></a></td>
@@ -495,7 +479,7 @@
     <small>de Vladimir Tsarkov</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/bwcartoon.html">
     <img src="/graphics/icons/gnu-and-penguin-color.80.png"
          alt="&nbsp;[El Gnu y el pinguino volando]&nbsp;" /></a></td>
@@ -519,7 +503,7 @@
     <small>de Don Hopkins</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((drm|),(banner|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((malware|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/digital-restrictions-management.html">
     <img src="/graphics/icons/ichain.80.png"
          alt="&nbsp;[Las cadenas de la Gestión Digital de 
Restricciones]&nbsp;" /></a></td>
@@ -527,7 +511,7 @@
     <small>de Chris Hayes</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/distros-dragora.html">
     <img src="/graphics/icons/distros-dragora.80.png"
          alt="&nbsp;[Dragora Logo]&nbsp;" /></a></td>
@@ -535,7 +519,7 @@
     <small>de Claudio Santillán</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|poster|badge|svg|))$/" -->
 <tr><td><a href="/graphics/dittberner-gnu.html">
     <img src="/graphics/icons/dittberner_gnu.80.png"
          alt="&nbsp;[gnu a la carrera]&nbsp;" /></a></td>
@@ -543,7 +527,7 @@
     <small>de Dorothea y Jan Dittberner</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((surveillance|),(cartoon|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((malware|),(poster|cartoon|))$/" -->
 <tr><td><a href="/graphics/dog.html">
     <img src="/graphics/icons/dog.80.png"
          alt="&nbsp;[Dog, wondering at pop-up ads]&nbsp;" /></a></td>
@@ -567,7 +551,7 @@
     <small>de Ernesto Bazzano</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((tux|),(logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((tux|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/freedo.html">
     <img src="/graphics/icons/freedo_improved.80.png"
          alt="&nbsp;[Un pingüino saliendo de la ducha]&nbsp;" /></a></td>
@@ -591,7 +575,7 @@
     <small>de Crista Moreno</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((tux|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((tux|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/freedo_on_the_beach.html">
     <img src="/graphics/icons/freedo_on_the_beach.80.png"
          alt="&nbsp;[Freedo de vacaciones en la playa]&nbsp;" /></a></td>
@@ -649,7 +633,7 @@
     <small>de Jonathan Richard</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|icon|svg|))$/" -->
 <tr><td><a href="/graphics/gg3po.html">
     <img src="/graphics/icons/gg3po-newGnu.80.png"
          alt="&nbsp;[New GNU]&nbsp;" /></a></td>
@@ -657,7 +641,7 @@
     <small>de gg3po</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|icon|))$/" -->
 <tr><td><a href="/graphics/gleesons.html">
     <img src="/graphics/icons/gleeson_head.80.png"
          alt="&nbsp;[Colorful rounded image of the head of a GNU]&nbsp;" 
/></a></td>
@@ -673,14 +657,14 @@
     <small>de Li Jiang</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-30.html">
     <img src="/graphics/icons/gnu-30-badge.80.png"
          alt="&nbsp;[GNU 30th - Celebrating 30 years]&nbsp;" /></a></td>
     <td>30 cumpleaños de GNU</td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-alternative.html">
     <img src="/graphics/icons/gnu-alternative.80.png"
          alt="&nbsp;[Stylized gnu mask]&nbsp;" /></a></td>
@@ -736,7 +720,7 @@
     <small>de Luk</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-head-shadow.html">
     <img src="/graphics/icons/gnu_headshadow.80.png"
          alt="&nbsp;[GNU banner saying: run free run gnu]&nbsp;" /></a></td>
@@ -744,7 +728,7 @@
     <small>de Vladimir Zúñiga</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|))$/" -->
 <tr><td><a href="/graphics/gnu-inside.html">
     <img src="/graphics/icons/gnu-inside.80.png"
          alt="&nbsp;[Fragment of the head of a GNU]&nbsp;" /></a></td>
@@ -752,7 +736,7 @@
     <small>de Mike Gerwitz</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),)$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-jacket.html">
     <img src="/graphics/icons/gnu-jacket.80.png"
          alt="&nbsp;[Gnu wearing a jacket]&nbsp;" /></a></td>
@@ -768,7 +752,7 @@
     <small>de Burkhard Jäckel</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-slash-linux.html">
     <img src="/graphics/icons/gnu-linux-on-black.80.png"
          alt="&nbsp;[Gnu and Tux on black]&nbsp;" /></a></td>
@@ -784,7 +768,7 @@
     <small>de Las</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|button|))$/" -->
 <tr><td><a href="/graphics/gnubanner.html">
     <img src="/graphics/icons/gnubanner-2.80.png"
          alt="&nbsp;[Come and see what GNU creates for YOU]&nbsp;" /></a></td>
@@ -816,7 +800,7 @@
     <small>tallado por Lorena Cid-Montiel</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(badge|logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(poster|badge|logo|svg|))$/" -->
 <tr><td><a href="/graphics/gnupascal.html">
     <img src="/graphics/icons/Gnu+Pascal.80.png"
          alt="&nbsp;[A Gnu and Blaise Pascal]&nbsp;" /></a></td>
@@ -856,7 +840,7 @@
     <small>de Imogen Mulley</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|poster|svg|))$/" -->
 <tr><td><a href="/graphics/happy_gnu_year_2019.html">
     <img src="/graphics/icons/happy_gnu_year_2019.80.png"
          alt="&nbsp;[Freedo está en el lugar del 0 de 2019, y el ñu está 
sosteniendo el
@@ -881,7 +865,7 @@
     <small>de the Hitflip Team</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|badge|poster|svg|))$/" -->
 <tr><td><a href="/graphics/holiday_deliveries.html">
     <img src="/graphics/icons/holiday_deliveries.80.png"
          alt="&nbsp;[Freedo, el gnu y el ciervo de Libreboot reparten software
@@ -906,7 +890,7 @@
     <small>de Stephen McCamant</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^(,(cartoon|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((malware|),(poster|cartoon|))$/" -->
 <tr><td><a href="/graphics/jesus-cartoon.html">
     <img src="/graphics/icons/jesus-cartoon.80.png"
          alt="&nbsp;[Bill Gates and Jesus]&nbsp;" /></a></td>
@@ -946,7 +930,7 @@
     <small>del Nevrax Design Team</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|logo|icon|))$/" -->
 <tr><td><a href="/graphics/modern_art_gnu.html">
     <img src="/graphics/icons/modern_art_gnu.80.png"
          alt="&nbsp;[Cabeza de GNU en estilo moderno]&nbsp;" /></a></td>
@@ -954,7 +938,7 @@
     <small>de Angelo A.</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|malware|),(cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/nandakumar-gnu.html">
     <img src="/graphics/icons/gnu-gives-freedom.80.png"
          alt="&nbsp;[GNU liberating a computer]&nbsp;" /></a></td>
@@ -962,7 +946,7 @@
     <small>de Nandakumar</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|malware|),(cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/navaneeth-gnu.html">
     <img src="/graphics/icons/give-me-freedom.80.png"
          alt="&nbsp;[A computer dreaming about GNU for freedom]&nbsp;" 
/></a></td>
@@ -1074,7 +1058,7 @@
     <small>de Jonas Laugs y Steven DuBois</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|svg|))$/" -->
 <tr><td><a href="/graphics/spiritoffreedom.html">
     <img src="/graphics/icons/o_espirito_da_liberdade.fondo.80.png"
          alt="&nbsp;[The Spirit of Freedom]&nbsp;" /></a></td>
@@ -1146,7 +1130,7 @@
     <small>de Rubén Rodríguez Pérez</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|banner|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|))$/" -->
 <tr><td><a href="/graphics/usegnu.html">
     <img src="/graphics/icons/use-gnu.80.png"
          alt="&nbsp;[Pseudo-Lisp (Use 'GNU)]&nbsp;" /></a></td>
@@ -1154,7 +1138,7 @@
     <small>by Etienne Suvasa and the FSF staff</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|banner|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/whatsgnu.html">
     <img src="/graphics/icons/whats-gnu.80.png"
          alt="&nbsp;[GNU head with motto on banderoles]&nbsp;" /></a></td>
@@ -1210,7 +1194,7 @@
     <small>de Etienne Suvasa</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|emacs|fs|),(banner|button|cartoon|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|emacs|fs|),(banner|badge|button|cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-post/index.html">
     <img src="/graphics/icons/GNU-Post-2007.80.png"
          alt="&nbsp;[GNU Post seal]&nbsp;" /></a></td>
@@ -1255,7 +1239,7 @@
     <td>GNOME.Asia 2019 Logo Competition</td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|emacs|fs|),(banner|button|plastic|poster|))$/" -->
+<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|emacs|fs|),(badge|button|plastic|poster|))$/" -->
 <tr><td><a href="/graphics/historic-gnu-press.html">
     <img src="/graphics/icons/Happy-back.80.png"
          alt="&nbsp;[Emacs logo]&nbsp;" /></a></td>
@@ -1358,7 +1342,7 @@
     <small>de Apolonis</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnu|fs|),(banner|logo|poster|))$/" -->
+<!--#if expr="$THEME,$TYPE = /^((gnu|fs|),(banner|button|logo|poster|))$/" -->
 <tr><td><a
 href="https://web.archive.org/web/20210116144718/http://gnuart.onshore.com/";>
     <img src="/graphics/icons/gsam-want-gnu.80.png"
@@ -1375,7 +1359,7 @@
     <small>de Arnuld Uttre</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = /^((gnuhead|tux|fs|),(button|wallpaper|))$/" -->
+<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|tux|fs|),(logo|poster|badge|button|wallpaper|))$/" -->
 <tr><td><a href="http://www.gerwinski.de/~anja/gnuart/";>
     <img src="/graphics/icons/europa-and-gnu.80.png"
          alt="&nbsp;[GNU and Europa]&nbsp;" /></a></td>
@@ -1392,7 +1376,7 @@
     de Edward Alfert</small></td></tr>
 <!--#endif
 -->
-<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(button|cartoon|icon|banner|poster|svg|))$/" -->
+<!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(button|cartoon|icon|banner|badge|poster|svg|))$/" -->
 <tr><td><a href="https://openclipart.org/search/?query=gnu";>
     <img src="/graphics/icons/gnu-wizard.80.png"
          alt="&nbsp;[GNU como mago]&nbsp;" /></a></td>
@@ -1486,7 +1470,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2023/02/26 10:00:10 $
+$Date: 2023/03/01 17:30:34 $
 
 <!-- timestamp end -->
 </p>

Index: graphics/po/graphics.es-en.html
===================================================================
RCS file: /web/www/www/graphics/po/graphics.es-en.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- graphics/po/graphics.es-en.html     26 Feb 2023 10:00:13 -0000      1.78
+++ graphics/po/graphics.es-en.html     1 Mar 2023 17:30:36 -0000       1.79
@@ -104,17 +104,14 @@
 --><option value="emacs" selected="selected">Emacs</option><!--#else
 --><option value="emacs">Emacs</option><!--#endif -->
 <!--#if expr="$THEME = fs"
---><option value="fs" selected="selected">Other free software / 
FSF</option><!--#else
---><option value="fs">Other free software / FSF</option><!--#endif -->
+--><option value="fs" selected="selected">other free software / 
FSF</option><!--#else
+--><option value="fs">other free software / FSF</option><!--#endif -->
 <!--#if expr="$THEME = license"
---><option value="license" selected="selected">license</option><!--#else
---><option value="license">license</option><!--#endif -->
-<!--#if expr="$THEME = drm"
---><option value="drm" selected="selected">DRM</option><!--#else
---><option value="drm">DRM</option><!--#endif -->
-<!--#if expr="$THEME = surveillance"
---><option value="surveillance" 
selected="selected">surveillance</option><!--#else
---><option value="surveillance">surveillance</option><!--#endif --></select>
+--><option value="license" selected="selected">licenses</option><!--#else
+--><option value="license">licenses</option><!--#endif -->
+<!--#if expr="$THEME = malware"
+--><option value="malware" selected="selected">proprietary 
malware</option><!--#else
+--><option value="malware">proprietary malware</option><!--#endif --></select>
 </div>
 
 <div><label for="type"><strong>Select by type:</strong></label><br />
@@ -127,8 +124,11 @@
 --><option value="ascii" selected="selected">ASCII / TTY art</option><!--#else
 --><option value="ascii">ASCII / TTY art</option><!--#endif -->
 <!--#if expr="$TYPE = banner"
---><option value="banner" selected="selected">banner / badge / 
t-shirt</option><!--#else
---><option value="banner">banner / badge / t-shirt</option><!--#endif -->
+--><option value="banner" selected="selected">banner</option><!--#else
+--><option value="banner">banner</option><!--#endif -->
+<!--#if expr="$TYPE = banner"
+--><option value="badge" selected="selected">badge / t-shirt</option><!--#else
+--><option value="badge">badge / t-shirt</option><!--#endif -->
 <!--#if expr="$TYPE = button"
 --><option value="button" selected="selected">button / stamp / 
sticker</option><!--#else
 --><option value="button">button / stamp / sticker</option><!--#endif -->
@@ -163,7 +163,7 @@
 
 <table class="gnu-art">
 <tr style="display:none"><td></td></tr><!-- Dummy entry for xhtml validation.
---><!--#if expr="$THEME,$TYPE = 
/^((license|surveillance|fs|),(poster|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((license|malware|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/babiichuk-devil-eula.html">
     <img src="/graphics/icons/babiichuk-devil-eula.80.png"
          alt="&nbsp;[Satire on EULA and proprietary software]&nbsp;" 
/></a></td>
@@ -175,7 +175,7 @@
          alt="&nbsp;[Banner in cartoon style promoting free software]&nbsp;" 
/></a></td>
     <td>October 2022: I Love Free Software<br />
     <small>by Carlos Chan</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|banner|poster|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|badge|poster|))$/" -->
 <tr><td><a href="/graphics/ai-art.html">
     <img src="/graphics/icons/ai-gnu-news.80.png"
          alt="&nbsp;[Gnu with wood-like hair structure]&nbsp;" /></a></td>
@@ -186,7 +186,7 @@
          alt="&nbsp;[Gnu and Tux bivouac in the desert]&nbsp;" /></a></td>
     <td>October 2021: Gnu and Tux Bivouac<br />
     <small>by Muhammed Omar Ali &amp; Fatamy</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((fs|),(poster|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((fs|),(poster|))$/" -->
 <tr><td><a href="/graphics/amihud-4-freedoms.html">
     <img src="/graphics/icons/amihud-4-freedoms.80.png"
          alt="&nbsp;[Poster defining the four freedoms]&nbsp;" /></a></td>
@@ -216,18 +216,6 @@
          alt="&nbsp;[Silhouette of a GNU head, in profile]&nbsp;" /></a></td>
     <td>March 2021: GNU Silhouette Logos<br />
     <small>by JC</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(wallpaper|))$/" -->
-<tr><td><a href="/graphics/wilgus-gnutiling.html">
-    <img src="/graphics/icons/wilgus-gnutiling-embossed.80.png"
-         alt="&nbsp;[Embossed GNU-head tiling]&nbsp;" /></a></td>
-    <td>May 2020: GNU-Head Tiling wallpapers<br />
-    <small>by Kacper Wilgus</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|logo|))$/" -->
-<tr><td><a href="/graphics/gnu-smiling.html">
-    <img src="/graphics/icons/gnu-smiling.80.png"
-         alt="&nbsp;[Smiling GNU head]&nbsp;" /></a></td>
-    <td>March 2020: GNU Smiling<br />
-    <small>by Las</small></td></tr><!--#endif
 -->
 </table>
 
@@ -274,7 +262,7 @@
          alt="&nbsp;[Spherical Hurd Logo]&nbsp;" /></a></td>
     <td>Spherical Hurd Logo<br />
     <small>by Teddy Hogeborn</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|banner|poster|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|gnuhead|),(ai|badge|poster|))$/" -->
 <tr><td><a href="/graphics/ai-art.html">
     <img src="/graphics/icons/ai-gnu-news.80.png"
          alt="&nbsp;[Gnu with wood-like hair structure]&nbsp;" /></a></td>
@@ -303,7 +291,7 @@
          alt="&nbsp;[Statue of Liberty protecting software freedoms]&nbsp;" 
/></a></td>
     <td>An LPF logo<br />
     <small>by Etienne Suvasa</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|banner|logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|),(svg|badge|logo|))$/" -->
 <tr><td><a href="/graphics/atypinggnu.html">
     <img src="/graphics/icons/gnu-type.80.png"
          alt="&nbsp;[Typing GNU hacker]&nbsp;" /></a></td>
@@ -315,13 +303,13 @@
          alt="&nbsp;[Another typing GNU hacker]&nbsp;" /></a></td>
     <td>Another typing GNU hacker<br />
     <small>by Peter McLachlan</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|poster|logo|))$/" -->
 <tr><td><a href="/graphics/arantxa.html">
     <img src="/graphics/icons/arantxa-glitch.80.png"
          alt="&nbsp;[Glitch]&nbsp;" /></a></td>
     <td>Sunny GNU designs<br />
     <small>by Arantxa Serantes</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((license|surveillance|fs|),(poster|svg))$/" 
-->
+--><!--#if expr="$THEME,$TYPE = /^((license|malware|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/babiichuk-devil-eula.html">
     <img src="/graphics/icons/babiichuk-devil-eula.80.png"
          alt="&nbsp;[Satire on EULA and proprietary software]&nbsp;" 
/></a></td>
@@ -351,13 +339,13 @@
          alt="&nbsp;[Winking GNU Head]&nbsp;" /></a></td>
     <td>Winking GNU<br />
     <small>by Bravo Edison</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(banner|button|icon|logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(badge|button|icon|logo|))$/" -->
 <tr><td><a href="/graphics/BVBN.html">
     <img src="/graphics/icons/bvbn-logo-small.80.png"
          alt="&nbsp;[GNU Head logo]&nbsp;" /></a></td>
     <td>GNU/Linux buttons<br />
     <small>by Vladimir Tsarkov</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/bwcartoon.html">
     <img src="/graphics/icons/gnu-and-penguin-color.80.png"
          alt="&nbsp;[The Gnu and the Penguin in flight]&nbsp;" /></a></td>
@@ -375,26 +363,26 @@
          alt="&nbsp;[&quot;Copyleft (L)&quot; sticker]&nbsp;" /></a></td>
     <td>&ldquo;Copyleft (L)&rdquo; sticker<br />
     <small>by Don Hopkins</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((drm|),(banner|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((malware|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/digital-restrictions-management.html">
     <img src="/graphics/icons/ichain.80.png"
          alt="&nbsp;[The chains of Digital Restrictions
            Management]&nbsp;" /></a></td>
     <td>GNU Art &mdash; Digital Restrictions Management<br />
     <small>by Chris Hayes</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((fs|),(logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((fs|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/distros-dragora.html">
     <img src="/graphics/icons/distros-dragora.80.png"
          alt="&nbsp;[Dragora Logo]&nbsp;" /></a></td>
     <td>Dragora Logo<br />
     <small>by Claudio Santillan</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|),(wallpaper|poster|badge|svg|))$/" -->
 <tr><td><a href="/graphics/dittberner-gnu.html">
     <img src="/graphics/icons/dittberner_gnu.80.png"
          alt="&nbsp;[Running gnu]&nbsp;" /></a></td>
     <td>Running Gnu<br />
     <small>by Dorothea and Jan Dittberner</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((surveillance|),(cartoon|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((malware|),(poster|cartoon|))$/" -->
 <tr><td><a href="/graphics/dog.html">
     <img src="/graphics/icons/dog.80.png"
          alt="&nbsp;[Dog, wondering at pop-up ads]&nbsp;" /></a></td>
@@ -412,7 +400,7 @@
          alt="&nbsp;[Flying GNU design]&nbsp;" /></a></td>
     <td>Flying Gnu<br />
     <small>by Ernesto Bazzano</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((tux|),(logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((tux|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/freedo.html">
     <img src="/graphics/icons/freedo_improved.80.png"
          alt="&nbsp;[A penguin getting out of the shower]&nbsp;" /></a></td>
@@ -430,7 +418,7 @@
          alt="&nbsp;[Reflecting on GNU and freedom]&nbsp;" /></a></td>
     <td>Freedom Reflection<br />
     <small>by Crista Moreno</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((tux|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((tux|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/freedo_on_the_beach.html">
     <img src="/graphics/icons/freedo_on_the_beach.80.png"
          alt="&nbsp;[Freedo taking a vacation on the beach]&nbsp;" /></a></td>
@@ -473,13 +461,13 @@
          alt="&nbsp;[The book cover logo for 'Free Software, Free 
Society']&nbsp;" /></a></td>
     <td>Book cover logo for Free Software, Free Society<br />
     <small>by Jonathan Richard</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|icon|svg|))$/" -->
 <tr><td><a href="/graphics/gg3po.html">
     <img src="/graphics/icons/gg3po-newGnu.80.png"
          alt="&nbsp;[New GNU]&nbsp;" /></a></td>
     <td>New GNU<br />
     <small>by gg3po</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|icon|))$/" -->
 <tr><td><a href="/graphics/gleesons.html">
     <img src="/graphics/icons/gleeson_head.80.png"
          alt="&nbsp;[Colorful rounded image of the head of a GNU]&nbsp;" 
/></a></td>
@@ -491,12 +479,12 @@
          alt="&nbsp;[gNewSense Logo]&nbsp;" /></a></td>
     <td>gNewSense Logo<br />
     <small>by Li Jiang</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-30.html">
     <img src="/graphics/icons/gnu-30-badge.80.png"
          alt="&nbsp;[GNU 30th - Celebrating 30 years]&nbsp;" /></a></td>
     <td>GNU 30th birthday</td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(logo|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-alternative.html">
     <img src="/graphics/icons/gnu-alternative.80.png"
          alt="&nbsp;[Stylized gnu mask]&nbsp;" /></a></td>
@@ -538,19 +526,19 @@
          alt="&nbsp;[Luk's GNU head]&nbsp;" /></a></td>
     <td>Stylized GNU Head<br />
     <small>by Luk</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-head-shadow.html">
     <img src="/graphics/icons/gnu_headshadow.80.png"
          alt="&nbsp;[GNU banner saying: run free run gnu]&nbsp;" /></a></td>
     <td>GNU Head shadowed<br />
     <small>by Vladimir Z&uacute;&ntilde;iga</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|))$/" -->
 <tr><td><a href="/graphics/gnu-inside.html">
     <img src="/graphics/icons/gnu-inside.80.png"
          alt="&nbsp;[Fragment of the head of a GNU]&nbsp;" /></a></td>
     <td>GNU Inside<br />
     <small>by Mike Gerwitz</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),)$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|),(poster|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-jacket.html">
     <img src="/graphics/icons/gnu-jacket.80.png"
          alt="&nbsp;[Gnu wearing a jacket]&nbsp;" /></a></td>
@@ -562,7 +550,7 @@
          alt="&nbsp;[Powered by GNU/Linux]&nbsp;" /></a></td>
     <td>GNU/Linux logos<br />
     <small>by Burkhard Jäckel</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(wallpaper|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-slash-linux.html">
     <img src="/graphics/icons/gnu-linux-on-black.80.png"
          alt="&nbsp;[Gnu and Tux on black]&nbsp;" /></a></td>
@@ -574,7 +562,7 @@
          alt="&nbsp;[Smiling GNU head]&nbsp;" /></a></td>
     <td>GNU Smiling<br />
     <small>by Las</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|badge|button|))$/" -->
 <tr><td><a href="/graphics/gnubanner.html">
     <img src="/graphics/icons/gnubanner-2.80.png"
          alt="&nbsp;[Come and see what GNU creates for YOU]&nbsp;" /></a></td>
@@ -599,7 +587,7 @@
          alt="&nbsp;[GNUoLantern]&nbsp;" /></a></td>
     <td>GNU o Lantern<br />
     <small>carved by Lorena Cid-Montiel</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(badge|logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|fs|),(poster|badge|logo|svg|))$/" 
-->
 <tr><td><a href="/graphics/gnupascal.html">
     <img src="/graphics/icons/Gnu+Pascal.80.png"
          alt="&nbsp;[A Gnu and Blaise Pascal]&nbsp;" /></a></td>
@@ -629,7 +617,7 @@
          alt="&nbsp;[Head of a GNU with a printing press]&nbsp;" /></a></td>
     <td>GNU Head with Printing Press<br />
     <small>by Imogen Mulley</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|poster|svg|))$/" -->
 <tr><td><a href="/graphics/happy_gnu_year_2019.html">
     <img src="/graphics/icons/happy_gnu_year_2019.80.png"
          alt="&nbsp;[Freedo stands in place of the 0 of 2019, and the gnu
@@ -648,7 +636,7 @@
          alt="&nbsp;[GNU coin]&nbsp;" /></a></td>
     <td>GNU Coin and Herd<br />
     <small>by the Hitflip Team</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((tux|gnu|),(banner|badge|poster|svg|))$/" 
-->
 <tr><td><a href="/graphics/holiday_deliveries.html">
     <img src="/graphics/icons/holiday_deliveries.80.png"
          alt="&nbsp;[Freedo, the gnu and the Libreboot deer deliver software 
freedom]&nbsp;" /></a></td>
@@ -666,7 +654,7 @@
          alt="&nbsp;[Hurd Metafont logo]&nbsp;" /></a></td>
     <td>Hurd Logo in Metafont<br />
     <small>by Stephen McCamant</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^(,(cartoon|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((malware|),(poster|cartoon|))$/" -->
 <tr><td><a href="/graphics/jesus-cartoon.html">
     <img src="/graphics/icons/jesus-cartoon.80.png"
          alt="&nbsp;[Bill Gates and Jesus]&nbsp;" /></a></td>
@@ -696,19 +684,19 @@
          alt="&nbsp;[Levitating, Meditating, Flue-playing Gnu]&nbsp;" 
/></a></td>
     <td>Levitating, Meditating, Flute-playing Gnu<br />
     <small>by the Nevrax Design Team</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(banner|logo|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|logo|icon|))$/" -->
 <tr><td><a href="/graphics/modern_art_gnu.html">
     <img src="/graphics/icons/modern_art_gnu.80.png"
          alt="&nbsp;[Modern-style GNU head]&nbsp;" /></a></td>
     <td>Modern-style GNU Head<br />
     <small>by Angelo A.</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|malware|),(cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/nandakumar-gnu.html">
     <img src="/graphics/icons/gnu-gives-freedom.80.png"
          alt="&nbsp;[GNU liberating a computer]&nbsp;" /></a></td>
     <td>GNU Gives Freedom poster<br />
     <small>by Nandakumar</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),(cartoon|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|malware|),(cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/navaneeth-gnu.html">
     <img src="/graphics/icons/give-me-freedom.80.png"
          alt="&nbsp;[A computer dreaming about GNU for freedom]&nbsp;" 
/></a></td>
@@ -792,7 +780,7 @@
          alt="&nbsp;[GNU social Logo]&nbsp;" /></a></td>
     <td>GNU Social logo<br />
     <small>by Jonas Laugs and Steven DuBois</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|tux|),(poster|wallpaper|svg|))$/" -->
 <tr><td><a href="/graphics/spiritoffreedom.html">
     <img src="/graphics/icons/o_espirito_da_liberdade.fondo.80.png"
          alt="&nbsp;[The Spirit of Freedom]&nbsp;" /></a></td>
@@ -846,13 +834,13 @@
          alt="&nbsp;[Trisquel Logo]&nbsp;" /></a></td>
     <td>Trisquel Logo<br />
     <small>by Rub&eacute;n Rodr&iacute;guez 
P&eacute;rez</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|banner|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|),(badge|))$/" -->
 <tr><td><a href="/graphics/usegnu.html">
     <img src="/graphics/icons/use-gnu.80.png"
          alt="&nbsp;[Pseudo-Lisp (Use 'GNU)]&nbsp;" /></a></td>
     <td>Use 'GNU<br />
     <small>by Etienne Suvasa and the FSF staff</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|banner|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnuhead|),(badge|svg|))$/" -->
 <tr><td><a href="/graphics/whatsgnu.html">
     <img src="/graphics/icons/whats-gnu.80.png"
          alt="&nbsp;[GNU head with motto on banderoles]&nbsp;" /></a></td>
@@ -894,7 +882,7 @@
          alt="&nbsp;[GNU party]&nbsp;" /></a></td>
     <td>GNU Party<br />
     <small>by Etienne Suvasa</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|emacs|fs|),(banner|button|cartoon|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = 
/^((gnu|tux|emacs|fs|),(banner|badge|button|cartoon|svg|))$/" -->
 <tr><td><a href="/graphics/gnu-post/index.html">
     <img src="/graphics/icons/GNU-Post-2007.80.png"
          alt="&nbsp;[GNU Post seal]&nbsp;" /></a></td>
@@ -930,7 +918,7 @@
     <img src="/graphics/icons/gnome-asia-2019-logo.80.png"
          alt="&nbsp;[Winner of the GNOME.Asia 2019 Logo Competition]&nbsp;" 
/></a></td>
     <td>GNOME.Asia 2019 Logo Competition</td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|emacs|fs|),(banner|button|plastic|poster|))$/" -->
+--><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|emacs|fs|),(badge|button|plastic|poster|))$/" -->
 <tr><td><a href="/graphics/historic-gnu-press.html">
     <img src="/graphics/icons/Happy-back.80.png"
          alt="&nbsp;[Emacs logo]&nbsp;" /></a></td>
@@ -1003,7 +991,7 @@
          alt="&nbsp;['United Geekdom of GNU Linux' poster]&nbsp;" /></a></td>
     <td>Le Sage<br />
     <small>by Apolonis</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnu|fs|),(banner|logo|poster|))$/" -->
+--><!--#if expr="$THEME,$TYPE = /^((gnu|fs|),(banner|button|logo|poster|))$/" 
-->
 <tr><td><a 
href="https://web.archive.org/web/20210116144718/http://gnuart.onshore.com/";>
     <img src="/graphics/icons/gsam-want-gnu.80.png"
          alt="&nbsp;['I want GNU' poster]&nbsp;" /></a></td>
@@ -1015,7 +1003,7 @@
          alt="&nbsp;[Hebrew copyleft sign]&nbsp;" /></a></td>
     <td>Various logos<br />
     <small>by Arnuld Uttre</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = /^((gnuhead|tux|fs|),(button|wallpaper|))$/" 
-->
+--><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|tux|fs|),(logo|poster|badge|button|wallpaper|))$/" -->
 <tr><td><a href="http://www.gerwinski.de/~anja/gnuart/";>
     <img src="/graphics/icons/europa-and-gnu.80.png"
          alt="&nbsp;[GNU and Europa]&nbsp;" /></a></td>
@@ -1027,7 +1015,7 @@
          alt="&nbsp;['Powered by GNU' button]&nbsp;" /></a></td>
     <td>Favicon and buttons <small>(archived)<br />
     by Edward Alfert</small></td></tr><!--#endif
---><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(button|cartoon|icon|banner|poster|svg|))$/" -->
+--><!--#if expr="$THEME,$TYPE = 
/^((gnuhead|gnu|tux|),(button|cartoon|icon|banner|badge|poster|svg|))$/" -->
 <tr><td><a href="https://openclipart.org/search/?query=gnu";>
     <img src="/graphics/icons/gnu-wizard.80.png"
          alt="&nbsp;[GNU as wizard]&nbsp;" /></a></td>
@@ -1101,7 +1089,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2023/02/26 10:00:13 $
+$Date: 2023/03/01 17:30:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/gpl-faq.fr.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.fr.html,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- licenses/gpl-faq.fr.html    25 Feb 2023 14:34:00 -0000      1.202
+++ licenses/gpl-faq.fr.html    1 Mar 2023 17:30:36 -0000       1.203
@@ -686,14 +686,8 @@
     <li><a href="#SystemLibraryException">Puis-je lier un programme sous GPL 
avec
 une bibliothèque système privatrice ?</a></li>
 
-    <li><a href="#AGPLPL">Puis-je lier des modules sous GPLv3 et des modules 
sous
-AGPLv3 en un seul exécutable ?</a></li>
-
-    <li><a href="#AGPLLibrary">Puis-je lier un programme sous GPLv3 avec une
-bibliothèque sous AGPLv3 ?</a></li>
-
-    <li><a href="#AGPLAndGPLLibrary">Puis-je lier un programme sous AGPLv3 
avec une
-bibliothèque sous GPLv3 ?</a></li>
+    <li><a href="#AGPLGPL">De quelles manières puis-je lier ou combiner du 
code sous
+AGPLv3 et du code sous GPLv3 ?</a></li>
 
     <li><a href="#GPLIncompatibleLibs">Quels problèmes juridiques puis-je 
rencontrer
 si mon logiciel sous GPL dépend de bibliothèques incompatibles avec la
@@ -1330,34 +1324,16 @@
 fin de l'article 3.</p>
 </dd>
 
-<dt id="AGPLGPL">Puis-je lier des modules sous GPLv3 et des modules sous 
AGPLv3 en un seul
-exécutable ? <span class="anchor-reference-id">(<a
+<dt id="AGPLGPL">De quelles manières puis-je lier ou combiner du code sous 
AGPLv3 et du code
+sous GPLv3 ? <span class="anchor-reference-id">(<a
 href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
 <dd><p>
-Vous pouvez toujours lier des modules sous GPLv3 avec des modules sous
-AGPLv3, ceci parce que chacune de ces licences permet explicitement la
-liaison avec du code sous l'autre licence.</p>
-</dd>
-
-<dt id="AGPLLibrary">Puis-je lier un programme sous GPLv3 avec une 
bibliothèque sous AGPLv3 ?
-<span class="anchor-reference-id">(<a
-href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
-<dd><p>
-Vous pouvez toujours <a href="#AGPLGPL">lier des modules sous GPLv3 avec des
-modules sous AGPLv3</a>. C'est vrai même si certains de ces modules sont des
-bibliothèques.</p>
+Chacune de ces licences permet explicitement de lier du code régi par
+l'autre licence. Vous pouvez toujours lier des modules sous GPLv3 avec des
+modules sous AGPLv3 et inversement. C'est vrai même si certains de ces
+modules sont des bibliothèques.</p>
 </dd>
 
-<dt id="AGPLAndGPLLibrary">Puis-je lier un programme sous AGPLv3 avec un 
programme sous GPLv3 ? <span
-class="anchor-reference-id">(<a
-href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
-<dd><p>
-Vous pouvez toujours <a href="#AGPLGPL">lier des modules sous GPLv3 avec des
-modules sous AGPLv3</a>. C'est vrai même si certains de ces modules sont des
-bibliothèques.</p>
-</dd>
-
-
 <dt id="GPLIncompatibleLibs">Quels problèmes juridiques puis-je rencontrer si 
mon logiciel sous GPL
 dépend de bibliothèques incompatibles avec la GPL ? <span
 class="anchor-reference-id">(<a href="#GPLIncompatibleLibs"
@@ -4243,7 +4219,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2023/02/25 14:34:00 $
+$Date: 2023/03/01 17:30:36 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/gpl-faq.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.fr-en.html,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- licenses/po/gpl-faq.fr-en.html      25 Feb 2023 14:34:01 -0000      1.100
+++ licenses/po/gpl-faq.fr-en.html      1 Mar 2023 17:30:36 -0000       1.101
@@ -668,14 +668,8 @@
     <li><a href="#SystemLibraryException">Can I link a GPL program with
     a proprietary system library?</a></li>
 
-    <li><a href="#AGPLPL">Can I link GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?</a></li>
-
-    <li><a href="#AGPLLibrary">Can I link a GPLv3-covered program with
-    an AGPLv3-covered library?</a></li>
-
-    <li><a href="#AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
-    a GPLv3-covered library?</a></li>
+    <li><a href="#AGPLGPL">In what ways can I link or
+    combine AGPLv3-covered and GPLv3-covered code?</a></li>
 
     <li><a href="#GPLIncompatibleLibs">What legal issues come up if I
     use GPL-incompatible libraries with GPL software?</a></li>
@@ -1323,37 +1317,17 @@
 issue slightly differently, near the end of section 3.</p>
 </dd>
 
-<dt id="AGPLGPL">Can I link GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?
+<dt id="AGPLGPL">In what ways can I link or combine
+AGPLv3-covered and GPLv3-covered code?
  <span class="anchor-reference-id">(<a
 href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
 <dd><p>
-You can always link GPLv3-covered modules with AGPLv3-covered modules.
-That is because each of these licenses explicitly permits linking with
-code under the other license.</p>
-</dd>
-
-<dt id="AGPLLibrary">Can I link a GPLv3-covered program with
-    an AGPLv3-covered library?
- <span class="anchor-reference-id">(<a
-href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
-<dd><p>
-You can always <a href="#AGPLGPL">link GPLv3-covered modules with
-AGPLv3-covered modules</a>.  That is true regardless of whether some of
-the modules are libraries.</p>
+Each of these licenses explicitly permits linking with code under the
+other license.  You can always link GPL3-covered modules with
+AGPL3-covered modules, and vice versa.  That is true regardless of
+whether some of the modules are libraries.</p>
 </dd>
 
-<dt id="AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
-    a GPLv3-covered library?
- <span class="anchor-reference-id">(<a
-href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
-<dd><p>
-You can always <a href="#AGPLGPL">link GPLv3-covered modules with
-AGPLv3-covered modules</a>.  That is true regardless of whether some of
-the modules are libraries.</p>
-</dd>
-
-
 <dt id="GPLIncompatibleLibs">What legal issues
     come up if I use GPL-incompatible libraries with GPL software?
  <span class="anchor-reference-id">(<a href="#GPLIncompatibleLibs"
@@ -4044,7 +4018,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2023/02/25 14:34:01 $
+$Date: 2023/03/01 17:30:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/gpl-faq.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.it-diff.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/po/gpl-faq.it-diff.html    25 Feb 2023 12:00:41 -0000      1.24
+++ licenses/po/gpl-faq.it-diff.html    1 Mar 2023 17:30:36 -0000       1.25
@@ -76,9 +76,7 @@
 Project, the Free Software Foundation, and its licenses&lt;span 
class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
 encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
   &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#understanding"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
-encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;General understanding</em></ins></span> of 
<span class="removed"><del><strong>Contents&lt;/h3&gt;
-
-  &lt;h4&gt;Basic</strong></del></span> <span class="inserted"><ins><em>the GNU
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;General understanding of the GNU
 licenses&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
 encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
   &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#licensing"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
@@ -97,7 +95,9 @@
 released under the GNU licenses&lt;span 
class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
 encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
   &lt;li&gt;&lt;!--#set var='ANCHOR' value='&lt;a 
href="#violations"&gt;&lt;b&gt;' --&gt;&lt;!--#echo
-encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Questions about violations of the
+encoding='none' var='ANCHOR' --&gt;&lt;span 
class="gnun-split"&gt;&lt;/span&gt;Questions about violations</em></ins></span> 
of <span class="removed"><del><strong>Contents&lt;/h3&gt;
+
+  &lt;h4&gt;Basic</strong></del></span> <span class="inserted"><ins><em>the
 GNU licenses&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!--#echo
 encoding='none' var='CLOSE' --&gt;&lt;/li&gt;
 &lt;/ul&gt;
@@ -700,14 +700,8 @@
     &lt;li&gt;&lt;a href="#SystemLibraryException"&gt;Can I link a GPL program 
with
     a proprietary system library?&lt;/a&gt;&lt;/li&gt;
 
-    &lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#AGPLPL"&gt;Can I 
link GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?&lt;/a&gt;&lt;/li&gt;
-
-    &lt;li&gt;&lt;a href="#AGPLLibrary"&gt;Can I link a GPLv3-covered program 
with
-    an AGPLv3-covered library?&lt;/a&gt;&lt;/li&gt;
-
-    &lt;li&gt;&lt;a href="#AGPLAndGPLLibrary"&gt;Can I link an AGPLv3-covered 
program with
-    a GPLv3-covered library?&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#AGPLGPL"&gt;In what 
ways can I link or
+    combine AGPLv3-covered and GPLv3-covered code?&lt;/a&gt;&lt;/li&gt;
 
     &lt;li&gt;&lt;a</em></ins></span> href="#GPLIncompatibleLibs"&gt;What 
legal issues come up if I
     use GPL-incompatible libraries with GPL software?&lt;/a&gt;&lt;/li&gt;
@@ -1361,37 +1355,17 @@
 issue slightly differently, near the end of section 3.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="AGPLGPL"&gt;Can I link 
GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?
+&lt;dt <span class="inserted"><ins><em>id="AGPLGPL"&gt;In what ways can I link 
or combine
+AGPLv3-covered and GPLv3-covered code?
  &lt;span class="anchor-reference-id"&gt;(&lt;a
 href="#AGPLGPL"&gt;#AGPLGPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;&lt;p&gt;
-You can always link GPLv3-covered modules with AGPLv3-covered modules.
-That is because each of these licenses explicitly permits linking with
-code under the other license.&lt;/p&gt;
+Each of these licenses explicitly permits linking with code under the
+other license.  You can always link GPL3-covered modules with
+AGPL3-covered modules, and vice versa.  That is true regardless of
+whether some of the modules are libraries.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt id="AGPLLibrary"&gt;Can I link a GPLv3-covered program with
-    an AGPLv3-covered library?
- &lt;span class="anchor-reference-id"&gt;(&lt;a
-href="#AGPLLibrary"&gt;#AGPLLibrary&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
-&lt;dd&gt;&lt;p&gt;
-You can always &lt;a href="#AGPLGPL"&gt;link GPLv3-covered modules with
-AGPLv3-covered modules&lt;/a&gt;.  That is true regardless of whether some of
-the modules are libraries.&lt;/p&gt;
-&lt;/dd&gt;
-
-&lt;dt id="AGPLAndGPLLibrary"&gt;Can I link an AGPLv3-covered program with
-    a GPLv3-covered library?
- &lt;span class="anchor-reference-id"&gt;(&lt;a
-href="#AGPLAndGPLLibrary"&gt;#AGPLAndGPLLibrary&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
-&lt;dd&gt;&lt;p&gt;
-You can always &lt;a href="#AGPLGPL"&gt;link GPLv3-covered modules with
-AGPLv3-covered modules&lt;/a&gt;.  That is true regardless of whether some of
-the modules are libraries.&lt;/p&gt;
-&lt;/dd&gt;
-
-
 &lt;dt</em></ins></span> id="GPLIncompatibleLibs"&gt;What legal issues
     come up if I use GPL-incompatible libraries with GPL software?
  &lt;span class="anchor-reference-id"&gt;(&lt;a href="#GPLIncompatibleLibs"
@@ -4101,7 +4075,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2023/02/25 12:00:41 $
+$Date: 2023/03/01 17:30:36 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/gpl-faq.ja-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ja-diff.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- licenses/po/gpl-faq.ja-diff.html    25 Feb 2023 12:00:41 -0000      1.40
+++ licenses/po/gpl-faq.ja-diff.html    1 Mar 2023 17:30:36 -0000       1.41
@@ -701,14 +701,8 @@
     &lt;li&gt;&lt;a href="#SystemLibraryException"&gt;Can I link a GPL program 
with
     a proprietary system library?&lt;/a&gt;&lt;/li&gt;
 
-    &lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#AGPLPL"&gt;Can I 
link GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?&lt;/a&gt;&lt;/li&gt;
-
-    &lt;li&gt;&lt;a href="#AGPLLibrary"&gt;Can I link a GPLv3-covered program 
with
-    an AGPLv3-covered library?&lt;/a&gt;&lt;/li&gt;
-
-    &lt;li&gt;&lt;a href="#AGPLAndGPLLibrary"&gt;Can I link an AGPLv3-covered 
program with
-    a GPLv3-covered library?&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a <span class="inserted"><ins><em>href="#AGPLGPL"&gt;In what 
ways can I link or
+    combine AGPLv3-covered and GPLv3-covered code?&lt;/a&gt;&lt;/li&gt;
 
     &lt;li&gt;&lt;a</em></ins></span> href="#GPLIncompatibleLibs"&gt;What 
legal issues come up if I
     use GPL-incompatible libraries with GPL software?&lt;/a&gt;&lt;/li&gt;
@@ -1363,37 +1357,17 @@
 issue slightly differently, near the end of section 3.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="AGPLGPL"&gt;Can I link 
GPLv3-covered modules and
-    AGPLv3-covered modules into one executable?
+&lt;dt <span class="inserted"><ins><em>id="AGPLGPL"&gt;In what ways can I link 
or combine
+AGPLv3-covered and GPLv3-covered code?
  &lt;span class="anchor-reference-id"&gt;(&lt;a
 href="#AGPLGPL"&gt;#AGPLGPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;&lt;p&gt;
-You can always link GPLv3-covered modules with AGPLv3-covered modules.
-That is because each of these licenses explicitly permits linking with
-code under the other license.&lt;/p&gt;
-&lt;/dd&gt;
-
-&lt;dt id="AGPLLibrary"&gt;Can I link a GPLv3-covered program with
-    an AGPLv3-covered library?
- &lt;span class="anchor-reference-id"&gt;(&lt;a
-href="#AGPLLibrary"&gt;#AGPLLibrary&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
-&lt;dd&gt;&lt;p&gt;
-You can always &lt;a href="#AGPLGPL"&gt;link GPLv3-covered modules with
-AGPLv3-covered modules&lt;/a&gt;.  That is true regardless of whether some of
-the modules are libraries.&lt;/p&gt;
+Each of these licenses explicitly permits linking with code under the
+other license.  You can always link GPL3-covered modules with
+AGPL3-covered modules, and vice versa.  That is true regardless of
+whether some of the modules are libraries.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt id="AGPLAndGPLLibrary"&gt;Can I link an AGPLv3-covered program with
-    a GPLv3-covered library?
- &lt;span class="anchor-reference-id"&gt;(&lt;a
-href="#AGPLAndGPLLibrary"&gt;#AGPLAndGPLLibrary&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
-&lt;dd&gt;&lt;p&gt;
-You can always &lt;a href="#AGPLGPL"&gt;link GPLv3-covered modules with
-AGPLv3-covered modules&lt;/a&gt;.  That is true regardless of whether some of
-the modules are libraries.&lt;/p&gt;
-&lt;/dd&gt;
-
-
 &lt;dt</em></ins></span> id="GPLIncompatibleLibs"&gt;What legal issues
     come up if I use GPL-incompatible libraries with GPL software?
  &lt;span class="anchor-reference-id"&gt;(&lt;a href="#GPLIncompatibleLibs"
@@ -2591,11 +2565,11 @@
 is licensed under the terms of the &lt;a
 href="#UnreleasedModsAGPL"&gt;GNU Affero GPL&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;Compare this</em></ins></span> to <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>a situation where</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>web site contains or links</em></ins></span> to <span 
class="removed"><del><strong>make modifications and
+&lt;p&gt;Compare this</em></ins></span> to <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>a situation where</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>web site contains or links to
+separate GPLed programs that are distributed</em></ins></span> to <span 
class="removed"><del><strong>make modifications and
 use them privately, without ever publishing those modifications.  However,
-putting</strong></del></span>
-<span class="inserted"><ins><em>separate GPLed programs that are distributed 
to the user when they
-visit</em></ins></span> the <span class="inserted"><ins><em>web site (often 
written in &lt;a
+putting</strong></del></span> the <span class="inserted"><ins><em>user when 
they
+visit the web site (often written in &lt;a
 href="/philosophy/javascript-trap.html"&gt;JavaScript&lt;/a&gt;, but other
 languages are used as well). In this situation the source code for the
 programs being distributed must be released to the user under the
@@ -4146,7 +4120,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2023/02/25 12:00:41 $
+$Date: 2023/03/01 17:30:36 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/who-does-that-server-really-serve.es.html
===================================================================
RCS file: /web/www/www/philosophy/who-does-that-server-really-serve.es.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- philosophy/who-does-that-server-really-serve.es.html        13 Nov 2022 
10:30:40 -0000      1.65
+++ philosophy/who-does-that-server-really-serve.es.html        1 Mar 2023 
17:30:36 -0000       1.66
@@ -88,11 +88,13 @@
 <p>¿Qué significa que determinada actividad de cómputo es <em>suya</em>?
 Significa que nadie más está intrínsecamente involucrado en ella. Para
 aclarar el significado de «intrínsecamente involucrado» recurriremos a un
-experimento mental. Suponga que dispone de todo el software libre que
-pudiera necesitar para realizar la tarea, y de todos los datos así como de
-ordenadores de cualquier velocidad, funcionalidad y capacidad que pudieran
-requerirse. ¿Podría realizar esa actividad de cómputo concreta utilizando
-solo esos ordenadores, sin comunicarse con ningún ordenador de nadie más?</p>
+experimento mental. Suponga que todas las operaciones informáticas que
+pudiera necesitar para realizar la tarea están implementadas en software
+libre y que tiene copias, que dispone de todos los datos que pudiera
+necesitar, así como de los ordenadores de cualquier velocidad, funcionalidad
+y capacidad que pudieran requerirse. ¿Podría realizar esa actividad de
+cómputo concreta utilizando solo esos ordenadores, sin comunicarse con
+ningún ordenador de nadie más?</p>
 
 <p>Si puede, entonces la actividad es <em>enteramente suya</em>. En aras de la
 libertad, merece tener el control de ella. Si la realiza ejecutando software
@@ -272,19 +274,21 @@
 
 <p>Rechazar el SaaSS no significa que haya que evitar el uso de todos los
 servidores de red establecidos por otros. La mayoría de los servidores no
-son SaaSS porque las tareas que realizan tienen que ver con algún tipo de
-comunicación, no son las propias tareas de cómputo del usuario.</p>
-
-<p>La idea original de los servidores web no era realizar tareas de cómputo
-sino publicar información para que se tuviese acceso a ella. Incluso hoy en
-día esto es lo que hace la mayoría de los sitios web, y no presentan el
-problema del SaaSS porque acceder a la información que alguien ha publicado
-no es como realizar sus propias tareas de cómputo. Tampoco lo es usar un
-sitio de <cite>blogs</cite> para publicar su propio material, o un servicio
-de <cite>microblogging</cite> como Twitter o StatusNet (estos servicios
-pueden o no presentar otros problemas, dependiendo de algunos detalles). Lo
-mismo se aplica a la comunicación que no tenga que ser privada, como en los
-grupos de conversación.</p>
+son SaaSS, porque las tareas que realizan tienen que ver con algún tipo de
+comunicación con quienes los visitan, en lugar de realizar tareas de cómputo
+propias del usuario.</p>
+
+<p>La idea original de los servidores web no era realizar tareas de cómputo 
del
+usuario, un visitante del servidor, sino publicar información para que se
+tuviese acceso a ella. Incluso hoy en día esto es lo que hace la mayoría de
+los sitios web, y no presentan el problema del SaaSS porque acceder a la
+información que alguien ha publicado en un sitio web no es realizar sus
+propias tareas de cómputo. Tampoco lo es usar un sitio de <cite>blogs</cite>
+para publicar su propio material, o un servicio de
+<cite>microblogging</cite> como Twitter o StatusNet (estos servicios pueden
+o no presentar otros problemas, dependiendo de algunos detalles). Lo mismo
+se aplica a la comunicación que no tenga que ser privada, como en los grupos
+de conversación.</p>
 
 <p>Esencialmente, las redes sociales son una forma de comunicación y
 publicación, no SaaSS. Sin embargo, un servicio cuya función principal es la
@@ -527,7 +531,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2022 Richard
+<p>Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2023 Richard
 Stallman</p>
 
 <p>Esta página está bajo licencia <a rel="license"
@@ -543,7 +547,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2022/11/13 10:30:40 $
+$Date: 2023/03/01 17:30:36 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/who-does-that-server-really-serve.es-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/who-does-that-server-really-serve.es-en.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- philosophy/po/who-does-that-server-really-serve.es-en.html  13 Nov 2022 
10:30:40 -0000      1.46
+++ philosophy/po/who-does-that-server-really-serve.es-en.html  1 Mar 2023 
17:30:37 -0000       1.47
@@ -80,11 +80,12 @@
 is <em>your own</em>?  It means that no one else is inherently
 involved in it.  To clarify the meaning of &ldquo;inherently
 involved,&rdquo; we present a thought experiment.  Suppose that any
-free software you might need for the job is available to you, and
-whatever data you might need, as well as computers of whatever speed,
-functionality and capacity might be required.  Could you do this
-particular computing activity entirely within those computers, not
-communicating with anyone else's computers?</p>
+software tasks you might need for the job are implemented in free
+software and you have copies, and you have whatever data you might
+need, as well as computers of whatever speed, functionality and
+capacity might be required.  Could you do this particular computing
+activity entirely within those computers, not communicating with
+anyone else's computers?</p>
 
 <p>If you could, then the activity is <em>entirely your own</em>.  For
 your freedom's sake, you deserve to control it.  If you do it by
@@ -250,18 +251,18 @@
 
 <p>Rejecting SaaSS does not mean refusing to use any network servers
 run by anyone other than you.  Most servers are not SaaSS because the
-jobs they do are some sort of communication, rather than the user's
-own computing.</p>
+jobs they do are some sort of communication with visitors, rather than
+each visitor's own computing.</p>
 
-<p>The original idea of web servers wasn't to do computing for you, it
-was to publish information for you to access.  Even today this is what
-most web sites do, and it doesn't pose the SaaSS problem, because
-accessing someone's published information isn't doing your own
-computing.  Neither is use of a blog site to publish your own works,
-or using a microblogging service such as Twitter or StatusNet.  (These
-services may or may not have other problems, depending on details.)
-The same goes for other communication not meant to be private, such as
-chat groups.</p>
+<p>The original idea of web servers wasn't to do computing for you, a
+visitor; it was to publish information for you to access.  Even today
+this is what most web sites do, and it doesn't pose the SaaSS problem,
+because accessing someone's published information on a web site isn't
+doing your own computing.  Neither is use of a blog site to publish
+your own works, or using a microblogging service such as Twitter or
+StatusNet.  (These services may or may not have other problems,
+depending on details.)  The same goes for other communication not
+meant to be private, such as chat groups.</p>
 
 <p>In its essence, social networking is a form of communication and
 publication, not SaaSS.  However, a service whose main facility is
@@ -484,7 +485,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2022 Richard 
Stallman</p>
+<p>Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2023 Richard 
Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -494,7 +495,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/11/13 10:30:40 $
+$Date: 2023/03/01 17:30:37 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/who-does-that-server-really-serve.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.es.po,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- philosophy/po/who-does-that-server-really-serve.es.po       1 Mar 2023 
11:10:37 -0000       1.90
+++ philosophy/po/who-does-that-server-really-serve.es.po       1 Mar 2023 
17:30:37 -0000       1.91
@@ -114,11 +114,11 @@
 msgid ""
 "Our solution to this problem is developing <em>free software</em> and "
 "rejecting proprietary software.  Free software means that you, as a user, "
-"have four essential freedoms: (0)&nbsp;to run the program as you wish, "
-"(1)&nbsp;to study and change the source code so it does what you wish, "
-"(2)&nbsp;to redistribute exact copies, and (3)&nbsp;to redistribute copies "
-"of your modified versions.  (See the <a href=\"/philosophy/free-sw.html"
-"\">free software definition</a>.)"
+"have four essential freedoms: (0)&nbsp;to run the program as you wish, (1)"
+"&nbsp;to study and change the source code so it does what you wish, (2)&nbsp;"
+"to redistribute exact copies, and (3)&nbsp;to redistribute copies of your "
+"modified versions.  (See the <a href=\"/philosophy/free-sw.html\">free "
+"software definition</a>.)"
 msgstr ""
 "Nuestra solución a este problema es desarrollar <em>software libre</em> y "
 "rechazar el software privativo. Software libre significa que usted, como "
@@ -175,16 +175,6 @@
 "proporcionado, y luego le enviará los resultados o actuará directamente en "
 "nombre del usuario."
 
-# | What does it mean to say that a given computing activity is <em>your
-# | own</em>? It means that no one else is inherently involved in it.  To
-# | clarify the meaning of &ldquo;inherently involved,&rdquo; we present a
-# | thought experiment.  Suppose that any [-free-] software {+tasks+} you
-# | might need for the job [-is available to you,-] {+are implemented in free
-# | software+} and {+you have copies, and you have+} whatever data you might
-# | need, as well as computers of whatever speed, functionality and capacity
-# | might be required.  Could you do this particular computing activity
-# | entirely within those computers, not communicating with anyone else's
-# | computers?
 #. type: Content of: <div><p>
 msgid ""
 "What does it mean to say that a given computing activity is <em>your own</"
@@ -587,10 +577,6 @@
 "constituye SaaSS."
 
 # type: Content of: <p>
-# | Rejecting SaaSS does not mean refusing to use any network servers run by
-# | anyone other than you.  Most servers are not SaaSS because the jobs they
-# | do are some sort of [-communication,-] {+communication with visitors,+}
-# | rather than [-the user's-] {+each visitor's+} own computing.
 #. type: Content of: <div><p>
 msgid ""
 "Rejecting SaaSS does not mean refusing to use any network servers run by "
@@ -605,15 +591,6 @@
 "propias del usuario."
 
 # type: Content of: <p>
-# | The original idea of web servers wasn't to do computing for you, {+a
-# | visitor;+} it was to publish information for you to access.  Even today
-# | this is what most web sites do, and it doesn't pose the SaaSS problem,
-# | because accessing someone's published information {+on a web site+} isn't
-# | doing your own computing.  Neither is use of a blog site to publish your
-# | own works, or using a microblogging service such as Twitter or StatusNet.
-# | (These services may or may not have other problems, depending on details.)
-# |  The same goes for other communication not meant to be private, such as
-# | chat groups.
 #. type: Content of: <div><p>
 msgid ""
 "The original idea of web servers wasn't to do computing for you, a visitor; "
@@ -1064,12 +1041,7 @@
 "\">Guía para las traducciones</a> para obtener información sobre la "
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
-# | Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 202[-2-]{+3+}
-# | Richard Stallman
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2022 Richard "
-#| "Stallman"
 msgid ""
 "Copyright &copy; 2010, 2013, 2015, 2016, 2018, 2020, 2021, 2023 Richard "
 "Stallman"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]