diff options
Diffstat (limited to 'talermerchantdemos/blog/articles/es/floss-and-foss.html')
| -rw-r--r-- | talermerchantdemos/blog/articles/es/floss-and-foss.html | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/talermerchantdemos/blog/articles/es/floss-and-foss.html b/talermerchantdemos/blog/articles/es/floss-and-foss.html index 9e2c7ec..7e3a1de 100644 --- a/talermerchantdemos/blog/articles/es/floss-and-foss.html +++ b/talermerchantdemos/blog/articles/es/floss-and-foss.html @@ -1,16 +1,23 @@ <!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" --> <!--#include virtual="/server/header.es.html" --> -<!-- Parent-Version: 1.79 --> +<!-- Parent-Version: 1.96 --> +<!-- This page is derived from /server/standards/boilerplate.html --> +<!--#set var="TAGS" value="essays aboutfs free-open" --> +<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --> <!-- This file is automatically generated by GNUnited Nations! --> <title>FLOSS y FOSS - Proyecto GNU - Free Software Foundation</title> <!--#include virtual="/philosophy/po/floss-and-foss.translist" --> <!--#include virtual="/server/banner.es.html" --> +<!--#include virtual="/philosophy/ph-breadcrumb.es.html" --> +<!--GNUN: OUT-OF-DATE NOTICE--> +<!--#include virtual="/server/top-addendum.es.html" --> +<div class="article reduced-width"> <h2>FLOSS y FOSS</h2> -<p>por <strong>Richard Stallman</strong></p> +<address class="byline">por Richard Stallman</address> <p>Las dos corrientes políticas dentro de la comunidad de software libre son el movimiento de software libre y el código abierto. El movimiento de software @@ -61,6 +68,7 @@ decir «FLOSS», en lugar de «FOSS».</p> términos porque no queremos ser neutrales en esta cuestión política. Nosotros defendemos la libertad y lo demostramos siempre que se presenta la ocasión diciendo «free» y «libre» o «free/libre».</p> +</div> <div class="translators-notes"> @@ -72,7 +80,7 @@ id="TransNote1">1</a> En inglés se emplea la misma palabra <!-- for id="content", starts in the include above --> <!--#include virtual="/server/footer.es.html" --> -<div id="footer"> +<div id="footer" role="contentinfo"> <div class="unprintable"> <p>Envíe sus consultas acerca de la FSF y GNU a <a @@ -94,7 +102,7 @@ href="mailto:webmasters@gnu.org"><webmasters@gnu.org></a>.</p> <web-translators@gnu.org></a>.</p> - <p>For information on coordinating and submitting translations of + <p>For information on coordinating and contributing translations of our web pages, see <a href="/server/standards/README.translations.html">Translations README</a>. --> @@ -108,7 +116,23 @@ 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.</p> </div> -<p>Copyright © 2013, 2015, 2016 Richard Stallman</p> +<!-- Regarding copyright, in general, standalone pages (as opposed to + files generated as part of manuals) on the GNU web server should + be under CC BY-ND 4.0. Please do NOT change or remove this + without talking with the webmasters or licensing team first. + Please make sure the copyright date is consistent with the + document. For web pages, it is ok to list just the latest year the + document was modified, or published. + + If you wish to list earlier years, that is ok too. + Either "2001, 2002, 2003" or "2001-2003" are ok for specifying + years, as long as each year in the range is in fact a copyrightable + year, i.e., a year in which the document was published (including + being publicly visible on the web or in a revision control system). + + There is more detail about copyright years in the GNU Maintainers + Information document, www.gnu.org/prep/maintain. --> +<p>Copyright © 2013, 2015, 2016, 2021 Richard Stallman</p> <p>Esta página está bajo licencia <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/deed.es_ES">Creative @@ -124,11 +148,12 @@ Equipo de traductores al español de GNU.</div> <p class="unprintable"><!-- timestamp start --> Última actualización: -$Date: 2021/03/31 09:01:12 $ +$Date: 2021/09/12 10:34:32 $ <!-- timestamp end --> </p> </div> </div> +<!-- for class="inner", starts in the banner include --> </body> </html> |